fix(installer): expand ~ in UiDbPath

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.gitea/workflows/release.yml

@@ -0,0 +1,174 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    env:
+      DOTNET_ROOT: /home/mika/.dotnet
+      GITEA_API: https://git.kuns.dev/api/v1
+      REPO: releases/ClaudeDo
+    steps:
+      - name: Resolve version
+        id: ver
+        run: |
+          set -euo pipefail
+          TAG="${{ github.ref_name }}"
+          VERSION="${TAG#v}"
+          echo "tag=$TAG"         >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "Building version: $VERSION (tag: $TAG)"
+
+      - name: Prepare workspace
+        id: ws
+        run: |
+          set -euo pipefail
+          WORK="$(mktemp -d -t claudedo-release-XXXXXX)"
+          echo "dir=$WORK" >> "$GITHUB_OUTPUT"
+          echo "Workspace: $WORK"
+
+      - name: Checkout tag
+        env:
+          TOKEN: ${{ secrets.GITEA_TOKEN }}
+          WORK:  ${{ steps.ws.outputs.dir }}
+          TAG:   ${{ steps.ver.outputs.tag }}
+        run: |
+          set -euo pipefail
+          git clone --depth 1 --branch "$TAG" \
+            "https://oauth2:${TOKEN}@git.kuns.dev/${REPO}.git" \
+            "$WORK/src"
+          git -C "$WORK/src" log -1 --oneline
+
+      - name: Publish ClaudeDo.App (win-x64, self-contained)
+        env:
+          WORK:    ${{ steps.ws.outputs.dir }}
+          VERSION: ${{ steps.ver.outputs.version }}
+        run: |
+          set -euo pipefail
+          export PATH="$DOTNET_ROOT:$PATH"
+          cd "$WORK/src"
+          dotnet publish src/ClaudeDo.App/ClaudeDo.App.csproj \
+            -c Release -r win-x64 --self-contained true \
+            /p:Version=$VERSION -o out/app
+
+      - name: Publish ClaudeDo.Worker (win-x64, self-contained)
+        env:
+          WORK:    ${{ steps.ws.outputs.dir }}
+          VERSION: ${{ steps.ver.outputs.version }}
+        run: |
+          set -euo pipefail
+          export PATH="$DOTNET_ROOT:$PATH"
+          cd "$WORK/src"
+          dotnet publish src/ClaudeDo.Worker/ClaudeDo.Worker.csproj \
+            -c Release -r win-x64 --self-contained true \
+            /p:Version=$VERSION -o out/worker
+
+      - name: Publish ClaudeDo.Installer (win-x64, single-file, framework-dependent)
+        env:
+          WORK:    ${{ steps.ws.outputs.dir }}
+          VERSION: ${{ steps.ver.outputs.version }}
+        run: |
+          set -euo pipefail
+          export PATH="$DOTNET_ROOT:$PATH"
+          cd "$WORK/src"
+          # Framework-dependent — WPF runtime pack isn't distributed on Linux SDK;
+          # the previous self-contained bundle crashed at startup (apphost AV).
+          # Target machines need .NET 8 Desktop Runtime (x64).
+          dotnet publish src/ClaudeDo.Installer/ClaudeDo.Installer.csproj \
+            -c Release -r win-x64 --self-contained false \
+            /p:Version=$VERSION /p:PublishSingleFile=true \
+            -o out/installer
+
+      - name: Package assets
+        env:
+          WORK:    ${{ steps.ws.outputs.dir }}
+          VERSION: ${{ steps.ver.outputs.version }}
+        run: |
+          set -euo pipefail
+          cd "$WORK/src"
+          mkdir -p assets
+
+          # 1) App + Worker bundle (top-level dirs /app and /worker)
+          rm -rf bundle
+          mkdir -p bundle
+          cp -r out/app    bundle/app
+          cp -r out/worker bundle/worker
+          ZIP_NAME="ClaudeDo-${VERSION}-win-x64.zip"
+          ( cd bundle && zip -r -q "../assets/${ZIP_NAME}" app worker )
+
+          # 2) Installer single-file exe (renamed)
+          INSTALLER_EXE=$(ls out/installer/*.exe | head -n 1)
+          if [ -z "$INSTALLER_EXE" ]; then
+            echo "::error::No .exe produced by installer publish" >&2
+            exit 1
+          fi
+          cp "$INSTALLER_EXE" "assets/ClaudeDo.Installer-${VERSION}.exe"
+
+          # 3) Checksums (sha256, relative filenames)
+          ( cd assets && sha256sum \
+              "ClaudeDo-${VERSION}-win-x64.zip" \
+              "ClaudeDo.Installer-${VERSION}.exe" \
+              > checksums.txt )
+
+          echo "--- assets ---"
+          ls -la assets
+
+      - name: Create Gitea Release
+        id: release
+        env:
+          WORK:  ${{ steps.ws.outputs.dir }}
+          TAG:   ${{ steps.ver.outputs.tag }}
+          TOKEN: ${{ secrets.GITEA_TOKEN }}
+        run: |
+          set -euo pipefail
+          BODY=$(jq -n \
+            --arg tag  "$TAG" \
+            --arg name "$TAG" \
+            '{tag_name:$tag, name:$name, body:"", draft:false, prerelease:false, target_commitish:"main"}')
+          RESP=$(curl -sS -X POST \
+            -H "Authorization: token ${TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "$BODY" \
+            "${GITEA_API}/repos/${REPO}/releases")
+          RELEASE_ID=$(echo "$RESP" | jq -r '.id // empty')
+          if [ -z "$RELEASE_ID" ] || [ "$RELEASE_ID" = "null" ]; then
+            echo "::error::Release creation failed" >&2
+            echo "$RESP" >&2
+            exit 1
+          fi
+          echo "release_id=$RELEASE_ID" >> "$GITHUB_OUTPUT"
+          echo "Created release id=$RELEASE_ID for tag=$TAG"
+
+      - name: Upload release assets
+        env:
+          WORK:       ${{ steps.ws.outputs.dir }}
+          VERSION:    ${{ steps.ver.outputs.version }}
+          RELEASE_ID: ${{ steps.release.outputs.release_id }}
+          TOKEN:      ${{ secrets.GITEA_TOKEN }}
+        run: |
+          set -euo pipefail
+          cd "$WORK/src/assets"
+          for f in \
+            "ClaudeDo-${VERSION}-win-x64.zip" \
+            "ClaudeDo.Installer-${VERSION}.exe" \
+            "checksums.txt"
+          do
+            echo "Uploading: $f"
+            curl -sS --fail-with-body -X POST \
+              -H "Authorization: token ${TOKEN}" \
+              -F "attachment=@${f}" \
+              "${GITEA_API}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=${f}" \
+              > /dev/null
+          done
+          echo "All assets uploaded."
+
+      - name: Cleanup workspace
+        if: always()
+        env:
+          WORK: ${{ steps.ws.outputs.dir }}
+        run: |
+          rm -rf "$WORK" || true

.gitignore

@@ -61,3 +61,4 @@ Desktop.ini
 *.log
 *.tmp
 *.bak
+design-time.db

CLAUDE.md

@@ -15,7 +15,7 @@ Two-process system communicating over SignalR (`127.0.0.1:47821`):
 ## Tech Stack
 
 - .NET 8.0, Avalonia 12.0.0 (Fluent theme)
-- SQLite (WAL mode) via Microsoft.Data.Sqlite — raw ADO.NET, no ORM
+- SQLite (WAL mode) via Entity Framework Core (Microsoft.EntityFrameworkCore.Sqlite)
 - SignalR for real-time IPC
 - CommunityToolkit.Mvvm (`[ObservableProperty]`, `[RelayCommand]`)
 - Git worktrees for task isolation
@@ -27,12 +27,14 @@ Two-process system communicating over SignalR (`127.0.0.1:47821`):
 - Worker config: `~/.todo-app/worker.config.json`
 - Logs: `~/.todo-app/logs/`
 - Worktrees: configured per worker (sibling or central strategy)
-- Schema: `schema/schema.sql` (embedded resource in ClaudeDo.Data)
 
 ## Conventions
 
 - Repository pattern — each entity has its own async repository
 - All data operations are async with CancellationToken support
+- EF Core migrations manage schema (Migrations/ folder in ClaudeDo.Data)
+- `IDbContextFactory<ClaudeDoDbContext>` used by singleton consumers (e.g. Worker)
+- Entity configuration via `IEntityTypeConfiguration<T>` in Configuration/ folder
 - Task status flow: Manual | Queued -> Running -> Done | Failed
 - Worktree state flow: Active -> Merged | Discarded | Kept
 - Tags "agent" and "manual" are seeded; "agent" tag marks tasks for automated queue pickup

ClaudeDo.slnx

@@ -9,5 +9,6 @@
   <Folder Name="/tests/">
     <Project Path="tests/ClaudeDo.Ui.Tests/ClaudeDo.Ui.Tests.csproj" />
     <Project Path="tests/ClaudeDo.Worker.Tests/ClaudeDo.Worker.Tests.csproj" />
+    <Project Path="tests/ClaudeDo.Installer.Tests/ClaudeDo.Installer.Tests.csproj" />
   </Folder>
 </Solution>

docs/superpowers/specs/2026-04-15-installer-download-mode-design.md

@@ -0,0 +1,316 @@
+# Installer: Download-Mode + Gitea Releases
+
+Date: 2026-04-15
+Status: Design — awaiting implementation plan
+
+## Goal
+
+Turn `ClaudeDo.Installer` into a self-contained tool that any user can run on
+any Windows machine to install, update, reconfigure, repair, or uninstall
+ClaudeDo. The installer pulls prebuilt binaries from a Gitea release on
+`git.kuns.dev` instead of building from source.
+
+End-user experience:
+
+1. Download `ClaudeDo.Installer-<version>.exe` from the releases page.
+2. Run it.
+3. Done — no .NET SDK, no source checkout, no manual steps.
+
+## Non-Goals
+
+- Code signing the installer or the app binaries (future concern).
+- Cross-platform installs (Windows-only, same as today).
+- In-app update notifications (the installer handles updates when run; the app
+  does not self-update).
+- Arbitrary-version selection UI. Installer always targets "latest" release.
+- A package-manager listing (winget/Chocolatey/Scoop). Future, separate spec.
+
+## Current State (2026-04-15)
+
+The existing installer (`src/ClaudeDo.Installer/`) is a WPF wizard that only
+works from inside a source checkout on a machine with the .NET SDK installed:
+
+- `PublishAppStep` runs `dotnet publish src/ClaudeDo.App/...`
+- `PublishWorkerStep` runs `dotnet publish src/ClaudeDo.Worker/...`
+- `DeployBinariesStep` copies `bin/Release/.../publish` into the install dir
+- Subsequent steps (`WriteConfigStep`, `InitDatabaseStep`,
+  `CreateShortcutsStep`, `RegisterServiceStep`) are fine to keep.
+
+The installer also contains a partial "Settings" window
+(`Views/SettingsWindow.xaml`, `Views/SettingsViewModel.cs`) — that wiring is
+reused for the Config view shown on subsequent launches (see Mode detection
+below).
+
+## High-Level Design
+
+Two pieces, each small:
+
+**1) A Gitea Actions workflow** that, on every `v*` tag push, builds the App,
+Worker, and Installer; packages them; and creates a Gitea Release on the
+public repo at `git.kuns.dev/releases/ClaudeDo`.
+
+The `releases/` org on the Gitea instance is world-readable without auth;
+private work (including the source repo, if you want) lives under `kuns/*`
+which is never public. The installer only needs to hit `releases/ClaudeDo`.
+
+**2) An installer rewrite** that replaces the three publish/deploy steps with
+a single `DownloadAndExtractStep`, detects existing installs via a marker
+file, and on subsequent launches checks the Gitea API for updates before
+deciding whether to show the Update flow or jump straight to the Config view.
+
+## Release Artifacts
+
+Each `v*` tag produces a Gitea Release with three assets:
+
+```
+ClaudeDo-<version>-win-x64.zip      # contains /app and /worker subdirs
+ClaudeDo.Installer-<version>.exe    # self-contained installer (no .NET needed)
+checksums.txt                       # SHA256 of the above
+```
+
+Decisions:
+
+- **One combined app+worker zip** (not two separate). Reasons: one download,
+  one extract, guaranteed version-locked pair.
+- **Self-contained installer exe** — user does not need .NET installed.
+- **App + Worker: self-contained** (`--self-contained true`, `-r win-x64`).
+  Zero runtime dependency on the target machine, at the cost of a larger
+  download (~100 MB combined zip). Decision: acceptable trade-off — the
+  installer is one-click, not per-user-problem-to-debug.
+- **Checksums file** — plain text, one line per asset (`<sha256>  <filename>`),
+  verified by installer before extract.
+
+The "latest installer exe" URL is stable:
+
+```
+https://git.kuns.dev/releases/ClaudeDo/releases/latest/download/ClaudeDo.Installer-<version>.exe
+```
+
+(Gitea also exposes `/releases/download/<tag>/<filename>` for specific
+versions.)
+
+## Gitea Actions Workflow
+
+File: `.gitea/workflows/release.yml`
+
+- **Trigger:** `push` on tags matching `v*`
+- **Runner:** Linux container with .NET 8 SDK (`dotnet publish -r win-x64`
+  works cross-platform). The installer itself requires Windows to run, but
+  `dotnet publish` can target `win-x64` from Linux.
+- **Steps:**
+  1. Checkout
+  2. Setup .NET 8 SDK
+  3. Derive version from tag (`${{ gitea.ref_name }}` without the `v` prefix)
+  4. `dotnet publish src/ClaudeDo.App -c Release -r win-x64 --self-contained true /p:Version=$VERSION -o out/app`
+  5. `dotnet publish src/ClaudeDo.Worker -c Release -r win-x64 --self-contained true /p:Version=$VERSION -o out/worker`
+  6. `dotnet publish src/ClaudeDo.Installer -c Release -r win-x64 --self-contained true /p:Version=$VERSION /p:PublishSingleFile=true -o out/installer`
+  7. Zip `out/app` + `out/worker` as `ClaudeDo-<version>-win-x64.zip` with
+     `app/` and `worker/` as top-level dirs
+  8. Copy `out/installer/ClaudeDo.Installer.exe` to
+     `ClaudeDo.Installer-<version>.exe`
+  9. Generate `checksums.txt` (`sha256sum` both files)
+  10. Create release via Gitea API using the built-in `${{ gitea.token }}`
+     (this token has repo write scope automatically on Actions runs). Release
+     name = tag name. Release notes = `git log` summary between previous tag
+     and this one (nice-to-have).
+
+The workflow needs **no custom secrets** — `gitea.token` is sufficient for
+creating releases on its own repo.
+
+## Installer Changes
+
+### New: `install.json` marker file
+
+Written at the end of every successful install or update to
+`{InstallDir}/install.json`:
+
+```json
+{
+  "version": "0.2.0",
+  "installDir": "C:\\Program Files\\ClaudeDo",
+  "workerDir": "C:\\Program Files\\ClaudeDo\\worker",
+  "installedAt": "2026-04-15T12:34:56Z"
+}
+```
+
+The installer reads this on startup (from the default install dir, or a
+path supplied via CLI arg) to decide which mode to run in.
+
+### Launch flow (`InstallModeDetector`)
+
+On every launch, the installer checks for `install.json` first:
+
+```
+install.json absent?
+  -> Install mode: Welcome -> Paths -> UiSettings -> Service -> Install
+                  (writes install.json at the end)
+
+install.json present?
+  -> Query https://git.kuns.dev/api/v1/repos/releases/ClaudeDo/releases/latest
+     (short timeout; if offline, treat as "no update available")
+
+     latest.tag_name > installed.version
+       -> Update mode: Welcome ("Update v0.1.0 -> v0.2.0, Update / Later")
+          If user accepts -> Install steps (download + swap service)
+          If user declines -> fall through to Config view
+     latest.tag_name <= installed.version  (or API unreachable)
+       -> Config view: directly open Paths/UiSettings/Service tabs,
+          prefilled from existing ~/.todo-app/*.json.
+          Action buttons: Save · Repair · Uninstall.
+```
+
+Key properties:
+
+- **First run = wizard**, as today — no behavior change for new users.
+- **Every subsequent run = update check first**, then either offer update or
+  drop straight into Config. No "Manage page" with a menu of actions — the
+  Config view *is* the default, and Repair/Uninstall are buttons on it.
+- **Offline / API error = not fatal**: if the release endpoint can't be
+  reached, the installer silently skips the update check and opens Config.
+  The user is never blocked from managing an existing install by a network
+  issue.
+- **Downgrade** (installed version > latest) is treated the same as "no
+  update available" — we don't ever offer a downgrade.
+
+The installer's own version (shown for reference in Config) comes from its
+assembly (`AssemblyInformationalVersion`), set by the workflow's
+`/p:Version=$VERSION`. The *installed* version comes from `install.json`.
+
+### New step: `DownloadAndExtractStep`
+
+Replaces `PublishAppStep`, `PublishWorkerStep`, `DeployBinariesStep`.
+
+```
+1. GET https://git.kuns.dev/api/v1/repos/releases/ClaudeDo/releases/latest
+   Parse tag_name and asset URLs for:
+     - ClaudeDo-<ver>-win-x64.zip
+     - checksums.txt
+2. Download both to %TEMP%\ClaudeDo-install-<guid>\
+3. Parse checksums.txt, verify SHA256 of the zip. Fail hard if mismatch.
+4. (Update mode only) Stop Worker service via sc.exe stop ClaudeDoWorker.
+   Wait up to 30s for it to actually stop. If it won't stop, fail.
+5. (Update mode only) Delete contents of {InstallDir}/app and
+   {InstallDir}/worker, but leave the directories and install.json in place.
+6. Extract zip: /app -> {InstallDir}/app, /worker -> {InstallDir}/worker.
+7. (Update mode only) Start service again via sc.exe start ClaudeDoWorker.
+8. Progress is reported via IProgress<string> — the UI already shows it.
+```
+
+Config files (`~/.todo-app/*.json`) and DB (`~/.todo-app/todo.db`) live
+outside `InstallDir` and are never touched by this step — updates are
+naturally non-destructive.
+
+### Update mode — which steps run
+
+- **Yes:** `DownloadAndExtractStep`
+- **No:** `WriteConfigStep` (user already has config — we don't overwrite)
+- **No:** `InitDatabaseStep` (DB exists)
+- **No:** `CreateShortcutsStep` (already there; Repair can re-run this)
+- **Conditional:** `RegisterServiceStep` only if service is not currently
+  registered (covers someone who unregistered it manually)
+
+### Config view — actions
+
+- **Save** (primary): writes the Paths / UiSettings / Service fields to
+  `~/.todo-app/*.json`. If worker config changed, prompts "Restart service?"
+  and calls `sc stop` / `sc start` if accepted. No download.
+- **Repair:** re-download + extract (same as Update flow), re-create
+  shortcuts, re-register service. Leaves config/DB alone. Confirmation
+  dialog before starting.
+- **Uninstall:** confirmation dialog ("This removes ClaudeDo *and* all of
+  your tasks, config, and database. Type UNINSTALL to confirm."). On
+  confirm:
+  1. Stop + unregister service (`sc stop`, `sc delete ClaudeDoWorker`)
+  2. Remove Start Menu / Desktop shortcuts
+  3. Delete `{InstallDir}` (including `install.json`)
+  4. Delete `~/.todo-app` in full (config + DB + logs)
+  5. Exit
+
+  Everything is removed. No "keep my data" option — that was explicitly
+  declined in the design discussion.
+
+### Files to add
+
+```
+src/ClaudeDo.Installer/Core/InstallModeDetector.cs
+src/ClaudeDo.Installer/Core/ReleaseClient.cs        // Gitea API + downloads
+src/ClaudeDo.Installer/Core/ChecksumVerifier.cs
+src/ClaudeDo.Installer/Core/InstallManifest.cs      // read/write install.json
+src/ClaudeDo.Installer/Steps/DownloadAndExtractStep.cs
+src/ClaudeDo.Installer/Steps/WriteInstallManifestStep.cs
+src/ClaudeDo.Installer/Steps/StopServiceStep.cs     // used in Update+Uninstall
+src/ClaudeDo.Installer/Steps/StartServiceStep.cs    // used in Update+Repair
+.gitea/workflows/release.yml
+```
+
+### Files to remove
+
+```
+src/ClaudeDo.Installer/Steps/PublishAppStep.cs
+src/ClaudeDo.Installer/Steps/PublishWorkerStep.cs
+src/ClaudeDo.Installer/Steps/DeployBinariesStep.cs
+```
+
+### Files to update
+
+- `Core/InstallerService.cs` — mode-aware step list
+- `Core/InstallContext.cs` — add `Version`, `Mode`, `IsFirstInstall` fields
+- `Pages/WelcomePage/*` — content + buttons depend on mode
+- `Views/WizardViewModel.cs` — route pages based on mode
+- `Core/PageResolver.cs` — register new/renamed pages
+- `ClaudeDo.Installer.csproj` — add `PublishSingleFile`, `SelfContained`
+  properties (only active when published)
+
+## Failure Modes & Recovery
+
+| Failure                               | Behavior                                              |
+|---------------------------------------|-------------------------------------------------------|
+| No network / Gitea unreachable        | Step fails with clear message + retry button          |
+| API returns no releases yet           | "No release available — publish a tag first"          |
+| Checksum mismatch                     | Step fails, temp files deleted, user prompted retry   |
+| Zip extraction fails mid-way (update) | InstallDir is left partially empty — user re-runs     |
+| Service won't stop                    | Fail before extract; nothing destructive has happened |
+| User cancels mid-download             | Temp dir cleaned up; install state unchanged          |
+
+For safety, the `DownloadAndExtractStep` always downloads + verifies
+**before** it deletes the old binaries. An aborted download cannot leave
+an install in a half-deleted state.
+
+## Security
+
+- All downloads over HTTPS from a pinned host (`git.kuns.dev`).
+- SHA256 verification before extract (protects against partial downloads and
+  tampered caches on the wire; not a substitute for code signing).
+- No tokens shipped in the installer — repo is public.
+- Worker service runs under the same account as today (no change).
+
+## Decisions to Revisit
+
+1. **Release notes content.** Auto-generated `git log` summary vs manual
+   notes in the tag message vs empty. Start empty; revisit when there are
+   enough releases to care.
+
+2. **Signed installer.** Out of scope for v1. Users will see a SmartScreen
+   warning the first time. Note this in the README.
+
+3. **Installer distribution page.** A simple `README.md` badge or a pinned
+   "Latest release" link on the Gitea repo home is enough for v1.
+
+## Success Criteria
+
+- On a fresh Windows VM with **no source checkout, no .NET runtime, and no
+  .NET SDK**:
+  1. Download `ClaudeDo.Installer-<ver>.exe`.
+  2. Run it.
+  3. Complete the wizard.
+  4. ClaudeDo App launches, Worker service is running, a task can be created
+     and picked up.
+- Running the same installer a second time, with no new release published,
+  opens directly in the Config view after a quick update check.
+- Publishing a new tag, then running the installer on the existing install,
+  offers the update; accepting performs it without touching `~/.todo-app/todo.db`
+  or the config JSONs.
+- Uninstall leaves no trace: `{InstallDir}` gone, `~/.todo-app` gone, service
+  unregistered, shortcuts removed.
+- The entire release pipeline runs on `git.kuns.dev` with no manual steps
+  beyond `git tag vX.Y.Z && git push --tags`.

docs/superpowers/specs/2026-04-16-efcore-migration-design.md

@@ -0,0 +1,253 @@
+# EF Core Migration Design
+
+Replace the raw ADO.NET / Microsoft.Data.Sqlite data layer with Entity Framework Core and LINQ queries.
+
+## Motivation
+
+- Developer ergonomics: raw SQL is tedious to write and maintain; LINQ enables faster iteration.
+- Maintainability: the ad-hoc migration approach (ALTER TABLE with error-code catching) and manual DBNull/enum mapping are a liability as the schema grows. EF Core provides proper migration versioning, value converters, and change tracking.
+
+## Decision Summary
+
+| Decision | Choice |
+|---|---|
+| Approach | Big bang — rewrite all 6 repositories at once |
+| Migration strategy | Fresh start — EF Core owns the schema, drop schema.sql |
+| DbContext sharing | Single shared `ClaudeDoDbContext` in ClaudeDo.Data |
+| Configuration style | Fluent API only, clean POCO models |
+| Atomic queue claim | Kept as `FromSqlRaw` — not expressible in LINQ |
+
+---
+
+## 1. DbContext and Entity Configuration
+
+### ClaudeDoDbContext
+
+A single `ClaudeDoDbContext` in `ClaudeDo.Data` with DbSets for all entities:
+
+```csharp
+public class ClaudeDoDbContext : DbContext
+{
+    public DbSet<TaskEntity> Tasks => Set<TaskEntity>();
+    public DbSet<ListEntity> Lists => Set<ListEntity>();
+    public DbSet<TagEntity> Tags => Set<TagEntity>();
+    public DbSet<ListConfigEntity> ListConfigs => Set<ListConfigEntity>();
+    public DbSet<WorktreeEntity> Worktrees => Set<WorktreeEntity>();
+    public DbSet<TaskRunEntity> TaskRuns => Set<TaskRunEntity>();
+    public DbSet<SubtaskEntity> Subtasks => Set<SubtaskEntity>();
+}
+```
+
+### Entity-to-Table Mapping
+
+| Entity | Table | Key | Notes |
+|---|---|---|---|
+| `TaskEntity` | `tasks` | `Id` (TEXT) | Nav to List, Tags, Worktree, Runs, Subtasks |
+| `ListEntity` | `lists` | `Id` (TEXT) | Nav to Tasks, Tags, Config |
+| `TagEntity` | `tags` | `Id` (INTEGER auto) | Nav to Lists, Tasks (both M:N) |
+| `ListConfigEntity` | `list_config` | `ListId` (TEXT) | 1:1 owned by List |
+| `WorktreeEntity` | `worktrees` | `TaskId` (TEXT) | 1:1 owned by Task |
+| `TaskRunEntity` | `task_runs` | `Id` (TEXT) | FK to Task |
+| `SubtaskEntity` | `subtasks` | `Id` (TEXT) | FK to Task |
+
+### Navigation Properties Added to Models
+
+```csharp
+// TaskEntity gains:
+public ListEntity List { get; set; }
+public WorktreeEntity? Worktree { get; set; }
+public ICollection<TagEntity> Tags { get; set; }
+public ICollection<TaskRunEntity> Runs { get; set; }
+public ICollection<SubtaskEntity> Subtasks { get; set; }
+
+// ListEntity gains:
+public ListConfigEntity? Config { get; set; }
+public ICollection<TaskEntity> Tasks { get; set; }
+public ICollection<TagEntity> Tags { get; set; }
+
+// TagEntity gains:
+public ICollection<ListEntity> Lists { get; set; }
+public ICollection<TaskEntity> Tasks { get; set; }
+```
+
+### Enum Handling
+
+EF Core `ValueConverter<TEnum, string>` for `TaskStatus` and `WorktreeState`, storing the same lowercase strings (`"manual"`, `"active"`, etc.) for database compatibility. The `ToDb`/`FromDb` methods in repositories are removed.
+
+### Junction Tables
+
+`list_tags` and `task_tags` are configured as implicit join tables via `.UsingEntity()` in Fluent API — no explicit junction entity classes needed.
+
+### Fluent Configuration
+
+Each entity gets its own `IEntityTypeConfiguration<T>` class in a `Configuration/` folder within `ClaudeDo.Data`.
+
+---
+
+## 2. Migration Strategy
+
+### Fresh Start
+
+- `schema.sql` and `SchemaInitializer` are deleted.
+- An initial EF Core migration (`InitialCreate`) is generated from the DbContext model, producing the full schema (all 8 tables, indexes, foreign keys, check constraints).
+- EF's `__EFMigrationsHistory` table tracks applied migrations.
+
+### Startup
+
+Both App and Worker call `context.Database.Migrate()` at startup instead of `SchemaInitializer.Apply()`. This is idempotent.
+
+### Existing Database Compatibility
+
+For users who already have a database created by `schema.sql`, the initial migration must handle the schema already existing. On startup, if the `lists` table exists but `__EFMigrationsHistory` does not, insert the initial migration record into `__EFMigrationsHistory` so EF skips it.
+
+### Seed Data
+
+The `"agent"` and `"manual"` tags move into `OnModelCreating` via `HasData()`:
+
+```csharp
+modelBuilder.Entity<TagEntity>().HasData(
+    new TagEntity { Id = 1, Name = "agent" },
+    new TagEntity { Id = 2, Name = "manual" });
+```
+
+### Ad-hoc Migrations Removed
+
+The 3 manual `ALTER TABLE` statements (model, system_prompt, agent_path on tasks) become part of the initial migration since they're already in the model. The manual `ApplyMigrations()` method is deleted.
+
+---
+
+## 3. Repository Rewrite
+
+All 6 repositories are rewritten to use `ClaudeDoDbContext` and LINQ.
+
+### Per-Repository Changes
+
+| Repository | After EF Core |
+|---|---|
+| `TagRepository` | LINQ queries. `GetOrCreateAsync` uses `FirstOrDefaultAsync` + `Add` + `SaveChangesAsync`. Static `SqliteConnection` overload removed. |
+| `SubtaskRepository` | Straightforward LINQ CRUD, `.OrderBy(s => s.OrderNum)`. |
+| `WorktreeRepository` | LINQ CRUD. State update becomes property set + `SaveChangesAsync`. |
+| `ListRepository` | LINQ CRUD. Tag management via `.Tags` navigation property. Config upsert via `List.Config` navigation. |
+| `TaskRunRepository` | LINQ CRUD. Latest = `.OrderByDescending(r => r.RunNumber).FirstOrDefaultAsync()`. |
+| `TaskRepository` | See special cases below. |
+
+### TaskRepository Special Cases
+
+**Atomic queue claim** (`GetNextQueuedAgentTaskAsync`): kept as `FromSqlRaw` / `ExecuteSqlRawAsync`. The `UPDATE ... WHERE id = (SELECT ...) RETURNING` is not expressible in LINQ and the atomicity guarantee matters.
+
+**Effective tags** (`GetEffectiveTagsAsync`): LINQ via navigation properties:
+
+```csharp
+var taskTags = context.Tasks
+    .Where(t => t.Id == taskId)
+    .SelectMany(t => t.Tags);
+var listTags = context.Tasks
+    .Where(t => t.Id == taskId)
+    .SelectMany(t => t.List.Tags);
+return await taskTags.Union(listTags).Distinct().ToListAsync(ct);
+```
+
+**FlipAllRunningToFailed**: EF Core 7+ bulk update:
+
+```csharp
+await context.Tasks
+    .Where(t => t.Status == TaskStatus.Running)
+    .ExecuteUpdateAsync(s => s.SetProperty(t => t.Status, TaskStatus.Failed), ct);
+```
+
+**Status transitions** (`MarkRunningAsync`, `MarkDoneAsync`, `MarkFailedAsync`): property updates + `SaveChangesAsync`.
+
+### Removed Code
+
+- `SqliteConnectionFactory.cs`
+- `SchemaInitializer.cs`
+- `schema/schema.sql`
+- All `ToDb`/`FromDb` enum mapping methods
+- All manual `DBNull.Value` handling
+- `BindTask` helper methods
+
+---
+
+## 4. Package Changes and DI Registration
+
+### ClaudeDo.Data.csproj
+
+- Remove: `Microsoft.Data.Sqlite`
+- Remove: embedded resource for `schema.sql`
+- Add: `Microsoft.EntityFrameworkCore.Sqlite`
+- Add: `Microsoft.EntityFrameworkCore.Design` (`PrivateAssets="all"`)
+
+### ClaudeDo.Worker.Tests.csproj
+
+- Remove: `Microsoft.Data.Sqlite`
+- Add: `Microsoft.EntityFrameworkCore.Sqlite`
+
+### App DI (Program.cs)
+
+```csharp
+// Replace SqliteConnectionFactory + singleton repos with:
+sc.AddDbContextFactory<ClaudeDoDbContext>(opt =>
+    opt.UseSqlite($"Data Source={dbPath}"));
+sc.AddScoped<ClaudeDoDbContext>(sp =>
+    sp.GetRequiredService<IDbContextFactory<ClaudeDoDbContext>>().CreateDbContext());
+sc.AddScoped<ListRepository>();
+sc.AddScoped<TaskRepository>();
+sc.AddScoped<SubtaskRepository>();
+sc.AddScoped<TagRepository>();
+sc.AddScoped<WorktreeRepository>();
+sc.AddScoped<TaskRunRepository>();
+
+// Migrate at startup:
+using var initScope = services.CreateScope();
+initScope.ServiceProvider.GetRequiredService<ClaudeDoDbContext>().Database.Migrate();
+```
+
+ViewModels are singletons that currently take repositories as constructor parameters. Since repositories become scoped, ViewModels switch to taking `IDbContextFactory<ClaudeDoDbContext>` and create a fresh context (+ repositories) per operation. Each ViewModel method that touches data does: `using var context = _factory.CreateDbContext();` then constructs or resolves the needed repository with that context. This mirrors the current connection-per-call pattern.
+
+### Worker DI (Program.cs)
+
+```csharp
+builder.Services.AddDbContext<ClaudeDoDbContext>(opt =>
+    opt.UseSqlite($"Data Source={cfg.DbPath}"));
+builder.Services.AddScoped<ListRepository>();
+builder.Services.AddScoped<TaskRepository>();
+builder.Services.AddScoped<SubtaskRepository>();
+builder.Services.AddScoped<TagRepository>();
+builder.Services.AddScoped<WorktreeRepository>();
+builder.Services.AddScoped<TaskRunRepository>();
+
+// Migrate at startup after build:
+using var scope = app.Services.CreateScope();
+scope.ServiceProvider.GetRequiredService<ClaudeDoDbContext>().Database.Migrate();
+```
+
+Worker has request scopes via SignalR hub invocations, so scoped registration works naturally.
+
+---
+
+## 5. Test Infrastructure
+
+### DbFixture
+
+`DbFixture` is rewritten as an EF Core fixture:
+
+- Creates a temp SQLite file per test class.
+- Builds `DbContextOptions<ClaudeDoDbContext>` with `UseSqlite`.
+- Calls `context.Database.Migrate()` to apply the schema (also tests that migrations work).
+- Exposes a `CreateContext()` method so each test gets a fresh context instance (avoids change-tracker bleed).
+
+Tests construct repositories by passing in a fresh context from the fixture.
+
+No mocking — tests keep hitting real SQLite, same philosophy as today.
+
+---
+
+## 6. Risk and Mitigation
+
+| Risk | Mitigation |
+|---|---|
+| Big-bang rewrite touches nearly every file in ClaudeDo.Data | Existing tests are the safety net — all must pass after migration |
+| Existing databases with schema from schema.sql | Compatibility shim: detect existing tables, mark initial migration as applied |
+| Atomic queue claim semantics change | Kept as raw SQL via `FromSqlRaw` |
+| Scoped lifetime vs. singleton ViewModels | `IDbContextFactory` provides on-demand contexts |
+| EF change tracker overhead vs. raw ADO.NET | Negligible for this workload size; use `AsNoTracking()` for read-only queries |

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)

global.json

@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "8.0.418",
+    "rollForward": "latestFeature"
+  }
+}

schema/schema.sql

@@ -1,90 +0,0 @@
--- ClaudeDo SQLite schema (single source of truth, 3NF)
--- Applied by Worker on first startup. WAL mode is set via PRAGMA after open.
-
-PRAGMA foreign_keys = ON;
-
-CREATE TABLE IF NOT EXISTS lists (
-    id                  TEXT PRIMARY KEY,
-    name                TEXT NOT NULL,
-    created_at          TIMESTAMP NOT NULL,
-    working_dir         TEXT NULL,
-    default_commit_type TEXT NOT NULL DEFAULT 'chore'
-);
-
-CREATE TABLE IF NOT EXISTS tasks (
-    id            TEXT PRIMARY KEY,
-    list_id       TEXT NOT NULL REFERENCES lists(id) ON DELETE CASCADE,
-    title         TEXT NOT NULL,
-    description   TEXT NULL,
-    status        TEXT NOT NULL CHECK (status IN ('manual','queued','running','done','failed')),
-    scheduled_for TIMESTAMP NULL,
-    result        TEXT NULL,
-    log_path      TEXT NULL,
-    created_at    TIMESTAMP NOT NULL,
-    started_at    TIMESTAMP NULL,
-    finished_at   TIMESTAMP NULL,
-    commit_type   TEXT NOT NULL DEFAULT 'chore'
-);
-
-CREATE INDEX IF NOT EXISTS idx_tasks_list_id ON tasks(list_id);
-CREATE INDEX IF NOT EXISTS idx_tasks_status  ON tasks(status);
-
-CREATE TABLE IF NOT EXISTS tags (
-    id   INTEGER PRIMARY KEY AUTOINCREMENT,
-    name TEXT NOT NULL UNIQUE
-);
-
-CREATE TABLE IF NOT EXISTS list_tags (
-    list_id TEXT    NOT NULL REFERENCES lists(id) ON DELETE CASCADE,
-    tag_id  INTEGER NOT NULL REFERENCES tags(id)  ON DELETE CASCADE,
-    PRIMARY KEY (list_id, tag_id)
-);
-
-CREATE TABLE IF NOT EXISTS task_tags (
-    task_id TEXT    NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
-    tag_id  INTEGER NOT NULL REFERENCES tags(id)  ON DELETE CASCADE,
-    PRIMARY KEY (task_id, tag_id)
-);
-
-CREATE TABLE IF NOT EXISTS list_config (
-    list_id       TEXT PRIMARY KEY REFERENCES lists(id) ON DELETE CASCADE,
-    model         TEXT NULL,
-    system_prompt TEXT NULL,
-    agent_path    TEXT NULL
-);
-
-CREATE TABLE IF NOT EXISTS worktrees (
-    task_id     TEXT PRIMARY KEY REFERENCES tasks(id) ON DELETE CASCADE,
-    path        TEXT NOT NULL,
-    branch_name TEXT NOT NULL,
-    base_commit TEXT NOT NULL,
-    head_commit TEXT NULL,
-    diff_stat   TEXT NULL,
-    state       TEXT NOT NULL DEFAULT 'active' CHECK (state IN ('active','merged','discarded','kept')),
-    created_at  TIMESTAMP NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS task_runs (
-    id                 TEXT PRIMARY KEY,
-    task_id            TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
-    run_number         INTEGER NOT NULL,
-    session_id         TEXT NULL,
-    is_retry           INTEGER NOT NULL DEFAULT 0,
-    prompt             TEXT NOT NULL,
-    result_markdown    TEXT NULL,
-    structured_output  TEXT NULL,
-    error_markdown     TEXT NULL,
-    exit_code          INTEGER NULL,
-    turn_count         INTEGER NULL,
-    tokens_in          INTEGER NULL,
-    tokens_out         INTEGER NULL,
-    log_path           TEXT NULL,
-    started_at         TIMESTAMP NULL,
-    finished_at        TIMESTAMP NULL
-);
-
-CREATE INDEX IF NOT EXISTS idx_task_runs_task_id ON task_runs(task_id);
-
--- Seed: minimal tag set (ignored if already present)
-INSERT OR IGNORE INTO tags (name) VALUES ('agent');
-INSERT OR IGNORE INTO tags (name) VALUES ('manual');

src/ClaudeDo.App/ClaudeDo.App.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ApplicationManifest>app.manifest</ApplicationManifest>
+    <ApplicationIcon>Assets\ClaudeTask.ico</ApplicationIcon>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
 

src/ClaudeDo.App/Program.cs

@@ -5,26 +5,47 @@ using ClaudeDo.Data.Repositories;
 using ClaudeDo.Ui;
 using ClaudeDo.Ui.Services;
 using ClaudeDo.Ui.ViewModels;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using System;
+using System.Runtime.InteropServices;
 
 namespace ClaudeDo.App;
 
 sealed class Program
 {
+    [DllImport("shell32.dll", CharSet = CharSet.Unicode)]
+    private static extern int SetCurrentProcessExplicitAppUserModelID(string appId);
+
     [STAThread]
     public static void Main(string[] args)
     {
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            SetCurrentProcessExplicitAppUserModelID("ClaudeDo.App");
+
         var services = BuildServices();
         App.Services = services;
 
-        // Ensure DB schema exists
-        var factory = services.GetRequiredService<SqliteConnectionFactory>();
-        SchemaInitializer.Apply(factory);
+        using (var scope = services.CreateScope())
+        {
+            ClaudeDoDbContext.MigrateAndConfigure(
+                scope.ServiceProvider.GetRequiredService<ClaudeDoDbContext>());
+        }
 
+        try
+        {
             BuildAvaloniaApp()
                 .StartWithClassicDesktopLifetime(args);
         }
+        finally
+        {
+            // Dispose the container so WorkerClient.DisposeAsync runs —
+            // cancels the retry loop and closes the SignalR connection cleanly
+            // instead of abandoning it.
+            try { services.DisposeAsync().AsTask().GetAwaiter().GetResult(); }
+            catch { /* best effort on shutdown */ }
+        }
+    }
 
     public static AppBuilder BuildAvaloniaApp()
         => AppBuilder.Configure<App>()
