fix: resolve critical bugs and improve reliability across worker, data, UI

- Fix worker using wrong DB by defaulting to CurrentUser service account
  and expanding ~ to absolute paths at install time
- Fix DbContext disposed before fire-and-forget by passing taskId instead
  of TaskEntity into RunInSlotAsync, which creates its own context
- Fix ActiveTaskDto property casing mismatch between hub and client
- Move WAL mode PRAGMA before migrations to prevent concurrent lock issues
- Replace FirstAsync with FirstOrDefaultAsync + null guards in tag operations
- Add delete confirmation flow for lists
- Log fire-and-forget exceptions instead of swallowing them
- Broadcast RunCreated event from WorkerHub.RunNow
- Add IDisposable to MainWindowViewModel for event handler cleanup
- Preserve subtask CreatedAt on updates instead of overwriting
- Replace bare catch blocks with Debug.WriteLine logging

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

docs/superpowers/specs/2026-04-16-subtask-tree-view-design.md

@@ -0,0 +1,118 @@
+# Subtask Tree View in Task List
+
+## Problem
+
+Subtasks are invisible in the task list — users only see them after opening the detail pane or editor modal. This makes it hard to get an overview of task progress without clicking into each task individually.
+
+## Solution
+
+Show subtasks indented below their parent task in the task list, with expand/collapse. Tasks start collapsed with a visual indicator when subtasks exist.
+
+## Scope
+
+Pure UI/ViewModel change. No data model changes, no new migrations, no repository schema changes.
+
+## Design
+
+### ViewModel Changes
+
+**TaskItemViewModel** — add:
+
+- `ObservableCollection<SubtaskItemViewModel> Subtasks` — populated on first expand
+- `bool IsExpanded` — observable, default `false`; toggles subtask visibility
+- `bool HasSubtasks` — observable, set during initial load from a count query
+- `int SubtaskCount` — observable, used for the indicator
+- `ToggleExpandedCommand` — flips `IsExpanded`; on first expand, loads subtasks from `SubtaskRepository.GetByTaskIdAsync`
+- `ToggleSubtaskDoneCommand(string subtaskId)` — toggles a subtask's `Completed` and persists via `SubtaskRepository.UpdateAsync`
+
+Constructor gains `SubtaskRepository` and initial `subtaskCount` parameter.
+
+**TaskListViewModel.LoadAsync** — after fetching tasks, run a single batch query to get subtask counts per task. Pass counts into each `TaskItemViewModel`. This avoids N+1 queries on load.
+
+**TaskListViewModel.RefreshSingleAsync** — if the refreshed task's `IsExpanded` is true, also reload its subtasks from DB and update the collection.
+
+### Repository Changes
+
+**SubtaskRepository** — add one method:
+
+```csharp
+Task<Dictionary<string, int>> GetCountsByTaskIdsAsync(IEnumerable<string> taskIds, CancellationToken ct = default)
+```
+
+Single query: `SELECT task_id, COUNT(*) FROM subtasks WHERE task_id IN (...) GROUP BY task_id`. Returns a map of taskId -> count. Tasks with no subtasks won't appear in the result (count defaults to 0).
+
+### XAML Changes
+
+**TaskListView.axaml** — the `DataTemplate` for `TaskItemViewModel` becomes a 2-row grid:
+
+```
+Row 0: [ExpandChevron] [StatusCircle] [Title + Tags/Status subtitle]
+Row 1: [SubtaskItemsControl, margin-left ~40px, visible when IsExpanded]
+```
+
+**Row 0 — Expand chevron:**
+- Column 0 gets a small chevron button (12x12 `Path` data) before the status circle
+- Right-pointing when collapsed, down-pointing when expanded
+- Bound to `ToggleExpandedCommand`
+- Only visible when `HasSubtasks` is true (via `IsVisible` binding)
+- When `HasSubtasks` is false, the space is empty but reserved (fixed-width column) so all titles align
+
+**Row 1 — Subtask list:**
+- `ItemsControl` bound to `Subtasks`
+- `IsVisible` bound to `IsExpanded`
+- Left margin ~40px for visual indentation
+- Each subtask item: `CheckBox` (bound to `Completed`) + `TextBlock` (bound to `Title`)
+- Subtask row has its own context menu flyout with "Edit Task" (opens parent task's editor modal via `EditTaskCommand` on root `TaskListViewModel`)
+- Checkbox toggle calls `ToggleSubtaskDoneCommand` on the parent `TaskItemViewModel`
+
+**Column layout change:** The existing 2-column `Grid` (`Auto, *`) gets a third column prepended: `Auto, Auto, *`. The chevron goes in column 0, status circle in column 1, title stack in column 2. Row 1 spans all 3 columns.
+
+### Subtask Checkbox Interaction
+
+When a subtask checkbox is toggled in the list:
+1. Update the `SubtaskItemViewModel.Completed` property
+2. Call `SubtaskRepository.UpdateAsync` with the updated entity (same auto-save pattern as `TaskDetailView`)
+3. No need to refresh the parent task — subtask completion doesn't affect task status
+
+### Subtask Context Menu
+
+Right-click on a subtask row shows:
+- "Edit Task" — opens the parent task's editor modal (same flow as `EditTaskCommand`)
+
+This reuses the existing editor which already has full subtask editing (add/remove/reorder/rename).
+
+### Real-time Updates
+
+When `RefreshSingleAsync` fires (via SignalR `TaskUpdatedEvent`):
+1. Reload subtask count, update `HasSubtasks` and `SubtaskCount`
+2. If `IsExpanded`, reload subtask list from DB and reconcile with the observable collection
+
+### Detail Pane Sync
+
+When the user edits subtasks in `TaskDetailView` (auto-save) or `TaskEditorView` (batch-save), the list view's subtask state may become stale. Two options:
+
+**Chosen approach:** The detail pane and editor already trigger `TaskUpdatedEvent` (or the editor's save path calls `RefreshSingleAsync` via `SelectedTask.Refresh`). Extend `Refresh` on `TaskItemViewModel` to also reload subtasks if expanded, and update `HasSubtasks`/`SubtaskCount`.
+
+### Visual Style
+
+- Chevron: 10x10 path, `TextDimBrush` color, no background, cursor=Hand
+- Subtask rows: smaller font (12px), `TextDimBrush` for unchecked title, strikethrough + dimmed for completed
+- Subtask checkbox: standard Avalonia `CheckBox` (no custom circular border), small size
+- Subtask row vertical padding: 2px (compact)
+- Indent: 40px left margin on the subtask `ItemsControl`
+
+## Files to Modify
+
+1. `src/ClaudeDo.Data/Repositories/SubtaskRepository.cs` — add `GetCountsByTaskIdsAsync`
+2. `src/ClaudeDo.Ui/ViewModels/TaskItemViewModel.cs` — add subtask collection, expand/collapse, toggle done
+3. `src/ClaudeDo.Ui/ViewModels/TaskListViewModel.cs` — batch-load counts, pass SubtaskRepository, extend refresh
+4. `src/ClaudeDo.Ui/Views/TaskListView.axaml` — restructure item template with chevron + nested ItemsControl
+5. `src/ClaudeDo.Ui/Views/TaskListView.axaml.cs` — handle subtask context menu pointer-pressed if needed
+6. `src/ClaudeDo.App/Program.cs` — pass SubtaskRepository to TaskListViewModel (if not already available via DI)
+
+## Out of Scope
+
+- Drag-to-reorder subtasks in the list view
+- Add subtask directly from the list view
+- Subtask progress indicator (e.g., "2/5 done") on collapsed tasks
+- Recursive task nesting (tasks containing tasks)

src/ClaudeDo.Data/ClaudeDoDbContext.cs

@@ -30,35 +30,48 @@ public class ClaudeDoDbContext : DbContext
     /// </summary>
     public static void MigrateAndConfigure(ClaudeDoDbContext db)
     {
-        // If the 'lists' table exists but __EFMigrationsHistory does not,
-        // this is a pre-EF database. Baseline the InitialCreate migration.
         var conn = db.Database.GetDbConnection();
-        conn.Open();
+        try
-        using (var cmd = conn.CreateCommand())
         {
-            cmd.CommandText = "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='lists'";
+            conn.Open();
-            var hasLists = Convert.ToInt64(cmd.ExecuteScalar()) > 0;
 
-            cmd.CommandText = "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='__EFMigrationsHistory'";
+            // Set WAL FIRST, before migrations — prevents write-lock contention
-            var hasHistory = Convert.ToInt64(cmd.ExecuteScalar()) > 0;
+            // when UI and Worker start simultaneously.
-
+            using (var walCmd = conn.CreateCommand())
-            if (hasLists && !hasHistory)
             {
-                // Create the history table and mark InitialCreate as applied.
+                walCmd.CommandText = "PRAGMA journal_mode=wal;";
-                cmd.CommandText = """
+                walCmd.ExecuteNonQuery();
-                    CREATE TABLE "__EFMigrationsHistory" (
+            }
-                        "MigrationId" TEXT NOT NULL CONSTRAINT "PK___EFMigrationsHistory" PRIMARY KEY,
+
-                        "ProductVersion" TEXT NOT NULL
+            // If the 'lists' table exists but __EFMigrationsHistory does not,
-                    );
+            // this is a pre-EF database. Baseline the InitialCreate migration.
-                    INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+            using (var cmd = conn.CreateCommand())
-                    VALUES ('20260416064948_InitialCreate', '8.0.11');
+            {
-                    """;
+                cmd.CommandText = "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='lists'";
-                cmd.ExecuteNonQuery();
+                var hasLists = Convert.ToInt64(cmd.ExecuteScalar()) > 0;
+
+                cmd.CommandText = "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='__EFMigrationsHistory'";
+                var hasHistory = Convert.ToInt64(cmd.ExecuteScalar()) > 0;
+
+                if (hasLists && !hasHistory)
+                {
+                    cmd.CommandText = """
+                        CREATE TABLE "__EFMigrationsHistory" (
+                            "MigrationId" TEXT NOT NULL CONSTRAINT "PK___EFMigrationsHistory" PRIMARY KEY,
+                            "ProductVersion" TEXT NOT NULL
+                        );
+                        INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+                        VALUES ('20260416064948_InitialCreate', '8.0.11');
+                        """;
+                    cmd.ExecuteNonQuery();
+                }
             }
         }
-        conn.Close();
+        finally
+        {
+            conn.Close();
+        }
 
         db.Database.Migrate();
-        db.Database.ExecuteSqlRaw("PRAGMA journal_mode=WAL");
     }
 }

src/ClaudeDo.Data/Repositories/ListRepository.cs

@@ -46,7 +46,8 @@ public sealed class ListRepository
 
     public async Task AddTagAsync(string listId, long tagId, CancellationToken ct = default)
     {
-        var list = await _context.Lists.Include(l => l.Tags).FirstAsync(l => l.Id == listId, ct);
+        var list = await _context.Lists.Include(l => l.Tags).FirstOrDefaultAsync(l => l.Id == listId, ct);
+        if (list is null) return;
         var tag = await _context.Tags.FindAsync([tagId], ct);
         if (tag is not null && !list.Tags.Any(t => t.Id == tagId))
         {
@@ -57,7 +58,8 @@ public sealed class ListRepository
 
     public async Task RemoveTagAsync(string listId, long tagId, CancellationToken ct = default)
     {
-        var list = await _context.Lists.Include(l => l.Tags).FirstAsync(l => l.Id == listId, ct);
+        var list = await _context.Lists.Include(l => l.Tags).FirstOrDefaultAsync(l => l.Id == listId, ct);
+        if (list is null) return;
         var tag = list.Tags.FirstOrDefault(t => t.Id == tagId);
         if (tag is not null)
         {

src/ClaudeDo.Data/Repositories/TaskRepository.cs

@@ -104,7 +104,8 @@ public sealed class TaskRepository
 
     public async Task AddTagAsync(string taskId, long tagId, CancellationToken ct = default)
     {
-        var task = await _context.Tasks.Include(t => t.Tags).FirstAsync(t => t.Id == taskId, ct);
+        var task = await _context.Tasks.Include(t => t.Tags).FirstOrDefaultAsync(t => t.Id == taskId, ct);
+        if (task is null) return;
         var tag = await _context.Tags.FindAsync([tagId], ct);
         if (tag is not null && !task.Tags.Any(t => t.Id == tagId))
         {
@@ -115,7 +116,8 @@ public sealed class TaskRepository
 
     public async Task RemoveTagAsync(string taskId, long tagId, CancellationToken ct = default)
     {
-        var task = await _context.Tasks.Include(t => t.Tags).FirstAsync(t => t.Id == taskId, ct);
+        var task = await _context.Tasks.Include(t => t.Tags).FirstOrDefaultAsync(t => t.Id == taskId, ct);
+        if (task is null) return;
         var tag = task.Tags.FirstOrDefault(t => t.Id == tagId);
         if (tag is not null)
         {

src/ClaudeDo.Installer/Core/InstallContext.cs

@@ -22,7 +22,7 @@ public sealed class InstallContext
     public int SignalRPort { get; set; } = 47_821;
     public int QueueBackstopIntervalMs { get; set; } = 30_000;
     public string ClaudeBin { get; set; } = "claude";
-    public string ServiceAccount { get; set; } = "LocalSystem";
+    public string ServiceAccount { get; set; } = "CurrentUser";
     public bool AutoStart { get; set; } = true;
     public int RestartDelayMs { get; set; } = 5000;
 

src/ClaudeDo.Installer/Steps/WriteConfigStep.cs

@@ -1,3 +1,4 @@
+using ClaudeDo.Data;
 using ClaudeDo.Installer.Core;
 
 namespace ClaudeDo.Installer.Steps;
@@ -10,13 +11,15 @@ public sealed class WriteConfigStep : IInstallStep
     {
         try
         {
+            // Expand ~ to the installing user's absolute path so the worker
+            // service always finds the correct DB regardless of service account.
             var workerCfg = new InstallerWorkerConfig
             {
-                DbPath = ctx.DbPath,
+                DbPath = Paths.Expand(ctx.DbPath),
-                SandboxRoot = ctx.SandboxRoot,
+                SandboxRoot = Paths.Expand(ctx.SandboxRoot),
-                LogRoot = ctx.LogRoot,
+                LogRoot = Paths.Expand(ctx.LogRoot),
                 WorktreeRootStrategy = ctx.WorktreeRootStrategy,
-                CentralWorktreeRoot = ctx.CentralWorktreeRoot,
+                CentralWorktreeRoot = Paths.Expand(ctx.CentralWorktreeRoot),
                 QueueBackstopIntervalMs = ctx.QueueBackstopIntervalMs,
                 SignalRPort = ctx.SignalRPort,
                 ClaudeBin = ctx.ClaudeBin,

src/ClaudeDo.Ui/Services/WorkerClient.cs

@@ -2,6 +2,7 @@ using System.Collections.ObjectModel;
 using Avalonia.Threading;
 using ClaudeDo.Data.Models;
 using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.AspNetCore.SignalR.Client;
 
 namespace ClaudeDo.Ui.Services;
@@ -208,9 +209,13 @@ public partial class WorkerClient : ObservableObject, IAsyncDisposable
                     ActiveTasks.Add(new ActiveTask(a.Slot, a.TaskId, a.StartedAt));
             });
         }
-        catch
+        catch (HubException)
         {
-            // Worker might not support GetActive yet
+            // Expected: worker doesn't support GetActive yet
+        }
+        catch (Exception ex)
+        {
+            System.Diagnostics.Debug.WriteLine($"SeedActiveTasksAsync failed: {ex}");
         }
     }
 

src/ClaudeDo.Ui/ViewModels/MainWindowViewModel.cs

@@ -13,7 +13,7 @@ using Microsoft.EntityFrameworkCore;
 
 namespace ClaudeDo.Ui.ViewModels;
 
-public partial class MainWindowViewModel : ViewModelBase
+public partial class MainWindowViewModel : ViewModelBase, IDisposable
 {
     private readonly IDbContextFactory<ClaudeDoDbContext> _dbFactory;
     private readonly WorkerClient _worker;
@@ -27,6 +27,8 @@ public partial class MainWindowViewModel : ViewModelBase
     public TaskDetailViewModel TaskDetail { get; }
     public StatusBarViewModel StatusBar { get; }
 
+    private readonly Action<string> _onTaskChanged;
+
     public MainWindowViewModel(
         IDbContextFactory<ClaudeDoDbContext> dbFactory,
         WorkerClient worker,
@@ -42,8 +44,15 @@ public partial class MainWindowViewModel : ViewModelBase
         TaskDetail = taskDetail;
         StatusBar = statusBar;
 
+        _onTaskChanged = taskId => _ = TaskList.RefreshSingleAsync(taskId);
         TaskList.SelectedTaskChanged += OnSelectedTaskChanged;
-        TaskDetail.TaskChanged += taskId => _ = TaskList.RefreshSingleAsync(taskId);
+        TaskDetail.TaskChanged += _onTaskChanged;
+    }
+
+    public void Dispose()
+    {
+        TaskList.SelectedTaskChanged -= OnSelectedTaskChanged;
+        TaskDetail.TaskChanged -= _onTaskChanged;
     }
 
     public async Task InitializeAsync()
@@ -61,7 +70,11 @@ public partial class MainWindowViewModel : ViewModelBase
             StatusBar.ShowMessage($"Error loading lists: {ex.Message}");
         }
 
-        _ = _worker.StartAsync();
+        _ = _worker.StartAsync().ContinueWith(t =>
+        {
+            if (t.IsFaulted)
+                System.Diagnostics.Debug.WriteLine($"Worker connection failed: {t.Exception?.Message}");
+        }, TaskScheduler.Default);
     }
 
     partial void OnSelectedListChanged(ListItemViewModel? value)
@@ -154,23 +167,46 @@ public partial class MainWindowViewModel : ViewModelBase
         }
     }
 
+    [ObservableProperty] private bool _isDeleteConfirmVisible;
+    private ListItemViewModel? _pendingDeleteList;
+
     [RelayCommand]
-    private async Task DeleteList()
+    private void DeleteList()
     {
         if (SelectedList is null) return;
-        // TODO: confirmation dialog
+        _pendingDeleteList = SelectedList;
+        IsDeleteConfirmVisible = true;
+    }
+
+    [RelayCommand]
+    private async Task ConfirmDeleteList()
+    {
+        IsDeleteConfirmVisible = false;
+        if (_pendingDeleteList is null) return;
         try
         {
             using var context = _dbFactory.CreateDbContext();
             var listRepo = new ListRepository(context);
-            await listRepo.DeleteAsync(SelectedList.Id);
+            await listRepo.DeleteAsync(_pendingDeleteList.Id);
-            Lists.Remove(SelectedList);
+            Lists.Remove(_pendingDeleteList);
-            SelectedList = null;
+            if (SelectedList == _pendingDeleteList)
+                SelectedList = null;
         }
         catch (Exception ex)
         {
             StatusBar.ShowMessage($"Error deleting list: {ex.Message}");
         }
+        finally
+        {
+            _pendingDeleteList = null;
+        }
+    }
+
+    [RelayCommand]
+    private void CancelDeleteList()
+    {
+        IsDeleteConfirmVisible = false;
+        _pendingDeleteList = null;
     }
 
     private static async Task ShowDialogAsync(Window dialog)

src/ClaudeDo.Ui/ViewModels/TaskDetailViewModel.cs

@@ -282,16 +282,18 @@ public partial class TaskDetailViewModel : ViewModelBase
         if (e.PropertyName is not (nameof(SubtaskItemViewModel.Title) or nameof(SubtaskItemViewModel.Completed))) return;
         try
         {
+            if (_taskId is null) return;
             using var context = _dbFactory.CreateDbContext();
+            var orig = await context.Subtasks.AsNoTracking().FirstOrDefaultAsync(s => s.Id == vm.Id);
             var subtaskRepo = new SubtaskRepository(context);
             await subtaskRepo.UpdateAsync(new SubtaskEntity
             {
                 Id = vm.Id,
-                TaskId = _taskId ?? "",
+                TaskId = _taskId,
                 Title = vm.Title,
                 Completed = vm.Completed,
                 OrderNum = Subtasks.IndexOf(vm),
-                CreatedAt = DateTime.UtcNow,
+                CreatedAt = orig?.CreatedAt ?? DateTime.UtcNow,
             });
         }
         catch (Exception ex)
@@ -378,13 +380,15 @@ public partial class TaskDetailViewModel : ViewModelBase
                 UseShellExecute = true,
             });
         }
-        catch { /* best effort */ }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Failed to open worktree: {ex.Message}");
+        }
     }
 
     [RelayCommand]
     private void ShowDiff()
     {
-        // TODO: open a proper diff viewer; for now open git diff in a console
         if (WorktreePath is null) return;
         try
         {
@@ -395,7 +399,10 @@ public partial class TaskDetailViewModel : ViewModelBase
                 UseShellExecute = true,
             });
         }
