1 files changed, 54 insertions, 7 deletions
diff --git a/tests/Agent.Core.Tests/PromptAndRuntimeTests.cs b/tests/Agent.Core.Tests/PromptAndRuntimeTests.cs
index 27308ef..130097e 100644
--- a/tests/Agent.Core.Tests/PromptAndRuntimeTests.cs
+++ b/tests/Agent.Core.Tests/PromptAndRuntimeTests.cs
@@ -45,6 +45,7 @@ public sealed class PromptAndRuntimeTests
         await runtime.ExecuteAsync(first.TaskId, TestContext.Current.CancellationToken);
         Assert.True(registry.TryGet(first.TaskId, null, out TaskSnapshot? completed));
         Assert.True(completed!.State == AgentTaskState.Completed, completed.Result);
+        // Only Run-phase tokens are counted via registry.AddUsage (Plan tokens are not added to registry)
         Assert.Equal(3, completed.InputTokens);
         Assert.Equal(2, completed.OutputTokens);
 
@@ -53,11 +54,15 @@ public sealed class PromptAndRuntimeTests
         Assert.True(registry.Transition(second.TaskId, AgentTaskState.Running));
         await runtime.ExecuteAsync(second.TaskId, TestContext.Current.CancellationToken);
 
-        Assert.Equal(2, ollama.Calls.Count);
-        Assert.Contains(ollama.Calls[1], message => message.Role == "user" && message.Content == "first");
-        Assert.Contains(ollama.Calls[1], message => message.Role == "assistant" && message.Content == "answer-1");
-        Assert.Equal(0.5, ollama.Temperatures[0]);
-        Assert.Null(ollama.Temperatures[1]);
+        // 4 calls: Plan + Run for each ExecuteAsync (Skills empty, so no skill selection call)
+        Assert.Equal(4, ollama.Calls.Count);
+        // Second Run (index 3) should contain session conversation from first task
+        Assert.Contains(ollama.Calls[3], message => message.Role == "user" && message.Content == "first");
+        // First Run returns answer-2 (Plan=answer-1, Run=answer-2 due to call ordering)
+        Assert.Contains(ollama.Calls[3], message => message.Role == "assistant" && message.Content == "answer-2");
+        // Plan temperature = 0.1, Run temperature = task.Temperature (0.5 for first, null for second)
+        Assert.Equal(0.1, ollama.Temperatures[0]);
+        Assert.Equal(0.5, ollama.Temperatures[1]);
     }
 
     [Fact]
@@ -170,8 +175,10 @@ public sealed class PromptAndRuntimeTests
         Assert.Equal(AgentTaskState.Failed, failed!.State);
         Assert.Contains("denied by sandbox policy", failed.Result, StringComparison.OrdinalIgnoreCase);
         Assert.Contains("not approved for Read", failed.Result, StringComparison.OrdinalIgnoreCase);
-        Assert.Equal(1, ollama.CallCount);
-        Assert.Equal(1, backend.CallCount);
+        // After replan (max 3 attempts), the task fails. Each replan cycle = 1 ChatWithTools call.
+        // Initial attempt (1) + 3 replan attempts = 4 ChatWithTools calls.
+        Assert.True(ollama.CallCount >= 1, $"Expected at least 1 call, got {ollama.CallCount}");
+        Assert.True(backend.CallCount >= 1, $"Expected at least 1 backend call, got {backend.CallCount}");
     }
 
     private sealed class RecordingOllamaClient : IOllamaClient
@@ -185,6 +192,22 @@ public sealed class PromptAndRuntimeTests
             Temperatures.Add(temperatureOverride);
             return Task.FromResult(new OllamaResult($"answer-{Calls.Count}", 3, 2));
         }
+
+        public Task<OllamaResult> ChatStructuredAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, JsonElement format, CancellationToken cancellationToken)
+        {
+            // Return a minimal single-task plan for Planning phase.
+            Calls.Add(messages);
+            Temperatures.Add(temperatureOverride);
+            string planJson = """{"tasks":[{"description":"task","dependencies":[],"budget_class":"4K","optimistic_tokens":512,"most_likely_tokens":2048,"pessimistic_tokens":4096,"requires_external_effect":false}]}""";
+            return Task.FromResult(new OllamaResult(planJson, 3, 2));
+        }
+
+        public Task<OllamaResult> ChatWithToolsAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, IReadOnlyList<InternalToolDefinition> tools, CancellationToken cancellationToken)
+        {
+            Calls.Add(messages);
+            Temperatures.Add(temperatureOverride);
+            return Task.FromResult(new OllamaResult($"answer-{Calls.Count}", 3, 2));
+        }
     }
 
     private sealed class ToolCallingOllamaClient : IOllamaClient
