Show the subagents in the clients

[onechat] / turn.go

diff --git a/turn.go b/turn.go
index 3c1c921ec2d1df76e82fdda8188e3366df8b6c09..deb47d9150cdc4d2fdda5df299edad9df7a50248 100644 (file)
--- a/turn.go
+++ b/turn.go
@@ -53,15 +53,18 @@ func newTurnLoop(agent *Agent, memory *Memory, subagents *Subagents, client Chai
 }
 
 // Event tells the clients what the agent does as it happens. Kind is the kind
 }
 
 // Event tells the clients what the agent does as it happens. Kind is the kind

-// of a logged message (user, reply, tool, echo, work), or one of ready, busy,
-// idle, error, and subagent, which tells that the subagent Text starts a run. ID is the ID of a logged message. Source names the client that
-// sent a user message, such as terminal or telegram, so that each client can
-// show the messages of the others.
+// of a logged message (user, reply, tool, echo, note, work), or one of ready,
+// busy, idle, error, and subagent, which tells that the subagent Text starts a
+// run. ID is the ID of a logged message. Source names the client that sent a
+// user message, such as terminal or telegram, so that each client can show the
+// messages of the others, or the subagent of a report. Status tells how the run
+// of a report ended: finished, stopped, or failed.

 type Event struct {
        Kind   string `json:"kind"`
        ID     int    `json:"id,omitempty"`
        Text   string `json:"text,omitempty"`
        Source string `json:"source,omitempty"`
 type Event struct {
        Kind   string `json:"kind"`
        ID     int    `json:"id,omitempty"`
        Text   string `json:"text,omitempty"`
        Source string `json:"source,omitempty"`

+       Status string `json:"status,omitempty"`

 }
 
 // TurnLoop runs the turns of one agent. A user message goes to the log when it
 }
 
 // TurnLoop runs the turns of one agent. A user message goes to the log when it


@@ -112,18 +115,28 @@ func (l *TurnLoop) Submit(source, text string) (Message, error) {
        return message, nil
 }
 
        return message, nil
 }
 

-// Report logs the report text of a subagent as a work message and tells the
-// clients. Unless the subagent was stopped, the report joins the waiting
-// messages and wakes the loop, as a user message of Submit does. A failed write
-// stops the loop, because the log refuses all writes after it.
-func (l *TurnLoop) Report(text string, stopped bool) {
-       message, err := l.record("work", "", text)
+// Report logs the report text of the subagent name as a work message and tells
+// the clients, with the status of the run. Unless the subagent was stopped, the
+// report joins the waiting messages and wakes the loop, as a user message of
+// Submit does. A failed write stops the loop, because the log refuses all
+// writes after it.
+func (l *TurnLoop) Report(name, text, status string) {
+       message, err := l.memory.Append("work", text)
+       if err == nil {
+               l.notify(Event{
+                       Kind:   "work",
+                       ID:     message.ID,
+                       Text:   text,
+                       Source: name,
+                       Status: status,
+               })
+       }

 
        l.mutex.Lock()
        switch {
        case err != nil:
                l.failure = fmt.Errorf("%w: %w", errChainLogWrite, err)
 
        l.mutex.Lock()
        switch {
        case err != nil:
                l.failure = fmt.Errorf("%w: %w", errChainLogWrite, err)

-       case !stopped:
+       case status != subagentStopped:

                l.pending = append(l.pending, message)
        }
        l.mutex.Unlock()
                l.pending = append(l.pending, message)
        }
        l.mutex.Unlock()