Back up the daemon and restore its data

[onechat] / turn.go

diff --git a/turn.go b/turn.go
index 40645b100ca8fb3aca74d8a064eed4110c890a07..637d783b70dfb8c5eb80eb521e7e0510b1db13fc 100644 (file)
--- a/turn.go
+++ b/turn.go
@@ -4,7 +4,7 @@ import (
        "context"
        "errors"
        "fmt"
-       "log"
+       "log/slog"
        "path/filepath"
        "sync"
        "time"
@@ -14,7 +14,7 @@ import (
 // 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) {
+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
@@ -92,7 +92,7 @@ type TurnLoop struct {
        runs   *SubagentRuns
        layout *ViewLayout
        clock  func() time.Time
-       logger *log.Logger
+       logger *slog.Logger
        notify func(Event)
        wake   chan struct{}
 
@@ -112,6 +112,7 @@ func (l *TurnLoop) Submit(source, text string) (Message, error) {
        }
 
        l.mutex.Lock()
+
        l.pending = append(l.pending, message)
        l.mutex.Unlock()
 
@@ -167,6 +168,7 @@ func (l *TurnLoop) Wake(messages ...Message) {
        }
 
        l.mutex.Lock()
+
        l.pending = append(l.pending, messages...)
        l.mutex.Unlock()
 
@@ -285,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()
 
@@ -313,11 +316,13 @@ func (l *TurnLoop) turn(ctx context.Context) error {
        defer cancel()
 
        l.mutex.Lock()
+
        l.cancel = cancel
        l.mutex.Unlock()
 
        defer func() {
                l.mutex.Lock()
+
                l.cancel = nil
                l.mutex.Unlock()
        }()
@@ -329,7 +334,7 @@ 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.logger.Error("turn failed", "err", err)
                }
 
                l.notify(Event{