test(solo): uitgebreide batch-preflight tests met 2 PBI's en 4 taken

Nieuw claude-jobs-batch.test.ts: 10 gevallen voor previewEnqueueAllAction (PBI-volgorde, REVIEW/BLOCKED-detectie, active-job-skip met blockerIndex-shift) en enqueueClaudeJobsBatchAction (happy path, IDOR, active-job-skip, demo).
feat(solo): preview-then-confirm flow in SoloBoard Voer-alle-uit
2026-05-03 13:48:35 +02:00 · 2026-05-03 13:44:13 +02:00 · 2026-05-03 13:38:41 +02:00 · 2026-05-03 13:33:51 +02:00 · 2026-05-03 13:29:48 +02:00 · 2026-05-03 13:24:51 +02:00
594 changed files with 7359 additions and 58595 deletions
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@ -0,0 +1,88 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npx tsc *)",
+      "Bash(git add *)",
+      "Bash(git commit *)",
+      "Bash(git push *)",
+      "Bash(npx eslint *)",
+      "Bash(npm run *)",
+      "Bash(npx tsx *)",
+      "mcp__scrum4me__list_products",
+      "mcp__scrum4me__get_claude_context",
+      "Bash(gh pr *)",
+      "Bash(git -C /Users/janpetervisser/Development/Scrum4Me branch --show-current)",
+      "Bash(git -C /Users/janpetervisser/Development/Scrum4Me log --oneline main..HEAD)",
+      "Bash(git -C /Users/janpetervisser/Development/Scrum4Me checkout main)",
+      "Bash(git -C /Users/janpetervisser/Development/Scrum4Me pull --ff-only)",
+      "Bash(git -C /Users/janpetervisser/Development/Scrum4Me branch -d feat/ST-1001-qr-login-milestone-plan)",
+      "Bash(git -C /Users/janpetervisser/Development/Scrum4Me checkout -b feat/M10-qr-login)",
+      "Bash(git -C /Users/janpetervisser/Development/Scrum4Me log --oneline -3)",
+      "mcp__scrum4me__log_implementation",
+      "mcp__scrum4me__update_task_status",
+      "mcp__scrum4me__log_test_result",
+      "mcp__scrum4me__log_commit",
+      "Bash(npx vitest *)",
+      "Bash(echo \"=== exit: $? ===\")",
+      "Bash(npm test *)",
+      "Bash(echo \"exit: $?\")",
+      "Bash(npx prisma *)",
+      "Bash(npm install *)",
+      "Bash(git checkout *)",
+      "Bash(git pull *)",
+      "Bash(git branch *)",
+      "Read(//Users/janpetervisser/Development/**)",
+      "Bash(git -C /Users/janpetervisser/Development/scrum4me-mcp status -sb)",
+      "Bash(git -C /Users/janpetervisser/Development/scrum4me-mcp submodule status)",
+      "Bash(git -C /Users/janpetervisser/Development/scrum4me-mcp log --oneline -5)",
+      "Bash(git -C /Users/janpetervisser/Development/scrum4me-mcp/vendor/scrum4me log --oneline -3)",
+      "Bash(git -C /Users/janpetervisser/Development/scrum4me-mcp/vendor/scrum4me branch -a)",
+      "Bash(git fetch *)",
+      "Bash(git reset *)",
+      "mcp__scrum4me__update_task_plan",
+      "mcp__scrum4me__create_task",
+      "mcp__scrum4me__ask_user_question",
+      "Bash(git *)",
+      "mcp__scrum4me__create_pbi",
+      "mcp__scrum4me__create_story",
+      "mcp__scrum4me__health",
+      "Bash(python3 -c \"import json,sys; d=json.load\\(sys.stdin\\); print\\(json.dumps\\(d.get\\('mcpServers', {}\\), indent=2\\)\\)\")",
+      "Read(//Users/janpetervisser/.claude/**)",
+      "Bash(python3 -c \"import json,sys; d=json.load\\(sys.stdin\\); print\\(json.dumps\\(d, indent=2\\)\\)\")",
+      "Bash(python3 -c \"import json,sys; d=json.load\\(sys.stdin\\); print\\(json.dumps\\(d.get\\('mcpServers',{}\\), indent=2\\)\\)\")",
+      "Bash(python3 -m json.tool)",
+      "mcp__scrum4me__wait_for_job",
+      "Bash(npx ctx7@latest docs /websites/github_en_rest \"How to fetch Copilot bot pull request reviews and identify them by author\")",
+      "Bash(npm i *)",
+      "Bash(curl *)",
+      "Bash(grep -E \"\\\\.\\(tsx|ts\\)$\")",
+      "mcp__scrum4me__update_job_status",
+      "Bash(node --env-file=.env.local node_modules/tsx/dist/cli.mjs ./scripts/check-jobs-tmp.ts)",
+      "Bash(node --env-file=.env.local node_modules/tsx/dist/cli.mjs ./scripts/check-workers-tmp.ts)",
+      "Bash(node --env-file=.env.local node_modules/prisma/build/index.js migrate deploy)",
+      "Bash(xargs grep *)",
+      "Bash(node --env-file=.env.local node_modules/prisma/build/index.js migrate status)",
+      "Bash(gh run *)",
+      "Bash(dir \"C:\\\\Users\\\\Madhu\\\\Projects\")",
+      "Bash(Get-ChildItem -Path \"C:\\\\Users\\\\Madhu\\\\Projects\\\\scrum4me-mcp\" -Recurse -Include \"*wait*\" -ErrorAction SilentlyContinue)",
+      "Bash(Select-Object FullName)",
+      "Bash(Get-ChildItem -Path \"C:\\\\Users\\\\Madhu\\\\Projects\\\\scrum4me-mcp\" -Force)",
+      "Bash(Format-Table -Property Name, PSIsContainer)",
+      "Bash(Sort-Object)",
+      "PowerShell(Push-Location \"C:\\\\Users\\\\Madhu\\\\Projects\\\\scrum4me-mcp\"; npx tsc --noEmit; $result = $?; Pop-Location; Write-Output \"typecheck ok: $result\")",
+      "PowerShell(git *)",
+      "mcp__scrum4me__verify_task_against_plan",
+      "Bash(mkdir -p docs/plans/archive)",
+      "Bash(rmdir .Plans)",
+      "Bash(mv .Plans/2026-04-27-claude-md-workflow-update.md docs/plans/archive/)",
+      "Bash(mv .Plans/2026-04-27-insert-milestone-tool.md docs/plans/archive/)",
+      "Bash(mv .Plans/2026-04-27-m8-realtime-solo.md docs/plans/archive/)",
+      "Bash(xargs sed *)",
+      "Bash(python3 *)"
+    ]
+  },
+  "enableAllProjectMcpServers": true,
+  "enabledMcpjsonServers": [
+    "scrum4me"
+  ]
+}
--- a/.env.example
+++ b/.env.example
@ -14,30 +14,3 @@ NODE_ENV="development"
 # local dev (the route returns 401 if the Authorization header doesn't match).
 # Generate with: openssl rand -base64 32
 CRON_SECRET=""
-
-# PBI-55 — Web Push (VAPID). All optional; app starts without these.
-# Generate keys with: npx web-push generate-vapid-keys
-NEXT_PUBLIC_VAPID_PUBLIC_KEY=""
-VAPID_PRIVATE_KEY=""
-# Must start with mailto: e.g. mailto:admin@example.com
-VAPID_SUBJECT="mailto:admin@example.com"
-# Shared secret for POST /api/internal/push/send — min 32 chars
-# Generate with: openssl rand -base64 32
-INTERNAL_PUSH_SECRET=""
-
-# PBI-66 — Anthropic API key voor `npm run db:sync-model-prices`.
-# Optional. Alleen nodig om wekelijks de model_prices tabel te synchroniseren.
-# Genereer op https://console.anthropic.com/ → API Keys.
-# /v1/models is een gratis metadata-call (geen tokens, geen credit nodig).
-ANTHROPIC_API_KEY=""
-
-# v1-readiness item 2 — Sentry error monitoring.
-# Optional. Without DSN, the SDK is a no-op (no network, no overhead).
-# Get a DSN at https://sentry.io → Project → Settings → Client Keys (DSN).
-NEXT_PUBLIC_SENTRY_DSN=""
-
-# Required ONLY if you want source-map upload during build (production deploy).
-# In Vercel: project settings → Environment Variables → add as encrypted.
-SENTRY_ORG=""
-SENTRY_PROJECT=""
-SENTRY_AUTH_TOKEN=""
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -5,23 +5,11 @@ on:
    branches: [main]
  pull_request:
    branches: [main]
-  workflow_dispatch:
-    inputs:
-      target:
-        type: choice
-        description: Deploy target
-        options: [preview, production]
-        default: preview
-
-permissions:
-  contents: read
-  pull-requests: read

 jobs:
  ci:
    name: Lint, Typecheck, Test & Build
    runs-on: ubuntu-latest
-    if: github.event_name != 'workflow_dispatch'

    steps:
      - name: Checkout
@ -61,52 +49,11 @@ jobs:
          DIRECT_URL: ${{ secrets.DIRECT_URL }}
          SESSION_SECRET: ${{ secrets.SESSION_SECRET }}

-  changes:
-    name: Detect deploy-relevant changes
-    runs-on: ubuntu-latest
-    needs: ci
-    # Alleen relevant voor auto-deploy jobs; skip wanneer auto-deploy uit staat.
-    if: vars.AUTO_DEPLOY_ENABLED == 'true' && github.event_name != 'workflow_dispatch'
-    outputs:
-      code: ${{ steps.filter.outputs.code }}
-    steps:
-      - uses: actions/checkout@v5
-      - uses: dorny/paths-filter@v3
-        id: filter
-        with:
-          filters: |
-            code:
-              - 'app/**'
-              - 'components/**'
-              - 'lib/**'
-              - 'actions/**'
-              - 'stores/**'
-              - 'prisma/**'
-              - 'public/**'
-              - 'package.json'
-              - 'package-lock.json'
-              - 'next.config.ts'
-              - 'tsconfig.json'
-              - 'vercel.json'
-              - 'proxy.ts'
-              - 'middleware.ts'
-              - '.github/workflows/**'
-
  deploy-preview:
    name: Deploy Preview (PR)
    runs-on: ubuntu-latest
-    needs: [ci, changes]
-    # Auto-deploy is uit. Gebruik "Run workflow" (workflow_dispatch) op de
-    # Actions-pagina voor handmatige deploys. Zet repo-variable
-    # AUTO_DEPLOY_ENABLED=true in Settings → Secrets and variables → Actions
-    # om PR-preview-deploys weer in te schakelen.
-    if: |
-      vars.AUTO_DEPLOY_ENABLED == 'true'
-      && github.event_name == 'pull_request' && (
-        (needs.changes.outputs.code == 'true'
-         && !contains(github.event.pull_request.labels.*.name, 'skip-deploy'))
-        || contains(github.event.pull_request.labels.*.name, 'force-deploy')
-      )
+    needs: ci
+    if: github.event_name == 'pull_request'

    steps:
      - name: Checkout
@ -133,15 +80,8 @@ jobs:
  deploy-production:
    name: Deploy Production (main)
    runs-on: ubuntu-latest
-    needs: [ci, changes]
-    # Auto-deploy is uit. Gebruik "Run workflow" (workflow_dispatch) →
-    # target=production voor handmatige productie-deploys. Zet repo-variable
-    # AUTO_DEPLOY_ENABLED=true om push-naar-main weer auto te deployen.
-    if: |
-      vars.AUTO_DEPLOY_ENABLED == 'true'
-      && github.ref == 'refs/heads/main'
-      && github.event_name == 'push'
-      && needs.changes.outputs.code == 'true'
+    needs: ci
+    if: github.ref == 'refs/heads/main' && github.event_name == 'push'

    steps:
      - name: Checkout
@ -170,42 +110,3 @@ jobs:
        env:
          VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
          VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
-
-  deploy-manual:
-    name: Deploy Manual (workflow_dispatch)
-    runs-on: ubuntu-latest
-    if: github.event_name == 'workflow_dispatch'
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v5
-        with:
-          node-version: '24'
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Install Vercel CLI
-        run: npm install -g vercel@latest
-
-      - name: Run database migrations (production only)
-        if: inputs.target == 'production'
-        run: npx prisma migrate deploy
-        env:
-          DATABASE_URL: ${{ secrets.DATABASE_URL }}
-          DIRECT_URL: ${{ secrets.DIRECT_URL }}
-
-      - name: Deploy
-        run: |
-          if [ "${{ inputs.target }}" = "production" ]; then
-            vercel deploy --prod --token=${{ secrets.VERCEL_TOKEN }}
-          else
-            vercel deploy --token=${{ secrets.VERCEL_TOKEN }}
-          fi
-        env:
-          VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
-          VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
--- a/.gitignore
+++ b/.gitignore
@ -50,7 +50,6 @@ next-env.d.ts

 # Claude Code local settings
 .claude/settings.local.json
-.claude/worktrees/

 # Local plan/scratch files (per-developer, not shared)

--- a/AGENTS.md
+++ b/AGENTS.md
@ -11,13 +11,3 @@ last_updated: 2026-05-03
 This file is a redirect stub. All agent instructions live in **[CLAUDE.md](./CLAUDE.md)**.

 For Claude Code specifically, CLAUDE.md is loaded automatically. Start there.
-
-## Branch & PR-flow (quick reference)
-
-| Moment | Actie | Verbod |
-|---|---|---|
-| Start run | `git checkout -b feat/<batch-slug>` | `gh pr create` |
-| Na elke taak | `git add -A && git commit -m "<type>(ST-XXX): <title>"` | `git push` |
-| Queue leeg | `git push -u origin <branch>` + `gh pr create` | — |
-
-Full details: [docs/runbooks/branch-and-commit.md § Agent-batch flow](./docs/runbooks/branch-and-commit.md)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,106 +0,0 @@
-# Changelog
-
-All notable changes to **Scrum4Me** are documented in this file.
-
-The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
---
-
-## [Unreleased]
-
---
-
-## [1.0.0] — 2026-05-04
-
-**Eerste stabiele release** — MVP volgens functional spec is af, getest en in
-productie. Geen breaking changes ten opzichte van 0.9.0; deze tag markeert de
-launch-ready state na de v1-readiness-checklist (Now + Before-launch items).
-
-### Added
- Rate-limiting: `enforceUserRateLimit(scope, userId)` helper toegepast op alle
-  high-value mutation paths — PBI/Story/Task/Todo/Sprint/Product/Token create,
-  Claude job enqueue, answerQuestion, story-log POST, avatar upload.
-  ([#86](https://github.com/madhura68/Scrum4Me/pull/86))
- Sentry error-monitoring scaffolding (`@sentry/nextjs`) met no-op fallback
-  zonder DSN. Activeer via `NEXT_PUBLIC_SENTRY_DSN` in Vercel env-vars.
-  ([#85](https://github.com/madhura68/Scrum4Me/pull/85))
- `CHANGELOG.md` (Keep a Changelog formaat) + `docs/runbooks/v1-smoke-test.md`
-  — 11-secties pre-launch verificatie. ([#89](https://github.com/madhura68/Scrum4Me/pull/89))
-
-### Changed
- A11y Lighthouse score op `/products/[id]` van 86 → ≥95: `aria-selected` →
-  `aria-pressed` op PBI-cards (correct ARIA role-attribute pairing); tap-targets
-  ≥28×28 px op hover-icon-buttons. ([#88](https://github.com/madhura68/Scrum4Me/pull/88))
- A11y form-label associaties (`htmlFor` + `id`) op happy-path dialogen
-  (Story/Task + Promote-PBI/Story); auth-pages krijgen `<main>` landmark.
-  ([#87](https://github.com/madhura68/Scrum4Me/pull/87))
- README: test-count 69 → 445, env-vars-tabel uitgebreid met `CRON_SECRET` en
-  Sentry-vars. ([#89](https://github.com/madhura68/Scrum4Me/pull/89))
-
-### Fixed
- Demo-policy: drie mutation-paden zonder `isDemo`-check gedicht
-  (`toggleTodoAction`, `archiveCompletedTodosAction`, `leaveProductAction`).
-  ([#89](https://github.com/madhura68/Scrum4Me/pull/89))
-
-### Security
- Vier debug-routes (`/debug-env`, `/debug-realtime`, `/api/debug/*`) krijgen
-  een NODE_ENV-guard → 404 in productie. ([#89](https://github.com/madhura68/Scrum4Me/pull/89))
-
---
-
-## [0.9.0] — 2026-05-04
-
-[GitHub Release](https://github.com/madhura68/Scrum4Me/releases/tag/v0.9.0)
-
-### Added
- **PBI-11: Mobile-shell met landscape-lock** ([#81](https://github.com/madhura68/Scrum4Me/pull/81)):
-  - Aparte route group `app/(mobile)/m/{settings,pair,products}/...` met eigen
-    layout (zonder NavBar/StatusBar/MinWidthBanner)
-  - `LandscapeGuard` (rotate-overlay in portrait), `MobileTabBar` (3 lucide-iconen)
-  - PWA-manifest met `"orientation": "landscape"`
-  - UA-redirect bij login: telefoons (`Mobi`-substring) → `/m/products/[active]/solo`,
-    tablets en desktop → `/dashboard`
-  - Gedeelde `lib/auth-guard.ts` `requireSession()` helper, hergebruikt door beide layouts
-  - Mobile-fullscreen voor entity-dialogen via gedeelde `entityDialogContentClasses`
- Sprint Product-Backlog kolom: filter-popover (prioriteit + status) en
-  edit-iconen op PBI/story/task-rijen. ([#79](https://github.com/madhura68/Scrum4Me/pull/79))
- Edit-icoon op product-card in dashboard (consistent met PBI/story/task-pattern).
-  ([#83](https://github.com/madhura68/Scrum4Me/pull/83))
- v1.0 readiness checklist in `docs/old/plans/v1-readiness.md`.
-  ([#82](https://github.com/madhura68/Scrum4Me/pull/82))
-
-### Changed
- Refactor `app/(app)/layout.tsx` om gedeelde `requireSession()` te gebruiken
-  (gedrag onveranderd). ([#81](https://github.com/madhura68/Scrum4Me/pull/81))
- `/m/pair` filesystem-verhuisd uit `(app)/` naar `(mobile)/` — URL onveranderd.
-  ([#81](https://github.com/madhura68/Scrum4Me/pull/81))
-
---
-
-## [0.4.0] — eerder
-
-### Added
- M9 — Actief Product Backlog: persistente actieve PB-keuze, gesplitste
-  navigatie, disabled-states bij geen actief product
-
---
-
-## [0.3.1] — eerder
-
-Initiële stabilisatie-release.
-
---
-
-## Pre-0.3.x
-
-Foundation-werk (M0 t/m M8) is niet retroactief in dit changelog opgenomen.
-Voor de volledige milestone-historie zie [docs/old/backlog/index.md](./docs/old/backlog/index.md).
-
---
-
-[Unreleased]: https://github.com/madhura68/Scrum4Me/compare/v1.0.0...HEAD
-[1.0.0]: https://github.com/madhura68/Scrum4Me/releases/tag/v1.0.0
-[0.9.0]: https://github.com/madhura68/Scrum4Me/releases/tag/v0.9.0
-[0.4.0]: https://github.com/madhura68/Scrum4Me/commit/615f0c8
-[0.3.1]: https://github.com/madhura68/Scrum4Me/commit/ecc05dd
--- a/CLAUDE.md
+++ b/CLAUDE.md
@ -3,7 +3,7 @@ title: "CLAUDE.md — Scrum4Me"
 status: active
 audience: [ai-agent]
 language: nl
-last_updated: 2026-05-11
+last_updated: 2026-05-03
 ---

 # CLAUDE.md — Scrum4Me
@ -19,24 +19,26 @@ Desktop-first Scrum-app voor solo developers en kleine teams. Hiërarchie: produ
 | `docs/INDEX.md` | Gegenereerde index van alle docs — begin hier |
 | `docs/specs/functional.md` | Acceptatiecriteria, user flows |
 | `docs/architecture.md` | Breadcrumb → 6 topische arch-bestanden |
+| `docs/backlog/index.md` | Implementatievolgorde, "done when"-criteria |
 | `docs/api/rest-contract.md` | REST API contract voor Claude Code |
 | `docs/design/styling.md` | **Lees vóór elk component** — MD3-tokens, shadcn |
-| `docs/adr/` | Architecture Decision Records — tech-keuzes (base-ui vs Radix, sort-order, demo-policy, …) |
-| `docs/architecture/` | 6 topische architecture-bestanden (data-model, auth, sprint-execution, …) — uitwerking van `docs/architecture.md` |
-| `docs/runbooks/plan-to-pbi-flow.md` | **Na goedgekeurd plan** — PBI/Story/Task aanmaken via MCP, zónder direct uitvoeren |
+| `docs/plans/<key>-*.md` | Implementatieplan per milestone |

 ---

 ## Hoe werk vinden

-1. Branch aanmaken: `git checkout -b feat/<batch-slug>` — nog **geen** `gh pr create`
-2. `mcp__scrum4me__get_claude_context` → pak de next story
-3. Voer taken uit in `sort_order`; update status per taak
-4. Lees het relevante patroon en styling vóór je begint
-5. Verifieer: `npm run verify && npm run build` — `verify` = lint + typecheck + test
-6. Commit per laag: `git add -A && git commit` — **geen** `git push` — zie [docs/runbooks/branch-and-commit.md](./docs/runbooks/branch-and-commit.md)
-7. Herhaal stap 2–6 per story; branch blijft dezelfde
-8. Queue leeg → `git push -u origin <branch>` + `gh pr create`
+**Track A — MCP (aanbevolen):**
+1. `mcp__scrum4me__get_claude_context` → pak de next story
+2. Voer taken uit in `sort_order`; update status per taak
+3. Lees het relevante patroon en styling vóór je begint
+4. Verifieer: `npm run lint && npm test && npm run build`
+5. Commit per laag — zie [docs/runbooks/branch-and-commit.md](./docs/runbooks/branch-and-commit.md)
+
+**Track B — manueel:**
+1. Lees taak in `docs/backlog/index.md`
+2. Zoek spec in `docs/specs/functional.md`
+3. Lees patroon + styling → bouw → verifieer → vraag bevestiging → commit

 Volledige MCP-tool documentatie: [docs/runbooks/mcp-integration.md](./docs/runbooks/mcp-integration.md)

@ -46,15 +48,12 @@ Volledige MCP-tool documentatie: [docs/runbooks/mcp-integration.md](./docs/runbo

 - **Styling:** nooit `bg-blue-500`; altijd MD3-tokens (`bg-primary`, `bg-status-done`, …)
 - **UI:** gebruik `@base-ui/react` met `render`-prop, niet Radix `asChild`
- **Push:** commits accumuleren lokaal per taak (`git add -A && git commit`); push + PR pas bij lege queue of na expliciete gebruikersbevestiging — zie [branch-and-commit.md](./docs/runbooks/branch-and-commit.md)
+- **Push:** nooit pushen zonder expliciete gebruikersbevestiging — zie [branch-and-commit.md](./docs/runbooks/branch-and-commit.md)
 - **Demo:** drie lagen — proxy.ts + server action + UI disabled knop
- **Proxy:** `proxy.ts` in repo-root (géén `middleware.ts`) onverzegelt de iron-session, redirect niet-geauthenticeerde users op `/dashboard|/products|/ideas`, en blokkeert niet-GET API-writes voor demo-users behalve `/api/cron/*`
 - **Enum:** DB UPPER_SNAKE ↔ API lowercase — uitsluitend via `lib/task-status.ts`
 - **Foutcodes:** 400 = parse-fout, 422 = Zod-validatie, 403 = demo-token
 - **Server/client grens:** `*-server.ts` bevat DB/node-only; nooit importeren in client component
- **Worker/jobs:** `ClaudeJob` queue (`QUEUED → CLAIMED → RUNNING → DONE|FAILED|SKIPPED`); MCP-worker claimt via `wait_for_job` en sluit met `update_job_status` — zie [worker-idempotency.md](./docs/runbooks/worker-idempotency.md)
- **Model/mode per ClaudeJob:** kind-default → product → job-snapshot → `task.requires_opus`. Resolver in `scrum4me-mcp/src/lib/job-config.ts` (en gespiegeld in `lib/job-config.ts`) — zie [job-model-selection.md](./docs/runbooks/job-model-selection.md)
- **Deployment:** `npm run verify && npm run build` vóór elke PR. Selectieve deploy-controle (labels + path-filter): zie [docs/runbooks/deploy-control.md](./docs/runbooks/deploy-control.md)
+- **Deployment:** `npm run lint && npm test && npm run build` vóór elke PR

 ---

@ -62,13 +61,12 @@ Volledige MCP-tool documentatie: [docs/runbooks/mcp-integration.md](./docs/runbo

 | Laag | Technologie |
 |---|---|
-| Framework | Next.js 16.2 (App Router) + React 19.2 — PPR/Cache Components beschikbaar |
+| Framework | Next.js 16 (App Router) + React 19 |
 | Taal | TypeScript strict |
-| Styling | Tailwind CSS v4 + shadcn/ui + MD3 via `app/styles/theme.css` |
+| Styling | Tailwind CSS + shadcn/ui + MD3 via `app/styles/theme.css` |
 | State | Zustand + dnd-kit |
-| DB | Prisma v7.8 + PostgreSQL (Neon) |
+| DB | Prisma v7 + PostgreSQL (Neon) |
 | Auth | iron-session + bcryptjs |
-| Test | Vitest (`__tests__/`, config in `vitest.config.ts`) |
 | Utilities | Zod, Sonner, Sharp, Vercel Analytics |

 ---
@ -81,20 +79,12 @@ Volledige MCP-tool documentatie: [docs/runbooks/mcp-integration.md](./docs/runbo
 | Prisma singleton | `docs/patterns/prisma-client.md` |
 | Server Action (auth + Zod) | `docs/patterns/server-action.md` |
 | Route Handler (REST) | `docs/patterns/route-handler.md` |
-| Workspace-store + realtime (PBI-74) | `docs/patterns/workspace-store.md` |
 | Zustand optimistic update | `docs/patterns/zustand-optimistic.md` |
 | Float sort_order / drag-and-drop | `docs/patterns/sort-order.md` |
 | Proxy / route protection | `docs/patterns/proxy.md` |
 | QR-pairing | `docs/patterns/qr-login.md` |
 | Claude ↔ user vraagkanaal | `docs/patterns/claude-question-channel.md` |
 | Entity Dialog (verplicht) | `docs/patterns/dialog.md` |
-| Realtime NOTIFY-payload | `docs/patterns/realtime-notify-payload.md` |
-| Story met UI-component | `docs/patterns/story-with-ui-component.md` |
-| Web Push | `docs/patterns/web-push.md` |
-| Job-config resolver (PBI-67) | `lib/job-config.ts` ↔ `scrum4me-mcp/src/lib/job-config.ts` |
-| Debug-id op component-root | `docs/patterns/debug-id.md` |
-| Debug-labels (BEM) | `docs/patterns/debug-labels.md` |
-| Demo client-state (PBI-80) | `docs/patterns/demo-client-state.md` |

 ---

@ -107,18 +97,7 @@ SESSION_SECRET=""  # min 32 chars
 CRON_SECRET=""     # Bearer-secret /api/cron/*
 ```

-Volledig schema: `lib/env.ts`. Canonieke lijst: `.env.example` — bevat ook web-push (`VAPID_*`, `INTERNAL_PUSH_SECRET`), Sentry (`SENTRY_*`) en optioneel `ANTHROPIC_API_KEY`.
-
---
-
-## MCP & cron
-
- **MCP-server (extern):** standalone Node-proces in `~/Development/scrum4me-mcp/` — Prisma-schema gesynced via `sync-schema.sh`. 30+ tools (`get_claude_context`, `wait_for_job`, `update_task_status`, …)
- **Bewuste duplicaten:** `lib/job-config.ts` (deze repo) en `scrum4me-mcp/src/lib/job-config.ts` (externe MCP) bevatten dezelfde resolver-logica; dit voorkomt dat de MCP-server Next-deps importeert. **Wijzig beide** bij elke job-config aanpassing
- **Cron (vercel.json):**
-  - `/api/cron/expire-questions` — dagelijks 04:00 UTC
-  - `/api/cron/cleanup-agent-artifacts` — dagelijks 03:00 UTC
- **Realtime:** SSE op `/api/realtime/*`, gevoed door PostgreSQL `LISTEN`/`NOTIFY` op kanaal `scrum4me_changes` (vereist `DIRECT_URL` voor pooler-bypass)
+Volledig schema: `lib/env.ts`. Canonieke lijst: `.env.example`.

 ---

@ -131,24 +110,5 @@ PBI (niet: Feature/Epic) · Story (niet: Ticket) · Sprint Goal (niet: Objective
 ## Verificatie

 ```bash
-npm run verify && npm run build   # verify = lint + typecheck + test
+npm run lint && npm test && npm run build
 ```
-
-Worker job-status protocol (wanneer `DONE` / `SKIPPED` / `FAILED`): zie [docs/runbooks/worker-idempotency.md](./docs/runbooks/worker-idempotency.md).
-
-### Scripts
-
-| Commando | Doel |
-|---|---|
-| `npm run dev` | Next dev op poort 3000 (`predev` kill-port draait automatisch) |
-| `npm test` | Vitest eenmalig (`vitest run`) |
-| `npm run test:watch` | Vitest watch-mode |
-| `npm test -- <pad>` | Eén bestand draaien — bv. `npm test -- lib/env` |
-| `npm run seed` | Prisma seed via `prisma/seed.ts` |
-| `npm run create-admin` | Admin-user toevoegen (`scripts/create-admin.ts`) |
-| `npm run db:insert-milestone` | Milestone-script (`scripts/insert-milestone.ts`) |
-| `npm run db:sync-model-prices` | Sync Anthropic-model-prijzen — vereist `ANTHROPIC_API_KEY` |
-| `npm run docs` | Regenereer `docs/INDEX.md` + check links |
-| `npm run diagrams` | Mermaid → SVG (`public/diagrams/architecture-{light,dark}.svg`) |
-
-> Vitest sluit `.claude/**` uit (relevant voor worktrees). `server-only` wordt via alias gemockt naar `tests/stubs/server-only.ts`, zodat `*-server.ts` modules laadbaar zijn in jsdom-tests.
--- a/README.md
+++ b/README.md
@ -49,7 +49,6 @@ Scrum4Me biedt een lichtgewicht, web-based oplossing voor het beheren van sprint

 ## Documentation

- [CHANGELOG.md](CHANGELOG.md) — release-historie (Keep a Changelog)
 - [docs/INDEX.md](docs/INDEX.md) — generated index of all docs (front-matter driven)
 - [docs/glossary.md](docs/glossary.md) — domain terms (PBI, Story, MCP-job, etc.)
 - [CLAUDE.md](CLAUDE.md) / [AGENTS.md](AGENTS.md) — agent instructions
@ -123,12 +122,16 @@ Vul daarna `DATABASE_URL` en `SESSION_SECRET` in. `DIRECT_URL` is optioneel loka
 npx prisma db push
 ```

-4. Genereer Prisma Client:
+4. Genereer Prisma Client en de ERD:

 ```bash
-npx prisma generate
+npm run db:erd
 ```

+Deze command voert lokaal `prisma generate` uit. Daardoor worden zowel de Prisma Client als `docs/assets/erd.svg` opnieuw opgebouwd.
+
+In CI en deployment wordt bewust alleen de Prisma Client gegenereerd met `prisma generate --generator client`. Het ERD-diagram gebruikt Mermaid/Puppeteer en wordt daarom niet in GitHub Actions of Vercel gegenereerd.
+
 5. Seed testdata indien nodig:

 ```bash
@ -149,7 +152,7 @@ npm run dev
 npm test
 ```

-Verwacht: alle 445 tests slagen, 0 failures.
+Verwacht: alle 69 tests slagen, 0 failures.

 **API curl-tests (vereist lopende dev server + API token):**

@ -162,9 +165,19 @@ De curl-tests dekken alle 7 API-endpoints: auth (401), demo-blokkering (403), in

 ## Database

-Het schema staat in `prisma/schema.prisma`; uitgebreide documentatie in [`docs/architecture/data-model.md`](./docs/architecture/data-model.md).
+![ERD](./docs/assets/erd.svg)

-Gebruik `npx prisma db push` om schema-wijzigingen naar de database te synchroniseren. `npx prisma generate` (of `prisma generate --generator client` in CI) genereert de Prisma Client.
+De databasevisualisatie wordt lokaal gegenereerd uit `prisma/schema.prisma` via `prisma-erd-generator`.
+
+Handmatige generatie:
+
+```bash
+npm run db:erd
+```
+
+Tijdens lokale development draait `npm run dev` naast Next.js ook `npm run db:erd:watch`. Bij wijzigingen in `prisma/schema.prisma` wordt `docs/assets/erd.svg` automatisch opnieuw gegenereerd.
+
+Gebruik `npx prisma db push` alleen om het schema naar de database te synchroniseren. Gebruik `npm run db:erd` om lokaal Prisma Client en de ERD te genereren. Gebruik in CI uitsluitend `npx prisma generate --generator client`.

 De app draait standaard op `http://localhost:3000`.

@ -175,6 +188,7 @@ npm run dev      # lokale development server
 npm run lint     # ESLint
 npm test         # Vitest test suite
 npm run build    # productiebuild zoals Vercel die verwacht
+npm run db:erd   # Prisma Client + docs/assets/erd.svg genereren
 ```

 ### Environment variables
@ -184,15 +198,8 @@ Zie [.env.example](.env.example).
 | Variabele | Verplicht | Doel |
 |---|---:|---|
 | `DATABASE_URL` | Ja | PostgreSQL connection string voor Prisma |
-| `DIRECT_URL` | Nee | Directe Neon connection string voor migraties (Prisma `directUrl`) |
+| `DIRECT_URL` | Nee | Directe Neon connection string voor migraties |
 | `SESSION_SECRET` | Ja | Minimaal 32 tekens; gebruikt door iron-session |
-| `CRON_SECRET` | Productie | Bearer-secret voor `/api/cron/*` routes — required als crons aan staan |
-| `NEXT_PUBLIC_VAPID_PUBLIC_KEY` | Nee | VAPID public key voor Web Push — genereer met `npx web-push generate-vapid-keys` |
-| `VAPID_PRIVATE_KEY` | Nee | VAPID private key voor Web Push |
-| `VAPID_SUBJECT` | Nee | Contact URI voor Web Push (bijv. `mailto:admin@example.com`) |
-| `INTERNAL_PUSH_SECRET` | Nee | Bearer-secret voor `/api/internal/push/*` routes (min 32 tekens) |
-| `NEXT_PUBLIC_SENTRY_DSN` | Nee | Sentry DSN — zonder is de SDK een no-op |
-| `SENTRY_ORG` / `SENTRY_PROJECT` / `SENTRY_AUTH_TOKEN` | Nee | Source-map upload tijdens build |
 | `NODE_ENV` | Nee | Wordt door Node/Vercel gezet |

 Vercel Analytics gebruikt geen project-specifieke environment variabele in deze app; de component staat in `app/layout.tsx`.
@ -247,20 +254,13 @@ Authorization: Bearer <token>

 | Methode | Endpoint | Doel |
 |---|---|---|
-| `GET` | `/api/health` | Liveness; `?db=1` doet ook een DB-ping (geen auth) |
 | `GET` | `/api/products` | Actieve producten waarvoor de tokengebruiker eigenaar of teamlid is |
-| `GET` | `/api/products/:id/next-story` | Hoogst geprioriteerde open story uit de actieve sprint |
-| `GET` | `/api/products/:id/claude-context` | Bundled product / actieve sprint / next-story (met tasks) / open ideas voor MCP |
+| `GET` | `/api/products/:id/next-story` | Volgende story uit de actieve sprint |
 | `GET` | `/api/sprints/:id/tasks?limit=10` | Eerste taken van een sprint |
 | `PATCH` | `/api/stories/:id/tasks/reorder` | Taakvolgorde aanpassen; alle IDs moeten bij de story horen |
 | `POST` | `/api/stories/:id/log` | Implementatieplan, testresultaat of commit vastleggen |
-| `PATCH` | `/api/tasks/:id` | Taakstatus of `implementation_plan` bijwerken |
-| `GET / POST` | `/api/ideas` · `GET / PATCH /api/ideas/:id` | Idea CRUD (M12 — vervangt voormalige `/api/todos`) |
-| `GET` | `/api/jobs/:id/sub-tasks` | `sprint_task_executions` van een SPRINT_IMPLEMENTATION-job |
-| `GET` | `/api/users/:id/avatar` | Avatar van een specifieke gebruiker |
-| `POST / GET` | `/api/profile/avatar` | Eigen avatar uploaden of opvragen |
-
-Daarnaast leveren `/api/realtime/{backlog,solo,jobs,notifications}` SSE-streams en zijn er auth-helpers `/api/auth/pair/*` (QR-pairing, M10), interne push-routes onder `/api/internal/push/*`, en cron-handlers (`/api/cron/cleanup-agent-artifacts`, `/api/cron/expire-questions`).
+| `PATCH` | `/api/tasks/:id` | Taakstatus of implementatieplan bijwerken |
+| `POST` | `/api/todos` | Todo aanmaken binnen een productcontext |

 ### Security-regels

@ -287,4 +287,5 @@ De productieomgeving is gericht op Vercel + Neon.

 - [Functionele specificatie](docs/specs/functional.md)
 - [Technische architectuur](docs/architecture.md)
+- [Backlog](docs/backlog/index.md)
 - [Agent-instructie audit](docs/decisions/agent-instructions-history.md)
--- a/tests/actions/active-sprint-action.test.ts
+++ b/tests/actions/active-sprint-action.test.ts
@ -1,103 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-vi.mock('next/cache', () => ({ revalidatePath: vi.fn() }))
-vi.mock('next/headers', () => ({
-  cookies: vi.fn().mockResolvedValue({
-    set: vi.fn(),
-    get: vi.fn(),
-    delete: vi.fn(),
-  }),
-}))
-vi.mock('iron-session', () => ({
-  getIronSession: vi.fn().mockResolvedValue({ userId: 'user-1', isDemo: false }),
-}))
-vi.mock('@/lib/session', () => ({
-  sessionOptions: { cookieName: 'test', password: 'test' },
-}))
-vi.mock('@/lib/product-access', () => ({
-  productAccessFilter: vi.fn().mockReturnValue({}),
-}))
-vi.mock('@/lib/prisma', () => ({
-  prisma: {
-    sprint: { findFirst: vi.fn() },
-    product: { findFirst: vi.fn() },
-    user: {
-      findUnique: vi.fn(),
-      update: vi.fn().mockResolvedValue({}),
-    },
-    $executeRaw: vi.fn().mockResolvedValue(1),
-  },
-}))
-
-import { prisma } from '@/lib/prisma'
-import { clearActiveSprintAction } from '@/actions/active-sprint'
-
-const mockPrisma = prisma as unknown as {
-  product: { findFirst: ReturnType<typeof vi.fn> }
-  user: {
-    findUnique: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
-}
-
-describe('clearActiveSprintAction', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('writes null instead of deleting the key', async () => {
-    mockPrisma.product.findFirst.mockResolvedValueOnce({ id: 'p1' })
-    mockPrisma.user.findUnique.mockResolvedValueOnce({
-      settings: { layout: { activeSprints: { p1: 'sprint-1', p2: 'sprint-2' } } },
-    })
-
-    const result = await clearActiveSprintAction('p1')
-
-    expect(result).toEqual({ success: true })
-    const updateArg = mockPrisma.user.update.mock.calls[0][0] as {
-      data: { settings: { layout?: { activeSprints?: Record<string, string | null> } } }
-    }
-    expect(updateArg.data.settings.layout?.activeSprints).toEqual({
-      p1: null,
-      p2: 'sprint-2',
-    })
-  })
-
-  it('preserves other product keys when clearing one', async () => {
-    mockPrisma.product.findFirst.mockResolvedValueOnce({ id: 'p1' })
-    mockPrisma.user.findUnique.mockResolvedValueOnce({
-      settings: {
-        layout: {
-          activeSprints: { p1: 'sprint-1', p2: 'sprint-2', p3: null },
-        },
-      },
-    })
-
-    await clearActiveSprintAction('p1')
-
-    const updateArg = mockPrisma.user.update.mock.calls[0][0] as {
-      data: { settings: { layout?: { activeSprints?: Record<string, string | null> } } }
-    }
-    expect(updateArg.data.settings.layout?.activeSprints).toEqual({
-      p1: null,
-      p2: 'sprint-2',
-      p3: null,
-    })
-  })
-
-  it('rejects when product is not accessible', async () => {
-    mockPrisma.product.findFirst.mockResolvedValueOnce(null)
-
-    const result = await clearActiveSprintAction('p1')
-
-    expect(result).toEqual({ error: 'Product niet gevonden of niet toegankelijk' })
-    expect(mockPrisma.user.update).not.toHaveBeenCalled()
-  })
-
-  it('rejects invalid productId', async () => {
-    const result = await clearActiveSprintAction('')
-
-    expect(result).toEqual({ error: 'Ongeldig product-id' })
-    expect(mockPrisma.user.update).not.toHaveBeenCalled()
-  })
-})
--- a/tests/actions/auth.test.ts
+++ b/tests/actions/auth.test.ts
@ -1,141 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-const {
-  redirectMock,
-  verifyUserMock,
-  headerGetMock,
-  sessionSaveMock,
-  requireSessionMock,
-  prismaUserUpdateMock,
-  prismaUserRoleFindFirstMock,
-} = vi.hoisted(() => ({
-  redirectMock: vi.fn((path: string) => { throw new Error(`REDIRECT:${path}`) }),
-  verifyUserMock: vi.fn(),
-  headerGetMock: vi.fn(),
-  sessionSaveMock: vi.fn(),
-  requireSessionMock: vi.fn(),
-  prismaUserUpdateMock: vi.fn(),
-  prismaUserRoleFindFirstMock: vi.fn().mockResolvedValue(null),
-}))
-
-vi.mock('next/navigation', () => ({ redirect: redirectMock }))
-vi.mock('next/headers', () => ({
-  cookies: vi.fn().mockResolvedValue({}),
-  headers: vi.fn().mockResolvedValue({ get: headerGetMock }),
-}))
-vi.mock('iron-session', () => ({
-  getIronSession: vi.fn().mockResolvedValue({
-    userId: '',
-    isDemo: false,
-    save: sessionSaveMock,
-  }),
-}))
-vi.mock('@/lib/session', () => ({ sessionOptions: { cookieName: 't', password: 't' } }))
-vi.mock('@/lib/auth', () => ({
-  verifyUser: verifyUserMock,
-  registerUser: vi.fn(),
-  hashPassword: vi.fn().mockResolvedValue('hashed'),
-}))
-vi.mock('@/lib/auth-guard', () => ({ requireSession: requireSessionMock }))
-vi.mock('@/lib/prisma', () => ({
-  prisma: {
-    user: { update: prismaUserUpdateMock },
-    userRole: { findFirst: prismaUserRoleFindFirstMock },
-  },
-}))
-vi.mock('@/lib/rate-limit', () => ({ checkRateLimit: vi.fn().mockReturnValue(true) }))
-
-import { loginAction, resetPasswordAction } from '@/actions/auth'
-
-const IPHONE_UA = 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_4 like Mac OS X) Mobile/15E148 Safari/604.1'
-const IPAD_UA = 'Mozilla/5.0 (iPad; CPU OS 17_4 like Mac OS X) Safari/604.1'
-const DESKTOP_UA = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 14_4) Chrome/124.0.0.0 Safari/537.36'
-
-function fd(username: string, password: string) {
-  const f = new FormData()
-  f.set('username', username)
-  f.set('password', password)
-  return f
-}
-
-beforeEach(() => {
-  redirectMock.mockClear()
-  verifyUserMock.mockReset()
-  headerGetMock.mockReset()
-  sessionSaveMock.mockReset()
-  requireSessionMock.mockReset()
-  prismaUserUpdateMock.mockReset()
-  prismaUserRoleFindFirstMock.mockResolvedValue(null)
-})
-
-describe('loginAction UA-redirect', () => {
-  it('phone-UA + actief product → /m/products/[id]/solo', async () => {
-    verifyUserMock.mockResolvedValue({ id: 'u1', is_demo: false, active_product_id: 'p1' })
-    headerGetMock.mockReturnValue(IPHONE_UA)
-    await expect(loginAction(undefined, fd('alice', 'secret123'))).rejects.toThrow('REDIRECT:/m/products/p1/solo')
-  })
-
-  it('phone-UA zonder actief product → /m/settings', async () => {
-    verifyUserMock.mockResolvedValue({ id: 'u1', is_demo: false, active_product_id: null })
-    headerGetMock.mockReturnValue(IPHONE_UA)
-    await expect(loginAction(undefined, fd('alice', 'secret123'))).rejects.toThrow('REDIRECT:/m/settings')
-  })
-
-  it('tablet-UA (iPad) → /dashboard', async () => {
-    verifyUserMock.mockResolvedValue({ id: 'u1', is_demo: false, active_product_id: 'p1' })
-    headerGetMock.mockReturnValue(IPAD_UA)
-    await expect(loginAction(undefined, fd('alice', 'secret123'))).rejects.toThrow('REDIRECT:/dashboard')
-  })
-
-  it('desktop-UA → /dashboard', async () => {
-    verifyUserMock.mockResolvedValue({ id: 'u1', is_demo: false, active_product_id: 'p1' })
-    headerGetMock.mockReturnValue(DESKTOP_UA)
-    await expect(loginAction(undefined, fd('alice', 'secret123'))).rejects.toThrow('REDIRECT:/dashboard')
-  })
-
-  it('geen UA-header → /dashboard', async () => {
-    verifyUserMock.mockResolvedValue({ id: 'u1', is_demo: false, active_product_id: 'p1' })
-    headerGetMock.mockReturnValue(null)
-    await expect(loginAction(undefined, fd('alice', 'secret123'))).rejects.toThrow('REDIRECT:/dashboard')
-  })
-
-  it('demo-user op phone volgt dezelfde routing', async () => {
-    verifyUserMock.mockResolvedValue({ id: 'demo', is_demo: true, active_product_id: 'p1' })
-    headerGetMock.mockReturnValue(IPHONE_UA)
-    await expect(loginAction(undefined, fd('demo', 'demo123pw'))).rejects.toThrow('REDIRECT:/m/products/p1/solo')
-  })
-})
-
-describe('resetPasswordAction', () => {
-  function fdReset(password: string, confirm: string) {
-    const f = new FormData()
-    f.set('password', password)
-    f.set('confirm', confirm)
-    return f
-  }
-
-  it('redirect /dashboard na succesvolle reset', async () => {
-    requireSessionMock.mockResolvedValue({ userId: 'u1' })
-    prismaUserUpdateMock.mockResolvedValue({})
-    await expect(resetPasswordAction(undefined, fdReset('nieuwpass1', 'nieuwpass1'))).rejects.toThrow('REDIRECT:/dashboard')
-    expect(prismaUserUpdateMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        where: { id: 'u1' },
-        data: expect.objectContaining({ password_hash: 'hashed', must_reset_password: false }),
-      })
-    )
-  })
-
-  it('fout als wachtwoorden niet overeenkomen', async () => {
-    requireSessionMock.mockResolvedValue({ userId: 'u1' })
-    const result = await resetPasswordAction(undefined, fdReset('nieuwpass1', 'anderpass1'))
-    expect(result).toMatchObject({ error: expect.objectContaining({ confirm: expect.any(Array) }) })
-    expect(prismaUserUpdateMock).not.toHaveBeenCalled()
-  })
-
-  it('fout als wachtwoord te kort is', async () => {
-    requireSessionMock.mockResolvedValue({ userId: 'u1' })
-    const result = await resetPasswordAction(undefined, fdReset('kort', 'kort'))
-    expect(result).toMatchObject({ error: expect.objectContaining({ password: expect.any(Array) }) })
-  })
-})
--- a/tests/actions/claude-jobs-batch.test.ts
+++ b/tests/actions/claude-jobs-batch.test.ts
@ -1,29 +1,232 @@
 /**
- * Per-task batch enqueue is gedeprecateerd ten gunste van startSprintRunAction
- * (zie actions/sprint-runs.ts). De functies blijven exporteerbaar als stub voor
- * backwards-compat met UI-componenten die in F4 worden vervangen.
+ * Uitgebreide integratie-stijl tests voor previewEnqueueAllAction en
+ * enqueueClaudeJobsBatchAction. Gebruikt realistische seed-data:
+ * 2 PBIs, elk met 1 story, elk 2 taken (4 taken totaal in PBI-volgorde).
 */
-import { describe, it, expect, vi } from 'vitest'
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+
+const {
+  mockGetSession,
+  mockFindFirstProduct,
+  mockFindFirstSprint,
+  mockFindManyTask,
+  mockTransaction,
+  mockExecuteRaw,
+} = vi.hoisted(() => ({
+  mockGetSession: vi.fn(),
+  mockFindFirstProduct: vi.fn(),
+  mockFindFirstSprint: vi.fn(),
+  mockFindManyTask: vi.fn(),
+  mockTransaction: vi.fn(),
+  mockExecuteRaw: vi.fn().mockResolvedValue(undefined),
+}))

 vi.mock('next/cache', () => ({ revalidatePath: vi.fn() }))
-vi.mock('@/lib/auth', () => ({ getSession: vi.fn() }))
-vi.mock('@/lib/prisma', () => ({ prisma: {} }))
+vi.mock('@/lib/auth', () => ({ getSession: mockGetSession }))
+vi.mock('@/lib/prisma', () => ({
+  prisma: {
+    task: { findMany: mockFindManyTask },
+    product: { findFirst: mockFindFirstProduct },
+    sprint: { findFirst: mockFindFirstSprint },
+    claudeJob: { create: vi.fn() },
+    $executeRaw: mockExecuteRaw,
+    $transaction: mockTransaction,
+  },
+}))

-import {
-  previewEnqueueAllAction,
-  enqueueClaudeJobsBatchAction,
-} from '@/actions/claude-jobs'
+import { previewEnqueueAllAction, enqueueClaudeJobsBatchAction } from '@/actions/claude-jobs'

-describe('previewEnqueueAllAction (deprecated)', () => {
-  it('retourneert een deprecation-error', async () => {
-    const result = await previewEnqueueAllAction('prod-1')
-    expect(result).toMatchObject({ error: expect.stringContaining('vervangen') })
+const SESSION_USER = { userId: 'user-1', isDemo: false }
+const SESSION_DEMO = { userId: 'demo-1', isDemo: true }
+const PRODUCT_ID = 'product-1'
+const SPRINT_ID = 'sprint-1'
+
+// --- Seed helpers ---
+const makePbi1Task = (id: string, status = 'TO_DO') => ({
+  id,
+  title: `PBI-1 Taak ${id}`,
+  status,
+  story: {
+    id: 'story-pbi1',
+    title: 'Story van PBI 1',
+    code: 'ST-1',
+    pbi: { id: 'pbi-1', status: 'READY', priority: 1, sort_order: 1.0 },
+  },
+})
+
+const makePbi2Task = (id: string, status = 'TO_DO', pbiStatus = 'READY') => ({
+  id,
+  title: `PBI-2 Taak ${id}`,
+  status,
+  story: {
+    id: 'story-pbi2',
+    title: 'Story van PBI 2',
+    code: 'ST-2',
+    pbi: { id: 'pbi-2', status: pbiStatus, priority: 2, sort_order: 2.0 },
+  },
+})
+
+const makeBatchTask = (id: string, hasActiveJob = false) => ({
+  id,
+  claude_jobs: hasActiveJob ? [{ id: 'job-active' }] : [],
+})
+
+// Canonical seed: [pbi1-t1, pbi1-t2, pbi2-t1, pbi2-t2]
+const SEED_ALL_TODO = [
+  makePbi1Task('pbi1-t1'),
+  makePbi1Task('pbi1-t2'),
+  makePbi2Task('pbi2-t1'),
+  makePbi2Task('pbi2-t2'),
+]
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  mockExecuteRaw.mockResolvedValue(undefined)
+  mockGetSession.mockResolvedValue(SESSION_USER)
+  mockFindFirstProduct.mockResolvedValue({ id: PRODUCT_ID })
+  mockFindFirstSprint.mockResolvedValue({ id: SPRINT_ID })
+})
+
+// =============================================================
+//  previewEnqueueAllAction
+// =============================================================
+describe('previewEnqueueAllAction — 2 PBI scenario', () => {
+  it('geen blocker: alle 4 TO_DO taken → tasks=[4], blockerIndex=null', async () => {
+    mockFindManyTask.mockResolvedValue(SEED_ALL_TODO)
+
+    const result = await previewEnqueueAllAction(PRODUCT_ID)
+
+    expect(result).toMatchObject({ blockerIndex: null, blockerReason: null })
+    if (!('error' in result)) {
+      expect(result.tasks).toHaveLength(4)
+      expect(result.tasks.map(t => t.id)).toEqual(['pbi1-t1', 'pbi1-t2', 'pbi2-t1', 'pbi2-t2'])
+    }
+  })
+
+  it('3e taak (pbi2-t1) REVIEW → blockerIndex=2, reden=task-review, tasks=[3]', async () => {
+    mockFindManyTask.mockResolvedValue([
+      makePbi1Task('pbi1-t1'),
+      makePbi1Task('pbi1-t2'),
+      makePbi2Task('pbi2-t1', 'REVIEW'),
+      makePbi2Task('pbi2-t2'),
+    ])
+
+    const result = await previewEnqueueAllAction(PRODUCT_ID)
+
+    expect(result).toMatchObject({ blockerIndex: 2, blockerReason: 'task-review' })
+    if (!('error' in result)) {
+      expect(result.tasks).toHaveLength(3)
+      expect(result.tasks[2].id).toBe('pbi2-t1')
+    }
+  })
+
+  it('PBI 1 BLOCKED → blockerIndex=0, reden=pbi-blocked, tasks=[1]', async () => {
+    mockFindManyTask.mockResolvedValue([
+      makePbi1Task('pbi1-t1', 'TO_DO'),
+      makePbi1Task('pbi1-t2', 'TO_DO'),
+      makePbi2Task('pbi2-t1'),
+      makePbi2Task('pbi2-t2'),
+    ].map((t, i) => i < 2 ? { ...t, story: { ...t.story, pbi: { ...t.story.pbi, status: 'BLOCKED' } } } : t))
+
+    const result = await previewEnqueueAllAction(PRODUCT_ID)
+
+    expect(result).toMatchObject({ blockerIndex: 0, blockerReason: 'pbi-blocked' })
+    if (!('error' in result)) expect(result.tasks).toHaveLength(1)
+  })
+
+  it('ACTIVE job op pbi1-t1 → geskipt door where-clause, geen blocker bij resterende 3', async () => {
+    // Simuleert dat pbi1-t1 een actieve job heeft: de where-clause sluit die taak uit
+    mockFindManyTask.mockResolvedValue([
+      makePbi1Task('pbi1-t2'),
+      makePbi2Task('pbi2-t1'),
+      makePbi2Task('pbi2-t2'),
+    ])
+
+    const result = await previewEnqueueAllAction(PRODUCT_ID)
+
+    expect(result).toMatchObject({ blockerIndex: null, blockerReason: null })
+    if (!('error' in result)) {
+      expect(result.tasks).toHaveLength(3)
+      expect(result.tasks[0].id).toBe('pbi1-t2')
+    }
+  })
+
+  it('ACTIVE job op pbi1-t1 AND pbi2-t1 REVIEW → blockerIndex=1 in resterende array', async () => {
+    mockFindManyTask.mockResolvedValue([
+      makePbi1Task('pbi1-t2'),
+      makePbi2Task('pbi2-t1', 'REVIEW'),
+      makePbi2Task('pbi2-t2'),
+    ])
+
+    const result = await previewEnqueueAllAction(PRODUCT_ID)
+
+    expect(result).toMatchObject({ blockerIndex: 1, blockerReason: 'task-review' })
+    if (!('error' in result)) expect(result.tasks).toHaveLength(2)
+  })
+
+  it('demo-user → error, findMany niet aangeroepen', async () => {
+    mockGetSession.mockResolvedValue(SESSION_DEMO)
+
+    const result = await previewEnqueueAllAction(PRODUCT_ID)
+
+    expect(result).toMatchObject({ error: expect.stringContaining('demo') })
+    expect(mockFindManyTask).not.toHaveBeenCalled()
  })
 })

-describe('enqueueClaudeJobsBatchAction (deprecated)', () => {
-  it('retourneert een deprecation-error', async () => {
-    const result = await enqueueClaudeJobsBatchAction('prod-1', ['t1', 't2'])
-    expect(result).toMatchObject({ error: expect.stringContaining('Start Sprint') })
+// =============================================================
+//  enqueueClaudeJobsBatchAction
+// =============================================================
+describe('enqueueClaudeJobsBatchAction — 2 PBI scenario', () => {
+  it('happy path: 2 taskIds → 2 QUEUED ClaudeJobs in invoervolgorde', async () => {
+    mockFindManyTask.mockResolvedValue([
+      makeBatchTask('pbi1-t1'),
+      makeBatchTask('pbi2-t1'),
+    ])
+    mockTransaction.mockResolvedValue([
+      { id: 'job-a', task_id: 'pbi1-t1' },
+      { id: 'job-b', task_id: 'pbi2-t1' },
+    ])
+
+    const result = await enqueueClaudeJobsBatchAction(PRODUCT_ID, ['pbi1-t1', 'pbi2-t1'])
+
+    expect(result).toEqual({ success: true, count: 2 })
+    expect(mockExecuteRaw).toHaveBeenCalledTimes(2)
+  })
+
+  it('IDOR: taskId van niet-toegewezen story → error, geen transaction', async () => {
+    // Authorized tasks bevat maar 1 van de 2 gevraagde IDs
+    mockFindManyTask.mockResolvedValue([makeBatchTask('pbi1-t1')])
+
+    const result = await enqueueClaudeJobsBatchAction(PRODUCT_ID, ['pbi1-t1', 'other-user-task'])
+
+    expect(result).toMatchObject({ error: expect.stringContaining('niet toegankelijk') })
+    expect(mockTransaction).not.toHaveBeenCalled()
+  })
+
+  it('taak met ACTIVE job wordt overgeslagen (idempotent)', async () => {
+    mockFindManyTask.mockResolvedValue([
+      makeBatchTask('pbi1-t1'),
+      makeBatchTask('pbi1-t2', true), // heeft actieve job → skip
+      makeBatchTask('pbi2-t1'),
+    ])
+    mockTransaction.mockResolvedValue([
+      { id: 'job-a', task_id: 'pbi1-t1' },
+      { id: 'job-b', task_id: 'pbi2-t1' },
+    ])
+
+    const result = await enqueueClaudeJobsBatchAction(PRODUCT_ID, ['pbi1-t1', 'pbi1-t2', 'pbi2-t1'])
+
+    expect(result).toEqual({ success: true, count: 2 })
+    expect(mockExecuteRaw).toHaveBeenCalledTimes(2)
+  })
+
+  it('demo-user → error, geen transaction', async () => {
+    mockGetSession.mockResolvedValue(SESSION_DEMO)
+
+    const result = await enqueueClaudeJobsBatchAction(PRODUCT_ID, ['t1'])
+
+    expect(result).toMatchObject({ error: expect.stringContaining('demo') })
+    expect(mockTransaction).not.toHaveBeenCalled()
  })
 })
--- a/tests/actions/claude-jobs.test.ts
+++ b/tests/actions/claude-jobs.test.ts
@ -1,46 +1,47 @@
-/**
- * Per-task enqueue-acties zijn gedeprecateerd. cancelClaudeJobAction blijft
- * actief — gebruikt voor het annuleren van losse jobs (bv. idea-jobs).
- */
 import { describe, it, expect, vi, beforeEach } from 'vitest'

 const {
  mockGetSession,
+  mockFindFirstTask,
+  mockFindManyTask,
+  mockFindFirstProduct,
+  mockFindFirstSprint,
  mockFindFirstJob,
+  mockCreateJob,
  mockUpdateJob,
-  mockUpdateManyJob,
-  mockUpdateManySprintTaskExecution,
-  mockTransaction,
  mockExecuteRaw,
-} = vi.hoisted(() => {
-  const mockUpdateManyJob = vi.fn()
-  const mockUpdateManySprintTaskExecution = vi.fn()
-  const mockTransaction = vi.fn()
-  return {
-    mockGetSession: vi.fn(),
-    mockFindFirstJob: vi.fn(),
-    mockUpdateJob: vi.fn(),
-    mockUpdateManyJob,
-    mockUpdateManySprintTaskExecution,
-    mockTransaction,
-    mockExecuteRaw: vi.fn().mockResolvedValue(undefined),
-  }
-})
+  mockTransaction,
+} = vi.hoisted(() => ({
+  mockGetSession: vi.fn(),
+  mockFindFirstTask: vi.fn(),
+  mockFindManyTask: vi.fn(),
+  mockFindFirstProduct: vi.fn(),
+  mockFindFirstSprint: vi.fn(),
+  mockFindFirstJob: vi.fn(),
+  mockCreateJob: vi.fn(),
+  mockUpdateJob: vi.fn(),
+  mockExecuteRaw: vi.fn().mockResolvedValue(undefined),
+  mockTransaction: vi.fn(),
+}))

 vi.mock('next/cache', () => ({ revalidatePath: vi.fn() }))
-vi.mock('@/lib/auth', () => ({ getSession: mockGetSession }))
+
+vi.mock('@/lib/auth', () => ({
+  getSession: mockGetSession,
+}))
+
 vi.mock('@/lib/prisma', () => ({
  prisma: {
+    task: { findFirst: mockFindFirstTask, findMany: mockFindManyTask },
+    product: { findFirst: mockFindFirstProduct },
+    sprint: { findFirst: mockFindFirstSprint },
    claudeJob: {
      findFirst: mockFindFirstJob,
+      create: mockCreateJob,
      update: mockUpdateJob,
-      updateMany: mockUpdateManyJob,
    },
-    sprintTaskExecution: {
-      updateMany: mockUpdateManySprintTaskExecution,
-    },
-    $transaction: mockTransaction,
    $executeRaw: mockExecuteRaw,
+    $transaction: mockTransaction,
  },
 }))

@ -48,194 +49,394 @@ import {
  enqueueClaudeJobAction,
  enqueueAllTodoJobsAction,
  cancelClaudeJobAction,
-  restartClaudeJobAction,
+  previewEnqueueAllAction,
+  enqueueClaudeJobsBatchAction,
 } from '@/actions/claude-jobs'

 const SESSION_USER = { userId: 'user-1', isDemo: false }

+const SESSION_DEMO = { userId: 'demo-1', isDemo: true }
+const TASK_ID = 'task-cuid-1'
+const JOB_ID = 'job-cuid-1'
+const PRODUCT_ID = 'product-cuid-1'
+
+const MOCK_TASK = { id: TASK_ID, story: { product_id: PRODUCT_ID } }
+const MOCK_JOB_QUEUED = { id: JOB_ID, status: 'QUEUED' as const, task_id: TASK_ID, product_id: PRODUCT_ID }
+
 beforeEach(() => {
  vi.clearAllMocks()
  mockExecuteRaw.mockResolvedValue(undefined)
-  mockTransaction.mockImplementation(async (fn: (tx: unknown) => Promise<unknown>) =>
-    fn({
-      claudeJob: { updateMany: mockUpdateManyJob },
-      sprintTaskExecution: { updateMany: mockUpdateManySprintTaskExecution },
-    })
-  )
 })

-describe('enqueueClaudeJobAction (deprecated)', () => {
-  it('retourneert een deprecation-error', async () => {
-    const result = await enqueueClaudeJobAction('task-1')
-    expect(result).toMatchObject({ error: expect.stringContaining('Start Sprint') })
+describe('enqueueClaudeJobAction', () => {
+  it('happy path: creates job with QUEUED status', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstTask.mockResolvedValue(MOCK_TASK)
+    mockFindFirstJob.mockResolvedValue(null)
+    mockCreateJob.mockResolvedValue({ id: JOB_ID })
+
+    const result = await enqueueClaudeJobAction(TASK_ID)
+
+    expect(result).toEqual({ success: true, jobId: JOB_ID })
+    expect(mockCreateJob).toHaveBeenCalledWith(
+      expect.objectContaining({ data: expect.objectContaining({ status: 'QUEUED', task_id: TASK_ID }) })
+    )
+  })
+
+  it('blocks demo user', async () => {
+    mockGetSession.mockResolvedValue(SESSION_DEMO)
+
+    const result = await enqueueClaudeJobAction(TASK_ID)
+
+    expect(result).toMatchObject({ error: 'Niet beschikbaar in demo-modus' })
+    expect(mockCreateJob).not.toHaveBeenCalled()
+  })
+
+  it('returns error when task not found', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstTask.mockResolvedValue(null)
+
+    const result = await enqueueClaudeJobAction(TASK_ID)
+
+    expect(result).toMatchObject({ error: 'Task niet gevonden' })
+    expect(mockCreateJob).not.toHaveBeenCalled()
+  })
+
+  it('idempotency: returns existing jobId when QUEUED job exists', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstTask.mockResolvedValue(MOCK_TASK)
+    mockFindFirstJob.mockResolvedValue({ id: JOB_ID })
+
+    const result = await enqueueClaudeJobAction(TASK_ID)
+
+    expect(result).toMatchObject({ error: 'Er loopt al een agent voor deze task', jobId: JOB_ID })
+    expect(mockCreateJob).not.toHaveBeenCalled()
+  })
+
+  it('allows new enqueue after terminal (DONE) job', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstTask.mockResolvedValue(MOCK_TASK)
+    mockFindFirstJob.mockResolvedValue(null) // no active job
+    mockCreateJob.mockResolvedValue({ id: 'new-job-id' })
+
+    const result = await enqueueClaudeJobAction(TASK_ID)
+
+    expect(result).toEqual({ success: true, jobId: 'new-job-id' })
  })
 })

-describe('enqueueAllTodoJobsAction (deprecated)', () => {
-  it('retourneert een deprecation-error', async () => {
-    const result = await enqueueAllTodoJobsAction('prod-1')
-    expect(result).toMatchObject({ error: expect.stringContaining('Start Sprint') })
+describe('enqueueAllTodoJobsAction', () => {
+  it('happy path: scopes to active sprint + assignee, queues all queueable tasks', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstProduct.mockResolvedValue({ id: PRODUCT_ID })
+    mockFindFirstSprint.mockResolvedValue({ id: 'sprint-1' })
+    mockFindManyTask.mockResolvedValue([{ id: 'task-a' }, { id: 'task-b' }])
+    mockTransaction.mockResolvedValue([
+      { id: 'job-a', task_id: 'task-a' },
+      { id: 'job-b', task_id: 'task-b' },
+    ])
+
+    const result = await enqueueAllTodoJobsAction(PRODUCT_ID)
+
+    expect(result).toEqual({ success: true, count: 2 })
+    expect(mockFindManyTask).toHaveBeenCalledWith(
+      expect.objectContaining({
+        where: expect.objectContaining({
+          status: 'TO_DO',
+          story: { sprint_id: 'sprint-1', assignee_id: SESSION_USER.userId },
+        }),
+      })
+    )
+    expect(mockExecuteRaw).toHaveBeenCalledTimes(2)
+  })
+
+  it('returns count=0 when product has no active sprint', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstProduct.mockResolvedValue({ id: PRODUCT_ID })
+    mockFindFirstSprint.mockResolvedValue(null)
+
+    const result = await enqueueAllTodoJobsAction(PRODUCT_ID)
+
+    expect(result).toEqual({ success: true, count: 0 })
+    expect(mockFindManyTask).not.toHaveBeenCalled()
+    expect(mockTransaction).not.toHaveBeenCalled()
+  })
+
+  it('returns count=0 when no queueable tasks in sprint+assignee scope', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstProduct.mockResolvedValue({ id: PRODUCT_ID })
+    mockFindFirstSprint.mockResolvedValue({ id: 'sprint-1' })
+    mockFindManyTask.mockResolvedValue([])
+
+    const result = await enqueueAllTodoJobsAction(PRODUCT_ID)
+
+    expect(result).toEqual({ success: true, count: 0 })
+    expect(mockTransaction).not.toHaveBeenCalled()
+    expect(mockExecuteRaw).not.toHaveBeenCalled()
+  })
+
+  it('blocks demo user', async () => {
+    mockGetSession.mockResolvedValue(SESSION_DEMO)
+
+    const result = await enqueueAllTodoJobsAction(PRODUCT_ID)
+
+    expect(result).toMatchObject({ error: 'Niet beschikbaar in demo-modus' })
+    expect(mockTransaction).not.toHaveBeenCalled()
+  })
+
+  it('returns error when product not accessible', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstProduct.mockResolvedValue(null)
+
+    const result = await enqueueAllTodoJobsAction(PRODUCT_ID)
+
+    expect(result).toMatchObject({ error: 'Geen toegang tot dit product' })
+    expect(mockTransaction).not.toHaveBeenCalled()
+  })
+})
+
+const makePbiTask = (id: string, status: string, pbiStatus = 'READY') => ({
+  id,
+  title: `Task ${id}`,
+  status,
+  story: { id: 'story-1', title: 'Story 1', code: 'ST-1', pbi: { id: 'pbi-1', status: pbiStatus, priority: 1, sort_order: 1.0 } },
+})
+
+describe('previewEnqueueAllAction', () => {
+  it('blocks demo user', async () => {
+    mockGetSession.mockResolvedValue(SESSION_DEMO)
+
+    const result = await previewEnqueueAllAction(PRODUCT_ID)
+
+    expect(result).toMatchObject({ error: 'Niet beschikbaar in demo-modus' })
+    expect(mockFindManyTask).not.toHaveBeenCalled()
+  })
+
+  it('returns error when product not accessible', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstProduct.mockResolvedValue(null)
+
+    const result = await previewEnqueueAllAction(PRODUCT_ID)
+
+    expect(result).toMatchObject({ error: 'Geen toegang tot dit product' })
+    expect(mockFindManyTask).not.toHaveBeenCalled()
+  })
+
+  it('returns empty tasks when no active sprint', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstProduct.mockResolvedValue({ id: PRODUCT_ID })
+    mockFindFirstSprint.mockResolvedValue(null)
+
+    const result = await previewEnqueueAllAction(PRODUCT_ID)
+
+    expect(result).toEqual({ tasks: [], blockerIndex: null, blockerReason: null })
+    expect(mockFindManyTask).not.toHaveBeenCalled()
+  })
+
+  it('returns all tasks with no blocker when only TO_DO tasks', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstProduct.mockResolvedValue({ id: PRODUCT_ID })
+    mockFindFirstSprint.mockResolvedValue({ id: 'sprint-1' })
+    mockFindManyTask.mockResolvedValue([
+      makePbiTask('t1', 'TO_DO'),
+      makePbiTask('t2', 'TO_DO'),
+    ])
+
+    const result = await previewEnqueueAllAction(PRODUCT_ID)
+
+    expect(result).toMatchObject({ blockerIndex: null, blockerReason: null })
+    if (!('error' in result)) expect(result.tasks).toHaveLength(2)
+  })
+
+  it('detects REVIEW task as blocker at correct index', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstProduct.mockResolvedValue({ id: PRODUCT_ID })
+    mockFindFirstSprint.mockResolvedValue({ id: 'sprint-1' })
+    mockFindManyTask.mockResolvedValue([
+      makePbiTask('t1', 'TO_DO'),
+      makePbiTask('t2', 'TO_DO'),
+      makePbiTask('t3', 'REVIEW'),
+      makePbiTask('t4', 'TO_DO'),
+    ])
+
+    const result = await previewEnqueueAllAction(PRODUCT_ID)
+
+    expect(result).toMatchObject({ blockerIndex: 2, blockerReason: 'task-review' })
+    if (!('error' in result)) expect(result.tasks).toHaveLength(3)
+  })
+
+  it('detects BLOCKED PBI as blocker at first task of that PBI', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstProduct.mockResolvedValue({ id: PRODUCT_ID })
+    mockFindFirstSprint.mockResolvedValue({ id: 'sprint-1' })
+    mockFindManyTask.mockResolvedValue([
+      makePbiTask('t1', 'TO_DO', 'BLOCKED'),
+      makePbiTask('t2', 'TO_DO', 'BLOCKED'),
+    ])
+
+    const result = await previewEnqueueAllAction(PRODUCT_ID)
+
+    expect(result).toMatchObject({ blockerIndex: 0, blockerReason: 'pbi-blocked' })
+    if (!('error' in result)) expect(result.tasks).toHaveLength(1)
+  })
+
+  it('queries without TO_DO filter to expose REVIEW tasks', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstProduct.mockResolvedValue({ id: PRODUCT_ID })
+    mockFindFirstSprint.mockResolvedValue({ id: 'sprint-1' })
+    mockFindManyTask.mockResolvedValue([])
+
+    await previewEnqueueAllAction(PRODUCT_ID)
+
+    expect(mockFindManyTask).toHaveBeenCalledWith(
+      expect.objectContaining({
+        where: expect.not.objectContaining({ status: 'TO_DO' }),
+      })
+    )
+  })
+})
+
+const makeBatchTask = (id: string, hasActiveJob = false) => ({
+  id,
+  claude_jobs: hasActiveJob ? [{ id: 'job-active' }] : [],
+})
+
+describe('enqueueClaudeJobsBatchAction', () => {
+  it('happy path: 3 taskIds → 3 jobs in input order', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstProduct.mockResolvedValue({ id: PRODUCT_ID })
+    mockFindFirstSprint.mockResolvedValue({ id: 'sprint-1' })
+    mockFindManyTask.mockResolvedValue([
+      makeBatchTask('t1'),
+      makeBatchTask('t2'),
+      makeBatchTask('t3'),
+    ])
+    mockTransaction.mockResolvedValue([
+      { id: 'job-1', task_id: 't1' },
+      { id: 'job-2', task_id: 't2' },
+      { id: 'job-3', task_id: 't3' },
+    ])
+
+    const result = await enqueueClaudeJobsBatchAction(PRODUCT_ID, ['t1', 't2', 't3'])
+
+    expect(result).toEqual({ success: true, count: 3 })
+    expect(mockExecuteRaw).toHaveBeenCalledTimes(3)
+  })
+
+  it('blocks demo user', async () => {
+    mockGetSession.mockResolvedValue(SESSION_DEMO)
+
+    const result = await enqueueClaudeJobsBatchAction(PRODUCT_ID, ['t1'])
+
+    expect(result).toMatchObject({ error: 'Niet beschikbaar in demo-modus' })
+    expect(mockTransaction).not.toHaveBeenCalled()
+  })
+
+  it('returns error when product not accessible', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstProduct.mockResolvedValue(null)
+
+    const result = await enqueueClaudeJobsBatchAction(PRODUCT_ID, ['t1'])
+
+    expect(result).toMatchObject({ error: 'Geen toegang tot dit product' })
+    expect(mockTransaction).not.toHaveBeenCalled()
+  })
+
+  it('returns error when task belongs to another user (IDOR)', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstProduct.mockResolvedValue({ id: PRODUCT_ID })
+    mockFindFirstSprint.mockResolvedValue({ id: 'sprint-1' })
+    // Only 1 of 2 tasks authorized (other-user's task filtered out)
+    mockFindManyTask.mockResolvedValue([makeBatchTask('t1')])
+
+    const result = await enqueueClaudeJobsBatchAction(PRODUCT_ID, ['t1', 't-other-user'])
+
+    expect(result).toMatchObject({ error: 'Een of meer taken zijn niet toegankelijk voor deze gebruiker' })
+    expect(mockTransaction).not.toHaveBeenCalled()
+  })
+
+  it('skips tasks with active jobs (idempotent)', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstProduct.mockResolvedValue({ id: PRODUCT_ID })
+    mockFindFirstSprint.mockResolvedValue({ id: 'sprint-1' })
+    mockFindManyTask.mockResolvedValue([
+      makeBatchTask('t1'),
+      makeBatchTask('t2', true), // has active job — skip
+      makeBatchTask('t3'),
+    ])
+    mockTransaction.mockResolvedValue([
+      { id: 'job-1', task_id: 't1' },
+      { id: 'job-3', task_id: 't3' },
+    ])
+
+    const result = await enqueueClaudeJobsBatchAction(PRODUCT_ID, ['t1', 't2', 't3'])
+
+    expect(result).toEqual({ success: true, count: 2 })
+    expect(mockExecuteRaw).toHaveBeenCalledTimes(2)
+  })
+
+  it('returns count=0 for empty taskIds', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+
+    const result = await enqueueClaudeJobsBatchAction(PRODUCT_ID, [])
+
+    expect(result).toEqual({ success: true, count: 0 })
+    expect(mockFindFirstProduct).not.toHaveBeenCalled()
  })
 })

 describe('cancelClaudeJobAction', () => {
-  it('cancelt een actieve job', async () => {
+  it('happy path: cancels QUEUED job', async () => {
    mockGetSession.mockResolvedValue(SESSION_USER)
-    mockFindFirstJob.mockResolvedValue({
-      id: 'job-1',
-      status: 'QUEUED',
-      task_id: 'task-1',
-      product_id: 'prod-1',
-    })
-    mockUpdateJob.mockResolvedValue(undefined)
+    mockFindFirstJob.mockResolvedValue(MOCK_JOB_QUEUED)
+    mockUpdateJob.mockResolvedValue({})

-    const result = await cancelClaudeJobAction('job-1')
+    const result = await cancelClaudeJobAction(JOB_ID)

    expect(result).toEqual({ success: true })
-    expect(mockUpdateJob).toHaveBeenCalledWith({
-      where: { id: 'job-1' },
-      data: expect.objectContaining({ status: 'CANCELLED' }),
-    })
+    expect(mockUpdateJob).toHaveBeenCalledWith(
+      expect.objectContaining({
+        where: { id: JOB_ID },
+        data: expect.objectContaining({ status: 'CANCELLED' }),
+      })
+    )
  })

-  it('weigert demo-sessie', async () => {
-    mockGetSession.mockResolvedValue({ userId: 'demo', isDemo: true })
+  it('demo user is blocked', async () => {
+    mockGetSession.mockResolvedValue(SESSION_DEMO)

-    const result = await cancelClaudeJobAction('job-1')
-    expect(result).toMatchObject({ error: expect.stringContaining('demo') })
+    const result = await cancelClaudeJobAction(JOB_ID)
+
+    expect(result).toMatchObject({ error: 'Niet beschikbaar in demo-modus' })
    expect(mockUpdateJob).not.toHaveBeenCalled()
  })

-  it('retourneert error als job niet gevonden', async () => {
+  it('returns error when job not found (ownership check)', async () => {
    mockGetSession.mockResolvedValue(SESSION_USER)
    mockFindFirstJob.mockResolvedValue(null)

-    const result = await cancelClaudeJobAction('nonexistent')
-    expect(result).toMatchObject({ error: expect.stringContaining('niet gevonden') })
+    const result = await cancelClaudeJobAction(JOB_ID)
+
+    expect(result).toMatchObject({ error: 'Job niet gevonden' })
+    expect(mockUpdateJob).not.toHaveBeenCalled()
  })

-  it('weigert wanneer job niet meer actief is', async () => {
+  it('returns error when cancelling terminal (DONE) job', async () => {
    mockGetSession.mockResolvedValue(SESSION_USER)
-    mockFindFirstJob.mockResolvedValue({
-      id: 'job-1',
-      status: 'DONE',
-      task_id: 'task-1',
-      product_id: 'prod-1',
-    })
+    mockFindFirstJob.mockResolvedValue({ ...MOCK_JOB_QUEUED, status: 'DONE' as const })

-    const result = await cancelClaudeJobAction('job-1')
-    expect(result).toMatchObject({ error: expect.stringContaining('actieve') })
-  })
-})
-
-describe('restartClaudeJobAction', () => {
-  const FAILED_JOB = {
-    id: 'job-1',
-    status: 'FAILED',
-    kind: 'TASK_IMPLEMENTATION',
-    task_id: 'task-1',
-    idea_id: null,
-    sprint_run_id: null,
-    product_id: 'prod-1',
-  }
-
-  it('reset een FAILED job naar QUEUED (happy path)', async () => {
-    mockGetSession.mockResolvedValue(SESSION_USER)
-    mockFindFirstJob.mockResolvedValue(FAILED_JOB)
-    mockUpdateManyJob.mockResolvedValue({ count: 1 })
-
-    const result = await restartClaudeJobAction('job-1')
-
-    expect(result).toEqual({ success: true })
-    expect(mockUpdateManyJob).toHaveBeenCalledWith(
-      expect.objectContaining({
-        where: expect.objectContaining({ id: 'job-1', status: { in: ['FAILED', 'CANCELLED', 'SKIPPED'] } }),
-        data: expect.objectContaining({ status: 'QUEUED' }),
-      })
-    )
-    expect(mockExecuteRaw).toHaveBeenCalled()
-  })
-
-  it('reset een CANCELLED job naar QUEUED', async () => {
-    mockGetSession.mockResolvedValue(SESSION_USER)
-    mockFindFirstJob.mockResolvedValue({ ...FAILED_JOB, status: 'CANCELLED' })
-    mockUpdateManyJob.mockResolvedValue({ count: 1 })
-
-    const result = await restartClaudeJobAction('job-1')
-    expect(result).toEqual({ success: true })
-  })
-
-  it('reset een SKIPPED job naar QUEUED', async () => {
-    mockGetSession.mockResolvedValue(SESSION_USER)
-    mockFindFirstJob.mockResolvedValue({ ...FAILED_JOB, status: 'SKIPPED' })
-    mockUpdateManyJob.mockResolvedValue({ count: 1 })
-
-    const result = await restartClaudeJobAction('job-1')
-    expect(result).toEqual({ success: true })
-  })
-
-  it('weigert demo-sessie', async () => {
-    mockGetSession.mockResolvedValue({ userId: 'demo', isDemo: true })
-
-    const result = await restartClaudeJobAction('job-1')
-    expect(result).toMatchObject({ error: expect.stringContaining('demo') })
-    expect(mockUpdateManyJob).not.toHaveBeenCalled()
-  })
-
-  it('retourneert error als job niet gevonden', async () => {
-    mockGetSession.mockResolvedValue(SESSION_USER)
-    mockFindFirstJob.mockResolvedValue(null)
-
-    const result = await restartClaudeJobAction('job-1')
-    expect(result).toMatchObject({ error: expect.stringContaining('niet gevonden') })
-  })
-
-  it('weigert wanneer job een niet-restartbare status heeft', async () => {
-    mockGetSession.mockResolvedValue(SESSION_USER)
-    mockFindFirstJob.mockResolvedValue({ ...FAILED_JOB, status: 'DONE' })
-
-    const result = await restartClaudeJobAction('job-1')
-    expect(result).toMatchObject({ error: expect.stringContaining('mislukte') })
-    expect(mockUpdateManyJob).not.toHaveBeenCalled()
-  })
-
-  it('retourneert error bij race-conditie (updateMany count === 0)', async () => {
-    mockGetSession.mockResolvedValue(SESSION_USER)
-    mockFindFirstJob.mockResolvedValue(FAILED_JOB)
-    mockUpdateManyJob.mockResolvedValue({ count: 0 })
-
-    const result = await restartClaudeJobAction('job-1')
-    expect(result).toMatchObject({ error: expect.stringContaining('gewijzigd') })
-  })
-
-  it('reset ook SprintTaskExecution-rows bij SPRINT_IMPLEMENTATION', async () => {
-    mockGetSession.mockResolvedValue(SESSION_USER)
-    mockFindFirstJob.mockResolvedValue({
-      ...FAILED_JOB,
-      kind: 'SPRINT_IMPLEMENTATION',
-      sprint_run_id: 'run-1',
-    })
-    mockUpdateManyJob.mockResolvedValue({ count: 1 })
-    mockUpdateManySprintTaskExecution.mockResolvedValue({ count: 3 })
-
-    const result = await restartClaudeJobAction('job-1')
-
-    expect(result).toEqual({ success: true })
-    expect(mockUpdateManySprintTaskExecution).toHaveBeenCalledWith(
-      expect.objectContaining({
-        where: { sprint_job_id: 'job-1' },
-        data: expect.objectContaining({ status: 'PENDING' }),
-      })
-    )
-  })
-
-  it('reset geen SprintTaskExecution-rows bij TASK_IMPLEMENTATION', async () => {
-    mockGetSession.mockResolvedValue(SESSION_USER)
-    mockFindFirstJob.mockResolvedValue(FAILED_JOB)
-    mockUpdateManyJob.mockResolvedValue({ count: 1 })
-
-    await restartClaudeJobAction('job-1')
-
-    expect(mockUpdateManySprintTaskExecution).not.toHaveBeenCalled()
+    const result = await cancelClaudeJobAction(JOB_ID)
+
+    expect(result).toMatchObject({ error: 'Alleen actieve jobs kunnen geannuleerd worden' })
+    expect(mockUpdateJob).not.toHaveBeenCalled()
+  })
+
+  it('returns error when cancelling FAILED job', async () => {
+    mockGetSession.mockResolvedValue(SESSION_USER)
+    mockFindFirstJob.mockResolvedValue({ ...MOCK_JOB_QUEUED, status: 'FAILED' as const })
+
+    const result = await cancelClaudeJobAction(JOB_ID)
+
+    expect(result).toMatchObject({ error: 'Alleen actieve jobs kunnen geannuleerd worden' })
  })
 })
--- a/tests/actions/commit-sprint-membership.test.ts
+++ b/tests/actions/commit-sprint-membership.test.ts
@ -1,290 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-vi.mock('next/cache', () => ({ revalidatePath: vi.fn() }))
-vi.mock('next/headers', () => ({
-  cookies: vi.fn().mockResolvedValue({
-    set: vi.fn(),
-    get: vi.fn(),
-    delete: vi.fn(),
-  }),
-}))
-vi.mock('iron-session', () => ({
-  getIronSession: vi.fn().mockResolvedValue({ userId: 'user-1', isDemo: false }),
-}))
-vi.mock('@/lib/session', () => ({
-  sessionOptions: { cookieName: 'test', password: 'test' },
-}))
-vi.mock('@/lib/product-access', () => ({
-  productAccessFilter: vi.fn().mockReturnValue({}),
-  getAccessibleProduct: vi.fn().mockResolvedValue({ id: 'product-1' }),
-}))
-vi.mock('@/lib/rate-limit', () => ({
-  enforceUserRateLimit: vi.fn().mockReturnValue(null),
-}))
-vi.mock('@/lib/code-server', () => ({
-  createWithCodeRetry: vi.fn(),
-  generateNextSprintCode: vi.fn(),
-}))
-vi.mock('@/lib/active-sprint', () => ({
-  setActiveSprintInSettings: vi.fn().mockResolvedValue(undefined),
-}))
-vi.mock('@/lib/prisma', () => {
-  const txClient = {
-    sprint: { create: vi.fn() },
-    story: { updateMany: vi.fn() },
-    task: { updateMany: vi.fn() },
-  }
-  return {
-    prisma: {
-      sprint: { findFirst: vi.fn() },
-      story: {
-        findMany: vi.fn(),
-        updateMany: vi.fn(),
-      },
-      task: {
-        findMany: vi.fn(),
-        updateMany: vi.fn(),
-      },
-      $transaction: vi.fn(async (fn: (tx: typeof txClient) => unknown) => fn(txClient)),
-      __txClient: txClient,
-    },
-  }
-})
-
-import { prisma } from '@/lib/prisma'
-import { commitSprintMembershipAction } from '@/actions/sprints'
-
-type Mocked = {
-  sprint: { findFirst: ReturnType<typeof vi.fn> }
-  story: {
-    findMany: ReturnType<typeof vi.fn>
-    updateMany: ReturnType<typeof vi.fn>
-  }
-  task: {
-    findMany: ReturnType<typeof vi.fn>
-    updateMany: ReturnType<typeof vi.fn>
-  }
-  $transaction: ReturnType<typeof vi.fn>
-  __txClient: {
-    sprint: { create: ReturnType<typeof vi.fn> }
-    story: { updateMany: ReturnType<typeof vi.fn> }
-    task: { updateMany: ReturnType<typeof vi.fn> }
-  }
-}
-const mockPrisma = prisma as unknown as Mocked
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mockPrisma.sprint.findFirst.mockReset().mockResolvedValue({
-    id: 'sprint-active',
-    product_id: 'product-1',
-  })
-  mockPrisma.story.findMany.mockReset()
-  mockPrisma.story.updateMany.mockReset()
-  mockPrisma.task.findMany.mockReset()
-  mockPrisma.task.updateMany.mockReset()
-  mockPrisma.$transaction.mockImplementation(
-    async (fn: (tx: typeof mockPrisma.__txClient) => unknown) =>
-      fn(mockPrisma.__txClient),
-  )
-  mockPrisma.__txClient.story.updateMany.mockReset().mockResolvedValue({ count: 0 })
-  mockPrisma.__txClient.task.updateMany.mockReset().mockResolvedValue({ count: 0 })
-})
-
-describe('commitSprintMembershipAction', () => {
-  it('happy path: eligible adds + valid removes → transactie commits', async () => {
-    // adds-partition: alle eligible (sprint_id=null + niet DONE)
-    mockPrisma.story.findMany
-      // partition lookup
-      .mockResolvedValueOnce([
-        { id: 's-add-1', sprint_id: null, status: 'OPEN', sprint: null },
-      ])
-      // removes-filter (sprint_id == activeSprintId)
-      .mockResolvedValueOnce([{ id: 's-rem-1' }])
-      // affectedStories
-      .mockResolvedValueOnce([
-        { pbi_id: 'pbiA' },
-        { pbi_id: 'pbiB' },
-      ])
-    mockPrisma.task.findMany.mockResolvedValueOnce([{ id: 't1' }])
-
-    const result = await commitSprintMembershipAction({
-      activeSprintId: 'sprint-active',
-      adds: ['s-add-1'],
-      removes: ['s-rem-1'],
-    })
-
-    expect('success' in result).toBe(true)
-    if ('success' in result) {
-      expect(result.affectedStoryIds.sort()).toEqual(['s-add-1', 's-rem-1'])
-      expect(result.affectedPbiIds.sort()).toEqual(['pbiA', 'pbiB'])
-      expect(result.affectedTaskIds).toEqual(['t1'])
-      expect(result.conflicts.notEligible).toEqual([])
-      expect(result.conflicts.alreadyRemoved).toEqual([])
-    }
-    expect(mockPrisma.$transaction).toHaveBeenCalledTimes(1)
-    expect(mockPrisma.__txClient.story.updateMany).toHaveBeenCalledTimes(2)
-    expect(mockPrisma.__txClient.task.updateMany).toHaveBeenCalledTimes(2)
-  })
-
-  it('add met status=DONE → conflicts.notEligible, story niet ge-update', async () => {
-    mockPrisma.story.findMany
-      .mockResolvedValueOnce([
-        { id: 's-done', sprint_id: null, status: 'DONE', sprint: null },
-      ])
-      // removes-filter (geen removes)
-      .mockResolvedValueOnce([])
-
-    const result = await commitSprintMembershipAction({
-      activeSprintId: 'sprint-active',
-      adds: ['s-done'],
-      removes: [],
-    })
-
-    expect('success' in result).toBe(true)
-    if ('success' in result) {
-      expect(result.affectedStoryIds).toEqual([])
-      expect(result.conflicts.notEligible).toEqual([
-        { storyId: 's-done', reason: 'DONE' },
-      ])
-    }
-    // Geen transaction omdat er niets te commiten valt.
-    expect(mockPrisma.$transaction).not.toHaveBeenCalled()
-  })
-
-  it('add met sprint_id in andere OPEN sprint → conflicts.notEligible IN_OTHER_SPRINT', async () => {
-    mockPrisma.story.findMany
-      .mockResolvedValueOnce([
-        {
-          id: 's-elsewhere',
-          sprint_id: 'sprint-other',
-          status: 'IN_SPRINT',
-          sprint: { id: 'sprint-other', code: 'SP-O', status: 'OPEN' },
-        },
-      ])
-      .mockResolvedValueOnce([])
-
-    const result = await commitSprintMembershipAction({
-      activeSprintId: 'sprint-active',
-      adds: ['s-elsewhere'],
-      removes: [],
-    })
-
-    if ('success' in result) {
-      expect(result.conflicts.notEligible).toEqual([
-        { storyId: 's-elsewhere', reason: 'IN_OTHER_SPRINT' },
-      ])
-    }
-  })
-
-  it('remove voor story die niet in actieve sprint zit → conflicts.alreadyRemoved', async () => {
-    mockPrisma.story.findMany
-      // adds-partition (geen adds)
-      .mockResolvedValueOnce([])
-      // removes-filter — race scenario: story zit niet meer in active sprint
-      .mockResolvedValueOnce([])
-
-    const result = await commitSprintMembershipAction({
-      activeSprintId: 'sprint-active',
-      adds: [],
-      removes: ['s-was-removed'],
-    })
-
-    if ('success' in result) {
-      expect(result.affectedStoryIds).toEqual([])
-      expect(result.conflicts.alreadyRemoved).toEqual(['s-was-removed'])
-    }
-  })
-
-  it('transactie: story.status=IN_SPRINT bij add, =OPEN bij remove', async () => {
-    mockPrisma.story.findMany
-      .mockResolvedValueOnce([
-        { id: 's-add', sprint_id: null, status: 'OPEN', sprint: null },
-      ])
-      .mockResolvedValueOnce([{ id: 's-rem' }])
-      .mockResolvedValueOnce([{ pbi_id: 'pbiA' }])
-    mockPrisma.task.findMany.mockResolvedValueOnce([])
-
-    await commitSprintMembershipAction({
-      activeSprintId: 'sprint-active',
-      adds: ['s-add'],
-      removes: ['s-rem'],
-    })
-
-    const calls = mockPrisma.__txClient.story.updateMany.mock.calls
-    // Add: status=IN_SPRINT + sprint_id=sprint-active
-    expect(calls[0][0].data).toEqual({
-      sprint_id: 'sprint-active',
-      status: 'IN_SPRINT',
-    })
-    // Remove: status=OPEN + sprint_id=null
-    expect(calls[1][0].data).toEqual({ sprint_id: null, status: 'OPEN' })
-  })
-
-  it('task.sprint_id wordt in dezelfde transactie ge-update', async () => {
-    mockPrisma.story.findMany
-      .mockResolvedValueOnce([
-        { id: 's-add', sprint_id: null, status: 'OPEN', sprint: null },
-      ])
-      .mockResolvedValueOnce([])
-      .mockResolvedValueOnce([{ pbi_id: 'pbiA' }])
-    mockPrisma.task.findMany.mockResolvedValueOnce([])
-
-    await commitSprintMembershipAction({
-      activeSprintId: 'sprint-active',
-      adds: ['s-add'],
-      removes: [],
-    })
-
-    expect(mockPrisma.__txClient.task.updateMany).toHaveBeenCalledWith(
-      expect.objectContaining({
-        where: { story_id: { in: ['s-add'] } },
-        data: { sprint_id: 'sprint-active' },
-      }),
-    )
-  })
-
-  it('return: affectedStoryIds + affectedPbiIds + affectedTaskIds + conflicts', async () => {
-    mockPrisma.story.findMany
-      .mockResolvedValueOnce([
-        { id: 's-add', sprint_id: null, status: 'OPEN', sprint: null },
-      ])
-      .mockResolvedValueOnce([{ id: 's-rem' }])
-      .mockResolvedValueOnce([
-        { pbi_id: 'pbiA' },
-        { pbi_id: 'pbiB' },
-      ])
-    mockPrisma.task.findMany.mockResolvedValueOnce([
-      { id: 't1' },
-      { id: 't2' },
-    ])
-
-    const result = await commitSprintMembershipAction({
-      activeSprintId: 'sprint-active',
-      adds: ['s-add'],
-      removes: ['s-rem'],
-    })
-
-    expect(result).toMatchObject({
-      success: true,
-      affectedStoryIds: expect.arrayContaining(['s-add', 's-rem']),
-      affectedPbiIds: expect.arrayContaining(['pbiA', 'pbiB']),
-      affectedTaskIds: expect.arrayContaining(['t1', 't2']),
-    })
-  })
-
-  it('rejects when sprint is not accessible', async () => {
-    mockPrisma.sprint.findFirst.mockResolvedValue(null)
-
-    const result = await commitSprintMembershipAction({
-      activeSprintId: 'sprint-active',
-      adds: [],
-      removes: [],
-    })
-
-    expect('error' in result).toBe(true)
-    if ('error' in result) {
-      expect(result.code).toBe(403)
-    }
-  })
-})
--- a/tests/actions/create-sprint-with-selection.test.ts
+++ b/tests/actions/create-sprint-with-selection.test.ts
@ -1,300 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-vi.mock('next/cache', () => ({ revalidatePath: vi.fn() }))
-vi.mock('next/headers', () => ({
-  cookies: vi.fn().mockResolvedValue({
-    set: vi.fn(),
-    get: vi.fn(),
-    delete: vi.fn(),
-  }),
-}))
-vi.mock('iron-session', () => ({
-  getIronSession: vi.fn().mockResolvedValue({ userId: 'user-1', isDemo: false }),
-}))
-vi.mock('@/lib/session', () => ({
-  sessionOptions: { cookieName: 'test', password: 'test' },
-}))
-vi.mock('@/lib/product-access', () => ({
-  productAccessFilter: vi.fn().mockReturnValue({}),
-  getAccessibleProduct: vi.fn().mockResolvedValue({
-    id: 'product-1',
-    user_id: 'user-1',
-  }),
-}))
-vi.mock('@/lib/rate-limit', () => ({
-  enforceUserRateLimit: vi.fn().mockReturnValue(null),
-}))
-vi.mock('@/lib/code-server', () => ({
-  createWithCodeRetry: vi.fn(async (_gen, fn) => fn('SP-1')),
-  generateNextSprintCode: vi.fn().mockResolvedValue('SP-1'),
-}))
-vi.mock('@/lib/active-sprint', () => ({
-  setActiveSprintInSettings: vi.fn().mockResolvedValue(undefined),
-}))
-vi.mock('@/lib/prisma', () => {
-  const txClient = {
-    sprint: { create: vi.fn() },
-    story: { updateMany: vi.fn() },
-    task: { updateMany: vi.fn() },
-  }
-  return {
-    prisma: {
-      sprint: {
-        create: vi.fn(),
-        findFirst: vi.fn(),
-        update: vi.fn(),
-      },
-      story: {
-        findMany: vi.fn(),
-        updateMany: vi.fn(),
-      },
-      task: {
-        findMany: vi.fn(),
-        updateMany: vi.fn(),
-      },
-      pbi: { findMany: vi.fn() },
-      user: {
-        findUnique: vi.fn(),
-        update: vi.fn(),
-      },
-      $transaction: vi.fn(async (fn: (tx: typeof txClient) => unknown) => fn(txClient)),
-      __txClient: txClient,
-    },
-  }
-})
-
-import { prisma } from '@/lib/prisma'
-import {
-  createSprintWithSelectionAction,
-  type CreateSprintWithSelectionInput,
-} from '@/actions/sprints'
-
-type Mocked = {
-  sprint: {
-    create: ReturnType<typeof vi.fn>
-    findFirst: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
-  story: {
-    findMany: ReturnType<typeof vi.fn>
-    updateMany: ReturnType<typeof vi.fn>
-  }
-  task: {
-    findMany: ReturnType<typeof vi.fn>
-    updateMany: ReturnType<typeof vi.fn>
-  }
-  $transaction: ReturnType<typeof vi.fn>
-  __txClient: {
-    sprint: { create: ReturnType<typeof vi.fn> }
-    story: { updateMany: ReturnType<typeof vi.fn> }
-    task: { updateMany: ReturnType<typeof vi.fn> }
-  }
-}
-const mockPrisma = prisma as unknown as Mocked
-
-function baseInput(
-  overrides: Partial<CreateSprintWithSelectionInput> = {},
-): CreateSprintWithSelectionInput {
-  return {
-    productId: 'product-1',
-    metadata: { goal: 'Sprint 1' },
-    pbiIntent: {},
-    storyOverrides: {},
-    ...overrides,
-  }
-}
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mockPrisma.sprint.create.mockReset()
-  mockPrisma.story.findMany.mockReset()
-  mockPrisma.story.updateMany.mockReset()
-  mockPrisma.task.findMany.mockReset()
-  mockPrisma.task.updateMany.mockReset()
-  mockPrisma.$transaction.mockImplementation(
-    async (fn: (tx: typeof mockPrisma.__txClient) => unknown) =>
-      fn(mockPrisma.__txClient),
-  )
-  mockPrisma.__txClient.sprint.create
-    .mockReset()
-    .mockResolvedValue({ id: 'sprint-1', code: 'SP-1' })
-  mockPrisma.__txClient.story.updateMany
-    .mockReset()
-    .mockResolvedValue({ count: 0 })
-  mockPrisma.__txClient.task.updateMany
-    .mockReset()
-    .mockResolvedValue({ count: 0 })
-})
-
-describe('createSprintWithSelectionAction', () => {
-  it('resolves intent=all naar alle child-stories en weert overrides.remove', async () => {
-    // Stap 1: stories voor PBI-A (intent=all). Plus eligibility-fetch.
-    mockPrisma.story.findMany
-      // resolve step (only for pbis with intent='all')
-      .mockResolvedValueOnce([
-        { id: 's1', pbi_id: 'pbiA' },
-        { id: 's2', pbi_id: 'pbiA' },
-        { id: 's3', pbi_id: 'pbiA' },
-      ])
-      // partitionByEligibility — alle eligible
-      .mockResolvedValueOnce([
-        { id: 's1', sprint_id: null, status: 'OPEN', sprint: null },
-        { id: 's3', sprint_id: null, status: 'OPEN', sprint: null },
-      ])
-      // affectedStories
-      .mockResolvedValueOnce([
-        { pbi_id: 'pbiA' },
-        { pbi_id: 'pbiA' },
-      ])
-    mockPrisma.task.findMany.mockResolvedValueOnce([{ id: 't1' }])
-
-    const result = await createSprintWithSelectionAction(
-      baseInput({
-        pbiIntent: { pbiA: 'all' },
-        storyOverrides: { pbiA: { add: [], remove: ['s2'] } },
-      }),
-    )
-
-    expect('success' in result).toBe(true)
-    if ('success' in result) {
-      expect(result.affectedStoryIds).toEqual(['s1', 's3'])
-      expect(result.conflicts.notEligible).toEqual([])
-    }
-  })
-
-  it('voegt storyOverrides.add toe over PBI heen (zelfs intent=none)', async () => {
-    // Geen PBI met intent=all → stap 1 wordt niet uitgevoerd.
-    mockPrisma.story.findMany
-      // partition
-      .mockResolvedValueOnce([
-        { id: 's10', sprint_id: null, status: 'OPEN', sprint: null },
-      ])
-      // affectedStories
-      .mockResolvedValueOnce([{ pbi_id: 'pbiB' }])
-    mockPrisma.task.findMany.mockResolvedValueOnce([])
-
-    const result = await createSprintWithSelectionAction(
-      baseInput({
-        pbiIntent: { pbiB: 'none' },
-        storyOverrides: { pbiB: { add: ['s10'], remove: [] } },
-      }),
-    )
-
-    expect('success' in result).toBe(true)
-    if ('success' in result) {
-      expect(result.affectedStoryIds).toEqual(['s10'])
-    }
-  })
-
-  it('eligibility-filter classificeert DONE en cross-sprint stories', async () => {
-    mockPrisma.story.findMany
-      // resolve
-      .mockResolvedValueOnce([
-        { id: 's1', pbi_id: 'pbiA' },
-        { id: 's2', pbi_id: 'pbiA' },
-        { id: 's3', pbi_id: 'pbiA' },
-      ])
-      // partition: s1=DONE, s2=eligible, s3=in andere OPEN sprint
-      .mockResolvedValueOnce([
-        { id: 's1', sprint_id: null, status: 'DONE', sprint: null },
-        { id: 's2', sprint_id: null, status: 'OPEN', sprint: null },
-        {
-          id: 's3',
-          sprint_id: 'sprint-other',
-          status: 'IN_SPRINT',
-          sprint: { id: 'sprint-other', code: 'SP-O', status: 'OPEN' },
-        },
-      ])
-      // affectedStories
-      .mockResolvedValueOnce([{ pbi_id: 'pbiA' }])
-    mockPrisma.task.findMany.mockResolvedValueOnce([])
-
-    const result = await createSprintWithSelectionAction(
-      baseInput({ pbiIntent: { pbiA: 'all' } }),
-    )
-
-    expect('success' in result).toBe(true)
-    if ('success' in result) {
-      expect(result.affectedStoryIds).toEqual(['s2'])
-      expect(result.conflicts.notEligible.map((n) => n.storyId).sort()).toEqual(
-        ['s1', 's3'],
-      )
-      expect(result.conflicts.crossSprint.map((c) => c.storyId)).toEqual(['s3'])
-    }
-  })
-
-  it('zet story.status=IN_SPRINT en task.sprint_id mee in dezelfde transactie', async () => {
-    mockPrisma.story.findMany
-      .mockResolvedValueOnce([{ id: 's1', pbi_id: 'pbiA' }])
-      .mockResolvedValueOnce([
-        { id: 's1', sprint_id: null, status: 'OPEN', sprint: null },
-      ])
-      .mockResolvedValueOnce([{ pbi_id: 'pbiA' }])
-    mockPrisma.task.findMany.mockResolvedValueOnce([{ id: 't1' }])
-
-    await createSprintWithSelectionAction(
-      baseInput({ pbiIntent: { pbiA: 'all' } }),
-    )
-
-    expect(mockPrisma.$transaction).toHaveBeenCalledTimes(1)
-    expect(mockPrisma.__txClient.story.updateMany).toHaveBeenCalledWith(
-      expect.objectContaining({
-        data: expect.objectContaining({
-          sprint_id: 'sprint-1',
-          status: 'IN_SPRINT',
-        }),
-      }),
-    )
-    expect(mockPrisma.__txClient.task.updateMany).toHaveBeenCalledWith(
-      expect.objectContaining({
-        data: { sprint_id: 'sprint-1' },
-      }),
-    )
-  })
-
-  it('returnt affectedStoryIds + affectedPbiIds + affectedTaskIds', async () => {
-    mockPrisma.story.findMany
-      .mockResolvedValueOnce([
-        { id: 's1', pbi_id: 'pbiA' },
-        { id: 's2', pbi_id: 'pbiB' },
-      ])
-      .mockResolvedValueOnce([
-        { id: 's1', sprint_id: null, status: 'OPEN', sprint: null },
-        { id: 's2', sprint_id: null, status: 'OPEN', sprint: null },
-      ])
-      .mockResolvedValueOnce([{ pbi_id: 'pbiA' }, { pbi_id: 'pbiB' }])
-    mockPrisma.task.findMany.mockResolvedValueOnce([
-      { id: 't1' },
-      { id: 't2' },
-    ])
-
-    const result = await createSprintWithSelectionAction(
-      baseInput({ pbiIntent: { pbiA: 'all', pbiB: 'all' } }),
-    )
-
-    expect('success' in result).toBe(true)
-    if ('success' in result) {
-      expect(result.affectedStoryIds.sort()).toEqual(['s1', 's2'])
-      expect(result.affectedPbiIds.sort()).toEqual(['pbiA', 'pbiB'])
-      expect(result.affectedTaskIds.sort()).toEqual(['t1', 't2'])
-    }
-  })
-
-  it('returnt error wanneer geen eligible stories overblijven', async () => {
-    mockPrisma.story.findMany
-      .mockResolvedValueOnce([{ id: 's1', pbi_id: 'pbiA' }])
-      // s1 is DONE → notEligible
-      .mockResolvedValueOnce([
-        { id: 's1', sprint_id: null, status: 'DONE', sprint: null },
-      ])
-
-    const result = await createSprintWithSelectionAction(
-      baseInput({ pbiIntent: { pbiA: 'all' } }),
-    )
-
-    expect('error' in result).toBe(true)
-    if ('error' in result) {
-      expect(result.code).toBe(422)
-    }
-  })
-})
--- a/tests/actions/ideas-crud.test.ts
+++ b/tests/actions/ideas-crud.test.ts
@ -1,717 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-const { mockSession } = vi.hoisted(() => ({
-  mockSession: { userId: 'user-1', isDemo: false },
-}))
-
-vi.mock('next/cache', () => ({ revalidatePath: vi.fn() }))
-vi.mock('next/headers', () => ({ cookies: vi.fn().mockResolvedValue({}) }))
-vi.mock('iron-session', () => ({
-  getIronSession: vi.fn().mockImplementation(async () => mockSession),
-}))
-vi.mock('@/lib/session', () => ({
-  sessionOptions: { cookieName: 'test', password: 'test-password-32-chars-minimum-len' },
-}))
-vi.mock('@/lib/idea-code-server', () => ({
-  nextIdeaCode: vi.fn().mockResolvedValue('IDEA-001'),
-}))
-vi.mock('@/lib/prisma', () => ({
-  prisma: {
-    idea: {
-      create: vi.fn(),
-      findFirst: vi.fn(),
-      update: vi.fn(),
-      delete: vi.fn(),
-    },
-    ideaLog: { create: vi.fn() },
-    claudeJob: {
-      findFirst: vi.fn(),
-      create: vi.fn(),
-      update: vi.fn(),
-    },
-    claudeWorker: {
-      count: vi.fn(),
-    },
-    pbi: {
-      findFirst: vi.fn(),
-      findMany: vi.fn(),
-      findUnique: vi.fn(),
-      create: vi.fn(),
-      delete: vi.fn(),
-    },
-    story: {
-      findMany: vi.fn(),
-      create: vi.fn(),
-    },
-    task: {
-      findMany: vi.fn(),
-      create: vi.fn(),
-      count: vi.fn(),
-      findUnique: vi.fn().mockResolvedValue(null),
-    },
-    product: {
-      findUnique: vi.fn().mockResolvedValue(null),
-    },
-    $transaction: vi.fn(),
-    $executeRaw: vi.fn().mockResolvedValue(0),
-  },
-}))
-
-import { prisma } from '@/lib/prisma'
-import {
-  createIdeaAction,
-  updateIdeaAction,
-  archiveIdeaAction,
-  deleteIdeaAction,
-  updateGrillMdAction,
-  updatePlanMdAction,
-  uploadPlanMdAction,
-  downloadIdeaMdAction,
-  startGrillJobAction,
-  startMakePlanJobAction,
-  cancelIdeaJobAction,
-  materializeIdeaPlanAction,
-  relinkIdeaPlanAction,
-} from '@/actions/ideas'
-
-type MockIdea = {
-  idea: { create: ReturnType<typeof vi.fn>; findFirst: ReturnType<typeof vi.fn>; update: ReturnType<typeof vi.fn>; delete: ReturnType<typeof vi.fn> }
-  ideaLog: { create: ReturnType<typeof vi.fn> }
-  claudeJob: { findFirst: ReturnType<typeof vi.fn>; create: ReturnType<typeof vi.fn>; update: ReturnType<typeof vi.fn> }
-  claudeWorker: { count: ReturnType<typeof vi.fn> }
-  pbi: { findFirst: ReturnType<typeof vi.fn>; findMany: ReturnType<typeof vi.fn>; findUnique: ReturnType<typeof vi.fn>; create: ReturnType<typeof vi.fn>; delete: ReturnType<typeof vi.fn> }
-  story: { findMany: ReturnType<typeof vi.fn>; create: ReturnType<typeof vi.fn> }
-  task: { findMany: ReturnType<typeof vi.fn>; create: ReturnType<typeof vi.fn>; count: ReturnType<typeof vi.fn> }
-  $transaction: ReturnType<typeof vi.fn>
-  $executeRaw: ReturnType<typeof vi.fn>
-}
-const m = prisma as unknown as MockIdea
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mockSession.userId = 'user-1'
-  mockSession.isDemo = false
-  // Default: $transaction passes its callback through with our mocked prisma
-  m.$transaction.mockImplementation(async (arg: unknown) => {
-    if (typeof arg === 'function') {
-      return (arg as (tx: unknown) => unknown)(m)
-    }
-    return arg
-  })
-})
-
-describe('createIdeaAction', () => {
-  it('happy path: creates DRAFT idea with auto-generated code', async () => {
-    m.idea.create.mockResolvedValueOnce({ id: 'idea-1', code: 'IDEA-001' })
-
-    const r = await createIdeaAction({ title: 'Plant-watering reminder' })
-    expect(r).toEqual({ success: true, data: { id: 'idea-1', code: 'IDEA-001' } })
-    expect(m.idea.create).toHaveBeenCalledWith(
-      expect.objectContaining({
-        data: expect.objectContaining({
-          user_id: 'user-1',
-          code: 'IDEA-001',
-          title: 'Plant-watering reminder',
-          status: 'DRAFT',
-        }),
-      }),
-    )
-  })
-
-  it('rejects unauthenticated', async () => {
-    mockSession.userId = ''
-    const r = await createIdeaAction({ title: 'x' })
-    expect(r).toMatchObject({ error: expect.stringMatching(/ingelogd/), code: 401 })
-    expect(m.idea.create).not.toHaveBeenCalled()
-  })
-
-  it('rejects demo-user', async () => {
-    mockSession.isDemo = true
-    const r = await createIdeaAction({ title: 'x' })
-    expect(r).toMatchObject({ error: expect.stringMatching(/demo/), code: 403 })
-    expect(m.idea.create).not.toHaveBeenCalled()
-  })
-
-  it('rejects invalid title (zod 422)', async () => {
-    const r = await createIdeaAction({ title: '   ' })
-    expect(r).toMatchObject({ code: 422 })
-    expect(m.idea.create).not.toHaveBeenCalled()
-  })
-})
-
-describe('updateIdeaAction', () => {
-  it('happy: updates editable idea (DRAFT)', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ id: 'idea-1', status: 'DRAFT' })
-    m.idea.update.mockResolvedValueOnce({})
-
-    const r = await updateIdeaAction('idea-1', { title: 'Updated' })
-    expect(r).toEqual({ success: true })
-    expect(m.idea.update).toHaveBeenCalledWith({
-      where: { id: 'idea-1' },
-      data: { title: 'Updated' },
-    })
-  })
-
-  it('blocks update on PLANNED (status-mismatch 422)', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ id: 'idea-1', status: 'PLANNED' })
-    const r = await updateIdeaAction('idea-1', { title: 'x' })
-    expect(r).toMatchObject({ code: 422 })
-    expect(m.idea.update).not.toHaveBeenCalled()
-  })
-
-  it('blocks update during GRILLING', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ id: 'idea-1', status: 'GRILLING' })
-    const r = await updateIdeaAction('idea-1', { title: 'x' })
-    expect(r).toMatchObject({ code: 422 })
-  })
-
-  it('returns 404 when idea belongs to another user', async () => {
-    m.idea.findFirst.mockResolvedValueOnce(null)
-    const r = await updateIdeaAction('idea-1', { title: 'x' })
-    expect(r).toMatchObject({ code: 404 })
-  })
-})
-
-describe('deleteIdeaAction', () => {
-  it('happy: deletes idea without pbi', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ id: 'idea-1', pbi_id: null })
-    const r = await deleteIdeaAction('idea-1')
-    expect(r).toEqual({ success: true })
-    expect(m.idea.delete).toHaveBeenCalledWith({ where: { id: 'idea-1' } })
-  })
-
-  it('blocks deletion when PBI is linked', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ id: 'idea-1', pbi_id: 'pbi-1' })
-    const r = await deleteIdeaAction('idea-1')
-    expect(r).toMatchObject({ code: 422 })
-    expect(m.idea.delete).not.toHaveBeenCalled()
-  })
-})
-
-describe('archiveIdeaAction', () => {
-  it('archives owned idea', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ id: 'idea-1' })
-    const r = await archiveIdeaAction('idea-1')
-    expect(r).toEqual({ success: true })
-    expect(m.idea.update).toHaveBeenCalledWith({
-      where: { id: 'idea-1' },
-      data: { archived: true },
-    })
-  })
-})
-
-describe('updateGrillMdAction', () => {
-  it('happy: updates grill_md in GRILLED', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ status: 'GRILLED' })
-    const r = await updateGrillMdAction('idea-1', '# Updated grill')
-    expect(r).toEqual({ success: true })
-    expect(m.$transaction).toHaveBeenCalled()
-  })
-
-  it('blocks in DRAFT', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ status: 'DRAFT' })
-    const r = await updateGrillMdAction('idea-1', 'x')
-    expect(r).toMatchObject({ code: 422 })
-    expect(m.$transaction).not.toHaveBeenCalled()
-  })
-})
-
-describe('updatePlanMdAction', () => {
-  const VALID_PLAN = `---
-pbi:
-  title: Test
-  priority: 2
-stories:
-  - title: S1
-    priority: 2
-    tasks:
-      - title: T1
-        priority: 2
---
-
-body
-`
-
-  it('happy: updates plan_md in PLAN_READY with valid yaml', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ status: 'PLAN_READY' })
-    const r = await updatePlanMdAction('idea-1', VALID_PLAN)
-    expect(r).toEqual({ success: true })
-  })
-
-  it('rejects invalid yaml (parse-fail 422 with details)', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ status: 'PLAN_READY' })
-    const r = await updatePlanMdAction('idea-1', '# no frontmatter')
-    expect(r).toMatchObject({ code: 422 })
-    expect((r as { details?: unknown }).details).toBeDefined()
-  })
-
-  it('blocks in PLANNED', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ status: 'PLANNED' })
-    const r = await updatePlanMdAction('idea-1', VALID_PLAN)
-    expect(r).toMatchObject({ code: 422 })
-  })
-})
-
-describe('uploadPlanMdAction', () => {
-  const VALID_PLAN = `---
-pbi:
-  title: Uploaded
-  priority: 2
-stories:
-  - title: S1
-    priority: 2
-    tasks:
-      - title: T1
-        priority: 2
---
-
-body
-`
-
-  it('happy: uploads from DRAFT — skips grill, sets PLAN_READY', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ status: 'DRAFT' })
-    const r = await uploadPlanMdAction('idea-1', VALID_PLAN)
-    expect(r).toEqual({ success: true })
-    expect(m.$transaction).toHaveBeenCalled()
-    const txnArg = m.$transaction.mock.calls.at(-1)?.[0] as unknown[] | undefined
-    expect(txnArg).toBeDefined()
-    // The first call in the transaction is the update — confirm status=PLAN_READY.
-    expect(m.idea.update).toHaveBeenCalledWith(
-      expect.objectContaining({
-        data: expect.objectContaining({ plan_md: VALID_PLAN, status: 'PLAN_READY' }),
-      }),
-    )
-  })
-
-  it('happy: uploads from GRILLED', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ status: 'GRILLED' })
-    const r = await uploadPlanMdAction('idea-1', VALID_PLAN)
-    expect(r).toEqual({ success: true })
-  })
-
-  it('happy: overwrites existing plan from PLAN_READY', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ status: 'PLAN_READY' })
-    const r = await uploadPlanMdAction('idea-1', VALID_PLAN)
-    expect(r).toEqual({ success: true })
-  })
-
-  it('happy: uploads from PLAN_FAILED (retry)', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ status: 'PLAN_FAILED' })
-    const r = await uploadPlanMdAction('idea-1', VALID_PLAN)
-    expect(r).toEqual({ success: true })
-  })
-
-  it('rejects from PLANNED (already materialized)', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ status: 'PLANNED' })
-    const r = await uploadPlanMdAction('idea-1', VALID_PLAN)
-    expect(r).toMatchObject({ code: 422 })
-    expect(m.$transaction).not.toHaveBeenCalled()
-  })
-
-  it('rejects from GRILLING (job running)', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ status: 'GRILLING' })
-    const r = await uploadPlanMdAction('idea-1', VALID_PLAN)
-    expect(r).toMatchObject({ code: 422 })
-  })
-
-  it('rejects empty markdown', async () => {
-    const r = await uploadPlanMdAction('idea-1', '   \n  ')
-    expect(r).toMatchObject({ code: 422 })
-    // Should fail before touching DB
-    expect(m.idea.findFirst).not.toHaveBeenCalled()
-  })
-
-  it('rejects oversized markdown', async () => {
-    const huge = 'a'.repeat(100_001)
-    const r = await uploadPlanMdAction('idea-1', huge)
-    expect(r).toMatchObject({ code: 422 })
-    expect(m.idea.findFirst).not.toHaveBeenCalled()
-  })
-
-  it('rejects invalid yaml (parse-fail 422 with details)', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ status: 'DRAFT' })
-    const r = await uploadPlanMdAction('idea-1', '# no frontmatter')
-    expect(r).toMatchObject({ code: 422 })
-    expect((r as { details?: unknown }).details).toBeDefined()
-    expect(m.$transaction).not.toHaveBeenCalled()
-  })
-
-  it('returns 404 when idea not found', async () => {
-    m.idea.findFirst.mockResolvedValueOnce(null)
-    const r = await uploadPlanMdAction('nope', VALID_PLAN)
-    expect(r).toMatchObject({ code: 404 })
-  })
-})
-
-describe('startGrillJobAction', () => {
-  const idea = {
-    id: 'idea-1',
-    status: 'DRAFT',
-    product_id: 'prod-1',
-    product: { id: 'prod-1', repo_url: 'https://github.com/x/y' },
-  }
-
-  beforeEach(() => {
-    m.idea.findFirst.mockResolvedValue(idea)
-    m.claudeJob.findFirst.mockResolvedValue(null)
-    m.claudeWorker.count.mockResolvedValue(1)
-    m.claudeJob.create.mockResolvedValue({ id: 'job-1' })
-  })
-
-  it('happy path: creates IDEA_GRILL job, flips status to GRILLING', async () => {
-    const r = await startGrillJobAction('idea-1')
-    expect(r).toMatchObject({ success: true, data: { job_id: 'job-1' } })
-    expect(m.$executeRaw).toHaveBeenCalled()
-  })
-
-  it('blocks demo-user', async () => {
-    mockSession.isDemo = true
-    const r = await startGrillJobAction('idea-1')
-    expect(r).toMatchObject({ code: 403 })
-    expect(m.claudeJob.create).not.toHaveBeenCalled()
-  })
-
-  it('blocks when product has no repo_url', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({
-      ...idea,
-      product: { id: 'prod-1', repo_url: null },
-    })
-    const r = await startGrillJobAction('idea-1')
-    expect(r).toMatchObject({ code: 422, error: expect.stringMatching(/repo_url/i) })
-  })
-
-  it('blocks when no idea is unlinked', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ ...idea, product_id: null, product: null })
-    const r = await startGrillJobAction('idea-1')
-    expect(r).toMatchObject({ code: 422 })
-  })
-
-  it('blocks when no worker is active', async () => {
-    m.claudeWorker.count.mockResolvedValueOnce(0)
-    const r = await startGrillJobAction('idea-1')
-    expect(r).toMatchObject({ code: 422, error: expect.stringMatching(/worker/i) })
-    expect(m.claudeJob.create).not.toHaveBeenCalled()
-  })
-
-  it('blocks when an active job already exists (409)', async () => {
-    m.claudeJob.findFirst.mockResolvedValueOnce({ id: 'existing-job' })
-    const r = await startGrillJobAction('idea-1')
-    expect(r).toMatchObject({ code: 409 })
-  })
-
-  it('blocks invalid status (PLANNING)', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ ...idea, status: 'PLANNING' })
-    const r = await startGrillJobAction('idea-1')
-    expect(r).toMatchObject({ code: 422 })
-  })
-})
-
-describe('startMakePlanJobAction', () => {
-  const idea = {
-    id: 'idea-1',
-    status: 'GRILLED',
-    product_id: 'prod-1',
-    product: { id: 'prod-1', repo_url: 'https://github.com/x/y' },
-  }
-
-  beforeEach(() => {
-    m.idea.findFirst.mockResolvedValue(idea)
-    m.claudeJob.findFirst.mockResolvedValue(null)
-    m.claudeWorker.count.mockResolvedValue(1)
-    m.claudeJob.create.mockResolvedValue({ id: 'job-2' })
-  })
-
-  it('happy: GRILLED → PLANNING', async () => {
-    const r = await startMakePlanJobAction('idea-1')
-    expect(r).toMatchObject({ success: true })
-  })
-
-  it('blocks from DRAFT (must grill first)', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ ...idea, status: 'DRAFT' })
-    const r = await startMakePlanJobAction('idea-1')
-    expect(r).toMatchObject({ code: 422 })
-  })
-})
-
-describe('cancelIdeaJobAction', () => {
-  it('grill cancel without prior grill_md → DRAFT', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({
-      id: 'idea-1',
-      status: 'GRILLING',
-      grill_md: null,
-      plan_md: null,
-    })
-    m.claudeJob.findFirst.mockResolvedValueOnce({ id: 'job-1', kind: 'IDEA_GRILL' })
-
-    const r = await cancelIdeaJobAction('idea-1')
-    expect(r).toEqual({ success: true })
-    // Verify $transaction was called with 3 ops (job-update, idea-update, log)
-    expect(m.$transaction).toHaveBeenCalled()
-  })
-
-  it('grill re-grill cancel with prior grill_md → GRILLED', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({
-      id: 'idea-1',
-      status: 'GRILLING',
-      grill_md: '# old grill',
-      plan_md: null,
-    })
-    m.claudeJob.findFirst.mockResolvedValueOnce({ id: 'job-1', kind: 'IDEA_GRILL' })
-
-    const r = await cancelIdeaJobAction('idea-1')
-    expect(r).toEqual({ success: true })
-  })
-
-  it('returns 404 when no active job', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({
-      id: 'idea-1',
-      status: 'GRILLED',
-      grill_md: null,
-      plan_md: null,
-    })
-    m.claudeJob.findFirst.mockResolvedValueOnce(null)
-    const r = await cancelIdeaJobAction('idea-1')
-    expect(r).toMatchObject({ code: 404 })
-  })
-})
-
-describe('materializeIdeaPlanAction', () => {
-  const VALID_PLAN = `---
-pbi:
-  title: New PBI
-  priority: 2
-stories:
-  - title: Story A
-    priority: 2
-    tasks:
-      - title: Task A1
-        priority: 2
-        implementation_plan: "1. Doe X"
-      - title: Task A2
-        priority: 2
-  - title: Story B
-    priority: 3
-    tasks:
-      - title: Task B1
-        priority: 3
---
-
-body
-`
-
-  beforeEach(() => {
-    m.idea.findFirst.mockResolvedValue({
-      id: 'idea-1',
-      status: 'PLAN_READY',
-      product_id: 'prod-1',
-      plan_md: VALID_PLAN,
-    })
-    m.pbi.findMany.mockResolvedValue([])
-    m.story.findMany.mockResolvedValue([])
-    m.task.findMany.mockResolvedValue([])
-    m.pbi.findFirst.mockResolvedValue(null)
-    m.pbi.create.mockResolvedValue({ id: 'pbi-1', code: 'PBI-1' })
-    m.story.create
-      .mockResolvedValueOnce({ id: 's-A' })
-      .mockResolvedValueOnce({ id: 's-B' })
-    m.task.create
-      .mockResolvedValueOnce({ id: 't-A1' })
-      .mockResolvedValueOnce({ id: 't-A2' })
-      .mockResolvedValueOnce({ id: 't-B1' })
-  })
-
-  it('happy: creates PBI + 2 stories + 3 tasks, links idea, returns ids; sort_order = parseCodeNumber(code)', async () => {
-    const r = await materializeIdeaPlanAction('idea-1')
-    expect(r).toMatchObject({
-      success: true,
-      data: {
-        pbi_id: 'pbi-1',
-        pbi_code: 'PBI-1',
-        story_ids: ['s-A', 's-B'],
-        task_ids: ['t-A1', 't-A2', 't-B1'],
-      },
-    })
-    expect(m.pbi.create).toHaveBeenCalledTimes(1)
-    expect(m.story.create).toHaveBeenCalledTimes(2)
-    expect(m.task.create).toHaveBeenCalledTimes(3)
-
-    // story sort_order = parseCodeNumber(auto-code): ST-001→1, ST-002→2
-    expect(m.story.create.mock.calls[0][0].data.sort_order).toBe(1)
-    expect(m.story.create.mock.calls[1][0].data.sort_order).toBe(2)
-
-    // task sort_order = parseCodeNumber(auto-code): T-1→1, T-2→2, T-3→3
-    expect(m.task.create.mock.calls[0][0].data.sort_order).toBe(1)
-    expect(m.task.create.mock.calls[1][0].data.sort_order).toBe(2)
-    expect(m.task.create.mock.calls[2][0].data.sort_order).toBe(3)
-  })
-
-  it('blocks when not PLAN_READY (e.g. GRILLED)', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({
-      id: 'idea-1',
-      status: 'GRILLED',
-      product_id: 'prod-1',
-      plan_md: VALID_PLAN,
-    })
-    const r = await materializeIdeaPlanAction('idea-1')
-    expect(r).toMatchObject({ code: 422 })
-    expect(m.pbi.create).not.toHaveBeenCalled()
-  })
-
-  it('returns 422 with details on parse-fail', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({
-      id: 'idea-1',
-      status: 'PLAN_READY',
-      product_id: 'prod-1',
-      plan_md: '# no frontmatter',
-    })
-    const r = await materializeIdeaPlanAction('idea-1')
-    expect(r).toMatchObject({ code: 422 })
-    expect((r as { details?: unknown }).details).toBeDefined()
-  })
-
-  it('blocks demo-user', async () => {
-    mockSession.isDemo = true
-    const r = await materializeIdeaPlanAction('idea-1')
-    expect(r).toMatchObject({ code: 403 })
-  })
-
-  it('returns 409 on P2002 race', async () => {
-    m.$transaction.mockImplementationOnce(async () => {
-      throw new Error('Unique constraint failed (P2002)')
-    })
-    const r = await materializeIdeaPlanAction('idea-1')
-    expect(r).toMatchObject({ code: 409 })
-  })
-})
-
-describe('materializeIdeaPlanAction — existing PBI pre-check', () => {
-  const VALID_PLAN = `---
-pbi:
-  title: New PBI
-  priority: 2
-stories:
-  - title: Story A
-    priority: 2
-    tasks:
-      - title: Task A1
-        priority: 2
---
-
-body
-`
-
-  beforeEach(() => {
-    // Use a distinct userId to avoid sharing the rate-limit bucket with the
-    // materializeIdeaPlanAction describe block above.
-    mockSession.userId = 'user-precheck'
-    m.idea.findFirst.mockResolvedValue({
-      id: 'idea-1',
-      status: 'PLAN_READY',
-      product_id: 'prod-1',
-      plan_md: VALID_PLAN,
-      pbi_id: 'old-pbi',
-    })
-    m.pbi.findMany.mockResolvedValue([])
-    m.story.findMany.mockResolvedValue([])
-    m.task.findMany.mockResolvedValue([])
-    m.pbi.findFirst.mockResolvedValue(null)
-    m.pbi.findUnique.mockResolvedValue({ code: 'PBI-X' })
-    m.pbi.create.mockResolvedValue({ id: 'pbi-new', code: 'PBI-2' })
-    m.pbi.delete.mockResolvedValue({})
-    m.story.create.mockResolvedValue({ id: 's-1' })
-    m.task.create.mockResolvedValue({ id: 't-1' })
-  })
-
-  it('auto-vervang: deletes old PBI in transaction when no tasks executed', async () => {
-    m.task.count.mockResolvedValueOnce(0)
-    const r = await materializeIdeaPlanAction('idea-1')
-    expect(r).toMatchObject({ success: true, data: { pbi_id: 'pbi-new' } })
-    expect(m.pbi.delete).toHaveBeenCalledWith({ where: { id: 'old-pbi' } })
-    expect(m.pbi.create).toHaveBeenCalledTimes(1)
-  })
-
-  it('conflict-409: returns PBI_HAS_ACTIVE_TASKS when executed tasks exist', async () => {
-    m.task.count.mockResolvedValueOnce(1)
-    const r = await materializeIdeaPlanAction('idea-1')
-    expect(r).toMatchObject({ code: 409, error: 'PBI_HAS_ACTIVE_TASKS:PBI-X' })
-    expect(m.pbi.create).not.toHaveBeenCalled()
-    expect(m.pbi.delete).not.toHaveBeenCalled()
-  })
-
-  it('alongside: skips old PBI delete and creates new PBI when allowAlongside=true', async () => {
-    m.task.count.mockResolvedValueOnce(1)
-    const r = await materializeIdeaPlanAction('idea-1', { allowAlongside: true })
-    expect(r).toMatchObject({ success: true, data: { pbi_id: 'pbi-new' } })
-    expect(m.pbi.delete).not.toHaveBeenCalled()
-    expect(m.pbi.create).toHaveBeenCalledTimes(1)
-  })
-})
-
-describe('relinkIdeaPlanAction', () => {
-  it('happy: PLANNED with pbi_id=null → PLAN_READY', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({
-      id: 'idea-1',
-      status: 'PLANNED',
-      pbi_id: null,
-    })
-    const r = await relinkIdeaPlanAction('idea-1')
-    expect(r).toEqual({ success: true })
-    expect(m.$transaction).toHaveBeenCalled()
-  })
-
-  it('blocks when pbi still linked', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({
-      id: 'idea-1',
-      status: 'PLANNED',
-      pbi_id: 'pbi-1',
-    })
-    const r = await relinkIdeaPlanAction('idea-1')
-    expect(r).toMatchObject({ code: 422 })
-  })
-
-  it('blocks when not PLANNED', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({
-      id: 'idea-1',
-      status: 'PLAN_READY',
-      pbi_id: null,
-    })
-    const r = await relinkIdeaPlanAction('idea-1')
-    expect(r).toMatchObject({ code: 422 })
-  })
-})
-
-describe('downloadIdeaMdAction', () => {
-  it('returns grill_md when present', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({
-      code: 'IDEA-001',
-      grill_md: '# Idee\nscope',
-      plan_md: null,
-    })
-    const r = await downloadIdeaMdAction('idea-1', 'grill')
-    expect(r).toMatchObject({
-      success: true,
-      data: { filename: 'IDEA-001-grill.md', markdown: '# Idee\nscope' },
-    })
-  })
-
-  it('404 when md not yet generated', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({
-      code: 'IDEA-001',
-      grill_md: null,
-      plan_md: null,
-    })
-    const r = await downloadIdeaMdAction('idea-1', 'plan')
-    expect(r).toMatchObject({ code: 404 })
-  })
-
-  it('demo MAY download (read-only operation)', async () => {
-    mockSession.isDemo = true
-    m.idea.findFirst.mockResolvedValueOnce({
-      code: 'IDEA-001',
-      grill_md: 'x',
-      plan_md: null,
-    })
-    const r = await downloadIdeaMdAction('idea-1', 'grill')
-    expect(r).toMatchObject({ success: true })
-  })
-})
--- a/tests/actions/products.test.ts
+++ b/tests/actions/products.test.ts
@ -1,163 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-const {
-  mockGetSession,
-  mockFindFirstProduct,
-  mockCreateProduct,
-  mockUpdateProduct,
-  mockCreateMember,
-  mockExecuteRaw,
-  mockTransaction,
-} = vi.hoisted(() => ({
-  mockGetSession: vi.fn(),
-  mockFindFirstProduct: vi.fn(),
-  mockCreateProduct: vi.fn(),
-  mockUpdateProduct: vi.fn(),
-  mockCreateMember: vi.fn(),
-  mockExecuteRaw: vi.fn().mockResolvedValue(undefined),
-  mockTransaction: vi.fn(),
-}))
-
-vi.mock('next/cache', () => ({ revalidatePath: vi.fn() }))
-vi.mock('next/navigation', () => ({ redirect: vi.fn() }))
-vi.mock('next/headers', () => ({ cookies: vi.fn().mockResolvedValue({}) }))
-vi.mock('iron-session', () => ({
-  getIronSession: vi.fn().mockResolvedValue({ userId: 'user-1', isDemo: false }),
-}))
-vi.mock('@/lib/session', () => ({
-  sessionOptions: { cookieName: 'test', password: 'test' },
-}))
-vi.mock('@/lib/auth', () => ({ getSession: mockGetSession }))
-vi.mock('@/lib/product-access', () => ({
-  productAccessFilter: vi.fn().mockReturnValue({ OR: [{ user_id: 'user-1' }] }),
-}))
-vi.mock('@/lib/prisma', () => ({
-  prisma: {
-    product: { findFirst: mockFindFirstProduct, create: mockCreateProduct, update: mockUpdateProduct },
-    productMember: { create: mockCreateMember },
-    $executeRaw: mockExecuteRaw,
-    $transaction: mockTransaction,
-  },
-}))
-
-import { createProductAction, updateProductAction } from '@/actions/products'
-import { getIronSession } from 'iron-session'
-
-const mockSession = getIronSession as ReturnType<typeof vi.fn>
-
-const SESSION_USER = { userId: 'user-1', isDemo: false }
-const SESSION_DEMO = { userId: 'demo-1', isDemo: true }
-const PRODUCT_ID = 'product-1'
-
-const VALID_DATA = {
-  name: 'Test Product',
-  code: 'TP',
-  description: 'Een product',
-  repo_url: 'https://github.com/org/repo',
-  definition_of_done: 'Alles groen',
-  auto_pr: false,
-}
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mockExecuteRaw.mockResolvedValue(undefined)
-  mockSession.mockResolvedValue(SESSION_USER)
-})
-
-// =============================================================
-//  createProductAction
-// =============================================================
-describe('createProductAction', () => {
-  it('happy path: maakt product + member aan en retourneert productId', async () => {
-    mockFindFirstProduct.mockResolvedValue(null) // geen dubbele code
-    mockTransaction.mockImplementation(async (fn: (tx: unknown) => Promise<unknown>) => {
-      return fn({
-        product: {
-          create: vi.fn().mockResolvedValue({ id: PRODUCT_ID }),
-        },
-        productMember: {
-          create: vi.fn().mockResolvedValue({}),
-        },
-      })
-    })
-
-    const result = await createProductAction(VALID_DATA)
-
-    expect(result).toEqual({ success: true, productId: PRODUCT_ID })
-  })
-
-  it('demo-user → error', async () => {
-    mockSession.mockResolvedValue(SESSION_DEMO)
-
-    const result = await createProductAction(VALID_DATA)
-
-    expect(result).toMatchObject({ error: expect.stringContaining('demo') })
-    expect(mockTransaction).not.toHaveBeenCalled()
-  })
-
-  it('ongeldige repo_url (niet github) → validatiefout', async () => {
-    const result = await createProductAction({ ...VALID_DATA, repo_url: 'https://gitlab.com/org/repo' })
-
-    expect(result).toMatchObject({ error: expect.any(String) })
-    expect(mockTransaction).not.toHaveBeenCalled()
-  })
-
-  it('dubbele code → error', async () => {
-    mockFindFirstProduct.mockResolvedValue({ id: 'other-product' })
-
-    const result = await createProductAction(VALID_DATA)
-
-    expect(result).toMatchObject({
-      code: 422,
-      fieldErrors: { code: expect.arrayContaining([expect.stringContaining('gebruik')]) },
-    })
-    expect(mockTransaction).not.toHaveBeenCalled()
-  })
-
-  it('naam ontbreekt → validatiefout', async () => {
-    const result = await createProductAction({ ...VALID_DATA, name: '' })
-
-    expect(result).toMatchObject({ error: expect.any(String) })
-  })
-})
-
-// =============================================================
-//  updateProductAction
-// =============================================================
-describe('updateProductAction', () => {
-  it('happy path: werkt product bij en stuurt pg_notify', async () => {
-    mockFindFirstProduct.mockResolvedValue({ id: PRODUCT_ID })
-    mockUpdateProduct.mockResolvedValue({ id: PRODUCT_ID })
-
-    const result = await updateProductAction(PRODUCT_ID, VALID_DATA)
-
-    expect(result).toEqual({ success: true })
-    expect(mockUpdateProduct).toHaveBeenCalled()
-    expect(mockExecuteRaw).toHaveBeenCalledTimes(1)
-  })
-
-  it('demo-user → error', async () => {
-    mockSession.mockResolvedValue(SESSION_DEMO)
-
-    const result = await updateProductAction(PRODUCT_ID, VALID_DATA)
-
-    expect(result).toMatchObject({ error: expect.stringContaining('demo') })
-    expect(mockUpdateProduct).not.toHaveBeenCalled()
-  })
-
-  it('geen toegang tot product → error', async () => {
-    mockFindFirstProduct.mockResolvedValue(null)
-
-    const result = await updateProductAction(PRODUCT_ID, VALID_DATA)
-
-    expect(result).toMatchObject({ error: expect.stringContaining('toegang') })
-    expect(mockUpdateProduct).not.toHaveBeenCalled()
-  })
-
-  it('ongeldige repo_url → validatiefout', async () => {
-    const result = await updateProductAction(PRODUCT_ID, { ...VALID_DATA, repo_url: 'https://bitbucket.org/x' })
-
-    expect(result).toMatchObject({ error: expect.any(String) })
-    expect(mockUpdateProduct).not.toHaveBeenCalled()
-  })
-})
--- a/tests/actions/push.test.ts
+++ b/tests/actions/push.test.ts
@ -1,102 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-const { mockGetSession } = vi.hoisted(() => ({
-  mockGetSession: vi.fn(),
-}))
-
-vi.mock('@/lib/auth', () => ({
-  getSession: mockGetSession,
-}))
-
-const { mockUpsert, mockDeleteMany } = vi.hoisted(() => ({
-  mockUpsert: vi.fn(),
-  mockDeleteMany: vi.fn(),
-}))
-
-vi.mock('@/lib/prisma', () => ({
-  prisma: {
-    pushSubscription: {
-      upsert: mockUpsert,
-      deleteMany: mockDeleteMany,
-    },
-  },
-}))
-
-import { subscribeToPushAction, unsubscribeFromPushAction } from '@/actions/push'
-
-const VALID_INPUT = {
-  endpoint: 'https://push.example.com/subscription/abc123',
-  keys: { p256dh: 'aBcDeFgH', auth: 'xYzAbC' },
-}
-
-const SESSION_USER = { userId: 'user-1', isDemo: false }
-const SESSION_DEMO = { userId: 'demo-1', isDemo: true }
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mockUpsert.mockResolvedValue({})
-  mockDeleteMany.mockResolvedValue({ count: 1 })
-})
-
-describe('subscribeToPushAction', () => {
-  it('upserts subscription for authenticated user', async () => {
-    mockGetSession.mockResolvedValue(SESSION_USER)
-    await subscribeToPushAction(VALID_INPUT)
-    expect(mockUpsert).toHaveBeenCalledWith(
-      expect.objectContaining({
-        where: { endpoint: VALID_INPUT.endpoint },
-        create: expect.objectContaining({ user_id: 'user-1', endpoint: VALID_INPUT.endpoint }),
-      })
-    )
-  })
-
-  it('is idempotent — calling twice upserts twice without error', async () => {
-    mockGetSession.mockResolvedValue(SESSION_USER)
-    await subscribeToPushAction(VALID_INPUT)
-    await subscribeToPushAction(VALID_INPUT)
-    expect(mockUpsert).toHaveBeenCalledTimes(2)
-  })
-
-  it('returns without writing for demo user', async () => {
-    mockGetSession.mockResolvedValue(SESSION_DEMO)
-    await subscribeToPushAction(VALID_INPUT)
-    expect(mockUpsert).not.toHaveBeenCalled()
-  })
-
-  it('returns without writing when not authenticated', async () => {
-    mockGetSession.mockResolvedValue({})
-    await subscribeToPushAction(VALID_INPUT)
-    expect(mockUpsert).not.toHaveBeenCalled()
-  })
-
-  it('returns without writing for invalid input', async () => {
-    mockGetSession.mockResolvedValue(SESSION_USER)
-    // @ts-expect-error intentionally invalid
-    await subscribeToPushAction({ endpoint: 'not-a-url', keys: {} })
-    expect(mockUpsert).not.toHaveBeenCalled()
-  })
-})
-
-describe('unsubscribeFromPushAction', () => {
-  it('deletes subscription scoped to user_id', async () => {
-    mockGetSession.mockResolvedValue(SESSION_USER)
-    await unsubscribeFromPushAction({ endpoint: VALID_INPUT.endpoint })
-    expect(mockDeleteMany).toHaveBeenCalledWith({
-      where: { endpoint: VALID_INPUT.endpoint, user_id: 'user-1' },
-    })
-  })
-
-  it('does not touch subscriptions of other users', async () => {
-    mockGetSession.mockResolvedValue({ userId: 'other-user', isDemo: false })
-    await unsubscribeFromPushAction({ endpoint: VALID_INPUT.endpoint })
-    expect(mockDeleteMany).toHaveBeenCalledWith(
-      expect.objectContaining({ where: expect.objectContaining({ user_id: 'other-user' }) })
-    )
-  })
-
-  it('returns without writing when not authenticated', async () => {
-    mockGetSession.mockResolvedValue({})
-    await unsubscribeFromPushAction({ endpoint: VALID_INPUT.endpoint })
-    expect(mockDeleteMany).not.toHaveBeenCalled()
-  })
-})
--- a/tests/actions/questions.test.ts
+++ b/tests/actions/questions.test.ts
@ -16,9 +16,6 @@ vi.mock('@/lib/prisma', () => ({
      findFirst: vi.fn(),
      updateMany: vi.fn(),
    },
-    product: {
-      findFirst: vi.fn().mockResolvedValue({ id: 'product-1' }),
-    },
  },
 }))

@ -47,13 +44,7 @@ beforeEach(() => {
 describe('actions/questions — answerQuestion', () => {
  it('happy: status pending→answered, revalidatePath geroepen', async () => {
    mockGetSession.mockResolvedValue(SESSION_USER)
-    mockPrisma.claudeQuestion.findFirst.mockResolvedValueOnce({
-      id: VALID_ID,
-      story_id: 'story-1',
-      idea_id: null,
-      product_id: 'product-1',
-      idea: null,
-    })
+    mockPrisma.claudeQuestion.findFirst.mockResolvedValueOnce({ id: VALID_ID }) // access-check
    mockPrisma.claudeQuestion.updateMany.mockResolvedValueOnce({ count: 1 })

    const res = await answerQuestion(VALID_ID, VALID_ANSWER)
@ -94,13 +85,7 @@ describe('actions/questions — answerQuestion', () => {

  it('al-answered: race-error met begrijpelijke melding', async () => {
    mockGetSession.mockResolvedValue(SESSION_USER)
-    mockPrisma.claudeQuestion.findFirst.mockResolvedValueOnce({
-      id: VALID_ID,
-      story_id: 'story-1',
-      idea_id: null,
-      product_id: 'product-1',
-      idea: null,
-    })
+    mockPrisma.claudeQuestion.findFirst.mockResolvedValueOnce({ id: VALID_ID }) // access-check
    mockPrisma.claudeQuestion.updateMany.mockResolvedValueOnce({ count: 0 })
    mockPrisma.claudeQuestion.findFirst.mockResolvedValueOnce({
      status: 'answered',
@ -114,13 +99,7 @@ describe('actions/questions — answerQuestion', () => {

  it('verlopen: updateMany count=0, nog open status maar voorbij expiry', async () => {
    mockGetSession.mockResolvedValue(SESSION_USER)
-    mockPrisma.claudeQuestion.findFirst.mockResolvedValueOnce({
-      id: VALID_ID,
-      story_id: 'story-1',
-      idea_id: null,
-      product_id: 'product-1',
-      idea: null,
-    })
+    mockPrisma.claudeQuestion.findFirst.mockResolvedValueOnce({ id: VALID_ID })
    mockPrisma.claudeQuestion.updateMany.mockResolvedValueOnce({ count: 0 })
    mockPrisma.claudeQuestion.findFirst.mockResolvedValueOnce({
      status: 'open',
--- a/tests/actions/settings.test.ts
+++ b/tests/actions/settings.test.ts
@ -1,72 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-const { mockUserUpdate, mockGetIronSession } = vi.hoisted(() => ({
-  mockUserUpdate: vi.fn(),
-  mockGetIronSession: vi.fn(),
-}))
-
-vi.mock('next/cache', () => ({ revalidatePath: vi.fn() }))
-vi.mock('next/headers', () => ({ cookies: vi.fn().mockResolvedValue({}) }))
-vi.mock('iron-session', () => ({ getIronSession: mockGetIronSession }))
-vi.mock('@/lib/session', () => ({ sessionOptions: { cookieName: 'test', password: 'test' } }))
-vi.mock('@/lib/prisma', () => ({
-  prisma: { user: { update: mockUserUpdate } },
-}))
-
-import { updateMinQuotaPctAction } from '@/actions/settings'
-
-const SESSION_USER = { userId: 'user-1', isDemo: false }
-const SESSION_DEMO = { userId: 'demo-1', isDemo: true }
-const SESSION_UNAUTH = { userId: undefined, isDemo: false }
-
-describe('updateMinQuotaPctAction', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mockUserUpdate.mockResolvedValue({})
-  })
-
-  it('returns error when not authenticated', async () => {
-    mockGetIronSession.mockResolvedValue(SESSION_UNAUTH)
-    const result = await updateMinQuotaPctAction(20)
-    expect(result).toMatchObject({ error: expect.any(String) })
-    expect(mockUserUpdate).not.toHaveBeenCalled()
-  })
-
-  it('returns 403 error for demo session', async () => {
-    mockGetIronSession.mockResolvedValue(SESSION_DEMO)
-    const result = await updateMinQuotaPctAction(20)
-    expect(result).toMatchObject({ status: 403 })
-    expect(mockUserUpdate).not.toHaveBeenCalled()
-  })
-
-  it('returns 422 error when value is 0 (below min)', async () => {
-    mockGetIronSession.mockResolvedValue(SESSION_USER)
-    const result = await updateMinQuotaPctAction(0)
-    expect(result).toMatchObject({ status: 422 })
-    expect(mockUserUpdate).not.toHaveBeenCalled()
-  })
-
-  it('returns 422 error when value is 101 (above max)', async () => {
-    mockGetIronSession.mockResolvedValue(SESSION_USER)
-    const result = await updateMinQuotaPctAction(101)
-    expect(result).toMatchObject({ status: 422 })
-    expect(mockUserUpdate).not.toHaveBeenCalled()
-  })
-
-  it('saves valid value and returns success', async () => {
-    mockGetIronSession.mockResolvedValue(SESSION_USER)
-    const result = await updateMinQuotaPctAction(35)
-    expect(result).toEqual({ success: true })
-    expect(mockUserUpdate).toHaveBeenCalledWith({
-      where: { id: 'user-1' },
-      data: { min_quota_pct: 35 },
-    })
-  })
-
-  it('accepts boundary values 1 and 100', async () => {
-    mockGetIronSession.mockResolvedValue(SESSION_USER)
-    await updateMinQuotaPctAction(1)
-    await updateMinQuotaPctAction(100)
-    expect(mockUserUpdate).toHaveBeenCalledTimes(2)
-  })
-})
--- a/tests/actions/sprint-dates.test.ts
+++ b/tests/actions/sprint-dates.test.ts
@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'

 vi.mock('next/cache', () => ({ revalidatePath: vi.fn() }))
-vi.mock('next/headers', () => ({ cookies: vi.fn().mockResolvedValue({ set: vi.fn(), get: vi.fn(), delete: vi.fn() }) }))
+vi.mock('next/headers', () => ({ cookies: vi.fn().mockResolvedValue({}) }))
 vi.mock('iron-session', () => ({
  getIronSession: vi.fn().mockResolvedValue({ userId: 'user-1', isDemo: false }),
 }))
@ -16,22 +16,16 @@ vi.mock('@/lib/prisma', () => ({
  prisma: {
    sprint: {
      findFirst: vi.fn(),
-      findMany: vi.fn(),
      create: vi.fn(),
      update: vi.fn(),
    },
-    user: {
-      findUnique: vi.fn().mockResolvedValue({ settings: {} }),
-      update: vi.fn().mockResolvedValue({}),
-    },
-    $executeRaw: vi.fn().mockResolvedValue(1),
  },
 }))

 import { prisma } from '@/lib/prisma'
 import { createSprintAction, updateSprintDatesAction } from '@/actions/sprints'

-const mockSprint = prisma as unknown as { sprint: { findFirst: ReturnType<typeof vi.fn>; findMany: ReturnType<typeof vi.fn>; create: ReturnType<typeof vi.fn>; update: ReturnType<typeof vi.fn> } }
+const mockSprint = prisma as unknown as { sprint: { findFirst: ReturnType<typeof vi.fn>; create: ReturnType<typeof vi.fn>; update: ReturnType<typeof vi.fn> } }

 function makeFormData(data: Record<string, string | null>) {
  const fd = new FormData()
@ -45,7 +39,6 @@ describe('createSprintAction — date validation', () => {
  beforeEach(() => {
    vi.clearAllMocks()
    mockSprint.sprint.findFirst.mockResolvedValue(null)
-    mockSprint.sprint.findMany.mockResolvedValue([])
    mockSprint.sprint.create.mockResolvedValue({ id: 'sprint-1' })
  })

@ -60,9 +53,10 @@ describe('createSprintAction — date validation', () => {

  it('rejects end_date before start_date', async () => {
    const fd = makeFormData({ productId: 'product-1', sprint_goal: 'Doel', start_date: '2026-05-14', end_date: '2026-05-01' })
-    const result = await createSprintAction(undefined, fd) as { code?: number; fieldErrors?: Record<string, string[]> }
-    expect(result.code).toBe(422)
-    expect(result.fieldErrors?.end_date?.[0]).toContain('Einddatum')
+    const result = await createSprintAction(undefined, fd)
+    expect(result.error).toBeTruthy()
+    const errors = result.error as Record<string, string[]>
+    expect(errors.end_date?.[0]).toContain('Einddatum')
  })

  it('accepts no dates (both optional)', async () => {
@ -87,9 +81,10 @@ describe('updateSprintDatesAction — date validation', () => {

  it('rejects end_date before start_date', async () => {
    const fd = makeFormData({ id: 'sprint-1', start_date: '2026-05-10', end_date: '2026-05-05' })
-    const result = await updateSprintDatesAction(undefined, fd) as { code?: number; fieldErrors?: Record<string, string[]> }
-    expect(result.code).toBe(422)
-    expect(result.fieldErrors?.end_date?.[0]).toContain('Einddatum')
+    const result = await updateSprintDatesAction(undefined, fd)
+    expect(result.error).toBeTruthy()
+    const errors = result.error as Record<string, string[]>
+    expect(errors.end_date?.[0]).toContain('Einddatum')
  })

  it('blocks demo users', async () => {
--- a/tests/actions/sprint-draft.test.ts
+++ b/tests/actions/sprint-draft.test.ts
@ -1,167 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-vi.mock('next/cache', () => ({ revalidatePath: vi.fn() }))
-vi.mock('next/headers', () => ({
-  cookies: vi.fn().mockResolvedValue({
-    set: vi.fn(),
-    get: vi.fn(),
-    delete: vi.fn(),
-  }),
-}))
-vi.mock('iron-session', () => ({
-  getIronSession: vi.fn().mockResolvedValue({ userId: 'user-1', isDemo: false }),
-}))
-vi.mock('@/lib/session', () => ({
-  sessionOptions: { cookieName: 'test', password: 'test' },
-}))
-vi.mock('@/lib/product-access', () => ({
-  productAccessFilter: vi.fn().mockReturnValue({}),
-}))
-vi.mock('@/lib/prisma', () => ({
-  prisma: {
-    product: { findFirst: vi.fn() },
-    user: {
-      findUnique: vi.fn(),
-      update: vi.fn().mockResolvedValue({}),
-    },
-    $executeRaw: vi.fn().mockResolvedValue(1),
-  },
-}))
-
-import { prisma } from '@/lib/prisma'
-import {
-  clearPendingSprintDraftAction,
-  setPendingSprintDraftAction,
-} from '@/actions/sprint-draft'
-import type { PendingSprintDraft, UserSettings } from '@/lib/user-settings'
-
-const mockPrisma = prisma as unknown as {
-  product: { findFirst: ReturnType<typeof vi.fn> }
-  user: {
-    findUnique: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
-}
-
-const validDraft: PendingSprintDraft = {
-  goal: 'Sprint 1',
-  pbiIntent: { pbiA: 'all' },
-  storyOverrides: { pbiA: { add: [], remove: ['story-1'] } },
-}
-
-describe('setPendingSprintDraftAction', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mockPrisma.product.findFirst.mockReset()
-    mockPrisma.user.findUnique.mockReset()
-    mockPrisma.user.update.mockReset().mockResolvedValue({})
-  })
-
-  it('persists draft for accessible product', async () => {
-    mockPrisma.product.findFirst.mockResolvedValueOnce({ id: 'p1' })
-    mockPrisma.user.findUnique.mockResolvedValueOnce({ settings: {} })
-
-    const result = await setPendingSprintDraftAction('p1', validDraft)
-
-    expect(result).toEqual({ success: true })
-    const updateArg = mockPrisma.user.update.mock.calls[0][0] as {
-      data: { settings: UserSettings }
-    }
-    expect(updateArg.data.settings.workflow?.pendingSprintDraft?.p1).toMatchObject({
-      goal: 'Sprint 1',
-      pbiIntent: { pbiA: 'all' },
-    })
-  })
-
-  it('preserves drafts for other products', async () => {
-    mockPrisma.product.findFirst.mockResolvedValueOnce({ id: 'p1' })
-    mockPrisma.user.findUnique.mockResolvedValueOnce({
-      settings: {
-        workflow: {
-          pendingSprintDraft: {
-            p2: { goal: 'P2 draft', pbiIntent: {}, storyOverrides: {} },
-          },
-        },
-      },
-    })
-
-    await setPendingSprintDraftAction('p1', validDraft)
-
-    const updateArg = mockPrisma.user.update.mock.calls[0][0] as {
-      data: { settings: UserSettings }
-    }
-    const drafts = updateArg.data.settings.workflow?.pendingSprintDraft
-    expect(Object.keys(drafts ?? {})).toEqual(expect.arrayContaining(['p1', 'p2']))
-  })
-
-  it('rejects invalid draft (empty goal)', async () => {
-    mockPrisma.product.findFirst.mockResolvedValueOnce({ id: 'p1' })
-
-    const result = await setPendingSprintDraftAction('p1', {
-      ...validDraft,
-      goal: '',
-    } as PendingSprintDraft)
-
-    expect(result).toHaveProperty('error')
-    expect(mockPrisma.user.update).not.toHaveBeenCalled()
-  })
-
-  it('rejects when product not accessible', async () => {
-    mockPrisma.product.findFirst.mockResolvedValueOnce(null)
-
-    const result = await setPendingSprintDraftAction('p1', validDraft)
-
-    expect(result).toEqual({ error: 'Product niet gevonden of niet toegankelijk' })
-    expect(mockPrisma.user.update).not.toHaveBeenCalled()
-  })
-})
-
-describe('clearPendingSprintDraftAction', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mockPrisma.product.findFirst.mockReset()
-    mockPrisma.user.findUnique.mockReset()
-    mockPrisma.user.update.mockReset().mockResolvedValue({})
-  })
-
-  it('removes draft key for product', async () => {
-    mockPrisma.product.findFirst.mockResolvedValueOnce({ id: 'p1' })
-    mockPrisma.user.findUnique.mockResolvedValueOnce({
-      settings: {
-        workflow: {
-          pendingSprintDraft: {
-            p1: { goal: 'gone', pbiIntent: {}, storyOverrides: {} },
-            p2: { goal: 'keep', pbiIntent: {}, storyOverrides: {} },
-          },
-        },
-      },
-    })
-
-    await clearPendingSprintDraftAction('p1')
-
-    const updateArg = mockPrisma.user.update.mock.calls[0][0] as {
-      data: { settings: UserSettings }
-    }
-    expect(updateArg.data.settings.workflow?.pendingSprintDraft).toEqual({
-      p2: { goal: 'keep', pbiIntent: {}, storyOverrides: {} },
-    })
-  })
-
-  it('is a no-op when there is no draft for the product', async () => {
-    mockPrisma.product.findFirst.mockResolvedValueOnce({ id: 'p1' })
-    mockPrisma.user.findUnique.mockResolvedValueOnce({ settings: {} })
-
-    const result = await clearPendingSprintDraftAction('p1')
-
-    expect(result).toEqual({ success: true })
-    expect(mockPrisma.user.update).not.toHaveBeenCalled()
-  })
-
-  it('rejects when product not accessible', async () => {
-    mockPrisma.product.findFirst.mockResolvedValueOnce(null)
-
-    const result = await clearPendingSprintDraftAction('p1')
-
-    expect(result).toEqual({ error: 'Product niet gevonden of niet toegankelijk' })
-  })
-})
--- a/tests/actions/sprint-runs.test.ts
+++ b/tests/actions/sprint-runs.test.ts
@ -1,407 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-vi.mock('next/cache', () => ({ revalidatePath: vi.fn() }))
-vi.mock('next/headers', () => ({ cookies: vi.fn().mockResolvedValue({}) }))
-vi.mock('iron-session', () => ({
-  getIronSession: vi.fn(),
-}))
-vi.mock('@/lib/session', () => ({
-  sessionOptions: { cookieName: 'test', password: 'test' },
-}))
-
-vi.mock('@/lib/prisma', () => ({
-  prisma: {
-    sprint: {
-      findUnique: vi.fn(),
-      update: vi.fn(),
-    },
-    sprintRun: {
-      findFirst: vi.fn(),
-      findUnique: vi.fn(),
-      create: vi.fn(),
-      update: vi.fn(),
-    },
-    story: {
-      findMany: vi.fn(),
-      updateMany: vi.fn(),
-    },
-    pbi: {
-      updateMany: vi.fn(),
-    },
-    task: {
-      updateMany: vi.fn(),
-      findUnique: vi.fn().mockResolvedValue(null),
-    },
-    claudeQuestion: {
-      findMany: vi.fn(),
-    },
-    claudeJob: {
-      create: vi.fn(),
-      updateMany: vi.fn(),
-    },
-    product: {
-      findUnique: vi.fn().mockResolvedValue(null),
-    },
-    $transaction: vi.fn(),
-  },
-}))
-
-import { prisma } from '@/lib/prisma'
-import { getIronSession } from 'iron-session'
-import {
-  startSprintRunAction,
-  resumeSprintAction,
-  cancelSprintRunAction,
-} from '@/actions/sprint-runs'
-
-const mockSession = getIronSession as ReturnType<typeof vi.fn>
-
-type Mocked = {
-  sprint: { findUnique: ReturnType<typeof vi.fn>; update: ReturnType<typeof vi.fn> }
-  sprintRun: {
-    findFirst: ReturnType<typeof vi.fn>
-    findUnique: ReturnType<typeof vi.fn>
-    create: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
-  story: {
-    findMany: ReturnType<typeof vi.fn>
-    updateMany: ReturnType<typeof vi.fn>
-  }
-  pbi: { updateMany: ReturnType<typeof vi.fn> }
-  task: { updateMany: ReturnType<typeof vi.fn> }
-  claudeQuestion: { findMany: ReturnType<typeof vi.fn> }
-  claudeJob: {
-    create: ReturnType<typeof vi.fn>
-    updateMany: ReturnType<typeof vi.fn>
-  }
-  $transaction: ReturnType<typeof vi.fn>
-}
-const mockPrisma = prisma as unknown as Mocked
-
-const SPRINT_OK = {
-  id: 'sprint-1',
-  status: 'OPEN',
-  product_id: 'prod-1',
-  product: { id: 'prod-1', pr_strategy: 'SPRINT' },
-}
-
-const STORY_OK = {
-  id: 'story-1',
-  pbi_id: 'pbi-1',
-  priority: 1,
-  sort_order: 1,
-  pbi: {
-    id: 'pbi-1',
-    code: 'PBI-1',
-    title: 'PBI',
-    status: 'READY',
-    priority: 1,
-    sort_order: 1,
-  },
-  tasks: [
-    { id: 'task-1', code: 'T-1', title: 'T1', priority: 1, sort_order: 1, implementation_plan: 'plan' },
-    { id: 'task-2', code: 'T-2', title: 'T2', priority: 1, sort_order: 2, implementation_plan: 'plan' },
-  ],
-}
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mockSession.mockResolvedValue({ userId: 'user-1', isDemo: false })
-  mockPrisma.$transaction.mockImplementation(
-    async (run: (tx: typeof prisma) => Promise<unknown>) => run(prisma),
-  )
-})
-
-describe('startSprintRunAction — happy path', () => {
-  it('maakt SprintRun + 2 ClaudeJobs voor 2 TO_DO tasks', async () => {
-    mockPrisma.sprint.findUnique.mockResolvedValue(SPRINT_OK)
-    mockPrisma.sprintRun.findFirst.mockResolvedValue(null)
-    mockPrisma.story.findMany.mockResolvedValue([STORY_OK])
-    mockPrisma.claudeQuestion.findMany.mockResolvedValue([])
-    mockPrisma.sprintRun.create.mockResolvedValue({ id: 'run-1' })
-    mockPrisma.claudeJob.create.mockResolvedValue({ id: 'job-x' })
-
-    const result = await startSprintRunAction({ sprint_id: 'sprint-1' })
-
-    expect(result).toEqual({ ok: true, sprint_run_id: 'run-1', jobs_count: 2 })
-    expect(mockPrisma.sprintRun.create).toHaveBeenCalledWith({
-      data: expect.objectContaining({
-        sprint_id: 'sprint-1',
-        started_by_id: 'user-1',
-        status: 'QUEUED',
-        pr_strategy: 'SPRINT',
-      }),
-    })
-    expect(mockPrisma.claudeJob.create).toHaveBeenCalledTimes(2)
-  })
-})
-
-describe('startSprintRunAction — pre-flight blockers', () => {
-  it('blokkeert wanneer task geen implementation_plan heeft', async () => {
-    mockPrisma.sprint.findUnique.mockResolvedValue(SPRINT_OK)
-    mockPrisma.sprintRun.findFirst.mockResolvedValue(null)
-    mockPrisma.story.findMany.mockResolvedValue([
-      {
-        ...STORY_OK,
-        tasks: [
-          { id: 'task-1', code: 'T-1', title: 'T1', priority: 1, sort_order: 1, implementation_plan: null },
-        ],
-      },
-    ])
-    mockPrisma.claudeQuestion.findMany.mockResolvedValue([])
-
-    const result = await startSprintRunAction({ sprint_id: 'sprint-1' })
-
-    expect(result).toMatchObject({ ok: false, error: 'PRE_FLIGHT_BLOCKED' })
-    if (result.ok === false && 'blockers' in result) {
-      expect(result.blockers).toContainEqual({
-        type: 'task_no_plan',
-        id: 'task-1',
-        label: 'T-1: T1',
-      })
-    }
-    expect(mockPrisma.sprintRun.create).not.toHaveBeenCalled()
-  })
-
-  it('blokkeert wanneer er een open ClaudeQuestion in scope is', async () => {
-    mockPrisma.sprint.findUnique.mockResolvedValue(SPRINT_OK)
-    mockPrisma.sprintRun.findFirst.mockResolvedValue(null)
-    mockPrisma.story.findMany.mockResolvedValue([STORY_OK])
-    mockPrisma.claudeQuestion.findMany.mockResolvedValue([
-      { id: 'q-1', question: 'Welke route?' },
-    ])
-
-    const result = await startSprintRunAction({ sprint_id: 'sprint-1' })
-
-    expect(result).toMatchObject({ ok: false, error: 'PRE_FLIGHT_BLOCKED' })
-    if (result.ok === false && 'blockers' in result) {
-      expect(result.blockers).toContainEqual({
-        type: 'open_question',
-        id: 'q-1',
-        label: 'Welke route?',
-      })
-    }
-  })
-
-  it('blokkeert wanneer een PBI BLOCKED of FAILED is', async () => {
-    mockPrisma.sprint.findUnique.mockResolvedValue(SPRINT_OK)
-    mockPrisma.sprintRun.findFirst.mockResolvedValue(null)
-    mockPrisma.story.findMany.mockResolvedValue([
-      { ...STORY_OK, pbi: { ...STORY_OK.pbi, status: 'BLOCKED' } },
-    ])
-    mockPrisma.claudeQuestion.findMany.mockResolvedValue([])
-
-    const result = await startSprintRunAction({ sprint_id: 'sprint-1' })
-
-    expect(result).toMatchObject({ ok: false, error: 'PRE_FLIGHT_BLOCKED' })
-    if (result.ok === false && 'blockers' in result) {
-      expect(result.blockers).toContainEqual({
-        type: 'pbi_blocked',
-        id: 'pbi-1',
-        label: 'PBI-1: PBI',
-      })
-    }
-  })
-})
-
-describe('startSprintRunAction — SPRINT_BATCH', () => {
-  const SPRINT_BATCH = {
-    ...SPRINT_OK,
-    product: {
-      id: 'prod-1',
-      pr_strategy: 'SPRINT_BATCH',
-      repo_url: 'https://github.com/example/main',
-    },
-  }
-
-  it('blokkeert task met afwijkende repo_url', async () => {
-    mockPrisma.sprint.findUnique.mockResolvedValue(SPRINT_BATCH)
-    mockPrisma.sprintRun.findFirst.mockResolvedValue(null)
-    mockPrisma.story.findMany.mockResolvedValue([
-      {
-        ...STORY_OK,
-        tasks: [
-          {
-            id: 'task-1',
-            code: 'T-1',
-            title: 'In main repo',
-            priority: 1,
-            sort_order: 1,
-            implementation_plan: 'plan',
-            repo_url: null,
-          },
-          {
-            id: 'task-2',
-            code: 'T-2',
-            title: 'Cross-repo',
-            priority: 1,
-            sort_order: 2,
-            implementation_plan: 'plan',
-            repo_url: 'https://github.com/example/other',
-          },
-        ],
-      },
-    ])
-    mockPrisma.claudeQuestion.findMany.mockResolvedValue([])
-
-    const result = await startSprintRunAction({ sprint_id: 'sprint-1' })
-
-    expect(result).toMatchObject({ ok: false, error: 'PRE_FLIGHT_BLOCKED' })
-    if (result.ok === false && 'blockers' in result) {
-      expect(result.blockers).toContainEqual({
-        type: 'task_cross_repo',
-        id: 'task-2',
-        label: 'T-2: Cross-repo',
-      })
-    }
-    expect(mockPrisma.sprintRun.create).not.toHaveBeenCalled()
-  })
-
-  it('staat tasks toe wanneer repo_url leeg is of gelijk aan product.repo_url', async () => {
-    mockPrisma.sprint.findUnique.mockResolvedValue(SPRINT_BATCH)
-    mockPrisma.sprintRun.findFirst.mockResolvedValue(null)
-    mockPrisma.story.findMany.mockResolvedValue([
-      {
-        ...STORY_OK,
-        tasks: [
-          {
-            id: 'task-1',
-            code: 'T-1',
-            title: 'No override',
-            priority: 1,
-            sort_order: 1,
-            implementation_plan: 'plan',
-            repo_url: null,
-          },
-          {
-            id: 'task-2',
-            code: 'T-2',
-            title: 'Same repo',
-            priority: 1,
-            sort_order: 2,
-            implementation_plan: 'plan',
-            repo_url: 'https://github.com/example/main',
-          },
-        ],
-      },
-    ])
-    mockPrisma.claudeQuestion.findMany.mockResolvedValue([])
-    mockPrisma.sprintRun.create.mockResolvedValue({ id: 'run-batch' })
-    mockPrisma.claudeJob.create.mockResolvedValue({ id: 'job-sprint' })
-
-    const result = await startSprintRunAction({ sprint_id: 'sprint-1' })
-
-    expect(result).toMatchObject({ ok: true, sprint_run_id: 'run-batch' })
-    // Eén SPRINT_IMPLEMENTATION-job, niet per-task
-    expect(mockPrisma.claudeJob.create).toHaveBeenCalledTimes(1)
-    expect(mockPrisma.claudeJob.create).toHaveBeenCalledWith({
-      data: expect.objectContaining({
-        kind: 'SPRINT_IMPLEMENTATION',
-        sprint_run_id: 'run-batch',
-        product_id: 'prod-1',
-      }),
-    })
-  })
-})
-
-describe('startSprintRunAction — guards', () => {
-  it('weigert wanneer Sprint niet ACTIVE is', async () => {
-    mockPrisma.sprint.findUnique.mockResolvedValue({ ...SPRINT_OK, status: 'CLOSED' })
-
-    const result = await startSprintRunAction({ sprint_id: 'sprint-1' })
-    expect(result).toMatchObject({ ok: false, error: 'SPRINT_NOT_ACTIVE' })
-  })
-
-  it('weigert wanneer er al een actieve SprintRun is', async () => {
-    mockPrisma.sprint.findUnique.mockResolvedValue(SPRINT_OK)
-    mockPrisma.sprintRun.findFirst.mockResolvedValue({ id: 'run-existing', status: 'RUNNING' })
-
-    const result = await startSprintRunAction({ sprint_id: 'sprint-1' })
-    expect(result).toMatchObject({ ok: false, error: 'SPRINT_RUN_ALREADY_ACTIVE' })
-  })
-
-  it('weigert demo-sessie', async () => {
-    mockSession.mockResolvedValue({ userId: 'demo', isDemo: true })
-
-    const result = await startSprintRunAction({ sprint_id: 'sprint-1' })
-    expect(result).toMatchObject({ ok: false, code: 403 })
-  })
-})
-
-describe('resumeSprintAction', () => {
-  it('zet sprint en cascade-statuses terug en maakt nieuwe SprintRun', async () => {
-    // Eerste findUnique (resume) ziet de sprint nog op FAILED;
-    // de tweede call (binnen startSprintRunCore na de update) ziet ACTIVE.
-    mockPrisma.sprint.findUnique
-      .mockResolvedValueOnce({ ...SPRINT_OK, status: 'FAILED' })
-      .mockResolvedValue(SPRINT_OK)
-    mockPrisma.sprintRun.findFirst.mockResolvedValue(null)
-    mockPrisma.story.findMany.mockImplementation(async (args: { select?: { pbi_id?: boolean } }) => {
-      if (args.select?.pbi_id) return [{ pbi_id: 'pbi-1' }]
-      return [STORY_OK]
-    })
-    mockPrisma.claudeQuestion.findMany.mockResolvedValue([])
-    mockPrisma.sprintRun.create.mockResolvedValue({ id: 'run-2' })
-    mockPrisma.claudeJob.create.mockResolvedValue({ id: 'job-x' })
-
-    const result = await resumeSprintAction({ sprint_id: 'sprint-1' })
-
-    expect(result).toMatchObject({ ok: true, sprint_run_id: 'run-2' })
-    expect(mockPrisma.sprint.update).toHaveBeenCalledWith({
-      where: { id: 'sprint-1' },
-      data: { status: 'OPEN', completed_at: null },
-    })
-    expect(mockPrisma.story.updateMany).toHaveBeenCalledWith({
-      where: { sprint_id: 'sprint-1', status: 'FAILED' },
-      data: { status: 'IN_SPRINT' },
-    })
-    expect(mockPrisma.task.updateMany).toHaveBeenCalledWith({
-      where: { story: { sprint_id: 'sprint-1' }, status: 'FAILED' },
-      data: { status: 'TO_DO' },
-    })
-  })
-
-  it('weigert als sprint niet FAILED is', async () => {
-    mockPrisma.sprint.findUnique.mockResolvedValue({ ...SPRINT_OK, status: 'OPEN' })
-
-    const result = await resumeSprintAction({ sprint_id: 'sprint-1' })
-    expect(result).toMatchObject({ ok: false, error: 'SPRINT_NOT_FAILED' })
-  })
-})
-
-describe('cancelSprintRunAction', () => {
-  it('zet SprintRun op CANCELLED en cancelt openstaande jobs', async () => {
-    mockPrisma.sprintRun.findUnique.mockResolvedValue({
-      id: 'run-1',
-      status: 'RUNNING',
-      sprint_id: 'sprint-1',
-    })
-
-    const result = await cancelSprintRunAction({ sprint_run_id: 'run-1' })
-
-    expect(result).toEqual({ ok: true })
-    expect(mockPrisma.sprintRun.update).toHaveBeenCalledWith({
-      where: { id: 'run-1' },
-      data: expect.objectContaining({ status: 'CANCELLED' }),
-    })
-    expect(mockPrisma.claudeJob.updateMany).toHaveBeenCalledWith(expect.objectContaining({
-      where: expect.objectContaining({
-        sprint_run_id: 'run-1',
-        status: { in: ['QUEUED', 'CLAIMED', 'RUNNING'] },
-      }),
-      data: expect.objectContaining({ status: 'CANCELLED' }),
-    }))
-  })
-
-  it('weigert wanneer SprintRun al DONE is', async () => {
-    mockPrisma.sprintRun.findUnique.mockResolvedValue({
-      id: 'run-1',
-      status: 'DONE',
-      sprint_id: 'sprint-1',
-    })
-
-    const result = await cancelSprintRunAction({ sprint_run_id: 'run-1' })
-    expect(result).toMatchObject({ ok: false, error: 'SPRINT_RUN_NOT_CANCELLABLE' })
-  })
-})
--- a/tests/actions/sprints-cascade.test.ts
+++ b/tests/actions/sprints-cascade.test.ts
@ -49,7 +49,7 @@ const mockPrisma = prisma as unknown as {
  $transaction: ReturnType<typeof vi.fn>
 }

-const SPRINT = { id: 'sprint-1', product_id: 'product-1', status: 'OPEN' }
+const SPRINT = { id: 'sprint-1', product_id: 'product-1', status: 'ACTIVE' }

 beforeEach(() => {
  vi.clearAllMocks()
--- a/tests/actions/story-claim.test.ts
+++ b/tests/actions/story-claim.test.ts
@ -50,7 +50,7 @@ const mockRequireProductWriter = requireProductWriter as ReturnType<typeof vi.fn
 const mockGetIronSession = getIronSession as ReturnType<typeof vi.fn>

 const STORY = { id: 'story-1', product_id: 'product-1', assignee_id: null }
-const SPRINT = { id: 'sprint-1', product_id: 'product-1', status: 'OPEN' }
+const SPRINT = { id: 'sprint-1', product_id: 'product-1', status: 'ACTIVE' }

 beforeEach(() => {
  vi.clearAllMocks()
--- a/tests/actions/tasks-dialog.test.ts
+++ b/tests/actions/tasks-dialog.test.ts
@ -23,24 +23,6 @@ vi.mock('@/lib/prisma', () => ({
    story: {
      findFirst: vi.fn(),
      findUniqueOrThrow: vi.fn(),
-      findMany: vi.fn(),
-      update: vi.fn(),
-    },
-    pbi: {
-      findUniqueOrThrow: vi.fn(),
-      findMany: vi.fn(),
-      update: vi.fn(),
-    },
-    sprint: {
-      findUniqueOrThrow: vi.fn(),
-      update: vi.fn(),
-    },
-    claudeJob: {
-      findFirst: vi.fn(),
-      updateMany: vi.fn(),
-    },
-    sprintRun: {
-      findUnique: vi.fn(),
      update: vi.fn(),
    },
    $transaction: vi.fn(),
@ -62,24 +44,6 @@ const mockPrisma = prisma as unknown as {
  story: {
    findFirst: ReturnType<typeof vi.fn>
    findUniqueOrThrow: ReturnType<typeof vi.fn>
-    findMany: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
-  pbi: {
-    findUniqueOrThrow: ReturnType<typeof vi.fn>
-    findMany: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
-  sprint: {
-    findUniqueOrThrow: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
-  claudeJob: {
-    findFirst: ReturnType<typeof vi.fn>
-    updateMany: ReturnType<typeof vi.fn>
-  }
-  sprintRun: {
-    findUnique: ReturnType<typeof vi.fn>
    update: ReturnType<typeof vi.fn>
  }
  $transaction: ReturnType<typeof vi.fn>
@ -190,14 +154,7 @@ describe('saveTask — edit met status-promotie', () => {
      implementation_plan: null,
    })
    mockPrisma.task.findMany.mockResolvedValue([{ status: 'DONE' }, { status: 'DONE' }])
-    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({
-      id: 'story-1',
-      status: 'IN_SPRINT',
-      pbi_id: 'pbi-1',
-      sprint_id: null,
-    })
-    mockPrisma.story.findMany.mockResolvedValue([{ status: 'DONE' }])
-    mockPrisma.pbi.findUniqueOrThrow.mockResolvedValue({ id: 'pbi-1', status: 'READY' })
+    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({ status: 'IN_SPRINT' })

    const result = await saveTask(
      { ...VALID_INPUT, status: 'DONE' },
--- a/tests/actions/update-sprint.test.ts
+++ b/tests/actions/update-sprint.test.ts
@ -1,148 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-vi.mock('next/cache', () => ({ revalidatePath: vi.fn() }))
-vi.mock('next/headers', () => ({
-  cookies: vi.fn().mockResolvedValue({
-    set: vi.fn(),
-    get: vi.fn(),
-    delete: vi.fn(),
-  }),
-}))
-vi.mock('iron-session', () => ({
-  getIronSession: vi.fn().mockResolvedValue({ userId: 'user-1', isDemo: false }),
-}))
-vi.mock('@/lib/session', () => ({
-  sessionOptions: { cookieName: 'test', password: 'test' },
-}))
-vi.mock('@/lib/product-access', () => ({
-  productAccessFilter: vi.fn().mockReturnValue({}),
-  getAccessibleProduct: vi.fn().mockResolvedValue({ id: 'product-1' }),
-}))
-vi.mock('@/lib/rate-limit', () => ({
-  enforceUserRateLimit: vi.fn().mockReturnValue(null),
-}))
-vi.mock('@/lib/code-server', () => ({
-  createWithCodeRetry: vi.fn(),
-  generateNextSprintCode: vi.fn(),
-}))
-vi.mock('@/lib/active-sprint', () => ({
-  setActiveSprintInSettings: vi.fn().mockResolvedValue(undefined),
-}))
-vi.mock('@/lib/prisma', () => ({
-  prisma: {
-    sprint: {
-      findFirst: vi.fn(),
-      update: vi.fn(),
-    },
-    story: {
-      findMany: vi.fn(),
-      updateMany: vi.fn(),
-    },
-    task: {
-      findMany: vi.fn(),
-      updateMany: vi.fn(),
-    },
-    $transaction: vi.fn(),
-  },
-}))
-
-import { prisma } from '@/lib/prisma'
-import { updateSprintAction } from '@/actions/sprints'
-
-type Mocked = {
-  sprint: {
-    findFirst: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
-}
-const mockPrisma = prisma as unknown as Mocked
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mockPrisma.sprint.findFirst.mockReset().mockResolvedValue({
-    id: 'sprint-1',
-    product_id: 'product-1',
-  })
-  mockPrisma.sprint.update.mockReset().mockResolvedValue({})
-})
-
-describe('updateSprintAction', () => {
-  it('updates sprint_goal alone', async () => {
-    const result = await updateSprintAction({
-      sprintId: 'sprint-1',
-      fields: { goal: 'Nieuw doel' },
-    })
-
-    expect('success' in result).toBe(true)
-    expect(mockPrisma.sprint.update).toHaveBeenCalledWith({
-      where: { id: 'sprint-1' },
-      data: { sprint_goal: 'Nieuw doel' },
-    })
-  })
-
-  it('updates dates only', async () => {
-    await updateSprintAction({
-      sprintId: 'sprint-1',
-      fields: { startAt: '2026-06-01', endAt: '2026-06-14' },
-    })
-
-    expect(mockPrisma.sprint.update).toHaveBeenCalledWith({
-      where: { id: 'sprint-1' },
-      data: {
-        start_date: new Date('2026-06-01'),
-        end_date: new Date('2026-06-14'),
-      },
-    })
-  })
-
-  it('accepts null to clear a date', async () => {
-    await updateSprintAction({
-      sprintId: 'sprint-1',
-      fields: { startAt: null },
-    })
-
-    expect(mockPrisma.sprint.update).toHaveBeenCalledWith({
-      where: { id: 'sprint-1' },
-      data: { start_date: null },
-    })
-  })
-
-  it('rejects when sprint not accessible', async () => {
-    mockPrisma.sprint.findFirst.mockResolvedValue(null)
-
-    const result = await updateSprintAction({
-      sprintId: 'sprint-1',
-      fields: { goal: 'x' },
-    })
-
-    expect('error' in result).toBe(true)
-    if ('error' in result) {
-      expect(result.code).toBe(403)
-    }
-    expect(mockPrisma.sprint.update).not.toHaveBeenCalled()
-  })
-
-  it('rejects empty goal', async () => {
-    const result = await updateSprintAction({
-      sprintId: 'sprint-1',
-      fields: { goal: '' },
-    })
-
-    expect('error' in result).toBe(true)
-    expect(mockPrisma.sprint.update).not.toHaveBeenCalled()
-  })
-
-  it('rejects when no fields are supplied', async () => {
-    const result = await updateSprintAction({
-      sprintId: 'sprint-1',
-      fields: {},
-    })
-
-    // Schema-refine should reject; OR action treats empty data as no-op success.
-    // Current implementation: refine forces minstens één veld → 422 error.
-    expect('error' in result).toBe(true)
-    if ('error' in result) {
-      expect(result.code).toBe(422)
-    }
-  })
-})
--- a/tests/actions/user-settings.test.ts
+++ b/tests/actions/user-settings.test.ts
@ -1,82 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-vi.mock('next/headers', () => ({ cookies: vi.fn().mockResolvedValue({}) }))
-vi.mock('iron-session', () => ({
-  getIronSession: vi.fn().mockResolvedValue({ userId: 'user-1', isDemo: false }),
-}))
-vi.mock('@/lib/session', () => ({
-  sessionOptions: { cookieName: 'test', password: 'test' },
-}))
-vi.mock('@/lib/prisma', () => ({
-  prisma: {
-    user: { findUnique: vi.fn() },
-    $transaction: vi.fn(async (fn: (tx: unknown) => Promise<unknown>) => {
-      return fn({
-        user: {
-          findUnique: vi.fn().mockResolvedValue({ settings: {} }),
-          update: vi.fn().mockResolvedValue({}),
-        },
-      })
-    }),
-    $executeRaw: vi.fn().mockResolvedValue(1),
-  },
-}))
-
-import { prisma } from '@/lib/prisma'
-import { getIronSession } from 'iron-session'
-import { updateUserSettingsAction } from '@/actions/user-settings'
-
-const mockPrisma = prisma as unknown as {
-  user: { findUnique: ReturnType<typeof vi.fn> }
-  $transaction: ReturnType<typeof vi.fn>
-  $executeRaw: ReturnType<typeof vi.fn>
-}
-const mockGetIronSession = getIronSession as ReturnType<typeof vi.fn>
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mockGetIronSession.mockResolvedValue({ userId: 'user-1', isDemo: false })
-  mockPrisma.$executeRaw.mockResolvedValue(1)
-})
-
-describe('updateUserSettingsAction', () => {
-  it('returns 401 when not logged in', async () => {
-    mockGetIronSession.mockResolvedValue({ userId: undefined, isDemo: false })
-    const result = await updateUserSettingsAction({})
-    expect(result).toEqual({ error: 'Niet ingelogd', code: 401 })
-  })
-
-  it('returns 403 for demo accounts', async () => {
-    mockGetIronSession.mockResolvedValue({ userId: 'user-1', isDemo: true })
-    const result = await updateUserSettingsAction({})
-    expect('error' in result && result.code).toBe(403)
-  })
-
-  it('returns 422 when patch is invalid', async () => {
-    const result = await updateUserSettingsAction({
-      views: { sprintBacklog: { filterStatus: 'NONSENSE' } },
-    } as never)
-    expect('error' in result && result.code).toBe(422)
-  })
-
-  it('merges with current settings and emits notify on success', async () => {
-    const existingFindUnique = vi.fn().mockResolvedValue({
-      settings: { views: { sprintBacklog: { sort: 'code' } } },
-    })
-    const update = vi.fn().mockResolvedValue({})
-    mockPrisma.$transaction.mockImplementationOnce(async (fn: (tx: unknown) => Promise<unknown>) => {
-      return fn({ user: { findUnique: existingFindUnique, update } })
-    })
-
-    const result = await updateUserSettingsAction({
-      views: { sprintBacklog: { sortDir: 'desc' } },
-    })
-
-    expect('success' in result && result.success).toBe(true)
-    expect(update).toHaveBeenCalledWith({
-      where: { id: 'user-1' },
-      data: { settings: { views: { sprintBacklog: { sort: 'code', sortDir: 'desc' } } } },
-    })
-    expect(mockPrisma.$executeRaw).toHaveBeenCalled()
-  })
-})
--- a/tests/api/backlog-realtime.test.ts
+++ b/tests/api/backlog-realtime.test.ts
@ -0,0 +1,131 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+
+const { mockGetSession } = vi.hoisted(() => ({ mockGetSession: vi.fn() }))
+
+vi.mock('@/lib/auth', () => ({ getSession: mockGetSession }))
+vi.mock('@/lib/product-access', () => ({
+  getAccessibleProduct: vi.fn(),
+}))
+
+import { getAccessibleProduct } from '@/lib/product-access'
+import type { NextRequest } from 'next/server'
+import { GET } from '@/app/api/realtime/backlog/route'
+import { useBacklogStore } from '@/stores/backlog-store'
+
+const mockGetAccessibleProduct = getAccessibleProduct as ReturnType<typeof vi.fn>
+
+function makeReq(productId?: string): NextRequest {
+  const url = productId
+    ? `http://localhost/api/realtime/backlog?product_id=${productId}`
+    : 'http://localhost/api/realtime/backlog'
+  return {
+    signal: new AbortController().signal,
+    nextUrl: new URL(url),
+  } as unknown as NextRequest
+}
+
+beforeEach(() => {
+  vi.clearAllMocks()
+})
+
+describe('GET /api/realtime/backlog', () => {
+  it('401 when not authenticated', async () => {
+    mockGetSession.mockResolvedValue({ userId: undefined, isDemo: false })
+    const res = await GET(makeReq('prod-1'))
+    expect(res.status).toBe(401)
+    expect(mockGetAccessibleProduct).not.toHaveBeenCalled()
+  })
+
+  it('400 when product_id is missing', async () => {
+    mockGetSession.mockResolvedValue({ userId: 'user-1', isDemo: false })
+    const res = await GET(makeReq())
+    expect(res.status).toBe(400)
+  })
+
+  it('403 when user has no access to the product', async () => {
+    mockGetSession.mockResolvedValue({ userId: 'user-1', isDemo: false })
+    mockGetAccessibleProduct.mockResolvedValue(null)
+    const res = await GET(makeReq('prod-1'))
+    expect(res.status).toBe(403)
+    expect(mockGetAccessibleProduct).toHaveBeenCalledWith('prod-1', 'user-1')
+  })
+
+  it('500 when DIRECT_URL and DATABASE_URL are absent', async () => {
+    mockGetSession.mockResolvedValue({ userId: 'user-1', isDemo: false })
+    mockGetAccessibleProduct.mockResolvedValue({ id: 'prod-1' })
+
+    const before = { DIRECT_URL: process.env.DIRECT_URL, DATABASE_URL: process.env.DATABASE_URL }
+    delete process.env.DIRECT_URL
+    delete process.env.DATABASE_URL
+    try {
+      const res = await GET(makeReq('prod-1'))
+      expect(res.status).toBe(500)
+    } finally {
+      if (before.DIRECT_URL !== undefined) process.env.DIRECT_URL = before.DIRECT_URL
+      if (before.DATABASE_URL !== undefined) process.env.DATABASE_URL = before.DATABASE_URL
+    }
+  })
+
+  it('demo user is allowed (no 403) when product is accessible', async () => {
+    mockGetSession.mockResolvedValue({ userId: 'demo-user', isDemo: true })
+    mockGetAccessibleProduct.mockResolvedValue({ id: 'prod-1' })
+
+    const before = { DIRECT_URL: process.env.DIRECT_URL, DATABASE_URL: process.env.DATABASE_URL }
+    delete process.env.DIRECT_URL
+    delete process.env.DATABASE_URL
+    try {
+      const res = await GET(makeReq('prod-1'))
+      // Fails at 500 (no DB URL) — not 403, confirming demo user is not blocked
+      expect(res.status).toBe(500)
+    } finally {
+      if (before.DIRECT_URL !== undefined) process.env.DIRECT_URL = before.DIRECT_URL
+      if (before.DATABASE_URL !== undefined) process.env.DATABASE_URL = before.DATABASE_URL
+    }
+  })
+})
+
+// shouldEmit scope filter — white-box unit tests
+describe('shouldEmit scope filter (via backlog-store reducer)', () => {
+  it('applyChange: pbi INSERT adds to pbis array', () => {
+    useBacklogStore.setState({ pbis: [], storiesByPbi: {}, tasksByStory: {} })
+    const pbi = { id: 'pbi-1', code: 'PBI-1', title: 'Test', priority: 2, created_at: new Date(), status: 'ready' as const }
+    useBacklogStore.getState().applyChange('pbi', 'I', pbi)
+    expect(useBacklogStore.getState().pbis).toHaveLength(1)
+    expect(useBacklogStore.getState().pbis[0].id).toBe('pbi-1')
+  })
+
+  it('applyChange: pbi UPDATE patches existing pbi', () => {
+    const pbi = { id: 'pbi-1', code: 'PBI-1', title: 'Old', priority: 2, created_at: new Date(), status: 'ready' as const }
+    useBacklogStore.setState({ pbis: [pbi], storiesByPbi: {}, tasksByStory: {} })
+    useBacklogStore.getState().applyChange('pbi', 'U', { id: 'pbi-1', title: 'New' })
+    expect(useBacklogStore.getState().pbis[0].title).toBe('New')
+  })
+
+  it('applyChange: pbi DELETE removes pbi', () => {
+    const pbi = { id: 'pbi-1', code: 'PBI-1', title: 'Test', priority: 2, created_at: new Date(), status: 'ready' as const }
+    useBacklogStore.setState({ pbis: [pbi], storiesByPbi: {}, tasksByStory: {} })
+    useBacklogStore.getState().applyChange('pbi', 'D', { id: 'pbi-1' })
+    expect(useBacklogStore.getState().pbis).toHaveLength(0)
+  })
+
+  it('applyChange: story INSERT adds to storiesByPbi', () => {
+    useBacklogStore.setState({ pbis: [], storiesByPbi: { 'pbi-1': [] }, tasksByStory: {} })
+    const story = { id: 'story-1', code: 'ST-1', title: 'S', description: null, acceptance_criteria: null, priority: 2, status: 'OPEN', pbi_id: 'pbi-1', created_at: new Date() }
+    useBacklogStore.getState().applyChange('story', 'I', story)
+    expect(useBacklogStore.getState().storiesByPbi['pbi-1']).toHaveLength(1)
+  })
+
+  it('applyChange: story DELETE removes from correct pbi bucket', () => {
+    const story = { id: 'story-1', code: 'ST-1', title: 'S', description: null, acceptance_criteria: null, priority: 2, status: 'OPEN', pbi_id: 'pbi-1', created_at: new Date() }
+    useBacklogStore.setState({ pbis: [], storiesByPbi: { 'pbi-1': [story] }, tasksByStory: {} })
+    useBacklogStore.getState().applyChange('story', 'D', { id: 'story-1' })
+    expect(useBacklogStore.getState().storiesByPbi['pbi-1']).toHaveLength(0)
+  })
+
+  it('applyChange: task UPDATE patches task across story buckets', () => {
+    const task = { id: 'task-1', title: 'Old', description: null, priority: 2, status: 'TO_DO', sort_order: 1, story_id: 'story-1', created_at: new Date() }
+    useBacklogStore.setState({ pbis: [], storiesByPbi: {}, tasksByStory: { 'story-1': [task] } })
+    useBacklogStore.getState().applyChange('task', 'U', { id: 'task-1', status: 'IN_PROGRESS' })
+    expect(useBacklogStore.getState().tasksByStory['story-1'][0].status).toBe('IN_PROGRESS')
+  })
+})
--- a/tests/api/cron-cleanup-agent-artifacts.test.ts
+++ b/tests/api/cron-cleanup-agent-artifacts.test.ts
@ -41,7 +41,7 @@ describe('POST /api/cron/cleanup-agent-artifacts', () => {
    expect(mockPrisma.claudeJob.deleteMany).not.toHaveBeenCalled()
  })

-  it('200 met juiste secret + deleteMany aangeroepen voor FAILED/CANCELLED/SKIPPED ouder dan 7 dagen', async () => {
+  it('200 met juiste secret + deleteMany aangeroepen voor FAILED/CANCELLED ouder dan 7 dagen', async () => {
    mockPrisma.claudeJob.deleteMany.mockResolvedValue({ count: 5 })

    const res = await POST(makeReq({ authorization: 'Bearer ' + SECRET }))
@ -51,7 +51,7 @@ describe('POST /api/cron/cleanup-agent-artifacts', () => {
    expect(body.ran_at).toMatch(/^\d{4}-\d{2}-\d{2}T/)

    const arg = mockPrisma.claudeJob.deleteMany.mock.calls[0][0]
-    expect(arg.where.status).toEqual({ in: ['FAILED', 'CANCELLED', 'SKIPPED'] })
+    expect(arg.where.status).toEqual({ in: ['FAILED', 'CANCELLED'] })
    expect(arg.where.finished_at.lt).toBeInstanceOf(Date)

    // cutoff should be approximately 7 days ago
--- a/tests/api/cross-sprint-blocks.test.ts
+++ b/tests/api/cross-sprint-blocks.test.ts
@ -1,120 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-vi.mock('@/lib/prisma', () => ({
-  prisma: {
-    product: { findFirst: vi.fn() },
-    story: { findMany: vi.fn() },
-  },
-}))
-
-vi.mock('@/lib/api-auth', () => ({
-  authenticateApiRequest: vi.fn(),
-}))
-
-vi.mock('@/lib/product-access', () => ({
-  productAccessFilter: vi.fn().mockReturnValue({}),
-}))
-
-import { prisma } from '@/lib/prisma'
-import { authenticateApiRequest } from '@/lib/api-auth'
-import { GET } from '@/app/api/products/[id]/cross-sprint-blocks/route'
-
-const mockPrisma = prisma as unknown as {
-  product: { findFirst: ReturnType<typeof vi.fn> }
-  story: { findMany: ReturnType<typeof vi.fn> }
-}
-const mockAuth = authenticateApiRequest as unknown as ReturnType<typeof vi.fn>
-
-function makeRequest(url: string) {
-  return new Request(url)
-}
-
-describe('GET /api/products/[id]/cross-sprint-blocks', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mockPrisma.product.findFirst.mockReset()
-    mockPrisma.story.findMany.mockReset()
-    mockAuth.mockReset().mockResolvedValue({ userId: 'user-1' })
-  })
-
-  it('returns blocking sprint info per story for happy path', async () => {
-    mockPrisma.product.findFirst.mockResolvedValue({ id: 'p1' })
-    mockPrisma.story.findMany.mockResolvedValue([
-      {
-        id: 'story-1',
-        sprint: { id: 'sprint-x', code: 'SP-X' },
-      },
-      {
-        id: 'story-2',
-        sprint: { id: 'sprint-y', code: 'SP-Y' },
-      },
-    ])
-
-    const req = makeRequest(
-      'http://localhost/api/products/p1/cross-sprint-blocks?excludeSprintId=sp-1&pbiIds=pbiA',
-    )
-    const res = await GET(req, { params: Promise.resolve({ id: 'p1' }) })
-
-    expect(res.status).toBe(200)
-    const body = await res.json()
-    expect(body).toEqual({
-      'story-1': { sprintId: 'sprint-x', sprintName: 'SP-X' },
-      'story-2': { sprintId: 'sprint-y', sprintName: 'SP-Y' },
-    })
-  })
-
-  it('rejects when pbiIds is missing', async () => {
-    const req = makeRequest(
-      'http://localhost/api/products/p1/cross-sprint-blocks?excludeSprintId=sp-1',
-    )
-    const res = await GET(req, { params: Promise.resolve({ id: 'p1' }) })
-    expect(res.status).toBe(400)
-  })
-
-  it('rejects when pbiIds is empty', async () => {
-    const req = makeRequest(
-      'http://localhost/api/products/p1/cross-sprint-blocks?pbiIds=',
-    )
-    const res = await GET(req, { params: Promise.resolve({ id: 'p1' }) })
-    expect(res.status).toBe(400)
-  })
-
-  it('returns 404 when product is not accessible', async () => {
-    mockPrisma.product.findFirst.mockResolvedValue(null)
-    const req = makeRequest(
-      'http://localhost/api/products/p1/cross-sprint-blocks?pbiIds=pbiA',
-    )
-    const res = await GET(req, { params: Promise.resolve({ id: 'p1' }) })
-    expect(res.status).toBe(404)
-  })
-
-  it('returns auth error when authenticate fails', async () => {
-    mockAuth.mockResolvedValue({ error: 'Niet ingelogd', status: 401 })
-    const req = makeRequest(
-      'http://localhost/api/products/p1/cross-sprint-blocks?pbiIds=pbiA',
-    )
-    const res = await GET(req, { params: Promise.resolve({ id: 'p1' }) })
-    expect(res.status).toBe(401)
-  })
-
-  it('passes NOT excludeSprintId to prisma when provided', async () => {
-    mockPrisma.product.findFirst.mockResolvedValue({ id: 'p1' })
-    mockPrisma.story.findMany.mockResolvedValue([])
-
-    const req = makeRequest(
-      'http://localhost/api/products/p1/cross-sprint-blocks?excludeSprintId=sp-active&pbiIds=pbiA',
-    )
-    await GET(req, { params: Promise.resolve({ id: 'p1' }) })
-
-    const callArg = mockPrisma.story.findMany.mock.calls[0][0] as {
-      where: Record<string, unknown>
-    }
-    expect(callArg.where).toMatchObject({
-      pbi_id: { in: ['pbiA'] },
-      product_id: 'p1',
-      sprint_id: { not: null },
-      NOT: { sprint_id: 'sp-active' },
-      sprint: { status: 'OPEN' },
-    })
-  })
-})
--- a/tests/api/ideas.test.ts
+++ b/tests/api/ideas.test.ts
@ -1,194 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-vi.mock('@/lib/prisma', () => ({
-  prisma: {
-    product: { findFirst: vi.fn() },
-    idea: {
-      findFirst: vi.fn(),
-      findMany: vi.fn(),
-      create: vi.fn(),
-      update: vi.fn(),
-    },
-    ideaLog: { findMany: vi.fn() },
-    $transaction: vi.fn(),
-  },
-}))
-vi.mock('@/lib/api-auth', () => ({
-  authenticateApiRequest: vi.fn(),
-}))
-vi.mock('@/lib/idea-code-server', () => ({
-  nextIdeaCode: vi.fn().mockResolvedValue('IDEA-001'),
-}))
-
-import { prisma } from '@/lib/prisma'
-import { authenticateApiRequest } from '@/lib/api-auth'
-import { GET as getIdeas, POST as postIdea } from '@/app/api/ideas/route'
-import { GET as getIdea, PATCH as patchIdea } from '@/app/api/ideas/[id]/route'
-
-type M = {
-  product: { findFirst: ReturnType<typeof vi.fn> }
-  idea: { findFirst: ReturnType<typeof vi.fn>; findMany: ReturnType<typeof vi.fn>; create: ReturnType<typeof vi.fn>; update: ReturnType<typeof vi.fn> }
-  ideaLog: { findMany: ReturnType<typeof vi.fn> }
-  $transaction: ReturnType<typeof vi.fn>
-}
-const m = prisma as unknown as M
-const mockAuth = authenticateApiRequest as ReturnType<typeof vi.fn>
-
-const NOW = new Date('2026-05-04T19:00:00Z')
-
-const IDEA_ROW = {
-  id: 'idea-1',
-  user_id: 'user-1',
-  code: 'IDEA-001',
-  title: 'Plant-watering reminder',
-  description: null,
-  status: 'DRAFT' as const,
-  product_id: null,
-  product: null,
-  pbi: null,
-  pbi_id: null,
-  archived: false,
-  grill_md: null,
-  plan_md: null,
-  created_at: NOW,
-  updated_at: NOW,
-}
-
-function makeRequest(method: 'GET' | 'POST' | 'PATCH', url: string, body?: unknown): Request {
-  return new Request(`http://localhost${url}`, {
-    method,
-    headers: {
-      Authorization: 'Bearer test-token',
-      'Content-Type': 'application/json',
-    },
-    body: body !== undefined ? JSON.stringify(body) : undefined,
-  })
-}
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mockAuth.mockResolvedValue({ userId: 'user-1', isDemo: false })
-  m.$transaction.mockImplementation(async (arg: unknown) => {
-    if (typeof arg === 'function') return (arg as (tx: unknown) => unknown)(m)
-    return arg
-  })
-})
-
-describe('GET /api/ideas', () => {
-  it('returns user ideas (DTO shape)', async () => {
-    m.idea.findMany.mockResolvedValueOnce([IDEA_ROW])
-    const res = await getIdeas(makeRequest('GET', '/api/ideas'))
-    expect(res.status).toBe(200)
-    const body = await res.json()
-    expect(body.ideas).toHaveLength(1)
-    expect(body.ideas[0]).toMatchObject({
-      id: 'idea-1',
-      code: 'IDEA-001',
-      status: 'draft',
-      has_grill_md: false,
-    })
-  })
-
-  it('rejects unauthenticated', async () => {
-    mockAuth.mockResolvedValueOnce({ error: 'Unauthorized', status: 401 })
-    const res = await getIdeas(makeRequest('GET', '/api/ideas'))
-    expect(res.status).toBe(401)
-  })
-
-  it('filters by archived=false param', async () => {
-    m.idea.findMany.mockResolvedValueOnce([])
-    await getIdeas(makeRequest('GET', '/api/ideas?archived=false'))
-    expect(m.idea.findMany).toHaveBeenCalledWith(
-      expect.objectContaining({
-        where: expect.objectContaining({ archived: false, user_id: 'user-1' }),
-      }),
-    )
-  })
-})
-
-describe('POST /api/ideas', () => {
-  it('creates idea and returns 201', async () => {
-    m.idea.create.mockResolvedValueOnce(IDEA_ROW)
-    const res = await postIdea(makeRequest('POST', '/api/ideas', { title: 'Plant-watering reminder' }))
-    expect(res.status).toBe(201)
-    const body = await res.json()
-    expect(body.idea).toMatchObject({ id: 'idea-1', code: 'IDEA-001', status: 'draft' })
-  })
-
-  it('rejects demo with 403', async () => {
-    mockAuth.mockResolvedValueOnce({ userId: 'demo-1', isDemo: true })
-    const res = await postIdea(makeRequest('POST', '/api/ideas', { title: 'x' }))
-    expect(res.status).toBe(403)
-  })
-
-  it('rejects empty title with 422', async () => {
-    const res = await postIdea(makeRequest('POST', '/api/ideas', { title: '' }))
-    expect(res.status).toBe(422)
-  })
-
-  it('rejects malformed JSON with 400', async () => {
-    const req = new Request('http://localhost/api/ideas', {
-      method: 'POST',
-      headers: { Authorization: 'Bearer test', 'Content-Type': 'application/json' },
-      body: 'not-json',
-    })
-    const res = await postIdea(req)
-    expect(res.status).toBe(400)
-  })
-
-  it('returns 404 when product_id refers to a foreign product', async () => {
-    m.product.findFirst.mockResolvedValueOnce(null)
-    const res = await postIdea(
-      makeRequest('POST', '/api/ideas', {
-        title: 'x',
-        product_id: 'cmohrysyj0000rd17clnjy4tc',
-      }),
-    )
-    expect(res.status).toBe(404)
-  })
-})
-
-describe('GET /api/ideas/[id]', () => {
-  it('returns idea + logs', async () => {
-    m.idea.findFirst.mockResolvedValueOnce(IDEA_ROW)
-    m.ideaLog.findMany.mockResolvedValueOnce([
-      { id: 'l-1', type: 'NOTE', content: 'x', metadata: null, created_at: NOW },
-    ])
-    const ctx = { params: Promise.resolve({ id: 'idea-1' }) }
-    const res = await getIdea(makeRequest('GET', '/api/ideas/idea-1'), ctx)
-    expect(res.status).toBe(200)
-    const body = await res.json()
-    expect(body.idea).toMatchObject({ id: 'idea-1' })
-    expect(body.logs).toHaveLength(1)
-  })
-
-  it('returns 404 (not 403) for foreign user — anti-enumeration', async () => {
-    m.idea.findFirst.mockResolvedValueOnce(null)
-    const ctx = { params: Promise.resolve({ id: 'idea-1' }) }
-    const res = await getIdea(makeRequest('GET', '/api/ideas/idea-1'), ctx)
-    expect(res.status).toBe(404)
-  })
-})
-
-describe('PATCH /api/ideas/[id]', () => {
-  const ctx = { params: Promise.resolve({ id: 'idea-1' }) }
-
-  it('updates editable idea', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ id: 'idea-1', status: 'DRAFT' })
-    m.idea.update.mockResolvedValueOnce({ ...IDEA_ROW, title: 'Updated' })
-    const res = await patchIdea(makeRequest('PATCH', '/api/ideas/idea-1', { title: 'Updated' }), ctx)
-    expect(res.status).toBe(200)
-  })
-
-  it('blocks demo with 403', async () => {
-    mockAuth.mockResolvedValueOnce({ userId: 'demo-1', isDemo: true })
-    const res = await patchIdea(makeRequest('PATCH', '/api/ideas/idea-1', { title: 'x' }), ctx)
-    expect(res.status).toBe(403)
-  })
-
-  it('blocks update on PLANNED with 422', async () => {
-    m.idea.findFirst.mockResolvedValueOnce({ id: 'idea-1', status: 'PLANNED' })
-    const res = await patchIdea(makeRequest('PATCH', '/api/ideas/idea-1', { title: 'x' }), ctx)
-    expect(res.status).toBe(422)
-  })
-})
--- a/tests/api/next-story.test.ts
+++ b/tests/api/next-story.test.ts
@ -25,7 +25,7 @@ const mockPrisma = prisma as unknown as {
 }
 const mockAuth = authenticateApiRequest as ReturnType<typeof vi.fn>

-const SPRINT = { id: 'sprint-1', product_id: 'prod-1', status: 'OPEN' }
+const SPRINT = { id: 'sprint-1', product_id: 'prod-1', status: 'ACTIVE' }
 const STORY = {
  id: 'story-1',
  title: 'Account aanmaken',
@ -95,7 +95,7 @@ describe('GET /api/products/:id/next-story', () => {
    expect(data.tasks[0]).toMatchObject({ id: 'task-1', status: 'todo' })
  })

-  it('queries story ordered by sort_order only', async () => {
+  it('queries story ordered by priority then sort_order', async () => {
    mockPrisma.sprint.findFirst.mockResolvedValue(SPRINT)
    mockPrisma.story.findFirst.mockResolvedValue(STORY)

@ -103,7 +103,7 @@ describe('GET /api/products/:id/next-story', () => {

    expect(mockPrisma.story.findFirst).toHaveBeenCalledWith(
      expect.objectContaining({
-        orderBy: [{ sort_order: 'asc' }],
+        orderBy: [{ priority: 'asc' }, { sort_order: 'asc' }],
      })
    )
  })
--- a/tests/api/notifications-stream.test.ts
+++ b/tests/api/notifications-stream.test.ts
@ -10,7 +10,6 @@ vi.mock('@/lib/prisma', () => ({
  prisma: {
    product: { findMany: vi.fn() },
    claudeQuestion: { findMany: vi.fn() },
-    idea: { findMany: vi.fn().mockResolvedValue([]) },
  },
 }))

--- a/tests/api/push-send.test.ts
+++ b/tests/api/push-send.test.ts
@ -1,75 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-vi.mock('server-only', () => ({}))
-
-const { mockSendPushToUser } = vi.hoisted(() => ({
-  mockSendPushToUser: vi.fn(),
-}))
-
-vi.mock('@/lib/push-server', () => ({
-  sendPushToUser: mockSendPushToUser,
-  enabled: true,
-}))
-
-vi.hoisted(() => {
-  process.env.INTERNAL_PUSH_SECRET = 'a-valid-secret-that-is-at-least-32-chars'
-})
-
-import { POST } from '@/app/api/internal/push/send/route'
-
-const VALID_BODY = {
-  userId: 'user-1',
-  payload: { title: 'Hello', body: 'World', url: '/dashboard' },
-}
-const SECRET = 'a-valid-secret-that-is-at-least-32-chars'
-
-function makeRequest(body: unknown, bearer?: string) {
-  return new Request('http://localhost/api/internal/push/send', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      ...(bearer !== undefined ? { Authorization: bearer } : {}),
-    },
-    body: JSON.stringify(body),
-  })
-}
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mockSendPushToUser.mockResolvedValue(undefined)
-})
-
-describe('POST /api/internal/push/send', () => {
-  it('returns 401 without authorization header', async () => {
-    const res = await POST(makeRequest(VALID_BODY))
-    expect(res.status).toBe(401)
-    expect(mockSendPushToUser).not.toHaveBeenCalled()
-  })
-
-  it('returns 401 with wrong bearer secret', async () => {
-    const res = await POST(makeRequest(VALID_BODY, 'Bearer wrong-secret'))
-    expect(res.status).toBe(401)
-  })
-
-  it('returns 422 with invalid body', async () => {
-    const res = await POST(makeRequest({ userId: '', payload: {} }, `Bearer ${SECRET}`))
-    expect(res.status).toBe(422)
-    expect(mockSendPushToUser).not.toHaveBeenCalled()
-  })
-
-  it('returns 204 and calls sendPushToUser on success', async () => {
-    const res = await POST(makeRequest(VALID_BODY, `Bearer ${SECRET}`))
-    expect(res.status).toBe(204)
-    expect(mockSendPushToUser).toHaveBeenCalledWith('user-1', VALID_BODY.payload)
-  })
-
-  it('returns 400 for invalid JSON', async () => {
-    const req = new Request('http://localhost/api/internal/push/send', {
-      method: 'POST',
-      headers: { Authorization: `Bearer ${SECRET}`, 'Content-Type': 'application/json' },
-      body: 'not-json',
-    })
-    const res = await POST(req)
-    expect(res.status).toBe(400)
-  })
-})
--- a/tests/api/reorder.test.ts
+++ b/tests/api/reorder.test.ts
@ -0,0 +1,111 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+
+vi.mock('@/lib/prisma', () => ({
+  prisma: {
+    story: {
+      findFirst: vi.fn(),
+    },
+    task: {
+      update: vi.fn(),
+    },
+    $transaction: vi.fn(),
+  },
+}))
+
+vi.mock('@/lib/api-auth', () => ({
+  authenticateApiRequest: vi.fn(),
+}))
+
+import { prisma } from '@/lib/prisma'
+import { authenticateApiRequest } from '@/lib/api-auth'
+import { PATCH as patchReorder } from '@/app/api/stories/[id]/tasks/reorder/route'
+
+const mockPrisma = prisma as unknown as {
+  story: { findFirst: ReturnType<typeof vi.fn> }
+  task: { update: ReturnType<typeof vi.fn> }
+  $transaction: ReturnType<typeof vi.fn>
+}
+const mockAuth = authenticateApiRequest as ReturnType<typeof vi.fn>
+
+function makeStory(taskIds: string[]) {
+  return {
+    id: 'story-1',
+    product_id: 'prod-1',
+    tasks: taskIds.map(id => ({ id })),
+  }
+}
+
+function makeRequest(body: unknown, storyId = 'story-1'): [Request, { params: Promise<{ id: string }> }] {
+  return [
+    new Request(`http://localhost/api/stories/${storyId}/tasks/reorder`, {
+      method: 'PATCH',
+      headers: { Authorization: 'Bearer test-token', 'Content-Type': 'application/json' },
+      body: JSON.stringify(body),
+    }),
+    { params: Promise.resolve({ id: storyId }) },
+  ]
+}
+
+describe('PATCH /api/stories/:id/tasks/reorder', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockAuth.mockResolvedValue({ userId: 'user-1', isDemo: false })
+    mockPrisma.$transaction.mockResolvedValue([])
+    mockPrisma.task.update.mockResolvedValue({ id: 'task-1', sort_order: 1 })
+  })
+
+  // TC-RO-06 — body validation fires before story lookup
+  it('returns 422 when task_ids is an empty array', async () => {
+    const res = await patchReorder(...makeRequest({ task_ids: [] }))
+    expect(res.status).toBe(422)
+    expect(mockPrisma.story.findFirst).not.toHaveBeenCalled()
+  })
+
+  // TC-RO-07
+  it('returns 422 when task_ids is not an array', async () => {
+    const res = await patchReorder(...makeRequest({ task_ids: 'task-1' }))
+    expect(res.status).toBe(422)
+    expect(mockPrisma.story.findFirst).not.toHaveBeenCalled()
+  })
+
+  it('returns 422 when task_ids is missing entirely', async () => {
+    const res = await patchReorder(...makeRequest({}))
+    expect(res.status).toBe(422)
+  })
+
+  // TC-RO-08
+  it('returns 422 when task_ids contains an ID not belonging to the story', async () => {
+    mockPrisma.story.findFirst.mockResolvedValue(makeStory(['task-1', 'task-2']))
+
+    const res = await patchReorder(...makeRequest({ task_ids: ['task-1', 'task-from-other-story'] }))
+    const data = await res.json()
+
+    expect(res.status).toBe(422)
+    expect(data.error).toContain('task-from-other-story')
+  })
+
+  // TC-RO-09
+  it('reorders tasks and returns 200 with success: true', async () => {
+    mockPrisma.story.findFirst.mockResolvedValue(makeStory(['task-1', 'task-2', 'task-3']))
+
+    const res = await patchReorder(...makeRequest({ task_ids: ['task-3', 'task-1', 'task-2'] }))
+    const data = await res.json()
+
+    expect(res.status).toBe(200)
+    expect(data).toEqual({ success: true })
+    expect(mockPrisma.$transaction).toHaveBeenCalled()
+  })
+
+  it('updates each task with its new sort_order index', async () => {
+    mockPrisma.story.findFirst.mockResolvedValue(makeStory(['task-1', 'task-2']))
+
+    await patchReorder(...makeRequest({ task_ids: ['task-2', 'task-1'] }))
+
+    expect(mockPrisma.task.update).toHaveBeenCalledWith(
+      expect.objectContaining({ where: { id: 'task-2' }, data: { sort_order: 1 } })
+    )
+    expect(mockPrisma.task.update).toHaveBeenCalledWith(
+      expect.objectContaining({ where: { id: 'task-1' }, data: { sort_order: 2 } })
+    )
+  })
+})
--- a/tests/api/security.test.ts
+++ b/tests/api/security.test.ts
@ -8,13 +8,10 @@ vi.mock('@/lib/prisma', () => ({
    },
    sprint: {
      findFirst: vi.fn(),
-      findUniqueOrThrow: vi.fn(),
-      update: vi.fn(),
    },
    story: {
      findFirst: vi.fn(),
      findUniqueOrThrow: vi.fn(),
-      findMany: vi.fn(),
      update: vi.fn(),
    },
    task: {
@ -22,19 +19,6 @@ vi.mock('@/lib/prisma', () => ({
      update: vi.fn(),
      findMany: vi.fn(),
    },
-    pbi: {
-      findUniqueOrThrow: vi.fn(),
-      findMany: vi.fn(),
-      update: vi.fn(),
-    },
-    claudeJob: {
-      findFirst: vi.fn(),
-      updateMany: vi.fn(),
-    },
-    sprintRun: {
-      findUnique: vi.fn(),
-      update: vi.fn(),
-    },
    storyLog: {
      create: vi.fn(),
    },
@ -54,20 +38,17 @@ import { authenticateApiRequest } from '@/lib/api-auth'
 import { GET as getProducts } from '@/app/api/products/route'
 import { GET as getNextStory } from '@/app/api/products/[id]/next-story/route'
 import { GET as getSprintTasks } from '@/app/api/sprints/[id]/tasks/route'
+import { PATCH as patchReorder } from '@/app/api/stories/[id]/tasks/reorder/route'
 import { POST as postStoryLog } from '@/app/api/stories/[id]/log/route'
 import { PATCH as patchTask } from '@/app/api/tasks/[id]/route'
+import { POST as postTodo } from '@/app/api/todos/route'

 const mockPrisma = prisma as unknown as {
  product: { findMany: ReturnType<typeof vi.fn>; findFirst: ReturnType<typeof vi.fn> }
-  sprint: {
-    findFirst: ReturnType<typeof vi.fn>
-    findUniqueOrThrow: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
+  sprint: { findFirst: ReturnType<typeof vi.fn> }
  story: {
    findFirst: ReturnType<typeof vi.fn>
    findUniqueOrThrow: ReturnType<typeof vi.fn>
-    findMany: ReturnType<typeof vi.fn>
    update: ReturnType<typeof vi.fn>
  }
  task: {
@ -75,19 +56,6 @@ const mockPrisma = prisma as unknown as {
    update: ReturnType<typeof vi.fn>
    findMany: ReturnType<typeof vi.fn>
  }
-  pbi: {
-    findUniqueOrThrow: ReturnType<typeof vi.fn>
-    findMany: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
-  claudeJob: {
-    findFirst: ReturnType<typeof vi.fn>
-    updateMany: ReturnType<typeof vi.fn>
-  }
-  sprintRun: {
-    findUnique: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
  storyLog: { create: ReturnType<typeof vi.fn> }
  todo: { create: ReturnType<typeof vi.fn> }
  $transaction: ReturnType<typeof vi.fn>
@ -196,7 +164,7 @@ describe('GET /api/products/:id/next-story', () => {
      expect.objectContaining({
        where: expect.objectContaining({
          product_id: 'prod-other',
-          status: 'OPEN',
+          status: 'ACTIVE',
          product: expect.objectContaining({
            OR: expect.arrayContaining([{ user_id: 'user-1' }]),
          }),
@ -275,6 +243,56 @@ describe('GET /api/sprints/:id/tasks', () => {
  })
 })

+// ─── PATCH /api/stories/:id/tasks/reorder ────────────────────────────────────
+
+describe('PATCH /api/stories/:id/tasks/reorder', () => {
+  const VALID_BODY = { task_ids: ['task-x'] }
+
+  // TC-RO-01
+  it('returns 401 when no valid token provided', async () => {
+    mockAuth.mockResolvedValue(UNAUTHORIZED)
+    const res = await patchReorder(
+      makePatch('http://localhost/api/stories/story-1/tasks/reorder', VALID_BODY),
+      routeCtx('story-1')
+    )
+    expect(res.status).toBe(401)
+  })
+
+  // TC-RO-03
+  it('returns 403 for demo users', async () => {
+    mockAuth.mockResolvedValue(DEMO_AUTH)
+    const res = await patchReorder(
+      makePatch('http://localhost/api/stories/story-1/tasks/reorder', VALID_BODY),
+      routeCtx('story-1')
+    )
+    expect(res.status).toBe(403)
+    const data = await res.json()
+    expect(data.error).toBe('Niet beschikbaar in demo-modus')
+  })
+
+  // TC-RO-04 / TC-RO-05
+  it('returns 404 when story is not accessible to the authenticated user', async () => {
+    mockAuth.mockResolvedValue(USER_2_AUTH)
+    mockPrisma.story.findFirst.mockResolvedValue(null)
+
+    const res = await patchReorder(
+      makePatch('http://localhost/api/stories/story-1/tasks/reorder', VALID_BODY),
+      routeCtx('story-1')
+    )
+    expect(res.status).toBe(404)
+    expect(mockPrisma.story.findFirst).toHaveBeenCalledWith(
+      expect.objectContaining({
+        where: expect.objectContaining({
+          id: 'story-1',
+          product: expect.objectContaining({
+            OR: expect.arrayContaining([{ user_id: 'user-2' }]),
+          }),
+        }),
+      })
+    )
+  })
+})
+
 // ─── POST /api/stories/:id/log ────────────────────────────────────────────────

 describe('POST /api/stories/:id/log', () => {
@ -392,14 +410,7 @@ describe('PATCH /api/tasks/:id', () => {
      implementation_plan: null,
    })
    mockPrisma.task.findMany.mockResolvedValue([{ status: 'DONE' }])
-    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({
-      id: 'story-1',
-      status: 'DONE',
-      pbi_id: 'pbi-1',
-      sprint_id: null,
-    })
-    mockPrisma.story.findMany.mockResolvedValue([{ status: 'DONE' }])
-    mockPrisma.pbi.findUniqueOrThrow.mockResolvedValue({ id: 'pbi-1', status: 'DONE' })
+    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({ status: 'DONE' })

    const res = await patchTask(
      makePatch('http://localhost/api/tasks/task-1', { status: 'done' }),
@ -408,3 +419,46 @@ describe('PATCH /api/tasks/:id', () => {
    expect(res.status).toBe(200)
  })
 })
+
+// ─── POST /api/todos ──────────────────────────────────────────────────────────
+
+describe('POST /api/todos', () => {
+  // product_id is required by the Zod schema (z.string().min(1))
+  const VALID_BODY = { title: 'Test todo', product_id: 'prod-1' }
+
+  // TC-TD-01
+  it('returns 401 when no valid token provided', async () => {
+    mockAuth.mockResolvedValue(UNAUTHORIZED)
+    const res = await postTodo(makePost('http://localhost/api/todos', VALID_BODY))
+    expect(res.status).toBe(401)
+  })
+
+  // TC-TD-03
+  it('returns 403 for demo users', async () => {
+    mockAuth.mockResolvedValue(DEMO_AUTH)
+    const res = await postTodo(makePost('http://localhost/api/todos', VALID_BODY))
+    expect(res.status).toBe(403)
+    const data = await res.json()
+    expect(data.error).toBe('Niet beschikbaar in demo-modus')
+  })
+
+  // TC-TD-08
+  it('returns 404 when product_id belongs to another user', async () => {
+    mockAuth.mockResolvedValue(USER_2_AUTH)
+    mockPrisma.product.findFirst.mockResolvedValue(null)
+
+    const res = await postTodo(
+      makePost('http://localhost/api/todos', { title: 'Todo', product_id: 'prod-owned-by-user-1' })
+    )
+    expect(res.status).toBe(404)
+    // Verify it queries by user_id, not productAccessFilter
+    expect(mockPrisma.product.findFirst).toHaveBeenCalledWith(
+      expect.objectContaining({
+        where: expect.objectContaining({
+          id: 'prod-owned-by-user-1',
+          user_id: 'user-2',
+        }),
+      })
+    )
+  })
+})
--- a/tests/api/sprint-membership-summary.test.ts
+++ b/tests/api/sprint-membership-summary.test.ts
@ -1,121 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-vi.mock('@/lib/prisma', () => ({
-  prisma: {
-    product: { findFirst: vi.fn() },
-    story: { groupBy: vi.fn() },
-  },
-}))
-
-vi.mock('@/lib/api-auth', () => ({
-  authenticateApiRequest: vi.fn(),
-}))
-
-vi.mock('@/lib/product-access', () => ({
-  productAccessFilter: vi.fn().mockReturnValue({}),
-}))
-
-import { prisma } from '@/lib/prisma'
-import { authenticateApiRequest } from '@/lib/api-auth'
-import { GET } from '@/app/api/products/[id]/sprint-membership-summary/route'
-
-const mockPrisma = prisma as unknown as {
-  product: { findFirst: ReturnType<typeof vi.fn> }
-  story: { groupBy: ReturnType<typeof vi.fn> }
-}
-const mockAuth = authenticateApiRequest as unknown as ReturnType<typeof vi.fn>
-
-function makeRequest(url: string) {
-  return new Request(url)
-}
-
-describe('GET /api/products/[id]/sprint-membership-summary', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mockPrisma.product.findFirst.mockReset()
-    mockPrisma.story.groupBy.mockReset()
-    mockAuth.mockReset().mockResolvedValue({ userId: 'user-1' })
-  })
-
-  it('returns counts per PBI for happy path', async () => {
-    mockPrisma.product.findFirst.mockResolvedValue({ id: 'p1' })
-    mockPrisma.story.groupBy
-      .mockResolvedValueOnce([
-        { pbi_id: 'pbiA', _count: { _all: 5 } },
-        { pbi_id: 'pbiB', _count: { _all: 3 } },
-      ])
-      .mockResolvedValueOnce([{ pbi_id: 'pbiA', _count: { _all: 2 } }])
-
-    const req = makeRequest(
-      'http://localhost/api/products/p1/sprint-membership-summary?sprintId=sp-1&pbiIds=pbiA,pbiB',
-    )
-    const res = await GET(req, { params: Promise.resolve({ id: 'p1' }) })
-
-    expect(res.status).toBe(200)
-    const body = await res.json()
-    expect(body).toEqual({
-      pbiA: { total: 5, inSprint: 2 },
-      pbiB: { total: 3, inSprint: 0 },
-    })
-  })
-
-  it('rejects when pbiIds is missing', async () => {
-    const req = makeRequest(
-      'http://localhost/api/products/p1/sprint-membership-summary?sprintId=sp-1',
-    )
-    const res = await GET(req, { params: Promise.resolve({ id: 'p1' }) })
-    expect(res.status).toBe(400)
-  })
-
-  it('rejects when pbiIds is empty', async () => {
-    const req = makeRequest(
-      'http://localhost/api/products/p1/sprint-membership-summary?sprintId=sp-1&pbiIds=',
-    )
-    const res = await GET(req, { params: Promise.resolve({ id: 'p1' }) })
-    expect(res.status).toBe(400)
-  })
-
-  it('rejects when sprintId is missing', async () => {
-    const req = makeRequest(
-      'http://localhost/api/products/p1/sprint-membership-summary?pbiIds=pbiA',
-    )
-    const res = await GET(req, { params: Promise.resolve({ id: 'p1' }) })
-    expect(res.status).toBe(400)
-  })
-
-  it('returns 404 when product is not accessible', async () => {
-    mockPrisma.product.findFirst.mockResolvedValue(null)
-    const req = makeRequest(
-      'http://localhost/api/products/p1/sprint-membership-summary?sprintId=sp-1&pbiIds=pbiA',
-    )
-    const res = await GET(req, { params: Promise.resolve({ id: 'p1' }) })
-    expect(res.status).toBe(404)
-  })
-
-  it('returns auth error when authenticate fails', async () => {
-    mockAuth.mockResolvedValue({ error: 'Niet ingelogd', status: 401 })
-    const req = makeRequest(
-      'http://localhost/api/products/p1/sprint-membership-summary?sprintId=sp-1&pbiIds=pbiA',
-    )
-    const res = await GET(req, { params: Promise.resolve({ id: 'p1' }) })
-    expect(res.status).toBe(401)
-  })
-
-  it('returns zero counts for PBIs without stories', async () => {
-    mockPrisma.product.findFirst.mockResolvedValue({ id: 'p1' })
-    mockPrisma.story.groupBy
-      .mockResolvedValueOnce([])
-      .mockResolvedValueOnce([])
-
-    const req = makeRequest(
-      'http://localhost/api/products/p1/sprint-membership-summary?sprintId=sp-1&pbiIds=pbiA,pbiB',
-    )
-    const res = await GET(req, { params: Promise.resolve({ id: 'p1' }) })
-
-    const body = await res.json()
-    expect(body).toEqual({
-      pbiA: { total: 0, inSprint: 0 },
-      pbiB: { total: 0, inSprint: 0 },
-    })
-  })
-})
--- a/tests/api/sprint-tasks.test.ts
+++ b/tests/api/sprint-tasks.test.ts
@ -25,7 +25,7 @@ const mockPrisma = prisma as unknown as {
 }
 const mockAuth = authenticateApiRequest as ReturnType<typeof vi.fn>

-const SPRINT = { id: 'sprint-1', product_id: 'prod-1', status: 'OPEN' }
+const SPRINT = { id: 'sprint-1', product_id: 'prod-1', status: 'ACTIVE' }

 function makeTask(n: number) {
  return {
--- a/tests/api/story-log.test.ts
+++ b/tests/api/story-log.test.ts
@ -129,7 +129,7 @@ describe('POST /api/stories/:id/log', () => {
      const res = await postStoryLog(
        ...makeRequest({ type: 'TEST_RESULT', content: 'Test gefaald.', status: 'FAILED' })
      )
-      await res.json()
+      const data = await res.json()

      expect(res.status).toBe(201)
      expect(mockPrisma.storyLog.create).toHaveBeenCalledWith(
--- a/tests/api/tasks.test.ts
+++ b/tests/api/tasks.test.ts
@ -9,24 +9,6 @@ vi.mock('@/lib/prisma', () => ({
    },
    story: {
      findUniqueOrThrow: vi.fn(),
-      findMany: vi.fn(),
-      update: vi.fn(),
-    },
-    pbi: {
-      findUniqueOrThrow: vi.fn(),
-      findMany: vi.fn(),
-      update: vi.fn(),
-    },
-    sprint: {
-      findUniqueOrThrow: vi.fn(),
-      update: vi.fn(),
-    },
-    claudeJob: {
-      findFirst: vi.fn(),
-      updateMany: vi.fn(),
-    },
-    sprintRun: {
-      findUnique: vi.fn(),
      update: vi.fn(),
    },
    $transaction: vi.fn(),
@ -49,24 +31,6 @@ const mockPrisma = prisma as unknown as {
  }
  story: {
    findUniqueOrThrow: ReturnType<typeof vi.fn>
-    findMany: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
-  pbi: {
-    findUniqueOrThrow: ReturnType<typeof vi.fn>
-    findMany: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
-  sprint: {
-    findUniqueOrThrow: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
-  claudeJob: {
-    findFirst: ReturnType<typeof vi.fn>
-    updateMany: ReturnType<typeof vi.fn>
-  }
-  sprintRun: {
-    findUnique: ReturnType<typeof vi.fn>
    update: ReturnType<typeof vi.fn>
  }
  $transaction: ReturnType<typeof vi.fn>
@ -111,14 +75,7 @@ describe('PATCH /api/tasks/:id', () => {
    })
    // Default sibling state: only this task, already DONE → no story-promotion
    mockPrisma.task.findMany.mockResolvedValue([{ status: 'DONE' }])
-    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({
-      id: 'story-1',
-      status: 'DONE',
-      pbi_id: 'pbi-1',
-      sprint_id: null,
-    })
-    mockPrisma.story.findMany.mockResolvedValue([{ status: 'DONE' }])
-    mockPrisma.pbi.findUniqueOrThrow.mockResolvedValue({ id: 'pbi-1', status: 'DONE' })
+    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({ status: 'DONE' })
    // Pass-through for $transaction so tests behave as if Prisma ran the run-fn directly.
    mockPrisma.$transaction.mockImplementation(async (run: (tx: typeof prisma) => Promise<unknown>) => {
      return run(prisma)
@ -233,14 +190,7 @@ describe('PATCH /api/tasks/:id', () => {
      story_id: 'story-1',
    })
    mockPrisma.task.findMany.mockResolvedValue([{ status: 'DONE' }, { status: 'DONE' }])
-    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({
-      id: 'story-1',
-      status: 'IN_SPRINT',
-      pbi_id: 'pbi-1',
-      sprint_id: null,
-    })
-    mockPrisma.story.findMany.mockResolvedValue([{ status: 'DONE' }])
-    mockPrisma.pbi.findUniqueOrThrow.mockResolvedValue({ id: 'pbi-1', status: 'READY' })
+    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({ status: 'IN_SPRINT' })

    const res = await patchTask(...makeRequest({ status: 'done' }))
    expect(res.status).toBe(200)
--- a/tests/api/todos.test.ts
+++ b/tests/api/todos.test.ts
@ -0,0 +1,109 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+
+vi.mock('@/lib/prisma', () => ({
+  prisma: {
+    product: {
+      findFirst: vi.fn(),
+    },
+    todo: {
+      create: vi.fn(),
+    },
+  },
+}))
+
+vi.mock('@/lib/api-auth', () => ({
+  authenticateApiRequest: vi.fn(),
+}))
+
+import { prisma } from '@/lib/prisma'
+import { authenticateApiRequest } from '@/lib/api-auth'
+import { POST as postTodo } from '@/app/api/todos/route'
+
+const mockPrisma = prisma as unknown as {
+  product: { findFirst: ReturnType<typeof vi.fn> }
+  todo: { create: ReturnType<typeof vi.fn> }
+}
+const mockAuth = authenticateApiRequest as ReturnType<typeof vi.fn>
+
+const PRODUCT = { id: 'prod-1', name: 'DevPlanner', archived: false, user_id: 'user-1' }
+const TODO_RESULT = { id: 'todo-1', title: 'Test todo', created_at: new Date('2026-04-30T10:00:00Z') }
+
+function makeRequest(body: unknown): Request {
+  return new Request('http://localhost/api/todos', {
+    method: 'POST',
+    headers: { Authorization: 'Bearer test-token', 'Content-Type': 'application/json' },
+    body: JSON.stringify(body),
+  })
+}
+
+describe('POST /api/todos', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockAuth.mockResolvedValue({ userId: 'user-1', isDemo: false })
+    mockPrisma.product.findFirst.mockResolvedValue(PRODUCT)
+    mockPrisma.todo.create.mockResolvedValue(TODO_RESULT)
+  })
+
+  // TC-TD-04
+  it('returns 422 when title is missing', async () => {
+    const res = await postTodo(makeRequest({ product_id: 'prod-1' }))
+    expect(res.status).toBe(422)
+  })
+
+  // TC-TD-05
+  it('returns 422 when title is empty string', async () => {
+    const res = await postTodo(makeRequest({ title: '', product_id: 'prod-1' }))
+    expect(res.status).toBe(422)
+  })
+
+  it('returns 422 when product_id is missing', async () => {
+    // product_id is required by the Zod schema (z.string().min(1))
+    const res = await postTodo(makeRequest({ title: 'My todo' }))
+    expect(res.status).toBe(422)
+  })
+
+  it('returns 422 when product_id is empty string', async () => {
+    const res = await postTodo(makeRequest({ title: 'My todo', product_id: '' }))
+    expect(res.status).toBe(422)
+  })
+
+  // TC-TD-07
+  it('creates todo with valid product_id and returns 201', async () => {
+    const res = await postTodo(makeRequest({ title: 'Test todo', product_id: 'prod-1' }))
+    const data = await res.json()
+
+    expect(res.status).toBe(201)
+    expect(data).toMatchObject({ id: 'todo-1', title: 'Test todo' })
+    expect(data).toHaveProperty('created_at')
+    expect(mockPrisma.todo.create).toHaveBeenCalledWith(
+      expect.objectContaining({
+        data: expect.objectContaining({
+          user_id: 'user-1',
+          product_id: 'prod-1',
+          title: 'Test todo',
+        }),
+      })
+    )
+  })
+
+  it('queries product by user_id (not productAccessFilter) to enforce ownership', async () => {
+    await postTodo(makeRequest({ title: 'Test todo', product_id: 'prod-1' }))
+
+    expect(mockPrisma.product.findFirst).toHaveBeenCalledWith(
+      expect.objectContaining({
+        where: expect.objectContaining({
+          id: 'prod-1',
+          user_id: 'user-1',
+          archived: false,
+        }),
+      })
+    )
+  })
+
+  it('returns 404 when product does not exist or is archived', async () => {
+    mockPrisma.product.findFirst.mockResolvedValue(null)
+
+    const res = await postTodo(makeRequest({ title: 'My todo', product_id: 'nonexistent' }))
+    expect(res.status).toBe(404)
+  })
+})
--- a/tests/app/api/jobs/job-by-id-route.test.ts
+++ b/tests/app/api/jobs/job-by-id-route.test.ts
@ -1,106 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-const { mockGetSession, mockFindFirstJob, mockFindManyPrice } = vi.hoisted(() => ({
-  mockGetSession: vi.fn(),
-  mockFindFirstJob: vi.fn(),
-  mockFindManyPrice: vi.fn(),
-}))
-
-vi.mock('@/lib/auth', () => ({ getSession: mockGetSession }))
-vi.mock('@/lib/prisma', () => ({
-  prisma: {
-    claudeJob: { findFirst: mockFindFirstJob },
-    modelPrice: { findMany: mockFindManyPrice },
-  },
-}))
-
-import { GET } from '@/app/api/jobs/[id]/route'
-
-function makeParams(id = 'job-1'): { params: Promise<{ id: string }> } {
-  return { params: Promise.resolve({ id }) }
-}
-
-function makeRequest(id = 'job-1'): Request {
-  return new Request(`http://localhost/api/jobs/${id}`)
-}
-
-const RAW_JOB = {
-  id: 'job-1',
-  kind: 'TASK_IMPLEMENTATION' as const,
-  status: 'DONE' as const,
-  model_id: 'claude-sonnet-4-6',
-  input_tokens: 100,
-  output_tokens: 50,
-  cache_read_tokens: 0,
-  cache_write_tokens: 0,
-  branch: 'feat/test',
-  pr_url: null,
-  error: null,
-  summary: 'Done',
-  verify_result: 'ALIGNED' as const,
-  started_at: new Date('2026-01-01T10:00:00Z'),
-  finished_at: new Date('2026-01-01T10:05:00Z'),
-  created_at: new Date('2026-01-01T09:59:00Z'),
-  sprint_run_id: null,
-  task: {
-    code: 'T-42',
-    title: 'Some task',
-    description: null,
-    implementation_plan: 'Do the thing',
-    story: { code: 'S-10', pbi: { code: 'PBI-5' } },
-  },
-  idea: null,
-  product: { name: 'Scrum4Me', code: 'SCR' },
-  sprint_run: null,
-}
-
-describe('GET /api/jobs/:id', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mockGetSession.mockResolvedValue({ userId: 'user-1' })
-    mockFindFirstJob.mockResolvedValue(RAW_JOB)
-    mockFindManyPrice.mockResolvedValue([])
-  })
-
-  it('returns 401 when not logged in', async () => {
-    mockGetSession.mockResolvedValue({ userId: undefined })
-    const res = await GET(makeRequest() as never, makeParams())
-    expect(res.status).toBe(401)
-    const body = await res.json()
-    expect(body.error).toBeTruthy()
-  })
-
-  it('returns 404 when job not found', async () => {
-    mockFindFirstJob.mockResolvedValue(null)
-    const res = await GET(makeRequest() as never, makeParams())
-    expect(res.status).toBe(404)
-    const body = await res.json()
-    expect(body.error).toBeTruthy()
-  })
-
-  it('queries with user_id filter to prevent cross-user access', async () => {
-    await GET(makeRequest() as never, makeParams())
-    expect(mockFindFirstJob).toHaveBeenCalledWith(
-      expect.objectContaining({
-        where: { id: 'job-1', user_id: 'user-1' },
-      })
-    )
-  })
-
-  it('returns 200 with mapped job shape including breadcrumb codes', async () => {
-    const res = await GET(makeRequest() as never, makeParams())
-    expect(res.status).toBe(200)
-    const body = await res.json()
-    expect(body).toMatchObject({
-      id: 'job-1',
-      kind: 'TASK_IMPLEMENTATION',
-      status: 'DONE',
-      taskCode: 'T-42',
-      taskTitle: 'Some task',
-      productCode: 'SCR',
-      storyCode: 'S-10',
-      pbiCode: 'PBI-5',
-      branch: 'feat/test',
-    })
-  })
-})
--- a/tests/app/m-products-page.test.ts
+++ b/tests/app/m-products-page.test.ts
@ -1,38 +0,0 @@
-// Lichte regressie-tests voor de mobile backlog-page. Server-component render
-// vereist te veel mocking; we asserten op statische source-eigenschappen die
-// kritisch zijn voor de mobile-shell (cookie-key gescheiden, /m/-paden).
-import { describe, it, expect } from 'vitest'
-import { readFileSync } from 'node:fs'
-import { resolve } from 'node:path'
-
-const PAGE = resolve(process.cwd(), 'app/(mobile)/m/products/[id]/page.tsx')
-const src = readFileSync(PAGE, 'utf-8')
-
-describe('mobile backlog page (ST-1137)', () => {
-  it('gebruikt gescheiden cookie-key (backlog-{id}-mobile)', () => {
-    // Beslissing C: tab-mode-gebruikers vervuilen desktop-split niet.
-    expect(src).toMatch(/cookieKey=\{`backlog-\$\{id\}-mobile`\}/)
-  })
-
-  it('closePath en TaskDialog redirect blijven onder /m/products/', () => {
-    expect(src).toContain('const closePath = `/m/products/${id}`')
-  })
-
-  it('hergebruikt BacklogHydrationWrapper + BacklogSplitPane (geen content-componenten dupliceren)', () => {
-    expect(src).toContain('BacklogHydrationWrapper')
-    expect(src).toContain('BacklogSplitPane')
-    expect(src).toContain('PbiList')
-    expect(src).toContain('StoryPanel')
-    expect(src).toContain('TaskPanel')
-  })
-
-  it('auth via requireSession() (gedeelde guard)', () => {
-    expect(src).toContain("from '@/lib/auth-guard'")
-    expect(src).toContain('requireSession()')
-  })
-
-  it('rendert TaskDialog op ?newTask en EditTaskLoader op ?editTask', () => {
-    expect(src).toContain('{newTask &&')
-    expect(src).toContain('{editTask && !newTask &&')
-  })
-})
--- a/tests/app/m-solo-page.test.ts
+++ b/tests/app/m-solo-page.test.ts
@ -1,35 +0,0 @@
-// ST-1138: regressie-vangnet voor mobile solo-page (server component).
-import { describe, it, expect } from 'vitest'
-import { readFileSync } from 'node:fs'
-import { resolve } from 'node:path'
-
-const PAGE = resolve(process.cwd(), 'app/(mobile)/m/products/[id]/solo/page.tsx')
-const TASK_DETAIL = resolve(process.cwd(), 'components/solo/task-detail-dialog.tsx')
-
-describe('mobile solo page (ST-1138)', () => {
-  const src = readFileSync(PAGE, 'utf-8')
-
-  it('hergebruikt SoloBoard zonder content-aanpassingen', () => {
-    expect(src).toContain('SoloBoard')
-    expect(src).toContain("from '@/components/solo/solo-board'")
-  })
-
-  it('auth via gedeelde requireSession()', () => {
-    expect(src).toContain("from '@/lib/auth-guard'")
-    expect(src).toContain('requireSession()')
-  })
-
-  it('geeft NoActiveSprint terug als geen actieve sprint (zelfde gedrag als desktop)', () => {
-    expect(src).toContain('NoActiveSprint')
-  })
-})
-
-describe('TaskDetailDialog erft mobile-fullscreen (ST-1138 T-332 verify-only)', () => {
-  // Beslissing A: TaskDetailDialog gebruikt entityDialogContentClasses; mobile-classes
-  // komen automatisch door uit T-317. Dit test bewijst de wiring blijft staan.
-  const src = readFileSync(TASK_DETAIL, 'utf-8')
-
-  it('rendert DialogContent met entityDialogContentClasses (geen eigen className-override)', () => {
-    expect(src).toContain('className={entityDialogContentClasses}')
-  })
-})
--- a/tests/components/backlog/backlog-split-pane.test.tsx
+++ b/tests/components/backlog/backlog-split-pane.test.tsx
@ -1,21 +1,9 @@
 // @vitest-environment jsdom
-import { describe, it, expect, beforeEach, vi } from 'vitest'
+import { describe, it, expect, beforeEach } from 'vitest'
 import { render, screen } from '@testing-library/react'
-
-vi.mock('@/actions/user-settings', () => ({
-  updateUserSettingsAction: vi.fn().mockResolvedValue({ success: true, settings: {} }),
-}))
-
-import { useProductWorkspaceStore } from '@/stores/product-workspace/store'
+import { useSelectionStore } from '@/stores/selection-store'
 import { BacklogSplitPane } from '@/components/backlog/backlog-split-pane'

-function setSelection(pbiId: string | null, storyId: string | null) {
-  useProductWorkspaceStore.setState((s) => {
-    s.context.activePbiId = pbiId
-    s.context.activeStoryId = storyId
-  })
-}
-
 const PANES = [
  <div key="a">PBI pane</div>,
  <div key="b">Stories pane</div>,
@ -34,7 +22,7 @@ function renderPane() {
 }

 beforeEach(() => {
-  setSelection(null, null)
+  useSelectionStore.setState({ selectedPbiId: null, selectedStoryId: null })
  // Force mobile viewport
  Object.defineProperty(window, 'innerWidth', { writable: true, configurable: true, value: 600 })
  window.dispatchEvent(new Event('resize'))
@ -49,7 +37,7 @@ describe('BacklogSplitPane auto-switch', () => {

  it('auto-switches to tab 1 when PBI is selected', () => {
    const { rerender } = renderPane()
-    setSelection('pbi-1', null)
+    useSelectionStore.setState({ selectedPbiId: 'pbi-1', selectedStoryId: null })
    rerender(
      <BacklogSplitPane
        panes={PANES}
@ -64,7 +52,7 @@ describe('BacklogSplitPane auto-switch', () => {

  it('auto-switches to tab 2 when story is selected', () => {
    const { rerender } = renderPane()
-    setSelection('pbi-1', 'story-1')
+    useSelectionStore.setState({ selectedPbiId: 'pbi-1', selectedStoryId: 'story-1' })
    rerender(
      <BacklogSplitPane
        panes={PANES}
@ -79,11 +67,11 @@ describe('BacklogSplitPane auto-switch', () => {

  it('switches to tab 1 on cascade-reset (story cleared when new PBI selected)', () => {
    // Start with story selected (tab 2)
-    setSelection('pbi-1', 'story-1')
+    useSelectionStore.setState({ selectedPbiId: 'pbi-1', selectedStoryId: 'story-1' })
    const { rerender } = renderPane()

    // Cascade-reset: new PBI → story clears
-    setSelection('pbi-2', null)
+    useSelectionStore.setState({ selectedPbiId: 'pbi-2', selectedStoryId: null })
    rerender(
      <BacklogSplitPane
        panes={PANES}
--- a/tests/components/backlog/integration.test.tsx
+++ b/tests/components/backlog/integration.test.tsx
@ -1,11 +1,8 @@
 // @vitest-environment jsdom
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { render, screen, fireEvent } from '@testing-library/react'
-import { useProductWorkspaceStore } from '@/stores/product-workspace/store'
-import type {
-  BacklogStory,
-  BacklogTask,
-} from '@/stores/product-workspace/types'
+import { useSelectionStore } from '@/stores/selection-store'
+import { useBacklogStore } from '@/stores/backlog-store'

 // Mock next/navigation
 const mockPush = vi.fn()
@ -25,16 +22,15 @@ Object.defineProperty(globalThis, 'localStorage', { value: localStorageMock, wri

 // Mock server actions
 vi.mock('@/actions/stories', () => ({
+  reorderStoriesAction: vi.fn().mockResolvedValue({ success: true }),
  reorderPbisAction: vi.fn().mockResolvedValue({ success: true }),
  updatePbiPriorityAction: vi.fn().mockResolvedValue({ success: true }),
 }))
 vi.mock('@/actions/pbis', () => ({ deletePbiAction: vi.fn().mockResolvedValue({ success: true }) }))
-vi.mock('@/actions/user-settings', () => ({
-  updateUserSettingsAction: vi.fn().mockResolvedValue({ success: true, settings: {} }),
-}))
+vi.mock('@/actions/tasks', () => ({ reorderTasksAction: vi.fn().mockResolvedValue({ success: true }) }))
 vi.mock('sonner', () => ({ toast: { error: vi.fn(), success: vi.fn() } }))

-// Mock dnd-kit (still needed for PBI panel which supports drag-and-drop)
+// Mock dnd-kit
 vi.mock('@dnd-kit/core', () => ({
  DndContext: ({ children }: { children: React.ReactNode }) => <>{children}</>,
  PointerSensor: class {},
@ -65,40 +61,19 @@ const PBI_ID = 'pbi-1'
 const ALT_PBI_ID = 'pbi-2'
 const STORY_ID = 'story-1'

-const STORIES: BacklogStory[] = [
-  { id: STORY_ID, code: 'ST-1', title: 'Eerste story', description: null, acceptance_criteria: null, priority: 2, sort_order: 1, status: 'OPEN', pbi_id: PBI_ID, sprint_id: null, created_at: new Date() },
+const STORIES = [
+  { id: STORY_ID, code: 'ST-1', title: 'Eerste story', description: null, acceptance_criteria: null, priority: 2, status: 'OPEN', pbi_id: PBI_ID, created_at: new Date() },
 ]
-const TASKS: BacklogTask[] = [
-  { id: 'task-1', code: null, title: 'Eerste taak', description: null, priority: 2, status: 'TO_DO', sort_order: 1, story_id: STORY_ID, created_at: new Date() },
+const TASKS = [
+  { id: 'task-1', title: 'Eerste taak', description: null, priority: 2, status: 'TO_DO', sort_order: 1, story_id: STORY_ID, created_at: new Date() },
 ]

 function resetStores() {
-  useProductWorkspaceStore.setState((s) => {
-    s.context.activeProduct = null
-    s.context.activePbiId = null
-    s.context.activeStoryId = null
-    s.context.activeTaskId = null
-    s.entities.pbisById = {}
-    s.entities.storiesById = Object.fromEntries(STORIES.map((st) => [st.id, st]))
-    s.entities.tasksById = Object.fromEntries(TASKS.map((t) => [t.id, t]))
-    s.relations.pbiIds = []
-    s.relations.storyIdsByPbi = { [PBI_ID]: STORIES.map((st) => st.id) }
-    s.relations.taskIdsByStory = { [STORY_ID]: TASKS.map((t) => t.id) }
-  })
-}
-
-function selectPbi(pbiId: string | null) {
-  useProductWorkspaceStore.setState((s) => {
-    s.context.activePbiId = pbiId
-    s.context.activeStoryId = null
-    s.context.activeTaskId = null
-  })
-}
-
-function selectStory(pbiId: string | null, storyId: string | null) {
-  useProductWorkspaceStore.setState((s) => {
-    s.context.activePbiId = pbiId
-    s.context.activeStoryId = storyId
+  useSelectionStore.setState({ selectedPbiId: null, selectedStoryId: null })
+  useBacklogStore.setState({
+    pbis: [],
+    storiesByPbi: { [PBI_ID]: STORIES },
+    tasksByStory: { [STORY_ID]: TASKS },
  })
 }

@ -114,40 +89,42 @@ describe('Backlog 3-pane integration', () => {
  })

  it('StoryPanel shows stories when PBI is selected', () => {
-    selectPbi(PBI_ID)
+    useSelectionStore.setState({ selectedPbiId: PBI_ID, selectedStoryId: null })
    render(<StoryPanel productId={PRODUCT_ID} isDemo={false} />)
    expect(screen.getByText('Eerste story')).toBeTruthy()
  })

-  it('clicking a story dispatches setActiveStory to the workspace-store', () => {
-    selectPbi(PBI_ID)
+  it('clicking a story dispatches selectStory to the store', () => {
+    useSelectionStore.setState({ selectedPbiId: PBI_ID, selectedStoryId: null })
    render(<StoryPanel productId={PRODUCT_ID} isDemo={false} />)
    fireEvent.click(screen.getByText('Eerste story'))
-    expect(useProductWorkspaceStore.getState().context.activeStoryId).toBe(STORY_ID)
+    expect(useSelectionStore.getState().selectedStoryId).toBe(STORY_ID)
  })

-  it('cascade-reset: selecting different PBI clears activeStoryId', () => {
-    selectStory(PBI_ID, STORY_ID)
-    useProductWorkspaceStore.getState().setActivePbi(ALT_PBI_ID)
-    expect(useProductWorkspaceStore.getState().context.activeStoryId).toBeNull()
+  it('cascade-reset: selecting different PBI clears selectedStoryId', () => {
+    useSelectionStore.setState({ selectedPbiId: PBI_ID, selectedStoryId: STORY_ID })
+    useSelectionStore.getState().selectPbi(ALT_PBI_ID)
+    expect(useSelectionStore.getState().selectedStoryId).toBeNull()
  })

  it('TaskPanel shows tasks after story is selected', () => {
-    selectStory(PBI_ID, STORY_ID)
+    useSelectionStore.setState({ selectedPbiId: PBI_ID, selectedStoryId: STORY_ID })
    render(<TaskPanel productId={PRODUCT_ID} isDemo={false} closePath={`/products/${PRODUCT_ID}`} />)
    expect(screen.getByText('Eerste taak')).toBeTruthy()
  })

  it('TaskPanel shows empty state after cascade-reset', () => {
-    selectStory(PBI_ID, STORY_ID)
+    useSelectionStore.setState({ selectedPbiId: PBI_ID, selectedStoryId: STORY_ID })
    render(<TaskPanel productId={PRODUCT_ID} isDemo={false} closePath={`/products/${PRODUCT_ID}`} />)
-    useProductWorkspaceStore.getState().setActivePbi(ALT_PBI_ID)
+    // Reset via selectPbi
+    useSelectionStore.getState().selectPbi(ALT_PBI_ID)
+    // Re-render reflects new store state
    render(<TaskPanel productId={PRODUCT_ID} isDemo={false} closePath={`/products/${PRODUCT_ID}`} />)
    expect(screen.getAllByText('Selecteer een story om de taken te bekijken.').length).toBeGreaterThan(0)
  })

  it('selected story card has isSelected highlight class applied', () => {
-    selectStory(PBI_ID, STORY_ID)
+    useSelectionStore.setState({ selectedPbiId: PBI_ID, selectedStoryId: STORY_ID })
    const { container } = render(<StoryPanel productId={PRODUCT_ID} isDemo={false} />)
    // bg-primary-container is applied when isSelected
    const selected = container.querySelector('.bg-primary-container')
--- a/tests/components/backlog/new-sprint-trigger.test.tsx
+++ b/tests/components/backlog/new-sprint-trigger.test.tsx
@ -1,57 +0,0 @@
-// @vitest-environment jsdom
-import { describe, it, expect, beforeEach, vi } from 'vitest'
-import { render, screen } from '@testing-library/react'
-import '@testing-library/jest-dom'
-import type { ReactNode } from 'react'
-
-const workflowMock: {
-  value: { pendingSprintDraft?: Record<string, unknown> } | undefined
-} = { value: undefined }
-
-vi.mock('@/stores/user-settings/store', () => ({
-  useUserSettingsStore: (
-    selector: (s: {
-      entities: {
-        settings: {
-          workflow: { pendingSprintDraft?: Record<string, unknown> } | undefined
-        }
-      }
-    }) => unknown,
-  ) => selector({ entities: { settings: { workflow: workflowMock.value } } }),
-}))
-
-vi.mock('./new-sprint-metadata-dialog', () => ({
-  NewSprintMetadataDialog: () => null,
-}))
-
-vi.mock('@/components/shared/demo-tooltip', () => ({
-  DemoTooltip: ({ children }: { children: ReactNode }) => children,
-}))
-
-import { NewSprintTrigger } from '@/components/backlog/new-sprint-trigger'
-
-beforeEach(() => {
-  workflowMock.value = undefined
-})
-
-describe('NewSprintTrigger', () => {
-  it('renders the button on an active product without a draft', () => {
-    render(<NewSprintTrigger productId="p1" isDemo={false} isActiveProduct={true} />)
-    expect(screen.getByText('Nieuwe sprint')).toBeInTheDocument()
-  })
-
-  it('renders nothing on a non-active product (G6)', () => {
-    const { container } = render(
-      <NewSprintTrigger productId="p1" isDemo={false} isActiveProduct={false} />,
-    )
-    expect(container).toBeEmptyDOMElement()
-  })
-
-  it('renders nothing when a sprint draft is pending', () => {
-    workflowMock.value = { pendingSprintDraft: { p1: { goal: 'X' } } }
-    const { container } = render(
-      <NewSprintTrigger productId="p1" isDemo={false} isActiveProduct={true} />,
-    )
-    expect(container).toBeEmptyDOMElement()
-  })
-})
--- a/tests/components/backlog/task-panel.test.tsx
+++ b/tests/components/backlog/task-panel.test.tsx
@ -1,40 +1,44 @@
 // @vitest-environment jsdom
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { render, screen, fireEvent } from '@testing-library/react'
-import { useProductWorkspaceStore } from '@/stores/product-workspace/store'
-import type { BacklogTask } from '@/stores/product-workspace/types'
-
-function resetWorkspace() {
-  useProductWorkspaceStore.setState((s) => {
-    s.context.activeProduct = null
-    s.context.activePbiId = null
-    s.context.activeStoryId = null
-    s.context.activeTaskId = null
-    s.entities.pbisById = {}
-    s.entities.storiesById = {}
-    s.entities.tasksById = {}
-    s.relations.pbiIds = []
-    s.relations.storyIdsByPbi = {}
-    s.relations.taskIdsByStory = {}
-  })
-}
-
-function setActiveStoryAndTasks(storyId: string | null, tasks: BacklogTask[] = []) {
-  useProductWorkspaceStore.setState((s) => {
-    s.context.activeStoryId = storyId
-    if (storyId) {
-      s.relations.taskIdsByStory[storyId] = tasks.map((t) => t.id)
-      for (const task of tasks) s.entities.tasksById[task.id] = task
-    }
-  })
-}
+import { useSelectionStore } from '@/stores/selection-store'
+import { useBacklogStore } from '@/stores/backlog-store'

 // Mock next/navigation
 const mockPush = vi.fn()
 vi.mock('next/navigation', () => ({ useRouter: () => ({ push: mockPush }) }))

+// Mock reorderTasksAction
+vi.mock('@/actions/tasks', () => ({ reorderTasksAction: vi.fn().mockResolvedValue({ success: true }) }))
 vi.mock('sonner', () => ({ toast: { error: vi.fn(), success: vi.fn() } }))

+// Mock dnd-kit to avoid jsdom drag complexity
+vi.mock('@dnd-kit/core', () => ({
+  DndContext: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+  PointerSensor: class {},
+  KeyboardSensor: class {},
+  useSensor: vi.fn(),
+  useSensors: vi.fn(() => []),
+  closestCenter: vi.fn(),
+  DragOverlay: () => null,
+}))
+vi.mock('@dnd-kit/sortable', () => ({
+  SortableContext: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+  useSortable: () => ({
+    attributes: {}, listeners: {}, setNodeRef: vi.fn(),
+    transform: null, transition: undefined, isDragging: false,
+  }),
+  rectSortingStrategy: {},
+  sortableKeyboardCoordinates: {},
+  arrayMove: (arr: unknown[], from: number, to: number) => {
+    const next = [...arr]
+    next.splice(from, 1)
+    next.splice(to, 0, arr[from])
+    return next
+  },
+}))
+vi.mock('@dnd-kit/utilities', () => ({ CSS: { Transform: { toString: () => '' } } }))
+
 import { TaskPanel } from '@/components/backlog/task-panel'

 const PRODUCT_ID = 'prod-1'
@ -42,8 +46,8 @@ const STORY_ID = 'story-1'
 const CLOSE_PATH = `/products/${PRODUCT_ID}`

 const TASKS = [
-  { id: 'task-1', code: null, title: 'Eerste taak', description: null, priority: 2, status: 'TO_DO', sort_order: 1, story_id: STORY_ID, created_at: new Date() },
-  { id: 'task-2', code: null, title: 'Tweede taak', description: null, priority: 3, status: 'IN_PROGRESS', sort_order: 2, story_id: STORY_ID, created_at: new Date() },
+  { id: 'task-1', title: 'Eerste taak', description: null, priority: 2, status: 'TO_DO', sort_order: 1, story_id: STORY_ID, created_at: new Date() },
+  { id: 'task-2', title: 'Tweede taak', description: null, priority: 3, status: 'IN_PROGRESS', sort_order: 2, story_id: STORY_ID, created_at: new Date() },
 ]

 function renderPanel(isDemo = false) {
@ -53,7 +57,8 @@ function renderPanel(isDemo = false) {
 describe('TaskPanel', () => {
  beforeEach(() => {
    mockPush.mockClear()
-    resetWorkspace()
+    useSelectionStore.setState({ selectedStoryId: null, selectedPbiId: null })
+    useBacklogStore.setState({ pbis: [], storiesByPbi: {}, tasksByStory: {} })
  })

  it('shows empty state when no story is selected', () => {
@ -62,35 +67,40 @@ describe('TaskPanel', () => {
  })

  it('shows empty state with action when story selected but no tasks', () => {
-    setActiveStoryAndTasks(STORY_ID, [])
+    useSelectionStore.setState({ selectedStoryId: STORY_ID, selectedPbiId: null })
+    useBacklogStore.setState({ tasksByStory: { [STORY_ID]: [] } })
    renderPanel()
    expect(screen.getByText('Nog geen taken voor deze story.')).toBeTruthy()
    expect(screen.getAllByText('+ Nieuwe taak').length).toBeGreaterThanOrEqual(1)
  })

  it('renders task cards when tasks are present', () => {
-    setActiveStoryAndTasks(STORY_ID, TASKS)
+    useSelectionStore.setState({ selectedStoryId: STORY_ID, selectedPbiId: null })
+    useBacklogStore.setState({ tasksByStory: { [STORY_ID]: TASKS } })
    renderPanel()
    expect(screen.getByText('Eerste taak')).toBeTruthy()
    expect(screen.getByText('Tweede taak')).toBeTruthy()
  })

  it('renders status badges on task cards', () => {
-    setActiveStoryAndTasks(STORY_ID, TASKS)
+    useSelectionStore.setState({ selectedStoryId: STORY_ID, selectedPbiId: null })
+    useBacklogStore.setState({ tasksByStory: { [STORY_ID]: TASKS } })
    renderPanel()
    expect(screen.getByText('To Do')).toBeTruthy()
    expect(screen.getByText('Bezig')).toBeTruthy()
  })

  it('task cards are rendered inside a grid container', () => {
-    setActiveStoryAndTasks(STORY_ID, TASKS)
+    useSelectionStore.setState({ selectedStoryId: STORY_ID, selectedPbiId: null })
+    useBacklogStore.setState({ tasksByStory: { [STORY_ID]: TASKS } })
    const { container } = renderPanel()
    const grid = container.querySelector('.grid')
    expect(grid).toBeTruthy()
  })

  it('clicking + button calls router.push with newTask params', () => {
-    setActiveStoryAndTasks(STORY_ID, [])
+    useSelectionStore.setState({ selectedStoryId: STORY_ID, selectedPbiId: null })
+    useBacklogStore.setState({ tasksByStory: { [STORY_ID]: [] } })
    renderPanel()
    const buttons = screen.getAllByText('+ Nieuwe taak')
    fireEvent.click(buttons[0])
@ -98,18 +108,29 @@ describe('TaskPanel', () => {
  })

  it('clicking task card calls router.push with editTask param', () => {
-    setActiveStoryAndTasks(STORY_ID, TASKS)
+    useSelectionStore.setState({ selectedStoryId: STORY_ID, selectedPbiId: null })
+    useBacklogStore.setState({ tasksByStory: { [STORY_ID]: TASKS } })
    renderPanel()
    fireEvent.click(screen.getByText('Eerste taak'))
    expect(mockPush).toHaveBeenCalledWith(`${CLOSE_PATH}?editTask=task-1`)
  })

  it('+ button is disabled in demo mode', () => {
-    setActiveStoryAndTasks(STORY_ID, [])
+    useSelectionStore.setState({ selectedStoryId: STORY_ID, selectedPbiId: null })
+    useBacklogStore.setState({ tasksByStory: { [STORY_ID]: [] } })
    renderPanel(true)
    const btn = screen.getAllByText('+ Nieuwe taak')[0].closest('button')
    expect(btn).toBeTruthy()
    expect((btn as HTMLButtonElement).disabled).toBe(true)
  })

+  it('cards have no drag listeners in demo mode (whole-card drag disabled)', () => {
+    useSelectionStore.setState({ selectedStoryId: STORY_ID, selectedPbiId: null })
+    useBacklogStore.setState({ tasksByStory: { [STORY_ID]: TASKS } })
+    // In demo mode, listeners ({} from useSortable mock) are not spread onto the card.
+    // The mock always returns empty listeners, so we just verify the cards render without error.
+    renderPanel(true)
+    expect(screen.getByText('Eerste taak')).toBeTruthy()
+    expect(screen.getByText('Tweede taak')).toBeTruthy()
+  })
 })
--- a/tests/components/dashboard/product-list.test.tsx
+++ b/tests/components/dashboard/product-list.test.tsx
@ -1,56 +0,0 @@
-// @vitest-environment jsdom
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { render, screen, fireEvent } from '@testing-library/react'
-
-const { pushMock } = vi.hoisted(() => ({ pushMock: vi.fn() }))
-vi.mock('next/navigation', () => ({ useRouter: () => ({ push: pushMock, refresh: vi.fn() }) }))
-vi.mock('@/actions/products', () => ({ restoreProductAction: vi.fn() }))
-vi.mock('@/actions/active-product', () => ({ setActiveProductAction: vi.fn() }))
-vi.mock('sonner', () => ({ toast: { success: vi.fn(), error: vi.fn() } }))
-vi.mock('@/components/dialogs/product-dialog', () => ({
-  ProductDialog: ({ open }: { open: boolean }) => (open ? <div role="dialog">ProductDialog</div> : null),
-}))
-
-import { ProductList } from '@/components/dashboard/product-list'
-
-const PRODUCT = {
-  id: 'p1',
-  name: 'Mijn Product',
-  code: 'MP',
-  description: 'Een product',
-  repo_url: 'https://github.com/foo/bar',
-  definition_of_done: 'klaar als het werkt',
-  auto_pr: false,
-}
-
-beforeEach(() => {
-  pushMock.mockClear()
-})
-
-describe('ProductList — edit-icoon (todo cmoq3ox51)', () => {
-  it('rendert pencil-icoon (Bewerk product) op active card, geen tekstknop "Bewerken"', () => {
-    render(<ProductList products={[PRODUCT]} isDemo={false} activeProductId="p1" />)
-    expect(screen.getByLabelText('Bewerk product')).toBeTruthy()
-    // Oude tekstknop is weg
-    expect(screen.queryByText('Bewerken')).toBeNull()
-  })
-
-  it('opent ProductDialog op klik (en stopt propagation zodat card-click niet navigeert)', () => {
-    render(<ProductList products={[PRODUCT]} isDemo={false} activeProductId="p1" />)
-    expect(screen.queryByRole('dialog')).toBeNull()
-    fireEvent.click(screen.getByLabelText('Bewerk product'))
-    expect(screen.getByRole('dialog')).toBeTruthy()
-    expect(pushMock).not.toHaveBeenCalled() // card-navigation niet getriggerd
-  })
-
-  it('demo-user: knop is disabled', () => {
-    render(<ProductList products={[PRODUCT]} isDemo={true} activeProductId="p1" />)
-    const btn = screen.getByLabelText('Bewerk product') as HTMLButtonElement
-    expect(btn.disabled).toBe(true)
-  })
-
-  it('toont geen edit-icoon bij gearchiveerde producten', () => {
-    render(<ProductList products={[PRODUCT]} isDemo={false} showArchived={true} activeProductId={null} />)
-    expect(screen.queryByLabelText('Bewerk product')).toBeNull()
-  })
-})
--- a/tests/components/dialogs/answer-modal.test.tsx
+++ b/tests/components/dialogs/answer-modal.test.tsx
@ -1,104 +0,0 @@
-// @vitest-environment jsdom
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { render, screen, fireEvent, waitFor } from '@testing-library/react'
-import React from 'react'
-
-vi.mock('@/actions/questions', () => ({
-  answerQuestion: vi.fn(),
-}))
-vi.mock('sonner', () => ({ toast: { success: vi.fn(), error: vi.fn() } }))
-vi.mock('@/stores/notifications-store', () => ({
-  useNotificationsStore: {
-    getState: () => ({ remove: vi.fn() }),
-  },
-}))
-vi.mock('next/link', () => ({
-  default: ({ href, children }: { href: string; children: React.ReactNode }) => (
-    <a href={href}>{children}</a>
-  ),
-}))
-
-import { AnswerModal } from '@/components/notifications/answer-modal'
-import { answerQuestion } from '@/actions/questions'
-import { toast } from 'sonner'
-import type { NotificationQuestion } from '@/stores/notifications-store'
-
-const mockAnswerQuestion = answerQuestion as ReturnType<typeof vi.fn>
-const mockToast = toast as unknown as {
-  success: ReturnType<typeof vi.fn>
-  error: ReturnType<typeof vi.fn>
-}
-
-const QUESTION: NotificationQuestion = {
-  kind: 'idea',
-  id: 'q-1',
-  product_id: 'prod-1',
-  idea_id: 'idea-1',
-  idea_code: 'IDEA-42',
-  idea_title: 'Mijn Idee',
-  question: 'Wat denk jij?',
-  options: ['Optie A', 'Optie B'],
-  created_at: '2026-01-01T00:00:00Z',
-  expires_at: '2026-12-31T00:00:00Z',
-}
-
-beforeEach(() => {
-  vi.clearAllMocks()
-})
-
-describe('AnswerModal — met opties', () => {
-  it('toont optieknoppen, textarea en Verstuur-knop', () => {
-    render(<AnswerModal question={QUESTION} isDemo={false} onClose={vi.fn()} />)
-    expect(screen.getByRole('button', { name: 'Optie A' })).toBeTruthy()
-    expect(screen.getByRole('button', { name: 'Optie B' })).toBeTruthy()
-    expect(screen.getByLabelText(/Antwoord op Claude/)).toBeTruthy()
-    expect(screen.getByRole('button', { name: 'Verstuur' })).toBeTruthy()
-  })
-
-  it('roept answerQuestion aan met optiewaarde bij klik op optieknop', async () => {
-    mockAnswerQuestion.mockResolvedValue({ ok: true })
-    render(<AnswerModal question={QUESTION} isDemo={false} onClose={vi.fn()} />)
-
-    fireEvent.click(screen.getByRole('button', { name: 'Optie A' }))
-
-    await waitFor(() => {
-      expect(mockAnswerQuestion).toHaveBeenCalledWith('q-1', 'Optie A')
-    })
-  })
-
-  it('roept answerQuestion aan met getypte tekst bij klik op Verstuur', async () => {
-    mockAnswerQuestion.mockResolvedValue({ ok: true })
-    render(<AnswerModal question={QUESTION} isDemo={false} onClose={vi.fn()} />)
-
-    fireEvent.change(screen.getByLabelText(/Antwoord op Claude/), {
-      target: { value: 'Mijn eigen antwoord' },
-    })
-    fireEvent.click(screen.getByRole('button', { name: 'Verstuur' }))
-
-    await waitFor(() => {
-      expect(mockAnswerQuestion).toHaveBeenCalledWith('q-1', 'Mijn eigen antwoord')
-    })
-  })
-
-  it('Verstuur-knop is disabled zolang het tekstveld leeg is', () => {
-    render(<AnswerModal question={QUESTION} isDemo={false} onClose={vi.fn()} />)
-    expect(screen.getByRole('button', { name: 'Verstuur' })).toHaveProperty('disabled', true)
-  })
-})
-
-describe('AnswerModal — demo-modus', () => {
-  it('textarea is disabled en Verstuur is disabled bij isDemo=true', () => {
-    render(<AnswerModal question={QUESTION} isDemo={true} onClose={vi.fn()} />)
-    expect(screen.getByLabelText(/Antwoord op Claude/)).toHaveProperty('disabled', true)
-    expect(screen.getByRole('button', { name: 'Verstuur' })).toHaveProperty('disabled', true)
-  })
-})
-
-describe('AnswerModal — geen vraag', () => {
-  it('rendert niets wanneer question null is', () => {
-    const { container } = render(
-      <AnswerModal question={null} isDemo={false} onClose={vi.fn()} />,
-    )
-    expect(container.firstChild).toBeNull()
-  })
-})
--- a/tests/components/dialogs/product-dialog.test.tsx
+++ b/tests/components/dialogs/product-dialog.test.tsx
@ -1,134 +0,0 @@
-// @vitest-environment jsdom
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { render, screen, fireEvent, waitFor } from '@testing-library/react'
-
-vi.mock('@/actions/products', () => ({
-  createProductAction: vi.fn(),
-  updateProductAction: vi.fn(),
-}))
-vi.mock('sonner', () => ({ toast: { success: vi.fn(), error: vi.fn() } }))
-vi.mock('@/stores/products-store', () => ({
-  useProductsStore: vi.fn((selector: (s: { addProduct: () => void; updateProduct: () => void }) => unknown) =>
-    selector({ addProduct: vi.fn(), updateProduct: vi.fn() })
-  ),
-}))
-
-import { ProductDialog } from '@/components/dialogs/product-dialog'
-import { createProductAction, updateProductAction } from '@/actions/products'
-import { toast } from 'sonner'
-
-const mockCreate = createProductAction as ReturnType<typeof vi.fn>
-const mockUpdate = updateProductAction as ReturnType<typeof vi.fn>
-const mockToast = toast as unknown as {
-  success: ReturnType<typeof vi.fn>
-  error: ReturnType<typeof vi.fn>
-}
-
-const PRODUCT = {
-  id: 'prod-1',
-  name: 'Mijn Product',
-  code: 'MP',
-  description: 'Een product',
-  repo_url: 'https://github.com/org/repo',
-  definition_of_done: 'Alles groen',
-  auto_pr: false,
-}
-
-beforeEach(() => {
-  vi.clearAllMocks()
-})
-
-describe('ProductDialog — create mode', () => {
-  it('rendert met lege velden en "Nieuw product" titel', () => {
-    render(
-      <ProductDialog mode="create" open={true} onOpenChange={vi.fn()} />
-    )
-    expect(screen.getByText('Nieuw product')).toBeTruthy()
-    expect(screen.getByLabelText(/Naam/)).toBeTruthy()
-    expect((screen.getByLabelText(/Naam/) as HTMLInputElement).value).toBe('')
-  })
-
-  it('toont validatiefout als naam leeg is bij submit', async () => {
-    render(
-      <ProductDialog mode="create" open={true} onOpenChange={vi.fn()} />
-    )
-    fireEvent.click(screen.getByRole('button', { name: 'Aanmaken' }))
-
-    await waitFor(() => {
-      expect(screen.getByText('Naam is verplicht')).toBeTruthy()
-    })
-    expect(mockCreate).not.toHaveBeenCalled()
-  })
-
-  it('roept createProductAction aan bij geldig formulier', async () => {
-    mockCreate.mockResolvedValue({ success: true, productId: 'new-prod' })
-
-    render(
-      <ProductDialog mode="create" open={true} onOpenChange={vi.fn()} />
-    )
-
-    fireEvent.change(screen.getByLabelText(/Naam/), { target: { value: 'Nieuw Product' } })
-    fireEvent.submit(document.getElementById('product-form')!)
-
-    await waitFor(() => {
-      expect(mockCreate).toHaveBeenCalledWith(
-        expect.objectContaining({ name: 'Nieuw Product' })
-      )
-    })
-    expect(mockToast.success).toHaveBeenCalledWith('Product aangemaakt')
-  })
-
-  it('toont error-toast als createProductAction een error retourneert', async () => {
-    mockCreate.mockResolvedValue({ error: 'Code is al in gebruik' })
-
-    render(
-      <ProductDialog mode="create" open={true} onOpenChange={vi.fn()} />
-    )
-
-    fireEvent.change(screen.getByLabelText(/Naam/), { target: { value: 'Test' } })
-    fireEvent.submit(document.getElementById('product-form')!)
-
-    await waitFor(() => {
-      expect(mockToast.error).toHaveBeenCalledWith('Code is al in gebruik')
-    })
-  })
-})
-
-describe('ProductDialog — edit mode', () => {
-  it('rendert met bestaande waarden vooringevuld', () => {
-    render(
-      <ProductDialog mode="edit" open={true} onOpenChange={vi.fn()} product={PRODUCT} />
-    )
-    expect(screen.getByText('Product bewerken')).toBeTruthy()
-    expect((screen.getByLabelText(/Naam/) as HTMLInputElement).value).toBe('Mijn Product')
-  })
-
-  it('roept updateProductAction aan bij opslaan', async () => {
-    mockUpdate.mockResolvedValue({ success: true })
-
-    render(
-      <ProductDialog mode="edit" open={true} onOpenChange={vi.fn()} product={PRODUCT} />
-    )
-
-    fireEvent.change(screen.getByLabelText(/Naam/), { target: { value: 'Gewijzigd Product' } })
-    fireEvent.submit(document.getElementById('product-form')!)
-
-    await waitFor(() => {
-      expect(mockUpdate).toHaveBeenCalledWith(
-        PRODUCT.id,
-        expect.objectContaining({ name: 'Gewijzigd Product' })
-      )
-    })
-    expect(mockToast.success).toHaveBeenCalledWith('Product opgeslagen')
-  })
-})
-
-describe('ProductDialog — demo mode', () => {
-  it('submit-knop is disabled in demo-modus', () => {
-    render(
-      <ProductDialog mode="create" open={true} onOpenChange={vi.fn()} isDemo={true} />
-    )
-    const submitBtn = screen.getByRole('button', { name: 'Aanmaken' })
-    expect(submitBtn).toHaveProperty('disabled', true)
-  })
-})
--- a/tests/components/ideas/idea-list.test.tsx
+++ b/tests/components/ideas/idea-list.test.tsx
@ -1,277 +0,0 @@
-// @vitest-environment jsdom
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { render, screen, fireEvent, waitFor } from '@testing-library/react'
-import '@testing-library/jest-dom'
-import React from 'react'
-
-// --- Navigation mock ---
-vi.mock('next/navigation', () => ({
-  useRouter: () => ({ push: vi.fn(), refresh: vi.fn() }),
-}))
-
-// --- Actions mocks ---
-vi.mock('@/actions/ideas', () => ({
-  createIdeaAction: vi.fn(),
-  archiveIdeaAction: vi.fn(),
-}))
-
-vi.mock('@/actions/user-settings', () => ({
-  updateUserSettingsAction: vi.fn().mockResolvedValue({ success: true, settings: {} }),
-}))
-
-// --- Sonner mock ---
-vi.mock('sonner', () => ({
-  toast: { error: vi.fn(), success: vi.fn() },
-}))
-
-// --- IdeaRowActions mock (complex component with many deps) ---
-vi.mock('@/components/ideas/idea-row-actions', () => ({
-  IdeaRowActions: () => <div data-testid="idea-row-actions" />,
-}))
-
-// --- DemoTooltip mock ---
-vi.mock('@/components/shared/demo-tooltip', () => ({
-  DemoTooltip: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-}))
-
-// --- Popover mock — controlled via open prop ---
-vi.mock('@/components/ui/popover', () => {
-  const PopoverCtx = React.createContext<{
-    open: boolean
-    onOpenChange: (v: boolean) => void
-  }>({ open: false, onOpenChange: () => {} })
-
-  return {
-    Popover: ({
-      children,
-      open,
-      onOpenChange,
-    }: {
-      children: React.ReactNode
-      open?: boolean
-      onOpenChange?: (v: boolean) => void
-    }) => (
-      <PopoverCtx.Provider value={{ open: open ?? false, onOpenChange: onOpenChange ?? (() => {}) }}>
-        {children}
-      </PopoverCtx.Provider>
-    ),
-    PopoverTrigger: ({ render: renderEl }: { render: React.ReactElement<{ onClick?: (e: React.MouseEvent) => void }> }) => {
-      const { open, onOpenChange } = React.useContext(PopoverCtx)
-      return React.cloneElement(renderEl, {
-        onClick: (e: React.MouseEvent) => {
-          onOpenChange(!open)
-          renderEl.props.onClick?.(e)
-        },
-      })
-    },
-    PopoverContent: ({ children }: { children: React.ReactNode }) => {
-      const { open } = React.useContext(PopoverCtx)
-      return open ? <div data-testid="popover-content">{children}</div> : null
-    },
-  }
-})
-
-// Import after mocks
-import { useUserSettingsStore } from '@/stores/user-settings/store'
-import { IdeaList } from '@/components/ideas/idea-list'
-import { createIdeaAction } from '@/actions/ideas'
-import type { IdeaDto } from '@/lib/idea-dto'
-
-const PRODUCTS = [
-  { id: 'prod-1', name: 'Product A', repo_url: null },
-  // repo_url ingesteld zodat de optietekst gewoon "Product B" is (zonder "(geen repo)" suffix)
-  { id: 'prod-2', name: 'Product B', repo_url: 'https://github.com/org/prod-b' },
-]
-
-// Minimal IdeaDto factory
-function makeIdea(overrides: Partial<IdeaDto> = {}): IdeaDto {
-  return {
-    id: 'idea-1',
-    code: 'ID-1',
-    title: 'Test Idee',
-    description: null,
-    status: 'draft',
-    product_id: null,
-    product: null,
-    pbi_id: null,
-    pbi: null,
-    secondary_products: [],
-    archived: false,
-    has_grill_md: false,
-    has_plan_md: false,
-    created_at: '2024-01-01T00:00:00.000Z',
-    updated_at: '2024-01-01T00:00:00.000Z',
-    ...overrides,
-  }
-}
-
-const IDEAS: IdeaDto[] = [
-  makeIdea({ id: 'idea-1', code: 'ID-1', title: 'Idee Concept', status: 'draft' }),
-  makeIdea({ id: 'idea-2', code: 'ID-2', title: 'Idee Gegrilld', status: 'grilled' }),
-  makeIdea({ id: 'idea-3', code: 'ID-3', title: 'Idee Gepland', status: 'planned' }),
-]
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  useUserSettingsStore.getState().hydrate({}, false)
-})
-
-describe('IdeaList — filterpopover', () => {
-  it('toont de "Filters"-knop in de toolbar (geen inline chip-rij)', () => {
-    render(<IdeaList ideas={IDEAS} products={[]} isDemo={false} activeProductId={null} />)
-
-    // Filters-knop aanwezig
-    expect(screen.getByText('Filters')).toBeInTheDocument()
-
-    // Status-labels zoals "Concept" mogen NIET los zichtbaar zijn zonder popover te openen
-    // (anders was de oude inline chip-rij er nog)
-    expect(screen.queryByRole('button', { name: 'Concept' })).not.toBeInTheDocument()
-  })
-
-  it('klik op "Filters" opent de popover en toont 11 statusopties', () => {
-    render(<IdeaList ideas={IDEAS} products={[]} isDemo={false} activeProductId={null} />)
-
-    // Popover nog niet open: content niet zichtbaar
-    expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
-
-    fireEvent.click(screen.getByText('Filters'))
-
-    // Content verschijnt
-    expect(screen.getByTestId('popover-content')).toBeInTheDocument()
-
-    // 11 statusopties + "Alle" = 12 buttons in de popover
-    // Controleer specifiek de 11 status-labels
-    const statusLabels = [
-      'Concept', 'Grillen', 'Gegrilld', 'Plannen', 'Plan klaar',
-      'Plan beoordelen', 'Gepland', 'Grill mislukt', 'Plan mislukt',
-      'Beoordeling mislukt', 'Plan beoordeeld',
-    ]
-    for (const label of statusLabels) {
-      expect(screen.getByRole('button', { name: label })).toBeInTheDocument()
-    }
-  })
-
-  it('klik op een statuschip schrijft de status naar de store', () => {
-    render(<IdeaList ideas={IDEAS} products={[]} isDemo={false} activeProductId={null} />)
-
-    fireEvent.click(screen.getByText('Filters'))
-    fireEvent.click(screen.getByRole('button', { name: 'Concept' }))
-
-    const stored =
-      useUserSettingsStore.getState().entities.settings.views?.ideasList?.filterStatuses
-    expect(stored).toContain('draft')
-  })
-
-  it('gehydrateerde filter toont "Filters (1)" en filtert de tabel', () => {
-    useUserSettingsStore
-      .getState()
-      .hydrate({ views: { ideasList: { filterStatuses: ['draft'] } } }, false)
-
-    render(<IdeaList ideas={IDEAS} products={[]} isDemo={false} activeProductId={null} />)
-
-    // Trigger toont het actieve filteraantal
-    expect(screen.getByText('Filters (1)')).toBeInTheDocument()
-
-    // Alleen het concept-idee is zichtbaar; de andere twee worden weggefilterd
-    expect(screen.getByText('Idee Concept')).toBeInTheDocument()
-    expect(screen.queryByText('Idee Gegrilld')).not.toBeInTheDocument()
-    expect(screen.queryByText('Idee Gepland')).not.toBeInTheDocument()
-  })
-
-  it('"Wis filters" is disabled wanneer geen filter actief is', () => {
-    render(<IdeaList ideas={IDEAS} products={[]} isDemo={false} activeProductId={null} />)
-
-    fireEvent.click(screen.getByText('Filters'))
-
-    const wisButton = screen.getByRole('button', { name: 'Wis filters' })
-    expect(wisButton).toBeDisabled()
-  })
-
-  it('"Wis filters" is enabled en wist de filter wanneer een filter actief is', () => {
-    useUserSettingsStore
-      .getState()
-      .hydrate({ views: { ideasList: { filterStatuses: ['draft'] } } }, false)
-
-    render(<IdeaList ideas={IDEAS} products={[]} isDemo={false} activeProductId={null} />)
-
-    fireEvent.click(screen.getByText('Filters (1)'))
-
-    const wisButton = screen.getByRole('button', { name: 'Wis filters' })
-    expect(wisButton).not.toBeDisabled()
-
-    fireEvent.click(wisButton)
-
-    const stored =
-      useUserSettingsStore.getState().entities.settings.views?.ideasList?.filterStatuses
-    expect(stored).toEqual([])
-  })
-})
-
-describe('IdeaList — activeProductId voorvullen', () => {
-  // Hulpfunctie: vind een knop op basis van gedeeltelijke tekstinhoud.
-  // getByText() werkt hier betrouwbaarder dan getByRole({name}) voor knoppen
-  // met SVG-icoon omdat de accessible-name-berekening van Base UI knoppen in
-  // jsdom soms afwijkt van wat we verwachten.
-  function clickButton(label: string) {
-    const btn = Array.from(document.querySelectorAll('button')).find(
-      (b) => b.textContent?.trim().includes(label)
-    )
-    if (!btn) throw new Error(`Knop met tekst "${label}" niet gevonden`)
-    fireEvent.click(btn)
-  }
-
-  it('AC1: "Nieuw idee"-select is voorgevuld met het actieve product', async () => {
-    render(
-      <IdeaList ideas={[]} products={PRODUCTS} isDemo={false} activeProductId="prod-2" />
-    )
-
-    clickButton('Nieuw idee')
-
-    // Wacht tot het formulier verschijnt; create-form-select toont "Product B" (waarde 'prod-2').
-    // De toolbar-select toont "Alle producten" (waarde 'all'), zodat displayValue uniek is.
-    const createFormSelect = await waitFor(() => screen.getByDisplayValue('Product B'))
-    expect(createFormSelect).toHaveValue('prod-2')
-  })
-
-  it('AC2: "Nieuw idee"-select staat op leeg wanneer activeProductId null is', async () => {
-    render(
-      <IdeaList ideas={[]} products={PRODUCTS} isDemo={false} activeProductId={null} />
-    )
-
-    clickButton('Nieuw idee')
-
-    // Toolbar-select toont "Alle producten"; create-form-select toont de placeholder (waarde '').
-    const createFormSelect = await waitFor(() =>
-      screen.getByDisplayValue('Geen product (kan later worden gekoppeld)')
-    )
-    expect(createFormSelect).toHaveValue('')
-  })
-
-  it('AC3: "Snel idee" stuurt product_id gelijk aan activeProductId mee', async () => {
-    vi.mocked(createIdeaAction).mockResolvedValue({ data: { code: 'ID-99', id: 'idea-99' } } as never)
-
-    render(
-      <IdeaList ideas={[]} products={PRODUCTS} isDemo={false} activeProductId="prod-2" />
-    )
-
-    // Open "Snel idee"-formulier en wacht tot het verschijnt
-    clickButton('Snel idee')
-    await waitFor(() => screen.getByPlaceholderText('Titel *'))
-
-    // Vul de verplichte titel in
-    fireEvent.change(screen.getByPlaceholderText('Titel *'), {
-      target: { value: 'Mijn snel idee' },
-    })
-
-    // Klik Opslaan — startTransition roept createIdeaAction synchroon aan
-    clickButton('Opslaan')
-
-    await waitFor(() => {
-      expect(createIdeaAction).toHaveBeenCalledWith({
-        title: 'Mijn snel idee',
-        description: null,
-        product_id: 'prod-2',
-      })
-    })
-  })
-})
--- a/tests/components/jobs/job-card.test.tsx
+++ b/tests/components/jobs/job-card.test.tsx
@ -1,85 +0,0 @@
-// @vitest-environment jsdom
-import { describe, it, expect } from 'vitest'
-import { render, screen } from '@testing-library/react'
-import '@testing-library/jest-dom'
-import JobCard from '@/components/jobs/job-card'
-
-const BASE_PROPS = {
-  id: 'job-1',
-  kind: 'TASK_IMPLEMENTATION' as const,
-  status: 'RUNNING' as const,
-  productName: 'Scrum4Me',
-  productCode: 'S4M',
-  pbiCode: 'PBI-1',
-  storyCode: 'ST-1',
-  createdAt: new Date('2026-01-01T10:00:00Z'),
-}
-
-describe('JobCard breadcrumb', () => {
-  it('TASK-job toont productCode, pbiCode en storyCode in de breadcrumb', () => {
-    render(<JobCard {...BASE_PROPS} />)
-    const breadcrumb = screen.getByText('S4M PBI-1 ST-1')
-    expect(breadcrumb).toBeInTheDocument()
-  })
-
-  it('TASK-job zonder productCode valt terug op productName in de breadcrumb', () => {
-    render(<JobCard {...BASE_PROPS} productCode={null} />)
-    expect(screen.getByText('Scrum4Me PBI-1 ST-1')).toBeInTheDocument()
-  })
-
-  it('TASK-job laat ontbrekende codes weg uit de breadcrumb', () => {
-    render(<JobCard {...BASE_PROPS} pbiCode={null} storyCode={null} />)
-    expect(screen.getByText('S4M')).toBeInTheDocument()
-  })
-
-  it('GRILL-job toont productCode en ideaCode', () => {
-    render(
-      <JobCard
-        {...BASE_PROPS}
-        kind="IDEA_GRILL"
-        productCode="S4M"
-        ideaCode="IDEA-5"
-        pbiCode={null}
-        storyCode={null}
-      />,
-    )
-    expect(screen.getByText('S4M IDEA-5')).toBeInTheDocument()
-  })
-
-  it('SPRINT-job toont productCode en sprintCode', () => {
-    render(
-      <JobCard
-        {...BASE_PROPS}
-        kind="SPRINT_IMPLEMENTATION"
-        productCode="S4M"
-        sprintCode="SP-3"
-        pbiCode={null}
-        storyCode={null}
-      />,
-    )
-    expect(screen.getByText('S4M SP-3')).toBeInTheDocument()
-  })
-})
-
-describe('JobCard datumweergave', () => {
-  it('toont finishedAt als die beschikbaar is', () => {
-    const finishedAt = new Date('2026-03-15T14:30:00Z')
-    render(<JobCard {...BASE_PROPS} startedAt={new Date('2026-03-10T09:00:00Z')} finishedAt={finishedAt} />)
-    const formatted = finishedAt.toLocaleString('nl-NL', { dateStyle: 'short', timeStyle: 'short' })
-    expect(screen.getByText(formatted)).toBeInTheDocument()
-  })
-
-  it('toont startedAt als finishedAt ontbreekt', () => {
-    const startedAt = new Date('2026-03-10T09:00:00Z')
-    render(<JobCard {...BASE_PROPS} startedAt={startedAt} finishedAt={null} />)
-    const formatted = startedAt.toLocaleString('nl-NL', { dateStyle: 'short', timeStyle: 'short' })
-    expect(screen.getByText(formatted)).toBeInTheDocument()
-  })
-
-  it('toont createdAt als zowel finishedAt als startedAt ontbreken', () => {
-    const createdAt = new Date('2026-01-01T10:00:00Z')
-    render(<JobCard {...BASE_PROPS} createdAt={createdAt} startedAt={null} finishedAt={null} />)
-    const formatted = createdAt.toLocaleString('nl-NL', { dateStyle: 'short', timeStyle: 'short' })
-    expect(screen.getByText(formatted)).toBeInTheDocument()
-  })
-})
--- a/tests/components/jobs/job-detail-pane.test.tsx
+++ b/tests/components/jobs/job-detail-pane.test.tsx
@ -1,78 +0,0 @@
-// @vitest-environment jsdom
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { render, screen, fireEvent } from '@testing-library/react'
-import '@testing-library/jest-dom'
-import type { JobWithRelations } from '@/actions/jobs-page'
-
-vi.mock('@/actions/claude-jobs', () => ({
-  restartClaudeJobAction: vi.fn(),
-}))
-
-vi.mock('sonner', () => ({ toast: { error: vi.fn() } }))
-
-import { restartClaudeJobAction } from '@/actions/claude-jobs'
-import JobDetailPane from '@/components/jobs/job-detail-pane'
-
-const mockAction = restartClaudeJobAction as ReturnType<typeof vi.fn>
-
-function makeJob(status: JobWithRelations['status']): JobWithRelations {
-  return {
-    id: 'job-1',
-    kind: 'TASK_IMPLEMENTATION',
-    status,
-    taskCode: 'T-1',
-    taskTitle: 'Test taak',
-    ideaCode: null,
-    ideaTitle: null,
-    sprintGoal: null,
-    sprintCode: null,
-    productName: 'Scrum4Me',
-    productCode: null,
-    storyCode: null,
-    pbiCode: null,
-    modelId: null,
-    inputTokens: null,
-    outputTokens: null,
-    cacheReadTokens: null,
-    cacheWriteTokens: null,
-    costUsd: null,
-    branch: null,
-    prUrl: null,
-    error: null,
-    summary: null,
-    description: null,
-    verifyResult: null,
-    startedAt: null,
-    finishedAt: null,
-    createdAt: new Date('2026-01-01'),
-    sprintRunId: null,
-  }
-}
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mockAction.mockResolvedValue({ success: true })
-})
-
-describe('JobDetailPane restart button', () => {
-  it('toont de knop voor FAILED-jobs', () => {
-    render(<JobDetailPane job={makeJob('FAILED')} isDemo={false} />)
-    expect(screen.getByRole('button', { name: /opnieuw starten/i })).toBeInTheDocument()
-  })
-
-  it('toont de knop niet voor DONE-jobs', () => {
-    render(<JobDetailPane job={makeJob('DONE')} isDemo={false} />)
-    expect(screen.queryByRole('button', { name: /opnieuw starten/i })).not.toBeInTheDocument()
-  })
-
-  it('roept restartClaudeJobAction aan met het juiste id bij klik', () => {
-    render(<JobDetailPane job={makeJob('FAILED')} isDemo={false} />)
-    fireEvent.click(screen.getByRole('button', { name: /opnieuw starten/i }))
-    expect(mockAction).toHaveBeenCalledWith('job-1')
-  })
-
-  it('knop is disabled in demo-modus', () => {
-    render(<JobDetailPane job={makeJob('FAILED')} isDemo={true} />)
-    expect(screen.getByRole('button', { name: /opnieuw starten/i })).toBeDisabled()
-  })
-})
--- a/tests/components/mobile/landscape-guard.test.tsx
+++ b/tests/components/mobile/landscape-guard.test.tsx
@ -1,73 +0,0 @@
-// @vitest-environment jsdom
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
-import { render, screen, act } from '@testing-library/react'
-import { LandscapeGuard } from '@/components/mobile/landscape-guard'
-
-type Listener = (e: MediaQueryListEvent) => void
-
-function mockMatchMedia(initialPortrait: boolean) {
-  let matches = initialPortrait
-  let listener: Listener | null = null
-
-  const mql = {
-    get matches() { return matches },
-    media: '(orientation: portrait)',
-    onchange: null,
-    addEventListener: (_: string, l: Listener) => { listener = l },
-    removeEventListener: () => { listener = null },
-    addListener: () => {},
-    removeListener: () => {},
-    dispatchEvent: () => false,
-  }
-
-  Object.defineProperty(window, 'matchMedia', {
-    writable: true,
-    configurable: true,
-    value: () => mql,
-  })
-
-  return {
-    setPortrait(p: boolean) {
-      matches = p
-      if (listener) listener({ matches: p } as MediaQueryListEvent)
-    },
-  }
-}
-
-describe('LandscapeGuard', () => {
-  beforeEach(() => {})
-
-  afterEach(() => {
-    vi.restoreAllMocks()
-  })
-
-  it('renders children always', () => {
-    mockMatchMedia(false)
-    render(<LandscapeGuard><div>kids</div></LandscapeGuard>)
-    expect(screen.getByText('kids')).toBeTruthy()
-  })
-
-  it('shows overlay in portrait', () => {
-    mockMatchMedia(true)
-    render(<LandscapeGuard><div>kids</div></LandscapeGuard>)
-    expect(screen.getByRole('alert').textContent).toContain('Draai je telefoon naar landscape')
-    // children blijven in DOM (geen unmount → SSE-streams blijven leven)
-    expect(screen.getByText('kids')).toBeTruthy()
-  })
-
-  it('hides overlay in landscape', () => {
-    mockMatchMedia(false)
-    render(<LandscapeGuard><div>kids</div></LandscapeGuard>)
-    expect(screen.queryByRole('alert')).toBeNull()
-  })
-
-  it('toggles overlay on orientation change', () => {
-    const ctl = mockMatchMedia(false)
-    render(<LandscapeGuard><div>kids</div></LandscapeGuard>)
-    expect(screen.queryByRole('alert')).toBeNull()
-    act(() => ctl.setPortrait(true))
-    expect(screen.getByRole('alert')).toBeTruthy()
-    act(() => ctl.setPortrait(false))
-    expect(screen.queryByRole('alert')).toBeNull()
-  })
-})
--- a/tests/components/mobile/logout-button.test.tsx
+++ b/tests/components/mobile/logout-button.test.tsx
@ -1,46 +0,0 @@
-// @vitest-environment jsdom
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { render, screen, fireEvent, waitFor } from '@testing-library/react'
-
-const { logoutMock } = vi.hoisted(() => ({
-  logoutMock: vi.fn().mockResolvedValue(undefined),
-}))
-vi.mock('@/actions/auth', () => ({ logoutAction: logoutMock }))
-
-import { LogoutButton } from '@/components/mobile/logout-button'
-
-beforeEach(() => {
-  logoutMock.mockClear()
-})
-
-describe('LogoutButton', () => {
-  it('toont initieel alleen de Uitloggen-knop, geen dialog', () => {
-    render(<LogoutButton />)
-    expect(screen.getByRole('button', { name: /Uitloggen/ })).toBeTruthy()
-    expect(screen.queryByText(/Weet je zeker/)).toBeNull()
-  })
-
-  it('opent AlertDialog bij klikken op de knop', () => {
-    render(<LogoutButton />)
-    fireEvent.click(screen.getByRole('button', { name: /Uitloggen/ }))
-    expect(screen.getByText('Uitloggen?')).toBeTruthy()
-    expect(screen.getByText(/Weet je zeker/)).toBeTruthy()
-  })
-
-  it('roept logoutAction aan op bevestigen', async () => {
-    const { container } = render(<LogoutButton />)
-    fireEvent.click(screen.getByRole('button', { name: /Uitloggen/ }))
-    // Het body-portal wordt buiten container gerenderd; query op document.body.
-    const allButtons = Array.from(document.body.querySelectorAll('button'))
-    const confirmBtn = allButtons.find(b => b.textContent?.trim() === 'Uitloggen' && !container.contains(b)) ?? allButtons[allButtons.length - 1]
-    fireEvent.click(confirmBtn)
-    await waitFor(() => expect(logoutMock).toHaveBeenCalledTimes(1))
-  })
-
-  it('roept logoutAction NIET aan bij annuleren', () => {
-    render(<LogoutButton />)
-    fireEvent.click(screen.getByRole('button', { name: /Uitloggen/ }))
-    fireEvent.click(screen.getByText('Annuleren'))
-    expect(logoutMock).not.toHaveBeenCalled()
-  })
-})
--- a/tests/components/mobile/mobile-tab-bar.test.tsx
+++ b/tests/components/mobile/mobile-tab-bar.test.tsx
@ -1,57 +0,0 @@
-// @vitest-environment jsdom
-import { describe, it, expect, vi } from 'vitest'
-import { render, screen } from '@testing-library/react'
-import { MobileTabBar } from '@/components/mobile/mobile-tab-bar'
-
-let pathname = '/m/products/p1'
-vi.mock('next/navigation', () => ({
-  usePathname: () => pathname,
-}))
-
-function setPathname(p: string) { pathname = p }
-
-describe('MobileTabBar', () => {
-  it('toont 3 tabs als activeProductId aanwezig is', () => {
-    setPathname('/m/products/p1')
-    render(<MobileTabBar activeProductId="p1" />)
-    expect(screen.getByLabelText('Backlog')).toBeTruthy()
-    expect(screen.getByLabelText('Solo')).toBeTruthy()
-    expect(screen.getByLabelText('Settings')).toBeTruthy()
-  })
-
-  it('toont alleen Settings als activeProductId null is', () => {
-    setPathname('/m/settings')
-    render(<MobileTabBar activeProductId={null} />)
-    expect(screen.queryByLabelText('Backlog')).toBeNull()
-    expect(screen.queryByLabelText('Solo')).toBeNull()
-    expect(screen.getByLabelText('Settings')).toBeTruthy()
-  })
-
-  it('Backlog-tab is aria-current op /m/products/[id]', () => {
-    setPathname('/m/products/p1')
-    render(<MobileTabBar activeProductId="p1" />)
-    expect(screen.getByLabelText('Backlog').getAttribute('aria-current')).toBe('page')
-    expect(screen.getByLabelText('Solo').getAttribute('aria-current')).toBeNull()
-  })
-
-  it('Solo-tab is aria-current op /m/products/[id]/solo', () => {
-    setPathname('/m/products/p1/solo')
-    render(<MobileTabBar activeProductId="p1" />)
-    expect(screen.getByLabelText('Solo').getAttribute('aria-current')).toBe('page')
-    expect(screen.getByLabelText('Backlog').getAttribute('aria-current')).toBeNull()
-  })
-
-  it('Settings-tab is aria-current op /m/settings', () => {
-    setPathname('/m/settings')
-    render(<MobileTabBar activeProductId="p1" />)
-    expect(screen.getByLabelText('Settings').getAttribute('aria-current')).toBe('page')
-  })
-
-  it('tap-targets >=44x44 (h-14 = 56px breedtevulling per tab)', () => {
-    setPathname('/m/products/p1')
-    render(<MobileTabBar activeProductId="p1" />)
-    const tab = screen.getByLabelText('Backlog')
-    expect(tab.className).toContain('h-14')
-    expect(tab.className).toContain('flex-1')
-  })
-})
--- a/tests/components/shared/entity-dialog-layout.test.ts
+++ b/tests/components/shared/entity-dialog-layout.test.ts
@ -1,38 +0,0 @@
-import { describe, it, expect } from 'vitest'
-import { readFileSync } from 'node:fs'
-import { resolve } from 'node:path'
-import { entityDialogContentClasses } from '@/components/shared/entity-dialog-layout'
-
-describe('entityDialogContentClasses', () => {
-  it('bevat mobile-fullscreen classes (<640px)', () => {
-    const cls = entityDialogContentClasses
-    expect(cls).toContain('max-sm:w-screen')
-    expect(cls).toContain('max-sm:h-screen')
-    expect(cls).toContain('max-sm:max-w-none')
-    expect(cls).toContain('max-sm:rounded-none')
-  })
-
-  it('behoudt desktop-classes (>=640px)', () => {
-    const cls = entityDialogContentClasses
-    expect(cls).toContain('sm:max-w-[90vw]')
-    expect(cls).toContain('sm:max-h-[85vh]')
-    expect(cls).toContain('lg:max-w-[50vw]')
-  })
-})
-
-describe('alle entity-dialogen gebruiken entityDialogContentClasses', () => {
-  // Regressie-vangnet: voorkomt dat een dialog zijn eigen className meegeeft en
-  // daarmee de gedeelde mobile-fullscreen-classes ontwijkt.
-  const files = [
-    'app/_components/tasks/task-dialog.tsx',
-    'components/solo/task-detail-dialog.tsx',
-    'components/backlog/pbi-dialog.tsx',
-    'components/backlog/story-dialog.tsx',
-  ]
-  for (const f of files) {
-    it(`${f} importeert + gebruikt entityDialogContentClasses`, () => {
-      const src = readFileSync(resolve(process.cwd(), f), 'utf-8')
-      expect(src).toContain('entityDialogContentClasses')
-    })
-  }
-})
--- a/tests/components/shared/nav-bar.test.tsx
+++ b/tests/components/shared/nav-bar.test.tsx
@ -1,179 +0,0 @@
-// @vitest-environment jsdom
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { render, screen, fireEvent } from '@testing-library/react'
-import '@testing-library/jest-dom'
-import React from 'react'
-
-const pushMock = vi.fn()
-const refreshMock = vi.fn()
-const pathnameMock = vi.fn(() => '/dashboard')
-
-vi.mock('next/navigation', () => ({
-  useRouter: () => ({ push: pushMock, refresh: refreshMock }),
-  usePathname: () => pathnameMock(),
-}))
-
-vi.mock('@/actions/active-product', () => ({
-  setActiveProductAction: vi.fn(),
-}))
-
-vi.mock('sonner', () => ({
-  toast: { error: vi.fn(), success: vi.fn() },
-}))
-
-vi.mock('@/components/ui/dropdown-menu', () => {
-  type Props = React.HTMLAttributes<HTMLDivElement> & {
-    children?: React.ReactNode
-    onClick?: () => void
-  }
-  const PassThrough = ({ children }: Props) => <>{children}</>
-  const Forwarding = ({ children, ...rest }: Props) => <div {...rest}>{children}</div>
-  return {
-    DropdownMenu: PassThrough,
-    DropdownMenuTrigger: Forwarding,
-    DropdownMenuContent: PassThrough,
-    DropdownMenuItem: ({ children, onClick, className }: Props) => (
-      <button type="button" onClick={onClick} className={className} data-testid="dd-item">
-        {children}
-      </button>
-    ),
-    DropdownMenuSeparator: () => null,
-  }
-})
-
-vi.mock('@/components/ui/tooltip', () => {
-  type Props = { children?: React.ReactNode }
-  const PassThrough = ({ children }: Props) => <>{children}</>
-  return {
-    Tooltip: PassThrough,
-    TooltipContent: PassThrough,
-    TooltipProvider: PassThrough,
-    TooltipTrigger: PassThrough,
-  }
-})
-
-vi.mock('@/components/shared/app-icon', () => ({ AppIcon: () => null }))
-vi.mock('@/components/shared/user-menu', () => ({ UserMenu: () => null }))
-vi.mock('@/components/shared/notifications-bell', () => ({ NotificationsBell: () => null }))
-vi.mock('@/components/solo/nav-status-indicators', () => ({
-  SoloNavStatusIndicators: () => null,
-}))
-
-import { setActiveProductAction } from '@/actions/active-product'
-import { toast } from 'sonner'
-import { NavBar } from '@/components/shared/nav-bar'
-
-const actionMock = setActiveProductAction as unknown as ReturnType<typeof vi.fn>
-const toastSuccess = toast.success as unknown as ReturnType<typeof vi.fn>
-
-const products = [
-  { id: 'A', name: 'Alpha' },
-  { id: 'B', name: 'Beta' },
-]
-
-function renderNavBar(overrides: { isDemo?: boolean; activeProductId?: string } = {}) {
-  const isDemo = overrides.isDemo ?? false
-  const activeId = overrides.activeProductId ?? 'A'
-  const activeProduct = products.find(p => p.id === activeId) ?? null
-  return render(
-    <NavBar
-      isDemo={isDemo}
-      roles={[]}
-      userId="u1"
-      username="user"
-      email={null}
-      activeProduct={activeProduct}
-      products={products}
-      hasActiveSprint={false}
-      minQuotaPct={100}
-    />,
-  )
-}
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  actionMock.mockResolvedValue({ success: true })
-  pathnameMock.mockReturnValue('/dashboard')
-})
-
-describe('NavBar — product switch', () => {
-  it('demo: clicking another product navigates via router.push without calling the action', () => {
-    renderNavBar({ isDemo: true, activeProductId: 'A' })
-    fireEvent.click(screen.getByText('Beta'))
-    expect(pushMock).toHaveBeenCalledWith('/products/B')
-    expect(actionMock).not.toHaveBeenCalled()
-    expect(toastSuccess).not.toHaveBeenCalled()
-  })
-
-  it('non-demo: clicking another product calls setActiveProductAction', async () => {
-    renderNavBar({ isDemo: false, activeProductId: 'A' })
-    fireEvent.click(screen.getByText('Beta'))
-    await Promise.resolve()
-    expect(actionMock).toHaveBeenCalledWith('B')
-  })
-
-  it('non-demo: on /products/A navigates to /products/B', async () => {
-    pathnameMock.mockReturnValue('/products/A')
-    renderNavBar({ isDemo: false, activeProductId: 'A' })
-    fireEvent.click(screen.getByText('Beta'))
-    await Promise.resolve()
-    await Promise.resolve()
-    expect(pushMock).toHaveBeenCalledWith('/products/B')
-    expect(toastSuccess).toHaveBeenCalled()
-  })
-
-  it('non-demo: on /products/A/sprint/SPR1 navigates to /products/B/sprint', async () => {
-    pathnameMock.mockReturnValue('/products/A/sprint/SPR1')
-    renderNavBar({ isDemo: false, activeProductId: 'A' })
-    fireEvent.click(screen.getByText('Beta'))
-    await Promise.resolve()
-    await Promise.resolve()
-    expect(pushMock).toHaveBeenCalledWith('/products/B/sprint')
-    expect(toastSuccess).toHaveBeenCalled()
-  })
-
-  it('non-demo: on /products/A/solo navigates to /products/B/solo', async () => {
-    pathnameMock.mockReturnValue('/products/A/solo')
-    renderNavBar({ isDemo: false, activeProductId: 'A' })
-    fireEvent.click(screen.getByText('Beta'))
-    await Promise.resolve()
-    await Promise.resolve()
-    expect(pushMock).toHaveBeenCalledWith('/products/B/solo')
-    expect(toastSuccess).toHaveBeenCalled()
-  })
-
-  it('non-demo: on /dashboard calls router.refresh and not router.push', async () => {
-    pathnameMock.mockReturnValue('/dashboard')
-    renderNavBar({ isDemo: false, activeProductId: 'A' })
-    fireEvent.click(screen.getByText('Beta'))
-    await Promise.resolve()
-    await Promise.resolve()
-    expect(refreshMock).toHaveBeenCalled()
-    expect(pushMock).not.toHaveBeenCalled()
-    expect(toastSuccess).toHaveBeenCalled()
-  })
-})
-
-describe('NavBar — URL-derived active product (demo only)', () => {
-  it('demo: label and dropdown highlight follow pathname, not the activeProduct prop', () => {
-    pathnameMock.mockReturnValue('/products/B/sprint')
-    const { container } = renderNavBar({ isDemo: true, activeProductId: 'A' })
-    const trigger = container.querySelector('[data-debug-id="nav-bar__product-switcher"]')
-    expect(trigger?.textContent).toContain('Beta')
-    expect(trigger?.textContent).not.toContain('Alpha')
-    const items = screen.getAllByTestId('dd-item')
-    const itemB = items.find(el => el.textContent?.includes('Beta'))
-    expect(itemB?.className).toContain('bg-primary-container')
-    const itemA = items.find(el => el.textContent?.includes('Alpha'))
-    expect(itemA?.className ?? '').not.toContain('bg-primary-container')
-  })
-
-  it('non-demo: pathname does NOT override the activeProduct prop', () => {
-    pathnameMock.mockReturnValue('/products/B/sprint')
-    renderNavBar({ isDemo: false, activeProductId: 'A' })
-    // Label still reflects server-rendered activeProduct (Alpha)
-    const items = screen.getAllByTestId('dd-item')
-    const itemA = items.find(el => el.textContent?.includes('Alpha'))
-    expect(itemA?.className).toContain('bg-primary-container')
-  })
-})
--- a/tests/components/shared/sprint-switcher.test.tsx
+++ b/tests/components/shared/sprint-switcher.test.tsx
@ -1,174 +0,0 @@
-// @vitest-environment jsdom
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { render, screen, fireEvent } from '@testing-library/react'
-import '@testing-library/jest-dom'
-import React from 'react'
-
-const pushMock = vi.fn()
-const refreshMock = vi.fn()
-const pathnameMock = vi.fn(() => '/products/p1/sprint')
-
-vi.mock('next/navigation', () => ({
-  useRouter: () => ({ push: pushMock, refresh: refreshMock }),
-  usePathname: () => pathnameMock(),
-}))
-
-vi.mock('@/actions/active-sprint', () => ({
-  setActiveSprintAction: vi.fn(),
-  switchActiveSprintAction: vi.fn(),
-  clearActiveSprintAction: vi.fn(),
-}))
-
-vi.mock('sonner', () => ({
-  toast: { error: vi.fn(), success: vi.fn() },
-}))
-
-const isDemoMock = { value: false }
-const workflowMock: {
-  value:
-    | { pendingSprintDraft?: Record<string, { goal: string } | undefined> }
-    | undefined
-} = { value: undefined }
-// Mock-state shape moet alle paden dekken die SprintSwitcher selecteert:
-// - s.context.isDemo (oude code)
-// - s.entities.settings.workflow?.pendingSprintDraft?.[productId]?.goal (PBI-79)
-type MockStoreState = {
-  context: { isDemo: boolean }
-  entities: {
-    settings: {
-      workflow?: {
-        pendingSprintDraft?: Record<string, { goal: string } | undefined>
-      }
-    }
-  }
-}
-vi.mock('@/stores/user-settings/store', () => ({
-  useUserSettingsStore: (selector: (s: MockStoreState) => unknown) =>
-    selector({
-      context: { isDemo: isDemoMock.value },
-      entities: { settings: { workflow: workflowMock.value } },
-    }),
-}))
-
-vi.mock('@/components/ui/dropdown-menu', () => {
-  type Props = { children?: React.ReactNode; onClick?: () => void; className?: string }
-  const PassThrough = ({ children }: Props) => <>{children}</>
-  return {
-    DropdownMenu: PassThrough,
-    DropdownMenuTrigger: PassThrough,
-    DropdownMenuContent: PassThrough,
-    DropdownMenuItem: ({ children, onClick, className }: Props) => (
-      <button type="button" onClick={onClick} className={className}>
-        {children}
-      </button>
-    ),
-    DropdownMenuSeparator: () => null,
-  }
-})
-
-vi.mock('@/components/ui/tooltip', () => {
-  type Props = { children?: React.ReactNode }
-  const PassThrough = ({ children }: Props) => <>{children}</>
-  return {
-    Tooltip: PassThrough,
-    TooltipContent: PassThrough,
-    TooltipProvider: PassThrough,
-    TooltipTrigger: PassThrough,
-  }
-})
-
-import { switchActiveSprintAction } from '@/actions/active-sprint'
-import { toast } from 'sonner'
-import { SprintSwitcher } from '@/components/shared/sprint-switcher'
-
-const actionMock = switchActiveSprintAction as unknown as ReturnType<typeof vi.fn>
-const toastError = toast.error as unknown as ReturnType<typeof vi.fn>
-const toastSuccess = toast.success as unknown as ReturnType<typeof vi.fn>
-
-const sprints = [
-  { id: 's1', code: 'SP-1', sprint_goal: 'Goal 1', status: 'open' as const },
-  { id: 's2', code: 'SP-2', sprint_goal: 'Goal 2', status: 'open' as const },
-]
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  isDemoMock.value = false
-  workflowMock.value = undefined
-  actionMock.mockResolvedValue({ success: true })
-  pathnameMock.mockReturnValue('/products/p1/sprint')
-})
-
-describe('SprintSwitcher', () => {
-  it('demo: clicking another sprint navigates via router.push without calling the action', () => {
-    isDemoMock.value = true
-    render(
-      <SprintSwitcher
-        productId="p1"
-        sprints={sprints}
-        activeSprint={sprints[0]}
-        buildingSprintIds={[]}
-      />,
-    )
-    fireEvent.click(screen.getByText('Goal 2'))
-    expect(pushMock).toHaveBeenCalledWith('/products/p1/sprint/s2')
-    expect(actionMock).not.toHaveBeenCalled()
-    expect(toastError).not.toHaveBeenCalled()
-    expect(toastSuccess).not.toHaveBeenCalled()
-  })
-
-  it('non-demo: clicking another sprint calls setActiveSprintAction', async () => {
-    isDemoMock.value = false
-    render(
-      <SprintSwitcher
-        productId="p1"
-        sprints={sprints}
-        activeSprint={sprints[0]}
-        buildingSprintIds={[]}
-      />,
-    )
-    fireEvent.click(screen.getByText('Goal 2'))
-    // Wait microtask for the transition to flush.
-    await Promise.resolve()
-    expect(actionMock).toHaveBeenCalledWith('p1', 's2')
-  })
-
-  it('clicking the already-active sprint does nothing', () => {
-    isDemoMock.value = true
-    render(
-      <SprintSwitcher
-        productId="p1"
-        sprints={sprints}
-        activeSprint={sprints[0]}
-        buildingSprintIds={[]}
-      />,
-    )
-    fireEvent.click(screen.getByText('Goal 1'))
-    expect(pushMock).not.toHaveBeenCalled()
-    expect(actionMock).not.toHaveBeenCalled()
-  })
-
-  it('shows the concept-sprint on the trigger when a draft is pending (G5)', () => {
-    workflowMock.value = { pendingSprintDraft: { p1: { goal: 'Test goal' } } }
-    render(
-      <SprintSwitcher
-        productId="p1"
-        sprints={sprints}
-        activeSprint={null}
-        buildingSprintIds={[]}
-      />,
-    )
-    expect(screen.getByText('⚙ Concept — Test goal')).toBeInTheDocument()
-  })
-
-  it('shows no concept label on the trigger when no draft is pending', () => {
-    render(
-      <SprintSwitcher
-        productId="p1"
-        sprints={sprints}
-        activeSprint={sprints[0]}
-        buildingSprintIds={[]}
-      />,
-    )
-    expect(screen.queryByText(/⚙ Concept/)).not.toBeInTheDocument()
-  })
-})
--- a/tests/components/solo/solo-board-batch-enqueue.test.tsx
+++ b/tests/components/solo/solo-board-batch-enqueue.test.tsx
@ -94,9 +94,6 @@ const TODO_TASK = {
  story_code: 'ST-1',
  story_title: 'Story 1',
  task_code: 'ST-1.1',
-  pbi_code: null,
-  pbi_title: null,
-  pbi_description: null,
 }

 const DEFAULT_PROPS = {
--- a/tests/components/solo/solo-task-card.test.tsx
+++ b/tests/components/solo/solo-task-card.test.tsx
@ -1,84 +0,0 @@
-// @vitest-environment jsdom
-import '@testing-library/jest-dom'
-import { describe, it, expect, vi } from 'vitest'
-import { render, screen } from '@testing-library/react'
-import type { SoloTask } from '@/components/solo/solo-board'
-
-vi.mock('@/components/ui/tooltip', () => ({
-  TooltipProvider: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-  Tooltip: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-  TooltipTrigger: ({ children }: { children?: React.ReactNode }) => <>{children}</>,
-  TooltipContent: ({ children }: { children: React.ReactNode }) => <span data-testid="tooltip-content">{children}</span>,
-}))
-vi.mock('@dnd-kit/core', () => ({
-  useDraggable: () => ({ attributes: {}, listeners: {}, setNodeRef: vi.fn(), transform: null, isDragging: false }),
-}))
-vi.mock('@/stores/solo-store', () => ({
-  useSoloStore: () => null,
-}))
-vi.mock('@/components/shared/code-badge', () => ({
-  CodeBadge: ({ code }: { code: string }) => <span data-testid="code-badge">{code}</span>,
-}))
-
-import { SoloTaskCard, SoloTaskCardOverlay } from '@/components/solo/solo-task-card'
-
-function makeSoloTask(overrides: Partial<SoloTask> = {}): SoloTask {
-  return {
-    id: 'task-1',
-    title: 'Taak titel',
-    description: 'Omschrijving van de taak die langer is dan tachtig tekens voor test',
-    implementation_plan: null,
-    priority: 2,
-    sort_order: 0,
-    status: 'TO_DO',
-    verify_only: false,
-    verify_required: 'ALIGNED',
-    story_id: 'story-1',
-    story_code: 'ST-1',
-    story_title: 'Story titel',
-    task_code: 'T-1',
-    pbi_code: 'PBI-1',
-    pbi_title: 'PBI titel',
-    pbi_description: 'PBI omschrijving',
-    ...overrides,
-  }
-}
-
-describe('SoloTaskCard', () => {
-  it('toont taaknaam, task_code, pbi_code, story_code, story_title', () => {
-    render(<SoloTaskCard task={makeSoloTask()} isDemo={false} onClick={vi.fn()} />)
-    expect(screen.getAllByText('Taak titel').length).toBeGreaterThan(0)
-    expect(screen.getAllByText('T-1').length).toBeGreaterThan(0)
-    expect(screen.getAllByText('PBI-1').length).toBeGreaterThan(0)
-    expect(screen.getByText('ST-1')).toBeInTheDocument()
-    expect(screen.getByText('Story titel')).toBeInTheDocument()
-  })
-
-  it('verbergt pbi_code badge als pbi_code null is', () => {
-    render(<SoloTaskCard task={makeSoloTask({ pbi_code: null })} isDemo={false} onClick={vi.fn()} />)
-    const badges = screen.queryAllByTestId('code-badge')
-    const codes = badges.map(b => b.textContent)
-    expect(codes).not.toContain('PBI-1')
-  })
-
-  it('verbergt description als description null is', () => {
-    const task = makeSoloTask({ description: null })
-    render(<SoloTaskCard task={task} isDemo={false} onClick={vi.fn()} />)
-    expect(screen.queryByText(/Omschrijving/)).toBeNull()
-  })
-
-  it('toont description als tekst', () => {
-    render(<SoloTaskCard task={makeSoloTask()} isDemo={false} onClick={vi.fn()} />)
-    expect(screen.getAllByText('Omschrijving van de taak die langer is dan tachtig tekens voor test').length).toBeGreaterThan(0)
-  })
-})
-
-describe('SoloTaskCardOverlay', () => {
-  it('toont taaknaam en codes zonder tooltip-wrappers', () => {
-    render(<SoloTaskCardOverlay task={makeSoloTask()} />)
-    expect(screen.getByText('Taak titel')).toBeInTheDocument()
-    expect(screen.getByText('T-1')).toBeInTheDocument()
-    expect(screen.getByText('PBI-1')).toBeInTheDocument()
-    expect(screen.queryAllByTestId('tooltip-content')).toHaveLength(0)
-  })
-})
--- a/tests/components/solo/task-detail-dialog.test.tsx
+++ b/tests/components/solo/task-detail-dialog.test.tsx
@ -65,9 +65,6 @@ const baseTask: SoloTask = {
  story_code: 'ST-100',
  story_title: 'Test Story',
  task_code: 'ST-100.1',
-  pbi_code: null,
-  pbi_title: null,
-  pbi_description: null,
 }

 const DEFAULT_PROPS = {
--- a/tests/components/split-pane.test.tsx
+++ b/tests/components/split-pane.test.tsx
@ -1,35 +1,28 @@
 // @vitest-environment jsdom
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
 import { render, screen, fireEvent } from '@testing-library/react'
-
-vi.mock('@/actions/user-settings', () => ({
-  updateUserSettingsAction: vi.fn().mockResolvedValue({ success: true, settings: {} }),
-}))
-
 import { SplitPane } from '@/components/split-pane/split-pane'
-import { useUserSettingsStore } from '@/stores/user-settings/store'

-function seedPositions(key: string, positions: number[]) {
-  useUserSettingsStore.setState((s) => {
-    s.entities.settings = {
-      layout: {
-        splitPanePositions: { [key]: positions },
-      },
-    }
+// Helper to set a cookie
+function setCookie(key: string, value: string) {
+  Object.defineProperty(document, 'cookie', {
+    writable: true,
+    configurable: true,
+    value: `sp:${key}=${encodeURIComponent(value)}`,
  })
 }

-function resetStore() {
-  useUserSettingsStore.setState((s) => {
-    s.entities.settings = {}
-    s.context.hydrated = false
-    s.context.isDemo = false
+function clearCookies() {
+  Object.defineProperty(document, 'cookie', {
+    writable: true,
+    configurable: true,
+    value: '',
  })
 }

 describe('SplitPane', () => {
  beforeEach(() => {
-    resetStore()
+    clearCookies()
    // Default: desktop viewport
    Object.defineProperty(window, 'innerWidth', { writable: true, configurable: true, value: 1440 })
    window.dispatchEvent(new Event('resize'))
@ -71,8 +64,9 @@ describe('SplitPane', () => {
    expect(dividers).toHaveLength(2)
  })

-  it('restores splits from user-settings store on mount', () => {
-    seedPositions('test-restore', [40, 60])
+  it('restores splits from cookie on mount', () => {
+    const stored = JSON.stringify([40, 60])
+    setCookie('test-restore', stored)

    const { container } = render(
      <SplitPane
@ -87,9 +81,8 @@ describe('SplitPane', () => {
    expect(paneDiv).toBeTruthy()
  })

-  it('falls back to defaultSplit when persisted positions are invalid', () => {
-    // Wrong number of values for a 2-pane layout
-    seedPositions('test-invalid', [10, 30, 60])
+  it('falls back to defaultSplit when cookie is invalid', () => {
+    setCookie('test-invalid', 'not-valid-json')

    const { container } = render(
      <SplitPane
--- a/tests/components/sprint/sprint-task-dialog-mount.test.tsx
+++ b/tests/components/sprint/sprint-task-dialog-mount.test.tsx
@ -1,119 +0,0 @@
-// @vitest-environment jsdom
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { render, screen, fireEvent, waitFor } from '@testing-library/react'
-
-vi.mock('next/navigation', () => ({ useRouter: () => ({ push: vi.fn() }) }))
-vi.mock('@/actions/tasks', () => ({
-  saveTask: vi.fn(),
-  deleteTask: vi.fn(),
-}))
-vi.mock('sonner', () => ({ toast: { success: vi.fn(), error: vi.fn() } }))
-
-import { SprintTaskDialogMount } from '@/components/sprint/sprint-task-dialog-mount'
-import { useSprintWorkspaceStore } from '@/stores/sprint-workspace/store'
-import type { SprintWorkspaceTaskDetail } from '@/stores/sprint-workspace/types'
-
-const TASK_DETAIL: SprintWorkspaceTaskDetail = {
-  id: 't1',
-  code: 'T-1',
-  title: 'Mijn taak',
-  description: 'Beschrijving',
-  priority: 2,
-  sort_order: 1,
-  status: 'in_progress',
-  story_id: 'story-1',
-  sprint_id: 'sprint-1',
-  created_at: new Date('2026-01-15'),
-  _detail: true,
-  implementation_plan: 'Stap 1\nStap 2',
-}
-
-function resetStore() {
-  useSprintWorkspaceStore.setState((s) => {
-    s.context.activeProduct = null
-    s.context.activeSprintId = null
-    s.context.activeStoryId = null
-    s.context.activeTaskId = null
-    s.entities.sprintsById = {}
-    s.entities.storiesById = {}
-    s.entities.tasksById = {}
-    s.relations.sprintIdsByProduct = {}
-    s.relations.storyIdsBySprint = {}
-    s.relations.taskIdsByStory = {}
-    s.loading.loadedProductSprintsIds = {}
-    s.loading.loadingProductId = null
-    s.loading.loadedSprintIds = {}
-    s.loading.loadingSprintId = null
-    s.loading.loadedStoryIds = {}
-    s.loading.loadedTaskIds = {}
-    s.loading.activeRequestId = null
-    s.pendingMutations = {}
-  })
-}
-
-beforeEach(() => {
-  resetStore()
-})
-
-afterEach(() => {
-  vi.restoreAllMocks()
-})
-
-describe('SprintTaskDialogMount', () => {
-  it('rendert niets wanneer er geen active task is', () => {
-    const { container } = render(
-      <SprintTaskDialogMount productId="p1" isDemo={false} />,
-    )
-    expect(container.textContent).toBe('')
-  })
-
-  it('rendert niets wanneer active task geen _detail heeft', () => {
-    useSprintWorkspaceStore.setState((s) => {
-      s.entities.tasksById['t1'] = {
-        id: 't1',
-        code: 'T-1',
-        title: 'Mijn taak',
-        description: null,
-        priority: 2,
-        sort_order: 1,
-        status: 'todo',
-        story_id: 'story-1',
-        sprint_id: 'sprint-1',
-        created_at: new Date(),
-      }
-      s.context.activeTaskId = 't1'
-    })
-
-    const { container } = render(
-      <SprintTaskDialogMount productId="p1" isDemo={false} />,
-    )
-    expect(container.textContent).toBe('')
-  })
-
-  it('rendert TaskDialog met titel "Taak bewerken" wanneer detail aanwezig is', () => {
-    useSprintWorkspaceStore.setState((s) => {
-      s.entities.tasksById['t1'] = TASK_DETAIL
-      s.context.activeTaskId = 't1'
-    })
-
-    render(<SprintTaskDialogMount productId="p1" isDemo={false} />)
-
-    expect(screen.getByText('Taak bewerken')).toBeTruthy()
-    expect((screen.getByLabelText(/Titel/) as HTMLInputElement).value).toBe('Mijn taak')
-  })
-
-  it('clear activeTaskId wanneer Annuleren wordt geklikt', async () => {
-    useSprintWorkspaceStore.setState((s) => {
-      s.entities.tasksById['t1'] = TASK_DETAIL
-      s.context.activeTaskId = 't1'
-    })
-
-    render(<SprintTaskDialogMount productId="p1" isDemo={false} />)
-
-    fireEvent.click(screen.getByRole('button', { name: 'Annuleren' }))
-
-    await waitFor(() => {
-      expect(useSprintWorkspaceStore.getState().context.activeTaskId).toBeNull()
-    })
-  })
-})
--- a/tests/components/use-dialog-submit-shortcut.test.ts
+++ b/tests/components/use-dialog-submit-shortcut.test.ts
@ -1,57 +0,0 @@
-// @vitest-environment jsdom
-import { describe, it, expect, vi } from 'vitest'
-import { useDialogSubmitShortcut } from '@/components/shared/use-dialog-submit-shortcut'
-
-function makeEvent(opts: Partial<KeyboardEvent>) {
-  return {
-    metaKey: false,
-    ctrlKey: false,
-    key: '',
-    preventDefault: vi.fn(),
-    ...opts,
-  } as unknown as React.KeyboardEvent
-}
-
-describe('useDialogSubmitShortcut', () => {
-  it('triggert submit op Cmd+Enter', () => {
-    const submit = vi.fn()
-    const handler = useDialogSubmitShortcut(submit)
-    const e = makeEvent({ metaKey: true, key: 'Enter' })
-
-    handler(e)
-
-    expect(submit).toHaveBeenCalledTimes(1)
-    expect(e.preventDefault).toHaveBeenCalled()
-  })
-
-  it('triggert submit op Ctrl+Enter', () => {
-    const submit = vi.fn()
-    const handler = useDialogSubmitShortcut(submit)
-    const e = makeEvent({ ctrlKey: true, key: 'Enter' })
-
-    handler(e)
-
-    expect(submit).toHaveBeenCalledTimes(1)
-  })
-
-  it('triggert NIET op Enter zonder modifier', () => {
-    const submit = vi.fn()
-    const handler = useDialogSubmitShortcut(submit)
-    const e = makeEvent({ key: 'Enter' })
-
-    handler(e)
-
-    expect(submit).not.toHaveBeenCalled()
-    expect(e.preventDefault).not.toHaveBeenCalled()
-  })
-
-  it('triggert NIET op Cmd+andere toets', () => {
-    const submit = vi.fn()
-    const handler = useDialogSubmitShortcut(submit)
-    const e = makeEvent({ metaKey: true, key: 'a' })
-
-    handler(e)
-
-    expect(submit).not.toHaveBeenCalled()
-  })
-})
--- a/tests/components/use-dirty-close-guard.test.tsx
+++ b/tests/components/use-dirty-close-guard.test.tsx
@ -1,50 +0,0 @@
-// @vitest-environment jsdom
-import { describe, it, expect, vi } from 'vitest'
-import { renderHook, act } from '@testing-library/react'
-import { useDirtyCloseGuard } from '@/components/shared/use-dirty-close-guard'
-
-describe('useDirtyCloseGuard', () => {
-  it('sluit direct als form niet dirty is', () => {
-    const onClose = vi.fn()
-    const { result } = renderHook(() => useDirtyCloseGuard(false, onClose))
-
-    act(() => result.current.attemptClose())
-
-    expect(onClose).toHaveBeenCalledTimes(1)
-    expect(result.current.confirmOpen).toBe(false)
-  })
-
-  it('opent confirm als form dirty is', () => {
-    const onClose = vi.fn()
-    const { result } = renderHook(() => useDirtyCloseGuard(true, onClose))
-
-    act(() => result.current.attemptClose())
-
-    expect(onClose).not.toHaveBeenCalled()
-    expect(result.current.confirmOpen).toBe(true)
-  })
-
-  it('confirmDiscard sluit confirm en roept onClose', () => {
-    const onClose = vi.fn()
-    const { result } = renderHook(() => useDirtyCloseGuard(true, onClose))
-
-    act(() => result.current.attemptClose())
-    expect(result.current.confirmOpen).toBe(true)
-
-    act(() => result.current.confirmDiscard())
-
-    expect(onClose).toHaveBeenCalledTimes(1)
-    expect(result.current.confirmOpen).toBe(false)
-  })
-
-  it('setConfirmOpen(false) annuleert zonder onClose te roepen', () => {
-    const onClose = vi.fn()
-    const { result } = renderHook(() => useDirtyCloseGuard(true, onClose))
-
-    act(() => result.current.attemptClose())
-    act(() => result.current.setConfirmOpen(false))
-
-    expect(onClose).not.toHaveBeenCalled()
-    expect(result.current.confirmOpen).toBe(false)
-  })
-})
--- a/tests/hooks/use-jobs-realtime.test.tsx
+++ b/tests/hooks/use-jobs-realtime.test.tsx
@ -1,147 +0,0 @@
-// @vitest-environment jsdom
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { renderHook, act } from '@testing-library/react'
-import { useJobsStore } from '@/stores/jobs-store'
-import useJobsRealtime from '@/hooks/use-jobs-realtime'
-
-type Listener = (event: { data: string }) => void
-
-class MockEventSource {
-  static instance: MockEventSource | null = null
-  private listeners: Record<string, Listener[]> = {}
-  onerror: (() => void) | null = null
-
-  constructor(_url: string) {
-    MockEventSource.instance = this
-  }
-
-  addEventListener(type: string, listener: Listener) {
-    if (!this.listeners[type]) this.listeners[type] = []
-    this.listeners[type].push(listener)
-  }
-
-  dispatch(type: string, data: unknown) {
-    for (const l of this.listeners[type] ?? []) {
-      l({ data: JSON.stringify(data) })
-    }
-  }
-
-  close() {}
-}
-
-const fullJob = {
-  id: 'job-unknown-1',
-  kind: 'TASK_IMPLEMENTATION',
-  status: 'RUNNING',
-  taskCode: 'T-1',
-  taskTitle: 'Test',
-  ideaCode: null,
-  ideaTitle: null,
-  sprintGoal: null,
-  sprintCode: null,
-  productName: 'Scrum4Me',
-  productCode: null,
-  storyCode: null,
-  pbiCode: null,
-  modelId: null,
-  inputTokens: null,
-  outputTokens: null,
-  cacheReadTokens: null,
-  cacheWriteTokens: null,
-  costUsd: null,
-  branch: null,
-  prUrl: null,
-  error: null,
-  summary: null,
-  description: null,
-  verifyResult: null,
-  startedAt: null,
-  finishedAt: null,
-  createdAt: new Date('2026-01-01'),
-  sprintRunId: null,
-}
-
-beforeEach(() => {
-  vi.stubGlobal('EventSource', MockEventSource)
-  MockEventSource.instance = null
-
-  // Lege store
-  useJobsStore.setState({ activeJobs: [], doneJobs: [], selectedJobId: null })
-
-  // fetch resolveert naar de volledige job
-  vi.stubGlobal(
-    'fetch',
-    vi.fn().mockImplementation(async () => ({
-      ok: true,
-      json: async () => fullJob,
-    }))
-  )
-})
-
-afterEach(() => {
-  vi.unstubAllGlobals()
-  vi.restoreAllMocks()
-})
-
-describe('useJobsRealtime: fetch-on-unknown', () => {
-  it('haalt onbekende job op via REST bij message-event', async () => {
-    renderHook(() => useJobsRealtime())
-    const es = MockEventSource.instance!
-
-    // Dispatch twee events met hetzelfde onbekende job_id gelijktijdig
-    act(() => {
-      es.dispatch('message', { job_id: 'job-unknown-1', status: 'RUNNING' })
-      es.dispatch('message', { job_id: 'job-unknown-1', status: 'RUNNING' })
-    })
-
-    // Wacht op alle microtasks / fetch-promises
-    await act(async () => {
-      await Promise.resolve()
-    })
-
-    expect(fetch).toHaveBeenCalledTimes(1)
-    expect(fetch).toHaveBeenCalledWith('/api/jobs/job-unknown-1')
-
-    const { activeJobs } = useJobsStore.getState()
-    expect(activeJobs.some(j => j.id === 'job-unknown-1')).toBe(true)
-    expect(activeJobs.find(j => j.id === 'job-unknown-1')?.taskTitle).toBe('Test')
-  })
-
-  it('gebruikt partial-upsert voor bekende jobs bij message-event', async () => {
-    // Zet een bekende job in de store
-    useJobsStore.setState({
-      activeJobs: [{ ...fullJob, id: 'job-known-1', status: 'QUEUED' } as never],
-      doneJobs: [],
-      selectedJobId: null,
-    })
-
-    renderHook(() => useJobsRealtime())
-    const es = MockEventSource.instance!
-
-    act(() => {
-      es.dispatch('message', { job_id: 'job-known-1', status: 'RUNNING', branch: 'feat/x' })
-    })
-
-    await act(async () => { await Promise.resolve() })
-
-    expect(fetch).not.toHaveBeenCalled()
-    const { activeJobs } = useJobsStore.getState()
-    expect(activeJobs.find(j => j.id === 'job-known-1')?.status).toBe('RUNNING')
-  })
-
-  it('haalt onbekende job op via REST bij jobs_initial-event', async () => {
-    renderHook(() => useJobsRealtime())
-    const es = MockEventSource.instance!
-
-    act(() => {
-      es.dispatch('jobs_initial', [{ job_id: 'job-unknown-1', status: 'RUNNING' }])
-    })
-
-    await act(async () => { await Promise.resolve() })
-
-    expect(fetch).toHaveBeenCalledTimes(1)
-    expect(fetch).toHaveBeenCalledWith('/api/jobs/job-unknown-1')
-    const { activeJobs } = useJobsStore.getState()
-    expect(activeJobs.some(j => j.id === 'job-unknown-1')).toBe(true)
-  })
-})
--- a/tests/lib/active-sprint.test.ts
+++ b/tests/lib/active-sprint.test.ts
@ -1,190 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-vi.mock('@/lib/prisma', () => ({
-  prisma: {
-    sprint: { findFirst: vi.fn() },
-    user: {
-      findUnique: vi.fn(),
-      update: vi.fn().mockResolvedValue({}),
-    },
-    $executeRaw: vi.fn().mockResolvedValue(1),
-  },
-}))
-
-import { prisma } from '@/lib/prisma'
-import type { UserSettings } from '@/lib/user-settings'
-import {
-  clearActiveSprintInSettings,
-  readStoredActiveSprintState,
-  resolveActiveSprint,
-} from '@/lib/active-sprint'
-
-const mockPrisma = prisma as unknown as {
-  sprint: { findFirst: ReturnType<typeof vi.fn> }
-  user: {
-    findUnique: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
-  $executeRaw: ReturnType<typeof vi.fn>
-}
-
-function withSettings(settings: UserSettings) {
-  mockPrisma.user.findUnique.mockResolvedValueOnce({ settings })
-}
-
-describe('readStoredActiveSprintState', () => {
-  it('returns unset when activeSprints map is absent', () => {
-    expect(readStoredActiveSprintState({}, 'p1')).toEqual({ kind: 'unset' })
-  })
-
-  it('returns unset when productId key is absent', () => {
-    const settings: UserSettings = {
-      layout: { activeSprints: { p2: 'sprint-2' } },
-    }
-    expect(readStoredActiveSprintState(settings, 'p1')).toEqual({
-      kind: 'unset',
-    })
-  })
-
-  it('returns cleared when key is present with null value', () => {
-    const settings: UserSettings = {
-      layout: { activeSprints: { p1: null } },
-    }
-    expect(readStoredActiveSprintState(settings, 'p1')).toEqual({
-      kind: 'cleared',
-    })
-  })
-
-  it('returns set when key is present with string value', () => {
-    const settings: UserSettings = {
-      layout: { activeSprints: { p1: 'sprint-1' } },
-    }
-    expect(readStoredActiveSprintState(settings, 'p1')).toEqual({
-      kind: 'set',
-      sprintId: 'sprint-1',
-    })
-  })
-})
-
-describe('resolveActiveSprint', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('returns null without fallback when key is explicitly null (cleared)', async () => {
-    withSettings({ layout: { activeSprints: { p1: null } } })
-
-    const result = await resolveActiveSprint('p1', 'user-1')
-
-    expect(result).toBeNull()
-    expect(mockPrisma.sprint.findFirst).not.toHaveBeenCalled()
-  })
-
-  it('returns the stored sprint when key is set and sprint exists', async () => {
-    withSettings({ layout: { activeSprints: { p1: 'sprint-1' } } })
-    mockPrisma.sprint.findFirst.mockResolvedValueOnce({
-      id: 'sprint-1',
-      code: 'SP-1',
-      status: 'OPEN',
-    })
-
-    const result = await resolveActiveSprint('p1', 'user-1')
-
-    expect(result).toEqual({ id: 'sprint-1', code: 'SP-1', status: 'OPEN' })
-    expect(mockPrisma.sprint.findFirst).toHaveBeenCalledTimes(1)
-  })
-
-  it('falls back when stored sprint is not found in DB', async () => {
-    withSettings({ layout: { activeSprints: { p1: 'stale-id' } } })
-    mockPrisma.sprint.findFirst
-      .mockResolvedValueOnce(null) // stored lookup misses
-      .mockResolvedValueOnce({ id: 'sprint-open', code: 'SP-O', status: 'OPEN' })
-
-    const result = await resolveActiveSprint('p1', 'user-1')
-
-    expect(result).toEqual({
-      id: 'sprint-open',
-      code: 'SP-O',
-      status: 'OPEN',
-    })
-  })
-
-  it('falls back to first OPEN sprint when key is absent', async () => {
-    withSettings({})
-    mockPrisma.sprint.findFirst.mockResolvedValueOnce({
-      id: 'sprint-open',
-      code: 'SP-O',
-      status: 'OPEN',
-    })
-
-    const result = await resolveActiveSprint('p1', 'user-1')
-
-    expect(result).toEqual({
-      id: 'sprint-open',
-      code: 'SP-O',
-      status: 'OPEN',
-    })
-  })
-
-  it('falls back to recent CLOSED sprint when no OPEN exists', async () => {
-    withSettings({})
-    mockPrisma.sprint.findFirst
-      .mockResolvedValueOnce(null) // no OPEN
-      .mockResolvedValueOnce({
-        id: 'sprint-closed',
-        code: 'SP-C',
-        status: 'CLOSED',
-      })
-
-    const result = await resolveActiveSprint('p1', 'user-1')
-
-    expect(result).toEqual({
-      id: 'sprint-closed',
-      code: 'SP-C',
-      status: 'CLOSED',
-    })
-  })
-
-  it('returns null when key absent and no sprints exist', async () => {
-    withSettings({})
-    mockPrisma.sprint.findFirst.mockResolvedValue(null)
-
-    const result = await resolveActiveSprint('p1', 'user-1')
-
-    expect(result).toBeNull()
-  })
-})
-
-describe('clearActiveSprintInSettings', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('writes null instead of deleting the key', async () => {
-    withSettings({
-      layout: { activeSprints: { p1: 'sprint-1', p2: 'sprint-2' } },
-    })
-
-    await clearActiveSprintInSettings('user-1', 'p1')
-
-    expect(mockPrisma.user.update).toHaveBeenCalledTimes(1)
-    const updateArg = mockPrisma.user.update.mock.calls[0][0] as {
-      data: { settings: UserSettings }
-    }
-    expect(updateArg.data.settings.layout?.activeSprints).toEqual({
-      p1: null,
-      p2: 'sprint-2',
-    })
-  })
-
-  it('adds the key with null when previously unset', async () => {
-    withSettings({})
-
-    await clearActiveSprintInSettings('user-1', 'p1')
-
-    const updateArg = mockPrisma.user.update.mock.calls[0][0] as {
-      data: { settings: UserSettings }
-    }
-    expect(updateArg.data.settings.layout?.activeSprints).toEqual({ p1: null })
-  })
-})
--- a/tests/lib/auth-guard.test.ts
+++ b/tests/lib/auth-guard.test.ts
@ -1,53 +0,0 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
-
-const getSessionMock = vi.fn()
-const isPairedSessionExpiredMock = vi.fn()
-const redirectMock = vi.fn(() => { throw new Error('REDIRECT_CALLED') })
-const prismaUserRoleFindFirstMock = vi.fn()
-
-vi.mock('@/lib/auth', () => ({ getSession: getSessionMock }))
-vi.mock('@/lib/auth/pairing', () => ({ isPairedSessionExpired: isPairedSessionExpiredMock }))
-vi.mock('next/navigation', () => ({ redirect: redirectMock }))
-vi.mock('@/lib/prisma', () => ({
-  prisma: { userRole: { findFirst: prismaUserRoleFindFirstMock } },
-}))
-
-describe('requireSession', () => {
-  beforeEach(() => {
-    getSessionMock.mockReset()
-    isPairedSessionExpiredMock.mockReset()
-    redirectMock.mockClear()
-  })
-
-  afterEach(() => {
-    vi.resetModules()
-  })
-
-  it('redirect /login als userId ontbreekt', async () => {
-    getSessionMock.mockResolvedValue({ userId: undefined, destroy: vi.fn() })
-    isPairedSessionExpiredMock.mockReturnValue(false)
-    const { requireSession } = await import('@/lib/auth-guard')
-    await expect(requireSession()).rejects.toThrow('REDIRECT_CALLED')
-    expect(redirectMock).toHaveBeenCalledWith('/login')
-  })
-
-  it('vernietigt + redirect /login als paired-sessie verlopen is', async () => {
-    const destroy = vi.fn().mockResolvedValue(undefined)
-    getSessionMock.mockResolvedValue({ userId: 'u1', destroy })
-    isPairedSessionExpiredMock.mockReturnValue(true)
-    const { requireSession } = await import('@/lib/auth-guard')
-    await expect(requireSession()).rejects.toThrow('REDIRECT_CALLED')
-    expect(destroy).toHaveBeenCalled()
-    expect(redirectMock).toHaveBeenCalledWith('/login')
-  })
-
-  it('geeft sessie terug als alles ok', async () => {
-    const sess = { userId: 'u1', destroy: vi.fn() }
-    getSessionMock.mockResolvedValue(sess)
-    isPairedSessionExpiredMock.mockReturnValue(false)
-    const { requireSession } = await import('@/lib/auth-guard')
-    const result = await requireSession()
-    expect(result).toBe(sess)
-    expect(redirectMock).not.toHaveBeenCalled()
-  })
-})
--- a/tests/lib/chart-colors.test.ts
+++ b/tests/lib/chart-colors.test.ts
@ -34,7 +34,7 @@ describe('chart-colors', () => {

  it('JOB_STATUS_COLORS has all ClaudeJobStatus keys and non-empty values', () => {
    const keys: (keyof typeof JOB_STATUS_COLORS)[] = [
-      'queued', 'claimed', 'running', 'done', 'failed', 'cancelled', 'skipped',
+      'queued', 'claimed', 'running', 'done', 'failed', 'cancelled',
    ]
    for (const key of keys) {
      expect(JOB_STATUS_COLORS[key]).toBeTruthy()
--- a/tests/lib/code.test.ts
+++ b/tests/lib/code.test.ts
@ -1,25 +0,0 @@
-import { describe, it, expect } from 'vitest'
-
-import { parseCodeNumber } from '@/lib/code'
-
-describe('parseCodeNumber', () => {
-  it('parses a standard story code', () => {
-    expect(parseCodeNumber('ST-001')).toBe(1)
-  })
-
-  it('parses a task code', () => {
-    expect(parseCodeNumber('T-42')).toBe(42)
-  })
-
-  it('parses a large number', () => {
-    expect(parseCodeNumber('ST-1000')).toBe(1000)
-  })
-
-  it('returns MAX_SAFE_INTEGER for a code with no trailing digits', () => {
-    expect(parseCodeNumber('FOO')).toBe(Number.MAX_SAFE_INTEGER)
-  })
-
-  it('returns MAX_SAFE_INTEGER for an empty string', () => {
-    expect(parseCodeNumber('')).toBe(Number.MAX_SAFE_INTEGER)
-  })
-})
--- a/tests/lib/debug.test.ts
+++ b/tests/lib/debug.test.ts
@ -1,23 +0,0 @@
-import { describe, it, expect, vi } from 'vitest'
-
-import { debugProps } from '@/lib/debug'
-
-describe('debugProps', () => {
-  it('returns data-debug-id attr in dev mode', () => {
-    const result = debugProps('sprint-board', 'SprintBoard', 'components/sprint/sprint-board.tsx')
-    expect(result).toEqual({
-      'data-debug-id': 'sprint-board',
-    })
-  })
-
-  it('returns empty object in production mode', () => {
-    const original = process.env.NODE_ENV
-    try {
-      vi.stubEnv('NODE_ENV', 'production')
-      const result = debugProps('sprint-board', 'SprintBoard', 'components/sprint/sprint-board.tsx')
-      expect(result).toEqual({})
-    } finally {
-      vi.stubEnv('NODE_ENV', original ?? 'test')
-    }
-  })
-})
--- a/tests/lib/idea-code.test.ts
+++ b/tests/lib/idea-code.test.ts
@ -1,21 +0,0 @@
-import { describe, it, expect } from 'vitest'
-
-import { formatIdeaCode } from '@/lib/idea-code'
-
-describe('formatIdeaCode', () => {
-  it('pads to 3 digits', () => {
-    expect(formatIdeaCode(1)).toBe('IDEA-001')
-    expect(formatIdeaCode(42)).toBe('IDEA-042')
-    expect(formatIdeaCode(999)).toBe('IDEA-999')
-  })
-
-  it('does not truncate beyond pad-width', () => {
-    expect(formatIdeaCode(1000)).toBe('IDEA-1000')
-    expect(formatIdeaCode(99999)).toBe('IDEA-99999')
-  })
-})
-
-// Integration-style concurrency-test op nextIdeaCode is in
-// __tests__/integration/ tests die de echte DB raken (zie M12 verificatie-stap).
-// Hier alleen de pure formatter; de increment-logica leunt op Prisma's
-// row-lock in $transaction die we per-database vertrouwen.
--- a/tests/lib/idea-plan-parser.test.ts
+++ b/tests/lib/idea-plan-parser.test.ts
@ -1,138 +0,0 @@
-import { describe, it, expect } from 'vitest'
-
-import { parsePlanMd } from '@/lib/idea-plan-parser'
-
-const VALID = `---
-pbi:
-  title: Test PBI
-  priority: 2
-stories:
-  - title: Eerste flow
-    priority: 2
-    tasks:
-      - title: Setup
-        priority: 2
-        implementation_plan: |
-          1. Doe X
-          2. Doe Y
---
-
-# Overwegingen
-
-Dit is de body, niet geparsed.
-`
-
-describe('parsePlanMd', () => {
-  it('parses a valid plan', () => {
-    const r = parsePlanMd(VALID)
-    expect(r.ok).toBe(true)
-    if (r.ok) {
-      expect(r.plan.pbi.title).toBe('Test PBI')
-      expect(r.plan.stories).toHaveLength(1)
-      expect(r.plan.stories[0].tasks).toHaveLength(1)
-      expect(r.plan.stories[0].tasks[0].implementation_plan).toContain('Doe X')
-      expect(r.body).toContain('# Overwegingen')
-    }
-  })
-
-  it('rejects when frontmatter is missing', () => {
-    const r = parsePlanMd('# Just markdown\n\nNo frontmatter here.')
-    expect(r.ok).toBe(false)
-    if (!r.ok) {
-      expect(r.errors[0].line).toBe(1)
-      expect(r.errors[0].message).toMatch(/frontmatter/i)
-    }
-  })
-
-  it('reports yaml syntax error with line info', () => {
-    const broken = `---
-pbi:
-  title: Test
-  priority: [unclosed
-stories:
-  - foo
---
-
-body
-`
-    const r = parsePlanMd(broken)
-    expect(r.ok).toBe(false)
-    if (!r.ok) {
-      expect(r.errors[0].message.length).toBeGreaterThan(0)
-    }
-  })
-
-  it('hints when markdown sneaks into frontmatter', () => {
-    // "1. **...**: [unclosed" triggers a YAMLParseError at the markdown line
-    // (plain-list-with-bold parses as valid YAML without an unclosed flow)
-    const broken = `---
-pbi:
-  title: Test
-  priority: 2
-stories:
-1. **Toggle zichtbaar in productie**: [unclosed
---
-
-body
-`
-    const r = parsePlanMd(broken)
-    expect(r.ok).toBe(false)
-    if (!r.ok) {
-      expect(r.errors[0].hint).toMatch(/markdown/i)
-      expect(r.errors[0].line).toBeGreaterThan(1)
-    }
-  })
-
-  it('omits hint for non-markdown yaml errors', () => {
-    const broken = `---
-pbi:
-  title: Test
-  priority: [unclosed
-stories:
-  - foo
---
-`
-    const r = parsePlanMd(broken)
-    expect(r.ok).toBe(false)
-    if (!r.ok) expect(r.errors[0].hint).toBeUndefined()
-  })
-
-  it('reports schema-validation error when pbi-section missing', () => {
-    const noPbi = `---
-stories:
-  - title: x
-    priority: 2
-    tasks:
-      - title: y
-        priority: 2
---
-
-body
-`
-    const r = parsePlanMd(noPbi)
-    expect(r.ok).toBe(false)
-    if (!r.ok) {
-      expect(r.errors.some((e) => e.message.includes('pbi'))).toBe(true)
-    }
-  })
-
-  it('rejects empty stories array', () => {
-    const noStories = `---
-pbi:
-  title: x
-  priority: 2
-stories: []
---
-
-body
-`
-    const r = parsePlanMd(noStories)
-    expect(r.ok).toBe(false)
-  })
-
-  it('handles CRLF line endings', () => {
-    const crlf = VALID.replace(/\n/g, '\r\n')
-    const r = parsePlanMd(crlf)
-    expect(r.ok).toBe(true)
-  })
-})
--- a/tests/lib/idea-schemas.test.ts
+++ b/tests/lib/idea-schemas.test.ts
@ -1,148 +0,0 @@
-import { describe, it, expect } from 'vitest'
-
-import {
-  ideaCreateSchema,
-  ideaUpdateSchema,
-  ideaPlanMdFrontmatterSchema,
-} from '@/lib/schemas/idea'
-
-describe('ideaCreateSchema', () => {
-  it('accepts minimal valid input', () => {
-    const r = ideaCreateSchema.safeParse({ title: 'Plant-watering reminder' })
-    expect(r.success).toBe(true)
-  })
-
-  it('trims and enforces non-empty title', () => {
-    const r = ideaCreateSchema.safeParse({ title: '   ' })
-    expect(r.success).toBe(false)
-  })
-
-  it('rejects oversized title and description', () => {
-    expect(ideaCreateSchema.safeParse({ title: 'x'.repeat(201) }).success).toBe(false)
-    expect(
-      ideaCreateSchema.safeParse({ title: 'ok', description: 'x'.repeat(4001) }).success,
-    ).toBe(false)
-  })
-
-  it('accepts cuid-like product_id', () => {
-    const r = ideaCreateSchema.safeParse({
-      title: 'Idee',
-      product_id: 'cmohrysyj0000rd17clnjy4tc',
-    })
-    expect(r.success).toBe(true)
-  })
-
-  it('rejects non-cuid product_id', () => {
-    const r = ideaCreateSchema.safeParse({ title: 'Idee', product_id: 'not-a-cuid' })
-    expect(r.success).toBe(false)
-  })
-})
-
-describe('ideaUpdateSchema', () => {
-  it('allows empty object (no-op update)', () => {
-    expect(ideaUpdateSchema.safeParse({}).success).toBe(true)
-  })
-
-  it('allows partial title update', () => {
-    expect(ideaUpdateSchema.safeParse({ title: 'Updated' }).success).toBe(true)
-  })
-})
-
-describe('ideaPlanMdFrontmatterSchema', () => {
-  const validPlan = {
-    pbi: { title: 'Test PBI', priority: 2 },
-    stories: [
-      {
-        title: 'Eerste flow',
-        priority: 2,
-        tasks: [
-          { title: 'Setup', priority: 2, implementation_plan: '1. Doe X' },
-        ],
-      },
-    ],
-  }
-
-  it('accepts a minimal valid plan', () => {
-    expect(ideaPlanMdFrontmatterSchema.safeParse(validPlan).success).toBe(true)
-  })
-
-  it('requires at least one story', () => {
-    const r = ideaPlanMdFrontmatterSchema.safeParse({ ...validPlan, stories: [] })
-    expect(r.success).toBe(false)
-  })
-
-  it('requires at least one task per story', () => {
-    const r = ideaPlanMdFrontmatterSchema.safeParse({
-      ...validPlan,
-      stories: [{ ...validPlan.stories[0], tasks: [] }],
-    })
-    expect(r.success).toBe(false)
-  })
-
-  it('validates priority bounds 1-4', () => {
-    expect(
-      ideaPlanMdFrontmatterSchema.safeParse({
-        ...validPlan,
-        pbi: { ...validPlan.pbi, priority: 5 },
-      }).success,
-    ).toBe(false)
-    expect(
-      ideaPlanMdFrontmatterSchema.safeParse({
-        ...validPlan,
-        pbi: { ...validPlan.pbi, priority: 0 },
-      }).success,
-    ).toBe(false)
-  })
-
-  it('accepts optional verify_required + verify_only', () => {
-    const r = ideaPlanMdFrontmatterSchema.safeParse({
-      ...validPlan,
-      stories: [
-        {
-          ...validPlan.stories[0],
-          tasks: [
-            {
-              title: 'Verify-only task',
-              priority: 2,
-              verify_required: 'ALIGNED_OR_PARTIAL',
-              verify_only: true,
-            },
-          ],
-        },
-      ],
-    })
-    expect(r.success).toBe(true)
-  })
-
-  it('rejects invalid verify_required enum', () => {
-    const r = ideaPlanMdFrontmatterSchema.safeParse({
-      ...validPlan,
-      stories: [
-        {
-          ...validPlan.stories[0],
-          tasks: [
-            { title: 't', priority: 2, verify_required: 'INVALID' },
-          ],
-        },
-      ],
-    })
-    expect(r.success).toBe(false)
-  })
-
-  it('accepts plan with task.priority omitted (inherits story-priority via materialize)', () => {
-    const r = ideaPlanMdFrontmatterSchema.safeParse({
-      ...validPlan,
-      stories: [
-        {
-          title: 'Story zonder task-priorities',
-          priority: 2,
-          tasks: [
-            { title: 'Taak 1' }, // geen priority — moet geaccepteerd
-            { title: 'Taak 2', verify_required: 'ALIGNED' },
-          ],
-        },
-      ],
-    })
-    expect(r.success).toBe(true)
-  })
-})
--- a/tests/lib/idea-status.test.ts
+++ b/tests/lib/idea-status.test.ts
@ -1,108 +0,0 @@
-import { describe, it, expect } from 'vitest'
-
-import {
-  ideaStatusToApi,
-  ideaStatusFromApi,
-  canTransition,
-  isIdeaEditable,
-  isGrillMdEditable,
-  isPlanMdEditable,
-  IDEA_STATUS_API_VALUES,
-} from '@/lib/idea-status'
-
-describe('idea-status mappers', () => {
-  it('round-trips every API value', () => {
-    for (const api of IDEA_STATUS_API_VALUES) {
-      const db = ideaStatusFromApi(api)
-      expect(db).not.toBeNull()
-      expect(ideaStatusToApi(db!)).toBe(api)
-    }
-  })
-
-  it('returns null for invalid input', () => {
-    expect(ideaStatusFromApi('NOT_A_STATUS')).toBeNull()
-  })
-
-  it('is case-insensitive on the API side', () => {
-    expect(ideaStatusFromApi('PLAN_READY')).toBe('PLAN_READY')
-    expect(ideaStatusFromApi('Plan_Ready')).toBe('PLAN_READY')
-  })
-})
-
-describe('canTransition', () => {
-  it('allows valid forward transitions', () => {
-    expect(canTransition('DRAFT', 'GRILLING')).toBe(true)
-    expect(canTransition('GRILLING', 'GRILLED')).toBe(true)
-    expect(canTransition('GRILLED', 'PLANNING')).toBe(true)
-    expect(canTransition('PLANNING', 'PLAN_READY')).toBe(true)
-    expect(canTransition('PLAN_READY', 'PLANNED')).toBe(true)
-  })
-
-  it('allows re-grill from GRILLED and PLAN_READY-ish states', () => {
-    expect(canTransition('GRILLED', 'GRILLING')).toBe(true)
-    expect(canTransition('PLAN_FAILED', 'PLANNING')).toBe(true)
-    expect(canTransition('PLAN_READY', 'GRILLING')).toBe(true)
-  })
-
-  it('allows fail-side transitions', () => {
-    expect(canTransition('GRILLING', 'GRILL_FAILED')).toBe(true)
-    expect(canTransition('PLANNING', 'PLAN_FAILED')).toBe(true)
-  })
-
-  it('allows recovery from failed states', () => {
-    expect(canTransition('GRILL_FAILED', 'GRILLING')).toBe(true)
-    expect(canTransition('PLAN_FAILED', 'GRILLED')).toBe(true)
-  })
-
-  it('allows PLANNED → PLAN_READY (relink) and PLANNED → GRILLING (re-grill)', () => {
-    expect(canTransition('PLANNED', 'PLAN_READY')).toBe(true)
-    expect(canTransition('PLANNED', 'GRILLING')).toBe(true)
-    expect(canTransition('PLANNED', 'DRAFT')).toBe(false)
-  })
-
-  it('canTransition to GRILLING from all statuses that allow re-grill', () => {
-    // GRILL_TRIGGERABLE_FROM in actions/ideas.ts — alle statussen die re-grill ondersteunen.
-    const regrill = ['DRAFT', 'GRILLED', 'GRILL_FAILED', 'PLAN_READY', 'PLANNED'] as const
-    for (const status of regrill) {
-      expect(canTransition(status, 'GRILLING')).toBe(true)
-    }
-  })
-
-  it('rejects invalid jumps', () => {
-    expect(canTransition('DRAFT', 'PLANNED')).toBe(false)
-    expect(canTransition('DRAFT', 'PLAN_READY')).toBe(false)
-    expect(canTransition('GRILLING', 'PLANNED')).toBe(false)
-  })
-})
-
-describe('isIdeaEditable', () => {
-  it('allows edit in non-running, non-PLANNED states', () => {
-    expect(isIdeaEditable('DRAFT')).toBe(true)
-    expect(isIdeaEditable('GRILLED')).toBe(true)
-    expect(isIdeaEditable('GRILL_FAILED')).toBe(true)
-    expect(isIdeaEditable('PLAN_FAILED')).toBe(true)
-    expect(isIdeaEditable('PLAN_READY')).toBe(true)
-  })
-
-  it('blocks edit while a job is running or after PLANNED', () => {
-    expect(isIdeaEditable('GRILLING')).toBe(false)
-    expect(isIdeaEditable('PLANNING')).toBe(false)
-    expect(isIdeaEditable('PLANNED')).toBe(false)
-  })
-})
-
-describe('isGrillMdEditable / isPlanMdEditable', () => {
-  it('grill_md only editable in GRILLED or PLAN_READY', () => {
-    expect(isGrillMdEditable('GRILLED')).toBe(true)
-    expect(isGrillMdEditable('PLAN_READY')).toBe(true)
-    expect(isGrillMdEditable('DRAFT')).toBe(false)
-    expect(isGrillMdEditable('PLANNED')).toBe(false)
-  })
-
-  it('plan_md only editable in PLAN_READY', () => {
-    expect(isPlanMdEditable('PLAN_READY')).toBe(true)
-    expect(isPlanMdEditable('GRILLED')).toBe(false)
-    expect(isPlanMdEditable('PLAN_FAILED')).toBe(false)
-    expect(isPlanMdEditable('PLANNED')).toBe(false)
-  })
-})
--- a/tests/lib/insights/agent-throughput.test.ts
+++ b/tests/lib/insights/agent-throughput.test.ts
@ -48,7 +48,7 @@ describe('getJobsPerDay', () => {

    // All days should have zero counts except the three we seeded
    const nonZero = result.perDay.filter(
-      d => d.done + d.failed + d.queued + d.claimed + d.running + d.cancelled + d.skipped > 0,
+      d => d.done + d.failed + d.queued + d.claimed + d.running + d.cancelled > 0,
    )
    expect(nonZero).toHaveLength(3)

--- a/tests/lib/insights/token-history.test.ts
+++ b/tests/lib/insights/token-history.test.ts
@ -1,74 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-const { mockQueryRaw } = vi.hoisted(() => ({ mockQueryRaw: vi.fn() }))
-
-vi.mock('@/lib/prisma', () => ({
-  prisma: { $queryRaw: mockQueryRaw },
-}))
-
-import {
-  getSprintTokenHistory,
-  getDayTokenData,
-  getPbiTokenAggregates,
-} from '@/lib/insights/token-history'
-
-beforeEach(() => {
-  vi.clearAllMocks()
-})
-
-describe('getSprintTokenHistory', () => {
-  it('returns mapped sprint rows', async () => {
-    mockQueryRaw.mockResolvedValueOnce([
-      { sprint_id: 'sp-1', sprint_goal: 'Goal A', total_tokens: BigInt(5000), total_cost: 0.1, job_count: BigInt(2) },
-    ])
-    const rows = await getSprintTokenHistory('user-1')
-    expect(rows).toHaveLength(1)
-    expect(rows[0].sprintId).toBe('sp-1')
-    expect(rows[0].totalTokens).toBe(5000)
-    expect(rows[0].totalCostUsd).toBe(0.1)
-    expect(rows[0].jobCount).toBe(2)
-  })
-
-  it('returns zero cost when total_cost is null', async () => {
-    mockQueryRaw.mockResolvedValueOnce([
-      { sprint_id: 'sp-2', sprint_goal: 'Goal B', total_tokens: BigInt(0), total_cost: null, job_count: BigInt(0) },
-    ])
-    const rows = await getSprintTokenHistory('user-1')
-    expect(rows[0].totalCostUsd).toBe(0)
-  })
-})
-
-describe('getDayTokenData', () => {
-  it('returns empty array for empty sprintId', async () => {
-    const rows = await getDayTokenData('user-1', '')
-    expect(rows).toHaveLength(0)
-    expect(mockQueryRaw).not.toHaveBeenCalled()
-  })
-
-  it('maps day rows with ISO date string', async () => {
-    mockQueryRaw.mockResolvedValueOnce([
-      { day: new Date('2026-05-01T00:00:00Z'), total_tokens: BigInt(2000), total_cost: 0.05 },
-    ])
-    const rows = await getDayTokenData('user-1', 'sprint-1')
-    expect(rows).toHaveLength(1)
-    expect(rows[0].day).toBe('2026-05-01')
-    expect(rows[0].totalTokens).toBe(2000)
-  })
-})
-
-describe('getPbiTokenAggregates', () => {
-  it('returns empty array for empty sprintId', async () => {
-    const rows = await getPbiTokenAggregates('user-1', '')
-    expect(rows).toHaveLength(0)
-    expect(mockQueryRaw).not.toHaveBeenCalled()
-  })
-
-  it('maps pbi rows', async () => {
-    mockQueryRaw.mockResolvedValueOnce([
-      { pbi_id: 'pbi-1', pbi_code: 'M1', pbi_title: 'First PBI', total_tokens: BigInt(3000), total_cost: 0.08 },
-    ])
-    const rows = await getPbiTokenAggregates('user-1', 'sprint-1')
-    expect(rows[0].pbiCode).toBe('M1')
-    expect(rows[0].totalTokens).toBe(3000)
-  })
-})
--- a/tests/lib/insights/token-stats.test.ts
+++ b/tests/lib/insights/token-stats.test.ts
@ -1,67 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-const { mockQueryRaw } = vi.hoisted(() => ({ mockQueryRaw: vi.fn() }))
-
-vi.mock('@/lib/prisma', () => ({
-  prisma: { $queryRaw: mockQueryRaw },
-}))
-
-import { getTokenStats } from '@/lib/insights/token-stats'
-
-beforeEach(() => {
-  vi.clearAllMocks()
-})
-
-describe('getTokenStats', () => {
-  it('returns empty result for empty sprintId', async () => {
-    const result = await getTokenStats('user-1', '')
-
-    expect(result.kpi.totalTokens).toBe(0)
-    expect(result.kpi.totalCostUsd).toBe(0)
-    expect(result.kpi.avgCostPerJob).toBe(0)
-    expect(result.kpi.jobCount).toBe(0)
-    expect(result.jobs).toHaveLength(0)
-    expect(mockQueryRaw).not.toHaveBeenCalled()
-  })
-
-  it('maps kpi rows correctly', async () => {
-    const kpiRows = [{ total_tokens: BigInt(10000), total_cost: 0.15, avg_cost: 0.05, job_count: BigInt(3) }]
-    const jobRows: unknown[] = []
-    mockQueryRaw.mockResolvedValueOnce(kpiRows).mockResolvedValueOnce(jobRows)
-
-    const result = await getTokenStats('user-1', 'sprint-1')
-
-    expect(result.kpi.totalTokens).toBe(10000)
-    expect(result.kpi.totalCostUsd).toBe(0.15)
-    expect(result.kpi.avgCostPerJob).toBe(0.05)
-    expect(result.kpi.jobCount).toBe(3)
-  })
-
-  it('maps job rows and handles null token data', async () => {
-    const kpiRows = [{ total_tokens: BigInt(0), total_cost: null, avg_cost: null, job_count: BigInt(0) }]
-    const jobRows = [
-      {
-        job_id: 'job-1',
-        task_title: 'My Task',
-        idea_code: null,
-        model_id: 'claude-sonnet-4-6',
-        input_tokens: null,
-        output_tokens: null,
-        cache_read_tokens: null,
-        cache_write_tokens: null,
-        cost_usd: null,
-        duration_seconds: 42,
-      },
-    ]
-    mockQueryRaw.mockResolvedValueOnce(kpiRows).mockResolvedValueOnce(jobRows)
-
-    const result = await getTokenStats('user-1', 'sprint-1')
-
-    expect(result.jobs).toHaveLength(1)
-    const job = result.jobs[0]
-    expect(job.jobId).toBe('job-1')
-    expect(job.taskTitle).toBe('My Task')
-    expect(job.costUsd).toBeNull()
-    expect(job.durationSeconds).toBe(42)
-  })
-})
--- a/tests/lib/job-config.test.ts
+++ b/tests/lib/job-config.test.ts
@ -1,101 +0,0 @@
-import { describe, it, expect } from 'vitest'
-import {
-  getKindDefault,
-  resolveJobConfig,
-  mapBudgetToEffort,
-} from '@/lib/job-config'
-
-describe('mapBudgetToEffort', () => {
-  it.each([
-    [0, null],
-    [-1, null],
-    [1, 'medium'],
-    [3000, 'medium'],
-    [6000, 'medium'],
-    [6001, 'high'],
-    [9000, 'high'],
-    [12000, 'high'],
-    [12001, 'xhigh'],
-    [18000, 'xhigh'],
-    [24000, 'xhigh'],
-    [24001, 'max'],
-    [50000, 'max'],
-    [100000, 'max'],
-  ])('budget %i → %s', (budget, expected) => {
-    expect(mapBudgetToEffort(budget)).toBe(expected)
-  })
-})
-
-describe('KIND_DEFAULTS.allowed_tools — sync met scrum4me-mcp', () => {
-  it('TASK_IMPLEMENTATION bevat geen claim-tools', () => {
-    const cfg = getKindDefault('TASK_IMPLEMENTATION')
-    expect(cfg.allowed_tools).not.toContain('mcp__scrum4me__wait_for_job')
-    expect(cfg.allowed_tools).not.toContain('mcp__scrum4me__check_queue_empty')
-    expect(cfg.allowed_tools).not.toContain('mcp__scrum4me__get_idea_context')
-  })
-
-  it('TASK_IMPLEMENTATION bevat de essentiële task-tools', () => {
-    const cfg = getKindDefault('TASK_IMPLEMENTATION')
-    expect(cfg.allowed_tools).toContain('mcp__scrum4me__update_task_status')
-    expect(cfg.allowed_tools).toContain('mcp__scrum4me__update_job_status')
-    expect(cfg.allowed_tools).toContain('mcp__scrum4me__verify_task_against_plan')
-    expect(cfg.allowed_tools).toContain('Bash')
-    expect(cfg.allowed_tools).toContain('Edit')
-    expect(cfg.allowed_tools).toContain('Write')
-  })
-
-  it('SPRINT_IMPLEMENTATION bevat sprint-specifieke tools maar GEEN job_heartbeat (runner doet die)', () => {
-    const cfg = getKindDefault('SPRINT_IMPLEMENTATION')
-    expect(cfg.allowed_tools).toContain('mcp__scrum4me__update_task_execution')
-    expect(cfg.allowed_tools).toContain('mcp__scrum4me__verify_sprint_task')
-    expect(cfg.allowed_tools).not.toContain('mcp__scrum4me__job_heartbeat')
-  })
-
-  it('IDEA_GRILL bevat update_idea_grill_md en geen wait_for_job', () => {
-    const cfg = getKindDefault('IDEA_GRILL')
-    expect(cfg.allowed_tools).toContain('mcp__scrum4me__update_idea_grill_md')
-    expect(cfg.allowed_tools).toContain('mcp__scrum4me__log_idea_decision')
-    expect(cfg.allowed_tools).toContain('mcp__scrum4me__update_job_status')
-    expect(cfg.allowed_tools).not.toContain('mcp__scrum4me__wait_for_job')
-  })
-
-  it('IDEA_MAKE_PLAN bevat update_idea_plan_md en geen wait_for_job', () => {
-    const cfg = getKindDefault('IDEA_MAKE_PLAN')
-    expect(cfg.allowed_tools).toContain('mcp__scrum4me__update_idea_plan_md')
-    expect(cfg.allowed_tools).toContain('mcp__scrum4me__log_idea_decision')
-    expect(cfg.allowed_tools).not.toContain('mcp__scrum4me__wait_for_job')
-  })
-
-  it('alle kinds hebben non-null allowed_tools', () => {
-    for (const kind of [
-      'IDEA_GRILL',
-      'IDEA_MAKE_PLAN',
-      'PLAN_CHAT',
-      'TASK_IMPLEMENTATION',
-      'SPRINT_IMPLEMENTATION',
-    ]) {
-      const cfg = getKindDefault(kind)
-      expect(cfg.allowed_tools).not.toBeNull()
-      expect(Array.isArray(cfg.allowed_tools)).toBe(true)
-    }
-  })
-})
-
-describe('resolveJobConfig — cascade (regression)', () => {
-  it('task.requires_opus overrult product.preferred_model', () => {
-    const cfg = resolveJobConfig(
-      { kind: 'TASK_IMPLEMENTATION' },
-      { preferred_model: 'claude-sonnet-4-6' },
-      { requires_opus: true },
-    )
-    expect(cfg.model).toBe('claude-opus-4-7')
-  })
-
-  it('product.preferred_permission_mode overrult bypassPermissions', () => {
-    const cfg = resolveJobConfig(
-      { kind: 'TASK_IMPLEMENTATION' },
-      { preferred_permission_mode: 'acceptEdits' },
-    )
-    expect(cfg.permission_mode).toBe('acceptEdits')
-  })
-})
--- a/tests/lib/job-status.test.ts
+++ b/tests/lib/job-status.test.ts
@ -27,14 +27,13 @@ describe('job-status mappers', () => {
    expect(jobStatusFromApi('QUEUED')).toBe('QUEUED')
  })

-  it('maps all 7 DB statuses to API', () => {
+  it('maps all 6 DB statuses to API', () => {
    expect(jobStatusToApi('QUEUED')).toBe('queued')
    expect(jobStatusToApi('CLAIMED')).toBe('claimed')
    expect(jobStatusToApi('RUNNING')).toBe('running')
    expect(jobStatusToApi('DONE')).toBe('done')
    expect(jobStatusToApi('FAILED')).toBe('failed')
    expect(jobStatusToApi('CANCELLED')).toBe('cancelled')
-    expect(jobStatusToApi('SKIPPED')).toBe('skipped')
  })

  it('ACTIVE_JOB_STATUSES contains exactly QUEUED, CLAIMED, RUNNING', () => {
--- a/tests/lib/jobs-time-filter.test.ts
+++ b/tests/lib/jobs-time-filter.test.ts
@ -1,57 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { isWithinTimeWindow } from '@/lib/jobs-time-filter'
-
-const HOUR_MS = 60 * 60 * 1000
-
-describe('isWithinTimeWindow', () => {
-  it("returns true for filter='all' regardless of age", () => {
-    const old = new Date(0)
-    expect(isWithinTimeWindow(old, 'all')).toBe(true)
-  })
-
-  describe("filter='1h'", () => {
-    const now = Date.now()
-
-    it('returns true for a job created 30 minutes ago', () => {
-      const createdAt = new Date(now - 30 * 60 * 1000)
-      expect(isWithinTimeWindow(createdAt, '1h', now)).toBe(true)
-    })
-
-    it('returns false for a job created 90 minutes ago', () => {
-      const createdAt = new Date(now - 90 * 60 * 1000)
-      expect(isWithinTimeWindow(createdAt, '1h', now)).toBe(false)
-    })
-  })
-
-  describe("filter='24h'", () => {
-    const now = Date.now()
-
-    it('returns true for a job created 23 hours ago', () => {
-      const createdAt = new Date(now - 23 * HOUR_MS)
-      expect(isWithinTimeWindow(createdAt, '24h', now)).toBe(true)
-    })
-
-    it('returns false for a job created 25 hours ago', () => {
-      const createdAt = new Date(now - 25 * HOUR_MS)
-      expect(isWithinTimeWindow(createdAt, '24h', now)).toBe(false)
-    })
-  })
-
-  describe('accepts both Date and ISO string for createdAt', () => {
-    const now = Date.now()
-    const recent = new Date(now - 30 * 60 * 1000)
-
-    it('accepts a Date object', () => {
-      expect(isWithinTimeWindow(recent, '1h', now)).toBe(true)
-    })
-
-    it('accepts an ISO string', () => {
-      expect(isWithinTimeWindow(recent.toISOString(), '1h', now)).toBe(true)
-    })
-  })
-
-  it('returns true for an invalid date string (fail-open)', () => {
-    expect(isWithinTimeWindow('not-a-date', '1h')).toBe(true)
-  })
-})
--- a/tests/lib/product-switch-path.test.ts
+++ b/tests/lib/product-switch-path.test.ts
@ -1,56 +0,0 @@
-import { describe, it, expect } from 'vitest'
-import { resolveProductSwitchTarget } from '@/lib/product-switch-path'
-
-describe('resolveProductSwitchTarget', () => {
-  it('returns null for non-product pages', () => {
-    expect(resolveProductSwitchTarget('/dashboard', 'new-id')).toBeNull()
-    expect(resolveProductSwitchTarget('/insights', 'new-id')).toBeNull()
-    expect(resolveProductSwitchTarget('/ideas', 'new-id')).toBeNull()
-    expect(resolveProductSwitchTarget('/jobs', 'new-id')).toBeNull()
-    expect(resolveProductSwitchTarget('/', 'new-id')).toBeNull()
-  })
-
-  it('maps /products/<old> to /products/<new>', () => {
-    expect(resolveProductSwitchTarget('/products/old-id', 'new-id')).toBe('/products/new-id')
-  })
-
-  it('maps /products/<old>/ to /products/<new>', () => {
-    expect(resolveProductSwitchTarget('/products/old-id/', 'new-id')).toBe('/products/new-id')
-  })
-
-  it('maps /products/<old>/sprint to /products/<new>/sprint', () => {
-    expect(resolveProductSwitchTarget('/products/old-id/sprint', 'new-id')).toBe(
-      '/products/new-id/sprint',
-    )
-  })
-
-  it('maps /products/<old>/sprint/<sprintId> to /products/<new>/sprint', () => {
-    expect(resolveProductSwitchTarget('/products/old-id/sprint/abc123', 'new-id')).toBe(
-      '/products/new-id/sprint',
-    )
-  })
-
-  it('maps /products/<old>/sprint/.../planning to /products/<new>/sprint', () => {
-    expect(resolveProductSwitchTarget('/products/old-id/sprint/abc123/planning', 'new-id')).toBe(
-      '/products/new-id/sprint',
-    )
-  })
-
-  it('maps /products/<old>/solo to /products/<new>/solo', () => {
-    expect(resolveProductSwitchTarget('/products/old-id/solo', 'new-id')).toBe(
-      '/products/new-id/solo',
-    )
-  })
-
-  it('falls back to /products/<new> for /products/<old>/settings', () => {
-    expect(resolveProductSwitchTarget('/products/old-id/settings', 'new-id')).toBe(
-      '/products/new-id',
-    )
-  })
-
-  it('falls back to /products/<new> for unknown sub-segments', () => {
-    expect(resolveProductSwitchTarget('/products/old-id/unknown/deep', 'new-id')).toBe(
-      '/products/new-id',
-    )
-  })
-})
--- a/tests/lib/push-client.test.ts
+++ b/tests/lib/push-client.test.ts
@ -1,35 +0,0 @@
-import { describe, it, expect, vi } from 'vitest'
-
-vi.mock('@/actions/push', () => ({
-  subscribeToPushAction: vi.fn(),
-  unsubscribeFromPushAction: vi.fn(),
-}))
-
-import { urlBase64ToUint8Array } from '@/lib/push-client'
-
-describe('urlBase64ToUint8Array', () => {
-  it('converts a base64url-encoded VAPID public key to Uint8Array', () => {
-    // 65-byte uncompressed EC public key encoded as base64url (no padding)
-    const base64url = 'BNMxB-LJm6XvGGiJSsYLdumcYiM7q9s_1aM9i5lI8lVzZ7GYJw1QkQFmrknwFsI4dI-e1iyvUhYHjNpHJKJD3oc'
-    const result = urlBase64ToUint8Array(base64url)
-    expect(result).toBeInstanceOf(Uint8Array)
-    expect(result.length).toBe(65)
-    expect(result[0]).toBe(0x04) // uncompressed EC point prefix
-  })
-
-  it('handles base64url with padding', () => {
-    // simple known vector: "hello" = aGVsbG8= in base64
-    const result = urlBase64ToUint8Array('aGVsbG8')
-    expect(result).toBeInstanceOf(Uint8Array)
-    expect(Array.from(result)).toEqual([104, 101, 108, 108, 111]) // "hello"
-  })
-
-  it('converts - and _ characters correctly', () => {
-    // base64url uses - and _ instead of + and /
-    const base64standard = 'AB+/AA=='
-    const base64url = 'AB-_AA'
-    const fromStd = urlBase64ToUint8Array(base64standard)
-    const fromUrl = urlBase64ToUint8Array(base64url)
-    expect(Array.from(fromStd)).toEqual(Array.from(fromUrl))
-  })
-})
--- a/tests/lib/push-server.test.ts
+++ b/tests/lib/push-server.test.ts
@ -1,77 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-vi.mock('server-only', () => ({}))
-
-const { mockSendNotification } = vi.hoisted(() => ({
-  mockSendNotification: vi.fn(),
-}))
-
-vi.mock('web-push', () => ({
-  default: {
-    setVapidDetails: vi.fn(),
-    sendNotification: mockSendNotification,
-  },
-}))
-
-vi.hoisted(() => {
-  process.env.NEXT_PUBLIC_VAPID_PUBLIC_KEY = 'pk'
-  process.env.VAPID_PRIVATE_KEY = 'sk'
-  process.env.VAPID_SUBJECT = 'mailto:test@example.com'
-})
-
-const { mockPushSubscription } = vi.hoisted(() => ({
-  mockPushSubscription: {
-    findMany: vi.fn(),
-    update: vi.fn(),
-    delete: vi.fn(),
-  },
-}))
-vi.mock('@/lib/prisma', () => ({
-  prisma: { pushSubscription: mockPushSubscription },
-}))
-
-import { sendPushToUser } from '@/lib/push-server'
-
-const SUB = { id: 'sub-1', endpoint: 'https://push.example.com/1', p256dh: 'p256dh', auth: 'auth' }
-const PAYLOAD = { title: 'Test', body: 'Body', url: '/test' }
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mockPushSubscription.findMany.mockResolvedValue([SUB])
-  mockPushSubscription.update.mockResolvedValue(SUB)
-  mockPushSubscription.delete.mockResolvedValue(SUB)
-})
-
-describe('sendPushToUser', () => {
-  it('sends notification and updates last_used_at on success', async () => {
-    mockSendNotification.mockResolvedValue({ statusCode: 201 })
-    await sendPushToUser('user-1', PAYLOAD)
-    expect(mockSendNotification).toHaveBeenCalledOnce()
-    expect(mockPushSubscription.update).toHaveBeenCalledWith({
-      where: { id: SUB.id },
-      data: { last_used_at: expect.any(Date) },
-    })
-  })
-
-  it('deletes subscription on 410 (expired)', async () => {
-    mockSendNotification.mockRejectedValue({ statusCode: 410 })
-    await sendPushToUser('user-1', PAYLOAD)
-    expect(mockPushSubscription.delete).toHaveBeenCalledWith({ where: { id: SUB.id } })
-    expect(mockPushSubscription.update).not.toHaveBeenCalled()
-  })
-
-  it('deletes subscription on 404 (not found)', async () => {
-    mockSendNotification.mockRejectedValue({ statusCode: 404 })
-    await sendPushToUser('user-1', PAYLOAD)
-    expect(mockPushSubscription.delete).toHaveBeenCalledWith({ where: { id: SUB.id } })
-  })
-
-  it('logs error but does not delete on other error status', async () => {
-    const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-    mockSendNotification.mockRejectedValue({ statusCode: 500 })
-    await sendPushToUser('user-1', PAYLOAD)
-    expect(mockPushSubscription.delete).not.toHaveBeenCalled()
-    expect(consoleSpy).toHaveBeenCalled()
-    consoleSpy.mockRestore()
-  })
-})
--- a/tests/lib/rate-limit.test.ts
+++ b/tests/lib/rate-limit.test.ts
@ -1,64 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest'
-import { checkRateLimit, enforceUserRateLimit, _resetRateLimit } from '@/lib/rate-limit'
-
-beforeEach(() => {
-  _resetRateLimit()
-})
-
-describe('checkRateLimit (legacy auth-keys)', () => {
-  it('staat de eerste request toe', () => {
-    expect(checkRateLimit('login:1.2.3.4')).toBe(true)
-  })
-
-  it('blokkeert na exceeding max (login: 10/min)', () => {
-    for (let i = 0; i < 10; i++) checkRateLimit('login:1.2.3.4')
-    expect(checkRateLimit('login:1.2.3.4')).toBe(false)
-  })
-
-  it('register heeft eigen lagere limiet (5/uur)', () => {
-    for (let i = 0; i < 5; i++) checkRateLimit('register:9.9.9.9')
-    expect(checkRateLimit('register:9.9.9.9')).toBe(false)
-  })
-
-  it('verschillende keys hebben hun eigen counter', () => {
-    for (let i = 0; i < 10; i++) checkRateLimit('login:1.1.1.1')
-    expect(checkRateLimit('login:1.1.1.1')).toBe(false)
-    expect(checkRateLimit('login:2.2.2.2')).toBe(true)
-  })
-})
-
-describe('enforceUserRateLimit (v1-readiness #3 mutation-scopes)', () => {
-  it('returnt null bij eerste call', () => {
-    expect(enforceUserRateLimit('create-pbi', 'user-1')).toBeNull()
-  })
-
-  it('returnt 429-shape na exceeding limiet', () => {
-    // create-product limiet = 5/min
-    for (let i = 0; i < 5; i++) enforceUserRateLimit('create-product', 'user-1')
-    const result = enforceUserRateLimit('create-product', 'user-1')
-    expect(result).not.toBeNull()
-    expect(result?.code).toBe(429)
-    expect(result?.error).toContain('Te veel acties')
-  })
-
-  it('scope is per (action, user) — andere user heeft eigen quota', () => {
-    for (let i = 0; i < 5; i++) enforceUserRateLimit('create-product', 'user-A')
-    expect(enforceUserRateLimit('create-product', 'user-A')).not.toBeNull()
-    expect(enforceUserRateLimit('create-product', 'user-B')).toBeNull()
-  })
-
-  it('verschillende scopes voor dezelfde user vullen apart', () => {
-    for (let i = 0; i < 5; i++) enforceUserRateLimit('create-product', 'user-1')
-    expect(enforceUserRateLimit('create-product', 'user-1')).not.toBeNull()
-    // create-task heeft eigen counter
-    expect(enforceUserRateLimit('create-task', 'user-1')).toBeNull()
-  })
-
-  it('create-task limiet (100) is hoger dan create-pbi (30)', () => {
-    for (let i = 0; i < 30; i++) enforceUserRateLimit('create-pbi', 'u')
-    expect(enforceUserRateLimit('create-pbi', 'u')).not.toBeNull()
-    // create-task is nog niet hit
-    for (let i = 0; i < 30; i++) enforceUserRateLimit('create-task', 'u')
-    expect(enforceUserRateLimit('create-task', 'u')).toBeNull()
-  })
-})
--- a/tests/lib/sprint-conflicts.test.ts
+++ b/tests/lib/sprint-conflicts.test.ts
@ -1,275 +0,0 @@
-import { describe, it, expect, vi } from 'vitest'
-import type { StoryStatus } from '@prisma/client'
-
-import {
-  getBlockingSprintMap,
-  isEligibleForSprint,
-  partitionByEligibility,
-} from '@/lib/sprint-conflicts'
-
-function mockPrisma(stories: Array<Record<string, unknown>>) {
-  return {
-    story: {
-      findMany: vi.fn().mockResolvedValue(stories),
-    },
-  } as unknown as Parameters<typeof partitionByEligibility>[0]
-}
-
-describe('isEligibleForSprint', () => {
-  it('returns true for OPEN story without sprint', () => {
-    expect(
-      isEligibleForSprint({ sprint_id: null, status: 'OPEN' as StoryStatus }),
-    ).toBe(true)
-  })
-
-  it('returns true for IN_SPRINT story without sprint_id (edge: restoration)', () => {
-    expect(
-      isEligibleForSprint({
-        sprint_id: null,
-        status: 'IN_SPRINT' as StoryStatus,
-      }),
-    ).toBe(true)
-  })
-
-  it('returns false for DONE story without sprint', () => {
-    expect(
-      isEligibleForSprint({ sprint_id: null, status: 'DONE' as StoryStatus }),
-    ).toBe(false)
-  })
-
-  it('returns false when story is in an OPEN sprint', () => {
-    expect(
-      isEligibleForSprint({
-        sprint_id: 'abc',
-        status: 'IN_SPRINT' as StoryStatus,
-        sprint: { status: 'OPEN' },
-      }),
-    ).toBe(false)
-  })
-
-  it('returns false when story is DONE (sprint_id irrelevant)', () => {
-    expect(
-      isEligibleForSprint({
-        sprint_id: 'abc',
-        status: 'DONE' as StoryStatus,
-        sprint: { status: 'CLOSED' },
-      }),
-    ).toBe(false)
-  })
-
-  it('returns true when story is in a CLOSED sprint (released back to planning)', () => {
-    expect(
-      isEligibleForSprint({
-        sprint_id: 'abc',
-        status: 'IN_SPRINT' as StoryStatus,
-        sprint: { status: 'CLOSED' },
-      }),
-    ).toBe(true)
-  })
-
-  it('returns true when story is in an ARCHIVED sprint', () => {
-    expect(
-      isEligibleForSprint({
-        sprint_id: 'abc',
-        status: 'IN_SPRINT' as StoryStatus,
-        sprint: { status: 'ARCHIVED' },
-      }),
-    ).toBe(true)
-  })
-
-  it('returns true when story is in a FAILED sprint', () => {
-    expect(
-      isEligibleForSprint({
-        sprint_id: 'abc',
-        status: 'IN_SPRINT' as StoryStatus,
-        sprint: { status: 'FAILED' },
-      }),
-    ).toBe(true)
-  })
-
-  it('returns false when sprint_id is set but sprint relation is missing (defensive)', () => {
-    // Zonder sprint-data weten we niet of die OPEN is, dus blijven we
-    // conservatief — niet eligible.
-    expect(
-      isEligibleForSprint({
-        sprint_id: 'abc',
-        status: 'IN_SPRINT' as StoryStatus,
-      }),
-    ).toBe(false)
-  })
-})
-
-describe('partitionByEligibility', () => {
-  it('returns empty partition for empty input', async () => {
-    const prisma = mockPrisma([])
-    const result = await partitionByEligibility(prisma, [])
-    expect(result).toEqual({ eligible: [], notEligible: [], crossSprint: [] })
-  })
-
-  it('classifies all eligible when stories are free + OPEN', async () => {
-    const prisma = mockPrisma([
-      { id: 's1', sprint_id: null, status: 'OPEN', sprint: null },
-      { id: 's2', sprint_id: null, status: 'IN_SPRINT', sprint: null },
-    ])
-    const result = await partitionByEligibility(prisma, ['s1', 's2'])
-    expect(result.eligible).toEqual(['s1', 's2'])
-    expect(result.notEligible).toEqual([])
-    expect(result.crossSprint).toEqual([])
-  })
-
-  it('marks DONE stories as notEligible with reason=DONE', async () => {
-    const prisma = mockPrisma([
-      { id: 's1', sprint_id: null, status: 'DONE', sprint: null },
-    ])
-    const result = await partitionByEligibility(prisma, ['s1'])
-    expect(result.eligible).toEqual([])
-    expect(result.notEligible).toEqual([{ storyId: 's1', reason: 'DONE' }])
-  })
-
-  it('marks stories in other OPEN sprint as crossSprint + notEligible', async () => {
-    const prisma = mockPrisma([
-      {
-        id: 's1',
-        sprint_id: 'sprint-other',
-        status: 'IN_SPRINT',
-        sprint: { id: 'sprint-other', code: 'SP-2', status: 'OPEN' },
-      },
-    ])
-    const result = await partitionByEligibility(prisma, ['s1'])
-    expect(result.crossSprint).toEqual([
-      { storyId: 's1', sprintId: 'sprint-other', sprintName: 'SP-2' },
-    ])
-    expect(result.notEligible).toEqual([
-      { storyId: 's1', reason: 'IN_OTHER_SPRINT' },
-    ])
-    expect(result.eligible).toEqual([])
-  })
-
-  it('classifies story in CLOSED sprint with status=OPEN as eligible (status reset already happened)', async () => {
-    const prisma = mockPrisma([
-      {
-        id: 's1',
-        sprint_id: null,
-        status: 'OPEN',
-        sprint: null,
-      },
-    ])
-    const result = await partitionByEligibility(prisma, ['s1'])
-    expect(result.eligible).toEqual(['s1'])
-  })
-
-  it('frees stories from a CLOSED sprint — they become eligible again', async () => {
-    const prisma = mockPrisma([
-      {
-        id: 's1',
-        sprint_id: 'sprint-closed',
-        status: 'IN_SPRINT',
-        sprint: { id: 'sprint-closed', code: 'SP-C', status: 'CLOSED' },
-      },
-    ])
-    const result = await partitionByEligibility(prisma, ['s1'])
-    expect(result.eligible).toEqual(['s1'])
-    expect(result.crossSprint).toEqual([])
-    expect(result.notEligible).toEqual([])
-  })
-
-  it('frees stories from ARCHIVED and FAILED sprints', async () => {
-    const prisma = mockPrisma([
-      {
-        id: 's1',
-        sprint_id: 'sprint-arch',
-        status: 'IN_SPRINT',
-        sprint: { id: 'sprint-arch', code: 'SP-A', status: 'ARCHIVED' },
-      },
-      {
-        id: 's2',
-        sprint_id: 'sprint-fail',
-        status: 'IN_SPRINT',
-        sprint: { id: 'sprint-fail', code: 'SP-F', status: 'FAILED' },
-      },
-    ])
-    const result = await partitionByEligibility(prisma, ['s1', 's2'])
-    expect(result.eligible).toEqual(['s1', 's2'])
-    expect(result.notEligible).toEqual([])
-  })
-
-  it('a DONE story in a CLOSED sprint is notEligible because DONE (sprint inactive)', async () => {
-    // Volgorde: niet-actieve sprint blokkeert niet meer, dus de DONE-check
-    // bepaalt de reason. Vroeger werd dit 'IN_OTHER_SPRINT' — dat was misleidend
-    // omdat de sprint helemaal niet meer actief was.
-    const prisma = mockPrisma([
-      {
-        id: 's1',
-        sprint_id: 'sprint-closed',
-        status: 'DONE',
-        sprint: { id: 'sprint-closed', code: 'SP-C', status: 'CLOSED' },
-      },
-    ])
-    const result = await partitionByEligibility(prisma, ['s1'])
-    expect(result.crossSprint).toEqual([])
-    expect(result.notEligible).toEqual([{ storyId: 's1', reason: 'DONE' }])
-    expect(result.eligible).toEqual([])
-  })
-
-  it('respects excludeSprintId — story in same sprint is eligible', async () => {
-    const prisma = mockPrisma([
-      {
-        id: 's1',
-        sprint_id: 'sprint-active',
-        status: 'IN_SPRINT',
-        sprint: { id: 'sprint-active', code: 'SP-A', status: 'OPEN' },
-      },
-    ])
-    const result = await partitionByEligibility(prisma, ['s1'], 'sprint-active')
-    expect(result.eligible).toEqual(['s1'])
-    expect(result.crossSprint).toEqual([])
-  })
-})
-
-describe('getBlockingSprintMap', () => {
-  it('returns empty map for empty input', async () => {
-    const prisma = mockPrisma([])
-    const result = await getBlockingSprintMap(prisma, 'p1', [])
-    expect(result.size).toBe(0)
-  })
-
-  it('returns blocking sprint info for stories in OPEN sprints', async () => {
-    const prisma = mockPrisma([
-      {
-        id: 's1',
-        sprint_id: 'sprint-x',
-        sprint: { id: 'sprint-x', code: 'SP-X', status: 'OPEN' },
-      },
-    ])
-    const result = await getBlockingSprintMap(prisma, 'p1', ['s1'])
-    expect(result.get('s1')).toEqual({
-      sprintId: 'sprint-x',
-      sprintName: 'SP-X',
-    })
-  })
-
-  it('excludes the active sprint from blocking', async () => {
-    const prisma = mockPrisma([
-      {
-        id: 's1',
-        sprint_id: 'sprint-active',
-        sprint: { id: 'sprint-active', code: 'SP-A', status: 'OPEN' },
-      },
-    ])
-    const result = await getBlockingSprintMap(
-      prisma,
-      'p1',
-      ['s1'],
-      'sprint-active',
-    )
-    expect(result.size).toBe(0)
-  })
-
-  it('does not include CLOSED sprints (filtered at DB query level)', async () => {
-    // The prisma mock receives WHERE sprint.status='OPEN' so CLOSED stories
-    // are already filtered out before reaching this function's mapping logic.
-    const prisma = mockPrisma([])
-    const result = await getBlockingSprintMap(prisma, 'p1', ['s1'])
-    expect(result.size).toBe(0)
-  })
-})
--- a/tests/lib/task-status.test.ts
+++ b/tests/lib/task-status.test.ts
@ -78,8 +78,8 @@ describe('task-status mappers', () => {
      expect(pbiStatusFromApi('todo')).toBeNull()
    })

-    it('exposes alle vier API values', () => {
-      expect(PBI_STATUS_API_VALUES).toEqual(['ready', 'blocked', 'failed', 'done'])
+    it('exposes exactly three API values', () => {
+      expect(PBI_STATUS_API_VALUES).toEqual(['ready', 'blocked', 'done'])
    })
  })
 })
--- a/tests/lib/tasks-status-update.test.ts
+++ b/tests/lib/tasks-status-update.test.ts
@ -8,23 +8,6 @@ vi.mock('@/lib/prisma', () => ({
    },
    story: {
      findUniqueOrThrow: vi.fn(),
-      findMany: vi.fn(),
-      update: vi.fn(),
-    },
-    pbi: {
-      findUniqueOrThrow: vi.fn(),
-      update: vi.fn(),
-    },
-    sprint: {
-      findUniqueOrThrow: vi.fn(),
-      update: vi.fn(),
-    },
-    claudeJob: {
-      findFirst: vi.fn(),
-      updateMany: vi.fn(),
-    },
-    sprintRun: {
-      findUnique: vi.fn(),
      update: vi.fn(),
    },
    $transaction: vi.fn(),
@ -32,35 +15,27 @@ vi.mock('@/lib/prisma', () => ({
 }))

 import { prisma } from '@/lib/prisma'
-import { propagateStatusUpwards } from '@/lib/tasks-status-update'
+import { updateTaskStatusWithStoryPromotion } from '@/lib/tasks-status-update'

-type MockedPrisma = {
-  task: { update: ReturnType<typeof vi.fn>; findMany: ReturnType<typeof vi.fn> }
+const mockPrisma = prisma as unknown as {
+  task: {
+    update: ReturnType<typeof vi.fn>
+    findMany: ReturnType<typeof vi.fn>
+  }
  story: {
    findUniqueOrThrow: ReturnType<typeof vi.fn>
-    findMany: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
-  pbi: {
-    findUniqueOrThrow: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
-  sprint: {
-    findUniqueOrThrow: ReturnType<typeof vi.fn>
-    update: ReturnType<typeof vi.fn>
-  }
-  claudeJob: {
-    findFirst: ReturnType<typeof vi.fn>
-    updateMany: ReturnType<typeof vi.fn>
-  }
-  sprintRun: {
-    findUnique: ReturnType<typeof vi.fn>
    update: ReturnType<typeof vi.fn>
  }
  $transaction: ReturnType<typeof vi.fn>
 }

-const mockPrisma = prisma as unknown as MockedPrisma
+beforeEach(() => {
+  vi.clearAllMocks()
+  // Pass-through: $transaction(run) just calls run with the mocked prisma client.
+  mockPrisma.$transaction.mockImplementation(async (run: (tx: typeof prisma) => Promise<unknown>) => {
+    return run(prisma)
+  })
+})

 const TASK_BASE = {
  id: 'task-1',
@ -69,267 +44,110 @@ const TASK_BASE = {
  implementation_plan: null,
 }

-beforeEach(() => {
-  vi.clearAllMocks()
-  mockPrisma.$transaction.mockImplementation(
-    async (run: (tx: typeof prisma) => Promise<unknown>) => run(prisma),
-  )
-})
-
-describe('propagateStatusUpwards — story-niveau', () => {
-  it('zet story op DONE wanneer alle siblings DONE zijn', async () => {
+describe('updateTaskStatusWithStoryPromotion', () => {
+  it('promotes story to DONE when last sibling task transitions to DONE', async () => {
    mockPrisma.task.update.mockResolvedValue({ ...TASK_BASE, status: 'DONE' })
    mockPrisma.task.findMany.mockResolvedValue([
      { status: 'DONE' },
      { status: 'DONE' },
    ])
-    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({
-      id: 'story-1',
-      status: 'IN_SPRINT',
-      pbi_id: 'pbi-1',
-      sprint_id: null,
-    })
-    mockPrisma.pbi.findUniqueOrThrow.mockResolvedValue({ id: 'pbi-1', status: 'READY' })
-    mockPrisma.story.findMany.mockResolvedValue([{ status: 'DONE' }])
+    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({ status: 'IN_SPRINT' })

-    const result = await propagateStatusUpwards('task-1', 'DONE')
+    const result = await updateTaskStatusWithStoryPromotion('task-1', 'DONE')

-    expect(result.storyChanged).toBe(true)
+    expect(result.storyStatusChange).toBe('promoted')
+    expect(result.storyId).toBe('story-1')
    expect(mockPrisma.story.update).toHaveBeenCalledWith({
      where: { id: 'story-1' },
      data: { status: 'DONE' },
    })
  })

-  it('zet story op FAILED wanneer een task FAILED is, ongeacht andere tasks', async () => {
-    mockPrisma.task.update.mockResolvedValue({ ...TASK_BASE, status: 'FAILED' })
-    mockPrisma.task.findMany.mockResolvedValue([
-      { status: 'FAILED' },
-      { status: 'DONE' },
-      { status: 'TO_DO' },
-    ])
-    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({
-      id: 'story-1',
-      status: 'IN_SPRINT',
-      pbi_id: 'pbi-1',
-      sprint_id: null,
-    })
-    mockPrisma.pbi.findUniqueOrThrow.mockResolvedValue({ id: 'pbi-1', status: 'READY' })
-    mockPrisma.story.findMany.mockResolvedValue([{ status: 'FAILED' }])
-
-    const result = await propagateStatusUpwards('task-1', 'FAILED')
-
-    expect(result.storyChanged).toBe(true)
-    expect(mockPrisma.story.update).toHaveBeenCalledWith({
-      where: { id: 'story-1' },
-      data: { status: 'FAILED' },
-    })
-  })
-
-  it('houdt story op IN_SPRINT als nog niet alle tasks DONE en geen FAILED', async () => {
+  it('does not promote when story is already DONE (idempotent)', async () => {
    mockPrisma.task.update.mockResolvedValue({ ...TASK_BASE, status: 'DONE' })
-    mockPrisma.task.findMany.mockResolvedValue([
-      { status: 'DONE' },
-      { status: 'TO_DO' },
-    ])
-    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({
-      id: 'story-1',
-      status: 'IN_SPRINT',
-      pbi_id: 'pbi-1',
-      sprint_id: 'sprint-1',
-    })
-    mockPrisma.pbi.findUniqueOrThrow.mockResolvedValue({ id: 'pbi-1', status: 'READY' })
-    mockPrisma.story.findMany.mockImplementation(async (args: { where?: { pbi_id?: string; sprint_id?: string } }) => {
-      if (args.where?.pbi_id) return [{ status: 'IN_SPRINT' }]
-      if (args.where?.sprint_id) return [{ pbi_id: 'pbi-1' }]
-      return []
-    })
-    mockPrisma.sprint.findUniqueOrThrow.mockResolvedValue({ id: 'sprint-1', status: 'OPEN' })
-    ;(mockPrisma.pbi as unknown as { findMany: ReturnType<typeof vi.fn> }).findMany = vi.fn().mockResolvedValue([{ status: 'READY' }])
+    mockPrisma.task.findMany.mockResolvedValue([{ status: 'DONE' }])
+    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({ status: 'DONE' })

-    const result = await propagateStatusUpwards('task-1', 'DONE')
+    const result = await updateTaskStatusWithStoryPromotion('task-1', 'DONE')

-    expect(result.storyChanged).toBe(false)
+    expect(result.storyStatusChange).toBe(null)
    expect(mockPrisma.story.update).not.toHaveBeenCalled()
  })

-  it('demoot story uit DONE als een task terug naar TO_DO gaat', async () => {
-    mockPrisma.task.update.mockResolvedValue({ ...TASK_BASE, status: 'TO_DO' })
+  it('does not promote when not all siblings are DONE', async () => {
+    mockPrisma.task.update.mockResolvedValue({ ...TASK_BASE, status: 'DONE' })
    mockPrisma.task.findMany.mockResolvedValue([
-      { status: 'TO_DO' },
+      { status: 'DONE' },
+      { status: 'IN_PROGRESS' },
+    ])
+    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({ status: 'IN_SPRINT' })
+
+    const result = await updateTaskStatusWithStoryPromotion('task-1', 'DONE')
+
+    expect(result.storyStatusChange).toBe(null)
+    expect(mockPrisma.story.update).not.toHaveBeenCalled()
+  })
+
+  it('demotes story to IN_SPRINT when a task moves out of DONE on a DONE story', async () => {
+    mockPrisma.task.update.mockResolvedValue({ ...TASK_BASE, status: 'IN_PROGRESS' })
+    mockPrisma.task.findMany.mockResolvedValue([
+      { status: 'IN_PROGRESS' },
      { status: 'DONE' },
    ])
-    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({
-      id: 'story-1',
-      status: 'DONE',
-      pbi_id: 'pbi-1',
-      sprint_id: 'sprint-1',
-    })
-    mockPrisma.pbi.findUniqueOrThrow.mockResolvedValue({ id: 'pbi-1', status: 'DONE' })
-    mockPrisma.story.findMany.mockImplementation(async (args: { where?: { pbi_id?: string; sprint_id?: string } }) => {
-      if (args.where?.pbi_id) return [{ status: 'IN_SPRINT' }, { status: 'DONE' }]
-      if (args.where?.sprint_id) return [{ pbi_id: 'pbi-1' }]
-      return []
-    })
-    mockPrisma.sprint.findUniqueOrThrow.mockResolvedValue({ id: 'sprint-1', status: 'CLOSED' })
-    ;(mockPrisma.pbi as unknown as { findMany: ReturnType<typeof vi.fn> }).findMany = vi.fn().mockResolvedValue([{ status: 'READY' }])
+    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({ status: 'DONE' })

-    const result = await propagateStatusUpwards('task-1', 'TO_DO')
+    const result = await updateTaskStatusWithStoryPromotion('task-1', 'IN_PROGRESS')

-    expect(result.storyChanged).toBe(true)
+    expect(result.storyStatusChange).toBe('demoted')
    expect(mockPrisma.story.update).toHaveBeenCalledWith({
      where: { id: 'story-1' },
      data: { status: 'IN_SPRINT' },
    })
  })

-  it('zet story op OPEN als sprint_id null is en niet DONE/FAILED', async () => {
+  it('does not demote when story is not DONE', async () => {
    mockPrisma.task.update.mockResolvedValue({ ...TASK_BASE, status: 'IN_PROGRESS' })
    mockPrisma.task.findMany.mockResolvedValue([{ status: 'IN_PROGRESS' }])
-    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({
-      id: 'story-1',
-      status: 'IN_SPRINT',
-      pbi_id: 'pbi-1',
-      sprint_id: null,
-    })
-    mockPrisma.pbi.findUniqueOrThrow.mockResolvedValue({ id: 'pbi-1', status: 'READY' })
-    mockPrisma.story.findMany.mockResolvedValue([{ status: 'OPEN' }])
+    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({ status: 'IN_SPRINT' })

-    const result = await propagateStatusUpwards('task-1', 'IN_PROGRESS')
+    const result = await updateTaskStatusWithStoryPromotion('task-1', 'IN_PROGRESS')

-    expect(result.storyChanged).toBe(true)
-    expect(mockPrisma.story.update).toHaveBeenCalledWith({
-      where: { id: 'story-1' },
-      data: { status: 'OPEN' },
-    })
-  })
-})
-
-describe('propagateStatusUpwards — PBI BLOCKED met rust laten', () => {
-  it('overschrijft een handmatig BLOCKED PBI niet', async () => {
-    mockPrisma.task.update.mockResolvedValue({ ...TASK_BASE, status: 'DONE' })
-    mockPrisma.task.findMany.mockResolvedValue([{ status: 'DONE' }])
-    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({
-      id: 'story-1',
-      status: 'IN_SPRINT',
-      pbi_id: 'pbi-1',
-      sprint_id: null,
-    })
-    mockPrisma.pbi.findUniqueOrThrow.mockResolvedValue({ id: 'pbi-1', status: 'BLOCKED' })
-
-    const result = await propagateStatusUpwards('task-1', 'DONE')
-
-    expect(result.pbiChanged).toBe(false)
-    expect(mockPrisma.pbi.update).not.toHaveBeenCalled()
-  })
-})
-
-describe('propagateStatusUpwards — sprint cascade tot SprintRun', () => {
-  it('zet bij FAILED de hele keten op FAILED en cancelt sibling-jobs', async () => {
-    mockPrisma.task.update.mockResolvedValue({ ...TASK_BASE, status: 'FAILED' })
-    mockPrisma.task.findMany.mockResolvedValue([
-      { status: 'FAILED' },
-      { status: 'DONE' },
-    ])
-    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({
-      id: 'story-1',
-      status: 'IN_SPRINT',
-      pbi_id: 'pbi-1',
-      sprint_id: 'sprint-1',
-    })
-    mockPrisma.pbi.findUniqueOrThrow.mockResolvedValue({ id: 'pbi-1', status: 'READY' })
-    mockPrisma.story.findMany.mockImplementation(async (args: { where?: { pbi_id?: string; sprint_id?: string } }) => {
-      if (args.where?.pbi_id) return [{ status: 'FAILED' }]
-      if (args.where?.sprint_id) return [{ pbi_id: 'pbi-1' }]
-      return []
-    })
-    mockPrisma.sprint.findUniqueOrThrow.mockResolvedValue({ id: 'sprint-1', status: 'OPEN' })
-    // findMany on pbi:
-    ;(mockPrisma.pbi as unknown as { findMany: ReturnType<typeof vi.fn> }).findMany = vi.fn().mockResolvedValue([{ status: 'FAILED' }])
-    mockPrisma.claudeJob.findFirst.mockResolvedValue({ id: 'job-1', sprint_run_id: 'run-1' })
-    mockPrisma.sprintRun.findUnique.mockResolvedValue({ id: 'run-1', status: 'RUNNING' })
-
-    const result = await propagateStatusUpwards('task-1', 'FAILED')
-
-    expect(result.storyChanged).toBe(true)
-    expect(result.pbiChanged).toBe(true)
-    expect(result.sprintChanged).toBe(true)
-    expect(result.sprintRunChanged).toBe(true)
-
-    expect(mockPrisma.sprintRun.update).toHaveBeenCalledWith(expect.objectContaining({
-      where: { id: 'run-1' },
-      data: expect.objectContaining({ status: 'FAILED', failed_task_id: 'task-1' }),
-    }))
-    expect(mockPrisma.claudeJob.updateMany).toHaveBeenCalledWith(expect.objectContaining({
-      where: expect.objectContaining({
-        sprint_run_id: 'run-1',
-        status: { in: ['QUEUED', 'CLAIMED', 'RUNNING'] },
-        id: { not: 'job-1' },
-      }),
-      data: expect.objectContaining({ status: 'CANCELLED' }),
-    }))
+    expect(result.storyStatusChange).toBe(null)
+    expect(mockPrisma.story.update).not.toHaveBeenCalled()
  })

-  it('zet bij alle DONE de SprintRun op DONE en Sprint op COMPLETED', async () => {
-    mockPrisma.task.update.mockResolvedValue({ ...TASK_BASE, status: 'DONE' })
-    mockPrisma.task.findMany.mockResolvedValue([{ status: 'DONE' }])
-    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({
-      id: 'story-1',
-      status: 'IN_SPRINT',
-      pbi_id: 'pbi-1',
-      sprint_id: 'sprint-1',
-    })
-    mockPrisma.pbi.findUniqueOrThrow.mockResolvedValue({ id: 'pbi-1', status: 'READY' })
-    mockPrisma.story.findMany.mockImplementation(async (args: { where?: { pbi_id?: string; sprint_id?: string } }) => {
-      if (args.where?.pbi_id) return [{ status: 'DONE' }]
-      if (args.where?.sprint_id) return [{ pbi_id: 'pbi-1' }]
-      return []
-    })
-    mockPrisma.sprint.findUniqueOrThrow.mockResolvedValue({ id: 'sprint-1', status: 'OPEN' })
-    ;(mockPrisma.pbi as unknown as { findMany: ReturnType<typeof vi.fn> }).findMany = vi.fn().mockResolvedValue([{ status: 'DONE' }])
-    mockPrisma.claudeJob.findFirst.mockResolvedValue({ id: 'job-1', sprint_run_id: 'run-1' })
-    mockPrisma.sprintRun.findUnique.mockResolvedValue({ id: 'run-1', status: 'RUNNING' })
+  it('updates the task regardless of story-status change', async () => {
+    mockPrisma.task.update.mockResolvedValue({ ...TASK_BASE, status: 'IN_PROGRESS' })
+    mockPrisma.task.findMany.mockResolvedValue([{ status: 'IN_PROGRESS' }])
+    mockPrisma.story.findUniqueOrThrow.mockResolvedValue({ status: 'IN_SPRINT' })

-    const result = await propagateStatusUpwards('task-1', 'DONE')
+    await updateTaskStatusWithStoryPromotion('task-1', 'IN_PROGRESS')

-    expect(result.sprintRunChanged).toBe(true)
-    expect(mockPrisma.sprint.update).toHaveBeenCalledWith(expect.objectContaining({
-      where: { id: 'sprint-1' },
-      data: expect.objectContaining({ status: 'CLOSED' }),
-    }))
-    expect(mockPrisma.sprintRun.update).toHaveBeenCalledWith(expect.objectContaining({
-      where: { id: 'run-1' },
-      data: expect.objectContaining({ status: 'DONE' }),
-    }))
+    expect(mockPrisma.task.update).toHaveBeenCalledWith({
+      where: { id: 'task-1' },
+      data: { status: 'IN_PROGRESS' },
+      select: expect.any(Object),
+    })
  })
-})

-describe('propagateStatusUpwards — transactionele aanroep', () => {
-  it('gebruikt de meegegeven transaction client', async () => {
+  it('uses the provided transaction client when passed', async () => {
    const tx = {
      task: { update: vi.fn(), findMany: vi.fn() },
-      story: { findUniqueOrThrow: vi.fn(), findMany: vi.fn(), update: vi.fn() },
-      pbi: { findUniqueOrThrow: vi.fn(), findMany: vi.fn(), update: vi.fn() },
-      sprint: { findUniqueOrThrow: vi.fn(), update: vi.fn() },
-      claudeJob: { findFirst: vi.fn(), updateMany: vi.fn() },
-      sprintRun: { findUnique: vi.fn(), update: vi.fn() },
+      story: { findUniqueOrThrow: vi.fn(), update: vi.fn() },
    }
-    tx.task.update.mockResolvedValue({ ...TASK_BASE, status: 'IN_PROGRESS' })
-    tx.task.findMany.mockResolvedValue([{ status: 'IN_PROGRESS' }])
-    tx.story.findUniqueOrThrow.mockResolvedValue({
-      id: 'story-1',
-      status: 'OPEN',
-      pbi_id: 'pbi-1',
-      sprint_id: null,
-    })
-    tx.pbi.findUniqueOrThrow.mockResolvedValue({ id: 'pbi-1', status: 'READY' })
-    tx.story.findMany.mockResolvedValue([{ status: 'OPEN' }])
+    tx.task.update.mockResolvedValue({ ...TASK_BASE, status: 'DONE' })
+    tx.task.findMany.mockResolvedValue([{ status: 'DONE' }])
+    tx.story.findUniqueOrThrow.mockResolvedValue({ status: 'IN_SPRINT' })

    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const result = await propagateStatusUpwards('task-1', 'IN_PROGRESS', tx as any)
+    const result = await updateTaskStatusWithStoryPromotion('task-1', 'DONE', tx as any)

-    expect(result.storyChanged).toBe(false)
-    // $transaction wordt niet aangeroepen wanneer caller al een tx meegeeft.
+    expect(result.storyStatusChange).toBe('promoted')
+    // $transaction should NOT be called when caller already provides a tx.
    expect(mockPrisma.$transaction).not.toHaveBeenCalled()
+    expect(tx.story.update).toHaveBeenCalledWith({
+      where: { id: 'story-1' },
+      data: { status: 'DONE' },
+    })
  })
 })
--- a/tests/lib/user-agent.test.ts
+++ b/tests/lib/user-agent.test.ts
@ -1,37 +0,0 @@
-import { describe, it, expect } from 'vitest'
-import { isPhoneUA } from '@/lib/user-agent'
-
-describe('isPhoneUA', () => {
-  it('iPhone Safari Mobile → true', () => {
-    const ua = 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4 Mobile/15E148 Safari/604.1'
-    expect(isPhoneUA(ua)).toBe(true)
-  })
-
-  it('Android Chrome (phone) → true', () => {
-    const ua = 'Mozilla/5.0 (Linux; Android 14; Pixel 7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Mobile Safari/537.36'
-    expect(isPhoneUA(ua)).toBe(true)
-  })
-
-  it('iPad → false (geen Mobi)', () => {
-    const ua = 'Mozilla/5.0 (iPad; CPU OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4 Safari/604.1'
-    expect(isPhoneUA(ua)).toBe(false)
-  })
-
-  it('Android tablet (Galaxy Tab) → false', () => {
-    const ua = 'Mozilla/5.0 (Linux; Android 14; SM-X910) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36'
-    expect(isPhoneUA(ua)).toBe(false)
-  })
-
-  it('Desktop Chrome → false', () => {
-    const ua = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36'
-    expect(isPhoneUA(ua)).toBe(false)
-  })
-
-  it('null → false', () => {
-    expect(isPhoneUA(null)).toBe(false)
-  })
-
-  it('lege string → false', () => {
-    expect(isPhoneUA('')).toBe(false)
-  })
-})
--- a/tests/lib/user-settings-migration.test.ts
+++ b/tests/lib/user-settings-migration.test.ts
@ -1,147 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-
-import {
-  buildMigrationPatch,
-  clearLegacyStorage,
-} from '@/lib/user-settings-migration'
-
-function clearAllCookies() {
-  for (const part of document.cookie.split(';')) {
-    const eq = part.indexOf('=')
-    const name = (eq < 0 ? part : part.slice(0, eq)).trim()
-    if (name) document.cookie = `${name}=; max-age=0; path=/`
-  }
-}
-
-beforeEach(() => {
-  localStorage.clear()
-  clearAllCookies()
-})
-
-afterEach(() => {
-  localStorage.clear()
-  clearAllCookies()
-})
-
-describe('buildMigrationPatch', () => {
-  it('returns no data when nothing is stored', () => {
-    const result = buildMigrationPatch()
-    expect(result.hasData).toBe(false)
-    expect(result.patch).toEqual({})
-    expect(result.legacyKeys).toEqual([])
-  })
-
-  it('skips after marker is set to current version', () => {
-    localStorage.setItem('scrum4me:sprint_pb_filter_status', 'all')
-    localStorage.setItem('scrum4me:settings_migrated', 'v2')
-    const result = buildMigrationPatch()
-    expect(result.hasData).toBe(false)
-  })
-
-  it('still runs when only the v1 marker is set (re-migration)', () => {
-    localStorage.setItem('scrum4me:sprint_pb_filter_status', 'all')
-    localStorage.setItem('scrum4me:settings_migrated', 'v1')
-    const result = buildMigrationPatch()
-    expect(result.hasData).toBe(true)
-  })
-
-  it('extracts split-pane cookies into layout', () => {
-    document.cookie = `sp:backlog-p1=${encodeURIComponent(JSON.stringify([25, 35, 40]))}; path=/`
-    const result = buildMigrationPatch()
-    expect(result.patch.layout?.splitPanePositions).toEqual({ 'backlog-p1': [25, 35, 40] })
-    expect(result.legacyCookies).toContain('sp:backlog-p1')
-  })
-
-  it('ignores split-pane cookies that do not sum to 100', () => {
-    document.cookie = `sp:bad=${encodeURIComponent(JSON.stringify([10, 20]))}; path=/`
-    const result = buildMigrationPatch()
-    expect(result.patch.layout).toBeUndefined()
-  })
-
-  it('extracts active-sprint cookies into layout.activeSprints', () => {
-    document.cookie = `active_sprint_prod-1=sprint-abc; path=/`
-    document.cookie = `active_sprint_prod-2=sprint-xyz; path=/`
-    const result = buildMigrationPatch()
-    expect(result.patch.layout?.activeSprints).toEqual({
-      'prod-1': 'sprint-abc',
-      'prod-2': 'sprint-xyz',
-    })
-    expect(result.legacyCookies).toContain('active_sprint_prod-1')
-  })
-
-  it('extracts sprint backlog prefs into nested patch', () => {
-    localStorage.setItem('scrum4me:sprint_pb_filter_status', 'all')
-    localStorage.setItem('scrum4me:sprint_pb_sort', 'priority')
-    localStorage.setItem('scrum4me:sprint_pb_sort_dir', 'desc')
-    localStorage.setItem('scrum4me:sprint_pb_collapsed', JSON.stringify(['pbi-1', 'pbi-2']))
-    localStorage.setItem('scrum4me:sprint_pb_filter_popover_open', 'true')
-
-    const result = buildMigrationPatch()
-
-    expect(result.hasData).toBe(true)
-    expect(result.patch.views?.sprintBacklog).toEqual({
-      filterStatus: 'all',
-      sort: 'priority',
-      sortDir: 'desc',
-      collapsedPbis: ['pbi-1', 'pbi-2'],
-      filterPopoverOpen: true,
-    })
-    expect(result.legacyKeys).toContain('scrum4me:sprint_pb_filter_status')
-    expect(result.legacyKeys).toContain('scrum4me:sprint_pb_collapsed')
-  })
-
-  it('extracts pbi-list prefs', () => {
-    localStorage.setItem('scrum4me:pbi_sort', 'date')
-    localStorage.setItem('scrum4me:pbi_filter_priority', '2')
-
-    const result = buildMigrationPatch()
-    expect(result.patch.views?.pbiList).toEqual({ sort: 'date', filterPriority: 2 })
-  })
-
-  it('extracts story_sort', () => {
-    localStorage.setItem('scrum4me:story_sort', 'code')
-    const result = buildMigrationPatch()
-    expect(result.patch.views?.storyPanel).toEqual({ sort: 'code' })
-  })
-
-  it('extracts debug-mode', () => {
-    localStorage.setItem('scrum4me:debug-mode', 'true')
-    const result = buildMigrationPatch()
-    expect(result.patch.devTools).toEqual({ debugMode: true })
-  })
-
-  it('extracts jobs-column dynamic prefixes from CSV values', () => {
-    localStorage.setItem('queue_filter_kind', 'TASK_IMPLEMENTATION,SPRINT_IMPLEMENTATION')
-    localStorage.setItem('queue_filter_status', 'queued,running')
-
-    const result = buildMigrationPatch()
-    expect(result.patch.views?.jobsColumns?.['queue']).toEqual({
-      kinds: ['TASK_IMPLEMENTATION', 'SPRINT_IMPLEMENTATION'],
-      statuses: ['queued', 'running'],
-    })
-  })
-
-  it('ignores invalid enum values', () => {
-    localStorage.setItem('scrum4me:sprint_pb_filter_status', 'BOGUS')
-    const result = buildMigrationPatch()
-    expect(result.hasData).toBe(false)
-  })
-})
-
-describe('clearLegacyStorage', () => {
-  it('removes given keys and cookies and sets the v2 marker', () => {
-    localStorage.setItem('scrum4me:sprint_pb_sort', 'code')
-    document.cookie = 'sp:x=foo; path=/'
-
-    clearLegacyStorage(['scrum4me:sprint_pb_sort'], ['sp:x'])
-
-    expect(localStorage.getItem('scrum4me:sprint_pb_sort')).toBeNull()
-    expect(document.cookie).not.toContain('sp:x=foo')
-    expect(localStorage.getItem('scrum4me:settings_migrated')).toBe('v2')
-  })
-
-  it('sets marker even with empty lists (no-op migration)', () => {
-    clearLegacyStorage([], [])
-    expect(localStorage.getItem('scrum4me:settings_migrated')).toBe('v2')
-  })
-})
--- a/tests/lib/user-settings.test.ts
+++ b/tests/lib/user-settings.test.ts
@ -1,209 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import {
-  DEFAULT_USER_SETTINGS,
-  UserSettingsSchema,
-  mergeSettings,
-  parseUserSettings,
-  type UserSettings,
-} from '@/lib/user-settings'
-
-describe('mergeSettings', () => {
-  it('returns the patch when previous is empty', () => {
-    const result = mergeSettings({}, { views: { sprintBacklog: { sort: 'code' } } })
-    expect(result).toEqual({ views: { sprintBacklog: { sort: 'code' } } })
-  })
-
-  it('preserves existing keys when patch only sets new ones', () => {
-    const prev: UserSettings = { views: { sprintBacklog: { sort: 'code' } } }
-    const result = mergeSettings(prev, {
-      views: { pbiList: { sort: 'date' } },
-    })
-    expect(result).toEqual({
-      views: {
-        sprintBacklog: { sort: 'code' },
-        pbiList: { sort: 'date' },
-      },
-    })
-  })
-
-  it('merges nested objects without overwriting siblings', () => {
-    const prev: UserSettings = {
-      views: { sprintBacklog: { sort: 'code', sortDir: 'asc' } },
-    }
-    const result = mergeSettings(prev, {
-      views: { sprintBacklog: { sort: 'priority' } },
-    })
-    expect(result).toEqual({
-      views: { sprintBacklog: { sort: 'priority', sortDir: 'asc' } },
-    })
-  })
-
-  it('replaces arrays instead of appending', () => {
-    const prev: UserSettings = {
-      views: { sprintBacklog: { collapsedPbis: ['a', 'b'] } },
-    }
-    const result = mergeSettings(prev, {
-      views: { sprintBacklog: { collapsedPbis: ['c'] } },
-    })
-    expect(result.views?.sprintBacklog?.collapsedPbis).toEqual(['c'])
-  })
-
-  it('does not mutate the previous object', () => {
-    const prev: UserSettings = { views: { sprintBacklog: { sort: 'code' } } }
-    const snapshot = JSON.parse(JSON.stringify(prev))
-    mergeSettings(prev, { views: { sprintBacklog: { sortDir: 'desc' } } })
-    expect(prev).toEqual(snapshot)
-  })
-
-  it('skips undefined values in the patch', () => {
-    const prev: UserSettings = { views: { sprintBacklog: { sort: 'code' } } }
-    const result = mergeSettings(prev, { views: undefined })
-    expect(result).toEqual(prev)
-  })
-})
-
-describe('parseUserSettings', () => {
-  it('returns defaults for null', () => {
-    expect(parseUserSettings(null)).toEqual(DEFAULT_USER_SETTINGS)
-  })
-
-  it('returns defaults for undefined', () => {
-    expect(parseUserSettings(undefined)).toEqual(DEFAULT_USER_SETTINGS)
-  })
-
-  it('returns defaults for invalid input', () => {
-    expect(parseUserSettings({ views: { sprintBacklog: { filterStatus: 'BOGUS' } } }))
-      .toEqual(DEFAULT_USER_SETTINGS)
-  })
-
-  it('passes valid settings through', () => {
-    const valid = { views: { sprintBacklog: { sort: 'code' as const } } }
-    expect(parseUserSettings(valid)).toEqual(valid)
-  })
-})
-
-describe('UserSettingsSchema', () => {
-  it('rejects unknown top-level keys', () => {
-    const result = UserSettingsSchema.safeParse({ unknown: 1 })
-    expect(result.success).toBe(false)
-  })
-
-  it('accepts an empty object', () => {
-    expect(UserSettingsSchema.safeParse({}).success).toBe(true)
-  })
-
-  it('accepts the full shape', () => {
-    const result = UserSettingsSchema.safeParse({
-      views: {
-        sprintBacklog: {
-          filterPriority: 1,
-          filterStatus: 'OPEN',
-          sort: 'code',
-          sortDir: 'asc',
-          collapsedPbis: ['x'],
-          filterPopoverOpen: true,
-        },
-        pbiList: { sort: 'priority', filterPriority: 'all', filterStatus: 'ready', sortDir: 'desc' },
-        storyPanel: { sort: 'date' },
-        jobsColumns: { 'queue:active': { kinds: ['TASK_IMPLEMENTATION'], statuses: [] } },
-        jobs: { timeFilter: '24h' },
-        ideasList: { filterStatuses: ['draft', 'planned'] },
-      },
-      devTools: { debugMode: true },
-      layout: {
-        splitPanePositions: { 'backlog-pid': [25, 35, 40] },
-        activeSprints: { 'product-1': 'sprint-1' },
-      },
-    })
-    expect(result.success).toBe(true)
-  })
-
-  it('accepts views.jobs.timeFilter and returns it via parseUserSettings', () => {
-    const input = { views: { jobs: { timeFilter: '1h' as const } } }
-    const result = parseUserSettings(input)
-    expect(result).toEqual(input)
-  })
-
-  it('rejects an invalid views.jobs.timeFilter value', () => {
-    const result = UserSettingsSchema.safeParse({ views: { jobs: { timeFilter: 'BOGUS' } } })
-    expect(result.success).toBe(false)
-  })
-
-  it('accepts layout-only settings', () => {
-    expect(UserSettingsSchema.safeParse({
-      layout: { splitPanePositions: { x: [50, 50] }, activeSprints: { p: 's' } },
-    }).success).toBe(true)
-  })
-
-  it('accepts null values in activeSprints (explicit "no active sprint")', () => {
-    const result = UserSettingsSchema.safeParse({
-      layout: { activeSprints: { 'product-1': null, 'product-2': 'sprint-2' } },
-    })
-    expect(result.success).toBe(true)
-    if (result.success) {
-      expect(result.data.layout?.activeSprints).toEqual({
-        'product-1': null,
-        'product-2': 'sprint-2',
-      })
-    }
-  })
-
-  it('accepts pendingSprintDraft with per-PBI intent and overrides', () => {
-    const result = UserSettingsSchema.safeParse({
-      workflow: {
-        pendingSprintDraft: {
-          'product-1': {
-            goal: 'Sprint goal',
-            pbiIntent: { pbiA: 'all', pbiB: 'none' },
-            storyOverrides: {
-              pbiA: { add: [], remove: ['story-1'] },
-              pbiB: { add: ['story-2'], remove: [] },
-            },
-          },
-        },
-      },
-    })
-    expect(result.success).toBe(true)
-  })
-
-  it('fills empty defaults for pbiIntent and storyOverrides in draft', () => {
-    const result = UserSettingsSchema.safeParse({
-      workflow: { pendingSprintDraft: { 'product-1': { goal: 'g' } } },
-    })
-    expect(result.success).toBe(true)
-    if (result.success) {
-      const draft = result.data.workflow?.pendingSprintDraft?.['product-1']
-      expect(draft?.pbiIntent).toEqual({})
-      expect(draft?.storyOverrides).toEqual({})
-    }
-  })
-
-  it('rejects pendingSprintDraft with empty goal', () => {
-    const result = UserSettingsSchema.safeParse({
-      workflow: { pendingSprintDraft: { 'p': { goal: '' } } },
-    })
-    expect(result.success).toBe(false)
-  })
-
-  it('rejects an invalid ideasList.filterStatuses value', () => {
-    const result = UserSettingsSchema.safeParse({ views: { ideasList: { filterStatuses: ['BOGUS'] } } })
-    expect(result.success).toBe(false)
-  })
-
-  it('accepts an empty ideasList.filterStatuses array', () => {
-    const result = UserSettingsSchema.safeParse({ views: { ideasList: { filterStatuses: [] } } })
-    expect(result.success).toBe(true)
-  })
-
-  it('rejects unknown intent value', () => {
-    const result = UserSettingsSchema.safeParse({
-      workflow: {
-        pendingSprintDraft: {
-          p: { goal: 'x', pbiIntent: { a: 'partial' } },
-        },
-      },
-    })
-    expect(result.success).toBe(false)
-  })
-})
--- a/tests/proxy/demo-guard.test.ts
+++ b/tests/proxy/demo-guard.test.ts
@ -30,26 +30,6 @@ beforeEach(() => {
 })

 describe('proxy demo-guard', () => {
-  it('demo + POST /api/ideas → 403 (M12)', async () => {
-    mockUnsealData.mockResolvedValue({ userId: 'demo-user', isDemo: true })
-    const req = makeRequest('POST', '/api/ideas', true)
-    const res = await proxy(req)
-    expect(res?.status).toBe(403)
-  })
-
-  it('demo + PATCH /api/ideas/abc → 403 (M12)', async () => {
-    mockUnsealData.mockResolvedValue({ userId: 'demo-user', isDemo: true })
-    const req = makeRequest('PATCH', '/api/ideas/abc', true)
-    const res = await proxy(req)
-    expect(res?.status).toBe(403)
-  })
-
-  it('demo + GET /api/ideas → passthrough (M12)', async () => {
-    const req = makeRequest('GET', '/api/ideas', true)
-    const res = await proxy(req)
-    expect(res?.status).not.toBe(403)
-  })
-
  it('demo + POST /api/todos → 403', async () => {
    mockUnsealData.mockResolvedValue({ userId: 'demo-user', isDemo: true })
    const req = makeRequest('POST', '/api/todos', true)
--- a/tests/realtime/payload-contract.test.ts
+++ b/tests/realtime/payload-contract.test.ts
@ -0,0 +1,160 @@
+import { describe, it, expect, beforeEach } from 'vitest'
+import { useBacklogStore } from '@/stores/backlog-store'
+import type { BacklogPbi, BacklogStory, BacklogTask } from '@/stores/backlog-store'
+
+const PBI: BacklogPbi = {
+  id: 'pbi-1',
+  code: 'PBI-1',
+  title: 'Realtime PBI',
+  priority: 2,
+  description: 'desc',
+  created_at: new Date('2024-01-01T00:00:00Z'),
+  status: 'ready',
+}
+
+const STORY: BacklogStory = {
+  id: 'story-1',
+  code: 'ST-1',
+  title: 'Realtime story',
+  description: null,
+  acceptance_criteria: null,
+  priority: 2,
+  status: 'OPEN',
+  pbi_id: 'pbi-1',
+  created_at: new Date('2024-01-01T00:00:00Z'),
+}
+
+const TASK: BacklogTask = {
+  id: 'task-1',
+  title: 'Realtime task',
+  description: null,
+  priority: 2,
+  status: 'TO_DO',
+  sort_order: 1,
+  story_id: 'story-1',
+  created_at: new Date('2024-01-01T00:00:00Z'),
+}
+
+beforeEach(() => {
+  useBacklogStore.setState({ pbis: [], storiesByPbi: {}, tasksByStory: {} })
+})
+
+// ---------------------------------------------------------------------------
+// PBI
+// ---------------------------------------------------------------------------
+
+describe('PBI payload contract', () => {
+  it('INSERT: entity appears in pbis with correct title and status', () => {
+    useBacklogStore.getState().applyChange('pbi', 'I', { ...PBI })
+    const state = useBacklogStore.getState()
+    expect(state.pbis).toHaveLength(1)
+    expect(state.pbis[0].id).toBe('pbi-1')
+    expect(state.pbis[0].title).toBe('Realtime PBI')
+    expect(state.pbis[0].status).toBe('ready')
+  })
+
+  it('INSERT is idempotent: duplicate SSE-event does not add a second entry', () => {
+    useBacklogStore.getState().applyChange('pbi', 'I', { ...PBI })
+    useBacklogStore.getState().applyChange('pbi', 'I', { ...PBI })
+    expect(useBacklogStore.getState().pbis).toHaveLength(1)
+  })
+
+  it('UPDATE: changed_fields partial merges into existing entity', () => {
+    useBacklogStore.setState({ pbis: [{ ...PBI }], storiesByPbi: {}, tasksByStory: {} })
+    useBacklogStore.getState().applyChange('pbi', 'U', { id: 'pbi-1', title: 'Updated PBI', status: 'in_sprint' as const })
+    const pbi = useBacklogStore.getState().pbis[0]
+    expect(pbi.title).toBe('Updated PBI')
+    expect(pbi.status).toBe('in_sprint')
+    expect(pbi.priority).toBe(2) // unchanged field retained
+  })
+
+  it('DELETE: entity is removed from pbis', () => {
+    useBacklogStore.setState({ pbis: [{ ...PBI }], storiesByPbi: {}, tasksByStory: {} })
+    useBacklogStore.getState().applyChange('pbi', 'D', { id: 'pbi-1' })
+    expect(useBacklogStore.getState().pbis).toHaveLength(0)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Story
+// ---------------------------------------------------------------------------
+
+describe('Story payload contract', () => {
+  it('INSERT: entity appears in storiesByPbi[pbi_id] with correct title and status', () => {
+    useBacklogStore.setState({ pbis: [], storiesByPbi: { 'pbi-1': [] }, tasksByStory: {} })
+    useBacklogStore.getState().applyChange('story', 'I', { ...STORY })
+    const bucket = useBacklogStore.getState().storiesByPbi['pbi-1']
+    expect(bucket).toHaveLength(1)
+    expect(bucket[0].id).toBe('story-1')
+    expect(bucket[0].title).toBe('Realtime story')
+    expect(bucket[0].status).toBe('OPEN')
+  })
+
+  it('INSERT: creates bucket when pbi_id was not yet in storiesByPbi', () => {
+    useBacklogStore.getState().applyChange('story', 'I', { ...STORY })
+    expect(useBacklogStore.getState().storiesByPbi['pbi-1']).toHaveLength(1)
+  })
+
+  it('INSERT is idempotent: duplicate SSE-event does not add a second entry', () => {
+    useBacklogStore.getState().applyChange('story', 'I', { ...STORY })
+    useBacklogStore.getState().applyChange('story', 'I', { ...STORY })
+    expect(useBacklogStore.getState().storiesByPbi['pbi-1']).toHaveLength(1)
+  })
+
+  it('UPDATE: changed_fields partial merges into existing story', () => {
+    useBacklogStore.setState({ pbis: [], storiesByPbi: { 'pbi-1': [{ ...STORY }] }, tasksByStory: {} })
+    useBacklogStore.getState().applyChange('story', 'U', { id: 'story-1', title: 'Updated story', status: 'IN_SPRINT' })
+    const story = useBacklogStore.getState().storiesByPbi['pbi-1'][0]
+    expect(story.title).toBe('Updated story')
+    expect(story.status).toBe('IN_SPRINT')
+    expect(story.priority).toBe(2) // unchanged field retained
+  })
+
+  it('DELETE: entity is removed from its pbi bucket', () => {
+    useBacklogStore.setState({ pbis: [], storiesByPbi: { 'pbi-1': [{ ...STORY }] }, tasksByStory: {} })
+    useBacklogStore.getState().applyChange('story', 'D', { id: 'story-1' })
+    expect(useBacklogStore.getState().storiesByPbi['pbi-1']).toHaveLength(0)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Task
+// ---------------------------------------------------------------------------
+
+describe('Task payload contract', () => {
+  it('INSERT: entity appears in tasksByStory[story_id] with correct title and status', () => {
+    useBacklogStore.setState({ pbis: [], storiesByPbi: {}, tasksByStory: { 'story-1': [] } })
+    useBacklogStore.getState().applyChange('task', 'I', { ...TASK })
+    const bucket = useBacklogStore.getState().tasksByStory['story-1']
+    expect(bucket).toHaveLength(1)
+    expect(bucket[0].id).toBe('task-1')
+    expect(bucket[0].title).toBe('Realtime task')
+    expect(bucket[0].status).toBe('TO_DO')
+  })
+
+  it('INSERT: creates bucket when story_id was not yet in tasksByStory', () => {
+    useBacklogStore.getState().applyChange('task', 'I', { ...TASK })
+    expect(useBacklogStore.getState().tasksByStory['story-1']).toHaveLength(1)
+  })
+
+  it('INSERT is idempotent: duplicate SSE-event does not add a second entry', () => {
+    useBacklogStore.getState().applyChange('task', 'I', { ...TASK })
+    useBacklogStore.getState().applyChange('task', 'I', { ...TASK })
+    expect(useBacklogStore.getState().tasksByStory['story-1']).toHaveLength(1)
+  })
+
+  it('UPDATE: changed_fields partial merges into existing task', () => {
+    useBacklogStore.setState({ pbis: [], storiesByPbi: {}, tasksByStory: { 'story-1': [{ ...TASK }] } })
+    useBacklogStore.getState().applyChange('task', 'U', { id: 'task-1', title: 'Updated task', status: 'IN_PROGRESS' })
+    const task = useBacklogStore.getState().tasksByStory['story-1'][0]
+    expect(task.title).toBe('Updated task')
+    expect(task.status).toBe('IN_PROGRESS')
+    expect(task.sort_order).toBe(1) // unchanged field retained
+  })
+
+  it('DELETE: entity is removed from its story bucket', () => {
+    useBacklogStore.setState({ pbis: [], storiesByPbi: {}, tasksByStory: { 'story-1': [{ ...TASK }] } })
+    useBacklogStore.getState().applyChange('task', 'D', { id: 'task-1' })
+    expect(useBacklogStore.getState().tasksByStory['story-1']).toHaveLength(0)
+  })
+})
--- a/tests/realtime/use-workspace-resync.test.tsx
+++ b/tests/realtime/use-workspace-resync.test.tsx
@ -1,69 +0,0 @@
-// @vitest-environment jsdom
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { renderHook } from '@testing-library/react'
-
-import { useProductWorkspaceStore } from '@/stores/product-workspace/store'
-import { useWorkspaceResync } from '@/lib/realtime/use-workspace-resync'
-
-let resyncSpy: ReturnType<typeof vi.fn>
-
-beforeEach(() => {
-  resyncSpy = vi.fn().mockResolvedValue(undefined)
-  useProductWorkspaceStore.setState((s) => {
-    s.resyncActiveScopes = resyncSpy as unknown as typeof s.resyncActiveScopes
-  })
-  // visibilitychange handler leest document.visibilityState — default is 'visible'
-  Object.defineProperty(document, 'visibilityState', {
-    value: 'visible',
-    writable: true,
-    configurable: true,
-  })
-})
-
-afterEach(() => {
-  vi.restoreAllMocks()
-})
-
-describe('useWorkspaceResync', () => {
-  it('triggert resyncActiveScopes("visible") op visibilitychange hidden→visible', () => {
-    renderHook(() => useWorkspaceResync())
-
-    Object.defineProperty(document, 'visibilityState', {
-      value: 'visible',
-      writable: true,
-      configurable: true,
-    })
-    document.dispatchEvent(new Event('visibilitychange'))
-
-    expect(resyncSpy).toHaveBeenCalledWith('visible')
-  })
-
-  it('triggert resyncActiveScopes("reconnect") op online-event', () => {
-    renderHook(() => useWorkspaceResync())
-    window.dispatchEvent(new Event('online'))
-    expect(resyncSpy).toHaveBeenCalledWith('reconnect')
-  })
-
-  it('triggert geen resync bij visibilitychange naar hidden', () => {
-    renderHook(() => useWorkspaceResync())
-
-    Object.defineProperty(document, 'visibilityState', {
-      value: 'hidden',
-      writable: true,
-      configurable: true,
-    })
-    document.dispatchEvent(new Event('visibilitychange'))
-
-    expect(resyncSpy).not.toHaveBeenCalled()
-  })
-
-  it('cleanup verwijdert listeners bij unmount', () => {
-    const { unmount } = renderHook(() => useWorkspaceResync())
-    unmount()
-
-    window.dispatchEvent(new Event('online'))
-    document.dispatchEvent(new Event('visibilitychange'))
-
-    expect(resyncSpy).not.toHaveBeenCalled()
-  })
-})
--- a/tests/review-plan-job.test.ts
+++ b/tests/review-plan-job.test.ts
@ -1,212 +0,0 @@
-import { describe, it, expect } from 'vitest'
-
-/**
- * Review-Plan Job Tests
- *
- * Tests for the IDEA_REVIEW_PLAN job kind and review-log schema validation.
- */
-
-// Sample review-log structure for testing
-const sampleReviewLog = {
-  plan_file: 'I-042',
-  created_at: new Date().toISOString(),
-  rounds: [
-    {
-      round: 0,
-      model: 'claude-3-5-haiku',
-      role: 'Structure Review',
-      focus: 'YAML parsing, format, syntax',
-      plan_before: '---\npbi:\n  title: "Test PBI"\nstories:\n  - title: "Story 1"\n---',
-      plan_after:
-        '---\npbi:\n  title: "Test PBI"\nstories:\n  - title: "Story 1"\n    priority: 2\n---',
-      issues: [
-        {
-          category: 'structure',
-          severity: 'warning',
-          suggestion: 'Add priority field to story',
-        },
-      ],
-      score: 75,
-      plan_diff_lines: 1,
-      converged: false,
-      timestamp: new Date().toISOString(),
-    },
-    {
-      round: 1,
-      model: 'claude-3-5-sonnet',
-      role: 'Logic & Patterns',
-      focus: 'Logic gaps, missing patterns, architecture fit',
-      plan_before: '---\npbi:\n  title: "Test PBI"\nstories:\n  - title: "Story 1"\n---',
-      plan_after: '---\npbi:\n  title: "Test PBI"\nstories:\n  - title: "Story 1"\n---',
-      issues: [
-        {
-          category: 'logic',
-          severity: 'info',
-          suggestion: 'Consider adding acceptance criteria',
-        },
-      ],
-      score: 80,
-      plan_diff_lines: 0,
-      converged: false,
-      timestamp: new Date().toISOString(),
-    },
-    {
-      round: 2,
-      model: 'claude-opus-4-7',
-      role: 'Risk Assessment',
-      focus: 'Risk assessment, edge cases, refactoring',
-      plan_before: '---\npbi:\n  title: "Test PBI"\nstories:\n  - title: "Story 1"\n---',
-      plan_after: '---\npbi:\n  title: "Test PBI"\nstories:\n  - title: "Story 1"\n---',
-      issues: [],
-      score: 85,
-      plan_diff_lines: 0,
-      converged: true,
-      timestamp: new Date().toISOString(),
-    },
-  ],
-  convergence: {
-    stable_at_round: 2,
-    final_diff_pct: 0.5,
-    convergence_metric: 'plan_stability',
-  },
-  approval: {
-    status: 'approved',
-    timestamp: new Date().toISOString(),
-  },
-  summary: 'Plan reviewed across three rounds. Minor structure improvements suggested. Plan approved.',
-}
-
-describe('review-plan-job', () => {
-  describe('ReviewLog Schema', () => {
-    it('should have required top-level fields', () => {
-      expect(sampleReviewLog).toHaveProperty('plan_file')
-      expect(sampleReviewLog).toHaveProperty('created_at')
-      expect(sampleReviewLog).toHaveProperty('rounds')
-      expect(sampleReviewLog).toHaveProperty('convergence')
-      expect(sampleReviewLog).toHaveProperty('approval')
-      expect(sampleReviewLog).toHaveProperty('summary')
-    })
-
-    it('should have valid plan_file format', () => {
-      expect(typeof sampleReviewLog.plan_file).toBe('string')
-      expect(sampleReviewLog.plan_file.length).toBeGreaterThan(0)
-    })
-
-    it('should have valid ISO timestamps', () => {
-      const isoRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/
-      expect(sampleReviewLog.created_at).toMatch(isoRegex)
-      expect(sampleReviewLog.approval.timestamp).toMatch(isoRegex)
-    })
-
-    it('should have at least one round', () => {
-      expect(sampleReviewLog.rounds.length).toBeGreaterThan(0)
-    })
-
-    it('should have valid round structure', () => {
-      for (const round of sampleReviewLog.rounds) {
-        expect(round).toHaveProperty('round')
-        expect(round).toHaveProperty('model')
-        expect(round).toHaveProperty('role')
-        expect(round).toHaveProperty('focus')
-        expect(round).toHaveProperty('plan_before')
-        expect(round).toHaveProperty('plan_after')
-        expect(round).toHaveProperty('issues')
-        expect(round).toHaveProperty('score')
-        expect(round).toHaveProperty('plan_diff_lines')
-        expect(round).toHaveProperty('converged')
-        expect(round).toHaveProperty('timestamp')
-
-        expect(typeof round.round).toBe('number')
-        expect(round.round).toBeGreaterThanOrEqual(0)
-        expect(typeof round.score).toBe('number')
-        expect(round.score).toBeGreaterThanOrEqual(0)
-        expect(round.score).toBeLessThanOrEqual(100)
-        expect(typeof round.plan_diff_lines).toBe('number')
-        expect(round.plan_diff_lines).toBeGreaterThanOrEqual(0)
-      }
-    })
-
-    it('should have valid issue structure per round', () => {
-      for (const round of sampleReviewLog.rounds) {
-        for (const issue of round.issues) {
-          expect(issue).toHaveProperty('category')
-          expect(issue).toHaveProperty('severity')
-          expect(issue).toHaveProperty('suggestion')
-
-          expect(['structure', 'logic', 'risk', 'pattern']).toContain(issue.category)
-          expect(['error', 'warning', 'info']).toContain(issue.severity)
-          expect(typeof issue.suggestion).toBe('string')
-          expect(issue.suggestion.length).toBeGreaterThan(0)
-        }
-      }
-    })
-
-    it('should have valid convergence structure when present', () => {
-      if (sampleReviewLog.convergence) {
-        expect(sampleReviewLog.convergence).toHaveProperty('stable_at_round')
-        expect(sampleReviewLog.convergence).toHaveProperty('final_diff_pct')
-        expect(sampleReviewLog.convergence).toHaveProperty('convergence_metric')
-
-        expect(typeof sampleReviewLog.convergence.stable_at_round).toBe('number')
-        expect(sampleReviewLog.convergence.stable_at_round).toBeGreaterThanOrEqual(0)
-        expect(typeof sampleReviewLog.convergence.final_diff_pct).toBe('number')
-        expect(sampleReviewLog.convergence.final_diff_pct).toBeGreaterThanOrEqual(0)
-        expect(sampleReviewLog.convergence.final_diff_pct).toBeLessThanOrEqual(100)
-      }
-    })
-
-    it('should have valid approval status', () => {
-      expect(['pending', 'approved', 'rejected']).toContain(sampleReviewLog.approval.status)
-      if (sampleReviewLog.approval.status !== 'pending') {
-        expect(sampleReviewLog.approval.timestamp).toBeDefined()
-      }
-    })
-
-    it('should have non-empty summary', () => {
-      expect(typeof sampleReviewLog.summary).toBe('string')
-      expect(sampleReviewLog.summary.length).toBeGreaterThan(0)
-    })
-  })
-
-  describe('Convergence Detection', () => {
-    it('should detect convergence when diff_pct < 5% for two consecutive rounds', () => {
-      // Simulate convergence: round 0 has 1 diff line, rounds 1-2 have 0 diffs
-      const totalLines = 50
-      const diff0 = 1
-      const diff1 = 0
-      const diff2 = 0
-
-      const pct0 = (diff0 / totalLines) * 100 // 2%
-      const pct1 = (diff1 / totalLines) * 100 // 0%
-      const pct2 = (diff2 / totalLines) * 100 // 0%
-
-      expect(pct0).toBeLessThan(5) // Should converge
-      expect(pct1).toBeLessThan(5) // Should converge
-      expect(pct2).toBeLessThan(5) // Should converge
-    })
-
-    it('should not detect convergence when diff_pct >= 5%', () => {
-      const totalLines = 50
-      const diff = 3 // 6% change
-
-      const pct = (diff / totalLines) * 100
-      expect(pct).toBeGreaterThanOrEqual(5)
-    })
-  })
-
-  describe('Status Transitions', () => {
-    it('should transition REVIEWING_PLAN → PLAN_REVIEWED when approved', () => {
-      const log = { ...sampleReviewLog, approval: { status: 'approved', timestamp: new Date().toISOString() } }
-      expect(log.approval.status).toBe('approved')
-      // In actual implementation: update_idea_plan_reviewed({ approval_status: 'approved' })
-      // → idea.status = 'PLAN_REVIEWED'
-    })
-
-    it('should transition REVIEWING_PLAN → PLAN_REVIEW_FAILED when rejected', () => {
-      const log = { ...sampleReviewLog, approval: { status: 'rejected' } }
-      expect(log.approval.status).toBe('rejected')
-      // In actual implementation: update_idea_plan_reviewed({ approval_status: 'rejected' })
-      // → idea.status = 'PLAN_REVIEW_FAILED'
-    })
-  })
-})
--- a/tests/stores/idea-store.test.ts
+++ b/tests/stores/idea-store.test.ts
@ -1,145 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest'
-
-import { useIdeaStore } from '@/stores/idea-store'
-
-beforeEach(() => {
-  // Reset store between tests — Zustand persists state across tests otherwise.
-  useIdeaStore.setState({
-    jobByIdea: {},
-    ideaStatuses: {},
-    openQuestionsByIdea: {},
-  })
-})
-
-describe('useIdeaStore — handleIdeaJobEvent', () => {
-  it('queued IDEA_GRILL → ideaStatuses[id] = grilling', () => {
-    useIdeaStore.getState().handleIdeaJobEvent({
-      type: 'claude_job_enqueued',
-      job_id: 'job-1',
-      idea_id: 'idea-1',
-      user_id: 'u-1',
-      kind: 'IDEA_GRILL',
-      status: 'queued',
-    })
-    const s = useIdeaStore.getState()
-    expect(s.jobByIdea['idea-1']?.status).toBe('queued')
-    expect(s.ideaStatuses['idea-1']).toBe('grilling')
-  })
-
-  it('failed IDEA_GRILL → ideaStatuses[id] = grill_failed', () => {
-    useIdeaStore.getState().handleIdeaJobEvent({
-      type: 'claude_job_status',
-      job_id: 'job-1',
-      idea_id: 'idea-1',
-      user_id: 'u-1',
-      kind: 'IDEA_GRILL',
-      status: 'failed',
-      error: 'oops',
-    })
-    expect(useIdeaStore.getState().ideaStatuses['idea-1']).toBe('grill_failed')
-    expect(useIdeaStore.getState().jobByIdea['idea-1']?.error).toBe('oops')
-  })
-
-  it('failed IDEA_MAKE_PLAN → plan_failed', () => {
-    useIdeaStore.getState().handleIdeaJobEvent({
-      type: 'claude_job_status',
-      job_id: 'job-2',
-      idea_id: 'idea-2',
-      user_id: 'u-1',
-      kind: 'IDEA_MAKE_PLAN',
-      status: 'failed',
-    })
-    expect(useIdeaStore.getState().ideaStatuses['idea-2']).toBe('plan_failed')
-  })
-
-  it('done does NOT auto-derive status (server is source-of-truth)', () => {
-    useIdeaStore.getState().setIdeaStatus('idea-3', 'grilled')
-    useIdeaStore.getState().handleIdeaJobEvent({
-      type: 'claude_job_status',
-      job_id: 'job-3',
-      idea_id: 'idea-3',
-      user_id: 'u-1',
-      kind: 'IDEA_GRILL',
-      status: 'done',
-    })
-    expect(useIdeaStore.getState().ideaStatuses['idea-3']).toBe('grilled')
-  })
-})
-
-describe('useIdeaStore — handleIdeaQuestionEvent', () => {
-  it('non-open status removes question from list', () => {
-    useIdeaStore.getState().initQuestions('idea-1', [
-      {
-        id: 'q-1',
-        idea_id: 'idea-1',
-        question: 'Q',
-        options: null,
-        status: 'open',
-        created_at: '',
-        expires_at: '',
-      },
-    ])
-    useIdeaStore.getState().handleIdeaQuestionEvent({
-      op: 'U',
-      entity: 'question',
-      id: 'q-1',
-      product_id: 'p-1',
-      story_id: null,
-      idea_id: 'idea-1',
-      status: 'answered',
-    })
-    expect(useIdeaStore.getState().openQuestionsByIdea['idea-1']).toEqual([])
-  })
-
-  it('open status keeps existing list (no detail in payload)', () => {
-    const q = {
-      id: 'q-1',
-      idea_id: 'idea-1',
-      question: 'Q',
-      options: null,
-      status: 'open' as const,
-      created_at: '',
-      expires_at: '',
-    }
-    useIdeaStore.getState().initQuestions('idea-1', [q])
-    useIdeaStore.getState().handleIdeaQuestionEvent({
-      op: 'I',
-      entity: 'question',
-      id: 'q-2',
-      product_id: 'p-1',
-      story_id: null,
-      idea_id: 'idea-1',
-      status: 'open',
-    })
-    // List length blijft 1 (server-fetch leveert de detail)
-    expect(useIdeaStore.getState().openQuestionsByIdea['idea-1']).toHaveLength(1)
-  })
-})
-
-describe('useIdeaStore — clearForIdea', () => {
-  it('removes job + status + questions for one idea, leaves others', () => {
-    const s = useIdeaStore.getState()
-    s.setJobStatus({
-      job_id: 'j-1',
-      idea_id: 'idea-1',
-      kind: 'IDEA_GRILL',
-      status: 'running',
-    })
-    s.setJobStatus({
-      job_id: 'j-2',
-      idea_id: 'idea-2',
-      kind: 'IDEA_GRILL',
-      status: 'running',
-    })
-    s.setIdeaStatus('idea-1', 'grilling')
-    s.setIdeaStatus('idea-2', 'grilling')
-
-    s.clearForIdea('idea-1')
-
-    const after = useIdeaStore.getState()
-    expect(after.jobByIdea['idea-1']).toBeUndefined()
-    expect(after.jobByIdea['idea-2']).toBeDefined()
-    expect(after.ideaStatuses['idea-1']).toBeUndefined()
-    expect(after.ideaStatuses['idea-2']).toBe('grilling')
-  })
-})
--- a/tests/stores/product-workspace/restore.test.ts
+++ b/tests/stores/product-workspace/restore.test.ts
@ -1,117 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import {
-  clearHints,
-  readHints,
-  writePbiHint,
-  writeProductHint,
-  writeStoryHint,
-  writeTaskHint,
-} from '@/stores/product-workspace/restore'
-
-describe('readHints', () => {
-  it('retourneert lege defaults wanneer localStorage leeg is', () => {
-    const hints = readHints()
-    expect(hints.lastActiveProductId).toBeNull()
-    expect(hints.perProduct).toEqual({})
-  })
-
-  it('herstelt hints uit localStorage', () => {
-    localStorage.setItem(
-      'product-workspace-hints',
-      JSON.stringify({
-        lastActiveProductId: 'p1',
-        perProduct: { p1: { lastActivePbiId: 'pbi-1' } },
-      }),
-    )
-    const hints = readHints()
-    expect(hints.lastActiveProductId).toBe('p1')
-    expect(hints.perProduct.p1.lastActivePbiId).toBe('pbi-1')
-  })
-
-  it('valt terug op defaults bij ongeldige JSON', () => {
-    localStorage.setItem('product-workspace-hints', '{not-json')
-    const hints = readHints()
-    expect(hints.lastActiveProductId).toBeNull()
-    expect(hints.perProduct).toEqual({})
-  })
-
-  it('valt terug op defaults bij verkeerde shape', () => {
-    localStorage.setItem('product-workspace-hints', '"just a string"')
-    const hints = readHints()
-    expect(hints.perProduct).toEqual({})
-  })
-})
-
-describe('writeProductHint', () => {
-  it('schrijft lastActiveProductId', () => {
-    writeProductHint('p1')
-    expect(readHints().lastActiveProductId).toBe('p1')
-  })
-
-  it('overschrijft bestaande waarde', () => {
-    writeProductHint('p1')
-    writeProductHint('p2')
-    expect(readHints().lastActiveProductId).toBe('p2')
-  })
-
-  it('accepteert null om hint te wissen', () => {
-    writeProductHint('p1')
-    writeProductHint(null)
-    expect(readHints().lastActiveProductId).toBeNull()
-  })
-})
-
-describe('writePbiHint', () => {
-  it('schrijft lastActivePbiId per productId', () => {
-    writePbiHint('prod-1', 'pbi-a')
-    writePbiHint('prod-2', 'pbi-b')
-    const hints = readHints()
-    expect(hints.perProduct['prod-1'].lastActivePbiId).toBe('pbi-a')
-    expect(hints.perProduct['prod-2'].lastActivePbiId).toBe('pbi-b')
-  })
-
-  it('null wist child story- en task-hints', () => {
-    writePbiHint('prod-1', 'pbi-1')
-    writeStoryHint('prod-1', 's-1')
-    writeTaskHint('prod-1', 't-1')
-    writePbiHint('prod-1', null)
-    const hints = readHints()
-    expect(hints.perProduct['prod-1'].lastActivePbiId).toBeNull()
-    expect(hints.perProduct['prod-1'].lastActiveStoryId).toBeNull()
-    expect(hints.perProduct['prod-1'].lastActiveTaskId).toBeNull()
-  })
-})
-
-describe('writeStoryHint', () => {
-  it('schrijft lastActiveStoryId per productId', () => {
-    writeStoryHint('prod-1', 's-1')
-    expect(readHints().perProduct['prod-1'].lastActiveStoryId).toBe('s-1')
-  })
-
-  it('null wist child task-hint', () => {
-    writeStoryHint('prod-1', 's-1')
-    writeTaskHint('prod-1', 't-1')
-    writeStoryHint('prod-1', null)
-    expect(readHints().perProduct['prod-1'].lastActiveStoryId).toBeNull()
-    expect(readHints().perProduct['prod-1'].lastActiveTaskId).toBeNull()
-  })
-})
-
-describe('writeTaskHint', () => {
-  it('schrijft lastActiveTaskId per productId', () => {
-    writeTaskHint('prod-1', 't-1')
-    expect(readHints().perProduct['prod-1'].lastActiveTaskId).toBe('t-1')
-  })
-})
-
-describe('clearHints', () => {
-  it('verwijdert alle hints', () => {
-    writeProductHint('p1')
-    writePbiHint('p1', 'pbi-1')
-    clearHints()
-    const hints = readHints()
-    expect(hints.lastActiveProductId).toBeNull()
-    expect(hints.perProduct).toEqual({})
-  })
-})
--- a/tests/stores/product-workspace/screen-state.test.ts
+++ b/tests/stores/product-workspace/screen-state.test.ts
@ -1,83 +0,0 @@
-import { describe, it, expect } from 'vitest'
-import {
-  deriveScreenState,
-  type ScreenStateInput,
-} from '@/stores/product-workspace/screen-state'
-
-const base: ScreenStateInput = {
-  activeSprintItem: null,
-  buildingSprintIds: [],
-  hasPendingDraft: false,
-  pendingAdds: [],
-  pendingRemoves: [],
-}
-
-describe('deriveScreenState', () => {
-  it('returns NO_SPRINT without draft or active sprint', () => {
-    expect(deriveScreenState(base)).toEqual({ kind: 'NO_SPRINT' })
-  })
-
-  it('returns DRAFT when a pending draft exists', () => {
-    expect(deriveScreenState({ ...base, hasPendingDraft: true })).toEqual({
-      kind: 'DRAFT',
-    })
-  })
-
-  it('lets a draft win over an active sprint with pending changes', () => {
-    expect(
-      deriveScreenState({
-        ...base,
-        hasPendingDraft: true,
-        activeSprintItem: { id: 's1' },
-        pendingAdds: ['x'],
-      }),
-    ).toEqual({ kind: 'DRAFT' })
-  })
-
-  it('returns ACTIVE for an active sprint with no pending changes', () => {
-    expect(
-      deriveScreenState({ ...base, activeSprintItem: { id: 's1' } }),
-    ).toEqual({ kind: 'ACTIVE', building: false })
-  })
-
-  it('flags building when the active sprint is in buildingSprintIds', () => {
-    expect(
-      deriveScreenState({
-        ...base,
-        activeSprintItem: { id: 's1' },
-        buildingSprintIds: ['s1'],
-      }),
-    ).toEqual({ kind: 'ACTIVE', building: true })
-  })
-
-  it('returns EDITING when there are pending adds', () => {
-    expect(
-      deriveScreenState({
-        ...base,
-        activeSprintItem: { id: 's1' },
-        pendingAdds: ['x'],
-      }),
-    ).toEqual({ kind: 'EDITING', building: false })
-  })
-
-  it('returns EDITING when there are pending removes', () => {
-    expect(
-      deriveScreenState({
-        ...base,
-        activeSprintItem: { id: 's1' },
-        pendingRemoves: ['y'],
-      }),
-    ).toEqual({ kind: 'EDITING', building: false })
-  })
-
-  it('flags building on EDITING when the active sprint is building', () => {
-    expect(
-      deriveScreenState({
-        ...base,
-        activeSprintItem: { id: 's1' },
-        pendingAdds: ['x'],
-        buildingSprintIds: ['s1'],
-      }),
-    ).toEqual({ kind: 'EDITING', building: true })
-  })
-})
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
Scrum4Me Agent	e92278f9ee	test(solo): uitgebreide batch-preflight tests met 2 PBI's en 4 taken Nieuw claude-jobs-batch.test.ts: 10 gevallen voor previewEnqueueAllAction (PBI-volgorde, REVIEW/BLOCKED-detectie, active-job-skip met blockerIndex-shift) en enqueueClaudeJobsBatchAction (happy path, IDOR, active-job-skip, demo).	2026-05-03 13:48:35 +02:00
Scrum4Me Agent	94b99198ed	feat(solo): preview-then-confirm flow in SoloBoard Voer-alle-uit Vervang directe enqueueAllTodoJobsAction door previewEnqueueAllAction + BatchEnqueueBlockerDialog. Geen blocker → enqueueClaudeJobsBatchAction direct. Wel blocker → dialog met prefix-enqueue of annuleer. Loading-state op knop tijdens preview en confirm. 5 integratie-tests.	2026-05-03 13:44:13 +02:00
Scrum4Me Agent	80a7d793b6	feat(solo): BatchEnqueueBlockerDialog component Nieuw dialoogvenster dat gebruiker waarschuwt bij gedetecteerde blocker: toont blockerReason in NL, prefixCount taken vóór blokkade, confirm-knop (disabled met tooltip bij count=0) en annuleer-knop. 7 tests voor rendering, click-handlers en disabled-state.	2026-05-03 13:38:41 +02:00
Scrum4Me Agent	3ca842ff80	feat(solo): enqueueClaudeJobsBatchAction met IDOR-check Voeg enqueueClaudeJobsBatchAction toe: accepteert expliciete taskIds[], verifieert dat alle IDs bij de ingelogde gebruiker horen (IDOR-preventie), slaat taken met actieve jobs over (idempotent), en maakt jobs aan in transactie in opgegeven volgorde. 6 nieuwe tests.	2026-05-03 13:33:51 +02:00
Scrum4Me Agent	8018920cae	feat(solo): previewEnqueueAllAction met blocker-detectie Voeg previewEnqueueAllAction toe aan actions/claude-jobs.ts: haalt taken op in PBI-volgorde, filtert actieve jobs, detecteert eerste blocker (REVIEW taak of BLOCKED PBI). Retourneert tasks[], blockerIndex en blockerReason. Tests: 7 nieuwe cases voor alle blocker-scenario's en demo-blokkering.	2026-05-03 13:29:48 +02:00
Scrum4Me Agent	41e7654374	feat(solo): orderBy taken per PBI-hiërarchie Voeg pbi.priority en pbi.sort_order toe aan de task.findMany orderBy in de solo-page query zodat taken per PBI gegroepeerd worden vóór story- en task-volgorde.	2026-05-03 13:24:51 +02:00