@@ -44,13 +65,10 @@ sealed class Program
 
         // Infrastructure
         sc.AddSingleton(settings);
-        sc.AddSingleton(new SqliteConnectionFactory(dbPath));
-
-        // Repositories
-        sc.AddSingleton<ListRepository>();
-        sc.AddSingleton<TaskRepository>();
-        sc.AddSingleton<TagRepository>();
-        sc.AddSingleton<WorktreeRepository>();
+        sc.AddDbContextFactory<ClaudeDoDbContext>(opt =>
+            opt.UseSqlite($"Data Source={dbPath}"));
+        sc.AddScoped<ClaudeDoDbContext>(sp =>
+            sp.GetRequiredService<IDbContextFactory<ClaudeDoDbContext>>().CreateDbContext());
 
         // Services
         sc.AddSingleton<GitService>();
@@ -60,29 +78,21 @@ sealed class Program
         sc.AddTransient<ListEditorViewModel>();
         sc.AddTransient<TaskEditorViewModel>();
         sc.AddSingleton<StatusBarViewModel>();
-        sc.AddSingleton<TaskDetailViewModel>(sp => new TaskDetailViewModel(
-            sp.GetRequiredService<TaskRepository>(),
-            sp.GetRequiredService<WorktreeRepository>(),
-            sp.GetRequiredService<ListRepository>(),
-            sp.GetRequiredService<GitService>(),
-            sp.GetRequiredService<WorkerClient>(),
-            sp.GetRequiredService<TagRepository>()));
+        sc.AddSingleton<TaskDetailViewModel>();
         sc.AddSingleton<TaskListViewModel>(sp =>
         {
-            var taskRepo = sp.GetRequiredService<TaskRepository>();
-            var tagRepo = sp.GetRequiredService<TagRepository>();
-            var listRepo = sp.GetRequiredService<ListRepository>();
+            var dbFactory = sp.GetRequiredService<IDbContextFactory<ClaudeDoDbContext>>();
             var worker = sp.GetRequiredService<WorkerClient>();
             var statusBar = sp.GetRequiredService<StatusBarViewModel>();
             return new TaskListViewModel(
-                taskRepo, tagRepo, listRepo, worker,
+                dbFactory, worker,
                 () => sp.GetRequiredService<TaskEditorViewModel>(),
                 msg => statusBar.ShowMessage(msg));
         });
         sc.AddSingleton<MainWindowViewModel>(sp =>
         {
             return new MainWindowViewModel(
-                sp.GetRequiredService<ListRepository>(),
+                sp.GetRequiredService<IDbContextFactory<ClaudeDoDbContext>>(),
                 sp.GetRequiredService<WorkerClient>(),
                 sp.GetRequiredService<TaskListViewModel>(),
                 sp.GetRequiredService<TaskDetailViewModel>(),

src/ClaudeDo.Data/CLAUDE.md

@@ -11,7 +11,7 @@ Shared data layer: models, repositories, SQLite infrastructure, and git operatio
 
 ## Repositories
 
-All repositories use raw parameterized SQL via `Microsoft.Data.Sqlite`. Each method opens its own connection — no Unit of Work.
+All repositories use EF Core LINQ queries via `ClaudeDoDbContext`. Exception: `TaskRepository.GetNextQueuedAgentTaskAsync` uses `FromSqlRaw` for atomic queue claim.
 
 - **TaskRepository** — CRUD, status transitions (`MarkRunningAsync`, `MarkDoneAsync`, `MarkFailedAsync`), `GetNextQueuedAgentTaskAsync` (queue polling), `GetEffectiveTagsAsync` (union of task + list tags), `FlipAllRunningToFailedAsync`
 - **ListRepository** — CRUD, tag junction management
@@ -20,8 +20,8 @@ All repositories use raw parameterized SQL via `Microsoft.Data.Sqlite`. Each met
 
 ## Infrastructure
 
-- **SqliteConnectionFactory** — creates connections, applies WAL mode once, enforces foreign keys via PRAGMA
-- **SchemaInitializer** — applies embedded `schema/schema.sql` idempotently (IF NOT EXISTS, INSERT OR IGNORE)
+- **ClaudeDoDbContext** — EF Core DbContext; configured with WAL mode and foreign keys via `UseSqlite` options
+- **IDbContextFactory<ClaudeDoDbContext>** — registered in DI; used by singleton consumers (e.g. Worker hosted service)
 - **Paths** — expands `~` and `%USERPROFILE%`, resolves relative paths. App root: `~/.todo-app`
 - **AppSettings** — loads `~/.todo-app/ui.config.json` (DbPath, SignalRUrl)
 
@@ -31,11 +31,11 @@ All repositories use raw parameterized SQL via `Microsoft.Data.Sqlite`. Each met
 
 ## Schema
 
-6 tables: `lists`, `tasks`, `tags`, `list_tags`, `task_tags`, `worktrees`. See `schema/schema.sql`. Seed data: tags "agent" and "manual".
+6 tables: `lists`, `tasks`, `tags`, `list_tags`, `task_tags`, `worktrees`. Managed by EF Core migrations in the `Migrations/` folder. Seed data: tags "agent" and "manual".
 
 ## Conventions
 
-- Enum <-> string mapping via explicit `ToDb()`/`FromDb()` static methods on each enum
+- Enum <-> string mapping via EF Core `ValueConverter` (configured in `IEntityTypeConfiguration<T>`)
+- Entity configurations live in the `Configuration/` folder
 - Primary keys are `init`-only strings (GUIDs assigned at creation)
-- Nullable fields use `DBNull.Value` checks
 - All methods are async with CancellationToken where applicable

src/ClaudeDo.Data/ClaudeDo.Data.csproj

@@ -7,11 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.11" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="..\..\schema\schema.sql" Link="schema.sql" LogicalName="ClaudeDo.Data.schema.sql" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.11">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
 </Project>

src/ClaudeDo.Data/ClaudeDoDbContext.cs

@@ -0,0 +1,77 @@
+using ClaudeDo.Data.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage;
+
+namespace ClaudeDo.Data;
+
+public class ClaudeDoDbContext : DbContext
+{
+    public ClaudeDoDbContext(DbContextOptions<ClaudeDoDbContext> options) : base(options) { }
+
+    public DbSet<TaskEntity> Tasks => Set<TaskEntity>();
+    public DbSet<ListEntity> Lists => Set<ListEntity>();
+    public DbSet<TagEntity> Tags => Set<TagEntity>();
+    public DbSet<ListConfigEntity> ListConfigs => Set<ListConfigEntity>();
+    public DbSet<WorktreeEntity> Worktrees => Set<WorktreeEntity>();
+    public DbSet<TaskRunEntity> TaskRuns => Set<TaskRunEntity>();
+    public DbSet<SubtaskEntity> Subtasks => Set<SubtaskEntity>();
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        modelBuilder.ApplyConfigurationsFromAssembly(typeof(ClaudeDoDbContext).Assembly);
+    }
+
+    /// <summary>
+    /// Applies EF Core migrations and sets WAL mode. Safe for both fresh and existing databases.
+    /// Existing databases (created by the old schema.sql) have their tables but no
+    /// __EFMigrationsHistory — this method detects that case and baselines the initial
+    /// migration so EF skips re-creating tables that already exist.
+    /// </summary>
+    public static void MigrateAndConfigure(ClaudeDoDbContext db)
+    {
+        var conn = db.Database.GetDbConnection();
+        try
+        {
+            conn.Open();
+
+            // Set WAL FIRST, before migrations — prevents write-lock contention
+            // when UI and Worker start simultaneously.
+            using (var walCmd = conn.CreateCommand())
+            {
+                walCmd.CommandText = "PRAGMA journal_mode=wal;";
+                walCmd.ExecuteNonQuery();
+            }
+
+            // If the 'lists' table exists but __EFMigrationsHistory does not,
+            // this is a pre-EF database. Baseline the InitialCreate migration.
+            using (var cmd = conn.CreateCommand())
+            {
+                cmd.CommandText = "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='lists'";
+                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();
+                }
+            }
+        }
+        finally
+        {
+            conn.Close();
+        }
+
+        db.Database.Migrate();
+    }
+}

src/ClaudeDo.Data/ClaudeDoDbContextFactory.cs

@@ -0,0 +1,15 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Design;
+
+namespace ClaudeDo.Data;
+
+public sealed class ClaudeDoDbContextFactory : IDesignTimeDbContextFactory<ClaudeDoDbContext>
+{
+    public ClaudeDoDbContext CreateDbContext(string[] args)
+    {
+        var options = new DbContextOptionsBuilder<ClaudeDoDbContext>()
+            .UseSqlite("Data Source=design-time.db")
+            .Options;
+        return new ClaudeDoDbContext(options);
+    }
+}

src/ClaudeDo.Data/Configuration/ListConfigEntityConfiguration.cs

@@ -0,0 +1,19 @@
+using ClaudeDo.Data.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ClaudeDo.Data.Configuration;
+
+public class ListConfigEntityConfiguration : IEntityTypeConfiguration<ListConfigEntity>
+{
+    public void Configure(EntityTypeBuilder<ListConfigEntity> builder)
+    {
+        builder.ToTable("list_config");
+
+        builder.HasKey(c => c.ListId);
+        builder.Property(c => c.ListId).HasColumnName("list_id");
+        builder.Property(c => c.Model).HasColumnName("model");
+        builder.Property(c => c.SystemPrompt).HasColumnName("system_prompt");
+        builder.Property(c => c.AgentPath).HasColumnName("agent_path");
+    }
+}

src/ClaudeDo.Data/Configuration/ListEntityConfiguration.cs

@@ -0,0 +1,36 @@
+using ClaudeDo.Data.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ClaudeDo.Data.Configuration;
+
+public class ListEntityConfiguration : IEntityTypeConfiguration<ListEntity>
+{
+    public void Configure(EntityTypeBuilder<ListEntity> builder)
+    {
+        builder.ToTable("lists");
+
+        builder.HasKey(l => l.Id);
+        builder.Property(l => l.Id).HasColumnName("id");
+        builder.Property(l => l.Name).HasColumnName("name").IsRequired();
+        builder.Property(l => l.CreatedAt).HasColumnName("created_at").IsRequired();
+        builder.Property(l => l.WorkingDir).HasColumnName("working_dir");
+        builder.Property(l => l.DefaultCommitType).HasColumnName("default_commit_type").IsRequired().HasDefaultValue("chore");
+
+        builder.HasOne(l => l.Config)
+            .WithOne(c => c.List)
+            .HasForeignKey<ListConfigEntity>(c => c.ListId)
+            .OnDelete(DeleteBehavior.Cascade);
+
+        builder.HasMany(l => l.Tags)
+            .WithMany(tag => tag.Lists)
+            .UsingEntity("list_tags",
+                l => l.HasOne(typeof(TagEntity)).WithMany().HasForeignKey("tag_id").OnDelete(DeleteBehavior.Cascade),
+                r => r.HasOne(typeof(ListEntity)).WithMany().HasForeignKey("list_id").OnDelete(DeleteBehavior.Cascade),
+                j =>
+                {
+                    j.HasKey("list_id", "tag_id");
+                    j.ToTable("list_tags");
+                });
+    }
+}

src/ClaudeDo.Data/Configuration/SubtaskEntityConfiguration.cs

@@ -0,0 +1,28 @@
+using ClaudeDo.Data.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ClaudeDo.Data.Configuration;
+
+public class SubtaskEntityConfiguration : IEntityTypeConfiguration<SubtaskEntity>
+{
+    public void Configure(EntityTypeBuilder<SubtaskEntity> builder)
+    {
+        builder.ToTable("subtasks");
+
+        builder.HasKey(s => s.Id);
+        builder.Property(s => s.Id).HasColumnName("id");
+        builder.Property(s => s.TaskId).HasColumnName("task_id").IsRequired();
+        builder.Property(s => s.Title).HasColumnName("title").IsRequired();
+        builder.Property(s => s.Completed).HasColumnName("completed").IsRequired().HasDefaultValue(false);
+        builder.Property(s => s.OrderNum).HasColumnName("order_num").IsRequired();
+        builder.Property(s => s.CreatedAt).HasColumnName("created_at").IsRequired();
+
+        builder.HasOne(s => s.Task)
+            .WithMany(t => t.Subtasks)
+            .HasForeignKey(s => s.TaskId)
+            .OnDelete(DeleteBehavior.Cascade);
+
+        builder.HasIndex(s => s.TaskId).HasDatabaseName("idx_subtasks_task_id");
+    }
+}

src/ClaudeDo.Data/Configuration/TagEntityConfiguration.cs

@@ -0,0 +1,22 @@
+using ClaudeDo.Data.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ClaudeDo.Data.Configuration;
+
+public class TagEntityConfiguration : IEntityTypeConfiguration<TagEntity>
+{
+    public void Configure(EntityTypeBuilder<TagEntity> builder)
+    {
+        builder.ToTable("tags");
+
+        builder.HasKey(t => t.Id);
+        builder.Property(t => t.Id).HasColumnName("id").ValueGeneratedOnAdd();
+        builder.Property(t => t.Name).HasColumnName("name").IsRequired();
+        builder.HasIndex(t => t.Name).IsUnique();
+
+        builder.HasData(
+            new TagEntity { Id = 1, Name = "agent" },
+            new TagEntity { Id = 2, Name = "manual" });
+    }
+}

src/ClaudeDo.Data/Configuration/TaskEntityConfiguration.cs

@@ -0,0 +1,75 @@
+using ClaudeDo.Data.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
+
+namespace ClaudeDo.Data.Configuration;
+
+public class TaskEntityConfiguration : IEntityTypeConfiguration<TaskEntity>
+{
+    private static string StatusToString(TaskStatus v)
+        => v == TaskStatus.Manual ? "manual"
+         : v == TaskStatus.Queued ? "queued"
+         : v == TaskStatus.Running ? "running"
+         : v == TaskStatus.Done ? "done"
+         : v == TaskStatus.Failed ? "failed"
+         : throw new ArgumentOutOfRangeException(nameof(v));
+
+    private static TaskStatus StatusFromString(string v)
+        => v == "manual" ? TaskStatus.Manual
+         : v == "queued" ? TaskStatus.Queued
+         : v == "running" ? TaskStatus.Running
+         : v == "done" ? TaskStatus.Done
+         : v == "failed" ? TaskStatus.Failed
+         : throw new ArgumentOutOfRangeException(nameof(v));
+
+    private static readonly ValueConverter<TaskStatus, string> StatusConverter =
+        new(v => StatusToString(v), v => StatusFromString(v));
+
+    public void Configure(EntityTypeBuilder<TaskEntity> builder)
+    {
+        builder.ToTable("tasks");
+
+        builder.HasKey(t => t.Id);
+        builder.Property(t => t.Id).HasColumnName("id");
+        builder.Property(t => t.ListId).HasColumnName("list_id").IsRequired();
+        builder.Property(t => t.Title).HasColumnName("title").IsRequired();
+        builder.Property(t => t.Description).HasColumnName("description");
+        builder.Property(t => t.Status).HasColumnName("status").IsRequired()
+            .HasConversion(StatusConverter);
+        builder.Property(t => t.ScheduledFor).HasColumnName("scheduled_for");
+        builder.Property(t => t.Result).HasColumnName("result");
+        builder.Property(t => t.LogPath).HasColumnName("log_path");
+        builder.Property(t => t.CreatedAt).HasColumnName("created_at").IsRequired();
+        builder.Property(t => t.StartedAt).HasColumnName("started_at");
+        builder.Property(t => t.FinishedAt).HasColumnName("finished_at");
+        builder.Property(t => t.CommitType).HasColumnName("commit_type").IsRequired().HasDefaultValue("chore");
+        builder.Property(t => t.Model).HasColumnName("model");
+        builder.Property(t => t.SystemPrompt).HasColumnName("system_prompt");
+        builder.Property(t => t.AgentPath).HasColumnName("agent_path");
+
+        builder.HasOne(t => t.List)
+            .WithMany(l => l.Tasks)
+            .HasForeignKey(t => t.ListId)
+            .OnDelete(DeleteBehavior.Cascade);
+
+        builder.HasOne(t => t.Worktree)
+            .WithOne(w => w.Task)
+            .HasForeignKey<WorktreeEntity>(w => w.TaskId);
+
+        builder.HasMany(t => t.Tags)
+            .WithMany(tag => tag.Tasks)
+            .UsingEntity("task_tags",
+                l => l.HasOne(typeof(TagEntity)).WithMany().HasForeignKey("tag_id").OnDelete(DeleteBehavior.Cascade),
+                r => r.HasOne(typeof(TaskEntity)).WithMany().HasForeignKey("task_id").OnDelete(DeleteBehavior.Cascade),
+                j =>
+                {
+                    j.HasKey("task_id", "tag_id");
+                    j.ToTable("task_tags");
+                });
+
+        builder.HasIndex(t => t.ListId).HasDatabaseName("idx_tasks_list_id");
+        builder.HasIndex(t => t.Status).HasDatabaseName("idx_tasks_status");
+    }
+}

src/ClaudeDo.Data/Configuration/TaskRunEntityConfiguration.cs

@@ -0,0 +1,38 @@
+using ClaudeDo.Data.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ClaudeDo.Data.Configuration;
+
+public class TaskRunEntityConfiguration : IEntityTypeConfiguration<TaskRunEntity>
+{
+    public void Configure(EntityTypeBuilder<TaskRunEntity> builder)
+    {
+        builder.ToTable("task_runs");
+
+        builder.HasKey(r => r.Id);
+        builder.Property(r => r.Id).HasColumnName("id");
+        builder.Property(r => r.TaskId).HasColumnName("task_id").IsRequired();
+        builder.Property(r => r.RunNumber).HasColumnName("run_number").IsRequired();
+        builder.Property(r => r.SessionId).HasColumnName("session_id");
+        builder.Property(r => r.IsRetry).HasColumnName("is_retry").IsRequired().HasDefaultValue(false);
+        builder.Property(r => r.Prompt).HasColumnName("prompt").IsRequired();
+        builder.Property(r => r.ResultMarkdown).HasColumnName("result_markdown");
+        builder.Property(r => r.StructuredOutputJson).HasColumnName("structured_output");
+        builder.Property(r => r.ErrorMarkdown).HasColumnName("error_markdown");
+        builder.Property(r => r.ExitCode).HasColumnName("exit_code");
+        builder.Property(r => r.TurnCount).HasColumnName("turn_count");
+        builder.Property(r => r.TokensIn).HasColumnName("tokens_in");
+        builder.Property(r => r.TokensOut).HasColumnName("tokens_out");
+        builder.Property(r => r.LogPath).HasColumnName("log_path");
+        builder.Property(r => r.StartedAt).HasColumnName("started_at");
+        builder.Property(r => r.FinishedAt).HasColumnName("finished_at");
+
+        builder.HasOne(r => r.Task)
+            .WithMany(t => t.Runs)
+            .HasForeignKey(r => r.TaskId)
+            .OnDelete(DeleteBehavior.Cascade);
+
+        builder.HasIndex(r => r.TaskId).HasDatabaseName("idx_task_runs_task_id");
+    }
+}

src/ClaudeDo.Data/Configuration/WorktreeEntityConfiguration.cs

@@ -0,0 +1,43 @@
+using ClaudeDo.Data.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+namespace ClaudeDo.Data.Configuration;
+
+public class WorktreeEntityConfiguration : IEntityTypeConfiguration<WorktreeEntity>
+{
+    private static string StateToString(WorktreeState v)
+        => v == WorktreeState.Active ? "active"
+         : v == WorktreeState.Merged ? "merged"
+         : v == WorktreeState.Discarded ? "discarded"
+         : v == WorktreeState.Kept ? "kept"
+         : throw new ArgumentOutOfRangeException(nameof(v));
+
+    private static WorktreeState StateFromString(string v)
+        => v == "active" ? WorktreeState.Active
+         : v == "merged" ? WorktreeState.Merged
+         : v == "discarded" ? WorktreeState.Discarded
+         : v == "kept" ? WorktreeState.Kept
+         : throw new ArgumentOutOfRangeException(nameof(v));
+
+    private static readonly ValueConverter<WorktreeState, string> StateConverter =
+        new(v => StateToString(v), v => StateFromString(v));
+
+    public void Configure(EntityTypeBuilder<WorktreeEntity> builder)
+    {
+        builder.ToTable("worktrees");
+
+        builder.HasKey(w => w.TaskId);
+        builder.Property(w => w.TaskId).HasColumnName("task_id");
+        builder.Property(w => w.Path).HasColumnName("path").IsRequired();
+        builder.Property(w => w.BranchName).HasColumnName("branch_name").IsRequired();
+        builder.Property(w => w.BaseCommit).HasColumnName("base_commit").IsRequired();
+        builder.Property(w => w.HeadCommit).HasColumnName("head_commit");
+        builder.Property(w => w.DiffStat).HasColumnName("diff_stat");
+        builder.Property(w => w.State).HasColumnName("state").IsRequired()
+            .HasDefaultValue(WorktreeState.Active)
+            .HasConversion(StateConverter);
+        builder.Property(w => w.CreatedAt).HasColumnName("created_at").IsRequired();
+    }
+}

src/ClaudeDo.Data/Git/GitService.cs

@@ -104,20 +104,34 @@ public sealed class GitService
         using var proc = new Process { StartInfo = psi };
         proc.Start();
 
+        // On cancellation: kill the git process tree. Killing closes the
+        // redirected pipes, which unblocks the ReadToEndAsync calls below
+        // and lets WaitForExitAsync return so the process is reaped.
+        // Without this, cancelling mid-git leaves zombie processes.
+        await using var ctr = ct.Register(() =>
+        {
+            try { proc.Kill(entireProcessTree: true); }
+            catch { /* already exited */ }
+        });
+
         if (stdinData is not null)
         {
             await proc.StandardInput.WriteAsync(stdinData.AsMemory(), ct);
             proc.StandardInput.Close();
         }
 
-        var stdoutTask = proc.StandardOutput.ReadToEndAsync(ct);
-        var stderrTask = proc.StandardError.ReadToEndAsync(ct);
+        // Drain output without ct — pipes close when the process exits
+        // (whether naturally or via Kill above), so these always complete.
+        var stdoutTask = proc.StandardOutput.ReadToEndAsync();
+        var stderrTask = proc.StandardError.ReadToEndAsync();
 
-        await proc.WaitForExitAsync(ct);
+        await proc.WaitForExitAsync(CancellationToken.None);
 
         var stdout = await stdoutTask;
         var stderr = await stderrTask;
 
+        ct.ThrowIfCancellationRequested();
+
         return (proc.ExitCode, stdout.TrimEnd(), stderr.TrimEnd());
     }
 }

src/ClaudeDo.Data/Migrations/20260416064948_InitialCreate.cs