-        catch { /* best effort */ }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Failed to show diff: {ex.Message}");
+        }
     }
 
     [RelayCommand]

src/ClaudeDo.Ui/ViewModels/TaskEditorViewModel.cs

@@ -215,7 +215,10 @@ public partial class TaskEditorViewModel : ViewModelBase
             {
                 if (vm.Id == "") continue;
                 if (vm.Title != vm.OriginalTitle || vm.Completed != vm.OriginalCompleted)
-                    await subtaskRepo.UpdateAsync(new SubtaskEntity { Id = vm.Id, TaskId = taskId, Title = vm.Title, Completed = vm.Completed, OrderNum = idx, CreatedAt = DateTime.UtcNow });
+                {
+                    var origSub = existing.FirstOrDefault(e => e.Id == vm.Id);
+                    await subtaskRepo.UpdateAsync(new SubtaskEntity { Id = vm.Id, TaskId = taskId, Title = vm.Title, Completed = vm.Completed, OrderNum = idx, CreatedAt = origSub?.CreatedAt ?? DateTime.UtcNow });
+                }
                 else
                 {
                     // update order_num if position changed

src/ClaudeDo.Worker/Hub/WorkerHub.cs

@@ -5,6 +5,8 @@ using Microsoft.AspNetCore.SignalR;
 
 namespace ClaudeDo.Worker.Hub;
 
+public record ActiveTaskDto(string Slot, string TaskId, DateTime StartedAt);
+
 public sealed class WorkerHub : Microsoft.AspNetCore.SignalR.Hub
 {
     private static readonly string Version =
@@ -12,19 +14,21 @@ public sealed class WorkerHub : Microsoft.AspNetCore.SignalR.Hub
 
     private readonly QueueService _queue;
     private readonly AgentFileService _agentService;
+    private readonly HubBroadcaster _broadcaster;
 
-    public WorkerHub(QueueService queue, AgentFileService agentService)
+    public WorkerHub(QueueService queue, AgentFileService agentService, HubBroadcaster broadcaster)
     {
         _queue = queue;
         _agentService = agentService;
+        _broadcaster = broadcaster;
     }
 
     public string Ping() => $"pong v{Version}";
 
-    public IReadOnlyList<object> GetActive()
+    public IReadOnlyList<ActiveTaskDto> GetActive()
     {
         return _queue.GetActive()
-            .Select(a => (object)new { slot = a.slot, taskId = a.taskId, startedAt = a.startedAt })
+            .Select(a => new ActiveTaskDto(a.slot, a.taskId, a.startedAt))
             .ToList();
     }
 
@@ -33,6 +37,7 @@ public sealed class WorkerHub : Microsoft.AspNetCore.SignalR.Hub
         try
         {
             await _queue.RunNow(taskId);
+            await _broadcaster.RunCreated(taskId, 1, false);
         }
         catch (InvalidOperationException)
         {

src/ClaudeDo.Worker/Services/QueueService.cs

@@ -58,11 +58,13 @@ public sealed class QueueService : BackgroundService
 
     public async Task RunNow(string taskId)
     {
-        using var context = _dbFactory.CreateDbContext();
+        using (var context = _dbFactory.CreateDbContext())
-        var taskRepo = new TaskRepository(context);
+        {
-        var task = await taskRepo.GetByIdAsync(taskId);
+            var taskRepo = new TaskRepository(context);
-        if (task is null)
+            var exists = await taskRepo.GetByIdAsync(taskId);
-            throw new KeyNotFoundException($"Task '{taskId}' not found.");
+            if (exists is null)
+                throw new KeyNotFoundException($"Task '{taskId}' not found.");
+        }
 
         lock (_lock)
         {
@@ -72,8 +74,10 @@ public sealed class QueueService : BackgroundService
             var cts = new CancellationTokenSource();
             _overrideSlot = new QueueSlotState { TaskId = taskId, StartedAt = DateTime.UtcNow, Cts = cts };
 
-            _ = RunInSlotAsync(task, "override", cts.Token).ContinueWith(_ =>
+            _ = RunInSlotAsync(taskId, "override", cts.Token).ContinueWith(t =>
             {
+                if (t.IsFaulted)
+                    _logger.LogError(t.Exception, "RunInSlotAsync failed for task {TaskId}", taskId);
                 lock (_lock) { _overrideSlot = null; }
                 cts.Dispose();
             }, TaskScheduler.Default);
@@ -98,8 +102,10 @@ public sealed class QueueService : BackgroundService
             var cts = new CancellationTokenSource();
             _overrideSlot = new QueueSlotState { TaskId = taskId, StartedAt = DateTime.UtcNow, Cts = cts };
 
-            _ = RunContinueInSlotAsync(taskId, followUpPrompt, cts.Token).ContinueWith(_ =>
+            _ = RunContinueInSlotAsync(taskId, followUpPrompt, cts.Token).ContinueWith(t =>
             {
+                if (t.IsFaulted)
+                    _logger.LogError(t.Exception, "RunContinueInSlotAsync failed for task {TaskId}", taskId);
                 lock (_lock) { _overrideSlot = null; }
                 cts.Dispose();
             }, TaskScheduler.Default);
@@ -165,8 +171,10 @@ public sealed class QueueService : BackgroundService
                     var cts = CancellationTokenSource.CreateLinkedTokenSource(stoppingToken);
                     _queueSlot = new QueueSlotState { TaskId = task.Id, StartedAt = DateTime.UtcNow, Cts = cts };
 
-                    _ = RunInSlotAsync(task, "queue", cts.Token).ContinueWith(_ =>
+                    _ = RunInSlotAsync(task.Id, "queue", cts.Token).ContinueWith(t =>
                     {
+                        if (t.IsFaulted)
+                            _logger.LogError(t.Exception, "RunInSlotAsync failed for task {TaskId} in queue slot", task.Id);
                         lock (_lock) { _queueSlot = null; }
                         cts.Dispose();
                         WakeQueue(); // Check for next task immediately.
@@ -186,16 +194,25 @@ public sealed class QueueService : BackgroundService
         _logger.LogInformation("QueueService stopping");
     }
 
-    private async Task RunInSlotAsync(TaskEntity task, string slot, CancellationToken ct)
+    private async Task RunInSlotAsync(string taskId, string slot, CancellationToken ct)
     {
         try
         {
-            _logger.LogInformation("Starting task {TaskId} in {Slot} slot", task.Id, slot);
+            _logger.LogInformation("Starting task {TaskId} in {Slot} slot", taskId, slot);
+
+            TaskEntity task;
+            using (var context = _dbFactory.CreateDbContext())
+            {
+                var taskRepo = new TaskRepository(context);
+                task = await taskRepo.GetByIdAsync(taskId, ct)
+                    ?? throw new KeyNotFoundException($"Task '{taskId}' not found.");
+            }
+
             await _runner.RunAsync(task, slot, ct);
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "Slot runner error for task {TaskId}", task.Id);
+            _logger.LogError(ex, "Slot runner error for task {TaskId}", taskId);
         }
     }