Version the package and command from the commit

[onechat] / turn.go

diff --git a/turn.go b/turn.go
index d6a1c416d1a7b04bf8d641eb7a758dfb7c55752e..42886049ffb934582fea0259145aa85e054d4863 100644 (file)
--- a/turn.go
+++ b/turn.go
@@ -4,15 +4,17 @@ import (
        "context"
        "errors"
        "fmt"
+       "log"
        "path/filepath"
        "sync"
        "time"
 )
 
-// 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) {
+// newTurnLoop returns the loop of agent with its memory, its subagents, and the
+// WhatsApp link and the schedules of its tools. Its calls go through client,
+// and notify gets each event. The clock gives the date of a turn. logger gets
+// the failed turns and the ends of the subagents.
+func newTurnLoop(agent *Agent, memory *Memory, subagents *Subagents, whatsapp *WhatsApp, schedules *Schedules, client ChainClient, clock func() time.Time, logger *log.Logger, notify func(Event)) (*TurnLoop, error) {
        layout, err := loadViewLayout(filepath.Join(agent.dir, viewLayoutFileName))
        if err != nil {
                return nil, err
@@ -24,6 +26,7 @@ func newTurnLoop(agent *Agent, memory *Memory, subagents *Subagents, client Chai
                client: client,
                layout: layout,
                clock:  clock,
+               logger: logger,
                notify: notify,
                wake:   make(chan struct{}, 1),
        }
@@ -38,6 +41,7 @@ func newTurnLoop(agent *Agent, memory *Memory, subagents *Subagents, client Chai
                report:    l.Report,
                note:      l.note,
                fail:      l.fail,
+               logger:    logger,
                notify:    notify,
                running:   make(map[string]*SubagentRun),
        }
@@ -47,6 +51,8 @@ func newTurnLoop(agent *Agent, memory *Memory, subagents *Subagents, client Chai
                chat:      memory,
                subagents: subagents,
                runs:      l.runs,
+               whatsapp:  whatsapp,
+               schedules: schedules,
                workdir:   agent.config.Workdir,
        }
 
@@ -86,6 +92,7 @@ type TurnLoop struct {
        runs   *SubagentRuns
        layout *ViewLayout
        clock  func() time.Time
+       logger *log.Logger
        notify func(Event)
        wake   chan struct{}
 
@@ -105,6 +112,7 @@ func (l *TurnLoop) Submit(source, text string) (Message, error) {
        }
 
        l.mutex.Lock()
+
        l.pending = append(l.pending, message)
        l.mutex.Unlock()
 
@@ -122,18 +130,19 @@ func (l *TurnLoop) Submit(source, text string) (Message, error) {
 // Submit does. A failed write stops the loop, because the log refuses all
 // writes after it.
 func (l *TurnLoop) Report(name, text, status string) {
-       _, err := l.Work(name, text, status, status != subagentStopped)
-       if err != nil {
+       message, err := l.Work(name, text, status)
+       switch {
+       case err != nil:
                l.fail(fmt.Errorf("%w: %w", errChainLogWrite, err))
+       case status != subagentStopped:
+               l.Wake(message)
        }
 }
 
 // Work logs text as a work message of source, such as the name of a subagent,
-// and tells the clients, with status. With wake, the message joins the waiting
-// messages and wakes the loop, as a user message of Submit does: it joins the
-// first request of a new turn, or the next request of a running turn after the
-// tool results.
-func (l *TurnLoop) Work(source, text, status string, wake bool) (Message, error) {
+// and tells the clients, with status. The message starts no turn until it goes
+// to Wake.
+func (l *TurnLoop) Work(source, text, status string) (Message, error) {
        message, err := l.memory.Append("work", text)
        if err != nil {
                return Message{}, err
@@ -147,20 +156,26 @@ func (l *TurnLoop) Work(source, text, status string, wake bool) (Message, error)
                Status: status,
        })
 
-       if !wake {
-               return message, nil
+       return message, nil
+}
+
+// Wake adds the logged messages to the waiting messages and wakes the loop
+// once, as a user message of Submit does. They join the first request of a new
+// turn together, or the next request of a running turn after the tool results.
+func (l *TurnLoop) Wake(messages ...Message) {
+       if len(messages) == 0 {
+               return
        }
 
        l.mutex.Lock()
-       l.pending = append(l.pending, message)
+
+       l.pending = append(l.pending, messages...)
        l.mutex.Unlock()
 
        select {
        case l.wake <- struct{}{}:
        default:
        }
-
-       return message, nil
 }
 
 // StopSubagent ends the run of the subagent name and tells if it ran. Its
@@ -272,6 +287,7 @@ func (l *TurnLoop) waiting() bool {
 // fail stops the loop with err.
 func (l *TurnLoop) fail(err error) {
        l.mutex.Lock()
+
        l.failure = errors.Join(l.failure, err)
        l.mutex.Unlock()
 
@@ -290,19 +306,23 @@ func (l *TurnLoop) failed() error {
 }
 
 // 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
-// needed login does not repeat. Only a failed log write is an error of turn.
+// tells the clients. A failure also goes to the logger, so that it is not lost
+// when no client is connected, but an interrupt does not. 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 needed login does not repeat. Only a
+// failed log write is an error of turn.
 func (l *TurnLoop) turn(ctx context.Context) error {
        ctx, cancel := context.WithCancel(ctx)
        defer cancel()
 
        l.mutex.Lock()
+
        l.cancel = cancel
        l.mutex.Unlock()
 
        defer func() {
                l.mutex.Lock()
+
                l.cancel = nil
                l.mutex.Unlock()
        }()
@@ -313,6 +333,10 @@ func (l *TurnLoop) turn(ctx context.Context) error {
 
        err := l.chain(ctx)
        if err != nil && !errors.Is(err, errChainLogWrite) {
+               if ctx.Err() == nil {
+                       l.logger.Printf("turn failed: %v", err)
+               }
+
                l.notify(Event{
                        Kind: "error",
                        Text: turnError(ctx, err),