ralphctl 0.17.1 → 0.18.0

package/dist/{cli-WTLOGLWF.mjs → cli-POCRZ3T7.mjs}

@@ -1229,16 +1229,16 @@ var killWithEscalation = (child, graceMs = DEFAULT_KILL_GRACE_MS) => {
 var DEFAULT_GIT_TIMEOUT_MS = 3e4;
 var GIT_MAX_OUTPUT_BYTES = 50 * 1024 * 1024;
 var createGitRunner = (deps = {}) => {
-  const spawn3 = deps.spawn ?? defaultSpawn;
+  const spawn2 = deps.spawn ?? defaultSpawn;
   const defaultTimeoutMs = deps.defaultTimeoutMs ?? DEFAULT_GIT_TIMEOUT_MS;
   const maxOutputBytes = deps.maxOutputBytes ?? GIT_MAX_OUTPUT_BYTES;
-  const run = (cwd, args, opts = {}) => runGitOnce(spawn3, cwd, args, opts.timeoutMs ?? defaultTimeoutMs, maxOutputBytes);
+  const run = (cwd, args, opts = {}) => runGitOnce(spawn2, cwd, args, opts.timeoutMs ?? defaultTimeoutMs, maxOutputBytes);
   return { run };
 };
-var spawnGitChild = (spawn3, cwd, args) => {
+var spawnGitChild = (spawn2, cwd, args) => {
   try {
     return Result.ok(
-      spawn3("git", args, {
+      spawn2("git", args, {
         stdio: ["pipe", "pipe", "pipe"],
         cwd: String(cwd)
       })
@@ -1310,8 +1310,8 @@ var buildCloseResult = (collector, timedOut, code, timeoutMs, args, maxOutputByt
     );
   }
 };
-var runGitOnce = (spawn3, cwd, args, timeoutMs, maxOutputBytes) => new Promise((resolve) => {
-  const spawnResult = spawnGitChild(spawn3, cwd, args);
+var runGitOnce = (spawn2, cwd, args, timeoutMs, maxOutputBytes) => new Promise((resolve) => {
+  const spawnResult = spawnGitChild(spawn2, cwd, args);
   if (!spawnResult.ok) {
     resolve(Result.error(spawnResult.error));
     return;
@@ -1398,9 +1398,9 @@ var buildChildEnv = (overrideEnv) => ({
   ...process.env,
   ...overrideEnv
 });
-var trySpawnChild = (spawn3, cwd, script, env) => {
+var trySpawnChild = (spawn2, cwd, script, env) => {
   try {
-    const child = spawn3(script, [], {
+    const child = spawn2(script, [], {
       stdio: ["pipe", "pipe", "pipe"],
       cwd: String(cwd),
       shell: true,
@@ -1462,14 +1462,14 @@ var wireAbortLadder = (child, signal, abortKillGraceMs, isSettled2) => {
   };
 };
 var runChildProcess = (cwd, script, opts, deps, resolve) => {
-  const { spawn: spawn3, defaultTimeoutMs, now, abortKillGraceMs } = deps;
+  const { spawn: spawn2, defaultTimeoutMs, now, abortKillGraceMs } = deps;
   const start = now();
   const timeoutMs = opts.timeoutMs ?? defaultTimeoutMs;
   if (opts.signal?.aborted === true) {
     resolve(abortResult());
     return;
   }
-  const spawnAttempt = trySpawnChild(spawn3, cwd, script, buildChildEnv(opts.env));
+  const spawnAttempt = trySpawnChild(spawn2, cwd, script, buildChildEnv(opts.env));
   if (!spawnAttempt.ok) {
     resolve(Result.error(spawnAttempt.error));
     return;
@@ -1989,33 +1989,38 @@ var reconcileStaleProjectSiblings = async (root, id, canonicalFile) => {
     await removeFile(fullPath);
   }
 };
-var createFsProjectRepository = (deps) => {
-  const list = async () => {
-    const dir = projectsDir(deps.root);
-    const entries = await listDir(dir);
-    if (!entries.ok) return Result.error(entries.error);
-    const jsonFiles = entries.value.filter((f) => f.endsWith(".json")).sort();
-    const items = [];
-    const byId = /* @__PURE__ */ new Map();
-    const canonicalIds = /* @__PURE__ */ new Set();
-    for (const file of jsonFiles) {
+var listProjects = async (root) => {
+  const dir = projectsDir(root);
+  const entries = await listDir(dir);
+  if (!entries.ok) return Result.error(entries.error);
+  const jsonFiles = entries.value.filter((f) => f.endsWith(".json")).sort();
+  const reads = await Promise.all(
+    jsonFiles.map(async (file) => {
       const path2 = `${dir}/${file}`;
-      const json = await readJson(path2);
-      if (!json.ok) {
-        if (json.error instanceof NotFoundError) continue;
-        return Result.error(json.error);
-      }
-      const decoded = decode(fromJsonProject, json.value, { entity: "project", path: path2 });
-      if (!decoded.ok) return Result.error(decoded.error);
-      const id = String(decoded.value.id);
-      const isCanonical = file.includes("--");
-      if (!isCanonical && canonicalIds.has(id)) continue;
-      byId.set(id, decoded.value);
-      if (isCanonical) canonicalIds.add(id);
+      return { file, path: path2, json: await readJson(path2) };
+    })
+  );
+  const items = [];
+  const byId = /* @__PURE__ */ new Map();
+  const canonicalIds = /* @__PURE__ */ new Set();
+  for (const { file, path: path2, json } of reads) {
+    if (!json.ok) {
+      if (json.error instanceof NotFoundError) continue;
+      return Result.error(json.error);
     }
-    items.push(...byId.values());
-    return Result.ok(items);
-  };
+    const decoded = decode(fromJsonProject, json.value, { entity: "project", path: path2 });
+    if (!decoded.ok) return Result.error(decoded.error);
+    const id = String(decoded.value.id);
+    const isCanonical = file.includes("--");
+    if (!isCanonical && canonicalIds.has(id)) continue;
+    byId.set(id, decoded.value);
+    if (isCanonical) canonicalIds.add(id);
+  }
+  items.push(...byId.values());
+  return Result.ok(items);
+};
+var createFsProjectRepository = (deps) => {
+  const list = () => listProjects(deps.root);
   return {
     async findById(id) {
       const path2 = await resolveProjectPath(deps.root, id);
@@ -2352,33 +2357,38 @@ var reconcileSprintDir = async (root, id, canonicalDir) => {
     reconciledDirs.add(memoKey);
   }
 };
-var createFsSprintRepository = (deps) => {
-  const list = async () => {
-    const dir = sprintsDir(deps.root);
-    const entries = await listDir(dir);
-    if (!entries.ok) return Result.error(entries.error);
-    const sortedEntries = [...entries.value].sort((a, b) => parseIdFromName(a).localeCompare(parseIdFromName(b)));
-    const items = [];
-    const byId = /* @__PURE__ */ new Map();
-    const canonicalIds = /* @__PURE__ */ new Set();
-    for (const entry of sortedEntries) {
+var listSprints = async (root) => {
+  const dir = sprintsDir(root);
+  const entries = await listDir(dir);
+  if (!entries.ok) return Result.error(entries.error);
+  const sortedEntries = [...entries.value].sort((a, b) => parseIdFromName(a).localeCompare(parseIdFromName(b)));
+  const reads = await Promise.all(
+    sortedEntries.map(async (entry) => {
       const path2 = `${dir}/${entry}/sprint.json`;
-      const json = await readJson(path2);
-      if (!json.ok) {
-        if (json.error instanceof NotFoundError) continue;
-        return Result.error(json.error);
-      }
-      const decoded = decode((input) => fromJsonSprint(input, path2), json.value, { entity: "sprint", path: path2 });
-      if (!decoded.ok) return Result.error(decoded.error);
-      const id = String(decoded.value.id);
-      const isCanonical = entry.includes("--");
-      if (!isCanonical && canonicalIds.has(id)) continue;
-      byId.set(id, decoded.value);
-      if (isCanonical) canonicalIds.add(id);
+      return { entry, path: path2, json: await readJson(path2) };
+    })
+  );
+  const items = [];
+  const byId = /* @__PURE__ */ new Map();
+  const canonicalIds = /* @__PURE__ */ new Set();
+  for (const { entry, path: path2, json } of reads) {
+    if (!json.ok) {
+      if (json.error instanceof NotFoundError) continue;
+      return Result.error(json.error);
     }
-    items.push(...byId.values());
-    return Result.ok(items);
-  };
+    const decoded = decode((input) => fromJsonSprint(input, path2), json.value, { entity: "sprint", path: path2 });
+    if (!decoded.ok) return Result.error(decoded.error);
+    const id = String(decoded.value.id);
+    const isCanonical = entry.includes("--");
+    if (!isCanonical && canonicalIds.has(id)) continue;
+    byId.set(id, decoded.value);
+    if (isCanonical) canonicalIds.add(id);
+  }
+  items.push(...byId.values());
+  return Result.ok(items);
+};
+var createFsSprintRepository = (deps) => {
+  const list = () => listSprints(deps.root);
   return {
     async findById(id) {
       const dir = await resolveSprintDir(deps.root, id);
@@ -2495,6 +2505,8 @@ var unblockTask = (task) => {
     // The raised effort is a per-run remedy like the model bump — a clean restart drops it so the
     // fresh run begins on the configured effort again.
     escalatedToEffort: _effort,
+    // Evaluator-side counterpart of the effort remedy above — same clean-restart rationale.
+    escalatedToEvaluatorEffort: _evaluatorEffort,
     // A clean restart drops the prior run's per-criterion verdicts too — a freshly-planned task
     // carries no k-of-N history; stale verdicts would mislead the next run's checklist.
     criteriaVerdicts: _verdicts,
@@ -2505,6 +2517,7 @@ var unblockTask = (task) => {
   void _from;
   void _to;
   void _effort;
+  void _evaluatorEffort;
   void _verdicts;
   return Result.ok({ ...rest, status: "todo", attempts: [] });
 };
@@ -2761,7 +2774,10 @@ var TaskBaseShape = {
   escalatedToModel: z13.string().optional(),
   // Same-model effort-rung override. Optional on read so `tasks.json` files written before the
   // field existed load unchanged (a missing value heals to `undefined`). Never planner-authored.
-  escalatedToEffort: z13.string().optional()
+  escalatedToEffort: z13.string().optional(),
+  // Evaluator-side counterpart of escalatedToEffort — same tolerant-read rationale. The evaluator
+  // MODEL never escalates, so there is no evaluator equivalent of escalatedToModel.
+  escalatedToEvaluatorEffort: z13.string().optional()
 };
 var TodoTaskSchema = z13.object({ ...TaskBaseShape, status: z13.literal("todo") });
 var InProgressTaskSchema = z13.object({ ...TaskBaseShape, status: z13.literal("in_progress") });
@@ -3061,6 +3077,31 @@ var isSuspendedModel = (s) => SUSPENDED_MODELS.includes(s);
 var SUSPENSION_NOTE = "suspended";
 var suspendedModelMessage = (model) => `'${model}' is temporarily suspended by its provider \u2014 pick another model until access is restored`;
 
+// src/integration/ai/providers/_engine/validate-model.ts
+var validateModel = (model, isKnownModel, opts) => {
+  if (!isKnownModel(model)) {
+    return Result.error(
+      new InvalidStateError({
+        entity: opts.entity,
+        currentState: "model-validation",
+        attemptedAction: opts.attemptedAction,
+        message: opts.notKnownMessage
+      })
+    );
+  }
+  if (isSuspendedModel(model)) {
+    return Result.error(
+      new InvalidStateError({
+        entity: opts.entity,
+        currentState: "model-suspended",
+        attemptedAction: opts.attemptedAction,
+        message: suspendedModelMessage(model)
+      })
+    );
+  }
+  return Result.ok(void 0);
+};
+
 // src/integration/ai/providers/_engine/bounded-tail.ts
 var STDERR_TAIL_CAP = 16384;
 var RATE_LIMIT_SCAN_TAIL_CAP = 8192;
@@ -3211,7 +3252,7 @@ var defaultProviderSpawn = (command, args, options) => crossPlatformSpawn(comman
 // src/integration/ai/providers/_engine/truncate-debug-field.ts
 var truncateField = (value, max = 120) => {
   if (value === void 0 || value === null) return void 0;
-  if (value.length === 0) return void 0;
+  if (value.trim().length === 0) return void 0;
   if (value.length <= max) return value;
   return `${value.slice(0, max)}\u2026`;
 };
@@ -3360,6 +3401,12 @@ var delayForRetry = (retryIndex, schedule = DEFAULT_BACKOFF_SCHEDULE) => {
   const clamped = Math.min(retryIndex - 1, schedule.length - 1);
   return schedule[clamped] ?? 0;
 };
+var JITTER_RATIO = 0.2;
+var applyJitter = (delayMs, random = Math.random) => {
+  if (delayMs <= 0) return delayMs;
+  const spread = delayMs * JITTER_RATIO;
+  return Math.round(delayMs - spread + random() * spread * 2);
+};
 var sleepCancellable = (ms, signal) => new Promise((resolve) => {
   if (signal?.aborted === true) {
     resolve();
@@ -3394,7 +3441,8 @@ var handleRateLimitOutcome = async ({
   attemptIdx,
   maxAttempts,
   schedule,
-  error
+  error,
+  random
 }) => {
   const bannerId = `rate-limit-${providerSlug}-${error.sessionId ?? String(attemptIdx + 1)}`;
   eventBus.publish({
@@ -3408,7 +3456,7 @@ var handleRateLimitOutcome = async ({
   if (attemptIdx >= maxAttempts - 1) {
     return { type: "continue", session: nextSession };
   }
-  const delayMs = delayForRetry(attemptIdx + 1, schedule);
+  const delayMs = applyJitter(delayForRetry(attemptIdx + 1, schedule), random ?? Math.random);
   if (delayMs <= 0) {
     return { type: "continue", session: nextSession };
   }
@@ -3472,7 +3520,8 @@ var runWithRateLimitRetry = async (opts) => {
         attemptIdx,
         maxAttempts,
         schedule,
-        error: outcome.error
+        error: outcome.error,
+        random: opts.random
       });
       if (result.type === "aborted") {
         return Result.error(result.error);
@@ -3918,26 +3967,12 @@ var disallowedToolsFor = (p) => {
   return denied;
 };
 var buildClaudeArgs = (session) => {
-  if (!isClaudeModel(session.model)) {
-    return Result.error(
-      new InvalidStateError({
-        entity: PROVIDER_NAME,
-        currentState: "model-validation",
-        attemptedAction: "build argv",
-        message: `claude-provider: '${session.model}' is not a known Claude model`
-      })
-    );
-  }
-  if (isSuspendedModel(session.model)) {
-    return Result.error(
-      new InvalidStateError({
-        entity: PROVIDER_NAME,
-        currentState: "model-suspended",
-        attemptedAction: "build argv",
-        message: suspendedModelMessage(session.model)
-      })
-    );
-  }
+  const validated = validateModel(session.model, isClaudeModel, {
+    entity: PROVIDER_NAME,
+    attemptedAction: "build argv",
+    notKnownMessage: `claude-provider: '${session.model}' is not a known Claude model`
+  });
+  if (!validated.ok) return Result.error(validated.error);
   const args = ["-p", "--verbose", "--output-format", "stream-json", "--model", session.model];
   args.push("--permission-mode", "bypassPermissions");
   const denied = disallowedToolsFor(session.permissions);
@@ -4039,16 +4074,12 @@ var sandboxFor = (_p) => {
   return Result.ok({ sandbox: "workspace-write" });
 };
 var buildCodexArgs = (session, opts) => {
-  if (!isCodexModel(session.model)) {
-    return Result.error(
-      new InvalidStateError({
-        entity: PROVIDER_NAME2,
-        currentState: "model-validation",
-        attemptedAction: "build argv",
-        message: `codex-provider: '${session.model}' is not a known Codex model`
-      })
-    );
-  }
+  const validated = validateModel(session.model, isCodexModel, {
+    entity: PROVIDER_NAME2,
+    attemptedAction: "build argv",
+    notKnownMessage: `codex-provider: '${session.model}' is not a known Codex model`
+  });
+  if (!validated.ok) return Result.error(validated.error);
   const perms = sandboxFor(session.permissions);
   if (!perms.ok) return Result.error(perms.error);
   const args = ["exec"];
@@ -4409,26 +4440,12 @@ var RESUME_STALE_RE3 = /(session|conversation)[^\n]*not found|no (session|conver
 var isFullAuto = (p) => p.autoApprove && p.canModifyRepoFiles && p.canRunShell;
 var PROVIDER_NAME3 = "copilot-provider";
 var buildCopilotArgs = (session) => {
-  if (!isCopilotModel(session.model)) {
-    return Result.error(
-      new InvalidStateError({
-        entity: PROVIDER_NAME3,
-        currentState: "model-validation",
-        attemptedAction: "build argv",
-        message: `copilot-provider: '${session.model}' is not a known Copilot model`
-      })
-    );
-  }
-  if (isSuspendedModel(session.model)) {
-    return Result.error(
-      new InvalidStateError({
-        entity: PROVIDER_NAME3,
-        currentState: "model-suspended",
-        attemptedAction: "build argv",
-        message: suspendedModelMessage(session.model)
-      })
-    );
-  }
+  const validated = validateModel(session.model, isCopilotModel, {
+    entity: PROVIDER_NAME3,
+    attemptedAction: "build argv",
+    notKnownMessage: `copilot-provider: '${session.model}' is not a known Copilot model`
+  });
+  if (!validated.ok) return Result.error(validated.error);
   const args = [
     "--output-format=json",
     "--autopilot",
@@ -4657,16 +4674,12 @@ var createInteractiveClaudeProvider = (deps) => {
   const newSessionId = deps.newSessionId ?? uuidv7;
   return {
     async run(input) {
-      if (!isClaudeModel(input.model)) {
-        return Result.error(
-          new InvalidStateError({
-            entity: PROVIDER,
-            currentState: "model-validation",
-            attemptedAction: "run",
-            message: `interactive-claude: '${input.model}' is not a known Claude model`
-          })
-        );
-      }
+      const validated = validateModel(input.model, isClaudeModel, {
+        entity: PROVIDER,
+        attemptedAction: "run",
+        notKnownMessage: `interactive-claude: '${input.model}' is not a known Claude model`
+      });
+      if (!validated.ok) return Result.error(validated.error);
       let prompt;
       try {
         prompt = await readFile5(String(input.promptFile));
@@ -4777,16 +4790,12 @@ var createInteractiveCodexProvider = (deps) => {
   const readFile5 = deps.readFile ?? defaultReadFile;
   return {
     async run(input) {
-      if (!isCodexModel(input.model)) {
-        return Result.error(
-          new InvalidStateError({
-            entity: PROVIDER2,
-            currentState: "model-validation",
-            attemptedAction: "run",
-            message: `interactive-codex: '${input.model}' is not a known Codex model`
-          })
-        );
-      }
+      const validated = validateModel(input.model, isCodexModel, {
+        entity: PROVIDER2,
+        attemptedAction: "run",
+        notKnownMessage: `interactive-codex: '${input.model}' is not a known Codex model`
+      });
+      if (!validated.ok) return Result.error(validated.error);
       let prompt;
       try {
         prompt = await readFile5(String(input.promptFile));
@@ -4887,16 +4896,12 @@ var createInteractiveCopilotProvider = (deps) => {
   const newSessionId = deps.newSessionId ?? uuidv7;
   return {
     async run(input) {
-      if (!isCopilotModel(input.model)) {
-        return Result.error(
-          new InvalidStateError({
-            entity: PROVIDER3,
-            currentState: "model-validation",
-            attemptedAction: "run",
-            message: `interactive-copilot: '${input.model}' is not a known Copilot model`
-          })
-        );
-      }
+      const validated = validateModel(input.model, isCopilotModel, {
+        entity: PROVIDER3,
+        attemptedAction: "run",
+        notKnownMessage: `interactive-copilot: '${input.model}' is not a known Copilot model`
+      });
+      if (!validated.ok) return Result.error(validated.error);
       let prompt;
       try {
         prompt = await readFile5(String(input.promptFile));
@@ -5016,10 +5021,10 @@ var createInteractiveAiProvider = (deps) => {
 };
 
 // src/integration/io/run-cli.ts
-var runCli = (spawn3, command, args, opts) => new Promise((resolve) => {
+var runCli = (spawn2, command, args, opts) => new Promise((resolve) => {
   let child;
   try {
-    child = spawn3(command, args, {
+    child = spawn2(command, args, {
       stdio: ["pipe", "pipe", "pipe"],
       ...opts.cwd !== void 0 ? { cwd: opts.cwd } : {}
     });
@@ -5133,9 +5138,9 @@ var looksLikeNotFound = (stderr) => {
   const s = stderr.toLowerCase();
   return s.includes("not found") || s.includes("404") || s.includes("could not resolve") || s.includes("does not exist");
 };
-var fetchGitHub = async (spawn3, parsed, url) => {
+var fetchGitHub = async (spawn2, parsed, url) => {
   const result = await runCli(
-    spawn3,
+    spawn2,
     "gh",
     [
       "issue",
@@ -5182,9 +5187,9 @@ var fetchGitHub = async (spawn3, parsed, url) => {
     comments
   });
 };
-var fetchGitLabNotes = async (spawn3, parsed) => {
+var fetchGitLabNotes = async (spawn2, parsed) => {
   const result = await runCli(
-    spawn3,
+    spawn2,
     "glab",
     ["issue", "note", "list", String(parsed.number), "--repo", glabRepoArg(parsed), "--output", "json"],
     { timeoutMs: CLI_TIMEOUT_MS }
@@ -5213,9 +5218,9 @@ var fetchGitLabNotes = async (spawn3, parsed) => {
   }));
   return { comments };
 };
-var fetchGitLab = async (spawn3, parsed, url, logger) => {
+var fetchGitLab = async (spawn2, parsed, url, logger) => {
   const result = await runCli(
-    spawn3,
+    spawn2,
     "glab",
     ["issue", "view", String(parsed.number), "--repo", glabRepoArg(parsed), "--output", "json"],
     { timeoutMs: CLI_TIMEOUT_MS }
@@ -5242,7 +5247,7 @@ var fetchGitLab = async (spawn3, parsed, url, logger) => {
       })
     );
   }
-  const notes = await fetchGitLabNotes(spawn3, parsed);
+  const notes = await fetchGitLabNotes(spawn2, parsed);
   if (notes.failure !== void 0) {
     logger?.warn(`glab issue note list failed for ${url}: ${notes.failure} \u2014 proceeding without comments`);
   }
@@ -5263,9 +5268,9 @@ var createIssueFetcher = (deps) => async (url) => {
 
 // src/integration/scm/issue-pusher.ts
 var CLI_TIMEOUT_MS2 = 3e4;
-var commentGitHub = async (spawn3, url, body, parsed) => {
+var commentGitHub = async (spawn2, url, body, parsed) => {
   const r = await runCli(
-    spawn3,
+    spawn2,
     "gh",
     ["issue", "comment", String(parsed.number), "--repo", `${parsed.owner}/${parsed.repo}`, "--body-file", "-"],
     { stdin: body, timeoutMs: CLI_TIMEOUT_MS2 }
@@ -5281,9 +5286,9 @@ var commentGitHub = async (spawn3, url, body, parsed) => {
   }
   return Result.ok(void 0);
 };
-var commentGitLab = async (spawn3, url, body, parsed) => {
+var commentGitLab = async (spawn2, url, body, parsed) => {
   const r = await runCli(
-    spawn3,
+    spawn2,
     "glab",
     [
       "issue",
@@ -5408,11 +5413,11 @@ var buildGlabArgs = (input) => {
   if (input.draft) args.push("--draft");
   return args;
 };
-var runPlatformCli = async (spawn3, platform, input) => {
+var runPlatformCli = async (spawn2, platform, input) => {
   const command = platform === "github" ? "gh" : "glab";
   const args = platform === "github" ? buildGhArgs(input) : buildGlabArgs(input);
   const noun = platform === "github" ? "gh pr create" : "glab mr create";
-  const result = await runCli(spawn3, command, args, { cwd: String(input.cwd), timeoutMs: CLI_TIMEOUT_MS3 });
+  const result = await runCli(spawn2, command, args, { cwd: String(input.cwd), timeoutMs: CLI_TIMEOUT_MS3 });
   if (!result.ok) return Result.error(result.error);
   if (result.value.exitCode !== 0) {
     const stderr = result.value.stderr.trim();
@@ -6024,7 +6029,7 @@ var createNpmVersionChecker = (deps) => {
 // package.json
 var package_default = {
   name: "ralphctl",
-  version: "0.17.1",
+  version: "0.18.0",
   description: "Agent harness for long-running AI coding tasks \u2014 orchestrates Claude Code, GitHub Copilot, and OpenAI Codex across repositories",
   homepage: "https://github.com/lukas-grigis/ralphctl",
   type: "module",
@@ -6526,18 +6531,7 @@ var BUNDLED_SKILLS = [
 ];
 var skillsForFlow = (flowId) => BUNDLED_SKILLS.filter((entry) => entry.defaultFor.includes(flowId)).map((entry) => entry.name);
 
-// src/integration/ai/skills/_engine/skill.ts
-import { z as z16 } from "zod";
-var SkillNameSchema = z16.string().min(1).max(64).regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/u, "lowercase alphanumeric with hyphens, no leading/trailing/consecutive hyphens");
-var SkillFrontmatterSchema = z16.object({
-  name: SkillNameSchema,
-  description: z16.string().min(1).max(1024),
-  license: z16.string().optional(),
-  compatibility: z16.string().max(500).optional(),
-  "allowed-tools": z16.string().optional()
-});
-
-// src/integration/ai/skills/_engine/parse-skill.ts
+// src/integration/ai/skills/_engine/frontmatter.ts
 var splitFrontmatter = (raw) => {
   const trimmed = raw.replace(/^\uFEFF/u, "");
   if (!trimmed.startsWith("---")) return { frontmatter: "", body: trimmed };
@@ -6564,6 +6558,19 @@ var parseSimpleYaml = (input) => {
   return result;
 };
 var errorCode = (cause) => typeof cause === "object" && cause !== null && "code" in cause && typeof cause.code === "string" ? cause.code : void 0;
+
+// src/integration/ai/skills/_engine/skill.ts
+import { z as z16 } from "zod";
+var SkillNameSchema = z16.string().min(1).max(64).regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/u, "lowercase alphanumeric with hyphens, no leading/trailing/consecutive hyphens");
+var SkillFrontmatterSchema = z16.object({
+  name: SkillNameSchema,
+  description: z16.string().min(1).max(1024),
+  license: z16.string().optional(),
+  compatibility: z16.string().max(500).optional(),
+  "allowed-tools": z16.string().optional()
+});
+
+// src/integration/ai/skills/_engine/parse-skill.ts
 var parseSkill = (label, path2, name, raw) => {
   const { frontmatter, body } = splitFrontmatter(raw);
   const fm = parseSimpleYaml(frontmatter);
@@ -7293,35 +7300,9 @@ import { readFile as readFile4 } from "fs/promises";
 var BUNDLED_AGENT_DEFINITIONS = ["ralphctl-evaluator", "ralphctl-generator"];
 
 // src/integration/ai/agents/_engine/parse-agent-definition.ts
-var splitFrontmatter2 = (raw) => {
-  const trimmed = raw.replace(/^\uFEFF/u, "");
-  if (!trimmed.startsWith("---")) return { frontmatter: "", body: trimmed };
-  const closing = trimmed.indexOf("\n---", 3);
-  if (closing === -1) return { frontmatter: "", body: trimmed };
-  const frontmatter = trimmed.slice(3, closing).trim();
-  const afterClose = trimmed.slice(closing + 4);
-  const body = afterClose.replace(/^(?:\r?\n)+/, "");
-  return { frontmatter, body };
-};
-var parseSimpleYaml2 = (input) => {
-  const result = {};
-  for (const line of input.split("\n")) {
-    const stripped = line.trim();
-    if (stripped.length === 0 || stripped.startsWith("#")) continue;
-    const colon = stripped.indexOf(":");
-    if (colon === -1) continue;
-    const key = stripped.slice(0, colon).trim();
-    let value = stripped.slice(colon + 1).trim();
-    if (value.startsWith('"') && value.endsWith('"')) value = value.slice(1, -1);
-    else if (value.startsWith("'") && value.endsWith("'")) value = value.slice(1, -1);
-    result[key] = value;
-  }
-  return result;
-};
-var errorCode2 = (cause) => typeof cause === "object" && cause !== null && "code" in cause && typeof cause.code === "string" ? cause.code : void 0;
 var parseAgentDefinition = (label, path2, name, raw) => {
-  const { frontmatter, body } = splitFrontmatter2(raw);
-  const fm = parseSimpleYaml2(frontmatter);
+  const { frontmatter, body } = splitFrontmatter(raw);
+  const fm = parseSimpleYaml(frontmatter);
   const parsed = AgentDefinitionFrontmatterSchema.safeParse(fm);
   if (!parsed.success) {
     return Result.error(
@@ -7375,7 +7356,7 @@ var readDefinitionOptional = async (root, name) => {
   try {
     raw = await readFile4(path2, "utf-8");
   } catch (cause) {
-    if (errorCode2(cause) === "ENOENT") return Result.ok(void 0);
+    if (errorCode(cause) === "ENOENT") return Result.ok(void 0);
     return Result.error(
       new StorageError({ subCode: "io", message: `bundled agent definition not readable: ${path2}`, path: path2, cause })
     );
@@ -7423,7 +7404,7 @@ var loadOperatorAgentDefinitions = async (deps) => {
   try {
     entries = await fs14.readdir(root, { withFileTypes: true });
   } catch (cause) {
-    if (errorCode2(cause) === "ENOENT") return [];
+    if (errorCode(cause) === "ENOENT") return [];
     log.warn("operator agent definitions dir not readable", { path: root, cause });
     return [];
   }
@@ -7656,7 +7637,7 @@ var buildWireAgentDefinitionSource = (storage2, logger) => composeAgentDefinitio
   })
 );
 var wire = (opts) => {
-  const spawn3 = opts.spawn ?? defaultPipeSpawn;
+  const spawn2 = opts.spawn ?? defaultPipeSpawn;
   const env = opts.env ?? process.env;
   const debugTrace = isTruthyEnvFlag(env[RALPHCTL_DEBUG_TRACE_ENV]);
   const appendFile = createAppendFile();
@@ -7716,9 +7697,9 @@ var wire = (opts) => {
     availableModelsFor,
     eventBus,
     logger,
-    pullRequestCreator: createPullRequestCreator({ gitRunner: createGitRunner(), spawn: spawn3 }),
-    issueFetcher: createIssueFetcher({ spawn: spawn3, logger }),
-    issuePusher: createIssuePusher({ spawn: spawn3 }),
+    pullRequestCreator: createPullRequestCreator({ gitRunner: createGitRunner(), spawn: spawn2 }),
+    issueFetcher: createIssueFetcher({ spawn: spawn2, logger }),
+    issuePusher: createIssuePusher({ spawn: spawn2 }),
     versionChecker: createNpmVersionChecker({
       stateRoot: opts.storage.stateRoot,
       currentVersion: CLI_METADATA.currentVersion,
@@ -8954,9 +8935,8 @@ var useSelection = () => {
 import { createContext as createContext10, useCallback as useCallback5, useContext as useContext10, useEffect as useEffect4, useState as useState6 } from "react";
 
 // src/integration/io/command-exists.ts
-import { spawn as spawn2 } from "child_process";
 var commandExists = (name) => new Promise((resolve) => {
-  const child = process.platform === "win32" ? spawn2("where", [name], { stdio: "ignore" }) : spawn2("sh", ["-c", 'command -v "$0"', name], { stdio: "ignore" });
+  const child = process.platform === "win32" ? crossPlatformSpawn("where", [name], { stdio: "ignore" }) : crossPlatformSpawn("sh", ["-c", 'command -v "$0"', name], { stdio: "ignore" });
   let settled = false;
   const settle = (value) => {
     if (settled) return;
@@ -10033,7 +10013,7 @@ var Breadcrumb = () => {
             /* @__PURE__ */ jsx14(Text5, { color: inkColors.primary, bold: true, children: right[1] }),
             /* @__PURE__ */ jsx14(Text5, { dimColor: true, children: " " }),
             /* @__PURE__ */ jsx14(Text5, { color: inkColors.highlight, bold: true, children: "[S]" }),
-            atLeast("md") && effectiveSprintStatus !== void 0 && /* @__PURE__ */ jsx14(Box3, { marginLeft: 1, children: /* @__PURE__ */ jsx14(StatusChip, { label: effectiveSprintStatus, kind: sprintStatusKind(effectiveSprintStatus) }) })
+            atLeast("md") && effectiveSprintStatus !== void 0 && /* @__PURE__ */ jsx14(Box3, { marginLeft: spacing.gutter, children: /* @__PURE__ */ jsx14(StatusChip, { label: effectiveSprintStatus, kind: sprintStatusKind(effectiveSprintStatus) }) })
           ] })
         ] })
       ]
@@ -11104,7 +11084,7 @@ var ScrollableMessage = ({ message, ownsArrows = true }) => {
       " ",
       header
     ] }),
-    body.length > 0 && /* @__PURE__ */ jsxs12(Box11, { flexDirection: "column", marginTop: 1, children: [
+    body.length > 0 && /* @__PURE__ */ jsxs12(Box11, { flexDirection: "column", marginTop: spacing.section, children: [
       /* @__PURE__ */ jsx22(Box11, { flexDirection: "column", borderStyle: "single", borderColor: inkColors.rule, paddingX: spacing.cardPadX, children: visible.map((line, i) => /* @__PURE__ */ jsx22(Text13, { children: line.length === 0 ? " " : line }, `body-${String(offset + i)}`)) }),
       overflows && /* @__PURE__ */ jsxs12(Text13, { dimColor: true, children: [
         "lines ",
@@ -11146,7 +11126,7 @@ var ConfirmPrompt = ({
   const Pill = ({ on, label }) => /* @__PURE__ */ jsx23(Text14, { color: on ? inkColors.primary : inkColors.muted, bold: on, children: on ? `[ ${label} ]` : `  ${label}  ` });
   return /* @__PURE__ */ jsxs13(Box12, { flexDirection: "column", paddingX: spacing.indent, children: [
     /* @__PURE__ */ jsx23(ScrollableMessage, { message }),
-    /* @__PURE__ */ jsxs13(Box12, { marginTop: 1, children: [
+    /* @__PURE__ */ jsxs13(Box12, { marginTop: spacing.section, children: [
       /* @__PURE__ */ jsx23(Pill, { on: yes, label: "Yes" }),
       /* @__PURE__ */ jsx23(Text14, { children: " " }),
       /* @__PURE__ */ jsx23(Pill, { on: !yes, label: "No" })
@@ -11209,7 +11189,7 @@ var SelectPrompt = ({
   const end = Math.min(options.length, start + VISIBLE_ROWS);
   return /* @__PURE__ */ jsxs14(Box13, { flexDirection: "column", paddingX: spacing.indent, children: [
     /* @__PURE__ */ jsx24(ScrollableMessage, { message, ownsArrows: false }),
-    /* @__PURE__ */ jsx24(Box13, { flexDirection: "column", marginTop: 1, children: options.slice(start, end).map((opt, localIdx) => {
+    /* @__PURE__ */ jsx24(Box13, { flexDirection: "column", marginTop: spacing.section, children: options.slice(start, end).map((opt, localIdx) => {
       const i = start + localIdx;
       const focused = i === cursor;
       const disabled = opt.disabled === true;
@@ -11352,7 +11332,7 @@ var MultiSelectPrompt = ({
       " ",
       message
     ] }),
-    /* @__PURE__ */ jsx25(Box14, { flexDirection: "column", marginTop: 1, children: options.slice(start, end).map((opt, localIdx) => {
+    /* @__PURE__ */ jsx25(Box14, { flexDirection: "column", marginTop: spacing.section, children: options.slice(start, end).map((opt, localIdx) => {
       const i = start + localIdx;
       const focused = i === cursor && opt.disabled !== true;
       return /* @__PURE__ */ jsx25(OptionRow, { opt, focused, checked: picked.has(i) }, `opt-${String(i)}`);
@@ -11585,6 +11565,9 @@ var OverflowRow = ({ direction, count }) => {
 // src/application/ui/tui/components/action-menu.tsx
 import { jsx as jsx29, jsxs as jsxs19 } from "react/jsx-runtime";
 var isEnabled3 = (item) => item.disabledReason === void 0;
+var RESERVED_NAV_KEYS = new Set(
+  [...listKeys.up.keys, ...listKeys.down.keys].filter((k) => /^[a-z]$/.test(k))
+);
 var findInitialCursorId = (items, initialIndex, enabledItems) => {
   for (let i = initialIndex; i < items.length; i++) {
     const it = items[i];
@@ -11592,7 +11575,10 @@ var findInitialCursorId = (items, initialIndex, enabledItems) => {
   }
   return enabledItems[0]?.id ?? "";
 };
-var matchHotkey = (items, input) => items.find((it) => it.hotkey === input && it.globalHotkey !== true && isEnabled3(it));
+var matchHotkey = (items, input) => {
+  if (RESERVED_NAV_KEYS.has(input)) return void 0;
+  return items.find((it) => it.hotkey === input && it.globalHotkey !== true && isEnabled3(it));
+};
 var isRowVisible = (it, enabled, visibleEnabledIds, windowedEnabled) => {
   if (enabled) return visibleEnabledIds.has(it.id);
   if (windowedEnabled.length === 0) return true;
@@ -14001,14 +13987,20 @@ var warnIfContractViolated = (logger, skillName, content) => {
 };
 
 // src/business/settings/resolve-effort.ts
+var FLOW_DEFAULT_EFFORT = {
+  plan: "high",
+  ideate: "high"
+};
 var resolveEffort = (flow, settings) => {
   const row = primaryFlowRow(settings.ai, flow);
-  return resolveEffortForRow(row, settings.ai.effort);
+  return resolveEffortForRow(row, settings.ai.effort, flow);
 };
-var resolveEffortForRow = (row, globalEffort) => {
+var resolveEffortForRow = (row, globalEffort, flow) => {
   if (row.effort !== void 0) return row.effort;
-  if (globalEffort === void 0) return void 0;
-  return _floorForProvider(globalEffort, row.provider);
+  if (globalEffort !== void 0) return _floorForProvider(globalEffort, row.provider);
+  const flowDefault = flow !== void 0 ? FLOW_DEFAULT_EFFORT[flow] : void 0;
+  if (flowDefault !== void 0) return clampEffortToProvider(flowDefault, row.provider);
+  return void 0;
 };
 var clampEffortToProvider = (effort, provider) => {
   if (provider === "openai-codex" && effort === "max") return "xhigh";
@@ -14585,6 +14577,28 @@ var interactiveSprintNameLeaf = (deps) => leaf("interactive-sprint-name", {
 // src/application/flows/create-sprint/leaves/init-progress-journal.ts
 import { join as join31 } from "path";
 
+// src/business/_shared/format-duration.ts
+var EM_DASH = "\u2014";
+var MS_PER_SECOND = 1e3;
+var MS_PER_MINUTE = 60 * MS_PER_SECOND;
+var MS_PER_HOUR = 60 * MS_PER_MINUTE;
+var formatDuration = (ms) => {
+  if (ms === void 0) return EM_DASH;
+  if (ms < 0) return `${String(ms)}ms`;
+  if (ms < MS_PER_SECOND) return `${String(ms)}ms`;
+  if (ms < MS_PER_MINUTE) {
+    return `${String(Math.floor(ms / MS_PER_SECOND))}s`;
+  }
+  if (ms < MS_PER_HOUR) {
+    const minutes2 = Math.floor(ms / MS_PER_MINUTE);
+    const seconds = Math.floor(ms % MS_PER_MINUTE / MS_PER_SECOND);
+    return seconds > 0 ? `${String(minutes2)}m ${String(seconds)}s` : `${String(minutes2)}m`;
+  }
+  const hours = Math.floor(ms / MS_PER_HOUR);
+  const minutes = Math.floor(ms % MS_PER_HOUR / MS_PER_MINUTE);
+  return minutes > 0 ? `${String(hours)}h ${String(minutes)}m` : `${String(hours)}h`;
+};
+
 // src/business/sprint/journal-sanitize.ts
 var sanitizeInline = (text) => text.replace(/[\r\n\t\v\f]+/g, " ").trim();
 var neutralizeProseHeadings = (text) => text.split("\n").map((line) => line.startsWith("#") ? `  ${line}` : line).join("\n");
@@ -14628,26 +14642,7 @@ _Task ${sanitizeInline(taskName)}: rejected diff quarantined to git stash \u2014
 `;
 
 // src/business/sprint/render-journal-entry.ts
-var EM_DASH = "\u2014";
-var MS_PER_SECOND = 1e3;
-var MS_PER_MINUTE = 60 * MS_PER_SECOND;
-var MS_PER_HOUR = 60 * MS_PER_MINUTE;
-var formatDuration = (ms) => {
-  if (ms === void 0) return EM_DASH;
-  if (ms < 0) return `${String(ms)}ms`;
-  if (ms < MS_PER_SECOND) return `${String(ms)}ms`;
-  if (ms < MS_PER_MINUTE) {
-    return `${String(Math.floor(ms / MS_PER_SECOND))}s`;
-  }
-  if (ms < MS_PER_HOUR) {
-    const minutes2 = Math.floor(ms / MS_PER_MINUTE);
-    const seconds = Math.floor(ms % MS_PER_MINUTE / MS_PER_SECOND);
-    return seconds > 0 ? `${String(minutes2)}m ${String(seconds)}s` : `${String(minutes2)}m`;
-  }
-  const hours = Math.floor(ms / MS_PER_HOUR);
-  const minutes = Math.floor(ms % MS_PER_HOUR / MS_PER_MINUTE);
-  return minutes > 0 ? `${String(hours)}h ${String(minutes)}m` : `${String(hours)}h`;
-};
+var EM_DASH2 = "\u2014";
 var SHA_DISPLAY_LENGTH = 7;
 var appendSubsection = (lines, heading, entries) => {
   if (entries.length === 0) return;
@@ -14734,7 +14729,7 @@ var appendOutcomeDetail = (lines, input) => {
   lines.push("");
 };
 var renderJournalEntry = (input) => {
-  const sha = input.commitSha !== void 0 ? input.commitSha.slice(0, SHA_DISPLAY_LENGTH) : EM_DASH;
+  const sha = input.commitSha !== void 0 ? input.commitSha.slice(0, SHA_DISPLAY_LENGTH) : EM_DASH2;
   const outcome = input.outcome.trim().length > 0 ? neutralizeProseHeadings(input.outcome.trim()) : "_(no outcome paragraph)_";
   const lines = [];
   lines.push("");
@@ -15676,11 +15671,29 @@ var assertTemplateKeysFilled = (rendered, template, partialBodies, values, where
 };
 
 // src/integration/ai/prompts/_engine/build-prompt.ts
+var findPartialParameterCollision = (def, partialPlaceholders) => {
+  for (const [field, rawSpec] of Object.entries(def.parameters)) {
+    if (partialPlaceholders.has(rawSpec.placeholder)) return [field, rawSpec.placeholder];
+  }
+  return void 0;
+};
 var buildPrompt = async (loader, def, input) => {
   const template = await loader.load(def.templateName);
   if (!template.ok) return Result.error(template.error);
   const values = {};
   const partialBodies = [];
+  const partialPlaceholders = new Set(def.partials !== void 0 ? Object.keys(def.partials) : []);
+  const collision = findPartialParameterCollision(def, partialPlaceholders);
+  if (collision !== void 0) {
+    const [field, placeholder] = collision;
+    return Result.error(
+      new ValidationError({
+        field,
+        value: placeholder,
+        message: `buildPrompt(${def.templateName}): parameter '${field}' declares placeholder {{${placeholder}}}, which collides with an auto-loaded partial slot of the same name \u2014 rename one of them.`
+      })
+    );
+  }
   if (def.partials !== void 0) {
     for (const [placeholder, name] of Object.entries(def.partials)) {
       const partial = await loader.load(name);
@@ -18546,7 +18559,6 @@ var branchPreflightLeaf = (deps, opts, name = "branch-preflight") => leaf(name,
 });
 
 // src/application/flows/implement/leaves/build-task-workspace.ts
-import { promises as fs21 } from "fs";
 import { join as join44 } from "path";
 
 // src/business/task/compose-criteria-history.ts
@@ -18849,22 +18861,6 @@ ${body}
 };
 
 // src/application/flows/implement/leaves/build-task-workspace.ts
-var writeOrError = async (path2, content) => {
-  try {
-    await fs21.mkdir(path2.slice(0, path2.lastIndexOf("/")), { recursive: true });
-    await fs21.writeFile(path2, content, "utf8");
-    return Result.ok(void 0);
-  } catch (cause) {
-    return Result.error(
-      new StorageError({
-        subCode: "io",
-        message: `failed to write task workspace file: ${path2}`,
-        path: path2,
-        cause
-      })
-    );
-  }
-};
 var buildTaskWorkspaceLeaf = (deps, opts, taskId) => leaf(`build-task-workspace-${String(taskId)}`, {
   useCase: {
     execute: async (input) => {
@@ -18873,6 +18869,10 @@ var buildTaskWorkspaceLeaf = (deps, opts, taskId) => leaf(`build-task-workspace-
       const previewOutputDir = AbsolutePath.parse(join44(workspaceRoot, "rounds", "1", "generator"));
       if (!previewOutputDir.ok) return Result.error(previewOutputDir.error);
       const contractPath = join44(workspaceRoot, "contract.md");
+      const parsedContractPath = AbsolutePath.parse(contractPath);
+      if (!parsedContractPath.ok) return Result.error(parsedContractPath.error);
+      const parsedPromptPath = AbsolutePath.parse(join44(workspaceRoot, "prompt.md"));
+      if (!parsedPromptPath.ok) return Result.error(parsedPromptPath.error);
       const prompt = await buildImplementPrompt(deps.templateLoader, {
         task: input.task,
         projectPath: String(opts.cwd),
@@ -18883,9 +18883,9 @@ var buildTaskWorkspaceLeaf = (deps, opts, taskId) => leaf(`build-task-workspace-
         ...opts.verifyScript !== void 0 ? { verifyScript: opts.verifyScript } : {}
       });
       if (!prompt.ok) return Result.error(prompt.error);
-      const wrotePrompt = await writeOrError(join44(workspaceRoot, "prompt.md"), String(prompt.value));
+      const wrotePrompt = await deps.writeFile(parsedPromptPath.value, String(prompt.value));
       if (!wrotePrompt.ok) return Result.error(wrotePrompt.error);
-      const wroteContract = await writeOrError(contractPath, renderContractMd(input.task));
+      const wroteContract = await deps.writeFile(parsedContractPath.value, renderContractMd(input.task));
       if (!wroteContract.ok) return Result.error(wroteContract.error);
       log.debug("task workspace built", { taskId: input.task.id, workspaceRoot });
       const parsedRoot = AbsolutePath.parse(workspaceRoot);
@@ -19306,6 +19306,7 @@ var markTaskDone = (task, now) => {
     ...guard2.value.escalatedFromModel !== void 0 ? { escalatedFromModel: guard2.value.escalatedFromModel } : {},
     ...guard2.value.escalatedToModel !== void 0 ? { escalatedToModel: guard2.value.escalatedToModel } : {},
     ...guard2.value.escalatedToEffort !== void 0 ? { escalatedToEffort: guard2.value.escalatedToEffort } : {},
+    ...guard2.value.escalatedToEvaluatorEffort !== void 0 ? { escalatedToEvaluatorEffort: guard2.value.escalatedToEvaluatorEffort } : {},
     status: "done",
     attempts,
     finalAttemptN: verified.n
@@ -19350,6 +19351,11 @@ var recordTaskEffortEscalation = (task, toEffort) => {
   if (!to.ok) return Result.error(to.error);
   return Result.ok({ ...task, escalatedToEffort: to.value });
 };
+var recordTaskEvaluatorEffortEscalation = (task, toEffort) => {
+  const to = parseRequiredString("task.escalatedToEvaluatorEffort", toEffort);
+  if (!to.ok) return Result.error(to.error);
+  return Result.ok({ ...task, escalatedToEvaluatorEffort: to.value });
+};
 
 // src/business/task/escalation-policy.ts
 var BANNER_SHOW_EVENT = "banner-show";
@@ -19373,11 +19379,14 @@ var decideEscalation = (props) => {
   if (nudgedAtTop) return { kind: "topped-out", model: props.generatorModel };
   const effortTarget = nextEffortRung(props.generatorProvider, props.generatorModel, props.generatorEffort);
   if (effortTarget !== void 0) {
+    const evaluatorEffortTarget = props.evaluatorModel !== void 0 ? nextEffortRung(props.evaluatorProvider, props.evaluatorModel, props.evaluatorEffort) : void 0;
+    const evaluatorCarry = evaluatorEffortTarget !== void 0 ? { evaluator: { from: props.evaluatorEffort ?? "default", to: evaluatorEffortTarget } } : {};
     return {
       kind: "escalate-effort",
       model: props.generatorModel,
       from: props.generatorEffort ?? "default",
-      to: effortTarget
+      to: effortTarget,
+      ...evaluatorCarry
     };
   }
   return { kind: "nudge", currentModel: props.generatorModel };
@@ -19449,11 +19458,12 @@ var applyEscalation = (props) => {
       return Result.ok({ task: stamped.value });
     }
     case "escalate-effort": {
+      const evaluatorClause = decision.evaluator !== void 0 ? `; evaluator effort: ${decision.evaluator.from} \u2192 ${decision.evaluator.to}` : "";
       eventBus.publish({
         type: BANNER_SHOW_EVENT,
         id: bannerId,
         tier: "info",
-        message: `raised generator effort on '${decision.model}': ${decision.from} \u2192 ${decision.to}`,
+        message: `raised generator effort on '${decision.model}': ${decision.from} \u2192 ${decision.to}${evaluatorClause}`,
         cause,
         at: now
       });
@@ -19462,7 +19472,8 @@ var applyEscalation = (props) => {
         model: decision.model,
         from: decision.from,
         to: decision.to,
-        reason: trigger
+        reason: trigger,
+        ...decision.evaluator !== void 0 ? { evaluatorFrom: decision.evaluator.from, evaluatorTo: decision.evaluator.to } : {}
       });
       return Result.ok({ task });
     }
@@ -19563,7 +19574,12 @@ var resolveEscalatableRemedy = (exit, props, cfg) => {
     // provider (or the row carries no effort dimension the caller could resolve) the policy never
     // returns `escalate-effort` and behaves exactly as before.
     generatorProvider: props.generatorProvider,
-    generatorEffort: props.generatorEffort
+    generatorEffort: props.generatorEffort,
+    // Evaluator lockstep context — same optionality: absent context means the policy never
+    // returns an `evaluator` field on the decision.
+    evaluatorProvider: props.evaluatorProvider,
+    evaluatorModel: props.evaluatorModel,
+    evaluatorEffort: props.evaluatorEffort
   });
   const applied = applyEscalation({
     task: props.task,
@@ -19583,6 +19599,11 @@ var resolveEscalatableRemedy = (exit, props, cfg) => {
     const stamped = recordTaskEffortEscalation(task, decision.to);
     if (!stamped.ok) return Result.error(stamped.error);
     task = stamped.value;
+    if (decision.evaluator !== void 0) {
+      const evaluatorStamped = recordTaskEvaluatorEffortEscalation(task, decision.evaluator.to);
+      if (!evaluatorStamped.ok) return Result.error(evaluatorStamped.error);
+      task = evaluatorStamped.value;
+    }
   }
   const shouldFailAttempt = decision.kind === "escalate" || decision.kind === "escalate-effort" || decision.kind === "nudge";
   return Result.ok({
@@ -19679,7 +19700,10 @@ var finalizeGenEvalLeaf = (deps, taskId) => leaf(`finalize-gen-eval-${String(tas
       clock: deps.clock,
       generatorModel: input.generatorModel,
       ...input.generatorProvider !== void 0 ? { generatorProvider: input.generatorProvider } : {},
-      ...input.generatorEffort !== void 0 ? { generatorEffort: input.generatorEffort } : {}
+      ...input.generatorEffort !== void 0 ? { generatorEffort: input.generatorEffort } : {},
+      ...input.evaluatorProvider !== void 0 ? { evaluatorProvider: input.evaluatorProvider } : {},
+      ...input.evaluatorModel !== void 0 ? { evaluatorModel: input.evaluatorModel } : {},
+      ...input.evaluatorEffort !== void 0 ? { evaluatorEffort: input.evaluatorEffort } : {}
     })
   },
   input: (ctx) => {
@@ -19701,6 +19725,7 @@ var finalizeGenEvalLeaf = (deps, taskId) => leaf(`finalize-gen-eval-${String(tas
     }
     const generatorModel = ctx.currentTask.escalatedToModel ?? deps.configuredGeneratorModel;
     const generatorEffort = ctx.currentTask.escalatedToEffort ?? deps.configuredGeneratorEffort;
+    const evaluatorEffort = ctx.currentTask.escalatedToEvaluatorEffort ?? deps.configuredEvaluatorEffort;
     return {
       task: ctx.currentTask,
       sprintId: ctx.sprintId,
@@ -19708,7 +19733,10 @@ var finalizeGenEvalLeaf = (deps, taskId) => leaf(`finalize-gen-eval-${String(tas
       turnsUsed: ctx.genEvalTurn ?? 0,
       generatorModel,
       ...deps.configuredGeneratorProvider !== void 0 ? { generatorProvider: deps.configuredGeneratorProvider } : {},
-      ...generatorEffort !== void 0 ? { generatorEffort } : {}
+      ...generatorEffort !== void 0 ? { generatorEffort } : {},
+      ...deps.configuredEvaluatorProvider !== void 0 ? { evaluatorProvider: deps.configuredEvaluatorProvider } : {},
+      ...deps.configuredEvaluatorModel !== void 0 ? { evaluatorModel: deps.configuredEvaluatorModel } : {},
+      ...evaluatorEffort !== void 0 ? { evaluatorEffort } : {}
     };
   },
   output: (ctx, out) => {
@@ -19846,7 +19874,7 @@ var computePlateauVerdict = (priorTurns, current, options) => {
 
 // src/application/flows/implement/leaves/evaluator.ts
 import { dirname as dirname17, join as join46 } from "path";
-import { promises as fs23 } from "fs";
+import { promises as fs22 } from "fs";
 
 // src/business/task/turn-error-policy.ts
 var isRecoverableTurnError = (err) => err.code !== ErrorCode.Aborted && err.code !== ErrorCode.RateLimit;
@@ -20184,7 +20212,7 @@ var buildEvaluateContinuationPrompt = async (deps, input) => buildPrompt(deps, e
 
 // src/integration/ai/contract/_engine/corrective-retry.ts
 import { ZodError } from "zod";
-var isCorrectableContractError = (err) => err.code !== ErrorCode.Aborted && err.code !== ErrorCode.RateLimit && err.code !== ErrorCode.MigrationGap;
+var isCorrectableContractError = (err) => err instanceof InvalidStateError || err instanceof ParseError;
 var MAX_ENUMERATED_ISSUES = 10;
 var correctiveBody = (err, signalsPath, selfContainedContext) => {
   const lines = [];
@@ -20255,6 +20283,14 @@ var validateSignalsFileWithCorrectiveRetry = async (deps, contract) => {
       return Result.ok({ signals: revalidated.value, nudgeCount: attempt });
     }
     lastErr = revalidated.error;
+    if (!isCorrectableContractError(lastErr)) {
+      log.warn("corrective retry produced a non-correctable error \u2014 self-blocking without a further nudge", {
+        outputDir: String(deps.outputDir),
+        attempt,
+        error: lastErr.message
+      });
+      return Result.error(lastErr);
+    }
   }
   log.warn("corrective retries exhausted \u2014 self-blocking", {
     outputDir: String(deps.outputDir),
@@ -20526,7 +20562,7 @@ var evaluatorOutputContract = {
 };
 
 // src/application/flows/implement/leaves/round-artifacts.ts
-import { promises as fs22 } from "fs";
+import { promises as fs21 } from "fs";
 import { join as join45 } from "path";
 var nextRoundNum = async (workspaceRoot) => {
   const entries = await listDir(join45(String(workspaceRoot), "rounds"));
@@ -20545,7 +20581,7 @@ var readRoundSessionId = async (workspaceRoot, round, role) => {
   const path2 = join45(String(workspaceRoot), "rounds", String(round), role, "session-id.txt");
   let content;
   try {
-    content = await fs22.readFile(path2, "utf8");
+    content = await fs21.readFile(path2, "utf8");
   } catch {
     return void 0;
   }
@@ -20617,7 +20653,7 @@ var positiveCountCarry = (field, delta, prior) => delta > 0 ? { [field]: (prior
 // src/application/flows/implement/leaves/evaluator.ts
 var readCappedProgress = async (path2, currentTaskId, model) => {
   try {
-    return capProgressBody(await fs23.readFile(path2, "utf8"), {
+    return capProgressBody(await fs22.readFile(path2, "utf8"), {
       currentTaskId,
       recentBudgetTokens: progressCapBudgetForModel(model)
     });
@@ -20676,7 +20712,7 @@ var makeEvaluatorReinvoke = (deps, args) => async (corrective, attempt) => {
       args.signalsFile,
       "evaluator",
       resume,
-      deps.effort,
+      args.effectiveEffort,
       args.signal,
       bodyFile.ok ? bodyFile.value : void 0
     )
@@ -20704,7 +20740,8 @@ var makeEvaluatorCallEvaluate = (deps, args) => async (task) => {
   const initialBodyFile = AbsolutePath.parse(
     roundBodyPath(args.input.workspaceRoot, args.input.roundNum, "evaluator")
   );
-  const spawn3 = await deps.provider.generate(
+  const effectiveEffort = task.escalatedToEvaluatorEffort ?? deps.effort;
+  const spawn2 = await deps.provider.generate(
     implementSession(
       args.input.workspaceRoot,
       deps.cwd,
@@ -20714,12 +20751,12 @@ var makeEvaluatorCallEvaluate = (deps, args) => async (task) => {
       args.signalsFile,
       "evaluator",
       args.input.priorEvaluatorSessionId,
-      deps.effort,
+      effectiveEffort,
       args.signal,
       initialBodyFile.ok ? initialBodyFile.value : void 0
     )
   );
-  if (!spawn3.ok) return Result.error(spawn3.error);
+  if (!spawn2.ok) return Result.error(spawn2.error);
   const validated = await validateSignalsFileWithCorrectiveRetry(
     {
       outputDir: args.outputDir,
@@ -20741,6 +20778,7 @@ var makeEvaluatorCallEvaluate = (deps, args) => async (task) => {
         workspaceRoot: args.input.workspaceRoot,
         roundNum: args.input.roundNum,
         signalsFile: args.signalsFile,
+        effectiveEffort,
         priorEvaluatorSessionId: args.input.priorEvaluatorSessionId,
         signal: args.signal
       })
@@ -20860,7 +20898,7 @@ var evaluatorLeaf = (deps, taskId) => leaf(`evaluator-${String(taskId)}`, {
 
 // src/application/flows/implement/leaves/generator.ts
 import { dirname as dirname18, join as join47 } from "path";
-import { promises as fs25 } from "fs";
+import { promises as fs24 } from "fs";
 
 // src/business/task/run-generator-turn.ts
 var findTaskBlocked = (signals) => signals.find((s) => s.type === "task-blocked")?.reason;
@@ -21027,7 +21065,8 @@ var composeDimensionTrajectory = (input) => {
   const priorFailed = failedDimensions(prior.evaluation);
   const fixed = sortedLimited([...priorFailed].filter((d) => !latestFailed.has(d)));
   const newlyFailing = sortedLimited([...latestFailed].filter((d) => !priorFailed.has(d)));
-  const stillFailing = sortedLimited([...latestFailed].filter((d) => priorFailed.has(d)));
+  const stillFailingAll = [...latestFailed].filter((d) => priorFailed.has(d));
+  const stillFailing = sortedLimited(stillFailingAll);
   const lines = [];
   for (const d of fixed) {
     lines.push(`- ${d}: fixed since last round \u2014 keep it passing.`);
@@ -21041,7 +21080,7 @@ var composeDimensionTrajectory = (input) => {
   }
   if (lines.length === 0) return "";
   const threshold = Math.max(2, Math.trunc(input.plateauThreshold));
-  const longestStall = stillFailing.reduce((max, d) => Math.max(max, consecutiveFailing(history, d)), 0);
+  const longestStall = stillFailingAll.reduce((max, d) => Math.max(max, consecutiveFailing(history, d)), 0);
   const pressure = longestStall >= threshold - 1 ? [
     "",
     `Round ${String(input.roundNum)} of ${String(input.maxTurns)}; ${String(longestStall)} stalled round(s) \u2014 the harness exits this loop at ${String(threshold)} consecutive stalled rounds and escalates. Do NOT repeat the previous approach on a still-failing dimension; step back and try a fundamentally different fix.`
@@ -21160,7 +21199,7 @@ var formatRetryFeedback = (task, logTail) => {
 };
 
 // src/integration/io/read-log-tail.ts
-import { promises as fs24 } from "fs";
+import { promises as fs23 } from "fs";
 var DEFAULT_LOG_TAIL_BYTES = 4096;
 var createFsLogTailReader = () => {
   return async (path2, maxBytes = DEFAULT_LOG_TAIL_BYTES) => {
@@ -21168,7 +21207,7 @@ var createFsLogTailReader = () => {
     if (cap === 0) return "";
     let handle;
     try {
-      handle = await fs24.open(String(path2), "r");
+      handle = await fs23.open(String(path2), "r");
       const stat = await handle.stat();
       const size = stat.size;
       if (size <= 0) return "";
@@ -21199,7 +21238,7 @@ var countTurnActionKinds = (out) => {
 };
 var readCappedProgress2 = async (path2, currentTaskId, model) => {
   try {
-    return capProgressBody(await fs25.readFile(path2, "utf8"), {
+    return capProgressBody(await fs24.readFile(path2, "utf8"), {
       currentTaskId,
       recentBudgetTokens: progressCapBudgetForModel(model)
     });
@@ -21364,7 +21403,7 @@ var makeGeneratorCallImplement = (deps, taskId, args) => async (task) => {
   const effectiveModel = task.escalatedToModel ?? deps.model;
   const effectiveEffort = task.escalatedToEffort ?? deps.effort;
   const initialBodyFile = AbsolutePath.parse(roundBodyPath(args.input.workspaceRoot, args.roundNum, "generator"));
-  const spawn3 = await deps.provider.generate(
+  const spawn2 = await deps.provider.generate(
     implementSession(
       args.input.workspaceRoot,
       deps.cwd,
@@ -21379,7 +21418,7 @@ var makeGeneratorCallImplement = (deps, taskId, args) => async (task) => {
       initialBodyFile.ok ? initialBodyFile.value : void 0
     )
   );
-  if (!spawn3.ok) return Result.error(spawn3.error);
+  if (!spawn2.ok) return Result.error(spawn2.error);
   const validated = await validateSignalsFileWithCorrectiveRetry(
     {
       outputDir: args.outputDir,
@@ -22725,13 +22764,13 @@ var quarantineRetryDiffLeaf = (deps, opts, taskId) => leaf(`quarantine-retry-dif
 var isRedVerifyRetry = (ctx) => ctx.lastShouldFailAttempt === true && ctx.lastBlockReason !== void 0;
 
 // src/application/flows/implement/leaves/progress-journal.ts
-import { promises as fs26 } from "fs";
+import { promises as fs25 } from "fs";
 
 // src/business/sprint/render-sprint-state-header.ts
-var EM_DASH2 = "\u2014";
+var EM_DASH3 = "\u2014";
 var cell = (text) => neutralizeProseHeadings(sanitizeInline(text));
 var isStale = (task) => task.status === "in_progress" && task.attemptCount > 0;
-var orEmDash = (value) => value !== null && value.length > 0 ? value : EM_DASH2;
+var orEmDash = (value) => value !== null && value.length > 0 ? value : EM_DASH3;
 var renderIdentity = (input) => [
   `# Sprint: ${cell(input.sprintName)}`,
   "",
@@ -22751,7 +22790,7 @@ var renderBlockers = (tasks) => {
   const blockers = tasks.filter((t) => t.status === "blocked");
   if (blockers.length === 0) return [];
   const bullets = blockers.map((t) => {
-    const reason = t.blockedReason !== void 0 && t.blockedReason.trim().length > 0 ? cell(t.blockedReason) : EM_DASH2;
+    const reason = t.blockedReason !== void 0 && t.blockedReason.trim().length > 0 ? cell(t.blockedReason) : EM_DASH3;
     return `- ${cell(t.name)}: ${reason}`;
   });
   return ["## Blockers", "", ...bullets, ""];
@@ -22764,7 +22803,7 @@ var renderStale = (tasks) => {
   );
   return ["## Stale tasks", "", ...bullets, ""];
 };
-var passesCell = (task) => task.criteriaTotal === 0 ? EM_DASH2 : `${String(task.criteriaPassed)}/${String(task.criteriaTotal)}`;
+var passesCell = (task) => task.criteriaTotal === 0 ? EM_DASH3 : `${String(task.criteriaPassed)}/${String(task.criteriaTotal)}`;
 var renderTaskTable = (tasks) => {
   if (tasks.length === 0) return ["## Tasks", "", "_No tasks planned yet._", ""];
   const rows = tasks.map((t) => `| ${cell(t.name)} | ${t.status} | ${passesCell(t)} |`);
@@ -22902,7 +22941,7 @@ var buildAttemptSection = (input, totalRounds, clock) => {
 };
 var readExisting = async (path2) => {
   try {
-    return await fs26.readFile(String(path2), "utf8");
+    return await fs25.readFile(String(path2), "utf8");
   } catch {
     return "";
   }
@@ -23142,16 +23181,16 @@ ${output.slice(output.length - tail)}`;
 };
 
 // src/business/task/render-round-outcome.ts
-var EM_DASH3 = "\u2014";
+var EM_DASH4 = "\u2014";
 var renderRoundOutcome = (input) => {
   const lines = [];
   lines.push(`# Round ${String(input.roundN)} \xB7 attempt ${String(input.attemptN)}`);
   lines.push("");
-  lines.push(`- generator session: ${input.generatorSessionId ?? EM_DASH3}`);
-  lines.push(`- evaluator session: ${input.evaluatorSessionId ?? EM_DASH3}`);
-  lines.push(`- duration: ${formatDuration2(input.durationMs)}`);
+  lines.push(`- generator session: ${input.generatorSessionId ?? EM_DASH4}`);
+  lines.push(`- evaluator session: ${input.evaluatorSessionId ?? EM_DASH4}`);
+  lines.push(`- duration: ${formatDuration(input.durationMs)}`);
   lines.push(`- verdict: ${input.verdict}`);
-  lines.push(`- commit: ${input.attempt.commitSha !== void 0 ? String(input.attempt.commitSha) : EM_DASH3}`);
+  lines.push(`- commit: ${input.attempt.commitSha !== void 0 ? String(input.attempt.commitSha) : EM_DASH4}`);
   const dimensionsBlock = renderDimensions(input.evaluation, input.attempt.evaluation);
   if (dimensionsBlock !== void 0) {
     lines.push("");
@@ -23223,25 +23262,6 @@ var formatFailedDimensions = (evaluation) => {
 };
 var SHA_DISPLAY_LENGTH2 = 7;
 var shortSha = (sha) => sha.slice(0, SHA_DISPLAY_LENGTH2);
-var MS_PER_SECOND2 = 1e3;
-var MS_PER_MINUTE2 = 60 * MS_PER_SECOND2;
-var MS_PER_HOUR2 = 60 * MS_PER_MINUTE2;
-var formatDuration2 = (ms) => {
-  if (ms === void 0) return EM_DASH3;
-  if (ms < 0) return `${String(ms)}ms`;
-  if (ms < MS_PER_SECOND2) return `${String(ms)}ms`;
-  if (ms < MS_PER_MINUTE2) {
-    return `${String(Math.floor(ms / MS_PER_SECOND2))}s`;
-  }
-  if (ms < MS_PER_HOUR2) {
-    const minutes2 = Math.floor(ms / MS_PER_MINUTE2);
-    const seconds = Math.floor(ms % MS_PER_MINUTE2 / MS_PER_SECOND2);
-    return seconds > 0 ? `${String(minutes2)}m ${String(seconds)}s` : `${String(minutes2)}m`;
-  }
-  const hours = Math.floor(ms / MS_PER_HOUR2);
-  const minutes = Math.floor(ms % MS_PER_HOUR2 / MS_PER_MINUTE2);
-  return minutes > 0 ? `${String(hours)}h ${String(minutes)}m` : `${String(hours)}h`;
-};
 
 // src/application/flows/implement/leaves/settle-attempt.ts
 var settleAttemptLeaf = (deps, opts, taskId) => {
@@ -23651,7 +23671,7 @@ var createPerTaskSubchain = (deps, opts, task, repo, readConfig) => {
           )
         ] : [],
         buildTaskWorkspaceLeaf(
-          { templateLoader: deps.templateLoader, logger: deps.logger },
+          { templateLoader: deps.templateLoader, logger: deps.logger, writeFile: deps.writeFile },
           {
             sprintDir: opts.sprintDir,
             cwd: repo.path,
@@ -23759,7 +23779,14 @@ var createPerTaskSubchain = (deps, opts, task, repo, readConfig) => {
                 // before spending the nudge. `providerId` is the resolved provider enum string;
                 // `nextEffortRung` skips gracefully for any non-effort provider or model.
                 configuredGeneratorProvider: opts.generator.providerId,
-                ...opts.generator.effort !== void 0 ? { configuredGeneratorEffort: opts.generator.effort } : {}
+                ...opts.generator.effort !== void 0 ? { configuredGeneratorEffort: opts.generator.effort } : {},
+                // Same lockstep wiring for the EVALUATOR role: the policy computes its bump
+                // independently against this triple, never copying the generator's target. The
+                // evaluator MODEL is never escalated, but it still rides through so `nextEffortRung`
+                // can classify the evaluator's own effort ladder.
+                configuredEvaluatorProvider: opts.evaluator.providerId,
+                configuredEvaluatorModel: opts.evaluator.model,
+                ...opts.evaluator.effort !== void 0 ? { configuredEvaluatorEffort: opts.evaluator.effort } : {}
               },
               taskId
             ),
@@ -24892,6 +24919,16 @@ var createPublishSignal = (eventBus, source, taskId) => (signal) => {
   eventBus.publish({ type: "ai-signal", signal, source, ...taskId !== void 0 ? { taskId } : {} });
 };
 
+// src/application/flows/implement/sprint-scoped-projection.ts
+var projectSprintScopedFields = (ctx) => ({
+  sprintId: ctx.sprintId,
+  sprint: ctx.sprint,
+  execution: ctx.execution,
+  progressFile: ctx.progressFile,
+  setupVerifiedRepoIdsThisRun: ctx.setupVerifiedRepoIdsThisRun,
+  priorLearnings: ctx.priorLearnings
+});
+
 // src/application/flows/implement/merge-wave.ts
 var branchSettled = (outcome) => outcome.status === "completed" || outcome.error !== void 0;
 var mergeImplementWave = (base, outcomes) => {
@@ -24902,13 +24939,7 @@ var mergeImplementWave = (base, outcomes) => {
   }
   const tasks = base.tasks?.map((t) => byId.get(t.id) ?? t);
   return {
-    // sprint-scoped → base
-    sprintId: base.sprintId,
-    ...base.sprint !== void 0 ? { sprint: base.sprint } : {},
-    ...base.execution !== void 0 ? { execution: base.execution } : {},
-    ...base.progressFile !== void 0 ? { progressFile: base.progressFile } : {},
-    ...base.setupVerifiedRepoIdsThisRun !== void 0 ? { setupVerifiedRepoIdsThisRun: base.setupVerifiedRepoIdsThisRun } : {},
-    ...base.priorLearnings !== void 0 ? { priorLearnings: base.priorLearnings } : {},
+    ...projectSprintScopedFields(base),
     // task list → overlay
     ...tasks !== void 0 ? { tasks } : {}
     // per-task + signal-accum classes intentionally omitted → undefined in the merged ctx.
@@ -24916,17 +24947,8 @@ var mergeImplementWave = (base, outcomes) => {
 };
 var forkCtx = (base, repo, worktreePath) => {
   const ctx = {
-    // sprint-scoped → base
-    sprintId: base.sprintId,
-    ...base.sprint !== void 0 ? { sprint: base.sprint } : {},
-    ...base.execution !== void 0 ? { execution: base.execution } : {},
-    ...base.progressFile !== void 0 ? { progressFile: base.progressFile } : {},
-    ...base.tasks !== void 0 ? { tasks: base.tasks } : {},
-    // run-scoped (like `execution`): the set of repos this launch's setup verified survives the
-    // fork so a parallel branch's first pre-task-verify can also take the fresh-setup skip.
-    ...base.setupVerifiedRepoIdsThisRun !== void 0 ? { setupVerifiedRepoIdsThisRun: base.setupVerifiedRepoIdsThisRun } : {},
-    // run-scoped cross-sprint memory: every branch's generator reads the same loaded ledger.
-    ...base.priorLearnings !== void 0 ? { priorLearnings: base.priorLearnings } : {}
+    ...projectSprintScopedFields(base),
+    ...base.tasks !== void 0 ? { tasks: base.tasks } : {}
     // per-task + signal-accum classes cleared (omitted → undefined); `priorPostVerifyOutcome`
     // dropped (accepted cost). `expectedBranch` is intentionally NOT set here — see the docstring:
     // the branch element omits `branch-preflight`, so leaving it `undefined` is correct.
@@ -25776,7 +25798,7 @@ var launchImplement = async (ctx) => {
 import { join as join60 } from "path";
 
 // src/application/flows/review/leaves/ensure-feedback-file.ts
-import { promises as fs27 } from "fs";
+import { promises as fs26 } from "fs";
 
 // src/business/feedback/md-parser.ts
 var ROUND_HEADING_RE = /^##\s+Round\s+(\d+)\s*$/;
@@ -25851,12 +25873,12 @@ var ensureFeedbackFileLeaf = (feedbackFile) => leaf("ensure-feedback-file", {
   useCase: {
     execute: async (path2) => {
       try {
-        await fs27.access(String(path2));
+        await fs26.access(String(path2));
         return Result.ok(void 0);
       } catch {
       }
       try {
-        await fs27.writeFile(String(path2), TEMPLATE, { flag: "wx" });
+        await fs26.writeFile(String(path2), TEMPLATE, { flag: "wx" });
         return Result.ok(void 0);
       } catch (cause) {
         if (typeof cause === "object" && cause !== null && cause.code === "EEXIST") {
@@ -25878,7 +25900,7 @@ var ensureFeedbackFileLeaf = (feedbackFile) => leaf("ensure-feedback-file", {
 });
 
 // src/application/flows/review/leaves/review-round.ts
-import { promises as fs28 } from "fs";
+import { promises as fs27 } from "fs";
 import { join as join56 } from "path";
 
 // src/business/feedback/apply-feedback.ts
@@ -26061,7 +26083,7 @@ var reviewRoundOutputContract = {
 var readProgressSnippet = async (path2) => {
   if (path2 === void 0) return "_(no progress file)_";
   try {
-    const content = await fs28.readFile(String(path2), "utf8");
+    const content = await fs27.readFile(String(path2), "utf8");
     return content.length > 4e3 ? `${content.slice(0, 4e3)}
 [truncated]` : content;
   } catch {
@@ -26077,7 +26099,7 @@ ${renderEmptyRound(nextIndex)}${ROUND_SEPARATOR}
 };
 var deriveActiveRoundIndex = async (feedbackFile) => {
   try {
-    const raw = await fs28.readFile(String(feedbackFile), "utf8");
+    const raw = await fs27.readFile(String(feedbackFile), "utf8");
     const rounds = parseFeedbackMd(raw);
     return rounds.at(-1)?.index ?? 1;
   } catch {
@@ -26086,7 +26108,7 @@ var deriveActiveRoundIndex = async (feedbackFile) => {
 };
 var writeRoundBody = async (path2, body) => {
   try {
-    const content = await fs28.readFile(String(path2), "utf8");
+    const content = await fs27.readFile(String(path2), "utf8");
     const lastMarker = content.lastIndexOf(MARKER_COMMENT);
     if (lastMarker === -1) {
       return Result.error(
@@ -26126,7 +26148,7 @@ var allocateRoundPaths = (reviewRoot, roundIndex) => {
 };
 var ensureRoundDir = async (dir) => {
   try {
-    await fs28.mkdir(String(dir), { recursive: true });
+    await fs27.mkdir(String(dir), { recursive: true });
     return Result.ok(void 0);
   } catch (cause) {
     return Result.error(
@@ -26161,7 +26183,7 @@ var reviewRoundLeaf = (deps, opts) => leaf(LEAF_NAME3, {
           if (!wrote.ok) return Result.error(wrote.error);
           return Result.ok(void 0);
         },
-        readFeedbackFile: () => fs28.readFile(String(input.feedbackFile), "utf8"),
+        readFeedbackFile: () => fs27.readFile(String(input.feedbackFile), "utf8"),
         readProgressSnippet: () => readProgressSnippet(input.progressFile),
         buildPrompt: async (params) => {
           const outputContractSection = renderContractSectionFor(reviewRoundOutputContract, paths.value.outputDir);
@@ -26189,7 +26211,7 @@ var reviewRoundLeaf = (deps, opts) => leaf(LEAF_NAME3, {
           const promptWrote = await writeTextAtomic(String(paths.value.promptFile), String(prompt));
           if (!promptWrote.ok) return Result.error(promptWrote.error);
           const chainSessionId = currentSessionId();
-          const spawn3 = await deps.provider.generate({
+          const spawn2 = await deps.provider.generate({
             prompt,
             cwd: paths.value.outputDir,
             additionalRoots: opts.additionalRoots,
@@ -26202,7 +26224,7 @@ var reviewRoundLeaf = (deps, opts) => leaf(LEAF_NAME3, {
             // the provider's SIGTERM ladder instead of letting it run to completion.
             ...signal !== void 0 ? { abortSignal: signal } : {}
           });
-          if (!spawn3.ok) return Result.error(spawn3.error);
+          if (!spawn2.ok) return Result.error(spawn2.error);
           const validated = await validateSignalsFile(paths.value.outputDir, reviewRoundOutputContract);
           if (!validated.ok) return Result.error(validated.error);
           for (const sig of validated.value) deps.publishSignal(sig);
@@ -26432,7 +26454,7 @@ var stampPass = (collected, accepted, retired, stampTime, path2) => {
 var isLive = (record) => record.retiredAt === void 0 || record.retiredAt === null;
 
 // src/application/flows/_shared/memory/distill-propose.ts
-import { promises as fs29 } from "fs";
+import { promises as fs28 } from "fs";
 import { join as join58 } from "path";
 
 // src/integration/ai/prompts/distill-learnings/definition.ts
@@ -26544,7 +26566,7 @@ var distillProposeUseCase = async (deps, tool, input, signal) => {
   if (!prompt.ok) return Result.error(prompt.error);
   const toolDir = join58(String(deps.distillRoot), tool);
   try {
-    await fs29.mkdir(toolDir, { recursive: true });
+    await fs28.mkdir(toolDir, { recursive: true });
   } catch (cause) {
     return Result.error(
       new StorageError({
@@ -26598,11 +26620,11 @@ var renderProjectTooling = (repository) => {
   const lines = [];
   if (repository.setupScript !== void 0) lines.push(`- Setup: ${repository.setupScript}`);
   if (repository.verifyScript !== void 0) lines.push(`- Verify: ${repository.verifyScript}`);
-  return lines.length > 0 ? lines.join("\n") : "(none detected)";
+  return renderProjectToolingSection(lines.length > 0 ? lines.join("\n") : void 0);
 };
 var safeReadText = async (path2) => {
   try {
-    return await fs29.readFile(path2, "utf8");
+    return await fs28.readFile(path2, "utf8");
   } catch {
     return void 0;
   }
@@ -26665,7 +26687,7 @@ var distillConfirmLeaf = (deps, tool) => leaf(`distill-confirm-${tool}`, {
 });
 
 // src/application/flows/_shared/memory/distill-write.ts
-import { promises as fs30 } from "fs";
+import { promises as fs29 } from "fs";
 var distillWriteUseCase = async (deps, tool, input) => {
   const log = deps.logger.named(`memory.distill-write-${tool}`);
   if (!input.accepted || input.proposedContent === void 0 || input.targetPath === void 0) {
@@ -26694,14 +26716,14 @@ var distillWriteUseCase = async (deps, tool, input) => {
 var makeBackupPath = (targetPath, now) => `${String(targetPath)}.bak.${String(now).replace(/:/g, "-")}`;
 var fileExists = async (path2) => {
   try {
-    return (await fs30.stat(path2)).isFile();
+    return (await fs29.stat(path2)).isFile();
   } catch {
     return false;
   }
 };
 var safeReadText2 = async (path2) => {
   try {
-    return await fs30.readFile(path2, "utf8");
+    return await fs29.readFile(path2, "utf8");
   } catch {
     return void 0;
   }
@@ -27858,7 +27880,7 @@ var probeReadinessLeaf = (deps, tool) => leaf(`probe-${tool}`, {
 });
 
 // src/application/flows/readiness/leaves/propose.ts
-import { promises as fs31 } from "fs";
+import { promises as fs30 } from "fs";
 
 // src/integration/ai/prompts/readiness/definition.ts
 var CLAUDE_CODE = "claude-code";
@@ -28127,7 +28149,7 @@ var proposeReadinessUseCase = async (deps, tool, input, abortSignal) => {
   let existingBody;
   if (existingPath !== void 0) {
     try {
-      existingBody = await fs31.readFile(existingPath, "utf8");
+      existingBody = await fs30.readFile(existingPath, "utf8");
     } catch {
       existingBody = void 0;
     }
@@ -28259,7 +28281,7 @@ var proposeReadinessLeaf = (deps, tool) => leaf(`propose-${tool}`, {
 });
 
 // src/application/flows/readiness/leaves/write.ts
-import { promises as fs32 } from "fs";
+import { promises as fs31 } from "fs";
 var writeReadinessUseCase = async (deps, tool, input) => {
   const log = deps.logger.named(`readiness.write-${tool}`);
   if (!input.accepted || input.proposal === void 0) {
@@ -28293,7 +28315,7 @@ var makeBackupPath2 = (targetPath, now) => {
 };
 var fileExists2 = async (path2) => {
   try {
-    const stat = await fs32.stat(path2);
+    const stat = await fs31.stat(path2);
     return stat.isFile();
   } catch {
     return false;
@@ -28301,7 +28323,7 @@ var fileExists2 = async (path2) => {
 };
 var safeReadText3 = async (path2) => {
   try {
-    return await fs32.readFile(path2, "utf8");
+    return await fs31.readFile(path2, "utf8");
   } catch {
     return void 0;
   }
@@ -28326,11 +28348,11 @@ var writeReadinessLeaf = (deps, tool) => leaf(`write-${tool}`, {
 });
 
 // src/application/flows/_shared/allocate-run-dir.ts
-import { promises as fs34 } from "fs";
+import { promises as fs33 } from "fs";
 import { join as join63 } from "path";
 
 // src/integration/ai/runs/_engine/run-artifacts.ts
-import { promises as fs33 } from "fs";
+import { promises as fs32 } from "fs";
 import { join as join62 } from "path";
 var BODY_PREVIEW_LIMIT = 800;
 var buildRunDirName = () => {
@@ -28341,7 +28363,7 @@ var buildRunDirName = () => {
 var readRunBodyPreview = async (runDir, options) => {
   let raw;
   try {
-    raw = await fs33.readFile(join62(String(runDir), "body.txt"), "utf8");
+    raw = await fs32.readFile(join62(String(runDir), "body.txt"), "utf8");
   } catch (cause) {
     if (isErrnoException(cause) && cause.code === "ENOENT") return void 0;
     const code = isErrnoException(cause) ? cause.code : "unknown";
@@ -28361,7 +28383,7 @@ var allocateRunDirLeaf = (opts) => leaf(opts.name, {
   useCase: {
     execute: async (input) => {
       try {
-        await fs34.mkdir(input.path, { recursive: true });
+        await fs33.mkdir(input.path, { recursive: true });
       } catch (cause) {
         return Result.error(
           new StorageError({
@@ -28749,16 +28771,16 @@ var proposeUseCase = async (deps, input, abortSignal) => {
   if (!prompt.ok) return Result.error(prompt.error);
   const promptWrote = await writeTextAtomic(String(paths.value.promptFile), String(prompt.value));
   if (!promptWrote.ok) return Result.error(promptWrote.error);
-  const spawn3 = await deps.provider.generate(
+  const spawn2 = await deps.provider.generate(
     readOnlySignalsSession(buildSessionOpts(deps, input, paths.value, prompt.value, abortSignal))
   );
-  if (!spawn3.ok) {
+  if (!spawn2.ok) {
     log.error(`provider failed for repo ${input.repository.name}`, {
       repositoryId: String(input.repository.id),
-      error: spawn3.error.message,
+      error: spawn2.error.message,
       runDir: String(input.runDir)
     });
-    return Result.error(spawn3.error);
+    return Result.error(spawn2.error);
   }
   const validated = await validateSignalsFile(input.runDir, detectSkillsOutputContract);
   if (!validated.ok) {
@@ -29194,16 +29216,16 @@ var proposeUseCase2 = async (deps, input, abortSignal) => {
   if (!prompt.ok) return Result.error(prompt.error);
   const promptWrote = await writeTextAtomic(String(paths.value.promptFile), String(prompt.value));
   if (!promptWrote.ok) return Result.error(promptWrote.error);
-  const spawn3 = await deps.provider.generate(
+  const spawn2 = await deps.provider.generate(
     readOnlySignalsSession(buildSessionOpts2(deps, input, paths.value, prompt.value, abortSignal))
   );
-  if (!spawn3.ok) {
+  if (!spawn2.ok) {
     log.error(`provider failed for repo ${input.repository.name}`, {
       repositoryId: String(input.repository.id),
-      error: spawn3.error.message,
+      error: spawn2.error.message,
       runDir: String(input.runDir)
     });
-    return Result.error(spawn3.error);
+    return Result.error(spawn2.error);
   }
   const validated = await validateSignalsFile(input.runDir, detectScriptsOutputContract);
   if (!validated.ok) {
@@ -31025,8 +31047,8 @@ var defaultRowFor = (flowId, settings) => {
   return primaryFlowRow(settings.ai, aiFlow);
 };
 var labelKeepDefault = (value) => `Keep default (${value ?? "unset"})`;
-var formatRow = (row, globalEffort) => {
-  const resolved = resolveEffortForRow(row, globalEffort);
+var formatRow = (row, globalEffort, flow) => {
+  const resolved = resolveEffortForRow(row, globalEffort, flow);
   return `${row.provider} / ${row.model} / ${resolved ?? "auto"}`;
 };
 var pickProviderStep = async (interactive, header, defaultRow) => {
@@ -31060,9 +31082,9 @@ var computeEffortDefaultLabel = (defaultRow, globalEffort, providerChanged, mode
   }
   return labelKeepDefault(resolvedRowEffort ?? "auto");
 };
-var pickEffortStep = async (interactive, header, defaultRow, globalEffort, effectiveProvider, providerChanged, modelChanged) => {
+var pickEffortStep = async (interactive, header, defaultRow, globalEffort, effectiveProvider, providerChanged, modelChanged, flow) => {
   const effortCatalog = PROVIDER_EFFORT_LEVELS[effectiveProvider];
-  const resolvedRowEffort = resolveEffortForRow(defaultRow, globalEffort);
+  const resolvedRowEffort = resolveEffortForRow(defaultRow, globalEffort, flow);
   const effortDefaultLabel = computeEffortDefaultLabel(
     defaultRow,
     globalEffort,
@@ -31087,7 +31109,7 @@ var assembleRowOverride = (defaultRow, providerChanged, providerValue, modelValu
   if (providerChanged && override.model === void 0) override.model = modelValue;
   return override;
 };
-var customizeRow = async (interactive, header, defaultRow, globalEffort, availableModelsFor) => {
+var customizeRow = async (interactive, header, defaultRow, globalEffort, availableModelsFor, flow) => {
   const providerStep = await pickProviderStep(interactive, header, defaultRow);
   if (providerStep === void 0) return void 0;
   const { providerValue, providerChanged, effectiveProvider } = providerStep;
@@ -31108,14 +31130,15 @@ var customizeRow = async (interactive, header, defaultRow, globalEffort, availab
     globalEffort,
     effectiveProvider,
     providerChanged,
-    modelChanged
+    modelChanged,
+    flow
   );
   if (effortValue === void 0) return void 0;
   return assembleRowOverride(defaultRow, providerChanged, providerValue, modelValue, effortValue);
 };
-var buildPickerHeader = (flowId, flowTitle, settings) => flowId === "implement" ? `${flowTitle} \u2014 current defaults:
-  generator: ${formatRow(settings.ai.implement.generator, settings.ai.effort)}
-  evaluator: ${formatRow(settings.ai.implement.evaluator, settings.ai.effort)}` : `${flowTitle} \u2014 current default: ${formatRow(defaultRowFor(flowId, settings), settings.ai.effort)}`;
+var buildPickerHeader = (flowId, flowTitle, settings, aiFlow) => flowId === "implement" ? `${flowTitle} \u2014 current defaults:
+  generator: ${formatRow(settings.ai.implement.generator, settings.ai.effort, aiFlow)}
+  evaluator: ${formatRow(settings.ai.implement.evaluator, settings.ai.effort, aiFlow)}` : `${flowTitle} \u2014 current default: ${formatRow(defaultRowFor(flowId, settings), settings.ai.effort, aiFlow)}`;
 var originLabel = (origin) => {
   switch (origin) {
     case "bundled-default":
@@ -31173,7 +31196,7 @@ var runSkillsStep = async (interactive, flowTitle, skillCandidates) => {
     skills: { disabled, saveAsDefault: saveAns.value === "remember" }
   };
 };
-var runImplementCustomize = async (interactive, header, flowTitle, settings, availableModelsFor, skillsStepInput) => {
+var runImplementCustomize = async (interactive, header, flowTitle, settings, availableModelsFor, skillsStepInput, aiFlow) => {
   const roles = ["generator", "evaluator"];
   const collected = {};
   for (const role of roles) {
@@ -31181,7 +31204,7 @@ var runImplementCustomize = async (interactive, header, flowTitle, settings, ava
     const roleHeader = `${header}
 
 Role: ${role}`;
-    const result = await customizeRow(interactive, roleHeader, row, settings.ai.effort, availableModelsFor);
+    const result = await customizeRow(interactive, roleHeader, row, settings.ai.effort, availableModelsFor, aiFlow);
     if (result === void 0) return { kind: "cancel" };
     if (Object.keys(result).length > 0) collected[role] = result;
   }
@@ -31205,10 +31228,10 @@ Role: ${role}`;
     ...skills !== void 0 ? { skills } : {}
   };
 };
-var runSingleRowCustomize = async (interactive, header, flowId, flowTitle, settings, availableModelsFor, skillsStepInput) => {
+var runSingleRowCustomize = async (interactive, header, flowId, flowTitle, settings, availableModelsFor, skillsStepInput, aiFlow) => {
   const defaultRow = defaultRowFor(flowId, settings);
   if (defaultRow === void 0) return { kind: "defaults" };
-  const override = await customizeRow(interactive, header, defaultRow, settings.ai.effort, availableModelsFor);
+  const override = await customizeRow(interactive, header, defaultRow, settings.ai.effort, availableModelsFor, aiFlow);
   if (override === void 0) return { kind: "cancel" };
   const candidates = await effectiveSkillCandidates(
     skillsStepInput.candidates,
@@ -31234,7 +31257,7 @@ var runCustomizePicker = async ({
 }) => {
   const aiFlow = aiFlowIdForPicker(flowId);
   if (aiFlow === void 0) return { kind: "defaults" };
-  const header = buildPickerHeader(flowId, flowTitle, settings);
+  const header = buildPickerHeader(flowId, flowTitle, settings, aiFlow);
   const action = await interactive.askChoice(
     `${header}
 
@@ -31252,9 +31275,18 @@ What would you like to do?`,
     ...rebuildSkillCandidates !== void 0 ? { rebuild: rebuildSkillCandidates } : {}
   };
   if (flowId === "implement") {
-    return runImplementCustomize(interactive, header, flowTitle, settings, availableModelsFor, skillsStepInput);
+    return runImplementCustomize(interactive, header, flowTitle, settings, availableModelsFor, skillsStepInput, aiFlow);
   }
-  return runSingleRowCustomize(interactive, header, flowId, flowTitle, settings, availableModelsFor, skillsStepInput);
+  return runSingleRowCustomize(
+    interactive,
+    header,
+    flowId,
+    flowTitle,
+    settings,
+    availableModelsFor,
+    skillsStepInput,
+    aiFlow
+  );
 };
 
 // src/application/flows/settings-set/flow.ts
@@ -31765,10 +31797,10 @@ var FeedbackLine = ({ text }) => {
   if (text === void 0) return null;
   if (typeof text === "string") {
     const { color: color2, body } = resolveStructured(text);
-    return /* @__PURE__ */ jsx45(Box34, { paddingX: spacing.indent, marginTop: 1, children: /* @__PURE__ */ jsx45(Text35, { color: color2, children: body }) });
+    return /* @__PURE__ */ jsx45(Box34, { paddingX: spacing.indent, marginTop: spacing.section, children: /* @__PURE__ */ jsx45(Text35, { color: color2, children: body }) });
   }
   const { glyph, color } = toneConfig(text.tone);
-  return /* @__PURE__ */ jsx45(Box34, { paddingX: spacing.indent, marginTop: 1, children: /* @__PURE__ */ jsxs34(Text35, { color, children: [
+  return /* @__PURE__ */ jsx45(Box34, { paddingX: spacing.indent, marginTop: spacing.section, children: /* @__PURE__ */ jsxs34(Text35, { color, children: [
     glyph.length > 0 ? `${glyph} ` : "",
     text.text
   ] }) });
@@ -34374,7 +34406,7 @@ var HeaderCardImpl = ({
           String(tasksTotal)
         ] })
       ] }),
-      isRunning && /* @__PURE__ */ jsx62(Box50, { marginLeft: 2, children: /* @__PURE__ */ jsx62(Spinner, { active: isRunning, color: inkColors.info, label: "live" }) })
+      isRunning && /* @__PURE__ */ jsx62(Box50, { marginLeft: spacing.indent, children: /* @__PURE__ */ jsx62(Spinner, { active: isRunning, color: inkColors.info, label: "live" }) })
     ] }),
     /* @__PURE__ */ jsx62(
       ModelLines,
@@ -35144,7 +35176,7 @@ var TASK_STATUS_COLOR = {
   aborted: inkColors.warning,
   skipped: inkColors.muted
 };
-var SidebarDivider = ({ width }) => /* @__PURE__ */ jsx69(Box56, { paddingX: 1, marginTop: spacing.gutter, children: /* @__PURE__ */ jsx69(Text56, { color: inkColors.rule, children: glyphs.sectionRule.repeat(Math.max(0, width - 2)) }) });
+var SidebarDivider = ({ width }) => /* @__PURE__ */ jsx69(Box56, { paddingX: spacing.gutter, marginTop: spacing.gutter, children: /* @__PURE__ */ jsx69(Text56, { color: inkColors.rule, children: glyphs.sectionRule.repeat(Math.max(0, width - 2)) }) });
 var truncateName = (name, maxChars) => name.length > maxChars ? `${name.slice(0, Math.max(0, maxChars - 1))}${glyphs.clipEllipsis}` : name;
 var TaskNavList = ({
   tasks,
@@ -39388,10 +39420,10 @@ var projectInput = (ctx) => {
 };
 var runAuthoringSpawn = async (deps, session, unitRoot, log) => {
   try {
-    const spawn3 = await deps.provider.generate(session);
-    if (!spawn3.ok) {
-      if (spawn3.error.code === ErrorCode.Aborted) return Result.error(spawn3.error);
-      log.warn(`create-pr: AI authoring failed, falling back to template (${spawn3.error.message})`);
+    const spawn2 = await deps.provider.generate(session);
+    if (!spawn2.ok) {
+      if (spawn2.error.code === ErrorCode.Aborted) return Result.error(spawn2.error);
+      log.warn(`create-pr: AI authoring failed, falling back to template (${spawn2.error.message})`);
       return Result.ok({});
     }
     const validated = await validateSignalsFile(unitRoot, generatePrContentOutputContract);
@@ -39861,7 +39893,7 @@ import { basename as basename5, join as join69 } from "path";
 
 // src/application/ui/tui/prompts/path-picker-prompt.tsx
 import { useEffect as useEffect40, useState as useState45 } from "react";
-import { promises as fs35 } from "fs";
+import { promises as fs34 } from "fs";
 import { dirname as dirname21, join as join68 } from "path";
 import { homedir as homedir2 } from "os";
 import { Box as Box76, Text as Text72, useInput as useInput28 } from "ink";
@@ -39880,7 +39912,7 @@ var useDirectoryEntries = (cwd, showHidden) => {
     let cancelled = false;
     const load = async () => {
       try {
-        const items = await fs35.readdir(cwd, { withFileTypes: true });
+        const items = await fs34.readdir(cwd, { withFileTypes: true });
         if (cancelled) return;
         const filtered = items.filter((d) => showHidden || !d.name.startsWith(".")).filter((d) => d.isDirectory()).map((d) => ({ name: d.name, isDirectory: true })).sort((a, b) => a.name.localeCompare(b.name));
         setEntries(filtered);
@@ -39962,7 +39994,7 @@ var submitTypedPath = async (raw, { setError, setTyping, onSubmit }) => {
     return;
   }
   try {
-    const stat = await fs35.stat(expanded);
+    const stat = await fs34.stat(expanded);
     if (!stat.isDirectory()) {
       setError(`${expanded} is not a directory`);
       setTyping(false);
@@ -40037,8 +40069,8 @@ var PathPickerPrompt = ({
     ] }) }),
     /* @__PURE__ */ jsx94(Box76, { paddingX: spacing.indent, children: /* @__PURE__ */ jsx94(Text72, { dimColor: true, children: cwd }) }),
     error !== void 0 && /* @__PURE__ */ jsx94(Box76, { paddingX: spacing.indent, children: /* @__PURE__ */ jsx94(Text72, { color: inkColors.error, children: error }) }),
-    /* @__PURE__ */ jsx94(Box76, { flexDirection: "column", marginTop: 1, children: /* @__PURE__ */ jsx94(PathPickerRows, { rows, start, end, cursor }) }),
-    typing ? /* @__PURE__ */ jsxs72(Box76, { flexDirection: "column", marginTop: 1, paddingX: spacing.indent, children: [
+    /* @__PURE__ */ jsx94(Box76, { flexDirection: "column", marginTop: spacing.section, children: /* @__PURE__ */ jsx94(PathPickerRows, { rows, start, end, cursor }) }),
+    typing ? /* @__PURE__ */ jsxs72(Box76, { flexDirection: "column", marginTop: spacing.section, paddingX: spacing.indent, children: [
       /* @__PURE__ */ jsx94(Text72, { dimColor: true, children: "Type an absolute path (~/ allowed). Enter validates; esc returns to the picker." }),
       /* @__PURE__ */ jsx94(
         TextPrompt,
@@ -40049,7 +40081,7 @@ var PathPickerPrompt = ({
           onCancel: () => setTyping(false)
         }
       )
-    ] }) : /* @__PURE__ */ jsx94(Box76, { paddingX: spacing.indent, marginTop: 1, children: /* @__PURE__ */ jsxs72(Text72, { dimColor: true, children: [
+    ] }) : /* @__PURE__ */ jsx94(Box76, { paddingX: spacing.indent, marginTop: spacing.section, children: /* @__PURE__ */ jsxs72(Text72, { dimColor: true, children: [
       "\u21B5 open/select \xB7 \u232B up \xB7 esc cancel \xB7 ~ home \xB7 t type \xB7 . ",
       showHidden ? "hide" : "show",
       " hidden"
@@ -40967,7 +40999,7 @@ var PickProjectView = () => {
 };
 
 // src/application/ui/tui/views/pick-sprint-view.tsx
-import { useEffect as useEffect45, useMemo as useMemo29, useState as useState50 } from "react";
+import { useMemo as useMemo29, useState as useState50 } from "react";
 import { Box as Box85, Text as Text80, useInput as useInput31 } from "ink";
 
 // src/application/ui/tui/views/pick-sprint-internals/types.ts
@@ -41032,99 +41064,75 @@ var flatten = (groups, includeCreate) => {
   }
   return rows;
 };
-var cursorableRowIndices = (rows) => {
-  const indices = [];
-  for (let i = 0; i < rows.length; i += 1) {
-    const kind = rows[i]?.kind;
-    if (kind === "sprint" || kind === "create") indices.push(i);
-  }
-  return indices;
-};
-var nextCursorableIndex = (rows, from, direction) => {
-  const candidates = cursorableRowIndices(rows);
-  if (candidates.length === 0) return from;
-  if (direction === 1) {
-    const next = candidates.find((i) => i > from);
-    return next ?? from;
-  }
-  let prev = from;
-  for (const i of candidates) {
-    if (i < from) prev = i;
-    else break;
-  }
-  return prev === from && candidates.includes(from) ? from : prev;
-};
-var cursorableNear = (rows, target, direction) => {
-  const candidates = cursorableRowIndices(rows);
-  if (candidates.length === 0) return target;
-  if (candidates.includes(target)) return target;
-  const below = candidates.find((i) => i > target);
-  let above;
-  for (const i of candidates) {
-    if (i < target) above = i;
-    else break;
+var CREATE_ROW_ID = "__create__";
+var cursorableRows = (rows) => rows.filter((r) => r.kind !== "header");
+var cursorableRowId = (row) => row.kind === "create" ? CREATE_ROW_ID : row.sprint.id;
+var preferredCursorId = (rows, preferredSprintId) => {
+  if (preferredSprintId !== void 0) {
+    const match = rows.find((r) => r.kind === "sprint" && r.sprint.id === preferredSprintId);
+    if (match !== void 0) return match.sprint.id;
   }
-  const preferred = direction === 1 ? below : above;
-  const fallback = direction === 1 ? above : below;
-  return preferred ?? fallback ?? target;
+  const firstSprint = rows.find((r) => r.kind === "sprint");
+  if (firstSprint !== void 0) return firstSprint.sprint.id;
+  const firstCreate = rows.find((r) => r.kind === "create");
+  return firstCreate !== void 0 ? CREATE_ROW_ID : "";
 };
 
 // src/application/ui/tui/views/pick-sprint-internals/window.ts
 var VERTICAL_CHROME_ROWS = 12;
 var MIN_VISIBLE_ROWS = 8;
-var computeWindow = (totalRows, cursor, visible) => {
-  if (totalRows <= visible) return { start: 0, end: totalRows, hiddenAbove: 0, hiddenBelow: 0 };
-  const half = Math.floor(visible / 2);
-  let start = Math.max(0, cursor - half);
-  let end = start + visible;
-  if (end > totalRows) {
-    end = totalRows;
-    start = Math.max(0, end - visible);
-  }
-  return { start, end, hiddenAbove: start, hiddenBelow: totalRows - end };
-};
 
 // src/application/ui/tui/views/pick-sprint-internals/row-views.tsx
 import { useMemo as useMemo28 } from "react";
 import { Box as Box84, Text as Text79 } from "ink";
 import { jsx as jsx102, jsxs as jsxs80 } from "react/jsx-runtime";
-var RowWindowView = ({
+var PickerRowList = ({
   rows,
-  cursor,
   visibleRows,
-  currentSprintId
+  active,
+  initialCursorId,
+  currentSprintId,
+  onSubmit
 }) => {
-  const window = useMemo28(() => computeWindow(rows.length, cursor, visibleRows), [rows.length, cursor, visibleRows]);
-  const slice = rows.slice(window.start, window.end);
+  const items = useMemo28(() => cursorableRows(rows), [rows]);
+  const { focusedItem } = useListWindow({
+    items,
+    getId: cursorableRowId,
+    visibleRows,
+    active,
+    initialCursorId,
+    onSubmit
+  });
+  const focusedId = focusedItem !== void 0 ? cursorableRowId(focusedItem) : void 0;
+  const focusedRowIndex = useMemo28(() => {
+    if (focusedId === void 0) return 0;
+    const idx = rows.findIndex((row) => row.kind !== "header" && cursorableRowId(row) === focusedId);
+    return idx < 0 ? 0 : idx;
+  }, [rows, focusedId]);
+  const renderWindow = useMemo28(
+    () => computeListWindow(rows.length, focusedRowIndex, visibleRows),
+    [rows.length, focusedRowIndex, visibleRows]
+  );
+  const renderRows = useMemo28(
+    () => rows.slice(renderWindow.start, renderWindow.end),
+    [rows, renderWindow.start, renderWindow.end]
+  );
   return /* @__PURE__ */ jsxs80(Box84, { flexDirection: "column", children: [
-    window.hiddenAbove > 0 && /* @__PURE__ */ jsx102(Box84, { paddingX: spacing.indent, children: /* @__PURE__ */ jsxs80(Text79, { dimColor: true, children: [
-      "\u25B2 ",
-      String(window.hiddenAbove),
-      " more above"
-    ] }) }),
-    slice.map((row, i) => {
-      const absoluteIndex = i + window.start;
-      if (row.kind === "header") {
-        return /* @__PURE__ */ jsx102(HeaderRowView, { row }, `h-${row.groupKey}-${String(absoluteIndex)}`);
-      }
-      if (row.kind === "create") {
-        return /* @__PURE__ */ jsx102(CreateRowView, { focused: absoluteIndex === cursor }, `create-${String(absoluteIndex)}`);
-      }
+    /* @__PURE__ */ jsx102(OverflowRow, { direction: "above", count: renderWindow.start }),
+    renderRows.map((row) => {
+      if (row.kind === "header") return /* @__PURE__ */ jsx102(HeaderRowView, { row }, `h-${row.groupKey}`);
+      if (row.kind === "create") return /* @__PURE__ */ jsx102(CreateRowView, { focused: focusedId === cursorableRowId(row) }, "create");
       return /* @__PURE__ */ jsx102(
         SprintRowView,
         {
           sprint: row.sprint,
-          focused: absoluteIndex === cursor,
+          focused: focusedId === row.sprint.id,
           isCurrent: currentSprintId === row.sprint.id
         },
         row.sprint.id
       );
     }),
-    window.hiddenBelow > 0 && /* @__PURE__ */ jsx102(Box84, { paddingX: spacing.indent, children: /* @__PURE__ */ jsxs80(Text79, { dimColor: true, children: [
-      "\u25BC ",
-      String(window.hiddenBelow),
-      " more below"
-    ] }) })
+    /* @__PURE__ */ jsx102(OverflowRow, { direction: "below", count: rows.length - renderWindow.end })
   ] });
 };
 var CreateRowView = ({ focused }) => /* @__PURE__ */ jsxs80(Box84, { flexDirection: "column", paddingX: spacing.indent, children: [
@@ -41186,15 +41194,6 @@ var SprintRowView = ({
 
 // src/application/ui/tui/views/pick-sprint-view.tsx
 import { Fragment as Fragment12, jsx as jsx103, jsxs as jsxs81 } from "react/jsx-runtime";
-var preferredCursorIndex = (rows, preferredSprintId) => {
-  if (preferredSprintId !== void 0) {
-    const i = rows.findIndex((r) => r.kind === "sprint" && r.sprint.id === preferredSprintId);
-    if (i !== -1) return i;
-  }
-  const firstSprint = rows.findIndex((r) => r.kind === "sprint");
-  if (firstSprint !== -1) return firstSprint;
-  return cursorableRowIndices(rows)[0] ?? 0;
-};
 var usePickerRows = (deps, selection) => {
   const [scopeAll, setScopeAll] = useState50(true);
   const [hideDone, setHideDone] = useState50(false);
@@ -41229,28 +41228,7 @@ var usePickerRows = (deps, selection) => {
     if (!hideDone || sprintCount > 0) return false;
     return flatten(buildGroups(data, selection.projectId, scopeAll), false).some((r) => r.kind === "sprint");
   }, [hideDone, sprintCount, data, selection.projectId, scopeAll]);
-  const initialIdx = useMemo29(() => preferredCursorIndex(rows, selection.sprintId), [rows, selection.sprintId]);
-  const [cursor, setCursor] = useState50(initialIdx);
-  useEffect45(() => {
-    setCursor((c) => {
-      if (rows.length === 0) return 0;
-      if (c >= rows.length) return Math.max(0, rows.length - 1);
-      const focused = rows[c];
-      if (focused?.kind !== "sprint" && focused?.kind !== "create") {
-        return cursorableRowIndices(rows)[0] ?? c;
-      }
-      return c;
-    });
-  }, [rows]);
-  useEffect45(() => {
-    setCursor(initialIdx);
-  }, [initialIdx]);
-  const toggleScope = () => {
-    const next = !scopeAll;
-    setScopeAll(next);
-    const nextRows = flatten(buildGroups(visibleData, selection.projectId, next), includeCreate);
-    setCursor(preferredCursorIndex(nextRows, selection.sprintId));
-  };
+  const toggleScope = () => setScopeAll((v) => !v);
   return {
     state,
     reload,
@@ -41261,24 +41239,9 @@ var usePickerRows = (deps, selection) => {
     scopeAll,
     hideDone,
     setHideDone,
-    toggleScope,
-    cursor,
-    setCursor
+    toggleScope
   };
 };
-var isNavigationInput = (input, key) => key.upArrow || key.downArrow || key.pageUp || key.pageDown || key.home || key.end || input === "j" || input === "k";
-var resolveArrowMove = (rows, cursor, visibleRows, input, key) => {
-  if (key.upArrow || input === "k") return nextCursorableIndex(rows, cursor, -1);
-  if (key.downArrow || input === "j") return nextCursorableIndex(rows, cursor, 1);
-  if (key.pageUp) return cursorableNear(rows, Math.max(0, cursor - visibleRows), -1);
-  if (key.pageDown) return cursorableNear(rows, Math.min(rows.length - 1, cursor + visibleRows), 1);
-  if (key.home) return cursorableRowIndices(rows)[0] ?? 0;
-  if (key.end) {
-    const candidates = cursorableRowIndices(rows);
-    return candidates[candidates.length - 1] ?? cursor;
-  }
-  return void 0;
-};
 var PickerBody = ({
   helpOpen,
   state,
@@ -41287,11 +41250,14 @@ var PickerBody = ({
   scopeAll,
   hideDone,
   rows,
-  cursor,
   visibleRows,
+  listActive,
+  initialCursorId,
+  listKey,
   currentSprintId,
   currentSprintLabel,
-  feedback: feedback2
+  feedback: feedback2,
+  onRowSubmit
 }) => helpOpen ? /* @__PURE__ */ jsx103(HelpOverlay, {}) : state.kind === "loading" || state.kind === "idle" ? /* @__PURE__ */ jsx103(LoadingRow, { label: "Loading sprints\u2026" }) : state.kind === "error" ? /* @__PURE__ */ jsx103(LoadErrorRow, { message: "Failed to load sprints.", color: inkColors.error }) : sprintCount === 0 ? /* @__PURE__ */ jsx103(Box85, { flexDirection: "column", paddingX: spacing.indent, children: hiddenByDoneFilter ? /* @__PURE__ */ jsxs81(Fragment12, { children: [
   /* @__PURE__ */ jsx103(Text80, { children: "All sprints here are done (hidden)." }),
   /* @__PURE__ */ jsx103(Text80, { dimColor: true, children: "Press f to show them, or + to create a new one." })
@@ -41316,7 +41282,18 @@ var PickerBody = ({
       /* @__PURE__ */ jsx103(Text80, { color: inkColors.primary, bold: true, children: currentSprintLabel })
     ] }) : /* @__PURE__ */ jsx103(Text80, { children: "press \u21B5 to confirm" })
   ] }) }),
-  /* @__PURE__ */ jsx103(RowWindowView, { rows, cursor, visibleRows, currentSprintId }),
+  /* @__PURE__ */ jsx103(
+    PickerRowList,
+    {
+      rows,
+      visibleRows,
+      active: listActive,
+      initialCursorId,
+      currentSprintId,
+      onSubmit: onRowSubmit
+    },
+    listKey
+  ),
   /* @__PURE__ */ jsx103(Box85, { marginTop: spacing.section, paddingX: spacing.indent, children: /* @__PURE__ */ jsxs81(Text80, { dimColor: true, children: [
     glyphs.bullet,
     " \u21B5 use the highlighted sprint ",
@@ -41330,67 +41307,15 @@ var PickerBody = ({
     glyphs.bullet,
     " + create a new one"
   ] }) }),
-  feedback2 !== void 0 && /* @__PURE__ */ jsx103(Box85, { paddingX: spacing.indent, marginTop: 1, children: /* @__PURE__ */ jsx103(Text80, { color: inkColors.error, children: feedback2 }) })
+  feedback2 !== void 0 && /* @__PURE__ */ jsx103(Box85, { paddingX: spacing.indent, marginTop: spacing.section, children: /* @__PURE__ */ jsx103(Text80, { color: inkColors.error, children: feedback2 }) })
 ] });
-var usePickerInput = ({
-  modalOpen,
-  rows,
-  cursor,
-  visibleRows,
-  setCursor,
-  pick,
-  launchCreateSprint: launchCreateSprint2,
-  toggleScope,
-  setHideDone,
-  reload
-}) => {
-  useInput31((input, key) => {
-    if (modalOpen) return;
-    if (isNavigationInput(input, key)) {
-      setCursor((c) => resolveArrowMove(rows, c, visibleRows, input, key) ?? c);
-      return;
-    }
-    if (key.return) {
-      const row = rows[cursor];
-      if (row?.kind === "sprint") pick(row.sprint);
-      else if (row?.kind === "create") void launchCreateSprint2();
-      return;
-    }
-    if (input === "t") {
-      toggleScope();
-      return;
-    }
-    if (input === "f") {
-      setHideDone((v) => !v);
-      return;
-    }
-    if (input === "+" || input === "c") {
-      void launchCreateSprint2();
-      return;
-    }
-    if (input === "r") reload();
-  });
-};
 var PickSprintView = () => {
   const deps = useDeps();
   const router = useRouter();
   const selection = useSelection();
   const ui = useUiState();
   const [feedback2, setFeedback] = useState50(void 0);
-  const {
-    state,
-    reload,
-    data,
-    rows,
-    sprintCount,
-    hiddenByDoneFilter,
-    scopeAll,
-    hideDone,
-    setHideDone,
-    toggleScope,
-    cursor,
-    setCursor
-  } = usePickerRows(deps, selection);
+  const { state, reload, data, rows, sprintCount, hiddenByDoneFilter, scopeAll, hideDone, setHideDone, toggleScope } = usePickerRows(deps, selection);
   useViewHints([
     { keys: "\u2191/\u2193/j/k", label: "move" },
     { keys: "\u21B5", label: "use sprint" },
@@ -41417,18 +41342,28 @@ var PickSprintView = () => {
     onError: setFeedback,
     noProjectMessage: `${glyphs.cross} select a project first`
   });
-  usePickerInput({
-    modalOpen: ui.modalOpen,
-    rows,
-    cursor,
-    visibleRows,
-    setCursor,
-    pick,
-    launchCreateSprint: launchCreateSprint2,
-    toggleScope,
-    setHideDone,
-    reload
+  const onRowSubmit = (row) => {
+    if (row.kind === "sprint") pick(row.sprint);
+    else void launchCreateSprint2();
+  };
+  useInput31((input) => {
+    if (ui.modalOpen) return;
+    if (input === "t") {
+      toggleScope();
+      return;
+    }
+    if (input === "f") {
+      setHideDone((v) => !v);
+      return;
+    }
+    if (input === "+" || input === "c") {
+      void launchCreateSprint2();
+      return;
+    }
+    if (input === "r") reload();
   });
+  const initialCursorId = useMemo29(() => preferredCursorId(rows, selection.sprintId), [rows, selection.sprintId]);
+  const listKey = `${String(scopeAll)}-${selection.sprintId ?? "unseeded"}`;
   return /* @__PURE__ */ jsx103(ViewShell, { title: "Pick a sprint", subtitle: "Switch sprint (and project) in one step", suppressScrollArrows: true, children: /* @__PURE__ */ jsx103(
     PickerBody,
     {
@@ -41439,11 +41374,14 @@ var PickSprintView = () => {
       scopeAll,
       hideDone,
       rows,
-      cursor,
       visibleRows,
+      listActive: !ui.modalOpen,
+      initialCursorId,
+      listKey,
       currentSprintId: selection.sprintId,
       currentSprintLabel: selection.sprintLabel,
-      feedback: feedback2
+      feedback: feedback2,
+      onRowSubmit
     }
   ) });
 };
@@ -41498,11 +41436,10 @@ var renderView = (entry) => {
 };
 
 // src/application/ui/tui/runtime/use-global-keys.ts
-import { useEffect as useEffect46, useMemo as useMemo30, useRef as useRef18 } from "react";
+import { useEffect as useEffect45, useMemo as useMemo30, useRef as useRef18 } from "react";
 import { useApp, useInput as useInput32 } from "ink";
 
 // src/integration/io/clipboard.ts
-import { spawn as nodeSpawn2 } from "child_process";
 var resolveHelpers = ({ platform, env }) => {
   if (platform === "darwin") return [{ cmd: "pbcopy", args: [] }];
   if (platform === "win32") return [{ cmd: "clip.exe", args: [] }];
@@ -41521,10 +41458,10 @@ var resolveHelpers = ({ platform, env }) => {
   return [];
 };
 var SPAWN_FAILED = "spawn-failed";
-var runHelper = (spawn3, helper, text) => new Promise((resolve) => {
+var runHelper = (spawn2, helper, text) => new Promise((resolve) => {
   let child;
   try {
-    child = spawn3(helper.cmd, helper.args, { stdio: ["pipe", "pipe", "pipe"] });
+    child = spawn2(helper.cmd, helper.args, { stdio: ["pipe", "pipe", "pipe"] });
   } catch (cause) {
     resolve(
       Result.error({
@@ -41568,7 +41505,7 @@ var runHelper = (spawn3, helper, text) => new Promise((resolve) => {
   }
 });
 var createCopyToClipboard = (opts = {}) => {
-  const spawn3 = opts.spawn ?? nodeSpawn2;
+  const spawn2 = opts.spawn ?? crossPlatformSpawn;
   const platform = opts.platform ?? process.platform;
   const env = opts.env ?? process.env;
   const helpers = resolveHelpers({ platform, env });
@@ -41581,7 +41518,7 @@ var createCopyToClipboard = (opts = {}) => {
     }
     let lastError;
     for (const helper of helpers) {
-      const result = await runHelper(spawn3, helper, text);
+      const result = await runHelper(spawn2, helper, text);
       if (result.ok) return result;
       lastError = result.error;
       if (result.error.code !== "no-helper") return result;
@@ -41610,7 +41547,7 @@ var useGlobalKeys = (opts = {}) => {
     [opts.copyToClipboard]
   );
   const clearTimerRef = useRef18(void 0);
-  useEffect46(
+  useEffect45(
     () => () => {
       if (clearTimerRef.current !== void 0) clearTimeout(clearTimerRef.current);
     },
@@ -41779,7 +41716,7 @@ var scheduleClear = (eventBus, ref3) => {
 };
 
 // src/application/ui/tui/components/memory-pressure-banner.tsx
-import { useEffect as useEffect47, useState as useState51 } from "react";
+import { useEffect as useEffect46, useState as useState51 } from "react";
 import { Box as Box86, Text as Text81 } from "ink";
 import { jsxs as jsxs82 } from "react/jsx-runtime";
 var formatMb = (bytes) => `${(bytes / 1048576).toFixed(0)} MB`;
@@ -41787,7 +41724,7 @@ var formatPercent = (ratio) => `${Math.round(ratio * 100)}%`;
 var MemoryPressureBanner = () => {
   const deps = useDeps();
   const [latest, setLatest] = useState51(void 0);
-  useEffect47(() => {
+  useEffect46(() => {
     return deps.eventBus.subscribe((event) => {
       if (event.type === "memory-pressure") setLatest(event);
     });
@@ -41810,13 +41747,13 @@ var MemoryPressureBanner = () => {
 };
 
 // src/application/ui/tui/components/chain-log-degraded-banner.tsx
-import { useEffect as useEffect48, useState as useState52 } from "react";
+import { useEffect as useEffect47, useState as useState52 } from "react";
 import { Box as Box87, Text as Text82 } from "ink";
 import { jsx as jsx105, jsxs as jsxs83 } from "react/jsx-runtime";
 var ChainLogDegradedBanner = () => {
   const deps = useDeps();
   const [degraded, setDegraded] = useState52(false);
-  useEffect48(() => {
+  useEffect47(() => {
     return deps.eventBus.subscribe((event) => {
       if (event.type === "chain-log-degraded") setDegraded(true);
     });
@@ -41829,9 +41766,9 @@ var ChainLogDegradedBanner = () => {
 };
 
 // src/application/ui/tui/components/progress-overlay.tsx
-import { promises as fs36 } from "fs";
+import { promises as fs35 } from "fs";
 import { join as join71 } from "path";
-import { useEffect as useEffect49, useState as useState53 } from "react";
+import { useEffect as useEffect48, useState as useState53 } from "react";
 import { Box as Box88, Text as Text83, useInput as useInput33 } from "ink";
 import { Fragment as Fragment13, jsx as jsx106, jsxs as jsxs84 } from "react/jsx-runtime";
 var CHROME_ROWS4 = 10;
@@ -41842,7 +41779,7 @@ var formatAgo = (modifiedAtMs, now) => {
 };
 var useProgressFile = (sprintId, dataRoot) => {
   const [state, setState] = useState53({ kind: "loading" });
-  useEffect49(() => {
+  useEffect48(() => {
     let cancelled = false;
     if (sprintId === void 0) {
       setState({ kind: "missing" });
@@ -41857,7 +41794,7 @@ var useProgressFile = (sprintId, dataRoot) => {
           return;
         }
         const progressPath = join71(dir, "progress.md");
-        const [stat, content] = await Promise.all([fs36.stat(progressPath), fs36.readFile(progressPath, "utf8")]);
+        const [stat, content] = await Promise.all([fs35.stat(progressPath), fs35.readFile(progressPath, "utf8")]);
         if (cancelled) return;
         const modifiedAtMs = stat.mtimeMs;
         if (content.trim().length === 0) {
@@ -41887,7 +41824,7 @@ var useProgressFile = (sprintId, dataRoot) => {
 var useProgressScroll = (state, bodyRows) => {
   const [offset, setOffset] = useState53(0);
   const lineCount = state.kind === "ok" ? state.lines.length : 0;
-  useEffect49(() => {
+  useEffect48(() => {
     setOffset(0);
   }, [lineCount]);
   const maxOffset = Math.max(0, lineCount - bodyRows);
@@ -42084,7 +42021,7 @@ import { useState as useState55 } from "react";
 import { useApp as useApp2 } from "ink";
 
 // src/application/ui/tui/migration/migration-gate.tsx
-import { useEffect as useEffect50, useRef as useRef19, useState as useState54 } from "react";
+import { useEffect as useEffect49, useRef as useRef19, useState as useState54 } from "react";
 import { Box as Box90, Text as Text84, useInput as useInput34 } from "ink";
 
 // src/application/ui/tui/migration/learnings-backfill-adapter.ts
@@ -42132,7 +42069,7 @@ var MigrationGate = (props) => {
   const { engine, dataRoot, stateRoot, appVersion, now, writeFile: writeFile3, onResolve, onQuit } = props;
   const [state, setState] = useState54({ kind: "scanning" });
   const scannedRef = useRef19(false);
-  useEffect50(() => {
+  useEffect49(() => {
     if (scannedRef.current) return;
     scannedRef.current = true;
     let cancelled = false;
@@ -42378,7 +42315,7 @@ var MigrationRoute = ({ gate, app, onResolved }) => {
 };
 
 // src/integration/persistence/data-migration/version-marker.ts
-import { promises as fs37 } from "fs";
+import { promises as fs36 } from "fs";
 import { join as join72 } from "path";
 import { z as z50 } from "zod";
 var CURRENT_DATA_VERSION = 2;
@@ -42391,7 +42328,7 @@ var versionMarkerPath = (dataRoot) => join72(String(dataRoot), DATA_VERSION_FILE
 var readDataVersion = async (dataRoot) => {
   let bytes;
   try {
-    bytes = await fs37.readFile(versionMarkerPath(dataRoot), "utf8");
+    bytes = await fs36.readFile(versionMarkerPath(dataRoot), "utf8");
   } catch {
     return { dataVersion: 1, lastWrittenByAppVersion: "" };
   }
@@ -42413,8 +42350,8 @@ var writeDataVersion = async (dataRoot, marker) => {
   const body = `${JSON.stringify(marker, null, 2)}
 `;
   try {
-    await fs37.mkdir(String(dataRoot), { recursive: true });
-    await fs37.writeFile(path2, body, "utf8");
+    await fs36.mkdir(String(dataRoot), { recursive: true });
+    await fs36.writeFile(path2, body, "utf8");
     return Result.ok(void 0);
   } catch (cause) {
     return Result.error(new StorageError({ subCode: "io", message: `marker write failed: ${path2}`, path: path2, cause }));
@@ -42426,7 +42363,7 @@ var needsMigration = async (dataRoot) => {
 };
 
 // src/integration/persistence/data-migration/dry-run.ts
-import { promises as fs38 } from "fs";
+import { promises as fs37 } from "fs";
 import { join as join73 } from "path";
 var PROJECTS_DIR = "projects";
 var SPRINTS_DIR = "sprints";
@@ -42445,7 +42382,7 @@ var dryRun = async (dataRoot) => {
 var checkBackupTargetWritable = async (dataRoot, acc) => {
   const parent = join73(String(dataRoot), "..");
   try {
-    await fs38.access(parent, fs38.constants.W_OK);
+    await fs37.access(parent, fs37.constants.W_OK);
   } catch {
     acc.problems.push({
       name: parent,
@@ -42563,7 +42500,7 @@ var planRename = async (parent, fromName, toName, id, slug, kind, acc) => {
 };
 var pathPresent = async (path2) => {
   try {
-    await fs38.stat(path2);
+    await fs37.stat(path2);
     return true;
   } catch {
     return false;
@@ -42571,7 +42508,7 @@ var pathPresent = async (path2) => {
 };
 var isDirectory = async (path2) => {
   try {
-    return (await fs38.stat(path2)).isDirectory();
+    return (await fs37.stat(path2)).isDirectory();
   } catch {
     return false;
   }
@@ -42594,7 +42531,7 @@ var readProjectSlugForId = async (dataRoot, projectId) => {
 var readSlugField = async (filePath) => {
   let bytes;
   try {
-    bytes = await fs38.readFile(filePath, "utf8");
+    bytes = await fs37.readFile(filePath, "utf8");
   } catch {
     return void 0;
   }
@@ -42611,11 +42548,11 @@ var readSlugField = async (filePath) => {
 };
 
 // src/integration/persistence/data-migration/apply.ts
-import { promises as fs41 } from "fs";
+import { promises as fs40 } from "fs";
 import { join as join76 } from "path";
 
 // src/integration/persistence/data-migration/backup.ts
-import { promises as fs39 } from "fs";
+import { promises as fs38 } from "fs";
 import { basename as basename7, dirname as dirname22, join as join74 } from "path";
 var BACKUP_DIR_PREFIX = "data.backup-";
 var backupDirName = (fromVersion, timestamp) => `${BACKUP_DIR_PREFIX}v${String(fromVersion)}-${sanitizeTimestamp(timestamp)}`;
@@ -42623,7 +42560,7 @@ var backupDataDir = async (dataRoot, fromVersion, timestamp) => {
   const src = String(dataRoot);
   const dest = join74(dirname22(src), backupDirName(fromVersion, timestamp));
   try {
-    await fs39.cp(src, dest, {
+    await fs38.cp(src, dest, {
       recursive: true,
       // Follow symlinks so the backup captures their real CONTENT, not a dangling node. The default
       // (`dereference: false`) copies a symlink as a link, which would leave the backup incomplete for
@@ -42645,7 +42582,7 @@ var backupDataDir = async (dataRoot, fromVersion, timestamp) => {
     );
   }
   try {
-    const stat = await fs39.stat(dest);
+    const stat = await fs38.stat(dest);
     if (!stat.isDirectory()) {
       return Result.error(
         new StorageError({ subCode: "io", message: `backup verify failed: ${dest} is not a directory`, path: dest })
@@ -42667,8 +42604,8 @@ var backupDataDir = async (dataRoot, fromVersion, timestamp) => {
 };
 var verifyEntryCount = async (src, dest) => {
   try {
-    const srcEntries = (await fs39.readdir(src)).filter((name) => !name.startsWith(BACKUP_DIR_PREFIX));
-    const destEntries = await fs39.readdir(dest);
+    const srcEntries = (await fs38.readdir(src)).filter((name) => !name.startsWith(BACKUP_DIR_PREFIX));
+    const destEntries = await fs38.readdir(dest);
     if (destEntries.length < srcEntries.length) {
       return Result.error(
         new StorageError({
@@ -42688,10 +42625,10 @@ var verifyEntryCount = async (src, dest) => {
 var sanitizeTimestamp = (timestamp) => timestamp.replace(/:/g, "-");
 
 // src/integration/persistence/data-migration/lock-guard.ts
-import { promises as fs40 } from "fs";
+import { promises as fs39 } from "fs";
 import { join as join75 } from "path";
 var LOCKS_SUBDIR2 = "locks";
-var HELD_WITHIN_MS = 3e4;
+var HELD_WITHIN_MS = DEFAULT_STALE_AFTER_MS;
 var anyLockHeld = async (stateRoot) => {
   const locksDir = join75(String(stateRoot), LOCKS_SUBDIR2);
   const entries = await listDir(locksDir);
@@ -42701,7 +42638,7 @@ var anyLockHeld = async (stateRoot) => {
     if (!name.endsWith(".lock")) continue;
     let mtimeMs;
     try {
-      ({ mtimeMs } = await fs40.lstat(join75(locksDir, name)));
+      ({ mtimeMs } = await fs39.lstat(join75(locksDir, name)));
     } catch {
       continue;
     }
@@ -42794,7 +42731,7 @@ var mergeOne = async (merge, ctx) => {
 };
 var readTextOrEmpty = async (path2) => {
   try {
-    return await fs41.readFile(path2, "utf8");
+    return await fs40.readFile(path2, "utf8");
   } catch {
     return "";
   }
@@ -42812,7 +42749,7 @@ var backfillLearningsMd = async (dataRoot, ctx) => {
     if (await pathPresent2(mdPath)) continue;
     let body;
     try {
-      body = await fs41.readFile(ledgerPath, "utf8");
+      body = await fs40.readFile(ledgerPath, "utf8");
     } catch {
       continue;
     }
@@ -42825,7 +42762,7 @@ var backfillLearningsMd = async (dataRoot, ctx) => {
 };
 var ledgerExceedsCeiling = async (ledgerPath) => {
   try {
-    const { size } = await fs41.stat(ledgerPath);
+    const { size } = await fs40.stat(ledgerPath);
     return size > MIRROR_BACKFILL_CEILING_BYTES;
   } catch {
     return false;
@@ -42833,7 +42770,7 @@ var ledgerExceedsCeiling = async (ledgerPath) => {
 };
 var pathPresent2 = async (path2) => {
   try {
-    await fs41.stat(path2);
+    await fs40.stat(path2);
     return true;
   } catch {
     return false;
@@ -42879,7 +42816,7 @@ var resolveInitialState = ({
 };
 
 // src/integration/persistence/selection/last-selection-store.ts
-import { promises as fs42 } from "fs";
+import { promises as fs41 } from "fs";
 import { join as join77 } from "path";
 var FILE_NAME = "last-selection.json";
 var createLastSelectionStore = (stateRoot) => {
@@ -42887,7 +42824,7 @@ var createLastSelectionStore = (stateRoot) => {
   return {
     async read() {
       try {
-        const raw = await fs42.readFile(path2, "utf8");
+        const raw = await fs41.readFile(path2, "utf8");
         const parsed = JSON.parse(raw);
         if (typeof parsed !== "object" || parsed === null) return void 0;
         const rec = parsed;
@@ -42905,10 +42842,10 @@ var createLastSelectionStore = (stateRoot) => {
     async write(value) {
       try {
         if (value === void 0) {
-          await fs42.rm(path2, { force: true });
+          await fs41.rm(path2, { force: true });
           return;
         }
-        await fs42.writeFile(path2, JSON.stringify(value, null, 2), "utf8");
+        await fs41.writeFile(path2, JSON.stringify(value, null, 2), "utf8");
       } catch {
       }
     }
@@ -43007,13 +42944,13 @@ var startHeapWatchdog = (deps) => {
 };
 
 // src/integration/observability/heap-snapshot.ts
-import * as fs43 from "fs";
+import * as fs42 from "fs";
 import * as path from "path";
 import * as v82 from "v8";
 var snapshotFilename = (timestamp) => `heap-${timestamp.replace(/[:.]/g, "-")}.heapsnapshot`;
 var writeHeapSnapshotToDir = (dir, clock) => {
   try {
-    fs43.mkdirSync(dir, { recursive: true });
+    fs42.mkdirSync(dir, { recursive: true });
     const timestamp = clock?.() ?? (/* @__PURE__ */ new Date()).toISOString();
     const fullPath = path.join(dir, snapshotFilename(timestamp));
     v82.writeHeapSnapshot(fullPath);
@@ -44534,11 +44471,11 @@ var formatTaskLine = (t) => {
 };
 
 // src/application/ui/cli/commands/runs.ts
-import { promises as fs45 } from "fs";
+import { promises as fs44 } from "fs";
 import { createInterface as createInterface2 } from "readline";
 
 // src/integration/ai/runs/_engine/run-enumeration.ts
-import { promises as fs44 } from "fs";
+import { promises as fs43 } from "fs";
 import { join as join80 } from "path";
 var parseRunTimestamp = (runDirName) => {
   const match = /^(\d{4})-(\d{2})-(\d{2})T(\d{2})-(\d{2})-(\d{2})-(\d{3})Z-/.exec(runDirName);
@@ -44639,7 +44576,7 @@ var listRuns = async (runsRoot) => {
   const root = String(runsRoot);
   let flowDirs;
   try {
-    flowDirs = await fs44.readdir(root, { withFileTypes: true });
+    flowDirs = await fs43.readdir(root, { withFileTypes: true });
   } catch (cause) {
     if (isErrnoException2(cause) && cause.code === "ENOENT") return Result.ok([]);
     return Result.error(
@@ -44656,7 +44593,7 @@ var listRuns = async (runsRoot) => {
     const flowPath = join80(root, flowDir.name);
     let runDirs;
     try {
-      runDirs = await fs44.readdir(flowPath, { withFileTypes: true });
+      runDirs = await fs43.readdir(flowPath, { withFileTypes: true });
     } catch (cause) {
       if (isErrnoException2(cause) && cause.code === "ENOENT") continue;
       return Result.error(
@@ -44701,7 +44638,7 @@ var computeDirSize = async (dir) => {
   let total = 0;
   let entries;
   try {
-    entries = await fs44.readdir(dir, { withFileTypes: true });
+    entries = await fs43.readdir(dir, { withFileTypes: true });
   } catch {
     return 0;
   }
@@ -44712,7 +44649,7 @@ var computeDirSize = async (dir) => {
       continue;
     }
     try {
-      const stat = await fs44.lstat(entryPath);
+      const stat = await fs43.lstat(entryPath);
       if (stat.isFile()) total += stat.size;
     } catch {
     }
@@ -45033,7 +44970,7 @@ var performPrune = async (candidates) => {
   let freedCount = 0;
   for (const candidate of candidates) {
     try {
-      await fs45.rm(String(candidate.path), { recursive: true, force: false });
+      await fs44.rm(String(candidate.path), { recursive: true, force: false });
       freedBytes += candidate.sizeBytes;
       freedCount += 1;
     } catch (cause) {