@staff0rd/assist 0.763.0 → 0.765.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.763.0",
+  version: "0.765.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -1792,9 +1792,9 @@ var daemonPaths = {
 
 // src/commands/sessions/daemon/connectToDaemon.ts
 function connectToDaemon() {
-  return new Promise((resolve26, reject) => {
+  return new Promise((resolve27, reject) => {
     const socket = net.connect(daemonPaths.socket);
-    socket.once("connect", () => resolve26(socket));
+    socket.once("connect", () => resolve27(socket));
     socket.once("error", reject);
   });
 }
@@ -2112,7 +2112,7 @@ ${failed3.length} script(s) failed:`);
   }
 }
 function runEntry(entry) {
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     const startTime = Date.now();
     const child = spawnCommand(
       entry.fullCommand,
@@ -2124,7 +2124,7 @@ function runEntry(entry) {
     child.on("close", (code) => {
       const exitCode = code ?? 1;
       flushIfFailed(exitCode, chunks);
-      resolve26({
+      resolve27({
         script: entry.name,
         code: exitCode,
         durationMs: Date.now() - startTime
@@ -2974,7 +2974,7 @@ function parsePreviewDecision(line, requestId) {
 
 // src/commands/sessions/shared/requestPreviewDecision.ts
 function requestPreviewDecision(request) {
-  return new Promise((resolve26, reject) => {
+  return new Promise((resolve27, reject) => {
     connectToDaemon().then((socket) => {
       let settled = false;
       const finish2 = (error, decision) => {
@@ -2982,7 +2982,7 @@ function requestPreviewDecision(request) {
         settled = true;
         socket.destroy();
         if (error) reject(error);
-        else resolve26(decision);
+        else resolve27(decision);
       };
       readSocketLines(socket, (line) => {
         const incoming = parsePreviewDecision(line, request.requestId);
@@ -7225,8 +7225,8 @@ function spawnInherit(command, args, options2 = {}) {
     env: { ...env, ...options2.env },
     cwd: options2.cwd
   });
-  const done2 = new Promise((resolve26, reject) => {
-    child.on("close", (code) => resolve26(code ?? 0));
+  const done2 = new Promise((resolve27, reject) => {
+    child.on("close", (code) => resolve27(code ?? 0));
     child.on("error", reject);
   });
   return { child, done: done2 };
@@ -7658,7 +7658,7 @@ Failed to launch Claude for ${context}: ${message3}`)
 // src/commands/sessions/daemon/sendToDaemon.ts
 var WRITE_TIMEOUT_MS = 500;
 function sendToDaemon(message3) {
-  return new Promise((resolve26, reject) => {
+  return new Promise((resolve27, reject) => {
     connectToDaemon().then((socket) => {
       const timer = setTimeout(() => {
         socket.destroy();
@@ -7672,7 +7672,7 @@ function sendToDaemon(message3) {
 `, () => {
         clearTimeout(timer);
         socket.end();
-        resolve26();
+        resolve27();
       });
     }, reject);
   });
@@ -7681,7 +7681,7 @@ function sendToDaemon(message3) {
 // src/commands/sessions/daemon/sendToDaemonAwaitAck.ts
 var ACK_TIMEOUT_MS = 1e3;
 function sendToDaemonAwaitAck(message3) {
-  return new Promise((resolve26, reject) => {
+  return new Promise((resolve27, reject) => {
     connectToDaemon().then((socket) => {
       let settled = false;
       const finish2 = (error) => {
@@ -7690,7 +7690,7 @@ function sendToDaemonAwaitAck(message3) {
         clearTimeout(timer);
         socket.destroy();
         if (error) reject(error);
-        else resolve26();
+        else resolve27();
       };
       const timer = setTimeout(
         () => finish2(new Error("timed out awaiting daemon ack")),
@@ -7781,7 +7781,7 @@ async function deliverReliably(sessionId, status2, payload) {
   }
 }
 function sleep(ms) {
-  return new Promise((resolve26) => setTimeout(resolve26, ms));
+  return new Promise((resolve27) => setTimeout(resolve27, ms));
 }
 function describeError(error) {
   return error instanceof Error ? error.message : String(error);
@@ -8232,6 +8232,7 @@ var activitySchema = z7.object({
   phaseName: z7.string().optional(),
   totalPhases: z7.number().optional(),
   claudeSessionId: z7.string().optional(),
+  watchState: z7.enum(["waiting", "updating"]).optional(),
   startedAt: z7.number()
 });
 function activityPath(sessionId) {
@@ -10756,7 +10757,7 @@ function spawnDaemon(reason4) {
   child.unref();
 }
 function delay(ms) {
-  return new Promise((resolve26) => setTimeout(resolve26, ms));
+  return new Promise((resolve27) => setTimeout(resolve27, ms));
 }
 
 // src/commands/sessions/daemon/originForCwd.ts
@@ -10798,10 +10799,10 @@ function gitInvocation(cwd, args) {
 }
 function git(cwd, args) {
   const { file, argv, options: options2 } = gitInvocation(cwd, args);
-  return new Promise((resolve26, reject) => {
+  return new Promise((resolve27, reject) => {
     execFile2(file, argv, options2, (error, stdout) => {
       if (error) reject(error);
-      else resolve26(stdout.toString());
+      else resolve27(stdout.toString());
     });
   });
 }
@@ -11060,7 +11061,7 @@ var defaultDeps = {
   serve: async (args) => {
     await runTailscale(args);
   },
-  sleep: (ms) => new Promise((resolve26) => setTimeout(resolve26, ms)),
+  sleep: (ms) => new Promise((resolve27) => setTimeout(resolve27, ms)),
   httpsPort: tailnetHttpsPort
 };
 async function ensureTailscaleServe(port, deps2 = {}) {
@@ -11467,12 +11468,12 @@ async function loadVisibleItems(req) {
 
 // src/commands/backlog/web/parseStatusBody.ts
 function readBody(req) {
-  return new Promise((resolve26, reject) => {
+  return new Promise((resolve27, reject) => {
     let body = "";
     req.on("data", (chunk) => {
       body += chunk.toString();
     });
-    req.on("end", () => resolve26(body));
+    req.on("end", () => resolve27(body));
     req.on("error", reject);
   });
 }
@@ -13581,11 +13582,11 @@ async function queryNodes() {
   } catch {
     return void 0;
   }
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     const finish2 = (result) => {
       clearTimeout(timer);
       socket.destroy();
-      resolve26(result);
+      resolve27(result);
     };
     const timer = setTimeout(() => finish2(void 0), QUERY_TIMEOUT_MS);
     const lines2 = createInterface5({ input: socket });
@@ -15077,7 +15078,7 @@ function forwardToPeer(req, res, node, url) {
   const label2 = `link ${node} http: ${req.method} ${url.pathname} trace=${traceId}`;
   const log2 = (outcome) => console.log(`${label2} -> ${outcome} (${Date.now() - started}ms)`);
   const send = url.protocol === "https:" ? httpsRequest : httpRequest;
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     const upstream = send(
       url,
       {
@@ -15089,7 +15090,7 @@ function forwardToPeer(req, res, node, url) {
           [TRACE_HEADER]: traceId
         }
       },
-      (peer) => relayPeerResponse(peer, res, url.pathname, log2, resolve26)
+      (peer) => relayPeerResponse(peer, res, url.pathname, log2, resolve27)
     );
     boundUpstream(upstream, res, peerTimeoutFor(url.pathname));
     upstream.on("error", (error) => {
@@ -15099,7 +15100,7 @@ function forwardToPeer(req, res, node, url) {
         respondJson(res, 502, {
           error: `${node} unreachable: ${error.message}`
         });
-      resolve26();
+      resolve27();
     });
     req.pipe(upstream);
   });
@@ -15679,17 +15680,17 @@ async function stopDaemon() {
   }
 }
 function closedBeforeTimeout(socket) {
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     const timer = setTimeout(() => {
       socket.destroy();
-      resolve26(false);
+      resolve27(false);
     }, STOP_TIMEOUT_MS);
     socket.resume();
     socket.on("error", () => {
     });
     socket.once("close", () => {
       clearTimeout(timer);
-      resolve26(true);
+      resolve27(true);
     });
   });
 }
@@ -15747,8 +15748,8 @@ async function restartWeb(req, res, deps2 = {}) {
     return;
   }
   console.log(`restart ${target} ${linkedRequester(req)}`);
-  await new Promise((resolve26) => {
-    res.once("finish", resolve26);
+  await new Promise((resolve27) => {
+    res.once("finish", resolve27);
     respondJson(res, 200, { ok: true });
   });
   await performRestart(target, deps2);
@@ -15884,8 +15885,8 @@ async function selfUpdate(req, res, deps2 = {}) {
     return;
   }
   console.log("self-update: updated; restarting daemon and web server");
-  await new Promise((resolve26) => {
-    res.once("finish", resolve26);
+  await new Promise((resolve27) => {
+    res.once("finish", resolve27);
     respondJson(res, 200, { ok: true });
   });
   await performRestart("both", restartDeps);
@@ -15986,14 +15987,14 @@ function linkWebSocketUrl(url) {
   return target.toString();
 }
 function connectLinkWebSocket(url, handlers) {
-  return new Promise((resolve26, reject) => {
+  return new Promise((resolve27, reject) => {
     const ws = new WebSocket(linkWebSocketUrl(url), {
       handshakeTimeout: HANDSHAKE_TIMEOUT_MS
     });
     let open = false;
     ws.on("open", () => {
       open = true;
-      resolve26({
+      resolve27({
         send: (line) => {
           if (ws.readyState !== WebSocket.OPEN) return false;
           ws.send(line);
@@ -16019,8 +16020,8 @@ var HELLO_TIMEOUT_MS = 5e3;
 async function probePeerHello(url) {
   let settle = () => {
   };
-  const reply2 = new Promise((resolve26) => {
-    settle = resolve26;
+  const reply2 = new Promise((resolve27) => {
+    settle = resolve27;
   });
   const socket = await connectLinkWebSocket(url, {
     onLine: (line) => {
@@ -19059,12 +19060,12 @@ function hasSubcommands(helpText) {
 // src/commands/permitCliReads/runHelp.ts
 import { exec as exec2 } from "child_process";
 function runHelp(args) {
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     exec2(
       `${args.join(" ")} --help`,
       { encoding: "utf8", timeout: 3e4 },
       (_err, stdout, stderr) => {
-        resolve26(stdout || stderr || "");
+        resolve27(stdout || stderr || "");
       }
     );
   });
@@ -19701,9 +19702,9 @@ function codexStatusFor(event, autoDecided) {
 
 // src/commands/codexHook/reportCodexStatus.ts
 async function reportCodexStatus(event, autoDecided) {
-  const report2 = codexStatusFor(event, autoDecided);
-  if (!report2) return;
-  await setSessionStatus(report2.status, { source: report2.source, ack: true });
+  const report = codexStatusFor(event, autoDecided);
+  if (!report) return;
+  await setSessionStatus(report.status, { source: report.source, ack: true });
 }
 
 // src/commands/codexHook.ts
@@ -23578,8 +23579,8 @@ function printRepoAuthorBreakdown(repos2) {
 }
 
 // src/commands/github/printCommitsReport.ts
-function printCommitsReport(report2) {
-  const { org, since, totalRepos, repos: repos2, committers, repoAuthors } = report2;
+function printCommitsReport(report) {
+  const { org, since, totalRepos, repos: repos2, committers, repoAuthors } = report;
   const scope = repos2.length < totalRepos ? ` (top ${repos2.length} of ${totalRepos} repos)` : "";
   console.log(`Top repos by commits in ${org} since ${since}${scope}:
 `);
@@ -23608,7 +23609,7 @@ function commits(org, options2) {
     name: repo.name,
     authors: fetchRepoCommitAuthors(org, repo.name, since)
   }));
-  const report2 = {
+  const report = {
     org,
     since: sinceDate,
     totalRepos: allRepos.length,
@@ -23617,11 +23618,11 @@ function commits(org, options2) {
     repoAuthors
   };
   if (options2.json) {
-    console.log(JSON.stringify(report2, null, 2));
+    console.log(JSON.stringify(report, null, 2));
   } else if (repos2.length === 0) {
     console.log(`No commits found in ${org} since ${sinceDate}.`);
   } else {
-    printCommitsReport(report2);
+    printCommitsReport(report);
   }
 }
 
@@ -25972,7 +25973,7 @@ function placedByDaemon() {
 function seed(worktreePath, clone) {
   console.log(`Preparing ${worktreePath}\u2026`);
   return new Promise(
-    (resolve26) => seedWorktree(worktreePath, clone, resolve26)
+    (resolve27) => seedWorktree(worktreePath, clone, resolve27)
   );
 }
 async function moveToPrCheckoutTree() {
@@ -27149,25 +27150,25 @@ function isVisibleText(t) {
   return /[a-zA-Z]{3,}/.test(t);
 }
 var isHashtag = (t) => /^#[A-Za-z0-9_]+$/.test(t);
-function collectRscText(v, resolve26, sink3, seen) {
+function collectRscText(v, resolve27, sink3, seen) {
   if (v == null) return;
   if (typeof v === "string") {
     if (isRscRef(v)) {
       if (!seen.has(v)) {
         seen.add(v);
-        collectRscText(resolve26(v), resolve26, sink3, seen);
+        collectRscText(resolve27(v), resolve27, sink3, seen);
       }
     } else if (isHashtag(v)) sink3.hashtags.push(v);
     else if (isVisibleText(v)) sink3.text.push(v);
     return;
   }
   if (Array.isArray(v)) {
-    for (const x of v) collectRscText(x, resolve26, sink3, seen);
+    for (const x of v) collectRscText(x, resolve27, sink3, seen);
     return;
   }
   if (typeof v === "object") {
     for (const val of Object.values(v)) {
-      collectRscText(val, resolve26, sink3, seen);
+      collectRscText(val, resolve27, sink3, seen);
     }
   }
 }
@@ -27199,7 +27200,7 @@ function visitObjects(root2, fn) {
     }
   }
 }
-function buildMentionMap(rows, resolve26) {
+function buildMentionMap(rows, resolve27) {
   const map = /* @__PURE__ */ new Map();
   visitObjects(rows, (o) => {
     const url = profileActionUrl(o);
@@ -27207,7 +27208,7 @@ function buildMentionMap(rows, resolve26) {
     const slug2 = slugFromProfileUrl(url);
     if (!slug2 || map.has(slug2)) return;
     const sink3 = { text: [], hashtags: [] };
-    collectRscText(o.children, resolve26, sink3, /* @__PURE__ */ new Set());
+    collectRscText(o.children, resolve27, sink3, /* @__PURE__ */ new Set());
     const name = sink3.text.join(" ").replace(/\s+/g, " ").trim();
     map.set(slug2, name ? { slug: slug2, name, url } : { slug: slug2, url });
   });
@@ -27293,10 +27294,10 @@ function buildPost(raw, mentionMap, author) {
 
 // src/commands/netcap/walkPostRow.ts
 var isCommentary = (o) => asObject(o.viewTrackingSpecs)?.viewName === "feed-commentary";
-function walkPostRow(v, resolve26, raw) {
+function walkPostRow(v, resolve27, raw) {
   if (v == null || typeof v !== "object") return;
   if (Array.isArray(v)) {
-    for (const x of v) walkPostRow(x, resolve26, raw);
+    for (const x of v) walkPostRow(x, resolve27, raw);
     return;
   }
   const o = v;
@@ -27310,9 +27311,9 @@ function walkPostRow(v, resolve26, raw) {
   }
   if (isCommentary(o)) {
     const sink3 = { text: raw.text, hashtags: raw.hashtags };
-    collectRscText(o.children, resolve26, sink3, /* @__PURE__ */ new Set());
+    collectRscText(o.children, resolve27, sink3, /* @__PURE__ */ new Set());
   }
-  for (const val of Object.values(o)) walkPostRow(val, resolve26, raw);
+  for (const val of Object.values(o)) walkPostRow(val, resolve27, raw);
 }
 
 // src/commands/netcap/extractLinkedInPosts.ts
@@ -27326,8 +27327,8 @@ function findCommentaryRows(rows) {
 }
 function extractLinkedInPosts(flight, author = findAuthorSlug(flight)) {
   const rows = parseRscRows(flight);
-  const resolve26 = makeRscResolver(rows);
-  const mentionMap = buildMentionMap(rows, resolve26);
+  const resolve27 = makeRscResolver(rows);
+  const mentionMap = buildMentionMap(rows, resolve27);
   const posts = [];
   for (const id of findCommentaryRows(rows)) {
     const raw = {
@@ -27337,7 +27338,7 @@ function extractLinkedInPosts(flight, author = findAuthorSlug(flight)) {
       links: [],
       related: []
     };
-    walkPostRow(rows[id], resolve26, raw);
+    walkPostRow(rows[id], resolve27, raw);
     const post = buildPost(raw, mentionMap, author);
     if (post) posts.push(post);
   }
@@ -28892,7 +28893,7 @@ function parseIncoming(line, type) {
   }
 }
 function requestSession(message3) {
-  return new Promise((resolve26, reject) => {
+  return new Promise((resolve27, reject) => {
     connectToDaemon().then((socket) => {
       let settled = false;
       const finish2 = (error, sessionId) => {
@@ -28900,7 +28901,7 @@ function requestSession(message3) {
         settled = true;
         socket.destroy();
         if (error) reject(error);
-        else resolve26(sessionId);
+        else resolve27(sessionId);
       };
       readSocketLines(socket, (line) => {
         const incoming = parseIncoming(line, message3.type);
@@ -29495,8 +29496,8 @@ function printPrStatus(pr) {
 }
 
 // src/commands/prs/status/printPrsStatus.ts
-function printPrsStatus(report2) {
-  for (const repo of report2.repos) {
+function printPrsStatus(report) {
+  for (const repo of report.repos) {
     const count8 = repo.pullRequests.length;
     console.log(`${chalk185.bold(repo.repo)} ${chalk185.dim(`(${count8} open)`)}`);
     for (const pr of repo.pullRequests) {
@@ -29505,9 +29506,9 @@ function printPrsStatus(report2) {
     if (count8 === 0) console.log(chalk185.dim("  no open pull requests"));
     console.log();
   }
-  if (report2.errors.length === 0) return;
+  if (report.errors.length === 0) return;
   console.log(chalk185.bold("Errors"));
-  for (const failure of report2.errors) {
+  for (const failure of report.errors) {
     console.log(`  ${chalk185.red(failure.repo)}: ${failure.error}`);
   }
   console.log();
@@ -29515,12 +29516,12 @@ function printPrsStatus(report2) {
 
 // src/commands/prs/prsStatus.ts
 function prsStatus(repos2, options2) {
-  const report2 = buildPrsStatusReport(repos2);
+  const report = buildPrsStatusReport(repos2);
   if (options2.json) {
-    console.log(JSON.stringify(report2, null, 2));
+    console.log(JSON.stringify(report, null, 2));
     return;
   }
-  printPrsStatus(report2);
+  printPrsStatus(report);
 }
 
 // src/commands/registerPrsStatus.ts
@@ -31354,7 +31355,7 @@ function getViolations(pattern2, options2 = {}, maxLines = DEFAULT_MAX_LINES2) {
 
 // src/commands/refactor/check.ts
 function runScript(script, cwd) {
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     const child = spawn7("npm", ["run", script], {
       stdio: "pipe",
       shell: true,
@@ -31368,7 +31369,7 @@ function runScript(script, cwd) {
       output += data.toString();
     });
     child.on("close", (code) => {
-      resolve26({ script, code: code ?? 1, output });
+      resolve27({ script, code: code ?? 1, output });
     });
   });
 }
@@ -35676,12 +35677,12 @@ function onCloseResult(ctx, code) {
   return { ...closed, stderr: ctx.stderr.value, stdout: ctx.stdout.value };
 }
 function waitForChildExit(ctx) {
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     let settled = false;
     const settle = (result) => {
       if (settled) return;
       settled = true;
-      resolve26(result);
+      resolve27(result);
     };
     ctx.child.on("error", (err) => settle(onErrorResult(ctx, err)));
     ctx.child.on("close", (code) => settle(onCloseResult(ctx, code)));
@@ -37053,11 +37054,11 @@ import { randomUUID as randomUUID20 } from "crypto";
 // src/commands/sessions/shared/sendShowPreview.ts
 async function sendShowPreview(request) {
   const socket = await connectToDaemon();
-  await new Promise((resolve26, reject) => {
+  await new Promise((resolve27, reject) => {
     const finish2 = (error) => {
       socket.destroy();
       if (error) reject(error);
-      else resolve26();
+      else resolve27();
     };
     readSocketLines(socket, (line) => {
       const reply2 = parseReply(line);
@@ -38320,9 +38321,9 @@ function createReadlineInterface() {
   });
 }
 function askQuestion(rl, question) {
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     rl.question(question, (answer) => {
-      resolve26(answer.trim());
+      resolve27(answer.trim());
     });
   });
 }
@@ -39464,47 +39465,18 @@ function registerVerify(program2) {
   configHelp(verifyCommand, verifyConfigHelp);
 }
 
-// src/commands/watch/decideLap.ts
-var RELAUNCH_CODES = /* @__PURE__ */ new Set([0, 2, 4]);
-function decideLap(end, interrupted) {
-  if (interrupted) return { kind: "exit", code: 130 };
-  if (end.code === null) return { kind: "relaunch" };
-  if (RELAUNCH_CODES.has(end.code)) return { kind: "relaunch" };
-  return { kind: "exit", code: end.code };
-}
-
-// src/commands/watch/runWatchLap.ts
-import { spawn as spawn9 } from "child_process";
-var WATCH_LAP_ARGS = ["watch", "wait", "--pull", "--build"];
-function runWatchLap() {
-  return new Promise((resolve26, reject) => {
-    const assistFromPath = spawn9("assist", WATCH_LAP_ARGS, {
-      stdio: "inherit",
-      shell: process.platform === "win32"
-    });
-    assistFromPath.on("close", (code, signal) => resolve26({ code, signal }));
-    assistFromPath.on("error", reject);
-  });
-}
+// src/commands/watch/simulateDivergence.ts
+import { writeFileSync as writeFileSync52 } from "fs";
 
-// src/commands/watch/watchLoop.ts
-async function watchLoop() {
-  let interrupted = false;
-  const recordInterruptAndLetLapFinish = () => {
-    interrupted = true;
-  };
-  process.on("SIGINT", recordInterruptAndLetLapFinish);
-  for (let lap = 1; ; lap++) {
-    console.log(`lap ${lap}: assist ${WATCH_LAP_ARGS.join(" ")}`);
-    const end = await runWatchLap();
-    const decision = decideLap(end, interrupted);
-    const how = end.signal ? `killed by ${end.signal}` : `exited ${end.code}`;
-    if (decision.kind === "exit") {
-      console.error(`lap ${lap} ${how} \u2014 stopping`);
-      return process.exit(decision.code);
-    }
-    console.log(`lap ${lap} ${how} \u2014 relaunching`);
+// 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/resolveUpstream.ts
@@ -39547,6 +39519,71 @@ function resolveUpstream(cwd) {
   }
 }
 
+// src/commands/watch/simulatedDivergencePath.ts
+import { resolve as resolve24 } from "path";
+function simulatedDivergencePath(cwd) {
+  return resolve24(
+    cwd ?? process.cwd(),
+    runGit3(["rev-parse", "--git-path", "assist-simulate-divergence"], cwd)
+  );
+}
+
+// src/commands/watch/simulateDivergence.ts
+function simulateDivergence() {
+  try {
+    writeFileSync52(simulatedDivergencePath(), "");
+    console.log(
+      `the next assist watch wait poll in ${runGit3(["rev-parse", "--show-toplevel"])} will exit 3 as a simulated divergence`
+    );
+  } catch (error) {
+    console.error(`cannot simulate a divergence: ${gitFailureReason(error)}`);
+    process.exit(1);
+  }
+}
+
+// src/commands/watch/decideLap.ts
+var RELAUNCH_CODES = /* @__PURE__ */ new Set([0, 2, 4]);
+function decideLap(end, interrupted) {
+  if (interrupted) return { kind: "exit", code: 130 };
+  if (end.code === null) return { kind: "relaunch" };
+  if (RELAUNCH_CODES.has(end.code)) return { kind: "relaunch" };
+  return { kind: "exit", code: end.code };
+}
+
+// src/commands/watch/runWatchLap.ts
+import { spawn as spawn9 } from "child_process";
+var WATCH_LAP_ARGS = ["watch", "wait", "--pull", "--build"];
+function runWatchLap() {
+  return new Promise((resolve27, reject) => {
+    const assistFromPath = spawn9("assist", WATCH_LAP_ARGS, {
+      stdio: "inherit",
+      shell: process.platform === "win32"
+    });
+    assistFromPath.on("close", (code, signal) => resolve27({ code, signal }));
+    assistFromPath.on("error", reject);
+  });
+}
+
+// src/commands/watch/watchLoop.ts
+async function watchLoop() {
+  let interrupted = false;
+  const recordInterruptAndLetLapFinish = () => {
+    interrupted = true;
+  };
+  process.on("SIGINT", recordInterruptAndLetLapFinish);
+  for (let lap = 1; ; lap++) {
+    console.log(`lap ${lap}: assist ${WATCH_LAP_ARGS.join(" ")}`);
+    const end = await runWatchLap();
+    const decision = decideLap(end, interrupted);
+    const how = end.signal ? `killed by ${end.signal}` : `exited ${end.code}`;
+    if (decision.kind === "exit") {
+      console.error(`lap ${lap} ${how} \u2014 stopping`);
+      return process.exit(decision.code);
+    }
+    console.log(`lap ${lap} ${how} \u2014 relaunching`);
+  }
+}
+
 // src/commands/watch/changedPaths.ts
 function changedPaths(from, cwd) {
   return runGit3(["diff", "--name-only", `${from}..HEAD`], cwd).split("\n").filter((line) => line.length > 0);
@@ -39670,17 +39707,6 @@ function buildWatchReport(from, 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 {
@@ -39691,6 +39717,9 @@ function watchReport(options2) {
   }
 }
 
+// src/commands/watch/simulatedDivergenceNote.ts
+var simulatedDivergenceNote = "requested by assist watch simulate-divergence; nothing has actually diverged";
+
 // src/commands/watch/describeOutcome.ts
 var short = (sha) => sha.slice(0, 7);
 function describeOutcome(outcome) {
@@ -39705,6 +39734,11 @@ function describeOutcome(outcome) {
         exitCode: 2,
         message: `no movement on ${outcome.upstream} after ${outcome.timeout}`
       };
+    case "simulated-divergence":
+      return {
+        exitCode: 3,
+        message: `simulated divergence from ${outcome.upstream} (${simulatedDivergenceNote})`
+      };
     case "unavailable":
       return { exitCode: 1, message: `cannot wait: ${outcome.reason}` };
     case "interrupted":
@@ -39712,19 +39746,9 @@ function describeOutcome(outcome) {
   }
 }
 
-// src/commands/watch/describePull.ts
-function describePull(result) {
-  if (result.kind === "fast-forwarded") {
-    return {
-      exitCode: 0,
-      message: `pulled --ff-only \u2192 ${result.sha.slice(0, 7)}`
-    };
-  }
-  return {
-    exitCode: 3,
-    message: `pull was not a fast-forward:
-${result.reason}`
-  };
+// src/commands/watch/emitWatchState.ts
+function emitWatchState(watchState) {
+  emitActivity({ kind: "command", name: "watch", watchState });
 }
 
 // src/commands/watch/parseDuration.ts
@@ -39759,6 +39783,21 @@ function parseWatchDurations(interval, timeout) {
   };
 }
 
+// src/commands/watch/describePull.ts
+function describePull(result) {
+  if (result.kind === "fast-forwarded") {
+    return {
+      exitCode: 0,
+      message: `pulled --ff-only \u2192 ${result.sha.slice(0, 7)}`
+    };
+  }
+  return {
+    exitCode: 3,
+    message: `pull was not a fast-forward:
+${result.reason}`
+  };
+}
+
 // src/commands/watch/pullFastForward.ts
 var STASH_MESSAGE = "assist watch";
 function attemptGit(args, cwd) {
@@ -39891,7 +39930,7 @@ function resolveParams(params, cliArgs) {
 
 // src/commands/run/resolveRunCwd.ts
 import { existsSync as existsSync80 } from "fs";
-import { resolve as resolve24 } from "path";
+import { resolve as resolve25 } from "path";
 var MissingRunCwdError = class extends Error {
   constructor(runName, cwd) {
     super(`run config "${runName}": cwd ${cwd} does not exist`);
@@ -39902,7 +39941,7 @@ var MissingRunCwdError = class extends Error {
 };
 function resolveRunCwd(config, baseDir = runConfigBaseDir()) {
   if (!config.cwd) return void 0;
-  const cwd = resolve24(baseDir, config.cwd);
+  const cwd = resolve25(baseDir, config.cwd);
   if (!existsSync80(cwd)) throw new MissingRunCwdError(config.name, cwd);
   return cwd;
 }
@@ -39971,6 +40010,12 @@ async function reportBuildOrExit(entry) {
   process.exit(4);
 }
 
+// src/commands/watch/reportOutcome.ts
+function reportOutcome({ exitCode, message: message3 }) {
+  if (exitCode === 0) console.log(message3);
+  else console.error(message3);
+}
+
 // src/commands/watch/runPostBuildSync.ts
 async function runPostBuildSync() {
   return toBuildOutcome(
@@ -39996,6 +40041,39 @@ async function reportSyncOrExit() {
   process.exit(4);
 }
 
+// src/commands/watch/pullAndBuild.ts
+var DEFAULT_BUILD_ENTRY = "auto-build";
+async function pullAndBuild(from, build2) {
+  emitWatchState("updating");
+  const pullResult = pullFastForward();
+  const pullReport = describePull(pullResult);
+  reportOutcome(pullReport);
+  if (pullResult.kind !== "fast-forwarded")
+    return process.exit(pullReport.exitCode);
+  console.log(`
+${buildWatchReport(from)}`);
+  if (build2) {
+    await reportBuildOrExit(
+      typeof build2 === "string" ? build2 : DEFAULT_BUILD_ENTRY
+    );
+    if (syncAdvice(changedPaths(from)).length > 0) await reportSyncOrExit();
+  }
+  process.exit(0);
+}
+
+// src/commands/watch/consumeSimulatedDivergence.ts
+import { existsSync as existsSync81, rmSync as rmSync6 } from "fs";
+function consumeSimulatedDivergence(cwd) {
+  try {
+    const path106 = simulatedDivergencePath(cwd);
+    if (!existsSync81(path106)) return false;
+    rmSync6(path106);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 // src/commands/watch/fetchQuietly.ts
 import { execFileSync as execFileSync22 } from "child_process";
 var MIN_FETCH_TIMEOUT_MS = 6e4;
@@ -40032,7 +40110,7 @@ function readMovement(cwd) {
 // src/commands/watch/pollForMovement.ts
 function pollForMovement(options2) {
   const { upstream, intervalMs, timeoutMs, timeout, cwd } = options2;
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     let settled = false;
     const finish2 = (outcome) => {
       if (settled) return;
@@ -40040,10 +40118,12 @@ function pollForMovement(options2) {
       clearInterval(ticker);
       clearTimeout(deadline);
       process.off("SIGINT", onInterrupt);
-      resolve26(outcome);
+      resolve27(outcome);
     };
     const onInterrupt = () => finish2({ kind: "interrupted" });
     const ticker = setInterval(() => {
+      if (consumeSimulatedDivergence(cwd))
+        return finish2({ kind: "simulated-divergence", upstream });
       fetchQuietly(cwd, intervalMs);
       const found = readMovement(cwd);
       if (found) finish2({ kind: "moved", upstream, ...found });
@@ -40069,6 +40149,8 @@ function waitForUpstream(options2) {
     });
   }
   onStart?.(upstream);
+  if (consumeSimulatedDivergence(cwd))
+    return Promise.resolve({ kind: "simulated-divergence", upstream });
   fetchQuietly(cwd, intervalMs);
   const moved = readMovement(cwd);
   if (moved) return Promise.resolve({ kind: "moved", upstream, ...moved });
@@ -40076,11 +40158,6 @@ function waitForUpstream(options2) {
 }
 
 // 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, timeoutMs } = parseWatchDurations(
     options2.interval,
@@ -40090,27 +40167,16 @@ async function watchWait(options2) {
     intervalMs,
     timeoutMs,
     timeout: options2.timeout,
-    onStart: (upstream) => console.log(`waiting on ${upstream} \u2026`)
+    onStart: (upstream) => {
+      emitWatchState("waiting");
+      console.log(`waiting on ${upstream} \u2026`);
+    }
   });
   const waitReport = describeOutcome(outcome);
-  report(waitReport);
+  reportOutcome(waitReport);
   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
-    );
-    if (syncAdvice(changedPaths(outcome.from)).length > 0)
-      await reportSyncOrExit();
-  }
-  process.exit(0);
+  await pullAndBuild(outcome.from, options2.build);
 }
 
 // src/commands/registerWatch.ts
@@ -40138,6 +40204,9 @@ function registerWatch(program2) {
   watchCommand.command("loop").description(
     "Run assist watch wait --pull --build as a fresh child per lap, relaunching after exit 0, 2 or 4 or a signal kill, and exit with the child's code on 1, 3 or 130"
   ).action(() => watchLoop());
+  watchCommand.command("simulate-divergence").description(
+    "Make the next assist watch wait poll in this repo exit 3 as if the branch had diverged, to test the watcher's divergence escalation"
+  ).action(() => simulateDivergence());
   watchCommand.command("report").description(
     "Print the built version, the last 10 commits as a markdown table, the restarts the new commits make necessary, and whether ~/.claude needs a sync"
   ).option(
@@ -40169,7 +40238,7 @@ function extractCode(url, expectedState) {
   return code;
 }
 function waitForCallback(port, expectedState) {
-  return new Promise((resolve26, reject) => {
+  return new Promise((resolve27, reject) => {
     const timeout = setTimeout(() => {
       server.close();
       reject(new Error("Authorization timed out after 120 seconds"));
@@ -40186,7 +40255,7 @@ function waitForCallback(port, expectedState) {
         const code = extractCode(url, expectedState);
         respondHtml(res, 200, "Authorization successful!");
         server.close();
-        resolve26(code);
+        resolve27(code);
       } catch (error) {
         respondHtml(res, 400, error.message);
         server.close();
@@ -40469,7 +40538,7 @@ async function run3(name, args) {
 }
 
 // src/commands/run/add.ts
-import { mkdirSync as mkdirSync33, writeFileSync as writeFileSync52 } from "fs";
+import { mkdirSync as mkdirSync33, writeFileSync as writeFileSync53 } from "fs";
 import { join as join95 } from "path";
 
 // src/commands/run/extractOption.ts
@@ -40540,7 +40609,7 @@ description: Run ${name}
 Run \`assist run ${name} $ARGUMENTS 2>&1\`.
 `;
   const filePath = join95(dir, `${name}.md`);
-  writeFileSync52(filePath, content);
+  writeFileSync53(filePath, content);
   console.log(`Created command file: ${filePath}`);
 }
 function add4() {
@@ -40595,7 +40664,7 @@ function link2() {
 }
 
 // src/commands/run/remove.ts
-import { existsSync as existsSync81, unlinkSync as unlinkSync21 } from "fs";
+import { existsSync as existsSync82, unlinkSync as unlinkSync21 } from "fs";
 import { join as join96 } from "path";
 function findRemoveIndex() {
   const idx = process.argv.indexOf("remove");
@@ -40612,7 +40681,7 @@ function parseRemoveName() {
 }
 function deleteCommandFile(name) {
   const filePath = join96(".claude", "commands", `${name}.md`);
-  if (existsSync81(filePath)) {
+  if (existsSync82(filePath)) {
     unlinkSync21(filePath);
     console.log(`Deleted command file: ${filePath}`);
   }
@@ -40691,10 +40760,10 @@ var STATUS_TIMEOUT_MS2 = 5e3;
 function queryDaemon(socket) {
   socket.write(`${JSON.stringify({ type: "ping" })}
 `);
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     const result = { sessions: [] };
     const pending = /* @__PURE__ */ new Set(["sessions", "pong"]);
-    const timer = setTimeout(() => resolve26(result), STATUS_TIMEOUT_MS2);
+    const timer = setTimeout(() => resolve27(result), STATUS_TIMEOUT_MS2);
     const lines2 = createInterface8({ input: socket });
     lines2.on("error", () => {
     });
@@ -40702,7 +40771,7 @@ function queryDaemon(socket) {
       applyLine(result, pending, line);
       if (pending.size === 0) {
         clearTimeout(timer);
-        resolve26(result);
+        resolve27(result);
       }
     });
   });
@@ -40802,11 +40871,11 @@ function clearPersistedSessionsOnDrain() {
 
 // src/commands/sessions/daemon/readDaemonMessage.ts
 function readDaemonMessage(lines2, timeoutMs, fallback, match) {
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     const finish2 = (value) => {
       clearTimeout(timer);
       lines2.off("line", onLine);
-      resolve26(value);
+      resolve27(value);
     };
     const timer = setTimeout(() => finish2(fallback), timeoutMs);
     const onLine = (line) => {
@@ -40993,12 +41062,12 @@ function toSessionRunInfo({
 }
 
 // src/commands/sessions/daemon/worktree/joinRefusal.ts
-import { existsSync as existsSync82 } from "fs";
+import { existsSync as existsSync83 } from "fs";
 function joinRefusal(session) {
   if (session.commandType === "run") return "a server run has no agent stream";
   if (session.closing === true) return "the session is closing";
   if (!session.cwd) return "the session has no working directory";
-  if (!existsSync82(session.cwd))
+  if (!existsSync83(session.cwd))
     return "the session's workspace no longer exists";
   return void 0;
 }
@@ -41373,11 +41442,11 @@ function sessionBase(id, status2) {
 }
 
 // src/commands/sessions/daemon/spawnPty.ts
-import { existsSync as existsSync84 } from "fs";
+import { existsSync as existsSync85 } from "fs";
 import * as pty from "node-pty";
 
 // src/commands/sessions/daemon/ensureSpawnHelperExecutable.ts
-import { chmodSync, existsSync as existsSync83, statSync as statSync13 } from "fs";
+import { chmodSync, existsSync as existsSync84, statSync as statSync13 } from "fs";
 import { createRequire as createRequire3 } from "module";
 import path102 from "path";
 var require4 = createRequire3(import.meta.url);
@@ -41392,7 +41461,7 @@ function ensureSpawnHelperExecutable() {
     `${process.platform}-${process.arch}`,
     "spawn-helper"
   );
-  if (!existsSync83(helper)) return;
+  if (!existsSync84(helper)) return;
   const mode = statSync13(helper).mode;
   if ((mode & 73) === 0) chmodSync(helper, mode | 493);
 }
@@ -41428,7 +41497,7 @@ function spawnPty(args, cwd, sessionId, extraEnv) {
   });
 }
 function refuseMissingCwd(cwd, sessionId) {
-  if (!cwd || existsSync84(cwd)) return;
+  if (!cwd || existsSync85(cwd)) return;
   daemonLog(
     `${sessionId ? `session ${sessionId}` : "pty"} not spawned: working directory ${cwd} no longer exists`
   );
@@ -41621,11 +41690,11 @@ function setStatus2(session, newStatus) {
 }
 
 // src/commands/sessions/daemon/worktree/reapWorktree.ts
-import { existsSync as existsSync86 } from "fs";
+import { existsSync as existsSync87 } from "fs";
 import { basename as basename27 } from "path";
 
 // src/commands/sessions/daemon/worktree/deleteStrandedTree.ts
-import { existsSync as existsSync85 } from "fs";
+import { existsSync as existsSync86 } from "fs";
 import { join as join99 } from "path";
 
 // src/commands/sessions/daemon/worktree/deleteTreeDirectly.ts
@@ -41695,7 +41764,7 @@ async function deleteStrandedTree(clone, worktreePath, cause) {
   );
 }
 function strandedReason(worktreePath, cause) {
-  if (!existsSync85(join99(worktreePath, ".git")))
+  if (!existsSync86(join99(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";
@@ -41747,7 +41816,7 @@ function reason3(error) {
 
 // src/commands/sessions/daemon/worktree/reapWorktree.ts
 async function reapWorktree(worktreePath, force = false) {
-  if (!existsSync86(worktreePath)) {
+  if (!existsSync87(worktreePath)) {
     forgetWorktree(worktreePath);
     daemonLog(
       `worktree ${worktreePath} already gone; its record was forgotten`
@@ -41772,7 +41841,7 @@ async function reapWorktree(worktreePath, force = false) {
 }
 function owningClone(worktreePath) {
   const recorded = worktreeAttributionIncludingReaped(worktreePath)?.clone;
-  if (recorded && existsSync86(recorded)) return recorded;
+  if (recorded && existsSync87(recorded)) return recorded;
   const detected = mainWorktree(worktreePath);
   if (detected) return detected;
   daemonLog(
@@ -41969,12 +42038,12 @@ function processCwd(link3) {
 var POLL_MS = 500;
 var GRACE_MS = 5e3;
 function awaitTreeVacated(session, treePath) {
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     let ticks = GRACE_MS / POLL_MS;
     const settle = (outcome) => {
       clearTimeout(timer);
       session.closeGrace = void 0;
-      resolve26(outcome);
+      resolve27(outcome);
     };
     const tick = () => {
       if (liveProcessesInTree(treePath).length === 0) settle("vacated");
@@ -42010,12 +42079,12 @@ async function closeBlockReason(sessionId, tree) {
 }
 
 // src/commands/sessions/daemon/worktree/watchGitState.ts
-import { existsSync as existsSync87, watch } from "fs";
+import { existsSync as existsSync88, watch } from "fs";
 var DEBOUNCE_MS = 500;
 var POLL_MS2 = 3e4;
 function watchGitState(cwd, onChange) {
   const common = gitCommonDir(cwd);
-  if (!common || !existsSync87(common)) return void 0;
+  if (!common || !existsSync88(common)) return void 0;
   const watchers = [
     watchGitDir(common, onChange),
     pollGitState(cwd, onChange)
@@ -42138,6 +42207,39 @@ function dismissSessionGated(sessions, id, notify2, discard = false) {
   settle();
 }
 
+// src/commands/sessions/daemon/worktree/resumeWatcherAfterEscalation.ts
+var ENDED = ["done", "error"];
+function resumeWatcherAfterEscalation(sessions, escalation, restart) {
+  if (escalation.divergenceEscalation !== true || !escalation.cwd) return;
+  const clone = canonicalTreePath(escalation.cwd);
+  const watcher = [...sessions.values()].find(
+    (s) => s.watcher === true && s.cwd !== void 0 && canonicalTreePath(s.cwd) === clone
+  );
+  if (!watcher) {
+    daemonLog(
+      `escalation session ${escalation.id} ended (${escalation.status}): no watcher left in the clone ${clone} to restart`
+    );
+    return;
+  }
+  if (!ENDED.includes(watcher.status)) {
+    daemonLog(
+      `escalation session ${escalation.id} ended (${escalation.status}): watcher session ${watcher.id} in the clone ${clone} is already ${watcher.status}`
+    );
+    return;
+  }
+  daemonLog(
+    `escalation session ${escalation.id} ended (${escalation.status}): restarting watcher session ${watcher.id} in the clone ${clone}`
+  );
+  restart(watcher.id);
+}
+
+// src/commands/sessions/daemon/dismissAndResumeWatcher.ts
+function dismissAndResumeWatcher(sessions, id, notify2, restart) {
+  const session = sessions.get(id);
+  dismissSessionGated(sessions, id, notify2);
+  if (session) resumeWatcherAfterEscalation(sessions, session, restart);
+}
+
 // src/commands/sessions/daemon/drainSessions.ts
 function drainSessions(sessions, notify2) {
   const drained = [...sessions.values()].map((s) => ({
@@ -42562,10 +42664,10 @@ function emitSessionOutput(session, clients, data) {
 }
 
 // src/commands/sessions/daemon/exitReason.ts
-import { existsSync as existsSync88 } from "fs";
-import { resolve as resolve25 } from "path";
+import { existsSync as existsSync89 } from "fs";
+import { resolve as resolve26 } from "path";
 function exitDetail(session) {
-  if (session.cwd && !existsSync88(session.cwd))
+  if (session.cwd && !existsSync89(session.cwd))
     return `working directory ${session.cwd} no longer exists`;
   return missingRunConfigCwd(session);
 }
@@ -42578,8 +42680,8 @@ function missingRunConfigCwd(session) {
   const dir = session.cwd ?? process.cwd();
   const config = resolveRunConfig(session.runName, dir);
   if (!config?.cwd) return void 0;
-  const configured = resolve25(runConfigBaseDirFrom(dir), config.cwd);
-  if (existsSync88(configured)) return void 0;
+  const configured = resolve26(runConfigBaseDirFrom(dir), config.cwd);
+  if (existsSync89(configured)) return void 0;
   return `run config "${config.name}": cwd ${configured} does not exist`;
 }
 
@@ -42627,7 +42729,7 @@ function handleRefusedRun(session, exitCode, onStatusChange) {
 }
 
 // src/commands/sessions/daemon/watchActivity.ts
-import { existsSync as existsSync89, mkdirSync as mkdirSync34, watch as watch2 } from "fs";
+import { existsSync as existsSync90, mkdirSync as mkdirSync34, watch as watch2 } from "fs";
 import { dirname as dirname41 } from "path";
 
 // src/commands/sessions/daemon/applyActivityToSession.ts
@@ -42713,7 +42815,7 @@ function watchActivity(session, notify2, onClaudeSessionId) {
     if (timer) clearTimeout(timer);
     timer = setTimeout(read3, DEBOUNCE_MS2);
   });
-  if (existsSync89(path106)) read3();
+  if (existsSync90(path106)) read3();
 }
 function refreshActivity(session) {
   if (session.commandType !== "assist" || !session.cwd) return;
@@ -43689,6 +43791,7 @@ function finishStatusChange(session, status2, exitCode, deps2) {
   if (status2 !== "stopped") session.undurable = void 0;
   if (session.watcher === true && exitCode === DIVERGED_EXIT_CODE)
     deps2.escalateDivergence?.(session);
+  if (status2 === "done" || status2 === "error") deps2.resumeWatcher?.(session);
   const autoRun = shouldAutoRun(session);
   if (autoRun.run) {
     deps2.reuseForRun(session, autoRun.itemId);
@@ -44039,112 +44142,6 @@ function reuseSessionForRun(session, itemId2, clients, onStatusChange, tree) {
   );
 }
 
-// src/commands/sessions/daemon/worktree/divergencePrompt.ts
-var MAX_REASON_LINES = 20;
-var MAX_REASON_CHARS = 2e3;
-function divergencePrompt(clone, scrollback) {
-  const reason4 = stripAnsi(scrollback).split(/\r?\n|\r/).map((line) => line.trimEnd()).filter((line) => line.trim().length > 0).slice(-MAX_REASON_LINES).join("\n").slice(-MAX_REASON_CHARS);
-  return [
-    `The watcher in ${clone} stopped because \`assist watch wait --pull --build\` could not fast-forward the branch (exit 3). The tail of its output:`,
-    "",
-    "```",
-    reason4 || "(no output captured)",
-    "```",
-    "",
-    "Diagnose why the local branch has diverged from its upstream and report what you find and the options for reconciling it. Do not force-push, `git reset`, or otherwise discard commits on either side \u2014 leave the decision to the user."
-  ].join("\n");
-}
-
-// src/commands/sessions/daemon/worktree/escalateDivergence.ts
-var ENDED = ["done", "error", "stopped"];
-function escalateDivergence(ctx, watcher) {
-  if (!watcher.cwd) return void 0;
-  const clone = canonicalTreePath(watcher.cwd);
-  const live = [...ctx.sessions.values()].find(
-    (s) => s.divergenceEscalation === true && s.cwd !== void 0 && canonicalTreePath(s.cwd) === clone && !ENDED.includes(s.status)
-  );
-  if (live) {
-    daemonLog(
-      `watcher session ${watcher.id} exited 3 (divergence) in the clone ${clone}: no escalation spawned, session ${live.id} is already diagnosing it (${live.status})`
-    );
-    return void 0;
-  }
-  const prompt = divergencePrompt(clone, watcher.scrollback);
-  const id = allocateAndBind(
-    ctx,
-    clone,
-    (sid, resolvedCwd) => ({
-      ...createSession(sid, { prompt, cwd: resolvedCwd ?? clone }),
-      divergenceEscalation: true
-    }),
-    { inPlace: true }
-  );
-  daemonLog(
-    `watcher session ${watcher.id} exited 3 (divergence) in the clone ${clone}: spawned escalation session ${id} to diagnose it`
-  );
-  return id;
-}
-
-// src/commands/sessions/daemon/managerStatusChangeHandler.ts
-function managerStatusChangeHandler(sessions, clients, dismiss, notify2, treeCtx) {
-  const handler = makeStatusChangeHandler(sessions, {
-    dismiss,
-    notify: notify2,
-    reuseForRun: (session, itemId2) => reuseSessionForRun(session, itemId2, clients, handler, treeCtx()),
-    escalateDivergence: (watcher) => escalateDivergence(treeCtx(), watcher)
-  });
-  return handler;
-}
-
-// src/commands/sessions/daemon/applySetStatus.ts
-function applySetStatus(sessions, id, status2, source, onStatusChange, rebind) {
-  const session = sessions.get(id);
-  if (!session) {
-    daemonLog(
-      `set-status for unknown session id=${id} status=${status2} (no live session; ignoring)`
-    );
-    return;
-  }
-  if (session.status === "stopped") {
-    daemonLog(
-      `set-status for stopped session id=${id} status=${status2} (held pending durable close; ignoring)`
-    );
-    return;
-  }
-  rebind?.(session);
-  if (source === "permission") session.permissionActive = true;
-  if (status2 === "running") session.permissionActive = false;
-  onStatusChange(session, status2);
-}
-
-// src/commands/sessions/daemon/rebindClaudeSession.ts
-function rebindClaudeSession(session, claudeSessionId, notify2, onStatusChange) {
-  if (!claudeSessionId) return;
-  if (session.claudeSessionId === claudeSessionId) return;
-  daemonLog(
-    `session ${session.id} claude session moved: ${session.claudeSessionId ?? "none"} -> ${claudeSessionId}`
-  );
-  session.claudeSessionId = claudeSessionId;
-  watchTranscript(session, notify2, onStatusChange);
-}
-
-// src/commands/sessions/daemon/setStatusFromHook.ts
-function setStatusFromHook(sessions, report2, notify2, onStatusChange) {
-  applySetStatus(
-    sessions,
-    report2.id,
-    report2.status,
-    report2.source,
-    onStatusChange,
-    (session) => rebindClaudeSession(
-      session,
-      report2.claudeSessionId,
-      notify2,
-      onStatusChange
-    )
-  );
-}
-
 // src/commands/sessions/daemon/respawnSession.ts
 function respawnSession(session, respawn, status2, clients, onStatusChange) {
   session.gitWatcher?.close();
@@ -44341,6 +44338,134 @@ function restartManagedSession(sessions, id, clients, onStatusChange) {
   return { ok: true };
 }
 
+// src/commands/sessions/daemon/worktree/divergencePrompt.ts
+var MAX_REASON_LINES = 20;
+var MAX_REASON_CHARS = 2e3;
+var RECONCILE_STEPS = [
+  "Reconcile it yourself, without discarding any commits on either side:",
+  "",
+  "1. Inspect `git status`, `git log --oneline @{u}..@` and `git log --oneline @..@{u}`.",
+  '2. Stash any uncommitted work with `git stash push -u -m "assist divergence"`, and restore it with `git stash pop` once the branch is reconciled.',
+  "3. Rebase the local commits onto the upstream with `git rebase @{u}`, resolving conflicts so both sides' changes survive. If the rebase cannot be resolved cleanly, `git rebase --abort` and `git merge @{u}` instead.",
+  "4. Push the result with a plain `git push` so the branch matches its upstream again.",
+  "5. Build the clone with `assist run auto-build`.",
+  "6. Run /close. The daemon restarts the watcher once this session closes.",
+  "",
+  "Never force-push, `git reset`, or otherwise discard commits. If you cannot reconcile the branch without doing so, explain what is blocking it and leave this session open for the user instead of closing it."
+];
+var SIMULATED_STEPS = [
+  "This divergence was simulated to test the escalation; there is nothing to reconcile. Run /close now. The daemon restarts the watcher once this session closes."
+];
+function divergenceReason(scrollback) {
+  return stripAnsi(scrollback).split(/\r?\n|\r/).map((line) => line.trimEnd()).filter((line) => line.trim().length > 0).slice(-MAX_REASON_LINES).join("\n").slice(-MAX_REASON_CHARS);
+}
+function divergencePrompt(clone, scrollback) {
+  const reason4 = divergenceReason(scrollback);
+  return [
+    `The watcher in ${clone} stopped because \`assist watch wait --pull --build\` could not fast-forward the branch (exit 3). The tail of its output:`,
+    "",
+    "```",
+    reason4 || "(no output captured)",
+    "```",
+    "",
+    ...reason4.includes(simulatedDivergenceNote) ? SIMULATED_STEPS : RECONCILE_STEPS
+  ].join("\n");
+}
+
+// src/commands/sessions/daemon/worktree/escalateDivergence.ts
+var ENDED2 = ["done", "error", "stopped"];
+function escalateDivergence(ctx, watcher) {
+  if (!watcher.cwd) return void 0;
+  const clone = canonicalTreePath(watcher.cwd);
+  const live = [...ctx.sessions.values()].find(
+    (s) => s.divergenceEscalation === true && s.cwd !== void 0 && canonicalTreePath(s.cwd) === clone && !ENDED2.includes(s.status)
+  );
+  if (live) {
+    daemonLog(
+      `watcher session ${watcher.id} exited 3 (divergence) in the clone ${clone}: no escalation spawned, session ${live.id} is already diagnosing it (${live.status})`
+    );
+    return void 0;
+  }
+  const prompt = divergencePrompt(clone, watcher.scrollback);
+  const id = allocateAndBind(
+    ctx,
+    clone,
+    (sid, resolvedCwd) => ({
+      ...createSession(sid, { prompt, cwd: resolvedCwd ?? clone }),
+      divergenceEscalation: true
+    }),
+    { inPlace: true }
+  );
+  daemonLog(
+    `watcher session ${watcher.id} exited 3 (divergence) in the clone ${clone}: spawned escalation session ${id} to diagnose it`
+  );
+  return id;
+}
+
+// src/commands/sessions/daemon/managerStatusChangeHandler.ts
+function managerStatusChangeHandler(sessions, clients, dismiss, notify2, treeCtx) {
+  const handler = makeStatusChangeHandler(sessions, {
+    dismiss,
+    notify: notify2,
+    reuseForRun: (session, itemId2) => reuseSessionForRun(session, itemId2, clients, handler, treeCtx()),
+    escalateDivergence: (watcher) => escalateDivergence(treeCtx(), watcher),
+    resumeWatcher: (escalation) => resumeWatcherAfterEscalation(sessions, escalation, (watcherId) => {
+      if (restartManagedSession(sessions, watcherId, clients, handler).ok)
+        notify2();
+    })
+  });
+  return handler;
+}
+
+// src/commands/sessions/daemon/applySetStatus.ts
+function applySetStatus(sessions, id, status2, source, onStatusChange, rebind) {
+  const session = sessions.get(id);
+  if (!session) {
+    daemonLog(
+      `set-status for unknown session id=${id} status=${status2} (no live session; ignoring)`
+    );
+    return;
+  }
+  if (session.status === "stopped") {
+    daemonLog(
+      `set-status for stopped session id=${id} status=${status2} (held pending durable close; ignoring)`
+    );
+    return;
+  }
+  rebind?.(session);
+  if (source === "permission") session.permissionActive = true;
+  if (status2 === "running") session.permissionActive = false;
+  onStatusChange(session, status2);
+}
+
+// src/commands/sessions/daemon/rebindClaudeSession.ts
+function rebindClaudeSession(session, claudeSessionId, notify2, onStatusChange) {
+  if (!claudeSessionId) return;
+  if (session.claudeSessionId === claudeSessionId) return;
+  daemonLog(
+    `session ${session.id} claude session moved: ${session.claudeSessionId ?? "none"} -> ${claudeSessionId}`
+  );
+  session.claudeSessionId = claudeSessionId;
+  watchTranscript(session, notify2, onStatusChange);
+}
+
+// src/commands/sessions/daemon/setStatusFromHook.ts
+function setStatusFromHook(sessions, report, notify2, onStatusChange) {
+  applySetStatus(
+    sessions,
+    report.id,
+    report.status,
+    report.source,
+    onStatusChange,
+    (session) => rebindClaudeSession(
+      session,
+      report.claudeSessionId,
+      notify2,
+      onStatusChange
+    )
+  );
+}
+
 // src/commands/sessions/daemon/restartAndNotify.ts
 function restartAndNotify(sessions, id, clients, onStatusChange, notify2) {
   const result = restartManagedSession(sessions, id, clients, onStatusChange);
@@ -44919,7 +45044,7 @@ function rearmStoppedSessions(sessions, notify2) {
 }
 
 // src/commands/sessions/daemon/worktree/reconcileWorktreesOnRestore.ts
-import { existsSync as existsSync92 } from "fs";
+import { existsSync as existsSync93 } from "fs";
 import { basename as basename29 } from "path";
 
 // src/commands/sessions/daemon/worktree/accountedTrees.ts
@@ -44940,9 +45065,9 @@ function accountedTrees(sessions) {
 }
 
 // src/commands/sessions/daemon/worktree/reclaimVanishedWorktrees.ts
-import { existsSync as existsSync91 } from "fs";
+import { existsSync as existsSync92 } from "fs";
 async function reclaimVanishedWorktrees(clone, paths) {
-  if (!existsSync91(clone)) {
+  if (!existsSync92(clone)) {
     for (const { path: path106 } of paths) forgetWorktree(path106);
     daemonLog(
       `clone ${clone} is gone; forgot ${paths.length} worktree record(s) it owned`
@@ -45108,7 +45233,7 @@ async function recoverOrphanedWorktrees(sessions, spawnWith, notify2) {
       );
       continue;
     }
-    if (!existsSync92(path106)) {
+    if (!existsSync93(path106)) {
       logVanishedTree(sessions, path106);
       vanished.set(clone, [
         ...vanished.get(clone) ?? [],
@@ -45524,7 +45649,7 @@ function failPendingCreators(state, message3) {
 }
 function resetRelayState(state, reason4) {
   failPendingCreators(state, reason4);
-  for (const resolve26 of state.historyWaiters) resolve26([]);
+  for (const resolve27 of state.historyWaiters) resolve27([]);
   state.historyWaiters = [];
   state.sessions = [];
   state.lastSnapshot = void 0;
@@ -45965,16 +46090,16 @@ var HISTORY_TIMEOUT_MS = 5e3;
 function requestLinkHistory(ctx) {
   if (!ctx.greeted) return Promise.resolve([]);
   const waiters = ctx.relay.historyWaiters;
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     const settle = (sessions) => {
       clearTimeout(timer);
-      resolve26(sessions);
+      resolve27(sessions);
     };
     const timer = setTimeout(() => {
       const index2 = waiters.indexOf(settle);
       if (index2 !== -1) waiters.splice(index2, 1);
       daemonLog(`link ${ctx.spec.name} ws: history timed out`);
-      resolve26(ctx.relay.lastHistory ?? []);
+      resolve27(ctx.relay.lastHistory ?? []);
     }, HISTORY_TIMEOUT_MS);
     timer.unref?.();
     waiters.push(settle);
@@ -46198,7 +46323,7 @@ function spawnAssistInTree(ctx, assistArgs, cwd, meta, context) {
 }
 
 // src/commands/sessions/daemon/worktree/resumeInTree.ts
-import { existsSync as existsSync95 } from "fs";
+import { existsSync as existsSync96 } from "fs";
 
 // src/commands/sessions/daemon/resumeSession.ts
 function resumeSession(id, sessionId, cwd, name, holdPty, harness) {
@@ -46229,10 +46354,10 @@ function resumeSession(id, sessionId, cwd, name, holdPty, harness) {
 }
 
 // src/commands/sessions/daemon/worktree/resumeInReplacementTree.ts
-import { existsSync as existsSync94 } from "fs";
+import { existsSync as existsSync95 } from "fs";
 
 // src/commands/sessions/daemon/worktree/carryTranscriptToTree.ts
-import { copyFileSync as copyFileSync5, existsSync as existsSync93, mkdirSync as mkdirSync36 } from "fs";
+import { copyFileSync as copyFileSync5, existsSync as existsSync94, mkdirSync as mkdirSync36 } from "fs";
 import { join as join101 } from "path";
 function carryTranscriptToTree(claudeSessionId, fromCwd, toCwd) {
   const dir = projectDirForCwd(toCwd);
@@ -46243,7 +46368,7 @@ function carryTranscriptToTree(claudeSessionId, fromCwd, toCwd) {
     return;
   }
   const dest = join101(dir, `${claudeSessionId}.jsonl`);
-  if (existsSync93(dest)) {
+  if (existsSync94(dest)) {
     daemonLog(`transcript ${claudeSessionId} already present in ${dir}`);
     return;
   }
@@ -46294,7 +46419,7 @@ function resumeInReplacementTree(ctx, claudeSessionId, missingCwd, name, harness
 }
 function cloneForReapedTree(missingCwd) {
   const clone = worktreeAttributionIncludingReaped(missingCwd)?.clone;
-  if (!clone || !existsSync94(clone))
+  if (!clone || !existsSync95(clone))
     throw new Error(
       `working directory no longer exists and no clone is recorded to re-allocate from: ${missingCwd}`
     );
@@ -46303,7 +46428,7 @@ function cloneForReapedTree(missingCwd) {
 
 // src/commands/sessions/daemon/worktree/resumeInTree.ts
 function resumeInTree(ctx, sessionId, cwd, name, harness) {
-  if (!existsSync95(cwd))
+  if (!existsSync96(cwd))
     return resumeInReplacementTree(ctx, sessionId, cwd, name, harness);
   const id = ctx.spawnWith(
     (sid) => resumeSession(sid, sessionId, cwd, name, void 0, harness)
@@ -46421,7 +46546,12 @@ var SessionManager = class {
     );
   }
   dismissSession = (id) => {
-    dismissSessionGated(this.sessions, id, this.notify);
+    dismissAndResumeWatcher(
+      this.sessions,
+      id,
+      this.notify,
+      (watcherId) => this.restart(watcherId)
+    );
   };
   discardSession = (id) => {
     dismissSessionGated(this.sessions, id, this.notify, true);
@@ -46438,8 +46568,8 @@ var SessionManager = class {
   update(mutate) {
     if (mutate(this.sessions)) this.notify();
   }
-  setStatus(report2) {
-    setStatusFromHook(this.sessions, report2, this.notify, this.onStatusChange);
+  setStatus(report) {
+    setStatusFromHook(this.sessions, report, this.notify, this.onStatusChange);
   }
   /* why: the status line relays token totals keyed by Claude's session id; join
    * it to the running backlog phase so the spend accumulates against that row. */
@@ -47125,7 +47255,7 @@ function handleConnection(socket, manager) {
 }
 
 // src/commands/sessions/daemon/onListening.ts
-import { unlinkSync as unlinkSync22, writeFileSync as writeFileSync53 } from "fs";
+import { unlinkSync as unlinkSync22, writeFileSync as writeFileSync54 } from "fs";
 
 // src/commands/sessions/daemon/startPidFileWatchdog.ts
 import { readFileSync as readFileSync65 } from "fs";
@@ -47147,7 +47277,7 @@ function ownsPidFile() {
 
 // src/commands/sessions/daemon/onListening.ts
 function onListening(manager, checkAutoExit) {
-  writeFileSync53(daemonPaths.pid, String(process.pid));
+  writeFileSync54(daemonPaths.pid, String(process.pid));
   startPidFileWatchdog(() => {
     daemonLog("lost daemon.pid ownership; shutting down sessions and exiting");
     void manager.flushActiveMs().finally(() => {
@@ -47308,17 +47438,17 @@ async function findUnlinkedWindowsNode(health2, platform = detectPlatform()) {
 
 // src/commands/sessions/nodes/printReport.ts
 import chalk254 from "chalk";
-function printReport(report2) {
-  if (report2.links.length === 0) {
-    console.log(`${report2.local} has no links`);
-    if (report2.suggestion)
+function printReport(report) {
+  if (report.links.length === 0) {
+    console.log(`${report.local} has no links`);
+    if (report.suggestion)
       console.log(
-        `A Windows node (${report2.suggestion.nodeName}) answers on ${report2.suggestion.url} but is not linked. Link it with:
-  ${report2.suggestion.command}`
+        `A Windows node (${report.suggestion.nodeName}) answers on ${report.suggestion.url} but is not linked. Link it with:
+  ${report.suggestion.command}`
       );
     return;
   }
-  for (const diagnosis of report2.links) printDiagnosis(diagnosis);
+  for (const diagnosis of report.links) printDiagnosis(diagnosis);
 }
 function printDiagnosis(diagnosis) {
   console.log(`${chalk254.bold(diagnosis.name)} ${chalk254.dim(diagnosis.url)}`);
@@ -47335,13 +47465,13 @@ async function doctorNodes(name, options2) {
   if (name && specs.length === 0)
     throw new Error(`No link named ${name}; see assist sessions nodes`);
   const probes = buildDoctorProbes(await queryNodes());
-  const report2 = { local: resolveNodeName(), links: [] };
-  for (const spec of specs) report2.links.push(await diagnoseLink(spec, probes));
+  const report = { local: resolveNodeName(), links: [] };
+  for (const spec of specs) report.links.push(await diagnoseLink(spec, probes));
   if (specs.length === 0)
-    report2.suggestion = await findUnlinkedWindowsNode(probes.health);
-  if (report2.links.some((l) => !l.ok)) process.exitCode = 1;
-  if (options2.json) console.log(JSON.stringify(report2, null, 2));
-  else printReport(report2);
+    report.suggestion = await findUnlinkedWindowsNode(probes.health);
+  if (report.links.some((l) => !l.ok)) process.exitCode = 1;
+  if (options2.json) console.log(JSON.stringify(report, null, 2));
+  else printReport(report);
 }
 
 // src/commands/sessions/nodes/listNodes.ts
@@ -47357,16 +47487,16 @@ async function nodesReport() {
   };
 }
 async function listNodes(options2) {
-  const report2 = await nodesReport();
+  const report = await nodesReport();
   if (options2.json) {
-    console.log(JSON.stringify(report2, null, 2));
+    console.log(JSON.stringify(report, null, 2));
     return;
   }
-  console.log(`${report2.local} ${chalk255.dim("(this node)")}`);
-  if (!report2.daemonRunning)
+  console.log(`${report.local} ${chalk255.dim("(this node)")}`);
+  if (!report.daemonRunning)
     console.log(chalk255.dim("  daemon not running; showing configured links"));
-  if (report2.links.length === 0) console.log(chalk255.dim("  no links"));
-  for (const link3 of report2.links) console.log(formatLink(link3));
+  if (report.links.length === 0) console.log(chalk255.dim("  no links"));
+  for (const link3 of report.links) console.log(formatLink(link3));
 }
 
 // src/commands/sessions/nodes/nodeLogs.ts