chore(claude-do): merge fix(worker): Stuck-Running-Fenster in Continue- und Stop-Pfa

ClaudeDo-Task: 6db1a9e2-aa1d-4911-a763-76b136f97946

src/ClaudeDo.Worker/Queue/QueueService.cs

@@ -348,9 +348,32 @@ public sealed class QueueService : BackgroundService
         }
         catch (OperationCanceledException)
         {
-            // Cancellation is driven by the cancel path, which already wrote the terminal status.
-            // Marking the task Failed here would be a regression (it would stomp Cancelled).
+            // Most cancellation origins (TaskStateService.CancelAsync, the runner's own
+            // OCE handling) already write a terminal status before the CTS is actually
+            // cancelled, so by the time we get here the task has already left Running.
+            // A plain Stop (QueueService.CancelTask cancels the slot's CTS directly, with no
+            // TaskStateService write) landing during the pre-dispatch reads above is the one
+            // gap nothing else covers — the picker's claim already committed status='running'
+            // and nothing since has moved it off that. Only close that specific gap: write
+            // Cancelled when (and only when) the task is still Running, so an origin that
+            // already wrote its own terminal status is never stomped.
             _logger.LogInformation("Slot runner cancelled for task {TaskId}", taskId);
+            try
+            {
+                TaskStatus current;
+                using (var context = _dbFactory.CreateDbContext())
+                    current = await context.Tasks.AsNoTracking()
+                        .Where(t => t.Id == taskId)
+                        .Select(t => t.Status)
+                        .FirstAsync(CancellationToken.None);
+
+                if (current == TaskStatus.Running)
+                    await _state.CancelAsync(taskId, DateTime.UtcNow, CancellationToken.None);
+            }
+            catch (Exception cancelEx)
+            {
+                _logger.LogError(cancelEx, "Could not finalize cancelled task {TaskId} after slot cancellation", taskId);
+            }
         }
         catch (Exception ex)
         {

src/ClaudeDo.Worker/Runner/TaskRunTokenRegistry.cs

@@ -17,6 +17,11 @@ public sealed class TaskRunTokenRegistry
         return false;
     }
     public void Unregister(string token) => _tokenToTaskId.TryRemove(token, out _);
+
+    // Test-only leak check: a run must never leave its token registered after it ends,
+    // no matter which step of setup failed.
+    public bool HasAnyTokenFor(string taskId) => _tokenToTaskId.Values.Contains(taskId);
+
     public static string GenerateToken()
     {
         var bytes = RandomNumberGenerator.GetBytes(32);

src/ClaudeDo.Worker/Runner/TaskRunner.cs

@@ -124,7 +124,7 @@ public sealed class TaskRunner
             var runDir = prep.RunDir!;
 
             var resolvedConfig = await ResolveConfigAsync(task, list, listConfig, null, ct);
-            (mcpToken, mcpConfigPath, resolvedConfig) = await SetupMcpConfigAsync(task, resolvedConfig, ct);
+            (mcpToken, mcpConfigPath, resolvedConfig) = await SetupMcpConfigAsync(task, resolvedConfig, ct, token => mcpToken = token);
 
             await _skillSeeder.SeedAsync(runDir, resolvedConfig.SkillNames, wtCtx is not null, ct);
 
@@ -237,32 +237,35 @@ public sealed class TaskRunner
             runDir = Path.Combine(_cfg.SandboxRoot, taskId);
         }
 
