Merge branch 'worktree-phase1-reaktivitaet'

src/ClaudeDo.Worker/CLAUDE.md

@@ -159,7 +159,6 @@ launch specs · worktrees · agents/settings/lists · reports/notes/prep · diag
 - `TaskMessage`
 - `WorktreeUpdated`
 - `TaskUpdated`
-- `RunCreated`
 - `ListUpdated`
 - `WorkerLog`
 - `PrimeFired`

src/ClaudeDo.Worker/Hub/HubBroadcaster.cs

@@ -40,9 +40,6 @@ public sealed class HubBroadcaster : IPrimeBroadcaster, IRefineBroadcaster
     public Task ListUpdated(string listId) =>
         _hub.Clients.All.SendAsync("ListUpdated", listId);
 
-    public Task RunCreated(string taskId, int runNumber, bool isRetry) =>
-        _hub.Clients.All.SendAsync("RunCreated", taskId, runNumber, isRetry);
-
     public Task UsageUpdated(UsageSnapshotDto snapshot) =>
         _hub.Clients.All.SendAsync("UsageUpdated", snapshot);
 

src/ClaudeDo.Worker/Online/OnlineSyncService.cs

@@ -1,6 +1,7 @@
 using ClaudeDo.Data;
 using ClaudeDo.Data.Models;
 using ClaudeDo.Data.Repositories;
+using ClaudeDo.Worker.Hub;
 using ClaudeDo.Worker.Online.Interfaces;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Hosting;
@@ -15,19 +16,22 @@ public sealed class OnlineSyncService : BackgroundService
     private readonly IOnlineAuthProvider _auth;
     private readonly OnlineInboxConfig _config;
     private readonly ILogger<OnlineSyncService> _logger;
+    private readonly HubBroadcaster _broadcaster;
 
     public OnlineSyncService(
         IDbContextFactory<ClaudeDoDbContext> dbFactory,
         IOnlineInboxApi api,
         IOnlineAuthProvider auth,
         OnlineInboxConfig config,
-        ILogger<OnlineSyncService> logger)
+        ILogger<OnlineSyncService> logger,
+        HubBroadcaster broadcaster)
     {
         _dbFactory = dbFactory;
         _api = api;
         _auth = auth;
         _config = config;
         _logger = logger;
+        _broadcaster = broadcaster;
     }
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
@@ -129,6 +133,8 @@ public sealed class OnlineSyncService : BackgroundService
                 CommitType = CommitTypeRegistry.DefaultType,
             };
             await tasks.AddAsync(entity, ct);
+            // Without this the imported task only shows up after a manual reload.
+            await _broadcaster.TaskUpdated(entity.Id);
             await _api.MarkImportedAsync(remote.Id, ct);
 
             _logger.LogInformation("OnlineSyncService: imported task {Id} ('{Title}')", remote.Id, remote.Title);

src/ClaudeDo.Worker/Queue/QueueService.cs

@@ -346,9 +346,28 @@ public sealed class QueueService : BackgroundService
 
             await _runner.RunAsync(task, "queue", ct, alreadyClaimed: true);
         }
+        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).
+            _logger.LogInformation("Slot runner cancelled for task {TaskId}", taskId);
+        }
         catch (Exception ex)
         {
             _logger.LogError(ex, "Slot runner error for task {TaskId}", taskId);
+
+            // The picker already committed status='running' before this ran. Without this the
+            // task stays Running forever and the UI never hears about it — it keeps showing the
+            // pre-claim status because the raw-SQL claim itself never broadcasts.
+            try
+            {
+                await _state.FailAsync(taskId, DateTime.UtcNow,
+                    $"Slot runner error: {ex.Message}", CancellationToken.None);
+            }
+            catch (Exception failEx)
+            {
+                _logger.LogError(failEx, "Could not mark task {TaskId} as failed after a slot error", taskId);
+            }
         }
     }
 }

src/ClaudeDo.Worker/Runner/TaskRunner.cs

@@ -311,6 +311,9 @@ public sealed class TaskRunner
             {
                 var wtCtx = await _wtManager.CreateAsync(task, list, ct);
                 await _broadcaster.WorkerLog($"Created worktree for \"{task.Title}\"", WorkerLogLevel.Info, DateTime.UtcNow);
+                // The worktrees row was just inserted; without this the UI keeps showing the task
+                // as having no worktree until some unrelated event happens to refresh it.
+                await _broadcaster.WorktreeUpdated(task.Id);
                 return new RunDirResult(wtCtx.WorktreePath, wtCtx, null);
             }
             catch (Exception ex)
@@ -355,8 +358,6 @@ public sealed class TaskRunner
             await taskRepo.SetLogPathAsync(taskId, logPath, ct);
         }
 
-        await _broadcaster.RunCreated(taskId, runNumber, isRetry);
-
         var arguments = _argsBuilder.Build(config);
 
         await using var logWriter = new LogWriter(logPath);