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

diff --git a/terminal.go b/terminal.go
index 2906204..96a8cc5 100644
--- a/terminal.go
+++ b/terminal.go
@@ -19,9 +19,10 @@ 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, 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.
+// 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
+// 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 {
@@ -76,21 +77,29 @@ func terminalSession(ctx context.Context, conn net.Conn, in io.Reader, out io.Wr
 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,
 		}
 
+		name, stop := stopSubagentName(line)
 		switch strings.TrimSpace(line) {
 		case "":
 			continue
 		case stopCommand:
-			request = clientRequest{
+			request = SocketRequest{
 				Type: "interrupt",
 			}
+		default:
+			if stop {
+				request = SocketRequest{
+					Type: "stop",
+					Text: name,
+				}
+			}
 		}
 
 		err := encoder.Encode(request)
@@ -106,7 +115,7 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error {
 // 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)
@@ -140,7 +149,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,6 +167,10 @@ 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":