X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/47f69638bc96100f2e446f63c7c3689023156e64..56d959f2d573eef1be5c04d0bf1659fa30d36e7c:/terminal.go?ds=inline diff --git a/terminal.go b/terminal.go index 9e2b650..1982f87 100644 --- a/terminal.go +++ b/terminal.go @@ -19,8 +19,9 @@ const terminalResultLines = 10 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, the line /stop interrupts the running turn, and the -// line /stop NAME stops the subagent NAME. The client shows the replies, the +// 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. func terminal(ctx context.Context, in io.Reader, out io.Writer) error { @@ -86,19 +87,23 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error { } name, stop := stopSubagentName(line) - switch strings.TrimSpace(line) { - case "": + args, whatsapp := whatsappCommandArgs(line) + switch { + case strings.TrimSpace(line) == "": continue - case stopCommand: + case strings.TrimSpace(line) == stopCommand: request = SocketRequest{ Type: "interrupt", } - default: - if stop { - request = SocketRequest{ - Type: "stop", - Text: name, - } + case stop: + request = SocketRequest{ + Type: "stop", + Text: name, + } + case whatsapp: + request = SocketRequest{ + Type: "whatsapp", + Text: args, } } @@ -149,7 +154,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 -// 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": @@ -166,12 +172,18 @@ func terminalEventText(event Event) string { 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 "notice": + return event.Text default: return "" }