Run each child with its own files and loop

[onechat] / turn.go

diff --git a/turn.go b/turn.go
index 42886049ffb934582fea0259145aa85e054d4863..2e5e50eef577cd3da3656dbaaa3122569ed112da 100644 (file)
--- a/turn.go
+++ b/turn.go
@@ -4,7 +4,7 @@ import (
        "context"
        "errors"
        "fmt"
-       "log"
+       "log/slog"
        "path/filepath"
        "sync"
        "time"
@@ -13,8 +13,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,
 // 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) {
+// 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
@@ -46,6 +47,10 @@ func newTurnLoop(agent *Agent, memory *Memory, subagents *Subagents, whatsapp *W
                running:   make(map[string]*SubagentRun),
        }
 
+       if agent.config.Parent != "" {
+               whatsapp = nil
+       }
+
        l.tools = &Toolbox{
                log:       l,
                chat:      memory,
@@ -92,7 +97,7 @@ type TurnLoop struct {
        runs   *SubagentRuns
        layout *ViewLayout
        clock  func() time.Time
-       logger *log.Logger
+       logger *slog.Logger
        notify func(Event)
        wake   chan struct{}
 
@@ -334,7 +339,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{
@@ -386,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,
        }