X-Git-Url: http://git.giacomolli.uk/onechat/blobdiff_plain/153f3f9b4b09d521412eacca30eddeed395c3f41..209df5ce842e24b3c6e99a322fe3d98ab2df720b:/terminal.go?ds=sidebyside

diff --git a/terminal.go b/terminal.go
index 2906204..4f1c378 100644
--- a/terminal.go
+++ b/terminal.go
@@ -18,10 +18,12 @@ const terminalResultLines = 10
 // 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. 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 {
@@ -35,6 +37,7 @@ func terminal(ctx context.Context, in io.Reader, out io.Writer) error {
 	}
 
 	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)
@@ -58,39 +61,59 @@ func terminalSession(ctx context.Context, conn net.Conn, in io.Reader, out io.Wr
 	}()
 
 	var err error
+
 	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
 	}
 
-	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.
 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), requestBytes)
+	scanner.Buffer(make([]byte, 64*1024), socketRequestBytes)
+
 	for ctx.Err() == nil && scanner.Scan() {
 		line := scanner.Text()
-		request := clientRequest{
+		request := SocketRequest{
 			Type: "send",
 			Text: line,
 		}
 
-		switch strings.TrimSpace(line) {
-		case "":
+		name, stop := stopSubagentName(line)
+		args, whatsapp := whatsappCommandArgs(line)
+		switch {
+		case strings.TrimSpace(line) == "":
 			continue
-		case stopCommand:
-			request = clientRequest{
+		case strings.TrimSpace(line) == stopCommand:
+			request = SocketRequest{
 				Type: "interrupt",
 			}
+		case stop:
+			request = SocketRequest{
+				Type: "stop",
+				Text: name,
+			}
+		case whatsapp:
+			request = SocketRequest{
+				Type: "whatsapp",
+				Text: args,
+			}
 		}
 
 		err := encoder.Encode(request)
@@ -99,16 +122,23 @@ 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
 // connection closes.
 func terminalShowEvents(conn net.Conn, out io.Writer) error {
 	scanner := bufio.NewScanner(conn)
-	scanner.Buffer(make([]byte, 64*1024), requestBytes)
+	scanner.Buffer(make([]byte, 64*1024), socketRequestBytes)
+
 	for scanner.Scan() {
 		var event Event
+
 		err := json.Unmarshal(scanner.Bytes(), &event)
 		if err != nil {
 			return fmt.Errorf("decode event: %w", err)
@@ -121,11 +151,16 @@ func terminalShowEvents(conn net.Conn, out io.Writer) error {
 
 		_, err = io.WriteString(out, text+"\n")
 		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.
@@ -140,7 +175,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":
@@ -157,12 +193,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 ""
 	}