Give each subagent its own prompt cache key

[onechat] / terminal.go

diff --git a/terminal.go b/terminal.go
index c785a969aef149ffd823e970d2aa1d04334d8919..96a8cc5cf5605671700802710ed757561a2b16e3 100644 (file)
--- 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
 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 {
 func terminal(ctx context.Context, in io.Reader, out io.Writer) error {
        dir, err := dataDir()
        if err != nil {


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

+               name, stop := stopSubagentName(line)

                switch strings.TrimSpace(line) {
                case "":
                        continue
                switch strings.TrimSpace(line) {
                case "":
                        continue


@@ -91,6 +93,13 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error {
                        request = SocketRequest{
                                Type: "interrupt",
                        }
                        request = SocketRequest{
                                Type: "interrupt",
                        }

+               default:
+                       if stop {
+                               request = SocketRequest{
+                                       Type: "stop",
+                                       Text: name,
+                               }
+                       }

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


@@ -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
 // 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,6 +167,10 @@ 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":
        case "busy":
                return "[working]"
        case "idle":