-        var now = DateTime.UtcNow;
-        // See RunAsync: queue dispatches arrive pre-claimed by the picker.
-        if (!alreadyClaimed)
-        {
-            var startResult = await _state.StartRunningAsync(taskId, now, ct);
-            if (!startResult.Ok)
-            {
-                _logger.LogWarning("Task {TaskId} skipped: StartRunningAsync rejected ({Reason})", taskId, startResult.Reason);
-                return;
-            }
-        }
-        else
-        {
-            // Queue-claimed dispatches skip StartRunningAsync, so broadcast TaskUpdated here
-            // (see RunAsync for the full rationale).
-            await _broadcaster.TaskUpdated(taskId);
-        }
-        await _broadcaster.TaskStarted(slot, taskId, now);
-
-        await _skillSeeder.SeedAsync(runDir, resolvedConfig.SkillNames, wtCtx is not null, ct);
-
-        var (mcpToken, mcpConfigPath, mcpConfig) = await SetupMcpConfigAsync(task, resolvedConfig, ct);
-        resolvedConfig = mcpConfig;
-
+        string? mcpToken = null;
+        string? mcpConfigPath = null;
         try
         {
+            var now = DateTime.UtcNow;
+            // See RunAsync: queue dispatches arrive pre-claimed by the picker. Claim, skill
+            // seeding, and MCP setup all live inside this try (mirroring RunAsync) so a failure
+            // in any of them still lands the task in Failed instead of stuck Running.
+            if (!alreadyClaimed)
+            {
+                var startResult = await _state.StartRunningAsync(taskId, now, ct);
+                if (!startResult.Ok)
+                {
+                    _logger.LogWarning("Task {TaskId} skipped: StartRunningAsync rejected ({Reason})", taskId, startResult.Reason);
+                    return;
+                }
+            }
+            else
+            {
+                // Queue-claimed dispatches skip StartRunningAsync, so broadcast TaskUpdated here
+                // (see RunAsync for the full rationale).
+                await _broadcaster.TaskUpdated(taskId);
+            }
+            await _broadcaster.TaskStarted(slot, taskId, now);
+
+            await _skillSeeder.SeedAsync(runDir, resolvedConfig.SkillNames, wtCtx is not null, ct);
+
+            (mcpToken, mcpConfigPath, resolvedConfig) = await SetupMcpConfigAsync(task, resolvedConfig, ct, token => mcpToken = token);
+
             var nextRunNumber = lastRun.RunNumber + 1;
             var result = await RunOnceAsync(taskId, task.Number, task.Title, slot, runDir, resolvedConfig, nextRunNumber, false, followUpPrompt, ct);
 
@@ -290,8 +293,12 @@ public sealed class TaskRunner
         }
         finally
         {
-            _tokens.Unregister(mcpToken);
-            try { File.Delete(mcpConfigPath); } catch { /* best effort */ }
+            if (mcpToken is not null)
+            {
+                _tokens.Unregister(mcpToken);
+                if (mcpConfigPath is not null)
+                    try { File.Delete(mcpConfigPath); } catch { /* best effort */ }
+            }
         }
     }
 
@@ -300,11 +307,15 @@ public sealed class TaskRunner
     // SuggestImprovement for filing out-of-scope follow-ups. Used by both a fresh run and a
     // --resume continuation, which needs the same wiring or the resumed session loses every
     // mcp__claudedo_run__* tool.
+    // onTokenRegistered fires the instant the token is registered, before any I/O that could
+    // still fail — callers assign it straight into their outer (pre-try) mcpToken variable so a
+    // later throw in this method still leaves the finally block able to unregister it.
     private async Task<(string McpToken, string McpConfigPath, ClaudeRunConfig Config)> SetupMcpConfigAsync(
-        TaskEntity task, ClaudeRunConfig resolvedConfig, CancellationToken ct)
+        TaskEntity task, ClaudeRunConfig resolvedConfig, CancellationToken ct, Action<string>? onTokenRegistered = null)
     {
         var mcpToken = TaskRunTokenRegistry.GenerateToken();
         _tokens.Register(mcpToken, task.Id);
+        onTokenRegistered?.Invoke(mcpToken);
         Directory.CreateDirectory(_cfg.LogRoot);
         var mcpConfigPath = Path.Combine(_cfg.LogRoot, $"{task.Id}_mcp.json");
         await File.WriteAllTextAsync(mcpConfigPath, BuildRunMcpConfigJson(mcpToken), ct);