feat(mcp): migrate server to MCP 2026-07-28

Replace the MCP 1.4.1 stateful HTTP design with the official C# SDK 2.0.0 stateless transport. The SDK now owns protocol negotiation, server/discover, standard MCP headers, GET and DELETE handling, error serialization, caching hints, and legacy initialize compatibility; production code no longer maintains a custom wire-protocol workaround for MCP Inspector.

Separate transport state from application conversation state. HTTP does not issue Mcp-Session-Id, while the existing session_id remains an Agent conversation identifier. Preserve agent_run and agent_status for clients without Tasks support and add the official ModelContextProtocol.Extensions.Tasks 2.0.0 path for capable clients.

Add persistent MCP Task storage with atomic JSON replacement, user-only state location, configurable TTL and poll interval, restart recovery, cancellation correlation, and public Agent-to-MCP state mapping. Keep conformance-only tools and protocol exception fixtures in a test host so they cannot enter the Release Bundle.

Run administrator, BFE, WFP transaction, and filter add/delete preflight before binding. Fail fast with exit code 2 and actionable localized diagnostics when sandbox enforcement is unavailable. Emit ready only after the listener starts and keep stdio stdout protocol-pure.

Add shared rotating application and HTTP request logs. Record real socket endpoints, connection and trace identifiers, method, path, result, timing, media metadata, User-Agent, and MCP metadata. Do not trust X-Forwarded-For and do not log authorization, cookies, query data, request or response bodies, prompts, images, or Base64 payloads.

Add typed logging and Tasks configuration, Japanese and English messages, protocol and operations documentation, design/specification deltas, traceability, and exact conformance acquisition/offline runner scripts for @modelcontextprotocol/conformance 0.2.0-alpha.11. Node remains test-only and is not a runtime dependency.

Conformance evidence: server-stateless passed 28 of 28 checks with zero unexpected failures; DNS rebinding and multiple POST stream scenarios passed. The alpha Tasks lifecycle/cancel/error/required-task checks passed, while its wire-schema validator misclassifies CreateTaskResult and its MRTR composition remains incompatible with SDK 2.0.0. The aggregate conformance Gate is therefore recorded as PARTIAL, not PASS. Test-host fixture gaps for tools-list descriptions, JSON Schema diagnostics, caching fixtures, and a header-validation/required-Task capability conflict are also recorded without expected-failure masking.

Verification: Release build passed with 0 warnings and 0 errors; Planner tests 10/10 and Core tests 47/47 passed with skip 0. The last Windows suite run passed 19/25; five WFP cases require an elevated token and one symlink case requires unavailable host privilege, so the elevated security Gate remains open. A win-x64 self-contained 1.0.0 Bundle and ZIP were regenerated under build/Release/publish; runtime check was intentionally skipped in this non-elevated session. Evidence remains under ignored artifacts/evidence/mcp-2026-07-28.

Harden release regeneration when another shell holds the previous Bundle directory as its current directory: validate the target and remove only its children instead of deleting the directory itself. build/ and artifacts/ remain excluded from Git.

1 files changed, 60 insertions, 5 deletions

diff --git a/src/Agent.Mcp/AgentTools.cs b/src/Agent.Mcp/AgentTools.cs
index c44d6ec..6a5759f 100644
--- a/src/Agent.Mcp/AgentTools.cs
+++ b/src/Agent.Mcp/AgentTools.cs
@@ -3,34 +3,47 @@ using Agent.Core.Localization;
 using Agent.Core.Tasks;
 using ModelContextProtocol.Server;
 using ModelContextProtocol.Protocol;
+using ModelContextProtocol.Extensions.Tasks;
+using System.Text.Json;
+using System.Text.Json.Nodes;
 
 namespace Agent.Mcp;
 
 [McpServerToolType]
