Log the version when the daemon is ready

[onechat] / turn.go

diff --git a/turn.go b/turn.go
index e304714e5068b01acb0f4d545b9dedd4de2ac5fb..637d783b70dfb8c5eb80eb521e7e0510b1db13fc 100644 (file)
--- a/turn.go
+++ b/turn.go
@@ -4,15 +4,17 @@ import (
        "context"
        "errors"
        "fmt"
+       "log/slog"
        "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 *slog.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 *slog.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()
 
@@ -160,6 +168,7 @@ func (l *TurnLoop) Wake(messages ...Message) {
        }
 
        l.mutex.Lock()
+
        l.pending = append(l.pending, messages...)
        l.mutex.Unlock()
 
@@ -278,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()
 
@@ -296,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()
        }()
@@ -319,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.Error("turn failed", "err", err)
+               }
+
                l.notify(Event{
                        Kind: "error",
                        Text: turnError(ctx, err),