diff --git a/.github/workflows/ci-test-build.yml b/.github/workflows/ci-test-build.yml
new file mode 100644
index 0000000..a0975f0
--- /dev/null
+++ b/.github/workflows/ci-test-build.yml
@@ -0,0 +1,34 @@
+name: ci-test-build
+
+on:
+  pull_request:
+
+jobs:
+  test-and-build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24
+
+      - name: Enable Corepack
+        run: corepack enable
+  
+      - name: Setup Yarn
+        run: corepack prepare yarn@4.6.0 --activate
+        
+      - name: Install dependencies
+        working-directory: dashboard
+        run: yarn install --immutable
+
+      - name: Run tests
+        working-directory: dashboard
+        run: yarn test
+
+      - name: Build dashboard
+        working-directory: dashboard
+        run: yarn build
diff --git a/.gitignore b/.gitignore
index bedace5..d7d2a04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,8 @@ dashboard/.yarn/install-state.gz
 # Package lock (using Yarn, not npm)
 dashboard/package-lock.json
 
-# Runtime state (generated by the server)
+# Runtime state (generated by the server; keep legacy path ignored during migration)
+.dispatch/runtime/
 .hub-runtime/
 
 # Job progress files (runtime artifacts, project-specific)
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 0000000..1cc6dd0
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,13 @@
+# Dispatch Agent Notes
+
+See `CLAUDE.md` for the full project guide.
+
+## Important config rule
+
+Dispatch loads configuration from:
+1. `config.local.json` when present
+2. otherwise `config.json`
+
+In this checkout, **`config.local.json` is the effective source of truth** for repo paths and file locations.
+
+Do not assume `config.json` reflects the active local repo set.
diff --git a/CLAUDE.md b/CLAUDE.md
index c8660e7..60bd137 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -6,7 +6,7 @@ A multi-repo coordination hub for Claude Code agent workflows. Aggregates tasks,
 
 ## Repos
 
-Defined in `config.json` (source of truth for all repo paths). Edit this to point to your repos.
+Defined in `config.local.json` when present, otherwise `config.json`. In this checkout, `config.local.json` is the effective source of truth for repo paths. Edit that first.
 
 | Field | Description |
 |-------|-------------|
@@ -41,20 +41,21 @@ config.json ─── loadConfig() ───┐
 
 ## Key Files
 
-- **config.json** -- Repo definitions. `hubRoot` (display path) and `monthlyBudget` (optional) are user-specific; set `hubRoot` to your local hub path (e.g. `.` for current dir). Server falls back to `HUB_DIR` env var when `hubRoot` is unset.
+- **config.local.json** -- Effective local repo definitions for this checkout. Dispatch loads this first when present.
+- **config.json** -- Fallback/shared repo definitions when `config.local.json` is absent. `hubRoot` (display path) and `monthlyBudget` (optional) are user-specific; set `hubRoot` to your local hub path (e.g. `.` for current dir). Server falls back to `HUB_DIR` env var when `hubRoot` is unset.
 - **parsers.js** -- CommonJS module. Primary job APIs: `parseJobFile`, `parseJobDir`, `writeJobValidation`, `writeJobKill`, `writeJobStatus`. Also owns task/activity parsing, task writes, and checkpoint helpers. Zero external dependencies.
 - **cli.js** -- Agent-friendly CLI. All output is JSON to stdout, errors as JSON to stderr. Commands: `status`, `tasks [--repo=name]`, `swarm [id]`, `repos`, `activity [--limit=N]`, `config`.
 - **terminal.js** -- Human-friendly ANSI terminal dashboard. Read-only display, no interactivity. Uses box-drawing characters.
 - **todo.md** -- Hub's own task tracker (markdown checkboxes).
 - **activity-log.md** -- Hub's own activity log. Contains `**Current stage:**` metadata.
 - **notes/jobs/** -- Job progress files (gitignored — runtime artifacts). Named `YYYY-MM-DD-slug.md`.
-- **.hub-runtime/** -- Server runtime state (gitignored): `.hub-runtime/job-runs.json` for job run state, `.hub-runtime/prompts/` for staged Claude prompts, `.hub-runtime/events/` for terminal event snapshots/NDJSON.
+- **.dispatch/runtime/** -- Server runtime state (gitignored): `.dispatch/runtime/job-runs.json` for job run state, `.dispatch/runtime/prompts/` for staged Claude prompts, `.dispatch/runtime/events/` for terminal event snapshots/NDJSON.
 
 ### Dashboard (`dashboard/`)
 
 Separate Node.js project with its own `package.json` (ESM, `"type": "module"`).
 
-- **server.js** -- Express backend on port 3747. Imports `../parsers.js` via `createRequire`. REST API for overview, tasks, bugs, jobs (`/api/jobs`), sessions, schedules, checkpoints, and events. WebSocket terminal server (`/ws/terminal`) keeps PTY sessions alive across reconnects, stages server-managed Claude launches/resumes, persists run state in `.hub-runtime/job-runs.json`.
+- **server.js** -- Express backend on port 3747. Imports `../parsers.js` via `createRequire`. REST API for overview, tasks, bugs, jobs (`/api/jobs`), sessions, schedules, checkpoints, and events. WebSocket terminal server (`/ws/terminal`) keeps PTY sessions alive across reconnects, stages server-managed Claude launches/resumes, persists run state in `.dispatch/runtime/job-runs.json`.
 - **eventPipeline.js** -- Captures terminal output into structured NDJSON events. Line classification, agent detection, event search, session summaries.
 - **src/** -- React SPA with Tailwind CSS v4. Navigation: `ActivityBar` (icon tabs) → views (`StatusView`, `JobsView`, `AllTasksView`, `DispatchView`, `SchedulesView`) with `JobDetailView` drill-down. Hooks: `usePolling`, `useSessionStore`, `useTerminal`, `useSearch`.
 - **vite.config.js** -- Proxies `/api` and `/ws` to `localhost:3747` during dev.
@@ -109,7 +110,7 @@ yarn start           # Serve built SPA + API from port 3747
 
 ## Rules
 
-1. **`config.json` is the source of truth** for repo paths and file locations. Do not hardcode repo paths elsewhere.
+1. **`config.local.json` is the source of truth when present; otherwise use `config.json`** for repo paths and file locations. In this repo, prefer `config.local.json`. Do not hardcode repo paths elsewhere.
 2. **`parsers.js` is shared infrastructure.** Test changes against all three consumers (cli.js, terminal.js, dashboard/server.js) before committing.
 3. **Job progress files** go in `notes/jobs/YYYY-MM-DD-slug.md` with the standard format (see Conventions above).
 4. **All repos use the same task/activity pattern**: `todo.md` for tasks, `activity-log.md` for activity.
diff --git a/activity-log.md b/activity-log.md
index 692303e..44d4e75 100644
--- a/activity-log.md
+++ b/activity-log.md
@@ -2,6 +2,32 @@
 
 **Current stage:** Getting started
 
+## 2026-04-07
+
+- **Use the correct logo for Pi https://camo.githubusercontent.com/8b5a446dcbd5bea234898b8584e5484099dc0a939d8e59e542b7f5f23b259217/68747470733a2f2f736869747479636f64696e676167656e742e61692f6c6f676f2e737667**
+- **- Reorder active jobs to the top of the jobs list - Add a new status boolean for "Read" jobs- those in review, that I've read but i want to hide for now. Marking a job as read is done on the jobs list row with a eye icon button. Then in the review group, add a toggle to show/hide the "read" jobs.**
+- **Add a Stop job button for dangling / orphaned jobs**
+- **Add forward-and-backward linking to job details for related jobs. Eg. dispatching a follow-up job will create a new job. and on that new job i want to be able to easily navigate to the previous job. Maybe at the top of the job page we have a simple navigation <-- [Previous_job_name] and if there is a chain of jobs then something like this: [<-- [revious_job_name]. [next_job_name -->]**
+- **Please ensure this is persisted across page loads and navigation --- Previous job context: notes/jobs/2026-04-07-reorder-active-jobs-to-the-top-of-the-jobs-list-ad.md**
+- **Use `gh pr view` to pull the latest claude code review. Then identify which issues remain and address each high and medium finding with a fix.**
+- **I marked a plan as complete, but it still appears in the list as needing review --- Previous job context: notes/jobs/2026-04-07-add-the-ability-to-mark-a-plan-as-complete-without.md**
+
+---
+
+## 2026-04-05
+
+- **/add-repo ../local-ai-hardware/darby and make the color deep blue**
+
+---
+
+## 2026-04-02
+
+- **Please implement code diffs in the markdown rendering for loops and tasks**
+- **Determine why dispatch is failing for cursor agents**
+- **Is that the correct way to do this? I still see many listed as active on the loops page --- Previous job context: notes/jobs/2026-04-02-please-mark-all-existing-loops-for-prompt-guard-an.md**
+
+---
+
 ## 2026-03-31
 
 - **Full loop.log ownership** — eliminated job files for loops; scripts write structured headers (LOOP_SESSION, LOOP_TYPE, LOOP_AGENT, LOOP_STARTED) and LOOP_STATUS to loop.log; added parseLoopRun/parseAllLoopRuns to parsers.js; rewrote /api/loops to scan .dispatch/loops/ dirs; created dedicated LoopDetailView with own /loops/:type/:timestamp route and terminal panel. skills: /done
diff --git a/cli.js b/cli.js
index 565d359..e3aeccc 100755
--- a/cli.js
+++ b/cli.js
@@ -113,7 +113,7 @@ function swarmSummary(agents) {
     if (a.status === 'in_progress') active++;
     else if (a.status === 'completed') completed++;
     else if (a.status === 'failed') failed++;
-    if (a.validation === 'needs_validation') needsValidation++;
+    if (a.validation === 'needs_validation' || a.status === 'stopped') needsValidation++;
   }
   return { active, completed, failed, needsValidation };
 }
