@open-code-review/cli 2.2.0 → 2.3.0

package/dist/dashboard/server.js

@@ -18410,10 +18410,10 @@ var require_view = __commonJS({
     var debug = require_src()("express:view");
     var path2 = __require("path");
     var fs6 = __require("fs");
-    var dirname15 = path2.dirname;
+    var dirname16 = path2.dirname;
     var basename5 = path2.basename;
     var extname = path2.extname;
-    var join20 = path2.join;
+    var join21 = path2.join;
     var resolve3 = path2.resolve;
     module.exports = View;
     function View(name, options) {
@@ -18449,7 +18449,7 @@ var require_view = __commonJS({
       for (var i = 0; i < roots.length && !path3; i++) {
         var root = roots[i];
         var loc = resolve3(root, name);
-        var dir = dirname15(loc);
+        var dir = dirname16(loc);
         var file = basename5(loc);
         path3 = this.resolve(dir, file);
       }
@@ -18461,12 +18461,12 @@ var require_view = __commonJS({
     };
     View.prototype.resolve = function resolve4(dir, file) {
       var ext = this.ext;
-      var path3 = join20(dir, file);
+      var path3 = join21(dir, file);
       var stat = tryStat(path3);
       if (stat && stat.isFile()) {
         return path3;
       }
-      path3 = join20(dir, basename5(file, ext), "index" + ext);
+      path3 = join21(dir, basename5(file, ext), "index" + ext);
       stat = tryStat(path3);
       if (stat && stat.isFile()) {
         return path3;
@@ -19099,7 +19099,7 @@ var require_send = __commonJS({
     var Stream = __require("stream");
     var util = __require("util");
     var extname = path2.extname;
-    var join20 = path2.join;
+    var join21 = path2.join;
     var normalize = path2.normalize;
     var resolve3 = path2.resolve;
     var sep = path2.sep;
@@ -19318,7 +19318,7 @@ var require_send = __commonJS({
           return res;
         }
         parts = path3.split(sep);
-        path3 = normalize(join20(root, path3));
+        path3 = normalize(join21(root, path3));
       } else {
         if (UP_PATH_REGEXP.test(path3)) {
           debug('malicious path "%s"', path3);
@@ -19453,7 +19453,7 @@ var require_send = __commonJS({
           if (err) return self.onStatError(err);
           return self.error(404);
         }
-        var p = join20(path3, self._index[i]);
+        var p = join21(path3, self._index[i]);
         debug('stat "%s"', p);
         fs6.stat(p, function(err2, stat) {
           if (err2) return next(err2);
@@ -20806,7 +20806,7 @@ var require_application = __commonJS({
     };
     app2.del = deprecate.function(app2.delete, "app.del: Use app.delete instead");
     app2.render = function render(name, options, callback) {
-      var cache = this.cache;
+      var cache2 = this.cache;
       var done = callback;
       var engines = this.engines;
       var opts = options;
@@ -20825,7 +20825,7 @@ var require_application = __commonJS({
         renderOptions.cache = this.enabled("view cache");
       }
       if (renderOptions.cache) {
-        view = cache[name];
+        view = cache2[name];
       }
       if (!view) {
         var View2 = this.get("view");
@@ -20841,7 +20841,7 @@ var require_application = __commonJS({
           return done(err);
         }
         if (renderOptions.cache) {
-          cache[name] = view;
+          cache2[name] = view;
         }
       }
       tryRender(view, renderOptions, done);
@@ -30047,9 +30047,9 @@ var init_define_lazy_prop = __esm({
 });
 
 // ../../node_modules/.pnpm/default-browser-id@5.0.1/node_modules/default-browser-id/index.js
-import { promisify as promisify2 } from "node:util";
+import { promisify } from "node:util";
 import process4 from "node:process";
-import { execFile as execFile2 } from "node:child_process";
+import { execFile } from "node:child_process";
 async function defaultBrowserId() {
   if (process4.platform !== "darwin") {
     throw new Error("macOS only");
@@ -30065,14 +30065,14 @@ async function defaultBrowserId() {
 var execFileAsync;
 var init_default_browser_id = __esm({
   "../../node_modules/.pnpm/default-browser-id@5.0.1/node_modules/default-browser-id/index.js"() {
-    execFileAsync = promisify2(execFile2);
+    execFileAsync = promisify(execFile);
   }
 });
 
 // ../../node_modules/.pnpm/run-applescript@7.1.0/node_modules/run-applescript/index.js
 import process5 from "node:process";
-import { promisify as promisify3 } from "node:util";
-import { execFile as execFile3, execFileSync as execFileSync2 } from "node:child_process";
+import { promisify as promisify2 } from "node:util";
+import { execFile as execFile2, execFileSync as execFileSync2 } from "node:child_process";
 async function runAppleScript(script, { humanReadableOutput = true, signal } = {}) {
   if (process5.platform !== "darwin") {
     throw new Error("macOS only");
@@ -30088,7 +30088,7 @@ async function runAppleScript(script, { humanReadableOutput = true, signal } = {
 var execFileAsync2;
 var init_run_applescript = __esm({
   "../../node_modules/.pnpm/run-applescript@7.1.0/node_modules/run-applescript/index.js"() {
-    execFileAsync2 = promisify3(execFile3);
+    execFileAsync2 = promisify2(execFile2);
   }
 });
 
@@ -30104,8 +30104,8 @@ var init_bundle_name = __esm({
 });
 
 // ../../node_modules/.pnpm/default-browser@5.5.0/node_modules/default-browser/windows.js
-import { promisify as promisify4 } from "node:util";
-import { execFile as execFile4 } from "node:child_process";
+import { promisify as promisify3 } from "node:util";
+import { execFile as execFile3 } from "node:child_process";
 async function defaultBrowser(_execFileAsync = execFileAsync3) {
   const { stdout } = await _execFileAsync("reg", [
     "QUERY",
@@ -30127,7 +30127,7 @@ async function defaultBrowser(_execFileAsync = execFileAsync3) {
 var execFileAsync3, windowsBrowserProgIds, _windowsBrowserProgIdMap, UnknownBrowserError;
 var init_windows = __esm({
   "../../node_modules/.pnpm/default-browser@5.5.0/node_modules/default-browser/windows.js"() {
-    execFileAsync3 = promisify4(execFile4);
+    execFileAsync3 = promisify3(execFile3);
     windowsBrowserProgIds = {
       MSEdgeHTM: { name: "Edge", id: "com.microsoft.edge" },
       // The missing `L` is correct.
@@ -30154,9 +30154,9 @@ var init_windows = __esm({
 });
 
 // ../../node_modules/.pnpm/default-browser@5.5.0/node_modules/default-browser/index.js
-import { promisify as promisify5 } from "node:util";
+import { promisify as promisify4 } from "node:util";
 import process6 from "node:process";
-import { execFile as execFile5 } from "node:child_process";
+import { execFile as execFile4 } from "node:child_process";
 async function defaultBrowser2() {
   if (process6.platform === "darwin") {
     const id = await defaultBrowserId();
@@ -30180,7 +30180,7 @@ var init_default_browser = __esm({
     init_default_browser_id();
     init_bundle_name();
     init_windows();
-    execFileAsync4 = promisify5(execFile5);
+    execFileAsync4 = promisify4(execFile4);
     titleize = (string) => string.toLowerCase().replaceAll(/(?:^|\s|-)\S/g, (x) => x.toUpperCase());
   }
 });
@@ -30196,14 +30196,14 @@ import process7 from "node:process";
 import { Buffer as Buffer2 } from "node:buffer";
 import path from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
-import { promisify as promisify6 } from "node:util";
+import { promisify as promisify5 } from "node:util";
 import childProcess from "node:child_process";
 import fs5, { constants as fsConstants2 } from "node:fs/promises";
 async function getWindowsDefaultBrowserFromWsl() {
   const powershellPath = await powerShellPath();
   const rawCommand = String.raw`(Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice").ProgId`;
   const encodedCommand = Buffer2.from(rawCommand, "utf16le").toString("base64");
-  const { stdout } = await execFile6(
+  const { stdout } = await execFile5(
     powershellPath,
     [
       "-NoProfile",
@@ -30243,14 +30243,14 @@ function detectPlatformBinary({ [platform]: platformBinary }, { wsl }) {
   }
   return detectArchBinary(platformBinary);
 }
-var execFile6, __dirname2, localXdgOpenPath, platform, arch, pTryEach, baseOpen, open, openApp, apps, open_default;
+var execFile5, __dirname2, localXdgOpenPath, platform, arch, pTryEach, baseOpen, open, openApp, apps, open_default;
 var init_open = __esm({
   "../../node_modules/.pnpm/open@10.2.0/node_modules/open/index.js"() {
     init_wsl_utils();
     init_define_lazy_prop();
     init_default_browser();
     init_is_inside_container();
-    execFile6 = promisify6(childProcess.execFile);
+    execFile5 = promisify5(childProcess.execFile);
     __dirname2 = path.dirname(fileURLToPath2(import.meta.url));
     localXdgOpenPath = path.join(__dirname2, "xdg-open");
     ({ platform, arch } = process7);
@@ -30483,42 +30483,197 @@ var init_open = __esm({
 // src/server/index.ts
 var import_express15 = __toESM(require_express2(), 1);
 import { createServer } from "node:http";
-import { existsSync as existsSync17, readFileSync as readFileSync12, writeFileSync as writeFileSync6, unlinkSync as unlinkSync5, mkdirSync as mkdirSync7 } from "node:fs";
-import { join as join19, dirname as dirname14, resolve as resolve2 } from "node:path";
+import { existsSync as existsSync17, readFileSync as readFileSync12, writeFileSync as writeFileSync6, unlinkSync as unlinkSync5, mkdirSync as mkdirSync8 } from "node:fs";
+import { join as join20, dirname as dirname15, resolve as resolve2 } from "node:path";
 
 // ../shared/platform/src/index.ts
-import {
-  execFile,
-  execFileSync,
-  spawn
-} from "node:child_process";
-import { promisify } from "node:util";
-var execFilePromise = promisify(execFile);
-var isWindows = process.platform === "win32";
+import { execFileSync } from "node:child_process";
+
+// ../shared/platform/src/spawn.ts
+import crossSpawn from "cross-spawn";
+var DEFAULT_MAX_BUFFER = 1024 * 1024;
 function execBinary(binary, args, opts) {
-  return execFileSync(binary, args, {
-    ...opts,
-    shell: isWindows
+  const result = crossSpawn.sync(binary, args, {
+    maxBuffer: DEFAULT_MAX_BUFFER,
+    ...opts
   });
+  if (result.error) throw result.error;
+  if (result.status !== 0) {
+    throw Object.assign(
+      new Error(
+        `Command failed: ${binary} ${args.join(" ")}
+${String(result.stderr ?? "")}`
+      ),
+      {
+        status: result.status,
+        code: result.status,
+        signal: result.signal,
+        stdout: result.stdout,
+        stderr: result.stderr,
+        pid: result.pid
+      }
+    );
+  }
+  return result.stdout;
 }
 async function execBinaryAsync(binary, args, opts) {
-  return execFilePromise(binary, args, {
-    ...opts,
-    shell: isWindows
+  return new Promise((resolvePromise, rejectPromise) => {
+    const child = crossSpawn(binary, args, {
+      cwd: opts.cwd,
+      env: opts.env,
+      windowsHide: true
+    });
+    const maxBuffer = opts.maxBuffer ?? DEFAULT_MAX_BUFFER;
+    let stdout = "";
+    let stderr = "";
+    let killed = false;
+    let settled = false;
+    const settle = (fn) => {
+      if (settled) return;
+      settled = true;
+      if (timer) clearTimeout(timer);
+      fn();
+    };
+    const overflow = () => {
+      killed = true;
+      child.kill();
+    };
+    child.stdout?.setEncoding(opts.encoding);
+    child.stderr?.setEncoding(opts.encoding);
+    child.stdout?.on("data", (chunk) => {
+      stdout += chunk;
+      if (stdout.length > maxBuffer) overflow();
+    });
+    child.stderr?.on("data", (chunk) => {
+      stderr += chunk;
+      if (stderr.length > maxBuffer) overflow();
+    });
+    const timer = opts.timeout ? setTimeout(() => {
+      killed = true;
+      child.kill();
+    }, opts.timeout) : void 0;
+    child.on("error", (err) => {
+      settle(
+        () => rejectPromise(Object.assign(err, { stdout, stderr, killed }))
+      );
+    });
+    child.on("close", (code, signal) => {
+      settle(() => {
+        if (code === 0 && !killed) {
+          resolvePromise({ stdout, stderr });
+          return;
+        }
+        rejectPromise(
+          Object.assign(
+            new Error(
+              `Command failed: ${binary} ${args.join(" ")}
+${stderr}`
+            ),
+            {
+              code: code ?? void 0,
+              signal,
+              stdout,
+              stderr,
+              killed
+            }
+          )
+        );
+      });
+    });
   });
 }
 function spawnBinary(binary, args, opts) {
-  return spawn(binary, args, {
+  return crossSpawn(binary, args, {
     ...opts,
-    ...isWindows && { shell: true, windowsHide: true }
+    windowsHide: true
   });
 }
+
+// ../shared/platform/src/verdict.ts
+var CANONICAL_VERDICTS = [
+  "APPROVE",
+  "REQUEST CHANGES",
+  "NEEDS DISCUSSION"
+];
+var VERDICT_SET = new Set(CANONICAL_VERDICTS);
+function isCanonicalVerdict(v) {
+  return VERDICT_SET.has(v);
+}
+var VERDICT_ALIASES = {
+  // Approve-gate aliases (including the retired composites)
+  APPROVED: "APPROVE",
+  LGTM: "APPROVE",
+  "APPROVE WITH SUGGESTIONS": "APPROVE",
+  APPROVE_WITH_SUGGESTIONS: "APPROVE",
+  "ACCEPT WITH FOLLOW-UPS": "APPROVE",
+  "ACCEPT WITH FOLLOWUPS": "APPROVE",
+  ACCEPT_WITH_FOLLOWUPS: "APPROVE",
+  ACCEPT_WITH_FOLLOW_UPS: "APPROVE",
+  // Request-changes-gate aliases
+  "CHANGES REQUESTED": "REQUEST CHANGES",
+  REQUEST_CHANGES: "REQUEST CHANGES",
+  BLOCK: "REQUEST CHANGES",
+  REJECT: "REQUEST CHANGES",
+  // Needs-discussion-gate aliases
+  "NEEDS WORK": "NEEDS DISCUSSION",
+  NEEDS_DISCUSSION: "NEEDS DISCUSSION"
+};
+function normalizeVerdict(raw) {
+  const key = raw.trim().toUpperCase();
+  if (isCanonicalVerdict(key)) return key;
+  return VERDICT_ALIASES[key] ?? null;
+}
+
+// ../shared/platform/src/counts.ts
+function deriveCounts(findings) {
+  const counts = {
+    blocker: 0,
+    should_fix: 0,
+    suggestion: 0,
+    style: 0
+  };
+  for (const finding of findings) {
+    const category = finding?.category;
+    if (category === "blocker" || category === "should_fix" || category === "suggestion" || category === "style") {
+      counts[category]++;
+    }
+  }
+  return counts;
+}
+function collectFindings(meta) {
+  const all = [];
+  for (const reviewer of meta.reviewers ?? []) {
+    for (const finding of reviewer?.findings ?? []) all.push(finding);
+  }
+  return all;
+}
+function preferred(scValue, derivedValue) {
+  return typeof scValue === "number" && Number.isFinite(scValue) ? scValue : derivedValue;
+}
+function resolveRoundCounts(meta) {
+  const allFindings = collectFindings(meta);
+  const derived = deriveCounts(allFindings);
+  const sc = meta.synthesis_counts ?? void 0;
+  return {
+    blockerCount: sc ? preferred(sc.blockers, derived.blocker) : derived.blocker,
+    shouldFixCount: sc ? preferred(sc.should_fix, derived.should_fix) : derived.should_fix,
+    suggestionCount: sc ? preferred(sc.suggestions, derived.suggestion) : derived.suggestion,
+    reviewerCount: (meta.reviewers ?? []).length,
+    totalFindingCount: allFindings.length
+  };
+}
+
+// ../shared/platform/src/index.ts
+var isWindows = process.platform === "win32";
+function killErrorMeansDead(err) {
+  return err instanceof Error && "code" in err && err.code === "ESRCH";
+}
 function isProcessAlive(pid) {
   try {
     process.kill(pid, 0);
     return true;
   } catch (err) {
-    return !(err instanceof Error && "code" in err && err.code === "ESRCH");
+    return !killErrorMeansDead(err);
   }
 }
 function walkDescendants(rootPid) {
@@ -30538,14 +30693,15 @@ function walkDescendants(rootPid) {
     if (!m) continue;
     const pid = Number(m[1]);
     const ppid = Number(m[2]);
-    if (!children.has(ppid)) children.set(ppid, []);
-    children.get(ppid).push(pid);
+    const siblings = children.get(ppid) ?? [];
+    siblings.push(pid);
+    children.set(ppid, siblings);
   }
   const acc = [];
   const queue = [rootPid];
   const seen = /* @__PURE__ */ new Set([rootPid]);
-  while (queue.length) {
-    const p = queue.shift();
+  let p;
+  while ((p = queue.shift()) !== void 0) {
     for (const c of children.get(p) ?? []) {
       if (seen.has(c)) continue;
       seen.add(c);
@@ -30628,7 +30784,6 @@ function defaultIconFor(id, tier) {
 // src/server/index.ts
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 import { randomBytes } from "node:crypto";
-import { execFileSync as execFileSync3 } from "node:child_process";
 import { Server as SocketIOServer } from "socket.io";
 
 // src/server/services/ocr-resolver.ts
@@ -30651,7 +30806,7 @@ function resolveOcrDir(startDir) {
   }
 }
 
-// ../cli/src/lib/db/index.ts
+// ../shared/persistence/src/db/index.ts
 import {
   existsSync as existsSync5,
   mkdirSync as mkdirSync2,
@@ -30662,10 +30817,10 @@ import {
 } from "node:fs";
 import { dirname as dirname5, join as join5 } from "node:path";
 
-// ../cli/src/lib/db/engine.ts
+// ../shared/persistence/src/db/engine.ts
 import { createRequire } from "node:module";
 
-// ../cli/src/lib/runtime-checks.ts
+// ../shared/persistence/src/runtime-checks.ts
 var NODE_FLOOR = { major: 22, minor: 5 };
 function isSupportedNode(version) {
   const [major = 0, minor = 0] = version.split(".").map((n) => Number.parseInt(n, 10) || 0);
@@ -30683,7 +30838,7 @@ function isSuppressibleSqliteWarning(warning) {
   return typeof message === "string" && message.includes("SQLite is an experimental feature");
 }
 
-// ../cli/src/lib/db/engine.ts
+// ../shared/persistence/src/db/engine.ts
 var SQLITE_BUSY = 5;
 var SQLITE_BUSY_SNAPSHOT = 261;
 var BUSY_RETRY_ATTEMPTS = 5;
@@ -30845,7 +31000,7 @@ function openEngine(dbPath) {
   return new NodeSqliteAdapter(native);
 }
 
-// ../cli/src/lib/db/migrations.ts
+// ../shared/persistence/src/db/migrations.ts
 var MIGRATIONS = [
   {
     version: 1,
@@ -31393,11 +31548,11 @@ function runMigrations(db) {
   }
 }
 
-// ../cli/src/lib/db/reconcile.ts
+// ../shared/persistence/src/db/reconcile.ts
 import { existsSync as existsSync2 } from "node:fs";
 import { isAbsolute, join as join2, dirname as dirname2 } from "node:path";
 
-// ../cli/src/lib/db/result-mapper.ts
+// ../shared/persistence/src/db/result-mapper.ts
 function resultToRows(result) {
   if (result.length === 0 || !result[0]) {
     return [];
@@ -31416,7 +31571,7 @@ function resultToRow(result) {
   return rows[0];
 }
 
-// ../cli/src/lib/db/queries.ts
+// ../shared/persistence/src/db/queries.ts
 function insertSession(db, params) {
   const {
     id,
@@ -31499,6 +31654,14 @@ function insertEvent(db, params) {
     ]
   );
 }
+function getEventsForSession(db, sessionId) {
+  return resultToRows(
+    db.exec(
+      "SELECT * FROM orchestration_events WHERE session_id = ? ORDER BY id ASC",
+      [sessionId]
+    )
+  );
+}
 function commitReasonClose(db, sessionId, reasonEvent, projectionUpdates) {
   db.transaction(() => {
     insertEvent(db, { session_id: sessionId, ...reasonEvent });
@@ -31506,7 +31669,7 @@ function commitReasonClose(db, sessionId, reasonEvent, projectionUpdates) {
   });
 }
 
-// ../cli/src/lib/db/reconcile.ts
+// ../shared/persistence/src/db/reconcile.ts
 var DEFAULT_STALE_THRESHOLD_SECONDS = 7 * 24 * 60 * 60;
 function hasTerminalArtifactEvent(db, sessionId, workflowType, currentRound, currentMapRun) {
   const eventType = workflowType === "map" ? "map_completed" : "round_completed";
@@ -31636,14 +31799,14 @@ function reconcileLegacyState(db, ocrDir, opts = {}) {
   return { dryRun, actions };
 }
 
-// ../cli/src/lib/db/liveness.ts
+// ../shared/persistence/src/db/liveness.ts
 var PID_REUSE_GUARD_MS = 24 * 60 * 60 * 1e3;
 function defaultIsAlive(pid) {
   try {
     process.kill(pid, 0);
     return true;
   } catch (err) {
-    return !(err instanceof Error && "code" in err && err.code === "ESRCH");
+    return !killErrorMeansDead(err);
   }
 }
 function sqliteUtcMs(ts) {
@@ -31651,7 +31814,7 @@ function sqliteUtcMs(ts) {
   return new Date(sqliteShape ? ts.replace(" ", "T") + "Z" : ts).getTime();
 }
 
-// ../cli/src/lib/state/exit-codes.ts
+// ../shared/persistence/src/state/exit-codes.ts
 var STATE_EXIT = {
   OK: 0,
   USAGE: 2,
@@ -31675,7 +31838,7 @@ var ORPHAN_EXIT_CODE = -3;
 var CASCADE_CLOSE_EXIT_CODE = -4;
 var WATCHDOG_DEADLINE_EXIT_CODE = -5;
 
-// ../cli/src/lib/db/agent-sessions.ts
+// ../shared/persistence/src/db/agent-sessions.ts
 var NOTE_ORPHAN_PREFIX = "orphaned by liveness sweep";
 var INSTANCE_COMMAND = "session-instance";
 function cascadeTerminateExecutions(db, workflowId, exitCode, note) {
@@ -31747,6 +31910,10 @@ function getLatestAgentSessionWithVendorId(db, workflowId) {
   );
   return row ? rowToAgentSession(row) : void 0;
 }
+var SAFE_VENDOR_SESSION_ID = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,255}$/;
+function isSafeVendorSessionId(id) {
+  return SAFE_VENDOR_SESSION_ID.test(id);
+}
 function recordVendorSessionIdForExecution(db, executionId, vendorSessionId) {
   db.run(
     `UPDATE command_executions
@@ -31868,7 +32035,7 @@ function sweepStaleSessions(db, thresholdSeconds) {
   return { closedSessionIds: rows.map((r) => r.id) };
 }
 
-// ../cli/src/lib/db/maintenance.ts
+// ../shared/persistence/src/db/maintenance.ts
 import {
   existsSync as existsSync3,
   readdirSync,
@@ -31943,7 +32110,7 @@ function reapStaleExecLogs(execLogsDir, maxAgeMs = SEVEN_DAYS_MS) {
   return reaped;
 }
 
-// ../cli/src/lib/db/command-log.ts
+// ../shared/persistence/src/db/command-log.ts
 import { appendFileSync, existsSync as existsSync4, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { dirname as dirname4, join as join4 } from "node:path";
 import { randomUUID } from "node:crypto";
@@ -32040,7 +32207,7 @@ function rotateIfNeeded(filePath) {
   }
 }
 
-// ../cli/src/lib/db/index.ts
+// ../shared/persistence/src/db/index.ts
 var V2_SCHEMA_VERSION = 12;
 function maybeSnapshotBeforeUpgrade(db, dbPath, fromVersion) {
   if (fromVersion < 1 || fromVersion >= V2_SCHEMA_VERSION) return null;
@@ -33346,41 +33513,8 @@ function createStatsRouter(db) {
 var import_express8 = __toESM(require_express2(), 1);
 
 // src/server/socket/command-runner.ts
-import { readFileSync as readFileSync5, writeFileSync as writeFileSync3, unlinkSync as unlinkSync3, mkdirSync as mkdirSync5, existsSync as existsSync10 } from "node:fs";
-import { dirname as dirname7, join as join12 } from "node:path";
-
-// src/server/services/command-outcome.ts
-function deriveCommandOutcome(exitCode, completeness) {
-  if (exitCode === null) return null;
-  if (exitCode === CANCELLED_EXIT_CODE || exitCode === CASCADE_CLOSE_EXIT_CODE) {
-    return "cancelled";
-  }
-  if (exitCode === WATCHDOG_DEADLINE_EXIT_CODE) return "failed";
-  if (exitCode !== 0) return "failed";
-  if (completeness === null || completeness === "complete") return "success";
-  return "incomplete";
-}
-function deriveCancellationReason(exitCode) {
-  if (exitCode === CANCELLED_EXIT_CODE) return "user";
-  if (exitCode === CASCADE_CLOSE_EXIT_CODE) return "cascade";
-  return null;
-}
-function getWorkflowCompletenessForExecution(db, executionId) {
-  const result = db.exec(
-    `SELECT sc.completeness_state
-       FROM command_executions ce
-       LEFT JOIN session_completeness sc ON sc.session_id = ce.workflow_id
-      WHERE ce.id = ?`,
-    [executionId]
-  );
-  const row = result[0]?.values[0];
-  if (!row) return null;
-  const state = row[0];
-  if (state === "complete" || state === "closed_without_artifact" || state === "in_flight" || state === "open_no_artifact") {
-    return state;
-  }
-  return null;
-}
+import { readFileSync as readFileSync5, mkdirSync as mkdirSync6 } from "node:fs";
+import { dirname as dirname7, join as join13 } from "node:path";
 
 // src/server/services/ai-cli/index.ts
 import { readFileSync as readFileSync3 } from "node:fs";
@@ -33390,12 +33524,24 @@ import { join as join9 } from "node:path";
 import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync2, unlinkSync as unlinkSync2, openSync, closeSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join as join7 } from "node:path";
-function buildFileStdio(stdin, logFile) {
+function buildFileStdio(logFile) {
   if (!logFile) {
-    return { stdio: [stdin, "pipe", "pipe"], logFd: null, logPath: void 0 };
+    return { stdio: ["pipe", "pipe", "pipe"], logFd: null, logPath: void 0 };
   }
   const logFd = openSync(logFile, "a");
-  return { stdio: [stdin, logFd, logFd], logFd, logPath: logFile };
+  return { stdio: ["pipe", logFd, logFd], logFd, logPath: logFile };
+}
+function assertNonEmptyPrompt(prompt) {
+  if (prompt.length === 0) {
+    throw new Error("refusing to spawn with an empty prompt");
+  }
+}
+function deliverPrompt(proc, prompt) {
+  assertNonEmptyPrompt(prompt);
+  proc.stdin?.on("error", () => {
+  });
+  proc.stdin?.write(prompt);
+  proc.stdin?.end();
 }
 function closeFileStdio(logFd) {
   if (logFd === null) return;
@@ -33459,7 +33605,7 @@ function cleanEnv() {
   return env;
 }
 
-// ../cli/src/lib/vendor-resume.ts
+// ../shared/persistence/src/vendor-resume.ts
 var VENDOR_BINARIES = {
   claude: "claude",
   opencode: "opencode"
@@ -33489,11 +33635,6 @@ function buildResumeCommand(vendor, vendorSessionId) {
 // src/server/services/ai-cli/claude-adapter.ts
 var WORKFLOW_TOOLS = ["Read", "Write", "Edit", "Bash", "Glob", "Grep", "TodoWrite", "TodoRead", "Task"];
 var QUERY_TOOLS = ["Read", "Grep", "Glob"];
-var BUNDLED_CLAUDE_MODELS = [
-  { id: "claude-opus-4-7", displayName: "Claude Opus 4.7" },
-  { id: "claude-sonnet-4-6", displayName: "Claude Sonnet 4.6" },
-  { id: "claude-haiku-4-5-20251001", displayName: "Claude Haiku 4.5" }
-];
 var ClaudeCodeAdapter = class {
   name = "Claude Code";
   binary = "claude";
@@ -33522,6 +33663,7 @@ var ClaudeCodeAdapter = class {
     }
   }
   spawn(opts) {
+    assertNonEmptyPrompt(opts.prompt);
     const isWorkflow = opts.mode === "workflow";
     const maxTurns = opts.maxTurns ?? (isWorkflow ? 500 : 1);
     const tools = opts.allowedTools ?? (isWorkflow ? WORKFLOW_TOOLS : QUERY_TOOLS);
@@ -33543,7 +33685,6 @@ var ClaudeCodeAdapter = class {
       flags.push("--model", opts.model);
     }
     const { stdio, logFd, logPath } = buildFileStdio(
-      "pipe",
       isWorkflow ? opts.logFile : void 0
     );
     const proc = spawnBinary("claude", flags, {
@@ -33554,46 +33695,13 @@ var ClaudeCodeAdapter = class {
     });
     closeFileStdio(logFd);
     if (isWorkflow) proc.unref();
-    proc.stdin?.write(opts.prompt);
-    proc.stdin?.end();
+    deliverPrompt(proc, opts.prompt);
     return {
       process: proc,
       detached: isWorkflow,
       ...logPath ? { logPath } : {}
     };
   }
-  async listModels() {
-    try {
-      const output = execBinary("claude", ["models", "--json"], {
-        encoding: "utf-8",
-        timeout: 5e3,
-        stdio: ["ignore", "pipe", "ignore"]
-      });
-      const parsed = JSON.parse(output);
-      if (Array.isArray(parsed)) {
-        const models = [];
-        for (const item of parsed) {
-          if (typeof item === "string") {
-            models.push({ id: item });
-          } else if (typeof item === "object" && item !== null && "id" in item && typeof item.id === "string") {
-            const obj = item;
-            const desc = { id: obj.id };
-            if (typeof obj.displayName === "string") desc.displayName = obj.displayName;
-            if (typeof obj.provider === "string") desc.provider = obj.provider;
-            if (Array.isArray(obj.tags)) {
-              desc.tags = obj.tags.filter((t) => typeof t === "string");
-            }
-            models.push(desc);
-          }
-        }
-        if (models.length > 0) {
-          return models;
-        }
-      }
-    } catch {
-    }
-    return BUNDLED_CLAUDE_MODELS;
-  }
   createParser() {
     return new ClaudeLineParser();
   }
@@ -33747,11 +33855,6 @@ function extractToolResultOutput(content) {
 function capitalize(s) {
   return s.charAt(0).toUpperCase() + s.slice(1);
 }
-var BUNDLED_OPENCODE_MODELS = [
-  { id: "anthropic/claude-opus-4-7", provider: "anthropic" },
-  { id: "anthropic/claude-sonnet-4-6", provider: "anthropic" },
-  { id: "anthropic/claude-haiku-4-5-20251001", provider: "anthropic" }
-];
 var OpenCodeAdapter = class {
   name = "OpenCode";
   binary = "opencode";
@@ -33784,11 +33887,11 @@ var OpenCodeAdapter = class {
     }
   }
   spawn(opts) {
+    assertNonEmptyPrompt(opts.prompt);
     const isWorkflow = opts.mode === "workflow";
     const agent = opts.allowedTools ? void 0 : isWorkflow ? "build" : "plan";
     const args = [
       "run",
-      opts.prompt,
       "--format",
       "json"
     ];
@@ -33802,7 +33905,6 @@ var OpenCodeAdapter = class {
       args.push("--model", opts.model);
     }
     const { stdio, logFd, logPath } = buildFileStdio(
-      "ignore",
       isWorkflow ? opts.logFile : void 0
     );
     const proc = spawnBinary("opencode", args, {
@@ -33813,44 +33915,13 @@ var OpenCodeAdapter = class {
     });
     closeFileStdio(logFd);
     if (isWorkflow) proc.unref();
+    deliverPrompt(proc, opts.prompt);
     return {
       process: proc,
       detached: isWorkflow,
       ...logPath ? { logPath } : {}
     };
   }
-  async listModels() {
-    try {
-      const output = execBinary("opencode", ["models", "--json"], {
-        encoding: "utf-8",
-        timeout: 5e3,
-        stdio: ["ignore", "pipe", "ignore"]
-      });
-      const parsed = JSON.parse(output);
-      if (Array.isArray(parsed)) {
-        const models = [];
-        for (const item of parsed) {
-          if (typeof item === "string") {
-            models.push({ id: item });
-          } else if (typeof item === "object" && item !== null && "id" in item && typeof item.id === "string") {
-            const obj = item;
-            const desc = { id: obj.id };
-            if (typeof obj.displayName === "string") desc.displayName = obj.displayName;
-            if (typeof obj.provider === "string") desc.provider = obj.provider;
-            if (Array.isArray(obj.tags)) {
-              desc.tags = obj.tags.filter((t) => typeof t === "string");
-            }
-            models.push(desc);
-          }
-        }
-        if (models.length > 0) {
-          return models;
-        }
-      }
-    } catch {
-    }
-    return BUNDLED_OPENCODE_MODELS;
-  }
   /**
    * OpenCode emits each event with all its content already resolved (tool
    * results arrive in the same event as the call), so the parser is
@@ -34019,6 +34090,9 @@ function readEventJournal(ocrDir, executionId) {
 }
 
 // src/server/services/ai-cli/index.ts
+function createRegisteredAdapters() {
+  return [new ClaudeCodeAdapter(), new OpenCodeAdapter()];
+}
 function readAiCliPreference(ocrDir) {
   try {
     const configPath = join9(ocrDir, "config.yaml");
@@ -34038,10 +34112,7 @@ var AiCliService = class {
   status;
   constructor(ocrDir) {
     this.preference = readAiCliPreference(ocrDir);
-    const adapters = [
-      new ClaudeCodeAdapter(),
-      new OpenCodeAdapter()
-    ];
+    const adapters = createRegisteredAdapters();
     this.entries = adapters.map((adapter) => ({
       adapter,
       detection: adapter.detect()
@@ -34118,8 +34189,8 @@ var AiCliService = class {
     const available = this.entries.filter((e) => e.detection.found);
     if (available.length === 0) return null;
     if (this.preference !== "auto") {
-      const preferred = available.find((e) => e.adapter.binary === this.preference);
-      if (preferred) return preferred.adapter;
+      const preferred2 = available.find((e) => e.adapter.binary === this.preference);
+      if (preferred2) return preferred2.adapter;
       console.warn(
         `  AI CLI: Preferred "${this.preference}" not found, falling back to auto-detection`
       );
@@ -34166,10 +34237,12 @@ var FileTailer = class {
   /** Read everything currently available from `offset` to EOF. */
   poll() {
     if (!this.ensureOpen()) return;
+    const fd = this.fd;
+    if (fd === null) return;
     let bytes;
     do {
       try {
-        bytes = readSync(this.fd, this.buf, 0, this.buf.length, this.offset);
+        bytes = readSync(fd, this.buf, 0, this.buf.length, this.offset);
       } catch {
         return;
       }
@@ -34230,100 +34303,12 @@ function resolveLocalCli() {
   return null;
 }
 
-// ../cli/src/lib/state/projection.ts
-var REASON_EVENT_TYPES = [
-  "session_aborted",
-  "session_auto_closed_stale",
-  "session_synced",
-  "session_legacy_import"
-];
-var TERMINAL_EVENT_TYPES = /* @__PURE__ */ new Set([
-  "session_closed",
-  ...REASON_EVENT_TYPES
-]);
-function hasCompletionInvariant(db, session) {
-  const eventType = session.workflow_type === "map" ? "map_completed" : "round_completed";
-  const round = session.workflow_type === "map" ? session.current_map_run : session.current_round;
-  const r = db.exec(
-    `SELECT 1 FROM orchestration_events
-       WHERE session_id = ? AND event_type = ? AND round = ? LIMIT 1`,
-    [session.id, eventType, round]
-  );
-  return (r[0]?.values.length ?? 0) > 0;
-}
-
-// ../cli/src/lib/state/index.ts
-async function stateClose(params) {
-  const { sessionId, ocrDir, abort } = params;
-  const db = await ensureDatabase(ocrDir);
-  const existing = getSession(db, sessionId);
-  if (!existing) {
-    throw new StateError(STATE_EXIT.NOT_FOUND, `Session not found: ${sessionId}`);
-  }
-  if (existing.status === "closed") {
-    console.error(`[ocr] Session already closed: ${sessionId}`);
-    return;
-  }
-  if (!abort && !hasCompletionInvariant(db, existing)) {
-    const what = existing.workflow_type === "map" ? `map run ${existing.current_map_run} has no map_completed event` : `round ${existing.current_round} has no round_completed event`;
-    throw new StateError(
-      STATE_EXIT.INVARIANT_UNMET,
-      `Cannot close session ${sessionId}: ${what}. Run 'ocr state complete-round' to finalize it, or pass --abort to record an abandoned session.`
-    );
-  }
-  const note = "closed by parent workflow close";
-  db.transaction(() => {
-    if (abort) {
-      insertEvent(db, {
-        session_id: sessionId,
-        event_type: "session_aborted",
-        phase: existing.current_phase,
-        phase_number: existing.phase_number,
-        round: existing.current_round
-      });
-    }
-    updateSession(db, sessionId, {
-      status: "closed",
-      current_phase: "complete"
-    });
-    if (!abort) {
-      insertEvent(db, {
-        session_id: sessionId,
-        event_type: "session_closed",
-        phase: "complete",
-        phase_number: existing.phase_number,
-        round: existing.current_round
-      });
-    }
-    cascadeTerminateExecutions(db, sessionId, CASCADE_CLOSE_EXIT_CODE, note);
-  });
-}
-async function reconcileWorkflowOnExit(ocrDir, sessionId, db) {
-  db ??= await ensureDatabase(ocrDir);
-  const existing = getSession(db, sessionId);
-  if (!existing) return "not-found";
-  if (existing.status === "closed") return "already-closed";
-  if (!hasCompletionInvariant(db, existing)) return "incomplete";
-  if (hasInFlightDependents(db, sessionId)) return "in-flight";
-  await stateClose({ sessionId, ocrDir, abort: false });
-  return "closed";
-}
-async function reconcileCompletedSessions(ocrDir) {
-  const db = await ensureDatabase(ocrDir);
-  const closed = [];
-  for (const s of getAllSessions(db)) {
-    if (s.status !== "active") continue;
-    const outcome = await reconcileWorkflowOnExit(ocrDir, s.id, db);
-    if (outcome === "closed") closed.push(s.id);
-  }
-  return closed;
-}
-
-// ../cli/src/lib/runtime-config.ts
+// ../shared/config/src/runtime-config.ts
 import { existsSync as existsSync9, readFileSync as readFileSync4 } from "node:fs";
 import { join as join11 } from "node:path";
 var DEFAULT_AGENT_HEARTBEAT_SECONDS = 60;
 var DEFAULT_WORKFLOW_HARD_DEADLINE_MINUTES = 60;
+var DEFAULT_FORWARD_RESUME_MAX_ATTEMPTS = 2;
 function readRuntimePositiveInt(ocrDir, key, defaultValue) {
   const configPath = join11(ocrDir, "config.yaml");
   if (!existsSync9(configPath)) return defaultValue;
@@ -34368,8 +34353,15 @@ function getWorkflowHardDeadlineMs(ocrDir) {
     DEFAULT_WORKFLOW_HARD_DEADLINE_MINUTES
   ) * 60 * 1e3;
 }
+function getForwardResumeMaxAttempts(ocrDir) {
+  return readRuntimePositiveInt(
+    ocrDir,
+    "forward_resume_max_attempts",
+    DEFAULT_FORWARD_RESUME_MAX_ATTEMPTS
+  );
+}
 
-// src/server/socket/command-runner.ts
+// src/server/socket/prompt-builder.ts
 function shellSplit(str) {
   const tokens = [];
   let current = "";
@@ -34396,11 +34388,6 @@ function shellSplit(str) {
   if (current) tokens.push(current);
   return tokens;
 }
-var ALLOWED_COMMANDS = /* @__PURE__ */ new Set([
-  "progress",
-  "state"
-]);
-var AI_COMMANDS = /* @__PURE__ */ new Set(["map", "review", "translate-review-to-single-human", "address", "create-reviewer", "sync-reviewers"]);
 function escapeUserHeaders(value) {
   return value.normalize("NFKC").replace(/[\u2028\u2029]/g, "\n").replace(/\p{Cf}/gu, "").replace(/^([ \t]{0,3})(#+)/gm, "$1\\$2").replace(/^([ \t]{0,3})(＃+)/gm, "$1\\$2").replace(/^([ \t]{0,3})(={3,}|-{3,})\s*$/gm, "$1\\$2").replace(/^([ \t]{0,3})(```+)/gm, "$1\\$2");
 }
@@ -34425,8 +34412,8 @@ function buildPrompt(opts) {
         options.push("--fresh");
         i++;
       } else if (arg === "--requirements" && i + 1 < subArgs.length) {
-        requirements = subArgs.slice(i + 1).join(" ");
-        break;
+        requirements = subArgs[i + 1] ?? "";
+        i += 2;
       } else if (arg === "--team" && i + 1 < subArgs.length) {
         team = subArgs[i + 1] ?? "";
         i += 2;
@@ -34436,8 +34423,9 @@ function buildPrompt(opts) {
       } else if (arg === "--reviewer" && i + 1 < subArgs.length) {
         const raw = subArgs[i + 1] ?? "";
         const countMatch = raw.match(/^(\d+):(.+)$/);
-        if (countMatch) {
-          reviewerDescriptions.push({ description: countMatch[2], count: parseInt(countMatch[1], 10) });
+        const [, countStr, description] = countMatch ?? [];
+        if (countStr && description) {
+          reviewerDescriptions.push({ description, count: parseInt(countStr, 10) });
         } else {
           reviewerDescriptions.push({ description: raw, count: 1 });
         }
@@ -34548,57 +34536,372 @@ function extractPerInstanceModels(subArgs) {
   }
   return [...models];
 }
+
+// src/server/socket/process-registry.ts
 var MAX_CONCURRENT = 3;
-var WATCHDOG_TICK_MS = 1e4;
-var POST_RESULT_GRACE_MS = 3e4;
-var HEARTBEAT_THROTTLE_MS = 5e3;
-function decideWatchdogTick(i) {
-  if (i.resultSeenAt !== void 0 && i.nowMs - i.resultSeenAt > i.postResultGraceMs) {
-    return {
-      action: "finalize",
-      reap: !i.exited,
-      exitCode: i.resultIsError ? 1 : 0,
-      reason: "result-grace"
-    };
-  }
-  if (i.nowMs - i.startedAtMs > i.hardDeadlineMs) {
-    return {
-      action: "finalize",
-      reap: !i.exited,
-      exitCode: WATCHDOG_DEADLINE_EXIT_CODE,
-      reason: "hard-deadline"
-    };
-  }
-  return i.exited ? { action: "wait" } : { action: "beat" };
-}
 var activeCommands = /* @__PURE__ */ new Map();
-function spawnMarkerPath(ocrDir) {
-  return join12(ocrDir, "data", "dashboard-active-spawn.json");
-}
-function writeSpawnMarker(ocrDir, executionUid, pid) {
-  const dataDir = join12(ocrDir, "data");
-  if (!existsSync10(dataDir)) mkdirSync5(dataDir, { recursive: true });
-  const payload = JSON.stringify({
-    execution_uid: executionUid,
+function getActiveCommands() {
+  return Array.from(activeCommands.values()).map((entry) => ({
+    execution_id: entry.executionId,
+    command: entry.commandStr,
+    started_at: entry.startedAt,
+    output: entry.outputBuffer
+  }));
+}
+
+// src/server/socket/spawn-markers.ts
+import { writeFileSync as writeFileSync3, unlinkSync as unlinkSync3, mkdirSync as mkdirSync5, existsSync as existsSync10, rmSync as rmSync2 } from "node:fs";
+import { join as join12 } from "node:path";
+function spawnMarkerDir(ocrDir) {
+  return join12(ocrDir, "data", "dashboard-active-spawn");
+}
+function spawnMarkerPath(ocrDir, executionUid) {
+  const safe = executionUid.replace(/[^A-Za-z0-9._-]/g, "_");
+  return join12(spawnMarkerDir(ocrDir), `${safe}.json`);
+}
+function legacySpawnMarkerPath(ocrDir) {
+  return join12(ocrDir, "data", "dashboard-active-spawn.json");
+}
+function writeSpawnMarker(ocrDir, executionUid, pid) {
+  const dir = spawnMarkerDir(ocrDir);
+  if (!existsSync10(dir)) mkdirSync5(dir, { recursive: true });
+  const payload = JSON.stringify({
+    execution_uid: executionUid,
     pid,
     started_at: (/* @__PURE__ */ new Date()).toISOString()
   });
-  writeFileSync3(spawnMarkerPath(ocrDir), payload, { mode: 384 });
+  writeFileSync3(spawnMarkerPath(ocrDir, executionUid), payload, { mode: 384 });
 }
-function clearSpawnMarker(ocrDir) {
+function clearSpawnMarker(ocrDir, executionUid) {
   try {
-    unlinkSync3(spawnMarkerPath(ocrDir));
+    unlinkSync3(spawnMarkerPath(ocrDir, executionUid));
   } catch {
   }
 }
-function getActiveCommands() {
-  return Array.from(activeCommands.values()).map((entry) => ({
-    execution_id: entry.executionId,
-    command: entry.commandStr,
-    started_at: entry.startedAt,
-    output: entry.outputBuffer
-  }));
+function clearAllSpawnMarkers(ocrDir) {
+  try {
+    rmSync2(spawnMarkerDir(ocrDir), { recursive: true, force: true });
+  } catch {
+  }
+  try {
+    unlinkSync3(legacySpawnMarkerPath(ocrDir));
+  } catch {
+  }
+}
+
+// src/server/socket/watchdog.ts
+var WATCHDOG_TICK_MS = 1e4;
+var POST_RESULT_GRACE_MS = 3e4;
+var HEARTBEAT_THROTTLE_MS = 5e3;
+function decideWatchdogTick(i) {
+  if (i.resultSeenAt !== void 0 && i.nowMs - i.resultSeenAt > i.postResultGraceMs) {
+    return {
+      action: "finalize",
+      reap: !i.exited,
+      exitCode: i.resultIsError ? 1 : 0,
+      reason: "result-grace"
+    };
+  }
+  if (i.nowMs - i.startedAtMs > i.hardDeadlineMs) {
+    return {
+      action: "finalize",
+      reap: !i.exited,
+      exitCode: WATCHDOG_DEADLINE_EXIT_CODE,
+      reason: "hard-deadline"
+    };
+  }
+  return i.exited ? { action: "wait" } : { action: "beat" };
+}
+function makeHeartbeatBumper(db, executionId, entry) {
+  return () => {
+    if (entry.finalized) return;
+    const now = Date.now();
+    if (now - (entry.lastBeatWrite ?? 0) < HEARTBEAT_THROTTLE_MS) return;
+    entry.lastBeatWrite = now;
+    try {
+      db.run(
+        `UPDATE command_executions SET last_heartbeat_at = datetime('now') WHERE id = ? AND finished_at IS NULL`,
+        [executionId]
+      );
+    } catch (err) {
+      console.error("[command-runner] heartbeat bump failed:", err);
+    }
+  };
+}
+
+// ../shared/persistence/src/state/phase-graph.ts
+var REVIEW_PHASE_NUMBERS = {
+  context: 1,
+  "change-context": 2,
+  analysis: 3,
+  reviews: 4,
+  aggregation: 5,
+  discourse: 6,
+  synthesis: 7,
+  complete: 8
+};
+var MAP_PHASE_NUMBERS = {
+  "map-context": 1,
+  topology: 2,
+  "flow-analysis": 3,
+  "requirements-mapping": 4,
+  synthesis: 5,
+  complete: 6
+};
+
+// ../shared/persistence/src/state/forward-resume.ts
+var FORWARD_RESUME_KIND = "forward_resume";
+var FORWARD_RESUME_EXHAUSTED_REASON = "forward_resume_exhausted";
+function parseLeaseMetadata(e) {
+  if (e.event_type !== "session_resumed" || !e.metadata) return null;
+  try {
+    return JSON.parse(e.metadata);
+  } catch {
+    return null;
+  }
+}
+function remainingPhasesAfter(workflowType, currentPhase) {
+  const numbers = workflowType === "map" ? MAP_PHASE_NUMBERS : REVIEW_PHASE_NUMBERS;
+  const cur = numbers[currentPhase];
+  if (cur === void 0) return [];
+  return Object.entries(numbers).filter(([, n]) => n > cur).sort((a, b) => a[1] - b[1]).map(([phase]) => phase);
+}
+function hasTerminalArtifactEvent2(events, workflowType, round) {
+  const terminal = workflowType === "map" ? "map_completed" : "round_completed";
+  return events.some((e) => e.event_type === terminal && e.round === round);
+}
+function countForwardResumeLeases(events, round) {
+  return events.filter((e) => parseLeaseMetadata(e)?.kind === FORWARD_RESUME_KIND && parseLeaseMetadata(e)?.round === round).length;
+}
+function strandedActionByCap(db, session, maxAttempts) {
+  const events = getEventsForSession(db, session.id);
+  const leaseCount = countForwardResumeLeases(events, session.current_round);
+  const workflowType = session.workflow_type === "map" ? "map" : "review";
+  return {
+    action: leaseCount >= maxAttempts ? "abort_or_fresh" : "forward_resume",
+    remainingPhases: remainingPhasesAfter(workflowType, session.current_phase),
+    attemptsRemaining: Math.max(0, maxAttempts - leaseCount)
+  };
+}
+function closeForwardResumeExhausted(db, sessionId, attempts) {
+  commitReasonClose(
+    db,
+    sessionId,
+    {
+      event_type: "session_auto_closed_stale",
+      phase: "complete",
+      metadata: JSON.stringify({
+        reason: FORWARD_RESUME_EXHAUSTED_REASON,
+        attempts
+      })
+    },
+    { status: "closed", current_phase: "complete" }
+  );
+}
+
+// ../shared/persistence/src/state/projection.ts
+var REASON_EVENT_TYPES = [
+  "session_aborted",
+  "session_auto_closed_stale",
+  "session_synced",
+  "session_legacy_import"
+];
+var TERMINAL_EVENT_TYPES = /* @__PURE__ */ new Set([
+  "session_closed",
+  ...REASON_EVENT_TYPES
+]);
+function hasCompletionInvariant(db, session) {
+  const eventType = session.workflow_type === "map" ? "map_completed" : "round_completed";
+  const round = session.workflow_type === "map" ? session.current_map_run : session.current_round;
+  const r = db.exec(
+    `SELECT 1 FROM orchestration_events
+       WHERE session_id = ? AND event_type = ? AND round = ? LIMIT 1`,
+    [session.id, eventType, round]
+  );
+  return (r[0]?.values.length ?? 0) > 0;
+}
+
+// ../shared/persistence/src/state/index.ts
+async function stateClose(params) {
+  const { sessionId, ocrDir, abort } = params;
+  const db = await ensureDatabase(ocrDir);
+  const existing = getSession(db, sessionId);
+  if (!existing) {
+    throw new StateError(STATE_EXIT.NOT_FOUND, `Session not found: ${sessionId}`);
+  }
+  if (existing.status === "closed") {
+    console.error(`[ocr] Session already closed: ${sessionId}`);
+    return;
+  }
+  if (!abort && !hasCompletionInvariant(db, existing)) {
+    const what = existing.workflow_type === "map" ? `map run ${existing.current_map_run} has no map_completed event` : `round ${existing.current_round} has no round_completed event`;
+    throw new StateError(
+      STATE_EXIT.INVARIANT_UNMET,
+      `Cannot close session ${sessionId}: ${what}. Run 'ocr state complete-round' to finalize it, or pass --abort to record an abandoned session.`
+    );
+  }
+  const note = "closed by parent workflow close";
+  db.transaction(() => {
+    if (abort) {
+      insertEvent(db, {
+        session_id: sessionId,
+        event_type: "session_aborted",
+        phase: existing.current_phase,
+        phase_number: existing.phase_number,
+        round: existing.current_round
+      });
+    }
+    updateSession(db, sessionId, {
+      status: "closed",
+      current_phase: "complete"
+    });
+    if (!abort) {
+      insertEvent(db, {
+        session_id: sessionId,
+        event_type: "session_closed",
+        phase: "complete",
+        phase_number: existing.phase_number,
+        round: existing.current_round
+      });
+    }
+    cascadeTerminateExecutions(db, sessionId, CASCADE_CLOSE_EXIT_CODE, note);
+  });
+}
+async function reconcileWorkflowOnExit(ocrDir, sessionId, db) {
+  db ??= await ensureDatabase(ocrDir);
+  const existing = getSession(db, sessionId);
+  if (!existing) return "not-found";
+  if (existing.status === "closed") return "already-closed";
+  if (!hasCompletionInvariant(db, existing)) return "incomplete";
+  if (hasInFlightDependents(db, sessionId)) return "in-flight";
+  await stateClose({ sessionId, ocrDir, abort: false });
+  return "closed";
+}
+async function reconcileCompletedSessions(ocrDir) {
+  const db = await ensureDatabase(ocrDir);
+  const closed = [];
+  for (const s of getAllSessions(db)) {
+    if (s.status !== "active") continue;
+    const outcome = await reconcileWorkflowOnExit(ocrDir, s.id, db);
+    if (outcome === "closed") closed.push(s.id);
+  }
+  return closed;
+}
+
+// src/server/services/command-outcome.ts
+function deriveCommandOutcome(exitCode, completeness) {
+  if (exitCode === null) return null;
+  if (exitCode === CANCELLED_EXIT_CODE || exitCode === CASCADE_CLOSE_EXIT_CODE) {
+    return "cancelled";
+  }
+  if (exitCode === WATCHDOG_DEADLINE_EXIT_CODE) return "failed";
+  if (exitCode !== 0) return "failed";
+  if (completeness === null || completeness === "complete") return "success";
+  return "incomplete";
+}
+function deriveCancellationReason(exitCode) {
+  if (exitCode === CANCELLED_EXIT_CODE) return "user";
+  if (exitCode === CASCADE_CLOSE_EXIT_CODE) return "cascade";
+  return null;
+}
+function getWorkflowCompletenessForExecution(db, executionId) {
+  const result = db.exec(
+    `SELECT sc.completeness_state
+       FROM command_executions ce
+       LEFT JOIN session_completeness sc ON sc.session_id = ce.workflow_id
+      WHERE ce.id = ?`,
+    [executionId]
+  );
+  const row = result[0]?.values[0];
+  if (!row) return null;
+  const state = row[0];
+  if (state === "complete" || state === "closed_without_artifact" || state === "in_flight" || state === "open_no_artifact") {
+    return state;
+  }
+  return null;
+}
+
+// src/server/socket/finalizer.ts
+function tryClaimFinalization(entry) {
+  if (!entry) return true;
+  if (entry.finalized) return false;
+  entry.finalized = true;
+  if (entry.watchdog) {
+    clearInterval(entry.watchdog);
+    entry.watchdog = void 0;
+  }
+  if (entry.tailer) {
+    entry.tailer.stop();
+    entry.tailer = void 0;
+  }
+  return true;
 }
+function finishExecution(io2, db, ocrDir, executionId, rawCode, output) {
+  const finishedAt = (/* @__PURE__ */ new Date()).toISOString();
+  const entry = activeCommands.get(executionId);
+  const code = entry?.cancelled ? CANCELLED_EXIT_CODE : rawCode;
+  if (!tryClaimFinalization(entry)) return;
+  const res = db.prepare(
+    `UPDATE command_executions
+       SET exit_code = ?, finished_at = ?, output = ?, pid = NULL
+       WHERE id = ? AND finished_at IS NULL`
+  ).run(code, finishedAt, output, executionId);
+  if (Number(res.changes) === 0 && !entry) return;
+  const completeness = getWorkflowCompletenessForExecution(db, executionId);
+  const outcome = deriveCommandOutcome(code, completeness);
+  const cancellationReason = deriveCancellationReason(code);
+  if (entry?.uid) {
+    appendCommandLog(ocrDir, {
+      v: 1,
+      uid: entry.uid,
+      db_id: executionId,
+      command: entry.commandStr,
+      args: entry.argsJson ?? null,
+      exit_code: code,
+      started_at: entry.startedAt,
+      finished_at: finishedAt,
+      is_detached: entry.detached ? 1 : 0,
+      event: code === CANCELLED_EXIT_CODE ? "cancel" : "finish",
+      writer: "dashboard"
+    });
+  }
+  io2.emit("command:finished", {
+    execution_id: executionId,
+    exitCode: code,
+    finished_at: finishedAt,
+    outcome,
+    cancellation_reason: cancellationReason
+  });
+  activeCommands.delete(executionId);
+  const workflowRow = db.exec(
+    "SELECT workflow_id FROM command_executions WHERE id = ?",
+    [executionId]
+  );
+  const workflowId = workflowRow[0]?.values[0]?.[0];
+  if (typeof workflowId === "string" && workflowId.length > 0) {
+    void reconcileWorkflowOnExit(ocrDir, workflowId, db).then((outcome2) => {
+      if (outcome2 === "closed") {
+        console.log(`[command-runner] auto-finalized workflow ${workflowId}`);
+      } else if (outcome2 === "incomplete" || outcome2 === "in-flight") {
+        console.debug(
+          `[command-runner] workflow ${workflowId} not finalized: ${outcome2}`
+        );
+      }
+    }).catch((err) => {
+      console.error(
+        `[command-runner] reconcileWorkflowOnExit(${workflowId}) failed:`,
+        err instanceof Error ? err.message : err
+      );
+    });
+  }
+}
+
+// src/server/socket/command-runner.ts
+var ALLOWED_COMMANDS = /* @__PURE__ */ new Set([
+  "progress",
+  "state"
+]);
+var AI_COMMANDS = /* @__PURE__ */ new Set(["map", "review", "translate-review-to-single-human", "address", "create-reviewer", "sync-reviewers"]);
 function registerCommandHandlers(io2, socket, db, ocrDir, aiCliService, sessionCapture) {
   socket.on("command:run", (payload) => {
     try {
@@ -34771,15 +35074,14 @@ function spawnAiCommand(io2, _socket, db, ocrDir, executionId, baseCommand, subA
     finishExecution(io2, db, ocrDir, executionId, 1, content);
     return;
   }
+  let capabilityWarning = null;
   if (adapter.supportsPerTaskModel === false) {
     const perInstanceModels = extractPerInstanceModels(subArgs);
     if (perInstanceModels.length > 0) {
-      const warning = `[ocr] Warning: ${adapter.name} does not support per-subagent model overrides. The configured per-instance models (${perInstanceModels.join(", ")}) will be ignored \u2014 all reviewers will run on the parent process model.
-`;
-      io2.emit("command:output", { execution_id: executionId, content: warning });
+      capabilityWarning = `[ocr] Warning: ${adapter.name} does not support per-subagent model overrides. The configured per-instance models (${perInstanceModels.join(", ")}) will be ignored \u2014 all reviewers will run on the parent process model.`;
     }
   }
-  const commandMdPath = join12(ocrDir, "commands", `${baseCommand}.md`);
+  const commandMdPath = join13(ocrDir, "commands", `${baseCommand}.md`);
   let commandContent;
   try {
     commandContent = readFileSync5(commandMdPath, "utf-8");
@@ -34830,9 +35132,9 @@ function spawnAiCommand(io2, _socket, db, ocrDir, executionId, baseCommand, subA
   let logFile;
   if (entry.uid) {
     try {
-      const logDir = join12(ocrDir, "data", "exec-logs");
-      mkdirSync5(logDir, { recursive: true });
-      logFile = join12(logDir, `${entry.uid}.log`);
+      const logDir = join13(ocrDir, "data", "exec-logs");
+      mkdirSync6(logDir, { recursive: true });
+      logFile = join13(logDir, `${entry.uid}.log`);
     } catch (err) {
       console.error(
         "[command-runner] could not prepare exec-log dir \u2014 falling back to pipe stdio (degraded: close may be withheld by a leaked grandchild; watchdog deadlines still finalize):",
@@ -34888,20 +35190,7 @@ function spawnAiCommand(io2, _socket, db, ocrDir, executionId, baseCommand, subA
     }
   }, POLL_INTERVAL_MS);
   entry.linkPoll = linkPoll;
-  const bumpHeartbeat = () => {
-    if (entry.finalized) return;
-    const now = Date.now();
-    if (now - (entry.lastBeatWrite ?? 0) < HEARTBEAT_THROTTLE_MS) return;
-    entry.lastBeatWrite = now;
-    try {
-      db.run(
-        `UPDATE command_executions SET last_heartbeat_at = datetime('now') WHERE id = ? AND finished_at IS NULL`,
-        [executionId]
-      );
-    } catch (err) {
-      console.error("[command-runner] heartbeat bump failed:", err);
-    }
-  };
+  const bumpHeartbeat = makeHeartbeatBumper(db, executionId, entry);
   const hardDeadlineMs = getWorkflowHardDeadlineMs(ocrDir);
   entry.watchdog = setInterval(() => {
     if (entry.finalized) return;
@@ -34933,6 +35222,12 @@ function spawnAiCommand(io2, _socket, db, ocrDir, executionId, baseCommand, subA
 `;
           entry.outputBuffer += notice;
           io2.emit("command:output", { execution_id: executionId, content: notice });
+          emitStreamEvent({
+            type: "notice",
+            level: "warning",
+            code: "hard_deadline_reaped",
+            message: notice.trim()
+          });
         } else {
           console.warn(`[watchdog] execution ${executionId}: result seen but no close after grace \u2014 finalizing${decision.reap ? " + reaping tree" : ""}`);
         }
@@ -34940,6 +35235,10 @@ function spawnAiCommand(io2, _socket, db, ocrDir, executionId, baseCommand, subA
         finishExecution(io2, db, ocrDir, executionId, decision.exitCode, entry.outputBuffer);
         return;
       }
+      default: {
+        const _exhaustive = decision;
+        throw new Error(`unhandled watchdog action: ${JSON.stringify(_exhaustive)}`);
+      }
     }
   }, WATCHDOG_TICK_MS);
   entry.watchdog.unref();
@@ -34967,6 +35266,16 @@ function spawnAiCommand(io2, _socket, db, ocrDir, executionId, baseCommand, subA
     journal.append(stream);
     io2.emit("command:event", stream);
   }
+  if (capabilityWarning) {
+    emitContent(`${capabilityWarning}
+`);
+    emitStreamEvent({
+      type: "notice",
+      level: "warning",
+      code: "per_instance_model_unsupported",
+      message: capabilityWarning
+    });
+  }
   function handleEvent(evt) {
     switch (evt.type) {
       case "text_delta":
@@ -35050,7 +35359,7 @@ function spawnAiCommand(io2, _socket, db, ocrDir, executionId, baseCommand, subA
       clearInterval(entry.linkPoll);
       entry.linkPoll = void 0;
     }
-    clearSpawnMarker(ocrDir);
+    clearSpawnMarker(ocrDir, entry.uid);
     if (entry.tailer) {
       entry.tailer.stop();
       entry.tailer = void 0;
@@ -35092,76 +35401,6 @@ ${stderrBuffer}`;
     finishExecution(io2, db, ocrDir, executionId, -1, entry.outputBuffer);
   });
 }
-function finishExecution(io2, db, ocrDir, executionId, rawCode, output) {
-  const finishedAt = (/* @__PURE__ */ new Date()).toISOString();
-  const entry = activeCommands.get(executionId);
-  const code = entry?.cancelled ? CANCELLED_EXIT_CODE : rawCode;
-  if (entry?.finalized) return;
-  if (entry) {
-    entry.finalized = true;
-    if (entry.watchdog) {
-      clearInterval(entry.watchdog);
-      entry.watchdog = void 0;
-    }
-    if (entry.tailer) {
-      entry.tailer.stop();
-      entry.tailer = void 0;
-    }
-  }
-  const res = db.prepare(
-    `UPDATE command_executions
-       SET exit_code = ?, finished_at = ?, output = ?, pid = NULL
-       WHERE id = ? AND finished_at IS NULL`
-  ).run(code, finishedAt, output, executionId);
-  if (Number(res.changes) === 0 && !entry) return;
-  const completeness = getWorkflowCompletenessForExecution(db, executionId);
-  const outcome = deriveCommandOutcome(code, completeness);
-  const cancellationReason = deriveCancellationReason(code);
-  if (entry?.uid) {
-    appendCommandLog(ocrDir, {
-      v: 1,
-      uid: entry.uid,
-      db_id: executionId,
-      command: entry.commandStr,
-      args: entry.argsJson ?? null,
-      exit_code: code,
-      started_at: entry.startedAt,
-      finished_at: finishedAt,
-      is_detached: entry.detached ? 1 : 0,
-      event: code === CANCELLED_EXIT_CODE ? "cancel" : "finish",
-      writer: "dashboard"
-    });
-  }
-  io2.emit("command:finished", {
-    execution_id: executionId,
-    exitCode: code,
-    finished_at: finishedAt,
-    outcome,
-    cancellation_reason: cancellationReason
-  });
-  activeCommands.delete(executionId);
-  const workflowRow = db.exec(
-    "SELECT workflow_id FROM command_executions WHERE id = ?",
-    [executionId]
-  );
-  const workflowId = workflowRow[0]?.values[0]?.[0];
-  if (typeof workflowId === "string" && workflowId.length > 0) {
-    void reconcileWorkflowOnExit(ocrDir, workflowId, db).then((outcome2) => {
-      if (outcome2 === "closed") {
-        console.log(`[command-runner] auto-finalized workflow ${workflowId}`);
-      } else if (outcome2 === "incomplete" || outcome2 === "in-flight") {
-        console.debug(
-          `[command-runner] workflow ${workflowId} not finalized: ${outcome2}`
-        );
-      }
-    }).catch((err) => {
-      console.error(
-        `[command-runner] reconcileWorkflowOnExit(${workflowId}) failed:`,
-        err instanceof Error ? err.message : err
-      );
-    });
-  }
-}
 
 // src/server/routes/commands.ts
 var AVAILABLE_COMMANDS = [
@@ -35249,7 +35488,7 @@ function createCommandsRouter(db, ocrDir) {
 // src/server/routes/config.ts
 var import_express9 = __toESM(require_express2(), 1);
 import { readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "node:fs";
-import { join as join13, dirname as dirname8, basename as basename2 } from "node:path";
+import { join as join14, dirname as dirname8, basename as basename2 } from "node:path";
 var VALID_IDES = ["vscode", "cursor", "windsurf", "jetbrains", "sublime"];
 function detectIde() {
   const termProgram = process.env.TERM_PROGRAM?.toLowerCase() ?? "";
@@ -35266,7 +35505,7 @@ function detectIde() {
 }
 function readIdeFromConfig(ocrDir) {
   try {
-    const configPath = join13(ocrDir, "config.yaml");
+    const configPath = join14(ocrDir, "config.yaml");
     const content = readFileSync6(configPath, "utf-8");
     const match = content.match(/^\s*ide:\s*(\S+)/m);
     return match?.[1] ?? "auto";
@@ -35313,7 +35552,7 @@ function createConfigRouter(ocrDir, aiCliService) {
       return;
     }
     try {
-      const configPath = join13(ocrDir, "config.yaml");
+      const configPath = join14(ocrDir, "config.yaml");
       let content = readFileSync6(configPath, "utf-8");
       if (content.match(/^\s*ide:\s*\S+/m)) {
         content = content.replace(/^(\s*ide:\s*)\S+/m, `$1${ide}`);
@@ -35403,9 +35642,9 @@ function createChatRouter(db) {
 // src/server/routes/reviewers.ts
 var import_express11 = __toESM(require_express2(), 1);
 import { readFileSync as readFileSync7, existsSync as existsSync11, watch } from "node:fs";
-import { join as join14 } from "node:path";
+import { join as join15 } from "node:path";
 function readReviewersMeta(ocrDir) {
-  const metaPath = join14(ocrDir, "reviewers-meta.json");
+  const metaPath = join15(ocrDir, "reviewers-meta.json");
   if (!existsSync11(metaPath)) {
     return { reviewers: [], defaults: [] };
   }
@@ -35434,7 +35673,7 @@ function createReviewersRouter(ocrDir) {
       res.status(400).json({ error: "Invalid reviewer ID" });
       return;
     }
-    const filePath = join14(ocrDir, "skills", "references", "reviewers", `${id}.md`);
+    const filePath = join15(ocrDir, "skills", "references", "reviewers", `${id}.md`);
     if (!existsSync11(filePath)) {
       res.status(404).json({ error: "Reviewer not found", id });
       return;
@@ -35449,7 +35688,7 @@ function createReviewersRouter(ocrDir) {
   return router;
 }
 function watchReviewersMeta(ocrDir, io2) {
-  const metaPath = join14(ocrDir, "reviewers-meta.json");
+  const metaPath = join15(ocrDir, "reviewers-meta.json");
   let watcher = null;
   let debounce;
   try {
@@ -35525,14 +35764,13 @@ function createHandoffRouter(sessionCapture, ocrDir, syncFromDisk = () => {
 
 // src/server/routes/team.ts
 var import_express14 = __toESM(require_express2(), 1);
-import { spawnSync } from "node:child_process";
 
-// ../cli/src/lib/team-config.ts
+// ../shared/config/src/team-config.ts
 var import_yaml = __toESM(require_dist(), 1);
 import { existsSync as existsSync12, readFileSync as readFileSync8 } from "node:fs";
-import { join as join15 } from "node:path";
+import { join as join16 } from "node:path";
 function loadTeamConfig(ocrDir) {
-  const configPath = join15(ocrDir, "config.yaml");
+  const configPath = join16(ocrDir, "config.yaml");
   if (!existsSync12(configPath)) {
     return { team: [], aliases: {}, defaultModel: null };
   }
@@ -35572,6 +35810,9 @@ function parseTeamConfigYaml(content) {
         aliases,
         defaultModel
       );
+      if (resolvedModel !== null) {
+        assertSafeModelId(resolvedModel, `default_team.${persona}[${i}]`);
+      }
       team.push({
         persona,
         instance_index: i + 1,
@@ -35652,6 +35893,16 @@ function readOptionalString(obj, key, pathLabel) {
   }
   return value;
 }
+var SAFE_MODEL_ID = /^[A-Za-z0-9][A-Za-z0-9._/:@[\]+-]{0,255}$/;
+function assertSafeModelId(value, pathLabel) {
+  if (SAFE_MODEL_ID.test(value)) return;
+  const allowed = /[A-Za-z0-9._/:@[\]+-]/;
+  const offending = [...value].find((ch) => !allowed.test(ch));
+  const detail = value.length === 0 ? "empty string" : value.length > 256 ? "longer than 256 characters" : offending !== void 0 ? `contains ${JSON.stringify(offending)}` : `starts with ${JSON.stringify(value[0])}`;
+  throw new Error(
+    `${pathLabel}: model id ${detail} \u2014 no vendor model id uses that. Allowed: letters and digits plus . _ / : @ [ ] + - (max 256 chars).`
+  );
+}
 function readAliases(root) {
   const models = root["models"];
   if (!models || typeof models !== "object" || Array.isArray(models)) return {};
@@ -35693,29 +35944,71 @@ function resolveTeamComposition(team, override) {
     result.push(inst);
   }
   for (const inst of override) {
+    if (inst.model !== null) {
+      assertSafeModelId(inst.model, `override ${inst.persona}#${inst.instance_index}`);
+    }
     result.push(inst);
   }
   return result;
 }
 
-// ../cli/src/lib/models.ts
-var BUNDLED_CLAUDE_MODELS2 = [
-  { id: "claude-opus-4-7", displayName: "Claude Opus 4.7" },
-  { id: "claude-sonnet-4-6", displayName: "Claude Sonnet 4.6" },
-  { id: "claude-haiku-4-5-20251001", displayName: "Claude Haiku 4.5" }
-];
-var BUNDLED_OPENCODE_MODELS2 = [
-  { id: "anthropic/claude-opus-4-7", provider: "anthropic" },
-  { id: "anthropic/claude-sonnet-4-6", provider: "anthropic" },
-  { id: "anthropic/claude-haiku-4-5-20251001", provider: "anthropic" }
-];
-function detectActiveVendor() {
-  for (const vendor of ["claude", "opencode"]) {
+// ../shared/config/src/models.ts
+function parseOpenCodeModelList(stdout) {
+  const models = [];
+  for (const rawLine of stdout.split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (!/^[^\s:]+\/\S+$/.test(line)) continue;
+    const provider = line.slice(0, line.indexOf("/"));
+    models.push({ id: line, provider });
+  }
+  return models.length > 0 ? models : null;
+}
+var VENDOR_MODEL_STRATEGIES = {
+  claude: {
+    displayName: "Claude Code",
+    native: {
+      // Verified against Claude Code 2.1.x: the CLI has no model-listing
+      // subcommand (`claude models --json` → "unknown option"). Revisit if
+      // a future release adds one.
+      unavailableReason: "Claude Code does not provide a model-listing command; showing its documented model aliases instead"
+    },
+    // Vendor-documented aliases that always track the latest generation —
+    // dated ids here would go stale by construction (the exact bug class of
+    // issue #39). Pinned dated ids remain available via free-text entry.
+    bundled: [
+      { id: "opus", displayName: "Claude Opus (latest)" },
+      { id: "sonnet", displayName: "Claude Sonnet (latest)" },
+      { id: "haiku", displayName: "Claude Haiku (latest)" }
+    ]
+  },
+  opencode: {
+    displayName: "OpenCode",
+    native: {
+      // Plain `opencode models` — newline-delimited ids. (`--json` is not a
+      // real flag, and `--verbose` interleaves JSON metadata blocks that
+      // defeat line parsing.)
+      args: ["models"],
+      parse: parseOpenCodeModelList
+    },
+    bundled: [
+      { id: "anthropic/claude-opus-4-8", provider: "anthropic" },
+      { id: "anthropic/claude-sonnet-4-6", provider: "anthropic" },
+      { id: "anthropic/claude-haiku-4-5", provider: "anthropic" }
+    ]
+  }
+};
+var SUPPORTED_VENDORS = Object.keys(
+  VENDOR_MODEL_STRATEGIES
+);
+function isModelVendor(value) {
+  return Object.hasOwn(VENDOR_MODEL_STRATEGIES, value);
+}
+async function detectActiveVendor() {
+  for (const vendor of SUPPORTED_VENDORS) {
     try {
-      execBinary(vendor, ["--version"], {
+      await execBinaryAsync(vendor, ["--version"], {
         encoding: "utf-8",
-        timeout: 3e3,
-        stdio: ["ignore", "pipe", "ignore"]
+        timeout: 3e3
       });
       return vendor;
     } catch {
@@ -35723,48 +36016,77 @@ function detectActiveVendor() {
   }
   return null;
 }
-function tryNativeEnumeration(vendor) {
+function describeProbeFailure(vendor, args, err) {
+  const command = `${vendor} ${args.join(" ")}`;
+  const e = err;
+  if (e.code === "ENOENT") {
+    return `\`${vendor}\` is not installed or not on PATH`;
+  }
+  if (e.killed) {
+    return `\`${command}\` timed out or exceeded output limits`;
+  }
+  const stderr = typeof e.stderr === "string" ? e.stderr.trim() : "";
+  const firstLine = (stderr.split(/\r?\n/)[0] ?? "").replace(/\u001b\[[0-9;]*[A-Za-z]/g, "").replace(/[\u0000-\u001f\u007f]/g, "").slice(0, 200);
+  const detail = firstLine ? `: ${firstLine}` : "";
+  const exit = typeof e.code === "number" ? ` with exit code ${e.code}` : "";
+  return `\`${command}\` failed${exit}${detail}`;
+}
+async function tryNativeEnumeration(vendor, probe) {
+  let stdout;
   try {
-    const output = execBinary(vendor, ["models", "--json"], {
+    const result = await execBinaryAsync(vendor, probe.args, {
       encoding: "utf-8",
-      timeout: 5e3,
-      stdio: ["ignore", "pipe", "ignore"]
+      timeout: 5e3
     });
-    const parsed = JSON.parse(output);
-    if (!Array.isArray(parsed)) return null;
-    const models = [];
-    for (const item of parsed) {
-      if (typeof item === "string") {
-        models.push({ id: item });
-      } else if (typeof item === "object" && item !== null && "id" in item && typeof item.id === "string") {
-        const obj = item;
-        const desc = { id: obj.id };
-        if (typeof obj.displayName === "string") desc.displayName = obj.displayName;
-        if (typeof obj.provider === "string") desc.provider = obj.provider;
-        if (Array.isArray(obj.tags)) {
-          desc.tags = obj.tags.filter((t) => typeof t === "string");
-        }
-        models.push(desc);
-      }
-    }
-    return models.length > 0 ? models : null;
-  } catch {
-    return null;
+    stdout = result.stdout;
+  } catch (err) {
+    return { models: null, reason: describeProbeFailure(vendor, probe.args, err) };
   }
+  const models = probe.parse(stdout);
+  if (!models) {
+    return {
+      models: null,
+      reason: `\`${vendor} ${probe.args.join(" ")}\` output did not contain any model identifiers`
+    };
+  }
+  return { models };
 }
-function bundledForVendor(vendor) {
-  if (vendor === "claude") return BUNDLED_CLAUDE_MODELS2;
-  return BUNDLED_OPENCODE_MODELS2;
-}
-function listModelsForVendor(vendor) {
-  const native = tryNativeEnumeration(vendor);
-  if (native) {
-    return { vendor, source: "native", models: native };
+var SUCCESS_TTL_MS = 6e4;
+var FAILURE_TTL_MS = 1e4;
+var cache = /* @__PURE__ */ new Map();
+async function listModelsForVendor(vendor) {
+  const cached = cache.get(vendor);
+  if (cached && cached.expiresAt > Date.now()) {
+    return cached.result;
+  }
+  const strategy = VENDOR_MODEL_STRATEGIES[vendor];
+  if (!strategy) {
+    throw new Error(`Unknown vendor: ${vendor}`);
+  }
+  let result;
+  if ("unavailableReason" in strategy.native) {
+    result = {
+      vendor,
+      source: "bundled",
+      models: strategy.bundled,
+      nativeUnavailableReason: strategy.native.unavailableReason
+    };
+  } else {
+    const native = await tryNativeEnumeration(vendor, strategy.native);
+    result = native.models ? { vendor, source: "native", models: native.models } : {
+      vendor,
+      source: "bundled",
+      models: strategy.bundled,
+      nativeUnavailableReason: native.reason
+    };
   }
-  return { vendor, source: "bundled", models: bundledForVendor(vendor) };
+  const ttl = result.source === "native" ? SUCCESS_TTL_MS : FAILURE_TTL_MS;
+  cache.set(vendor, { result, expiresAt: Date.now() + ttl });
+  return result;
 }
 
 // src/server/routes/team.ts
+import { dirname as dirname10 } from "node:path";
 function isReviewerInstanceArray(input) {
   if (!Array.isArray(input)) return false;
   for (const entry of input) {
@@ -35817,60 +36139,64 @@ function createTeamRouter(ocrDir) {
       return;
     }
     try {
-      const result = spawnSync("ocr", ["team", "set", "--stdin"], {
+      execBinary("ocr", ["team", "set", "--stdin"], {
         input: JSON.stringify(body.team),
         encoding: "utf-8",
-        cwd: ocrDir.replace(/\/\.ocr$/, ""),
+        // Run from the project root (parent of `.ocr`). `dirname` is
+        // separator-correct on every platform — a prior `/\/\.ocr$/` regex
+        // silently no-op'd on Windows (join builds the path with `\`), running
+        // `ocr team set` inside the `.ocr` dir itself (blocker B2). Matches the
+        // `dirname(ocrDir)` derivation used across the socket handlers.
+        cwd: dirname10(ocrDir),
         timeout: 1e4
       });
-      if (result.error) {
-        res.status(500).json({
-          error: "Failed to invoke ocr team set",
-          detail: result.error.message
-        });
-        return;
-      }
-      if (result.status !== 0) {
-        res.status(500).json({
-          error: "ocr team set exited non-zero",
-          stderr: result.stderr
-        });
-        return;
-      }
       res.json({ ok: true, team: body.team });
     } catch (err) {
       console.error("Failed to persist team:", err);
+      const e = err;
       res.status(500).json({
         error: "Failed to persist team",
-        detail: err instanceof Error ? err.message : String(err)
+        detail: err instanceof Error ? err.message : String(err),
+        ...typeof e.stderr === "string" && e.stderr ? { stderr: e.stderr } : {}
       });
     }
   });
   router.get("/models", (req, res) => {
-    let vendor;
-    const requested = req.query["vendor"]?.toLowerCase();
-    if (requested === "claude" || requested === "opencode") {
-      vendor = requested;
-    } else if (!requested || requested === "auto") {
-      vendor = detectActiveVendor();
-    } else {
-      res.status(400).json({ error: `Unknown vendor: ${requested}` });
-      return;
-    }
-    if (!vendor) {
-      res.json({ vendor: null, source: null, models: [] });
-      return;
-    }
-    try {
-      const result = listModelsForVendor(vendor);
-      res.json(result);
-    } catch (err) {
-      console.error("Failed to list models:", err);
-      res.status(500).json({
-        error: "Failed to list models",
-        detail: err instanceof Error ? err.message : String(err)
-      });
-    }
+    void (async () => {
+      try {
+        const raw = req.query["vendor"];
+        if (raw !== void 0 && typeof raw !== "string") {
+          res.status(400).json({ error: "vendor must be a single string" });
+          return;
+        }
+        const requested = raw?.toLowerCase();
+        let vendor;
+        if (requested && isModelVendor(requested)) {
+          vendor = requested;
+        } else if (!requested || requested === "auto") {
+          vendor = await detectActiveVendor();
+        } else {
+          res.status(400).json({
+            error: `Unknown vendor: ${requested}. Supported: ${SUPPORTED_VENDORS.join(", ")}`
+          });
+          return;
+        }
+        if (!vendor) {
+          res.json({ vendor: null, source: null, models: [] });
+          return;
+        }
+        const result = await listModelsForVendor(vendor);
+        res.json(result);
+      } catch (err) {
+        console.error("Failed to list models:", err);
+        if (!res.headersSent) {
+          res.status(500).json({
+            error: "Failed to list models",
+            detail: err instanceof Error ? err.message : String(err)
+          });
+        }
+      }
+    })();
   });
   return router;
 }
@@ -35948,6 +36274,7 @@ function recoverFromEventsJsonl(ocrDir, db, workflowId) {
 function createSessionCaptureService(deps) {
   const { db, ocrDir, aiCliService } = deps;
   const driftLoggedFor = /* @__PURE__ */ new Set();
+  const rejectLoggedFor = /* @__PURE__ */ new Set();
   function readBoundSessionId(executionId) {
     const result = db.exec(
       "SELECT vendor_session_id FROM command_executions WHERE id = ?",
@@ -35958,6 +36285,15 @@ function createSessionCaptureService(deps) {
   }
   function recordSessionId(executionId, vendorSessionId) {
     try {
+      if (!isSafeVendorSessionId(vendorSessionId)) {
+        if (!rejectLoggedFor.has(executionId)) {
+          rejectLoggedFor.add(executionId);
+          console.warn(
+            `[session-capture] rejecting implausible vendor session id on execution ${executionId}: ${JSON.stringify(vendorSessionId)} (allowed: letters/digits plus . _ : - , max 256 chars). Not recorded \u2014 resume for this execution is unavailable.`
+          );
+        }
+        return;
+      }
       const existing = readBoundSessionId(executionId);
       if (existing === vendorSessionId) return;
       if (existing) {
@@ -36137,7 +36473,7 @@ function buildDiagnostics(input) {
 
 // src/server/services/filesystem-sync.ts
 import { readdirSync as readdirSync2, readFileSync as readFileSync9, statSync as statSync3, existsSync as existsSync13 } from "node:fs";
-import { join as join16, basename as basename3, dirname as dirname10, relative } from "node:path";
+import { join as join17, basename as basename3, dirname as dirname11, relative } from "node:path";
 import { watch as watch2 } from "chokidar";
 
 // src/server/services/parsers/reviewer-parser.ts
@@ -36232,21 +36568,12 @@ var VERDICT_RE = /^\*?\*?\s*(?:##\s*)?Verdict\s*\*?\*?\s*:?\s*\*?\*?\s*(.*)/im;
 var BLOCKERS_RE = /^\*\*Blockers?\*\*\s*:?\s*(\d+)/im;
 var SHOULD_FIX_RE = /^\*\*Should\s*Fix\*\*\s*:?\s*(\d+)/im;
 var SUGGESTIONS_RE = /^\*\*Suggestions?\*\*\s*:?\s*(\d+)/im;
-var KNOWN_VERDICTS = [
-  "REQUEST CHANGES",
-  "CHANGES REQUESTED",
-  "NEEDS DISCUSSION",
-  "NEEDS WORK",
-  "APPROVED",
-  "APPROVE",
-  "LGTM",
-  "BLOCK",
-  "REJECT"
-];
-function normalizeVerdict(raw) {
+function extractVerdictLabel(raw) {
   const cleaned = raw.trim().replace(/^\*+|\*+$/g, "").trim();
+  const canonical = normalizeVerdict(cleaned);
+  if (canonical) return canonical;
   const upper = cleaned.toUpperCase();
-  for (const verdict of KNOWN_VERDICTS) {
+  for (const verdict of CANONICAL_VERDICTS) {
     if (upper.startsWith(verdict)) return verdict;
   }
   const truncated = cleaned.split(/\s+[—:.]\s+|\n/, 1)[0] ?? cleaned;
@@ -36258,7 +36585,7 @@ function parseFinalMd(content) {
   if (verdictMatch) {
     const captured = (verdictMatch[1] ?? "").trim();
     if (captured.length > 0) {
-      verdict = normalizeVerdict(captured);
+      verdict = extractVerdictLabel(captured);
     }
   }
   const blockerMatch = content.match(BLOCKERS_RE);
@@ -36345,13 +36672,13 @@ var FilesystemSync = class {
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
       const sessionId = entry.name;
-      const sessionDir = join16(this.sessionsDir, sessionId);
+      const sessionDir = join17(this.sessionsDir, sessionId);
       this.syncSession(sessionId, sessionDir);
     }
   }
   syncSession(sessionId, sessionDir) {
     this.ensureSessionRow(sessionId, sessionDir);
-    const roundsDir = join16(sessionDir, "rounds");
+    const roundsDir = join17(sessionDir, "rounds");
     if (existsSync13(roundsDir)) {
       const rounds = readdirSync2(roundsDir, { withFileTypes: true });
       for (const roundEntry of rounds) {
@@ -36359,34 +36686,34 @@ var FilesystemSync = class {
         const roundMatch = roundEntry.name.match(/^round-(\d+)$/);
         if (!roundMatch) continue;
         const roundNumber = parseInt(roundMatch[1] ?? "0", 10);
-        const roundDir = join16(roundsDir, roundEntry.name);
-        const reviewsDir = join16(roundDir, "reviews");
+        const roundDir = join17(roundsDir, roundEntry.name);
+        const reviewsDir = join17(roundDir, "reviews");
         if (existsSync13(reviewsDir)) {
           const reviewFiles = readdirSync2(reviewsDir).filter((f) => f.endsWith(".md"));
           for (const reviewFile of reviewFiles) {
-            const filePath = join16(reviewsDir, reviewFile);
+            const filePath = join17(reviewsDir, reviewFile);
             this.processReviewerOutput(sessionId, roundNumber, filePath, reviewFile);
           }
         }
-        const roundMetaPath = join16(roundDir, "round-meta.json");
+        const roundMetaPath = join17(roundDir, "round-meta.json");
         if (existsSync13(roundMetaPath)) {
           this.processRoundMeta(sessionId, roundNumber, roundMetaPath);
         }
-        const finalPath = join16(roundDir, "final.md");
+        const finalPath = join17(roundDir, "final.md");
         if (existsSync13(finalPath)) {
           this.processFinalMd(sessionId, roundNumber, finalPath);
         }
-        const finalHumanPath = join16(roundDir, "final-human.md");
+        const finalHumanPath = join17(roundDir, "final-human.md");
         if (existsSync13(finalHumanPath)) {
           this.processGenericArtifact(sessionId, "final-human", finalHumanPath, roundNumber);
         }
-        const discoursePath = join16(roundDir, "discourse.md");
+        const discoursePath = join17(roundDir, "discourse.md");
         if (existsSync13(discoursePath)) {
           this.processGenericArtifact(sessionId, "discourse", discoursePath, roundNumber);
         }
       }
     }
-    const mapDir = join16(sessionDir, "map", "runs");
+    const mapDir = join17(sessionDir, "map", "runs");
     if (existsSync13(mapDir)) {
       const runs = readdirSync2(mapDir, { withFileTypes: true });
       for (const runEntry of runs) {
@@ -36394,12 +36721,12 @@ var FilesystemSync = class {
         const runMatch = runEntry.name.match(/^run-(\d+)$/);
         if (!runMatch) continue;
         const runNumber = parseInt(runMatch[1] ?? "0", 10);
-        const runDir = join16(mapDir, runEntry.name);
-        const mapMetaPath = join16(runDir, "map-meta.json");
+        const runDir = join17(mapDir, runEntry.name);
+        const mapMetaPath = join17(runDir, "map-meta.json");
         if (existsSync13(mapMetaPath)) {
           this.processMapMeta(sessionId, runNumber, mapMetaPath);
         }
-        const mapPath = join16(runDir, "map.md");
+        const mapPath = join17(runDir, "map.md");
         if (existsSync13(mapPath)) {
           this.processMapMd(sessionId, runNumber, mapPath);
         }
@@ -36409,7 +36736,7 @@ var FilesystemSync = class {
           ["requirements-mapping.md", "requirements-mapping"]
         ];
         for (const [fileName, artifactType] of mapArtifacts) {
-          const filePath = join16(runDir, fileName);
+          const filePath = join17(runDir, fileName);
           if (existsSync13(filePath)) {
             this.processGenericArtifact(sessionId, artifactType, filePath, void 0, runNumber);
           }
@@ -36421,68 +36748,113 @@ var FilesystemSync = class {
       ["discovered-standards.md", "discovered-standards"]
     ];
     for (const [fileName, artifactType] of sessionArtifacts) {
-      const filePath = join16(sessionDir, fileName);
+      const filePath = join17(sessionDir, fileName);
       if (existsSync13(filePath)) {
         this.processGenericArtifact(sessionId, artifactType, filePath);
       }
     }
   }
+  // ── Terminal-completion evidence (defect D1) ──
+  //
+  // The dashboard read/sync path NEVER originates terminal workflow completion.
+  // A `final.md` / `map.md` artifact on disk is evidence of the **synthesis**
+  // phase only; terminal completion is the CLI's to declare and is recognized
+  // solely from the CLI-produced evidence — a `round_completed` / `map_completed`
+  // orchestration event. Closing on artifact presence alone is the fabrication
+  // these helpers exist to prevent.
+  /** Whether the CLI has recorded a `round_completed` event for this round. */
+  hasRoundCompletedEvent(sessionId, round) {
+    return queryFirst(
+      this.db,
+      `SELECT 1 FROM orchestration_events
+           WHERE session_id = ? AND event_type = 'round_completed' AND round = ? LIMIT 1`,
+      [sessionId, round]
+    ) != null;
+  }
+  /** Whether the CLI has recorded a `map_completed` event for this map run. */
+  hasMapCompletedEvent(sessionId, mapRun) {
+    return queryFirst(
+      this.db,
+      `SELECT 1 FROM orchestration_events
+           WHERE session_id = ? AND event_type = 'map_completed' AND round = ? LIMIT 1`,
+      [sessionId, mapRun]
+    ) != null;
+  }
+  /**
+   * Full CLI terminal evidence for a review round: a `round_completed` event AND
+   * a validated `round-meta.json` on disk. Used by the backfill reconciler to
+   * decide whether a discovered-on-disk session is genuinely complete.
+   */
+  hasTerminalRoundEvidence(sessionId, round, roundDir) {
+    return existsSync13(join17(roundDir, "round-meta.json")) && this.hasRoundCompletedEvent(sessionId, round);
+  }
+  /** Full CLI terminal evidence for a map run: a `map_completed` event AND a
+   *  validated `map-meta.json` on disk. */
+  hasTerminalMapEvidence(sessionId, mapRun, runDir) {
+    return existsSync13(join17(runDir, "map-meta.json")) && this.hasMapCompletedEvent(sessionId, mapRun);
+  }
   // ── Session Backfill ──
   ensureSessionRow(sessionId, sessionDir) {
     const branchMatch = sessionId.match(/^\d{4}-\d{2}-\d{2}-(.+)$/);
     const branch = branchMatch?.[1] ?? "unknown";
-    const hasRoundsDir = existsSync13(join16(sessionDir, "rounds"));
-    const hasMapDir = existsSync13(join16(sessionDir, "map"));
+    const hasRoundsDir = existsSync13(join17(sessionDir, "rounds"));
+    const hasMapDir = existsSync13(join17(sessionDir, "map"));
     const workflowType = hasMapDir && !hasRoundsDir ? "map" : "review";
     let currentRound = 1;
     if (hasRoundsDir) {
-      const roundDirs = readdirSync2(join16(sessionDir, "rounds")).filter((d) => d.match(/^round-\d+$/));
+      const roundDirs = readdirSync2(join17(sessionDir, "rounds")).filter((d) => d.match(/^round-\d+$/));
       currentRound = Math.max(1, roundDirs.length);
     }
     let currentMapRun = 1;
-    const mapRunsDir = join16(sessionDir, "map", "runs");
+    const mapRunsDir = join17(sessionDir, "map", "runs");
     if (existsSync13(mapRunsDir)) {
       const runDirs = readdirSync2(mapRunsDir).filter((d) => d.match(/^run-\d+$/));
       currentMapRun = Math.max(1, runDirs.length);
     }
     let phase = "context";
     let phaseNumber = 1;
-    let status = "closed";
+    let status = "active";
     if (workflowType === "review" && hasRoundsDir) {
-      const roundDir = join16(sessionDir, "rounds", `round-${currentRound}`);
-      if (existsSync13(join16(roundDir, "final.md"))) {
+      const roundDir = join17(sessionDir, "rounds", `round-${currentRound}`);
+      if (existsSync13(join17(roundDir, "final.md")) && this.hasTerminalRoundEvidence(sessionId, currentRound, roundDir)) {
         phase = "complete";
         phaseNumber = 8;
         status = "closed";
-      } else if (existsSync13(join16(roundDir, "discourse.md"))) {
+      } else if (existsSync13(join17(roundDir, "final.md"))) {
         phase = "synthesis";
         phaseNumber = 7;
-      } else if (existsSync13(join16(roundDir, "reviews")) && readdirSync2(join16(roundDir, "reviews")).filter((f) => f.endsWith(".md")).length > 0) {
+      } else if (existsSync13(join17(roundDir, "discourse.md"))) {
+        phase = "synthesis";
+        phaseNumber = 7;
+      } else if (existsSync13(join17(roundDir, "reviews")) && readdirSync2(join17(roundDir, "reviews")).filter((f) => f.endsWith(".md")).length > 0) {
         phase = "reviews";
         phaseNumber = 4;
-      } else if (existsSync13(join16(sessionDir, "context.md"))) {
+      } else if (existsSync13(join17(sessionDir, "context.md"))) {
         phase = "analysis";
         phaseNumber = 3;
-      } else if (existsSync13(join16(sessionDir, "discovered-standards.md"))) {
+      } else if (existsSync13(join17(sessionDir, "discovered-standards.md"))) {
         phase = "change-context";
         phaseNumber = 2;
       }
     } else if (workflowType === "map" && hasMapDir) {
-      const runDir = join16(mapRunsDir, `run-${currentMapRun}`);
-      if (existsSync13(join16(runDir, "map.md"))) {
+      const runDir = join17(mapRunsDir, `run-${currentMapRun}`);
+      if (existsSync13(join17(runDir, "map.md")) && this.hasTerminalMapEvidence(sessionId, currentMapRun, runDir)) {
         phase = "complete";
         phaseNumber = 6;
         status = "closed";
-      } else if (existsSync13(join16(runDir, "requirements-mapping.md"))) {
+      } else if (existsSync13(join17(runDir, "map.md"))) {
+        phase = "synthesis";
+        phaseNumber = 5;
+      } else if (existsSync13(join17(runDir, "requirements-mapping.md"))) {
         phase = "synthesis";
         phaseNumber = 5;
-      } else if (existsSync13(join16(runDir, "flow-analysis.md"))) {
+      } else if (existsSync13(join17(runDir, "flow-analysis.md"))) {
         phase = "requirements-mapping";
         phaseNumber = 4;
-      } else if (existsSync13(join16(runDir, "topology.md"))) {
+      } else if (existsSync13(join17(runDir, "topology.md"))) {
         phase = "flow-analysis";
         phaseNumber = 3;
-      } else if (existsSync13(join16(sessionDir, "discovered-standards.md"))) {
+      } else if (existsSync13(join17(sessionDir, "discovered-standards.md"))) {
         phase = "topology";
         phaseNumber = 2;
       }
@@ -36537,7 +36909,7 @@ var FilesystemSync = class {
     try {
       for (const entry of readdirSync2(dir, { withFileTypes: true })) {
         if (entry.isDirectory()) {
-          if (this.hasArtifacts(join16(dir, entry.name))) return true;
+          if (this.hasArtifacts(join17(dir, entry.name))) return true;
         } else if (/\.(md|json)$/.test(entry.name)) {
           return true;
         }
@@ -36683,7 +37055,7 @@ var FilesystemSync = class {
       "SELECT current_phase, phase_number, workflow_type FROM sessions WHERE id = ?",
       [sessionId]
     );
-    if (session && session["workflow_type"] === "map" && (session["current_phase"] !== "complete" || session["phase_number"] < 6)) {
+    if (session && session["workflow_type"] === "map" && this.hasMapCompletedEvent(sessionId, runNumber) && (session["current_phase"] !== "complete" || session["phase_number"] < 6)) {
       commitReasonClose(
         this.db,
         sessionId,
@@ -36841,13 +37213,8 @@ var FilesystemSync = class {
       console.error(`[FilesystemSync] Invalid round-meta.json at ${filePath}`);
       return;
     }
-    const allFindings = meta.reviewers.flatMap((r) => r.findings ?? []);
-    const sc = meta.synthesis_counts;
-    const blockerCount = sc?.blockers ?? allFindings.filter((f) => f.category === "blocker").length;
-    const shouldFixCount = sc?.should_fix ?? allFindings.filter((f) => f.category === "should_fix").length;
-    const suggestionCount = sc?.suggestions ?? allFindings.filter((f) => f.category === "suggestion").length;
-    const reviewerCount = meta.reviewers.length;
-    const totalFindingCount = allFindings.length;
+    const normalizedVerdict = normalizeVerdict(meta.verdict) ?? meta.verdict;
+    const { blockerCount, shouldFixCount, suggestionCount, reviewerCount, totalFindingCount } = resolveRoundCounts(meta);
     this.db.run("BEGIN TRANSACTION");
     try {
       this.db.run(
@@ -36856,7 +37223,7 @@ var FilesystemSync = class {
              reviewer_count = ?, total_finding_count = ?, source = 'orchestrator', parsed_at = ?
          WHERE session_id = ? AND round_number = ?`,
         [
-          meta.verdict,
+          normalizedVerdict,
           blockerCount,
           suggestionCount,
           shouldFixCount,
@@ -36877,12 +37244,12 @@ var FilesystemSync = class {
         this.db.run("COMMIT");
         return;
       }
-      const roundDir = dirname10(filePath);
+      const roundDir = dirname11(filePath);
       for (const reviewer of meta.reviewers) {
         const reviewerType = reviewer.type ?? "unknown";
         const instanceNumber = reviewer.instance ?? 1;
         const findings = reviewer.findings ?? [];
-        const reviewerMdPath = join16(roundDir, "reviews", `${reviewerType}-${instanceNumber}.md`);
+        const reviewerMdPath = join17(roundDir, "reviews", `${reviewerType}-${instanceNumber}.md`);
         this.db.run(
           `INSERT OR REPLACE INTO reviewer_outputs (round_id, reviewer_type, instance_number, file_path, finding_count, parsed_at)
            VALUES (?, ?, ?, ?, ?, ?)`,
@@ -36956,7 +37323,7 @@ var FilesystemSync = class {
     this.io?.to(`session:${sessionId}`).emit("round:updated", {
       sessionId,
       roundNumber,
-      verdict: meta.verdict,
+      verdict: normalizedVerdict,
       blockerCount,
       shouldFixCount,
       suggestionCount,
@@ -37117,11 +37484,12 @@ var FilesystemSync = class {
       );
     } else {
       const parsed = parseFinalMd(content);
+      const parsedVerdict = parsed.verdict ? normalizeVerdict(parsed.verdict) ?? parsed.verdict : parsed.verdict;
       this.db.run(
         `UPDATE review_rounds SET verdict = ?, blocker_count = ?, suggestion_count = ?, should_fix_count = ?, final_md_path = ?, parsed_at = ?, source = 'parser'
          WHERE session_id = ? AND round_number = ?`,
         [
-          parsed.verdict,
+          parsedVerdict,
           parsed.blockerCount,
           parsed.suggestionCount,
           parsed.shouldFixCount,
@@ -37151,7 +37519,7 @@ var FilesystemSync = class {
       "SELECT current_phase, phase_number, status FROM sessions WHERE id = ?",
       [sessionId]
     );
-    if (session && (session["current_phase"] !== "complete" || session["phase_number"] < 8)) {
+    if (session && this.hasRoundCompletedEvent(sessionId, roundNumber) && (session["current_phase"] !== "complete" || session["phase_number"] < 8)) {
       commitReasonClose(
         this.db,
         sessionId,
@@ -37245,7 +37613,7 @@ var FilesystemSync = class {
     const parts = relFromSessions.split("/");
     const sessionId = parts[0];
     if (!sessionId) return;
-    const sessionDir = join16(this.sessionsDir, sessionId);
+    const sessionDir = join17(this.sessionsDir, sessionId);
     this.ensureSessionRow(sessionId, sessionDir);
     const fileName = basename3(filePath);
     const reviewerMatch = relFromSessions.match(/rounds\/round-(\d+)\/reviews\/(.+\.md)$/);
@@ -37318,7 +37686,7 @@ var FilesystemSync = class {
 
 // src/server/services/db-sync-watcher.ts
 import { existsSync as existsSync14 } from "node:fs";
-import { dirname as dirname11, basename as basename4 } from "node:path";
+import { dirname as dirname12, basename as basename4 } from "node:path";
 import { watch as watch3 } from "chokidar";
 function col(row, key) {
   return row[key] ?? null;
@@ -37360,7 +37728,7 @@ var DbSyncWatcher = class {
   /** Start watching the DB file (and its WAL sidecar) for external writes. */
   startWatching() {
     if (!existsSync14(this.dbFilePath)) return;
-    const watchDir = dirname11(this.dbFilePath);
+    const watchDir = dirname12(this.dbFilePath);
     const dbFile = basename4(this.dbFilePath);
     const walFile = `${dbFile}-wal`;
     this.watcher = watch3(watchDir, {
@@ -37622,20 +37990,20 @@ function commandFingerprint(row) {
 }
 
 // src/server/socket/chat-handler.ts
-import { dirname as dirname12 } from "node:path";
+import { dirname as dirname13 } from "node:path";
 
 // src/server/services/chat-context.ts
 import { readFileSync as readFileSync10, readdirSync as readdirSync3, existsSync as existsSync15 } from "node:fs";
-import { join as join17 } from "node:path";
+import { join as join18 } from "node:path";
 function buildChatContext(ocrDir, target) {
-  const sessionsDir = join17(ocrDir, "sessions");
+  const sessionsDir = join18(ocrDir, "sessions");
   if (target.type === "map_run") {
     return buildMapRunContext(sessionsDir, target.sessionId, target.runNumber);
   }
   return buildReviewRoundContext(sessionsDir, target.sessionId, target.roundNumber);
 }
 function buildMapRunContext(sessionsDir, sessionId, runNumber) {
-  const mapPath = join17(
+  const mapPath = join18(
     sessionsDir,
     sessionId,
     "map",
@@ -37662,9 +38030,9 @@ function buildMapRunContext(sessionsDir, sessionId, runNumber) {
   return parts.join("\n");
 }
 function buildReviewRoundContext(sessionsDir, sessionId, roundNumber) {
-  const roundDir = join17(sessionsDir, sessionId, "rounds", `round-${roundNumber}`);
-  const finalPath = join17(roundDir, "final.md");
-  const reviewersDir = join17(roundDir, "reviews");
+  const roundDir = join18(sessionsDir, sessionId, "rounds", `round-${roundNumber}`);
+  const finalPath = join18(roundDir, "final.md");
+  const reviewersDir = join18(roundDir, "reviews");
   const parts = [
     `You are an expert code reviewer assisting with a code review session.`,
     `You are looking at review round #${roundNumber} for session "${sessionId}".`,
@@ -37681,7 +38049,7 @@ function buildReviewRoundContext(sessionsDir, sessionId, roundNumber) {
   if (existsSync15(reviewersDir)) {
     const files = readdirSync3(reviewersDir).filter((f) => f.endsWith(".md")).sort();
     for (const file of files) {
-      const content = readFileSync10(join17(reviewersDir, file), "utf-8");
+      const content = readFileSync10(join18(reviewersDir, file), "utf-8");
       const reviewerName = file.replace(/\.md$/, "");
       parts.push("");
       parts.push(`<reviewer name="${reviewerName}">`);
@@ -37745,7 +38113,7 @@ function startTrackedExecution(io2, db, ocrDir, command, args = []) {
       db.run(
         `UPDATE command_executions
          SET exit_code = ?, finished_at = ?, output = ?, pid = NULL
-         WHERE id = ?`,
+         WHERE id = ? AND finished_at IS NULL`,
         [exitCode, finishedAt, outputBuffer, executionId]
       );
       appendCommandLog(ocrDir, {
@@ -37835,7 +38203,7 @@ User: ${message}`;
         });
         return;
       }
-      const repoRoot = dirname12(ocrDir);
+      const repoRoot = dirname13(ocrDir);
       const spawnResult = adapter.spawn({
         prompt,
         cwd: repoRoot,
@@ -38011,13 +38379,13 @@ function cleanupAllChats() {
 }
 
 // src/server/socket/post-handler.ts
-import { existsSync as existsSync16, mkdirSync as mkdirSync6, readFileSync as readFileSync11, unlinkSync as unlinkSync4, writeFileSync as writeFileSync5 } from "node:fs";
+import { existsSync as existsSync16, mkdirSync as mkdirSync7, readFileSync as readFileSync11, unlinkSync as unlinkSync4, writeFileSync as writeFileSync5 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import { join as join18, dirname as dirname13, isAbsolute as isAbsolute2 } from "node:path";
+import { join as join19, dirname as dirname14, isAbsolute as isAbsolute2 } from "node:path";
 import { randomUUID as randomUUID2 } from "node:crypto";
 function resolveSessionDir2(sessionDir, ocrDir) {
   if (isAbsolute2(sessionDir)) return sessionDir;
-  return join18(dirname13(ocrDir), sessionDir);
+  return join19(dirname14(ocrDir), sessionDir);
 }
 var BRANCH_PREFIXES = [
   "feat",
@@ -38086,7 +38454,7 @@ function registerPostHandlers(io2, socket, db, ocrDir, aiCliService) {
         return;
       }
       const branch = session.branch;
-      const repoRoot = dirname13(ocrDir);
+      const repoRoot = dirname14(ocrDir);
       try {
         await execBinaryAsync("gh", ["auth", "status"], { env: cleanEnv(), cwd: repoRoot, encoding: "utf-8" });
       } catch {
@@ -38187,16 +38555,16 @@ function registerPostHandlers(io2, socket, db, ocrDir, aiCliService) {
         socket.emit("post:error", { error: "Session not found" });
         return;
       }
-      const sessionDir = session.session_dir ? resolveSessionDir2(session.session_dir, ocrDir) : join18(ocrDir, "sessions", sessionId);
-      const roundDir = join18(sessionDir, "rounds", `round-${roundNumber}`);
-      const finalPath = join18(roundDir, "final.md");
+      const sessionDir = session.session_dir ? resolveSessionDir2(session.session_dir, ocrDir) : join19(ocrDir, "sessions", sessionId);
+      const roundDir = join19(sessionDir, "rounds", `round-${roundNumber}`);
+      const finalPath = join19(roundDir, "final.md");
       if (!existsSync16(finalPath)) {
         socket.emit("post:error", { error: "final.md not found for this round" });
         return;
       }
-      const humanReviewPath = join18(roundDir, "final-human.md");
-      const repoRoot = dirname13(ocrDir);
-      const commandMdPath = join18(ocrDir, "commands", "translate-review-to-single-human.md");
+      const humanReviewPath = join19(roundDir, "final-human.md");
+      const repoRoot = dirname14(ocrDir);
+      const commandMdPath = join19(ocrDir, "commands", "translate-review-to-single-human.md");
       let commandContent;
       try {
         commandContent = readFileSync11(commandMdPath, "utf-8");
@@ -38356,10 +38724,10 @@ function registerPostHandlers(io2, socket, db, ocrDir, aiCliService) {
           socket.emit("post:save-result", { success: false, error: "Session not found" });
           return;
         }
-        const sessionDir = session.session_dir ? resolveSessionDir2(session.session_dir, ocrDir) : join18(ocrDir, "sessions", sessionId);
-        const roundDir = join18(sessionDir, "rounds", `round-${roundNumber}`);
-        mkdirSync6(roundDir, { recursive: true });
-        const filePath = join18(roundDir, "final-human.md");
+        const sessionDir = session.session_dir ? resolveSessionDir2(session.session_dir, ocrDir) : join19(ocrDir, "sessions", sessionId);
+        const roundDir = join19(sessionDir, "rounds", `round-${roundNumber}`);
+        mkdirSync7(roundDir, { recursive: true });
+        const filePath = join19(roundDir, "final-human.md");
         writeFileSync5(filePath, content, { mode: 420 });
         socket.emit("post:save-result", { success: true });
       } catch (err) {
@@ -38386,14 +38754,14 @@ function registerPostHandlers(io2, socket, db, ocrDir, aiCliService) {
         );
         tracker.appendOutput(`\u25B8 Posting review to PR #${prNumber}...
 `);
-        const tmpDir = join18(tmpdir2(), "ocr-post-comments");
+        const tmpDir = join19(tmpdir2(), "ocr-post-comments");
         try {
-          mkdirSync6(tmpDir, { recursive: true, mode: 448 });
+          mkdirSync7(tmpDir, { recursive: true, mode: 448 });
         } catch {
         }
-        const tmpFile = join18(tmpDir, `${randomUUID2()}.md`);
+        const tmpFile = join19(tmpDir, `${randomUUID2()}.md`);
         writeFileSync5(tmpFile, content, { mode: 384 });
-        const repoRoot = dirname13(ocrDir);
+        const repoRoot = dirname14(ocrDir);
         try {
           const { stdout } = await execBinaryAsync(
             "gh",
@@ -38436,9 +38804,67 @@ function cleanupAllPostGenerations() {
   }
 }
 
+// src/server/services/forward-resume-sweep.ts
+function hasPositiveDeathEvidence(db, sessionId, isAlive) {
+  const instances = listAgentSessionsForWorkflow(db, sessionId);
+  if (instances.length === 0) return false;
+  return instances.every(
+    (s) => s.ended_at != null || s.pid != null && !isAlive(s.pid)
+  );
+}
+function planForwardResume(db, cfg) {
+  const isAlive = cfg.isAlive ?? defaultIsAlive;
+  const plan = [];
+  for (const session of getAllSessions(db)) {
+    if (session.status !== "active") continue;
+    const events = getEventsForSession(db, session.id);
+    const workflowType = session.workflow_type === "map" ? "map" : "review";
+    if (hasTerminalArtifactEvent2(events, workflowType, session.current_round)) {
+      continue;
+    }
+    if (!hasPositiveDeathEvidence(db, session.id, isAlive)) continue;
+    const stranded = strandedActionByCap(db, session, cfg.maxAttempts);
+    if (stranded.action === "abort_or_fresh") {
+      plan.push({ sessionId: session.id, action: "cap_close" });
+      continue;
+    }
+    const latest = getLatestAgentSessionWithVendorId(db, session.id);
+    plan.push({
+      sessionId: session.id,
+      action: latest?.vendor_session_id ? "resume" : "handoff"
+    });
+  }
+  return plan;
+}
+function runForwardResumeSweep(deps) {
+  const plan = planForwardResume(deps.db, deps.config);
+  for (const item of plan) {
+    try {
+      if (item.action === "cap_close") {
+        closeForwardResumeExhausted(deps.db, item.sessionId, deps.maxAttempts);
+        deps.log?.(
+          `[ForwardResume] ${item.sessionId}: attempts exhausted \u2192 closed non-success`
+        );
+      } else if (item.action === "resume") {
+        deps.spawnResume(item.sessionId);
+        deps.log?.(`[ForwardResume] ${item.sessionId}: auto-resuming (ocr review --resume)`);
+      } else {
+        deps.log?.(
+          `[ForwardResume] ${item.sessionId}: stranded, no resume adapter \u2014 pick up in terminal`
+        );
+      }
+    } catch (err) {
+      deps.log?.(
+        `[ForwardResume] ${item.sessionId}: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  }
+  return plan;
+}
+
 // src/server/index.ts
 import { homedir } from "node:os";
-var __dirname3 = dirname14(fileURLToPath3(import.meta.url));
+var __dirname3 = dirname15(fileURLToPath3(import.meta.url));
 function shortenPath(p) {
   const home = homedir();
   return p.startsWith(home) ? "~" + p.slice(home.length) : p;
@@ -38505,7 +38931,7 @@ if (process.env.NODE_ENV !== "production") {
 function isOcrDashboardProcess(pid) {
   if (process.platform === "win32") return false;
   try {
-    const cmd = execFileSync3("ps", ["-p", String(pid), "-o", "command="], {
+    const cmd = execBinary("ps", ["-p", String(pid), "-o", "command="], {
       encoding: "utf-8",
       timeout: 3e3
     }).trim();
@@ -38520,23 +38946,23 @@ async function startServer(options = {}) {
   process.title = "ocr-dashboard";
   const ocrDir = resolveOcrDir();
   const aiCliService = new AiCliService(ocrDir);
-  const dbPathForCheckpoint = join19(ocrDir, "data", "ocr.db");
+  const dbPathForCheckpoint = join20(ocrDir, "data", "ocr.db");
   const walResult = walCheckpointTruncate(dbPathForCheckpoint);
   if (walResult === "checkpointed") {
     console.log("  WAL checkpoint:    truncated stale write-ahead-log file");
   }
-  for (const reaped of reapOrphanDbFiles(join19(ocrDir, "data"))) {
+  for (const reaped of reapOrphanDbFiles(join20(ocrDir, "data"))) {
     console.log(`  Orphan reap:       removed stale ${reaped}`);
   }
-  const staleLogs = reapStaleExecLogs(join19(ocrDir, "data", "exec-logs"));
+  const staleLogs = reapStaleExecLogs(join20(ocrDir, "data", "exec-logs"));
   if (staleLogs.length > 0) {
     console.log(`  Exec-log reap:     removed ${staleLogs.length} stale agent log(s)`);
   }
   const db = await openDb(ocrDir);
-  const dataDir = join19(ocrDir, "data");
-  const pidFilePath = join19(dataDir, "dashboard.pid");
-  const portFilePath = join19(dataDir, "server-port");
-  mkdirSync7(dataDir, { recursive: true });
+  const dataDir = join20(ocrDir, "data");
+  const pidFilePath = join20(dataDir, "dashboard.pid");
+  const portFilePath = join20(dataDir, "server-port");
+  mkdirSync8(dataDir, { recursive: true });
   try {
     unlinkSync5(portFilePath);
   } catch {
@@ -38634,12 +39060,39 @@ async function startServer(options = {}) {
     }
   };
   await reconcileCompleted();
+  const forwardResumeMaxAttempts = getForwardResumeMaxAttempts(ocrDir);
+  const spawnResume = (sessionId) => {
+    const child = spawnBinary("ocr", ["review", "--resume", sessionId], {
+      cwd: ocrDir.replace(/\.ocr$/, "") || process.cwd(),
+      stdio: "ignore",
+      detached: true
+    });
+    child.on("error", (err) => {
+      console.error(`[ForwardResume] spawn failed for ${sessionId}:`, err.message);
+    });
+    child.unref();
+  };
+  const runForwardResume = () => {
+    try {
+      runForwardResumeSweep({
+        db,
+        config: { maxAttempts: forwardResumeMaxAttempts, heartbeatMs: heartbeatSeconds * 1e3 },
+        maxAttempts: forwardResumeMaxAttempts,
+        spawnResume,
+        log: (m) => console.log(`  ${m}`)
+      });
+    } catch (err) {
+      console.error("[ForwardResume] sweep failed:", err);
+    }
+  };
+  runForwardResume();
   const SWEEP_INTERVAL_MS = 5 * 60 * 1e3;
   const sweepTimer = setInterval(() => {
     try {
       logAgentSweep(sweepStaleAgentSessions(db, heartbeatSeconds, defaultIsAlive));
       sweepStaleSessions(db, STALE_SESSION_THRESHOLD_SECONDS);
       void reconcileCompleted();
+      runForwardResume();
     } catch (err) {
       console.error("[sweep] periodic sweep failed:", err);
     }
@@ -38675,10 +39128,10 @@ async function startServer(options = {}) {
   app.use("/api/agent-sessions", createAgentSessionsRouter(db, () => pullSync()));
   app.use("/api/sessions", createHandoffRouter(sessionCapture, ocrDir, () => pullSync()));
   app.use("/api/team", createTeamRouter(ocrDir));
-  const clientDir = join19(__dirname3, "client");
+  const clientDir = join20(__dirname3, "client");
   if (process.env.NODE_ENV === "production" && existsSync17(clientDir)) {
     app.use(import_express15.default.static(clientDir, { index: false }));
-    const indexHtmlPath = join19(clientDir, "index.html");
+    const indexHtmlPath = join20(clientDir, "index.html");
     const rawIndexHtml = existsSync17(indexHtmlPath) ? readFileSync12(indexHtmlPath, "utf-8") : "";
     const tokenScript = `<script>window.__OCR_TOKEN__=${JSON.stringify(AUTH_TOKEN)};</script>`;
     const injectedIndexHtml = rawIndexHtml.replace(
@@ -38698,7 +39151,7 @@ async function startServer(options = {}) {
     registerChatHandlers(io, socket, db, ocrDir, aiCliService);
     registerPostHandlers(io, socket, db, ocrDir, aiCliService);
   });
-  const dbFilePath = join19(ocrDir, "data", "ocr.db");
+  const dbFilePath = join20(ocrDir, "data", "ocr.db");
   const dbSyncWatcher = new DbSyncWatcher(
     db,
     dbFilePath,
@@ -38714,7 +39167,7 @@ async function startServer(options = {}) {
   dbSyncWatcher.startWatching();
   pullSync = () => dbSyncWatcher.syncFromDisk();
   console.log(`  Watching DB:       ${shortenPath(dbFilePath)}`);
-  const sessionsDir = join19(ocrDir, "sessions");
+  const sessionsDir = join20(ocrDir, "sessions");
   const fsSync = new FilesystemSync(db, sessionsDir, io);
   await fsSync.fullScan();
   fsSync.startWatching();
@@ -38778,7 +39231,7 @@ async function startServer(options = {}) {
       unlinkSync5(portFilePath);
     } catch {
     }
-    clearSpawnMarker(ocrDir);
+    clearAllSpawnMarkers(ocrDir);
     try {
       const activeResult = db.exec(
         "SELECT id, pid FROM command_executions WHERE pid IS NOT NULL AND finished_at IS NULL"