Send terminal images by local path

[onechat] / terminal.go

diff --git a/terminal.go b/terminal.go
index c785a969aef149ffd823e970d2aa1d04334d8919..da0d78aa4fb6c95160ed1f42fb77631820a426d2 100644 (file)
--- a/terminal.go
+++ b/terminal.go
@@ -10,6 +10,8 @@ import (
        "net"
        "path/filepath"
        "strings"
        "net"
        "path/filepath"
        "strings"

+
+       "golang.org/x/sys/unix"

 )
 
 // terminalResultLines is the most lines of a tool result that the client shows.
 )
 
 // terminalResultLines is the most lines of a tool result that the client shows.


@@ -18,10 +20,13 @@ const terminalResultLines = 10
 // errTerminalDaemonClosed tells that the daemon closed the connection.
 var errTerminalDaemonClosed = errors.New("the daemon closed the connection")
 
 // errTerminalDaemonClosed tells that the daemon closed the connection.
 var errTerminalDaemonClosed = errors.New("the daemon closed the connection")
 

-// terminal runs "onechat chat": the terminal client of the daemon. Each line of
-// input is a user message, and the line /stop interrupts the running turn. 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.
+// 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. /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 {


@@ -35,6 +40,7 @@ func terminal(ctx context.Context, in io.Reader, out io.Writer) error {
        }
 
        var dialer net.Dialer
        }
 
        var dialer net.Dialer

+

        conn, err := dialer.DialContext(ctx, "unix", path)
        if err != nil {
                return fmt.Errorf(`connect to the daemon (start it with "onechat daemon"): %w`, err)
        conn, err := dialer.DialContext(ctx, "unix", path)
        if err != nil {
                return fmt.Errorf(`connect to the daemon (start it with "onechat daemon"): %w`, err)


@@ -58,18 +64,25 @@ func terminalSession(ctx context.Context, conn net.Conn, in io.Reader, out io.Wr
        }()
 
        var err error
        }()
 
        var err error

+

        select {
        case err = <-sent:
                err = errors.Join(err, conn.Close())
        select {
        case err = <-sent:
                err = errors.Join(err, conn.Close())

+

                <-shown
        case err = <-shown:
                err = errors.Join(terminalCmpError(err, errTerminalDaemonClosed), conn.Close())
        case <-ctx.Done():
                err = conn.Close()
                <-shown
        case err = <-shown:
                err = errors.Join(terminalCmpError(err, errTerminalDaemonClosed), conn.Close())
        case <-ctx.Done():
                err = conn.Close()

+

                <-shown
        }
 
                <-shown
        }
 

-       return err
+       if err != nil {
+               return fmt.Errorf("run terminal client: %w", err)
+       }
+
+       return nil

 }
 
 // terminalSendLines sends each line of in as a request until the input ends.
 }
 
 // terminalSendLines sends each line of in as a request until the input ends.


@@ -77,6 +90,7 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error {
        encoder := json.NewEncoder(conn)
        scanner := bufio.NewScanner(in)
        scanner.Buffer(make([]byte, 64*1024), socketRequestBytes)
        encoder := json.NewEncoder(conn)
        scanner := bufio.NewScanner(in)
        scanner.Buffer(make([]byte, 64*1024), socketRequestBytes)

+

        for ctx.Err() == nil && scanner.Scan() {
                line := scanner.Text()
                request := SocketRequest{
        for ctx.Err() == nil && scanner.Scan() {
                line := scanner.Text()
                request := SocketRequest{


@@ -84,13 +98,36 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error {
                        Text: line,
                }
 
                        Text: line,
                }
 

-               switch strings.TrimSpace(line) {
-               case "":
+               name, stop := stopSubagentName(line)
+               args, whatsapp := whatsappCommandArgs(line)
+               image, isImage := terminalImageRequest(line)
+               switch {
+               case strings.TrimSpace(line) == "":

                        continue
                        continue

-               case stopCommand:
+               case strings.TrimSpace(line) == stopCommand:

                        request = SocketRequest{
                                Type: "interrupt",
                        }
                        request = SocketRequest{
                                Type: "interrupt",
                        }

+               case stop:
+                       request = SocketRequest{
+                               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",
+                               Text: args,
+                       }

                }
 
                err := encoder.Encode(request)
                }
 
                err := encoder.Encode(request)


@@ -99,16 +136,26 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error {
                }
        }
 
                }
        }
 

-       return scanner.Err()
+       err := scanner.Err()
+       if err != nil {
+               return fmt.Errorf("read terminal input: %w", err)
+       }
+
+       return nil

 }
 
 // terminalShowEvents writes each event from the daemon to out until the
 }
 
 // terminalShowEvents writes each event from the daemon to out until the

