Merge claudedo/c97dcaafbb3542bda9c670e502ffffb6

src/ClaudeDo.Worker/Runner/ClaudeProcess.cs

@@ -60,8 +60,8 @@ public sealed class ClaudeProcess : IClaudeProcess
         // wait_for_task_change blocks up to TaskWaitMcpTools.MaxTimeoutSeconds (900 s) and the
         // in-task AskUser tool blocks up to 3 min waiting for the user, so lift the cap well
         // past the longer of the two (with margin) or that wait would be killed early. Harmless
-        // for every other tool. Keep in sync with InteractiveLaunchSpecService's MCP_TOOL_TIMEOUT.
-        psi.Environment["MCP_TOOL_TIMEOUT"] = "930000";
+        // for every other tool. Shares the value with InteractiveLaunchSpecService.McpToolTimeoutMs.
+        psi.Environment["MCP_TOOL_TIMEOUT"] = InteractiveLaunchSpecService.McpToolTimeoutMs;
 
         using var process = new Process { StartInfo = psi };
         process.Start();

src/ClaudeDo.Worker/Runner/InteractiveLaunchSpecService.cs

@@ -27,6 +27,11 @@ namespace ClaudeDo.Worker.Runner;
 // `--resume` pickup in a Windows Terminal window.
 public sealed class InteractiveLaunchSpecService : IInteractiveLaunchSpecService
 {
+    // Claude Code caps HTTP MCP tool calls at 60s unless raised; every ConPTY spec built by this
+    // service lifts it well past wait_for_task_change's 900s server-side cap. Keep in sync with
+    // ClaudeProcess's own MCP_TOOL_TIMEOUT (same value, set independently for headless runs).
+    public const string McpToolTimeoutMs = "930000";
+
     private readonly IDbContextFactory<ClaudeDoDbContext> _dbFactory;
     private readonly ISessionSkillSeeder _skillSeeder;
     private readonly ISessionSkillRegistry _skillRegistry;
@@ -111,7 +116,7 @@ public sealed class InteractiveLaunchSpecService : IInteractiveLaunchSpecService
         // it is harmless for every other tool. Keep in sync with ClaudeProcess's MCP_TOOL_TIMEOUT.
         var env = new Dictionary<string, string>
         {
-            ["MCP_TOOL_TIMEOUT"] = "930000",
+            ["MCP_TOOL_TIMEOUT"] = McpToolTimeoutMs,
         };
 
         return new LaunchSpec(worktree.Path, resolvedClaude, args, env);
@@ -129,7 +134,7 @@ public sealed class InteractiveLaunchSpecService : IInteractiveLaunchSpecService
         {
             ["MAX_THINKING_TOKENS"] = "20000",
             ["CLAUDEDO_PLANNING_TOKEN"] = ctx.Token,
-            ["MCP_TOOL_TIMEOUT"] = "930000",
+            ["MCP_TOOL_TIMEOUT"] = McpToolTimeoutMs,
         };
 
         return new LaunchSpec(
@@ -147,7 +152,7 @@ public sealed class InteractiveLaunchSpecService : IInteractiveLaunchSpecService
         var env = new Dictionary<string, string>
         {
             ["CLAUDEDO_PLANNING_TOKEN"] = ctx.Token,
-            ["MCP_TOOL_TIMEOUT"] = "930000",
+            ["MCP_TOOL_TIMEOUT"] = McpToolTimeoutMs,
         };
 
         return new LaunchSpec(
@@ -170,7 +175,7 @@ public sealed class InteractiveLaunchSpecService : IInteractiveLaunchSpecService
 
         var env = new Dictionary<string, string>
         {
-            ["MCP_TOOL_TIMEOUT"] = "930000",
+            ["MCP_TOOL_TIMEOUT"] = McpToolTimeoutMs,
         };
 
         // No task and no list here — the global default model's preset decides the effort.
@@ -247,7 +252,7 @@ public sealed class InteractiveLaunchSpecService : IInteractiveLaunchSpecService
 
         var env = new Dictionary<string, string>
         {
-            ["MCP_TOOL_TIMEOUT"] = "930000",
+            ["MCP_TOOL_TIMEOUT"] = McpToolTimeoutMs,
         };
 
         return new LaunchSpec(repoDir, resolvedClaude, args, env);
@@ -320,7 +325,7 @@ public sealed class InteractiveLaunchSpecService : IInteractiveLaunchSpecService
 
         var env = new Dictionary<string, string>
         {
-            ["MCP_TOOL_TIMEOUT"] = "200000",
+            ["MCP_TOOL_TIMEOUT"] = McpToolTimeoutMs,
         };
 
         return new LaunchSpec(repoDir, resolvedClaude, args, env);

src/ClaudeDo.Worker/Runner/TaskRunner.cs

@@ -266,7 +266,6 @@ public sealed class TaskRunner
             await _broadcaster.TaskUpdated(taskId);
         }
         await _broadcaster.TaskStarted(slot, taskId, now);
-        await _broadcaster.TaskUpdated(taskId);
 
         await _skillSeeder.SeedAsync(runDir, resolvedConfig.SkillNames, wtCtx is not null, ct);