diff --git a/config.example.json b/config.example.json
deleted file mode 100644
index a5f0679..0000000
--- a/config.example.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "repos": [
-    {
-      "name": "app",
-      "path": "../my-app",
-      "taskFile": "todo.md",
-      "bugsFile": "bugs.md",
-      "activityFile": "activity-log.md",
-      "startScript": "npm run dev",
-      "testScript": "npm run test",
-      "cleanupScript": "rm -rf dist"
-    },
-    {
-      "name": "backend",
-      "path": "../my-backend",
-      "taskFile": "todo.md",
-      "bugsFile": "bugs.md",
-      "activityFile": "activity-log.md",
-      "startScript": "npm run dev",
-      "testScript": "npm run test",
-      "cleanupScript": null
-    },
-    {
-      "name": "hub",
-      "path": ".",
-      "taskFile": "todo.md",
-      "bugsFile": "bugs.md",
-      "activityFile": "activity-log.md",
-      "startScript": "cd dashboard && yarn dev",
-      "testScript": null,
-      "cleanupScript": "cd dashboard && rm -rf dist node_modules/.vite"
-    }
-  ],
-  "hubRoot": ".",
-  "monthlyBudget": 200
-}
diff --git a/dashboard/env.example b/dashboard/env.example
new file mode 100644
index 0000000..bc27c05
--- /dev/null
+++ b/dashboard/env.example
@@ -0,0 +1,3 @@
+# Copy to .env.local for Vite dev (optional).
+# DISPATCH_API_KEY=   # must match hub server — proxy sends this to /api and /ws
+# VITE_DISPATCH_API_KEY=   # for production build when hub requires auth (same value)
diff --git a/dashboard/eventPipeline.js b/dashboard/eventPipeline.js
index ca21610..c171576 100644
--- a/dashboard/eventPipeline.js
+++ b/dashboard/eventPipeline.js
@@ -8,11 +8,12 @@ const MAX_EVENT_RAW_CHARS = 1000
 
 function stripAnsiForParse(str) {
   return (str || '')
-    .replace(/\x1b\[[0-9;]*[a-zA-Z]/g, '')
+    .replace(/\x1b\[[\x20-\x3f]*[\x40-\x7e]/g, '')
     .replace(/\x1b\][^\x07]*\x07/g, '')
     .replace(/\x1b\([A-Z]/g, '')
     .replace(/\x1b[=>]/g, '')
     .replace(/[\x00-\x08\x0b\x0c\x0e-\x1f]/g, '')
+    .replace(/\[(?:\?|>)[0-9;]*[a-zA-Z]/g, '')
 }
 
 function detectAgentKind(state, text) {
@@ -29,6 +30,10 @@ function classifyLine(line) {
 
   if (!t) return { kind: 'system', level: 'info', text: '' }
 
+  if (/usage.?limit|rate.?limit|too many requests|quota exceeded|credits?\s*(expired|ran\s*out|depleted)|hit your.{0,10}limit|try again at\b/i.test(lower)) {
+    return { kind: 'error', level: 'error', text: t, subKind: 'rate_limit' }
+  }
+
   if (/\berror\b|\bfailed\b|exception|traceback|fatal/.test(lower)) {
     return { kind: 'error', level: 'error', text: t }
   }
@@ -68,6 +73,7 @@ function parseLines(lines, baseState, adapterKind) {
       raw: clean,
       meta: {
         parser: adapterKind,
+        ...(classified.subKind ? { subKind: classified.subKind } : {}),
       },
     })
   }
@@ -159,7 +165,7 @@ export function parseChunkWithAdapters(chunk, state = {}) {
 
 export function createSessionEventStore({ sessionId, repo, baseDir, ringSize = 1200 }) {
   const created = Date.now()
-  const runtimeDir = path.join(baseDir, '.hub-runtime', 'events')
+  const runtimeDir = path.join(baseDir, '.dispatch', 'runtime', 'events')
   fs.mkdirSync(runtimeDir, { recursive: true })
   const snapshotPath = path.join(runtimeDir, `${sessionId}.ndjson`)
 
@@ -174,6 +180,8 @@ export function createSessionEventStore({ sessionId, repo, baseDir, ringSize = 1
     summary: {
       lastStep: null,
       lastError: null,
+      lastErrorSubKind: null,
+      errorCount: 0,
       filesTouched: [],
       toolCalls: 0,
     },
@@ -235,6 +243,8 @@ export function appendChunkToEventStore(store, chunk) {
     }
     if (full.level === 'error' || full.kind === 'error') {
       store.summary.lastError = full.text
+      store.summary.lastErrorSubKind = full.meta?.subKind || null
+      store.summary.errorCount = (store.summary.errorCount || 0) + 1
     }
     if (full.kind === 'tool') {
       store.summary.toolCalls += 1
diff --git a/dashboard/server.integration.test.mjs b/dashboard/server.integration.test.mjs
index e326cff..3751b62 100644
--- a/dashboard/server.integration.test.mjs
+++ b/dashboard/server.integration.test.mjs
@@ -66,8 +66,8 @@ function createTestHub() {
     '- Set up test hub',
   ].join('\n'));
 
-  // .hub-runtime directory
-  fs.mkdirSync(path.join(tmpDir, '.hub-runtime'), { recursive: true });
+  // .dispatch/runtime directory
+  fs.mkdirSync(path.join(tmpDir, '.dispatch', 'runtime'), { recursive: true });
 
   // Init git repo
   execSync(`git init -b main "${repoDir}"`, { encoding: 'utf8' });
@@ -200,6 +200,19 @@ describe('Dashboard GET endpoints', () => {
     assert.equal(json.repos[0].name, 'testrepo');
   });
 
+  it('GET /api/catalog returns repos, agents, models, modelSources', async () => {
+    const { status, json } = await api('GET', '/api/catalog');
+    assert.equal(status, 200);
+    assert.ok(Array.isArray(json.repos));
+    assert.equal(json.repos[0].name, 'testrepo');
+    assert.ok(json.repos[0].taskFile);
+    assert.ok(Array.isArray(json.agents));
+    assert.ok(json.agents.some((a) => a.id === 'claude'));
+    assert.ok(json.models && typeof json.models === 'object');
+    assert.ok(json.models.claude && Array.isArray(json.models.claude));
+    assert.ok(json.modelSources && json.modelSources.claude);
+  });
+
   it('GET /api/overview returns stage, repos, totals', async () => {
     const { status, json } = await api('GET', '/api/overview');
     assert.equal(status, 200);
@@ -285,6 +298,60 @@ describe('Dashboard POST write endpoints', () => {
     assert.ok(json.success);
   });
 
+  it('POST /api/jobs/init links follow-up jobs linearly', async () => {
+    const repoDir = path.join(tmpDir, 'testrepo');
+    createJobFile(repoDir, '2026-03-26-parent-job');
+
+    const { status, json } = await api('POST', '/api/jobs/init', {
+      repo: 'testrepo',
+      taskText: 'Follow up on parent job',
+      previousJobId: '2026-03-26-parent-job',
+    });
+    assert.equal(status, 200);
+    assert.ok(json.fileName);
+
+    const childId = json.fileName.replace(/\.md$/, '');
+    const childContent = fs.readFileSync(
+      path.join(repoDir, 'notes', 'jobs', `${childId}.md`),
+      'utf8'
+    );
+    const parentContent = fs.readFileSync(
+      path.join(repoDir, 'notes', 'jobs', '2026-03-26-parent-job.md'),
+      'utf8'
+    );
+
+    assert.ok(childContent.includes('PreviousJob: 2026-03-26-parent-job'));
+    assert.ok(parentContent.includes(`NextJob: ${childId}`));
+
+    await api('DELETE', `/api/sessions/${encodeURIComponent(json.sessionId)}`);
+    await api('DELETE', `/api/sessions/${encodeURIComponent(json.sessionId)}/purge`);
+  });
+
+  it('POST /api/jobs/init rejects branching from a job that already has a next link', async () => {
+    const repoDir = path.join(tmpDir, 'testrepo');
+    const filePath = path.join(repoDir, 'notes', 'jobs', '2026-03-26-linear-parent.md');
+    fs.writeFileSync(filePath, [
+      '# Job Task: Linear parent',
+      'Started: 2026-03-26 12:00:00',
+      'Status: Completed',
+      'Validation: Needs validation',
+      'Repo: testrepo',
+      'NextJob: 2026-03-26-existing-child',
+      '',
+      '## Progress',
+      '',
+      '## Results',
+    ].join('\n'));
+
+    const { status, json } = await api('POST', '/api/jobs/init', {
+      repo: 'testrepo',
+      taskText: 'Attempt second follow up',
+      previousJobId: '2026-03-26-linear-parent',
+    });
+    assert.equal(status, 409);
+    assert.ok(json.error);
+  });
+
   it('POST /api/jobs/:id/validate sets validation to Validated', async () => {
     const repoDir = path.join(tmpDir, 'testrepo');
     createJobFile(repoDir, '2026-03-26-validate-test');
@@ -300,7 +367,7 @@ describe('Dashboard POST write endpoints', () => {
     assert.ok(content.includes('Validation: Validated'));
   });
 
-  it('POST /api/jobs/:id/kill sets status to Killed', async () => {
+  it('POST /api/jobs/:id/kill sets status to Stopped and keeps it reviewable', async () => {
     const repoDir = path.join(tmpDir, 'testrepo');
     createJobFile(repoDir, '2026-03-26-kill-test', { status: 'In progress' });
 
@@ -310,7 +377,8 @@ describe('Dashboard POST write endpoints', () => {
     const content = fs.readFileSync(
       path.join(repoDir, 'notes', 'jobs', '2026-03-26-kill-test.md'), 'utf8'
     );
-    assert.ok(content.includes('Status: Killed'));
+    assert.ok(content.includes('Status: Stopped'));
+    assert.ok(content.includes('Validation: Needs validation'));
   });
 });
 
diff --git a/dashboard/server.js b/dashboard/server.js
index 61c6681..06038dd 100644
--- a/dashboard/server.js
+++ b/dashboard/server.js
@@ -1,12 +1,16 @@
 // ── Security / Threat Model ──────────────────────────────
-// This server is designed as a **single-user localhost tool**.
+// This server is designed as a **single-user localhost tool** by default.
 //
 // Trust boundary:
-//   - Binds to 127.0.0.1 only — not reachable from the LAN.
-//   - CORS restricts HTTP API access to the dashboard's own origin.
-//   - WebSocket connections are validated against the same origin allowlist.
+//   - Binds to 127.0.0.1 only unless `DISPATCH_BIND` is set (e.g. 0.0.0.0 for LAN).
+//   - Optional `DISPATCH_API_KEY`: required on all `/api/*` HTTP routes and `/ws/terminal`
+//     when set (Bearer, X-API-Key, or `apiKey` query on WebSocket).
+//   - CORS restricts browser API access to the dashboard's own origin (no origin = allowed).
+//   - WebSocket connections are validated against the same origin allowlist after auth.
 //
-// If you need to expose this on a shared machine or LAN, you MUST add:
+// If you expose this on a LAN, you MUST set `DISPATCH_API_KEY` and prefer TLS in front.
+//
+// Legacy note — if you need to expose without the below, you MUST add:
 //   1. Authentication on all HTTP and WebSocket routes.
 //   2. Per-user authorization for destructive operations (job control, merge,
 //      checkpoint, session management).
@@ -22,14 +26,14 @@
 // ─────────────────────────────────────────────────────────
 
 import { createRequire } from 'module'
-import { execFileSync, execSync } from 'child_process'
+import { execFileSync, execSync, spawnSync } from 'child_process'
 import express from 'express'
 import cors from 'cors'
 import path from 'path'
 import os from 'os'
 import { fileURLToPath } from 'url'
 import fs from 'fs'
-import { createHash, randomUUID } from 'crypto'
+import { createHash, randomUUID, timingSafeEqual } from 'crypto'
 import { WebSocketServer } from 'ws'
 import {
   createSessionEventStore,
@@ -43,7 +47,7 @@ const require = createRequire(import.meta.url)
 const pty = require('node-pty')
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const {
-  parseTaskFile, parseActivityLog, getGitInfo, parseJobFile, parseJobDir, parsePlansDir, parseFrontmatter, parseSkillsDir, loadConfig, parseLoopState, parseAllLoopRuns,
+  parseTaskFile, parseActivityLog, getGitInfo, parseJobFile, parseJobDir, parsePlansDir, parseFrontmatter, parseSkillsDir, loadConfig, parseLoopState, parseAllLoopRuns, parseLoopRunDetailed,
   writeTaskDone, writeTaskDoneByText, writeTaskReopenByText, writeTaskAdd, writeTaskEdit, writeTaskMove,
   writeActivityEntry, writeJobValidation, writeJobKill, writeJobStatus, writeJobResults,
   createCheckpoint, revertCheckpoint, dismissCheckpoint, listCheckpoints,
@@ -53,10 +57,16 @@ const {
 
 const HUB_DIR = process.env.HUB_DIR ? path.resolve(process.env.HUB_DIR) : path.resolve(__dirname, '..')
 const PORT = process.env.PORT || 3747
-const RUNTIME_DIR = path.join(HUB_DIR, '.hub-runtime')
+/** When set, all `/api/*` requests must send this key (Bearer or X-API-Key). */
+const DISPATCH_API_KEY = (process.env.DISPATCH_API_KEY || '').trim()
+/** Listen address (default 127.0.0.1). Use e.g. 0.0.0.0 for LAN access behind a firewall + API key. */
+const DISPATCH_BIND = (process.env.DISPATCH_BIND || '127.0.0.1').trim()
+const DISPATCH_DIR = path.join(HUB_DIR, '.dispatch')
+const RUNTIME_DIR = path.join(DISPATCH_DIR, 'runtime')
 const JOB_RUNS_FILE = path.join(RUNTIME_DIR, 'job-runs.json')
 const PROMPTS_DIR = path.join(RUNTIME_DIR, 'prompts')
 const WORKTREES_DIR = path.join(RUNTIME_DIR, 'worktrees')
+const PI_SESSIONS_DIR = path.join(RUNTIME_DIR, 'pi-sessions')
 const RUN_STATE = Object.freeze({
   QUEUED: 'queued',
   STARTING: 'starting',
@@ -253,6 +263,7 @@ const VALID_RESUME_ID_RE = /^[A-Za-z0-9._:-]{1,200}$/
 function isValidResumeId(id) {
   return typeof id === 'string' && VALID_RESUME_ID_RE.test(id)
 }
+const VALID_LOOP_TIMESTAMP_RE = /^[A-Za-z0-9._:-]{1,120}$/
 
 // Branch names: alphanumeric, dots, hyphens, forward slashes
 const VALID_BRANCH_RE = /^[a-zA-Z0-9._\-/]+$/
@@ -267,7 +278,54 @@ function buildResumeClaudeCommand(resumeId, flags = '') {
   return `claude${flags} --resume "${id}"`
 }
 
-function buildDispatchPrompt(taskText, jobFilePath = null, selectedSkillNames = [], worktreePath = null) {
+function buildResumeCursorCommand(resumeId, flags = '', binary = detectCursorBinary()) {
+  const id = String(resumeId ?? '').trim()
+  if (!id) return null
+  if (!isValidResumeId(id)) return null
+  return `${binary === 'agent' ? 'agent' : 'cursor-agent'}${flags} --resume "${id}"`
+}
+
+function detectCursorBinary() {
+  if (detectCursorBinary.cached) return detectCursorBinary.cached
+  try {
+    execFileSync('bash', ['-lc', 'command -v cursor-agent >/dev/null 2>&1'], { stdio: 'ignore' })
+    detectCursorBinary.cached = 'cursor-agent'
+    return detectCursorBinary.cached
+  } catch {
+    detectCursorBinary.cached = 'agent'
+    return detectCursorBinary.cached
+  }
+}
+
+function buildCursorResumeCommand(resumeId, flags = '', binary = detectCursorBinary()) {
+  return buildResumeCursorCommand(resumeId, flags, binary)
+}
+
+function getPiSessionFilePath({ repoName, jobId }) {
+  return path.join(PI_SESSIONS_DIR, sanitizeRepoName(repoName || 'repo'), `${jobId}.jsonl`)
+}
+
+function buildResumePiCommand(sessionFilePath) {
+  const resolved = String(sessionFilePath || '').trim()
+  if (!resolved) return null
+  return `pi --session ${shellQuote(resolved)}`
+}
+
+function extractPiSessionPath(command) {
+  if (!command) return null
+  const match = String(command).match(/--session\s+(?:"([^"]+)"|'([^']+)'|(\S+))/i)
+  const value = match?.[1] || match?.[2] || match?.[3] || null
+  return value ? path.resolve(value) : null
+}
+
+function isSafePiSessionFilePath(sessionFilePath) {
+  if (!sessionFilePath) return false
+  const resolved = path.resolve(sessionFilePath)
+  const root = path.resolve(PI_SESSIONS_DIR)
+  return resolved.startsWith(`${root}${path.sep}`)
+}
+
+function buildDispatchPrompt(taskText, jobFilePath = null, selectedSkillNames = [], worktreePath = null, agent = 'claude') {
   let prompt = ''
 
   if (worktreePath) {
@@ -278,10 +336,11 @@ function buildDispatchPrompt(taskText, jobFilePath = null, selectedSkillNames =
   prompt += String(taskText || '')
 
   if (Array.isArray(selectedSkillNames) && selectedSkillNames.length > 0) {
+    const skillPrefix = agent === 'pi' ? '/skill:' : '/'
     const names = selectedSkillNames
       .map(name => String(name || '').trim())
       .filter(Boolean)
-      .map(name => `/${name}`)
+      .map(name => `${skillPrefix}${name}`)
     if (names.length > 0) {
       prompt += `\n\nYou have access to the following skills: ${names.join(', ')}.`
     }
@@ -392,6 +451,58 @@ function buildTrackedCodexCommand({
   return `${cmd}; __hub_code=$?; echo "__HUB_CLAUDE_EXIT_CODE:\${__hub_code}__"; exit $__hub_code`
 }
 
+function buildTrackedCursorCommand({
+  promptFilePath = null,
+  model = null,
+  skipPermissions = false,
+  plainOutput = false,
+  resumeId = null,
+  sessionId = null,
+  jobId = null,
+  repoName = null,
+  extraFlags = '',
+} = {}) {
+  if (!promptFilePath && !resumeId) return null
+  const cursorBinary = detectCursorBinary()
+  let flags = ''
+  if (skipPermissions) flags += ' --force'
+  if (model) flags += ` --model ${shellQuote(model)}`
+  if (plainOutput) flags += ' --print --output-format text --trust'
+  const sanitized = sanitizeExtraFlags(extraFlags)
+  if (sanitized) flags += ` ${sanitized}`
+  const envPrefix = buildClaudeEnvPrefix({ sessionId, jobId, repoName })
+  const cursorCommand = resumeId
+    ? `${envPrefix}${buildCursorResumeCommand(resumeId, flags, cursorBinary)}`
+    : cursorBinary === 'agent'
+      ? `${envPrefix}agent -p "$(cat ${shellQuote(promptFilePath)})"${flags}`
+      : `${envPrefix}cursor-agent${flags} "$(cat ${shellQuote(promptFilePath)})"`
+  const withExit = `${cursorCommand}; __hub_code=$?; echo "__HUB_CLAUDE_EXIT_CODE:\${__hub_code}__"; exit $__hub_code`
+  return plainOutput ? `echo '__HUB_OUTPUT_START__'; ${withExit}` : withExit
+}
+
+function buildTrackedPiCommand({
+  promptFilePath = null,
+  model = null,
+  plainOutput = false,
+  sessionId = null,
+  jobId = null,
+  repoName = null,
+  extraFlags = '',
+  piSessionPath = null,
+} = {}) {
+  if (!promptFilePath) return null
+  let flags = ''
+  if (plainOutput) flags += ' -p'
+  if (model) flags += ` --model ${shellQuote(model)}`
+  if (piSessionPath) flags += ` --session ${shellQuote(piSessionPath)}`
+  const sanitized = sanitizeExtraFlags(extraFlags)
+  if (sanitized) flags += ` ${sanitized}`
+  const envPrefix = buildClaudeEnvPrefix({ sessionId, jobId, repoName })
+  const cmd = `${envPrefix}pi${flags} "$(cat ${shellQuote(promptFilePath)})"`
+  const withExit = `${cmd}; __hub_code=$?; echo "__HUB_CLAUDE_EXIT_CODE:\${__hub_code}__"; exit $__hub_code`
+  return plainOutput ? `echo '__HUB_OUTPUT_START__'; ${withExit}` : withExit
+}
+
 // Strip ANSI escape sequences for clean log output
 function stripAnsi(str) {
   return str
@@ -532,6 +643,43 @@ app.param('name', (req, res, next, value) => {
   next()
 })
 
+function extractApiKeyFromRequest(req) {
+  const x = req.headers['x-api-key']
+  if (x && typeof x === 'string') return x.trim()
+  const auth = req.headers.authorization
+  if (auth && typeof auth === 'string' && auth.startsWith('Bearer ')) return auth.slice(7).trim()
+  return ''
+}
+
+function extractApiKeyFromWsRequest(req) {
+  try {
+    const url = new URL(req.url, `http://${req.headers.host || 'localhost'}`)
+    const q = url.searchParams.get('apiKey')
+    if (q) return q.trim()
+  } catch { /* ignore */ }
+  const x = req.headers['x-api-key']
+  if (x && typeof x === 'string') return x.trim()
+  const auth = req.headers.authorization
+  if (auth && typeof auth === 'string' && auth.startsWith('Bearer ')) return auth.slice(7).trim()
+  return ''
+}
+
+function apiKeyMatches(key) {
+  const provided = createHash('sha256').update(String(key || ''), 'utf8').digest()
+  const expected = createHash('sha256').update(DISPATCH_API_KEY, 'utf8').digest()
+  return timingSafeEqual(provided, expected)
+}
+
+app.use((req, res, next) => {
+  if (!req.path.startsWith('/api/')) return next()
+  if (!DISPATCH_API_KEY) return next()
+  const key = extractApiKeyFromRequest(req)
+  if (!apiKeyMatches(key)) {
+    return res.status(401).json({ error: 'Unauthorized' })
+  }
+  next()
+})
+
 let wss = null
 const JOB_EVENT = '\x01JOBS_CHANGED:'
 const LEGACY_SWARM_EVENT = '\x01SWARM_CHANGED:'
@@ -561,6 +709,8 @@ function collectAvailableSkills() {
   const globalDirs = [
     path.join(os.homedir(), '.claude'),
     path.join(os.homedir(), '.codex'),
+    path.join(os.homedir(), '.pi', 'agent'),
+    path.join(os.homedir(), '.agents'),
   ]
   const globalSkills = []
   for (const dir of globalDirs) {
@@ -754,31 +904,51 @@ app.get(['/api/jobs', '/api/swarm'], (req, res) => {
     if ((a.status === 'in_progress' && a.session && liveSessionIds.has(a.session)) || (runSessionAlive && runStateIsActive)) active++
     else if (a.status === 'completed') completed++
     else if (a.status === 'failed') failed++
-    if (a.validation === 'needs_validation') needsValidation++
+    if (a.validation === 'needs_validation' || a.status === 'stopped') needsValidation++
+  }
+
+  const sessionErrorSummary = new Map()
+  for (const [sid, s] of ptySessions) {
+    const summary = s.eventStore?.summary
+    if (summary?.lastError) {
+      sessionErrorSummary.set(sid, {
+        lastError: summary.lastError,
+        lastErrorSubKind: summary.lastErrorSubKind || null,
+        errorCount: summary.errorCount || 0,
+      })
+    }
   }
 
   const jobs = allAgents
     .filter(a => a.type !== 'loop')
-    .map(a => ({
-      id: a.id,
-      repo: a.repo,
-      taskName: a.taskName,
-      agent: a.agent || 'claude',
-      started: a.started,
-      status: a.status,
-      validation: a.validation,
-      lastProgress: a.lastProgress,
-      progressCount: a.progressCount,
-      durationMinutes: a.durationMinutes,
-      skills: a.skills,
-      session: latestRunByJob.get(a.id)?.sessionId || a.session,
-      runState: latestRunByJob.get(a.id)?.state || null,
-      branch: a.branch || null,
-      worktreePath: a.worktreePath || null,
-      planSlug: a.planSlug || null,
-      planTitle: a.planTitle || null,
-      planRepo: a.planRepo || a.repo || null,
-    }))
+    .map(a => {
+      const sessionId = latestRunByJob.get(a.id)?.sessionId || a.session
+      const errInfo = sessionId ? sessionErrorSummary.get(sessionId) : null
+      return {
+        id: a.id,
+        repo: a.repo,
+        taskName: a.taskName,
+        agent: a.agent || 'claude',
+        read: a.read === true,
+        started: a.started,
+        status: a.status,
+        validation: a.validation,
+        lastProgress: a.lastProgress,
+        progressCount: a.progressCount,
+        durationMinutes: a.durationMinutes,
+        skills: a.skills,
+        session: sessionId,
+        runState: latestRunByJob.get(a.id)?.state || null,
+        branch: a.branch || null,
+        worktreePath: a.worktreePath || null,
+        planSlug: a.planSlug || null,
+        planTitle: a.planTitle || null,
+        planRepo: a.planRepo || a.repo || null,
+        lastError: errInfo?.lastError || null,
+        lastErrorSubKind: errInfo?.lastErrorSubKind || null,
+        errorCount: errInfo?.errorCount || 0,
+      }
+    })
   res.json({
     jobs,
     agents: jobs,
@@ -799,8 +969,8 @@ app.get('/api/loops', (req, res) => {
       const runs = parseAllLoopRuns(typeDir)
       for (const run of runs) {
         const dirName = path.basename(run.runDir)
-        const id = `${loopType}/${dirName}`
-        const sessionActive = run.session ? ptySessions.has(run.session) : false
+        const id = `${repo.name}/${loopType}/${dirName}`
+        const sessionActive = run.session ? ptySessions.get(run.session)?.alive === true : false
         let status = 'unknown'
         if (sessionActive) status = 'in_progress'
         else if (run.loopStatus === 'completed' || run.complete) status = 'completed'
@@ -872,12 +1042,15 @@ app.post('/api/loops/init', (req, res) => {
   const repoConfig = findRepoConfig(repo)
   if (!repoConfig) return res.status(404).json({ error: `repo "${repo}" not found` })
 
-  // Write prompt file if provided
-  if (promptContent != null) {
-    const promptPath = path.join(repoConfig.resolvedPath, '.dispatch', 'loops', loopType, 'prompt.md')
-    fs.mkdirSync(path.dirname(promptPath), { recursive: true })
-    fs.writeFileSync(promptPath, promptContent, 'utf8')
+  const promptPath = path.join(repoConfig.resolvedPath, '.dispatch', 'loops', loopType, 'prompt.md')
+  const promptText = typeof promptContent === 'string'
+    ? promptContent
+    : (fs.existsSync(promptPath) ? fs.readFileSync(promptPath, 'utf8') : '')
+  if (!promptText.trim()) {
+    return res.status(400).json({ error: 'Loop prompt is required' })
   }
+  fs.mkdirSync(path.dirname(promptPath), { recursive: true })
+  fs.writeFileSync(promptPath, promptText, 'utf8')
 
   const sessionId = makeSessionId()
 
@@ -905,6 +1078,60 @@ app.post('/api/loops/init', (req, res) => {
   res.json({ sessionId, shellCommand })
 })
 
+app.get('/api/loops/:loopType/:timestamp/artifacts', (req, res) => {
+  const { loopType, timestamp } = req.params
+  const repoName = typeof req.query.repo === 'string' ? req.query.repo.trim() : ''
+  if (!VALID_LOOP_TYPES.has(loopType)) {
+    return res.status(400).json({ error: `Invalid loop type` })
+  }
+  if (!VALID_LOOP_TIMESTAMP_RE.test(timestamp)) {
+    return res.status(400).json({ error: 'Invalid timestamp' })
+  }
+  try {
+    const config = getConfig()
+    let reposToSearch = config.repos
+    if (repoName) {
+      const targetRepo = findRepoConfig(repoName)
+      if (!targetRepo) return res.status(404).json({ error: `repo "${repoName}" not found` })
+      reposToSearch = [targetRepo]
+    }
+
+    const matches = []
+    for (const repo of reposToSearch) {
+      const runDir = path.join(repo.resolvedPath, '.dispatch', 'loops', loopType, timestamp)
+      if (fs.existsSync(runDir)) matches.push({ repo, runDir })
+    }
+
+    if (matches.length === 0) {
+      return res.status(404).json({ error: 'Loop run not found' })
+    }
+    if (!repoName && matches.length > 1) {
+      return res.status(409).json({
+        error: 'Ambiguous loop run id. Specify repo query parameter.',
+        repos: matches.map(match => match.repo.name),
+      })
+    }
+
+    const match = matches[0]
+    try {
+      const detailed = parseLoopRunDetailed(match.runDir)
+      return res.json({
+        repo: match.repo.name,
+        iterations: detailed.iterations,
+        artifacts: detailed.artifacts,
+        prompt: detailed.prompt,
+        warnings: detailed.warnings || [],
+      })
+    } catch (err) {
+      console.error('[loops/artifacts] failed to parse run', { runDir: match.runDir, error: err?.message || String(err) })
+      return res.status(500).json({ error: 'Failed to parse loop artifacts' })
+    }
+  } catch (err) {
+    console.error('[loops/artifacts] failed to load config', { error: err?.message || String(err) })
+    return res.status(500).json({ error: 'Failed to load loop artifacts' })
+  }
+})
+
 // ── End loop endpoints ──────────────────────────────────────────────────────
 
 function compareAgentsByStart(a, b) {
@@ -983,6 +1210,14 @@ app.get(['/api/jobs/:id', '/api/swarm/:id'], (req, res) => {
       if (fs.existsSync(filePath)) {
         const agent = parseJobFile(filePath)
         agent.repo = repo.name
+        const sessionId = agent.session
+        const session = sessionId ? ptySessions.get(sessionId) : null
+        const summary = session?.eventStore?.summary
+        if (summary?.lastError) {
+          agent.lastError = summary.lastError
+          agent.lastErrorSubKind = summary.lastErrorSubKind || null
+          agent.errorCount = summary.errorCount || 0
+        }
         return res.json(enrichAgentWithPlanLink(agent, planLookup))
       }
     }
@@ -1186,6 +1421,12 @@ const FALLBACK_CURSOR_MODELS = [
   { value: 'gemini-2.5-pro', label: 'Gemini 2.5 Pro' },
 ]
 
+const FALLBACK_PI_MODELS = [
+  { value: 'google/gemini-2.5-pro', label: 'Gemini 2.5 Pro' },
+  { value: 'openai-codex/gpt-5.4', label: 'GPT-5.4' },
+  { value: 'anthropic/claude-sonnet-4', label: 'Claude Sonnet 4' },
+]
+
 function readCodexModelsCache() {
   const cachePath = path.join(os.homedir(), '.codex', 'models_cache.json')
   try {
@@ -1218,13 +1459,56 @@ function readClaudeOAuthToken() {
   }
 }
 
-app.get('/api/agents/models', async (req, res) => {
-  const { agent = 'claude' } = req.query
+function readPiModels() {
+  try {
+    const response = spawnSync('pi', ['--mode', 'rpc', '--no-session'], {
+      input: JSON.stringify({ id: 'models-1', type: 'get_available_models' }) + '\n',
+      encoding: 'utf8',
+      timeout: 5000,
+    })
+    if (response.error) throw response.error
+    if (response.status !== 0) throw new Error(response.stderr || `pi exited with ${response.status}`)
+    const payloads = String(response.stdout || '')
+      .split(/\r?\n/)
+      .map(line => line.trim())
+      .filter(line => line.startsWith('{') && line.endsWith('}'))
+      .map(line => {
+        try { return JSON.parse(line) } catch { return null }
+      })
+      .filter(Boolean)
+    const matching = payloads.find(item => item.id === 'models-1' || item.replyTo === 'models-1' || item.reply_to === 'models-1')
+    const rawModels = Array.isArray(matching?.models)
+      ? matching.models
+      : Array.isArray(matching?.result?.models)
+        ? matching.result.models
+        : Array.isArray(matching?.result)
+          ? matching.result
+          : Array.isArray(matching?.data?.models)
+            ? matching.data.models
+            : null
+    if (!rawModels || rawModels.length === 0) return null
+    const models = rawModels
+      .filter(model => model?.id && model?.provider)
+      .map(model => ({
+        value: `${model.provider}/${model.id}`,
+        label: model.name || model.id,
+        description: `${model.provider}${model.reasoning ? ' • thinking' : ''}`,
+      }))
+    return models.length > 0 ? models : null
+  } catch {
+    return null
+  }
+}
+
+const DISPATCH_AGENT_KINDS = ['claude', 'codex', 'cursor', 'pi']
+const DISPATCH_AGENT_LABELS = { claude: 'Claude', codex: 'Codex', cursor: 'Cursor', pi: 'Pi' }
+
+async function getModelsForAgent(agent) {
+  const a = String(agent || 'claude')
   try {
-    if (agent === 'claude') {
-      // Prefer env API key, fall back to Claude Code's stored OAuth token
+    if (a === 'claude') {
       const apiKey = process.env.ANTHROPIC_API_KEY || readClaudeOAuthToken()
-      if (!apiKey) return res.json({ models: FALLBACK_CLAUDE_MODELS, source: 'fallback' })
+      if (!apiKey) return { models: FALLBACK_CLAUDE_MODELS, source: 'fallback' }
       const response = await fetch('https://api.anthropic.com/v1/models?limit=100', {
         headers: {
           'x-api-key': apiKey,
@@ -1232,26 +1516,71 @@ app.get('/api/agents/models', async (req, res) => {
           'anthropic-beta': 'oauth-2023-09-01',
         },
       })
-      if (!response.ok) return res.json({ models: FALLBACK_CLAUDE_MODELS, source: 'fallback' })
+      if (!response.ok) return { models: FALLBACK_CLAUDE_MODELS, source: 'fallback' }
       const data = await response.json()
       const models = (data.data || [])
         .filter(m => m.id.startsWith('claude') && !m.id.endsWith('-latest'))
         .sort((a, b) => b.id.localeCompare(a.id))
         .map(m => ({ value: m.id, label: m.display_name || m.id }))
-      return res.json({ models: models.length > 0 ? models : FALLBACK_CLAUDE_MODELS, source: 'api' })
+      return { models: models.length > 0 ? models : FALLBACK_CLAUDE_MODELS, source: 'api' }
     }
-    if (agent === 'codex') {
-      // Read directly from Codex's own models cache — same source as the Codex TUI
+    if (a === 'codex') {
       const cached = readCodexModelsCache()
-      if (cached) return res.json({ models: cached, source: 'codex-cache' })
-      return res.json({ models: FALLBACK_CLAUDE_MODELS, source: 'fallback' })
+      if (cached) return { models: cached, source: 'codex-cache' }
+      return { models: FALLBACK_CLAUDE_MODELS, source: 'fallback' }
+    }
+    if (a === 'cursor') {
+      return { models: FALLBACK_CURSOR_MODELS, source: 'fallback' }
     }
-    if (agent === 'cursor') {
-      return res.json({ models: FALLBACK_CURSOR_MODELS, source: 'fallback' })
+    if (a === 'pi') {
+      const models = readPiModels()
+      return { models: models || FALLBACK_PI_MODELS, source: models ? 'pi-rpc' : 'fallback' }
     }
-    return res.json({ models: [], source: 'unknown' })
+    return { models: [], source: 'unknown' }
   } catch {
-    return res.json({ models: FALLBACK_CLAUDE_MODELS, source: 'fallback' })
+    const fallback = a === 'cursor'
+      ? FALLBACK_CURSOR_MODELS
+      : a === 'pi'
+        ? FALLBACK_PI_MODELS
+        : FALLBACK_CLAUDE_MODELS
+    return { models: fallback, source: 'fallback' }
+  }
+}
+
+app.get('/api/agents/models', async (req, res) => {
+  const { agent = 'claude' } = req.query
+  const result = await getModelsForAgent(agent)
+  res.json({ models: result.models, source: result.source })
+})
+
+app.get('/api/catalog', async (req, res) => {
+  try {
+    const config = getConfig()
+    const repos = config.repos.map(r => ({
+      name: r.name,
+      path: r.path,
+      taskFile: r.taskFile,
+      activityFile: r.activityFile,
+      ...(r.bugsFile ? { bugsFile: r.bugsFile } : {}),
+    }))
+    const models = {}
+    const modelSources = {}
+    const modelResults = await Promise.all(DISPATCH_AGENT_KINDS.map(agent => getModelsForAgent(agent)))
+    for (let i = 0; i < DISPATCH_AGENT_KINDS.length; i++) {
+      const agent = DISPATCH_AGENT_KINDS[i]
+      const result = modelResults[i]
+      models[agent] = result.models
+      modelSources[agent] = result.source
+    }
+    res.json({
+      hubRoot: config.hubRoot || HUB_DIR,
+      repos,
+      agents: DISPATCH_AGENT_KINDS.map(id => ({ id, label: DISPATCH_AGENT_LABELS[id] || id })),
+      models,
+      modelSources,
+    })
+  } catch (err) {
+    res.status(500).json({ error: err?.message || 'catalog failed' })
   }
 })
 
@@ -1279,6 +1608,7 @@ app.post(['/api/jobs/init', '/api/swarm/init'], (req, res) => {
     plainOutput,
     planSlug,
     skills,
+    previousJobId,
   } = req.body
   if (!repo || !taskText) return res.status(400).json({ error: 'repo and taskText required' })
   // Validate baseBranch if provided — reject shell metacharacters and path traversal
@@ -1286,10 +1616,26 @@ app.post(['/api/jobs/init', '/api/swarm/init'], (req, res) => {
   if (baseBranch && !validBranchRe.test(baseBranch)) {
     return res.status(400).json({ error: `Invalid base branch name: ${baseBranch}` })
   }
+  if (previousJobId && !isValidJobId(previousJobId)) {
+    return res.status(400).json({ error: `Invalid previous job id: ${previousJobId}` })
+  }
 
   const repoConfig = findRepoConfig(repo)
   if (!repoConfig) return res.status(404).json({ error: `repo "${repo}" not found` })
   const knownSkills = collectAvailableSkills().all
+  const previousJob = previousJobId ? findJobFileById(previousJobId) : null
+  if (previousJobId && !previousJob) {
+    return res.status(404).json({ error: `Previous job "${previousJobId}" not found` })
+  }
+  if (previousJob) {
+    const previousDetail = parseJobFile(previousJob.filePath)
+    if (previousDetail.nextJobId) {
+      return res.status(409).json({ error: `Job "${previousJobId}" already links to next job "${previousDetail.nextJobId}"` })
+    }
+  }
+  const normalizedAgent = DISPATCH_AGENT_KINDS.includes(String(agent || '').trim()) ? String(agent).trim() : 'claude'
+  const effectiveSkipPermissions = normalizedAgent === 'pi' ? false : Boolean(skipPermissions)
+  const effectiveMaxTurns = ['codex', 'cursor', 'pi'].includes(normalizedAgent) ? null : maxTurns
   const skillNameById = new Map(
     knownSkills.map(skill => [String(skill?.id || '').trim(), String(skill?.name || skill?.id || '').trim()])
   )
@@ -1338,10 +1684,11 @@ app.post(['/api/jobs/init', '/api/swarm/init'], (req, res) => {
   }
   if (headerOriginalPrompt) lines.push(`OriginalPrompt: ${headerOriginalPrompt}`)
   lines.push(`Session: ${assignedSessionId}`)
-  lines.push(`SkipPermissions: ${Boolean(skipPermissions)}`)
-  if (agent && agent !== 'claude') lines.push(`Agent: ${agent}`)
+  if (previousJobId) lines.push(`PreviousJob: ${previousJobId}`)
+  lines.push(`SkipPermissions: ${effectiveSkipPermissions}`)
+  if (normalizedAgent !== 'claude') lines.push(`Agent: ${normalizedAgent}`)
   if (model) lines.push(`Model: ${model}`)
-  if (maxTurns) lines.push(`MaxTurns: ${maxTurns}`)
+  if (effectiveMaxTurns) lines.push(`MaxTurns: ${effectiveMaxTurns}`)
   if (autoMerge) lines.push('AutoMerge: true')
   if (baseBranch) lines.push(`BaseBranch: ${baseBranch}`)
   if (planSlug) lines.push(`Plan: ${singleLine(planSlug)}`)
@@ -1349,6 +1696,11 @@ app.post(['/api/jobs/init', '/api/swarm/init'], (req, res) => {
 
   const relativePath = `notes/jobs/${fileName}`
   const jobId = fileName.replace(/\.md$/, '')
+  const piSessionPath = normalizedAgent === 'pi' ? getPiSessionFilePath({ repoName: repo, jobId }) : null
+  if (piSessionPath) {
+    fs.mkdirSync(path.dirname(piSessionPath), { recursive: true })
+    lines.push(`ResumeCommand: ${buildResumePiCommand(piSessionPath)}`)
+  }
 
   // Create a git worktree if requested
   let worktreeInfo = null
@@ -1372,6 +1724,9 @@ app.post(['/api/jobs/init', '/api/swarm/init'], (req, res) => {
 
   lines.push('', '## Progress', `- [${timestamp}] Task initiated from dashboard`, '', '## Results', '')
   fs.writeFileSync(filePath, lines.join('\n'), 'utf8')
+  if (previousJob) {
+    upsertHeaderLine(previousJob.filePath, 'NextJob', jobId)
+  }
 
   // Determine PTY working directory — use worktree if available, else repo root
   const ptyCwd = worktreeInfo ? worktreeInfo.worktreePath : repoConfig.resolvedPath
@@ -1388,7 +1743,7 @@ app.post(['/api/jobs/init', '/api/swarm/init'], (req, res) => {
   try {
     const promptFilePath = persistPromptFile(
       assignedSessionId,
-      buildDispatchPrompt(taskText, jobFilePathForPrompt, selectedSkillNames, worktreeInfo?.worktreePath || null)
+      buildDispatchPrompt(taskText, jobFilePathForPrompt, selectedSkillNames, worktreeInfo?.worktreePath || null, normalizedAgent)
     )
     createPtySession(
       assignedSessionId,
@@ -1400,14 +1755,15 @@ app.post(['/api/jobs/init', '/api/swarm/init'], (req, res) => {
       {
         promptFilePath,
         model,
-        maxTurns: agent === 'codex' ? null : maxTurns,
-        skipPermissions: Boolean(skipPermissions),
+        maxTurns: effectiveMaxTurns,
+        skipPermissions: effectiveSkipPermissions,
         plainOutput: Boolean(plainOutput),
         sessionId: assignedSessionId,
         jobId,
         repoName: repo,
-        agent: agent || 'claude',
+        agent: normalizedAgent,
         extraFlags: extraFlags || '',
+        piSessionPath,
       }
     )
   } catch (err) {
@@ -1659,6 +2015,20 @@ function extractResumeId(resumeCommand) {
   return isValidResumeId(match[1]) ? match[1] : null
 }
 
+function buildResumeCommandForJob(detail) {
+  const agentId = detail?.agent || 'claude'
+  if (agentId === 'pi') return detail?.resumeCommand || null
+  const resumeId = detail?.resumeId || extractResumeId(detail?.resumeCommand)
+  if (!resumeId || !isValidResumeId(resumeId)) return null
+  const skipPermissions = detail?.skipPermissions == null ? true : detail.skipPermissions === true
+  const resumeFlags = agentId === 'cursor'
+    ? (skipPermissions ? ' --force' : '')
+    : (skipPermissions ? ' --dangerously-skip-permissions' : '')
+  return agentId === 'cursor'
+    ? buildCursorResumeCommand(resumeId, resumeFlags)
+    : buildResumeClaudeCommand(resumeId, resumeFlags)
+}
+
 function markJobReadyForValidation({ jobId, sessionId = null, reason = 'stop_hook' } = {}) {
   const found = findJobFileById(jobId)
   if (!found) return { status: 404, body: { error: `Job "${jobId}" not found` } }
@@ -1714,26 +2084,34 @@ app.post(['/api/jobs/:id/resume', '/api/swarm/:id/resume'], (req, res) => {
 
   try {
     const detail = parseJobFile(found.filePath)
+    const agentId = detail.agent || 'claude'
     const sessionId = detail.session || null
     if (!sessionId || !isValidSessionId(sessionId)) {
       return res.status(409).json({
         error: 'This job has no valid tracked terminal session to resume.',
       })
     }
-    const resumeId = detail.resumeId || extractResumeId(detail.resumeCommand)
-    if (!resumeId || !isValidResumeId(resumeId)) {
+    const resumeCommand = buildResumeCommandForJob(detail)
+    if (!resumeCommand) {
+      return res.status(409).json({
+        error: 'No resume command is recorded for this job yet.',
+      })
+    }
+    const resumeId = agentId === 'pi' ? null : (detail.resumeId || extractResumeId(detail.resumeCommand))
+    if (agentId !== 'pi' && (!resumeId || !isValidResumeId(resumeId))) {
       return res.status(409).json({
         error: 'No valid resume id is recorded for this job yet.',
       })
     }
-    const skipPermissions = detail.skipPermissions == null ? true : detail.skipPermissions === true
-    const resumeFlags = skipPermissions ? ' --dangerously-skip-permissions' : ''
-    const resumeCommand = buildResumeClaudeCommand(resumeId, resumeFlags)
-    if (!resumeCommand) {
+    const piSessionPath = agentId === 'pi' ? extractPiSessionPath(resumeCommand) : null
+    if (agentId === 'pi' && !isSafePiSessionFilePath(piSessionPath)) {
       return res.status(409).json({
-        error: 'No resume command is recorded for this job yet.',
+        error: 'The recorded Pi session path is invalid.',
       })
     }
+    const skipPermissions = agentId === 'pi'
+      ? false
+      : (detail.skipPermissions == null ? true : detail.skipPermissions === true)
 
     const latestRun = getLatestRunByJobId(req.params.id)
     if (latestRun?.state === RUN_STATE.VALIDATED) {
@@ -1754,7 +2132,9 @@ app.post(['/api/jobs/:id/resume', '/api/swarm/:id/resume'], (req, res) => {
       ptySessions.delete(sessionId)
     }
 
-    const cwd = found.repo?.resolvedPath || HUB_DIR
+    const cwd = detail.worktreePath && detail.worktreePath !== '(merged)'
+      ? detail.worktreePath
+      : found.repo?.resolvedPath || HUB_DIR
     createPtySession(
       sessionId,
       cwd,
@@ -1768,6 +2148,8 @@ app.post(['/api/jobs/:id/resume', '/api/swarm/:id/resume'], (req, res) => {
         sessionId,
         jobId: req.params.id,
         repoName: found.repo?.name || null,
+        agent: agentId,
+        piSessionPath,
       }
     )
 
@@ -1797,6 +2179,7 @@ app.post(['/api/jobs/:id/resume', '/api/swarm/:id/resume'], (req, res) => {
       resumeCommand,
       resumeId,
       skipPermissions,
+      agent: agentId,
       taskText: detail.taskName || detail.originalTask || req.params.id,
       status: 'in_progress',
       validation: 'none',
@@ -1812,6 +2195,27 @@ app.post(['/api/jobs/:id/resume', '/api/swarm/:id/resume'], (req, res) => {
   }
 })
 
+app.post(['/api/jobs/:id/read', '/api/swarm/:id/read'], (req, res) => {
+  const found = findJobFileById(req.params.id)
+  if (!found) {
+    return res.status(404).json({ error: `Job "${req.params.id}" not found` })
+  }
+
+  const nextRead = req.body?.read
+  if (typeof nextRead !== 'boolean') {
+    return res.status(400).json({ error: 'read boolean required' })
+  }
+
+  try {
+    upsertHeaderLine(found.filePath, 'Read', nextRead ? 'true' : 'false')
+    const detail = parseJobFile(found.filePath)
+    emitJobsChanged({ repo: found.repo.name, id: req.params.id, reason: nextRead ? 'read' : 'unread' })
+    return res.json({ ok: true, id: detail.id, read: detail.read })
+  } catch (err) {
+    return res.status(400).json({ error: err.message })
+  }
+})
+
 app.post(['/api/jobs/:id/run-dev', '/api/swarm/:id/run-dev'], (req, res) => {
   const found = findJobFileById(req.params.id)
   if (!found) {
@@ -1968,33 +2372,31 @@ app.post(['/api/jobs/:id/kill', '/api/swarm/:id/kill'], (req, res) => {
   try {
     const detail = parseJobFile(found.filePath)
     const latestRun = getLatestRunByJobId(req.params.id)
-    if (detail.status !== 'killed') {
+    if (detail.status !== 'stopped') {
       writeJobKill(found.filePath)
     }
     if (latestRun) {
+      const reviewValidation = latestRun.validation === 'validated' || latestRun.validation === 'rejected'
+        ? latestRun.validation
+        : 'needs_validation'
       transitionRun(latestRun, RUN_STATE.KILLED, {
-        validation: latestRun.validation || 'none',
-        reason: 'user_killed_job',
+        validation: reviewValidation,
+        reason: 'user_stopped_job',
         force: latestRun.state === RUN_STATE.KILLED,
       })
     }
-    // Terminate the underlying shell if still running, but keep session record
-    // so scrollback remains viewable in the dashboard.
+    // Terminate the underlying shell if still running.
     if (detail.session && ptySessions.has(detail.session)) {
       const s = ptySessions.get(detail.session)
       s.killRequested = true
-      try { transitionRun(getLatestRunBySessionId(detail.session), RUN_STATE.STOPPING, { reason: 'user_kill_requested', force: true }) } catch {}
+      try { transitionRun(getLatestRunBySessionId(detail.session), RUN_STATE.STOPPING, { reason: 'user_stop_requested', force: true }) } catch {}
       if (s.tmuxName) killTmuxSession(s.tmuxName)
       try { s?.shell?.kill() } catch {}
     }
     purgePtySessionHard(`run-dev-${req.params.id}`)
-    // Clean up worktree and branch — killed jobs are abandoned
-    if (detail.worktreePath) {
-      try { removeJobWorktree(found.repo.resolvedPath, req.params.id, { deleteBranch: true, repoName: found.repo.name }) } catch {}
-    }
     invalidateGitInfoCache(found.repo.resolvedPath)
-    emitJobsChanged({ repo: found.repo.name, id: req.params.id, reason: 'killed' })
-    return res.json({ success: true, id: req.params.id, status: 'killed' })
+    emitJobsChanged({ repo: found.repo.name, id: req.params.id, reason: 'stopped' })
+    return res.json({ success: true, id: req.params.id, status: 'stopped' })
   } catch (err) {
     return res.status(400).json({ error: err.message })
   }
@@ -2259,9 +2661,8 @@ if (fs.existsSync(distDir)) {
   })
 }
 
-const BIND_HOST = '127.0.0.1'
-const server = process.env.TESTING ? null : app.listen(PORT, BIND_HOST, () => {
-  console.log(`Hub dashboard API running at http://${BIND_HOST}:${PORT}`)
+const server = process.env.TESTING ? null : app.listen(PORT, DISPATCH_BIND, () => {
+  console.log(`Hub dashboard API running at http://${DISPATCH_BIND}:${PORT}`)
 })
 
 // ── Persistent PTY sessions ──────────────────────────────
@@ -2362,6 +2763,58 @@ function garbageCollectSessions() {
   }
 }
 
+function reconcileOrphanedTmuxSessions() {
+  let metaChanged = false
+
+  for (const [sessionId, meta] of Object.entries(ptySessionsMeta)) {
+    if (!meta?.tmuxName) continue
+    if (ptySessions.get(sessionId)?.alive) continue
+    if (tmuxSessionAlive(meta.tmuxName)) continue
+
+    delete ptySessionsMeta[sessionId]
+    metaChanged = true
+
+    const jobFilePath = meta.jobFilePath
+    if (!jobFilePath || !fs.existsSync(jobFilePath)) continue
+
+    try {
+      const detail = parseJobFile(jobFilePath)
+      if (detail.session && detail.session !== sessionId) continue
+
+      let nextReason = null
+      if (detail.status === 'in_progress') {
+        writeJobStatus(jobFilePath, 'completed')
+        writeJobValidation(jobFilePath, 'needs_validation', null)
+        nextReason = 'orphaned_tmux_completed'
+      } else if (detail.status === 'completed' && (!detail.validation || detail.validation === 'none')) {
+        writeJobValidation(jobFilePath, 'needs_validation', null)
+        nextReason = 'orphaned_tmux_needs_validation'
+      }
+
+      const run = getLatestRunBySessionId(sessionId) || (detail.id ? getLatestRunByJobId(detail.id) : null)
+      if (run && [RUN_STATE.STARTING, RUN_STATE.RUNNING, RUN_STATE.STOPPING].includes(run.state)) {
+        transitionRun(run, RUN_STATE.AWAITING_VALIDATION, {
+          reason: 'orphaned_tmux_session',
+          validation: 'needs_validation',
+          force: true,
+        })
+      }
+
+      if (meta.repoName) {
+        const repoConfig = findRepoConfig(meta.repoName)
+        invalidateGitInfoCache(repoConfig?.resolvedPath)
+      }
+      if (nextReason && detail.id) {
+        emitJobsChanged({ repo: meta.repoName || detail.repo || null, id: detail.id, reason: nextReason })
+      }
+    } catch (err) {
+      console.error(`Failed to reconcile orphaned tmux session ${sessionId}:`, err.message)
+    }
+  }
+
+  if (metaChanged) savePtySessionsMeta()
+}
+
 function startPendingLaunch(session) {
   if (!session || session.launchStarted || !session.pendingLaunch) return
   const launch = session.pendingLaunch
@@ -2370,7 +2823,11 @@ function startPendingLaunch(session) {
     ? (shellCommand ? `${shellCommand}\n` : null)
     : launch.agent === 'codex'
       ? buildTrackedCodexCommand(launch)
-      : buildTrackedClaudeCommand(launch)
+      : launch.agent === 'cursor'
+        ? buildTrackedCursorCommand(launch)
+        : launch.agent === 'pi'
+          ? buildTrackedPiCommand(launch)
+        : buildTrackedClaudeCommand(launch)
   if (!command) return
   session.launchStarted = true
   if (launch.agent !== 'shell') {
@@ -2395,6 +2852,8 @@ function startPendingLaunch(session) {
   }
 }
 setInterval(garbageCollectSessions, SESSION_GC_INTERVAL_MS).unref()
+setInterval(reconcileOrphanedTmuxSessions, 15 * 1000).unref()
+reconcileOrphanedTmuxSessions()
 
 function createPtySession(sessionId, cwd, repoName, jobFilePath, initialScrollback = '', launch = null, pendingLaunch = null) {
   let spawnSpec = launch || { file: '/bin/zsh', args: ['--login'] }
@@ -2444,7 +2903,7 @@ function createPtySession(sessionId, cwd, repoName, jobFilePath, initialScrollba
     plainOutput: Boolean(pendingLaunch?.plainOutput),
     pendingLaunch: pendingLaunch || null,
     launchStarted: Boolean(launch),
-    resumeCommand: null,
+    resumeCommand: pendingLaunch?.agent === 'pi' ? buildResumePiCommand(pendingLaunch.piSessionPath) : null,
     resumeId: null,
     tmuxName: tmuxName || null,
     eventStore: createSessionEventStore({
@@ -2482,12 +2941,18 @@ function createPtySession(sessionId, cwd, repoName, jobFilePath, initialScrollba
         if (fs.existsSync(session.jobFilePath)) {
           const agent = parseJobFile(session.jobFilePath)
           const run = getLatestRunByJobId(agent.id) || getLatestRunBySessionId(sessionId)
-          const isKilled = session.killRequested || reason === 'killed'
+          const isStopped = session.killRequested || reason === 'killed'
+          const hasRateLimitError = session.eventStore?.summary?.lastErrorSubKind === 'rate_limit'
           if (run) {
-            if (isKilled) {
-              transitionRun(run, RUN_STATE.KILLED, { reason, validation: run.validation || 'none', force: true })
+            if (isStopped) {
+              const reviewValidation = run.validation === 'validated' || run.validation === 'rejected'
+                ? run.validation
+                : 'needs_validation'
+              transitionRun(run, RUN_STATE.KILLED, { reason, validation: reviewValidation, force: true })
             } else if (reason === 'write_error') {
               transitionRun(run, RUN_STATE.FAILED, { reason, validation: run.validation || 'none', force: true })
+            } else if (hasRateLimitError) {
+              transitionRun(run, RUN_STATE.FAILED, { reason: 'rate_limit', validation: run.validation || 'none', force: true })
             } else if (run.state !== RUN_STATE.AWAITING_VALIDATION) {
               transitionRun(run, RUN_STATE.AWAITING_VALIDATION, {
                 reason,
@@ -2497,18 +2962,15 @@ function createPtySession(sessionId, cwd, repoName, jobFilePath, initialScrollba
             }
           }
 
-          if (isKilled) {
-            if (agent.status !== 'killed') {
+          if (isStopped) {
+            if (agent.status !== 'stopped') {
               writeJobKill(session.jobFilePath)
             }
             if (session.repo) {
               const repoConfig = findRepoConfig(session.repo)
-              if (agent.worktreePath) {
-                try { removeJobWorktree(repoConfig?.resolvedPath, agent.id, { deleteBranch: true }) } catch {}
-              }
               invalidateGitInfoCache(repoConfig?.resolvedPath)
             }
-            emitJobsChanged({ repo: session.repo, id: agent.id, reason: `${reason}_killed` })
+            emitJobsChanged({ repo: session.repo, id: agent.id, reason: `${reason}_stopped` })
             return
           }
 
@@ -2527,7 +2989,15 @@ function createPtySession(sessionId, cwd, repoName, jobFilePath, initialScrollba
             return
           }
 
-          if (agent.status === 'in_progress') {
+          if (hasRateLimitError && agent.status === 'in_progress') {
+            writeJobStatus(session.jobFilePath, 'failed')
+            if (session.repo) {
+              const repoConfig = findRepoConfig(session.repo)
+              invalidateGitInfoCache(repoConfig?.resolvedPath)
+            }
+            emitJobsChanged({ repo: session.repo, id: agent.id, reason: 'rate_limit_failed' })
+            console.log(`Session end (${reason}): marked job file as failed (rate limit): ${session.jobFilePath}`)
+          } else if (agent.status === 'in_progress') {
             writeJobStatus(session.jobFilePath, 'completed')
             writeJobValidation(session.jobFilePath, 'needs_validation', null)
             if (session.repo) {
@@ -2587,15 +3057,20 @@ function createPtySession(sessionId, cwd, repoName, jobFilePath, initialScrollba
     }
 
     const stripped = stripAnsi(chunk)
-    // Capture resume command emitted by Claude so the job can be resumed later.
-    const cmdMatch = stripped.match(/(claude(?:\s+code)?\s+(?:resume|--resume)\s+(?:["'])?[A-Za-z0-9._:-]+(?:["'])?)/i)
+    // Capture resume commands emitted by supported agent CLIs so the job can be resumed later.
+    const cmdMatch = stripped.match(/((?:claude(?:\s+code)?|cursor-agent)\s+(?:resume|--resume)\s+(?:["'])?[A-Za-z0-9._:-]+(?:["'])?)/i)
     if (cmdMatch) {
       const nextResumeId = extractResumeId(cmdMatch[1])
       const headerDetail = session.jobFilePath && fs.existsSync(session.jobFilePath)
         ? parseJobFile(session.jobFilePath)
         : null
-      const resumeFlags = headerDetail?.skipPermissions ? ' --dangerously-skip-permissions' : ''
-      const nextResumeCommand = buildResumeClaudeCommand(nextResumeId, resumeFlags)
+      const sessionAgent = headerDetail?.agent || session.pendingLaunch?.agent || 'claude'
+      const resumeFlags = sessionAgent === 'cursor'
+        ? (headerDetail?.skipPermissions ? ' --force' : '')
+        : (headerDetail?.skipPermissions ? ' --dangerously-skip-permissions' : '')
+      const nextResumeCommand = sessionAgent === 'cursor'
+        ? buildCursorResumeCommand(nextResumeId, resumeFlags)
+        : buildResumeClaudeCommand(nextResumeId, resumeFlags)
       if (nextResumeCommand && nextResumeCommand !== session.resumeCommand) {
         session.resumeCommand = nextResumeCommand
         session.resumeId = nextResumeId
@@ -2764,6 +3239,12 @@ wss = new WebSocketServer({
   server,
   path: '/ws/terminal',
   verifyClient({ req }, done) {
+    if (DISPATCH_API_KEY) {
+      const key = extractApiKeyFromWsRequest(req)
+      if (!apiKeyMatches(key)) {
+        return done(false, 401, 'Unauthorized')
+      }
+    }
     const origin = req.headers.origin || ''
     // Allow connections with no origin (non-browser clients, curl, server hooks)
     if (!origin || ALLOWED_ORIGINS.has(origin)) {
diff --git a/dashboard/src/App.jsx b/dashboard/src/App.jsx
index 11addb8..cb6c68c 100644
--- a/dashboard/src/App.jsx
+++ b/dashboard/src/App.jsx
@@ -62,6 +62,7 @@ export default function App() {
     handleNavChange,
     openJobDetail,
     openLoopDetail,
+    openLoopBySession,
     openDispatch,
     closeJobDetail,
   } = useAppNavigation()
@@ -141,6 +142,17 @@ export default function App() {
     await startTaskSession(taskText, repo, { originalTask, baseBranch, model, maxTurns, autoMerge, useWorktree, plainOutput, skipPermissions, agent: agentId, planSlug, skills })
   }, [startTaskSession, settings])
 
+  const handleLoopDispatch = useCallback(async (body) => {
+    const res = await fetch('/api/loops/init', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(body),
+    })
+    const data = await res.json().catch(() => ({}))
+    if (!res.ok) throw new Error(data.error || 'Loop launch failed')
+    if (data.sessionId) openLoopBySession(data.sessionId)
+  }, [openLoopBySession])
+
   const handleResumeJob = useCallback(async (jobId) => {
     const sessionId = await resumeJobSession(jobId)
     if (!sessionId) return
@@ -257,9 +269,12 @@ export default function App() {
                     sessionRecords={sessionRecordsForNav}
                     overview={overview.data}
                     onSelectJob={openJobDetail}
+                    onJobsRefresh={jobs.refresh}
+                    showToast={showToast}
                   />
                 </ScrollableView>
               } />
+              <Route path="/loops/session/:sessionId" element={loopDetailElement} />
               <Route path="/loops/:loopType/:timestamp" element={loopDetailElement} />
               <Route path="/loops" element={
                 <ScrollableView>
@@ -267,7 +282,6 @@ export default function App() {
                     loops={loops.data}
                     overview={overview.data}
                     onSelectLoop={openLoopDetail}
-                    onSelectSession={openJobDetail}
                   />
                 </ScrollableView>
               } />
@@ -308,6 +322,7 @@ export default function App() {
                   <DispatchView
                     overview={overview.data}
                     onDispatch={handleDispatch}
+                    onLoopDispatch={handleLoopDispatch}
                     initialRepo={dispatchPreFill?.repo || null}
                     initialPrompt={dispatchPreFill?.prompt || null}
                     initialPlanSlug={dispatchPreFill?.planSlug || null}
diff --git a/dashboard/src/components/ActivityFeed.jsx b/dashboard/src/components/ActivityFeed.jsx
index 7b176eb..40c08c5 100644
--- a/dashboard/src/components/ActivityFeed.jsx
+++ b/dashboard/src/components/ActivityFeed.jsx
@@ -25,6 +25,7 @@ function inferActivityType(text) {
   if (t.includes('failed') || t.includes('error') || t.includes('killed')) return 'failed'
   if (t.includes('started') || t.includes('running') || t.includes('in progress')) return 'started'
   if (t.includes('completed') || t.includes('done') || t.includes('validated')) return 'completed'
+  if (t.includes('stopped')) return 'updated'
   return 'updated'
 }
 
diff --git a/dashboard/src/components/AgentIcon.jsx b/dashboard/src/components/AgentIcon.jsx
index 6972ca0..b8e9317 100644
--- a/dashboard/src/components/AgentIcon.jsx
+++ b/dashboard/src/components/AgentIcon.jsx
@@ -7,6 +7,7 @@ function labelForAgent(agentId) {
   const normalized = normalizeAgentId(agentId)
   if (normalized === 'codex') return 'Codex'
   if (normalized === 'cursor') return 'Cursor'
+  if (normalized === 'pi') return 'Pi'
   return 'Claude'
 }
 
@@ -43,6 +44,32 @@ export default function AgentIcon({ agent = 'claude', size = 14, className, colo
     )
   }
 
+  if (normalizedAgent === 'pi') {
+    return (
+      <svg
+        viewBox="0 0 800 800"
+        width={size}
+        height={size}
+        title={title || `${label} icon`}
+        className={cn('shrink-0', className)}
+        style={{ color: color || getAgentBrandColor(normalizedAgent), ...style }}
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          fill="currentColor"
+          fillRule="evenodd"
+          d="M165.29 165.29H517.36V400H400V517.36H282.65V634.72H165.29ZM282.65 282.65V400H400V282.65Z"
+          clipRule="evenodd"
+        />
+        <path
+          fill="currentColor"
+          d="M517.36 400H634.72V634.72H517.36Z"
+        />
+      </svg>
+    )
+  }
+
   return (
     <Sparkles
       size={size}
diff --git a/dashboard/src/components/AgentModelPicker.jsx b/dashboard/src/components/AgentModelPicker.jsx
new file mode 100644
index 0000000..b078379
--- /dev/null
+++ b/dashboard/src/components/AgentModelPicker.jsx
@@ -0,0 +1,70 @@
+import { useEffect } from 'react'
+import { Code2, ScanSearch, GitFork } from 'lucide-react'
+import { cn } from '../lib/utils'
+import { AGENT_OPTIONS, getAgentBrandColor } from '../lib/constants'
+import { useAgentModels } from '../lib/useAgentModels'
+import AgentIcon from './AgentIcon'
+
+export const LOOP_TYPES = [
+  { id: 'linear-implementation', label: 'Linear Impl',     icon: Code2 },
+  { id: 'linear-review',         label: 'Linear Review',   icon: ScanSearch },
+  { id: 'parallel-review',       label: 'Parallel Review', icon: GitFork },
+]
+
+/** Compact agent + model picker — mirrors DispatchSettingsRow's Agent+Model section */
+export function AgentModelPicker({ label, value, onChange }) {
+  const models = useAgentModels(value.agent)
+
+  // Snap model to first option when agent changes and current model isn't valid
+  useEffect(() => {
+    if (models.length > 0 && !models.find(m => m.value === value.model)) {
+      onChange({ ...value, model: models[0].value })
+    }
+  }, [models, onChange, value])
+
+  return (
+    <div>
+      {label && <label className="block text-[11px] font-medium text-muted-foreground mb-1">{label}</label>}
+      <div className="flex items-center gap-1.5">
+        <div className="flex gap-1">
+          {AGENT_OPTIONS.map(opt => {
+            const isSelected = value.agent === opt.id
+            const brandColor = getAgentBrandColor(opt.id)
+            return (
+              <button
+                key={opt.id}
+                type="button"
+                onClick={() => onChange({ agent: opt.id, model: '' })}
+                style={isSelected ? { color: brandColor, borderColor: `${brandColor}40`, backgroundColor: `${brandColor}18` } : undefined}
+                className={cn(
+                  'flex items-center gap-1.5 px-2 py-1 rounded-md text-[12px] font-medium border transition-colors',
+                  isSelected
+                    ? 'border-transparent'
+                    : 'border-border bg-card text-muted-foreground hover:text-foreground hover:bg-card-hover'
+                )}
+              >
+                <AgentIcon agent={opt.id} size={12} />
+                {opt.label}
+              </button>
+            )
+          })}
+        </div>
+        <select
+          value={value.model}
+          onChange={e => onChange({ ...value, model: e.target.value })}
+          className="h-8 px-2.5 rounded-md border border-border bg-card text-[12px] text-foreground focus:outline-none focus:border-primary/30 w-44"
+        >
+          {models.map(m => <option key={m.value} value={m.value}>{m.label}</option>)}
+        </select>
+      </div>
+    </div>
+  )
+}
+
+export function defaultAgentModel() {
+  return { agent: 'claude', model: '' }
+}
+
+export function fmtAgent({ agent, model }) {
+  return model ? `${agent}:${model}` : agent
+}
diff --git a/dashboard/src/components/AllTasksView.jsx b/dashboard/src/components/AllTasksView.jsx
index ab2d58a..cbe58eb 100644
--- a/dashboard/src/components/AllTasksView.jsx
+++ b/dashboard/src/components/AllTasksView.jsx
@@ -29,7 +29,7 @@ function deriveStatus(task, repoName, agentTerminals, jobAgents) {
   // Prefer canonical job status from the server over local session heuristics.
   if (jobAgents) {
     for (const agent of jobAgents) {
-      if (agent.repo === repoName && agent.validation === 'needs_validation') {
+      if (agent.repo === repoName && (agent.validation === 'needs_validation' || agent.status === 'stopped')) {
         const match = agent.taskName?.toLowerCase().includes(task.text.toLowerCase().slice(0, 30)) ||
           task.text.toLowerCase().includes(agent.taskName?.toLowerCase()?.slice(0, 30) || '')
         if (match) return { status: 'review', jobId: agent.id }
diff --git a/dashboard/src/components/DispatchSettingsRow.jsx b/dashboard/src/components/DispatchSettingsRow.jsx
index e175e05..20a4508 100644
--- a/dashboard/src/components/DispatchSettingsRow.jsx
+++ b/dashboard/src/components/DispatchSettingsRow.jsx
@@ -15,7 +15,7 @@ export default function DispatchSettingsRow({
   autoMerge, setAutoMerge,
   plainOutput, setPlainOutput,
 }) {
-  const isCodex = agent === 'codex'
+  const turnsUnsupported = agent === 'codex' || agent === 'cursor' || agent === 'pi'
   return (
     <>
       {/* Agent selector */}
@@ -67,14 +67,14 @@ export default function DispatchSettingsRow({
           type="number"
           min={1}
           max={200}
-          value={isCodex ? '' : (maxTurns ?? '')}
-          disabled={isCodex}
+          value={turnsUnsupported ? '' : (maxTurns ?? '')}
+          disabled={turnsUnsupported}
           onChange={(e) => setMaxTurns(parseInt(e.target.value) || 10)}
-          placeholder={isCodex ? 'N/A' : '10'}
-          title={isCodex ? 'N/A for Codex' : undefined}
+          placeholder={turnsUnsupported ? 'N/A' : '10'}
+          title={turnsUnsupported ? `N/A for ${agent === 'cursor' ? 'Cursor' : agent === 'pi' ? 'Pi' : 'Codex'}` : undefined}
           className={cn(
             'w-full h-8 px-2.5 rounded-md border border-border bg-card text-[12px] text-foreground font-mono focus:outline-none focus:border-primary/30',
-            isCodex && 'opacity-40 cursor-not-allowed'
+            turnsUnsupported && 'opacity-40 cursor-not-allowed'
           )}
           style={{ fontFamily: 'var(--font-mono)' }}
         />
@@ -87,7 +87,13 @@ export default function DispatchSettingsRow({
           <Toggle
             checked={!plainOutput}
             onChange={(val) => setPlainOutput(!val)}
-            title={isCodex ? 'TUI mode — off adds --quiet' : 'TUI mode — off adds -p --output-format text'}
+            title={agent === 'codex'
+              ? 'TUI mode — off adds --color never'
+              : agent === 'cursor'
+                ? 'TUI mode — off adds --print --output-format text'
+                : agent === 'pi'
+                  ? 'TUI mode — off adds -p'
+                : 'TUI mode — off adds -p --output-format text'}
           />
         </div>
       </div>
diff --git a/dashboard/src/components/DispatchView.jsx b/dashboard/src/components/DispatchView.jsx
index e1b8f72..8a823d8 100644
--- a/dashboard/src/components/DispatchView.jsx
+++ b/dashboard/src/components/DispatchView.jsx
@@ -1,11 +1,12 @@
-import { useState, useEffect, useRef } from 'react'
-import { Send, FileText, X } from 'lucide-react'
+import { useState, useEffect, useRef, useCallback } from 'react'
+import { Send, FileText, X, RefreshCcw } from 'lucide-react'
 import { cn } from '../lib/utils'
 import { repoIdentityColors } from '../lib/constants'
 import { useAgentModels } from '../lib/useAgentModels'
 import { useSkills } from '../lib/useSkills'
 import DispatchSettingsRow from './DispatchSettingsRow'
 import SkillsSelector from './SkillsSelector'
+import { AgentModelPicker, LOOP_TYPES, defaultAgentModel, fmtAgent } from './AgentModelPicker'
 
 function readSaved() {
   try { return JSON.parse(localStorage.getItem('dispatch-settings')) || {} }
@@ -19,7 +20,7 @@ function writeSaved(patch) {
   } catch {}
 }
 
-export default function DispatchView({ overview, onDispatch, initialRepo, initialPrompt, initialPlanSlug, initialSkills, onDispatchComplete, settings }) {
+export default function DispatchView({ overview, onDispatch, onLoopDispatch, initialRepo, initialPrompt, initialPlanSlug, initialSkills, onDispatchComplete, settings }) {
   const repos = overview?.repos || []
 
   // Read from localStorage once on mount (sync, before useState defaults)
@@ -29,6 +30,7 @@ export default function DispatchView({ overview, onDispatch, initialRepo, initia
 
   const agentSettings = settings?.agents || {}
 
+  const [mode, setMode] = useState(() => s.dispatchMode || 'task')
   const [agent, setAgent] = useState(s.agent || 'claude')
   const [repo, setRepo] = useState(initialRepo || s.repo || repos[0]?.name || '')
   const [baseBranch, setBaseBranch] = useState('')
@@ -42,7 +44,16 @@ export default function DispatchView({ overview, onDispatch, initialRepo, initia
   const [btnPhase, setBtnPhase] = useState('idle') // idle | shaking | sliding | hidden | returning
   const [dispatchError, setDispatchError] = useState(null)
 
-  const isCodex = agent === 'codex'
+  // Loop mode state
+  const [loopType, setLoopType] = useState(s.loopType || 'linear-implementation')
+  const [loopPrompt, setLoopPrompt] = useState('')
+  const [loopAgentSpec, setLoopAgentSpec] = useState(defaultAgentModel())
+  const [reviewers, setReviewers] = useState([defaultAgentModel()])
+  const [synthesizer, setSynthesizer] = useState(defaultAgentModel())
+  const [implementor, setImplementor] = useState(defaultAgentModel())
+  const [loopBtnPhase, setLoopBtnPhase] = useState('idle')
+
+  const turnsUnsupported = agent === 'codex' || agent === 'cursor' || agent === 'pi'
   const models = useAgentModels(agent)
   const availableSkills = useSkills()
 
@@ -86,6 +97,8 @@ export default function DispatchView({ overview, onDispatch, initialRepo, initia
   useEffect(() => { writeSaved({ useWorktree }) }, [useWorktree])
   useEffect(() => { writeSaved({ plainOutput }) }, [plainOutput])
   useEffect(() => { writeSaved({ prompt }) }, [prompt])
+  useEffect(() => { writeSaved({ dispatchMode: mode }) }, [mode])
+  useEffect(() => { writeSaved({ loopType }) }, [loopType])
 
   // Set default repo once repos load (overview may not be ready on first render)
   useEffect(() => {
@@ -108,11 +121,27 @@ export default function DispatchView({ overview, onDispatch, initialRepo, initia
     if (sanitized.length !== selectedSkills.length) setSelectedSkills(sanitized)
   }, [availableSkills, selectedSkills])
 
+  // Load loop prompt when repo or loopType changes (loop mode)
+  useEffect(() => {
+    if (mode !== 'loop' || !repo || !loopType) return
+    let cancelled = false
+    fetch(`/api/loops/${encodeURIComponent(repo)}/prompt?type=${encodeURIComponent(loopType)}`)
+      .then(async (r) => {
+        const data = await r.json().catch(() => ({}))
+        if (!r.ok) throw new Error(data.error || 'Failed to load loop prompt')
+        return data
+      })
+      .then(d => { if (!cancelled) setLoopPrompt(d.content || '') })
+      .catch(() => { if (!cancelled) setLoopPrompt('') })
+    return () => { cancelled = true }
+  }, [repo, loopType, mode])
+
   const selectedRepo = repos.find(r => r.name === repo)
   const defaultBranch = selectedRepo?.git?.branch || 'main'
   const branchOptions = selectedRepo?.git?.branches || []
 
   const isReady = repo && (planSlug || prompt.trim())
+  const isLoopReady = Boolean(repo && loopPrompt.trim())
 
   async function handleDispatch(e) {
     e.preventDefault()
@@ -138,7 +167,7 @@ export default function DispatchView({ overview, onDispatch, initialRepo, initia
         originalTask: initialPrompt || null,
         baseBranch: baseBranch.trim() || defaultBranch,
         model,
-        maxTurns: isCodex ? null : maxTurns,
+      maxTurns: turnsUnsupported ? null : maxTurns,
         autoMerge,
         useWorktree,
         plainOutput,
@@ -160,173 +189,357 @@ export default function DispatchView({ overview, onDispatch, initialRepo, initia
     }
   }
 
+  const handleLoopLaunch = useCallback(async () => {
+    if (!isLoopReady || loopBtnPhase !== 'idle') return
+    if (!loopPrompt.trim()) {
+      setDispatchError('Loop prompt is required')
+      return
+    }
+    setDispatchError(null)
+
+    setLoopBtnPhase('shaking')
+    setTimeout(() => setLoopBtnPhase('sliding'), 400)
+    setTimeout(() => setLoopBtnPhase('hidden'), 800)
+
+    try {
+      const body = { repo, loopType, promptContent: loopPrompt }
+      if (loopType === 'parallel-review') {
+        body.reviewerAgents = reviewers.map(fmtAgent)
+        body.synthesizerAgent = fmtAgent(synthesizer)
+        body.implementorAgent = fmtAgent(implementor)
+      } else {
+        body.agentSpec = fmtAgent(loopAgentSpec)
+      }
+      await onLoopDispatch?.(body)
+      setTimeout(() => setLoopBtnPhase('returning'), 1800)
+      setTimeout(() => setLoopBtnPhase('idle'), 2400)
+    } catch (err) {
+      console.error('Loop launch failed:', err)
+      setLoopBtnPhase('idle')
+      setDispatchError(err.message)
+    }
+  }, [repo, loopType, loopPrompt, loopAgentSpec, reviewers, synthesizer, implementor, onLoopDispatch, isLoopReady, loopBtnPhase])
+
+  const repoChips = (
+    <div>
+      <label className="block text-[11px] font-medium text-muted-foreground mb-1">Repository</label>
+      <div className="flex gap-1.5 flex-wrap">
+        {repos.map(r => {
+          const color = repoIdentityColors[r.name] || 'var(--primary)'
+          const isSelected = repo === r.name
+          return (
+            <button
+              key={r.name}
+              type="button"
+              onClick={() => { setRepo(r.name); setBaseBranch('') }}
+              className={cn(
+                'px-2.5 py-1 rounded-md text-[12px] font-medium capitalize border transition-all',
+                isSelected
+                  ? 'border-primary/40 bg-primary/10 text-foreground'
+                  : 'border-border bg-card text-muted-foreground hover:text-foreground hover:bg-card-hover'
+              )}
+              style={isSelected ? { borderColor: `${color}40`, backgroundColor: `${color}10` } : undefined}
+            >
+              <span className="inline-block w-1.5 h-1.5 rounded-full mr-1.5" style={{ background: color }} />
+              {r.name}
+            </button>
+          )
+        })}
+      </div>
+    </div>
+  )
+
+  function renderGlowButton({ isReadyFlag, phase, icon: Icon, label, onClick, type = 'button' }) {
+    return (
+      <div>
+        <div aria-hidden="true" className="text-[11px] mb-1 invisible select-none">·</div>
+        <div
+          className={cn(
+            'relative inline-flex items-center justify-center',
+            phase === 'idle' && 'transition-opacity duration-200',
+            phase === 'shaking' && 'animate-dispatch-shake',
+            phase === 'sliding' && 'animate-dispatch-btn-out',
+            phase === 'returning' && 'animate-dispatch-btn-in',
+          )}
+          style={{
+            opacity: !isReadyFlag && phase === 'idle' ? 0.4 : 1,
+            ...(phase === 'hidden' && { transform: 'translateX(400px)' }),
+          }}
+        >
+          <div
+            className="absolute inset-0 pointer-events-none transition-opacity duration-500"
+            style={{ opacity: isReadyFlag || phase !== 'idle' ? 1 : 0 }}
+          >
+            <div className="absolute pointer-events-none animate-loading-halo" style={{ width: '204px', height: '66px', background: '#8bab8f', borderRadius: '50%', filter: 'blur(35px)', top: 'calc(50% - 33px)', left: 'calc(50% - 102px)' }} />
+            <div className="absolute pointer-events-none animate-loading-glow" style={{ width: '108px', height: '38px', background: '#8bab8f', borderRadius: '50%', filter: 'blur(19px)', top: 'calc(50% - 19px)', left: 'calc(50% - 54px)' }} />
+            <div className="absolute pointer-events-none animate-loading-glow-shift" style={{ width: '90px', height: '32px', background: '#7ea89a', borderRadius: '50%', filter: 'blur(17px)', top: 'calc(50% - 16px)', left: 'calc(50% - 45px)' }} />
+          </div>
+
+          <button
+            type={type}
+            onClick={onClick}
+            style={{
+              background: 'linear-gradient(135deg, #8bab8f 0%, #6d9472 100%)',
+              color: '#1a1b1e',
+              boxShadow: phase !== 'idle'
+                ? '0 0 18px 4px rgba(139,171,143,0.45)'
+                : '0 0 8px 2px rgba(139,171,143,0.18)',
+              transition: 'box-shadow 400ms ease',
+              cursor: !isReadyFlag && phase === 'idle' ? 'not-allowed' : 'pointer',
+            }}
+            className={cn(
+              'inline-flex items-center gap-2.5 pl-5 pr-6 h-10 rounded-full text-[13px] font-semibold shrink-0 relative z-10',
+              phase === 'idle' && 'transition-transform duration-150 ease-out hover:scale-105 active:scale-[0.97]',
+            )}
+          >
+            <Icon size={15} />
+            {label}
+          </button>
+        </div>
+      </div>
+    )
+  }
+
   return (
     <div>
-      <form onSubmit={handleDispatch} className="space-y-3">
-
-        {/* Repo row */}
-        <div>
-          <label className="block text-[11px] font-medium text-muted-foreground mb-1">Repository</label>
-          <div className="flex gap-1.5 flex-wrap">
-            {repos.map(r => {
-              const color = repoIdentityColors[r.name] || 'var(--primary)'
-              const isSelected = repo === r.name
-              return (
+      {/* Mode toggle */}
+      <div className="flex items-center gap-1.5 mb-4">
+        <button
+          type="button"
+          onClick={() => setMode('task')}
+          className={cn(
+            'flex items-center gap-1.5 px-2.5 py-1 rounded-md text-[12px] font-medium border transition-all',
+            mode === 'task'
+              ? 'border-primary/40 bg-primary/10 text-foreground'
+              : 'border-border bg-card text-muted-foreground hover:text-foreground hover:bg-card-hover'
+          )}
+          style={mode === 'task' ? { borderColor: 'rgba(139,171,143,0.4)', backgroundColor: 'rgba(139,171,143,0.1)' } : undefined}
+        >
+          <Send size={11} />
+          Task
+        </button>
+        <button
+          type="button"
+          onClick={() => setMode('loop')}
+          className={cn(
+            'flex items-center gap-1.5 px-2.5 py-1 rounded-md text-[12px] font-medium border transition-all',
+            mode === 'loop'
+              ? 'border-primary/40 bg-primary/10 text-foreground'
+              : 'border-border bg-card text-muted-foreground hover:text-foreground hover:bg-card-hover'
+          )}
+          style={mode === 'loop' ? { borderColor: 'rgba(139,171,143,0.4)', backgroundColor: 'rgba(139,171,143,0.1)' } : undefined}
+        >
+          <RefreshCcw size={11} />
+          Loop
+        </button>
+      </div>
+
+      {mode === 'task' ? (
+        /* ── Task mode (existing form) ── */
+        <form onSubmit={handleDispatch} className="space-y-3">
+          {repoChips}
+
+          {/* Branch row */}
+          <div className="flex items-end gap-3">
+            <div className="w-44 shrink-0">
+              <label htmlFor="dispatch-branch" className="block text-[11px] font-medium text-muted-foreground mb-1">
+                Branch
+              </label>
+              <select
+                id="dispatch-branch"
+                value={baseBranch || defaultBranch}
+                onChange={(e) => setBaseBranch(e.target.value)}
+                className="w-full h-8 px-2.5 rounded-md border border-border bg-card text-[12px] text-foreground focus:outline-none focus:border-primary/30"
+              >
+                {branchOptions.length > 0 ? (
+                  branchOptions.map(b => (
+                    <option key={b} value={b}>{b}</option>
+                  ))
+                ) : (
+                  <option value={defaultBranch}>{defaultBranch}</option>
+                )}
+              </select>
+            </div>
+          </div>
+
+          <SkillsSelector
+            skills={availableSkills}
+            selectedSkillIds={selectedSkills}
+            onChange={setSelectedSkills}
+          />
+
+          {/* Plan chip */}
+          {planSlug && (
+            <div>
+              <label className="block text-[11px] font-medium text-muted-foreground mb-1">Plan</label>
+              <div className="inline-flex items-center gap-2 h-8 pl-2.5 pr-2 rounded-md border border-border bg-card max-w-full">
+                <FileText size={12} className="text-muted-foreground/60 shrink-0" />
+                <span
+                  className="text-[12px] text-foreground/70 truncate"
+                  style={{ fontFamily: 'var(--font-mono)' }}
+                >
+                  plans/{planSlug}.md
+                </span>
                 <button
-                  key={r.name}
                   type="button"
-                  onClick={() => { setRepo(r.name); setBaseBranch('') }}
-                  className={cn(
-                    'px-2.5 py-1 rounded-md text-[12px] font-medium capitalize border transition-all',
-                    isSelected
-                      ? 'border-primary/40 bg-primary/10 text-foreground'
-                      : 'border-border bg-card text-muted-foreground hover:text-foreground hover:bg-card-hover'
-                  )}
-                  style={isSelected ? { borderColor: `${color}40`, backgroundColor: `${color}10` } : undefined}
+                  onClick={() => setPlanSlug(null)}
+                  className="ml-1 text-muted-foreground/40 hover:text-muted-foreground transition-colors shrink-0"
+                  title="Remove plan reference"
                 >
-                  <span className="inline-block w-1.5 h-1.5 rounded-full mr-1.5" style={{ background: color }} />
-                  {r.name}
+                  <X size={12} />
                 </button>
-              )
-            })}
-          </div>
-        </div>
+              </div>
+            </div>
+          )}
 
-        {/* Branch row */}
-        <div className="flex items-end gap-3">
-          <div className="w-44 shrink-0">
-            <label htmlFor="dispatch-branch" className="block text-[11px] font-medium text-muted-foreground mb-1">
-              Branch
+          {/* Prompt */}
+          <div>
+            <label htmlFor="dispatch-prompt" className="block text-[11px] font-medium text-muted-foreground mb-1">
+              {planSlug ? 'Additional Instructions' : 'Task Prompt'}
             </label>
-            <select
-              id="dispatch-branch"
-              value={baseBranch || defaultBranch}
-              onChange={(e) => setBaseBranch(e.target.value)}
-              className="w-full h-8 px-2.5 rounded-md border border-border bg-card text-[12px] text-foreground focus:outline-none focus:border-primary/30"
-            >
-              {branchOptions.length > 0 ? (
-                branchOptions.map(b => (
-                  <option key={b} value={b}>{b}</option>
-                ))
-              ) : (
-                <option value={defaultBranch}>{defaultBranch}</option>
+            <textarea
+              id="dispatch-prompt"
+              value={prompt}
+              onChange={(e) => setPrompt(e.target.value)}
+              placeholder={planSlug ? 'Additional instructions (optional)...' : 'Describe the task for the worker...'}
+              rows={planSlug ? 3 : 4}
+              className={cn(
+                'w-full px-3 py-2 rounded-md border border-border bg-card',
+                'text-[13px] text-foreground placeholder:text-muted-foreground/40 leading-relaxed',
+                'focus:outline-none focus:border-primary/30 focus:ring-1 focus:ring-primary/10',
+                'resize-y'
               )}
-            </select>
+            />
           </div>
-        </div>
 
-        <SkillsSelector
-          skills={availableSkills}
-          selectedSkillIds={selectedSkills}
-          onChange={setSelectedSkills}
-        />
+          {/* Agent + Model + Turns + TUI + Auto-merge + Worktree + Submit */}
+          <div className="flex items-start gap-3 flex-wrap">
+            <DispatchSettingsRow
+              agent={agent} onSwitchAgent={switchAgent}
+              model={model} setModel={setModel} models={models}
+              maxTurns={maxTurns} setMaxTurns={setMaxTurns}
+              useWorktree={useWorktree} setUseWorktree={setUseWorktree}
+              autoMerge={autoMerge} setAutoMerge={setAutoMerge}
+              plainOutput={plainOutput} setPlainOutput={setPlainOutput}
+            />
+
+            <div className="flex-1" />
 
-        {/* Plan chip */}
-        {planSlug && (
+            {renderGlowButton({
+              isReadyFlag: isReady,
+              phase: btnPhase,
+              icon: Send,
+              label: 'Dispatch',
+              type: 'submit',
+            })}
+          </div>
+        </form>
+      ) : (
+        /* ── Loop mode ── */
+        <div className="space-y-3">
+          {repoChips}
+
+          {/* Loop type */}
           <div>
-            <label className="block text-[11px] font-medium text-muted-foreground mb-1">Plan</label>
-            <div className="inline-flex items-center gap-2 h-8 pl-2.5 pr-2 rounded-md border border-border bg-card max-w-full">
-              <FileText size={12} className="text-muted-foreground/60 shrink-0" />
-              <span
-                className="text-[12px] text-foreground/70 truncate"
-                style={{ fontFamily: 'var(--font-mono)' }}
-              >
-                plans/{planSlug}.md
-              </span>
-              <button
-                type="button"
-                onClick={() => setPlanSlug(null)}
-                className="ml-1 text-muted-foreground/40 hover:text-muted-foreground transition-colors shrink-0"
-                title="Remove plan reference"
-              >
-                <X size={12} />
-              </button>
+            <label className="block text-[11px] font-medium text-muted-foreground mb-1">Loop Type</label>
+            <div className="flex gap-1.5 flex-wrap">
+              {LOOP_TYPES.map(lt => {
+                const isSelected = loopType === lt.id
+                const Icon = lt.icon
+                return (
+                  <button
+                    key={lt.id}
+                    type="button"
+                    onClick={() => setLoopType(lt.id)}
+                    className={cn(
+                      'flex items-center gap-1.5 px-2.5 py-1 rounded-md text-[12px] font-medium border transition-all',
+                      isSelected
+                        ? 'border-primary/40 bg-primary/10 text-foreground'
+                        : 'border-border bg-card text-muted-foreground hover:text-foreground hover:bg-card-hover'
+                    )}
+                    style={isSelected ? { borderColor: 'rgba(139,171,143,0.4)', backgroundColor: 'rgba(139,171,143,0.1)' } : undefined}
+                  >
+                    <Icon size={11} />
+                    {lt.label}
+                  </button>
+                )
+              })}
             </div>
           </div>
-        )}
-
-        {/* Prompt */}
-        <div>
-          <label htmlFor="dispatch-prompt" className="block text-[11px] font-medium text-muted-foreground mb-1">
-            {planSlug ? 'Additional Instructions' : 'Task Prompt'}
-          </label>
-          <textarea
-            id="dispatch-prompt"
-            value={prompt}
-            onChange={(e) => setPrompt(e.target.value)}
-            placeholder={planSlug ? 'Additional instructions (optional)...' : 'Describe the task for the worker...'}
-            rows={planSlug ? 3 : 4}
-            className={cn(
-              'w-full px-3 py-2 rounded-md border border-border bg-card',
-              'text-[13px] text-foreground placeholder:text-muted-foreground/40 leading-relaxed',
-              'focus:outline-none focus:border-primary/30 focus:ring-1 focus:ring-primary/10',
-              'resize-y'
-            )}
-          />
-        </div>
-
-        {/* Agent + Model + Turns + TUI + Auto-merge + Worktree + Submit */}
-        <div className="flex items-start gap-3 flex-wrap">
-          <DispatchSettingsRow
-            agent={agent} onSwitchAgent={switchAgent}
-            model={model} setModel={setModel} models={models}
-            maxTurns={maxTurns} setMaxTurns={setMaxTurns}
-            useWorktree={useWorktree} setUseWorktree={setUseWorktree}
-            autoMerge={autoMerge} setAutoMerge={setAutoMerge}
-            plainOutput={plainOutput} setPlainOutput={setPlainOutput}
-          />
-
-          <div className="flex-1" />
 
+          {/* Prompt */}
           <div>
-            <div aria-hidden="true" className="text-[11px] mb-1 invisible select-none">·</div>
-            {/* Wrapper carries glow + button together through animations */}
-            <div
+            <label className="block text-[11px] font-medium text-muted-foreground mb-1">Prompt</label>
+            <textarea
+              value={loopPrompt}
+              onChange={e => setLoopPrompt(e.target.value)}
+              rows={5}
               className={cn(
-                'relative inline-flex items-center justify-center',
-                btnPhase === 'idle' && 'transition-opacity duration-200',
-                btnPhase === 'shaking' && 'animate-dispatch-shake',
-                btnPhase === 'sliding' && 'animate-dispatch-btn-out',
-                btnPhase === 'returning' && 'animate-dispatch-btn-in',
+                'w-full px-3 py-2 rounded-md border border-border bg-card',
+                'text-[13px] text-foreground placeholder:text-muted-foreground/40 leading-relaxed',
+                'focus:outline-none focus:border-primary/30 focus:ring-1 focus:ring-primary/10',
+                'resize-y'
               )}
-              style={{
-                opacity: !isReady && btnPhase === 'idle' ? 0.4 : 1,
-                ...(btnPhase === 'hidden' && { transform: 'translateX(400px)' }),
-              }}
-            >
-              {/* Glow layers — fade in when button is ready, out when disabled */}
-              <div
-                className="absolute inset-0 pointer-events-none transition-opacity duration-500"
-                style={{ opacity: isReady || btnPhase !== 'idle' ? 1 : 0 }}
-              >
-                <div className="absolute pointer-events-none animate-loading-halo" style={{ width: '204px', height: '66px', background: '#8bab8f', borderRadius: '50%', filter: 'blur(35px)', top: 'calc(50% - 33px)', left: 'calc(50% - 102px)' }} />
-                <div className="absolute pointer-events-none animate-loading-glow" style={{ width: '108px', height: '38px', background: '#8bab8f', borderRadius: '50%', filter: 'blur(19px)', top: 'calc(50% - 19px)', left: 'calc(50% - 54px)' }} />
-                <div className="absolute pointer-events-none animate-loading-glow-shift" style={{ width: '90px', height: '32px', background: '#7ea89a', borderRadius: '50%', filter: 'blur(17px)', top: 'calc(50% - 16px)', left: 'calc(50% - 45px)' }} />
+              placeholder="Describe the task for the loop..."
+            />
+          </div>
+
+          {/* Agent picker for linear types */}
+          {loopType !== 'parallel-review' && (
+            <AgentModelPicker label="Agent" value={loopAgentSpec} onChange={setLoopAgentSpec} />
+          )}
+
+          {/* Parallel-review agent pickers */}
+          {loopType === 'parallel-review' && (
+            <div className="space-y-3">
+              <div>
+                <label className="block text-[11px] font-medium text-muted-foreground mb-2">Reviewer Agents</label>
+                <div className="space-y-2">
+                  {reviewers.map((r, i) => (
+                    <div key={i} className="flex items-end gap-2">
+                      <AgentModelPicker
+                        value={r}
+                        onChange={v => { const next = [...reviewers]; next[i] = v; setReviewers(next) }}
+                      />
+                      {reviewers.length > 1 && (
+                        <button
+                          type="button"
+                          onClick={() => setReviewers(reviewers.filter((_, j) => j !== i))}
+                          className="h-8 px-2.5 rounded-md border border-border text-[11px] text-muted-foreground hover:text-foreground hover:bg-card-hover transition-colors shrink-0"
+                        >
+                          Remove
+                        </button>
+                      )}
+                    </div>
+                  ))}
+                  <button
+                    type="button"
+                    onClick={() => setReviewers([...reviewers, defaultAgentModel()])}
+                    className="text-[11px] text-muted-foreground hover:text-foreground transition-colors"
+                  >
+                    + Add reviewer
+                  </button>
+                </div>
               </div>
 
-              <button
-                type="submit"
-                style={{
-                  background: 'linear-gradient(135deg, #8bab8f 0%, #6d9472 100%)',
-                  color: '#1a1b1e',
-                  boxShadow: btnPhase !== 'idle'
-                    ? '0 0 18px 4px rgba(139,171,143,0.45)'
-                    : '0 0 8px 2px rgba(139,171,143,0.18)',
-                  transition: 'box-shadow 400ms ease',
-                  cursor: !isReady && btnPhase === 'idle' ? 'not-allowed' : 'pointer',
-                }}
-                className={cn(
-                  'inline-flex items-center gap-2.5 pl-5 pr-6 h-10 rounded-full text-[13px] font-semibold shrink-0 relative z-10',
-                  btnPhase === 'idle' && 'transition-transform duration-150 ease-out hover:scale-105 active:scale-[0.97]',
-                )}
-              >
-                <Send size={15} />
-                Dispatch
-              </button>
+              <AgentModelPicker label="Synthesizer" value={synthesizer} onChange={setSynthesizer} />
+              <AgentModelPicker label="Implementor" value={implementor} onChange={setImplementor} />
             </div>
+          )}
+
+          {/* Glow dispatch button */}
+          <div className="flex justify-end">
+            {renderGlowButton({
+              isReadyFlag: isLoopReady,
+              phase: loopBtnPhase,
+              icon: RefreshCcw,
+              label: 'Dispatch',
+              onClick: handleLoopLaunch,
+            })}
           </div>
         </div>
-      </form>
+      )}
+
       {dispatchError && (
         <div className="mt-3 px-3 py-2 rounded-md border border-red-500/30 bg-red-500/10 text-[12px] text-red-400">
           {dispatchError}
diff --git a/dashboard/src/components/JobDetailView.jsx b/dashboard/src/components/JobDetailView.jsx
index 8305da3..54c5ea8 100644
--- a/dashboard/src/components/JobDetailView.jsx
+++ b/dashboard/src/components/JobDetailView.jsx
@@ -1,5 +1,6 @@
 import { useState, useMemo, useEffect } from 'react'
-import { ArrowLeft, TerminalSquare, ClipboardCheck } from 'lucide-react'
+import { ArrowLeft, ArrowRight, TerminalSquare, ClipboardCheck } from 'lucide-react'
+import { Link } from 'react-router-dom'
 import { cn } from '../lib/utils'
 import { repoIdentityColors, normalizeAgentId, getAgentBrandColor } from '../lib/constants'
 import AgentIcon, { getAgentLabel } from './AgentIcon'
@@ -65,6 +66,20 @@ export default function JobDetailView({
     return jobs.find(agent => agent.session === jobId) || null
   }, [swarm, taskInfo?.jobFile?.fileName, jobId])
 
+  const previousJob = useMemo(() => {
+    const previousJobId = linkedJob?.previousJobId || null
+    if (!previousJobId) return null
+    const jobs = swarm?.agents || []
+    return jobs.find(agent => agent.id === previousJobId) || { id: previousJobId, taskName: previousJobId }
+  }, [swarm, linkedJob?.previousJobId])
+
+  const nextJob = useMemo(() => {
+    const nextJobId = linkedJob?.nextJobId || null
+    if (!nextJobId) return null
+    const jobs = swarm?.agents || []
+    return jobs.find(agent => agent.id === nextJobId) || { id: nextJobId, taskName: nextJobId }
+  }, [swarm, linkedJob?.nextJobId])
+
   const repoName = taskInfo?.repoName || runDevSession?.repoName || linkedJob?.repo || ''
   const repoColor = repoIdentityColors[repoName] || 'var(--primary)'
 
@@ -187,6 +202,35 @@ export default function JobDetailView({
         </div>
       </div>
 
+      {(previousJob || nextJob) && (
+        <div className="px-6 py-2 border-b border-border bg-background/30 shrink-0">
+          <div className="max-w-[50rem] mx-auto w-full flex items-center justify-between gap-3 text-[12px]">
+            <div className="min-w-0 flex-1">
+              {previousJob ? (
+                <Link
+                  to={`/jobs/${encodeURIComponent(previousJob.id)}`}
+                  className="inline-flex max-w-full items-center gap-1.5 text-muted-foreground hover:text-foreground transition-colors"
+                >
+                  <ArrowLeft size={13} />
+                  <span className="truncate">{previousJob.taskName || previousJob.id}</span>
+                </Link>
+              ) : null}
+            </div>
+            <div className="min-w-0 flex-1 flex justify-end">
+              {nextJob ? (
+                <Link
+                  to={`/jobs/${encodeURIComponent(nextJob.id)}`}
+                  className="inline-flex max-w-full items-center gap-1.5 text-muted-foreground hover:text-foreground transition-colors"
+                >
+                  <span className="truncate">{nextJob.taskName || nextJob.id}</span>
+                  <ArrowRight size={13} />
+                </Link>
+              ) : null}
+            </div>
+          </div>
+        </div>
+      )}
+
       {/* Content area — terminal always mounted (hidden/shown), review conditionally rendered */}
       <div className="flex-1 min-h-0 relative">
         <div className="absolute inset-0" style={{ display: view === 'terminal' ? 'block' : 'none' }}>
diff --git a/dashboard/src/components/JobsView.jsx b/dashboard/src/components/JobsView.jsx
index c7fe8cb..26d52c8 100644
--- a/dashboard/src/components/JobsView.jsx
+++ b/dashboard/src/components/JobsView.jsx
@@ -1,13 +1,41 @@
-import { useState, useMemo, useEffect } from 'react'
-import { Bot, Sparkles, AlertCircle, CheckCircle2, XCircle, Clock, GitBranch } from 'lucide-react'
+import { useState, useMemo, useEffect, useCallback } from 'react'
+import { Bot, Sparkles, AlertCircle, CheckCircle2, XCircle, Clock, GitBranch, AlertTriangle, Square, Loader, Eye, EyeOff } from 'lucide-react'
 import { cn, timeAgo, truncateWithEllipsis, buildPlanPath } from '../lib/utils'
 import { repoIdentityColors, normalizeAgentId, getAgentBrandColor } from '../lib/constants'
 import { buildWorkerNavItems } from '../lib/workerUtils'
 import { FilterChip, toggleFilter, BUG_COLOR, loadFilters, saveFilters } from '../lib/filterUtils.jsx'
 import AgentIcon, { getAgentLabel } from './AgentIcon'
 
-const JOB_STATUSES = ['review', 'active', 'completed', 'failed', 'rejected']
+const JOB_STATUSES = ['active', 'review', 'completed', 'failed', 'rejected']
 const STORAGE_KEY = 'jobsView:filters'
+const READ_OVERRIDES_KEY = 'jobsView:readOverrides'
+
+function loadReadOverrides() {
+  try {
+    const raw = localStorage.getItem(READ_OVERRIDES_KEY)
+    if (!raw) return {}
+    const parsed = JSON.parse(raw)
+    if (!parsed || typeof parsed !== 'object') return {}
+    return Object.fromEntries(
+      Object.entries(parsed).filter(([jobId, value]) => Boolean(jobId) && typeof value === 'boolean')
+    )
+  } catch {
+    return {}
+  }
+}
+
+function saveReadOverrides(overrides) {
+  try {
+    const entries = Object.entries(overrides || {}).filter(([, value]) => typeof value === 'boolean')
+    if (entries.length === 0) {
+      localStorage.removeItem(READ_OVERRIDES_KEY)
+      return
+    }
+    localStorage.setItem(READ_OVERRIDES_KEY, JSON.stringify(Object.fromEntries(entries)))
+  } catch {
+    // noop in non-browser/private contexts
+  }
+}
 
 const STATUS_LABELS = {
   active: 'Active',
@@ -24,9 +52,10 @@ function classifyItem(worker) {
   if (worker.validation === 'rejected' || worker.runState === 'rejected') return 'rejected'
   if (worker.needsReview || worker.validation === 'needs_validation' || worker.runState === 'awaiting_validation') return 'review'
   if (worker.status === 'in_progress') return 'active'
+  if (worker.status === 'stopped' || worker.status === 'killed') return 'review'
   if (worker.status === 'completed' && (!worker.validation || worker.validation === 'none')) return 'review'
   if (worker.status === 'completed') return 'completed'
-  if (worker.status === 'failed' || worker.status === 'killed') return 'failed'
+  if (worker.status === 'failed') return 'failed'
   return 'active'
 }
 
@@ -42,8 +71,53 @@ export default function JobsView({
   sessionRecords,
   overview,
   onSelectJob,
+  onJobsRefresh,
+  showToast,
 }) {
   const agents = swarm?.agents || []
+  const [stoppingJobs, setStoppingJobs] = useState(new Set())
+  const [confirmStopId, setConfirmStopId] = useState(null)
+  const [readOverrides, setReadOverrides] = useState(() => loadReadOverrides())
+  const [showReadReview, setShowReadReview] = useState(() => loadFilters(STORAGE_KEY)?.showReadReview ?? false)
+
+  const handleStopOrphan = useCallback(async (e, worker) => {
+    e.stopPropagation()
+    const jobId = worker.jobId || worker.id
+    if (confirmStopId !== jobId) {
+      setConfirmStopId(jobId)
+      setTimeout(() => setConfirmStopId(prev => prev === jobId ? null : prev), 3000)
+      return
+    }
+    setStoppingJobs(prev => new Set(prev).add(jobId))
+    setConfirmStopId(null)
+    try {
+      const res = await fetch(`/api/jobs/${jobId}/kill`, { method: 'POST' })
+      if (res.ok) {
+        showToast?.('Job stopped', 'info')
+        onJobsRefresh?.()
+      }
+    } catch { /* SSE will refresh */ }
+    setStoppingJobs(prev => { const next = new Set(prev); next.delete(jobId); return next })
+  }, [confirmStopId, onJobsRefresh, showToast])
+
+  const handleToggleRead = useCallback(async (e, worker) => {
+    e.stopPropagation()
+    const jobId = worker.jobId || worker.id
+    const nextRead = !worker.read
+    setReadOverrides(prev => ({ ...prev, [jobId]: nextRead }))
+    try {
+      const res = await fetch(`/api/jobs/${jobId}/read`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ read: nextRead }),
+      })
+      if (!res.ok) throw new Error('Failed to update read status')
+      onJobsRefresh?.()
+    } catch {
+      setReadOverrides(prev => ({ ...prev, [jobId]: worker.read === true }))
+      showToast?.('Failed to update read status', 'error')
+    }
+  }, [onJobsRefresh, showToast])
 
   // Build a set of bug task texts (lowercased) from overview for cross-referencing
   const bugTaskTexts = useMemo(() => {
@@ -58,15 +132,29 @@ export default function JobsView({
     return texts
   }, [overview])
 
-  const allItems = useMemo(() => {
+  const baseItems = useMemo(() => {
     const items = buildWorkerNavItems(agents, null, jobFileToSession, sessionRecords)
     return items.map(item => {
       const labelLower = (item.label || '').toLowerCase()
       const isBug = [...bugTaskTexts].some(bt => labelLower.includes(bt) || bt.includes(labelLower.slice(0, 40)))
-      return { ...item, filterStatus: classifyItem(item), isBug }
+      return {
+        ...item,
+        filterStatus: classifyItem(item),
+        isBug,
+      }
     })
   }, [agents, jobFileToSession, bugTaskTexts, sessionRecords])
 
+  const allItems = useMemo(() => {
+    return baseItems.map(item => {
+      const jobId = item.jobId || item.id
+      return {
+        ...item,
+        read: readOverrides[jobId] ?? item.read ?? false,
+      }
+    })
+  }, [baseItems, readOverrides])
+
   // Use overview repos so all configured repos appear as filter chips (including those with no jobs)
   const repoNames = useMemo(() => {
     return (overview?.repos || []).map(r => r.name)
@@ -89,8 +177,41 @@ export default function JobsView({
   }, [repoNames.join(',')]) // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
-    saveFilters(STORAGE_KEY, { statuses: selectedStatuses, repos: selectedRepos, bugOnly: bugFilter })
-  }, [selectedStatuses, selectedRepos, bugFilter])
+    saveFilters(STORAGE_KEY, { statuses: selectedStatuses, repos: selectedRepos, bugOnly: bugFilter, showReadReview })
+  }, [selectedStatuses, selectedRepos, bugFilter, showReadReview])
+
+  useEffect(() => {
+    saveReadOverrides(readOverrides)
+  }, [readOverrides])
+
+  useEffect(() => {
+    setReadOverrides(prev => {
+      const prevEntries = Object.entries(prev)
+      if (prevEntries.length === 0) return prev
+
+      const serverReadByJobId = new Map(
+        baseItems
+          .map(item => [item.jobId || item.id, item.read === true])
+          .filter(([jobId]) => Boolean(jobId))
+      )
+
+      let changed = false
+      const next = {}
+      for (const [jobId, overrideValue] of prevEntries) {
+        if (!serverReadByJobId.has(jobId)) {
+          changed = true
+          continue
+        }
+        if (serverReadByJobId.get(jobId) === overrideValue) {
+          changed = true
+          continue
+        }
+        next[jobId] = overrideValue
+      }
+
+      return changed ? next : prev
+    })
+  }, [baseItems])
 
   const filteredItems = useMemo(() => {
     return allItems.filter(w => {
@@ -115,13 +236,13 @@ export default function JobsView({
       status,
       items: filteredItems
         .filter(w => w.filterStatus === status)
+        .filter(w => status !== 'review' || showReadReview || !w.read)
         .sort((a, b) => {
           const ta = a.created ? new Date(a.created).getTime() : 0
           const tb = b.created ? new Date(b.created).getTime() : 0
           return tb - ta
         }),
     }))
-    .filter(g => g.items.length > 0)
 
   if (allItems.length === 0) {
     return (
@@ -191,9 +312,30 @@ export default function JobsView({
                 <span className="text-[10px] font-mono text-muted-foreground/40" style={{ fontFamily: 'var(--font-mono)' }}>
                   {group.items.length}
                 </span>
+                {group.status === 'review' && (
+                  <button
+                    type="button"
+                    onClick={() => setShowReadReview(prev => !prev)}
+                    className={cn(
+                      'ml-2 inline-flex items-center gap-1 rounded-full border px-2 py-0.5 text-[10px] transition-colors',
+                      showReadReview
+                        ? 'border-status-review-border bg-status-review-bg text-status-review'
+                        : 'border-border text-muted-foreground/70 hover:text-foreground'
+                    )}
+                    title={showReadReview ? 'Hide read jobs' : 'Show read jobs'}
+                  >
+                    {showReadReview ? <EyeOff size={10} /> : <Eye size={10} />}
+                    {showReadReview ? 'Hide read' : 'Show read'}
+                  </button>
+                )}
               </div>
 
               <div className="space-y-2">
+                {group.items.length === 0 && (
+                  <div className="w-full px-3.5 py-2.5 rounded-lg text-center">
+                    <span className="text-[13px] text-muted-foreground/40">Empty</span>
+                  </div>
+                )}
                 {group.items.map(worker => {
                   const repoColor = repoIdentityColors[worker.repo] || 'var(--primary)'
                   const normalizedAgent = normalizeAgentId(worker.agent)
@@ -259,6 +401,17 @@ export default function JobsView({
                               )}
                             </span>
                           )}
+                          {worker.lastError && (
+                            <div
+                              className="mt-1 flex items-start gap-1.5 text-[10px] text-status-failed/80 min-w-0"
+                              title={worker.lastError}
+                            >
+                              <AlertTriangle size={10} className="shrink-0 mt-[1px]" />
+                              <span className="truncate">
+                                {worker.lastErrorSubKind === 'rate_limit' ? 'Rate limit hit' : 'Error'}{worker.errorCount > 1 ? ` (${worker.errorCount})` : ''}
+                              </span>
+                            </div>
+                          )}
                           {worker.planSlug && (
                             <div className="mt-1 flex items-center gap-1 text-[10px] text-muted-foreground/70 min-w-0">
                               <span className="shrink-0">Plan:</span>
@@ -282,6 +435,45 @@ export default function JobsView({
                         </div>
 
                         <div className="flex items-center gap-2 shrink-0 self-center">
+                          {worker.filterStatus === 'review' && (
+                            <button
+                              type="button"
+                              onClick={(e) => handleToggleRead(e, worker)}
+                              className={cn(
+                                'p-1 rounded-md border transition-colors',
+                                worker.read
+                                  ? 'border-status-review-border bg-status-review-bg text-status-review'
+                                  : 'border-border text-muted-foreground/70 hover:text-foreground hover:border-status-review/30'
+                              )}
+                              title={worker.read ? 'Mark as unread' : 'Mark as read'}
+                              aria-label={worker.read ? 'Mark as unread' : 'Mark as read'}
+                            >
+                              {worker.read ? <EyeOff size={12} /> : <Eye size={12} />}
+                            </button>
+                          )}
+                          {worker.filterStatus === 'active' && !worker.alive && (() => {
+                            const jid = worker.jobId || worker.id
+                            const isStopping = stoppingJobs.has(jid)
+                            const isConfirming = confirmStopId === jid
+                            return (
+                              <button
+                                onClick={(e) => handleStopOrphan(e, worker)}
+                                disabled={isStopping}
+                                className={cn(
+                                  'px-2 py-0.5 rounded text-[10px] font-medium transition-all flex items-center gap-1',
+                                  isConfirming
+                                    ? 'bg-status-failed-bg text-status-failed border border-status-failed-border'
+                                    : 'text-status-failed/60 hover:text-status-failed bg-status-failed-bg/40 border border-status-failed-border/20 hover:border-status-failed-border'
+                                )}
+                                title="Stop orphaned job (no active session)"
+                              >
+                                {isStopping
+                                  ? <Loader size={9} className="animate-spin" />
+                                  : <Square size={9} />}
+                                {isConfirming ? 'Stop?' : 'Stop'}
+                              </button>
+                            )
+                          })()}
                           <span
                             className="text-[9px] px-1.5 py-0.5 rounded-full border font-medium capitalize"
                             style={{ background: `${repoColor}10`, color: repoColor, borderColor: `${repoColor}30` }}
diff --git a/dashboard/src/components/LoopDetailView.jsx b/dashboard/src/components/LoopDetailView.jsx
index 545bf1a..4103a2e 100644
--- a/dashboard/src/components/LoopDetailView.jsx
+++ b/dashboard/src/components/LoopDetailView.jsx
@@ -1,15 +1,11 @@
-import { useMemo } from 'react'
-import { ArrowLeft, Clock, Code2, ScanSearch, GitFork, RefreshCcw } from 'lucide-react'
+import { useState, useMemo, useEffect, useRef } from 'react'
+import { ArrowLeft, TerminalSquare, ClipboardCheck, Clock, RefreshCcw } from 'lucide-react'
 import { cn, timeAgo } from '../lib/utils'
 import { repoIdentityColors, normalizeAgentId, getAgentBrandColor } from '../lib/constants'
+import { LOOP_TYPE_META } from '../lib/loopConstants'
 import AgentIcon, { getAgentLabel } from './AgentIcon'
 import TerminalPanel from './TerminalPanel'
-
-const LOOP_TYPE_META = {
-  'linear-implementation': { label: 'Linear Implementation', icon: Code2 },
-  'linear-review':         { label: 'Linear Review',         icon: ScanSearch },
-  'parallel-review':       { label: 'Parallel Review',       icon: GitFork },
-}
+import LoopReviewPanel from './LoopReviewPanel'
 
 const STATUS_COLORS = {
   in_progress: '#4ade80',
@@ -29,20 +25,76 @@ export default function LoopDetailView({
   onContextUsage,
   onJobsChanged,
 }) {
+  const [view, setView] = useState('review')
+  const hasSetInitialViewRef = useRef(false)
+
   const loop = useMemo(() => {
     const all = loops?.jobs || []
-    return all.find(j => j.id === loopId) || null
+    // Support lookup by session ID (from freshly launched loops)
+    if (loopId && loopId.startsWith('session:')) {
+      const sessionId = loopId.slice('session:'.length)
+      return all.find(j => j.session === sessionId) || null
+    }
+    return all.find(j => j.id === loopId) || all.find(j => j.id.endsWith(`/${loopId}`)) || null
   }, [loops, loopId])
 
+  const isSessionLookup = loopId && loopId.startsWith('session:')
+  const hasTerminal = loop?.session && agentTerminals.has(loop.session)
+  const loopIdentity = loop?.id || String(loopId || '')
+
+  useEffect(() => {
+    hasSetInitialViewRef.current = false
+  }, [loopIdentity])
+
+  // Default to terminal tab when there's a live terminal for new launches
+  useEffect(() => {
+    if (hasSetInitialViewRef.current) return
+    if (isSessionLookup && !loop) {
+      setView('terminal')
+      hasSetInitialViewRef.current = true
+    } else if (loop) {
+      setView('review')
+      hasSetInitialViewRef.current = true
+    }
+  }, [isSessionLookup, loop])
+
   if (!loop) {
     return (
       <div className="h-full flex flex-col">
         <div className="flex items-center gap-3 px-5 py-3 border-b border-border">
-          <button onClick={onBack} className="p-1.5 rounded-md hover:bg-card-hover transition-colors text-muted-foreground hover:text-foreground">
-            <ArrowLeft size={16} />
+          <button onClick={onBack} className="flex items-center gap-1.5 text-[12px] text-muted-foreground hover:text-foreground transition-colors">
+            <ArrowLeft size={14} />
+            Back
           </button>
-          <span className="text-[13px] text-muted-foreground">Loop not found</span>
+          <div className="h-4 w-px bg-border" />
+          <span className="text-[13px] text-muted-foreground">
+            {isSessionLookup ? 'Starting loop…' : 'Loop not found'}
+          </span>
         </div>
+        {isSessionLookup && (
+          <div className="flex-1 min-h-0">
+            {agentTerminals.has(loopId.slice('session:'.length)) ? (
+              <TerminalPanel
+                sessions={agentTerminals}
+                activeSessionId={loopId.slice('session:'.length)}
+                isVisible={true}
+                skipPermissions={true}
+                onKillSession={onKillSession}
+                onUpdateSessionId={onUpdateSessionId}
+                onPromptSent={onPromptSent}
+                onContextUsage={onContextUsage}
+                onJobsChanged={onJobsChanged}
+              />
+            ) : (
+              <div className="flex items-center justify-center h-full">
+                <div className="text-center space-y-2">
+                  <RefreshCcw size={28} className="mx-auto text-muted-foreground/20 animate-spin" style={{ animationDuration: '3s' }} />
+                  <p className="text-[12px] text-muted-foreground/50">Waiting for loop to initialize…</p>
+                </div>
+              </div>
+            )}
+          </div>
+        )}
       </div>
     )
   }
@@ -51,103 +103,104 @@ export default function LoopDetailView({
   const TypeIcon = meta.icon
   const repoColor = repoIdentityColors[loop.repo] || 'var(--primary)'
   const statusColor = STATUS_COLORS[loop.status] || STATUS_COLORS.unknown
-  const duration = loop.durationMinutes != null ? timeAgo(null, loop.durationMinutes) : null
   const agentId = normalizeAgentId((loop.agent || 'claude').split(':')[0])
   const agentLabel = getAgentLabel(agentId)
   const agentColor = getAgentBrandColor(agentId)
-  const hasTerminal = loop.session && agentTerminals.has(loop.session)
 
   return (
     <div className="h-full flex flex-col">
-      {/* Header */}
-      <div className="flex items-center gap-3 px-5 py-3 border-b border-border shrink-0">
-        <button onClick={onBack} className="p-1.5 rounded-md hover:bg-card-hover transition-colors text-muted-foreground hover:text-foreground">
-          <ArrowLeft size={16} />
+      {/* Top bar — mirrors JobDetailView layout */}
+      <div className="px-6 py-2.5 border-b border-border bg-background/60 shrink-0 flex items-center gap-3">
+        <button
+          onClick={onBack}
+          className="flex items-center gap-1.5 text-[12px] text-muted-foreground hover:text-foreground transition-colors"
+        >
+          <ArrowLeft size={14} />
+          Back
         </button>
 
-        <span
-          className="w-6 h-6 rounded-md border flex items-center justify-center shrink-0"
-          style={{ color: statusColor, background: `${statusColor}12`, borderColor: `${statusColor}30` }}
-        >
-          <TypeIcon size={13} />
-        </span>
+        <div className="h-4 w-px bg-border" />
 
-        <div className="flex-1 min-w-0">
-          <p className="text-[13px] font-semibold text-foreground truncate">{meta.label}</p>
-          <div className="flex items-center gap-2 mt-0.5">
-            <span
-              className="text-[9px] px-1.5 py-0.5 rounded-full border font-medium capitalize"
-              style={{ background: `${repoColor}10`, color: repoColor, borderColor: `${repoColor}30` }}
-            >
-              {loop.repo}
-            </span>
-            <span className="flex items-center gap-1 text-[10px]" style={{ color: agentColor }}>
-              <AgentIcon agent={agentId} size={10} />
-              {loop.agent || agentLabel}
-            </span>
-            {duration && (
-              <span className="text-[10px] text-muted-foreground/40 flex items-center gap-1 font-mono">
-                <Clock size={9} />{duration}
-              </span>
-            )}
-          </div>
+        <div className="flex-1 min-w-0 flex items-center gap-2">
+          <p className="text-[13px] font-medium text-foreground truncate">{meta.label}</p>
+          <span
+            className="inline-flex items-center gap-1 text-[10px] font-medium px-1.5 py-0.5 rounded shrink-0"
+            style={{ background: `${agentColor}10`, color: agentColor, border: `1px solid ${agentColor}30` }}
+            title={agentLabel}
+          >
+            <AgentIcon agent={agentId} size={10} title={agentLabel} />
+            {agentLabel}
+          </span>
+          <span
+            className="text-[10px] font-medium px-1.5 py-0.5 rounded capitalize shrink-0"
+            style={{ background: `${repoColor}15`, color: repoColor, border: `1px solid ${repoColor}30` }}
+          >
+            {loop.repo}
+          </span>
         </div>
 
-        <span
-          className="text-[10px] px-2 py-0.5 rounded-full border font-medium capitalize"
-          style={{ color: statusColor, borderColor: `${statusColor}40`, background: `${statusColor}10` }}
-        >
-          {loop.status === 'in_progress' ? 'running' : loop.status}
-        </span>
-      </div>
-
-      {/* Loop state info bar */}
-      <div className="flex items-center gap-4 px-5 py-2 border-b border-border bg-card/50 text-[11px] text-muted-foreground shrink-0">
-        {loop.loopState?.iteration > 0 && (
-          <span>Iteration <strong className="text-foreground">{loop.loopState.iteration}</strong></span>
-        )}
-        {loop.loopState?.lastVerdict && (
-          <span>Last verdict: <strong className="text-foreground">{loop.loopState.lastVerdict}</strong></span>
-        )}
-        {loop.started && (
-          <span>Started: <strong className="text-foreground">{loop.started}</strong></span>
-        )}
-        {loop.loopState?.loopStatus && (
-          <span>Exit: <strong className="text-foreground">{loop.loopState.loopStatus}</strong></span>
-        )}
+        <div className="flex items-center gap-1.5 shrink-0">
+          <button
+            onClick={() => setView('terminal')}
+            style={view === 'terminal' ? { color: '#8bab8f' } : undefined}
+            className={cn(
+              'text-[11px] px-2.5 py-1 rounded border flex items-center gap-1.5',
+              view === 'terminal'
+                ? 'bg-primary/[0.14] border-primary/20'
+                : 'border-border text-muted-foreground hover:text-foreground'
+            )}
+          >
+            <TerminalSquare size={12} strokeWidth={view === 'terminal' ? 2.2 : 1.8} /> Terminal
+          </button>
+          <button
+            onClick={() => setView('review')}
+            style={view === 'review' ? { color: '#8bab8f' } : undefined}
+            className={cn(
+              'text-[11px] px-2.5 py-1 rounded border flex items-center gap-1.5',
+              view === 'review'
+                ? 'bg-primary/[0.14] border-primary/20'
+                : 'border-border text-muted-foreground hover:text-foreground'
+            )}
+          >
+            <ClipboardCheck size={12} strokeWidth={view === 'review' ? 2.2 : 1.8} /> Review
+          </button>
+        </div>
       </div>
 
-      {/* Terminal or empty state */}
-      <div className="flex-1 min-h-0">
-        {hasTerminal ? (
-          <TerminalPanel
-            sessions={agentTerminals}
-            activeSessionId={loop.session}
-            isVisible={true}
-            skipPermissions={true}
-            onKillSession={onKillSession}
-            onUpdateSessionId={onUpdateSessionId}
-            onPromptSent={onPromptSent}
-            onContextUsage={onContextUsage}
-            onJobsChanged={onJobsChanged}
-          />
-        ) : (
-          <div className="flex items-center justify-center h-full">
-            <div className="text-center space-y-2">
-              <TypeIcon size={28} className="mx-auto text-muted-foreground/20" />
-              <p className="text-[12px] text-muted-foreground/50">
-                {loop.status === 'in_progress'
-                  ? 'Terminal session not found — it may still be initializing.'
-                  : 'This loop has ended. No live terminal available.'}
-              </p>
-              {loop.loopState?.complete && (
-                <p className="text-[11px] text-muted-foreground/40">
-                  Final status: {loop.loopState.lastVerdict || loop.loopState.loopStatus || 'completed'}
+      {/* Content area — terminal always mounted (hidden/shown), review conditionally rendered */}
+      <div className="flex-1 min-h-0 relative">
+        <div className="absolute inset-0" style={{ display: view === 'terminal' ? 'block' : 'none' }}>
+          {hasTerminal ? (
+            <TerminalPanel
+              sessions={agentTerminals}
+              activeSessionId={loop.session}
+              isVisible={view === 'terminal'}
+              skipPermissions={true}
+              onKillSession={onKillSession}
+              onUpdateSessionId={onUpdateSessionId}
+              onPromptSent={onPromptSent}
+              onContextUsage={onContextUsage}
+              onJobsChanged={onJobsChanged}
+            />
+          ) : (
+            <div className="flex items-center justify-center h-full">
+              <div className="text-center space-y-2">
+                <TypeIcon size={28} className="mx-auto text-muted-foreground/20" />
+                <p className="text-[12px] text-muted-foreground/50">
+                  {loop.status === 'in_progress'
+                    ? 'Terminal session not found — it may still be initializing.'
+                    : 'This loop has ended. No live terminal available.'}
                 </p>
-              )}
+              </div>
             </div>
+          )}
+        </div>
+
+        <div className="absolute inset-0 overflow-y-auto px-6 py-5" style={{ display: view === 'review' ? 'block' : 'none' }}>
+          <div className="max-w-[50rem] mx-auto w-full">
+            <LoopReviewPanel loop={loop} />
           </div>
-        )}
+        </div>
       </div>
     </div>
   )
diff --git a/dashboard/src/components/LoopReviewPanel.jsx b/dashboard/src/components/LoopReviewPanel.jsx
new file mode 100644
index 0000000..2f50d7f
--- /dev/null
+++ b/dashboard/src/components/LoopReviewPanel.jsx
@@ -0,0 +1,322 @@
+import { useMemo } from 'react'
+import { Clock, RefreshCcw, CheckCircle2, XCircle, Loader2, ChevronRight } from 'lucide-react'
+import Markdown from 'react-markdown'
+import remarkGfm from 'remark-gfm'
+import { cn, timeAgo } from '../lib/utils'
+import { repoIdentityColors, normalizeAgentId, getAgentBrandColor } from '../lib/constants'
+import { LOOP_TYPE_META } from '../lib/loopConstants'
+import { usePolling } from '../lib/usePolling'
+import { mdComponents } from './mdComponents'
+import AgentIcon, { getAgentLabel } from './AgentIcon'
+
+const VERDICT_COLORS = {
+  PASS: '#4ade80',
+  FAIL: '#f87171',
+}
+
+const TRANSCRIPT_META_RE = /^(OpenAI |--------$|workdir: |model: |provider: |approval: |sandbox: |reasoning effort: |reasoning summaries: |session id: |user$|assistant$|mcp startup:|codex$|claude$|cursor$|tokens used$|\d{1,3}(,\d{3})*$)/
+const SUMMARY_LINE_RE = /^(Implemented:|Findings:|VERDICT:|VERIFIED:|ALL ISSUES RESOLVED|Original findings:|\d+\.\s)/
+
+function normalizeArtifactText(text) {
+  return String(text || '').replace(/\r\n?/g, '\n').trim()
+}
+
+function isTranscriptMetaLine(line) {
+  return TRANSCRIPT_META_RE.test(String(line || '').trim())
+}
+
+function isDiffStart(line) {
+  return /^diff --git /.test(line)
+}
+
+function isDiffLine(line) {
+  return /^(diff --git |index |--- |\+\+\+ |@@ |[ +\-].*|\\ No newline at end of file)/.test(line)
+}
+
+function isDiffMetadataLine(line) {
+  return /^(diff --git |index |--- [ab]\/|\+\+\+ [ab]\/|@@ )/.test(String(line || '').trim())
+}
+
+function formatArtifactContent(text) {
+  const normalized = normalizeArtifactText(text)
+  if (!normalized) return '*Empty*'
+
+  const lines = normalized.split('\n')
+  const blocks = []
+
+  for (let idx = 0; idx < lines.length;) {
+    const line = lines[idx]
+
+    if (isDiffStart(line)) {
+      const diffLines = []
+      while (idx < lines.length && (lines[idx] === '' || isDiffLine(lines[idx]))) {
+        diffLines.push(lines[idx])
+        idx += 1
+      }
+      blocks.push(`\`\`\`diff\n${diffLines.join('\n')}\n\`\`\``)
+      continue
+    }
+
+    if (isTranscriptMetaLine(line)) {
+      const metaLines = []
+      while (idx < lines.length && (lines[idx] === '' || isTranscriptMetaLine(lines[idx]))) {
+        metaLines.push(lines[idx])
+        idx += 1
+      }
+      blocks.push(`\`\`\`text\n${metaLines.join('\n')}\n\`\`\``)
+      continue
+    }
+
+    blocks.push(line)
+    idx += 1
+  }
+
+  return blocks.join('\n')
+}
+
+function collectSummaryLines(lines, startIndex) {
+  const collected = []
+  let blankCount = 0
+
+  for (let idx = startIndex; idx < lines.length; idx += 1) {
+    const line = lines[idx]
+    const trimmed = line.trim()
+    if (!trimmed) {
+      blankCount += 1
+      if (blankCount > 1 && collected.length > 0) break
+      continue
+    }
+    blankCount = 0
+    if (isTranscriptMetaLine(trimmed) || isDiffMetadataLine(trimmed)) continue
+    collected.push(trimmed)
+    if (collected.length >= 6) break
+  }
+
+  return collected
+}
+
+function summarizeArtifact(text, type) {
+  const normalized = normalizeArtifactText(text)
+  if (!normalized) return { status: 'Empty artifact', details: [] }
+
+  const lines = normalized.split('\n')
+  const verdictLine = [...lines].reverse().find(line => /^(VERDICT:|VERIFIED:|ALL ISSUES RESOLVED)/.test(line.trim()))
+  const verdict = verdictLine ? verdictLine.trim() : null
+
+  if (verdict === 'ALL ISSUES RESOLVED') {
+    return { status: verdict, details: [] }
+  }
+
+  const findingsStart = lines.findIndex(line => /^Findings:\s*$/.test(line.trim()))
+  const implementedStart = lines.findIndex(line => /^Implemented:\s*$/.test(line.trim()))
+  const numberedFindings = lines
+    .filter(line => /^\d+\.\s+/.test(line.trim()))
+    .slice(0, 3)
+    .map(line => line.trim())
+
+  const details = findingsStart >= 0
+    ? collectSummaryLines(lines, findingsStart).filter(line => line !== 'Findings:')
+    : numberedFindings
+
+  if (details.length > 0) {
+    return { status: verdict || `${details.length} key finding${details.length === 1 ? '' : 's'}`, details }
+  }
+
+  if (implementedStart >= 0) {
+    return {
+      status: verdict || (type === 'review' ? 'Review summary' : 'Summary'),
+      details: collectSummaryLines(lines, implementedStart).filter(line => line !== 'Implemented:'),
+    }
+  }
+
+  const generic = lines.find(line => SUMMARY_LINE_RE.test(line.trim()) && !isTranscriptMetaLine(line))
+  if (generic) {
+    return { status: verdict || generic.trim(), details: verdict && generic.trim() !== verdict ? [generic.trim()] : [] }
+  }
+
+  return { status: verdict || 'Open artifact', details: [] }
+}
+
+export default function LoopReviewPanel({ loop }) {
+  const meta = LOOP_TYPE_META[loop?.loopType] || { label: loop?.loopType || 'Unknown', icon: RefreshCcw }
+  const TypeIcon = meta.icon
+  const repoColor = repoIdentityColors[loop?.repo] || 'var(--primary)'
+  const agentId = normalizeAgentId((loop?.agent || 'claude').split(':')[0])
+  const agentLabel = getAgentLabel(agentId)
+  const agentColor = getAgentBrandColor(agentId)
+  const duration = loop?.durationMinutes != null ? timeAgo(null, loop.durationMinutes) : null
+  const isActive = loop?.status === 'in_progress'
+
+  // Build artifacts URL from loop identity.
+  const artifactsUrl = useMemo(() => {
+    if (!loop?.id || !loop?.repo || !loop?.loopType) return null
+    const parts = loop.id.split('/')
+    const timestamp = parts.length >= 3 ? parts.slice(2).join('/') : parts.slice(1).join('/')
+    if (!timestamp) return null
+    return `/api/loops/${encodeURIComponent(loop.loopType)}/${encodeURIComponent(timestamp)}/artifacts?repo=${encodeURIComponent(loop.repo)}`
+  }, [loop?.id, loop?.repo, loop?.loopType])
+
+  const artifacts = usePolling(artifactsUrl, isActive ? 10000 : null)
+  const data = artifacts.data
+  const iterations = data?.iterations || []
+  const artifactList = data?.artifacts || []
+
+  // Group artifacts by iteration, most recent first
+  const iterationGroups = useMemo(() => {
+    if (iterations.length === 0 && artifactList.length === 0) return []
+    // Collect iteration numbers from both sources
+    const iterNums = new Set([
+      ...iterations.map(i => i.number),
+      ...artifactList.filter(a => a.iteration != null).map(a => a.iteration),
+    ])
+    const groups = [...iterNums].sort((a, b) => b - a).map(num => {
+      const iterInfo = iterations.find(i => i.number === num)
+      const arts = artifactList.filter(a => a.iteration === num)
+      return { number: num, timestamp: iterInfo?.timestamp || null, verdict: iterInfo?.verdict || null, artifacts: arts }
+    })
+    return groups
+  }, [iterations, artifactList])
+
+  return (
+    <div className="space-y-5">
+      {/* Metadata card */}
+      <div className="border border-border rounded-lg p-4 space-y-3">
+        <div className="flex items-center gap-3 flex-wrap">
+          <span
+            className="w-6 h-6 rounded-md border flex items-center justify-center shrink-0"
+            style={{ color: repoColor, background: `${repoColor}12`, borderColor: `${repoColor}30` }}
+          >
+            <TypeIcon size={13} />
+          </span>
+          <span className="text-[13px] font-semibold text-foreground">{meta.label}</span>
+          <span
+            className="text-[9px] px-1.5 py-0.5 rounded-full border font-medium capitalize"
+            style={{ background: `${repoColor}10`, color: repoColor, borderColor: `${repoColor}30` }}
+          >
+            {loop?.repo}
+          </span>
+          <span className="flex items-center gap-1 text-[10px]" style={{ color: agentColor }}>
+            <AgentIcon agent={agentId} size={10} />
+            {loop?.agent || agentLabel}
+          </span>
+        </div>
+
+        <div className="flex items-center gap-4 text-[11px] text-muted-foreground flex-wrap">
+          {loop?.started && <span>Started: <strong className="text-foreground">{loop.started}</strong></span>}
+          {duration && (
+            <span className="flex items-center gap-1">
+              <Clock size={10} /> {duration}
+            </span>
+          )}
+          {loop?.loopState?.iteration > 0 && (
+            <span>Iterations: <strong className="text-foreground">{loop.loopState.iteration}</strong></span>
+          )}
+          <span>Status: <strong className="text-foreground capitalize">{loop?.status === 'in_progress' ? 'running' : loop?.status}</strong></span>
+          {loop?.loopState?.lastVerdict && (
+            <span>Verdict: <strong className="text-foreground">{loop.loopState.lastVerdict}</strong></span>
+          )}
+        </div>
+      </div>
+
+      {/* Artifacts list grouped by iteration */}
+      {iterationGroups.length === 0 ? (
+        <div className="py-12 text-center">
+          {isActive ? (
+            <>
+              <Loader2 size={24} className="mx-auto mb-2 text-muted-foreground/30 animate-spin" />
+              <p className="text-[12px] text-muted-foreground/50">Awaiting review output…</p>
+            </>
+          ) : (
+            <>
+              <TypeIcon size={24} className="mx-auto mb-2 text-muted-foreground/20" />
+              <p className="text-[12px] text-muted-foreground/50">No review artifacts found.</p>
+            </>
+          )}
+        </div>
+      ) : (
+        <div className="space-y-6">
+          {iterationGroups.map(group => {
+            const verdictColor = group.verdict ? (VERDICT_COLORS[group.verdict] || '#888') : null
+            return (
+              <div key={group.number}>
+                {/* Iteration header */}
+                <div className="flex items-center gap-2 mb-3">
+                  <span className="text-[12px] font-semibold text-foreground">Iteration {group.number}</span>
+                  {group.timestamp && (
+                    <span className="text-[10px] text-muted-foreground/50 font-mono">{group.timestamp}</span>
+                  )}
+                  {group.verdict && (
+                    <span
+                      className="inline-flex items-center gap-1 text-[10px] px-1.5 py-0.5 rounded-full border font-medium"
+                      style={{ color: verdictColor, borderColor: `${verdictColor}40`, background: `${verdictColor}10` }}
+                    >
+                      {group.verdict === 'PASS' ? <CheckCircle2 size={10} /> : <XCircle size={10} />}
+                      {group.verdict}
+                    </span>
+                  )}
+                </div>
+
+                {/* Artifact blocks */}
+                {group.artifacts.length === 0 ? (
+                  <p className="text-[11px] text-muted-foreground/40 pl-2">No artifacts for this iteration.</p>
+                ) : (
+                  <div className="space-y-3">
+                    {group.artifacts.map(art => (
+                      <ArtifactCard key={art.name} artifact={art} />
+                    ))}
+                  </div>
+                )}
+              </div>
+            )
+          })}
+        </div>
+      )}
+    </div>
+  )
+}
+
+function ArtifactCard({ artifact }) {
+  const formattedContent = useMemo(() => formatArtifactContent(artifact.content), [artifact.content])
+  const summary = useMemo(() => summarizeArtifact(artifact.content, artifact.type), [artifact.content, artifact.type])
+
+  return (
+    <details className="group border border-border rounded-lg overflow-hidden bg-card/20">
+      <summary className="list-none px-3 py-2 cursor-pointer border-b border-border/80 bg-card/50">
+        <div className="flex items-start gap-2">
+          <ChevronRight size={12} className="mt-0.5 shrink-0 text-muted-foreground/60 transition-transform group-open:rotate-90" />
+          <div className="min-w-0 flex-1 space-y-1">
+            <div className="flex items-center gap-2 flex-wrap">
+              <span className={cn(
+                'text-[10px] px-1.5 py-0.5 rounded font-medium capitalize',
+                artifact.type === 'review' && 'text-blue-400 bg-blue-400/10',
+                artifact.type === 'synthesis' && 'text-purple-400 bg-purple-400/10',
+                artifact.type === 'verification' && 'text-amber-400 bg-amber-400/10',
+                artifact.type === 'unknown' && 'text-muted-foreground bg-card',
+              )}>
+                {artifact.type}
+              </span>
+              <span className="text-[10px] text-muted-foreground/40 font-mono break-all">{artifact.name}</span>
+            </div>
+            <div className="space-y-1">
+              <p className="text-[11px] font-medium text-foreground/90">{summary.status}</p>
+              {summary.details.length > 0 && (
+                <ul className="space-y-1">
+                  {summary.details.map(detail => (
+                    <li key={detail} className="text-[11px] leading-relaxed text-muted-foreground/75 line-clamp-2">
+                      {detail}
+                    </li>
+                  ))}
+                </ul>
+              )}
+            </div>
+          </div>
+        </div>
+      </summary>
+      <div className="px-4 py-3 text-[13px] leading-relaxed prose-sm max-w-none">
+        <Markdown remarkPlugins={[remarkGfm]} components={mdComponents}>
+          {formattedContent}
+        </Markdown>
+      </div>
+    </details>
+  )
+}
diff --git a/dashboard/src/components/LoopsView.jsx b/dashboard/src/components/LoopsView.jsx
index 8031f28..b936844 100644
--- a/dashboard/src/components/LoopsView.jsx
+++ b/dashboard/src/components/LoopsView.jsx
@@ -1,396 +1,222 @@
-import { useState, useEffect, useCallback, useMemo } from 'react'
-import { RefreshCcw, Clock, Code2, ScanSearch, GitFork } from 'lucide-react'
+import { useState, useMemo, useEffect } from 'react'
+import { RefreshCcw, Clock, Code2, ScanSearch, GitFork, Sparkles, CheckCircle2, XCircle } from 'lucide-react'
 import { cn, timeAgo } from '../lib/utils'
-import { repoIdentityColors, AGENT_OPTIONS, getAgentBrandColor } from '../lib/constants'
-import { useAgentModels } from '../lib/useAgentModels'
-import AgentIcon from './AgentIcon'
+import { repoIdentityColors } from '../lib/constants'
+import { FilterChip, toggleFilter, loadFilters, saveFilters } from '../lib/filterUtils.jsx'
+import { LOOP_TYPES } from './AgentModelPicker'
 
-const LOOP_TYPES = [
-  { id: 'linear-implementation', label: 'Linear Impl',     icon: Code2 },
-  { id: 'linear-review',         label: 'Linear Review',   icon: ScanSearch },
-  { id: 'parallel-review',       label: 'Parallel Review', icon: GitFork },
-]
+const STORAGE_KEY = 'loopsView:filters'
 
-/** Compact agent + model picker — mirrors DispatchSettingsRow's Agent+Model section */
-function AgentModelPicker({ label, value, onChange }) {
-  const models = useAgentModels(value.agent)
+const LOOP_STATUSES = ['active', 'completed', 'failed']
 
-  // Snap model to first option when agent changes and current model isn't valid
-  useEffect(() => {
-    if (models.length > 0 && !models.find(m => m.value === value.model)) {
-      onChange({ ...value, model: models[0].value })
-    }
-  }, [models, onChange, value])
-
-  return (
-    <div>
-      {label && <label className="block text-[11px] font-medium text-muted-foreground mb-1">{label}</label>}
-      <div className="flex items-center gap-1.5">
-        <div className="flex gap-1">
-          {AGENT_OPTIONS.map(opt => {
-            const isSelected = value.agent === opt.id
-            const brandColor = getAgentBrandColor(opt.id)
-            return (
-              <button
-                key={opt.id}
-                type="button"
-                onClick={() => onChange({ agent: opt.id, model: '' })}
-                style={isSelected ? { color: brandColor, borderColor: `${brandColor}40`, backgroundColor: `${brandColor}18` } : undefined}
-                className={cn(
-                  'flex items-center gap-1.5 px-2 py-1 rounded-md text-[12px] font-medium border transition-colors',
-                  isSelected
-                    ? 'border-transparent'
-                    : 'border-border bg-card text-muted-foreground hover:text-foreground hover:bg-card-hover'
-                )}
-              >
-                <AgentIcon agent={opt.id} size={12} />
-                {opt.label}
-              </button>
-            )
-          })}
-        </div>
-        <select
-          value={value.model}
-          onChange={e => onChange({ ...value, model: e.target.value })}
-          className="h-8 px-2.5 rounded-md border border-border bg-card text-[12px] text-foreground focus:outline-none focus:border-primary/30 w-44"
-        >
-          {models.map(m => <option key={m.value} value={m.value}>{m.label}</option>)}
-        </select>
-      </div>
-    </div>
-  )
+const STATUS_LABELS = {
+  active: 'Active',
+  completed: 'Completed',
+  failed: 'Failed',
 }
 
-function defaultAgentModel() {
-  return { agent: 'claude', model: '' }
+const STATUS_COLORS = {
+  active: '#4ade80',
+  completed: '#8bab8f',
+  failed: '#f87171',
 }
 
-function fmtAgent({ agent, model }) {
-  return model ? `${agent}:${model}` : agent
+const GROUP_CONFIG = {
+  active: { label: 'Active', dotClass: 'bg-status-active', icon: Sparkles },
+  completed: { label: 'Completed', dotClass: 'bg-status-complete', icon: CheckCircle2 },
+  failed: { label: 'Failed', dotClass: 'bg-status-failed', icon: XCircle },
 }
 
 function classifyLoop(job) {
   if (job.status === 'completed' || job.loopState?.complete) return 'completed'
   if (job.status === 'failed') return 'failed'
-  if (job.status === 'in_progress') return 'active'
   return 'active'
 }
 
-const STATUS_COLORS = {
-  active: '#4ade80',
-  completed: '#8bab8f',
-  rejected: '#f87171',
-  failed: '#f87171',
-}
-
 function getLoopTypeIcon(loopTypeId) {
   return LOOP_TYPES.find(lt => lt.id === loopTypeId)?.icon || RefreshCcw
 }
 
-export default function LoopsView({ loops, overview, onSelectLoop, onSelectSession }) {
+export default function LoopsView({ loops, overview, onSelectLoop }) {
   const jobs = loops?.jobs || []
   const repos = useMemo(() => (overview?.repos || []).map(r => r.name), [overview])
 
-  const [repo, setRepo] = useState('')
-  const [loopType, setLoopType] = useState('linear-implementation')
-  const [prompt, setPrompt] = useState('')
-  const [agentSpec, setAgentSpec] = useState(defaultAgentModel())
-  const [reviewers, setReviewers] = useState([defaultAgentModel()])
-  const [synthesizer, setSynthesizer] = useState(defaultAgentModel())
-  const [implementor, setImplementor] = useState(defaultAgentModel())
-  const [btnPhase, setBtnPhase] = useState('idle') // idle | shaking | sliding | hidden | returning
+  const allItems = useMemo(() => {
+    return jobs.map(job => ({ ...job, filterStatus: classifyLoop(job) }))
+  }, [jobs])
 
-  // Default repo once repos are available
-  useEffect(() => {
-    if (repos.length > 0 && !repo) setRepo(repos[0])
-  }, [repos])
+  const [savedFilters] = useState(() => loadFilters(STORAGE_KEY))
+  const [selectedStatuses, setSelectedStatuses] = useState(() => savedFilters?.statuses ?? new Set(LOOP_STATUSES))
+  const [selectedRepos, setSelectedRepos] = useState(() => savedFilters?.repos ?? new Set(repos))
+  const [selectedTypes, setSelectedTypes] = useState(() => savedFilters?.types ?? new Set(LOOP_TYPES.map(lt => lt.id)))
 
-  // Load prompt when repo or loopType changes
+  // Sync repo filter when repos change (only if empty)
   useEffect(() => {
-    if (!repo || !loopType) return
-    let cancelled = false
-    fetch(`/api/loops/${encodeURIComponent(repo)}/prompt?type=${encodeURIComponent(loopType)}`)
-      .then(r => r.json())
-      .then(d => { if (!cancelled) setPrompt(d.content || '') })
-      .catch(() => { if (!cancelled) setPrompt('') })
-    return () => { cancelled = true }
-  }, [repo, loopType])
-
-  const isReady = !!repo
-
-  const handleLaunch = useCallback(async () => {
-    if (!isReady || btnPhase !== 'idle') return
-
-    setBtnPhase('shaking')
-    setTimeout(() => setBtnPhase('sliding'), 400)
-    setTimeout(() => setBtnPhase('hidden'), 800)
-
-    try {
-      const body = { repo, loopType, promptContent: prompt }
-      if (loopType === 'parallel-review') {
-        body.reviewerAgents = reviewers.map(fmtAgent)
-        body.synthesizerAgent = fmtAgent(synthesizer)
-        body.implementorAgent = fmtAgent(implementor)
-      } else {
-        body.agentSpec = fmtAgent(agentSpec)
-      }
-      const res = await fetch('/api/loops/init', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(body),
-      })
-      const data = await res.json().catch(() => ({}))
-      if (!res.ok) {
-        throw new Error(data.error || 'Loop launch failed')
-      }
-      if (data.sessionId) onSelectSession?.(data.sessionId)
-      setTimeout(() => setBtnPhase('returning'), 1800)
-      setTimeout(() => setBtnPhase('idle'), 2400)
-    } catch (err) {
-      console.error('Loop launch failed:', err)
-      setBtnPhase('idle')
+    if (repos.length > 0 && selectedRepos.size === 0) {
+      setSelectedRepos(new Set(repos))
     }
-  }, [repo, loopType, prompt, agentSpec, reviewers, synthesizer, implementor, onSelectSession, isReady, btnPhase])
+  }, [repos, selectedRepos.size])
+
+  useEffect(() => {
+    saveFilters(STORAGE_KEY, { statuses: selectedStatuses, repos: selectedRepos, types: selectedTypes })
+  }, [selectedStatuses, selectedRepos, selectedTypes])
+
+  const filteredItems = useMemo(() => {
+    return allItems.filter(w => {
+      if (selectedStatuses.size > 0 && !selectedStatuses.has(w.filterStatus)) return false
+      if (selectedRepos.size > 0 && !selectedRepos.has(w.repo)) return false
+      if (selectedTypes.size > 0 && !selectedTypes.has(w.loopType)) return false
+      return true
+    })
+  }, [allItems, selectedStatuses, selectedRepos, selectedTypes])
+
+  const groups = LOOP_STATUSES
+    .map(status => ({
+      ...GROUP_CONFIG[status],
+      status,
+      items: filteredItems
+        .filter(w => w.filterStatus === status)
+        .sort((a, b) => {
+          const aTs = a.started ? Date.parse(a.started) : 0
+          const bTs = b.started ? Date.parse(b.started) : 0
+          return bTs - aTs
+        }),
+    }))
 
   return (
-    <div className="space-y-6">
+    <div className="space-y-4">
       <div>
         <h2 className="text-[13px] font-semibold text-foreground mb-1">Loops</h2>
         <p className="text-[11px] text-muted-foreground">Multi-agent implementation and review loops.</p>
       </div>
 
-      {/* Loop list */}
-      {jobs.length === 0 ? (
-        <p className="text-[12px] text-muted-foreground/50 py-2">No loop jobs yet. Launch one below.</p>
-      ) : (
-        <div className="space-y-2">
-          {jobs.map(job => {
-            const repoColor = repoIdentityColors[job.repo] || 'var(--primary)'
-            const category = classifyLoop(job)
-            const statusColor = STATUS_COLORS[category] || STATUS_COLORS.active
-            const duration = job.durationMinutes != null ? timeAgo(null, job.durationMinutes) : null
-            const TypeIcon = getLoopTypeIcon(job.loopType)
-            return (
-              <div
-                key={job.id}
-                role="button"
-                tabIndex={0}
-                onClick={() => onSelectLoop?.(job.id)}
-                onKeyDown={e => { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); onSelectLoop?.(job.id) } }}
-                className="w-full text-left px-3.5 py-2.5 rounded-lg border bg-card hover:bg-card-hover transition-colors group cursor-pointer"
-                style={{ borderColor: 'rgba(255,255,255,0.05)' }}
-                onMouseEnter={e => { e.currentTarget.style.borderColor = 'rgba(139,171,143,0.35)' }}
-                onMouseLeave={e => { e.currentTarget.style.borderColor = 'rgba(255,255,255,0.05)' }}
-              >
-                <div className="flex items-center gap-3">
-                  <span
-                    className="w-5 h-5 rounded-md border flex items-center justify-center shrink-0"
-                    style={{ color: statusColor, background: `${statusColor}12`, borderColor: `${statusColor}30` }}
-                  >
-                    <TypeIcon size={11} />
-                  </span>
-                  <div className="flex-1 min-w-0">
-                    <p className="text-[13px] font-medium text-foreground truncate">{job.taskName || job.loopType || job.id}</p>
-                    <div className="flex items-center gap-2 mt-0.5">
-                      {duration && (
-                        <span className="text-[10px] text-muted-foreground/40 flex items-center gap-1 font-mono">
-                          <Clock size={9} />{duration}
-                        </span>
-                      )}
-                      {job.loopState?.iteration > 0 && (
-                        <span className="text-[10px] text-muted-foreground/60">
-                          Iter {job.loopState.iteration}
-                          {job.loopState.lastVerdict && ` · ${job.loopState.lastVerdict}`}
-                        </span>
-                      )}
-                    </div>
-                  </div>
-                  <div className="flex items-center gap-2 shrink-0">
-                    <span
-                      className="text-[9px] px-1.5 py-0.5 rounded-full border font-medium capitalize"
-                      style={{ background: `${repoColor}10`, color: repoColor, borderColor: `${repoColor}30` }}
-                    >
-                      {job.repo}
-                    </span>
-                    <span className="text-[11px] text-muted-foreground/40 transition-colors group-hover:text-primary">
-                      View
-                    </span>
-                  </div>
-                </div>
-              </div>
-            )
-          })}
-        </div>
-      )}
-
-      {/* Launch form */}
-      <div className="border border-border rounded-lg p-4 space-y-4">
-        <h3 className="text-[12px] font-semibold text-foreground">Launch Loop</h3>
-
-        {/* Repo */}
-        <div>
-          <label className="block text-[11px] font-medium text-muted-foreground mb-1">Repository</label>
-          <div className="flex gap-1.5 flex-wrap">
-            {repos.map(name => {
-              const color = repoIdentityColors[name] || 'var(--primary)'
-              const isSelected = repo === name
-              return (
-                <button
-                  key={name}
-                  type="button"
-                  onClick={() => setRepo(name)}
-                  className={cn(
-                    'px-2.5 py-1 rounded-md text-[12px] font-medium capitalize border transition-all',
-                    isSelected
-                      ? 'border-primary/40 bg-primary/10 text-foreground'
-                      : 'border-border bg-card text-muted-foreground hover:text-foreground hover:bg-card-hover'
-                  )}
-                  style={isSelected ? { borderColor: `${color}40`, backgroundColor: `${color}10` } : undefined}
-                >
-                  <span className="inline-block w-1.5 h-1.5 rounded-full mr-1.5" style={{ background: color }} />
-                  {name}
-                </button>
-              )
-            })}
-          </div>
+      {/* Filter chips */}
+      <div className="space-y-2">
+        <div className="flex items-center gap-1.5 flex-wrap">
+          <span className="text-[10px] uppercase tracking-wider text-muted-foreground/60 mr-1 shrink-0">Status</span>
+          {LOOP_STATUSES.map(st => (
+            <FilterChip
+              key={st}
+              label={STATUS_LABELS[st]}
+              active={selectedStatuses.has(st)}
+              onClick={() => toggleFilter(selectedStatuses, setSelectedStatuses, st)}
+            />
+          ))}
+
+          <div className="h-4 w-px bg-border mx-1" />
+
+          <span className="text-[10px] uppercase tracking-wider text-muted-foreground/60 mr-1 shrink-0">Type</span>
+          {LOOP_TYPES.map(lt => (
+            <FilterChip
+              key={lt.id}
+              label={lt.label}
+              active={selectedTypes.has(lt.id)}
+              onClick={() => toggleFilter(selectedTypes, setSelectedTypes, lt.id)}
+            />
+          ))}
         </div>
 
-        {/* Loop type */}
-        <div>
-          <label className="block text-[11px] font-medium text-muted-foreground mb-1">Loop Type</label>
-          <div className="flex gap-1.5 flex-wrap">
-            {LOOP_TYPES.map(lt => {
-              const isSelected = loopType === lt.id
-              const Icon = lt.icon
-              return (
-                <button
-                  key={lt.id}
-                  type="button"
-                  onClick={() => setLoopType(lt.id)}
-                  className={cn(
-                    'flex items-center gap-1.5 px-2.5 py-1 rounded-md text-[12px] font-medium border transition-all',
-                    isSelected
-                      ? 'border-primary/40 bg-primary/10 text-foreground'
-                      : 'border-border bg-card text-muted-foreground hover:text-foreground hover:bg-card-hover'
-                  )}
-                  style={isSelected ? { borderColor: 'rgba(139,171,143,0.4)', backgroundColor: 'rgba(139,171,143,0.1)' } : undefined}
-                >
-                  <Icon size={11} />
-                  {lt.label}
-                </button>
-              )
-            })}
-          </div>
+        <div className="flex items-center gap-1.5 flex-wrap">
+          <span className="text-[10px] uppercase tracking-wider text-muted-foreground/60 mr-1 shrink-0">Repo</span>
+          {repos.map(name => (
+            <FilterChip
+              key={name}
+              label={name}
+              active={selectedRepos.has(name)}
+              onClick={() => toggleFilter(selectedRepos, setSelectedRepos, name)}
+              color={repoIdentityColors[name]}
+            />
+          ))}
         </div>
+      </div>
 
-        {/* Prompt */}
-        <div>
-          <label className="block text-[11px] font-medium text-muted-foreground mb-1">Prompt</label>
-          <textarea
-            value={prompt}
-            onChange={e => setPrompt(e.target.value)}
-            rows={5}
-            className={cn(
-              'w-full px-3 py-2 rounded-md border border-border bg-card',
-              'text-[13px] text-foreground placeholder:text-muted-foreground/40 leading-relaxed',
-              'focus:outline-none focus:border-primary/30 focus:ring-1 focus:ring-primary/10',
-              'resize-y'
-            )}
-            placeholder="Describe the task for the loop..."
-          />
+      {/* Grouped loop cards */}
+      {jobs.length === 0 ? (
+        <div className="py-16 text-center">
+          <RefreshCcw size={28} className="mx-auto mb-3 text-muted-foreground/30" />
+          <p className="text-sm text-muted-foreground/60">No loop jobs yet.</p>
+          <p className="text-[11px] text-muted-foreground/40 mt-1">Launch one from the Dispatch page.</p>
         </div>
+      ) : (
+        <div className="space-y-6">
+          {groups.map(group => (
+            <div key={group.status}>
+              <div className="flex items-center gap-2 mb-3">
+                <span className={cn('w-1.5 h-1.5 rounded-full', group.dotClass)} />
+                <h3 className="text-[11px] font-medium uppercase tracking-wider text-muted-foreground">
+                  {group.label}
+                </h3>
+                <span className="text-[10px] font-mono text-muted-foreground/40" style={{ fontFamily: 'var(--font-mono)' }}>
+                  {group.items.length}
+                </span>
+              </div>
 
-        {/* Agent picker for linear types */}
-        {loopType !== 'parallel-review' && (
-          <AgentModelPicker label="Agent" value={agentSpec} onChange={setAgentSpec} />
-        )}
-
-        {/* Parallel-review agent pickers */}
-        {loopType === 'parallel-review' && (
-          <div className="space-y-3">
-            <div>
-              <label className="block text-[11px] font-medium text-muted-foreground mb-2">Reviewer Agents</label>
               <div className="space-y-2">
-                {reviewers.map((r, i) => (
-                  <div key={i} className="flex items-end gap-2">
-                    <AgentModelPicker
-                      value={r}
-                      onChange={v => { const next = [...reviewers]; next[i] = v; setReviewers(next) }}
-                    />
-                    {reviewers.length > 1 && (
-                      <button
-                        type="button"
-                        onClick={() => setReviewers(reviewers.filter((_, j) => j !== i))}
-                        className="h-8 px-2.5 rounded-md border border-border text-[11px] text-muted-foreground hover:text-foreground hover:bg-card-hover transition-colors shrink-0"
-                      >
-                        Remove
-                      </button>
-                    )}
+                {group.items.length === 0 && (
+                  <div className="w-full px-3.5 py-2.5 rounded-lg text-center">
+                    <span className="text-[13px] text-muted-foreground/40">Empty</span>
                   </div>
-                ))}
-                <button
-                  type="button"
-                  onClick={() => setReviewers([...reviewers, defaultAgentModel()])}
-                  className="text-[11px] text-muted-foreground hover:text-foreground transition-colors"
-                >
-                  + Add reviewer
-                </button>
+                )}
+                {group.items.map(job => {
+                  const repoColor = repoIdentityColors[job.repo] || 'var(--primary)'
+                  const statusColor = STATUS_COLORS[job.filterStatus] || STATUS_COLORS.active
+                  const duration = job.durationMinutes != null ? timeAgo(null, job.durationMinutes) : null
+                  const TypeIcon = getLoopTypeIcon(job.loopType)
+                  return (
+                    <div
+                      key={job.id}
+                      role="button"
+                      tabIndex={0}
+                      onClick={() => onSelectLoop?.(job.id)}
+                      onKeyDown={e => { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); onSelectLoop?.(job.id) } }}
+                      className="w-full text-left px-3.5 py-2.5 rounded-lg border bg-card hover:bg-card-hover transition-colors group cursor-pointer"
+                      style={{ borderColor: 'rgba(255,255,255,0.05)' }}
+                      onMouseEnter={e => { e.currentTarget.style.borderColor = 'rgba(139,171,143,0.35)' }}
+                      onMouseLeave={e => { e.currentTarget.style.borderColor = 'rgba(255,255,255,0.05)' }}
+                    >
+                      <div className="flex items-center gap-3">
+                        <span
+                          className="w-5 h-5 rounded-md border flex items-center justify-center shrink-0"
+                          style={{ color: statusColor, background: `${statusColor}12`, borderColor: `${statusColor}30` }}
+                        >
+                          <TypeIcon size={11} />
+                        </span>
+                        <div className="flex-1 min-w-0">
+                          <p className="text-[13px] font-medium text-foreground truncate">{job.taskName || job.loopType || job.id}</p>
+                          <div className="flex items-center gap-2 mt-0.5">
+                            {duration && (
+                              <span className="text-[10px] text-muted-foreground/40 flex items-center gap-1 font-mono">
+                                <Clock size={9} />{duration}
+                              </span>
+                            )}
+                            {job.loopState?.iteration > 0 && (
+                              <span className="text-[10px] text-muted-foreground/60">
+                                Iter {job.loopState.iteration}
+                                {job.loopState.lastVerdict && ` · ${job.loopState.lastVerdict}`}
+                              </span>
+                            )}
+                          </div>
+                        </div>
+                        <div className="flex items-center gap-2 shrink-0">
+                          <span
+                            className="text-[9px] px-1.5 py-0.5 rounded-full border font-medium capitalize"
+                            style={{ background: `${repoColor}10`, color: repoColor, borderColor: `${repoColor}30` }}
+                          >
+                            {job.repo}
+                          </span>
+                          <span className="text-[11px] text-muted-foreground/40 transition-colors group-hover:text-primary">
+                            View
+                          </span>
+                        </div>
+                      </div>
+                    </div>
+                  )
+                })}
               </div>
             </div>
-
-            <AgentModelPicker label="Synthesizer" value={synthesizer} onChange={setSynthesizer} />
-            <AgentModelPicker label="Implementor" value={implementor} onChange={setImplementor} />
-          </div>
-        )}
-
-        {/* Glow launch button */}
-        <div className="flex justify-end">
-        <div
-          className={cn(
-            'relative inline-flex items-center justify-center',
-            btnPhase === 'idle' && 'transition-opacity duration-200',
-            btnPhase === 'shaking' && 'animate-dispatch-shake',
-            btnPhase === 'sliding' && 'animate-dispatch-btn-out',
-            btnPhase === 'returning' && 'animate-dispatch-btn-in',
-          )}
-          style={{
-            opacity: !isReady && btnPhase === 'idle' ? 0.4 : 1,
-            ...(btnPhase === 'hidden' && { transform: 'translateX(400px)' }),
-          }}
-        >
-          {/* Glow layers */}
-          <div
-            className="absolute inset-0 pointer-events-none transition-opacity duration-500"
-            style={{ opacity: isReady || btnPhase !== 'idle' ? 1 : 0 }}
-          >
-            <div className="absolute pointer-events-none animate-loading-halo" style={{ width: '204px', height: '66px', background: '#8bab8f', borderRadius: '50%', filter: 'blur(35px)', top: 'calc(50% - 33px)', left: 'calc(50% - 102px)' }} />
-            <div className="absolute pointer-events-none animate-loading-glow" style={{ width: '108px', height: '38px', background: '#8bab8f', borderRadius: '50%', filter: 'blur(19px)', top: 'calc(50% - 19px)', left: 'calc(50% - 54px)' }} />
-            <div className="absolute pointer-events-none animate-loading-glow-shift" style={{ width: '90px', height: '32px', background: '#7ea89a', borderRadius: '50%', filter: 'blur(17px)', top: 'calc(50% - 16px)', left: 'calc(50% - 45px)' }} />
-          </div>
-
-          <button
-            type="button"
-            onClick={handleLaunch}
-            style={{
-              background: 'linear-gradient(135deg, #8bab8f 0%, #6d9472 100%)',
-              color: '#1a1b1e',
-              boxShadow: btnPhase !== 'idle'
-                ? '0 0 18px 4px rgba(139,171,143,0.45)'
-                : '0 0 8px 2px rgba(139,171,143,0.18)',
-              transition: 'box-shadow 400ms ease',
-              cursor: !isReady && btnPhase === 'idle' ? 'not-allowed' : 'pointer',
-            }}
-            className={cn(
-              'inline-flex items-center gap-2.5 pl-5 pr-6 h-10 rounded-full text-[13px] font-semibold shrink-0 relative z-10',
-              btnPhase === 'idle' && 'transition-transform duration-150 ease-out hover:scale-105 active:scale-[0.97]',
-            )}
-          >
-            <RefreshCcw size={15} />
-            Dispatch
-          </button>
+          ))}
         </div>
-        </div>
-      </div>
+      )}
     </div>
   )
 }
diff --git a/dashboard/src/components/PlansView.jsx b/dashboard/src/components/PlansView.jsx
index 2e8624a..1ec5d20 100644
--- a/dashboard/src/components/PlansView.jsx
+++ b/dashboard/src/components/PlansView.jsx
@@ -9,6 +9,7 @@ import Markdown from 'react-markdown'
 import remarkGfm from 'remark-gfm'
 import { buildPlanPath, cn, truncateWithEllipsis } from '../lib/utils'
 import { repoIdentityColors } from '../lib/constants'
+import { getFilterChipClassName, getFilterChipStyle } from '../lib/filterUtils.jsx'
 import { mdComponents } from './mdComponents'
 
 function timeAgo(isoStr) {
@@ -74,8 +75,9 @@ function getLinkedJobStatusChip(job) {
   if (job.validation === 'validated') return { label: 'validated', color: 'var(--status-complete)' }
   if (job.validation === 'rejected') return { label: 'rejected', color: 'var(--status-failed)' }
   if (job.status === 'in_progress') return { label: 'running', color: 'var(--status-active)' }
+  if (job.status === 'stopped' || job.status === 'killed') return { label: 'stopped', color: 'var(--status-review)' }
   if (job.status === 'completed') return { label: 'completed', color: 'var(--status-complete)' }
-  if (job.status === 'failed' || job.status === 'killed') return { label: 'failed', color: 'var(--status-failed)' }
+  if (job.status === 'failed') return { label: 'failed', color: 'var(--status-failed)' }
   return { label: job.status || 'dispatched', color: 'var(--muted-foreground)' }
 }
 
@@ -83,7 +85,8 @@ function getPlanListGroup(plan, swarm) {
   const linkedJob = plan.jobSlug ? (swarm?.agents?.find(a => a.id === plan.jobSlug) || null) : null
   const jobStatus = resolveJobStatus(plan, swarm)
 
-  if (linkedJob?.validation === 'needs_validation' || jobStatus === 'needs_validation') return 'in_review'
+  if (plan.planStatus === 'completed') return 'done'
+  if (linkedJob?.validation === 'needs_validation' || jobStatus === 'needs_validation' || jobStatus === 'stopped') return 'in_review'
   if (jobStatus === 'completed' && (!linkedJob?.validation || linkedJob.validation === 'none')) return 'in_review'
   if (linkedJob?.validation === 'validated' || jobStatus === 'completed') return 'done'
   if (plan.planStatus === 'ready') return 'ready'
@@ -278,12 +281,13 @@ function PlanDetail({ plan: initialPlan, onBack, onNavigateToDispatch, settings,
   const [isEditing, setIsEditing] = useState(false)
   const [editContent, setEditContent] = useState('')
   const [saving, setSaving] = useState(false)
-  const [togglingReady, setTogglingReady] = useState(false)
+  const [updatingStatus, setUpdatingStatus] = useState(false)
 
   const color = repoIdentityColors[plan.repo] || 'var(--primary)'
   const jobStatus = resolveJobStatus(plan, swarm)
   const isRunning = jobStatus === 'in_progress'
   const isReady = plan.planStatus === 'ready'
+  const isCompleted = plan.planStatus === 'completed'
   const linkedJob = plan.jobSlug ? (swarm?.agents?.find(a => a.id === plan.jobSlug) || null) : null
   const linkedJobStatus = getLinkedJobStatusChip(linkedJob)
   const linkedJobNameRaw = linkedJob?.taskName || plan.jobSlug || ''
@@ -310,9 +314,8 @@ function PlanDetail({ plan: initialPlan, onBack, onNavigateToDispatch, settings,
     }
   }
 
-  async function toggleReady() {
-    const newStatus = isReady ? null : 'ready'
-    setTogglingReady(true)
+  async function updatePlanStatus(newStatus) {
+    setUpdatingStatus(true)
     try {
       await fetch(`/api/plans/${plan.repo}/${plan.slug}/status`, {
         method: 'POST',
@@ -321,7 +324,7 @@ function PlanDetail({ plan: initialPlan, onBack, onNavigateToDispatch, settings,
       })
       setPlan(p => ({ ...p, planStatus: newStatus }))
     } finally {
-      setTogglingReady(false)
+      setUpdatingStatus(false)
     }
   }
 
@@ -369,23 +372,40 @@ function PlanDetail({ plan: initialPlan, onBack, onNavigateToDispatch, settings,
           </>
         )}
 
-        {/* Ready toggle */}
+        {/* Status toggles */}
         {!isEditing && (
-          <button
-            onClick={toggleReady}
-            disabled={togglingReady}
-            className={cn(
-              'flex items-center gap-1.5 px-2.5 py-1 rounded-md border text-[12px] font-medium transition-all disabled:opacity-50',
-              isReady
-                ? 'text-foreground'
-                : 'border-border bg-card text-muted-foreground hover:text-foreground hover:bg-card-hover'
-            )}
-            style={isReady ? { color: '#8bab8f', borderColor: '#8bab8f40', backgroundColor: '#8bab8f18' } : undefined}
-            title={isReady ? 'Mark as draft' : 'Mark as ready'}
-          >
-            <Check size={12} />
-            {isReady ? 'Ready' : 'Mark ready'}
-          </button>
+          <>
+            <button
+              onClick={() => updatePlanStatus(isReady ? null : 'ready')}
+              disabled={updatingStatus}
+              className={cn(
+                'flex items-center gap-1.5 px-2.5 py-1 rounded-md border text-[12px] font-medium transition-all disabled:opacity-50',
+                isReady
+                  ? 'text-foreground'
+                  : 'border-border bg-card text-muted-foreground hover:text-foreground hover:bg-card-hover'
+              )}
+              style={isReady ? { color: '#8bab8f', borderColor: '#8bab8f40', backgroundColor: '#8bab8f18' } : undefined}
+              title={isReady ? 'Mark as draft' : 'Mark as ready'}
+            >
+              <Check size={12} />
+              {isReady ? 'Ready' : 'Mark ready'}
+            </button>
+            <button
+              onClick={() => updatePlanStatus(isCompleted ? null : 'completed')}
+              disabled={updatingStatus}
+              className={cn(
+                'flex items-center gap-1.5 px-2.5 py-1 rounded-md border text-[12px] font-medium transition-all disabled:opacity-50',
+                isCompleted
+                  ? 'text-foreground'
+                  : 'border-border bg-card text-muted-foreground hover:text-foreground hover:bg-card-hover'
+              )}
+              style={isCompleted ? { color: 'var(--status-complete)', borderColor: 'var(--status-complete-border)', backgroundColor: 'var(--status-complete-bg)' } : undefined}
+              title={isCompleted ? 'Mark as draft' : 'Mark as complete'}
+            >
+              <Check size={12} />
+              {isCompleted ? 'Completed' : 'Mark complete'}
+            </button>
+          </>
         )}
 
         {/* Edit / Save */}
@@ -567,7 +587,6 @@ export default function PlansView({ overview, swarm, onNavigateToDispatch, setti
   for (const group of PLAN_LIST_GROUPS) {
     groupedPlans[group.key].sort((a, b) => new Date(b.lastModified).getTime() - new Date(a.lastModified).getTime())
   }
-  const hasGroupedPlans = PLAN_LIST_GROUPS.some(group => groupedPlans[group.key].length > 0)
 
   return (
     <div className="flex flex-col gap-4">
@@ -576,13 +595,8 @@ export default function PlansView({ overview, swarm, onNavigateToDispatch, setti
         <div className="flex gap-1.5 flex-wrap">
           <button
             onClick={() => setRepoFilterPersisted(null)}
-            className={cn(
-              'px-2.5 py-1 rounded-md text-[12px] font-medium border transition-all',
-              repoFilter === null
-                ? 'border-primary/40 bg-primary/10 text-foreground'
-                : 'border-border bg-card text-muted-foreground hover:text-foreground hover:bg-card-hover'
-            )}
-            style={repoFilter === null ? { borderColor: '#8bab8f40', backgroundColor: '#8bab8f10' } : undefined}
+            className={getFilterChipClassName(repoFilter === null, 'px-2.5 py-1 rounded-md text-[12px]')}
+            style={getFilterChipStyle(repoFilter === null, '#8bab8f')}
           >
             All
           </button>
@@ -593,13 +607,8 @@ export default function PlansView({ overview, swarm, onNavigateToDispatch, setti
               <button
                 key={r.name}
                 onClick={() => setRepoFilterPersisted(isActive ? null : r.name)}
-                className={cn(
-                  'px-2.5 py-1 rounded-md text-[12px] font-medium capitalize border transition-all',
-                  isActive
-                    ? 'border-primary/40 bg-primary/10 text-foreground'
-                    : 'border-border bg-card text-muted-foreground hover:text-foreground hover:bg-card-hover'
-                )}
-                style={isActive ? { borderColor: `${color}40`, backgroundColor: `${color}10` } : undefined}
+                className={getFilterChipClassName(isActive, 'px-2.5 py-1 rounded-md text-[12px] capitalize')}
+                style={getFilterChipStyle(isActive, color)}
               >
                 <span className="inline-block w-1.5 h-1.5 rounded-full mr-1.5" style={{ background: color }} />
                 {r.name}
@@ -622,26 +631,25 @@ export default function PlansView({ overview, swarm, onNavigateToDispatch, setti
       ) : (
         <div className="flex flex-col gap-4">
           {PLAN_LIST_GROUPS.map(group => (
-            groupedPlans[group.key].length > 0 ? (
               <div key={group.key} className="flex flex-col gap-1.5">
                 <h3 className="flex items-center gap-1.5 text-[11px] uppercase tracking-wider text-muted-foreground/60 font-semibold pt-1 pb-0.5">
                   {group.label} <CountBadge n={groupedPlans[group.key].length} />
                 </h3>
-                {groupedPlans[group.key].map(plan => (
-                  <PlanCard
-                    key={`${plan.repo}/${plan.slug}`}
-                    plan={plan}
-                    onSelect={handleSelectPlan}
-                  />
-                ))}
+                {groupedPlans[group.key].length === 0 ? (
+                  <div className="w-full px-4 py-3 rounded-lg text-center">
+                    <span className="text-[13px] text-muted-foreground/40">Empty</span>
+                  </div>
+                ) : (
+                  groupedPlans[group.key].map(plan => (
+                    <PlanCard
+                      key={`${plan.repo}/${plan.slug}`}
+                      plan={plan}
+                      onSelect={handleSelectPlan}
+                    />
+                  ))
+                )}
               </div>
-            ) : null
           ))}
-          {!hasGroupedPlans && (
-            <div className="py-8 text-center">
-              <p className="text-[13px] text-muted-foreground/60">No plans found.</p>
-            </div>
-          )}
         </div>
       )}
     </div>
diff --git a/dashboard/src/components/ResultsPanel.jsx b/dashboard/src/components/ResultsPanel.jsx
index 17c4ed1..b6a4b67 100644
--- a/dashboard/src/components/ResultsPanel.jsx
+++ b/dashboard/src/components/ResultsPanel.jsx
@@ -1,5 +1,5 @@
 import { useState, useEffect, useRef } from 'react'
-import { CheckCircle, XCircle, Loader, Clock, Square, Activity, ListChecks, GitMerge, Trash2, Send, RotateCcw, ChevronRight, ChevronDown, GitBranch, Copy, Check, MoreHorizontal, Play, X } from 'lucide-react'
+import { CheckCircle, XCircle, Loader, Clock, Square, Activity, ListChecks, GitMerge, Trash2, Send, RotateCcw, ChevronRight, ChevronDown, GitBranch, Copy, Check, MoreHorizontal, Play, X, AlertTriangle } from 'lucide-react'
 import Markdown from 'react-markdown'
 import remarkGfm from 'remark-gfm'
 import { cn, timeAgo, truncateWithEllipsis, buildPlanPath } from '../lib/utils'
@@ -528,7 +528,7 @@ function AgentActions({ detail, agentId, diffData, onJobsRefresh, onOverviewRefr
         diffData.deletions > 0 ? `−${diffData.deletions}` : null,
       ].filter(Boolean).join(', ')
     : null
-  const showFollowUpSection = detail.validation === 'needs_validation' || detail.status === 'completed' || detail.status === 'killed'
+  const showFollowUpSection = detail.validation === 'needs_validation' || detail.status === 'completed' || detail.status === 'stopped' || detail.status === 'killed'
 
   return (
     <div className="space-y-5">
@@ -659,7 +659,7 @@ function FollowUpChat({ repoName, detail, onDispatch, dispatching, settings: app
     setIncludeWorktreeContext(Boolean(activeWorktreePath))
   }, [activeWorktreePath])
 
-  const isCodex = agent === 'codex'
+  const turnsUnsupported = agent === 'codex' || agent === 'cursor' || agent === 'pi'
 
   async function handleDispatch() {
     if (!chatPrompt.trim()) return
@@ -674,11 +674,12 @@ function FollowUpChat({ repoName, detail, onDispatch, dispatching, settings: app
     await onDispatch?.(promptWithContext, {
       agent,
       model,
-      maxTurns: isCodex ? null : maxTurns,
+      maxTurns: turnsUnsupported ? null : maxTurns,
       autoMerge,
       useWorktree,
       plainOutput,
       originalTask: basePrompt,
+      previousJobId: detail?.id || undefined,
     })
     setChatPrompt('')
     setActiveTemplate(null)
@@ -783,16 +784,16 @@ function FollowUpChat({ repoName, detail, onDispatch, dispatching, settings: app
 
 function getHeroStyle(status, validation) {
   if (status === 'in_progress') return 'animate-glow-pulse'
-  if (status === 'failed' || status === 'killed') return 'ring-1 ring-status-failed/10'
-  if (validation === 'needs_validation') return 'ring-1 ring-status-review/10'
+  if (status === 'stopped' || status === 'killed' || validation === 'needs_validation') return 'ring-1 ring-status-review/10'
+  if (status === 'failed') return 'ring-1 ring-status-failed/10'
   if (validation === 'validated') return 'opacity-90'
   return ''
 }
 
 function getHeroBg(status, validation) {
   if (status === 'in_progress') return 'bg-status-active-bg/30'
-  if (status === 'failed' || status === 'killed') return 'bg-status-failed-bg/30'
-  if (validation === 'needs_validation') return 'bg-status-review-bg/30'
+  if (status === 'stopped' || status === 'killed' || validation === 'needs_validation') return 'bg-status-review-bg/30'
+  if (status === 'failed') return 'bg-status-failed-bg/30'
   if (validation === 'validated') return 'bg-status-active-bg/20'
   return 'bg-card/30'
 }
@@ -1112,16 +1113,19 @@ export default function ResultsPanel({ agentId, hasLiveTerminal = false, onJobsR
                   <span className="flex items-center gap-1.5"><RotateCcw size={12} /> Resume</span>
                 </button>
               )}
-              {detail.status === 'in_progress' && hasLiveTerminal && (
+              {detail.status === 'in_progress' && (
                 <button
                   onClick={handleKill}
                   className={cn(
                     'px-3 py-1.5 rounded-md text-xs font-medium transition-all shrink-0',
                     confirmKill
                       ? 'bg-status-failed-bg text-status-failed border border-status-failed-border'
-                      : 'text-muted-foreground hover:text-status-failed hover:bg-status-failed-bg border border-transparent hover:border-status-failed-border'
+                      : hasLiveTerminal
+                        ? 'text-muted-foreground hover:text-status-failed hover:bg-status-failed-bg border border-transparent hover:border-status-failed-border'
+                        : 'text-status-failed/70 hover:text-status-failed bg-status-failed-bg/50 border border-status-failed-border/30 hover:border-status-failed-border'
                   )}
                   disabled={killing}
+                  title={hasLiveTerminal ? 'Stop running job' : 'Stop orphaned job (no active session)'}
                 >
                   {killing ? <Loader size={12} className="animate-spin-slow" /> : confirmKill ? 'Confirm Stop?' : <span className="flex items-center gap-1.5"><Square size={12} /> Stop</span>}
                 </button>
@@ -1137,6 +1141,24 @@ export default function ResultsPanel({ agentId, hasLiveTerminal = false, onJobsR
           </div>
         )}
 
+        {/* Error banner */}
+        {detail.lastError && (
+          <div className="mt-4 rounded-lg border border-status-failed-border bg-status-failed-bg px-4 py-3">
+            <div className="flex items-start gap-2.5">
+              <AlertTriangle size={14} className="text-status-failed shrink-0 mt-0.5" />
+              <div className="min-w-0 flex-1">
+                <p className="text-xs font-semibold text-status-failed">
+                  {detail.lastErrorSubKind === 'rate_limit' ? 'Rate Limit Hit' : 'Error Detected'}
+                  {detail.errorCount > 1 && (
+                    <span className="ml-1.5 font-normal opacity-70">({detail.errorCount} errors)</span>
+                  )}
+                </p>
+                <p className="mt-1 text-[11px] text-status-failed/80 leading-relaxed break-words">{detail.lastError}</p>
+              </div>
+            </div>
+          </div>
+        )}
+
         {/* Action bar — Approve / Request Changes / Mark Done — right here in Zone 1 */}
         {(canAct || (!taskMarked && detail.status === 'completed')) && (
           <div className="mt-4 space-y-2">
diff --git a/dashboard/src/components/SettingsView.jsx b/dashboard/src/components/SettingsView.jsx
index 754e4ff..03864ed 100644
--- a/dashboard/src/components/SettingsView.jsx
+++ b/dashboard/src/components/SettingsView.jsx
@@ -59,7 +59,11 @@ function AgentCard({ agentId, label, agentSettings, onUpdate, showMaxTurns = tru
         <div>
           <span className="text-[12px] text-foreground/80">Skip Permissions</span>
           <p className="text-[10px] text-muted-foreground/50">
-            {agentId === 'claude' ? '--dangerously-skip-permissions' : '--dangerously-bypass-approvals-and-sandbox'}
+            {agentId === 'claude'
+              ? '--dangerously-skip-permissions'
+              : agentId === 'cursor'
+                ? '--force'
+                : '--dangerously-bypass-approvals-and-sandbox'}
           </p>
         </div>
       </div>
@@ -74,7 +78,11 @@ function AgentCard({ agentId, label, agentSettings, onUpdate, showMaxTurns = tru
           <div>
             <span className="text-[12px] text-foreground/80">TUI Mode</span>
             <p className="text-[10px] text-muted-foreground/50">
-              {agentId === 'claude' ? 'Off: adds -p --output-format text' : 'Off: adds --quiet, runs headless'}
+              {agentId === 'claude'
+                ? 'Off: adds -p --output-format text'
+                : agentId === 'cursor'
+                  ? 'Off: adds --print --output-format text'
+                  : 'Off: adds --color never, runs headless'}
             </p>
           </div>
         </div>
@@ -121,6 +129,22 @@ export default function SettingsView({ settings, onUpdateAgent }) {
           showMaxTurns={false}
           showTuiMode={true}
         />
+        <AgentCard
+          agentId="cursor"
+          label="Cursor"
+          agentSettings={settings.agents.cursor}
+          onUpdate={onUpdateAgent}
+          showMaxTurns={false}
+          showTuiMode={true}
+        />
+        <AgentCard
+          agentId="pi"
+          label="Pi"
+          agentSettings={settings.agents.pi}
+          onUpdate={onUpdateAgent}
+          showMaxTurns={false}
+          showTuiMode={true}
+        />
       </div>
     </div>
   )
diff --git a/dashboard/src/components/StatusView.jsx b/dashboard/src/components/StatusView.jsx
index 75b56af..4cd20a2 100644
--- a/dashboard/src/components/StatusView.jsx
+++ b/dashboard/src/components/StatusView.jsx
@@ -31,8 +31,8 @@ export default function StatusView({ overview, swarm }) {
         color: repoIdentityColors[repo.name] || 'var(--primary)',
         active: repoAgents.filter(a => a.status === 'in_progress').length,
         completed: repoAgents.filter(a => a.status === 'completed').length,
-        failed: repoAgents.filter(a => a.status === 'failed' || a.status === 'killed').length,
-        review: repoAgents.filter(a => a.validation === 'needs_validation').length,
+        failed: repoAgents.filter(a => a.status === 'failed').length,
+        review: repoAgents.filter(a => a.validation === 'needs_validation' || a.status === 'stopped').length,
         openTasks: repo.tasks?.openCount || 0,
         branch: repo.git?.branch || '-',
         dirty: repo.git?.isDirty || false,
diff --git a/dashboard/src/components/TerminalPanel.jsx b/dashboard/src/components/TerminalPanel.jsx
index f2ad02c..c6e8a1b 100644
--- a/dashboard/src/components/TerminalPanel.jsx
+++ b/dashboard/src/components/TerminalPanel.jsx
@@ -83,17 +83,21 @@ function AgentHeader({ taskInfo }) {
     ? 'Running'
     : status === 'completed'
       ? 'Completed'
-      : status === 'failed' || status === 'killed'
-        ? 'Failed'
-        : 'Starting'
+      : status === 'stopped' || status === 'killed'
+        ? 'Stopped'
+        : status === 'failed'
+          ? 'Failed'
+          : 'Starting'
 
   const statusClass = status === 'in_progress'
     ? 'text-status-active bg-status-active-bg border-status-active-border'
     : status === 'completed'
       ? 'text-status-complete bg-status-complete-bg border-status-complete-border'
-      : status === 'failed' || status === 'killed'
-        ? 'text-status-failed bg-status-failed-bg border-status-failed-border'
-        : 'text-muted-foreground bg-card border-border'
+      : status === 'stopped' || status === 'killed'
+        ? 'text-status-review bg-status-review-bg border-status-review-border'
+        : status === 'failed'
+          ? 'text-status-failed bg-status-failed-bg border-status-failed-border'
+          : 'text-muted-foreground bg-card border-border'
 
   return (
     <div className="px-3 py-2.5 border-b border-border bg-card/60">
diff --git a/dashboard/src/components/mdComponents.jsx b/dashboard/src/components/mdComponents.jsx
index 4b548d4..e86ff93 100644
--- a/dashboard/src/components/mdComponents.jsx
+++ b/dashboard/src/components/mdComponents.jsx
@@ -2,6 +2,26 @@
  * Shared react-markdown component overrides for consistent styling.
  * Used by ResultsPanel, SwarmDetail.
  */
+function flattenCodeChildren(children) {
+  if (Array.isArray(children)) return children.map(flattenCodeChildren).join('')
+  if (typeof children === 'string') return children
+  if (children == null) return ''
+  return String(children)
+}
+
+function renderDiffLines(text) {
+  const lines = text.replace(/\n$/, '').split('\n')
+  return lines.map((line, idx) => {
+    let lineClass = 'block -mx-2 px-2'
+    if (line.startsWith('+++') || line.startsWith('---')) lineClass += ' text-sky-300 bg-sky-500/10'
+    else if (line.startsWith('+')) lineClass += ' text-emerald-300 bg-emerald-500/10'
+    else if (line.startsWith('-')) lineClass += ' text-rose-300 bg-rose-500/10'
+    else if (line.startsWith('@@')) lineClass += ' text-amber-300 bg-amber-500/10'
+    else if (line.startsWith('diff ') || line.startsWith('index ')) lineClass += ' text-muted-foreground/80'
+    return <span key={idx} className={lineClass}>{line || ' '}</span>
+  })
+}
+
 export const mdComponents = {
   h1: ({ children }) => <h1 className="text-base font-bold text-foreground mt-3 mb-1 first:mt-0">{children}</h1>,
   p: ({ children }) => <p className="leading-relaxed mb-1.5 last:mb-0">{children}</p>,
@@ -21,8 +41,8 @@ export const mdComponents = {
       {children}
     </pre>
   ),
-  code: ({ node, children, ...props }) => {
-    const text = Array.isArray(children) ? children.join('') : String(children || '')
+  code: ({ inline, className, node, children }) => {
+    const text = flattenCodeChildren(children)
     if (text.startsWith('ts:')) {
       const parts = text.slice(3).split('~~')
       const relative = parts[0]
@@ -36,7 +56,19 @@ export const mdComponents = {
         </span>
       )
     }
-    const isInline = !node?.properties?.className
+    const isInline = typeof inline === 'boolean' ? inline : !node?.properties?.className
+    const languageMatch = String(className || '').match(/language-([A-Za-z0-9_-]+)/)
+    const language = languageMatch?.[1]?.toLowerCase()
+    const isDiffBlock = !isInline && (language === 'diff' || language === 'patch')
+
+    if (isDiffBlock) {
+      return (
+        <code className="block text-[11px] font-mono" style={{ fontFamily: 'var(--font-mono)' }}>
+          {renderDiffLines(text)}
+        </code>
+      )
+    }
+
     if (isInline) {
       return (
         <code className="px-1 py-0.5 rounded bg-secondary/60 text-[11px] font-mono" style={{ fontFamily: 'var(--font-mono)' }}>
diff --git a/dashboard/src/lib/apiFetchSetup.js b/dashboard/src/lib/apiFetchSetup.js
new file mode 100644
index 0000000..7bc282c
--- /dev/null
+++ b/dashboard/src/lib/apiFetchSetup.js
@@ -0,0 +1,34 @@
+/**
+ * When the hub uses DISPATCH_API_KEY, production builds must set
+ * VITE_DISPATCH_API_KEY to the same value so browser fetch() includes X-API-Key.
+ * Dev: Vite proxy injects the key from DISPATCH_API_KEY (see vite.config.js).
+ */
+const key = import.meta.env.VITE_DISPATCH_API_KEY
+if (key && typeof window !== 'undefined') {
+  const orig = window.fetch.bind(window)
+  const origin = window.location.origin
+
+  function shouldAttachApiKey(input) {
+    try {
+      const rawUrl = input instanceof Request
+        ? input.url
+        : typeof input === 'string' || input instanceof URL
+          ? String(input)
+          : ''
+      if (!rawUrl) return false
+      const url = new URL(rawUrl, window.location.href)
+      return url.origin === origin
+    } catch {
+      return false
+    }
+  }
+
+  window.fetch = (input, init = {}) => {
+    if (!shouldAttachApiKey(input)) return orig(input, init)
+    const next = { ...init }
+    const h = new Headers(init.headers || {})
+    h.set('X-API-Key', key)
+    next.headers = h
+    return orig(input, next)
+  }
+}
diff --git a/dashboard/src/lib/constants.js b/dashboard/src/lib/constants.js
index 59cd6d8..60e226c 100644
--- a/dashboard/src/lib/constants.js
+++ b/dashboard/src/lib/constants.js
@@ -44,6 +44,15 @@ export const CURSOR_MODEL_OPTIONS = [
   { value: 'gemini-2.5-pro', label: 'Gemini 2.5 Pro' },
 ]
 
+/**
+ * Available Pi models. Keep in sync with server.js FALLBACK_PI_MODELS.
+ */
+export const PI_MODEL_OPTIONS = [
+  { value: 'google/gemini-2.5-pro', label: 'Gemini 2.5 Pro' },
+  { value: 'openai-codex/gpt-5.4', label: 'GPT-5.4' },
+  { value: 'anthropic/claude-sonnet-4', label: 'Claude Sonnet 4' },
+]
+
 /**
  * Supported agent providers.
  */
@@ -51,6 +60,7 @@ export const AGENT_OPTIONS = [
   { id: 'claude', label: 'Claude' },
   { id: 'codex', label: 'Codex' },
   { id: 'cursor', label: 'Cursor' },
+  { id: 'pi', label: 'Pi' },
 ]
 
 /**
@@ -61,6 +71,7 @@ export const AGENT_BRAND_COLORS = {
   claude: '#D97757',
   codex: '#924FF7',
   cursor: '#2B7FFF',
+  pi: '#18A874',
 }
 
 /**
@@ -69,6 +80,7 @@ export const AGENT_BRAND_COLORS = {
 export function normalizeAgentId(agent) {
   if (agent === 'codex') return 'codex'
   if (agent === 'cursor') return 'cursor'
+  if (agent === 'pi') return 'pi'
   return 'claude'
 }
 
diff --git a/dashboard/src/lib/filterUtils.jsx b/dashboard/src/lib/filterUtils.jsx
index 17e5601..14291d9 100644
--- a/dashboard/src/lib/filterUtils.jsx
+++ b/dashboard/src/lib/filterUtils.jsx
@@ -2,20 +2,37 @@ import { cn } from './utils'
 
 export const BUG_COLOR = '#7ea89a'
 
+export function getFilterChipClassName(active, className = '') {
+  return cn(
+    'border font-medium transition-colors',
+    active
+      ? 'hover:brightness-105'
+      : 'hover:brightness-110',
+    className
+  )
+}
+
+export function getFilterChipStyle(active, color) {
+  return {
+    backgroundColor: active
+      ? (color ? `${color}16` : 'var(--secondary)')
+      : 'var(--tertiary)',
+    color: active ? 'var(--secondary-foreground)' : 'var(--tertiary-foreground)',
+    borderColor: color
+      ? (active ? `${color}4a` : `${color}22`)
+      : (active ? 'rgba(255,255,255,0.12)' : 'rgba(255,255,255,0.07)'),
+    boxShadow: active
+      ? (color ? `inset 0 0 0 1px ${color}10` : 'inset 0 0 0 1px rgba(255,255,255,0.03)')
+      : 'none',
+  }
+}
+
 export function FilterChip({ label, active, onClick, color }) {
   return (
     <button
       onClick={onClick}
-      className={cn(
-        'text-[11px] px-2.5 py-1 rounded-full border font-medium transition-all capitalize',
-        active
-          ? ''
-          : 'bg-card border-border text-muted-foreground/60 hover:text-muted-foreground hover:border-border'
-      )}
-      style={active ? (color
-        ? { borderColor: `${color}60`, backgroundColor: `${color}18`, color }
-        : { borderColor: 'rgba(255,255,255,0.10)', backgroundColor: 'rgba(255,255,255,0.04)', color: '#b0b1b8' }
-      ) : undefined}
+      className={getFilterChipClassName(active, 'text-[11px] px-2.5 py-1 rounded-full capitalize')}
+      style={getFilterChipStyle(active, color)}
     >
       {label}
     </button>
diff --git a/dashboard/src/lib/loopConstants.js b/dashboard/src/lib/loopConstants.js
new file mode 100644
index 0000000..91e8143
--- /dev/null
+++ b/dashboard/src/lib/loopConstants.js
@@ -0,0 +1,7 @@
+import { Code2, ScanSearch, GitFork } from 'lucide-react'
+
+export const LOOP_TYPE_META = {
+  'linear-implementation': { label: 'Linear Implementation', icon: Code2 },
+  'linear-review': { label: 'Linear Review', icon: ScanSearch },
+  'parallel-review': { label: 'Parallel Review', icon: GitFork },
+}
diff --git a/dashboard/src/lib/statusConfig.js b/dashboard/src/lib/statusConfig.js
index e74434d..e241265 100644
--- a/dashboard/src/lib/statusConfig.js
+++ b/dashboard/src/lib/statusConfig.js
@@ -1,4 +1,4 @@
-import { Activity, CheckCircle, XCircle, AlertCircle, Loader, Ban } from 'lucide-react'
+import { Activity, CheckCircle, XCircle, AlertCircle, Loader, Square } from 'lucide-react'
 
 /**
  * Status config for swarm agent states — icon, color, label, etc.
@@ -29,13 +29,21 @@ export const statusConfig = {
     label: 'Failed',
     dotColor: 'var(--status-failed)',
   },
+  stopped: {
+    icon: Square,
+    color: 'text-status-review',
+    borderColor: 'var(--status-review-border)',
+    bg: 'bg-status-review-bg',
+    label: 'Stopped',
+    dotColor: 'var(--status-review)',
+  },
   killed: {
-    icon: Ban,
-    color: 'text-status-failed',
-    borderColor: 'var(--status-failed-border)',
-    bg: 'bg-status-failed-bg',
-    label: 'Killed',
-    dotColor: 'var(--status-failed)',
+    icon: Square,
+    color: 'text-status-review',
+    borderColor: 'var(--status-review-border)',
+    bg: 'bg-status-review-bg',
+    label: 'Stopped',
+    dotColor: 'var(--status-review)',
   },
   needs_validation: {
     icon: AlertCircle,
diff --git a/dashboard/src/lib/useAgentModels.js b/dashboard/src/lib/useAgentModels.js
index ff6f9d5..a0c5559 100644
--- a/dashboard/src/lib/useAgentModels.js
+++ b/dashboard/src/lib/useAgentModels.js
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react'
-import { MODEL_OPTIONS, CODEX_MODEL_OPTIONS, CURSOR_MODEL_OPTIONS } from './constants'
+import { MODEL_OPTIONS, CODEX_MODEL_OPTIONS, CURSOR_MODEL_OPTIONS, PI_MODEL_OPTIONS } from './constants'
 
 /**
  * Fetches available models for the given agent from the server, which queries
@@ -9,6 +9,7 @@ import { MODEL_OPTIONS, CODEX_MODEL_OPTIONS, CURSOR_MODEL_OPTIONS } from './cons
 export function useAgentModels(agent) {
   const fallback = agent === 'codex' ? CODEX_MODEL_OPTIONS
                  : agent === 'cursor' ? CURSOR_MODEL_OPTIONS
+                 : agent === 'pi' ? PI_MODEL_OPTIONS
                  : MODEL_OPTIONS
   const [models, setModels] = useState(fallback)
 
diff --git a/dashboard/src/lib/useAppNavigation.js b/dashboard/src/lib/useAppNavigation.js
index 7e27deb..8b43978 100644
--- a/dashboard/src/lib/useAppNavigation.js
+++ b/dashboard/src/lib/useAppNavigation.js
@@ -22,10 +22,12 @@ export function useAppNavigation() {
     ? decodeURIComponent(segments[1])
     : null
 
-  // drillDownLoopId is derived from URL: /loops/:loopType/:timestamp
-  const drillDownLoopId = segments[0] === 'loops' && segments[1] && segments[2]
-    ? `${decodeURIComponent(segments[1])}/${decodeURIComponent(segments[2])}`
-    : null
+  // drillDownLoopId is derived from URL: /loops/:loopType/:timestamp or /loops/session/:sessionId
+  const drillDownLoopId = segments[0] === 'loops' && segments[1] === 'session' && segments[2]
+    ? `session:${decodeURIComponent(segments[2])}`
+    : segments[0] === 'loops' && segments[1] && segments[2]
+      ? `${decodeURIComponent(segments[1])}/${decodeURIComponent(segments[2])}`
+      : null
 
   const [commandPaletteOpen, setCommandPaletteOpen] = useState(false)
 
@@ -51,6 +53,10 @@ export function useAppNavigation() {
     navigate(`/loops/${encodeURIComponent(parts[0])}/${encodeURIComponent(parts.slice(1).join('/'))}`)
   }, [navigate])
 
+  const openLoopBySession = useCallback((sessionId) => {
+    navigate(`/loops/session/${encodeURIComponent(sessionId)}`)
+  }, [navigate])
+
   const openDispatch = useCallback(() => {
     navigate('/dispatch')
   }, [navigate])
@@ -78,6 +84,7 @@ export function useAppNavigation() {
     handleNavChange,
     openJobDetail,
     openLoopDetail,
+    openLoopBySession,
     openDispatch,
     closeJobDetail,
   }
diff --git a/dashboard/src/lib/useSessionStore.js b/dashboard/src/lib/useSessionStore.js
index 36428de..c1cce36 100644
--- a/dashboard/src/lib/useSessionStore.js
+++ b/dashboard/src/lib/useSessionStore.js
@@ -114,6 +114,7 @@ export function useSessionStore() {
         extraFlags: dispatchOpts.extraFlags || undefined,
         plainOutput: dispatchOpts.plainOutput || undefined,
         planSlug: dispatchOpts.planSlug || undefined,
+        previousJobId: dispatchOpts.previousJobId || undefined,
         skills: Array.isArray(dispatchOpts.skills) ? dispatchOpts.skills : undefined,
       }),
     })
@@ -173,6 +174,7 @@ export function useSessionStore() {
       next.set(sessionId, {
         taskText: data.taskText || '',
         repoName: data.repo || '',
+        agent: data.agent || 'claude',
         jobFile: data.jobFile || null,
         created: Date.now(),
         ptySessionId: sessionId,
diff --git a/dashboard/src/lib/useSettings.js b/dashboard/src/lib/useSettings.js
index 03ed40b..e4bdb11 100644
--- a/dashboard/src/lib/useSettings.js
+++ b/dashboard/src/lib/useSettings.js
@@ -6,6 +6,8 @@ const DEFAULT_SETTINGS = {
   agents: {
     claude: { defaultModel: 'claude-opus-4-6', defaultMaxTurns: 10, skipPermissions: false, tuiMode: true, extraFlags: '' },
     codex: { defaultModel: 'gpt-5.4', defaultMaxTurns: null, skipPermissions: false, tuiMode: false, extraFlags: '' },
+    cursor: { defaultModel: 'claude-4.6-opus-high-thinking', defaultMaxTurns: null, skipPermissions: false, tuiMode: true, extraFlags: '' },
+    pi: { defaultModel: 'google/gemini-2.5-pro', defaultMaxTurns: null, skipPermissions: false, tuiMode: true, extraFlags: '' },
   },
 }
 
@@ -23,6 +25,8 @@ function loadSettings() {
         ...(parsed.agents || {}),
         claude: { ...DEFAULT_SETTINGS.agents.claude, ...(parsed.agents?.claude || {}) },
         codex: { ...DEFAULT_SETTINGS.agents.codex, ...(parsed.agents?.codex || {}) },
+        cursor: { ...DEFAULT_SETTINGS.agents.cursor, ...(parsed.agents?.cursor || {}) },
+        pi: { ...DEFAULT_SETTINGS.agents.pi, ...(parsed.agents?.pi || {}) },
       },
     }
   } catch {
diff --git a/dashboard/src/lib/useTerminal.js b/dashboard/src/lib/useTerminal.js
index 43f14ee..96a3394 100644
--- a/dashboard/src/lib/useTerminal.js
+++ b/dashboard/src/lib/useTerminal.js
@@ -49,6 +49,8 @@ export function useTerminal({ onConnected, onIncomingData, onJobsChanged, repo,
     if (repo) params.set('repo', repo)
     if (sessionId) params.set('session', sessionId)
     if (jobFilePath) params.set('jobFile', jobFilePath)
+    const viteKey = import.meta.env.VITE_DISPATCH_API_KEY
+    if (viteKey) params.set('apiKey', viteKey)
     const qs = params.toString() ? `?${params.toString()}` : ''
     const ws = new WebSocket(`${protocol}//${location.host}/ws/terminal${qs}`)
     wsRef.current = ws
diff --git a/dashboard/src/lib/workerUtils.js b/dashboard/src/lib/workerUtils.js
index 8afd1d0..0c34ac4 100644
--- a/dashboard/src/lib/workerUtils.js
+++ b/dashboard/src/lib/workerUtils.js
@@ -10,9 +10,9 @@ export function getRepoFlags(repoName, jobAgents, activeWorkers) {
 
   for (const agent of jobAgents) {
     if (agent.repo !== repoName) continue
-    if (agent.validation === 'needs_validation') hasReview = true
+    if (agent.validation === 'needs_validation' || agent.status === 'stopped') hasReview = true
     if (agent.status === 'in_progress') hasRunning = true
-    if (agent.status === 'failed' || agent.status === 'killed') failedCount += 1
+    if (agent.status === 'failed') failedCount += 1
   }
 
   if (activeWorkers) {
@@ -113,7 +113,8 @@ function buildWorkerItemsCore(jobAgents, activeWorkers, jobFileToSession, sessio
       repo: session.repo,
       agent: session.agent || 'claude',
       label: session.label,
-      needsReview: session.validation === 'needs_validation',
+      read: linkedAgent?.read === true,
+      needsReview: session.validation === 'needs_validation' || session.status === 'stopped',
       status: session.status,
       validation: session.validation,
       created: session.created,
@@ -123,6 +124,9 @@ function buildWorkerItemsCore(jobAgents, activeWorkers, jobFileToSession, sessio
       planSlug: session.planSlug || linkedAgent?.planSlug || null,
       planTitle: session.planTitle || linkedAgent?.planTitle || null,
       planRepo: session.planRepo || linkedAgent?.planRepo || session.repo || null,
+      lastError: linkedAgent?.lastError || null,
+      lastErrorSubKind: linkedAgent?.lastErrorSubKind || null,
+      errorCount: linkedAgent?.errorCount || 0,
     })
   }
 
@@ -141,7 +145,8 @@ function buildWorkerItemsCore(jobAgents, activeWorkers, jobFileToSession, sessio
       repo: agent.repo,
       agent: agent.agent || 'claude',
       label: agent.taskName || agent.id,
-      needsReview: agent.validation === 'needs_validation',
+      read: agent.read === true,
+      needsReview: agent.validation === 'needs_validation' || agent.status === 'stopped',
       status: agent.status,
       validation: agent.validation,
       created: agent.started,
@@ -153,6 +158,9 @@ function buildWorkerItemsCore(jobAgents, activeWorkers, jobFileToSession, sessio
       planSlug: agent.planSlug || null,
       planTitle: agent.planTitle || null,
       planRepo: agent.planRepo || agent.repo || null,
+      lastError: agent.lastError || null,
+      lastErrorSubKind: agent.lastErrorSubKind || null,
+      errorCount: agent.errorCount || 0,
     })
   }
 
diff --git a/dashboard/src/main.jsx b/dashboard/src/main.jsx
index 0723ab7..3964f4f 100644
--- a/dashboard/src/main.jsx
+++ b/dashboard/src/main.jsx
@@ -1,3 +1,4 @@
+import './lib/apiFetchSetup.js'
 import React from 'react'
 import ReactDOM from 'react-dom/client'
 import { BrowserRouter } from 'react-router-dom'
diff --git a/dashboard/src/styles/theme.css b/dashboard/src/styles/theme.css
index a0c6bb5..cce59a7 100644
--- a/dashboard/src/styles/theme.css
+++ b/dashboard/src/styles/theme.css
@@ -18,8 +18,10 @@
   --primary-foreground: #1a1b1e;
 
   /* Surface */
-  --secondary: #242329;
-  --secondary-foreground: #838490;
+  --secondary: #25242a;
+  --secondary-foreground: #a3a4ad;
+  --tertiary: #1b1c20;
+  --tertiary-foreground: #7a7b86;
   --muted: #28272e;
   --muted-foreground: #6b6c78;
   --accent: #28272e;
@@ -79,6 +81,8 @@
   --color-primary-foreground: var(--primary-foreground);
   --color-secondary: var(--secondary);
   --color-secondary-foreground: var(--secondary-foreground);
+  --color-tertiary: var(--tertiary);
+  --color-tertiary-foreground: var(--tertiary-foreground);
   --color-muted: var(--muted);
   --color-muted-foreground: var(--muted-foreground);
   --color-accent: var(--accent);
diff --git a/dashboard/vite.config.js b/dashboard/vite.config.js
index 599915c..1c4db6c 100644
--- a/dashboard/vite.config.js
+++ b/dashboard/vite.config.js
@@ -1,4 +1,4 @@
-import { defineConfig, createLogger } from 'vite'
+import { defineConfig, createLogger, loadEnv } from 'vite'
 import tailwindcss from '@tailwindcss/vite'
 import react from '@vitejs/plugin-react'
 
@@ -9,20 +9,35 @@ logger.error = (msg, opts) => {
   originalError(msg, opts)
 }
 
-export default defineConfig({
-  plugins: [react(), tailwindcss()],
-  customLogger: logger,
-  server: {
-    proxy: {
-      '/api': {
-        target: 'http://localhost:3747',
-        configure: (proxy) => { proxy.on('error', () => {}) },
-      },
-      '/ws': {
-        target: 'ws://localhost:3747',
-        ws: true,
-        configure: (proxy) => { proxy.on('error', () => {}) },
+export default defineConfig(({ mode }) => {
+  const env = loadEnv(mode, process.cwd(), '')
+  const dispatchApiKey = env.DISPATCH_API_KEY || ''
+
+  return {
+    plugins: [react(), tailwindcss()],
+    customLogger: logger,
+    server: {
+      proxy: {
+        '/api': {
+          target: 'http://localhost:3747',
+          configure: (proxy) => {
+            proxy.on('proxyReq', (proxyReq) => {
+              if (dispatchApiKey) proxyReq.setHeader('X-API-Key', dispatchApiKey)
+            })
+            proxy.on('error', () => {})
+          },
+        },
+        '/ws': {
+          target: 'ws://localhost:3747',
+          ws: true,
+          configure: (proxy) => {
+            proxy.on('proxyReqWs', (proxyReq) => {
+              if (dispatchApiKey) proxyReq.setHeader('X-API-Key', dispatchApiKey)
+            })
+            proxy.on('error', () => {})
+          },
+        },
       },
     },
-  },
+  }
 })
diff --git a/docs/INDEX.md b/docs/INDEX.md
index 0e9a012..1df4110 100644
--- a/docs/INDEX.md
+++ b/docs/INDEX.md
@@ -14,13 +14,14 @@
 | Topic | File | Summary |
 |-------|------|---------|
 | CLI & parsers | `docs/cli-architecture.md` | parsers.js job/swarm compatibility exports, cli.js command map, terminal.js structure, task numbering, and data flow |
-| Web dashboard | `docs/dashboard-architecture.md` | Express endpoints for jobs/sessions/schedules, runtime state in `.hub-runtime/`, React views, hooks, PTY lifecycle, and Claude resume flow |
+| Web dashboard | `docs/dashboard-architecture.md` | Express endpoints for jobs/sessions/schedules, runtime state in `.dispatch/runtime/`, React views, hooks, PTY lifecycle, and Claude resume flow |
 
 ## Agent Integration
 
 | Topic | File | Summary |
 |-------|------|---------|
-| Server API reference | `docs/agent-api.md` | All REST endpoints on port 3747 — jobs, tasks, bugs, plans, checkpoints, schedules, and the hook callback used by `hub-stop.js`. Includes dispatch field reference and injected env vars. |
+| Server API reference | `docs/agent-api.md` | All REST endpoints on port 3747 — optional `DISPATCH_API_KEY` / `DISPATCH_BIND`, `GET /api/catalog`, jobs, tasks, bugs, plans, checkpoints, schedules, and the hook callback used by `hub-stop.js`. Includes dispatch field reference and injected env vars. |
+| Dispatch API quick reference | `docs/dispatch-api-quickref.md` | Minimal handoff for external orchestrators: auth, catalog, dispatch, polling, lifecycle — points to `agent-api.md` for full detail. |
 
 ## Standards
 
diff --git a/docs/agent-api.md b/docs/agent-api.md
index 7f5b8e0..30b8058 100644
--- a/docs/agent-api.md
+++ b/docs/agent-api.md
@@ -1,11 +1,30 @@
 # Dispatch Server API — Agent Reference
 
-Base URL: `http://127.0.0.1:3747`
+Base URL: `http://127.0.0.1:3747` (or your hub host when `DISPATCH_BIND` exposes the LAN).
 
 All request and response bodies are JSON. All write endpoints require `Content-Type: application/json`.
 
 ---
 
+## Authentication and server options
+
+When **`DISPATCH_API_KEY`** is set on the hub process, every **`/api/*`** request must include that key:
+
+- Header `Authorization: Bearer <key>`, or
+- Header `X-API-Key: <key>`
+
+The **`/ws/terminal`** WebSocket accepts the same key via header (`X-API-Key` / `Authorization`, e.g. Vite dev proxy) or query parameter **`apiKey=<key>`** (e.g. browser connecting straight to the hub).
+
+| Env | Purpose |
+|-----|---------|
+| `DISPATCH_API_KEY` | If set, required for all HTTP `/api/*` and for `/ws/terminal` as above. |
+| `DISPATCH_BIND` | Listen address (default `127.0.0.1`). Use `0.0.0.0` only with a firewall + API key on untrusted networks. |
+| `PORT` | HTTP port (default `3747`). |
+
+For **`yarn dev`**, put `DISPATCH_API_KEY` in `dashboard/.env.local` so the Vite proxy forwards it. For a **production build** served by the hub with auth enabled, set **`VITE_DISPATCH_API_KEY`** at build time to the same value (see `dashboard/env.example`).
+
+---
+
 ## Read Endpoints
 
 ### Hub overview
@@ -69,10 +88,12 @@ Returns all jobs across all repos.
 }
 ```
 
-**Job status values:** `in_progress` | `completed` | `failed` | `killed`
+**Job status values:** `in_progress` | `completed` | `failed` | `stopped`
 **Validation values:** `none` | `needs_validation` | `validated` | `rejected`
 **runState values:** `queued` | `starting` | `running` | `stopping` | `awaiting_validation` | `validated` | `rejected` | `failed` | `killed`
 
+`runState` still uses `killed` internally for process termination, but the job's markdown/API status is exposed as `stopped` so the work remains reviewable.
+
 ### Single job
 ```
 GET /api/jobs/:id
@@ -134,10 +155,37 @@ Returns available skills.
 }
 ```
 
+### Catalog (repos + agents + models)
+```
+GET /api/catalog
+```
+Single response for orchestrators: connected **repos** (name, relative `path`, task/activity/bugs files), supported **agent** kinds with labels, per-agent **models** (same logic as `/api/agents/models`), and **`modelSources`** (`api`, `fallback`, `codex-cache`, etc.).
+
+```json
+{
+  "hubRoot": ".",
+  "repos": [
+    { "name": "my-app", "path": "../my-app", "taskFile": "todo.md", "activityFile": "activity-log.md", "bugsFile": "bugs.md" }
+  ],
+  "agents": [
+    { "id": "claude", "label": "Claude" },
+    { "id": "codex", "label": "Codex" },
+    { "id": "cursor", "label": "Cursor" }
+  ],
+  "models": {
+    "claude": [{ "value": "claude-opus-4-6", "label": "..." }],
+    "codex": [],
+    "cursor": []
+  },
+  "modelSources": { "claude": "api", "codex": "codex-cache", "cursor": "fallback" }
+}
+```
+
 ### Models
 ```
 GET /api/agents/models?agent=claude
 GET /api/agents/models?agent=codex
+GET /api/agents/models?agent=cursor
 ```
 Returns available model list. Falls back to hardcoded defaults if API is unavailable.
 
@@ -166,10 +214,10 @@ POST /api/jobs/init
 | `repo` | string | yes | Repo name (from config) |
 | `taskText` | string | yes | The prompt sent to the agent |
 | `originalTask` | string | no | Human-readable task label (shown in UI) |
-| `agent` | string | no | `"claude"` (default) or `"codex"` |
+| `agent` | string | no | `"claude"` (default), `"codex"`, or `"cursor"` |
 | `model` | string | no | Model ID e.g. `"claude-opus-4-6"` |
 | `maxTurns` | number | no | Max agent turns |
-| `skipPermissions` | boolean | no | Pass `--dangerously-skip-permissions` |
+| `skipPermissions` | boolean | no | Pass the provider-specific permission-bypass flag |
 | `plainOutput` | boolean | no | Run with `-p --output-format text` (captures stdout) |
 | `useWorktree` | boolean | no | Create an isolated git worktree for this job |
 | `baseBranch` | string | no | Base branch for worktree (default: `main`) |
@@ -283,7 +331,7 @@ PUT /api/plans/:repoName/:slug
 Body: { "content": "# Plan title\n..." }
 
 POST /api/plans/:repoName/:slug/status
-Body: { "status": "ready" }   ← omit or null to clear
+Body: { "status": "ready" | "completed" }   ← omit or null to clear
 ```
 
 ---
diff --git a/docs/cli-architecture.md b/docs/cli-architecture.md
index a46647b..378b7fb 100644
--- a/docs/cli-architecture.md
+++ b/docs/cli-architecture.md
@@ -46,7 +46,7 @@ Primary naming has moved from "swarm" to "job". The parser exports the new `pars
 | `writeTaskEdit(filePath, taskNum, newText)` | Replaces the text of the Nth open task | `todo.md` |
 | `writeTaskMove(sourceFile, taskNum, destFile, section)` | Removes task from source, adds to destination | Two `todo.md` files |
 | `writeJobValidation(filePath, status, notes)` | Sets `Validation:` line, appends `## Validation Notes` | Job `.md` file |
-| `writeJobKill(filePath)` | Sets `Status: Killed`, writes `.kill` marker file | Job `.md` file |
+| `writeJobKill(filePath)` | Sets `Status: Stopped`, marks the job for review, writes `.kill` marker file | Job `.md` file |
 | `writeJobStatus(filePath, newStatus)` | Updates the `Status:` line to a new value | Job `.md` file |
 | `writeSwarmValidation(filePath, status, notes)` | Legacy alias of `writeJobValidation` | Job `.md` file |
 | `writeSwarmKill(filePath)` | Legacy alias of `writeJobKill` | Job `.md` file |
diff --git a/docs/coding-standards.md b/docs/coding-standards.md
index d40cce3..2c526d5 100644
--- a/docs/coding-standards.md
+++ b/docs/coding-standards.md
@@ -159,7 +159,8 @@ hub/
       styles/          # CSS (Tailwind + theme)
     vite.config.js     # Build configuration
     package.json       # Dashboard-only dependencies
-  .hub-runtime/        # Runtime state: job-runs.json, staged prompts, event logs
+  .dispatch/
+    runtime/           # Runtime state: job-runs.json, staged prompts, event logs
   plans/               # Markdown planning documents
   notes/
     jobs/              # Primary job progress files (YYYY-MM-DD-slug.md)
@@ -400,7 +401,7 @@ Header fields (parsed from line-level patterns, not YAML frontmatter):
 - `# Job Task: <name>` — Preferred task title header.
 - `# Swarm Task: <name>` — Legacy header still accepted by parsers.
 - `Started: <date>` — Local-time timestamp, no timezone suffix (e.g. `2026-03-31 16:39:56`). **See Timestamp Rules below.**
-- `Status: <value>` — Normalized to: `in_progress`, `completed`, `failed`, or the raw lowercase value.
+- `Status: <value>` — Normalized to: `in_progress`, `completed`, `failed`, `stopped` (including legacy `Killed`), or the raw lowercase value.
 - `Validation: <value>` — Optional. Values like `needs_validation`, `validated`, `rejected`.
 - `Session: <id>` — PTY session ID used by the dashboard to reconnect/resume.
 - `SkipPermissions: <bool>` — Whether Claude was launched with `--dangerously-skip-permissions`.
diff --git a/docs/dashboard-architecture.md b/docs/dashboard-architecture.md
index 7546b62..9706c4b 100644
--- a/docs/dashboard-architecture.md
+++ b/docs/dashboard-architecture.md
@@ -87,7 +87,7 @@ dashboard/
 
 ESM module. Bridges to `parsers.js` (CommonJS) via `createRequire`.
 
-The dashboard is the canonical job runtime. It reads both `notes/jobs/` and legacy `notes/swarm/`, stores run state in `.hub-runtime/job-runs.json`, stages prompt files in `.hub-runtime/prompts/`, and stores terminal event output in `.hub-runtime/events/`.
+The dashboard is the canonical job runtime. It reads both `notes/jobs/` and legacy `notes/swarm/`, stores run state in `.dispatch/runtime/job-runs.json`, stages prompt files in `.dispatch/runtime/prompts/`, and stores terminal event output in `.dispatch/runtime/events/`.
 
 ### REST API Endpoints
 
@@ -96,6 +96,7 @@ The dashboard is the canonical job runtime. It reads both `notes/jobs/` and lega
 | Endpoint | parsers.js Functions Used |
 |----------|--------------------------|
 | `GET /api/config` | `loadConfig` |
+| `GET /api/catalog` | `loadConfig` + `getModelsForAgent` (per-agent model lists) — repos, agent kinds, models |
 | `GET /api/overview` | `parseTaskFile`, `parseActivityLog`, `getGitInfo`, `listCheckpoints` |
 | `GET /api/jobs` and legacy `GET /api/swarm` | `parseJobDir` |
 | `GET /api/jobs/:id` and legacy `GET /api/swarm/:id` | `parseJobFile` |
@@ -106,7 +107,7 @@ The dashboard is the canonical job runtime. It reads both `notes/jobs/` and lega
 | `GET /api/repos/:name/checkpoints` | `listCheckpoints` |
 | `GET /api/schedules` | Reads `schedules.json` |
 | `GET /api/events/search` | `eventPipeline.searchEvents` |
-| `GET /api/job-runs` | Reads `.hub-runtime/job-runs.json` |
+| `GET /api/job-runs` | Reads `.dispatch/runtime/job-runs.json` |
 
 #### Write Endpoints
 
@@ -123,7 +124,7 @@ The dashboard is the canonical job runtime. It reads both `notes/jobs/` and lega
 | `POST /api/hooks/stop-ready` | None | Stop hook callback that transitions an active run to review-ready |
 | `POST /api/jobs/:id/validate` and legacy `POST /api/swarm/:id/validate` | `writeJobValidation` | Set validation to "validated" and finalize run state |
 | `POST /api/jobs/:id/reject` and legacy `POST /api/swarm/:id/reject` | `writeJobValidation` | Set validation to "rejected" |
-| `POST /api/jobs/:id/kill` and legacy `POST /api/swarm/:id/kill` | `writeJobKill` | Mark agent as killed and stop PTY |
+| `POST /api/jobs/:id/kill` and legacy `POST /api/swarm/:id/kill` | `writeJobKill` | Stop the agent, mark the job `stopped`, and stop the PTY |
 | `POST /api/jobs/:id/merge` and legacy `POST /api/swarm/:id/merge` | None (git operations) | Merge agent branch into target |
 | `DELETE /api/jobs/:id` and legacy `DELETE /api/swarm/:id` | None (fs unlink) | Delete job file and remove run history |
 | `POST /api/repos/:name/checkpoint` | `createCheckpoint` |
@@ -174,7 +175,7 @@ Captures and structures terminal session output into queryable events.
 
 1. **Line classification** — Categorizes terminal output lines as: error, warning, progress, tool, file, thought, action
 2. **Agent detection** — Identifies session agent kind (claude, codex, generic)
-3. **Event persistence** — Writes NDJSON files to `.hub-runtime/events/<sessionId>.ndjson`
+3. **Event persistence** — Writes NDJSON files to `.dispatch/runtime/events/<sessionId>.ndjson`
 4. **Coalescing** — Deduplicates and merges related output lines
 5. **Summary tracking** — Maintains per-session stats: last step, errors, files touched, tool calls
 6. **Search** — Full-text search across session event history
@@ -247,7 +248,7 @@ import { repoIdentityColors } from '../lib/constants'
 **Worker list building** — `lib/workerUtils.js` provides `buildWorkerNavItems()` which unifies active PTY sessions with swarm agents and validation states. Used by ActivityBar, JobsView, and App for badge counts.
 
 **Status config** — In `lib/statusConfig.js`:
-Maps status strings (`in_progress`, `completed`, `failed`, `killed`, `needs_validation`) to `{ icon, color, bg, label, dotColor }`.
+Maps status strings (`in_progress`, `completed`, `failed`, `stopped`, `needs_validation`) to `{ icon, color, bg, label, dotColor }`.
 
 **Markdown rendering** — Shared `mdComponents` in `components/mdComponents.jsx` for consistent react-markdown styling.
 
@@ -314,7 +315,7 @@ The `agentTerminals` Map bridges these: each entry stores `{ jobFile: { fileName
 7. The first resize event triggers `startPendingLaunch()`, which writes a tracked Claude command into the PTY. For new work this is `claude [flags] "$(cat promptFile)"`; for resumes it is `claude [flags] --resume "<resumeId>"`
 8. Terminal output is captured by `eventPipeline.ingestLine()` for structured event storage and by the server's resume-command detector
 9. When Claude prints a resume command, the server persists normalized `ResumeCommand`, `ResumeId`, and `SkipPermissions` into the job file
-10. On PTY exit, the run transitions to review/failed/killed state and the job markdown is updated accordingly
+10. On PTY exit, the run transitions to review/failed/killed state and the job markdown is updated accordingly; user-stopped jobs are written back as `Status: Stopped` so they remain reviewable
 11. If the user clicks Resume later, `POST /api/jobs/:id/resume` recreates the PTY under the same tracked session ID, replays prior scrollback, and relaunches Claude with the stored flags
 
 ---
diff --git a/docs/dispatch-api-quickref.md b/docs/dispatch-api-quickref.md
new file mode 100644
index 0000000..a57774d
--- /dev/null
+++ b/docs/dispatch-api-quickref.md
@@ -0,0 +1,144 @@
+# Dispatch Hub API — minimal reference (for orchestrators)
+
+Use this when integrating **another service or agent** (e.g. Darby) with the Dispatch dashboard server. For full detail, see [`agent-api.md`](./agent-api.md).
+
+**Default base URL:** `http://127.0.0.1:3747` — replace host/port if the hub binds elsewhere (`PORT`, `DISPATCH_BIND`).
+
+---
+
+## Auth (when enabled)
+
+If the hub sets **`DISPATCH_API_KEY`**, send the same secret on **every** HTTP call to `/api/*`:
+
+| Header | Value |
+|--------|--------|
+| `X-API-Key` | `<key>` |
+| *or* `Authorization` | `Bearer <key>` |
+
+`Content-Type: application/json` is required for POST/PUT bodies.
+
+Unauthorized requests return **`401`** with `{ "error": "..." }`.
+
+---
+
+## 1. Discover repos, agents, and models
+
+```http
+GET /api/catalog
+```
+
+Returns JSON including:
+
+- **`repos`** — `name`, relative `path`, `taskFile`, `activityFile`, optional `bugsFile` (use **`name`** as `repo` when dispatching).
+- **`agents`** — supported kinds: `claude`, `codex`, `cursor`.
+- **`models`** — per-agent model lists (`value` / `label`).
+- **`modelSources`** — how each list was resolved (`api`, `fallback`, `codex-cache`, …).
+- **`hubRoot`** — hub root path hint.
+
+---
+
+## 2. Start a job
+
+```http
+POST /api/jobs/init
+```
+
+**Body (minimum):**
+
+```json
+{
+  "repo": "<name from catalog>",
+  "taskText": "<prompt for the coding agent>"
+}
+```
+
+**Common optional fields:** `originalTask`, `agent` (`claude` default), `model`, `maxTurns`, `skipPermissions`, `useWorktree`, `baseBranch`, `autoMerge`, `planSlug`, `skills` (string array), `sessionId`, `extraFlags`.
+
+**Response (typical):**
+
+```json
+{
+  "fileName": "2026-04-02-slug.md",
+  "relativePath": "notes/jobs/2026-04-02-slug.md",
+  "absolutePath": "/…",
+  "repo": "my-app",
+  "sessionId": "session-<uuid>",
+  "serverStarted": true,
+  "branch": "job/2026-04-02-slug",
+  "worktreePath": "/…"
+}
+```
+
+Save **`sessionId`** and the job **`id`** (the slug, e.g. `2026-04-02-slug`, from `fileName` without `.md` or from `GET /api/jobs`).
+
+Legacy alias: `POST /api/swarm/init` (same body).
+
+---
+
+## 3. Follow progress (polling)
+
+There is **no** server-sent job stream for external clients. **Poll** on an interval (e.g. 1–3s).
+
+**While the session exists in memory:**
+
+```http
+GET /api/sessions/<sessionId>/events?limit=120&cursor=<opaque>
+```
+
+Response: `{ "sessionId", "items": [...], "nextCursor" }` — pass **`nextCursor`** on the next request until null.
+
+Optional rollup:
+
+```http
+GET /api/sessions/<sessionId>/summary
+```
+
+**If the hub restarts** or the session is gone, session endpoints may return **`404`**. Fall back to:
+
+```http
+GET /api/jobs/<jobId>
+```
+
+Parse status / validation from the job payload until the job reaches a terminal state (e.g. completed + needs review, failed, stopped).
+
+---
+
+## 4. Job actions (after the agent stops)
+
+| Action | Request |
+|--------|---------|
+| Approve | `POST /api/jobs/<id>/validate` — body `{ "notes": "optional" }` |
+| Reject | `POST /api/jobs/<id>/reject` — body `{ "notes": "required" }` |
+| Stop | `POST /api/jobs/<id>/kill` |
+| Merge branch | `POST /api/jobs/<id>/merge` — body `{ "targetBranch": "main" }` optional |
+| Delete job file | `DELETE /api/jobs/<id>` |
+
+`/api/swarm/...` paths mirror `/api/jobs/...` for compatibility.
+
+---
+
+## 5. Errors
+
+```json
+{ "error": "Human-readable message" }
+```
+
+Typical: **`400`** invalid input, **`401`** auth, **`404`** missing resource, **`409`** bad state transition, **`500`** server error.
+
+---
+
+## 6. Optional: stop hook (Claude Code)
+
+If the repo uses Dispatch’s Claude hook, completion may call:
+
+```http
+POST /api/hooks/stop-ready
+```
+
+Body: `{ "sessionId", "jobId", "reason" }` — usually not called by external orchestrators; listed for completeness.
+
+---
+
+## 7. WebSocket (terminal attach only)
+
+`GET /ws/terminal?repo=...&session=...&jobFile=...` — interactive PTY for the dashboard, **not** required for HTTP-only orchestration. If `DISPATCH_API_KEY` is set, pass the key via **`X-API-Key`** on the upgrade or **`?apiKey=`** (browser limitation).
diff --git a/loops/parallel-review.sh b/loops/parallel-review.sh
index 7691039..5164295 100755
--- a/loops/parallel-review.sh
+++ b/loops/parallel-review.sh
@@ -19,7 +19,7 @@
 #   gpt-5.2-codex        gpt-5.2              gpt-5.1-codex-max
 #   gpt-5.1-codex-mini
 #
-# cursor  (agent -p — run `agent --list-models` for latest)
+# cursor  (cursor-agent or agent -p — run `agent --list-models` for latest)
 #   Cursor Composer
 #     auto               composer-2           composer-2-fast      composer-1.5
 #   Claude
@@ -159,7 +159,8 @@ fi
 # ---------------------------------------------------------------------------
 run_agent() {
   local spec="$1"; shift
-  local extra_flags=("$@")
+  local extra_flags=()
+  [[ $# -gt 0 ]] && extra_flags=("$@")
 
   # Parse tool and optional model from spec; fall back to DEFAULT_*_MODEL
   local tool model=""
@@ -209,10 +210,19 @@ run_agent() {
         fi
         ;;
       cursor)
-        # Cursor CLI doesn't read stdin — prompt goes as a positional argument
+        # Cursor CLI doesn't read stdin — prompt goes as a positional argument.
+        # Prefer cursor-agent to match server launch/resume paths, but fall back
+        # to agent if that's the installed binary.
         local prompt_content
         prompt_content=$(cat "$tmp_prompt")
-        local cmd=(agent -p "$prompt_content")
+        local cursor_bin="cursor-agent"
+        local cmd=()
+        if ! command -v "$cursor_bin" >/dev/null 2>&1; then
+          cursor_bin="agent"
+          cmd=("$cursor_bin" -p "$prompt_content")
+        else
+          cmd=("$cursor_bin" "$prompt_content")
+        fi
         [[ -n "$model" ]] && cmd+=(--model "$model")
         for flag in "${extra_flags[@]}"; do
           if [[ "$flag" == "--dangerously-skip-permissions" ]]; then
diff --git a/parsers.integration.test.js b/parsers.integration.test.js
index 0633a28..bae07e8 100644
--- a/parsers.integration.test.js
+++ b/parsers.integration.test.js
@@ -247,7 +247,8 @@ describe('normalizeStatus via parseJobFile', () => {
       ['Completed', 'completed'],
       ['In progress', 'in_progress'],
       ['Failed', 'failed'],
-      ['Killed', 'killed'],
+      ['Killed', 'stopped'],
+      ['Stopped', 'stopped'],
     ];
     for (const [input, expected] of cases) {
       const p = makeJob(input);
diff --git a/parsers.js b/parsers.js
index 2822e99..871d150 100644
--- a/parsers.js
+++ b/parsers.js
@@ -113,7 +113,7 @@ function normalizeStatus(raw) {
   if (lower === 'complete' || lower === 'completed') return 'completed';
   if (lower === 'in progress' || lower === 'in_progress') return 'in_progress';
   if (lower === 'failed') return 'failed';
-  if (lower === 'killed') return 'killed';
+  if (lower === 'killed' || lower === 'stopped') return 'stopped';
   return lower;
 }
 
@@ -122,8 +122,10 @@ function parseJobFile(filePath) {
   let taskName = '', started = '', status = 'unknown', validation = 'none', agentId = null, skills = [];
   let originalTask = '', session = null, repo = null;
   let originalPrompt = '';
+  let previousJobId = null, nextJobId = null;
   let planSlug = null;
   let agent = 'claude';
+  let read = false;
   let skipPermissions = null;
   let resumeId = null, resumeCommand = null;
   let ai = null;
@@ -170,9 +172,22 @@ function parseJobFile(filePath) {
       const sessionMatch = line.match(/^Session:\s*(.+)/);
       if (sessionMatch) { session = sessionMatch[1].trim(); continue; }
 
+      const previousJobMatch = line.match(/^PreviousJob:\s*(.+)/);
+      if (previousJobMatch) { previousJobId = previousJobMatch[1].trim(); continue; }
+
+      const nextJobMatch = line.match(/^NextJob:\s*(.+)/);
+      if (nextJobMatch) { nextJobId = nextJobMatch[1].trim(); continue; }
+
       const agentMatch = line.match(/^Agent:\s*(.+)/);
       if (agentMatch) { agent = agentMatch[1].trim().toLowerCase() || 'claude'; continue; }
 
+      const readMatch = line.match(/^Read:\s*(.+)/);
+      if (readMatch) {
+        const raw = readMatch[1].trim().toLowerCase();
+        read = raw === 'true' || raw === 'yes' || raw === '1';
+        continue;
+      }
+
       const skipPermissionsMatch = line.match(/^SkipPermissions:\s*(.+)/);
       if (skipPermissionsMatch) {
         const raw = skipPermissionsMatch[1].trim().toLowerCase();
@@ -249,7 +264,8 @@ function parseJobFile(filePath) {
   return {
     id, taskName, started, status, validation, agentId, skills,
     agent,
-    originalTask, originalPrompt, session, skipPermissions, resumeId, resumeCommand, repo, planSlug,
+    read,
+    originalTask, originalPrompt, session, previousJobId, nextJobId, skipPermissions, resumeId, resumeCommand, repo, planSlug,
     branch, worktreePath, startCommit, baseBranch,
     type, loopType,
     lastProgress, progressCount, durationMinutes, resultsSummary,
@@ -335,6 +351,97 @@ function parseLoopState(loopDir) {
   return { iteration, lastVerdict, complete, runDir };
 }
 
+function parseLoopRunDetailed(runDir) {
+  const run = parseLoopRun(runDir);
+  const iterations = [];
+  const warnings = [];
+  const addWarning = (context, err) => {
+    const message = err instanceof Error ? err.message : String(err);
+    warnings.push(`${context}: ${message}`);
+  };
+  // Parse iteration info from loop.log body
+  try {
+    const logPath = path.join(runDir, 'loop.log');
+    const content = fs.readFileSync(logPath, 'utf8');
+    const lines = content.split('\n');
+    let pastHeader = false;
+    let currentIter = null;
+    for (const line of lines) {
+      if (!pastHeader) {
+        if (line.trim() === '---') pastHeader = true;
+        continue;
+      }
+      const iterMatch = line.match(/Iteration\s+(\d+)\s*[-–—]\s*(\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2})/i);
+      if (iterMatch) {
+        currentIter = { number: parseInt(iterMatch[1], 10), timestamp: iterMatch[2], verdict: null };
+        iterations.push(currentIter);
+        continue;
+      }
+      // Also match iteration lines without timestamps
+      const iterMatchSimple = line.match(/Iteration\s+(\d+)/i);
+      if (iterMatchSimple && !iterMatch) {
+        const num = parseInt(iterMatchSimple[1], 10);
+        if (!currentIter || currentIter.number !== num) {
+          currentIter = { number: num, timestamp: null, verdict: null };
+          iterations.push(currentIter);
+        }
+      }
+      if (currentIter) {
+        if (line.includes('VERDICT: PASS') || line.includes('VERIFIED: PASS')) currentIter.verdict = 'PASS';
+        else if (line.includes('VERDICT: FAIL')) currentIter.verdict = 'FAIL';
+        else if (line.includes('ALL PHASES COMPLETE')) currentIter.verdict = 'PASS';
+        else if (line.includes('ALL ISSUES RESOLVED')) currentIter.verdict = 'PASS';
+      }
+    }
+  } catch (err) {
+    addWarning('failed to parse loop.log', err);
+  }
+
+  // Scan for artifact files
+  const artifacts = [];
+  try {
+    const files = fs.readdirSync(runDir).filter(f => f.endsWith('.txt')).sort();
+    for (const file of files) {
+      let type = 'unknown', iteration = null;
+      const reviewMatch = file.match(/^review_iter(\d+)/);
+      const synthMatch = file.match(/^synthesis_iter(\d+)/);
+      const verifyMatch = file.match(/^verification_iter(\d+)/);
+      if (reviewMatch) { type = 'review'; iteration = parseInt(reviewMatch[1], 10); }
+      else if (synthMatch) { type = 'synthesis'; iteration = parseInt(synthMatch[1], 10); }
+      else if (verifyMatch) { type = 'verification'; iteration = parseInt(verifyMatch[1], 10); }
+
+      let content = '';
+      try {
+        content = fs.readFileSync(path.join(runDir, file), 'utf8');
+      } catch (err) {
+        addWarning(`failed to read artifact "${file}"`, err);
+      }
+      artifacts.push({ name: file, type, iteration, content });
+    }
+  } catch (err) {
+    addWarning('failed to scan artifact directory', err);
+  }
+
+  // Read prompt
+  let prompt = '';
+  try {
+    const candidatePromptPaths = [
+      path.join(runDir, '..', 'prompt.md'),
+      path.join(runDir, 'prompt.md'),
+      path.join(path.dirname(path.dirname(runDir)), 'prompt.md'),
+    ];
+    for (const promptPath of candidatePromptPaths) {
+      if (!fs.existsSync(promptPath)) continue;
+      prompt = fs.readFileSync(promptPath, 'utf8');
+      break;
+    }
+  } catch (err) {
+    addWarning('failed to read prompt.md', err);
+  }
+
+  return { ...run, iterations, artifacts, prompt, warnings };
+}
+
 function loadConfig(hubDir) {
   const localConfigPath = path.join(hubDir, 'config.local.json');
   const configPath = fs.existsSync(localConfigPath) ? localConfigPath : path.join(hubDir, 'config.json');
@@ -590,18 +697,22 @@ function writeJobValidation(filePath, newValidation, notes) {
 }
 
 /**
- * Kill a swarm agent by marking its file as Killed and writing a .kill marker.
+ * Stop a swarm agent by marking its file as Stopped and writing a .kill marker.
  * Returns { success, id, agentId }.
  */
 function writeJobKill(filePath) {
   const content = fs.readFileSync(filePath, 'utf8');
   const lines = content.split('\n');
   let statusLineIndex = -1;
+  let validationLineIndex = -1;
 
   for (let i = 0; i < lines.length; i++) {
-    if (lines[i].match(/^Status:\s/)) {
+    if (statusLineIndex === -1 && lines[i].match(/^Status:\s/)) {
       statusLineIndex = i;
-      break;
+      continue;
+    }
+    if (validationLineIndex === -1 && lines[i].match(/^Validation:\s/)) {
+      validationLineIndex = i;
     }
   }
 
@@ -609,14 +720,24 @@ function writeJobKill(filePath) {
     throw new Error('swarm file has no Status: line');
   }
 
-  // Change Status to Killed
-  lines[statusLineIndex] = 'Status: Killed';
+  // Change Status to Stopped so the work can still be reviewed/followed up.
+  lines[statusLineIndex] = 'Status: Stopped';
+
+  // Ensure stopped work is surfaced for review unless it has already been reviewed.
+  if (validationLineIndex !== -1) {
+    const currentVal = lines[validationLineIndex].replace(/^Validation:\s*/, '').trim().toLowerCase().replace(/\s+/g, '_');
+    if (currentVal !== 'validated' && currentVal !== 'rejected' && currentVal !== 'needs_validation') {
+      lines[validationLineIndex] = 'Validation: Needs validation';
+    }
+  } else {
+    lines.splice(statusLineIndex + 1, 0, 'Validation: Needs validation');
+  }
 
-  // Append a ## Killed section with timestamp
+  // Append a ## Stopped section with timestamp.
   const killTimestamp = new Date().toISOString();
   lines.push('');
-  lines.push('## Killed');
-  lines.push(`Killed at: ${killTimestamp}`);
+  lines.push('## Stopped');
+  lines.push(`Stopped at: ${killTimestamp}`);
 
   fs.writeFileSync(filePath, lines.join('\n'), 'utf8');
 
@@ -692,7 +813,8 @@ function writeJobStatus(filePath, newStatus) {
     completed: 'Completed',
     in_progress: 'In progress',
     failed: 'Failed',
-    killed: 'Killed',
+    stopped: 'Stopped',
+    killed: 'Stopped',
   };
   const validStatuses = Object.keys(displayMap);
   if (!validStatuses.includes(newStatus)) {
@@ -701,10 +823,10 @@ function writeJobStatus(filePath, newStatus) {
   const displayValue = displayMap[newStatus];
   lines[statusLineIndex] = `Status: ${displayValue}`;
 
-  // When completing, always force validation to "Needs validation".
+  // When completing, and when explicitly stopping a job, surface it for review.
   // This prevents agents from self-validating by writing Validation: Validated
   // directly to the swarm file before the PTY exits.
-  if (newStatus === 'completed') {
+  if (newStatus === 'completed' || newStatus === 'stopped' || newStatus === 'killed') {
     let validationLineIndex = -1;
     for (let i = 0; i < lines.length; i++) {
       if (lines[i].match(/^Validation:\s/)) {
@@ -714,7 +836,8 @@ function writeJobStatus(filePath, newStatus) {
     }
     if (validationLineIndex !== -1) {
       const currentVal = lines[validationLineIndex].replace(/^Validation:\s*/, '').trim().toLowerCase().replace(/\s+/g, '_');
-      if (currentVal !== 'needs_validation') {
+      const shouldForceReview = newStatus === 'completed' || (currentVal !== 'validated' && currentVal !== 'rejected');
+      if (shouldForceReview && currentVal !== 'needs_validation') {
         lines[validationLineIndex] = 'Validation: Needs validation';
       }
     } else {
@@ -726,7 +849,7 @@ function writeJobStatus(filePath, newStatus) {
   fs.writeFileSync(filePath, lines.join('\n'), 'utf8');
 
   const parsed = parseJobFile(filePath);
-  return { success: true, id: parsed.id, status: newStatus };
+  return { success: true, id: parsed.id, status: parsed.status };
 }
 
 /**
@@ -1436,6 +1559,7 @@ module.exports = {
   dismissCheckpoint,
   listCheckpoints,
   parseLoopRun,
+  parseLoopRunDetailed,
   parseAllLoopRuns,
   parseLoopState,
 };
diff --git a/parsers.test.js b/parsers.test.js
index 3aa64b3..9534a6c 100644
--- a/parsers.test.js
+++ b/parsers.test.js
@@ -257,6 +257,8 @@ describe('parseJobFile', () => {
       'Repo: app',
       'OriginalPrompt: Build login page\\nwith tests',
       'Session: sess-123',
+      'PreviousJob: 2026-03-24-discovery',
+      'NextJob: 2026-03-26-polish',
       'SkipPermissions: true',
       'ResumeId: resume-456',
       'ResumeCommand: claude --resume',
@@ -283,6 +285,8 @@ describe('parseJobFile', () => {
     assert.equal(result.repo, 'app');
     assert.equal(result.originalPrompt, 'Build login page\\nwith tests');
     assert.equal(result.session, 'sess-123');
+    assert.equal(result.previousJobId, '2026-03-24-discovery');
+    assert.equal(result.nextJobId, '2026-03-26-polish');
     assert.equal(result.skipPermissions, true);
     assert.equal(result.resumeId, 'resume-456');
     assert.equal(result.resumeCommand, 'claude --resume');
@@ -314,7 +318,8 @@ describe('parseJobFile', () => {
       ['In progress', 'in_progress'],
       ['In_progress', 'in_progress'],
       ['Failed', 'failed'],
-      ['Killed', 'killed'],
+      ['Killed', 'stopped'],
+      ['Stopped', 'stopped'],
     ];
     for (const [raw, expected] of cases) {
       const f = tmp(`job-${raw.replace(/\s/g, '')}.md`, [
@@ -359,6 +364,24 @@ describe('parseJobFile', () => {
     ].join('\n'));
     assert.equal(parseJobFile(f).skipPermissions, false);
   });
+
+  it('parses Read variations', () => {
+    for (const val of ['true', 'yes', '1']) {
+      const f = tmp(`read-${val}.md`, [
+        '# Job Task: Test',
+        'Status: Completed',
+        `Read: ${val}`,
+      ].join('\n'));
+      assert.equal(parseJobFile(f).read, true);
+    }
+
+    const f = tmp('read-false.md', [
+      '# Job Task: Test',
+      'Status: Completed',
+      'Read: false',
+    ].join('\n'));
+    assert.equal(parseJobFile(f).read, false);
+  });
 });
 
 // ── parseJobDir ──────────────────────────────────────────────
@@ -936,7 +959,7 @@ describe('writeJobKill', () => {
   beforeEach(setup);
   afterEach(teardown);
 
-  it('sets status to Killed and creates .kill marker', () => {
+  it('sets status to Stopped, marks it for review, and creates .kill marker', () => {
     const f = tmp('job.md', [
       '# Job Task: Test',
       'Status: In progress',
@@ -949,8 +972,9 @@ describe('writeJobKill', () => {
     assert.equal(result.success, true);
 
     const content = read(f);
-    assert.ok(content.includes('Status: Killed'));
-    assert.ok(content.includes('## Killed'));
+    assert.ok(content.includes('Status: Stopped'));
+    assert.ok(content.includes('Validation: Needs validation'));
+    assert.ok(content.includes('## Stopped'));
 
     // Kill marker file should exist
     assert.ok(fs.existsSync(f + '.kill'));
diff --git a/todo.md b/todo.md
index eb864f2..6536e74 100644
--- a/todo.md
+++ b/todo.md
@@ -5,12 +5,12 @@
 
 ## Present
 
-- [ ] change .hub-runtime to .dispatch and update all references to it.
+- [x] move dashboard runtime state to `.dispatch/runtime/` and update all references.
 - [ ] rename hub.root to dispatch.root in config.json, config.local.json, and config.example.json
 - [ ] Move tests to a separate directory. Update test command accordingly
 - [ ] add skills-lock.json to gitignore
-- [ ] Add multi-dispatch feature for task list. On right, to left of "Start", show a checkbox to select multiple tasks. When at least one is selected hide the "Start" button and show a "Start <n> tasks" button. When no tasks are selected, show the "Start" button. Then on the dispatch page, show each task in the prompt input. We also need a way to track multi-task completion for a single job. Show Mark Task done button for each task, but limit the text to a reasonable length, so we don't have large newlines. Hovering over the task name should show the full task text.
-- [ ] If work is added to the base repo, then worktree diffs show all these changes, since it currently uses the commit it was started from. We need to make sure that the worktree diffs show only the changes for the current job. It would also be nice to show the changes for the current job even without using worktrees, but im not sure how to do that.
+- [x] Add multi-dispatch feature for task list. On right, to left of "Start", show a checkbox to select multiple tasks. When at least one is selected hide the "Start" button and show a "Start <n> tasks" button. When no tasks are selected, show the "Start" button. Then on the dispatch page, show each task in the prompt input. We also need a way to track multi-task completion for a single job. Show Mark Task done button for each task, but limit the text to a reasonable length, so we don't have large newlines. Hovering over the task name should show the full task text.
+- [x] If work is added to the base repo, then worktree diffs show all these changes, since it currently uses the commit it was started from. We need to make sure that the worktree diffs show only the changes for the current job. It would also be nice to show the changes for the current job even without using worktrees, but im not sure how to do that.
 
 ## Workflows
 
@@ -39,7 +39,7 @@
 
 - [x] Review the current code for quality and brevity — *Feedback: reviewer assessed code quality as "Clean, well-structured." Focus review effort on parsers.js edge cases (fuzzy matching, stemming) and dual-state sync patterns rather than broad refactoring.*
 - [x] Make `maxTurns` required with sensible defaults; add rough cost-per-job tracking via token counts — *Feedback: the `monthlyBudget` field is purely informational today. Making maxTurns required prevents runaway jobs. Rough cost-per-job via token counts from Claude's output helps users understand spending.*
-- [x] Promote markdown job files as canonical state; derive `.hub-runtime/job-runs.json` as cache to reduce dual-state sync bugs — *Feedback: job state currently lives in markdown (notes/jobs/*.md), run state in job-runs.json, schedules in schedules.json, and config in config.json. A job's Status: line can disagree with run state, creating reconciliation complexity. Markdown should be canonical; JSON should be derived cache.*
+- [x] Promote markdown job files as canonical state; derive `.dispatch/runtime/job-runs.json` as cache to reduce dual-state sync bugs — *Feedback: job state currently lives in markdown (notes/jobs/*.md), run state in job-runs.json, schedules in schedules.json, and config in config.json. A job's Status: line can disagree with run state, creating reconciliation complexity. Markdown should be canonical; JSON should be derived cache.*
 - [ ] Add auth to the Express dashboard server (required before any remote/Tailscale access) — *Feedback: port 3001 has no authentication. Anyone who can reach it can read tasks, dispatch jobs, validate/reject work, and access live terminal WebSocket sessions. Fine for strict localhost; mandatory before any remote access (e.g. over Tailscale).*
 - [x] Write a product showcase video script for Work Down. I will handle video production using the /remotion skill when you are done. You should focus on the following items: open-source, local-first, lightweight.
 - [x] Create `/remove-repo` skill to uninstall hooks and remove config entries (inverse of `/add-repo`) — *Feedback: `/add-repo` copies hooks into other repos' `.claude/` directories and modifies their `settings.json`. If someone stops using Dispatch, those hooks remain orphaned (`hub-stop.js` is a no-op without env vars, but still unexpected). A `/remove-repo` skill should clean up hooks and remove the config entry.*