@staff0rd/assist 0.554.0 → 0.554.2

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.554.0",
+  version: "0.554.2",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -5407,9 +5407,9 @@ var daemonPaths = {
 
 // src/commands/sessions/daemon/connectToDaemon.ts
 function connectToDaemon() {
-  return new Promise((resolve23, reject) => {
+  return new Promise((resolve24, reject) => {
     const socket = net.connect(daemonPaths.socket);
-    socket.once("connect", () => resolve23(socket));
+    socket.once("connect", () => resolve24(socket));
     socket.once("error", reject);
   });
 }
@@ -5562,7 +5562,7 @@ ${failed2.length} script(s) failed:`);
   }
 }
 function runEntry(entry) {
-  return new Promise((resolve23) => {
+  return new Promise((resolve24) => {
     const startTime = Date.now();
     const child = spawnCommand(
       entry.fullCommand,
@@ -5574,7 +5574,7 @@ function runEntry(entry) {
     child.on("close", (code) => {
       const exitCode = code ?? 1;
       flushIfFailed(exitCode, chunks);
-      resolve23({
+      resolve24({
         script: entry.name,
         code: exitCode,
         durationMs: Date.now() - startTime
@@ -6728,8 +6728,8 @@ function spawnInherit(command, args, options2 = {}) {
     env,
     cwd: options2.cwd
   });
-  const done2 = new Promise((resolve23, reject) => {
-    child.on("close", (code) => resolve23(code ?? 0));
+  const done2 = new Promise((resolve24, reject) => {
+    child.on("close", (code) => resolve24(code ?? 0));
     child.on("error", reject);
   });
   return { child, done: done2 };
@@ -7875,7 +7875,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((resolve23, reject) => {
+  return new Promise((resolve24, reject) => {
     connectToDaemon().then((socket) => {
       const timer = setTimeout(() => {
         socket.destroy();
@@ -7889,7 +7889,7 @@ function sendToDaemon(message3) {
 `, () => {
         clearTimeout(timer);
         socket.end();
-        resolve23();
+        resolve24();
       });
     }, reject);
   });
