Verify task-specific external effect evidence

9 files changed, 105 insertions, 19 deletions

diff --git a/doc/Design.md b/doc/Design.md
index 1c5c8d4..ac496bb 100644
--- a/doc/Design.md
+++ b/doc/Design.md
@@ -319,7 +319,9 @@ Ollamaに公開する現行Internal Tool catalogは次のとおりとする。�
   "budget_class":"1K|2K|4K|8K|16K|32K|64K|128K|null",
   "optimistic_tokens":0,
   "most_likely_tokens":0,
-  "pessimistic_tokens":0
+  "pessimistic_tokens":0,
+  "requires_external_effect":"boolean|null",
+  "required_effect_tools":["file_edit|process_run|dir"]
 }
 ```
 Task状態遷移はAgent Runtimeだけが行う。`task_update` はTask追加、dependency追加、estimate変更に限定し、LLMから状態を変更するschemaを公開しない。
@@ -354,7 +356,9 @@ Task
   ActualOutputTokens: long
   ActualTotalTokens: long
   RequiresExternalEffect: bool
+  RequiredEffectTools: set<Internal Tool name>
 ```
+`RequiresExternalEffect=true`のTaskは、Tool catalogに存在し副作用を持つTool名を`RequiredEffectTools`へ1件以上持つ。Planner structured outputの`required_effect_tools`から構築し、Runtimeは成功した副作用Toolがこの集合に含まれる場合だけ期待副作用の証跡として扱う。例えば`process_run`が必要なTask中の`file_edit`成功は完了根拠にしない。`RequiresExternalEffect=false`では集合を空にする。
 ### 8.2 PERT計算
 ```text
 ExpectedTokens = (O + 4*M + P) / 6.0
diff --git a/src/Agent.Core/Runtime/AgentRuntime.cs b/src/Agent.Core/Runtime/AgentRuntime.cs
index 894f50e..333d557 100644
--- a/src/Agent.Core/Runtime/AgentRuntime.cs
+++ b/src/Agent.Core/Runtime/AgentRuntime.cs
@@ -279,7 +279,7 @@ public sealed class AgentRuntime(TaskRegistry registry, IOllamaClient ollama, Ag
                         toolResult = new(false, ex.Message, false, $"{call.Function.Name}:{ex.GetType().Name}:{ex.Message}");
                     }
 
-                    externalEffectEvidence |= toolResult.Success && toolResult.ExternalEffect;
+                    externalEffectEvidence |= toolResult.Success && toolResult.ExternalEffect && plannerTask.RequiredEffectTools.Contains(call.Function.Name);
                     // task_update is a metadata tool for graph bookkeeping; its failures should not block completion.
                     bool isMetadataTool = call.Function.Name == "task_update";
                     if (toolResult.Success) unresolvedToolFailures.Remove(call.Function.Name);
@@ -298,6 +298,9 @@ public sealed class AgentRuntime(TaskRegistry registry, IOllamaClient ollama, Ag
                 }
                 ToolUseGuardResult callGuard = guard.Evaluate(requiresExternalEffect, true, externalEffectEvidence, failureFingerprint);
                 if (callGuard.Decision == ToolUseGuardDecision.Fail) throw new InvalidOperationException(callGuard.Observation);
+                if (callGuard.Decision == ToolUseGuardDecision.Retry)
+                    messages.Add(new OllamaMessage("system", callGuard.Observation + " Required effect Tool(s) for the current Task: " +
+                        string.Join(", ", plannerTask.RequiredEffectTools.Order(StringComparer.Ordinal)) + "."));
                 continue;
             }
 
diff --git a/src/Agent.Core/Runtime/PlanResult.cs b/src/Agent.Core/Runtime/PlanResult.cs
index bad41fa..2e8dbae 100644
--- a/src/Agent.Core/Runtime/PlanResult.cs
+++ b/src/Agent.Core/Runtime/PlanResult.cs
@@ -36,6 +36,9 @@ public sealed class PlannedTask
 
     [JsonPropertyName("requires_external_effect")]
     public bool RequiresExternalEffect { get; init; }
+
+    [JsonPropertyName("required_effect_tools")]
+    public List<string> RequiredEffectTools { get; init; } = [];
 }
 
 /// <summary>
@@ -43,9 +46,9 @@ public sealed class PlannedTask
 /// </summary>
 public static class PlanSchema
 {
-    public static string Json => """{"type":"object","properties":{"tasks":{"type":"array","items":{"type":"object","properties":{"description":{"type":"string"},"dependencies":{"type":"array","items":{"type":"integer"}},"budget_class":{"type":"string","enum":["1K","2K","4K","8K","16K","32K","64K","128K"]},"optimistic_tokens":{"type":"integer","minimum":1},"most_likely_tokens":{"type":"integer","minimum":1},"pessimistic_tokens":{"type":"integer","minimum":1},"requires_external_effect":{"type":"boolean"}},"required":["description","dependencies","budget_class","optimistic_tokens","most_likely_tokens","pessimistic_tokens","requires_external_effect"]}}},"required":["tasks"]}""";
+    public static string Json => """{"type":"object","properties":{"tasks":{"type":"array","items":{"type":"object","properties":{"description":{"type":"string"},"dependencies":{"type":"array","items":{"type":"integer"}},"budget_class":{"type":"string","enum":["1K","2K","4K","8K","16K","32K","64K","128K"]},"optimistic_tokens":{"type":"integer","minimum":1},"most_likely_tokens":{"type":"integer","minimum":1},"pessimistic_tokens":{"type":"integer","minimum":1},"requires_external_effect":{"type":"boolean"},"required_effect_tools":{"type":"array","items":{"type":"string","enum":["file_edit","process_run","dir"]}}},"required":["description","dependencies","budget_class","optimistic_tokens","most_likely_tokens","pessimistic_tokens","requires_external_effect","required_effect_tools"]}}},"required":["tasks"]}""";
 
     private static readonly JsonElement _element = JsonDocument.Parse(Json).RootElement.Clone();
 
     public static JsonElement Element => _element;
-}
\ No newline at end of file
+}
diff --git a/src/Agent.Core/Runtime/PlannerService.cs b/src/Agent.Core/Runtime/PlannerService.cs
index aa7d3a5..18e4043 100644
--- a/src/Agent.Core/Runtime/PlannerService.cs
+++ b/src/Agent.Core/Runtime/PlannerService.cs
@@ -93,7 +93,8 @@ public sealed class PlannerService(IOllamaClient ollama, AgentRuntimeSettings se
             }
 
             string description = string.IsNullOrWhiteSpace(pt.Description) ? originalRequest : pt.Description;
-            PlannerTask task = graph.AddTask(description, budgetClass, estimate, dependencies, pt.RequiresExternalEffect);
+            PlannerTask task = graph.AddTask(description, budgetClass, estimate, dependencies, pt.RequiresExternalEffect,
+                requiredEffectTools: ValidateRequiredEffectTools(pt));
             idMap.Add(task.Id);
         }
 
@@ -111,7 +112,7 @@ public sealed class PlannerService(IOllamaClient ollama, AgentRuntimeSettings se
         foreach (PlannerTask item in completed)
         {
             Guid[] dependencies = item.Dependencies.Where(id => completed.Any(candidate => candidate.Id == id)).ToArray();
-            PlannerTask copy = graph.AddTask(item.Description, item.BudgetClass, item.Estimate, dependencies, item.RequiresExternalEffect, item.Id);
+            PlannerTask copy = graph.AddTask(item.Description, item.BudgetClass, item.Estimate, dependencies, item.RequiresExternalEffect, item.Id, item.RequiredEffectTools);
             graph.AddUsage(copy.Id, item.ActualInputTokens, item.ActualOutputTokens);
             graph.SetState(copy.Id, PlannerTaskState.Completed);
         }
@@ -140,7 +141,8 @@ public sealed class PlannerService(IOllamaClient ollama, AgentRuntimeSettings se
             }
 
             string description = string.IsNullOrWhiteSpace(pt.Description) ? originalRequest : pt.Description;
-            PlannerTask task = graph.AddTask(description, bc, est, dependencies, pt.RequiresExternalEffect);
+            PlannerTask task = graph.AddTask(description, bc, est, dependencies, pt.RequiresExternalEffect,
+                requiredEffectTools: ValidateRequiredEffectTools(pt));
             idMap.Add(task.Id);
         }
 
@@ -167,6 +169,19 @@ public sealed class PlannerService(IOllamaClient ollama, AgentRuntimeSettings se
         return new TokenEstimate(o, m, p);
     }
 
+    private static IReadOnlySet<string> ValidateRequiredEffectTools(PlannedTask task)
+    {
+        HashSet<string> tools = task.RequiredEffectTools.ToHashSet(StringComparer.Ordinal);
+        string[] allowed = ["file_edit", "process_run", "dir"];
+        if (tools.Any(tool => !allowed.Contains(tool, StringComparer.Ordinal)))
+            throw new PlannerValidationException("required_effect_tools contains a Tool that cannot provide external-effect evidence.");
+        if (task.RequiresExternalEffect && tools.Count == 0)
+            throw new PlannerValidationException("An external-effect Task must provide required_effect_tools.");
+        if (!task.RequiresExternalEffect && tools.Count != 0)
+            throw new PlannerValidationException("A non-effect Task must have empty required_effect_tools.");
+        return tools;
+    }
+
     private static PlanResult? ParsePlan(string content)
     {
         try
@@ -285,10 +300,12 @@ public sealed class PlannerService(IOllamaClient ollama, AgentRuntimeSettings se
         - budget_class: one of 1K, 2K, 4K, 8K, 16K, 32K, 64K, 128K (token budget for this task)
         - optimistic_tokens, most_likely_tokens, pessimistic_tokens: PERT estimates (0 < O <= M <= P <= budget)
         - requires_external_effect: true if this task requires a verifiable external effect (file edit, process run, etc.)
+        - required_effect_tools: the exact effect-producing Internal Tool names whose successful result can complete this task; use only file_edit, process_run, or dir
         
         For pure analysis or informational tasks, requires_external_effect should be false.
         For tasks that modify files, run processes, or produce verifiable side effects, requires_external_effect should be true.
         Read-only operations (file_read, file_search, and dir list) do not create an external effect and must use requires_external_effect=false.
+        When requires_external_effect is false, required_effect_tools must be empty. When true, it must contain at least one Tool and only the Tool(s) that prove this task's own expected effect.
         Preserve every user-supplied absolute path, executable, cwd, argument array, operation name, and literal value exactly in the task that uses it; never abbreviate these values into a shell-like command.
         Keep each task limited to its own described operation. Do not put later dependent operations into an earlier task.
         A single task is valid for simple requests.
diff --git a/src/Agent.Core/Tools/InternalToolCatalog.cs b/src/Agent.Core/Tools/InternalToolCatalog.cs
index d261269..e28673d 100644
--- a/src/Agent.Core/Tools/InternalToolCatalog.cs
+++ b/src/Agent.Core/Tools/InternalToolCatalog.cs
@@ -19,7 +19,7 @@ public static class InternalToolCatalog
             Define("file_read", "Read an approved file.", """{"type":"object","additionalProperties":false,"required":["path","mode"],"properties":{"path":{"type":"string"},"mode":{"type":"string","enum":["whole","range","metadata"]},"start":{"type":"integer","minimum":0},"length":{"type":"integer","minimum":0}}}"""),
             Define("file_edit", "Edit an approved file transactionally.", """{"type":"object","additionalProperties":false,"required":["path","operation"],"properties":{"path":{"type":"string"},"operation":{"type":"string","enum":["overwrite","patch","atomic_replace","delete","rename"]},"content":{"type":["string","null"]},"patch":{"type":["string","null"]},"expected_sha256":{"type":["string","null"]},"new_path":{"type":["string","null"]}}}"""),
             Define("process_run", "Run one approved executable with separated arguments.", """{"type":"object","additionalProperties":false,"required":["executable","args","cwd"],"properties":{"executable":{"type":"string"},"args":{"type":"array","items":{"type":"string"}},"cwd":{"type":"string"},"timeout_seconds":{"type":"integer","minimum":1},"stdin":{"type":["string","null"]}}}"""),
-            Define("task_update", "Update the deterministic task graph structure or estimates.", """{"type":"object","additionalProperties":false,"required":["operation"],"properties":{"operation":{"type":"string","enum":["add","add_dependency","set_estimate"]},"task_id":{"type":["string","null"]},"description":{"type":["string","null"]},"depends_on":{"type":"array","items":{"type":"string"}},"budget_class":{"type":["string","null"],"enum":["1K","2K","4K","8K","16K","32K","64K","128K",null]},"optimistic_tokens":{"type":"integer","minimum":0},"most_likely_tokens":{"type":"integer","minimum":0},"pessimistic_tokens":{"type":"integer","minimum":0},"requires_external_effect":{"type":["boolean","null"]}}}"""),
+            Define("task_update", "Update the deterministic task graph structure or estimates.", """{"type":"object","additionalProperties":false,"required":["operation"],"properties":{"operation":{"type":"string","enum":["add","add_dependency","set_estimate"]},"task_id":{"type":["string","null"]},"description":{"type":["string","null"]},"depends_on":{"type":"array","items":{"type":"string"}},"budget_class":{"type":["string","null"],"enum":["1K","2K","4K","8K","16K","32K","64K","128K",null]},"optimistic_tokens":{"type":"integer","minimum":0},"most_likely_tokens":{"type":"integer","minimum":0},"pessimistic_tokens":{"type":"integer","minimum":0},"requires_external_effect":{"type":["boolean","null"]},"required_effect_tools":{"type":"array","items":{"type":"string","enum":["file_edit","process_run","dir"]}}}}"""),
             Define("dir", "Create, remove, or list directories under an approved root. Only empty directories can be removed.", """{"type":"object","additionalProperties":false,"required":["path","operation"],"properties":{"path":{"type":"string"},"operation":{"type":"string","enum":["mkdir","rmdir","list"]}}}""")
         ];
         return definitions.ToDictionary(static definition => definition.Name, StringComparer.Ordinal);
diff --git a/src/Agent.Core/Tools/TaskGraphToolHandler.cs b/src/Agent.Core/Tools/TaskGraphToolHandler.cs
index 26d5a27..fb3979b 100644
--- a/src/Agent.Core/Tools/TaskGraphToolHandler.cs
+++ b/src/Agent.Core/Tools/TaskGraphToolHandler.cs
@@ -52,7 +52,8 @@ public sealed class TaskGraphToolHandler(int maxTasks = 32, SessionStore? sessio
                     Estimate(arguments),
                     Ids(arguments, "depends_on"),
                     requiresExternalEffect: OptionalBool(arguments, "requires_external_effect"),
-                    id: OptionalId(arguments, "task_id"));
+                    id: OptionalId(arguments, "task_id"),
+                    requiredEffectTools: Strings(arguments, "required_effect_tools"));
                 break;
             case "add_dependency":
                 Guid taskIdValue = RequiredId(arguments, "task_id");
@@ -79,7 +80,8 @@ public sealed class TaskGraphToolHandler(int maxTasks = 32, SessionStore? sessio
                 depends_on = task.Dependencies,
                 state = task.State.ToString().ToLowerInvariant(),
                 expected_tokens = task.ExpectedTokens,
-                requires_external_effect = task.RequiresExternalEffect
+                requires_external_effect = task.RequiresExternalEffect,
+                required_effect_tools = task.RequiredEffectTools
             }),
             critical_path = graph.CriticalPath.TaskIds,
             critical_path_tokens = graph.CriticalPath.CumulativeTokenCost,
@@ -114,6 +116,13 @@ public sealed class TaskGraphToolHandler(int maxTasks = 32, SessionStore? sessio
         return value.ValueKind == JsonValueKind.True;
     }
 
+    private static string[] Strings(JsonElement arguments, string property)
+    {
+        if (!arguments.TryGetProperty(property, out JsonElement value) || value.ValueKind is JsonValueKind.Null or JsonValueKind.Undefined) return [];
+        if (value.ValueKind != JsonValueKind.Array) throw new ToolValidationException($"'{property}' must be an array.");
+        return value.EnumerateArray().Select(item => item.GetString() ?? throw new ToolValidationException($"'{property}' entries must be strings.")).ToArray();
+    }
+
     private static void DemandStructuralMutation(TaskGraph graph, Guid taskId)
     {
         PlannerTaskState state = graph.Get(taskId).State;
diff --git a/src/Agent.Planner/PlannerTask.cs b/src/Agent.Planner/PlannerTask.cs
index edc85c2..afba0ef 100644
--- a/src/Agent.Planner/PlannerTask.cs
+++ b/src/Agent.Planner/PlannerTask.cs
@@ -9,7 +9,8 @@ public sealed record PlannerTask(
     TokenEstimate Estimate,
     long ActualInputTokens,
     long ActualOutputTokens,
-    bool RequiresExternalEffect)
+    bool RequiresExternalEffect,
+    IReadOnlySet<string> RequiredEffectTools)
 {
     public double ExpectedTokens => Estimate.ExpectedTokens;
     public long ActualTotalTokens => checked(ActualInputTokens + ActualOutputTokens);
diff --git a/src/Agent.Planner/TaskGraph.cs b/src/Agent.Planner/TaskGraph.cs
index 7a4d45b..729f646 100644
--- a/src/Agent.Planner/TaskGraph.cs
+++ b/src/Agent.Planner/TaskGraph.cs
@@ -18,7 +18,8 @@ public sealed class TaskGraph(int maxTasks = 32)
         TokenEstimate estimate,
         IEnumerable<Guid>? dependencies = null,
         bool requiresExternalEffect = false,
-        Guid? id = null)
+        Guid? id = null,
+        IEnumerable<string>? requiredEffectTools = null)
     {
         if (string.IsNullOrWhiteSpace(description)) throw new PlannerValidationException("Task description is required.");
         if (_tasks.Count >= MaxTasks) throw new PlannerValidationException($"Task limit of {MaxTasks} exceeded.");
@@ -26,10 +27,13 @@ public sealed class TaskGraph(int maxTasks = 32)
         Guid taskId = id ?? Guid.NewGuid();
         if (_tasks.ContainsKey(taskId)) throw new PlannerValidationException($"Task '{taskId}' already exists.");
         HashSet<Guid> dependencySet = dependencies?.ToHashSet() ?? [];
+        HashSet<string> effectTools = requiredEffectTools?.ToHashSet(StringComparer.Ordinal) ?? [];
+        if (requiresExternalEffect && effectTools.Count == 0) throw new PlannerValidationException("An external-effect Task must name at least one required effect tool.");
+        if (!requiresExternalEffect && effectTools.Count != 0) throw new PlannerValidationException("A non-effect Task cannot require an effect tool.");
         EnsureDependenciesExist(dependencySet);
         if (dependencySet.Contains(taskId)) throw new PlannerValidationException("A task cannot depend on itself.");
 
-        _tasks.Add(taskId, new MutableTask(taskId, description, dependencySet, budgetClass, estimate, requiresExternalEffect));
+        _tasks.Add(taskId, new MutableTask(taskId, description, dependencySet, budgetClass, estimate, requiresExternalEffect, effectTools));
         _insertionOrder.Add(taskId);
         try
         {
@@ -163,7 +167,7 @@ public sealed class TaskGraph(int maxTasks = 32)
         if (task.State == PlannerTaskState.Completed) throw new PlannerValidationException("Completed tasks are immutable.");
     }
 
-    private sealed class MutableTask(Guid id, string description, HashSet<Guid> dependencies, TokenBudgetClass budgetClass, TokenEstimate estimate, bool requiresExternalEffect)
+    private sealed class MutableTask(Guid id, string description, HashSet<Guid> dependencies, TokenBudgetClass budgetClass, TokenEstimate estimate, bool requiresExternalEffect, HashSet<string> requiredEffectTools)
     {
         public Guid Id { get; } = id;
         public string Description { get; } = description;
@@ -174,6 +178,7 @@ public sealed class TaskGraph(int maxTasks = 32)
         public long ActualInputTokens { get; set; }
         public long ActualOutputTokens { get; set; }
         public bool RequiresExternalEffect { get; } = requiresExternalEffect;
-        public PlannerTask Snapshot() => new(Id, Description, Dependencies.ToHashSet(), State, BudgetClass, Estimate, ActualInputTokens, ActualOutputTokens, RequiresExternalEffect);
+        public HashSet<string> RequiredEffectTools { get; } = requiredEffectTools;
+        public PlannerTask Snapshot() => new(Id, Description, Dependencies.ToHashSet(), State, BudgetClass, Estimate, ActualInputTokens, ActualOutputTokens, RequiresExternalEffect, RequiredEffectTools.ToHashSet(StringComparer.Ordinal));
     }
 }
diff --git a/tests/Agent.Core.Tests/PromptAndRuntimeTests.cs b/tests/Agent.Core.Tests/PromptAndRuntimeTests.cs
index dce2b28..d72e02a 100644
--- a/tests/Agent.Core.Tests/PromptAndRuntimeTests.cs
+++ b/tests/Agent.Core.Tests/PromptAndRuntimeTests.cs
@@ -127,6 +127,25 @@ public sealed class PromptAndRuntimeTests
     }
 
     [Fact]
+    public async Task Runtime_requires_the_planned_effect_tool_not_an_unrelated_effect()
+    {
+        TaskRegistry registry = new();
+        FakeInternalToolBackend backend = new();
+        var dispatcher = new InternalToolDispatcher(
+            new DenyByDefaultPolicy(InternalToolCatalog.All.Select(static item => item.Name).ToHashSet(StringComparer.Ordinal)), backend);
+        var runtime = new AgentRuntime(registry, new MismatchedThenRequiredEffectOllamaClient(),
+            new AgentRuntimeSettings("", "en", [], "sandbox"), dispatcher);
+        TaskSnapshot task = registry.Enqueue("run build", null, null);
+        registry.Transition(task.TaskId, AgentTaskState.Planning);
+
+        await runtime.ExecuteAsync(task.TaskId, TestContext.Current.CancellationToken);
+
+        Assert.True(registry.TryGet(task.TaskId, null, out TaskSnapshot? completed));
+        Assert.Equal(AgentTaskState.Completed, completed!.State);
+        Assert.Equal(["file_edit", "process_run"], backend.Calls.Select(static call => call.Name));
+    }
+
+    [Fact]
     public async Task Runtime_reaches_terminal_failed_state_when_resource_cleanup_fails()
     {
         TaskRegistry registry = new();
@@ -413,7 +432,7 @@ public sealed class PromptAndRuntimeTests
         public Task<OllamaResult> ChatStructuredAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, JsonElement format, CancellationToken cancellationToken)
         {
             // Return a plan with requires_external_effect=true for file edit task.
-            string planJson = """{"tasks":[{"description":"fileを修正","dependencies":[],"budget_class":"4K","optimistic_tokens":512,"most_likely_tokens":2048,"pessimistic_tokens":4096,"requires_external_effect":true}]}""";
+            string planJson = """{"tasks":[{"description":"fileを修正","dependencies":[],"budget_class":"4K","optimistic_tokens":512,"most_likely_tokens":2048,"pessimistic_tokens":4096,"requires_external_effect":true,"required_effect_tools":["file_edit"]}]}""";
             return Task.FromResult(new OllamaResult(planJson, 1, 1));
         }
         public Task<OllamaResult> ChatWithToolsAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, IReadOnlyList<InternalToolDefinition> tools, CancellationToken cancellationToken)
@@ -429,6 +448,31 @@ public sealed class PromptAndRuntimeTests
         }
     }
 
+    private sealed class MismatchedThenRequiredEffectOllamaClient : IOllamaClient
+    {
+        private int _runCalls;
+        public Task<OllamaResult> ChatAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, CancellationToken cancellationToken) =>
+            Task.FromResult(new OllamaResult("done", 1, 1));
+        public Task<OllamaResult> ChatStructuredAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, JsonElement format, CancellationToken cancellationToken) =>
+            Task.FromResult(new OllamaResult("""{"tasks":[{"description":"run build","dependencies":[],"budget_class":"4K","optimistic_tokens":10,"most_likely_tokens":20,"pessimistic_tokens":30,"requires_external_effect":true,"required_effect_tools":["process_run"]}]}""", 1, 1));
+        public Task<OllamaResult> ChatWithToolsAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, IReadOnlyList<InternalToolDefinition> tools, CancellationToken cancellationToken)
+        {
+            int call = Interlocked.Increment(ref _runCalls);
+            if (call == 1)
+            {
+                using JsonDocument arguments = JsonDocument.Parse("""{"path":"x","operation":"overwrite","content":"new"}""");
+                return Task.FromResult(new OllamaResult("", 1, 1, [new OllamaToolCall(new OllamaFunctionCall("file_edit", arguments.RootElement.Clone()))]));
+            }
+            if (call == 2)
+            {
+                Assert.Contains(messages, message => message.Role == "system" && message.Content.Contains("process_run", StringComparison.Ordinal));
+                using JsonDocument arguments = JsonDocument.Parse("""{"executable":"x","args":[],"cwd":"."}""");
+                return Task.FromResult(new OllamaResult("", 1, 1, [new OllamaToolCall(new OllamaFunctionCall("process_run", arguments.RootElement.Clone()))]));
+            }
+            return Task.FromResult(new OllamaResult("done", 1, 1));
+        }
+    }
+
     private sealed class NonVisionOllamaClient : IOllamaClient
     {
         public int ChatCalls { get; private set; }
@@ -470,7 +514,7 @@ public sealed class PromptAndRuntimeTests
             Task.FromResult(new OllamaResult("done", 1, 1));
         public Task<OllamaResult> ChatStructuredAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, JsonElement format, CancellationToken cancellationToken)
         {
-            string planJson = """{"tasks":[{"description":"run build","dependencies":[],"budget_class":"4K","optimistic_tokens":512,"most_likely_tokens":2048,"pessimistic_tokens":4096,"requires_external_effect":true}]}""";
+            string planJson = """{"tasks":[{"description":"run build","dependencies":[],"budget_class":"4K","optimistic_tokens":512,"most_likely_tokens":2048,"pessimistic_tokens":4096,"requires_external_effect":true,"required_effect_tools":["process_run"]}]}""";
             return Task.FromResult(new OllamaResult(planJson, 1, 1));
         }
         public Task<OllamaResult> ChatWithToolsAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, IReadOnlyList<InternalToolDefinition> tools, CancellationToken cancellationToken)
@@ -503,7 +547,7 @@ public sealed class PromptAndRuntimeTests
 
         public Task<OllamaResult> ChatStructuredAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, JsonElement format, CancellationToken cancellationToken)
         {
-            string planJson = """{"tasks":[{"description":"research regional curry","dependencies":[],"budget_class":"4K","optimistic_tokens":512,"most_likely_tokens":2048,"pessimistic_tokens":4096,"requires_external_effect":true}]}""";
+            string planJson = """{"tasks":[{"description":"research regional curry","dependencies":[],"budget_class":"4K","optimistic_tokens":512,"most_likely_tokens":2048,"pessimistic_tokens":4096,"requires_external_effect":true,"required_effect_tools":["file_edit"]}]}""";
             return Task.FromResult(new OllamaResult(planJson, 1, 1));
         }
 
@@ -548,7 +592,7 @@ public sealed class PromptAndRuntimeTests
         public Task<OllamaResult> ChatStructuredAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, JsonElement format, bool? thinkOverride, CancellationToken cancellationToken)
         {
             int plan = Interlocked.Increment(ref _plans);
-            string json = $$"""{"tasks":[{"description":"search-{{plan}}","dependencies":[],"budget_class":"4K","optimistic_tokens":10,"most_likely_tokens":20,"pessimistic_tokens":30,"requires_external_effect":true}]}""";
+            string json = $$"""{"tasks":[{"description":"search-{{plan}}","dependencies":[],"budget_class":"4K","optimistic_tokens":10,"most_likely_tokens":20,"pessimistic_tokens":30,"requires_external_effect":true,"required_effect_tools":["file_edit"]}]}""";
             return Task.FromResult(new OllamaResult(json, 1, 1));
         }
         public Task<OllamaResult> ChatWithToolsAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, IReadOnlyList<InternalToolDefinition> tools, CancellationToken cancellationToken)