Sync agent queue replacements before success

[onechat] / terminal.go

diff --git a/terminal.go b/terminal.go
index 203cb5e64adb2d6a8054f71e2b0431536e5c1331..340a8aa1e54118ecff9a06feffd3a93acc905119 100644 (file)
--- a/terminal.go
+++ b/terminal.go
@@ -23,19 +23,20 @@ var errTerminalDaemonClosed = errors.New("the daemon closed the connection")
 // terminal runs "onechat" and "onechat chat": the terminal client of the
 // daemon. Each line of input is a user message, the line /stop interrupts the
 // running turn, the line /stop NAME stops the subagent NAME, and a line that
 // terminal runs "onechat" and "onechat chat": the terminal client of the
 // daemon. Each line of input is a user message, the line /stop interrupts the
 // running turn, the line /stop NAME stops the subagent NAME, and a line that

-// starts with /whatsapp is a WhatsApp command. The client shows the replies,
-// the tool calls, and their results as they happen. It ends at the end of the
-// input or when the daemon closes the connection.
+// starts with /whatsapp is a WhatsApp command. /image PATH [caption] sends an
+// image from the client working directory. The client shows the replies, the
+// tool calls, and their results as they happen. It ends at the end of the input
+// or when the daemon closes the connection.

 func terminal(ctx context.Context, in io.Reader, out io.Writer) error {
        dir, err := dataDir()
        if err != nil {
 func terminal(ctx context.Context, in io.Reader, out io.Writer) error {
        dir, err := dataDir()
        if err != nil {

-               return err
+               return fmt.Errorf("find data directory: %w", err)

        }
 
        path := filepath.Join(dir, socketFileName)
        err = checkSocketPath(path)
        if err != nil {
        }
 
        path := filepath.Join(dir, socketFileName)
        err = checkSocketPath(path)
        if err != nil {

-               return err
+               return fmt.Errorf("check terminal socket path: %w", err)

        }
 
        var dialer net.Dialer
        }
 
        var dialer net.Dialer


@@ -45,7 +46,12 @@ func terminal(ctx context.Context, in io.Reader, out io.Writer) error {
                return fmt.Errorf(`connect to the daemon (start it with "onechat daemon"): %w`, err)
        }
 
                return fmt.Errorf(`connect to the daemon (start it with "onechat daemon"): %w`, err)
        }
 

-       return terminalSession(ctx, conn, in, out)
+       err = terminalSession(ctx, conn, in, out)
+       if err != nil {
+               return fmt.Errorf("run terminal session: %w", err)
+       }
+
+       return nil

 }
 
 // terminalSession runs the client on conn until the input ends, the daemon
 }
 
 // terminalSession runs the client on conn until the input ends, the daemon


@@ -99,6 +105,7 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error {
 
                name, stop := stopSubagentName(line)
                args, whatsapp := whatsappCommandArgs(line)
 
                name, stop := stopSubagentName(line)
                args, whatsapp := whatsappCommandArgs(line)

+               image, isImage := terminalImageRequest(line)

                switch {
                case strings.TrimSpace(line) == "":
                        continue
                switch {
                case strings.TrimSpace(line) == "":
                        continue


@@ -111,6 +118,16 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error {
                                Type: "stop",
                                Text: name,
                        }
                                Type: "stop",
                                Text: name,
                        }

+               case isImage:
+                       request = image
+                       if request.Path != "" {
+                               var err error
+
+                               request.Path, err = filepath.Abs(request.Path)
+                               if err != nil {
+                                       return fmt.Errorf("find terminal image path: %w", err)
+                               }
+                       }

                case whatsapp:
                        request = SocketRequest{
                                Type: "whatsapp",
                case whatsapp:
                        request = SocketRequest{
                                Type: "whatsapp",


@@ -134,8 +151,10 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error {
 
 // terminalShowEvents writes each event from the daemon to out until the
 // connection closes. Only replies and work messages use Markdown styles, and
 
 // terminalShowEvents writes each event from the daemon to out until the
 // connection closes. Only replies and work messages use Markdown styles, and

-// only when out is a terminal.
+// only when out is a terminal. Terminal output ends each shown idle event with
+// an input prompt and clears that prompt before the next shown event.

 func terminalShowEvents(conn net.Conn, out io.Writer) error {
 func terminalShowEvents(conn net.Conn, out io.Writer) error {

+       busy, prompt := false, false

        scanner := bufio.NewScanner(conn)
        scanner.Buffer(make([]byte, 64*1024), socketRequestBytes)
 
        scanner := bufio.NewScanner(conn)
        scanner.Buffer(make([]byte, 64*1024), socketRequestBytes)
 


@@ -157,7 +176,24 @@ func terminalShowEvents(conn net.Conn, out io.Writer) error {
                        text = strings.Join(terminalMarkdown(text, columns), "\n")
                }
 
                        text = strings.Join(terminalMarkdown(text, columns), "\n")
                }
 

-               _, err = io.WriteString(out, text+"\n")
+               switch event.Kind {
+               case "busy":
+                       busy = true
+               case "idle":
+                       busy = false
+               }
+
+               text += "\n"
+               if prompt {
+                       text = "\r\x1b[2K" + text
+               }
+
+               prompt = columns > 0 && !busy
+               if prompt {
+                       text += "> "
+               }
+
+               _, err = io.WriteString(out, text)

                if err != nil {
                        return fmt.Errorf("write terminal event: %w", err)
                }
                if err != nil {
                        return fmt.Errorf("write terminal event: %w", err)
                }