-public sealed class AgentTools(TaskRegistry registry, LocaleCatalog locale, VisionLimits visionLimits)
+public sealed class AgentTools(TaskRegistry registry, LocaleCatalog locale, VisionLimits visionLimits, PersistentMcpTaskStore taskStore)
 {
     [McpServerTool(Name = "agent_run", ReadOnly = false, Destructive = true, OpenWorld = false, UseStructuredContent = false)]
     [Description("Queue a natural-language request for asynchronous execution.")]
-    public string AgentRun(
+    public async Task<string> AgentRun(
         RequestContext<CallToolRequestParams> context,
         [Description("Non-empty natural-language work request.")] string request,
         [Description("Existing session UUID, or omit to create a session.")] Guid? session_id = null,
         [Description("Task-scoped temperature from 0.0 through 2.0.")] double? temperature = null,
-        [Description("Optional PNG, JPEG, or WebP images.")] IReadOnlyList<McpImageInput>? images = null)
+        [Description("Optional PNG, JPEG, or WebP images.")] IReadOnlyList<McpImageInput>? images = null,
+        CancellationToken cancellationToken = default)
     {
         RequireOnly(context, "request", "session_id", "temperature", "images");
         ValidateImages(images);
-        TaskSnapshot task = registry.Enqueue(request, session_id, temperature, images?.Select(static image => image.DataBase64).ToArray());
+        Guid? mcpTaskId = GetRelatedTaskId(context.Params?.Meta) ?? GetRelatedTaskId(context.JsonRpcRequest) ??
+            taskStore.ResolveTaskId(cancellationToken);
+        TaskSnapshot task = registry.Enqueue(request, session_id, temperature, images?.Select(static image => image.DataBase64).ToArray(), mcpTaskId);
         string message = locale.Format("mcp.task_queued", new Dictionary<string, object?>
         {
             ["task"] = task.TaskId,
             ["session"] = task.SessionId
         });
-        return string.Join('\n',
+        string queued = string.Join('\n',
             $"task_id: {task.TaskId}",
             $"session_id: {task.SessionId}",
             "status: queued",
             $"message: {message}");
+        if (mcpTaskId is null) return queued;
+
+        using CancellationTokenRegistration registration = cancellationToken.Register(() => registry.Cancel(task.TaskId));
+        TaskSnapshot terminal = await registry.WaitForTerminalAsync(task.TaskId, cancellationToken).ConfigureAwait(false);
+        if (terminal.State == AgentTaskState.Failed) throw new InvalidOperationException(terminal.Result ?? "Agent task failed.");
+        if (terminal.State == AgentTaskState.Cancelled) throw new OperationCanceledException("Agent task was cancelled.", cancellationToken);
+        return FormatStatus(terminal);
     }
 
     private void ValidateImages(IReadOnlyList<McpImageInput>? images)
@@ -66,6 +79,11 @@ public sealed class AgentTools(TaskRegistry registry, LocaleCatalog locale, Visi
                 $"message: {locale.Format("mcp.task_not_found", new Dictionary<string, object?> { ["task"] = task_id })}");
         }
 
+        return FormatStatus(task);
+    }
+
+    private string FormatStatus(TaskSnapshot task)
+    {
         string state = task.State.ToString().ToLowerInvariant();
         bool terminal = task.State is AgentTaskState.Completed or AgentTaskState.Failed or AgentTaskState.Cancelled;
         return string.Join('\n',
@@ -80,6 +98,43 @@ public sealed class AgentTools(TaskRegistry registry, LocaleCatalog locale, Visi
             terminal ? $"result: {task.Result}" : "result:");
     }
 
+    private static Guid? GetRelatedTaskId(object? metadata)
+    {
+        if (metadata is null) return null;
+        JsonElement json = JsonSerializer.SerializeToElement(metadata);
+        return Find(json);
+
+        static Guid? Find(JsonElement json)
+        {
+            if (json.ValueKind == JsonValueKind.Object)
+            {
+                foreach (JsonProperty property in json.EnumerateObject())
+                {
+                    if (property.NameEquals(TasksProtocol.MetaRelatedTask)) return Parse(property.Value);
+                    Guid? nested = Find(property.Value);
+                    if (nested is not null) return nested;
+                }
+            }
+            else if (json.ValueKind == JsonValueKind.Array)
+            {
+                foreach (JsonElement item in json.EnumerateArray())
+                {
+                    Guid? nested = Find(item);
+                    if (nested is not null) return nested;
+                }
+            }
+            return null;
+        }
+
+        static Guid? Parse(JsonElement related)
+        {
+        if (related.ValueKind == JsonValueKind.String && Guid.TryParse(related.GetString(), out Guid direct)) return direct;
+        if (related.ValueKind == JsonValueKind.Object && related.TryGetProperty("taskId", out JsonElement taskId) &&
+            Guid.TryParse(taskId.GetString(), out Guid nested)) return nested;
+        return null;
+        }
+    }
+
     private static void RequireOnly(RequestContext<CallToolRequestParams> context, params string[] allowed)
     {
         if (context.Params?.Arguments is null) return;