X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/ae8532ff0e9d3d676fec5f48780a62e58aa6882d..9346d20fe4297dce1aa16171749a7ef3e41ce7bd:/terminal.go?ds=sidebyside diff --git a/terminal.go b/terminal.go index 9945620..340a8aa 100644 --- 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 -// 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 { - return err + return fmt.Errorf("find data directory: %w", err) } 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 @@ -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 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 @@ -99,6 +105,7 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error { name, stop := stopSubagentName(line) args, whatsapp := whatsappCommandArgs(line) + image, isImage := terminalImageRequest(line) 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, } + 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",