-// connection closes.
+// connection closes. Only replies and work messages use Markdown styles, and
+// 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)

+

        for scanner.Scan() {
                var event Event
        for scanner.Scan() {
                var event Event

+

                err := json.Unmarshal(scanner.Bytes(), &event)
                if err != nil {
                        return fmt.Errorf("decode event: %w", err)
                err := json.Unmarshal(scanner.Bytes(), &event)
                if err != nil {
                        return fmt.Errorf("decode event: %w", err)


@@ -119,13 +166,40 @@ func terminalShowEvents(conn net.Conn, out io.Writer) error {
                        continue
                }
 
                        continue
                }
 

-               _, err = io.WriteString(out, text+"\n")
+               columns := terminalColumns(out)
+               if columns > 0 && (event.Kind == "reply" || event.Kind == "work") {
+                       text = strings.Join(terminalMarkdown(text, columns), "\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 {
                if err != nil {

-                       return err
+                       return fmt.Errorf("write terminal event: %w", err)

                }
        }
 
                }
        }
 

-       return scanner.Err()
+       err := scanner.Err()
+       if err != nil {
+               return fmt.Errorf("read daemon events: %w", err)
+       }
+
+       return nil

 }
 
 // terminalCmpError returns err, or fallback when err is nil.
 }
 
 // terminalCmpError returns err, or fallback when err is nil.


@@ -140,7 +214,8 @@ func terminalCmpError(err, fallback error) error {
 // terminalEventText returns the text that the client shows for event, or "" for
 // none. The client shows a user message only from another source, such as
 // telegram, because the user typed the others. A tool result shows its first
 // terminalEventText returns the text that the client shows for event, or "" for
 // none. The client shows a user message only from another source, such as
 // telegram, because the user typed the others. A tool result shows its first

-// terminalResultLines lines.
+// terminalResultLines lines. The report of a subagent shows whole, and it
+// starts with the name of the subagent.

 func terminalEventText(event Event) string {
        switch event.Kind {
        case "ready":
 func terminalEventText(event Event) string {
        switch event.Kind {
        case "ready":


@@ -157,17 +232,43 @@ func terminalEventText(event Event) string {
                return "[tool] " + event.Text
        case "echo":
                return "[result] " + terminalFirstLines(event.Text, terminalResultLines)
                return "[tool] " + event.Text
        case "echo":
                return "[result] " + terminalFirstLines(event.Text, terminalResultLines)

+       case "subagent":
+               return "[" + event.Text + "] started"
+       case "work":
+               return event.Text

        case "busy":
                return "[working]"
        case "idle":
                return "[done]"
        case "error":
                return "[error] " + event.Text
        case "busy":
                return "[working]"
        case "idle":
                return "[done]"
        case "error":
                return "[error] " + event.Text

+       case "notice":
+               return event.Text

        default:
                return ""
        }
 }
 
        default:
                return ""
        }
 }
 

+// terminalColumns returns the current terminal width, or zero for other output.
+// A terminal that reports no columns uses 80.
+func terminalColumns(out io.Writer) int {
+       file, ok := out.(interface{ Fd() uintptr })
+       if !ok {
+               return 0
+       }
+
+       size, err := unix.IoctlGetWinsize(int(file.Fd()), unix.TIOCGWINSZ)
+       if err != nil {
+               return 0
+       }
+
+       if size.Col == 0 {
+               return 80
+       }
+
+       return int(size.Col)
+}
+

 // terminalFirstLines returns the first count lines of text, with the number of
 // the lines left out.
 func terminalFirstLines(text string, count int) string {
 // terminalFirstLines returns the first count lines of text, with the number of
 // the lines left out.
 func terminalFirstLines(text string, count int) string {