fix(conversation): send fewer carriage returns after a user message (#11)

hugodutka · web-flow · commit faabad7d005f · 2025-05-26T13:41:22.000+02:00
* fix(conversation): send fewer carriage returns after a user message
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,7 @@
 {
     "editor.formatOnSave": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "[go]": {
+        "editor.defaultFormatter": "golang.go"
+    }
 }
diff --git a/lib/screentracker/conversation.go b/lib/screentracker/conversation.go
@@ -289,15 +289,23 @@ func (c *Conversation) writeMessageWithConfirmation(ctx context.Context, message
 
 	// wait for the screen to change after the carriage return is written
 	screenBeforeCarriageReturn := c.cfg.AgentIO.ReadScreen()
+	lastCarriageReturnTime := time.Time{}
 	if err := util.WaitFor(ctx, util.WaitTimeout{
 		Timeout:     15 * time.Second,
 		MinInterval: 25 * time.Millisecond,
 	}, func() (bool, error) {
-		if _, err := c.cfg.AgentIO.Write([]byte("\r")); err != nil {
-			return false, xerrors.Errorf("failed to write carriage return: %w", err)
+		// we don't want to spam additional carriage returns because the agent may process them
+		// (aider does this), but we do want to retry sending one if nothing's
+		// happening for a while
+		if time.Since(lastCarriageReturnTime) >= 3*time.Second {
+			lastCarriageReturnTime = time.Now()
+			if _, err := c.cfg.AgentIO.Write([]byte("\r")); err != nil {
+				return false, xerrors.Errorf("failed to write carriage return: %w", err)
+			}
 		}
 		time.Sleep(25 * time.Millisecond)
 		screen := c.cfg.AgentIO.ReadScreen()
+
 		return screen != screenBeforeCarriageReturn, nil
 	}); err != nil {
 		return xerrors.Errorf("failed to wait for processing to start: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"editor.formatOnSave": true,`
`3`		`- "editor.defaultFormatter": "esbenp.prettier-vscode"`
	`3`	`+ "editor.defaultFormatter": "esbenp.prettier-vscode",`
	`4`	`+ "[go]": {`
	`5`	`+ "editor.defaultFormatter": "golang.go"`
	`6`	`+ }`
`4`	`7`	`}`