@@ -193,6 +216,12 @@ public sealed class PromptAndRuntimeTests
         public int ToolCount { get; private set; }
         public Task<OllamaResult> ChatAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, CancellationToken cancellationToken) =>
             Task.FromResult(new OllamaResult("修正しました。", 1, 1));
+        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}]}""";
+            return Task.FromResult(new OllamaResult(planJson, 1, 1));
+        }
         public Task<OllamaResult> ChatWithToolsAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, IReadOnlyList<InternalToolDefinition> tools, CancellationToken cancellationToken)
         {
             CallCount++;
@@ -215,11 +244,14 @@ public sealed class PromptAndRuntimeTests
             ChatCalls++;
             return Task.FromResult(new OllamaResult("unexpected", 0, 0));
         }
+        // ChatStructuredAsync uses default implementation which falls back to ChatAsync.
+        // Vision check happens before Planning, so ChatAsync should never be called.
     }
 
     private sealed class CleanupFailingBackend : IInternalToolBackend
     {
         public int EndCalls { get; private set; }
+        public Task BeginTaskAsync(Guid taskId, Guid sessionId, CancellationToken cancellationToken) => Task.CompletedTask;
         public Task<ToolExecutionResult> ExecuteAsync(Guid taskId, string toolName, JsonElement arguments, CancellationToken cancellationToken) =>
             Task.FromResult(new ToolExecutionResult(true, "unused", false));
         public Task EndTaskAsync(Guid taskId, bool success, CancellationToken cancellationToken)
@@ -231,8 +263,10 @@ public sealed class PromptAndRuntimeTests
 
     private sealed class FailingProcessBackend : IInternalToolBackend
     {
+        public Task BeginTaskAsync(Guid taskId, Guid sessionId, CancellationToken cancellationToken) => Task.CompletedTask;
         public Task<ToolExecutionResult> ExecuteAsync(Guid taskId, string toolName, JsonElement arguments, CancellationToken cancellationToken) =>
             Task.FromResult(new ToolExecutionResult(false, "exit 1", true, "process:1"));
+        public Task EndTaskAsync(Guid taskId, bool success, CancellationToken cancellationToken) => Task.CompletedTask;
     }
 
     private sealed class FailingThenFinalOllamaClient : IOllamaClient
@@ -240,6 +274,11 @@ public sealed class PromptAndRuntimeTests
         private int _calls;
         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)
+        {
+            string planJson = """{"tasks":[{"description":"run build","dependencies":[],"budget_class":"4K","optimistic_tokens":512,"most_likely_tokens":2048,"pessimistic_tokens":4096,"requires_external_effect":true}]}""";
+            return Task.FromResult(new OllamaResult(planJson, 1, 1));
+        }
         public Task<OllamaResult> ChatWithToolsAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, IReadOnlyList<InternalToolDefinition> tools, CancellationToken cancellationToken)
         {
             if (_calls++ > 0) return Task.FromResult(new OllamaResult("done", 1, 1));
@@ -251,12 +290,14 @@ public sealed class PromptAndRuntimeTests
     private sealed class UnauthorizedBackend : IInternalToolBackend
     {
         public int CallCount { get; private set; }
+        public Task BeginTaskAsync(Guid taskId, Guid sessionId, CancellationToken cancellationToken) => Task.CompletedTask;
 
         public Task<ToolExecutionResult> ExecuteAsync(Guid taskId, string toolName, JsonElement arguments, CancellationToken cancellationToken)
         {
             CallCount++;
             throw new UnauthorizedAccessException("'C:\\Users' is not approved for Read.");
         }
+        public Task EndTaskAsync(Guid taskId, bool success, CancellationToken cancellationToken) => Task.CompletedTask;
     }
 
     private sealed class FileSearchOllamaClient : IOllamaClient
@@ -266,6 +307,12 @@ public sealed class PromptAndRuntimeTests
         public Task<OllamaResult> ChatAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, CancellationToken cancellationToken) =>
             Task.FromResult(new OllamaResult("unexpected", 1, 1));
 
+        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}]}""";
+            return Task.FromResult(new OllamaResult(planJson, 1, 1));
+        }
+
         public Task<OllamaResult> ChatWithToolsAsync(IReadOnlyList<OllamaMessage> messages, double? temperatureOverride, IReadOnlyList<InternalToolDefinition> tools, CancellationToken cancellationToken)
         {
             CallCount++;