Stop a subagent with /stop NAME

[onechat] / turn.go

diff --git a/turn.go b/turn.go
index 051c74df822c2c95b4299e40327f5cf0cad304ee..3c1c921ec2d1df76e82fdda8188e3366df8b6c09 100644 (file)
--- a/turn.go
+++ b/turn.go
@@ -3,14 +3,16 @@ package main
 import (
        "context"
        "errors"
 import (
        "context"
        "errors"

+       "fmt"

        "path/filepath"
        "sync"
        "time"
 )
 
        "path/filepath"
        "sync"
        "time"
 )
 

-// newTurnLoop returns the loop of agent with its memory. Its calls go through
-// client, and notify gets each event. The clock gives the date of a turn.
-func newTurnLoop(agent *Agent, memory *Memory, client ChainClient, clock func() time.Time, notify func(Event)) (*TurnLoop, error) {
+// newTurnLoop returns the loop of agent with its memory and its subagents. Its
+// calls go through client, and notify gets each event. The clock gives the date
+// of a turn.
+func newTurnLoop(agent *Agent, memory *Memory, subagents *Subagents, client ChainClient, clock func() time.Time, notify func(Event)) (*TurnLoop, error) {

        layout, err := loadViewLayout(filepath.Join(agent.dir, viewLayoutFileName))
        if err != nil {
                return nil, err
        layout, err := loadViewLayout(filepath.Join(agent.dir, viewLayoutFileName))
        if err != nil {
                return nil, err


@@ -26,18 +28,33 @@ func newTurnLoop(agent *Agent, memory *Memory, client ChainClient, clock func()
                wake:   make(chan struct{}, 1),
        }
 
                wake:   make(chan struct{}, 1),
        }
 

+       l.runs = &SubagentRuns{
+               agent:     agent,
+               memory:    memory,
+               subagents: subagents,
+               layout:    layout,
+               client:    client,
+               state:     l.state,
+               report:    l.Report,
+               note:      l.note,
+               notify:    notify,
+               running:   make(map[string]*SubagentRun),
+       }
+

        l.tools = &Toolbox{
        l.tools = &Toolbox{

-               log:     l,
-               chat:    memory,
-               workdir: agent.config.Workdir,
+               log:       l,
+               chat:      memory,
+               subagents: subagents,
+               runs:      l.runs,
+               workdir:   agent.config.Workdir,

        }
 
        return l, nil
 }
 
 // Event tells the clients what the agent does as it happens. Kind is the kind
        }
 
        return l, nil
 }
 
 // Event tells the clients what the agent does as it happens. Kind is the kind

-// of a logged message (user, reply, tool, echo), or one of ready, busy, idle,
-// and error. ID is the ID of a logged message. Source names the client that
+// 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.
 type Event struct {
 // sent a user message, such as terminal or telegram, so that each client can
 // show the messages of the others.
 type Event struct {


@@ -55,12 +72,14 @@ type Event struct {
 // The view goes out as the messages of a ViewLayout, so the first request of a
 // turn reads the view of the turn before from the prompt cache. User messages
 // that come during a turn join the next request of its chain after the tool
 // The view goes out as the messages of a ViewLayout, so the first request of a
 // turn reads the view of the turn before from the prompt cache. User messages
 // that come during a turn join the next request of its chain after the tool

-// results.
+// results, and so do the reports of the subagents. The subagents run until the
+// loop ends.

 type TurnLoop struct {
        agent  *Agent
        memory *Memory
        client ChainClient
        tools  *Toolbox
 type TurnLoop struct {
        agent  *Agent
        memory *Memory
        client ChainClient
        tools  *Toolbox

+       runs   *SubagentRuns

        layout *ViewLayout
        clock  func() time.Time
        notify func(Event)
        layout *ViewLayout
        clock  func() time.Time
        notify func(Event)


@@ -69,6 +88,7 @@ type TurnLoop struct {
        mutex   sync.Mutex
        pending []Message
        cancel  context.CancelFunc
        mutex   sync.Mutex
        pending []Message
        cancel  context.CancelFunc

+       failure error

 }
 
 // Submit logs a user message from the client source and wakes the loop. The
 }
 
 // Submit logs a user message from the client source and wakes the loop. The


@@ -92,6 +112,34 @@ 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)
+
+       l.mutex.Lock()
+       switch {
+       case err != nil:
+               l.failure = fmt.Errorf("%w: %w", errChainLogWrite, err)
+       case !stopped:
+               l.pending = append(l.pending, message)
+       }
+       l.mutex.Unlock()
+
+       select {
+       case l.wake <- struct{}{}:
+       default:
+       }
+}
+
+// StopSubagent ends the run of the subagent name and tells if it ran. Its
+// report is logged, but it starts no turn.
+func (l *TurnLoop) StopSubagent(name string) (bool, error) {
+       return l.runs.Stop(name)
+}
+

 // Interrupt ends the running turn. A running tool is killed, and the turn sends
 // no further request.
 func (l *TurnLoop) Interrupt() bool {
 // Interrupt ends the running turn. A running tool is killed, and the turn sends
 // no further request.
 func (l *TurnLoop) Interrupt() bool {


@@ -126,9 +174,12 @@ func (l *TurnLoop) Flush(ctx context.Context) error {
        return l.memory.Flush(ctx)
 }
 
        return l.memory.Flush(ctx)
 }
 

-// Run runs a turn each time user messages wait, until ctx ends. It returns the
-// error of a failed log write, which stops the agent.
+// Run runs a turn each time user messages or reports wait, until ctx ends. It
+// returns the error of a failed log write, which stops the agent. At its end
+// it ends the runs of the subagents and waits for them.

 func (l *TurnLoop) Run(ctx context.Context) error {
 func (l *TurnLoop) Run(ctx context.Context) error {

+       defer l.runs.Close()
+

        for {
                for l.waiting() {
                        err := l.turn(ctx)
        for {
                for l.waiting() {
                        err := l.turn(ctx)


@@ -142,9 +193,21 @@ func (l *TurnLoop) Run(ctx context.Context) error {
                case <-ctx.Done():
                        return ctx.Err()
                }
                case <-ctx.Done():
                        return ctx.Err()
                }

+
+               err := l.failed()
+               if err != nil {
+                       return err
+               }

        }
 }
 
        }
 }
 

+// note logs a note and tells the clients. A note starts no turn.
+func (l *TurnLoop) note(text string) error {
+       _, err := l.record("note", "", text)
+
+       return err
+}
+

 // record logs a message and tells the clients, with the client source of a user
 // message.
 func (l *TurnLoop) record(kind, source, text string) (Message, error) {
 // record logs a message and tells the clients, with the client source of a user
 // message.
 func (l *TurnLoop) record(kind, source, text string) (Message, error) {


@@ -163,7 +226,7 @@ func (l *TurnLoop) record(kind, source, text string) (Message, error) {
        return message, nil
 }
 
        return message, nil
 }
 

-// waiting tells if user messages wait for a request.
+// waiting tells if user messages or reports wait for a request.

 func (l *TurnLoop) waiting() bool {
        l.mutex.Lock()
        defer l.mutex.Unlock()
 func (l *TurnLoop) waiting() bool {
        l.mutex.Lock()
        defer l.mutex.Unlock()


@@ -171,6 +234,14 @@ func (l *TurnLoop) waiting() bool {
        return len(l.pending) > 0
 }
 
        return len(l.pending) > 0
 }
 

+// failed returns the error of a failed write of a report.
+func (l *TurnLoop) failed() error {
+       l.mutex.Lock()
+       defer l.mutex.Unlock()
+
+       return l.failure
+}
+

 // turn runs one turn. A failed or interrupted model call ends the turn and
 // tells the clients. The messages of the turn stay in the log and the view, and
 // the next turn starts only with a new message, so a lasting failure such as a
 // turn runs one turn. A failed or interrupted model call ends the turn and
 // tells the clients. The messages of the turn stay in the log and the view, and
 // the next turn starts only with a new message, so a lasting failure such as a