Carry new images through model request chains

[onechat] / subagent_run.go

diff --git a/subagent_run.go b/subagent_run.go
index 0780393db3f87c96e5d6aef425535106c102b4f3..891766c4e0baf5895b81617a0ede42eea19e13d6 100644 (file)
--- a/subagent_run.go
+++ b/subagent_run.go
@@ -256,6 +256,18 @@ func (r *SubagentRuns) Resume(ctx context.Context) error {
        return r.save()
 }
 
+// Snapshot locks the run state, memory, and subagent logs while snapshot reads
+// the agent files. The lock order agrees with Stop, which logs under the run
+// lock.
+func (r *SubagentRuns) Snapshot(ctx context.Context, snapshot func() error) error {
+       r.mutex.Lock()
+       defer r.mutex.Unlock()
+
+       return r.memory.Snapshot(ctx, func() error {
+               return r.subagents.Snapshot(ctx, snapshot)
+       })
+}
+
 // Close ends every run and waits for them. No subagent starts after Close.
 func (r *SubagentRuns) Close() {
        r.mutex.Lock()
@@ -503,11 +515,13 @@ func (r *SubagentRuns) chain(ctx context.Context, run *SubagentRun) (string, err
        input = append(input, modelUserMessage(r.state()), modelUserMessage(log))
        chain := &Chain{
                client: r.client,
+               images: r.agent.Images(),
                tools: &Toolbox{
                        log:       run.subagent,
                        chat:      r.memory,
                        subagents: r.subagents,
                        workdir:   run.subagent.WorkDir(),
+                       images:    r.agent.Images(),
                },
                request: ModelRequest{
                        Model:        r.agent.config.Model,