X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/2124c559da8f164a43a3da987b399b6ac6125035..c781f79f3c8cb9a7577ee1574d196988da2719b3:/daemon_agent.go

diff --git a/daemon_agent.go b/daemon_agent.go
index 4520f35..682fed7 100644
--- a/daemon_agent.go
+++ b/daemon_agent.go
@@ -9,6 +9,22 @@ import (
 	"time"
 )
 
+// DaemonAgent owns the open files and model client of one persistent agent. Its
+// loop must stop before Close releases the files.
+type DaemonAgent struct {
+	agent     *Agent
+	memory    *Memory
+	client    *ModelClient
+	subagents *Subagents
+	schedules *Schedules
+	clock     func() time.Time
+	logger    *slog.Logger
+	openChild func(context.Context, *Agent) (*DaemonAgent, error)
+}
+
+// DaemonAgents holds the root first and then its children in directory order.
+type DaemonAgents []*DaemonAgent
+
 // openDaemonAgents opens the root and its direct children. An invalid child
 // stops startup, and each opened agent is closed when startup fails.
 func openDaemonAgents(ctx context.Context, dir, address string, auth ModelAuthorizer, compactor ModelConfig, clock func() time.Time, logger *slog.Logger) (agents DaemonAgents, err error) {
@@ -55,7 +71,7 @@ func openDaemonAgents(ctx context.Context, dir, address string, auth ModelAuthor
 // one agent. All model calls use its cache key and usage file.
 func openDaemonAgent(ctx context.Context, agent *Agent, address string, auth ModelAuthorizer, compactor ModelConfig, clock func() time.Time, logger *slog.Logger) (*DaemonAgent, error) {
 	client := newModelClient(address, auth, agent.CacheKey(), filepath.Join(agent.dir, "usage.jsonl"))
-	memory, err := openMemory(ctx, agent.dir, clock, newCompactor(client, agent.Prompt, compactor, agent.Tools()), logger)
+	memory, err := openMemory(ctx, agent.dir, clock, newCompactor(client, agent.Prompt, compactor, agent.Tools(), agent.Images()), logger)
 	if err != nil {
 		return nil, fmt.Errorf("open memory: %w", err)
 	}
@@ -73,25 +89,23 @@ func openDaemonAgent(ctx context.Context, agent *Agent, address string, auth Mod
 		schedules: schedules,
 		clock:     clock,
 		logger:    logger,
+		openChild: func(ctx context.Context, child *Agent) (*DaemonAgent, error) {
+			return openDaemonAgent(ctx, child, address, auth, compactor, clock, logger.With("name", child.config.Name))
+		},
 	}, nil
 }
 
-// DaemonAgent owns the open files and model client of one persistent agent. Its
-// loop must stop before Close releases the files.
-type DaemonAgent struct {
-	agent     *Agent
-	memory    *Memory
-	client    *ModelClient
-	subagents *Subagents
-	schedules *Schedules
-	clock     func() time.Time
-	logger    *slog.Logger
-}
-
 // Loop makes the turn loop with its event destination. Only the root has a
 // WhatsApp link. Child events stay with their own logs.
 func (a *DaemonAgent) Loop(whatsapp *WhatsApp, notify func(Event)) (*TurnLoop, error) {
-	return newTurnLoop(a.agent, a.memory, a.subagents, whatsapp, a.schedules, a.client, a.clock, a.logger, notify)
+	loop, err := newTurnLoop(a.agent, a.memory, a.subagents, whatsapp, a.schedules, a.client, a.clock, a.logger, notify)
+	if err != nil {
+		return nil, err
+	}
+
+	loop.openChild = a.openChild
+
+	return loop, nil
 }
 
 // Close flushes and closes the subagents and the memory.
@@ -99,9 +113,6 @@ func (a *DaemonAgent) Close() error {
 	return errors.Join(a.subagents.Close(), a.memory.Close())
 }
 
-// DaemonAgents holds the root first and then its children in directory order.
-type DaemonAgents []*DaemonAgent
-
 // Close closes all agents, including after a partial startup.
 func (a DaemonAgents) Close() error {
 	var err error