@@ -0,0 +1,298 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
+
+namespace ClaudeDo.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class InitialCreate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "lists",
+                columns: table => new
+                {
+                    id = table.Column<string>(type: "TEXT", nullable: false),
+                    name = table.Column<string>(type: "TEXT", nullable: false),
+                    created_at = table.Column<DateTime>(type: "TEXT", nullable: false),
+                    working_dir = table.Column<string>(type: "TEXT", nullable: true),
+                    default_commit_type = table.Column<string>(type: "TEXT", nullable: false, defaultValue: "chore")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_lists", x => x.id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "tags",
+                columns: table => new
+                {
+                    id = table.Column<long>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    name = table.Column<string>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_tags", x => x.id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "list_config",
+                columns: table => new
+                {
+                    list_id = table.Column<string>(type: "TEXT", nullable: false),
+                    model = table.Column<string>(type: "TEXT", nullable: true),
+                    system_prompt = table.Column<string>(type: "TEXT", nullable: true),
+                    agent_path = table.Column<string>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_list_config", x => x.list_id);
+                    table.ForeignKey(
+                        name: "FK_list_config_lists_list_id",
+                        column: x => x.list_id,
+                        principalTable: "lists",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "tasks",
+                columns: table => new
+                {
+                    id = table.Column<string>(type: "TEXT", nullable: false),
+                    list_id = table.Column<string>(type: "TEXT", nullable: false),
+                    title = table.Column<string>(type: "TEXT", nullable: false),
+                    description = table.Column<string>(type: "TEXT", nullable: true),
+                    status = table.Column<string>(type: "TEXT", nullable: false),
+                    scheduled_for = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    result = table.Column<string>(type: "TEXT", nullable: true),
+                    log_path = table.Column<string>(type: "TEXT", nullable: true),
+                    created_at = table.Column<DateTime>(type: "TEXT", nullable: false),
+                    started_at = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    finished_at = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    commit_type = table.Column<string>(type: "TEXT", nullable: false, defaultValue: "chore"),
+                    model = table.Column<string>(type: "TEXT", nullable: true),
+                    system_prompt = table.Column<string>(type: "TEXT", nullable: true),
+                    agent_path = table.Column<string>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_tasks", x => x.id);
+                    table.ForeignKey(
+                        name: "FK_tasks_lists_list_id",
+                        column: x => x.list_id,
+                        principalTable: "lists",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "list_tags",
+                columns: table => new
+                {
+                    list_id = table.Column<string>(type: "TEXT", nullable: false),
+                    tag_id = table.Column<long>(type: "INTEGER", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_list_tags", x => new { x.list_id, x.tag_id });
+                    table.ForeignKey(
+                        name: "FK_list_tags_lists_list_id",
+                        column: x => x.list_id,
+                        principalTable: "lists",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_list_tags_tags_tag_id",
+                        column: x => x.tag_id,
+                        principalTable: "tags",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "subtasks",
+                columns: table => new
+                {
+                    id = table.Column<string>(type: "TEXT", nullable: false),
+                    task_id = table.Column<string>(type: "TEXT", nullable: false),
+                    title = table.Column<string>(type: "TEXT", nullable: false),
+                    completed = table.Column<bool>(type: "INTEGER", nullable: false, defaultValue: false),
+                    order_num = table.Column<int>(type: "INTEGER", nullable: false),
+                    created_at = table.Column<DateTime>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_subtasks", x => x.id);
+                    table.ForeignKey(
+                        name: "FK_subtasks_tasks_task_id",
+                        column: x => x.task_id,
+                        principalTable: "tasks",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "task_runs",
+                columns: table => new
+                {
+                    id = table.Column<string>(type: "TEXT", nullable: false),
+                    task_id = table.Column<string>(type: "TEXT", nullable: false),
+                    run_number = table.Column<int>(type: "INTEGER", nullable: false),
+                    session_id = table.Column<string>(type: "TEXT", nullable: true),
+                    is_retry = table.Column<bool>(type: "INTEGER", nullable: false, defaultValue: false),
+                    prompt = table.Column<string>(type: "TEXT", nullable: false),
+                    result_markdown = table.Column<string>(type: "TEXT", nullable: true),
+                    structured_output = table.Column<string>(type: "TEXT", nullable: true),
+                    error_markdown = table.Column<string>(type: "TEXT", nullable: true),
+                    exit_code = table.Column<int>(type: "INTEGER", nullable: true),
+                    turn_count = table.Column<int>(type: "INTEGER", nullable: true),
+                    tokens_in = table.Column<int>(type: "INTEGER", nullable: true),
+                    tokens_out = table.Column<int>(type: "INTEGER", nullable: true),
+                    log_path = table.Column<string>(type: "TEXT", nullable: true),
+                    started_at = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    finished_at = table.Column<DateTime>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_task_runs", x => x.id);
+                    table.ForeignKey(
+                        name: "FK_task_runs_tasks_task_id",
+                        column: x => x.task_id,
+                        principalTable: "tasks",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "task_tags",
+                columns: table => new
+                {
+                    task_id = table.Column<string>(type: "TEXT", nullable: false),
+                    tag_id = table.Column<long>(type: "INTEGER", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_task_tags", x => new { x.task_id, x.tag_id });
+                    table.ForeignKey(
+                        name: "FK_task_tags_tags_tag_id",
+                        column: x => x.tag_id,
+                        principalTable: "tags",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_task_tags_tasks_task_id",
+                        column: x => x.task_id,
+                        principalTable: "tasks",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "worktrees",
+                columns: table => new
+                {
+                    task_id = table.Column<string>(type: "TEXT", nullable: false),
+                    path = table.Column<string>(type: "TEXT", nullable: false),
+                    branch_name = table.Column<string>(type: "TEXT", nullable: false),
+                    base_commit = table.Column<string>(type: "TEXT", nullable: false),
+                    head_commit = table.Column<string>(type: "TEXT", nullable: true),
+                    diff_stat = table.Column<string>(type: "TEXT", nullable: true),
+                    state = table.Column<string>(type: "TEXT", nullable: false, defaultValue: "active"),
+                    created_at = table.Column<DateTime>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_worktrees", x => x.task_id);
+                    table.ForeignKey(
+                        name: "FK_worktrees_tasks_task_id",
+                        column: x => x.task_id,
+                        principalTable: "tasks",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.InsertData(
+                table: "tags",
+                columns: new[] { "id", "name" },
+                values: new object[,]
+                {
+                    { 1L, "agent" },
+                    { 2L, "manual" }
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_list_tags_tag_id",
+                table: "list_tags",
+                column: "tag_id");
+
+            migrationBuilder.CreateIndex(
+                name: "idx_subtasks_task_id",
+                table: "subtasks",
+                column: "task_id");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_tags_name",
+                table: "tags",
+                column: "name",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "idx_task_runs_task_id",
+                table: "task_runs",
+                column: "task_id");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_task_tags_tag_id",
+                table: "task_tags",
+                column: "tag_id");
+
+            migrationBuilder.CreateIndex(
+                name: "idx_tasks_list_id",
+                table: "tasks",
+                column: "list_id");
+
+            migrationBuilder.CreateIndex(
+                name: "idx_tasks_status",
+                table: "tasks",
+                column: "status");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "list_config");
+
+            migrationBuilder.DropTable(
+                name: "list_tags");
+
+            migrationBuilder.DropTable(
+                name: "subtasks");
+
+            migrationBuilder.DropTable(
+                name: "task_runs");
+
+            migrationBuilder.DropTable(
+                name: "task_tags");
+
+            migrationBuilder.DropTable(
+                name: "worktrees");
+
+            migrationBuilder.DropTable(
+                name: "tags");
+
+            migrationBuilder.DropTable(
+                name: "tasks");
+
+            migrationBuilder.DropTable(
+                name: "lists");
+        }
+    }
+}

src/ClaudeDo.Data/Migrations/ClaudeDoDbContextModelSnapshot.cs

@@ -0,0 +1,479 @@
+// <auto-generated />
+using System;
+using ClaudeDo.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace ClaudeDo.Data.Migrations
+{
+    [DbContext(typeof(ClaudeDoDbContext))]
+    partial class ClaudeDoDbContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.11");
+
+            modelBuilder.Entity("ClaudeDo.Data.Models.ListConfigEntity", b =>
+                {
+                    b.Property<string>("ListId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("list_id");
+
+                    b.Property<string>("AgentPath")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("agent_path");
+
+                    b.Property<string>("Model")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("model");
+
+                    b.Property<string>("SystemPrompt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("system_prompt");
+
+                    b.HasKey("ListId");
+
+                    b.ToTable("list_config", (string)null);
+                });
+
+            modelBuilder.Entity("ClaudeDo.Data.Models.ListEntity", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<string>("DefaultCommitType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasDefaultValue("chore")
+                        .HasColumnName("default_commit_type");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.Property<string>("WorkingDir")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("working_dir");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("lists", (string)null);
+                });
+
+            modelBuilder.Entity("ClaudeDo.Data.Models.SubtaskEntity", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("id");
+
+                    b.Property<bool>("Completed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(false)
+                        .HasColumnName("completed");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<int>("OrderNum")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("order_num");
+
+                    b.Property<string>("TaskId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("task_id");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TaskId")
+                        .HasDatabaseName("idx_subtasks_task_id");
+
+                    b.ToTable("subtasks", (string)null);
+                });
+
+            modelBuilder.Entity("ClaudeDo.Data.Models.TagEntity", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("tags", (string)null);
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1L,
+                            Name = "agent"
+                        },
+                        new
+                        {
+                            Id = 2L,
+                            Name = "manual"
+                        });
+                });
+
+            modelBuilder.Entity("ClaudeDo.Data.Models.TaskEntity", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("id");
+
+                    b.Property<string>("AgentPath")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("agent_path");
+
+                    b.Property<string>("CommitType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasDefaultValue("chore")
+                        .HasColumnName("commit_type");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("description");
+
+                    b.Property<DateTime?>("FinishedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("finished_at");
+
+                    b.Property<string>("ListId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("list_id");
+
+                    b.Property<string>("LogPath")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("log_path");
+
+                    b.Property<string>("Model")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("model");
+
+                    b.Property<string>("Result")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("result");
+
+                    b.Property<DateTime?>("ScheduledFor")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("scheduled_for");
+
+                    b.Property<DateTime?>("StartedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("started_at");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("status");
+
+                    b.Property<string>("SystemPrompt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("system_prompt");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ListId")
+                        .HasDatabaseName("idx_tasks_list_id");
+
+                    b.HasIndex("Status")
+                        .HasDatabaseName("idx_tasks_status");
+
+                    b.ToTable("tasks", (string)null);
+                });
+
+            modelBuilder.Entity("ClaudeDo.Data.Models.TaskRunEntity", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("id");
+
+                    b.Property<string>("ErrorMarkdown")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("error_markdown");
+
+                    b.Property<int?>("ExitCode")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exit_code");
+
+                    b.Property<DateTime?>("FinishedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("finished_at");
+
+                    b.Property<bool>("IsRetry")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(false)
+                        .HasColumnName("is_retry");
+
+                    b.Property<string>("LogPath")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("log_path");
+
+                    b.Property<string>("Prompt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("prompt");
+
+                    b.Property<string>("ResultMarkdown")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("result_markdown");
+
+                    b.Property<int>("RunNumber")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("run_number");
+
+                    b.Property<string>("SessionId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("session_id");
+
+                    b.Property<DateTime?>("StartedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("started_at");
+
+                    b.Property<string>("StructuredOutputJson")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("structured_output");
+
+                    b.Property<string>("TaskId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("task_id");
+
+                    b.Property<int?>("TokensIn")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("tokens_in");
+
+                    b.Property<int?>("TokensOut")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("tokens_out");
+
+                    b.Property<int?>("TurnCount")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("turn_count");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TaskId")
+                        .HasDatabaseName("idx_task_runs_task_id");
+
+                    b.ToTable("task_runs", (string)null);
+                });
+
+            modelBuilder.Entity("ClaudeDo.Data.Models.WorktreeEntity", b =>
+                {
+                    b.Property<string>("TaskId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("task_id");
+
+                    b.Property<string>("BaseCommit")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("base_commit");
+
+                    b.Property<string>("BranchName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("branch_name");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<string>("DiffStat")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("diff_stat");
+
+                    b.Property<string>("HeadCommit")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("head_commit");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<string>("State")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasDefaultValue("active")
+                        .HasColumnName("state");
+
+                    b.HasKey("TaskId");
+
+                    b.ToTable("worktrees", (string)null);
+                });
+
+            modelBuilder.Entity("list_tags", b =>
+                {
+                    b.Property<string>("list_id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("tag_id")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("list_id", "tag_id");
+
+                    b.HasIndex("tag_id");
+
+                    b.ToTable("list_tags", (string)null);
+                });
+
+            modelBuilder.Entity("task_tags", b =>
+                {
+                    b.Property<string>("task_id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("tag_id")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("task_id", "tag_id");
+
+                    b.HasIndex("tag_id");
+
+                    b.ToTable("task_tags", (string)null);
+                });
+
+            modelBuilder.Entity("ClaudeDo.Data.Models.ListConfigEntity", b =>
+                {
+                    b.HasOne("ClaudeDo.Data.Models.ListEntity", "List")
+                        .WithOne("Config")
+                        .HasForeignKey("ClaudeDo.Data.Models.ListConfigEntity", "ListId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("List");
+                });
+
+            modelBuilder.Entity("ClaudeDo.Data.Models.SubtaskEntity", b =>
+                {
+                    b.HasOne("ClaudeDo.Data.Models.TaskEntity", "Task")
+                        .WithMany("Subtasks")
+                        .HasForeignKey("TaskId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Task");
+                });
+
+            modelBuilder.Entity("ClaudeDo.Data.Models.TaskEntity", b =>
+                {
+                    b.HasOne("ClaudeDo.Data.Models.ListEntity", "List")
+                        .WithMany("Tasks")
+                        .HasForeignKey("ListId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("List");
+                });
+
+            modelBuilder.Entity("ClaudeDo.Data.Models.TaskRunEntity", b =>
+                {
+                    b.HasOne("ClaudeDo.Data.Models.TaskEntity", "Task")
+                        .WithMany("Runs")
+                        .HasForeignKey("TaskId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Task");
+                });
+
+            modelBuilder.Entity("ClaudeDo.Data.Models.WorktreeEntity", b =>
+                {
+                    b.HasOne("ClaudeDo.Data.Models.TaskEntity", "Task")
+                        .WithOne("Worktree")
+                        .HasForeignKey("ClaudeDo.Data.Models.WorktreeEntity", "TaskId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Task");
+                });
+
+            modelBuilder.Entity("list_tags", b =>
+                {
+                    b.HasOne("ClaudeDo.Data.Models.ListEntity", null)
+                        .WithMany()
+                        .HasForeignKey("list_id")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ClaudeDo.Data.Models.TagEntity", null)
+                        .WithMany()
+                        .HasForeignKey("tag_id")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("task_tags", b =>
+                {
+                    b.HasOne("ClaudeDo.Data.Models.TagEntity", null)
+                        .WithMany()
+                        .HasForeignKey("tag_id")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ClaudeDo.Data.Models.TaskEntity", null)
+                        .WithMany()
+                        .HasForeignKey("task_id")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("ClaudeDo.Data.Models.ListEntity", b =>
+                {
+                    b.Navigation("Config");
+
+                    b.Navigation("Tasks");
+                });
+
+            modelBuilder.Entity("ClaudeDo.Data.Models.TaskEntity", b =>
+                {
+                    b.Navigation("Runs");
+
+                    b.Navigation("Subtasks");
+
+                    b.Navigation("Worktree");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/ClaudeDo.Data/Models/ListConfigEntity.cs

@@ -6,4 +6,7 @@ public sealed class ListConfigEntity
     public string? Model { get; set; }
     public string? SystemPrompt { get; set; }
     public string? AgentPath { get; set; }
+
+    // Navigation property
+    public ListEntity List { get; set; } = null!;
 }

src/ClaudeDo.Data/Models/ListEntity.cs

@@ -7,4 +7,9 @@ public sealed class ListEntity
     public required DateTime CreatedAt { get; init; }
     public string? WorkingDir { get; set; }
     public string DefaultCommitType { get; set; } = "chore";
+
+    // Navigation properties
+    public ListConfigEntity? Config { get; set; }
+    public ICollection<TaskEntity> Tasks { get; set; } = new List<TaskEntity>();
+    public ICollection<TagEntity> Tags { get; set; } = new List<TagEntity>();
 }

src/ClaudeDo.Data/Models/SubtaskEntity.cs

@@ -0,0 +1,14 @@
+namespace ClaudeDo.Data.Models;
+
+public sealed class SubtaskEntity
+{
+    public required string Id { get; init; }
+    public required string TaskId { get; init; }
+    public required string Title { get; set; }
+    public bool Completed { get; set; }
+    public int OrderNum { get; set; }
+    public required DateTime CreatedAt { get; init; }
+
+    // Navigation property
+    public TaskEntity Task { get; set; } = null!;
+}

src/ClaudeDo.Data/Models/TagEntity.cs

@@ -4,4 +4,8 @@ public sealed class TagEntity
 {
     public long Id { get; init; }
     public required string Name { get; set; }
+
+    // Navigation properties
+    public ICollection<ListEntity> Lists { get; set; } = new List<ListEntity>();
+    public ICollection<TaskEntity> Tasks { get; set; } = new List<TaskEntity>();
 }

src/ClaudeDo.Data/Models/TaskEntity.cs

@@ -26,4 +26,11 @@ public sealed class TaskEntity
     public string? Model { get; set; }
     public string? SystemPrompt { get; set; }
     public string? AgentPath { get; set; }
+
+    // Navigation properties
+    public ListEntity List { get; set; } = null!;
+    public WorktreeEntity? Worktree { get; set; }
+    public ICollection<TagEntity> Tags { get; set; } = new List<TagEntity>();
+    public ICollection<TaskRunEntity> Runs { get; set; } = new List<TaskRunEntity>();
+    public ICollection<SubtaskEntity> Subtasks { get; set; } = new List<SubtaskEntity>();
 }

src/ClaudeDo.Data/Models/TaskRunEntity.cs

@@ -18,4 +18,7 @@ public sealed class TaskRunEntity
     public string? LogPath { get; set; }
     public DateTime? StartedAt { get; set; }
     public DateTime? FinishedAt { get; set; }
+
+    // Navigation property
+    public TaskEntity Task { get; set; } = null!;
 }

src/ClaudeDo.Data/Models/WorktreeEntity.cs

@@ -18,4 +18,7 @@ public sealed class WorktreeEntity
     public string? DiffStat { get; set; }
     public WorktreeState State { get; set; } = WorktreeState.Active;
     public required DateTime CreatedAt { get; init; }
+
+    // Navigation property
+    public TaskEntity Task { get; set; } = null!;
 }

src/ClaudeDo.Data/Repositories/ListRepository.cs

@@ -1,157 +1,91 @@
 using ClaudeDo.Data.Models;
-using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
 
 namespace ClaudeDo.Data.Repositories;
 
 public sealed class ListRepository
 {
-    private readonly SqliteConnectionFactory _factory;
+    private readonly ClaudeDoDbContext _context;
 
-    public ListRepository(SqliteConnectionFactory factory) => _factory = factory;
+    public ListRepository(ClaudeDoDbContext context) => _context = context;
 
     public async Task AddAsync(ListEntity entity, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = """
-            INSERT INTO lists (id, name, created_at, working_dir, default_commit_type)
-            VALUES (@id, @name, @created_at, @working_dir, @default_commit_type)
-            """;
-        cmd.Parameters.AddWithValue("@id", entity.Id);
-        cmd.Parameters.AddWithValue("@name", entity.Name);
-        cmd.Parameters.AddWithValue("@created_at", entity.CreatedAt.ToString("o"));
-        cmd.Parameters.AddWithValue("@working_dir", (object?)entity.WorkingDir ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@default_commit_type", entity.DefaultCommitType);
-        await cmd.ExecuteNonQueryAsync(ct);
+        _context.Lists.Add(entity);
+        await _context.SaveChangesAsync(ct);
     }
 
     public async Task UpdateAsync(ListEntity entity, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = """
-            UPDATE lists SET name = @name, working_dir = @working_dir,
-                             default_commit_type = @default_commit_type
-            WHERE id = @id
-            """;
-        cmd.Parameters.AddWithValue("@id", entity.Id);
-        cmd.Parameters.AddWithValue("@name", entity.Name);
-        cmd.Parameters.AddWithValue("@working_dir", (object?)entity.WorkingDir ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@default_commit_type", entity.DefaultCommitType);
-        await cmd.ExecuteNonQueryAsync(ct);
+        _context.Lists.Update(entity);
+        await _context.SaveChangesAsync(ct);
     }
 
     public async Task DeleteAsync(string listId, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "DELETE FROM lists WHERE id = @id";
-        cmd.Parameters.AddWithValue("@id", listId);
-        await cmd.ExecuteNonQueryAsync(ct);
+        await _context.Lists.Where(l => l.Id == listId).ExecuteDeleteAsync(ct);
     }
 
     public async Task<ListEntity?> GetByIdAsync(string listId, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "SELECT id, name, created_at, working_dir, default_commit_type FROM lists WHERE id = @id";
-        cmd.Parameters.AddWithValue("@id", listId);
-
-        await using var reader = await cmd.ExecuteReaderAsync(ct);
-        if (!await reader.ReadAsync(ct)) return null;
-        return ReadList(reader);
+        return await _context.Lists.FirstOrDefaultAsync(l => l.Id == listId, ct);
     }
 
     public async Task<List<ListEntity>> GetAllAsync(CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "SELECT id, name, created_at, working_dir, default_commit_type FROM lists ORDER BY created_at";
-
-        await using var reader = await cmd.ExecuteReaderAsync(ct);
-        var result = new List<ListEntity>();
-        while (await reader.ReadAsync(ct))
-            result.Add(ReadList(reader));
-        return result;
+        return await _context.Lists.OrderBy(l => l.CreatedAt).ToListAsync(ct);
     }
 
     public async Task<List<TagEntity>> GetTagsAsync(string listId, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = """
-            SELECT t.id, t.name FROM tags t
-            JOIN list_tags lt ON lt.tag_id = t.id
-            WHERE lt.list_id = @list_id
-            """;
-        cmd.Parameters.AddWithValue("@list_id", listId);
-
-        await using var reader = await cmd.ExecuteReaderAsync(ct);
-        var result = new List<TagEntity>();
-        while (await reader.ReadAsync(ct))
-            result.Add(new TagEntity { Id = reader.GetInt64(0), Name = reader.GetString(1) });
-        return result;
+        return await _context.Lists
+            .Where(l => l.Id == listId)
+            .SelectMany(l => l.Tags)
+            .ToListAsync(ct);
     }
 
     public async Task AddTagAsync(string listId, long tagId, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "INSERT OR IGNORE INTO list_tags (list_id, tag_id) VALUES (@list_id, @tag_id)";
-        cmd.Parameters.AddWithValue("@list_id", listId);
-        cmd.Parameters.AddWithValue("@tag_id", tagId);
-        await cmd.ExecuteNonQueryAsync(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))
+        {
+            list.Tags.Add(tag);
+            await _context.SaveChangesAsync(ct);
+        }
     }
 
     public async Task RemoveTagAsync(string listId, long tagId, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "DELETE FROM list_tags WHERE list_id = @list_id AND tag_id = @tag_id";
-        cmd.Parameters.AddWithValue("@list_id", listId);
-        cmd.Parameters.AddWithValue("@tag_id", tagId);
-        await cmd.ExecuteNonQueryAsync(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)
+        {
+            list.Tags.Remove(tag);
+            await _context.SaveChangesAsync(ct);
+        }
     }
 
     public async Task<ListConfigEntity?> GetConfigAsync(string listId, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "SELECT list_id, model, system_prompt, agent_path FROM list_config WHERE list_id = @list_id";
-        cmd.Parameters.AddWithValue("@list_id", listId);
-
-        await using var reader = await cmd.ExecuteReaderAsync(ct);
-        if (!await reader.ReadAsync(ct)) return null;
-        return new ListConfigEntity
-        {
-            ListId = reader.GetString(0),
-            Model = reader.IsDBNull(1) ? null : reader.GetString(1),
-            SystemPrompt = reader.IsDBNull(2) ? null : reader.GetString(2),
-            AgentPath = reader.IsDBNull(3) ? null : reader.GetString(3),
-        };
+        return await _context.ListConfigs.FirstOrDefaultAsync(c => c.ListId == listId, ct);
     }
 
-    public async Task SetConfigAsync(ListConfigEntity entity, CancellationToken ct = default)
+    public async Task SetConfigAsync(ListConfigEntity config, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = """
-            INSERT OR REPLACE INTO list_config (list_id, model, system_prompt, agent_path)
-            VALUES (@list_id, @model, @system_prompt, @agent_path)
-            """;
-        cmd.Parameters.AddWithValue("@list_id", entity.ListId);
-        cmd.Parameters.AddWithValue("@model", (object?)entity.Model ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@system_prompt", (object?)entity.SystemPrompt ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@agent_path", (object?)entity.AgentPath ?? DBNull.Value);
-        await cmd.ExecuteNonQueryAsync(ct);
+        var existing = await _context.ListConfigs.FirstOrDefaultAsync(c => c.ListId == config.ListId, ct);
+        if (existing is null)
+        {
+            _context.ListConfigs.Add(config);
         }
-
-    private static ListEntity ReadList(SqliteDataReader reader) => new()
+        else
         {
-        Id = reader.GetString(0),
-        Name = reader.GetString(1),
-        CreatedAt = DateTime.Parse(reader.GetString(2)),
-        WorkingDir = reader.IsDBNull(3) ? null : reader.GetString(3),
-        DefaultCommitType = reader.GetString(4),
-    };
+            existing.Model = config.Model;
+            existing.SystemPrompt = config.SystemPrompt;
+            existing.AgentPath = config.AgentPath;
+        }
+        await _context.SaveChangesAsync(ct);
+    }
 }

src/ClaudeDo.Data/Repositories/SubtaskRepository.cs

@@ -0,0 +1,41 @@
+using ClaudeDo.Data.Models;
+using Microsoft.EntityFrameworkCore;
+
+namespace ClaudeDo.Data.Repositories;
+
+public sealed class SubtaskRepository
+{
+    private readonly ClaudeDoDbContext _context;
+
+    public SubtaskRepository(ClaudeDoDbContext context) => _context = context;
+
+    public async Task AddAsync(SubtaskEntity entity, CancellationToken ct = default)
+    {
+        _context.Subtasks.Add(entity);
+        await _context.SaveChangesAsync(ct);
+    }
+
+    public async Task<List<SubtaskEntity>> GetByTaskIdAsync(string taskId, CancellationToken ct = default)
+    {
+        return await _context.Subtasks
+            .Where(s => s.TaskId == taskId)
+            .OrderBy(s => s.OrderNum)
+            .ToListAsync(ct);
+    }
+
+    public async Task UpdateAsync(SubtaskEntity entity, CancellationToken ct = default)
+    {
+        _context.Subtasks.Update(entity);
+        await _context.SaveChangesAsync(ct);
+    }
+
+    public async Task DeleteAsync(string subtaskId, CancellationToken ct = default)
+    {
+        await _context.Subtasks.Where(s => s.Id == subtaskId).ExecuteDeleteAsync(ct);
+    }
+
+    public async Task DeleteByTaskIdAsync(string taskId, CancellationToken ct = default)
+    {
+        await _context.Subtasks.Where(s => s.TaskId == taskId).ExecuteDeleteAsync(ct);
+    }
+}

src/ClaudeDo.Data/Repositories/TagRepository.cs

@@ -1,47 +1,28 @@
 using ClaudeDo.Data.Models;
-using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
 
 namespace ClaudeDo.Data.Repositories;
 
 public sealed class TagRepository
 {
-    private readonly SqliteConnectionFactory _factory;
+    private readonly ClaudeDoDbContext _context;
 
-    public TagRepository(SqliteConnectionFactory factory) => _factory = factory;
+    public TagRepository(ClaudeDoDbContext context) => _context = context;
 
     public async Task<List<TagEntity>> GetAllAsync(CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "SELECT id, name FROM tags ORDER BY id";
-
-        await using var reader = await cmd.ExecuteReaderAsync(ct);
-        var result = new List<TagEntity>();
-        while (await reader.ReadAsync(ct))
-            result.Add(new TagEntity { Id = reader.GetInt64(0), Name = reader.GetString(1) });
-        return result;
+        return await _context.Tags.OrderBy(t => t.Id).ToListAsync(ct);
     }
 
     public async Task<long> GetOrCreateAsync(string name, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        return await GetOrCreateAsync(conn, name, ct);
-    }
-
-    public static async Task<long> GetOrCreateAsync(SqliteConnection conn, string name, CancellationToken ct = default)
-    {
-        await using var sel = conn.CreateCommand();
-        sel.CommandText = "SELECT id FROM tags WHERE name = @name";
-        sel.Parameters.AddWithValue("@name", name);
-
-        var existing = await sel.ExecuteScalarAsync(ct);
+        var existing = await _context.Tags.FirstOrDefaultAsync(t => t.Name == name, ct);
         if (existing is not null)
-            return (long)existing;
+            return existing.Id;
 
-        await using var ins = conn.CreateCommand();
-        ins.CommandText = "INSERT INTO tags (name) VALUES (@name) RETURNING id";
-        ins.Parameters.AddWithValue("@name", name);
-
-        return (long)(await ins.ExecuteScalarAsync(ct))!;
+        var tag = new TagEntity { Name = name };
+        _context.Tags.Add(tag);
+        await _context.SaveChangesAsync(ct);
+        return tag.Id;
     }
 }

src/ClaudeDo.Data/Repositories/TaskRepository.cs

@@ -1,171 +1,148 @@
 using ClaudeDo.Data.Models;
-using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
 using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
 
 namespace ClaudeDo.Data.Repositories;
 
 public sealed class TaskRepository
 {
-    private readonly SqliteConnectionFactory _factory;
+    private readonly ClaudeDoDbContext _context;
 
-    public TaskRepository(SqliteConnectionFactory factory) => _factory = factory;
-
-    #region Status mapping
-
-    private static string ToDb(TaskStatus s) => s switch
-    {
-        TaskStatus.Manual => "manual",
-        TaskStatus.Queued => "queued",
-        TaskStatus.Running => "running",
-        TaskStatus.Done => "done",
-        TaskStatus.Failed => "failed",
-        _ => throw new ArgumentOutOfRangeException(nameof(s)),
-    };
-
-    private static TaskStatus FromDb(string s) => s switch
-    {
-        "manual" => TaskStatus.Manual,
-        "queued" => TaskStatus.Queued,
-        "running" => TaskStatus.Running,
-        "done" => TaskStatus.Done,
-        "failed" => TaskStatus.Failed,
-        _ => throw new ArgumentOutOfRangeException(nameof(s)),
-    };
-
-    #endregion
+    public TaskRepository(ClaudeDoDbContext context) => _context = context;
 
     #region CRUD
 
     public async Task AddAsync(TaskEntity entity, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = """
-            INSERT INTO tasks (id, list_id, title, description, status, scheduled_for,
-                               result, log_path, created_at, started_at, finished_at, commit_type,
-                               model, system_prompt, agent_path)
-            VALUES (@id, @list_id, @title, @description, @status, @scheduled_for,
-                    @result, @log_path, @created_at, @started_at, @finished_at, @commit_type,
-                    @model, @system_prompt, @agent_path)
-            """;
-        BindTask(cmd, entity);
-        await cmd.ExecuteNonQueryAsync(ct);
+        _context.Tasks.Add(entity);
+        await _context.SaveChangesAsync(ct);
     }
 
     public async Task UpdateAsync(TaskEntity entity, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = """
-            UPDATE tasks SET list_id = @list_id, title = @title, description = @description,
-                             status = @status, scheduled_for = @scheduled_for, result = @result,
-                             log_path = @log_path, started_at = @started_at,
-                             finished_at = @finished_at, commit_type = @commit_type,
-                             model = @model, system_prompt = @system_prompt, agent_path = @agent_path
-            WHERE id = @id
-            """;
-        BindTask(cmd, entity);
-        await cmd.ExecuteNonQueryAsync(ct);
+        _context.Tasks.Update(entity);
+        await _context.SaveChangesAsync(ct);
     }
 
     public async Task DeleteAsync(string taskId, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "DELETE FROM tasks WHERE id = @id";
-        cmd.Parameters.AddWithValue("@id", taskId);
-        await cmd.ExecuteNonQueryAsync(ct);
+        await _context.Tasks.Where(t => t.Id == taskId).ExecuteDeleteAsync(ct);
     }
 
     public async Task<TaskEntity?> GetByIdAsync(string taskId, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "SELECT id, list_id, title, description, status, scheduled_for, result, log_path, created_at, started_at, finished_at, commit_type, model, system_prompt, agent_path FROM tasks WHERE id = @id";
-        cmd.Parameters.AddWithValue("@id", taskId);
-
-        await using var reader = await cmd.ExecuteReaderAsync(ct);
-        if (!await reader.ReadAsync(ct)) return null;
-        return ReadTask(reader);
+        return await _context.Tasks.AsNoTracking().FirstOrDefaultAsync(t => t.Id == taskId, ct);
     }
 
-    public async Task<List<TaskEntity>> GetByListAsync(string listId, CancellationToken ct = default)
+    public async Task<List<TaskEntity>> GetByListIdAsync(string listId, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "SELECT id, list_id, title, description, status, scheduled_for, result, log_path, created_at, started_at, finished_at, commit_type, model, system_prompt, agent_path FROM tasks WHERE list_id = @list_id ORDER BY created_at";
-        cmd.Parameters.AddWithValue("@list_id", listId);
+        return await _context.Tasks
+            .Where(t => t.ListId == listId)
+            .OrderBy(t => t.CreatedAt)
+            .ToListAsync(ct);
+    }
 
-        await using var reader = await cmd.ExecuteReaderAsync(ct);
-        var result = new List<TaskEntity>();
-        while (await reader.ReadAsync(ct))
-            result.Add(ReadTask(reader));
-        return result;
+    // Kept for backwards-compatibility with callers using the old name.
+    public Task<List<TaskEntity>> GetByListAsync(string listId, CancellationToken ct = default)
+        => GetByListIdAsync(listId, ct);
+
+    #endregion
+
+    #region Status transitions
+
+    public async Task MarkRunningAsync(string taskId, DateTime startedAt, CancellationToken ct = default)
+    {
+        await _context.Tasks
+            .Where(t => t.Id == taskId)
+            .ExecuteUpdateAsync(s => s
+                .SetProperty(t => t.Status, TaskStatus.Running)
+                .SetProperty(t => t.StartedAt, startedAt), ct);
+    }
+
+    public async Task MarkDoneAsync(string taskId, DateTime finishedAt, string? result, CancellationToken ct = default)
+    {
+        await _context.Tasks
+            .Where(t => t.Id == taskId)
+            .ExecuteUpdateAsync(s => s
+                .SetProperty(t => t.Status, TaskStatus.Done)
+                .SetProperty(t => t.FinishedAt, finishedAt)
+                .SetProperty(t => t.Result, result), ct);
+    }
+
+    public async Task MarkFailedAsync(string taskId, DateTime finishedAt, string? result, CancellationToken ct = default)
+    {
+        await _context.Tasks
+            .Where(t => t.Id == taskId)
+            .ExecuteUpdateAsync(s => s
+                .SetProperty(t => t.Status, TaskStatus.Failed)
+                .SetProperty(t => t.FinishedAt, finishedAt)
+                .SetProperty(t => t.Result, result), ct);
+    }
+
+    public async Task SetLogPathAsync(string taskId, string logPath, CancellationToken ct = default)
+    {
+        await _context.Tasks
+            .Where(t => t.Id == taskId)
+            .ExecuteUpdateAsync(s => s.SetProperty(t => t.LogPath, logPath), ct);
+    }
+
+    public async Task<int> FlipAllRunningToFailedAsync(string reason, CancellationToken ct = default)
+    {
+        var resultText = "[stale] " + reason;
+        var now = DateTime.UtcNow;
+        return await _context.Tasks
+            .Where(t => t.Status == TaskStatus.Running)
+            .ExecuteUpdateAsync(s => s
+                .SetProperty(t => t.Status, TaskStatus.Failed)
+                .SetProperty(t => t.FinishedAt, now)
+                .SetProperty(t => t.Result, resultText), ct);
     }
 
     #endregion
 
-    #region Tag junction
-
-    public async Task<List<TagEntity>> GetTagsAsync(string taskId, CancellationToken ct = default)
-    {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = """
-            SELECT t.id, t.name FROM tags t
-            JOIN task_tags tt ON tt.tag_id = t.id
-            WHERE tt.task_id = @task_id
-            """;
-        cmd.Parameters.AddWithValue("@task_id", taskId);
-
-        await using var reader = await cmd.ExecuteReaderAsync(ct);
-        var result = new List<TagEntity>();
-        while (await reader.ReadAsync(ct))
-            result.Add(new TagEntity { Id = reader.GetInt64(0), Name = reader.GetString(1) });
-        return result;
-    }
+    #region Tags
 
     public async Task AddTagAsync(string taskId, long tagId, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "INSERT OR IGNORE INTO task_tags (task_id, tag_id) VALUES (@task_id, @tag_id)";
-        cmd.Parameters.AddWithValue("@task_id", taskId);
-        cmd.Parameters.AddWithValue("@tag_id", tagId);
-        await cmd.ExecuteNonQueryAsync(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))
+        {
+            task.Tags.Add(tag);
+            await _context.SaveChangesAsync(ct);
+        }
     }
 
     public async Task RemoveTagAsync(string taskId, long tagId, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "DELETE FROM task_tags WHERE task_id = @task_id AND tag_id = @tag_id";
-        cmd.Parameters.AddWithValue("@task_id", taskId);
-        cmd.Parameters.AddWithValue("@tag_id", tagId);
-        await cmd.ExecuteNonQueryAsync(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)
+        {
+            task.Tags.Remove(tag);
+            await _context.SaveChangesAsync(ct);
+        }
+    }
+
+    public async Task<List<TagEntity>> GetTagsAsync(string taskId, CancellationToken ct = default)
+    {
+        return await _context.Tasks
+            .Where(t => t.Id == taskId)
+            .SelectMany(t => t.Tags)
+            .ToListAsync(ct);
     }
 
     public async Task<List<TagEntity>> GetEffectiveTagsAsync(string taskId, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = """
-            SELECT DISTINCT t.id, t.name FROM tags t
-            WHERE t.id IN (
-                SELECT tag_id FROM task_tags WHERE task_id = @task_id
-                UNION
-                SELECT lt.tag_id FROM list_tags lt
-                JOIN tasks tk ON tk.list_id = lt.list_id
-                WHERE tk.id = @task_id
-            )
-            """;
-        cmd.Parameters.AddWithValue("@task_id", taskId);
-
-        await using var reader = await cmd.ExecuteReaderAsync(ct);
-        var result = new List<TagEntity>();
-        while (await reader.ReadAsync(ct))
-            result.Add(new TagEntity { Id = reader.GetInt64(0), Name = reader.GetString(1) });
-        return result;
+        var taskTags = _context.Tasks
+            .Where(t => t.Id == taskId)
+            .SelectMany(t => t.Tags);
+        var listTags = _context.Tasks
+            .Where(t => t.Id == taskId)
+            .SelectMany(t => t.List.Tags);
+        return await taskTags.Union(listTags).Distinct().ToListAsync(ct);
     }
 
     #endregion
@@ -174,136 +151,38 @@ public sealed class TaskRepository
 
     public async Task<TaskEntity?> GetNextQueuedAgentTaskAsync(DateTime now, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = """
-            SELECT t.id, t.list_id, t.title, t.description, t.status, t.scheduled_for,
-                   t.result, t.log_path, t.created_at, t.started_at, t.finished_at, t.commit_type,
-                   t.model, t.system_prompt, t.agent_path
-            FROM tasks t
+        // Atomic queue claim: UPDATE + RETURNING in one statement prevents TOCTOU races.
+        // Uses raw SQL because EF cannot express UPDATE...RETURNING.
+        // Includes both task-level and list-level "agent" tag so lists tagged "agent"
+        // automatically enqueue all their tasks without per-task tagging.
+        // EF SQLite stores DateTime as "yyyy-MM-dd HH:mm:ss.fffffff" — use the same format for comparison.
+        var nowStr = now.ToUniversalTime().ToString("yyyy-MM-dd HH:mm:ss.fffffff");
+        var result = await _context.Tasks.FromSqlRaw("""
+            UPDATE tasks SET status = 'running'
+            WHERE id = (
+                SELECT t.id FROM tasks t
                 WHERE t.status = 'queued'
-              AND (t.scheduled_for IS NULL OR t.scheduled_for <= @now)
-              AND EXISTS (
+                  AND (t.scheduled_for IS NULL OR t.scheduled_for <= {0})
+                  AND (
+                      EXISTS (
                           SELECT 1 FROM task_tags tt
                           JOIN tags tg ON tg.id = tt.tag_id
                           WHERE tt.task_id = t.id AND tg.name = 'agent'
-                  UNION
+                      )
+                      OR EXISTS (
                           SELECT 1 FROM list_tags lt
                           JOIN tags tg ON tg.id = lt.tag_id
                           WHERE lt.list_id = t.list_id AND tg.name = 'agent'
                       )
+                  )
                 ORDER BY t.created_at ASC
                 LIMIT 1
-            """;
-        cmd.Parameters.AddWithValue("@now", now.ToString("o"));
+            )
+            RETURNING *
+            """, nowStr).ToListAsync(ct);
 
-        await using var reader = await cmd.ExecuteReaderAsync(ct);
-        if (!await reader.ReadAsync(ct)) return null;
-        return ReadTask(reader);
+        return result.FirstOrDefault();
     }
 
     #endregion
-
-    #region Transitions
-
-    public async Task SetLogPathAsync(string taskId, string logPath, CancellationToken ct = default)
-    {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "UPDATE tasks SET log_path = @log_path WHERE id = @id";
-        cmd.Parameters.AddWithValue("@id", taskId);
-        cmd.Parameters.AddWithValue("@log_path", logPath);
-        await cmd.ExecuteNonQueryAsync(ct);
-    }
-
-    public async Task MarkRunningAsync(string taskId, DateTime startedAt, CancellationToken ct = default)
-    {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "UPDATE tasks SET status = 'running', started_at = @started_at WHERE id = @id";
-        cmd.Parameters.AddWithValue("@id", taskId);
-        cmd.Parameters.AddWithValue("@started_at", startedAt.ToString("o"));
-        await cmd.ExecuteNonQueryAsync(ct);
-    }
-
-    public async Task MarkDoneAsync(string taskId, DateTime finishedAt, string? result, CancellationToken ct = default)
-    {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "UPDATE tasks SET status = 'done', finished_at = @finished_at, result = @result WHERE id = @id";
-        cmd.Parameters.AddWithValue("@id", taskId);
-        cmd.Parameters.AddWithValue("@finished_at", finishedAt.ToString("o"));
-        cmd.Parameters.AddWithValue("@result", (object?)result ?? DBNull.Value);
-        await cmd.ExecuteNonQueryAsync(ct);
-    }
-
-    public async Task MarkFailedAsync(string taskId, DateTime finishedAt, string? errorMarkdown, CancellationToken ct = default)
-    {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "UPDATE tasks SET status = 'failed', finished_at = @finished_at, result = @result WHERE id = @id";
-        cmd.Parameters.AddWithValue("@id", taskId);
-        cmd.Parameters.AddWithValue("@finished_at", finishedAt.ToString("o"));
-        cmd.Parameters.AddWithValue("@result", (object?)errorMarkdown ?? DBNull.Value);
-        await cmd.ExecuteNonQueryAsync(ct);
-    }
-
-    public async Task<int> FlipAllRunningToFailedAsync(string reason, CancellationToken ct = default)
-    {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = """
-            UPDATE tasks SET status = 'failed',
-                             finished_at = @now,
-                             result = '[stale] ' || @reason
-            WHERE status = 'running'
-            """;
-        cmd.Parameters.AddWithValue("@now", DateTime.UtcNow.ToString("o"));
-        cmd.Parameters.AddWithValue("@reason", reason);
-        return await cmd.ExecuteNonQueryAsync(ct);
-    }
-
-    #endregion
-
-    #region Helpers
-
-    private static void BindTask(SqliteCommand cmd, TaskEntity e)
-    {
-        cmd.Parameters.AddWithValue("@id", e.Id);
-        cmd.Parameters.AddWithValue("@list_id", e.ListId);
-        cmd.Parameters.AddWithValue("@title", e.Title);
-        cmd.Parameters.AddWithValue("@description", (object?)e.Description ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@status", ToDb(e.Status));
-        cmd.Parameters.AddWithValue("@scheduled_for", e.ScheduledFor.HasValue ? e.ScheduledFor.Value.ToString("o") : DBNull.Value);
-        cmd.Parameters.AddWithValue("@result", (object?)e.Result ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@log_path", (object?)e.LogPath ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@created_at", e.CreatedAt.ToString("o"));
-        cmd.Parameters.AddWithValue("@started_at", e.StartedAt.HasValue ? e.StartedAt.Value.ToString("o") : DBNull.Value);
-        cmd.Parameters.AddWithValue("@finished_at", e.FinishedAt.HasValue ? e.FinishedAt.Value.ToString("o") : DBNull.Value);
-        cmd.Parameters.AddWithValue("@commit_type", e.CommitType);
-        cmd.Parameters.AddWithValue("@model", (object?)e.Model ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@system_prompt", (object?)e.SystemPrompt ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@agent_path", (object?)e.AgentPath ?? DBNull.Value);
-    }
-
-    private static TaskEntity ReadTask(SqliteDataReader r) => new()
-    {
-        Id = r.GetString(0),
-        ListId = r.GetString(1),
-        Title = r.GetString(2),
-        Description = r.IsDBNull(3) ? null : r.GetString(3),
-        Status = FromDb(r.GetString(4)),
-        ScheduledFor = r.IsDBNull(5) ? null : DateTime.Parse(r.GetString(5)),
-        Result = r.IsDBNull(6) ? null : r.GetString(6),
-        LogPath = r.IsDBNull(7) ? null : r.GetString(7),
-        CreatedAt = DateTime.Parse(r.GetString(8)),
-        StartedAt = r.IsDBNull(9) ? null : DateTime.Parse(r.GetString(9)),
-        FinishedAt = r.IsDBNull(10) ? null : DateTime.Parse(r.GetString(10)),
-        CommitType = r.GetString(11),
-        Model = r.IsDBNull(12) ? null : r.GetString(12),
-        SystemPrompt = r.IsDBNull(13) ? null : r.GetString(13),
-        AgentPath = r.IsDBNull(14) ? null : r.GetString(14),
-    };
-
-    #endregion
 }

src/ClaudeDo.Data/Repositories/TaskRunRepository.cs

@@ -1,139 +1,44 @@
-using System.Globalization;
 using ClaudeDo.Data.Models;
-using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
 
 namespace ClaudeDo.Data.Repositories;
 
 public sealed class TaskRunRepository
 {
-    private readonly SqliteConnectionFactory _factory;
+    private readonly ClaudeDoDbContext _context;
 
-    public TaskRunRepository(SqliteConnectionFactory factory) => _factory = factory;
+    public TaskRunRepository(ClaudeDoDbContext context) => _context = context;
 
     public async Task AddAsync(TaskRunEntity entity, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = """
-            INSERT INTO task_runs (id, task_id, run_number, session_id, is_retry, prompt,
-                                   result_markdown, structured_output, error_markdown, exit_code,
-                                   turn_count, tokens_in, tokens_out, log_path, started_at, finished_at)
-            VALUES (@id, @task_id, @run_number, @session_id, @is_retry, @prompt,
-                    @result_markdown, @structured_output, @error_markdown, @exit_code,
-                    @turn_count, @tokens_in, @tokens_out, @log_path, @started_at, @finished_at)
-            """;
-        BindRun(cmd, entity);
-        await cmd.ExecuteNonQueryAsync(ct);
+        _context.TaskRuns.Add(entity);
+        await _context.SaveChangesAsync(ct);
     }
 
     public async Task UpdateAsync(TaskRunEntity entity, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = """
-            UPDATE task_runs SET session_id = @session_id,
-                                 result_markdown = @result_markdown,
-                                 structured_output = @structured_output,
-                                 error_markdown = @error_markdown,
-                                 exit_code = @exit_code,
-                                 turn_count = @turn_count,
-                                 tokens_in = @tokens_in,
-                                 tokens_out = @tokens_out,
-                                 finished_at = @finished_at
-            WHERE id = @id
-            """;
-        cmd.Parameters.AddWithValue("@id", entity.Id);
-        cmd.Parameters.AddWithValue("@session_id", (object?)entity.SessionId ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@result_markdown", (object?)entity.ResultMarkdown ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@structured_output", (object?)entity.StructuredOutputJson ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@error_markdown", (object?)entity.ErrorMarkdown ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@exit_code", entity.ExitCode.HasValue ? entity.ExitCode.Value : DBNull.Value);
-        cmd.Parameters.AddWithValue("@turn_count", entity.TurnCount.HasValue ? entity.TurnCount.Value : DBNull.Value);
-        cmd.Parameters.AddWithValue("@tokens_in", entity.TokensIn.HasValue ? entity.TokensIn.Value : DBNull.Value);
-        cmd.Parameters.AddWithValue("@tokens_out", entity.TokensOut.HasValue ? entity.TokensOut.Value : DBNull.Value);
-        cmd.Parameters.AddWithValue("@finished_at", entity.FinishedAt.HasValue ? entity.FinishedAt.Value.ToString("o") : DBNull.Value);
-        await cmd.ExecuteNonQueryAsync(ct);
+        _context.TaskRuns.Update(entity);
+        await _context.SaveChangesAsync(ct);
     }
 
-    public async Task<TaskRunEntity?> GetByIdAsync(string runId, CancellationToken ct = default)
+    public async Task<TaskRunEntity?> GetByIdAsync(string id, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "SELECT id, task_id, run_number, session_id, is_retry, prompt, result_markdown, structured_output, error_markdown, exit_code, turn_count, tokens_in, tokens_out, log_path, started_at, finished_at FROM task_runs WHERE id = @id";
-        cmd.Parameters.AddWithValue("@id", runId);
-
-        await using var reader = await cmd.ExecuteReaderAsync(ct);
-        if (!await reader.ReadAsync(ct)) return null;
-        return ReadRun(reader);
+        return await _context.TaskRuns.FirstOrDefaultAsync(r => r.Id == id, ct);
     }
 
     public async Task<List<TaskRunEntity>> GetByTaskIdAsync(string taskId, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "SELECT id, task_id, run_number, session_id, is_retry, prompt, result_markdown, structured_output, error_markdown, exit_code, turn_count, tokens_in, tokens_out, log_path, started_at, finished_at FROM task_runs WHERE task_id = @task_id ORDER BY run_number";
-        cmd.Parameters.AddWithValue("@task_id", taskId);
-
-        await using var reader = await cmd.ExecuteReaderAsync(ct);
-        var result = new List<TaskRunEntity>();
-        while (await reader.ReadAsync(ct))
-            result.Add(ReadRun(reader));
-        return result;
+        return await _context.TaskRuns
+            .Where(r => r.TaskId == taskId)
+            .OrderBy(r => r.RunNumber)
+            .ToListAsync(ct);
     }
 
     public async Task<TaskRunEntity?> GetLatestByTaskIdAsync(string taskId, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "SELECT id, task_id, run_number, session_id, is_retry, prompt, result_markdown, structured_output, error_markdown, exit_code, turn_count, tokens_in, tokens_out, log_path, started_at, finished_at FROM task_runs WHERE task_id = @task_id ORDER BY run_number DESC LIMIT 1";
-        cmd.Parameters.AddWithValue("@task_id", taskId);
-
-        await using var reader = await cmd.ExecuteReaderAsync(ct);
-        if (!await reader.ReadAsync(ct)) return null;
-        return ReadRun(reader);
+        return await _context.TaskRuns
+            .Where(r => r.TaskId == taskId)
+            .OrderByDescending(r => r.RunNumber)
+            .FirstOrDefaultAsync(ct);
     }
-
-    #region Helpers
-
-    private static void BindRun(SqliteCommand cmd, TaskRunEntity e)
-    {
-        cmd.Parameters.AddWithValue("@id", e.Id);
-        cmd.Parameters.AddWithValue("@task_id", e.TaskId);
-        cmd.Parameters.AddWithValue("@run_number", e.RunNumber);
-        cmd.Parameters.AddWithValue("@session_id", (object?)e.SessionId ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@is_retry", e.IsRetry ? 1 : 0);
-        cmd.Parameters.AddWithValue("@prompt", e.Prompt);
-        cmd.Parameters.AddWithValue("@result_markdown", (object?)e.ResultMarkdown ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@structured_output", (object?)e.StructuredOutputJson ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@error_markdown", (object?)e.ErrorMarkdown ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@exit_code", e.ExitCode.HasValue ? e.ExitCode.Value : DBNull.Value);
-        cmd.Parameters.AddWithValue("@turn_count", e.TurnCount.HasValue ? e.TurnCount.Value : DBNull.Value);
-        cmd.Parameters.AddWithValue("@tokens_in", e.TokensIn.HasValue ? e.TokensIn.Value : DBNull.Value);
-        cmd.Parameters.AddWithValue("@tokens_out", e.TokensOut.HasValue ? e.TokensOut.Value : DBNull.Value);
-        cmd.Parameters.AddWithValue("@log_path", (object?)e.LogPath ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@started_at", e.StartedAt.HasValue ? e.StartedAt.Value.ToString("o") : DBNull.Value);
-        cmd.Parameters.AddWithValue("@finished_at", e.FinishedAt.HasValue ? e.FinishedAt.Value.ToString("o") : DBNull.Value);
-    }
-
-    private static TaskRunEntity ReadRun(SqliteDataReader r) => new()
-    {
-        Id = r.GetString(0),
-        TaskId = r.GetString(1),
-        RunNumber = r.GetInt32(2),
-        SessionId = r.IsDBNull(3) ? null : r.GetString(3),
-        IsRetry = r.GetInt32(4) != 0,
-        Prompt = r.GetString(5),
-        ResultMarkdown = r.IsDBNull(6) ? null : r.GetString(6),
-        StructuredOutputJson = r.IsDBNull(7) ? null : r.GetString(7),
-        ErrorMarkdown = r.IsDBNull(8) ? null : r.GetString(8),
-        ExitCode = r.IsDBNull(9) ? null : r.GetInt32(9),
-        TurnCount = r.IsDBNull(10) ? null : r.GetInt32(10),
-        TokensIn = r.IsDBNull(11) ? null : r.GetInt32(11),
-        TokensOut = r.IsDBNull(12) ? null : r.GetInt32(12),
-        LogPath = r.IsDBNull(13) ? null : r.GetString(13),
-        StartedAt = r.IsDBNull(14) ? null : DateTime.Parse(r.GetString(14), null, DateTimeStyles.RoundtripKind),
-        FinishedAt = r.IsDBNull(15) ? null : DateTime.Parse(r.GetString(15), null, DateTimeStyles.RoundtripKind),
-    };
-
-    #endregion
 }

src/ClaudeDo.Data/Repositories/WorktreeRepository.cs

@@ -1,102 +1,43 @@
 using ClaudeDo.Data.Models;
-using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
 
 namespace ClaudeDo.Data.Repositories;
 
 public sealed class WorktreeRepository
 {
-    private readonly SqliteConnectionFactory _factory;
+    private readonly ClaudeDoDbContext _context;
 
-    public WorktreeRepository(SqliteConnectionFactory factory) => _factory = factory;
-
-    private static string ToDb(WorktreeState s) => s switch
-    {
-        WorktreeState.Active => "active",
-        WorktreeState.Merged => "merged",
-        WorktreeState.Discarded => "discarded",
-        WorktreeState.Kept => "kept",
-        _ => throw new ArgumentOutOfRangeException(nameof(s)),
-    };
-
-    private static WorktreeState FromDb(string s) => s switch
-    {
-        "active" => WorktreeState.Active,
-        "merged" => WorktreeState.Merged,
-        "discarded" => WorktreeState.Discarded,
-        "kept" => WorktreeState.Kept,
-        _ => throw new ArgumentOutOfRangeException(nameof(s)),
-    };
+    public WorktreeRepository(ClaudeDoDbContext context) => _context = context;
 
     public async Task AddAsync(WorktreeEntity entity, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = """
-            INSERT INTO worktrees (task_id, path, branch_name, base_commit, head_commit, diff_stat, state, created_at)
-            VALUES (@task_id, @path, @branch_name, @base_commit, @head_commit, @diff_stat, @state, @created_at)
-            """;
-        cmd.Parameters.AddWithValue("@task_id", entity.TaskId);
-        cmd.Parameters.AddWithValue("@path", entity.Path);
-        cmd.Parameters.AddWithValue("@branch_name", entity.BranchName);
-        cmd.Parameters.AddWithValue("@base_commit", entity.BaseCommit);
-        cmd.Parameters.AddWithValue("@head_commit", (object?)entity.HeadCommit ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@diff_stat", (object?)entity.DiffStat ?? DBNull.Value);
-        cmd.Parameters.AddWithValue("@state", ToDb(entity.State));
-        cmd.Parameters.AddWithValue("@created_at", entity.CreatedAt.ToString("o"));
-        await cmd.ExecuteNonQueryAsync(ct);
+        _context.Worktrees.Add(entity);
+        await _context.SaveChangesAsync(ct);
     }
 
     public async Task<WorktreeEntity?> GetByTaskIdAsync(string taskId, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "SELECT task_id, path, branch_name, base_commit, head_commit, diff_stat, state, created_at FROM worktrees WHERE task_id = @task_id";
-        cmd.Parameters.AddWithValue("@task_id", taskId);
-
-        await using var reader = await cmd.ExecuteReaderAsync(ct);
-        if (!await reader.ReadAsync(ct)) return null;
-        return ReadWorktree(reader);
+        return await _context.Worktrees.FirstOrDefaultAsync(w => w.TaskId == taskId, ct);
     }
 
     public async Task UpdateHeadAsync(string taskId, string headCommit, string? diffStat, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "UPDATE worktrees SET head_commit = @head_commit, diff_stat = @diff_stat WHERE task_id = @task_id";
-        cmd.Parameters.AddWithValue("@task_id", taskId);
-        cmd.Parameters.AddWithValue("@head_commit", headCommit);
-        cmd.Parameters.AddWithValue("@diff_stat", (object?)diffStat ?? DBNull.Value);
-        await cmd.ExecuteNonQueryAsync(ct);
+        await _context.Worktrees
+            .Where(w => w.TaskId == taskId)
+            .ExecuteUpdateAsync(s => s
+                .SetProperty(w => w.HeadCommit, headCommit)
+                .SetProperty(w => w.DiffStat, diffStat), ct);
     }
 
     public async Task SetStateAsync(string taskId, WorktreeState state, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "UPDATE worktrees SET state = @state WHERE task_id = @task_id";
-        cmd.Parameters.AddWithValue("@task_id", taskId);
-        cmd.Parameters.AddWithValue("@state", ToDb(state));
-        await cmd.ExecuteNonQueryAsync(ct);
+        await _context.Worktrees
+            .Where(w => w.TaskId == taskId)
+            .ExecuteUpdateAsync(s => s.SetProperty(w => w.State, state), ct);
     }
 
     public async Task DeleteAsync(string taskId, CancellationToken ct = default)
     {
-        await using var conn = _factory.Open();
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = "DELETE FROM worktrees WHERE task_id = @task_id";
-        cmd.Parameters.AddWithValue("@task_id", taskId);
-        await cmd.ExecuteNonQueryAsync(ct);
+        await _context.Worktrees.Where(w => w.TaskId == taskId).ExecuteDeleteAsync(ct);
     }
-
-    private static WorktreeEntity ReadWorktree(SqliteDataReader r) => new()
-    {
-        TaskId = r.GetString(0),
-        Path = r.GetString(1),
-        BranchName = r.GetString(2),
-        BaseCommit = r.GetString(3),
-        HeadCommit = r.IsDBNull(4) ? null : r.GetString(4),
-        DiffStat = r.IsDBNull(5) ? null : r.GetString(5),
-        State = FromDb(r.GetString(6)),
-        CreatedAt = DateTime.Parse(r.GetString(7)),
-    };
 }

src/ClaudeDo.Data/SchemaInitializer.cs

@@ -1,67 +0,0 @@
-using System.Reflection;
-using Microsoft.Data.Sqlite;
-
-namespace ClaudeDo.Data;
-
-/// <summary>
-/// Applies the embedded schema.sql script. Safe to call on every start — the script uses
-/// IF NOT EXISTS / INSERT OR IGNORE.
-/// </summary>
-public static class SchemaInitializer
-{
-    private const string ResourceName = "ClaudeDo.Data.schema.sql";
-
-    public static void Apply(SqliteConnectionFactory factory)
-    {
-        using var conn = factory.Open();
-        ApplyTo(conn);
-    }
-
-    public static void ApplyTo(SqliteConnection conn)
-    {
-        var sql = LoadScript();
-        using var tx = conn.BeginTransaction();
-        using var cmd = conn.CreateCommand();
-        cmd.Transaction = tx;
-        cmd.CommandText = sql;
-        cmd.ExecuteNonQuery();
-        tx.Commit();
-
-        ApplyMigrations(conn);
-    }
-
-    private static void ApplyMigrations(SqliteConnection conn)
-    {
-        string[] alterStatements =
-        [
-            "ALTER TABLE tasks ADD COLUMN model TEXT NULL",
-            "ALTER TABLE tasks ADD COLUMN system_prompt TEXT NULL",
-            "ALTER TABLE tasks ADD COLUMN agent_path TEXT NULL",
-        ];
-
-        foreach (var sql in alterStatements)
-        {
-            try
-            {
-                using var cmd = conn.CreateCommand();
-                cmd.CommandText = sql;
-                cmd.ExecuteNonQuery();
-            }
-            catch (SqliteException ex) when (ex.SqliteErrorCode == 1)
-            {
-                // Column already exists — safe to ignore.
-            }
-        }
-    }
-
-    private static string LoadScript()
-    {
-        var asm = typeof(SchemaInitializer).Assembly;
-        using var stream = asm.GetManifestResourceStream(ResourceName)
-            ?? throw new InvalidOperationException(
-                $"Embedded resource '{ResourceName}' not found in {asm.GetName().Name}. " +
-                $"Available: {string.Join(", ", asm.GetManifestResourceNames())}");
-        using var reader = new StreamReader(stream);
-        return reader.ReadToEnd();
-    }
-}

src/ClaudeDo.Data/SqliteConnectionFactory.cs

@@ -1,48 +0,0 @@
-using Microsoft.Data.Sqlite;
-
-namespace ClaudeDo.Data;
-
-/// <summary>
-/// Opens <see cref="SqliteConnection"/> instances pointed at <see cref="DbPath"/>.
-/// First call ensures the parent directory exists, enables WAL and foreign keys.
-/// </summary>
-public sealed class SqliteConnectionFactory
-{
-    public string DbPath { get; }
-    private readonly string _connectionString;
-    private int _walApplied;
-
-    public SqliteConnectionFactory(string dbPath)
-    {
-        DbPath = Paths.Expand(dbPath);
-        Directory.CreateDirectory(Path.GetDirectoryName(DbPath)!);
-
-        _connectionString = new SqliteConnectionStringBuilder
-        {
-            DataSource = DbPath,
-            Mode = SqliteOpenMode.ReadWriteCreate,
-            Cache = SqliteCacheMode.Shared,
-        }.ToString();
-    }
-
-    public SqliteConnection Open()
-    {
-        var conn = new SqliteConnection(_connectionString);
-        conn.Open();
-
-        // WAL is a persistent DB-level setting; applying it once per process is enough,
-        // but idempotent so we do it defensively on the first connection we hand out.
-        if (Interlocked.Exchange(ref _walApplied, 1) == 0)
-        {
-            using var pragma = conn.CreateCommand();
-            pragma.CommandText = "PRAGMA journal_mode=WAL;";
-            pragma.ExecuteNonQuery();
-        }
-
-        using var fk = conn.CreateCommand();
-        fk.CommandText = "PRAGMA foreign_keys=ON;";
-        fk.ExecuteNonQuery();
-
-        return conn;
-    }
-}

src/ClaudeDo.Installer/App.xaml.cs

@@ -1,3 +1,5 @@
+using System.Net.Http;
+using System.Reflection;
 using System.Windows;
 using ClaudeDo.Installer.Core;
 using ClaudeDo.Installer.Pages.InstallPage;
@@ -15,24 +17,53 @@ public partial class App : Application
 {
     private ServiceProvider? _services;
 
-    protected override void OnStartup(StartupEventArgs e)
+    protected override async void OnStartup(StartupEventArgs e)
     {
         base.OnStartup(e);
 
-        var mode = ModeDetector.Detect();
         _services = BuildServices();
 
-        Window mainWindow = mode switch
+        var context = _services.GetRequiredService<InstallContext>();
+        context.InstallerVersion = GetInstallerVersion();
+
+        // Default install dir for detection — on upgrade we stay where we were.
+        var detector = _services.GetRequiredService<InstallModeDetector>();
+        using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
+
+        // Read manifest up front so we can fall back to Config if the API times out
+        // on an existing install. If the API is slow, we do NOT want to drop an
+        // already-installed user into FreshInstall — that would risk overwriting them.
+        var existingManifest = InstallManifestStore.TryRead(context.InstallDirectory);
+
+        DetectedState state;
+        try
         {
-            InstallerMode.Wizard => new WizardWindow
+            state = await detector.DetectAsync(context.InstallDirectory, cts.Token);
+        }
+        catch (OperationCanceledException)
+        {
+            state = existingManifest is not null
+                ? new DetectedState(InstallerMode.Config, existingManifest, null, null)
+                : new DetectedState(InstallerMode.FreshInstall, null, null, null);
+        }
+
+        context.Mode = state.Mode;
+        context.InstalledVersion = state.Existing?.Version;
+        context.LatestVersion = state.LatestVersion;
+        if (state.Existing is not null)
+            context.InstallDirectory = state.Existing.InstallDir;
+
+        Window mainWindow = state.Mode switch
+        {
+            InstallerMode.FreshInstall or InstallerMode.Update => new WizardWindow
             {
                 DataContext = _services.GetRequiredService<WizardViewModel>()
             },
-            InstallerMode.Settings => new SettingsWindow
+            InstallerMode.Config => new SettingsWindow
             {
                 DataContext = _services.GetRequiredService<SettingsViewModel>()
             },
-            _ => throw new InvalidOperationException($"Unknown installer mode: {mode}")
+            _ => throw new InvalidOperationException($"Unknown installer mode: {state.Mode}")
         };
 
         DarkTitleBar.Apply(mainWindow);
@@ -45,6 +76,13 @@ public partial class App : Application
         base.OnExit(e);
     }
 
+    private static string GetInstallerVersion()
+    {
+        var infoAttr = Assembly.GetExecutingAssembly()
+            .GetCustomAttribute<AssemblyInformationalVersionAttribute>();
+        return infoAttr?.InformationalVersion ?? "0.0.0";
+    }
+
     private static ServiceProvider BuildServices()
     {
         var sc = new ServiceCollection();
@@ -52,7 +90,10 @@ public partial class App : Application
         // Core
         sc.AddSingleton<InstallContext>();
         sc.AddSingleton<PageResolver>();
-        sc.AddSingleton<InstallerService>();
+        // HTTP + release client
+        sc.AddSingleton(_ => new HttpClient { Timeout = TimeSpan.FromSeconds(15) });
+        sc.AddSingleton<IReleaseClient>(sp => new ReleaseClient(sp.GetRequiredService<HttpClient>()));
+        sc.AddSingleton<InstallModeDetector>();
 
         // Pages
         sc.AddSingleton<IInstallerPage, WelcomePageViewModel>();
@@ -61,14 +102,28 @@ public partial class App : Application
         sc.AddSingleton<IInstallerPage, UiSettingsPageViewModel>();
         sc.AddSingleton<IInstallerPage, InstallPageViewModel>();
 
-        // Steps (registration order = execution order)
-        sc.AddSingleton<IInstallStep, PublishAppStep>();
-        sc.AddSingleton<IInstallStep, PublishWorkerStep>();
-        sc.AddSingleton<IInstallStep, DeployBinariesStep>();
+        // Steps — execution order matters for the FreshInstall pipeline (IEnumerable<IInstallStep>).
+        // Double-registered as both IInstallStep and concrete type so Task 15's Update pipeline
+        // can pull them out individually via GetRequiredService<T>().
+        sc.AddSingleton<DownloadAndExtractStep>();
+        sc.AddSingleton<IInstallStep>(sp => sp.GetRequiredService<DownloadAndExtractStep>());
         sc.AddSingleton<IInstallStep, WriteConfigStep>();
         sc.AddSingleton<IInstallStep, InitDatabaseStep>();
         sc.AddSingleton<IInstallStep, RegisterServiceStep>();
+        sc.AddSingleton<IInstallStep>(sp => sp.GetRequiredService<StartServiceStep>());
         sc.AddSingleton<IInstallStep, CreateShortcutsStep>();
+        sc.AddSingleton<IInstallStep, WriteUninstallRegistryStep>();
+        sc.AddSingleton<WriteInstallManifestStep>();
+        sc.AddSingleton<IInstallStep>(sp => sp.GetRequiredService<WriteInstallManifestStep>());
+
+        // Stop — NOT registered as IInstallStep (not part of default FreshInstall pipeline).
+        // Pulled by Update flow + Repair/Uninstall.
+        sc.AddSingleton<StopServiceStep>();
+        // StartServiceStep is also registered as IInstallStep above (fresh-install pipeline).
+        sc.AddSingleton<StartServiceStep>();
+
+        // Runners
+        sc.AddSingleton<UninstallRunner>();
 
         // ViewModels
         sc.AddSingleton<WizardViewModel>();

src/ClaudeDo.Installer/ClaudeDo.Installer.csproj

@@ -6,8 +6,16 @@
     <UseWPF>true</UseWPF>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <!-- Allow Linux Gitea runners to publish this WPF project for win-x64; no-op on Windows. -->
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
+    <ApplicationIcon>ClaudeTaskSetup.ico</ApplicationIcon>
   </PropertyGroup>
 
+  <ItemGroup>
+    <!-- Embed icon so it is available via pack URI in WPF windows. -->
+    <Resource Include="ClaudeTaskSetup.ico" />
+  </ItemGroup>
+
   <!-- Debug: asInvoker so Rider/VS can debug without elevation -->
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <ApplicationManifest>app.debug.manifest</ApplicationManifest>
@@ -18,6 +26,18 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(PublishSingleFile)' == 'true'">
+    <!-- Framework-dependent: the WPF runtime pack isn't distributed for cross-compile
+         on Linux CI, which made self-contained bundles crash on startup with AV in the
+         apphost. Target machines already have the .NET 8 Desktop Runtime. -->
+    <SelfContained>false</SelfContained>
+    <RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">win-x64</RuntimeIdentifier>
+    <PublishTrimmed>false</PublishTrimmed>
+    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+    <IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
+    <EnableCompressionInSingleFile>false</EnableCompressionInSingleFile>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />

src/ClaudeDo.Installer/Core/ChecksumVerifier.cs

@@ -0,0 +1,37 @@
+using System.IO;
+using System.Security.Cryptography;
+
+namespace ClaudeDo.Installer.Core;
+
+public static class ChecksumVerifier
+{
+    public static string ComputeSha256(string filePath)
+    {
+        using var stream = File.OpenRead(filePath);
+        using var sha = SHA256.Create();
+        var hash = sha.ComputeHash(stream);
+        return Convert.ToHexString(hash).ToLowerInvariant();
+    }
+
+    public static bool Verify(string filePath, string expectedSha256)
+    {
+        var actual = ComputeSha256(filePath);
+        return string.Equals(actual, expectedSha256.Trim(), StringComparison.OrdinalIgnoreCase);
+    }
+
+    public static IReadOnlyDictionary<string, string> ParseChecksumsFile(string content)
+    {
+        var map = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        foreach (var rawLine in content.Split('\n'))
+        {
+            var line = rawLine.Trim();
+            if (line.Length == 0) continue;
+            var parts = line.Split(new[] { ' ', '\t' }, 2, StringSplitOptions.RemoveEmptyEntries);
+            if (parts.Length != 2) continue;
+            var hashPart = parts[0].Trim();
+            if (hashPart.Length != 64) continue;
+            map[parts[1].Trim()] = hashPart;
+        }
+        return map;
+    }
+}

src/ClaudeDo.Installer/Core/IReleaseClient.cs

@@ -0,0 +1,15 @@
+namespace ClaudeDo.Installer.Core;
+
+public sealed record ReleaseAsset(string Name, string BrowserDownloadUrl, long Size);
+
+public sealed record GiteaRelease(
+    string TagName,
+    string Name,
+    IReadOnlyList<ReleaseAsset> Assets);
+
+public interface IReleaseClient
+{
+    Task<GiteaRelease?> GetLatestReleaseAsync(CancellationToken ct);
+
+    Task DownloadAsync(string url, string destPath, IProgress<long> progress, CancellationToken ct);
+}

src/ClaudeDo.Installer/Core/InstallContext.cs

@@ -2,10 +2,15 @@ namespace ClaudeDo.Installer.Core;
 
 public sealed class InstallContext
 {
-    // WelcomePage
-    public string SourceDirectory { get; set; } = "";
+    // WelcomePage / install destination
     public string InstallDirectory { get; set; } = @"C:\Program Files\ClaudeDo";
 
+    // Mode + versions (set by App startup after InstallModeDetector runs)
+    public InstallerMode Mode { get; set; } = InstallerMode.FreshInstall;
+    public string? InstallerVersion { get; set; }   // from this installer's assembly
+    public string? InstalledVersion { get; set; }   // from install.json (or set by DownloadAndExtractStep)
+    public string? LatestVersion { get; set; }      // from Gitea API (may be null if offline)
+
     // PathsPage
     public string DbPath { get; set; } = "~/.todo-app/todo.db";
     public string LogRoot { get; set; } = "~/.todo-app/logs";
@@ -17,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/Core/InstallManifest.cs

@@ -0,0 +1,48 @@
+using System.IO;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace ClaudeDo.Installer.Core;
+
+public sealed record InstallManifest(
+    string Version,
+    string InstallDir,
+    string WorkerDir,
+    DateTimeOffset InstalledAt);
+
+public static class InstallManifestStore
+{
+    public const string FileName = "install.json";
+
+    private static readonly JsonSerializerOptions JsonOptions = new()
+    {
+        WriteIndented = true,
+        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+    };
+
+    public static string ManifestPath(string installDir) => Path.Combine(installDir, FileName);
+
+    public static InstallManifest? TryRead(string installDir)
+    {
+        var path = ManifestPath(installDir);
+        if (!File.Exists(path)) return null;
+
+        try
+        {
+            var json = File.ReadAllText(path);
+            return JsonSerializer.Deserialize<InstallManifest>(json, JsonOptions);
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
+    public static void Write(string installDir, InstallManifest manifest)
+    {
+        Directory.CreateDirectory(installDir);
+        var json = JsonSerializer.Serialize(manifest, JsonOptions);
+        File.WriteAllText(ManifestPath(installDir), json);
+    }
+}

src/ClaudeDo.Installer/Core/InstallModeDetector.cs

@@ -0,0 +1,48 @@
+namespace ClaudeDo.Installer.Core;
+
+public sealed record DetectedState(
+    InstallerMode Mode,
+    InstallManifest? Existing,
+    GiteaRelease? LatestRelease,
+    string? LatestVersion);
+
+public sealed class InstallModeDetector
+{
+    private readonly IReleaseClient _releases;
+
+    public InstallModeDetector(IReleaseClient releases)
+    {
+        _releases = releases;
+    }
+
+    public async Task<DetectedState> DetectAsync(string installDir, CancellationToken ct)
+    {
+        var manifest = InstallManifestStore.TryRead(installDir);
+        if (manifest is null)
+            return new DetectedState(InstallerMode.FreshInstall, null, null, null);
+
+        var release = await _releases.GetLatestReleaseAsync(ct);
+        if (release is null)
+            return new DetectedState(InstallerMode.Config, manifest, null, null);
+
+        var latestVersion = release.TagName.TrimStart('v', 'V');
+        if (IsNewer(latestVersion, manifest.Version))
+            return new DetectedState(InstallerMode.Update, manifest, release, latestVersion);
+
+        return new DetectedState(InstallerMode.Config, manifest, release, latestVersion);
+    }
+
+    /// <summary>
+    /// Returns true only when both versions parse as System.Version (major.minor[.build[.revision]])
+    /// AND latest &gt; current. Semver pre-release tags like "0.2.0-beta" fail to parse and are
+    /// treated as "not newer" — the user drops into Config mode with no update offered.
+    /// This is deliberate: offering an update we can't compare is worse than silently skipping it.
+    /// If the project starts shipping pre-release tags, revisit this.
+    /// </summary>
+    private static bool IsNewer(string latest, string current)
+    {
+        if (!Version.TryParse(latest, out var lv)) return false;
+        if (!Version.TryParse(current, out var cv)) return false;
+        return lv > cv;
+    }
+}

src/ClaudeDo.Installer/Core/InstallerMode.cs

@@ -1,19 +1,8 @@
-using System.IO;
-using ClaudeDo.Data;
-
 namespace ClaudeDo.Installer.Core;
 
-public enum InstallerMode { Wizard, Settings }
-
-public static class ModeDetector
+public enum InstallerMode
 {
-    public static InstallerMode Detect()
-    {
-        var root = Paths.AppDataRoot();
-        var workerConfig = Path.Combine(root, "worker.config.json");
-        var uiConfig = Path.Combine(root, "ui.config.json");
-        return File.Exists(workerConfig) && File.Exists(uiConfig)
-            ? InstallerMode.Settings
-            : InstallerMode.Wizard;
-    }
+    FreshInstall,   // No install.json present -> run full wizard
+    Update,         // install.json present, newer release available
+    Config,         // install.json present, no update (or API unreachable)
 }

src/ClaudeDo.Installer/Core/ReleaseClient.cs

@@ -0,0 +1,85 @@
+using System.IO;
+using System.Net.Http;
+using System.Text.Json;
+
+namespace ClaudeDo.Installer.Core;
+
+public sealed class ReleaseClient : IReleaseClient
+{
+    public const string DefaultApiBase = "https://git.kuns.dev/api/v1/repos/releases/ClaudeDo";
+
+    private readonly HttpClient _http;
+    private readonly string _apiBase;
+
+    public ReleaseClient(HttpClient http, string apiBase = DefaultApiBase)
+    {
+        _http = http;
+        _apiBase = apiBase.TrimEnd('/');
+    }
+
+    public async Task<GiteaRelease?> GetLatestReleaseAsync(CancellationToken ct)
+    {
+        try
+        {
+            using var response = await _http.GetAsync($"{_apiBase}/releases/latest", ct);
+            if (!response.IsSuccessStatusCode) return null;
+            var json = await response.Content.ReadAsStringAsync(ct);
+            return ParseRelease(json);
+        }
+        catch (HttpRequestException) { return null; }
+        catch (TaskCanceledException) when (!ct.IsCancellationRequested) { return null; }
+    }
+
+    public async Task DownloadAsync(string url, string destPath, IProgress<long> progress, CancellationToken ct)
+    {
+        using var response = await _http.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, ct);
+        response.EnsureSuccessStatusCode();
+
+        await using var input = await response.Content.ReadAsStreamAsync(ct);
+        await using var output = File.Create(destPath);
+
+        var buffer = new byte[81920];
+        long total = 0;
+        int read;
+        while ((read = await input.ReadAsync(buffer, ct)) > 0)
+        {
+            await output.WriteAsync(buffer.AsMemory(0, read), ct);
+            total += read;
+            progress.Report(total);
+        }
+    }
+
+    private static GiteaRelease? ParseRelease(string json)
+    {
+        try
+        {
+            using var doc = JsonDocument.Parse(json);
+            var root = doc.RootElement;
+            if (!root.TryGetProperty("tag_name", out var tagEl)) return null;
+
+            var tag = tagEl.GetString() ?? "";
+            var name = root.TryGetProperty("name", out var nameEl) ? (nameEl.GetString() ?? "") : "";
+
+            var assets = new List<ReleaseAsset>();
+            if (root.TryGetProperty("assets", out var arr) && arr.ValueKind == JsonValueKind.Array)
+            {
+                foreach (var item in arr.EnumerateArray())
+                {
+                    if (!item.TryGetProperty("name", out var nameField)) continue;
+                    if (!item.TryGetProperty("browser_download_url", out var urlField)) continue;
+
+                    var aName = nameField.GetString() ?? "";
+                    var aUrl = urlField.GetString() ?? "";
+                    var aSize = item.TryGetProperty("size", out var s) ? s.GetInt64() : 0L;
+                    assets.Add(new ReleaseAsset(aName, aUrl, aSize));
+                }
+            }
+
+            return new GiteaRelease(tag, name, assets);
+        }
+        catch (JsonException)
+        {
+            return null;
+        }
+    }
+}

src/ClaudeDo.Installer/Core/UninstallRunner.cs

@@ -0,0 +1,189 @@
+using System.Diagnostics;
+using System.IO;
+using ClaudeDo.Data;
+using ClaudeDo.Installer.Steps;
+using Microsoft.Win32;
+
+namespace ClaudeDo.Installer.Core;
+
+public sealed class UninstallRunner
+{
+    private readonly InstallContext _context;
+    private readonly StopServiceStep _stopService;
+
+    public UninstallRunner(InstallContext context, StopServiceStep stopService)
+    {
+        _context = context;
+        _stopService = stopService;
+    }
+
+    public async Task<StepResult> RunAsync(bool removeAppData, IProgress<string> progress, CancellationToken ct)
+    {
+        // 1) Validate install dir up front — refuse obviously unsafe paths.
+        //    Prevents Directory.Delete(recursive:true) from wiping C:\ or C:\Program Files\.
+        if (!IsSafeInstallDir(_context.InstallDirectory, out var safeError))
+            return StepResult.Fail($"Refusing to uninstall: {safeError}");
+
+        // 2) Stop service. If stop fails we MUST abort — deleting a service whose
+        //    process is still running leaves orphan locked binaries under the install dir
+        //    which Directory.Delete will silently skip.
+        progress.Report("Stopping worker service...");
+        var stopResult = await _stopService.ExecuteAsync(_context, progress, ct);
+        if (!stopResult.Success)
+            return StepResult.Fail(
+                $"Cannot uninstall: worker service did not stop cleanly. {stopResult.ErrorMessage} " +
+                "Kill the worker manually and re-run uninstall.");
+
+        // 3) Unregister service.
+        progress.Report("Unregistering service...");
+        await ProcessRunner.RunAsync("sc.exe", $"delete {StopServiceStep.ServiceName}", null, progress, ct);
+
+        // 3b) Remove Apps & Features registry entry (best-effort).
+        progress.Report("Removing Add/Remove Programs entry...");
+        try
+        {
+            Registry.LocalMachine.DeleteSubKeyTree(WriteUninstallRegistryStep.UninstallKeyPath, throwOnMissingSubKey: false);
+        }
+        catch (Exception ex)
+        {
+            progress.Report($"Warning: could not delete uninstall registry key: {ex.Message}");
+        }
+
+        // 4) Remove shortcuts (best-effort — a stuck .lnk must not block the rest).
+        progress.Report("Removing shortcuts...");
+        TryDeleteFile(Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.CommonDesktopDirectory),
+            "ClaudeDo.lnk"));
+        TryDeleteFile(Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.CommonStartMenu),
+            "Programs", "ClaudeDo.lnk"));
+
+        // 5) Delete install directory. Track success so we can report partial state.
+        var failures = new List<string>();
+        if (Directory.Exists(_context.InstallDirectory))
+        {
+            progress.Report($"Deleting {_context.InstallDirectory}...");
+            if (!TryDeleteDir(_context.InstallDirectory, out var err))
+                failures.Add($"install dir ({_context.InstallDirectory}): {err}");
+        }
+
+        // 6) Delete ~/.todo-app (config + DB + logs) — only if user opted in.
+        if (removeAppData)
+        {
+            var appData = Paths.AppDataRoot();
+            if (Directory.Exists(appData))
+            {
+                progress.Report($"Deleting {appData}...");
+                if (!TryDeleteDir(appData, out var err))
+                    failures.Add($"app data ({appData}): {err}");
+            }
+        }
+
+        // 7) If we were launched from inside the install dir (Apps & Features case),
+        //    our own exe is still locked — schedule a cmd.exe trampoline to finish
+        //    the deletion after this process exits. Best-effort: if this fails the
+        //    user is left with an empty <uninstaller> folder which is harmless.
+        var runningExe = Environment.ProcessPath;
+        if (runningExe is not null
+            && IsInsideDirectory(runningExe, _context.InstallDirectory)
+            && Directory.Exists(_context.InstallDirectory))
+        {
+            progress.Report("Scheduling final cleanup after exit...");
+            TryScheduleTrampolineDelete(_context.InstallDirectory);
+            // The trampoline will finish the job — clear the residual failure entry for the install dir.
+            failures.RemoveAll(f => f.StartsWith("install dir"));
+        }
+
+        if (failures.Count > 0)
+        {
+            return StepResult.Fail(
+                "Uninstall partially succeeded — the following could not be removed:\n  " +
+                string.Join("\n  ", failures));
+        }
+
+        progress.Report("Uninstall complete.");
+        return StepResult.Ok();
+    }
+
+    private static bool IsInsideDirectory(string filePath, string directory)
+    {
+        try
+        {
+            var full = Path.GetFullPath(filePath);
+            var dir = Path.GetFullPath(directory).TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar;
+            return full.StartsWith(dir, StringComparison.OrdinalIgnoreCase);
+        }
+        catch { return false; }
+    }
+
+    private static void TryScheduleTrampolineDelete(string installDir)
+    {
+        try
+        {
+            var pid = Environment.ProcessId;
+            // Wait for this process to exit, then recursively remove the install dir.
+            // /B timeout avoids a visible window; ping as a portable sleep; rmdir /S /Q is silent.
+            var cmd = $"/C start \"\" /MIN cmd /C \"ping 127.0.0.1 -n 3 >nul & rmdir /S /Q \"\"{installDir}\"\"\"";
+            Process.Start(new ProcessStartInfo
+            {
+                FileName = "cmd.exe",
+                Arguments = cmd,
+                UseShellExecute = false,
+                CreateNoWindow = true,
+                WindowStyle = ProcessWindowStyle.Hidden,
+            });
+        }
+        catch { /* best effort */ }
+    }
+
+    /// <summary>
+    /// Guards against catastrophic recursive-delete paths. The install dir must be
+    /// a non-root directory with a non-empty name (e.g. reject "", "C:\\", "/").
+    /// </summary>
+    private static bool IsSafeInstallDir(string path, out string reason)
+    {
+        if (string.IsNullOrWhiteSpace(path))
+        {
+            reason = "install directory is empty";
+            return false;
+        }
+
+        string full;
+        try { full = Path.GetFullPath(path); }
+        catch (Exception ex)
+        {
+            reason = $"install directory is not a valid path: {ex.Message}";
+            return false;
+        }
+
+        var name = Path.GetFileName(full.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar));
+        if (string.IsNullOrEmpty(name))
+        {
+            reason = $"install directory resolves to a drive root ({full})";
+            return false;
+        }
+
+        reason = "";
+        return true;
+    }
+
+    private static void TryDeleteFile(string path)
+    {
+        try { if (File.Exists(path)) File.Delete(path); } catch { /* best effort — single shortcut */ }
+    }
+
+    private static bool TryDeleteDir(string path, out string error)
+    {
+        try
+        {
+            Directory.Delete(path, recursive: true);
+            error = "";
+            return true;
+        }
+        catch (Exception ex)
+        {
+            error = ex.Message;
+            return false;
+        }
+    }
+}

src/ClaudeDo.Installer/Pages/InstallPage/InstallPageViewModel.cs

@@ -3,15 +3,17 @@ using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
 using ClaudeDo.Installer.Core;
+using ClaudeDo.Installer.Steps;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace ClaudeDo.Installer.Pages.InstallPage;
 
 public partial class InstallPageViewModel : ObservableObject, IInstallerPage
 {
     private readonly InstallContext _context;
-    private readonly InstallerService _installerService;
+    private readonly IServiceProvider _serviceProvider;
     private InstallPageView? _view;
     private CancellationTokenSource? _cts;
 
@@ -29,22 +31,32 @@ public partial class InstallPageViewModel : ObservableObject, IInstallerPage
     [ObservableProperty] private bool _hasErrors;
     [ObservableProperty] private double _overallProgress;
 
-    public InstallPageViewModel(InstallContext context, InstallerService installerService)
+    public InstallPageViewModel(InstallContext context, IServiceProvider serviceProvider)
     {
         _context = context;
-        _installerService = installerService;
+        _serviceProvider = serviceProvider;
     }
 
     public Task LoadAsync()
     {
         Steps.Clear();
-        Steps.Add(new StepViewModel("Publish ClaudeDo.App"));
-        Steps.Add(new StepViewModel("Publish ClaudeDo.Worker"));
-        Steps.Add(new StepViewModel("Deploy Binaries"));
+        if (_context.Mode == InstallerMode.Update)
+        {
+            Steps.Add(new StepViewModel("Stop Worker Service"));
+            Steps.Add(new StepViewModel("Download and Extract"));
+            Steps.Add(new StepViewModel("Start Worker Service"));
+            Steps.Add(new StepViewModel("Write Install Manifest"));
+        }
+        else
+        {
+            Steps.Add(new StepViewModel("Download and Extract"));
             Steps.Add(new StepViewModel("Write Configuration"));
             Steps.Add(new StepViewModel("Initialize Database"));
             Steps.Add(new StepViewModel("Register Windows Service"));
             Steps.Add(new StepViewModel("Create Shortcuts"));
+            Steps.Add(new StepViewModel("Register in Add/Remove Programs"));
+            Steps.Add(new StepViewModel("Write Install Manifest"));
+        }
         return Task.CompletedTask;
     }
 
@@ -71,7 +83,21 @@ public partial class InstallPageViewModel : ObservableObject, IInstallerPage
 
             step.Status = p.Status;
             if (p.Message is not null)
+            {
+                // Messages starting with "\r" overwrite the previous line (live progress).
+                if (p.Message.StartsWith('\r'))
+                {
+                    var line = p.Message[1..];
+                    if (step.Messages.Count > 0 && step.Messages[^1].StartsWith("  "))
+                        step.Messages[^1] = line;
+                    else
+                        step.Messages.Add(line);
+                }
+                else
+                {
                     step.Messages.Add(p.Message);
+                }
+            }
 
             if (p.Status is StepStatus.Running && !step.IsExpanded)
                 step.IsExpanded = true;
@@ -85,7 +111,24 @@ public partial class InstallPageViewModel : ObservableObject, IInstallerPage
 
         try
         {
-            var results = await _installerService.ExecuteAsync(_context, progress, _cts.Token);
+            IEnumerable<IInstallStep> steps;
+            if (_context.Mode == InstallerMode.Update)
+            {
+                steps = new IInstallStep[]
+                {
+                    _serviceProvider.GetRequiredService<StopServiceStep>(),
+                    _serviceProvider.GetRequiredService<DownloadAndExtractStep>(),
+                    _serviceProvider.GetRequiredService<StartServiceStep>(),
+                    _serviceProvider.GetRequiredService<WriteInstallManifestStep>(),
+                };
+            }
+            else
+            {
+                steps = _serviceProvider.GetServices<IInstallStep>();
+            }
+
+            var runner = new InstallerService(steps);
+            var results = await runner.ExecuteAsync(_context, progress, _cts.Token);
             HasErrors = results.Any(r => !r.Result.Success);
         }
         catch (OperationCanceledException)

src/ClaudeDo.Installer/Pages/WelcomePage/WelcomePageView.xaml

@@ -9,40 +9,29 @@
 
     <ScrollViewer VerticalScrollBarVisibility="Auto">
         <StackPanel MaxWidth="520">
-            <TextBlock Text="Welcome to ClaudeDo Setup" FontSize="20" FontWeight="SemiBold"
-                       Margin="0,0,0,6"/>
-            <TextBlock Text="This wizard will build, configure, and install ClaudeDo on your machine."
-                       Foreground="{StaticResource TextSecondaryBrush}" Margin="0,0,0,24"
-                       TextWrapping="Wrap"/>
 
-            <!-- Source Directory -->
-            <Label Content="Source Directory"/>
-            <Grid Margin="0,0,0,4">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <TextBox Grid.Column="0" Text="{Binding SourceDirectory, UpdateSourceTrigger=PropertyChanged}"/>
-                <Button Grid.Column="1" Content="Browse..." Command="{Binding BrowseSourceCommand}"
-                        Margin="8,0,0,0"/>
-            </Grid>
-            <TextBlock Text="{Binding SourceError}" Foreground="{StaticResource ErrorBrush}" FontSize="11"
-                       Visibility="{Binding SourceError, Converter={StaticResource NullToCollapsedConverter}}"
-                       Margin="0,0,0,16"/>
+            <TextBlock Text="{Binding Heading}" FontSize="20" FontWeight="SemiBold" Margin="0,0,0,6"/>
+            <TextBlock Text="{Binding Subheading}" TextWrapping="Wrap"
+                       Foreground="{StaticResource TextSecondaryBrush}" Margin="0,0,0,24"/>
 
-            <!-- Install Directory -->
             <Label Content="Install Directory"/>
             <Grid Margin="0,0,0,4">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
-                <TextBox Grid.Column="0" Text="{Binding InstallDirectory, UpdateSourceTrigger=PropertyChanged}"/>
-                <Button Grid.Column="1" Content="Browse..." Command="{Binding BrowseInstallCommand}"
-                        Margin="8,0,0,0"/>
+                <TextBox Grid.Column="0"
+                         Text="{Binding InstallDirectory, UpdateSourceTrigger=PropertyChanged}"
+                         IsEnabled="{Binding InstallDirEditable}"/>
+                <Button Grid.Column="1"
+                        Content="Browse..."
+                        Margin="8,0,0,0"
+                        Command="{Binding BrowseInstallCommand}"
+                        IsEnabled="{Binding InstallDirEditable}"/>
             </Grid>
             <TextBlock Text="{Binding InstallError}" Foreground="{StaticResource ErrorBrush}" FontSize="11"
                        Visibility="{Binding InstallError, Converter={StaticResource NullToCollapsedConverter}}"/>
+
         </StackPanel>
     </ScrollViewer>
 </UserControl>

src/ClaudeDo.Installer/Pages/WelcomePage/WelcomePageViewModel.cs

@@ -19,88 +19,69 @@ public partial class WelcomePageViewModel : ObservableObject, IInstallerPage
     public bool ShowInSettings => false;
     public UserControl View => _view ??= new WelcomePageView { DataContext = this };
 
-    [ObservableProperty] private string _sourceDirectory = "";
     [ObservableProperty] private string _installDirectory = @"C:\Program Files\ClaudeDo";
-    [ObservableProperty] private string? _sourceError;
     [ObservableProperty] private string? _installError;
+    [ObservableProperty] private string _heading = "Install ClaudeDo";
+    [ObservableProperty] private string _subheading = "Set the installation directory and continue.";
+    [ObservableProperty] private bool _installDirEditable = true;
 
     public WelcomePageViewModel(InstallContext context)
     {
         _context = context;
-        _sourceDirectory = DetectSourceDirectory();
     }
 
     public Task LoadAsync()
     {
-        if (!string.IsNullOrEmpty(_context.SourceDirectory))
-            SourceDirectory = _context.SourceDirectory;
-        if (!string.IsNullOrEmpty(_context.InstallDirectory))
-            InstallDirectory = _context.InstallDirectory;
+        InstallDirectory = string.IsNullOrEmpty(_context.InstallDirectory)
+            ? @"C:\Program Files\ClaudeDo"
+            : _context.InstallDirectory;
+
+        switch (_context.Mode)
+        {
+            case InstallerMode.FreshInstall:
+                Heading = "Install ClaudeDo";
+                Subheading = "Choose where to install ClaudeDo, then click Next.";
+                InstallDirEditable = true;
+                break;
+
+            case InstallerMode.Update:
+                Heading = $"Update ClaudeDo  {_context.InstalledVersion ?? "?"}  ->  {_context.LatestVersion ?? "?"}";
+                Subheading = "Your tasks, config, and database will be preserved. Click Next to continue.";
+                InstallDirEditable = false; // stay where we were installed
+                break;
+
+            default:
+                // Config and any future modes should never reach the wizard; guard loudly if they do.
+                throw new InvalidOperationException(
+                    $"WelcomePage is not valid for installer mode {_context.Mode}");
+        }
+
         return Task.CompletedTask;
     }
 
     public Task ApplyAsync()
     {
-        _context.SourceDirectory = SourceDirectory;
         _context.InstallDirectory = InstallDirectory;
         return Task.CompletedTask;
     }
 
     public bool Validate()
     {
-        var valid = true;
-
-        if (string.IsNullOrWhiteSpace(SourceDirectory) ||
-            !File.Exists(Path.Combine(SourceDirectory, "ClaudeDo.slnx")))
-        {
-            SourceError = "Source directory must contain ClaudeDo.slnx";
-            valid = false;
-        }
-        else
-        {
-            SourceError = null;
-        }
-
         if (string.IsNullOrWhiteSpace(InstallDirectory))
         {
             InstallError = "Install directory is required";
-            valid = false;
+            return false;
         }
-        else
-        {
         InstallError = null;
-        }
-
-        return valid;
-    }
-
-    [RelayCommand]
-    private void BrowseSource()
-    {
-        var dialog = new OpenFolderDialog { Title = "Select ClaudeDo source directory" };
-        if (dialog.ShowDialog() == true)
-            SourceDirectory = dialog.FolderName;
+        return true;
     }
 
     [RelayCommand]
     private void BrowseInstall()
     {
+        if (!InstallDirEditable) return;
         var dialog = new OpenFolderDialog { Title = "Select installation directory" };
         if (dialog.ShowDialog() == true)
             InstallDirectory = dialog.FolderName;
     }
-
-    private static string DetectSourceDirectory()
-    {
-        var dir = AppContext.BaseDirectory;
-        for (var i = 0; i < 8; i++)
-        {
-            if (File.Exists(Path.Combine(dir, "ClaudeDo.slnx")))
-                return dir;
-            var parent = Directory.GetParent(dir)?.FullName;
-            if (parent is null) break;
-            dir = parent;
-        }
-        return "";
-    }
 }

src/ClaudeDo.Installer/Steps/DeployBinariesStep.cs

@@ -1,62 +0,0 @@
-using System.IO;
-using ClaudeDo.Installer.Core;
-
-namespace ClaudeDo.Installer.Steps;
-
-public sealed class DeployBinariesStep : IInstallStep
-{
-    public string Name => "Deploy Binaries";
-
-    public Task<StepResult> ExecuteAsync(InstallContext ctx, IProgress<string> progress, CancellationToken ct)
-    {
-        try
-        {
-            var appPublish = Path.Combine(ctx.SourceDirectory, "src", "ClaudeDo.App", "bin", "Release", "net8.0", "win-x64", "publish");
-            var workerPublish = Path.Combine(ctx.SourceDirectory, "src", "ClaudeDo.Worker", "bin", "Release", "net8.0", "win-x64", "publish");
-
-            var appDest = Path.Combine(ctx.InstallDirectory, "app");
-            var workerDest = Path.Combine(ctx.InstallDirectory, "worker");
-
-            if (!Directory.Exists(appPublish))
-                return Task.FromResult(StepResult.Fail($"App publish directory not found: {appPublish}"));
-            if (!Directory.Exists(workerPublish))
-                return Task.FromResult(StepResult.Fail($"Worker publish directory not found: {workerPublish}"));
-
-            var appCount = CopyDirectory(appPublish, appDest, progress, ct);
-            progress.Report($"Copied {appCount} files to {appDest}");
-
-            var workerCount = CopyDirectory(workerPublish, workerDest, progress, ct);
-            progress.Report($"Copied {workerCount} files to {workerDest}");
-
-            return Task.FromResult(StepResult.Ok());
-        }
-        catch (Exception ex)
-        {
-            return Task.FromResult(StepResult.Fail(ex.Message));
-        }
-    }
-
-    private static int CopyDirectory(string source, string dest, IProgress<string> progress, CancellationToken ct)
-    {
-        Directory.CreateDirectory(dest);
-        var count = 0;
-
-        foreach (var dir in Directory.GetDirectories(source, "*", SearchOption.AllDirectories))
-        {
-            ct.ThrowIfCancellationRequested();
-            var relative = Path.GetRelativePath(source, dir);
-            Directory.CreateDirectory(Path.Combine(dest, relative));
-        }
-
-        foreach (var file in Directory.GetFiles(source, "*", SearchOption.AllDirectories))
-        {
-            ct.ThrowIfCancellationRequested();
-            var relative = Path.GetRelativePath(source, file);
-            var destFile = Path.Combine(dest, relative);
-            File.Copy(file, destFile, overwrite: true);
-            count++;
-        }
-
-        return count;
-    }
-}

src/ClaudeDo.Installer/Steps/DownloadAndExtractStep.cs

@@ -0,0 +1,113 @@
+using System.IO;
+using System.IO.Compression;
+using ClaudeDo.Installer.Core;
+
+namespace ClaudeDo.Installer.Steps;
+
+public sealed class DownloadAndExtractStep : IInstallStep
+{
+    private readonly IReleaseClient _releases;
+
+    public DownloadAndExtractStep(IReleaseClient releases)
+    {
+        _releases = releases;
+    }
+
+    public string Name => "Download and Extract";
+
+    public async Task<StepResult> ExecuteAsync(InstallContext ctx, IProgress<string> progress, CancellationToken ct)
+    {
+        if (string.IsNullOrWhiteSpace(ctx.InstallDirectory))
+            return StepResult.Fail("Install directory is not set.");
+
+        progress.Report("Fetching latest release metadata...");
+        var release = await _releases.GetLatestReleaseAsync(ct);
+        if (release is null)
+            return StepResult.Fail("Could not reach the release server. Check your network connection and try again.");
+
+        var zipAsset = release.Assets.FirstOrDefault(a =>
+            a.Name.StartsWith("ClaudeDo-", StringComparison.OrdinalIgnoreCase) &&
+            a.Name.EndsWith("-win-x64.zip", StringComparison.OrdinalIgnoreCase));
+        var checksumAsset = release.Assets.FirstOrDefault(a =>
+            a.Name.Equals("checksums.txt", StringComparison.OrdinalIgnoreCase));
+
+        if (zipAsset is null)
+            return StepResult.Fail("Release zip asset not found in release metadata.");
+        if (checksumAsset is null)
+            return StepResult.Fail("checksums.txt not found in release metadata.");
+
+        var scratchDir = Path.Combine(Path.GetTempPath(), "ClaudeDo-install-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(scratchDir);
+
+        try
+        {
+            var zipPath = Path.Combine(scratchDir, zipAsset.Name);
+            var checksumPath = Path.Combine(scratchDir, "checksums.txt");
+
+            var totalMb = zipAsset.Size / (1024 * 1024);
+            progress.Report($"Downloading {zipAsset.Name} ({totalMb} MB)...");
+            long lastReportedMb = -1;
+            await _releases.DownloadAsync(zipAsset.BrowserDownloadUrl, zipPath,
+                new Progress<long>(b =>
+                {
+                    var mb = b / (1024 * 1024);
+                    if (mb == lastReportedMb) return;
+                    lastReportedMb = mb;
+                    // Leading "\r" tells the UI to overwrite the previous line instead of appending.
+                    progress.Report($"\r  {mb} / {totalMb} MB downloaded");
+                }),
+                ct);
+
+            progress.Report("Downloading checksums...");
+            await _releases.DownloadAsync(checksumAsset.BrowserDownloadUrl, checksumPath,
+                new Progress<long>(_ => { }), ct);
+
+            progress.Report("Verifying checksum...");
+            var map = ChecksumVerifier.ParseChecksumsFile(await File.ReadAllTextAsync(checksumPath, ct));
+            if (!map.TryGetValue(zipAsset.Name, out var expectedHash))
+                return StepResult.Fail($"No checksum entry for {zipAsset.Name} in checksums.txt.");
+            if (!ChecksumVerifier.Verify(zipPath, expectedHash))
+                return StepResult.Fail("Checksum mismatch — the downloaded zip may be corrupt or tampered with.");
+
+            // Only after verification do we touch the install directory.
+            progress.Report("Stashing previous app/worker binaries...");
+            var appDest = Path.Combine(ctx.InstallDirectory, "app");
+            var workerDest = Path.Combine(ctx.InstallDirectory, "worker");
+            var appBak = appDest + ".bak";
+            var workerBak = workerDest + ".bak";
+
+            if (Directory.Exists(appBak))    Directory.Delete(appBak, recursive: true);
+            if (Directory.Exists(workerBak)) Directory.Delete(workerBak, recursive: true);
+            if (Directory.Exists(appDest))   Directory.Move(appDest, appBak);
+            if (Directory.Exists(workerDest)) Directory.Move(workerDest, workerBak);
+
+            progress.Report("Extracting...");
+            Directory.CreateDirectory(ctx.InstallDirectory);
+            try
+            {
+                ZipFile.ExtractToDirectory(zipPath, ctx.InstallDirectory, overwriteFiles: true);
+            }
+            catch (Exception ex)
+            {
+                // Roll back to previous binaries.
+                if (Directory.Exists(appDest))   Directory.Delete(appDest, recursive: true);
+                if (Directory.Exists(workerDest)) Directory.Delete(workerDest, recursive: true);
+                if (Directory.Exists(appBak))    Directory.Move(appBak, appDest);
+                if (Directory.Exists(workerBak)) Directory.Move(workerBak, workerDest);
+                return StepResult.Fail(
+                    $"Extraction failed; previous binaries have been restored: {ex.Message}.");
+            }
+
+            // Success — drop stash.
+            if (Directory.Exists(appBak))    Directory.Delete(appBak, recursive: true);
+            if (Directory.Exists(workerBak)) Directory.Delete(workerBak, recursive: true);
+
+            ctx.InstalledVersion = release.TagName.TrimStart('v', 'V');
+            return StepResult.Ok();
+        }
+        finally
+        {
+            try { Directory.Delete(scratchDir, recursive: true); } catch { /* best effort */ }
+        }
+    }
+}

src/ClaudeDo.Installer/Steps/InitDatabaseStep.cs

@@ -1,5 +1,6 @@
 using ClaudeDo.Data;
 using ClaudeDo.Installer.Core;
+using Microsoft.EntityFrameworkCore;
 
 namespace ClaudeDo.Installer.Steps;
 
@@ -14,8 +15,11 @@ public sealed class InitDatabaseStep : IInstallStep
             var expandedPath = Paths.Expand(ctx.DbPath);
             progress.Report($"Initializing database at {expandedPath}");
 
-            var factory = new SqliteConnectionFactory(expandedPath);
-            SchemaInitializer.Apply(factory);
+            var options = new DbContextOptionsBuilder<ClaudeDoDbContext>()
+                .UseSqlite($"Data Source={expandedPath}")
+                .Options;
+            using var context = new ClaudeDoDbContext(options);
+            ClaudeDoDbContext.MigrateAndConfigure(context);
 
             progress.Report("Schema applied successfully");
             return Task.FromResult(StepResult.Ok());

src/ClaudeDo.Installer/Steps/PublishAppStep.cs

@@ -1,20 +0,0 @@
-using ClaudeDo.Installer.Core;
-
-namespace ClaudeDo.Installer.Steps;
-
-public sealed class PublishAppStep : IInstallStep
-{
-    public string Name => "Publish ClaudeDo.App";
-
-    public async Task<StepResult> ExecuteAsync(InstallContext ctx, IProgress<string> progress, CancellationToken ct)
-    {
-        progress.Report("Publishing ClaudeDo.App...");
-
-        var args = "publish src/ClaudeDo.App/ClaudeDo.App.csproj -c Release -r win-x64 --self-contained false";
-        var (exitCode, output) = await ProcessRunner.RunAsync("dotnet", args, ctx.SourceDirectory, progress, ct);
-
-        return exitCode == 0
-            ? StepResult.Ok()
-            : StepResult.Fail($"dotnet publish failed with exit code {exitCode}");
-    }
-}

src/ClaudeDo.Installer/Steps/PublishWorkerStep.cs

@@ -1,20 +0,0 @@
-using ClaudeDo.Installer.Core;
-
-namespace ClaudeDo.Installer.Steps;
-
-public sealed class PublishWorkerStep : IInstallStep
-{
-    public string Name => "Publish ClaudeDo.Worker";
-
-    public async Task<StepResult> ExecuteAsync(InstallContext ctx, IProgress<string> progress, CancellationToken ct)
-    {
-        progress.Report("Publishing ClaudeDo.Worker...");
-
-        var args = "publish src/ClaudeDo.Worker/ClaudeDo.Worker.csproj -c Release -r win-x64 --self-contained false";
-        var (exitCode, output) = await ProcessRunner.RunAsync("dotnet", args, ctx.SourceDirectory, progress, ct);
-
-        return exitCode == 0
-            ? StepResult.Ok()
-            : StepResult.Fail($"dotnet publish failed with exit code {exitCode}");
-    }
-}

src/ClaudeDo.Installer/Steps/RegisterServiceStep.cs

@@ -23,18 +23,39 @@ public sealed class RegisterServiceStep : IInstallStep
         progress.Report("Removing existing service registration (if any)...");
         await RunSc($"delete {ServiceName}", ctx, progress, ct, ignoreErrors: true);
 
+        // Wait for the service to actually disappear from SCM. `sc delete` returns
+        // immediately but the service stays "marked for deletion" until every open
+        // handle (services.msc, Task Manager, a prior sc query process) is closed.
+        // Poll up to 30s — then fail with actionable guidance if it's still there.
+        progress.Report("Waiting for prior service registration to clear...");
+        for (var i = 0; i < 30; i++)
+        {
+            ct.ThrowIfCancellationRequested();
+            var (queryExit, _) = await RunSc($"query {ServiceName}", ctx, progress, ct, ignoreErrors: true);
+            if (queryExit != 0) break; // service no longer registered — good
+            if (i == 29)
+                return StepResult.Fail(
+                    $"Service '{ServiceName}' is marked for deletion but hasn't cleared after 30s. " +
+                    "Close any open Services console (services.msc), Task Manager Services tab, or " +
+                    "Event Viewer showing the service, then retry. A reboot will also clear it.");
+            await Task.Delay(1000, ct);
+        }
+
         // Create service
         var startType = ctx.AutoStart ? "auto" : "demand";
         var createArgs = $"create {ServiceName} binPath= \"{workerExe}\" start= {startType}";
 
         if (ctx.ServiceAccount == "CurrentUser")
-        {
-            var username = Environment.UserName;
-            createArgs += $" obj= \".\\{username}\"";
-        }
+            return StepResult.Fail(
+                "Service cannot run as Current User without a password. " +
+                "Select 'Local System' or extend ServicePage to capture a password.");
 
         progress.Report("Creating service...");
         var (exitCode, output) = await RunSc(createArgs, ctx, progress, ct);
+        if (exitCode == 1072)
+            return StepResult.Fail(
+                $"Service '{ServiceName}' is still marked for deletion. " +
+                "Close services.msc / Task Manager / Event Viewer and retry, or reboot.");
         if (exitCode != 0)
             return StepResult.Fail($"sc.exe create failed (exit {exitCode}): {output}");
 
@@ -46,15 +67,6 @@ public sealed class RegisterServiceStep : IInstallStep
         if (failExit != 0)
             progress.Report($"Warning: failed to set restart policy (exit {failExit})");
 
-        // Start service if auto-start
-        if (ctx.AutoStart)
-        {
-            progress.Report("Starting service...");
-            var (startExit, _) = await RunSc($"start {ServiceName}", ctx, progress, ct);
-            if (startExit != 0)
-                progress.Report("Warning: service created but failed to start. You may need to start it manually.");
-        }
-
         return StepResult.Ok();
     }
 

src/ClaudeDo.Installer/Steps/StartServiceStep.cs

@@ -0,0 +1,27 @@
+using ClaudeDo.Installer.Core;
+
+namespace ClaudeDo.Installer.Steps;
+
+public sealed class StartServiceStep : IInstallStep
+{
+    private const string ServiceName = StopServiceStep.ServiceName;
+
+    public string Name => "Start Worker Service";
+
+    public async Task<StepResult> ExecuteAsync(InstallContext ctx, IProgress<string> progress, CancellationToken ct)
+    {
+        progress.Report($"Starting {ServiceName}...");
+
+        var (exit, _) = await ProcessRunner.RunAsync("sc.exe", $"start {ServiceName}", null, progress, ct);
+        if (exit == 0) return StepResult.Ok();
+
+        // Exit 1056 = ERROR_SERVICE_ALREADY_RUNNING — that's fine too.
+        if (exit == 1056)
+        {
+            progress.Report("Service was already running.");
+            return StepResult.Ok();
+        }
+
+        return StepResult.Fail($"sc.exe start failed with exit code {exit}");
+    }
+}

src/ClaudeDo.Installer/Steps/StopServiceStep.cs

@@ -0,0 +1,54 @@
+using ClaudeDo.Installer.Core;
+
+namespace ClaudeDo.Installer.Steps;
+
+public sealed class StopServiceStep : IInstallStep
+{
+    public const string ServiceName = "ClaudeDoWorker";
+
+    public string Name => "Stop Worker Service";
+
+    public async Task<StepResult> ExecuteAsync(InstallContext ctx, IProgress<string> progress, CancellationToken ct)
+    {
+        progress.Report($"Stopping {ServiceName} (if running)...");
+
+        // sc.exe query -> returns non-zero if the service does not exist; that's fine.
+        var (queryExit, queryOutput) = await ProcessRunner.RunAsync("sc.exe", $"query {ServiceName}", null, progress, ct);
+        if (queryExit != 0)
+        {
+            progress.Report("Service is not registered — nothing to stop.");
+            return StepResult.Ok();
+        }
+
+        if (queryOutput.Contains("STOPPED", StringComparison.OrdinalIgnoreCase))
+        {
+            progress.Report("Service is already stopped.");
+            return StepResult.Ok();
+        }
+
+        var (stopExit, _) = await ProcessRunner.RunAsync("sc.exe", $"stop {ServiceName}", null, progress, ct);
+        // 1062 = ERROR_SERVICE_NOT_ACTIVE — registered but not running, treat as already stopped.
+        if (stopExit == 1062)
+        {
+            progress.Report("Service was registered but not running.");
+            return StepResult.Ok();
+        }
+        if (stopExit != 0)
+            return StepResult.Fail($"sc.exe stop failed with exit code {stopExit}");
+
+        // Poll until stopped or timeout (up to 30s).
+        for (var i = 0; i < 30; i++)
+        {
+            ct.ThrowIfCancellationRequested();
+            await Task.Delay(1000, ct);
+            var (e, o) = await ProcessRunner.RunAsync("sc.exe", $"query {ServiceName}", null, progress, ct);
+            if (e != 0 || o.Contains("STOPPED", StringComparison.OrdinalIgnoreCase))
+            {
+                progress.Report("Service stopped.");
+                return StepResult.Ok();
+            }
+        }
+
+        return StepResult.Fail("Service did not stop within 30 seconds.");
+    }
+}

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,
-                SandboxRoot = ctx.SandboxRoot,
-                LogRoot = ctx.LogRoot,
+                DbPath = Paths.Expand(ctx.DbPath),
+                SandboxRoot = Paths.Expand(ctx.SandboxRoot),
+                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,
@@ -26,7 +29,7 @@ public sealed class WriteConfigStep : IInstallStep
 
             var uiCfg = new InstallerAppSettings
             {
-                DbPath = ctx.UiDbPath,
+                DbPath = Paths.Expand(ctx.UiDbPath),
                 SignalRUrl = ctx.SignalRUrl,
             };
             uiCfg.Save();

src/ClaudeDo.Installer/Steps/WriteInstallManifestStep.cs

@@ -0,0 +1,32 @@
+using System.IO;
+using ClaudeDo.Installer.Core;
+
+namespace ClaudeDo.Installer.Steps;
+
+public sealed class WriteInstallManifestStep : IInstallStep
+{
+    public string Name => "Write Install Manifest";
+
+    public Task<StepResult> ExecuteAsync(InstallContext ctx, IProgress<string> progress, CancellationToken ct)
+    {
+        if (string.IsNullOrWhiteSpace(ctx.InstalledVersion))
+            return Task.FromResult(StepResult.Fail("Installed version is not set — DownloadAndExtractStep must run first."));
+
+        try
+        {
+            var manifest = new InstallManifest(
+                Version: ctx.InstalledVersion,
+                InstallDir: ctx.InstallDirectory,
+                WorkerDir: Path.Combine(ctx.InstallDirectory, "worker"),
+                InstalledAt: DateTimeOffset.UtcNow);
+
+            InstallManifestStore.Write(ctx.InstallDirectory, manifest);
+            progress.Report($"Wrote {InstallManifestStore.ManifestPath(ctx.InstallDirectory)}");
+            return Task.FromResult(StepResult.Ok());
+        }
+        catch (Exception ex)
+        {
+            return Task.FromResult(StepResult.Fail(ex.Message));
+        }
+    }
+}

src/ClaudeDo.Installer/Steps/WriteUninstallRegistryStep.cs

@@ -0,0 +1,81 @@
+using System.IO;
+using ClaudeDo.Installer.Core;
+using Microsoft.Win32;
+
+namespace ClaudeDo.Installer.Steps;
+
+/// <summary>
+/// Registers ClaudeDo under <c>HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\ClaudeDo</c>
+/// so it shows up in Windows "Apps &amp; Features" / "Programs and Features".
+/// Also copies the running installer into the install directory so there is an exe
+/// for UninstallString to reference after the temp-extracted single-file bundle is gone.
+/// </summary>
+public sealed class WriteUninstallRegistryStep : IInstallStep
+{
+    internal const string UninstallKeyPath = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\ClaudeDo";
+
+    public string Name => "Register in Add/Remove Programs";
+
+    public async Task<StepResult> ExecuteAsync(InstallContext ctx, IProgress<string> progress, CancellationToken ct)
+    {
+        var uninstallDir = Path.Combine(ctx.InstallDirectory, "uninstaller");
+        Directory.CreateDirectory(uninstallDir);
+        var targetExe = Path.Combine(uninstallDir, "ClaudeDo.Installer.exe");
+
+        // Copy the running installer so Apps & Features has a stable exe to launch —
+        // the single-file temp extract is gone once this process exits.
+        var sourceExe = Environment.ProcessPath
+            ?? throw new InvalidOperationException("Cannot resolve running installer path.");
+        try
+        {
+            progress.Report("Copying uninstaller binary...");
+            File.Copy(sourceExe, targetExe, overwrite: true);
+        }
+        catch (Exception ex)
+        {
+            return StepResult.Fail($"Failed to copy uninstaller exe: {ex.Message}");
+        }
+
+        progress.Report("Writing Add/Remove Programs entry...");
+        try
+        {
+            using var key = Registry.LocalMachine.CreateSubKey(UninstallKeyPath, writable: true);
+            if (key is null)
+                return StepResult.Fail("Could not open uninstall registry key (permission denied?).");
+
+            key.SetValue("DisplayName", "ClaudeDo", RegistryValueKind.String);
+            key.SetValue("DisplayVersion", ctx.InstallerVersion ?? "0.0.0", RegistryValueKind.String);
+            key.SetValue("Publisher", "Mika Kuns", RegistryValueKind.String);
+            key.SetValue("InstallLocation", ctx.InstallDirectory, RegistryValueKind.String);
+            key.SetValue("UninstallString", $"\"{targetExe}\"", RegistryValueKind.String);
+            key.SetValue("DisplayIcon", targetExe, RegistryValueKind.String);
+            key.SetValue("NoModify", 1, RegistryValueKind.DWord);
+            key.SetValue("NoRepair", 1, RegistryValueKind.DWord);
+
+            // Best-effort install size (KB) — scan install dir.
+            try
+            {
+                var sizeKb = (int)(DirectorySizeBytes(ctx.InstallDirectory) / 1024);
+                key.SetValue("EstimatedSize", sizeKb, RegistryValueKind.DWord);
+            }
+            catch { /* best-effort only */ }
+        }
+        catch (Exception ex)
+        {
+            return StepResult.Fail($"Failed to write uninstall registry: {ex.Message}");
+        }
+
+        await Task.CompletedTask;
+        return StepResult.Ok();
+    }
+
+    private static long DirectorySizeBytes(string path)
+    {
+        long total = 0;
+        foreach (var file in Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories))
+        {
+            try { total += new FileInfo(file).Length; } catch { /* ignore */ }
+        }
+        return total;
+    }
+}

src/ClaudeDo.Installer/Theme/DarkTheme.xaml

@@ -184,6 +184,34 @@
         </Setter>
     </Style>
 
+    <!-- ComboBox toggle button (dropdown arrow chrome) -->
+    <ControlTemplate x:Key="ComboBoxToggleButtonTemplate" TargetType="ToggleButton">
+        <Border x:Name="Bd"
+                Background="{StaticResource IslandBgBrush}"
+                BorderBrush="{StaticResource BorderSubtleBrush}"
+                BorderThickness="1"
+                CornerRadius="4">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="20"/>
+                </Grid.ColumnDefinitions>
+                <Path Grid.Column="1"
+                      HorizontalAlignment="Center" VerticalAlignment="Center"
+                      Fill="{StaticResource TextSecondaryBrush}"
+                      Data="M 0 0 L 4 4 L 8 0 Z"/>
+            </Grid>
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+            </Trigger>
+            <Trigger Property="IsChecked" Value="True">
+                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
     <!-- ComboBox -->
     <Style TargetType="ComboBox">
         <Setter Property="Background" Value="{StaticResource IslandBgBrush}"/>
@@ -191,6 +219,71 @@
         <Setter Property="BorderBrush" Value="{StaticResource BorderSubtleBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Padding" Value="8,6"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ComboBox">
+                    <Grid>
+                        <ToggleButton x:Name="ToggleButton"
+                                      Template="{StaticResource ComboBoxToggleButtonTemplate}"
+                                      Focusable="False"
+                                      IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                      ClickMode="Press"/>
+                        <ContentPresenter x:Name="ContentSite"
+                                          IsHitTestVisible="False"
+                                          Content="{TemplateBinding SelectionBoxItem}"
+                                          ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                          Margin="{TemplateBinding Padding}"
+                                          VerticalAlignment="Center" HorizontalAlignment="Left"
+                                          TextElement.Foreground="{StaticResource TextPrimaryBrush}"/>
+                        <Popup x:Name="Popup"
+                               Placement="Bottom"
+                               IsOpen="{TemplateBinding IsDropDownOpen}"
+                               AllowsTransparency="True" Focusable="False"
+                               PopupAnimation="Slide">
+                            <Border x:Name="DropDownBorder"
+                                    Background="{StaticResource IslandBgBrush}"
+                                    BorderBrush="{StaticResource BorderSubtleBrush}"
+                                    BorderThickness="1"
+                                    CornerRadius="4"
+                                    MinWidth="{TemplateBinding ActualWidth}"
+                                    MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                                <ScrollViewer SnapsToDevicePixels="True">
+                                    <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained"/>
+                                </ScrollViewer>
+                            </Border>
+                        </Popup>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ComboBoxItem — dark dropdown rows -->
+    <Style TargetType="ComboBoxItem">
+        <Setter Property="Background" Value="{StaticResource IslandBgBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource TextPrimaryBrush}"/>
+        <Setter Property="Padding" Value="8,6"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ComboBoxItem">
+                    <Border x:Name="Bd"
+                            Background="{TemplateBinding Background}"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource SelectionHoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource SelectionBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
 
     <!-- CheckBox -->

src/ClaudeDo.Installer/Views/SettingsViewModel.cs

@@ -1,5 +1,6 @@
 using System.Windows;
 using ClaudeDo.Installer.Core;
+using ClaudeDo.Installer.Steps;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 
@@ -8,6 +9,11 @@ namespace ClaudeDo.Installer.Views;
 public partial class SettingsViewModel : ObservableObject
 {
     private readonly InstallContext _context;
+    private readonly IReleaseClient _releases;
+    private readonly StopServiceStep _stopService;
+    private readonly StartServiceStep _startService;
+    private readonly DownloadAndExtractStep _downloadStep;
+    private readonly UninstallRunner _uninstallRunner;
 
     public IReadOnlyList<IInstallerPage> Pages { get; }
 
@@ -20,12 +26,32 @@ public partial class SettingsViewModel : ObservableObject
     [ObservableProperty]
     private bool _isStatusError;
 
-    public SettingsViewModel(PageResolver resolver, InstallContext context)
+    [ObservableProperty]
+    private string _versionLabel = "";
+
+    [ObservableProperty]
+    private bool _removeAppData;
+
+    public SettingsViewModel(
+        PageResolver resolver,
+        InstallContext context,
+        IReleaseClient releases,
+        StopServiceStep stopService,
+        StartServiceStep startService,
+        DownloadAndExtractStep downloadStep,
+        UninstallRunner uninstallRunner)
     {
         Pages = resolver.SettingsPages;
         _context = context;
+        _releases = releases;
+        _stopService = stopService;
+        _startService = startService;
+        _downloadStep = downloadStep;
+        _uninstallRunner = uninstallRunner;
         _selectedPage = Pages.FirstOrDefault();
 
+        VersionLabel = $"Installed: {context.InstalledVersion ?? "?"}   Installer: {context.InstallerVersion ?? "?"}";
+
         _ = LoadAllAsync();
     }
 
@@ -36,9 +62,8 @@ public partial class SettingsViewModel : ObservableObject
     }
 
     [RelayCommand]
-    private async Task Apply()
+    private async Task Save()
     {
-        // Validate all pages
         foreach (var page in Pages)
         {
             if (!page.Validate())
@@ -50,11 +75,9 @@ public partial class SettingsViewModel : ObservableObject
             }
         }
 
-        // Apply all pages (writes to InstallContext)
         foreach (var page in Pages)
             await page.ApplyAsync();
 
-        // Write config files directly
         var workerCfg = new InstallerWorkerConfig
         {
             DbPath = _context.DbPath,
@@ -75,13 +98,71 @@ public partial class SettingsViewModel : ObservableObject
         };
         uiCfg.Save();
 
-        StatusMessage = "Settings saved successfully.";
+        StatusMessage = "Settings saved.";
         IsStatusError = false;
     }
 
     [RelayCommand]
-    private void Close()
+    private async Task Repair()
     {
+        var confirm = MessageBox.Show(
+            "Re-download and reinstall the ClaudeDo binaries? Your config and database are NOT affected.",
+            "Repair ClaudeDo",
+            MessageBoxButton.OKCancel,
+            MessageBoxImage.Question);
+
+        if (confirm != MessageBoxResult.OK) return;
+
+        StatusMessage = "Repairing...";
+        IsStatusError = false;
+
+        var progress = new Progress<string>(msg => StatusMessage = msg);
+        var steps = new IInstallStep[] { _stopService, _downloadStep, _startService };
+
+        foreach (var step in steps)
+        {
+            var r = await step.ExecuteAsync(_context, progress, CancellationToken.None);
+            if (!r.Success)
+            {
+                StatusMessage = $"{step.Name} failed: {r.ErrorMessage}";
+                IsStatusError = true;
+                return;
+            }
+        }
+
+        StatusMessage = "Repair complete.";
+    }
+
+    [RelayCommand]
+    private async Task Uninstall()
+    {
+        var dataNote = RemoveAppData
+            ? "This will remove ClaudeDo AND delete all of your tasks, configuration, and database.\n\nContinue?"
+            : "This will remove ClaudeDo. Your tasks, configuration, and database in ~/.todo-app will be kept.\n\nContinue?";
+
+        var confirm = MessageBox.Show(
+            dataNote,
+            "Uninstall ClaudeDo",
+            MessageBoxButton.YesNo,
+            MessageBoxImage.Warning);
+
+        if (confirm != MessageBoxResult.Yes) return;
+
+        var progress = new Progress<string>(msg => StatusMessage = msg);
+        var r = await _uninstallRunner.RunAsync(RemoveAppData, progress, CancellationToken.None);
+
+        if (!r.Success)
+        {
+            StatusMessage = $"Uninstall failed: {r.ErrorMessage}";
+            IsStatusError = true;
+            return;
+        }
+
+        MessageBox.Show("ClaudeDo has been removed.", "Uninstall complete",
+            MessageBoxButton.OK, MessageBoxImage.Information);
         Application.Current.Shutdown();
     }
+
+    [RelayCommand]
+    private void Close() => Application.Current.Shutdown();
 }

src/ClaudeDo.Installer/Views/SettingsWindow.xaml

@@ -3,9 +3,14 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:views="clr-namespace:ClaudeDo.Installer.Views"
         Title="ClaudeDo Settings"
+        Icon="/ClaudeTaskSetup.ico"
         Width="720" Height="520"
         MinWidth="620" MinHeight="460"
         WindowStartupLocation="CenterScreen"
+        Background="{StaticResource WindowBgBrush}"
+        Foreground="{StaticResource TextPrimaryBrush}"
+        FontFamily="Segoe UI"
+        FontSize="13"
         d:DataContext="{d:DesignInstance views:SettingsViewModel}"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -61,11 +66,16 @@
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
 
-                <!-- Status message -->
-                <TextBlock Grid.Column="0" Text="{Binding StatusMessage}"
-                           VerticalAlignment="Center" FontSize="12">
+                <!-- Status message / version label -->
+                <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                    <TextBlock Text="{Binding VersionLabel}" FontSize="11" Opacity="0.7"/>
+                    <TextBlock Text="{Binding StatusMessage}" FontSize="12">
                         <TextBlock.Style>
                             <Style TargetType="TextBlock">
                                 <Setter Property="Foreground" Value="{StaticResource AccentBrush}"/>
@@ -77,15 +87,20 @@
                             </Style>
                         </TextBlock.Style>
                     </TextBlock>
+                </StackPanel>
 
-                <Button Grid.Column="1" Content="Close"
-                        Command="{Binding CloseCommand}"
-                        Margin="0,0,8,0" MinWidth="80"/>
-
-                <Button Grid.Column="2" Content="Save &amp; Apply"
-                        Command="{Binding ApplyCommand}"
-                        Style="{StaticResource AccentButton}"
-                        MinWidth="100"/>
+                <CheckBox Grid.Column="1" IsChecked="{Binding RemoveAppData}"
+                          Content="Remove user data (tasks, logs, configs in ~/.todo-app)"
+                          Margin="0,0,12,0" VerticalAlignment="Center"/>
+                <Button Grid.Column="2" Content="Uninstall" Margin="0,0,8,0"
+                        Command="{Binding UninstallCommand}"/>
+                <Button Grid.Column="3" Content="Repair" Margin="0,0,8,0"
+                        Command="{Binding RepairCommand}"/>
+                <Button Grid.Column="4" Content="Save" Margin="0,0,8,0"
+                        Command="{Binding SaveCommand}"
+                        Style="{StaticResource AccentButton}"/>
+                <Button Grid.Column="5" Content="Close"
+                        Command="{Binding CloseCommand}"/>
             </Grid>
         </Border>
     </Grid>

src/ClaudeDo.Installer/Views/WizardViewModel.cs

@@ -1,5 +1,8 @@
+using System.Linq;
 using System.Windows;
 using ClaudeDo.Installer.Core;
+using ClaudeDo.Installer.Pages.InstallPage;
+using ClaudeDo.Installer.Pages.WelcomePage;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 
@@ -28,9 +31,14 @@ public partial class WizardViewModel : ObservableObject
 
     public WizardViewModel(PageResolver resolver, InstallContext context)
     {
-        Pages = resolver.WizardPages;
         _context = context;
 
+        var all = resolver.WizardPages;
+        Pages = context.Mode == InstallerMode.Update
+            ? all.Where(p => p is WelcomePageViewModel
+                          || p is InstallPageViewModel).ToList()
+            : all;
+
         if (Pages.Count > 0)
             _ = InitAsync();
     }

src/ClaudeDo.Installer/Views/WizardWindow.xaml

@@ -3,9 +3,14 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:views="clr-namespace:ClaudeDo.Installer.Views"
         Title="ClaudeDo Installer"
+        Icon="/ClaudeTaskSetup.ico"
         Width="720" Height="520"
         MinWidth="620" MinHeight="460"
         WindowStartupLocation="CenterScreen"
+        Background="{StaticResource WindowBgBrush}"
+        Foreground="{StaticResource TextPrimaryBrush}"
+        FontFamily="Segoe UI"
+        FontSize="13"
         d:DataContext="{d:DesignInstance views:WizardViewModel}"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

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/ListEditorViewModel.cs

@@ -54,6 +54,7 @@ public partial class ListEditorViewModel : ViewModelBase
 
     public void InitForCreate()
     {
+        _tcs = new TaskCompletionSource<ListEntity?>();
         _editId = null;
         _createdAt = DateTime.UtcNow;
         WindowTitle = "New List";
@@ -61,6 +62,7 @@ public partial class ListEditorViewModel : ViewModelBase
 
     public void InitForEdit(ListEntity entity, ListConfigEntity? config)
     {
+        _tcs = new TaskCompletionSource<ListEntity?>();
         _editId = entity.Id;
         _createdAt = entity.CreatedAt;
         Name = entity.Name;
@@ -119,9 +121,5 @@ public partial class ListEditorViewModel : ViewModelBase
         _tcs.TrySetResult(null);
     }
 
-    public Task<ListEntity?> ShowAndWaitAsync()
-    {
-        _tcs = new TaskCompletionSource<ListEntity?>();
-        return _tcs.Task;
-    }
+    public Task<ListEntity?> ShowAndWaitAsync() => _tcs.Task;
 }

src/ClaudeDo.Ui/ViewModels/MainWindowViewModel.cs

@@ -2,18 +2,20 @@ using System.Collections.ObjectModel;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using ClaudeDo.Data;
 using ClaudeDo.Data.Models;
 using ClaudeDo.Data.Repositories;
 using ClaudeDo.Ui.Services;
 using ClaudeDo.Ui.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Microsoft.EntityFrameworkCore;
 
 namespace ClaudeDo.Ui.ViewModels;
 
-public partial class MainWindowViewModel : ViewModelBase
+public partial class MainWindowViewModel : ViewModelBase, IDisposable
 {
-    private readonly ListRepository _listRepo;
+    private readonly IDbContextFactory<ClaudeDoDbContext> _dbFactory;
     private readonly WorkerClient _worker;
     private readonly Func<ListEditorViewModel> _listEditorFactory;
 
@@ -25,30 +27,41 @@ public partial class MainWindowViewModel : ViewModelBase
     public TaskDetailViewModel TaskDetail { get; }
     public StatusBarViewModel StatusBar { get; }
 
+    private readonly Action<string> _onTaskChanged;
+
     public MainWindowViewModel(
-        ListRepository listRepo,
+        IDbContextFactory<ClaudeDoDbContext> dbFactory,
         WorkerClient worker,
         TaskListViewModel taskList,
         TaskDetailViewModel taskDetail,
         StatusBarViewModel statusBar,
         Func<ListEditorViewModel> listEditorFactory)
     {
-        _listRepo = listRepo;
+        _dbFactory = dbFactory;
         _worker = worker;
         _listEditorFactory = listEditorFactory;
         TaskList = taskList;
         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()
     {
         try
         {
-            var lists = await _listRepo.GetAllAsync();
+            using var context = _dbFactory.CreateDbContext();
+            var listRepo = new ListRepository(context);
+            var lists = await listRepo.GetAllAsync();
             foreach (var l in lists)
                 Lists.Add(new ListItemViewModel(l));
         }
@@ -57,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)
@@ -91,10 +108,12 @@ public partial class MainWindowViewModel : ViewModelBase
 
         try
         {
-            await _listRepo.AddAsync(entity);
+            using var context = _dbFactory.CreateDbContext();
+            var listRepo = new ListRepository(context);
+            await listRepo.AddAsync(entity);
             var configEntity = editor.BuildConfig(entity.Id);
             if (configEntity is not null)
-                await _listRepo.SetConfigAsync(configEntity);
+                await listRepo.SetConfigAsync(configEntity);
             Lists.Add(new ListItemViewModel(entity));
         }
         catch (Exception ex)
@@ -107,10 +126,17 @@ public partial class MainWindowViewModel : ViewModelBase
     private async Task EditList()
     {
         if (SelectedList is null) return;
-        var existing = await _listRepo.GetByIdAsync(SelectedList.Id);
-        if (existing is null) return;
 
-        var config = await _listRepo.GetConfigAsync(existing.Id);
+        ListEntity? existing;
+        ListConfigEntity? config;
+        using (var context = _dbFactory.CreateDbContext())
+        {
+            var listRepo = new ListRepository(context);
+            existing = await listRepo.GetByIdAsync(SelectedList.Id);
+            if (existing is null) return;
+            config = await listRepo.GetConfigAsync(existing.Id);
+        }
+
         var editor = _listEditorFactory();
         await editor.LoadAgentsAsync(_worker);
         editor.InitForEdit(existing, config);
@@ -125,10 +151,12 @@ public partial class MainWindowViewModel : ViewModelBase
 
         try
         {
-            await _listRepo.UpdateAsync(entity);
+            using var context = _dbFactory.CreateDbContext();
+            var listRepo = new ListRepository(context);
+            await listRepo.UpdateAsync(entity);
             var configEntity = editor.BuildConfig(entity.Id);
             if (configEntity is not null)
-                await _listRepo.SetConfigAsync(configEntity);
+                await listRepo.SetConfigAsync(configEntity);
             SelectedList.Name = entity.Name;
             SelectedList.WorkingDir = entity.WorkingDir;
             SelectedList.DefaultCommitType = entity.DefaultCommitType;
@@ -139,21 +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
         {
-            await _listRepo.DeleteAsync(SelectedList.Id);
-            Lists.Remove(SelectedList);
+            using var context = _dbFactory.CreateDbContext();
+            var listRepo = new ListRepository(context);
+            await listRepo.DeleteAsync(_pendingDeleteList.Id);
+            Lists.Remove(_pendingDeleteList);
+            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/SubtaskItemViewModel.cs

@@ -0,0 +1,23 @@
+using ClaudeDo.Data.Models;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace ClaudeDo.Ui.ViewModels;
+
+public partial class SubtaskItemViewModel : ObservableObject
+{
+    [ObservableProperty] private string _title = string.Empty;
+    [ObservableProperty] private bool _completed;
+
+    public string Id { get; set; } = string.Empty;
+    public string? OriginalTitle { get; set; }
+    public bool OriginalCompleted { get; set; }
+
+    public static SubtaskItemViewModel From(SubtaskEntity e) => new()
+    {
+        Id = e.Id,
+        Title = e.Title,
+        Completed = e.Completed,
+        OriginalTitle = e.Title,
+        OriginalCompleted = e.Completed,
+    };
+}

src/ClaudeDo.Ui/ViewModels/TaskDetailViewModel.cs

@@ -2,6 +2,7 @@ using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
+using ClaudeDo.Data;
 using ClaudeDo.Data.Git;
 using ClaudeDo.Data.Models;
 using ClaudeDo.Data.Repositories;
@@ -9,17 +10,15 @@ using ClaudeDo.Ui.Helpers;
 using ClaudeDo.Ui.Services;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Microsoft.EntityFrameworkCore;
 
 namespace ClaudeDo.Ui.ViewModels;
 
 public partial class TaskDetailViewModel : ViewModelBase
 {
-    private readonly TaskRepository _taskRepo;
-    private readonly WorktreeRepository _worktreeRepo;
-    private readonly ListRepository _listRepo;
+    private readonly IDbContextFactory<ClaudeDoDbContext> _dbFactory;
     private readonly GitService _git;
     private readonly WorkerClient _worker;
-    private readonly TagRepository _tagRepo;
 
     [ObservableProperty] private string _title = "";
     [ObservableProperty] private string? _description;
@@ -28,9 +27,14 @@ public partial class TaskDetailViewModel : ViewModelBase
     [ObservableProperty] private string _statusText = "";
     [ObservableProperty] private string _statusChoice = "Manual";
     [ObservableProperty] private string _commitType = "chore";
+    [ObservableProperty] private string _modelChoice = "(list default)";
+    [ObservableProperty] private string? _systemPromptOverride;
+    [ObservableProperty] private AgentInfo? _selectedAgent;
+    public List<AgentInfo> AvailableAgents { get; } = [];
 
     public static string[] StatusChoices { get; } = ["Manual", "Queued", "Running", "Done", "Failed"];
     public static string[] CommitTypes { get; } = ["feat", "fix", "refactor", "docs", "test", "chore", "ci", "perf", "style", "build"];
+    public static string[] ModelChoices { get; } = ["(list default)", "Sonnet", "Opus", "Haiku"];
 
     // Worktree
     [ObservableProperty] private bool _hasWorktree;
@@ -44,22 +48,23 @@ public partial class TaskDetailViewModel : ViewModelBase
     private StreamLineFormatter _formatter = new();
     public ObservableCollection<TagEntity> Tags { get; } = new();
     [ObservableProperty] private string _newTagInput = "";
+    public ObservableCollection<SubtaskItemViewModel> Subtasks { get; } = new();
 
     private string? _taskId;
     private string? _listId;
     private bool _isLoading;
+    // Cancels an in-flight LoadAsync when a new TaskUpdated event arrives
+    // before the previous load finished — prevents torn state on _taskId,
+    // Subtasks, Tags, etc.
+    private CancellationTokenSource? _loadCts;
 
     public event Action<string>? TaskChanged;
 
-    public TaskDetailViewModel(TaskRepository taskRepo, WorktreeRepository worktreeRepo,
-        ListRepository listRepo, GitService git, WorkerClient worker, TagRepository tagRepo)
+    public TaskDetailViewModel(IDbContextFactory<ClaudeDoDbContext> dbFactory, GitService git, WorkerClient worker)
     {
-        _taskRepo = taskRepo;
-        _worktreeRepo = worktreeRepo;
-        _listRepo = listRepo;
+        _dbFactory = dbFactory;
         _git = git;
         _worker = worker;
-        _tagRepo = tagRepo;
 
         worker.TaskMessageEvent += OnTaskMessage;
         worker.WorktreeUpdatedEvent += OnWorktreeUpdated;
@@ -70,12 +75,54 @@ public partial class TaskDetailViewModel : ViewModelBase
 
     public async Task LoadAsync(string taskId)
     {
+        // Cancel any in-flight load so rapid TaskUpdated events don't race
+        // on _taskId / Subtasks / Tags. The newest caller wins.
+        var oldCts = _loadCts;
+        var cts = new CancellationTokenSource();
+        _loadCts = cts;
+        oldCts?.Cancel();
+        oldCts?.Dispose();
+        var ct = cts.Token;
+
         _taskId = taskId;
+        HasWorktree = false;
+        WorktreeState = "";
+        BranchName = null;
+        DiffStat = null;
+        WorktreePath = null;
+        OnPropertyChanged(nameof(CanWorktreeAction));
         LiveText = "";
         _formatter = new StreamLineFormatter();
 
-        var task = await _taskRepo.GetByIdAsync(taskId);
+        try
+        {
+            TaskEntity? task;
+            List<TagEntity> tags;
+            List<SubtaskEntity> subtasks;
+
+            using (var context = _dbFactory.CreateDbContext())
+            {
+                var taskRepo = new TaskRepository(context);
+                task = await taskRepo.GetByIdAsync(taskId, ct);
                 if (task is null) return;
+                ct.ThrowIfCancellationRequested();
+
+                tags = await taskRepo.GetTagsAsync(taskId, ct);
+                ct.ThrowIfCancellationRequested();
+
+                var subtaskRepo = new SubtaskRepository(context);
+                subtasks = await subtaskRepo.GetByTaskIdAsync(taskId, ct);
+            }
+
+            ct.ThrowIfCancellationRequested();
+
+            if (AvailableAgents.Count == 0)
+            {
+                var agents = await _worker.GetAgentsAsync();
+                ct.ThrowIfCancellationRequested();
+                AvailableAgents.AddRange(agents);
+                OnPropertyChanged(nameof(AvailableAgents));
+            }
 
             _isLoading = true;
             try
@@ -90,16 +137,44 @@ public partial class TaskDetailViewModel : ViewModelBase
                     && File.Exists(task.LogPath))
                 {
                     _formatter = new StreamLineFormatter();
-                LiveText = await Task.Run(() => _formatter.FormatFile(task.LogPath));
+                    LiveText = await Task.Run(() => _formatter.FormatFile(task.LogPath), ct);
                 }
                 StatusText = task.Status.ToString().ToLowerInvariant();
                 StatusChoice = task.Status.ToString();
                 CommitType = task.CommitType;
+                ModelChoice = task.Model is not null
+                    ? ListEditorViewModel.ModelIdToDisplay(task.Model)
+                    : "(list default)";
+                SystemPromptOverride = task.SystemPrompt;
+                if (task.AgentPath is not null)
+                {
+                    var match = AvailableAgents.FirstOrDefault(a => a.Path == task.AgentPath);
+                    if (match is null)
+                    {
+                        match = new AgentInfo(Path.GetFileNameWithoutExtension(task.AgentPath), "(external)", task.AgentPath);
+                        AvailableAgents.Add(match);
+                        OnPropertyChanged(nameof(AvailableAgents));
+                    }
+                    SelectedAgent = match;
+                }
+                else
+                {
+                    SelectedAgent = null;
+                }
 
                 Tags.Clear();
-            var tags = await _taskRepo.GetTagsAsync(taskId);
                 foreach (var tag in tags)
                     Tags.Add(tag);
+
+                // Tear down old subtask subscriptions before replacing them.
+                foreach (var old in Subtasks) old.PropertyChanged -= OnSubtaskPropertyChanged;
+                Subtasks.Clear();
+                foreach (var s in subtasks)
+                {
+                    var vm = SubtaskItemViewModel.From(s);
+                    vm.PropertyChanged += OnSubtaskPropertyChanged;
+                    Subtasks.Add(vm);
+                }
             }
             finally
             {
@@ -108,22 +183,34 @@ public partial class TaskDetailViewModel : ViewModelBase
 
             await LoadWorktreeAsync(taskId);
         }
+        catch (OperationCanceledException)
+        {
+            // Superseded by a newer LoadAsync — nothing to do.
+        }
+    }
 
     public async Task SaveAsync()
     {
         if (_isLoading || _taskId is null) return;
 
-        var entity = await _taskRepo.GetByIdAsync(_taskId);
+        using var context = _dbFactory.CreateDbContext();
+        var taskRepo = new TaskRepository(context);
+        var entity = await taskRepo.GetByIdAsync(_taskId);
         if (entity is null) return;
 
         entity.Title = Title;
         entity.Description = Description;
         entity.CommitType = CommitType;
+        entity.Model = ModelChoice != "(list default)"
+            ? ListEditorViewModel.ModelDisplayToId(ModelChoice)
+            : null;
+        entity.SystemPrompt = string.IsNullOrWhiteSpace(SystemPromptOverride) ? null : SystemPromptOverride.Trim();
+        entity.AgentPath = SelectedAgent?.Path;
 
         if (Enum.TryParse<Data.Models.TaskStatus>(StatusChoice, true, out var status))
             entity.Status = status;
 
-        await _taskRepo.UpdateAsync(entity);
+        await taskRepo.UpdateAsync(entity);
         StatusText = entity.Status.ToString().ToLowerInvariant();
         TaskChanged?.Invoke(_taskId);
     }
@@ -134,11 +221,15 @@ public partial class TaskDetailViewModel : ViewModelBase
         var name = NewTagInput.Trim();
         if (string.IsNullOrEmpty(name) || _taskId is null) return;
 
-        var tagId = await _tagRepo.GetOrCreateAsync(name);
-        await _taskRepo.AddTagAsync(_taskId, tagId);
+        using var context = _dbFactory.CreateDbContext();
+        var tagRepo = new TagRepository(context);
+        var taskRepo = new TaskRepository(context);
+
+        var tagId = await tagRepo.GetOrCreateAsync(name);
+        await taskRepo.AddTagAsync(_taskId, tagId);
 
         Tags.Clear();
-        var tags = await _taskRepo.GetTagsAsync(_taskId);
+        var tags = await taskRepo.GetTagsAsync(_taskId);
         foreach (var tag in tags)
             Tags.Add(tag);
 
@@ -150,13 +241,93 @@ public partial class TaskDetailViewModel : ViewModelBase
     private async Task RemoveTag(TagEntity tag)
     {
         if (_taskId is null) return;
-        await _taskRepo.RemoveTagAsync(_taskId, tag.Id);
+        using var context = _dbFactory.CreateDbContext();
+        var taskRepo = new TaskRepository(context);
+        await taskRepo.RemoveTagAsync(_taskId, tag.Id);
         Tags.Remove(tag);
         TaskChanged?.Invoke(_taskId);
     }
 
+    [RelayCommand]
+    private async Task AddSubtask()
+    {
+        if (_taskId is null) return;
+        var entity = new SubtaskEntity
+        {
+            Id = Guid.NewGuid().ToString(),
+            TaskId = _taskId,
+            Title = "",
+            Completed = false,
+            OrderNum = Subtasks.Count,
+            CreatedAt = DateTime.UtcNow,
+        };
+        using var context = _dbFactory.CreateDbContext();
+        var subtaskRepo = new SubtaskRepository(context);
+        await subtaskRepo.AddAsync(entity);
+        var vm = SubtaskItemViewModel.From(entity);
+        vm.PropertyChanged += OnSubtaskPropertyChanged;
+        Subtasks.Add(vm);
+    }
+
+    [RelayCommand]
+    private async Task RemoveSubtask(SubtaskItemViewModel item)
+    {
+        if (!string.IsNullOrEmpty(item.Id))
+        {
+            using var context = _dbFactory.CreateDbContext();
+            var subtaskRepo = new SubtaskRepository(context);
+            await subtaskRepo.DeleteAsync(item.Id);
+        }
+        item.PropertyChanged -= OnSubtaskPropertyChanged;
+        Subtasks.Remove(item);
+    }
+
+    private async void OnSubtaskPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+    {
+        if (_isLoading || sender is not SubtaskItemViewModel vm || string.IsNullOrEmpty(vm.Id)) return;
+        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,
+                Title = vm.Title,
+                Completed = vm.Completed,
+                OrderNum = Subtasks.IndexOf(vm),
+                CreatedAt = orig?.CreatedAt ?? DateTime.UtcNow,
+            });
+        }
+        catch (Exception ex)
+        {
+            // async void must never throw — surface via Debug.
+            Debug.WriteLine($"[TaskDetailViewModel] Subtask update failed for {vm.Id}: {ex}");
+        }
+    }
+
+    public void SetAgentFromPath(string path)
+    {
+        var existing = AvailableAgents.FirstOrDefault(a => a.Path == path);
+        if (existing is null)
+        {
+            existing = new AgentInfo(Path.GetFileNameWithoutExtension(path), "(external)", path);
+            AvailableAgents.Add(existing);
+            OnPropertyChanged(nameof(AvailableAgents));
+        }
+        SelectedAgent = existing;
+    }
+
     public void Clear()
     {
+        // Cancel any load in flight so it doesn't resurrect state after Clear.
+        _loadCts?.Cancel();
+        _loadCts?.Dispose();
+        _loadCts = null;
+
         _taskId = null;
         _listId = null;
         Title = "";
@@ -169,13 +340,20 @@ public partial class TaskDetailViewModel : ViewModelBase
         _formatter = new StreamLineFormatter();
         Tags.Clear();
         NewTagInput = "";
+        foreach (var s in Subtasks) s.PropertyChanged -= OnSubtaskPropertyChanged;
+        Subtasks.Clear();
         StatusChoice = "Manual";
         CommitType = "chore";
+        ModelChoice = "(list default)";
+        SystemPromptOverride = null;
+        SelectedAgent = null;
     }
 
     private async Task LoadWorktreeAsync(string taskId)
     {
-        var wt = await _worktreeRepo.GetByTaskIdAsync(taskId);
+        using var context = _dbFactory.CreateDbContext();
+        var wtRepo = new WorktreeRepository(context);
+        var wt = await wtRepo.GetByTaskIdAsync(taskId);
         HasWorktree = wt is not null;
         if (wt is not null)
         {
@@ -208,13 +386,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
         {
@@ -225,21 +405,37 @@ public partial class TaskDetailViewModel : ViewModelBase
                 UseShellExecute = true,
             });
         }
-        catch { /* best effort */ }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Failed to show diff: {ex.Message}");
+        }
     }
 
     [RelayCommand]
     private async Task MergeIntoMainAsync()
     {
         if (_taskId is null || _listId is null) return;
-        var wt = await _worktreeRepo.GetByTaskIdAsync(_taskId);
-        var list = await _listRepo.GetByIdAsync(_listId);
+
+        WorktreeEntity? wt;
+        ListEntity? list;
+        using (var context = _dbFactory.CreateDbContext())
+        {
+            var wtRepo = new WorktreeRepository(context);
+            wt = await wtRepo.GetByTaskIdAsync(_taskId);
+            var listRepo = new ListRepository(context);
+            list = await listRepo.GetByIdAsync(_listId);
+        }
         if (wt is null || list?.WorkingDir is null) return;
 
         await _git.MergeFfOnlyAsync(list.WorkingDir, wt.BranchName);
         await _git.WorktreeRemoveAsync(list.WorkingDir, wt.Path, force: true);
         await _git.BranchDeleteAsync(list.WorkingDir, wt.BranchName, force: true);
-        await _worktreeRepo.SetStateAsync(_taskId, Data.Models.WorktreeState.Merged);
+
+        using (var context = _dbFactory.CreateDbContext())
+        {
+            var wtRepo = new WorktreeRepository(context);
+            await wtRepo.SetStateAsync(_taskId, Data.Models.WorktreeState.Merged);
+        }
         await LoadWorktreeAsync(_taskId);
     }
 
@@ -247,12 +443,25 @@ public partial class TaskDetailViewModel : ViewModelBase
     private async Task KeepAsBranchAsync()
     {
         if (_taskId is null || _listId is null) return;
-        var wt = await _worktreeRepo.GetByTaskIdAsync(_taskId);
-        var list = await _listRepo.GetByIdAsync(_listId);
+
+        WorktreeEntity? wt;
+        ListEntity? list;
+        using (var context = _dbFactory.CreateDbContext())
+        {
+            var wtRepo = new WorktreeRepository(context);
+            wt = await wtRepo.GetByTaskIdAsync(_taskId);
+            var listRepo = new ListRepository(context);
+            list = await listRepo.GetByIdAsync(_listId);
+        }
         if (wt is null || list?.WorkingDir is null) return;
 
         await _git.WorktreeRemoveAsync(list.WorkingDir, wt.Path, force: true);
-        await _worktreeRepo.SetStateAsync(_taskId, Data.Models.WorktreeState.Kept);
+
+        using (var context = _dbFactory.CreateDbContext())
+        {
+            var wtRepo = new WorktreeRepository(context);
+            await wtRepo.SetStateAsync(_taskId, Data.Models.WorktreeState.Kept);
+        }
         await LoadWorktreeAsync(_taskId);
     }
 
@@ -260,13 +469,26 @@ public partial class TaskDetailViewModel : ViewModelBase
     private async Task DiscardAsync()
     {
         if (_taskId is null || _listId is null) return;
-        var wt = await _worktreeRepo.GetByTaskIdAsync(_taskId);
-        var list = await _listRepo.GetByIdAsync(_listId);
+
+        WorktreeEntity? wt;
+        ListEntity? list;
+        using (var context = _dbFactory.CreateDbContext())
+        {
+            var wtRepo = new WorktreeRepository(context);
+            wt = await wtRepo.GetByTaskIdAsync(_taskId);
+            var listRepo = new ListRepository(context);
+            list = await listRepo.GetByIdAsync(_listId);
+        }
         if (wt is null || list?.WorkingDir is null) return;
 
         await _git.WorktreeRemoveAsync(list.WorkingDir, wt.Path, force: true);
         await _git.BranchDeleteAsync(list.WorkingDir, wt.BranchName, force: true);
-        await _worktreeRepo.SetStateAsync(_taskId, Data.Models.WorktreeState.Discarded);
+
+        using (var context = _dbFactory.CreateDbContext())
+        {
+            var wtRepo = new WorktreeRepository(context);
+            await wtRepo.SetStateAsync(_taskId, Data.Models.WorktreeState.Discarded);
+        }
         await LoadWorktreeAsync(_taskId);
     }
 
@@ -299,12 +521,28 @@ public partial class TaskDetailViewModel : ViewModelBase
     private async void OnWorktreeUpdated(string taskId)
     {
         if (taskId != _taskId) return;
+        try
+        {
             await LoadWorktreeAsync(taskId);
         }
+        catch (Exception ex)
+        {
+            // async void must never throw.
+            Debug.WriteLine($"[TaskDetailViewModel] OnWorktreeUpdated failed for {taskId}: {ex}");
+        }
+    }
 
     private async void OnTaskUpdated(string taskId)
     {
         if (taskId != _taskId) return;
+        try
+        {
             await LoadAsync(taskId);
         }
+        catch (Exception ex)
+        {
+            // async void must never throw.
+            Debug.WriteLine($"[TaskDetailViewModel] OnTaskUpdated failed for {taskId}: {ex}");
+        }
+    }
 }

src/ClaudeDo.Ui/ViewModels/TaskEditorViewModel.cs

@@ -1,13 +1,20 @@
+using System.Collections.ObjectModel;
+using System.IO;
+using ClaudeDo.Data;
 using ClaudeDo.Data.Models;
+using ClaudeDo.Data.Repositories;
 using ClaudeDo.Ui.Services;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Microsoft.EntityFrameworkCore;
 using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
 
 namespace ClaudeDo.Ui.ViewModels;
 
 public partial class TaskEditorViewModel : ViewModelBase
 {
+    private readonly IDbContextFactory<ClaudeDoDbContext> _dbFactory;
+
     [ObservableProperty] private string _title = "";
     [ObservableProperty] private string? _description;
     [ObservableProperty] private string _commitType = "chore";
@@ -18,6 +25,7 @@ public partial class TaskEditorViewModel : ViewModelBase
     [ObservableProperty] private string? _systemPromptOverride;
     [ObservableProperty] private AgentInfo? _selectedAgent;
     public List<AgentInfo> AvailableAgents { get; set; } = [];
+    public ObservableCollection<SubtaskItemViewModel> Subtasks { get; } = new();
 
     private string? _editId;
     private string _listId = "";
@@ -34,11 +42,28 @@ public partial class TaskEditorViewModel : ViewModelBase
     public static string[] StatusChoices { get; } =
         ["manual", "queued"];
 
+    public TaskEditorViewModel(IDbContextFactory<ClaudeDoDbContext> dbFactory)
+    {
+        _dbFactory = dbFactory;
+    }
+
     public async Task LoadAgentsAsync(WorkerClient worker)
     {
         AvailableAgents = await worker.GetAgentsAsync();
     }
 
+    public void SetAgentFromPath(string path)
+    {
+        var existing = AvailableAgents.FirstOrDefault(a => a.Path == path);
+        if (existing is null)
+        {
+            existing = new AgentInfo(Path.GetFileNameWithoutExtension(path), "(external)", path);
+            AvailableAgents.Add(existing);
+            OnPropertyChanged(nameof(AvailableAgents));
+        }
+        SelectedAgent = existing;
+    }
+
     public IReadOnlyList<string> SelectedTagNames =>
         TagsInput.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
             .Distinct()
@@ -46,15 +71,18 @@ public partial class TaskEditorViewModel : ViewModelBase
 
     public void InitForCreate(string listId, string defaultCommitType = "chore")
     {
+        _tcs = new TaskCompletionSource<TaskEntity?>();
         _editId = null;
         _listId = listId;
         _createdAt = DateTime.UtcNow;
         CommitType = defaultCommitType;
         WindowTitle = "New Task";
+        Subtasks.Clear();
     }
 
-    public void InitForEdit(TaskEntity entity, IReadOnlyList<TagEntity> taskTags)
+    public async Task InitForEditAsync(TaskEntity entity, IReadOnlyList<TagEntity> taskTags, CancellationToken ct = default)
     {
+        _tcs = new TaskCompletionSource<TaskEntity?>();
         _editId = entity.Id;
         _listId = entity.ListId;
         _createdAt = entity.CreatedAt;
@@ -72,14 +100,82 @@ public partial class TaskEditorViewModel : ViewModelBase
             ? ListEditorViewModel.ModelIdToDisplay(entity.Model)
             : "(list default)";
         SystemPromptOverride = entity.SystemPrompt;
-        SelectedAgent = entity.AgentPath is not null
-            ? AvailableAgents.FirstOrDefault(a => a.Path == entity.AgentPath)
-            : null;
+
+        if (entity.AgentPath is not null)
+        {
+            var match = AvailableAgents.FirstOrDefault(a => a.Path == entity.AgentPath);
+            if (match is null)
+            {
+                match = new AgentInfo(Path.GetFileNameWithoutExtension(entity.AgentPath), "(external)", entity.AgentPath);
+                AvailableAgents.Add(match);
+                OnPropertyChanged(nameof(AvailableAgents));
+            }
+            SelectedAgent = match;
+        }
+        else
+        {
+            SelectedAgent = null;
+        }
+
+        WindowTitle = $"Edit Task: {entity.Title}";
+
+        Subtasks.Clear();
+        using var context = _dbFactory.CreateDbContext();
+        var subtaskRepo = new SubtaskRepository(context);
+        var list = await subtaskRepo.GetByTaskIdAsync(entity.Id, ct);
+        foreach (var s in list)
+            Subtasks.Add(SubtaskItemViewModel.From(s));
+    }
+
+    // Keep old sync overload for callers that haven't loaded agents yet
+    public void InitForEdit(TaskEntity entity, IReadOnlyList<TagEntity> taskTags)
+    {
+        _tcs = new TaskCompletionSource<TaskEntity?>();
+        _editId = entity.Id;
+        _listId = entity.ListId;
+        _createdAt = entity.CreatedAt;
+        Title = entity.Title;
+        Description = entity.Description;
+        CommitType = entity.CommitType;
+        StatusChoice = entity.Status switch
+        {
+            TaskStatus.Manual => "manual",
+            TaskStatus.Queued => "queued",
+            _ => entity.Status.ToString().ToLowerInvariant(),
+        };
+        TagsInput = string.Join(", ", taskTags.Select(t => t.Name));
+        ModelChoice = entity.Model is not null
+            ? ListEditorViewModel.ModelIdToDisplay(entity.Model)
+            : "(list default)";
+        SystemPromptOverride = entity.SystemPrompt;
+
+        if (entity.AgentPath is not null)
+        {
+            var match = AvailableAgents.FirstOrDefault(a => a.Path == entity.AgentPath);
+            if (match is null)
+            {
+                match = new AgentInfo(Path.GetFileNameWithoutExtension(entity.AgentPath), "(external)", entity.AgentPath);
+                AvailableAgents.Add(match);
+                OnPropertyChanged(nameof(AvailableAgents));
+            }
+            SelectedAgent = match;
+        }
+        else
+        {
+            SelectedAgent = null;
+        }
+
         WindowTitle = $"Edit Task: {entity.Title}";
     }
 
     [RelayCommand]
-    private void Save()
+    private void AddSubtask() => Subtasks.Add(new SubtaskItemViewModel());
+
+    [RelayCommand]
+    private void RemoveSubtask(SubtaskItemViewModel item) => Subtasks.Remove(item);
+
+    [RelayCommand]
+    private async Task Save()
     {
         if (string.IsNullOrWhiteSpace(Title)) return;
         var status = StatusChoice switch
@@ -87,9 +183,10 @@ public partial class TaskEditorViewModel : ViewModelBase
             "queued" => TaskStatus.Queued,
             _ => TaskStatus.Manual,
         };
+        var taskId = _editId ?? Guid.NewGuid().ToString();
         var entity = new TaskEntity
         {
-            Id = _editId ?? Guid.NewGuid().ToString(),
+            Id = taskId,
             ListId = _listId,
             Title = Title.Trim(),
             Description = string.IsNullOrWhiteSpace(Description) ? null : Description.Trim(),
@@ -102,6 +199,51 @@ public partial class TaskEditorViewModel : ViewModelBase
             : null;
         entity.SystemPrompt = string.IsNullOrWhiteSpace(SystemPromptOverride) ? null : SystemPromptOverride.Trim();
         entity.AgentPath = SelectedAgent?.Path;
+
+        // Persist subtask changes
+        if (_editId is not null)
+        {
+            using var context = _dbFactory.CreateDbContext();
+            var subtaskRepo = new SubtaskRepository(context);
+            var existing = await subtaskRepo.GetByTaskIdAsync(taskId);
+            var existingIds = existing.Select(s => s.Id).ToHashSet();
+            var currentIds = Subtasks.Where(s => s.Id != "").Select(s => s.Id).ToHashSet();
+
+            // Deleted
+            foreach (var id in existingIds.Except(currentIds))
+                await subtaskRepo.DeleteAsync(id);
+
+            // Updated
+            foreach (var (vm, idx) in Subtasks.Select((v, i) => (v, i)))
+            {
+                if (vm.Id == "") continue;
+                if (vm.Title != vm.OriginalTitle || vm.Completed != vm.OriginalCompleted)
+                {
+                    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
+                    var orig = existing.FirstOrDefault(e => e.Id == vm.Id);
+                    if (orig is not null && orig.OrderNum != idx)
+                        await subtaskRepo.UpdateAsync(new SubtaskEntity { Id = vm.Id, TaskId = taskId, Title = vm.Title, Completed = vm.Completed, OrderNum = idx, CreatedAt = orig.CreatedAt });
+                }
+            }
+        }
+
+        // Added (id == "" means new)
+        {
+            using var context = _dbFactory.CreateDbContext();
+            var subtaskRepo = new SubtaskRepository(context);
+            foreach (var (vm, idx) in Subtasks.Select((v, i) => (v, i)).Where(x => x.v.Id == ""))
+            {
+                if (string.IsNullOrWhiteSpace(vm.Title)) continue;
+                var newId = Guid.NewGuid().ToString();
+                await subtaskRepo.AddAsync(new SubtaskEntity { Id = newId, TaskId = taskId, Title = vm.Title.Trim(), Completed = vm.Completed, OrderNum = idx, CreatedAt = DateTime.UtcNow });
+            }
+        }
+
         _tcs.TrySetResult(entity);
         RequestClose?.Invoke();
     }
@@ -118,9 +260,5 @@ public partial class TaskEditorViewModel : ViewModelBase
         _tcs.TrySetResult(null);
     }
 
-    public Task<TaskEntity?> ShowAndWaitAsync()
-    {
-        _tcs = new TaskCompletionSource<TaskEntity?>();
-        return _tcs.Task;
-    }
+    public Task<TaskEntity?> ShowAndWaitAsync() => _tcs.Task;
 }

src/ClaudeDo.Ui/ViewModels/TaskItemViewModel.cs

@@ -1,7 +1,11 @@
+using System.Collections.ObjectModel;
 using Avalonia.Media;
+using ClaudeDo.Data;
 using ClaudeDo.Data.Models;
+using ClaudeDo.Data.Repositories;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Microsoft.EntityFrameworkCore;
 using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
 
 namespace ClaudeDo.Ui.ViewModels;
@@ -15,6 +19,11 @@ public partial class TaskItemViewModel : ViewModelBase
     [ObservableProperty] private string? _description;
     [ObservableProperty] private TaskStatus _status;
     [ObservableProperty] private bool _isStarting;
+    [ObservableProperty] private bool _isExpanded;
+    [ObservableProperty] private bool _hasSubtasks;
+    [ObservableProperty] private int _subtaskCount;
+
+    public ObservableCollection<SubtaskItemViewModel> Subtasks { get; } = new();
 
     public string Id { get; }
     public string ListId { get; }
@@ -23,9 +32,13 @@ public partial class TaskItemViewModel : ViewModelBase
     private readonly Func<string, Task>? _runNow;
     private readonly Func<bool> _canRunNow;
     private readonly Func<string, Task>? _toggleDone;
+    private readonly IDbContextFactory<ClaudeDoDbContext> _dbFactory;
+    private bool _subtasksLoaded;
 
     public TaskItemViewModel(TaskEntity entity, IReadOnlyList<TagEntity> tags,
-        Func<string, Task>? runNow, Func<bool> canRunNow, Func<string, Task>? toggleDone = null)
+        Func<string, Task>? runNow, Func<bool> canRunNow,
+        IDbContextFactory<ClaudeDoDbContext> dbFactory, int subtaskCount,
+        Func<string, Task>? toggleDone = null)
     {
         Entity = entity;
         Id = entity.Id;
@@ -39,6 +52,9 @@ public partial class TaskItemViewModel : ViewModelBase
         _runNow = runNow;
         _canRunNow = canRunNow;
         _toggleDone = toggleDone;
+        _dbFactory = dbFactory;
+        _subtaskCount = subtaskCount;
+        _hasSubtasks = subtaskCount > 0;
     }
 
     public bool IsDone => Status == TaskStatus.Done;
@@ -104,4 +120,55 @@ public partial class TaskItemViewModel : ViewModelBase
         if (_toggleDone is not null)
             await _toggleDone(Id);
     }
+
+    [RelayCommand]
+    private async Task ToggleExpanded()
+    {
+        IsExpanded = !IsExpanded;
+        if (IsExpanded && !_subtasksLoaded)
+            await LoadSubtasksAsync();
+    }
+
+    private async Task LoadSubtasksAsync()
+    {
+        using var context = _dbFactory.CreateDbContext();
+        var repo = new SubtaskRepository(context);
+        var entities = await repo.GetByTaskIdAsync(Id);
+        Subtasks.Clear();
+        foreach (var e in entities)
+            Subtasks.Add(SubtaskItemViewModel.From(e));
+        _subtasksLoaded = true;
+    }
+
+    [RelayCommand]
+    private async Task ToggleSubtaskDone(string subtaskId)
+    {
+        var vm = Subtasks.FirstOrDefault(s => s.Id == subtaskId);
+        if (vm is null) return;
+        vm.Completed = !vm.Completed;
+
+        using var context = _dbFactory.CreateDbContext();
+        var entity = await context.Subtasks.FindAsync(subtaskId);
+        if (entity is not null)
+        {
+            entity.Completed = vm.Completed;
+            await context.SaveChangesAsync();
+        }
+    }
+
+    public async Task RefreshSubtasksAsync(int newCount)
+    {
+        SubtaskCount = newCount;
+        HasSubtasks = newCount > 0;
+        if (!HasSubtasks)
+        {
+            IsExpanded = false;
+            Subtasks.Clear();
+            _subtasksLoaded = false;
+        }
+        else if (_subtasksLoaded || IsExpanded)
+        {
+            await LoadSubtasksAsync();
+        }
+    }
 }

src/ClaudeDo.Ui/ViewModels/TaskListViewModel.cs

@@ -2,21 +2,21 @@ using System.Collections.ObjectModel;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using ClaudeDo.Data;
 using ClaudeDo.Data.Models;
 using ClaudeDo.Data.Repositories;
 using ClaudeDo.Ui.Services;
 using ClaudeDo.Ui.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Microsoft.EntityFrameworkCore;
 using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
 
 namespace ClaudeDo.Ui.ViewModels;
 
 public partial class TaskListViewModel : ViewModelBase
 {
-    private readonly TaskRepository _taskRepo;
-    private readonly TagRepository _tagRepo;
-    private readonly ListRepository _listRepo;
+    private readonly IDbContextFactory<ClaudeDoDbContext> _dbFactory;
     private readonly WorkerClient _worker;
     private readonly Func<TaskEditorViewModel> _editorFactory;
     private readonly Action<string> _showMessage;
@@ -33,13 +33,10 @@ public partial class TaskListViewModel : ViewModelBase
     partial void OnSelectedTaskChanged(TaskItemViewModel? value) =>
         SelectedTaskChanged?.Invoke(value);
 
-    public TaskListViewModel(TaskRepository taskRepo, TagRepository tagRepo,
-        ListRepository listRepo, WorkerClient worker,
+    public TaskListViewModel(IDbContextFactory<ClaudeDoDbContext> dbFactory, WorkerClient worker,
         Func<TaskEditorViewModel> editorFactory, Action<string> showMessage)
     {
-        _taskRepo = taskRepo;
-        _tagRepo = tagRepo;
-        _listRepo = listRepo;
+        _dbFactory = dbFactory;
         _worker = worker;
         _editorFactory = editorFactory;
         _showMessage = showMessage;
@@ -77,7 +74,9 @@ public partial class TaskListViewModel : ViewModelBase
 
         if (listId is not null)
         {
-            var list = await _listRepo.GetByIdAsync(listId);
+            using var context = _dbFactory.CreateDbContext();
+            var listRepo = new ListRepository(context);
+            var list = await listRepo.GetByIdAsync(listId);
             ListName = list?.Name ?? "Tasks";
         }
         else
@@ -89,11 +88,20 @@ public partial class TaskListViewModel : ViewModelBase
 
         try
         {
-            var entities = await _taskRepo.GetByListAsync(listId);
+            using var context = _dbFactory.CreateDbContext();
+            var taskRepo = new TaskRepository(context);
+            var entities = await taskRepo.GetByListIdAsync(listId);
+            var taskIds = entities.Select(e => e.Id).ToList();
+            var subtaskCounts = await context.Subtasks
+                .Where(s => taskIds.Contains(s.TaskId))
+                .GroupBy(s => s.TaskId)
+                .ToDictionaryAsync(g => g.Key, g => g.Count());
             foreach (var e in entities)
             {
-                var tags = await _taskRepo.GetEffectiveTagsAsync(e.Id);
-                Tasks.Add(new TaskItemViewModel(e, tags, RunNowAsync, () => _worker.IsConnected, ToggleDoneAsync));
+                var tags = await taskRepo.GetEffectiveTagsAsync(e.Id);
+                subtaskCounts.TryGetValue(e.Id, out var count);
+                Tasks.Add(new TaskItemViewModel(e, tags, RunNowAsync, () => _worker.IsConnected,
+                    _dbFactory, count, ToggleDoneAsync));
             }
         }
         catch (Exception ex)
@@ -110,8 +118,13 @@ public partial class TaskListViewModel : ViewModelBase
         var title = InlineAddTitle.Trim();
         if (string.IsNullOrEmpty(title) || CurrentListId is null) return;
 
-        var list = await _listRepo.GetByIdAsync(CurrentListId);
-        var defaultCommitType = list?.DefaultCommitType ?? "chore";
+        string defaultCommitType;
+        using (var context = _dbFactory.CreateDbContext())
+        {
+            var listRepo = new ListRepository(context);
+            var list = await listRepo.GetByIdAsync(CurrentListId);
+            defaultCommitType = list?.DefaultCommitType ?? "chore";
+        }
 
         var entity = new TaskEntity
         {
@@ -125,9 +138,12 @@ public partial class TaskListViewModel : ViewModelBase
 
         try
         {
-            await _taskRepo.AddAsync(entity);
-            var tags = await _taskRepo.GetEffectiveTagsAsync(entity.Id);
-            var vm = new TaskItemViewModel(entity, tags, RunNowAsync, () => _worker.IsConnected, ToggleDoneAsync);
+            using var context = _dbFactory.CreateDbContext();
+            var taskRepo = new TaskRepository(context);
+            await taskRepo.AddAsync(entity);
+            var tags = await taskRepo.GetEffectiveTagsAsync(entity.Id);
+            var vm = new TaskItemViewModel(entity, tags, RunNowAsync, () => _worker.IsConnected,
+                _dbFactory, 0, ToggleDoneAsync);
             Tasks.Add(vm);
             SelectedTask = vm;
             InlineAddTitle = "";
@@ -141,13 +157,20 @@ public partial class TaskListViewModel : ViewModelBase
     [RelayCommand(CanExecute = nameof(CanAddTask))]
     private async Task AddTask()
     {
-        // Get list default commit type
-        var list = await _listRepo.GetByIdAsync(CurrentListId);
-        var defaultCommitType = list?.DefaultCommitType ?? "chore";
+        var listId = CurrentListId;
+        if (listId is null) return;
+
+        string defaultCommitType;
+        using (var context = _dbFactory.CreateDbContext())
+        {
+            var listRepo = new ListRepository(context);
+            var list = await listRepo.GetByIdAsync(listId);
+            defaultCommitType = list?.DefaultCommitType ?? "chore";
+        }
 
         var editor = _editorFactory();
         await editor.LoadAgentsAsync(_worker);
-        editor.InitForCreate(CurrentListId, defaultCommitType);
+        editor.InitForCreate(listId, defaultCommitType);
 
         var window = new TaskEditorView { DataContext = editor };
         editor.RequestClose += () => window.Close();
@@ -159,16 +182,20 @@ public partial class TaskListViewModel : ViewModelBase
 
         try
         {
-            await _taskRepo.AddAsync(saved);
+            using var context = _dbFactory.CreateDbContext();
+            var taskRepo = new TaskRepository(context);
+            var tagRepo = new TagRepository(context);
+            await taskRepo.AddAsync(saved);
 
             foreach (var tagName in editor.SelectedTagNames)
             {
-                var tagId = await _tagRepo.GetOrCreateAsync(tagName);
-                await _taskRepo.AddTagAsync(saved.Id, tagId);
+                var tagId = await tagRepo.GetOrCreateAsync(tagName);
+                await taskRepo.AddTagAsync(saved.Id, tagId);
             }
 
-            var tags = await _taskRepo.GetEffectiveTagsAsync(saved.Id);
-            Tasks.Add(new TaskItemViewModel(saved, tags, RunNowAsync, () => _worker.IsConnected, ToggleDoneAsync));
+            var tags = await taskRepo.GetEffectiveTagsAsync(saved.Id);
+            Tasks.Add(new TaskItemViewModel(saved, tags, RunNowAsync, () => _worker.IsConnected,
+                _dbFactory, 0, ToggleDoneAsync));
 
             // Auto wake-queue if agent+queued
             if (saved.Status == TaskStatus.Queued &&
@@ -188,13 +215,20 @@ public partial class TaskListViewModel : ViewModelBase
     private async Task EditTask()
     {
         if (SelectedTask is null || CurrentListId is null) return;
-        var entity = await _taskRepo.GetByIdAsync(SelectedTask.Id);
-        if (entity is null) return;
 
-        var taskTags = await _taskRepo.GetTagsAsync(entity.Id);
+        TaskEntity? entity;
+        List<TagEntity> taskTags;
+        using (var context = _dbFactory.CreateDbContext())
+        {
+            var taskRepo = new TaskRepository(context);
+            entity = await taskRepo.GetByIdAsync(SelectedTask.Id);
+            if (entity is null) return;
+            taskTags = await taskRepo.GetTagsAsync(entity.Id);
+        }
+
         var editor = _editorFactory();
         await editor.LoadAgentsAsync(_worker);
-        editor.InitForEdit(entity, taskTags);
+        await editor.InitForEditAsync(entity, taskTags);
 
         var window = new TaskEditorView { DataContext = editor };
         editor.RequestClose += () => window.Close();
@@ -206,18 +240,21 @@ public partial class TaskListViewModel : ViewModelBase
 
         try
         {
-            await _taskRepo.UpdateAsync(saved);
+            using var context = _dbFactory.CreateDbContext();
+            var taskRepo = new TaskRepository(context);
+            var tagRepo = new TagRepository(context);
+            await taskRepo.UpdateAsync(saved);
 
-            var existingTags = await _taskRepo.GetTagsAsync(saved.Id);
+            var existingTags = await taskRepo.GetTagsAsync(saved.Id);
             foreach (var old in existingTags)
-                await _taskRepo.RemoveTagAsync(saved.Id, old.Id);
+                await taskRepo.RemoveTagAsync(saved.Id, old.Id);
             foreach (var tagName in editor.SelectedTagNames)
             {
-                var tagId = await _tagRepo.GetOrCreateAsync(tagName);
-                await _taskRepo.AddTagAsync(saved.Id, tagId);
+                var tagId = await tagRepo.GetOrCreateAsync(tagName);
+                await taskRepo.AddTagAsync(saved.Id, tagId);
             }
 
-            var newTags = await _taskRepo.GetEffectiveTagsAsync(saved.Id);
+            var newTags = await taskRepo.GetEffectiveTagsAsync(saved.Id);
             SelectedTask.Refresh(saved, newTags);
         }
         catch (Exception ex)
@@ -232,7 +269,9 @@ public partial class TaskListViewModel : ViewModelBase
         if (SelectedTask is null) return;
         try
         {
-            await _taskRepo.DeleteAsync(SelectedTask.Id);
+            using var context = _dbFactory.CreateDbContext();
+            var taskRepo = new TaskRepository(context);
+            await taskRepo.DeleteAsync(SelectedTask.Id);
             Tasks.Remove(SelectedTask);
             SelectedTask = null;
         }
@@ -244,16 +283,22 @@ public partial class TaskListViewModel : ViewModelBase
 
     public async Task RefreshSingleAsync(string taskId)
     {
-        var entity = await _taskRepo.GetByIdAsync(taskId);
+        using var context = _dbFactory.CreateDbContext();
+        var taskRepo = new TaskRepository(context);
+        var entity = await taskRepo.GetByIdAsync(taskId);
         var existing = Tasks.FirstOrDefault(t => t.Id == taskId);
         if (entity is null)
         {
             if (existing is not null) Tasks.Remove(existing);
             return;
         }
-        var tags = await _taskRepo.GetEffectiveTagsAsync(taskId);
+        var tags = await taskRepo.GetEffectiveTagsAsync(taskId);
         if (existing is not null)
+        {
             existing.Refresh(entity, tags);
+            var subtaskCount = await context.Subtasks.CountAsync(s => s.TaskId == taskId);
+            await existing.RefreshSubtasksAsync(subtaskCount);
+        }
     }
 
     private async Task RunNowAsync(string taskId)
@@ -270,22 +315,31 @@ public partial class TaskListViewModel : ViewModelBase
 
     private async Task ToggleDoneAsync(string taskId)
     {
-        var entity = await _taskRepo.GetByIdAsync(taskId);
+        using var context = _dbFactory.CreateDbContext();
+        var taskRepo = new TaskRepository(context);
+        var entity = await taskRepo.GetByIdAsync(taskId);
         if (entity is null) return;
 
         entity.Status = entity.Status == TaskStatus.Done ? TaskStatus.Manual : TaskStatus.Done;
         if (entity.Status == TaskStatus.Done)
             entity.FinishedAt = DateTime.UtcNow;
 
-        await _taskRepo.UpdateAsync(entity);
+        await taskRepo.UpdateAsync(entity);
         await RefreshSingleAsync(taskId);
     }
 
     private async void OnTaskUpdated(string taskId)
     {
         if (CurrentListId is null) return;
+        try
+        {
             await RefreshSingleAsync(taskId);
         }
+        catch (Exception ex)
+        {
+            System.Diagnostics.Debug.WriteLine($"[TaskListViewModel] OnTaskUpdated failed for {taskId}: {ex}");
+        }
+    }
 
     private static async Task ShowDialogAsync(Window dialog)
     {

src/ClaudeDo.Ui/Views/MainWindow.axaml

@@ -8,6 +8,7 @@
         x:Class="ClaudeDo.Ui.Views.MainWindow"
         x:DataType="vm:MainWindowViewModel"
         Title="ClaudeDo"
+        Icon="avares://ClaudeDo.App/Assets/ClaudeTask.ico"
         MinWidth="800" MinHeight="500"
         KeyDown="OnGlobalKeyDown">
 
@@ -18,7 +19,7 @@
 
             <!-- Lists island -->
             <Border Grid.Column="0" CornerRadius="12" Background="{StaticResource IslandBgBrush}"
-                    MinWidth="180" MaxWidth="320" Margin="0,0,4,8" ClipToBounds="True">
+                    MinWidth="180" Margin="0,0,4,8" ClipToBounds="True">
                 <DockPanel>
                     <TextBlock DockPanel.Dock="Top"
                                Text="Lists" FontWeight="SemiBold" FontSize="13"
@@ -95,7 +96,7 @@
 
             <!-- Detail island -->
             <Border Grid.Column="2" CornerRadius="12" Background="{StaticResource IslandBgBrush}"
-                    MinWidth="280" MaxWidth="500" Margin="4,0,0,8" ClipToBounds="True">
+                    MinWidth="280" Margin="4,0,0,8" ClipToBounds="True">
                 <v:TaskDetailView DataContext="{Binding TaskDetail}" />
             </Border>
         </Grid>

src/ClaudeDo.Ui/Views/TaskDetailView.axaml

@@ -86,6 +86,71 @@
                      PlaceholderText="Add a description..."
                      LostFocus="OnFieldLostFocus"/>
 
+            <!-- Sub-Tasks -->
+            <Border Height="1" Background="{StaticResource BorderSubtleBrush}" Margin="0,8,0,4"/>
+            <TextBlock Text="Sub-Tasks" FontWeight="Bold" FontSize="13"
+                       Foreground="{StaticResource TextPrimaryBrush}"/>
+            <ItemsControl ItemsSource="{Binding Subtasks}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate x:DataType="vm:SubtaskItemViewModel">
+                        <StackPanel Orientation="Horizontal" Spacing="6" Margin="0,2,0,2">
+                            <CheckBox IsChecked="{Binding Completed}" VerticalAlignment="Center"/>
+                            <TextBox Text="{Binding Title}" PlaceholderText="Subtask title..." Width="220"
+                                     VerticalAlignment="Center"
+                                     LostFocus="OnSubtaskTitleLostFocus"/>
+                            <Button Content="✕" Padding="6,2"
+                                    Background="Transparent" BorderThickness="0"
+                                    Foreground="{StaticResource TextMutedBrush}"
+                                    Command="{Binding $parent[UserControl].((vm:TaskDetailViewModel)DataContext).RemoveSubtaskCommand}"
+                                    CommandParameter="{Binding}"/>
+                        </StackPanel>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+            <Button Content="+ Add Sub-Task" Command="{Binding AddSubtaskCommand}"
+                    Background="Transparent" BorderThickness="0"
+                    Foreground="{StaticResource AccentLightBrush}" HorizontalAlignment="Left"/>
+
+            <!-- Agent Config (overrides) -->
+            <Border Height="1" Background="{StaticResource BorderSubtleBrush}" Margin="0,8,0,4"/>
+            <TextBlock Text="Agent Config (overrides)" FontWeight="Bold" FontSize="13"
+                       Foreground="{StaticResource TextPrimaryBrush}"/>
+
+            <Grid ColumnDefinitions="*,12,*" Margin="0,4,0,0">
+                <StackPanel Grid.Column="0" Spacing="4">
+                    <TextBlock Text="Model" FontSize="12" FontWeight="SemiBold"
+                               Foreground="{StaticResource TextSecondaryBrush}"/>
+                    <ComboBox ItemsSource="{Binding ModelChoices}"
+                              SelectedItem="{Binding ModelChoice}"
+                              MinWidth="100"
+                              LostFocus="OnFieldLostFocus"/>
+                </StackPanel>
+                <StackPanel Grid.Column="2" Spacing="4">
+                    <TextBlock Text="Agent File" FontSize="12" FontWeight="SemiBold"
+                               Foreground="{StaticResource TextSecondaryBrush}"/>
+                    <StackPanel Orientation="Horizontal" Spacing="4">
+                        <ComboBox ItemsSource="{Binding AvailableAgents}"
+                                  SelectedItem="{Binding SelectedAgent}"
+                                  MinWidth="100"
+                                  LostFocus="OnFieldLostFocus">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate x:DataType="m:AgentInfo">
+                                    <TextBlock Text="{Binding Name}"/>
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+                        <Button Content="…" Click="OnBrowseAgent" ToolTip.Tip="Browse for agent .md file"/>
+                    </StackPanel>
+                </StackPanel>
+            </Grid>
+
+            <TextBlock Text="System Prompt" FontSize="12" FontWeight="SemiBold"
+                       Foreground="{StaticResource TextSecondaryBrush}" Margin="0,4,0,2"/>
+            <TextBox Text="{Binding SystemPromptOverride}"
+                     PlaceholderText="(inherits from list)"
+                     AcceptsReturn="True" TextWrapping="Wrap" MinHeight="50"
+                     LostFocus="OnFieldLostFocus"/>
+
             <!-- === READ-ONLY ZONE === -->
 
             <TextBlock Text="Result" FontWeight="SemiBold" FontSize="12"

src/ClaudeDo.Ui/Views/TaskDetailView.axaml.cs

@@ -2,6 +2,7 @@ using System.ComponentModel;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.Platform.Storage;
 using ClaudeDo.Ui.ViewModels;
 
 namespace ClaudeDo.Ui.Views;
@@ -19,6 +20,31 @@ public partial class TaskDetailView : UserControl
             await vm.SaveAsync();
     }
 
+    private void OnSubtaskTitleLostFocus(object? sender, RoutedEventArgs e)
+    {
+        // Title change is handled by SubtaskItemViewModel.PropertyChanged → OnSubtaskPropertyChanged in the VM
+    }
+
+    private async void OnBrowseAgent(object? sender, RoutedEventArgs e)
+    {
+        var topLevel = TopLevel.GetTopLevel(this);
+        if (topLevel is null) return;
+        var files = await topLevel.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+        {
+            Title = "Select Agent File",
+            AllowMultiple = false,
+            FileTypeFilter = new[] { new FilePickerFileType("Agent Files") { Patterns = ["*.md"] } },
+        });
+        if (files.Count == 0) return;
+        var path = files[0].TryGetLocalPath();
+        if (path is null) return;
+        if (DataContext is TaskDetailViewModel vm)
+        {
+            vm.SetAgentFromPath(path);
+            await vm.SaveAsync();
+        }
+    }
+
     private void OnTagInputKeyDown(object? sender, KeyEventArgs e)
     {
         if (e.Key == Key.Enter && DataContext is TaskDetailViewModel vm)

src/ClaudeDo.Ui/Views/TaskEditorView.axaml

@@ -35,6 +35,30 @@
         <TextBlock Text="Tags (comma-separated)" FontWeight="SemiBold" Foreground="{StaticResource TextSecondaryBrush}"/>
         <TextBox Text="{Binding TagsInput}" PlaceholderText="agent, manual, code, ..."/>
 
+        <!-- Sub-Tasks -->
+        <Border Height="1" Background="{StaticResource BorderSubtleBrush}" Margin="0,6,0,2"/>
+        <TextBlock Text="Sub-Tasks" FontWeight="Bold" FontSize="13"
+                   Foreground="{StaticResource TextPrimaryBrush}"/>
+        <ItemsControl ItemsSource="{Binding Subtasks}">
+            <ItemsControl.ItemTemplate>
+                <DataTemplate x:DataType="vm:SubtaskItemViewModel">
+                    <StackPanel Orientation="Horizontal" Spacing="6" Margin="0,2,0,2">
+                        <CheckBox IsChecked="{Binding Completed}" VerticalAlignment="Center"/>
+                        <TextBox Text="{Binding Title}" PlaceholderText="Subtask title..." Width="320"
+                                 VerticalAlignment="Center"/>
+                        <Button Content="✕" Padding="6,2"
+                                Background="Transparent" BorderThickness="0"
+                                Foreground="{StaticResource TextMutedBrush}"
+                                Command="{Binding $parent[Window].((vm:TaskEditorViewModel)DataContext).RemoveSubtaskCommand}"
+                                CommandParameter="{Binding}"/>
+                    </StackPanel>
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
+        <Button Content="+ Add Sub-Task" Command="{Binding AddSubtaskCommand}"
+                Background="Transparent" BorderThickness="0"
+                Foreground="{StaticResource AccentLightBrush}" HorizontalAlignment="Left"/>
+
         <!-- Divider -->
         <Border Height="1" Background="{StaticResource BorderSubtleBrush}" Margin="0,6,0,2"/>
 
@@ -55,6 +79,7 @@
 
         <TextBlock Text="Agent File" FontWeight="SemiBold"
                    Foreground="{StaticResource TextSecondaryBrush}"/>
+        <StackPanel Orientation="Horizontal" Spacing="6">
             <ComboBox ItemsSource="{Binding AvailableAgents}"
                       SelectedItem="{Binding SelectedAgent}"
                       MinWidth="150">
@@ -64,6 +89,8 @@
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>
+            <Button Content="…" Click="OnBrowseAgent" ToolTip.Tip="Browse for agent .md file"/>
+        </StackPanel>
 
         <StackPanel Orientation="Horizontal" Spacing="8" HorizontalAlignment="Right" Margin="0,10,0,0">
             <Button Content="Save" Command="{Binding SaveCommand}" IsDefault="True" MinWidth="80"

src/ClaudeDo.Ui/Views/TaskEditorView.axaml.cs

@@ -1,4 +1,7 @@
 using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Platform.Storage;
+using ClaudeDo.Ui.ViewModels;
 
 namespace ClaudeDo.Ui.Views;
 
@@ -8,4 +11,19 @@ public partial class TaskEditorView : Window
     {
         InitializeComponent();
     }
+
+    private async void OnBrowseAgent(object? sender, RoutedEventArgs e)
+    {
+        var files = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+        {
+            Title = "Select Agent File",
+            AllowMultiple = false,
+            FileTypeFilter = new[] { new FilePickerFileType("Agent Files") { Patterns = ["*.md"] } },
+        });
+        if (files.Count == 0) return;
+        var path = files[0].TryGetLocalPath();
+        if (path is null) return;
+        if (DataContext is TaskEditorViewModel vm)
+            vm.SetAgentFromPath(path);
+    }
 }

src/ClaudeDo.Ui/Views/TaskListView.axaml

@@ -31,9 +31,11 @@
                  KeyDown="OnTaskListKeyDown">
             <ListBox.ItemTemplate>
                 <DataTemplate x:DataType="vm:TaskItemViewModel">
-                    <Grid ColumnDefinitions="Auto,*" Margin="4,4"
+                    <Grid RowDefinitions="Auto,Auto"
                           Background="Transparent"
-                          Opacity="{Binding RowOpacity}"
+                          Opacity="{Binding RowOpacity}">
+                        <!-- Row 0: Task row -->
+                        <Grid Grid.Row="0" ColumnDefinitions="20,Auto,*" Margin="4,4"
                               DoubleTapped="OnTaskItemDoubleTapped"
                               PointerPressed="OnTaskItemPointerPressed">
                             <Grid.ContextFlyout>
@@ -48,8 +50,32 @@
                                 </MenuFlyout>
                             </Grid.ContextFlyout>
 
+                            <!-- Expand/collapse chevron -->
+                            <Button Grid.Column="0"
+                                    Command="{Binding ToggleExpandedCommand}"
+                                    IsVisible="{Binding HasSubtasks}"
+                                    Background="Transparent"
+                                    BorderThickness="0"
+                                    Padding="0"
+                                    Width="16" Height="16"
+                                    VerticalAlignment="Center"
+                                    Cursor="Hand">
+                                <Panel>
+                                    <Canvas Width="10" Height="10"
+                                            IsVisible="{Binding !IsExpanded}">
+                                        <Path Stroke="{StaticResource TextDimBrush}" StrokeThickness="1.5"
+                                              Data="M 2,0 L 8,5 L 2,10"/>
+                                    </Canvas>
+                                    <Canvas Width="10" Height="10"
+                                            IsVisible="{Binding IsExpanded}">
+                                        <Path Stroke="{StaticResource TextDimBrush}" StrokeThickness="1.5"
+                                              Data="M 0,2 L 5,8 L 10,2"/>
+                                    </Canvas>
+                                </Panel>
+                            </Button>
+
                             <!-- Circular checkbox -->
-                        <Border Grid.Column="0" Width="22" Height="22"
+                            <Border Grid.Column="1" Width="22" Height="22"
                                     CornerRadius="11"
                                     BorderThickness="2"
                                     BorderBrush="{Binding StatusText, Converter={x:Static conv:CheckboxBorderConverter.Instance}}"
@@ -58,19 +84,16 @@
                                     Cursor="Hand"
                                     PointerPressed="OnCheckboxPressed">
                                 <Panel>
-                                <!-- Checkmark for done -->
                                     <Canvas Width="12" Height="12"
                                             IsVisible="{Binding IsDone}"
                                             HorizontalAlignment="Center" VerticalAlignment="Center">
                                         <Path Stroke="{StaticResource StatusGreenBrush}" StrokeThickness="2"
                                               Data="M 1,6 L 4.5,9.5 L 11,3"/>
                                     </Canvas>
-                                <!-- Running dot -->
                                     <Ellipse Width="8" Height="8"
                                              Fill="{StaticResource StatusOrangeBrush}"
                                              IsVisible="{Binding IsRunning}"
                                              HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                <!-- Starting dot -->
                                     <Ellipse Width="8" Height="8" Fill="#FFD700"
                                              IsVisible="{Binding IsStarting}"
                                              HorizontalAlignment="Center" VerticalAlignment="Center"/>
@@ -78,7 +101,7 @@
                             </Border>
 
                             <!-- Task content -->
-                        <StackPanel Grid.Column="1" VerticalAlignment="Center">
+                            <StackPanel Grid.Column="2" VerticalAlignment="Center">
                                 <TextBlock Text="{Binding Title}" FontWeight="Medium"
                                            Foreground="{Binding TitleForeground}"
                                            TextDecorations="{Binding TitleDecorations}"
@@ -98,6 +121,39 @@
                                            IsVisible="{Binding TagsText, Converter={x:Static StringConverters.IsNullOrEmpty}}"/>
                             </StackPanel>
                         </Grid>
+
+                        <!-- Row 1: Subtask list (visible when expanded) -->
+                        <ItemsControl Grid.Row="1"
+                                      ItemsSource="{Binding Subtasks}"
+                                      IsVisible="{Binding IsExpanded}"
+                                      Margin="40,0,0,4">
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate x:DataType="vm:SubtaskItemViewModel">
+                                    <Grid ColumnDefinitions="Auto,*" Margin="0,2"
+                                          PointerPressed="OnSubtaskPointerPressed">
+                                        <Grid.ContextFlyout>
+                                            <MenuFlyout>
+                                                <MenuItem Header="Edit Task"
+                                                          Command="{Binding #Root.((vm:TaskListViewModel)DataContext).EditTaskCommand}"/>
+                                            </MenuFlyout>
+                                        </Grid.ContextFlyout>
+                                        <CheckBox Grid.Column="0"
+                                                  IsChecked="{Binding Completed, Mode=OneWay}"
+                                                  VerticalAlignment="Center"
+                                                  Margin="0,0,6,0"
+                                                  MinWidth="0"
+                                                  Click="OnSubtaskCheckboxClick"/>
+                                        <TextBlock Grid.Column="1"
+                                                   Text="{Binding Title}"
+                                                   FontSize="12"
+                                                   Foreground="{StaticResource TextDimBrush}"
+                                                   VerticalAlignment="Center"
+                                                   TextTrimming="CharacterEllipsis"/>
+                                    </Grid>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                    </Grid>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>

src/ClaudeDo.Ui/Views/TaskListView.axaml.cs

@@ -1,3 +1,4 @@
+using System.Collections.ObjectModel;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -97,6 +98,29 @@ public partial class TaskListView : UserControl
         }
     }
 
+    private void OnSubtaskPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        if (e.GetCurrentPoint(null).Properties.IsRightButtonPressed
+            && sender is Control { DataContext: SubtaskItemViewModel subtask }
+            && DataContext is TaskListViewModel vm)
+        {
+            var parent = vm.Tasks.FirstOrDefault(t => t.Subtasks.Contains(subtask));
+            if (parent is not null)
+                vm.SelectedTask = parent;
+        }
+    }
+
+    private async void OnSubtaskCheckboxClick(object? sender, RoutedEventArgs e)
+    {
+        if (sender is CheckBox { DataContext: SubtaskItemViewModel subtask }
+            && DataContext is TaskListViewModel vm)
+        {
+            var parent = vm.Tasks.FirstOrDefault(t => t.Subtasks.Contains(subtask));
+            if (parent is not null)
+                await parent.ToggleSubtaskDoneCommand.ExecuteAsync(subtask.Id);
+        }
+    }
+
     public void FocusInlineAdd()
     {
         this.FindControl<TextBox>("InlineAddBox")?.Focus();

src/ClaudeDo.Worker/ClaudeDo.Worker.csproj

@@ -6,6 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
   </ItemGroup>
 
   <PropertyGroup>

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();
     }
 

src/ClaudeDo.Worker/Program.cs

@@ -5,22 +5,20 @@ using ClaudeDo.Worker.Config;
 using ClaudeDo.Worker.Hub;
 using ClaudeDo.Worker.Runner;
 using ClaudeDo.Worker.Services;
+using Microsoft.EntityFrameworkCore;
 
 var cfg = WorkerConfig.Load();
 
 var builder = WebApplication.CreateBuilder(args);
 
-// Initialize DB schema before the host starts accepting connections.
-var dbFactory = new SqliteConnectionFactory(cfg.DbPath);
-SchemaInitializer.Apply(dbFactory);
+// When launched by the Windows SCM, speak the Service Control Protocol so SCM
+// doesn't think we crashed (~30s timeout). No-op when running interactively.
+builder.Host.UseWindowsService(o => o.ServiceName = "ClaudeDoWorker");
+
+builder.Services.AddDbContextFactory<ClaudeDoDbContext>(opt =>
+    opt.UseSqlite($"Data Source={cfg.DbPath}"));
 
 builder.Services.AddSingleton(cfg);
-builder.Services.AddSingleton(dbFactory);
-builder.Services.AddSingleton<TagRepository>();
-builder.Services.AddSingleton<ListRepository>();
-builder.Services.AddSingleton<TaskRepository>();
-builder.Services.AddSingleton<WorktreeRepository>();
-builder.Services.AddSingleton<TaskRunRepository>();
 builder.Services.AddHostedService<StaleTaskRecovery>();
 builder.Services.AddSignalR();
 
@@ -46,6 +44,12 @@ builder.WebHost.UseUrls($"http://127.0.0.1:{cfg.SignalRPort}");
 
 var app = builder.Build();
 
+using (var scope = app.Services.CreateScope())
+{
+    ClaudeDoDbContext.MigrateAndConfigure(
+        scope.ServiceProvider.GetRequiredService<ClaudeDoDbContext>());
+}
+
 app.MapHub<WorkerHub>("/hub");
 
 app.Logger.LogInformation("ClaudeDo.Worker listening on http://127.0.0.1:{Port} (db: {Db})",

src/ClaudeDo.Worker/Runner/ClaudeArgsBuilder.cs

@@ -55,9 +55,15 @@ public sealed class ClaudeArgsBuilder
 
     private static string Escape(string value)
     {
-        if (value.Contains(' ') || value.Contains('"') || value.Contains('\''))
+        if (value.Contains(' ') || value.Contains('"') || value.Contains('\'')
+            || value.Contains('\t') || value.Contains('\n') || value.Contains('\r'))
         {
-            var escaped = value.Replace("\\", "\\\\").Replace("\"", "\\\"");
+            var escaped = value
+                .Replace("\\", "\\\\")
+                .Replace("\"", "\\\"")
+                .Replace("\n", "\\n")
+                .Replace("\r", "\\r")
+                .Replace("\t", "\\t");
             return $"\"{escaped}\"";
         }
         return value;

src/ClaudeDo.Worker/Runner/ClaudeProcess.cs

@@ -45,6 +45,9 @@ public sealed class ClaudeProcess : IClaudeProcess
         var analyzer = new StreamAnalyzer();
         var lastStderr = new StringBuilder();
 
+        // On cancellation: kill the tree. Killing closes the redirected pipes,
+        // which unblocks the ReadLineAsync loops below (which run without ct
+        // so they reliably drain instead of hanging on cancellation).
         await using var ctr = ct.Register(() =>
         {
             try { process.Kill(entireProcessTree: true); }
@@ -53,26 +56,30 @@ public sealed class ClaudeProcess : IClaudeProcess
 
         var stdoutTask = Task.Run(async () =>
         {
-            while (await process.StandardOutput.ReadLineAsync(ct) is { } line)
+            while (await process.StandardOutput.ReadLineAsync() is { } line)
             {
                 if (string.IsNullOrEmpty(line)) continue;
                 await onStdoutLine(line);
                 analyzer.ProcessLine(line);
             }
-        }, ct);
+        });
 
         var stderrTask = Task.Run(async () =>
         {
-            while (await process.StandardError.ReadLineAsync(ct) is { } line)
+            while (await process.StandardError.ReadLineAsync() is { } line)
             {
                 if (string.IsNullOrEmpty(line)) continue;
                 lastStderr.AppendLine(line);
                 await onStdoutLine($"[stderr] {line}");
             }
-        }, ct);
+        });
 
         await Task.WhenAll(stdoutTask, stderrTask);
-        await process.WaitForExitAsync(ct);
+        await process.WaitForExitAsync(CancellationToken.None);
+
+        // If we were asked to cancel, surface that to the caller now that
+        // the process is fully reaped.
+        ct.ThrowIfCancellationRequested();
 
         var exitCode = process.ExitCode;
         var streamResult = analyzer.GetResult();

src/ClaudeDo.Worker/Runner/TaskRunner.cs

@@ -1,17 +1,16 @@
+using ClaudeDo.Data;
 using ClaudeDo.Data.Models;
 using ClaudeDo.Data.Repositories;
 using ClaudeDo.Worker.Config;
 using ClaudeDo.Worker.Hub;
+using Microsoft.EntityFrameworkCore;
 
 namespace ClaudeDo.Worker.Runner;
 
 public sealed class TaskRunner
 {
     private readonly IClaudeProcess _claude;
-    private readonly TaskRepository _taskRepo;
-    private readonly TaskRunRepository _runRepo;
-    private readonly ListRepository _listRepo;
-    private readonly WorktreeRepository _wtRepo;
+    private readonly IDbContextFactory<ClaudeDoDbContext> _dbFactory;
     private readonly HubBroadcaster _broadcaster;
     private readonly WorktreeManager _wtManager;
     private readonly ClaudeArgsBuilder _argsBuilder;
@@ -20,10 +19,7 @@ public sealed class TaskRunner
 
     public TaskRunner(
         IClaudeProcess claude,
-        TaskRepository taskRepo,
-        TaskRunRepository runRepo,
-        ListRepository listRepo,
-        WorktreeRepository wtRepo,
+        IDbContextFactory<ClaudeDoDbContext> dbFactory,
         HubBroadcaster broadcaster,
         WorktreeManager wtManager,
         ClaudeArgsBuilder argsBuilder,
@@ -31,10 +27,7 @@ public sealed class TaskRunner
         ILogger<TaskRunner> logger)
     {
         _claude = claude;
-        _taskRepo = taskRepo;
-        _runRepo = runRepo;
-        _listRepo = listRepo;
-        _wtRepo = wtRepo;
+        _dbFactory = dbFactory;
         _broadcaster = broadcaster;
         _wtManager = wtManager;
         _argsBuilder = argsBuilder;
@@ -46,12 +39,24 @@ public sealed class TaskRunner
     {
         try
         {
-            var list = await _listRepo.GetByIdAsync(task.ListId, ct);
+            ListEntity? list;
+            ListConfigEntity? listConfig;
+            List<SubtaskEntity> subtasks;
+
+            using (var context = _dbFactory.CreateDbContext())
+            {
+                var listRepo = new ListRepository(context);
+                list = await listRepo.GetByIdAsync(task.ListId, ct);
                 if (list is null)
                 {
                     await MarkFailed(task.Id, slot, "List not found.");
                     return;
                 }
+                listConfig = await listRepo.GetConfigAsync(task.ListId, ct);
+
+                var subtaskRepo = new SubtaskRepository(context);
+                subtasks = await subtaskRepo.GetByTaskIdAsync(task.Id, ct);
+            }
 
             // Determine working directory: worktree or sandbox.
             WorktreeContext? wtCtx = null;
@@ -78,7 +83,6 @@ public sealed class TaskRunner
             }
 
             // Resolve config: task overrides > list config > null.
-            var listConfig = await _listRepo.GetConfigAsync(task.ListId, ct);
             var resolvedConfig = new ClaudeRunConfig(
                 Model: task.Model ?? listConfig?.Model ?? "claude-sonnet-4-6",
                 SystemPrompt: task.SystemPrompt ?? listConfig?.SystemPrompt,
@@ -87,13 +91,23 @@ public sealed class TaskRunner
             );
 
             var now = DateTime.UtcNow;
-            await _taskRepo.MarkRunningAsync(task.Id, now, ct);
+            using (var context = _dbFactory.CreateDbContext())
+            {
+                var taskRepo = new TaskRepository(context);
+                await taskRepo.MarkRunningAsync(task.Id, now, ct);
+            }
             await _broadcaster.TaskStarted(slot, task.Id, now);
 
             // Build prompt.
-            var prompt = string.IsNullOrWhiteSpace(task.Description)
-                ? task.Title
-                : $"{task.Title}\n\n{task.Description.Trim()}";
+            var sb = new System.Text.StringBuilder(task.Title);
+            if (!string.IsNullOrWhiteSpace(task.Description)) sb.Append("\n\n").Append(task.Description.Trim());
+            if (subtasks.Count > 0)
+            {
+                sb.Append("\n\n## Sub-Tasks\n");
+                foreach (var s in subtasks)
+                    sb.Append(s.Completed ? "- [x] " : "- [ ] ").Append(s.Title).Append('\n');
+            }
+            var prompt = sb.ToString();
 
             // Run 1.
             var result = await RunOnceAsync(task.Id, slot, runDir, resolvedConfig, 1, false, prompt, ct);
@@ -111,7 +125,6 @@ public sealed class TaskRunner
                     var retryConfig = resolvedConfig with { ResumeSessionId = result.SessionId };
                     var retryPrompt = $"The previous attempt failed with:\n\n{result.ErrorMarkdown}\n\nTry again and fix the issues.";
 
-                    await _broadcaster.RunCreated(task.Id, 2, true);
                     var retryResult = await RunOnceAsync(task.Id, slot, runDir, retryConfig, 2, true, retryPrompt, ct);
 
                     if (retryResult.IsSuccess)
@@ -145,19 +158,34 @@ public sealed class TaskRunner
 
     public async Task ContinueAsync(string taskId, string followUpPrompt, string slot, CancellationToken ct)
     {
-        var task = await _taskRepo.GetByIdAsync(taskId, ct)
+        TaskEntity task;
+        TaskRunEntity lastRun;
+        ListEntity list;
+        ListConfigEntity? listConfig;
+        WorktreeEntity? worktree;
+
+        using (var context = _dbFactory.CreateDbContext())
+        {
+            var taskRepo = new TaskRepository(context);
+            task = await taskRepo.GetByIdAsync(taskId, ct)
                 ?? throw new KeyNotFoundException($"Task '{taskId}' not found.");
 
-        var lastRun = await _runRepo.GetLatestByTaskIdAsync(taskId, ct)
+            var runRepo = new TaskRunRepository(context);
+            lastRun = await runRepo.GetLatestByTaskIdAsync(taskId, ct)
                 ?? throw new InvalidOperationException("No previous run to continue.");
 
             if (lastRun.SessionId is null)
                 throw new InvalidOperationException("Previous run has no session ID — cannot resume.");
 
-        var list = await _listRepo.GetByIdAsync(task.ListId, ct)
+            var listRepo = new ListRepository(context);
+            list = await listRepo.GetByIdAsync(task.ListId, ct)
                 ?? throw new InvalidOperationException("List not found.");
+            listConfig = await listRepo.GetConfigAsync(task.ListId, ct);
+
+            var wtRepo = new WorktreeRepository(context);
+            worktree = await wtRepo.GetByTaskIdAsync(taskId, ct);
+        }
 
-        var listConfig = await _listRepo.GetConfigAsync(task.ListId, ct);
         var resolvedConfig = new ClaudeRunConfig(
             Model: task.Model ?? listConfig?.Model,
             SystemPrompt: task.SystemPrompt ?? listConfig?.SystemPrompt,
@@ -168,7 +196,6 @@ public sealed class TaskRunner
         // Determine run directory from existing worktree or sandbox.
         string runDir;
         WorktreeContext? wtCtx = null;
-        var worktree = await _wtRepo.GetByTaskIdAsync(taskId, ct);
         if (worktree is not null)
         {
             runDir = worktree.Path;
@@ -180,11 +207,14 @@ public sealed class TaskRunner
         }
 
         var now = DateTime.UtcNow;
-        await _taskRepo.MarkRunningAsync(taskId, now, ct);
+        using (var context = _dbFactory.CreateDbContext())
+        {
+            var taskRepo = new TaskRepository(context);
+            await taskRepo.MarkRunningAsync(taskId, now, ct);
+        }
         await _broadcaster.TaskStarted(slot, taskId, now);
 
         var nextRunNumber = lastRun.RunNumber + 1;
-        await _broadcaster.RunCreated(taskId, nextRunNumber, false);
         var result = await RunOnceAsync(taskId, slot, runDir, resolvedConfig, nextRunNumber, false, followUpPrompt, ct);
 
         if (result.IsSuccess)
@@ -216,12 +246,21 @@ public sealed class TaskRunner
             LogPath = logPath,
             StartedAt = DateTime.UtcNow,
         };
-        await _runRepo.AddAsync(run, ct);
+
+        using (var context = _dbFactory.CreateDbContext())
+        {
+            var runRepo = new TaskRunRepository(context);
+            await runRepo.AddAsync(run, ct);
+        }
+
+        await _broadcaster.RunCreated(taskId, runNumber, isRetry);
 
         var arguments = _argsBuilder.Build(config);
 
         await using var logWriter = new LogWriter(logPath);
 
+        try
+        {
             var result = await _claude.RunAsync(
                 arguments,
                 prompt,
@@ -233,7 +272,9 @@ public sealed class TaskRunner
                 },
                 ct);
 
-        // Update the run record with results.
+            // Update the run record with results. Use CancellationToken.None:
+            // this is a terminal write that must always complete, even if the
+            // caller's token is already cancelled.
             run.SessionId = result.SessionId;
             run.ResultMarkdown = result.ResultMarkdown;
             run.StructuredOutputJson = result.StructuredOutputJson;
@@ -243,13 +284,41 @@ public sealed class TaskRunner
             run.TokensIn = result.TokensIn;
             run.TokensOut = result.TokensOut;
             run.FinishedAt = DateTime.UtcNow;
-        await _runRepo.UpdateAsync(run, ct);
 
-        // Update denormalized fields on the task.
-        await _taskRepo.SetLogPathAsync(taskId, logPath, ct);
+            using (var context = _dbFactory.CreateDbContext())
+            {
+                var runRepo = new TaskRunRepository(context);
+                await runRepo.UpdateAsync(run, CancellationToken.None);
+
+                var taskRepo = new TaskRepository(context);
+                await taskRepo.SetLogPathAsync(taskId, logPath, CancellationToken.None);
+            }
 
             return result;
         }
+        catch (OperationCanceledException)
+        {
+            // Ensure the run row is completed so ContinueAsync / inspection
+            // isn't left staring at a null session_id / finished_at.
+            run.ErrorMarkdown = "Cancelled.";
+            run.ExitCode = -1;
+            run.FinishedAt = DateTime.UtcNow;
+            try
+            {
+                using var context = _dbFactory.CreateDbContext();
+                var runRepo = new TaskRunRepository(context);
+                await runRepo.UpdateAsync(run, CancellationToken.None);
+
+                var taskRepo = new TaskRepository(context);
+                await taskRepo.SetLogPathAsync(taskId, logPath, CancellationToken.None);
+            }
+            catch (Exception updateEx)
+            {
+                _logger.LogError(updateEx, "Failed to finalize cancelled run {RunId} for task {TaskId}", runId, taskId);
+            }
+            throw;
+        }
+    }
 
     private async Task HandleSuccess(TaskEntity task, ListEntity list, string slot, WorktreeContext? wtCtx, RunResult result, CancellationToken ct)
     {
@@ -260,8 +329,15 @@ public sealed class TaskRunner
                 await _broadcaster.WorktreeUpdated(task.Id);
         }
 
+        // Terminal DB write uses CancellationToken.None so the task status
+        // is never left as 'running' because of a cancel that arrived
+        // after the Claude run already succeeded.
         var finishedAt = DateTime.UtcNow;
-        await _taskRepo.MarkDoneAsync(task.Id, finishedAt, result.ResultMarkdown, ct);
+        using (var context = _dbFactory.CreateDbContext())
+        {
+            var taskRepo = new TaskRepository(context);
+            await taskRepo.MarkDoneAsync(task.Id, finishedAt, result.ResultMarkdown, CancellationToken.None);
+        }
         await _broadcaster.TaskFinished(slot, task.Id, "done", finishedAt);
         _logger.LogInformation("Task {TaskId} completed (turns={Turns}, tokens_in={In}, tokens_out={Out})",
             task.Id, result.TurnCount, result.TokensIn, result.TokensOut);
@@ -269,8 +345,12 @@ public sealed class TaskRunner
 
     private async Task HandleFailure(string taskId, string slot, RunResult result)
     {
+        // Intentionally does not accept a CancellationToken: this is the
+        // terminal write for a failed task and must always be persisted.
         var finishedAt = DateTime.UtcNow;
-        await _taskRepo.MarkFailedAsync(taskId, finishedAt, result.ErrorMarkdown);
+        using var context = _dbFactory.CreateDbContext();
+        var taskRepo = new TaskRepository(context);
+        await taskRepo.MarkFailedAsync(taskId, finishedAt, result.ErrorMarkdown, CancellationToken.None);
         await _broadcaster.TaskFinished(slot, taskId, "failed", finishedAt);
         _logger.LogWarning("Task {TaskId} failed (turns={Turns}): {Error}", taskId, result.TurnCount, result.ErrorMarkdown);
     }
@@ -280,7 +360,10 @@ public sealed class TaskRunner
         try
         {
             var now = DateTime.UtcNow;
-            await _taskRepo.MarkFailedAsync(taskId, now, error);
+            // Terminal write — never cancel.
+            using var context = _dbFactory.CreateDbContext();
+            var taskRepo = new TaskRepository(context);
+            await taskRepo.MarkFailedAsync(taskId, now, error, CancellationToken.None);
             await _broadcaster.TaskFinished(slot, taskId, "failed", now);
             await _broadcaster.TaskUpdated(taskId);
         }

src/ClaudeDo.Worker/Runner/WorktreeManager.cs

@@ -1,7 +1,9 @@
+using ClaudeDo.Data;
 using ClaudeDo.Data.Git;
 using ClaudeDo.Data.Models;
 using ClaudeDo.Data.Repositories;
 using ClaudeDo.Worker.Config;
+using Microsoft.EntityFrameworkCore;
 
 namespace ClaudeDo.Worker.Runner;
 
@@ -10,14 +12,14 @@ public sealed record WorktreeContext(string WorktreePath, string BranchName, str
 public sealed class WorktreeManager
 {
     private readonly GitService _git;
-    private readonly WorktreeRepository _wtRepo;
+    private readonly IDbContextFactory<ClaudeDoDbContext> _dbFactory;
     private readonly WorkerConfig _cfg;
     private readonly ILogger<WorktreeManager> _logger;
 
-    public WorktreeManager(GitService git, WorktreeRepository wtRepo, WorkerConfig cfg, ILogger<WorktreeManager> logger)
+    public WorktreeManager(GitService git, IDbContextFactory<ClaudeDoDbContext> dbFactory, WorkerConfig cfg, ILogger<WorktreeManager> logger)
     {
         _git = git;
-        _wtRepo = wtRepo;
+        _dbFactory = dbFactory;
         _cfg = cfg;
         _logger = logger;
     }
@@ -31,8 +33,10 @@ public sealed class WorktreeManager
             throw new InvalidOperationException($"working_dir is not a git repository: {workingDir}");
 
         var baseCommit = await _git.RevParseHeadAsync(workingDir, ct);
-        var shortId = task.Id.Length >= 8 ? task.Id[..8] : task.Id;
-        var branchName = $"claudedo/{shortId}";
+        // Use the full task id (dashes stripped) in the branch name so
+        // two GUIDs sharing an 8-char prefix cannot collide on the same branch.
+        var idForBranch = task.Id.Replace("-", "");
+        var branchName = $"claudedo/{idForBranch}";
         var slug = CommitMessageBuilder.ToSlug(list.Name);
 
         var worktreePath = _cfg.WorktreeRootStrategy.Equals("central", StringComparison.OrdinalIgnoreCase)
@@ -48,7 +52,9 @@ public sealed class WorktreeManager
         await _git.WorktreeAddAsync(workingDir, branchName, worktreePath, baseCommit, ct);
 
         // Insert worktrees row AFTER git succeeds — if git throws, no row is created.
-        await _wtRepo.AddAsync(new WorktreeEntity
+        using var context = _dbFactory.CreateDbContext();
+        var wtRepo = new WorktreeRepository(context);
+        await wtRepo.AddAsync(new WorktreeEntity
         {
             TaskId = task.Id,
             Path = worktreePath,
@@ -85,7 +91,9 @@ public sealed class WorktreeManager
         var head = await _git.RevParseHeadAsync(ctx.WorktreePath, ct);
         var diffStat = await _git.DiffStatAsync(ctx.WorktreePath, ctx.BaseCommit, head, ct);
 
-        await _wtRepo.UpdateHeadAsync(task.Id, head, diffStat, ct);
+        using var context = _dbFactory.CreateDbContext();
+        var wtRepo = new WorktreeRepository(context);
+        await wtRepo.UpdateHeadAsync(task.Id, head, diffStat, ct);
 
         _logger.LogInformation("Committed changes for task {TaskId}: {Head}", task.Id, head);
         return true;

src/ClaudeDo.Worker/Services/QueueService.cs

@@ -1,7 +1,9 @@
+using ClaudeDo.Data;
 using ClaudeDo.Data.Models;
 using ClaudeDo.Data.Repositories;
 using ClaudeDo.Worker.Config;
 using ClaudeDo.Worker.Runner;
+using Microsoft.EntityFrameworkCore;
 
 namespace ClaudeDo.Worker.Services;
 
@@ -14,7 +16,7 @@ public sealed class QueueSlotState
 
 public sealed class QueueService : BackgroundService
 {
-    private readonly TaskRepository _taskRepo;
+    private readonly IDbContextFactory<ClaudeDoDbContext> _dbFactory;
     private readonly TaskRunner _runner;
     private readonly WorkerConfig _cfg;
     private readonly ILogger<QueueService> _logger;
@@ -26,12 +28,12 @@ public sealed class QueueService : BackgroundService
     private readonly SemaphoreSlim _wakeSignal = new(0, 1);
 
     public QueueService(
-        TaskRepository taskRepo,
+        IDbContextFactory<ClaudeDoDbContext> dbFactory,
         TaskRunner runner,
         WorkerConfig cfg,
         ILogger<QueueService> logger)
     {
-        _taskRepo = taskRepo;
+        _dbFactory = dbFactory;
         _runner = runner;
         _cfg = cfg;
         _logger = logger;
@@ -56,44 +58,60 @@ public sealed class QueueService : BackgroundService
 
     public async Task RunNow(string taskId)
     {
-        var task = await _taskRepo.GetByIdAsync(taskId);
-        if (task is null)
+        using (var context = _dbFactory.CreateDbContext())
+        {
+            var taskRepo = new TaskRepository(context);
+            var exists = await taskRepo.GetByIdAsync(taskId);
+            if (exists is null)
                 throw new KeyNotFoundException($"Task '{taskId}' not found.");
+        }
 
         lock (_lock)
         {
+            if (_queueSlot?.TaskId == taskId)
+                throw new InvalidOperationException("task is already running in queue slot");
             if (_overrideSlot is not null)
                 throw new InvalidOperationException("override slot busy");
 
             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);
         }
     }
 
     public async Task<string> ContinueTask(string taskId, string followUpPrompt)
     {
-        var task = await _taskRepo.GetByIdAsync(taskId)
+        using var context = _dbFactory.CreateDbContext();
+        var taskRepo = new TaskRepository(context);
+        var task = await taskRepo.GetByIdAsync(taskId)
             ?? throw new KeyNotFoundException($"Task '{taskId}' not found.");
 
         if (task.Status == Data.Models.TaskStatus.Running)
-            throw new InvalidOperationException("Task is currently running.");
+            throw new InvalidOperationException("task is already running");
 
         lock (_lock)
         {
+            if (_queueSlot?.TaskId == taskId)
+                throw new InvalidOperationException("task is already running in queue slot");
             if (_overrideSlot is not null)
                 throw new InvalidOperationException("override slot busy");
 
             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);
         }
 
@@ -142,7 +160,12 @@ public sealed class QueueService : BackgroundService
 
                 if (_queueSlot is not null) continue;
 
-                var task = await _taskRepo.GetNextQueuedAgentTaskAsync(DateTime.UtcNow, stoppingToken);
+                TaskEntity? task;
+                using (var context = _dbFactory.CreateDbContext())
+                {
+                    var taskRepo = new TaskRepository(context);
+                    task = await taskRepo.GetNextQueuedAgentTaskAsync(DateTime.UtcNow, stoppingToken);
+                }
                 if (task is null) continue;
 
                 lock (_lock)
@@ -152,9 +175,12 @@ 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.
                     }, TaskScheduler.Default);
                 }
@@ -172,16 +198,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);
         }
     }
 

src/ClaudeDo.Worker/Services/StaleTaskRecovery.cs

@@ -1,21 +1,25 @@
+using ClaudeDo.Data;
 using ClaudeDo.Data.Repositories;
+using Microsoft.EntityFrameworkCore;
 
 namespace ClaudeDo.Worker.Services;
 
 public sealed class StaleTaskRecovery : IHostedService
 {
-    private readonly TaskRepository _tasks;
+    private readonly IDbContextFactory<ClaudeDoDbContext> _dbFactory;
     private readonly ILogger<StaleTaskRecovery> _logger;
 
-    public StaleTaskRecovery(TaskRepository tasks, ILogger<StaleTaskRecovery> logger)
+    public StaleTaskRecovery(IDbContextFactory<ClaudeDoDbContext> dbFactory, ILogger<StaleTaskRecovery> logger)
     {
-        _tasks = tasks;
+        _dbFactory = dbFactory;
         _logger = logger;
     }
 
     public async Task StartAsync(CancellationToken cancellationToken)
     {
-        var flipped = await _tasks.FlipAllRunningToFailedAsync("worker restart", cancellationToken);
+        using var context = _dbFactory.CreateDbContext();
+        var tasks = new TaskRepository(context);
+        var flipped = await tasks.FlipAllRunningToFailedAsync("worker restart", cancellationToken);
         if (flipped > 0)
             _logger.LogWarning("Stale task recovery: flipped {Count} running task(s) to failed", flipped);
         else

tests/ClaudeDo.Installer.Tests/ChecksumVerifierTests.cs

@@ -0,0 +1,106 @@
+using System.IO;
+using ClaudeDo.Installer.Core;
+
+namespace ClaudeDo.Installer.Tests;
+
+public sealed class ChecksumVerifierTests : IDisposable
+{
+    private readonly string _tempDir;
+
+    public ChecksumVerifierTests()
+    {
+        _tempDir = Path.Combine(Path.GetTempPath(), "ClaudeDoChecksum-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(_tempDir);
+    }
+
+    public void Dispose()
+    {
+        try { Directory.Delete(_tempDir, recursive: true); } catch { }
+    }
+
+    [Fact]
+    public void ComputeSha256_KnownVector_EmptyFile()
+    {
+        var path = Path.Combine(_tempDir, "empty.bin");
+        File.WriteAllBytes(path, Array.Empty<byte>());
+
+        var hash = ChecksumVerifier.ComputeSha256(path);
+
+        Assert.Equal("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", hash);
+    }
+
+    [Fact]
+    public void ComputeSha256_KnownVector_Hello()
+    {
+        var path = Path.Combine(_tempDir, "hello.bin");
+        File.WriteAllText(path, "hello");
+
+        var hash = ChecksumVerifier.ComputeSha256(path);
+
+        Assert.Equal("2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824", hash);
+    }
+
+    [Fact]
+    public void Verify_ReturnsTrue_WhenHashMatches()
+    {
+        var path = Path.Combine(_tempDir, "x.bin");
+        File.WriteAllText(path, "hello");
+
+        Assert.True(ChecksumVerifier.Verify(path,
+            "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824"));
+    }
+
+    [Fact]
+    public void Verify_IsCaseInsensitive()
+    {
+        var path = Path.Combine(_tempDir, "x.bin");
+        File.WriteAllText(path, "hello");
+
+        Assert.True(ChecksumVerifier.Verify(path,
+            "2CF24DBA5FB0A30E26E83B2AC5B9E29E1B161E5C1FA7425E73043362938B9824"));
+    }
+
+    [Fact]
+    public void Verify_ReturnsFalse_OnMismatch()
+    {
+        var path = Path.Combine(_tempDir, "x.bin");
+        File.WriteAllText(path, "hello");
+
+        Assert.False(ChecksumVerifier.Verify(path, new string('0', 64)));
+    }
+
+    [Fact]
+    public void ParseChecksumsFile_ReadsTwoLines()
+    {
+        var content = """
+            e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ClaudeDo-0.2.0-win-x64.zip
+            2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824  ClaudeDo.Installer-0.2.0.exe
+            """;
+
+        var map = ChecksumVerifier.ParseChecksumsFile(content);
+
+        Assert.Equal(2, map.Count);
+        Assert.Equal(
+            "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+            map["ClaudeDo-0.2.0-win-x64.zip"]);
+        Assert.Equal(
+            "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824",
+            map["ClaudeDo.Installer-0.2.0.exe"]);
+    }
+
+    [Fact]
+    public void ParseChecksumsFile_SkipsBlankAndMalformedLines()
+    {
+        var content = """
+
+            not a line
+            e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  file.zip
+
+            """;
+
+        var map = ChecksumVerifier.ParseChecksumsFile(content);
+
+        Assert.Single(map);
+        Assert.True(map.ContainsKey("file.zip"));
+    }
+}

tests/ClaudeDo.Installer.Tests/ClaudeDo.Installer.Tests.csproj

@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+<ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+    <!-- Allow Linux Gitea runners to build this Windows-targeted project; no-op on Windows. -->
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Xunit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\ClaudeDo.Installer\ClaudeDo.Installer.csproj" />
+  </ItemGroup>
+
+</Project>

tests/ClaudeDo.Installer.Tests/DownloadAndExtractStepTests.cs

@@ -0,0 +1,148 @@
+using System.IO;
+using System.IO.Compression;
+using ClaudeDo.Installer.Core;
+using ClaudeDo.Installer.Steps;
+
+namespace ClaudeDo.Installer.Tests;
+
+public sealed class DownloadAndExtractStepTests : IDisposable
+{
+    private readonly string _tempDir;
+    private readonly string _installDir;
+
+    public DownloadAndExtractStepTests()
+    {
+        _tempDir = Path.Combine(Path.GetTempPath(), "ClaudeDoDownloadStep-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(_tempDir);
+        _installDir = Path.Combine(_tempDir, "install");
+        Directory.CreateDirectory(_installDir);
+    }
+
+    public void Dispose()
+    {
+        try { Directory.Delete(_tempDir, recursive: true); } catch { }
+    }
+
+    private sealed class FileCopyReleaseClient : IReleaseClient
+    {
+        private readonly Dictionary<string, string> _urlToSourceFile;
+        public GiteaRelease? Release { get; set; }
+
+        public FileCopyReleaseClient(Dictionary<string, string> urlToSourceFile)
+            => _urlToSourceFile = urlToSourceFile;
+
+        public Task<GiteaRelease?> GetLatestReleaseAsync(CancellationToken ct) => Task.FromResult(Release);
+
+        public Task DownloadAsync(string url, string destPath, IProgress<long> progress, CancellationToken ct)
+        {
+            File.Copy(_urlToSourceFile[url], destPath, overwrite: true);
+            progress.Report(new FileInfo(destPath).Length);
+            return Task.CompletedTask;
+        }
+    }
+
+    [Fact]
+    public async Task Extracts_Zip_Into_InstallDir_App_And_Worker()
+    {
+        var zipPath = Path.Combine(_tempDir, "release.zip");
+        using (var fs = File.Create(zipPath))
+        using (var zip = new ZipArchive(fs, ZipArchiveMode.Create))
+        {
+            var a = zip.CreateEntry("app/a.txt");
+            using (var w = new StreamWriter(a.Open())) w.Write("hello-app");
+            var b = zip.CreateEntry("worker/b.txt");
+            using (var w = new StreamWriter(b.Open())) w.Write("hello-worker");
+        }
+
+        var zipHash = ChecksumVerifier.ComputeSha256(zipPath);
+        var checksumsPath = Path.Combine(_tempDir, "checksums.txt");
+        File.WriteAllText(checksumsPath, $"{zipHash}  ClaudeDo-0.1.0-win-x64.zip\n");
+
+        var release = new GiteaRelease("v0.1.0", "v0.1.0", new[]
+        {
+            new ReleaseAsset("ClaudeDo-0.1.0-win-x64.zip", "fake://zip", new FileInfo(zipPath).Length),
+            new ReleaseAsset("checksums.txt", "fake://checksums", new FileInfo(checksumsPath).Length),
+        });
+
+        var client = new FileCopyReleaseClient(new()
+        {
+            ["fake://zip"] = zipPath,
+            ["fake://checksums"] = checksumsPath,
+        }) { Release = release };
+
+        var step = new DownloadAndExtractStep(client);
+        var ctx = new InstallContext { InstallDirectory = _installDir };
+
+        var result = await step.ExecuteAsync(ctx, new Progress<string>(_ => { }), CancellationToken.None);
+
+        Assert.True(result.Success, result.ErrorMessage);
+        Assert.Equal("hello-app", File.ReadAllText(Path.Combine(_installDir, "app", "a.txt")));
+        Assert.Equal("hello-worker", File.ReadAllText(Path.Combine(_installDir, "worker", "b.txt")));
+        Assert.Equal("0.1.0", ctx.InstalledVersion);
+    }
+
+    [Fact]
+    public async Task Fails_On_ChecksumMismatch_Without_Overwriting_InstallDir()
+    {
+        var zipPath = Path.Combine(_tempDir, "release.zip");
+        using (var fs = File.Create(zipPath))
+        using (var zip = new ZipArchive(fs, ZipArchiveMode.Create))
+        {
+            var a = zip.CreateEntry("app/a.txt");
+            using (var w = new StreamWriter(a.Open())) w.Write("x");
+        }
+
+        var checksumsPath = Path.Combine(_tempDir, "checksums.txt");
+        File.WriteAllText(checksumsPath, $"{new string('0', 64)}  ClaudeDo-0.1.0-win-x64.zip\n");
+
+        File.WriteAllText(Path.Combine(_installDir, "marker.txt"), "untouched");
+
+        var release = new GiteaRelease("v0.1.0", "v0.1.0", new[]
+        {
+            new ReleaseAsset("ClaudeDo-0.1.0-win-x64.zip", "fake://zip", 0),
+            new ReleaseAsset("checksums.txt", "fake://checksums", 0),
+        });
+
+        var client = new FileCopyReleaseClient(new()
+        {
+            ["fake://zip"] = zipPath,
+            ["fake://checksums"] = checksumsPath,
+        }) { Release = release };
+
+        var step = new DownloadAndExtractStep(client);
+        var ctx = new InstallContext { InstallDirectory = _installDir };
+
+        var result = await step.ExecuteAsync(ctx, new Progress<string>(_ => { }), CancellationToken.None);
+
+        Assert.False(result.Success);
+        Assert.Contains("checksum", result.ErrorMessage!, StringComparison.OrdinalIgnoreCase);
+        Assert.True(File.Exists(Path.Combine(_installDir, "marker.txt")));
+        Assert.False(Directory.Exists(Path.Combine(_installDir, "app")));
+    }
+
+    [Fact]
+    public async Task Fails_When_Release_Has_No_Zip_Asset()
+    {
+        var release = new GiteaRelease("v0.1.0", "v0.1.0", Array.Empty<ReleaseAsset>());
+        var client = new FileCopyReleaseClient(new()) { Release = release };
+        var step = new DownloadAndExtractStep(client);
+        var ctx = new InstallContext { InstallDirectory = _installDir };
+
+        var result = await step.ExecuteAsync(ctx, new Progress<string>(_ => { }), CancellationToken.None);
+
+        Assert.False(result.Success);
+        Assert.Contains("not found", result.ErrorMessage!, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public async Task Fails_When_ReleaseClient_Returns_Null()
+    {
+        var client = new FileCopyReleaseClient(new()) { Release = null };
+        var step = new DownloadAndExtractStep(client);
+        var ctx = new InstallContext { InstallDirectory = _installDir };
+
+        var result = await step.ExecuteAsync(ctx, new Progress<string>(_ => { }), CancellationToken.None);
+
+        Assert.False(result.Success);
+    }
+}