X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/e737005f89c7c663e1636830001730ad79396bdc..2a276c273c21a1752d541bf87e074c5d1c27e30f:/turn.go?ds=inline

diff --git a/turn.go b/turn.go
index 837ac7c..2e5e50e 100644
--- a/turn.go
+++ b/turn.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log/slog"
 	"path/filepath"
 	"sync"
 	"time"
@@ -11,8 +12,10 @@ 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,
-// 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. A child has no WhatsApp
+// tools, even when the caller supplies a link.
+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 +27,7 @@ func newTurnLoop(agent *Agent, memory *Memory, subagents *Subagents, whatsapp *W
 		client: client,
 		layout: layout,
 		clock:  clock,
+		logger: logger,
 		notify: notify,
 		wake:   make(chan struct{}, 1),
 	}
@@ -38,10 +42,15 @@ func newTurnLoop(agent *Agent, memory *Memory, subagents *Subagents, whatsapp *W
 		report:    l.Report,
 		note:      l.note,
 		fail:      l.fail,
+		logger:    logger,
 		notify:    notify,
 		running:   make(map[string]*SubagentRun),
 	}
 
+	if agent.config.Parent != "" {
+		whatsapp = nil
+	}
+
 	l.tools = &Toolbox{
 		log:       l,
 		chat:      memory,
@@ -88,6 +97,7 @@ type TurnLoop struct {
 	runs   *SubagentRuns
 	layout *ViewLayout
 	clock  func() time.Time
+	logger *slog.Logger
 	notify func(Event)
 	wake   chan struct{}
 
@@ -107,6 +117,7 @@ func (l *TurnLoop) Submit(source, text string) (Message, error) {
 	}
 
 	l.mutex.Lock()
+
 	l.pending = append(l.pending, message)
 	l.mutex.Unlock()
 
@@ -162,6 +173,7 @@ func (l *TurnLoop) Wake(messages ...Message) {
 	}
 
 	l.mutex.Lock()
+
 	l.pending = append(l.pending, messages...)
 	l.mutex.Unlock()
 
@@ -280,6 +292,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()
 
@@ -298,19 +311,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()
 	}()
@@ -321,6 +338,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),
@@ -370,7 +391,7 @@ func (l *TurnLoop) chain(ctx context.Context) error {
 			Model:        l.agent.config.Model,
 			Effort:       l.agent.config.Effort,
 			Instructions: instructions,
-			Tools:        promptTools(),
+			Tools:        l.agent.Tools(),
 		},
 		take: l.take,
 	}