@@ -7912,7 +7912,7 @@ function readSocketLines(socket, onLine) {
 // src/commands/sessions/daemon/sendToDaemonAwaitAck.ts
 var ACK_TIMEOUT_MS = 1e3;
 function sendToDaemonAwaitAck(message3) {
-  return new Promise((resolve23, reject) => {
+  return new Promise((resolve24, reject) => {
     connectToDaemon().then((socket) => {
       let settled = false;
       const finish = (error) => {
@@ -7921,7 +7921,7 @@ function sendToDaemonAwaitAck(message3) {
         clearTimeout(timer);
         socket.destroy();
         if (error) reject(error);
-        else resolve23();
+        else resolve24();
       };
       const timer = setTimeout(
         () => finish(new Error("timed out awaiting daemon ack")),
@@ -7995,7 +7995,7 @@ async function deliverReliably(sessionId, status3, payload) {
   }
 }
 function sleep(ms) {
-  return new Promise((resolve23) => setTimeout(resolve23, ms));
+  return new Promise((resolve24) => setTimeout(resolve24, ms));
 }
 function describeError(error) {
   return error instanceof Error ? error.message : String(error);
@@ -9711,7 +9711,7 @@ function spawnDaemon(reason4) {
   child.unref();
 }
 function delay(ms) {
-  return new Promise((resolve23) => setTimeout(resolve23, ms));
+  return new Promise((resolve24) => setTimeout(resolve24, ms));
 }
 
 // src/commands/sessions/daemon/isWindowsCwd.ts
@@ -9752,10 +9752,10 @@ function gitInvocation(cwd, args) {
 }
 function git2(cwd, args) {
   const { file, argv, options: options2 } = gitInvocation(cwd, args);
-  return new Promise((resolve23, reject) => {
+  return new Promise((resolve24, reject) => {
     execFile2(file, argv, options2, (error, stdout) => {
       if (error) reject(error);
-      else resolve23(stdout.toString());
+      else resolve24(stdout.toString());
     });
   });
 }
@@ -10167,12 +10167,12 @@ async function loadVisibleItems(req) {
 
 // src/commands/backlog/web/parseStatusBody.ts
 function readBody(req) {
-  return new Promise((resolve23, reject) => {
+  return new Promise((resolve24, reject) => {
     let body = "";
     req.on("data", (chunk) => {
       body += chunk.toString();
     });
-    req.on("end", () => resolve23(body));
+    req.on("end", () => resolve24(body));
     req.on("error", reject);
   });
 }
@@ -11817,17 +11817,17 @@ async function stopDaemon() {
   }
 }
 function closedBeforeTimeout(socket) {
-  return new Promise((resolve23) => {
+  return new Promise((resolve24) => {
     const timer = setTimeout(() => {
       socket.destroy();
-      resolve23(false);
+      resolve24(false);
     }, STOP_TIMEOUT_MS);
     socket.resume();
     socket.on("error", () => {
     });
     socket.once("close", () => {
       clearTimeout(timer);
-      resolve23(true);
+      resolve24(true);
     });
   });
 }
@@ -11878,8 +11878,8 @@ async function restartWeb(req, res, deps2 = {}) {
     respondJson(res, 400, { error: "Invalid target" });
     return;
   }
-  await new Promise((resolve23) => {
-    res.once("finish", resolve23);
+  await new Promise((resolve24) => {
+    res.once("finish", resolve24);
     respondJson(res, 200, { ok: true });
   });
   if (target === "daemon" || target === "both") {
@@ -14085,7 +14085,7 @@ function parsePreviewDecision(line, requestId) {
 
 // src/commands/sessions/shared/requestPreviewDecision.ts
 function requestPreviewDecision(request) {
-  return new Promise((resolve23, reject) => {
+  return new Promise((resolve24, reject) => {
     connectToDaemon().then((socket) => {
       let settled = false;
       const finish = (error, decision) => {
@@ -14093,7 +14093,7 @@ function requestPreviewDecision(request) {
         settled = true;
         socket.destroy();
         if (error) reject(error);
-        else resolve23(decision);
+        else resolve24(decision);
       };
       readSocketLines(socket, (line) => {
         const incoming = parsePreviewDecision(line, request.requestId);
@@ -16924,12 +16924,12 @@ function hasSubcommands(helpText) {
 // src/commands/permitCliReads/runHelp.ts
 import { exec as exec2 } from "child_process";
 function runHelp(args) {
-  return new Promise((resolve23) => {
+  return new Promise((resolve24) => {
     exec2(
       `${args.join(" ")} --help`,
       { encoding: "utf8", timeout: 3e4 },
       (_err, stdout, stderr) => {
-        resolve23(stdout || stderr || "");
+        resolve24(stdout || stderr || "");
       }
     );
   });
@@ -20656,6 +20656,17 @@ function recentDaemonLogLines() {
   return [...ring];
 }
 
+// src/commands/sessions/daemon/worktree/canonicalTreePath.ts
+import { realpathSync as realpathSync2 } from "fs";
+import { resolve as resolve14 } from "path";
+function canonicalTreePath(path73) {
+  try {
+    return realpathSync2(path73);
+  } catch {
+    return resolve14(path73);
+  }
+}
+
 // src/commands/sessions/daemon/worktree/createWorktree.ts
 import { existsSync as existsSync45 } from "fs";
 import { basename as basename14, dirname as dirname25 } from "path";
@@ -20723,6 +20734,12 @@ function createWorktree(clone, strategy, boundTreeRoots2, preferredPath) {
   return path73;
 }
 
+// src/commands/sessions/daemon/worktree/keptInTree.ts
+function keptInTree(cwd, reason4) {
+  daemonLog(`session kept in ${cwd}: ${reason4}`);
+  return { cwd, kind: "primary", created: false };
+}
+
 // src/commands/sessions/daemon/worktree/treeDurability.ts
 import { existsSync as existsSync46 } from "fs";
 var treeIsGone = { durable: true, gone: true };
@@ -20777,8 +20794,22 @@ function reusesClone(clone, boundTreeRoots2, options2) {
     );
     return true;
   }
-  if (planAllocation(clone, boundTreeRoots2) !== "primary") return false;
-  return !wouldDisturbWorkInProgress(clone, options2.forCheckout === true);
+  if (planAllocation(clone, boundTreeRoots2) !== "primary") {
+    daemonLog(
+      `clone ${clone} is held by a live session \u2014 spilling to a worktree`
+    );
+    return false;
+  }
+  if (wouldDisturbWorkInProgress(clone, options2.forCheckout === true))
+    return false;
+  daemonLog(
+    `session kept in the clone ${clone}: no live session holds it${describeHolders(boundTreeRoots2)}`
+  );
+  return true;
+}
+function describeHolders(boundTreeRoots2) {
+  if (boundTreeRoots2.size === 0) return " and no tree is bound";
+  return ` (bound trees: ${[...boundTreeRoots2].join(", ")})`;
 }
 function wouldDisturbWorkInProgress(clone, forCheckout) {
   if (!forCheckout) return false;
@@ -20821,12 +20852,21 @@ function forcedSpillReason(clone, trunk, options2) {
 function allocateTree(requestedCwd, boundTreeRoots2, options2 = {}) {
   if (!requestedCwd)
     return { cwd: requestedCwd, kind: "primary", created: false };
-  if (options2.inPlace === true) return keptInPlace(requestedCwd);
-  const repoRoot2 = findRepoRoot(requestedCwd) ?? requestedCwd;
+  if (options2.inPlace === true)
+    return keptInTree(
+      requestedCwd,
+      "launched against work already checked out there"
+    );
+  const repoRoot2 = canonicalTreePath(
+    findRepoRoot(requestedCwd) ?? requestedCwd
+  );
   const cfg = worktreeConfigFor(repoRoot2);
   if (!cfg.enabled)
-    return { cwd: requestedCwd, kind: "primary", created: false };
-  const clone = mainWorktree(repoRoot2) ?? repoRoot2;
+    return keptInTree(
+      requestedCwd,
+      `worktree.enabled is off for ${repoRoot2}, so every session shares this tree`
+    );
+  const clone = canonicalTreePath(mainWorktree(repoRoot2) ?? repoRoot2);
   const reuse = { ...options2, includeDrafts: cfg.includeDrafts };
   const forcedSpill = forcedSpillReason(clone, cfg.trunk, options2);
   if (forcedSpill) daemonLog(forcedSpill);
@@ -20840,12 +20880,6 @@ function allocateTree(requestedCwd, boundTreeRoots2, options2 = {}) {
   );
   return { cwd: path73, kind: "worktree", created: true, clone };
 }
-function keptInPlace(cwd) {
-  daemonLog(
-    `session kept in ${cwd}: launched against work already checked out there`
-  );
-  return { cwd, kind: "primary", created: false };
-}
 
 // src/commands/sessions/daemon/describePersistedSession.ts
 function describePersistedSession(entry) {
@@ -21132,7 +21166,7 @@ function placedByDaemon() {
 function seed(worktreePath, clone) {
   console.log(`Preparing ${worktreePath}\u2026`);
   return new Promise(
-    (resolve23) => seedWorktree(worktreePath, clone, resolve23)
+    (resolve24) => seedWorktree(worktreePath, clone, resolve24)
   );
 }
 async function moveToPrCheckoutTree() {
@@ -21339,12 +21373,12 @@ function registerList(program2) {
 
 // src/commands/mermaid/index.ts
 import { mkdirSync as mkdirSync17, readdirSync as readdirSync9 } from "fs";
-import { resolve as resolve15 } from "path";
+import { resolve as resolve16 } from "path";
 import chalk166 from "chalk";
 
 // src/commands/mermaid/exportFile.ts
 import { readFileSync as readFileSync38, writeFileSync as writeFileSync31 } from "fs";
-import { basename as basename15, extname as extname2, resolve as resolve14 } from "path";
+import { basename as basename15, extname as extname2, resolve as resolve15 } from "path";
 import chalk165 from "chalk";
 
 // src/commands/mermaid/renderBlock.ts
@@ -21392,7 +21426,7 @@ async function exportFile(file, outDir, krokiUrl, onlyIndex) {
   for (const [i, source] of blocks.entries()) {
     const idx = i + 1;
     if (onlyIndex !== void 0 && idx !== onlyIndex) continue;
-    const outPath = resolve14(outDir, `${stem}-${idx}.svg`);
+    const outPath = resolve15(outDir, `${stem}-${idx}.svg`);
     const svg = await renderBlock(krokiUrl, source);
     writeFileSync31(outPath, svg, "utf8");
     console.log(chalk165.green(`  \u2192 ${outPath}`));
@@ -21406,7 +21440,7 @@ function extractMermaidBlocks(markdown) {
 // src/commands/mermaid/index.ts
 async function mermaidExport(file, options2 = {}) {
   const { mermaid } = loadConfig();
-  const outDir = resolve15(process.cwd(), options2.out ?? ".");
+  const outDir = resolve16(process.cwd(), options2.out ?? ".");
   mkdirSync17(outDir, { recursive: true });
   if (options2.index !== void 0) {
     if (!Number.isInteger(options2.index) || options2.index < 1) {
@@ -21590,7 +21624,7 @@ async function prepareExtensionForLoad(port, filter = "") {
 }
 
 // src/commands/netcap/resolveNetcapOutPath.ts
-import { isAbsolute as isAbsolute3, join as join54, resolve as resolve16 } from "path";
+import { isAbsolute as isAbsolute3, join as join54, resolve as resolve17 } from "path";
 
 // src/commands/netcap/defaultCapturePath.ts
 import { homedir as homedir19 } from "os";
@@ -21602,7 +21636,7 @@ function defaultCapturePath() {
 // src/commands/netcap/resolveNetcapOutPath.ts
 function resolveNetcapOutPath(out) {
   if (!out) return defaultCapturePath();
-  const dir = isAbsolute3(out) ? out : resolve16(process.cwd(), out);
+  const dir = isAbsolute3(out) ? out : resolve17(process.cwd(), out);
   return join54(dir, "capture.jsonl");
 }
 
@@ -21693,25 +21727,25 @@ function isVisibleText(t) {
   return /[a-zA-Z]{3,}/.test(t);
 }
 var isHashtag = (t) => /^#[A-Za-z0-9_]+$/.test(t);
-function collectRscText(v, resolve23, sink2, seen) {
+function collectRscText(v, resolve24, sink2, seen) {
   if (v == null) return;
   if (typeof v === "string") {
     if (isRscRef(v)) {
       if (!seen.has(v)) {
         seen.add(v);
-        collectRscText(resolve23(v), resolve23, sink2, seen);
+        collectRscText(resolve24(v), resolve24, 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, resolve23, sink2, seen);
+    for (const x of v) collectRscText(x, resolve24, sink2, seen);
     return;
   }
   if (typeof v === "object") {
     for (const val of Object.values(v)) {
-      collectRscText(val, resolve23, sink2, seen);
+      collectRscText(val, resolve24, sink2, seen);
     }
   }
 }
@@ -21743,7 +21777,7 @@ function visitObjects(root, fn) {
     }
   }
 }
-function buildMentionMap(rows, resolve23) {
+function buildMentionMap(rows, resolve24) {
   const map = /* @__PURE__ */ new Map();
   visitObjects(rows, (o) => {
     const url = profileActionUrl(o);
@@ -21751,7 +21785,7 @@ function buildMentionMap(rows, resolve23) {
     const slug = slugFromProfileUrl(url);
     if (!slug || map.has(slug)) return;
     const sink2 = { text: [], hashtags: [] };
-    collectRscText(o.children, resolve23, sink2, /* @__PURE__ */ new Set());
+    collectRscText(o.children, resolve24, sink2, /* @__PURE__ */ new Set());
     const name = sink2.text.join(" ").replace(/\s+/g, " ").trim();
     map.set(slug, name ? { slug, name, url } : { slug, url });
   });
@@ -21837,10 +21871,10 @@ function buildPost(raw, mentionMap, author) {
 
 // src/commands/netcap/walkPostRow.ts
 var isCommentary = (o) => asObject(o.viewTrackingSpecs)?.viewName === "feed-commentary";
-function walkPostRow(v, resolve23, raw) {
+function walkPostRow(v, resolve24, raw) {
   if (v == null || typeof v !== "object") return;
   if (Array.isArray(v)) {
-    for (const x of v) walkPostRow(x, resolve23, raw);
+    for (const x of v) walkPostRow(x, resolve24, raw);
     return;
   }
   const o = v;
@@ -21854,9 +21888,9 @@ function walkPostRow(v, resolve23, raw) {
   }
   if (isCommentary(o)) {
     const sink2 = { text: raw.text, hashtags: raw.hashtags };
-    collectRscText(o.children, resolve23, sink2, /* @__PURE__ */ new Set());
+    collectRscText(o.children, resolve24, sink2, /* @__PURE__ */ new Set());
   }
-  for (const val of Object.values(o)) walkPostRow(val, resolve23, raw);
+  for (const val of Object.values(o)) walkPostRow(val, resolve24, raw);
 }
 
 // src/commands/netcap/extractLinkedInPosts.ts
@@ -21870,8 +21904,8 @@ function findCommentaryRows(rows) {
 }
 function extractLinkedInPosts(flight, author = findAuthorSlug(flight)) {
   const rows = parseRscRows(flight);
-  const resolve23 = makeRscResolver(rows);
-  const mentionMap = buildMentionMap(rows, resolve23);
+  const resolve24 = makeRscResolver(rows);
+  const mentionMap = buildMentionMap(rows, resolve24);
   const posts = [];
   for (const id of findCommentaryRows(rows)) {
     const raw = {
@@ -21881,7 +21915,7 @@ function extractLinkedInPosts(flight, author = findAuthorSlug(flight)) {
       links: [],
       related: []
     };
-    walkPostRow(rows[id], resolve23, raw);
+    walkPostRow(rows[id], resolve24, raw);
     const post = buildPost(raw, mentionMap, author);
     if (post) posts.push(post);
   }
@@ -23324,7 +23358,7 @@ function parseIncoming(line, type) {
   }
 }
 function requestSession(message3) {
-  return new Promise((resolve23, reject) => {
+  return new Promise((resolve24, reject) => {
     connectToDaemon().then((socket) => {
       let settled = false;
       const finish = (error, sessionId) => {
@@ -23332,7 +23366,7 @@ function requestSession(message3) {
         settled = true;
         socket.destroy();
         if (error) reject(error);
-        else resolve23(sessionId);
+        else resolve24(sessionId);
       };
       readSocketLines(socket, (line) => {
         const incoming = parseIncoming(line, message3.type);
@@ -24377,7 +24411,7 @@ function getViolations(pattern2, options2 = {}, maxLines = DEFAULT_MAX_LINES) {
 
 // src/commands/refactor/check/index.ts
 function runScript(script, cwd) {
-  return new Promise((resolve23) => {
+  return new Promise((resolve24) => {
     const child = spawn6("npm", ["run", script], {
       stdio: "pipe",
       shell: true,
@@ -24391,7 +24425,7 @@ function runScript(script, cwd) {
       output += data.toString();
     });
     child.on("close", (code) => {
-      resolve23({ script, code: code ?? 1, output });
+      resolve24({ script, code: code ?? 1, output });
     });
   });
 }
@@ -27329,12 +27363,12 @@ function onCloseResult(ctx, code) {
   return { ...closed, stderr: ctx.stderr.value, stdout: ctx.stdout.value };
 }
 function waitForChildExit(ctx) {
-  return new Promise((resolve23) => {
+  return new Promise((resolve24) => {
     let settled = false;
     const settle = (result) => {
       if (settled) return;
       settled = true;
-      resolve23(result);
+      resolve24(result);
     };
     ctx.child.on("error", (err) => settle(onErrorResult(ctx, err)));
     ctx.child.on("close", (code) => settle(onCloseResult(ctx, code)));
@@ -28850,9 +28884,9 @@ function createReadlineInterface() {
   });
 }
 function askQuestion(rl, question) {
-  return new Promise((resolve23) => {
+  return new Promise((resolve24) => {
     rl.question(question, (answer) => {
-      resolve23(answer.trim());
+      resolve24(answer.trim());
     });
   });
 }
@@ -29858,7 +29892,7 @@ function resolveParams(params, cliArgs) {
 
 // src/commands/run/resolveRunCwd.ts
 import { existsSync as existsSync63 } from "fs";
-import { resolve as resolve17 } from "path";
+import { resolve as resolve18 } from "path";
 var MissingRunCwdError = class extends Error {
   constructor(runName, cwd) {
     super(`run config "${runName}": cwd ${cwd} does not exist`);
@@ -29869,7 +29903,7 @@ var MissingRunCwdError = class extends Error {
 };
 function resolveRunCwd(config, baseDir = runConfigBaseDir()) {
   if (!config.cwd) return void 0;
-  const cwd = resolve17(baseDir, config.cwd);
+  const cwd = resolve18(baseDir, config.cwd);
   if (!existsSync63(cwd)) throw new MissingRunCwdError(config.name, cwd);
   return cwd;
 }
@@ -29881,12 +29915,12 @@ import { existsSync as existsSync65 } from "fs";
 // src/commands/run/resolveCommand.ts
 import { execFileSync as execFileSync11 } from "child_process";
 import { existsSync as existsSync64 } from "fs";
-import { dirname as dirname35, join as join79, resolve as resolve18 } from "path";
+import { dirname as dirname35, join as join79, resolve as resolve19 } from "path";
 function resolveCommand2(command) {
   if (process.platform !== "win32" || command !== "bash") return command;
   try {
     const gitPath = execFileSync11("where", ["git"], { encoding: "utf8" }).trim().split("\r\n")[0];
-    const gitRoot = resolve18(dirname35(gitPath), "..");
+    const gitRoot = resolve19(dirname35(gitPath), "..");
     const gitBash = join79(gitRoot, "bin", "bash.exe");
     if (existsSync64(gitBash)) return gitBash;
   } catch {
@@ -30017,7 +30051,7 @@ function readMovement(cwd) {
 // src/commands/watch/pollForMovement.ts
 function pollForMovement(options2) {
   const { upstream, intervalMs, timeoutMs, timeout, cwd } = options2;
-  return new Promise((resolve23) => {
+  return new Promise((resolve24) => {
     let settled = false;
     const finish = (outcome) => {
       if (settled) return;
@@ -30025,7 +30059,7 @@ function pollForMovement(options2) {
       clearInterval(ticker);
       clearTimeout(deadline);
       process.off("SIGINT", onInterrupt);
-      resolve23(outcome);
+      resolve24(outcome);
     };
     const onInterrupt = () => finish({ kind: "interrupted" });
     const ticker = setInterval(() => {
@@ -30149,7 +30183,7 @@ function extractCode(url, expectedState) {
   return code;
 }
 function waitForCallback(port, expectedState) {
-  return new Promise((resolve23, reject) => {
+  return new Promise((resolve24, reject) => {
     const timeout = setTimeout(() => {
       server.close();
       reject(new Error("Authorization timed out after 120 seconds"));
@@ -30166,7 +30200,7 @@ function waitForCallback(port, expectedState) {
         const code = extractCode(url, expectedState);
         respondHtml(res, 200, "Authorization successful!");
         server.close();
-        resolve23(code);
+        resolve24(code);
       } catch (error) {
         respondHtml(res, 400, error.message);
         server.close();
@@ -30631,7 +30665,7 @@ function registerRun(program2) {
 import { execSync as execSync60 } from "child_process";
 import { existsSync as existsSync67, mkdirSync as mkdirSync30, unlinkSync as unlinkSync22, writeFileSync as writeFileSync45 } from "fs";
 import { tmpdir as tmpdir8 } from "os";
-import { join as join83, resolve as resolve19 } from "path";
+import { join as join83, resolve as resolve20 } from "path";
 import chalk215 from "chalk";
 
 // src/commands/screenshot/captureWindowPs1.ts
@@ -30765,7 +30799,7 @@ function buildOutputPath(outputDir, processName) {
     mkdirSync30(outputDir, { recursive: true });
   }
   const timestamp6 = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  return resolve19(outputDir, `${processName}-${timestamp6}.png`);
+  return resolve20(outputDir, `${processName}-${timestamp6}.png`);
 }
 function runPowerShellScript(processName, outputPath) {
   const scriptPath = join83(tmpdir8(), `assist-screenshot-${Date.now()}.ps1`);
@@ -30781,7 +30815,7 @@ function runPowerShellScript(processName, outputPath) {
 }
 function screenshot(processName) {
   const config = loadConfig();
-  const outputDir = resolve19(config.screenshot.outputDir);
+  const outputDir = resolve20(config.screenshot.outputDir);
   const outputPath = buildOutputPath(outputDir, processName);
   console.log(chalk215.gray(`Capturing window for process "${processName}" ...`));
   try {
@@ -30814,10 +30848,10 @@ var STATUS_TIMEOUT_MS = 5e3;
 function queryDaemon(socket) {
   socket.write(`${JSON.stringify({ type: "ping" })}
 `);
-  return new Promise((resolve23) => {
+  return new Promise((resolve24) => {
     const result = { sessions: [] };
     const pending = /* @__PURE__ */ new Set(["sessions", "pong"]);
-    const timer = setTimeout(() => resolve23(result), STATUS_TIMEOUT_MS);
+    const timer = setTimeout(() => resolve24(result), STATUS_TIMEOUT_MS);
     const lines2 = createInterface5({ input: socket });
     lines2.on("error", () => {
     });
@@ -30825,7 +30859,7 @@ function queryDaemon(socket) {
       applyLine(result, pending, line);
       if (pending.size === 0) {
         clearTimeout(timer);
-        resolve23(result);
+        resolve24(result);
       }
     });
   });
@@ -30911,11 +30945,11 @@ function clearPersistedSessionsOnDrain() {
 
 // src/commands/sessions/daemon/readDaemonMessage.ts
 function readDaemonMessage(lines2, timeoutMs, fallback, match) {
-  return new Promise((resolve23) => {
+  return new Promise((resolve24) => {
     const finish = (value) => {
       clearTimeout(timer);
       lines2.off("line", onLine);
-      resolve23(value);
+      resolve24(value);
     };
     const timer = setTimeout(() => finish(fallback), timeoutMs);
     const onLine = (line) => {
@@ -32219,7 +32253,7 @@ function emitSessionOutput(session, clients, data) {
 
 // src/commands/sessions/daemon/exitReason.ts
 import { existsSync as existsSync74 } from "fs";
-import { resolve as resolve20 } from "path";
+import { resolve as resolve21 } from "path";
 function exitDetail(session) {
   if (session.cwd && !existsSync74(session.cwd))
     return `working directory ${session.cwd} no longer exists`;
@@ -32234,7 +32268,7 @@ function missingRunConfigCwd(session) {
   const dir = session.cwd ?? process.cwd();
   const config = resolveRunConfig(session.runName, dir);
   if (!config?.cwd) return void 0;
-  const configured = resolve20(runConfigBaseDirFrom(dir), config.cwd);
+  const configured = resolve21(runConfigBaseDirFrom(dir), config.cwd);
   if (existsSync74(configured)) return void 0;
   return `run config "${config.name}": cwd ${configured} does not exist`;
 }
@@ -34249,7 +34283,7 @@ function boundTreeRoots(sessions, exclude) {
 }
 function treeRootOf(session) {
   if (!session.cwd) return void 0;
-  return findRepoRoot(session.cwd) ?? session.cwd;
+  return canonicalTreePath(findRepoRoot(session.cwd) ?? session.cwd);
 }
 function holdsTree(session, root) {
   if (session.closing) return true;
@@ -34285,7 +34319,7 @@ function ensureWatcher(ctx, cwd) {
   const repoRoot2 = findRepoRoot(cwd) ?? cwd;
   const cfg = worktreeConfigFor(repoRoot2);
   if (!cfg.enabled || cfg.watcher !== true) return void 0;
-  const clone = mainWorktree(repoRoot2) ?? repoRoot2;
+  const clone = canonicalTreePath(mainWorktree(repoRoot2) ?? repoRoot2);
   const live = liveWatcherFor(ctx.sessions, clone);
   if (live) {
     daemonLog(
@@ -34306,7 +34340,7 @@ function ensureWatcher(ctx, cwd) {
 }
 function liveWatcherFor(sessions, clone) {
   for (const session of sessions.values())
-    if (session.watcher === true && session.cwd === clone && session.status !== "stopped" && session.status !== "error")
+    if (session.watcher === true && session.cwd !== void 0 && canonicalTreePath(session.cwd) === clone && session.status !== "stopped" && session.status !== "error")
       return session;
   return void 0;
 }
@@ -34532,7 +34566,7 @@ function windowsDaemonHost() {
 var CONNECT_TIMEOUT_MS = 2e3;
 var KEEPALIVE_PROBE_MS = 1e4;
 function connectToWindowsDaemon() {
-  return new Promise((resolve23, reject) => {
+  return new Promise((resolve24, reject) => {
     const socket = net2.connect(windowsDaemonPort(), windowsDaemonHost());
     socket.setTimeout(CONNECT_TIMEOUT_MS);
     socket.once("timeout", () => {
@@ -34542,7 +34576,7 @@ function connectToWindowsDaemon() {
     socket.once("connect", () => {
       socket.setTimeout(0);
       socket.setKeepAlive(true, KEEPALIVE_PROBE_MS);
-      resolve23(socket);
+      resolve24(socket);
     });
     socket.once("error", reject);
   });
@@ -34620,7 +34654,7 @@ async function waitForWindowsDaemon() {
   );
 }
 function delay2(ms) {
-  return new Promise((resolve23) => setTimeout(resolve23, ms));
+  return new Promise((resolve24) => setTimeout(resolve24, ms));
 }
 
 // src/commands/sessions/daemon/defaultConnect.ts
@@ -34904,7 +34938,7 @@ async function healWindowsDaemon() {
   daemonLog("windows daemon: auto-heal: stale daemon stopped");
 }
 function runOnWindowsHost(command, timeoutMs) {
-  return new Promise((resolve23, reject) => {
+  return new Promise((resolve24, reject) => {
     const child = spawn12("pwsh.exe", ["-Command", command], {
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -34924,7 +34958,7 @@ function runOnWindowsHost(command, timeoutMs) {
     });
     child.on("exit", (code) => {
       clearTimeout(timer);
-      if (code === 0) resolve23();
+      if (code === 0) resolve24();
       else
         reject(
           new Error(
@@ -36259,7 +36293,7 @@ function buildLimitsSegment(rateLimits) {
 
 // src/commands/readGitBranch.ts
 import { readFileSync as readFileSync58, statSync as statSync14 } from "fs";
-import { isAbsolute as isAbsolute4, join as join89, resolve as resolve21 } from "path";
+import { isAbsolute as isAbsolute4, join as join89, resolve as resolve22 } from "path";
 function resolveGitDir(cwd) {
   const dotGit = join89(cwd, ".git");
   let stat4;
@@ -36282,7 +36316,7 @@ function resolveGitDir(cwd) {
     return null;
   }
   const gitDir = match[1].trim();
-  return isAbsolute4(gitDir) ? gitDir : resolve21(cwd, gitDir);
+  return isAbsolute4(gitDir) ? gitDir : resolve22(cwd, gitDir);
 }
 function readGitBranch(cwd) {
   const gitDir = resolveGitDir(cwd);