Keep each schedule with its owning agent

[onechat] / turn.go

diff --git a/turn.go b/turn.go
index 42886049ffb934582fea0259145aa85e054d4863..e559950675925ccf3fb51d470c7ce8a2af2bb803 100644 (file)
--- a/turn.go
+++ b/turn.go
@@ -4,7 +4,7 @@ import (
        "context"
        "errors"
        "fmt"
        "context"
        "errors"
        "fmt"

-       "log"
+       "log/slog"

        "path/filepath"
        "sync"
        "time"
        "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
 // 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
        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),
        }
 
                running:   make(map[string]*SubagentRun),
        }
 

+       if agent.config.Parent != "" {
+               whatsapp = nil
+       }
+

        l.tools = &Toolbox{
                log:       l,
                chat:      memory,
        l.tools = &Toolbox{
                log:       l,
                chat:      memory,


@@ -83,18 +88,22 @@ type Event struct {
 // turn reads the view of the turn before from the prompt cache. User messages
 // that come during a turn join the next request of its chain after the tool
 // results, and so do the reports of the subagents. The subagents run until the
 // turn reads the view of the turn before from the prompt cache. User messages
 // that come during a turn join the next request of its chain after the tool
 // results, and so do the reports of the subagents. The subagents run until the

-// loop ends.
+// loop ends. Parent and child messages stay queued until the turn finishes.
+// active belongs to the running turn. The mutex protects pending, cancel, and
+// failure.

 type TurnLoop struct {
 type TurnLoop struct {

-       agent  *Agent
-       memory *Memory
-       client ChainClient
-       tools  *Toolbox
-       runs   *SubagentRuns
-       layout *ViewLayout
-       clock  func() time.Time
-       logger *log.Logger
-       notify func(Event)
-       wake   chan struct{}
+       agent    *Agent
+       memory   *Memory
+       client   ChainClient
+       tools    *Toolbox
+       runs     *SubagentRuns
+       layout   *ViewLayout
+       clock    func() time.Time
+       logger   *slog.Logger
+       notify   func(Event)
+       wake     chan struct{}
+       messages *DaemonMessages
+       active   []Message

 
        mutex   sync.Mutex
        pending []Message
 
        mutex   sync.Mutex
        pending []Message


@@ -231,10 +240,15 @@ func (l *TurnLoop) Run(ctx context.Context) error {
        }
 
        for {
        }
 
        for {

-               for l.waiting() {
-                       err := l.turn(ctx)
+               for ctx.Err() == nil && l.waiting() {
+                       err := l.failed()
+                       if err != nil {
+                               return fmt.Errorf("check turn loop failure: %w", err)
+                       }
+
+                       err = l.turn(ctx)

                        if err != nil {
                        if err != nil {

-                               return err
+                               return fmt.Errorf("run turn: %w", err)

                        }
                }
 
                        }
                }
 


@@ -246,7 +260,7 @@ func (l *TurnLoop) Run(ctx context.Context) error {
 
                err := l.failed()
                if err != nil {
 
                err := l.failed()
                if err != nil {

-                       return err
+                       return fmt.Errorf("check turn loop failure: %w", err)

                }
        }
 }
                }
        }
 }


@@ -310,8 +324,11 @@ func (l *TurnLoop) failed() error {
 // 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
 // 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.
+// failed log or queue write is an error of turn. A daemon stop leaves taken
+// parent and child messages queued for restart. A user interrupt completes them
+// without a report.

 func (l *TurnLoop) turn(ctx context.Context) error {
 func (l *TurnLoop) turn(ctx context.Context) error {

+       runCtx := ctx

        ctx, cancel := context.WithCancel(ctx)
        defer cancel()
 
        ctx, cancel := context.WithCancel(ctx)
        defer cancel()
 


@@ -331,10 +348,22 @@ func (l *TurnLoop) turn(ctx context.Context) error {
                Kind: "busy",
        })
 
                Kind: "busy",
        })
 

-       err := l.chain(ctx)
+       if l.messages != nil {
+               l.logger.Info("turn started")
+       }
+
+       reply, err := l.chain(ctx)
+       if l.messages != nil && !errors.Is(err, errChainLogWrite) && (err == nil || runCtx.Err() == nil) {
+               finishErr := l.messages.Finish(l, l.active, reply)
+               if finishErr != nil {
+                       err = errors.Join(err, fmt.Errorf("%w: finish agent messages: %w", errChainLogWrite, finishErr))
+               }
+       }
+
+       l.active = nil

        if err != nil && !errors.Is(err, errChainLogWrite) {
                if ctx.Err() == nil {
        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{
                }
 
                l.notify(Event{


@@ -345,6 +374,10 @@ func (l *TurnLoop) turn(ctx context.Context) error {
                err = nil
        }
 
                err = nil
        }
 

+       if l.messages != nil {
+               l.logger.Info("turn done")
+       }
+

        l.notify(Event{
                Kind: "idle",
        })
        l.notify(Event{
                Kind: "idle",
        })


@@ -353,20 +386,20 @@ func (l *TurnLoop) turn(ctx context.Context) error {
 }
 
 // chain runs the request chain of a turn until the final answer.
 }
 
 // chain runs the request chain of a turn until the final answer.

-func (l *TurnLoop) chain(ctx context.Context) error {
+func (l *TurnLoop) chain(ctx context.Context) (string, error) {

        messages := l.take()
        if len(messages) == 0 {
        messages := l.take()
        if len(messages) == 0 {

-               return nil
+               return "", nil

        }
 
        err := l.memory.Wait(ctx)
        if err != nil {
        }
 
        err := l.memory.Wait(ctx)
        if err != nil {

-               return err
+               return "", fmt.Errorf("wait for turn memory: %w", err)

        }
 
        instructions, err := l.agent.Prompt()
        if err != nil {
        }
 
        instructions, err := l.agent.Prompt()
        if err != nil {

-               return err
+               return "", fmt.Errorf("read turn prompt: %w", err)

        }
 
        skip := make(map[int]bool, len(messages))
        }
 
        skip := make(map[int]bool, len(messages))


@@ -376,7 +409,7 @@ func (l *TurnLoop) chain(ctx context.Context) error {
 
        view, err := l.layout.Split(l.memory.ViewLines(skip))
        if err != nil {
 
        view, err := l.layout.Split(l.memory.ViewLines(skip))
        if err != nil {

-               return err
+               return "", fmt.Errorf("split turn view: %w", err)

        }
 
        chain := &Chain{
        }
 
        chain := &Chain{


@@ -386,14 +419,17 @@ func (l *TurnLoop) chain(ctx context.Context) error {
                        Model:        l.agent.config.Model,
                        Effort:       l.agent.config.Effort,
                        Instructions: instructions,
                        Model:        l.agent.config.Model,
                        Effort:       l.agent.config.Effort,
                        Instructions: instructions,

-                       Tools:        promptTools(),
+                       Tools:        l.agent.Tools(),

                },
                take: l.take,
        }
 
                },
                take: l.take,
        }
 

-       _, err = chain.Run(ctx, turnInput(view, l.state(), messages))
+       reply, err := chain.Run(ctx, turnInput(view, l.state(), messages))
+       if err != nil {
+               return "", fmt.Errorf("run turn chain: %w", err)
+       }

 
 

-       return err
+       return reply, nil

 }
 
 // take returns the user messages that wait for a request, and removes them.
 }
 
 // take returns the user messages that wait for a request, and removes them.


@@ -403,6 +439,9 @@ func (l *TurnLoop) take() []Message {
 
        messages := l.pending
        l.pending = nil
 
        messages := l.pending
        l.pending = nil

+       if l.messages != nil {
+               l.active = append(l.active, messages...)
+       }

 
        return messages
 }
 
        return messages
 }