@staff0rd/assist 0.488.4 → 0.489.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.488.4",
+  version: "0.489.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -2415,8 +2415,8 @@ function printDiff(oldContent, newContent) {
     normalizeJson(newContent)
   );
   for (const change of changes) {
-    const lines = change.value.replace(/\n$/, "").split("\n");
-    for (const line of lines) {
+    const lines2 = change.value.replace(/\n$/, "").split("\n");
+    for (const line of lines2) {
       if (change.added) {
         console.log(chalk12.green(`+ ${line}`));
       } else if (change.removed) {
@@ -2863,11 +2863,11 @@ function removeVscodeFromGitignore() {
     return;
   }
   const content = fs3.readFileSync(gitignorePath, "utf8");
-  const lines = content.split("\n");
-  const filteredLines = lines.filter(
+  const lines2 = content.split("\n");
+  const filteredLines = lines2.filter(
     (line) => !line.trim().toLowerCase().includes(".vscode")
   );
-  if (filteredLines.length !== lines.length) {
+  if (filteredLines.length !== lines2.length) {
     fs3.writeFileSync(gitignorePath, filteredLines.join("\n"));
     console.log(chalk20.dim("Removed .vscode references from .gitignore"));
   }
@@ -3269,11 +3269,11 @@ ${checkName} failed:
 // src/commands/lint/lint/runImportExtensionCheck.ts
 function checkForImportExtensions(filePath) {
   const content = fs12.readFileSync(filePath, "utf8");
-  const lines = content.split("\n");
+  const lines2 = content.split("\n");
   const violations = [];
   const importExtensionPattern = /from\s+["']\..*\.(js|ts)["']/;
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
+  for (let i = 0; i < lines2.length; i++) {
+    const line = lines2[i];
     if (importExtensionPattern.test(line)) {
       violations.push({
         filePath,
@@ -3305,12 +3305,12 @@ function runImportExtensionCheck() {
 import fs13 from "fs";
 function checkForDynamicImports(filePath) {
   const content = fs13.readFileSync(filePath, "utf8");
-  const lines = content.split("\n");
+  const lines2 = content.split("\n");
   const violations = [];
   const requirePattern = /\brequire\s*\(/;
   const dynamicImportPattern = /\bimport\s*\(/;
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
+  for (let i = 0; i < lines2.length; i++) {
+    const line = lines2[i];
     if (requirePattern.test(line) || dynamicImportPattern.test(line)) {
       violations.push({
         filePath,
@@ -3412,9 +3412,9 @@ function collectBicepComments(content) {
     comments3.push({ line, text: match });
     return blankNonNewline(match);
   });
-  const lines = work.split("\n");
-  for (let i = 0; i < lines.length; i++) {
-    const match = lines[i].match(LINE_COMMENT);
+  const lines2 = work.split("\n");
+  for (let i = 0; i < lines2.length; i++) {
+    const match = lines2[i].match(LINE_COMMENT);
     if (match) comments3.push({ line: i + 1, text: match[0] });
   }
   return comments3;
@@ -3429,14 +3429,14 @@ function isHeaderLine(line) {
   return trimmed === "" || trimmed.startsWith("#");
 }
 function collectHashComments(content, options2) {
-  const lines = content.split("\n");
+  const lines2 = content.split("\n");
   let start3 = 0;
   if (options2.skipHeader) {
-    while (start3 < lines.length && isHeaderLine(lines[start3])) start3++;
+    while (start3 < lines2.length && isHeaderLine(lines2[start3])) start3++;
   }
   const comments3 = [];
-  for (let i = start3; i < lines.length; i++) {
-    const work = lines[i].replace(
+  for (let i = start3; i < lines2.length; i++) {
+    const work = lines2[i].replace(
       /"(?:[^"\\]|\\.)*"|'(?:[^']|'')*'/g,
       blankNonNewline2
     );
@@ -3470,8 +3470,8 @@ function collectComments(sourceFile) {
 var MAINTAINABILITY_OVERRIDE_MARKER = "assist-maintainability-override";
 var OVERRIDE_MARKER = /^\s*\/\/\s*assist-maintainability-override:?\s*(-?\d+)\s*$/;
 function parseMaintainabilityOverride(content) {
-  const lines = content.split("\n").slice(0, 10);
-  for (const line of lines) {
+  const lines2 = content.split("\n").slice(0, 10);
+  for (const line of lines2) {
     const match = line.match(OVERRIDE_MARKER);
     if (!match) continue;
     const value = Number(match[1]);
@@ -3508,12 +3508,12 @@ function isCommentExempt(text17) {
 function toSingleLine(text17) {
   return text17.replace(/\s+/g, " ").trim();
 }
-function collectSourceFindings(file, lines, project) {
+function collectSourceFindings(file, lines2, project) {
   const findings = [];
   const sourceFile = project.addSourceFileAtPath(file);
   for (const { pos, text: text17 } of collectComments(sourceFile)) {
     const { line } = sourceFile.getLineAndColumnAtPos(pos);
-    if (!lines.has(line)) continue;
+    if (!lines2.has(line)) continue;
     if (isCommentExempt(text17)) continue;
     findings.push({ file, line, text: toSingleLine(text17) });
   }
@@ -3533,29 +3533,29 @@ function collectYamlComments(content) {
 }
 
 // src/commands/verify/blockCodeComments/collectFileComments.ts
-function toFindings(file, lines, raw, exempt) {
+function toFindings(file, lines2, raw, exempt) {
   const findings = [];
   for (const { line, text: text17 } of raw) {
-    if (!lines.has(line)) continue;
+    if (!lines2.has(line)) continue;
     if (exempt && isCommentExempt(text17)) continue;
     findings.push({ file, line, text: text17.replace(/\s+/g, " ").trim() });
   }
   return findings;
 }
-function collectFileComments(file, lines, project) {
+function collectFileComments(file, lines2, project) {
   const read = () => fs14.readFileSync(file, "utf8");
   if (isYamlFile(file))
-    return toFindings(file, lines, collectYamlComments(read()), false);
+    return toFindings(file, lines2, collectYamlComments(read()), false);
   if (isDockerfile(file) || isEnvFile(file) || isShellFile(file))
     return toFindings(
       file,
-      lines,
+      lines2,
       collectHashComments(read(), { skipHeader: isShellFile(file) }),
       true
     );
   if (isBicepFile(file))
-    return toFindings(file, lines, collectBicepComments(read()), true);
-  return collectSourceFindings(file, lines, project);
+    return toFindings(file, lines2, collectBicepComments(read()), true);
+  return collectSourceFindings(file, lines2, project);
 }
 
 // src/commands/verify/blockCodeComments/parseDiffAddedLines.ts
@@ -3623,9 +3623,9 @@ function findComments(options2) {
     compilerOptions: { allowJs: true }
   });
   const findings = [];
-  for (const [file, lines] of addedLines) {
+  for (const [file, lines2] of addedLines) {
     if (!shouldScan(file, options2.ignoreGlobs)) continue;
-    findings.push(...collectFileComments(file, lines, project));
+    findings.push(...collectFileComments(file, lines2, project));
   }
   findings.sort((a, b) => a.file.localeCompare(b.file) || a.line - b.line);
   return findings;
@@ -3658,10 +3658,10 @@ function getDocumentedConfigKeys() {
 }
 function renderConfigHelp(entries, preamble) {
   const width = Math.max(...entries.map((entry) => entry.setter.length));
-  const lines = entries.map(
+  const lines2 = entries.map(
     (entry) => `  ${entry.setter.padEnd(width)} # ${entry.note}`
   );
-  const body = preamble ? ["", preamble, "", "Config:", ...lines] : ["", "Config:", ...lines];
+  const body = preamble ? ["", preamble, "", "Config:", ...lines2] : ["", "Config:", ...lines2];
   return body.join("\n");
 }
 function configHelp(command, entries, preamble) {
@@ -3960,14 +3960,14 @@ function findRuleViolations(data, rule) {
   }
   return violations;
 }
-function findForbiddenStrings(rules, readJson) {
-  return rules.flatMap((rule) => findRuleViolations(readJson(rule.file), rule));
+function findForbiddenStrings(rules2, readJson) {
+  return rules2.flatMap((rule) => findRuleViolations(readJson(rule.file), rule));
 }
 
 // src/commands/verify/forbiddenStrings/index.ts
 function forbiddenStrings() {
-  const rules = loadConfig().forbiddenStrings ?? [];
-  if (rules.length === 0) {
+  const rules2 = loadConfig().forbiddenStrings ?? [];
+  if (rules2.length === 0) {
     console.log("No forbidden-strings rules configured.");
     process.exit(0);
   }
@@ -3988,7 +3988,7 @@ function forbiddenStrings() {
     cache4.set(file, parsed);
     return parsed;
   };
-  const violations = findForbiddenStrings(rules, readJson);
+  const violations = findForbiddenStrings(rules2, readJson);
   if (violations.length === 0) {
     console.log("No forbidden strings found.");
     process.exit(0);
@@ -4015,18 +4015,18 @@ function hardcodedColors() {
     const output = execSync13(`grep -rEnH '${pattern}' src/`, {
       encoding: "utf8"
     });
-    const lines = output.trim().split("\n").filter((line) => {
+    const lines2 = output.trim().split("\n").filter((line) => {
       const match = line.match(/^(.+?):\d+:/);
       if (!match) return true;
       const file = match[1];
       return !ignoreGlobs.some((glob) => minimatch3(file, glob));
     });
-    if (lines.length === 0) {
+    if (lines2.length === 0) {
       console.log("No hardcoded colors found.");
       process.exit(0);
     }
     console.log("Hardcoded colors found:\n");
-    for (const line of lines) {
+    for (const line of lines2) {
       const match = line.match(/^(.+):(\d+):(.+)$/);
       if (match) {
         const [, file, lineNum, content] = match;
@@ -4036,7 +4036,7 @@ function hardcodedColors() {
       }
     }
     console.log(`
-Total: ${lines.length} hardcoded color(s)`);
+Total: ${lines2.length} hardcoded color(s)`);
     console.log("\nUse colors from the 'open-color' (oc) library instead.");
     console.log("\nExample fix:");
     console.log("  Before: color: '#228be6'");
@@ -4523,7 +4523,7 @@ ${failed2.length} script(s) failed:`);
   }
 }
 function runEntry(entry) {
-  return new Promise((resolve21) => {
+  return new Promise((resolve22) => {
     const startTime = Date.now();
     const child = spawnCommand(
       entry.fullCommand,
@@ -4535,7 +4535,7 @@ function runEntry(entry) {
     child.on("close", (code) => {
       const exitCode = code ?? 1;
       flushIfFailed(exitCode, chunks);
-      resolve21({
+      resolve22({
         script: entry.name,
         code: exitCode,
         durationMs: Date.now() - startTime
@@ -5158,38 +5158,38 @@ var END_MARKER = "# <<< assist backup schedule <<<";
 function buildBlock(every, cronLine) {
   return [BEGIN_MARKER, `# every ${every}`, cronLine, END_MARKER];
 }
-function findBlockRange(lines) {
-  const start3 = lines.indexOf(BEGIN_MARKER);
+function findBlockRange(lines2) {
+  const start3 = lines2.indexOf(BEGIN_MARKER);
   if (start3 === -1) return void 0;
-  const end = lines.indexOf(END_MARKER, start3);
+  const end = lines2.indexOf(END_MARKER, start3);
   if (end === -1) return void 0;
   return { start: start3, end };
 }
 function upsertScheduleBlock(crontab, every, cronLine) {
-  const lines = crontab.length === 0 ? [] : crontab.replace(/\n$/, "").split("\n");
+  const lines2 = crontab.length === 0 ? [] : crontab.replace(/\n$/, "").split("\n");
   const block = buildBlock(every, cronLine);
-  const range = findBlockRange(lines);
-  const next3 = range === void 0 ? [...lines, ...block] : [
-    ...lines.slice(0, range.start),
+  const range = findBlockRange(lines2);
+  const next3 = range === void 0 ? [...lines2, ...block] : [
+    ...lines2.slice(0, range.start),
     ...block,
-    ...lines.slice(range.end + 1)
+    ...lines2.slice(range.end + 1)
   ];
   return `${next3.join("\n")}
 `;
 }
 function removeScheduleBlock(crontab) {
-  const lines = crontab.length === 0 ? [] : crontab.replace(/\n$/, "").split("\n");
-  const range = findBlockRange(lines);
+  const lines2 = crontab.length === 0 ? [] : crontab.replace(/\n$/, "").split("\n");
+  const range = findBlockRange(lines2);
   if (range === void 0) return crontab;
-  const next3 = [...lines.slice(0, range.start), ...lines.slice(range.end + 1)];
+  const next3 = [...lines2.slice(0, range.start), ...lines2.slice(range.end + 1)];
   return next3.length === 0 ? "" : `${next3.join("\n")}
 `;
 }
 function readScheduleBlock(crontab) {
-  const lines = crontab.length === 0 ? [] : crontab.split("\n");
-  const range = findBlockRange(lines);
+  const lines2 = crontab.length === 0 ? [] : crontab.split("\n");
+  const range = findBlockRange(lines2);
   if (range === void 0) return void 0;
-  const body = lines.slice(range.start + 1, range.end);
+  const body = lines2.slice(range.start + 1, range.end);
   const everyLine = body.find((line) => line.startsWith("# every "));
   const cronLine = body.find(
     (line) => !line.startsWith("#") && line.trim() !== ""
@@ -5705,8 +5705,8 @@ function spawnInherit(command, args, options2 = {}) {
     env,
     cwd: options2.cwd
   });
-  const done2 = new Promise((resolve21, reject) => {
-    child.on("close", (code) => resolve21(code ?? 0));
+  const done2 = new Promise((resolve22, reject) => {
+    child.on("close", (code) => resolve22(code ?? 0));
     child.on("error", reject);
   });
   return { child, done: done2 };
@@ -6851,9 +6851,9 @@ Failed to launch Claude for ${context}: ${message3}`)
 // src/commands/sessions/daemon/connectToDaemon.ts
 import * as net from "net";
 function connectToDaemon() {
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve22, reject) => {
     const socket = net.connect(daemonPaths.socket);
-    socket.once("connect", () => resolve21(socket));
+    socket.once("connect", () => resolve22(socket));
     socket.once("error", reject);
   });
 }
@@ -6869,7 +6869,7 @@ async function isDaemonRunning() {
 // src/commands/sessions/daemon/sendToDaemon.ts
 var WRITE_TIMEOUT_MS = 500;
 function sendToDaemon(message3) {
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve22, reject) => {
     connectToDaemon().then((socket) => {
       const timer = setTimeout(() => {
         socket.destroy();
@@ -6883,7 +6883,7 @@ function sendToDaemon(message3) {
 `, () => {
         clearTimeout(timer);
         socket.end();
-        resolve21();
+        resolve22();
       });
     }, reject);
   });
@@ -6906,7 +6906,7 @@ function readSocketLines(socket, onLine) {
 // src/commands/sessions/daemon/sendToDaemonAwaitAck.ts
 var ACK_TIMEOUT_MS = 1e3;
 function sendToDaemonAwaitAck(message3) {
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve22, reject) => {
     connectToDaemon().then((socket) => {
       let settled = false;
       const finish = (error) => {
@@ -6915,7 +6915,7 @@ function sendToDaemonAwaitAck(message3) {
         clearTimeout(timer);
         socket.destroy();
         if (error) reject(error);
-        else resolve21();
+        else resolve22();
       };
       const timer = setTimeout(
         () => finish(new Error("timed out awaiting daemon ack")),
@@ -6989,7 +6989,7 @@ async function deliverReliably(sessionId, status3, payload) {
   }
 }
 function sleep(ms) {
-  return new Promise((resolve21) => setTimeout(resolve21, ms));
+  return new Promise((resolve22) => setTimeout(resolve22, ms));
 }
 function describeError(error) {
   return error instanceof Error ? error.message : String(error);
@@ -7631,14 +7631,14 @@ function backlogRunMarkers(text17) {
 }
 
 // src/commands/sessions/shared/extractSessionMeta.ts
-function extractSessionMeta(lines) {
+function extractSessionMeta(lines2) {
   let sessionId = "";
   let cwd = "";
   let timestamp6 = "";
   let name = "";
   let commandName = "";
   let commandArgs = "";
-  for (const line of lines) {
+  for (const line of lines2) {
     const entry = safeParse(line);
     if (!entry) continue;
     sessionId ||= strField(entry, "sessionId");
@@ -8645,7 +8645,7 @@ function spawnDaemon(reason4) {
   child.unref();
 }
 function delay(ms) {
-  return new Promise((resolve21) => setTimeout(resolve21, ms));
+  return new Promise((resolve22) => setTimeout(resolve22, ms));
 }
 
 // src/commands/sessions/daemon/isWindowsCwd.ts
@@ -8682,10 +8682,10 @@ function gitInvocation(cwd, args) {
 }
 function git2(cwd, args) {
   const { file, argv, options: options2 } = gitInvocation(cwd, args);
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve22, reject) => {
     execFile2(file, argv, options2, (error, stdout) => {
       if (error) reject(error);
-      else resolve21(stdout.toString());
+      else resolve22(stdout.toString());
     });
   });
 }
@@ -9097,12 +9097,12 @@ async function loadVisibleItems(req) {
 
 // src/commands/backlog/web/parseStatusBody.ts
 function readBody(req) {
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve22, reject) => {
     let body = "";
     req.on("data", (chunk) => {
       body += chunk.toString();
     });
-    req.on("end", () => resolve21(body));
+    req.on("end", () => resolve22(body));
     req.on("error", reject);
   });
 }
@@ -10586,17 +10586,17 @@ async function stopDaemon() {
   }
 }
 function closedBeforeTimeout(socket) {
-  return new Promise((resolve21) => {
+  return new Promise((resolve22) => {
     const timer = setTimeout(() => {
       socket.destroy();
-      resolve21(false);
+      resolve22(false);
     }, STOP_TIMEOUT_MS);
     socket.resume();
     socket.on("error", () => {
     });
     socket.once("close", () => {
       clearTimeout(timer);
-      resolve21(true);
+      resolve22(true);
     });
   });
 }
@@ -10647,8 +10647,8 @@ async function restartWeb(req, res, deps2 = {}) {
     respondJson(res, 400, { error: "Invalid target" });
     return;
   }
-  await new Promise((resolve21) => {
-    res.once("finish", resolve21);
+  await new Promise((resolve22) => {
+    res.once("finish", resolve22);
     respondJson(res, 200, { ok: true });
   });
   if (target === "daemon" || target === "both") {
@@ -11185,8 +11185,8 @@ async function runGhImage(filePath, cwd) {
       `gh image failed: ${stderr.trim() || err.message || "unknown error"}`
     );
   }
-  const lines = stdout.split("\n").map((line) => line.trim()).filter(Boolean);
-  const markdown = lines.find((line) => /^!\[.*]\(.+\)$/.test(line)) ?? lines.find((line) => line.includes("http")) ?? lines[0];
+  const lines2 = stdout.split("\n").map((line) => line.trim()).filter(Boolean);
+  const markdown = lines2.find((line) => /^!\[.*]\(.+\)$/.test(line)) ?? lines2.find((line) => line.includes("http")) ?? lines2[0];
   if (!markdown) throw new Error("gh image produced no output");
   return markdown;
 }
@@ -11377,10 +11377,10 @@ async function openDaemonConnection(ws, ctx) {
   }
 }
 function relayDaemonLines(conn, ws, repoCwd) {
-  const lines = createInterface2({ input: conn });
-  lines.on("error", () => {
+  const lines2 = createInterface2({ input: conn });
+  lines2.on("error", () => {
   });
-  lines.on("line", (line) => {
+  lines2.on("line", (line) => {
     if (ws.readyState === ws.OPEN) ws.send(withRepoCwd(line, repoCwd));
   });
   conn.on("error", () => {
@@ -11522,7 +11522,7 @@ function firstEnabledIndex(items2) {
 // src/commands/sessions/web/restartMenu/renderRestartMenu.ts
 import chalk59 from "chalk";
 function renderRestartMenu(items2, selected) {
-  const lines = [chalk59.bold.cyan("assist \u2014 restart menu")];
+  const lines2 = [chalk59.bold.cyan("assist \u2014 restart menu")];
   items2.forEach((item, i) => {
     const active = i === selected;
     const pointer = active ? chalk59.cyan("\u276F ") : "  ";
@@ -11531,10 +11531,10 @@ function renderRestartMenu(items2, selected) {
     let label2 = item.label;
     if (item.disabled) label2 = chalk59.dim(label2);
     else if (active) label2 = chalk59.cyan.bold(label2);
-    lines.push(`${pointer}${number}${label2}${note}`);
+    lines2.push(`${pointer}${number}${label2}${note}`);
   });
-  lines.push(chalk59.dim("\u2191/\u2193 move \xB7 1-3 jump \xB7 enter select \xB7 esc close"));
-  return lines.join("\n");
+  lines2.push(chalk59.dim("\u2191/\u2193 move \xB7 1-3 jump \xB7 enter select \xB7 esc close"));
+  return lines2.join("\n");
 }
 
 // src/commands/sessions/web/restartMenu/createMenuState.ts
@@ -11660,10 +11660,10 @@ async function connect2() {
   }
 }
 function wire(socket) {
-  const lines = createInterface3({ input: socket });
-  lines.on("error", () => {
+  const lines2 = createInterface3({ input: socket });
+  lines2.on("error", () => {
   });
-  lines.on("line", emit);
+  lines2.on("line", emit);
   socket.on("error", () => {
   });
   socket.on("close", scheduleReconnect);
@@ -12203,11 +12203,11 @@ async function countRows(client, table) {
   return rows[0].n;
 }
 function printSummary(tables, current, incoming) {
-  const lines = tables.map(
+  const lines2 = tables.map(
     (t, i) => `  ${t.name}: ${current[i]} \u2192 ${incoming[i]} rows`
   );
   console.error(chalk71.bold("\nThis will REPLACE all backlog data:"));
-  console.error(`${lines.join("\n")}
+  console.error(`${lines2.join("\n")}
 `);
 }
 async function confirmReplace(client, tables, incoming, fromStdin) {
@@ -12600,7 +12600,7 @@ function parsePreviewDecision(line, requestId) {
 
 // src/commands/sessions/shared/requestPreviewDecision.ts
 function requestPreviewDecision(request) {
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve22, reject) => {
     connectToDaemon().then((socket) => {
       let settled = false;
       const finish = (error, decision) => {
@@ -12608,7 +12608,7 @@ function requestPreviewDecision(request) {
         settled = true;
         socket.destroy();
         if (error) reject(error);
-        else resolve21(decision);
+        else resolve22(decision);
       };
       readSocketLines(socket, (line) => {
         const incoming = parsePreviewDecision(line, request.requestId);
@@ -14859,13 +14859,13 @@ function saveCliReads(commands) {
   );
   cachedReads = void 0;
 }
-function findMatch(command, lines) {
+function findMatch(command, lines2) {
   const words = command.split(/\s+/);
   if (words.length === 0) return void 0;
-  if (lines.includes(words[0])) return words[0];
+  if (lines2.includes(words[0])) return words[0];
   if (words.length < 2) return void 0;
   const prefix2 = `${words[0]} ${words[1]}`;
-  const candidates = lines.filter(
+  const candidates = lines2.filter(
     (line) => line === prefix2 || line.startsWith(`${prefix2} `)
   );
   return candidates.sort((a, b) => b.length - a.length).find((rc) => command === rc || command.startsWith(`${rc} `));
@@ -15299,12 +15299,12 @@ function hasSubcommands(helpText) {
 // src/commands/permitCliReads/runHelp.ts
 import { exec as exec2 } from "child_process";
 function runHelp(args) {
-  return new Promise((resolve21) => {
+  return new Promise((resolve22) => {
     exec2(
       `${args.join(" ")} --help`,
       { encoding: "utf8", timeout: 3e4 },
       (_err, stdout, stderr) => {
-        resolve21(stdout || stderr || "");
+        resolve22(stdout || stderr || "");
       }
     );
   });
@@ -15432,14 +15432,14 @@ function formatHuman(cli, commands) {
   const sorted = [...commands].sort(
     (a, b) => a.path.join(" ").localeCompare(b.path.join(" "))
   );
-  const lines = [`Discovered ${commands.length} commands for "${cli}":
+  const lines2 = [`Discovered ${commands.length} commands for "${cli}":
 `];
   for (const cmd of sorted) {
     const full = `${cli} ${cmd.path.join(" ")}`;
     const text17 = cmd.description ? `${full} \u2014 ${cmd.description}` : full;
-    lines.push(`${prefix(classifyVerb(cmd.path))}${text17}`);
+    lines2.push(`${prefix(classifyVerb(cmd.path))}${text17}`);
   }
-  return lines.join("\n");
+  return lines2.join("\n");
 }
 
 // src/commands/permitCliReads/parseCached.ts
@@ -15686,22 +15686,22 @@ function codeCommentConfirm(pin) {
     return;
   }
   const original = readFileSync29(state.file, "utf8");
-  const lines = original.split("\n");
+  const lines2 = original.split("\n");
   const index3 = state.line - 1;
-  if (index3 > lines.length) {
+  if (index3 > lines2.length) {
     console.error(
       chalk118.red(
-        `Line ${state.line} is beyond the end of ${state.file} (${lines.length} lines).`
+        `Line ${state.line} is beyond the end of ${state.file} (${lines2.length} lines).`
       )
     );
     process.exitCode = 1;
     return;
   }
   const marker = isHashCommentFile(state.file) ? "#" : "//";
-  const indentSource = lines[index3] ?? "";
+  const indentSource = lines2[index3] ?? "";
   const indent2 = indentSource.match(/^\s*/)?.[0] ?? "";
-  lines.splice(index3, 0, `${indent2}${marker} ${state.text}`);
-  writeFileSync24(state.file, lines.join("\n"));
+  lines2.splice(index3, 0, `${indent2}${marker} ${state.text}`);
+  writeFileSync24(state.file, lines2.join("\n"));
   unlinkSync8(getPinStatePath(pin));
   console.log(
     chalk118.green(
@@ -16413,17 +16413,17 @@ async function sloc(pattern2 = "**/*.ts", options2 = {}) {
     let hasViolation = false;
     for (const file of files) {
       const content = fs22.readFileSync(file, "utf8");
-      const lines = countSloc(content);
-      results.push({ file, lines });
-      if (options2.threshold !== void 0 && lines > options2.threshold) {
+      const lines2 = countSloc(content);
+      results.push({ file, lines: lines2 });
+      if (options2.threshold !== void 0 && lines2 > options2.threshold) {
         hasViolation = true;
       }
     }
     results.sort((a, b) => b.lines - a.lines);
-    for (const { file, lines } of results) {
-      const exceedsThreshold = options2.threshold !== void 0 && lines > options2.threshold;
+    for (const { file, lines: lines2 } of results) {
+      const exceedsThreshold = options2.threshold !== void 0 && lines2 > options2.threshold;
       const color = exceedsThreshold ? chalk127.red : chalk127.white;
-      console.log(`${color(file)} \u2192 ${chalk127.cyan(lines)} lines`);
+      console.log(`${color(file)} \u2192 ${chalk127.cyan(lines2)} lines`);
     }
     const total = results.reduce((sum, r) => sum + r.lines, 0);
     console.log(
@@ -17010,9 +17010,9 @@ function printCommitsWithFiles(commits2, ignore3, verbose) {
   }
 }
 function parseGitLogCommits(output, ignore3, afterDate) {
-  const lines = output.trim().split("\n");
+  const lines2 = output.trim().split("\n");
   const commitsByDate = /* @__PURE__ */ new Map();
-  for (const line of lines) {
+  for (const line of lines2) {
     const [date, hash, ...messageParts] = line.split("|");
     const message3 = messageParts.join("|");
     if (afterDate && date <= afterDate) {
@@ -18108,12 +18108,12 @@ function isHeaderLine2(line) {
   return trimmed === "" || trimmed.startsWith("#");
 }
 function extractShellComments(text17) {
-  const lines = text17.split("\n");
+  const lines2 = text17.split("\n");
   let firstCodeLine = 0;
-  while (firstCodeLine < lines.length && isHeaderLine2(lines[firstCodeLine])) {
+  while (firstCodeLine < lines2.length && isHeaderLine2(lines2[firstCodeLine])) {
     firstCodeLine++;
   }
-  return extractYamlComments(lines.slice(firstCodeLine).join("\n"));
+  return extractYamlComments(lines2.slice(firstCodeLine).join("\n"));
 }
 
 // src/commands/editHook/introducedComments.ts
@@ -19159,9 +19159,28 @@ function keptInPlace(cwd) {
   return { cwd, kind: "primary", created: false };
 }
 
+// src/commands/sessions/daemon/describePersistedSession.ts
+function describePersistedSession(entry) {
+  const { id, name, cwd } = readDescribed(entry);
+  return `id=${id ?? "?"} name=${JSON.stringify(name ?? "?")} cwd=${cwd ?? "?"}`;
+}
+function readDescribed(entry) {
+  if (typeof entry !== "object" || entry === null) return {};
+  const record = entry;
+  return {
+    id: stringOrUndefined(record.id),
+    name: stringOrUndefined(record.name),
+    cwd: stringOrUndefined(record.cwd)
+  };
+}
+function stringOrUndefined(value) {
+  return typeof value === "string" ? value : void 0;
+}
+
 // src/commands/sessions/daemon/persistedSessionSchema.ts
 import { z as z7 } from "zod";
 var persistedSessionSchema = z7.object({
+  id: z7.string().optional(),
   name: z7.string(),
   title: z7.string().optional(),
   generatedTitle: z7.string().optional(),
@@ -19185,6 +19204,7 @@ var persistedSessionSchema = z7.object({
 // src/commands/sessions/daemon/toPersistedSession.ts
 function toPersistedSession(session) {
   return {
+    id: session.id,
     name: session.name,
     title: session.title,
     generatedTitle: session.generatedTitle,
@@ -19214,10 +19234,25 @@ var SESSIONS_FILE = "sessions.json";
 function loadPersistedSessions() {
   const data = loadJson(SESSIONS_FILE);
   if (!Array.isArray(data)) return [];
-  return data.flatMap((entry) => {
+  const rejected = [];
+  const loaded = data.flatMap((entry) => {
     const parsed = persistedSessionSchema.safeParse(entry);
-    return parsed.success ? [parsed.data] : [];
+    if (parsed.success) return [parsed.data];
+    rejected.push(
+      `${describePersistedSession(entry)}: ${parsed.error.issues.map((i) => `${i.path.join(".")} ${i.message}`).join("; ")}`
+    );
+    return [];
   });
+  logRejected(rejected);
+  return loaded;
+}
+var lastRejectedSignature = "";
+function logRejected(rejected) {
+  const signature = rejected.join("|");
+  if (signature === lastRejectedSignature) return;
+  lastRejectedSignature = signature;
+  for (const entry of rejected)
+    daemonLog(`unreadable persisted session dropped \u2014 ${entry}`);
 }
 function savePersistedSessions(sessions) {
   saveJson(SESSIONS_FILE, sessions);
@@ -19389,7 +19424,7 @@ function placedByDaemon() {
 function seed(worktreePath, clone) {
   console.log(`Preparing ${worktreePath}\u2026`);
   return new Promise(
-    (resolve21) => seedWorktree(worktreePath, clone, resolve21)
+    (resolve22) => seedWorktree(worktreePath, clone, resolve22)
   );
 }
 async function moveToPrCheckoutTree() {
@@ -19896,25 +19931,25 @@ function isVisibleText(t) {
   return /[a-zA-Z]{3,}/.test(t);
 }
 var isHashtag = (t) => /^#[A-Za-z0-9_]+$/.test(t);
-function collectRscText(v, resolve21, sink2, seen) {
+function collectRscText(v, resolve22, sink2, seen) {
   if (v == null) return;
   if (typeof v === "string") {
     if (isRscRef(v)) {
       if (!seen.has(v)) {
         seen.add(v);
-        collectRscText(resolve21(v), resolve21, sink2, seen);
+        collectRscText(resolve22(v), resolve22, sink2, seen);
       }
     } else if (isHashtag(v)) sink2.hashtags.push(v);
     else if (isVisibleText(v)) sink2.text.push(v);
     return;
   }
   if (Array.isArray(v)) {
-    for (const x of v) collectRscText(x, resolve21, sink2, seen);
+    for (const x of v) collectRscText(x, resolve22, sink2, seen);
     return;
   }
   if (typeof v === "object") {
     for (const val of Object.values(v)) {
-      collectRscText(val, resolve21, sink2, seen);
+      collectRscText(val, resolve22, sink2, seen);
     }
   }
 }
@@ -19946,7 +19981,7 @@ function visitObjects(root, fn) {
     }
   }
 }
-function buildMentionMap(rows, resolve21) {
+function buildMentionMap(rows, resolve22) {
   const map = /* @__PURE__ */ new Map();
   visitObjects(rows, (o) => {
     const url = profileActionUrl(o);
@@ -19954,7 +19989,7 @@ function buildMentionMap(rows, resolve21) {
     const slug = slugFromProfileUrl(url);
     if (!slug || map.has(slug)) return;
     const sink2 = { text: [], hashtags: [] };
-    collectRscText(o.children, resolve21, sink2, /* @__PURE__ */ new Set());
+    collectRscText(o.children, resolve22, sink2, /* @__PURE__ */ new Set());
     const name = sink2.text.join(" ").replace(/\s+/g, " ").trim();
     map.set(slug, name ? { slug, name, url } : { slug, url });
   });
@@ -20040,10 +20075,10 @@ function buildPost(raw, mentionMap, author) {
 
 // src/commands/netcap/walkPostRow.ts
 var isCommentary = (o) => asObject(o.viewTrackingSpecs)?.viewName === "feed-commentary";
-function walkPostRow(v, resolve21, raw) {
+function walkPostRow(v, resolve22, raw) {
   if (v == null || typeof v !== "object") return;
   if (Array.isArray(v)) {
-    for (const x of v) walkPostRow(x, resolve21, raw);
+    for (const x of v) walkPostRow(x, resolve22, raw);
     return;
   }
   const o = v;
@@ -20057,9 +20092,9 @@ function walkPostRow(v, resolve21, raw) {
   }
   if (isCommentary(o)) {
     const sink2 = { text: raw.text, hashtags: raw.hashtags };
-    collectRscText(o.children, resolve21, sink2, /* @__PURE__ */ new Set());
+    collectRscText(o.children, resolve22, sink2, /* @__PURE__ */ new Set());
   }
-  for (const val of Object.values(o)) walkPostRow(val, resolve21, raw);
+  for (const val of Object.values(o)) walkPostRow(val, resolve22, raw);
 }
 
 // src/commands/netcap/extractLinkedInPosts.ts
@@ -20073,8 +20108,8 @@ function findCommentaryRows(rows) {
 }
 function extractLinkedInPosts(flight, author = findAuthorSlug(flight)) {
   const rows = parseRscRows(flight);
-  const resolve21 = makeRscResolver(rows);
-  const mentionMap = buildMentionMap(rows, resolve21);
+  const resolve22 = makeRscResolver(rows);
+  const mentionMap = buildMentionMap(rows, resolve22);
   const posts = [];
   for (const id of findCommentaryRows(rows)) {
     const raw = {
@@ -20084,7 +20119,7 @@ function extractLinkedInPosts(flight, author = findAuthorSlug(flight)) {
       links: [],
       related: []
     };
-    walkPostRow(rows[id], resolve21, raw);
+    walkPostRow(rows[id], resolve22, raw);
     const post = buildPost(raw, mentionMap, author);
     if (post) posts.push(post);
   }
@@ -20253,9 +20288,9 @@ function extractVoyagerPosts(body) {
 
 // src/commands/netcap/extractPostsFromCapture.ts
 function captureEntries(captureFile) {
-  const lines = readFileSync39(captureFile, "utf8").split("\n").filter(Boolean);
+  const lines2 = readFileSync39(captureFile, "utf8").split("\n").filter(Boolean);
   const entries = [];
-  for (const line of lines) {
+  for (const line of lines2) {
     let entry;
     try {
       entry = JSON.parse(line);
@@ -20695,11 +20730,11 @@ function findWallOfText(body) {
 function splitParagraphs(body) {
   const paragraphs = [];
   let section3 = "(intro)";
-  let lines = [];
+  let lines2 = [];
   const flush = () => {
-    if (lines.length > 0) {
-      paragraphs.push({ section: section3, lines });
-      lines = [];
+    if (lines2.length > 0) {
+      paragraphs.push({ section: section3, lines: lines2 });
+      lines2 = [];
     }
   };
   for (const line of body.split("\n")) {
@@ -20710,17 +20745,17 @@ function splitParagraphs(body) {
     } else if (line.trim() === "") {
       flush();
     } else {
-      lines.push(line);
+      lines2.push(line);
     }
   }
   flush();
   return paragraphs;
 }
-function isWallOfText(lines) {
-  if (lines.some(isListLine)) {
+function isWallOfText(lines2) {
+  if (lines2.some(isListLine)) {
     return false;
   }
-  const text17 = lines.join(" ").trim();
+  const text17 = lines2.join(" ").trim();
   return text17.length > MAX_PARAGRAPH_CHARS || countSentences(text17) > MAX_PARAGRAPH_SENTENCES;
 }
 function countSentences(paragraph) {
@@ -22163,9 +22198,9 @@ function parseRefactorYml() {
   }
   const content = fs24.readFileSync(REFACTOR_YML_PATH, "utf8");
   const entries = [];
-  const lines = content.split("\n");
+  const lines2 = content.split("\n");
   let currentEntry = {};
-  for (const line of lines) {
+  for (const line of lines2) {
     const trimmed = line.trim();
     if (trimmed.startsWith("- file:")) {
       if (currentEntry.file) {
@@ -22238,7 +22273,7 @@ function getViolations(pattern2, options2 = {}, maxLines = DEFAULT_MAX_LINES) {
 
 // src/commands/refactor/check/index.ts
 function runScript(script, cwd) {
-  return new Promise((resolve21) => {
+  return new Promise((resolve22) => {
     const child = spawn6("npm", ["run", script], {
       stdio: "pipe",
       shell: true,
@@ -22252,7 +22287,7 @@ function runScript(script, cwd) {
       output += data.toString();
     });
     child.on("close", (code) => {
-      resolve21({ script, code: code ?? 1, output });
+      resolve22({ script, code: code ?? 1, output });
     });
   });
 }
@@ -22753,22 +22788,22 @@ function formatImportLine(imp) {
 
 // src/commands/refactor/extract/buildDestinationContent.ts
 function buildDestinationContent(functionTexts, imports, sourceRelativePath, sourceImportNames) {
-  const lines = [];
+  const lines2 = [];
   for (const imp of imports) {
-    lines.push(formatImportLine(imp));
+    lines2.push(formatImportLine(imp));
   }
   if (sourceImportNames.length > 0) {
-    lines.push(
+    lines2.push(
       `import { ${sourceImportNames.join(", ")} } from "${sourceRelativePath}";`
     );
   }
-  if (lines.length > 0) lines.push("");
+  if (lines2.length > 0) lines2.push("");
   for (let i = 0; i < functionTexts.length; i++) {
-    if (i > 0) lines.push("");
-    lines.push(functionTexts[i]);
+    if (i > 0) lines2.push("");
+    lines2.push(functionTexts[i]);
   }
-  lines.push("");
-  return lines.join("\n");
+  lines2.push("");
+  return lines2.join("\n");
 }
 
 // src/commands/refactor/extract/getRelativeImportPath.ts
@@ -23379,9 +23414,9 @@ function groupReferences(symbol, cwd) {
   const grouped = /* @__PURE__ */ new Map();
   for (const ref of refs) {
     const refFile = path50.relative(cwd, ref.getSourceFile().getFilePath());
-    const lines = grouped.get(refFile) ?? [];
-    if (!grouped.has(refFile)) grouped.set(refFile, lines);
-    lines.push(ref.getStartLineNumber());
+    const lines2 = grouped.get(refFile) ?? [];
+    if (!grouped.has(refFile)) grouped.set(refFile, lines2);
+    lines2.push(ref.getStartLineNumber());
   }
   return grouped;
 }
@@ -23401,9 +23436,9 @@ async function renameSymbol(file, oldName, newName, options2 = {}) {
     chalk189.bold(`Rename: ${oldName} \u2192 ${newName} (${totalRefs} references)
 `)
   );
-  for (const [refFile, lines] of grouped) {
+  for (const [refFile, lines2] of grouped) {
     console.log(
-      `  ${chalk189.dim(refFile)}: lines ${chalk189.cyan(lines.join(", "))}`
+      `  ${chalk189.dim(refFile)}: lines ${chalk189.cyan(lines2.join(", "))}`
     );
   }
   if (options2.apply) {
@@ -23844,12 +23879,12 @@ function headerFor(c) {
   return tags ? `### ${location} [${tags}]` : `### ${location}`;
 }
 function formatThread(thread) {
-  const lines = [
+  const lines2 = [
     headerFor(thread.root),
     `**${thread.root.author}**: ${thread.root.body.trim()}`,
     ...thread.replies.map((r) => `**${r.author}** (reply): ${r.body.trim()}`)
   ];
-  return lines.join("\n\n");
+  return lines2.join("\n\n");
 }
 var INTRO = `The PR already has the review comments below (including resolved and outdated threads). Avoid re-raising findings that a prior comment substantively covers.`;
 function formatPriorComments(comments3) {
@@ -24156,13 +24191,13 @@ function summariseSynthesis(markdown) {
   return { summary: extractSummary(markdown), totals, findingCount };
 }
 function formatSynthesisSummary(summary) {
-  const lines = [];
+  const lines2 = [];
   const { totals, findingCount } = summary;
-  lines.push(
+  lines2.push(
     `Findings: ${findingCount} (blocker ${totals.blocker}, major ${totals.major}, minor ${totals.minor}, nit ${totals.nit})`
   );
-  if (summary.summary) lines.push("", summary.summary);
-  return lines.join("\n");
+  if (summary.summary) lines2.push("", summary.summary);
+  return lines2.join("\n");
 }
 
 // src/commands/review/buildReviewSummary.ts
@@ -24173,12 +24208,12 @@ function formatFindingLine(finding) {
 function buildReviewSummary(markdown) {
   const summary = summariseSynthesis(markdown);
   const findings = parseFindings(markdown);
-  const lines = ["## Code review summary", "", formatSynthesisSummary(summary)];
+  const lines2 = ["## Code review summary", "", formatSynthesisSummary(summary)];
   if (findings.length > 0) {
-    lines.push("", "### Findings", "");
-    for (const finding of findings) lines.push(formatFindingLine(finding));
+    lines2.push("", "### Findings", "");
+    for (const finding of findings) lines2.push(formatFindingLine(finding));
   }
-  return lines.join("\n");
+  return lines2.join("\n");
 }
 
 // src/commands/review/sanitiseReviewerNames.ts
@@ -24189,13 +24224,13 @@ function sanitiseReviewerNames(value) {
 
 // src/commands/review/postFindings.ts
 function buildCommentBody(finding) {
-  const lines = [];
+  const lines2 = [];
   const severityLabel = finding.severity ?? "finding";
-  lines.push(`**${severityLabel}: ${finding.title}**`);
-  if (finding.impact) lines.push("", `Impact: ${finding.impact}`);
+  lines2.push(`**${severityLabel}: ${finding.title}**`);
+  if (finding.impact) lines2.push("", `Impact: ${finding.impact}`);
   if (finding.recommendation)
-    lines.push("", `Recommendation: ${finding.recommendation}`);
-  return sanitiseReviewerNames(lines.join("\n"));
+    lines2.push("", `Recommendation: ${finding.recommendation}`);
+  return sanitiseReviewerNames(lines2.join("\n"));
 }
 function postFindings(findings) {
   let posted = 0;
@@ -24294,10 +24329,10 @@ function buildDiffLineIndex(diff3) {
 
 // src/commands/review/partitionFindingsByDiff.ts
 function isWithinDiff(finding, index3) {
-  const lines = index3.get(finding.file);
-  if (!lines) return false;
-  if (!lines.has(finding.line)) return false;
-  if (finding.startLine !== void 0 && !lines.has(finding.startLine)) {
+  const lines2 = index3.get(finding.file);
+  if (!lines2) return false;
+  if (!lines2.has(finding.line)) return false;
+  if (finding.startLine !== void 0 && !lines2.has(finding.startLine)) {
     return false;
   }
   return true;
@@ -24688,8 +24723,8 @@ function indent(text17) {
   return text17.split(/\r?\n/).map((line) => `  ${line}`);
 }
 function tailLines(text17, maxLines) {
-  const lines = text17.split(/\r?\n/);
-  return lines.length <= maxLines ? text17 : lines.slice(-maxLines).join("\n");
+  const lines2 = text17.split(/\r?\n/);
+  return lines2.length <= maxLines ? text17 : lines2.slice(-maxLines).join("\n");
 }
 function isFastFail(input) {
   return input.exitCode !== 0 && input.elapsedMs !== void 0 && input.elapsedMs < FAST_FAIL_MS;
@@ -25061,12 +25096,12 @@ function onCloseResult(ctx, code) {
   return { ...closed, stderr: ctx.stderr.value, stdout: ctx.stdout.value };
 }
 function waitForChildExit(ctx) {
-  return new Promise((resolve21) => {
+  return new Promise((resolve22) => {
     let settled = false;
     const settle = (result) => {
       if (settled) return;
       settled = true;
-      resolve21(result);
+      resolve22(result);
     };
     ctx.child.on("error", (err) => settle(onErrorResult(ctx, err)));
     ctx.child.on("close", (code) => settle(onCloseResult(ctx, code)));
@@ -25721,13 +25756,13 @@ function formatEvent(event) {
   const abbrev = levelAbbrev(event.Level);
   const ts8 = chalk198.dim(formatTimestamp(event.Timestamp));
   const msg = renderMessage(event);
-  const lines = [`${ts8} ${color(`[${abbrev}]`)} ${msg}`];
+  const lines2 = [`${ts8} ${color(`[${abbrev}]`)} ${msg}`];
   if (event.Exception) {
     for (const line of event.Exception.split("\n")) {
-      lines.push(chalk198.red(`  ${line}`));
+      lines2.push(chalk198.red(`  ${line}`));
     }
   }
-  return lines.join("\n");
+  return lines2.join("\n");
 }
 
 // src/commands/seq/parseRelativeTime.ts
@@ -26166,9 +26201,9 @@ function createReadlineInterface() {
   });
 }
 function askQuestion(rl, question) {
-  return new Promise((resolve21) => {
+  return new Promise((resolve22) => {
     rl.question(question, (answer) => {
-      resolve21(answer.trim());
+      resolve22(answer.trim());
     });
   });
 }
@@ -26388,13 +26423,13 @@ function extractSpeaker(fullText) {
 function isTextLine(line) {
   return !!line.trim() && !line.includes("-->");
 }
-function scanTextLines(lines, start3) {
+function scanTextLines(lines2, start3) {
   let i = start3;
-  while (i < lines.length && isTextLine(lines[i])) i++;
-  return { texts: lines.slice(start3, i).map((l) => l.trim()), end: i };
+  while (i < lines2.length && isTextLine(lines2[i])) i++;
+  return { texts: lines2.slice(start3, i).map((l) => l.trim()), end: i };
 }
-function collectTextLines(lines, startIndex) {
-  const { texts, end } = scanTextLines(lines, startIndex);
+function collectTextLines(lines2, startIndex) {
+  const { texts, end } = scanTextLines(lines2, startIndex);
   return { text: texts.join(" "), nextIndex: end };
 }
 function parseTimestampLine(line) {
@@ -26405,30 +26440,30 @@ function buildCue(startMs, endMs, fullText) {
   const { speaker, text: text17 } = extractSpeaker(fullText);
   return text17 ? { startMs, endMs, speaker, text: text17 } : null;
 }
-function parseCueLine(lines, i) {
-  const { startMs, endMs } = parseTimestampLine(lines[i]);
-  const { text: text17, nextIndex: nextIndex2 } = collectTextLines(lines, i + 1);
+function parseCueLine(lines2, i) {
+  const { startMs, endMs } = parseTimestampLine(lines2[i]);
+  const { text: text17, nextIndex: nextIndex2 } = collectTextLines(lines2, i + 1);
   return { cue: buildCue(startMs, endMs, text17), nextIndex: nextIndex2 };
 }
 function isCueSeparator(line) {
   return line.trim().includes("-->");
 }
-function skipHeader(lines) {
+function skipHeader(lines2) {
   let i = 0;
-  while (i < lines.length && !isCueSeparator(lines[i])) i++;
+  while (i < lines2.length && !isCueSeparator(lines2[i])) i++;
   return i;
 }
-function processLine(cues, lines, i) {
-  if (!isCueSeparator(lines[i])) return i + 1;
-  const { cue, nextIndex: nextIndex2 } = parseCueLine(lines, i);
+function processLine(cues, lines2, i) {
+  if (!isCueSeparator(lines2[i])) return i + 1;
+  const { cue, nextIndex: nextIndex2 } = parseCueLine(lines2, i);
   if (cue) cues.push(cue);
   return nextIndex2;
 }
 function parseVtt(content) {
   const cues = [];
-  const lines = content.split(/\r?\n/);
-  let i = skipHeader(lines);
-  while (i < lines.length) i = processLine(cues, lines, i);
+  const lines2 = content.split(/\r?\n/);
+  let i = skipHeader(lines2);
+  while (i < lines2.length) i = processLine(cues, lines2, i);
   return cues;
 }
 
@@ -26653,8 +26688,8 @@ function logs(options2) {
     console.log("Voice log is empty");
     return;
   }
-  const lines = content.split("\n").slice(-count8);
-  for (const line of lines) {
+  const lines2 = content.split("\n").slice(-count8);
+  for (const line of lines2) {
     try {
       const event = JSON.parse(line);
       const time = event.timestamp?.slice(11, 19) ?? "";
@@ -26802,8 +26837,8 @@ function isProcessAlive3(pid) {
 }
 function readRecentLogs(count8) {
   if (!existsSync56(voicePaths.log)) return [];
-  const lines = readFileSync46(voicePaths.log, "utf8").trim().split("\n");
-  return lines.slice(-count8);
+  const lines2 = readFileSync46(voicePaths.log, "utf8").trim().split("\n");
+  return lines2.slice(-count8);
 }
 function status2() {
   if (!existsSync56(voicePaths.pid)) {
@@ -26910,6 +26945,152 @@ function registerVoice(program2) {
   configHelp(voiceCommand, voiceConfigHelp);
 }
 
+// src/commands/watch/readBuiltVersion.ts
+import { join as join67 } from "path";
+
+// src/commands/watch/resolveUpstream.ts
+import { execFileSync as execFileSync10 } from "child_process";
+function runGit2(args, cwd) {
+  return execFileSync10("git", args, {
+    encoding: "utf8",
+    stdio: ["pipe", "pipe", "pipe"],
+    cwd
+  }).trim();
+}
+function resolveUpstream(cwd) {
+  try {
+    runGit2(["rev-parse", "--is-inside-work-tree"], cwd);
+  } catch {
+    throw new Error(
+      "not a git repository \u2014 run assist watch wait from inside a repo"
+    );
+  }
+  let branch2;
+  try {
+    branch2 = runGit2(["symbolic-ref", "--quiet", "--short", "HEAD"], cwd);
+  } catch {
+    throw new Error(
+      "HEAD is detached \u2014 check out a branch before waiting on its upstream"
+    );
+  }
+  try {
+    return {
+      branch: branch2,
+      upstream: runGit2(
+        ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"],
+        cwd
+      )
+    };
+  } catch {
+    throw new Error(
+      `branch "${branch2}" has no upstream \u2014 set one with: git push -u origin ${branch2}`
+    );
+  }
+}
+
+// src/commands/watch/readBuiltVersion.ts
+function readBuiltVersion(cwd) {
+  try {
+    const root = runGit2(["rev-parse", "--show-toplevel"], cwd);
+    return readPackageJson(join67(root, "package.json")).version ?? "unknown";
+  } catch {
+    return "unknown";
+  }
+}
+
+// src/commands/watch/readRecentCommits.ts
+function readRecentCommits(count8 = 10, cwd) {
+  const output = runGit2(
+    ["log", `-${count8}`, "--pretty=format:%H%x09%h%x09%ar%x09%s"],
+    cwd
+  );
+  if (!output) return [];
+  return output.split("\n").map((line) => {
+    const [sha, short2, when, ...subject] = line.split("	");
+    return { sha, short: short2, when, subject: subject.join("	") };
+  });
+}
+
+// src/commands/watch/renderWatchReport.ts
+var escapeCell = (text17) => text17.replaceAll("|", String.raw`\|`);
+function renderWatchReport({
+  version: version2,
+  commits: commits2,
+  newShas,
+  restarts
+}) {
+  const isNew = new Set(newShas);
+  const lines2 = [`**Version** ${version2}`, ""];
+  if (commits2.length === 0) {
+    lines2.push("_no commits_");
+  } else {
+    lines2.push("| SHA | When | Subject |", "| --- | --- | --- |");
+    for (const commit2 of commits2) {
+      const marker = isNew.has(commit2.sha) ? " \u2190 new" : "";
+      lines2.push(
+        `| \`${commit2.short}\` | ${commit2.when} | ${escapeCell(commit2.subject)}${marker} |`
+      );
+    }
+  }
+  lines2.push("", "**Restarts**", "");
+  lines2.push(
+    ...restarts.length === 0 ? ["- none needed"] : restarts.map((restart) => `- ${restart}`)
+  );
+  return lines2.join("\n");
+}
+
+// src/commands/watch/restartAdvice.ts
+var webUiPrefix = "src/commands/sessions/web/ui/";
+var sessionsPrefix = "src/commands/sessions/";
+var rules = [
+  {
+    matches: (path71) => path71.startsWith(webUiPrefix),
+    advice: "restart the web server, then hard-reload the browser tab"
+  },
+  {
+    matches: (path71) => path71.startsWith(sessionsPrefix) && !path71.startsWith(webUiPrefix),
+    advice: "restart the daemon"
+  }
+];
+function restartAdvice(paths) {
+  return rules.filter((rule) => paths.some(rule.matches)).map((rule) => rule.advice);
+}
+
+// src/commands/watch/buildWatchReport.ts
+var lines = (output) => output.split("\n").filter((line) => line.length > 0);
+function buildWatchReport(from, cwd) {
+  const range = from ? `${from}..HEAD` : void 0;
+  return renderWatchReport({
+    version: readBuiltVersion(cwd),
+    commits: readRecentCommits(10, cwd),
+    newShas: range ? lines(runGit2(["rev-list", range], cwd)) : [],
+    restarts: restartAdvice(
+      range ? lines(runGit2(["diff", "--name-only", range], cwd)) : []
+    )
+  });
+}
+
+// src/commands/watch/gitFailureReason.ts
+function gitFailureReason(error) {
+  const streams = error;
+  for (const stream of [streams?.stderr, streams?.stdout]) {
+    const text17 = stream == null ? "" : String(stream).trim();
+    if (text17) return text17;
+  }
+  const message3 = error instanceof Error ? error.message : String(error);
+  return message3.trim() || "git failed without reporting a reason";
+}
+
+// src/commands/watch/watchReport.ts
+function watchReport(options2) {
+  try {
+    console.log(buildWatchReport(options2.from));
+  } catch (error) {
+    console.error(`cannot build the report: ${gitFailureReason(error)}`);
+    process.exit(1);
+  }
+}
+
 // src/commands/watch/describeOutcome.ts
 var short = (sha) => sha.slice(0, 7);
 function describeOutcome(outcome) {
@@ -26962,72 +27143,248 @@ function parseDuration(value) {
   return amount * UNIT_MS[match[2]];
 }
 
-// src/commands/watch/gitFailureReason.ts
-function gitFailureReason(error) {
-  const streams = error;
-  for (const stream of [streams?.stderr, streams?.stdout]) {
-    const text17 = stream == null ? "" : String(stream).trim();
-    if (text17) return text17;
+// src/commands/watch/parseWatchDurations.ts
+function parseOrExit(value) {
+  try {
+    return parseDuration(value);
+  } catch (error) {
+    console.error(error instanceof Error ? error.message : String(error));
+    return process.exit(1);
   }
-  const message3 = error instanceof Error ? error.message : String(error);
-  return message3.trim() || "git failed without reporting a reason";
+}
+function parseWatchDurations(interval, timeout) {
+  return {
+    intervalMs: parseOrExit(interval),
+    timeoutMs: timeout.trim() === "none" ? void 0 : parseOrExit(timeout)
+  };
 }
 
-// src/commands/watch/resolveUpstream.ts
-import { execFileSync as execFileSync10 } from "child_process";
-function runGit2(args, cwd) {
-  return execFileSync10("git", args, {
-    encoding: "utf8",
-    stdio: ["pipe", "pipe", "pipe"],
-    cwd
-  }).trim();
+// src/commands/watch/pullFastForward.ts
+var STASH_MESSAGE = "assist watch";
+function attemptGit(args, cwd) {
+  try {
+    runGit2(args, cwd);
+    return { ok: true };
+  } catch (error) {
+    return { ok: false, reason: gitFailureReason(error) };
+  }
 }
-function resolveUpstream(cwd) {
+function fastForwarded(cwd) {
+  return { kind: "fast-forwarded", sha: runGit2(["rev-parse", "@"], cwd) };
+}
+function operationInProgress(cwd) {
+  return ["MERGE_HEAD", "REBASE_HEAD"].some(
+    (ref) => attemptGit(["rev-parse", "--verify", "--quiet", ref], cwd).ok
+  );
+}
+function headMatchesUpstream(cwd) {
   try {
-    runGit2(["rev-parse", "--is-inside-work-tree"], cwd);
+    return runGit2(["rev-parse", "@"], cwd) === runGit2(["rev-parse", "@{u}"], cwd);
   } catch {
-    throw new Error(
-      "not a git repository \u2014 run assist watch wait from inside a repo"
-    );
+    return false;
   }
-  let branch2;
+}
+function behindUpstream(cwd) {
+  return attemptGit(["merge-base", "--is-ancestor", "@", "@{u}"], cwd).ok;
+}
+function stashDirtyTree(cwd) {
+  let dirty;
   try {
-    branch2 = runGit2(["symbolic-ref", "--quiet", "--short", "HEAD"], cwd);
-  } catch {
-    throw new Error(
-      "HEAD is detached \u2014 check out a branch before waiting on its upstream"
-    );
+    dirty = runGit2(["status", "--porcelain"], cwd) !== "";
+  } catch (error) {
+    return { ok: false, reason: gitFailureReason(error) };
+  }
+  if (!dirty) return { ok: true, stashed: false };
+  const push = attemptGit(
+    ["stash", "push", "--include-untracked", "--message", STASH_MESSAGE],
+    cwd
+  );
+  return push.ok ? { ok: true, stashed: true } : push;
+}
+function mergeBehindBranch(cwd) {
+  const stash = stashDirtyTree(cwd);
+  if (!stash.ok) return { kind: "blocked", reason: stash.reason };
+  const merge = attemptGit(["merge", "--ff-only", "@{u}"], cwd);
+  const restore2 = stash.stashed ? attemptGit(["stash", "pop"], cwd) : { ok: true };
+  if (!merge.ok) return { kind: "blocked", reason: merge.reason };
+  if (!restore2.ok) return { kind: "blocked", reason: restore2.reason };
+  return fastForwarded(cwd);
+}
+function pullFastForward(cwd) {
+  const pull = attemptGit(["pull", "--ff-only"], cwd);
+  if (pull.ok) return fastForwarded(cwd);
+  if (operationInProgress(cwd)) return { kind: "blocked", reason: pull.reason };
+  if (headMatchesUpstream(cwd)) return fastForwarded(cwd);
+  if (!behindUpstream(cwd)) return { kind: "blocked", reason: pull.reason };
+  return mergeBehindBranch(cwd);
+}
+
+// src/commands/watch/runWatchBuild.ts
+import { resolve as resolve17 } from "path";
+
+// src/commands/run/findRunConfig.ts
+function exitNoRunConfigs() {
+  console.error("No run configurations found in assist.yml");
+  process.exit(1);
+}
+function exitWithConfigNotFound(name, configs) {
+  console.error(`No run configuration found with name: ${name}`);
+  console.error("Available configurations:");
+  for (const r of configs) {
+    console.error(`  - ${r.name}`);
+  }
+  process.exit(1);
+}
+function exitWithAmbiguousConfig(name, matches) {
+  console.error(`Ambiguous run configuration: ${name}`);
+  console.error("Did you mean:");
+  for (const r of matches) {
+    console.error(`  - ${r.name}`);
+  }
+  process.exit(1);
+}
+function requireRunConfigs() {
+  const { run: run4 } = loadConfig();
+  const configs = resolveRunConfigs(run4, getConfigDir());
+  if (configs.length === 0) return exitNoRunConfigs();
+  return configs;
+}
+function lookupRunConfig(name) {
+  const configs = requireRunConfigs();
+  const exact = configs.find((r) => r.name === name);
+  if (exact) return { kind: "match", config: exact };
+  const suffixMatches = configs.filter((r) => r.name.endsWith(`:${name}`));
+  if (suffixMatches.length === 1)
+    return { kind: "match", config: suffixMatches[0] };
+  if (suffixMatches.length > 1)
+    return { kind: "ambiguous", matches: suffixMatches };
+  return { kind: "not-found" };
+}
+function findRunConfig(name) {
+  const result = lookupRunConfig(name);
+  if (result.kind === "match") return result.config;
+  if (result.kind === "ambiguous")
+    return exitWithAmbiguousConfig(name, result.matches);
+  return exitWithConfigNotFound(name, requireRunConfigs());
+}
+
+// src/commands/run/resolveParams.ts
+function resolveParams(params, cliArgs) {
+  if (!params || params.length === 0) return cliArgs;
+  const resolved = [];
+  const missing = [];
+  for (let i = 0; i < params.length; i++) {
+    const param = params[i];
+    const value = cliArgs[i] ?? param.default;
+    if (value !== void 0) {
+      resolved.push(value);
+    } else if (param.required) {
+      missing.push(param.name);
+    }
+  }
+  if (missing.length > 0) {
+    const s = missing.length > 1 ? "s" : "";
+    const names = missing.map((n) => `"${n}"`).join(", ");
+    console.error(`Missing required param${s}: ${names}`);
+    process.exit(1);
   }
+  resolved.push(...cliArgs.slice(params.length));
+  return resolved;
+}
+
+// src/commands/run/runCommandToCompletion.ts
+import { execFileSync as execFileSync11, spawn as spawn9 } from "child_process";
+import { existsSync as existsSync58 } from "fs";
+import { dirname as dirname31, join as join68, resolve as resolve16 } from "path";
+function resolveCommand2(command) {
+  if (process.platform !== "win32" || command !== "bash") return command;
   try {
-    return {
-      branch: branch2,
-      upstream: runGit2(
-        ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"],
-        cwd
-      )
-    };
+    const gitPath = execFileSync11("where", ["git"], { encoding: "utf8" }).trim().split("\r\n")[0];
+    const gitRoot = resolve16(dirname31(gitPath), "..");
+    const gitBash = join68(gitRoot, "bin", "bash.exe");
+    if (existsSync58(gitBash)) return gitBash;
   } catch {
-    throw new Error(
-      `branch "${branch2}" has no upstream \u2014 set one with: git push -u origin ${branch2}`
-    );
+    return command;
   }
+  return command;
+}
+function runCommandToCompletion(command, args, env, cwd, quiet) {
+  return new Promise((resolveResult) => {
+    const child = spawn9(resolveCommand2(command), args, {
+      stdio: quiet ? "pipe" : "inherit",
+      env: env ? { ...process.env, ...expandEnv(env) } : void 0,
+      cwd
+    });
+    const chunks = [];
+    if (quiet) {
+      child.stdout?.on("data", (data) => chunks.push(data));
+      child.stderr?.on("data", (data) => chunks.push(data));
+    }
+    child.on("close", (code) => {
+      resolveResult({
+        kind: "completed",
+        exitCode: code ?? 0,
+        output: Buffer.concat(chunks).toString()
+      });
+    });
+    child.on("error", (err) => {
+      resolveResult({
+        kind: "failed",
+        message: `Failed to execute command: ${err.message}`
+      });
+    });
+  });
 }
 
-// src/commands/watch/pullFastForward.ts
-function pullFastForward(cwd) {
-  try {
-    runGit2(["pull", "--ff-only"], cwd);
-    return { kind: "fast-forwarded", sha: runGit2(["rev-parse", "@"], cwd) };
-  } catch (error) {
-    return { kind: "blocked", reason: gitFailureReason(error) };
+// src/commands/run/runPreCommands.ts
+import { execSync as execSync60 } from "child_process";
+function runPreCommands(pre, cwd) {
+  for (const cmd of pre) {
+    try {
+      execSync60(cmd, { stdio: "inherit", cwd });
+    } catch (error) {
+      const code = error && typeof error === "object" && "status" in error ? error.status : 1;
+      process.exit(code);
+    }
+  }
+}
+
+// src/commands/watch/runWatchBuild.ts
+async function runWatchBuild(entry) {
+  const config = findRunConfig(entry);
+  const cwd = config.cwd ? resolve17(getConfigDir(), config.cwd) : void 0;
+  if (config.pre) runPreCommands(config.pre, cwd);
+  const result = await runCommandToCompletion(
+    config.command,
+    [...config.args ?? [], ...resolveParams(config.params, [])],
+    config.env,
+    cwd,
+    config.quiet
+  );
+  if (result.kind === "failed")
+    return { kind: "failed", exitCode: 1, output: result.message };
+  if (result.exitCode !== 0)
+    return { kind: "failed", exitCode: result.exitCode, output: result.output };
+  return { kind: "built" };
+}
+
+// src/commands/watch/reportBuildOrExit.ts
+async function reportBuildOrExit(entry) {
+  const outcome = await runWatchBuild(entry);
+  if (outcome.kind === "built") {
+    console.log(`built with "${entry}"`);
+    return;
   }
+  if (outcome.output.length > 0) process.stdout.write(outcome.output);
+  console.error(`build "${entry}" failed with exit code ${outcome.exitCode}`);
+  process.exit(4);
 }
 
 // src/commands/watch/fetchQuietly.ts
-import { execFileSync as execFileSync11 } from "child_process";
+import { execFileSync as execFileSync12 } from "child_process";
 function fetchQuietly(cwd, timeoutMs) {
   try {
-    execFileSync11("git", ["fetch", "--quiet"], {
+    execFileSync12("git", ["fetch", "--quiet"], {
       stdio: ["pipe", "pipe", "pipe"],
       cwd,
       timeout: timeoutMs
@@ -27055,26 +27412,12 @@ function readMovement(cwd) {
   }
 }
 
-// src/commands/watch/waitForUpstream.ts
+// src/commands/watch/pollForMovement.ts
 var MIN_FETCH_TIMEOUT_MS = 6e4;
-function waitForUpstream(options2) {
-  const { intervalMs, timeoutMs, timeout, cwd, onStart } = options2;
-  let upstream;
-  try {
-    upstream = resolveUpstream(cwd).upstream;
-  } catch (error) {
-    return Promise.resolve({
-      kind: "unavailable",
-      reason: error instanceof Error ? error.message : String(error)
-    });
-  }
-  onStart?.(upstream);
-  const moved = readMovement(cwd);
-  if (moved) {
-    return Promise.resolve({ kind: "moved", upstream, ...moved });
-  }
+function pollForMovement(options2) {
+  const { upstream, intervalMs, timeoutMs, timeout, cwd } = options2;
   const fetchTimeoutMs = Math.max(intervalMs, MIN_FETCH_TIMEOUT_MS);
-  return new Promise((resolve21) => {
+  return new Promise((resolve22) => {
     let settled = false;
     const finish = (outcome) => {
       if (settled) return;
@@ -27082,7 +27425,7 @@ function waitForUpstream(options2) {
       clearInterval(ticker);
       clearTimeout(deadline);
       process.off("SIGINT", onInterrupt);
-      resolve21(outcome);
+      resolve22(outcome);
     };
     const onInterrupt = () => finish({ kind: "interrupted" });
     const ticker = setInterval(() => {
@@ -27090,7 +27433,7 @@ function waitForUpstream(options2) {
       const found = readMovement(cwd);
       if (found) finish({ kind: "moved", upstream, ...found });
     }, intervalMs);
-    const deadline = setTimeout(
+    const deadline = timeoutMs === void 0 ? void 0 : setTimeout(
       () => finish({ kind: "timeout", upstream, timeout }),
       timeoutMs
     );
@@ -27098,22 +27441,35 @@ function waitForUpstream(options2) {
   });
 }
 
-// src/commands/watch/watchWait.ts
-function parseOrExit(value) {
+// src/commands/watch/waitForUpstream.ts
+function waitForUpstream(options2) {
+  const { intervalMs, timeoutMs, timeout, cwd, onStart } = options2;
+  let upstream;
   try {
-    return parseDuration(value);
+    upstream = resolveUpstream(cwd).upstream;
   } catch (error) {
-    console.error(error instanceof Error ? error.message : String(error));
-    return process.exit(1);
+    return Promise.resolve({
+      kind: "unavailable",
+      reason: error instanceof Error ? error.message : String(error)
+    });
   }
+  onStart?.(upstream);
+  const moved = readMovement(cwd);
+  if (moved) return Promise.resolve({ kind: "moved", upstream, ...moved });
+  return pollForMovement({ upstream, intervalMs, timeoutMs, timeout, cwd });
 }
+
+// src/commands/watch/watchWait.ts
+var DEFAULT_BUILD_ENTRY = "auto-build";
 function report({ exitCode, message: message3 }) {
   if (exitCode === 0) console.log(message3);
   else console.error(message3);
 }
 async function watchWait(options2) {
-  const intervalMs = parseOrExit(options2.interval);
-  const timeoutMs = parseOrExit(options2.timeout);
+  const { intervalMs, timeoutMs } = parseWatchDurations(
+    options2.interval,
+    options2.timeout
+  );
   const outcome = await waitForUpstream({
     intervalMs,
     timeoutMs,
@@ -27122,29 +27478,47 @@ async function watchWait(options2) {
   });
   const waitReport = describeOutcome(outcome);
   report(waitReport);
-  if (outcome.kind === "moved" && options2.pull) {
-    const pullReport = describePull(pullFastForward());
-    report(pullReport);
-    process.exit(pullReport.exitCode);
+  if (outcome.kind !== "moved" || !options2.pull)
+    return process.exit(waitReport.exitCode);
+  const pullResult = pullFastForward();
+  const pullReport = describePull(pullResult);
+  report(pullReport);
+  if (pullResult.kind !== "fast-forwarded")
+    return process.exit(pullReport.exitCode);
+  console.log(`
+${buildWatchReport(outcome.from)}`);
+  if (options2.build) {
+    await reportBuildOrExit(
+      typeof options2.build === "string" ? options2.build : DEFAULT_BUILD_ENTRY
+    );
   }
-  process.exit(waitReport.exitCode);
+  process.exit(0);
 }
 
 // src/commands/registerWatch.ts
 function registerWatch(program2) {
   const watchCommand = program2.command("watch").description("Wait on upstream movement for the current branch");
   watchCommand.command("wait").description(
-    "Block until the current branch's upstream gains commits, then exit 0 (2 on timeout, 3 when --pull is not a fast-forward, 1 when waiting is impossible, 130 on interrupt)"
+    "Block until the current branch's upstream gains commits, then exit 0 (2 on timeout, 3 when --pull hits genuine divergence, 4 when --build fails, 1 when waiting is impossible, 130 on interrupt)"
   ).option("--interval <duration>", "How often to fetch (e.g. 30s, 2m)", "30s").option(
     "--timeout <duration>",
-    "Give up and exit 2 after this long (e.g. 60m, 2h)",
-    "60m"
+    "Give up and exit 2 after this long (e.g. 60m, 2h), or none to wait indefinitely",
+    "none"
   ).option(
     "--pull",
-    "On movement, fast-forward with git pull --ff-only; exit 3 with git's reason if it is not a clean fast-forward"
+    "On movement, fast-forward with git pull --ff-only, recovering a dirty tree or a merely-behind branch; exit 3 with git's reason on genuine divergence"
+  ).option(
+    "--build [entry]",
+    "After a successful pull, run this run entry (default auto-build); exit 4 with its output when it fails"
   ).action(
     (options2) => watchWait(options2)
   );
+  watchCommand.command("report").description(
+    "Print the built version, the last 10 commits as a markdown table, and the restarts the new commits make necessary"
+  ).option(
+    "--from <sha>",
+    "Mark commits reachable from HEAD but not <sha> as new, and derive restart advice from the files they changed"
+  ).action((options2) => watchReport(options2));
 }
 
 // src/commands/roam/auth.ts
@@ -27170,7 +27544,7 @@ function extractCode(url, expectedState) {
   return code;
 }
 function waitForCallback(port, expectedState) {
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve22, reject) => {
     const timeout = setTimeout(() => {
       server.close();
       reject(new Error("Authorization timed out after 120 seconds"));
@@ -27187,7 +27561,7 @@ function waitForCallback(port, expectedState) {
         const code = extractCode(url, expectedState);
         respondHtml(res, 200, "Authorization successful!");
         server.close();
-        resolve21(code);
+        resolve22(code);
       } catch (error) {
         respondHtml(res, 400, error.message);
         server.close();
@@ -27307,9 +27681,9 @@ async function auth() {
 }
 
 // src/commands/roam/postRoamActivity.ts
-import { execFileSync as execFileSync12 } from "child_process";
+import { execFileSync as execFileSync13 } from "child_process";
 import { readdirSync as readdirSync12, readFileSync as readFileSync48, statSync as statSync10 } from "fs";
-import { join as join67 } from "path";
+import { join as join69 } from "path";
 function findPortFile(roamDir) {
   let entries;
   try {
@@ -27318,7 +27692,7 @@ function findPortFile(roamDir) {
     return void 0;
   }
   const candidates = entries.filter((name) => /^roam-local-api(-[^.]+)?\.port$/.test(name)).map((name) => {
-    const path71 = join67(roamDir, name);
+    const path71 = join69(roamDir, name);
     try {
       return { path: path71, mtimeMs: statSync10(path71).mtimeMs };
     } catch {
@@ -27330,7 +27704,7 @@ function findPortFile(roamDir) {
 function postRoamActivity(app, event) {
   const appData = process.env.APPDATA;
   if (!appData) return;
-  const portFile = findPortFile(join67(appData, "Roam"));
+  const portFile = findPortFile(join69(appData, "Roam"));
   if (!portFile) return;
   let port;
   try {
@@ -27340,7 +27714,7 @@ function postRoamActivity(app, event) {
   }
   const url = `http://127.0.0.1:${port}/api/v1/activity/${app}/${event}?pid=${app === "codex" ? 99998 : 99999}`;
   try {
-    execFileSync12("curl", ["-sf", "--max-time", "0.2", "-X", "POST", url], {
+    execFileSync13("curl", ["-sf", "--max-time", "0.2", "-X", "POST", url], {
       stdio: "ignore"
     });
   } catch {
@@ -27464,53 +27838,7 @@ var rootConfigHelp = {
 };
 
 // src/commands/run/index.ts
-import { resolve as resolve17 } from "path";
-
-// src/commands/run/findRunConfig.ts
-function exitNoRunConfigs() {
-  console.error("No run configurations found in assist.yml");
-  process.exit(1);
-}
-function exitWithConfigNotFound(name, configs) {
-  console.error(`No run configuration found with name: ${name}`);
-  console.error("Available configurations:");
-  for (const r of configs) {
-    console.error(`  - ${r.name}`);
-  }
-  process.exit(1);
-}
-function exitWithAmbiguousConfig(name, matches) {
-  console.error(`Ambiguous run configuration: ${name}`);
-  console.error("Did you mean:");
-  for (const r of matches) {
-    console.error(`  - ${r.name}`);
-  }
-  process.exit(1);
-}
-function requireRunConfigs() {
-  const { run: run4 } = loadConfig();
-  const configs = resolveRunConfigs(run4, getConfigDir());
-  if (configs.length === 0) return exitNoRunConfigs();
-  return configs;
-}
-function lookupRunConfig(name) {
-  const configs = requireRunConfigs();
-  const exact = configs.find((r) => r.name === name);
-  if (exact) return { kind: "match", config: exact };
-  const suffixMatches = configs.filter((r) => r.name.endsWith(`:${name}`));
-  if (suffixMatches.length === 1)
-    return { kind: "match", config: suffixMatches[0] };
-  if (suffixMatches.length > 1)
-    return { kind: "ambiguous", matches: suffixMatches };
-  return { kind: "not-found" };
-}
-function findRunConfig(name) {
-  const result = lookupRunConfig(name);
-  if (result.kind === "match") return result.config;
-  if (result.kind === "ambiguous")
-    return exitWithAmbiguousConfig(name, result.matches);
-  return exitWithConfigNotFound(name, requireRunConfigs());
-}
+import { resolve as resolve18 } from "path";
 
 // src/commands/run/formatConfiguredCommands.ts
 function formatConfiguredCommands() {
@@ -27523,84 +27851,23 @@ Configured commands:
 ${names}`;
 }
 
-// src/commands/run/resolveParams.ts
-function resolveParams(params, cliArgs) {
-  if (!params || params.length === 0) return cliArgs;
-  const resolved = [];
-  const missing = [];
-  for (let i = 0; i < params.length; i++) {
-    const param = params[i];
-    const value = cliArgs[i] ?? param.default;
-    if (value !== void 0) {
-      resolved.push(value);
-    } else if (param.required) {
-      missing.push(param.name);
-    }
-  }
-  if (missing.length > 0) {
-    const s = missing.length > 1 ? "s" : "";
-    const names = missing.map((n) => `"${n}"`).join(", ");
-    console.error(`Missing required param${s}: ${names}`);
-    process.exit(1);
-  }
-  resolved.push(...cliArgs.slice(params.length));
-  return resolved;
-}
-
-// src/commands/run/runPreCommands.ts
-import { execSync as execSync60 } from "child_process";
-function runPreCommands(pre, cwd) {
-  for (const cmd of pre) {
-    try {
-      execSync60(cmd, { stdio: "inherit", cwd });
-    } catch (error) {
-      const code = error && typeof error === "object" && "status" in error ? error.status : 1;
-      process.exit(code);
-    }
-  }
-}
-
 // src/commands/run/spawnRunCommand.ts
-import { execFileSync as execFileSync13, spawn as spawn9 } from "child_process";
-import { existsSync as existsSync58 } from "fs";
-import { dirname as dirname31, join as join68, resolve as resolve16 } from "path";
-function resolveCommand2(command) {
-  if (process.platform !== "win32" || command !== "bash") return command;
-  try {
-    const gitPath = execFileSync13("where", ["git"], { encoding: "utf8" }).trim().split("\r\n")[0];
-    const gitRoot = resolve16(dirname31(gitPath), "..");
-    const gitBash = join68(gitRoot, "bin", "bash.exe");
-    if (existsSync58(gitBash)) return gitBash;
-  } catch {
-  }
-  return command;
-}
 function spawnRunCommand(command, args, env, cwd, quiet) {
   const start3 = Date.now();
-  const child = spawn9(resolveCommand2(command), args, {
-    stdio: quiet ? "pipe" : "inherit",
-    env: env ? { ...process.env, ...expandEnv(env) } : void 0,
-    cwd
-  });
-  const chunks = [];
-  if (quiet) {
-    child.stdout?.on("data", (data) => chunks.push(data));
-    child.stderr?.on("data", (data) => chunks.push(data));
-  }
-  child.on("close", (code) => {
-    const exitCode = code ?? 0;
-    if (quiet && exitCode !== 0 && chunks.length > 0) {
-      process.stdout.write(Buffer.concat(chunks));
+  void runCommandToCompletion(command, args, env, cwd, quiet).then((result) => {
+    if (result.kind === "failed") {
+      console.error(result.message);
+      process.exit(1);
+    }
+    const { exitCode, output } = result;
+    if (quiet && exitCode !== 0 && output.length > 0) {
+      process.stdout.write(output);
     }
     const elapsed = formatElapsed(Date.now() - start3);
     if (!quiet || exitCode !== 0) console.log(`
 Done in ${elapsed}`);
     process.exit(exitCode);
   });
-  child.on("error", (err) => {
-    console.error(`Failed to execute command: ${err.message}`);
-    process.exit(1);
-  });
 }
 
 // src/commands/run/index.ts
@@ -27616,7 +27883,7 @@ function listRunConfigs(verbose) {
   }
 }
 function execRunConfig(config, args) {
-  const cwd = config.cwd ? resolve17(getConfigDir(), config.cwd) : void 0;
+  const cwd = config.cwd ? resolve18(getConfigDir(), config.cwd) : void 0;
   if (config.pre) runPreCommands(config.pre, cwd);
   const resolved = resolveParams(config.params, args);
   spawnRunCommand(
@@ -27658,7 +27925,7 @@ async function run3(name, args) {
 
 // src/commands/run/add.ts
 import { mkdirSync as mkdirSync24, writeFileSync as writeFileSync41 } from "fs";
-import { join as join69 } from "path";
+import { join as join70 } from "path";
 
 // src/commands/run/extractOption.ts
 function extractOption(args, flag) {
@@ -27719,7 +27986,7 @@ function saveNewRunConfig(name, command, args, cwd) {
   saveConfig(config);
 }
 function createCommandFile(name) {
-  const dir = join69(".claude", "commands");
+  const dir = join70(".claude", "commands");
   mkdirSync24(dir, { recursive: true });
   const content = `---
 description: Run ${name}
@@ -27727,7 +27994,7 @@ description: Run ${name}
 
 Run \`assist run ${name} $ARGUMENTS 2>&1\`.
 `;
-  const filePath = join69(dir, `${name}.md`);
+  const filePath = join70(dir, `${name}.md`);
   writeFileSync41(filePath, content);
   console.log(`Created command file: ${filePath}`);
 }
@@ -27784,7 +28051,7 @@ function link2() {
 
 // src/commands/run/remove.ts
 import { existsSync as existsSync59, unlinkSync as unlinkSync21 } from "fs";
-import { join as join70 } from "path";
+import { join as join71 } from "path";
 function findRemoveIndex() {
   const idx = process.argv.indexOf("remove");
   if (idx === -1 || idx + 1 >= process.argv.length) return -1;
@@ -27799,7 +28066,7 @@ function parseRemoveName() {
   return process.argv[idx + 1];
 }
 function deleteCommandFile(name) {
-  const filePath = join70(".claude", "commands", `${name}.md`);
+  const filePath = join71(".claude", "commands", `${name}.md`);
   if (existsSync59(filePath)) {
     unlinkSync21(filePath);
     console.log(`Deleted command file: ${filePath}`);
@@ -27856,7 +28123,7 @@ function registerRun(program2) {
 import { execSync as execSync61 } from "child_process";
 import { existsSync as existsSync60, mkdirSync as mkdirSync25, unlinkSync as unlinkSync22, writeFileSync as writeFileSync42 } from "fs";
 import { tmpdir as tmpdir8 } from "os";
-import { join as join71, resolve as resolve18 } from "path";
+import { join as join72, resolve as resolve19 } from "path";
 import chalk209 from "chalk";
 
 // src/commands/screenshot/captureWindowPs1.ts
@@ -27990,10 +28257,10 @@ function buildOutputPath(outputDir, processName) {
     mkdirSync25(outputDir, { recursive: true });
   }
   const timestamp6 = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  return resolve18(outputDir, `${processName}-${timestamp6}.png`);
+  return resolve19(outputDir, `${processName}-${timestamp6}.png`);
 }
 function runPowerShellScript(processName, outputPath) {
-  const scriptPath = join71(tmpdir8(), `assist-screenshot-${Date.now()}.ps1`);
+  const scriptPath = join72(tmpdir8(), `assist-screenshot-${Date.now()}.ps1`);
   writeFileSync42(scriptPath, captureWindowPs1, "utf8");
   try {
     execSync61(
@@ -28006,7 +28273,7 @@ function runPowerShellScript(processName, outputPath) {
 }
 function screenshot(processName) {
   const config = loadConfig();
-  const outputDir = resolve18(config.screenshot.outputDir);
+  const outputDir = resolve19(config.screenshot.outputDir);
   const outputPath = buildOutputPath(outputDir, processName);
   console.log(chalk209.gray(`Capturing window for process "${processName}" ...`));
   try {
@@ -28039,18 +28306,18 @@ var STATUS_TIMEOUT_MS = 5e3;
 function queryDaemon(socket) {
   socket.write(`${JSON.stringify({ type: "ping" })}
 `);
-  return new Promise((resolve21) => {
+  return new Promise((resolve22) => {
     const result = { sessions: [] };
     const pending = /* @__PURE__ */ new Set(["sessions", "pong"]);
-    const timer = setTimeout(() => resolve21(result), STATUS_TIMEOUT_MS);
-    const lines = createInterface5({ input: socket });
-    lines.on("error", () => {
+    const timer = setTimeout(() => resolve22(result), STATUS_TIMEOUT_MS);
+    const lines2 = createInterface5({ input: socket });
+    lines2.on("error", () => {
     });
-    lines.on("line", (line) => {
+    lines2.on("line", (line) => {
       applyLine(result, pending, line);
       if (pending.size === 0) {
         clearTimeout(timer);
-        resolve21(result);
+        resolve22(result);
       }
     });
   });
@@ -28135,12 +28402,12 @@ function clearPersistedSessionsOnDrain() {
 }
 
 // src/commands/sessions/daemon/readDaemonMessage.ts
-function readDaemonMessage(lines, timeoutMs, fallback, match) {
-  return new Promise((resolve21) => {
+function readDaemonMessage(lines2, timeoutMs, fallback, match) {
+  return new Promise((resolve22) => {
     const finish = (value) => {
       clearTimeout(timer);
-      lines.off("line", onLine);
-      resolve21(value);
+      lines2.off("line", onLine);
+      resolve22(value);
     };
     const timer = setTimeout(() => finish(fallback), timeoutMs);
     const onLine = (line) => {
@@ -28150,7 +28417,7 @@ function readDaemonMessage(lines, timeoutMs, fallback, match) {
       } catch {
       }
     };
-    lines.on("line", onLine);
+    lines2.on("line", onLine);
   });
 }
 
@@ -28165,10 +28432,10 @@ async function drainDaemon(options2 = {}) {
     clearPersistedSessionsOnDrain();
     return;
   }
-  const lines = createInterface6({ input: socket });
-  lines.on("error", () => {
+  const lines2 = createInterface6({ input: socket });
+  lines2.on("error", () => {
   });
-  const live = await liveSessions(lines);
+  const live = await liveSessions(lines2);
   if (live.length > 0 && options2.yes !== true) {
     reportLive(live);
     if (!await confirmDrain()) {
@@ -28176,7 +28443,7 @@ async function drainDaemon(options2 = {}) {
       return;
     }
   }
-  const count8 = await requestDrain(socket, lines);
+  const count8 = await requestDrain(socket, lines2);
   socket.destroy();
   console.log(`Drained ${count8} session(s)`);
 }
@@ -28195,9 +28462,9 @@ async function confirmDrain() {
   console.log("Drain cancelled");
   return false;
 }
-function liveSessions(lines) {
+function liveSessions(lines2) {
   return readDaemonMessage(
-    lines,
+    lines2,
     LIST_TIMEOUT_MS,
     [],
     (data) => data.type === "sessions" ? (data.sessions ?? []).filter(
@@ -28205,11 +28472,11 @@ function liveSessions(lines) {
     ) : void 0
   );
 }
-function requestDrain(socket, lines) {
+function requestDrain(socket, lines2) {
   socket.write(`${JSON.stringify({ type: "drain" })}
 `);
   return readDaemonMessage(
-    lines,
+    lines2,
     DRAIN_TIMEOUT_MS,
     0,
     (data) => data.type === "drained" ? data.count ?? 0 : void 0
@@ -28674,12 +28941,12 @@ import { basename as basename18 } from "path";
 
 // src/commands/sessions/daemon/worktree/deleteStrandedTree.ts
 import { existsSync as existsSync63 } from "fs";
-import { join as join74 } from "path";
+import { join as join75 } from "path";
 
 // src/commands/sessions/daemon/worktree/deleteTreeDirectly.ts
 import { statSync as statSync12 } from "fs";
 import { rm as rm2 } from "fs/promises";
-import { join as join73 } from "path";
+import { join as join74 } from "path";
 async function deleteTreeDirectly(clone, worktreePath, why) {
   if (holdsAGitDirectoryRatherThanALink(worktreePath)) {
     daemonLog(
@@ -28706,7 +28973,7 @@ async function deleteTreeDirectly(clone, worktreePath, why) {
   return true;
 }
 function holdsAGitDirectoryRatherThanALink(worktreePath) {
-  return statSync12(join73(worktreePath, ".git"), {
+  return statSync12(join74(worktreePath, ".git"), {
     throwIfNoEntry: false
   })?.isDirectory() === true;
 }
@@ -28742,7 +29009,7 @@ async function deleteStrandedTree(clone, worktreePath, cause) {
   );
 }
 function strandedReason(worktreePath, cause) {
-  if (!existsSync63(join74(worktreePath, ".git")))
+  if (!existsSync63(join75(worktreePath, ".git")))
     return "its .git link is already gone";
   if (/not a working tree|not a git repository/i.test(reason2(cause)))
     return "git no longer recognises it as a working tree";
@@ -29836,6 +30103,40 @@ function registerSpawnedSession(session, sessions, clients, onStatusChange, noti
   return session.id;
 }
 
+// src/commands/sessions/daemon/sessionLimits.ts
+var MAX_LIVE = 12;
+var sessionLimits = {
+  maxRestore: MAX_LIVE,
+  /** Allocate the next session id from counter, refusing past the absolute
+   * ceiling regardless of caller (restore, web create, retry) so no trigger
+   * can fan out without bound. The counter advances only when allowed. */
+  nextId(liveCount, counter) {
+    if (liveCount >= MAX_LIVE) {
+      daemonLog(`refusing to spawn: at ceiling of ${MAX_LIVE} live sessions`);
+      throw new Error(`session ceiling of ${MAX_LIVE} reached`);
+    }
+    return String(counter.next++);
+  },
+  recoveryCardId(counter) {
+    return String(counter.next++);
+  }
+};
+
+// src/commands/sessions/daemon/makeSessionSpawner.ts
+function makeSessionSpawner(sessions, clients, counter, onStatusChange, notify2) {
+  const register = (allocateId) => (create) => registerSpawnedSession(
+    create(allocateId()),
+    sessions,
+    clients,
+    onStatusChange(),
+    notify2
+  );
+  return {
+    spawn: register(() => sessionLimits.nextId(sessions.size, counter)),
+    recoveryCard: register(() => sessionLimits.recoveryCardId(counter))
+  };
+}
+
 // src/commands/sessions/daemon/applySetStatus.ts
 function applySetStatus(sessions, id, status3, source, onStatusChange) {
   const session = sessions.get(id);
@@ -29931,9 +30232,9 @@ async function recordWindowTokens(db, window, resetsAt, tokensUp, tokensDown) {
 
 // src/commands/sessions/shared/transcriptUsage.ts
 import * as fs38 from "fs";
-function transcriptUsage(lines) {
+function transcriptUsage(lines2) {
   const byId = /* @__PURE__ */ new Map();
-  for (const line of lines) {
+  for (const line of lines2) {
     if (!line.trim()) continue;
     let entry;
     try {
@@ -30298,6 +30599,43 @@ function restoreBase(id, persisted) {
   };
 }
 
+// src/commands/sessions/daemon/deferredSession.ts
+function deferredSession(id, persisted, cap) {
+  return {
+    ...restoreBase(id, persisted),
+    status: "stopped",
+    startedAt: persisted.startedAt,
+    runningMs: persisted.runningMs ?? 0,
+    runningSince: null,
+    waitingSince: null,
+    pty: null,
+    claudeSessionId: persisted.claudeSessionId,
+    runName: persisted.runName,
+    runArgs: persisted.runArgs,
+    activity: persisted.activity,
+    restored: false,
+    scrollback: deferralNotice(persisted, cap)
+  };
+}
+function deferralNotice(persisted, cap) {
+  return [
+    `\r
+\x1B[33mNot resumed: restore was already at its cap of ${cap} session(s)\x1B[0m\r
+`,
+    `This card is the handle for it. Its command, working directory (${persisted.cwd})\r
+`,
+    "and transcript are intact \u2014 restart to put an agent back in it, or dismiss it.\r\n"
+  ].join("");
+}
+
+// src/commands/sessions/daemon/logDroppedSession.ts
+function logDroppedSession(persisted, error) {
+  const reason4 = error instanceof Error ? error.message : String(error);
+  daemonLog(
+    `dropped persisted session ${describePersistedSession(persisted)}: ${reason4}`
+  );
+}
+
 // src/commands/sessions/daemon/errorSession.ts
 function errorSession(id, persisted, error) {
   return {
@@ -30460,16 +30798,20 @@ function restoreSession(id, persisted) {
 }
 
 // src/commands/sessions/daemon/restoreOne.ts
-function restoreOne(persisted, spawn13, sessions) {
+function restoreOne(persisted, spawner, sessions) {
   try {
-    const id = spawn13((sid) => restoreSession(sid, persisted));
+    const id = spawner.spawn((sid) => restoreSession(sid, persisted));
     logUnresumable(persisted.name, id, sessions.get(id));
   } catch (error) {
-    const reason4 = logRestoreError(persisted.name, error);
-    try {
-      spawn13((id) => errorSession(id, persisted, reason4));
-    } catch {
-    }
+    const reason4 = logRestoreError(persisted, error);
+    spawnErrorCard(persisted, spawner, reason4);
+  }
+}
+function spawnErrorCard(persisted, spawner, reason4) {
+  try {
+    spawner.recoveryCard((id) => errorSession(id, persisted, reason4));
+  } catch (cardError) {
+    logDroppedSession(persisted, cardError);
   }
 }
 function logUnresumable(name, id, session) {
@@ -30478,42 +30820,36 @@ function logUnresumable(name, id, session) {
       `could not resume restored session "${name}" (id ${id}): ${session.error}`
     );
 }
-function logRestoreError(name, error) {
+function logRestoreError(persisted, error) {
   const reason4 = error instanceof Error ? error.message : String(error);
-  daemonLog(`failed to restore session "${name}": ${reason4}`);
+  daemonLog(
+    `failed to restore session ${describePersistedSession(persisted)}: ${reason4}`
+  );
   return reason4;
 }
 
-// src/commands/sessions/daemon/sessionLimits.ts
-var MAX_LIVE = 12;
-var MAX_RESTORE = 10;
-var sessionLimits = {
-  maxRestore: MAX_RESTORE,
-  /** Allocate the next session id from counter, refusing past the absolute
-   * ceiling regardless of caller (restore, web create, retry) so no trigger
-   * can fan out without bound. The counter advances only when allowed. */
-  nextId(liveCount, counter) {
-    if (liveCount >= MAX_LIVE) {
-      daemonLog(`refusing to spawn: at ceiling of ${MAX_LIVE} live sessions`);
-      throw new Error(`session ceiling of ${MAX_LIVE} reached`);
-    }
-    return String(counter.next++);
-  }
-};
-
 // src/commands/sessions/daemon/restoreAll.ts
-function restoreAll(spawn13, sessions) {
+function restoreAll(spawner, sessions) {
   const persisted = loadPersistedSessions();
-  const toRestore = persisted.slice(0, sessionLimits.maxRestore);
-  const skipped = persisted.length - toRestore.length;
-  if (skipped > 0)
+  const names = persisted.slice(0, sessionLimits.maxRestore).map((entry) => {
+    restoreOne(entry, spawner, sessions);
+    return entry.name;
+  });
+  for (const over of persisted.slice(sessionLimits.maxRestore))
+    deferOne(over, spawner.recoveryCard);
+  return names;
+}
+function deferOne(persisted, spawnRecoveryCard) {
+  try {
+    const id = spawnRecoveryCard(
+      (sid) => deferredSession(sid, persisted, sessionLimits.maxRestore)
+    );
     daemonLog(
-      `restore capped at ${sessionLimits.maxRestore}; skipping ${skipped} persisted session(s)`
+      `restore capped at ${sessionLimits.maxRestore}: ${describePersistedSession(persisted)} deferred to stopped card ${id}`
     );
-  return toRestore.map((persisted2) => {
-    restoreOne(persisted2, spawn13, sessions);
-    return persisted2.name;
-  });
+  } catch (error) {
+    logDroppedSession(persisted, error);
+  }
 }
 
 // src/commands/sessions/daemon/worktree/rearmStoppedSessions.ts
@@ -30597,29 +30933,29 @@ async function describeHeldWork(path71, reason4) {
 }
 async function changedFiles(path71) {
   const status3 = await gitResult(path71, ["status", "--porcelain"]);
-  const lines = status3.ok ? nonEmptyLines(status3.out) : [];
+  const lines2 = status3.ok ? nonEmptyLines(status3.out) : [];
   return {
-    summary: `${lines.length} uncommitted ${lines.length === 1 ? "file" : "files"}`,
-    items: capped(lines)
+    summary: `${lines2.length} uncommitted ${lines2.length === 1 ? "file" : "files"}`,
+    items: capped(lines2)
   };
 }
 async function unpushedCommits(path71, reason4) {
   const log2 = await gitResult(path71, ["log", "--oneline", "@{upstream}..HEAD"]);
   if (!log2.ok) return { summary: reason4, items: [] };
-  const lines = nonEmptyLines(log2.out);
+  const lines2 = nonEmptyLines(log2.out);
   return {
-    summary: `${lines.length} unpushed ${lines.length === 1 ? "commit" : "commits"}`,
-    items: capped(lines)
+    summary: `${lines2.length} unpushed ${lines2.length === 1 ? "commit" : "commits"}`,
+    items: capped(lines2)
   };
 }
 function nonEmptyLines(out) {
   return out.split("\n").map((line) => line.trim()).filter((line) => line !== "");
 }
-function capped(lines) {
-  if (lines.length <= MAX_ITEMS) return lines;
+function capped(lines2) {
+  if (lines2.length <= MAX_ITEMS) return lines2;
   return [
-    ...lines.slice(0, MAX_ITEMS),
-    `\u2026 and ${lines.length - MAX_ITEMS} more`
+    ...lines2.slice(0, MAX_ITEMS),
+    `\u2026 and ${lines2.length - MAX_ITEMS} more`
   ];
 }
 
@@ -30764,9 +31100,9 @@ async function recoverOrphan(sessions, spawnWith, orphan, notify2) {
 }
 
 // src/commands/sessions/daemon/restoreAllSessions.ts
-function restoreAllSessions(spawnWith, sessions, notify2) {
-  const names = restoreAll(spawnWith, sessions);
-  reconcileWorktreesOnRestore(sessions, spawnWith, notify2);
+function restoreAllSessions(spawner, sessions, notify2) {
+  const names = restoreAll(spawner, sessions);
+  reconcileWorktreesOnRestore(sessions, spawner.recoveryCard, notify2);
   rearmStoppedSessions(sessions, notify2);
   return names;
 }
@@ -31100,7 +31436,7 @@ function windowsDaemonHost() {
 var CONNECT_TIMEOUT_MS = 2e3;
 var KEEPALIVE_PROBE_MS = 1e4;
 function connectToWindowsDaemon() {
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve22, reject) => {
     const socket = net2.connect(windowsDaemonPort(), windowsDaemonHost());
     socket.setTimeout(CONNECT_TIMEOUT_MS);
     socket.once("timeout", () => {
@@ -31110,7 +31446,7 @@ function connectToWindowsDaemon() {
     socket.once("connect", () => {
       socket.setTimeout(0);
       socket.setKeepAlive(true, KEEPALIVE_PROBE_MS);
-      resolve21(socket);
+      resolve22(socket);
     });
     socket.once("error", reject);
   });
@@ -31131,9 +31467,9 @@ import { spawn as spawn11 } from "child_process";
 import { createInterface as createInterface7 } from "readline";
 function logChildStream(stream, label2) {
   if (!stream) return;
-  const lines = createInterface7({ input: stream });
-  lines.on("line", (line) => daemonLog(`[${label2}] ${line}`));
-  lines.on("error", () => {
+  const lines2 = createInterface7({ input: stream });
+  lines2.on("line", (line) => daemonLog(`[${label2}] ${line}`));
+  lines2.on("error", () => {
   });
 }
 
@@ -31188,7 +31524,7 @@ async function waitForWindowsDaemon() {
   );
 }
 function delay2(ms) {
-  return new Promise((resolve21) => setTimeout(resolve21, ms));
+  return new Promise((resolve22) => setTimeout(resolve22, ms));
 }
 
 // src/commands/sessions/daemon/defaultConnect.ts
@@ -31472,7 +31808,7 @@ async function healWindowsDaemon() {
   daemonLog("windows daemon: auto-heal: stale daemon stopped");
 }
 function runOnWindowsHost(command, timeoutMs) {
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve22, reject) => {
     const child = spawn12("pwsh.exe", ["-Command", command], {
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -31492,7 +31828,7 @@ function runOnWindowsHost(command, timeoutMs) {
     });
     child.on("exit", (code) => {
       clearTimeout(timer);
-      if (code === 0) resolve21();
+      if (code === 0) resolve22();
       else
         reject(
           new Error(
@@ -31603,10 +31939,10 @@ var WindowsConnection = class {
     return socket;
   }
   wire(socket) {
-    const lines = createInterface8({ input: socket });
-    lines.on("error", () => {
+    const lines2 = createInterface8({ input: socket });
+    lines2.on("error", () => {
     });
-    lines.on("line", (line) => this.deps.onLine(line));
+    lines2.on("line", (line) => this.deps.onLine(line));
     socket.on("error", () => {
     });
     socket.on("close", () => {
@@ -31961,16 +32297,17 @@ var SessionManager = class {
     );
   }
   restore() {
-    return restoreAllSessions(this.spawnWith, this.sessions, this.notify);
+    return restoreAllSessions(this.spawner, this.sessions, this.notify);
   }
   drain = () => drainSessions(this.sessions, this.notify);
-  spawnWith = (create) => registerSpawnedSession(
-    create(sessionLimits.nextId(this.sessions.size, this.idCounter)),
+  spawner = makeSessionSpawner(
     this.sessions,
     this.clients,
-    this.onStatusChange,
-    this.notify
+    this.idCounter,
+    () => this.onStatusChange,
+    () => this.notify()
   );
+  spawnWith = this.spawner.spawn;
   treeCtx() {
     return treeSpawnContext(
       this.sessions,
@@ -32204,9 +32541,9 @@ async function parseTranscript(sessionId) {
     return [];
   }
 }
-function parseTranscriptLines(lines) {
+function parseTranscriptLines(lines2) {
   const messages = [];
-  for (const line of lines) {
+  for (const line of lines2) {
     const entry = line.trim() ? safeParse2(line) : null;
     if (!entry || entry.isSidechain || entry.isMeta) continue;
     messages.push(...entryMessages(entry));
@@ -32388,10 +32725,10 @@ function handleConnection(socket, manager) {
   };
   manager.addClient(client);
   manager.clients.greet(client);
-  const lines = createInterface9({ input: socket });
-  lines.on("error", () => {
+  const lines2 = createInterface9({ input: socket });
+  lines2.on("error", () => {
   });
-  lines.on("line", (line) => {
+  lines2.on("line", (line) => {
     let data;
     try {
       data = JSON.parse(line);
@@ -32852,9 +33189,9 @@ function buildLimitsSegment(rateLimits) {
 
 // src/commands/readGitBranch.ts
 import { readFileSync as readFileSync54, statSync as statSync14 } from "fs";
-import { isAbsolute as isAbsolute4, join as join76, resolve as resolve19 } from "path";
+import { isAbsolute as isAbsolute4, join as join77, resolve as resolve20 } from "path";
 function resolveGitDir(cwd) {
-  const dotGit = join76(cwd, ".git");
+  const dotGit = join77(cwd, ".git");
   let stat3;
   try {
     stat3 = statSync14(dotGit);
@@ -32875,7 +33212,7 @@ function resolveGitDir(cwd) {
     return null;
   }
   const gitDir = match[1].trim();
-  return isAbsolute4(gitDir) ? gitDir : resolve19(cwd, gitDir);
+  return isAbsolute4(gitDir) ? gitDir : resolve20(cwd, gitDir);
 }
 function readGitBranch(cwd) {
   const gitDir = resolveGitDir(cwd);
@@ -32884,7 +33221,7 @@ function readGitBranch(cwd) {
   }
   let head;
   try {
-    head = readFileSync54(join76(gitDir, "HEAD"), "utf8");
+    head = readFileSync54(join77(gitDir, "HEAD"), "utf8");
   } catch {
     return null;
   }