Reread the rules from disk in the diff review

[onechat] / turn.go

diff --git a/turn.go b/turn.go
index 837ac7c519ecbdd6760bdbc370c7522a622f5422..40645b100ca8fb3aca74d8a064eed4110c890a07 100644 (file)
--- a/turn.go
+++ b/turn.go
@@ -4,6 +4,7 @@ import (
        "context"
        "errors"
        "fmt"
        "context"
        "errors"
        "fmt"

+       "log"

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


@@ -11,8 +12,9 @@ import (
 
 // 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,
 
 // 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.
-func newTurnLoop(agent *Agent, memory *Memory, subagents *Subagents, whatsapp *WhatsApp, schedules *Schedules, client ChainClient, clock func() time.Time, notify func(Event)) (*TurnLoop, error) {
+// 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
        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, whatsapp *W
                client: client,
                layout: layout,
                clock:  clock,
                client: client,
                layout: layout,
                clock:  clock,

+               logger: logger,

                notify: notify,
                wake:   make(chan struct{}, 1),
        }
                notify: notify,
                wake:   make(chan struct{}, 1),
        }


@@ -38,6 +41,7 @@ func newTurnLoop(agent *Agent, memory *Memory, subagents *Subagents, whatsapp *W
                report:    l.Report,
                note:      l.note,
                fail:      l.fail,
                report:    l.Report,
                note:      l.note,
                fail:      l.fail,

+               logger:    logger,

                notify:    notify,
                running:   make(map[string]*SubagentRun),
        }
                notify:    notify,
                running:   make(map[string]*SubagentRun),
        }


@@ -88,6 +92,7 @@ type TurnLoop struct {
        runs   *SubagentRuns
        layout *ViewLayout
        clock  func() time.Time
        runs   *SubagentRuns
        layout *ViewLayout
        clock  func() time.Time

+       logger *log.Logger

        notify func(Event)
        wake   chan struct{}
 
        notify func(Event)
        wake   chan struct{}
 


@@ -298,9 +303,11 @@ func (l *TurnLoop) failed() error {
 }
 
 // turn runs one turn. A failed or interrupted model call ends the turn and
 }
 
 // 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()
 func (l *TurnLoop) turn(ctx context.Context) error {
        ctx, cancel := context.WithCancel(ctx)
        defer cancel()


@@ -321,6 +328,10 @@ func (l *TurnLoop) turn(ctx context.Context) error {
 
        err := l.chain(ctx)
        if err != nil && !errors.Is(err, errChainLogWrite) {
 
        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),
                l.notify(Event{
                        Kind: "error",
                        Text: turnError(ctx, err),