@staff0rd/assist 0.486.1 → 0.487.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.486.1",
+  version: "0.487.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -6829,7 +6829,6 @@ function consumePause(itemId2) {
 }
 
 // src/commands/backlog/executePhase.ts
-import { randomUUID } from "crypto";
 import chalk44 from "chalk";
 
 // src/shared/awaitClaude.ts
@@ -7000,6 +6999,13 @@ function logHookFired(status3, sessionId, source) {
   );
 }
 
+// src/commands/backlog/assertCodexResumeSupported.ts
+function assertCodexResumeSupported(options2) {
+  if (options2?.resumeSessionId && options2.harness === "codex") {
+    throw new Error("Codex backlog sessions cannot be resumed yet");
+  }
+}
+
 // src/commands/backlog/buildCommentLines.ts
 function buildCommentLines(comments3) {
   if (!comments3?.length) return [];
@@ -7142,6 +7148,101 @@ function buildPhasePrompt(item, phaseNumber, phase) {
   });
 }
 
+// src/shared/harnesses.ts
+import * as os from "os";
+import * as path22 from "path";
+
+// src/shared/checkCliAvailable.ts
+import { execSync as execSync30 } from "child_process";
+function checkCliAvailable(cli) {
+  const binary = cli.split(/\s+/)[0];
+  const opts = {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"]
+  };
+  try {
+    execSync30(`command -v ${binary}`, opts);
+    return true;
+  } catch {
+    try {
+      execSync30(`where ${binary}`, opts);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+}
+
+// src/shared/harnesses.ts
+var harnesses = {
+  claude: {
+    kind: "claude",
+    command: "claude",
+    homeDir: path22.join(os.homedir(), ".claude"),
+    sync: {
+      agentsFile: "CLAUDE.md",
+      commandDest: (name) => path22.join("commands", `${name}.md`)
+    }
+  },
+  codex: {
+    kind: "codex",
+    command: "codex",
+    homeDir: path22.join(os.homedir(), ".codex"),
+    sync: {
+      agentsFile: "AGENTS.md",
+      commandDest: (name) => path22.join("skills", name, "SKILL.md")
+    }
+  },
+  pi: {
+    kind: "pi",
+    command: "pi",
+    homeDir: path22.join(os.homedir(), ".pi", "agent"),
+    sync: {
+      agentsFile: "AGENTS.md",
+      commandDest: (name) => path22.join("prompts", `${name}.md`)
+    }
+  }
+};
+function isHarnessAvailable(kind) {
+  return checkCliAvailable(harnesses[kind].command);
+}
+
+// src/shared/spawnCodex.ts
+function spawnCodex(prompt, options2 = {}) {
+  const cwd = options2.cwd ?? process.cwd();
+  return spawnInherit(harnesses.codex.command, [
+    "-C",
+    cwd,
+    "--sandbox",
+    options2.sandbox ?? "workspace-write",
+    prompt
+  ]);
+}
+
+// src/shared/spawnPi.ts
+function spawnPi(prompt, options2 = {}) {
+  const cwd = options2.cwd ?? process.cwd();
+  return spawnInherit(harnesses.pi.command, [prompt], { cwd });
+}
+
+// src/shared/spawnHarness.ts
+function spawnHarness(harness, prompt, options2 = {}) {
+  if (harness === "codex") {
+    return spawnCodex(prompt, {
+      cwd: options2.cwd,
+      sandbox: options2.allowEdits === false ? "read-only" : "workspace-write"
+    });
+  }
+  if (harness === "pi") {
+    return spawnPi(prompt, { cwd: options2.cwd });
+  }
+  return spawnClaude(prompt, {
+    allowEdits: options2.allowEdits ?? true,
+    sessionId: options2.sessionId,
+    resumeSessionId: options2.resumeSessionId
+  });
+}
+
 // src/commands/backlog/watchForMarker.ts
 import { existsSync as existsSync24, unwatchFile, watchFile } from "fs";
 
@@ -7150,8 +7251,8 @@ import { existsSync as existsSync23, readFileSync as readFileSync17 } from "fs";
 
 // src/commands/backlog/writeSignal.ts
 import { mkdirSync as mkdirSync8, writeFileSync as writeFileSync18 } from "fs";
-import { homedir as homedir8 } from "os";
-import { dirname as dirname16, join as join20 } from "path";
+import { homedir as homedir9 } from "os";
+import { dirname as dirname16, join as join21 } from "path";
 import chalk41 from "chalk";
 
 // src/commands/backlog/recordSignalOwner.ts
@@ -7162,10 +7263,10 @@ import {
   rmSync,
   writeFileSync as writeFileSync17
 } from "fs";
-import { homedir as homedir7 } from "os";
-import { dirname as dirname15, join as join19 } from "path";
+import { homedir as homedir8 } from "os";
+import { dirname as dirname15, join as join20 } from "path";
 function getOwnerPath(itemId2) {
-  return join19(homedir7(), ".assist", "signals", `owner-${itemId2}.json`);
+  return join20(homedir8(), ".assist", "signals", `owner-${itemId2}.json`);
 }
 function recordSignalOwner(itemId2) {
   const sessionId = process.env.ASSIST_SESSION_ID;
@@ -7195,7 +7296,7 @@ function clearSignalOwner(itemId2) {
 // src/commands/backlog/writeSignal.ts
 function getSignalPath(sessionId = process.env.ASSIST_SESSION_ID) {
   if (!sessionId) return void 0;
-  return join20(homedir8(), ".assist", "signals", `signal-${sessionId}.json`);
+  return join21(homedir9(), ".assist", "signals", `signal-${sessionId}.json`);
 }
 function resolveSignalTarget(event, data) {
   const caller = process.env.ASSIST_SESSION_ID;
@@ -7264,8 +7365,11 @@ function stopWatching() {
 }
 
 // src/commands/backlog/launchPhaseClaude.ts
-async function launchPhaseClaude(prompt, spawnOptions, context) {
-  const { child, done: done2 } = spawnClaude(prompt, spawnOptions);
+async function launchPhaseClaude(prompt, spawnOptions, context, harness = "claude") {
+  const { child, done: done2 } = spawnHarness(harness, prompt, {
+    ...spawnOptions,
+    cwd: process.cwd()
+  });
   watchForMarker(child);
   const exitCode = await awaitClaude(done2, context);
   stopWatching();
@@ -7284,16 +7388,77 @@ function resumeNudge() {
 
 // src/commands/backlog/launchPhaseSession.ts
 function launchPhaseSession(item, phaseNumber, phase, phaseLabel2, claudeSessionId, spawnOptions) {
-  const resumeSessionId = spawnOptions?.resumeSessionId;
+  const harness = spawnOptions?.harness;
+  const { harness: _harness, ...phaseOptions } = spawnOptions ?? {};
+  const resumeSessionId = phaseOptions.resumeSessionId;
   return launchPhaseClaude(
     resumeSessionId ? resumeNudge() : buildPhasePrompt(item, phaseNumber, phase),
-    resumeSessionId ? spawnOptions ?? {} : { ...spawnOptions, sessionId: claudeSessionId },
-    phaseLabel2
+    resumeSessionId ? phaseOptions : { ...phaseOptions, sessionId: claudeSessionId },
+    phaseLabel2,
+    harness
+  );
+}
+
+// src/commands/backlog/resolvePhaseResult.ts
+import { existsSync as existsSync25, unlinkSync as unlinkSync4 } from "fs";
+import chalk42 from "chalk";
+
+// src/commands/backlog/handleIncompletePhase.ts
+import enquirer4 from "enquirer";
+async function handleIncompletePhase() {
+  const { action } = await exitOnCancel(
+    enquirer4.prompt({
+      type: "select",
+      name: "action",
+      message: "Phase was not marked complete. What would you like to do?",
+      choices: ["Retry this phase", "Skip to next phase", "Abort"]
+    })
   );
+  if (action === "Retry this phase") return "retry";
+  if (action === "Skip to next phase") return "skip";
+  return "abort";
+}
+
+// src/commands/backlog/resolvePhaseResult.ts
+function cleanupSignal() {
+  const statusPath = getSignalPath();
+  if (statusPath && existsSync25(statusPath)) {
+    unlinkSync4(statusPath);
+  }
+}
+async function isTerminalStatus(itemId2) {
+  const { orm } = await getReady();
+  const item = await loadItem(orm, itemId2);
+  return item?.status === "done" || item?.status === "wontdo";
+}
+async function resolvePhaseResult(phaseIndex, itemId2) {
+  const signalPath = getSignalPath();
+  if (!signalPath || !existsSync25(signalPath)) {
+    if (await isTerminalStatus(itemId2)) return { kind: "abort" };
+    const action = await handleIncompletePhase();
+    if (action === "abort") return { kind: "abort" };
+    return action === "skip" ? { kind: "skip" } : { kind: "retry" };
+  }
+  const signal = readSignal();
+  cleanupSignal();
+  if (signal?.event === "rewind") {
+    const targetPhase = signal.targetPhase;
+    const targetPhaseNumber = targetPhase + 1;
+    console.log(chalk42.yellow(`
+Rewinding to phase ${targetPhaseNumber}.`));
+    return { kind: "rewind", targetPhase };
+  }
+  const phaseNumber = phaseIndex + 1;
+  console.log(chalk42.green(`
+Phase ${phaseNumber} completed.`));
+  return { kind: "advance" };
 }
 
+// src/commands/backlog/preparePhaseSession.ts
+import { randomUUID } from "crypto";
+
 // src/commands/backlog/persistPhaseSession.ts
-import os from "os";
+import os2 from "os";
 
 // src/shared/db/recordPhaseSession.ts
 import { sql as sql12 } from "drizzle-orm";
@@ -7318,8 +7483,8 @@ async function persistPhaseSession(itemId2, phaseIdx, claudeSessionId) {
       itemId2,
       phaseIdx,
       claudeSessionId,
-      os.hostname(),
-      os.userInfo().username
+      os2.hostname(),
+      os2.userInfo().username
     );
   } catch (error) {
     console.error(
@@ -7348,8 +7513,8 @@ async function persistPhaseSessionId(itemId2, phaseIdx, claudeSessionId) {
 
 // src/shared/emitActivity.ts
 import { mkdirSync as mkdirSync9, readFileSync as readFileSync18, rmSync as rmSync2, writeFileSync as writeFileSync19 } from "fs";
-import { homedir as homedir9 } from "os";
-import { dirname as dirname17, join as join21 } from "path";
+import { homedir as homedir10 } from "os";
+import { dirname as dirname17, join as join22 } from "path";
 import { z as z4 } from "zod";
 var activitySchema = z4.object({
   kind: z4.enum(["command", "backlog"]),
@@ -7364,7 +7529,7 @@ var activitySchema = z4.object({
   startedAt: z4.number()
 });
 function activityPath(sessionId) {
-  return join21(homedir9(), ".assist", "activity", `activity-${sessionId}.json`);
+  return join22(homedir10(), ".assist", "activity", `activity-${sessionId}.json`);
 }
 function emitActivity(activity2) {
   const sessionId = process.env.ASSIST_ACTIVITY_ID;
@@ -7410,75 +7575,20 @@ function reportPhaseActivity(item, phaseNumber, totalPhases, phase, claudeSessio
   });
 }
 
-// src/commands/backlog/resolvePhaseResult.ts
-import { existsSync as existsSync25, unlinkSync as unlinkSync4 } from "fs";
-import chalk42 from "chalk";
-
-// src/commands/backlog/handleIncompletePhase.ts
-import enquirer4 from "enquirer";
-async function handleIncompletePhase() {
-  const { action } = await exitOnCancel(
-    enquirer4.prompt({
-      type: "select",
-      name: "action",
-      message: "Phase was not marked complete. What would you like to do?",
-      choices: ["Retry this phase", "Skip to next phase", "Abort"]
-    })
-  );
-  if (action === "Retry this phase") return "retry";
-  if (action === "Skip to next phase") return "skip";
-  return "abort";
-}
-
-// src/commands/backlog/resolvePhaseResult.ts
-function cleanupSignal() {
-  const statusPath = getSignalPath();
-  if (statusPath && existsSync25(statusPath)) {
-    unlinkSync4(statusPath);
-  }
-}
-async function isTerminalStatus(itemId2) {
-  const { orm } = await getReady();
-  const item = await loadItem(orm, itemId2);
-  return item?.status === "done" || item?.status === "wontdo";
-}
-async function resolvePhaseResult(phaseIndex, itemId2) {
-  const signalPath = getSignalPath();
-  if (!signalPath || !existsSync25(signalPath)) {
-    if (await isTerminalStatus(itemId2)) return { kind: "abort" };
-    const action = await handleIncompletePhase();
-    if (action === "abort") return { kind: "abort" };
-    return action === "skip" ? { kind: "skip" } : { kind: "retry" };
-  }
-  const signal = readSignal();
-  cleanupSignal();
-  if (signal?.event === "rewind") {
-    const targetPhase = signal.targetPhase;
-    const targetPhaseNumber = targetPhase + 1;
-    console.log(chalk42.yellow(`
-Rewinding to phase ${targetPhaseNumber}.`));
-    return { kind: "rewind", targetPhase };
-  }
-  const phaseNumber = phaseIndex + 1;
-  console.log(chalk42.green(`
-Phase ${phaseNumber} completed.`));
-  return { kind: "advance" };
-}
-
 // src/commands/backlog/verifyResumeConversation.ts
 import chalk43 from "chalk";
 
 // src/commands/sessions/shared/findSessionJsonlPath.ts
-import * as path24 from "path";
+import * as path25 from "path";
 
 // src/commands/sessions/shared/discoverSessions.ts
 import * as fs18 from "fs";
-import * as os2 from "os";
-import * as path23 from "path";
+import * as os3 from "os";
+import * as path24 from "path";
 
 // src/commands/sessions/shared/parseSessionFile.ts
 import * as fs17 from "fs";
-import * as path22 from "path";
+import * as path23 from "path";
 
 // src/commands/sessions/shared/deriveHistoryFields.ts
 var KNOWN = [
@@ -7602,10 +7712,10 @@ async function readHeadLines(handle) {
 }
 function deriveProject(cwd, filePath, origin) {
   if (!cwd) return dirNameToProject(filePath);
-  return origin === "windows" ? path22.win32.basename(cwd) : path22.basename(cwd);
+  return origin === "windows" ? path23.win32.basename(cwd) : path23.basename(cwd);
 }
 function dirNameToProject(filePath) {
-  const dirName = path22.basename(path22.dirname(filePath));
+  const dirName = path23.basename(path23.dirname(filePath));
   const parts = dirName.split("--");
   return parts[parts.length - 1].replace(/-/g, "/");
 }
@@ -7613,7 +7723,7 @@ function dirNameToProject(filePath) {
 // src/commands/sessions/shared/discoverSessions.ts
 function sessionRoots() {
   const roots = [
-    { dir: path23.join(os2.homedir(), ".claude", "projects"), origin: "wsl" }
+    { dir: path24.join(os3.homedir(), ".claude", "projects"), origin: "wsl" }
   ];
   const windowsRoot = loadConfig().sessions?.windowsProjectsRoot;
   if (windowsRoot) roots.push({ dir: windowsRoot, origin: "windows" });
@@ -7631,7 +7741,7 @@ async function discoverSessionJsonlPaths() {
       }
       await Promise.all(
         projectDirs.map(async (dirName) => {
-          const dirPath = path23.join(dir, dirName);
+          const dirPath = path24.join(dir, dirName);
           let entries;
           try {
             entries = await fs18.promises.readdir(dirPath);
@@ -7640,7 +7750,7 @@ async function discoverSessionJsonlPaths() {
           }
           for (const file of entries) {
             if (file.endsWith(".jsonl"))
-              results.push({ path: path23.join(dirPath, file), origin });
+              results.push({ path: path24.join(dirPath, file), origin });
           }
         })
       );
@@ -7670,7 +7780,7 @@ async function discoverSessions() {
 async function findSessionJsonlPath(sessionId) {
   const paths = await discoverSessionJsonlPaths();
   const direct = paths.find(
-    (p) => path24.basename(p.path, ".jsonl") === sessionId
+    (p) => path25.basename(p.path, ".jsonl") === sessionId
   );
   if (direct) return direct.path;
   for (const p of paths) {
@@ -7703,6 +7813,21 @@ async function verifyPhaseResume(itemId2, resumeSessionId, phaseLabel2) {
   return true;
 }
 
+// src/commands/backlog/preparePhaseSession.ts
+async function preparePhaseSession(item, phase, phaseIndex, phaseNumber, totalPhases, phaseLabel2, spawnOptions) {
+  const resumeSessionId = spawnOptions?.resumeSessionId;
+  const claudeSessionId = resumeSessionId ?? randomUUID();
+  if (resumeSessionId && !await verifyPhaseResume(item.id, resumeSessionId, phaseLabel2)) {
+    return void 0;
+  }
+  reportPhaseActivity(item, phaseNumber, totalPhases, phase, claudeSessionId);
+  if (!resumeSessionId) {
+    await persistPhaseSessionId(item.id, phaseIndex, claudeSessionId);
+  }
+  await persistPhaseSession(item.id, phaseIndex, claudeSessionId);
+  return { claudeSessionId };
+}
+
 // src/commands/backlog/executePhase.ts
 async function executePhase(item, phaseIndex, phases, spawnOptions, totalPhases = phases.length) {
   const phase = phases[phaseIndex];
@@ -7714,27 +7839,27 @@ async function executePhase(item, phaseIndex, phases, spawnOptions, totalPhases
 `
     )
   );
-  const resumeSessionId = spawnOptions?.resumeSessionId;
-  const claudeSessionId = resumeSessionId ?? randomUUID();
+  assertCodexResumeSupported(spawnOptions);
   process.env.ASSIST_SESSION_ID ??= String(process.pid);
   process.env.ASSIST_BACKLOG_ITEM_ID = String(item.id);
   recordSignalOwner(item.id);
   const phaseLabel2 = `phase ${phaseNumber}/${totalPhases}`;
-  if (resumeSessionId) {
-    if (!await verifyPhaseResume(item.id, resumeSessionId, phaseLabel2))
-      return { kind: "abort" };
-  }
-  reportPhaseActivity(item, phaseNumber, totalPhases, phase, claudeSessionId);
-  if (!resumeSessionId) {
-    await persistPhaseSessionId(item.id, phaseIndex, claudeSessionId);
-  }
-  await persistPhaseSession(item.id, phaseIndex, claudeSessionId);
+  const phaseSession = await preparePhaseSession(
+    item,
+    phase,
+    phaseIndex,
+    phaseNumber,
+    totalPhases,
+    phaseLabel2,
+    spawnOptions
+  );
+  if (!phaseSession) return { kind: "abort" };
   const exitCode = await launchPhaseSession(
     item,
     phaseNumber,
     phase,
     phaseLabel2,
-    claudeSessionId,
+    phaseSession.claudeSessionId,
     spawnOptions
   );
   if (exitCode === CLAUDE_SPAWN_FAILED) return { kind: "abort" };
@@ -8300,7 +8425,7 @@ import chalk61 from "chalk";
 import { WebSocketServer } from "ws";
 
 // src/shared/getInstallDir.ts
-import { execSync as execSync30 } from "child_process";
+import { execSync as execSync31 } from "child_process";
 import { dirname as dirname19, resolve as resolve8 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 var __filename2 = fileURLToPath3(import.meta.url);
@@ -8310,7 +8435,7 @@ function getInstallDir() {
 }
 function isGitRepo(dir) {
   try {
-    const result = execSync30("git rev-parse --show-toplevel", {
+    const result = execSync31("git rev-parse --show-toplevel", {
       cwd: dir,
       stdio: "pipe"
     }).toString().trim();
@@ -8327,11 +8452,11 @@ import {
 import chalk57 from "chalk";
 
 // src/lib/openBrowser.ts
-import { execSync as execSync31 } from "child_process";
+import { execSync as execSync32 } from "child_process";
 function tryExec(commands) {
   for (const cmd of commands) {
     try {
-      execSync31(cmd, { stdio: "ignore" });
+      execSync32(cmd, { stdio: "ignore" });
       return true;
     } catch {
     }
@@ -8632,13 +8757,13 @@ function gitCommonDir(cwd) {
 
 // src/shared/loadJson.ts
 import { existsSync as existsSync26, mkdirSync as mkdirSync11, readFileSync as readFileSync19, writeFileSync as writeFileSync20 } from "fs";
-import { homedir as homedir11 } from "os";
-import { join as join23 } from "path";
+import { homedir as homedir12 } from "os";
+import { join as join24 } from "path";
 function getStoreDir() {
-  return join23(homedir11(), ".assist");
+  return join24(homedir12(), ".assist");
 }
 function getStorePath(filename) {
-  return join23(getStoreDir(), filename);
+  return join24(getStoreDir(), filename);
 }
 function loadJson(filename) {
   const path71 = getStorePath(filename);
@@ -8709,10 +8834,10 @@ function hostedGroup(cwd, origin, clone) {
 // src/shared/createBundleHandler.ts
 import { createHash } from "crypto";
 import { readFileSync as readFileSync20, statSync as statSync3 } from "fs";
-import { dirname as dirname20, join as join24 } from "path";
+import { dirname as dirname20, join as join25 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 function createBundleHandler(importMetaUrl, bundlePath, contentType = "application/javascript") {
-  const file = join24(dirname20(fileURLToPath4(importMetaUrl)), bundlePath);
+  const file = join25(dirname20(fileURLToPath4(importMetaUrl)), bundlePath);
   let cache4;
   return (req, res) => {
     const mtimeMs = statSync3(file).mtimeMs;
@@ -8849,12 +8974,12 @@ async function loadItemSummaries(orm, origin) {
 import { existsSync as existsSync27 } from "fs";
 
 // src/commands/backlog/cloneTargetDir.ts
-import { join as join25, resolve as resolve9 } from "path";
+import { join as join26, resolve as resolve9 } from "path";
 function cloneTargetDir(origin, baseDir) {
   if (origin.startsWith("local:")) return null;
   const repoName = origin.split("/").filter(Boolean).pop();
   if (!repoName) return null;
-  return resolve9(join25(baseDir, repoName));
+  return resolve9(join26(baseDir, repoName));
 }
 
 // src/commands/backlog/resolveRepoLocation.ts
@@ -9841,19 +9966,19 @@ function handleServerRuns(req, res) {
 // src/commands/sessions/web/getReviewSynthesis.ts
 import { execFile as execFile4 } from "child_process";
 import { readFileSync as readFileSync21 } from "fs";
-import { homedir as homedir12 } from "os";
-import { basename as basename8, join as join27 } from "path";
+import { homedir as homedir13 } from "os";
+import { basename as basename8, join as join28 } from "path";
 import { promisify as promisify3 } from "util";
 
 // src/commands/sessions/web/findSynthesisForBranch.ts
 import { existsSync as existsSync28, readdirSync as readdirSync2, statSync as statSync4 } from "fs";
-import { basename as basename7, dirname as dirname21, join as join26 } from "path";
+import { basename as basename7, dirname as dirname21, join as join27 } from "path";
 function findSynthesisForBranch(repoReviewsDir, branch2) {
-  const branchKeyPath = join26(repoReviewsDir, `${branch2}-`);
+  const branchKeyPath = join27(repoReviewsDir, `${branch2}-`);
   const parent = dirname21(branchKeyPath);
   const branchPrefix = basename7(branchKeyPath);
   if (!existsSync28(parent)) return null;
-  const synthesisFiles = readdirSync2(parent).filter((name) => name.startsWith(branchPrefix)).map((name) => join26(parent, name, "synthesis.md")).filter((path71) => existsSync28(path71)).map((path71) => ({ path: path71, mtime: statSync4(path71).mtimeMs })).sort((a, b) => b.mtime - a.mtime);
+  const synthesisFiles = readdirSync2(parent).filter((name) => name.startsWith(branchPrefix)).map((name) => join27(parent, name, "synthesis.md")).filter((path71) => existsSync28(path71)).map((path71) => ({ path: path71, mtime: statSync4(path71).mtimeMs })).sort((a, b) => b.mtime - a.mtime);
   return synthesisFiles[0]?.path ?? null;
 }
 
@@ -9870,8 +9995,8 @@ async function resolveSynthesisPath(cwd) {
     runGit(cwd, ["rev-parse", "--show-toplevel"]),
     runGit(cwd, ["rev-parse", "--abbrev-ref", "HEAD"])
   ]);
-  const repoReviewsDir = join27(
-    homedir12(),
+  const repoReviewsDir = join28(
+    homedir13(),
     ".assist",
     "reviews",
     basename8(repoRoot)
@@ -10013,65 +10138,6 @@ async function gitStatus(req, res) {
   }
 }
 
-// src/shared/harnesses.ts
-import * as os3 from "os";
-import * as path25 from "path";
-
-// src/shared/checkCliAvailable.ts
-import { execSync as execSync32 } from "child_process";
-function checkCliAvailable(cli) {
-  const binary = cli.split(/\s+/)[0];
-  const opts = {
-    encoding: "utf8",
-    stdio: ["ignore", "pipe", "pipe"]
-  };
-  try {
-    execSync32(`command -v ${binary}`, opts);
-    return true;
-  } catch {
-    try {
-      execSync32(`where ${binary}`, opts);
-      return true;
-    } catch {
-      return false;
-    }
-  }
-}
-
-// src/shared/harnesses.ts
-var harnesses = {
-  claude: {
-    kind: "claude",
-    command: "claude",
-    homeDir: path25.join(os3.homedir(), ".claude"),
-    sync: {
-      agentsFile: "CLAUDE.md",
-      commandDest: (name) => path25.join("commands", `${name}.md`)
-    }
-  },
-  codex: {
-    kind: "codex",
-    command: "codex",
-    homeDir: path25.join(os3.homedir(), ".codex"),
-    sync: {
-      agentsFile: "AGENTS.md",
-      commandDest: (name) => path25.join("skills", name, "SKILL.md")
-    }
-  },
-  pi: {
-    kind: "pi",
-    command: "pi",
-    homeDir: path25.join(os3.homedir(), ".pi", "agent"),
-    sync: {
-      agentsFile: "AGENTS.md",
-      commandDest: (name) => path25.join("prompts", `${name}.md`)
-    }
-  }
-};
-function isHarnessAvailable(kind) {
-  return checkCliAvailable(harnesses[kind].command);
-}
-
 // src/commands/sessions/web/harnessCapabilities.ts
 function harnessCapabilities(_req, res) {
   const config = loadConfig().harness;
@@ -12989,33 +13055,6 @@ import enquirer7 from "enquirer";
 // src/commands/backlog/launchMode.ts
 import { randomUUID as randomUUID4 } from "crypto";
 
-// src/shared/spawnCodex.ts
-function spawnCodex(prompt, options2 = {}) {
-  const cwd = options2.cwd ?? process.cwd();
-  return spawnInherit(harnesses.codex.command, ["-C", cwd, prompt]);
-}
-
-// src/shared/spawnPi.ts
-function spawnPi(prompt, options2 = {}) {
-  const cwd = options2.cwd ?? process.cwd();
-  return spawnInherit(harnesses.pi.command, [prompt], { cwd });
-}
-
-// src/shared/spawnHarness.ts
-function spawnHarness(harness, prompt, options2 = {}) {
-  if (harness === "codex") {
-    return spawnCodex(prompt, { cwd: options2.cwd });
-  }
-  if (harness === "pi") {
-    return spawnPi(prompt, { cwd: options2.cwd });
-  }
-  return spawnClaude(prompt, {
-    allowEdits: true,
-    sessionId: options2.sessionId,
-    resumeSessionId: options2.resumeSessionId
-  });
-}
-
 // src/commands/backlog/handleLaunchSignal.ts
 import chalk86 from "chalk";
 
@@ -13217,7 +13256,10 @@ function registerRewindCommand(cmd) {
 
 // src/commands/backlog/registerRunCommand.ts
 function registerRunCommand(cmd) {
-  cmd.command("run <id>").description("Run a backlog item's plan phase-by-phase with Claude").option("-w, --write", "Run Claude with auto permission mode (default)").option("--no-write", "Run Claude without auto permission mode").option(
+  cmd.command("run <id>").description("Run a backlog item's plan phase-by-phase").option("-w, --write", "Run the harness with write access (default)").option("--no-write", "Run the harness without write access").option(
+    "--harness <harness>",
+    "Coding harness to launch (claude|codex|pi); defaults to the configured harness.engine"
+  ).option(
     "--resume-session <id>",
     "Resume an interrupted Claude session for the current phase (used by the sessions daemon on restart)"
   ).action(
@@ -13225,6 +13267,7 @@ function registerRunCommand(cmd) {
       if (!opts.resumeSession) pullIfConfigured();
       await run2(id, {
         allowEdits: opts.write !== false,
+        harness: resolveHarness(opts.harness),
         resumeSessionId: opts.resumeSession
       });
     }
@@ -20863,6 +20906,25 @@ function fetchLineComments(org, repo, prNumber, threadInfo) {
 import { mkdirSync as mkdirSync18, writeFileSync as writeFileSync35 } from "fs";
 import { dirname as dirname28 } from "path";
 import { stringify } from "yaml";
+
+// src/commands/prs/removeStaleCommentsCaches.ts
+import { readdirSync as readdirSync10, unlinkSync as unlinkSync16 } from "fs";
+import { join as join58 } from "path";
+var STALE_PATTERN = /^pr-\d+-comments\.yaml$/;
+function removeStaleCommentsCaches(cwd = process.cwd()) {
+  const dir = join58(cwd, ".assist");
+  let entries;
+  try {
+    entries = readdirSync10(dir);
+  } catch {
+    return;
+  }
+  for (const entry of entries.filter((e) => STALE_PATTERN.test(e))) {
+    unlinkSync16(join58(dir, entry));
+  }
+}
+
+// src/commands/prs/listComments/updateCommentsCache.ts
 function writeCommentsCache(org, repo, prNumber, comments3) {
   const cachePath = commentsCachePath(org, repo, prNumber);
   mkdirSync18(dirname28(cachePath), { recursive: true });
@@ -20874,6 +20936,7 @@ function writeCommentsCache(org, repo, prNumber, comments3) {
   writeFileSync35(cachePath, stringify(cacheData));
 }
 function updateCommentsCache(org, repo, prNumber, comments3) {
+  removeStaleCommentsCaches();
   if (comments3.some((c) => c.type === "line")) {
     writeCommentsCache(org, repo, prNumber, comments3);
   } else {
@@ -23741,9 +23804,9 @@ ${annotateDiffWithLineNumbers(context.diff.trimEnd())}
 
 // src/commands/review/buildReviewPaths.ts
 import { homedir as homedir21 } from "os";
-import { basename as basename16, join as join58 } from "path";
+import { basename as basename16, join as join59 } from "path";
 function buildReviewPaths(repoRoot, key) {
-  const reviewDir = join58(
+  const reviewDir = join59(
     homedir21(),
     ".assist",
     "reviews",
@@ -23752,10 +23815,10 @@ function buildReviewPaths(repoRoot, key) {
   );
   return {
     reviewDir,
-    requestPath: join58(reviewDir, "request.md"),
-    claudePath: join58(reviewDir, "claude.md"),
-    codexPath: join58(reviewDir, "codex.md"),
-    synthesisPath: join58(reviewDir, "synthesis.md")
+    requestPath: join59(reviewDir, "request.md"),
+    claudePath: join59(reviewDir, "claude.md"),
+    codexPath: join59(reviewDir, "codex.md"),
+    synthesisPath: join59(reviewDir, "synthesis.md")
   };
 }
 
@@ -24294,10 +24357,10 @@ async function handlePostSynthesis(synthesisPath, options2) {
 }
 
 // src/commands/review/prepareReviewDir.ts
-import { existsSync as existsSync49, mkdirSync as mkdirSync19, unlinkSync as unlinkSync16, writeFileSync as writeFileSync36 } from "fs";
+import { existsSync as existsSync49, mkdirSync as mkdirSync19, unlinkSync as unlinkSync17, writeFileSync as writeFileSync36 } from "fs";
 function clearReviewFiles(paths) {
   for (const path71 of [paths.claudePath, paths.codexPath, paths.synthesisPath]) {
-    if (existsSync49(path71)) unlinkSync16(path71);
+    if (existsSync49(path71)) unlinkSync17(path71);
   }
 }
 function prepareReviewDir(paths, requestBody, force) {
@@ -24582,7 +24645,7 @@ function printReviewerFailures(results) {
 }
 
 // src/commands/review/runAndSynthesise.ts
-import { existsSync as existsSync51, unlinkSync as unlinkSync18 } from "fs";
+import { existsSync as existsSync51, unlinkSync as unlinkSync19 } from "fs";
 
 // src/commands/review/buildReviewerStdin.ts
 var REVIEW_PROMPT = `You are acting as a reviewer for a proposed code change made by another engineer. The full review request \u2014 branch, base, changed files, and unified diff \u2014 is in the request file whose absolute path is given below.
@@ -25002,7 +25065,7 @@ function resolveClaude(args) {
 }
 
 // src/commands/review/runCodexReviewer.ts
-import { existsSync as existsSync50, unlinkSync as unlinkSync17 } from "fs";
+import { existsSync as existsSync50, unlinkSync as unlinkSync18 } from "fs";
 
 // src/commands/review/parseCodexEvent.ts
 function isItemStarted(value) {
@@ -25055,7 +25118,7 @@ async function runCodexReviewer(spec) {
     }
   });
   if (result.exitCode !== 0 && existsSync50(spec.outputPath)) {
-    unlinkSync17(spec.outputPath);
+    unlinkSync18(spec.outputPath);
   }
   return finaliseReviewerRun({ ...spec, command }, spinner, result);
 }
@@ -25201,7 +25264,7 @@ async function runAndSynthesise(args) {
     return { ok: false, failures };
   }
   if (anyFresh && existsSync51(paths.synthesisPath)) {
-    unlinkSync18(paths.synthesisPath);
+    unlinkSync19(paths.synthesisPath);
   }
   const synthesisResult = await synthesise(paths, { multi });
   if (synthesisResult.exitCode !== 0) failures.push(synthesisResult);
@@ -26073,14 +26136,14 @@ async function configure() {
 }
 
 // src/commands/transcript/list.ts
-import { existsSync as existsSync52, readdirSync as readdirSync10, statSync as statSync9 } from "fs";
-import { join as join59 } from "path";
+import { existsSync as existsSync52, readdirSync as readdirSync11, statSync as statSync9 } from "fs";
+import { join as join60 } from "path";
 function list4() {
   const { vttDir } = getTranscriptConfig();
   if (!existsSync52(vttDir)) return;
-  for (const entry of readdirSync10(vttDir)) {
+  for (const entry of readdirSync11(vttDir)) {
     if (!entry.endsWith(".vtt")) continue;
-    if (statSync9(join59(vttDir, entry)).isDirectory()) continue;
+    if (statSync9(join60(vttDir, entry)).isDirectory()) continue;
     console.log(entry);
   }
 }
@@ -26093,7 +26156,7 @@ import {
   renameSync as renameSync2,
   writeFileSync as writeFileSync38
 } from "fs";
-import { basename as basename17, join as join60 } from "path";
+import { basename as basename17, join as join61 } from "path";
 
 // src/commands/transcript/cleanText.ts
 function cleanText(text17) {
@@ -26306,9 +26369,9 @@ function convertVttToMarkdown(inputPath) {
   return formatChatLog(messages);
 }
 function archiveRawVtt(vttDir, sourcePath, filename) {
-  const processedDir = join60(vttDir, "processed");
+  const processedDir = join61(vttDir, "processed");
   mkdirSync20(processedDir, { recursive: true });
-  renameSync2(sourcePath, join60(processedDir, filename));
+  renameSync2(sourcePath, join61(processedDir, filename));
 }
 function move(file, options2) {
   const { date, client } = options2;
@@ -26318,19 +26381,19 @@ function move(file, options2) {
   }
   const { vttDir, transcriptsDir, summaryDir } = getTranscriptConfig();
   const filename = basename17(file);
-  const sourcePath = join60(vttDir, filename);
+  const sourcePath = join61(vttDir, filename);
   if (!existsSync53(sourcePath)) {
     console.error(`Error: VTT file not found: ${sourcePath}`);
     process.exit(1);
   }
   const base = basename17(filename, ".vtt").replace(/ Transcription$/, "");
   const outputName = `${date} ${base}.md`;
-  const formattedDir = join60(transcriptsDir, client);
+  const formattedDir = join61(transcriptsDir, client);
   mkdirSync20(formattedDir, { recursive: true });
-  const formattedPath = join60(formattedDir, outputName);
+  const formattedPath = join61(formattedDir, outputName);
   writeFileSync38(formattedPath, convertVttToMarkdown(sourcePath), "utf8");
   archiveRawVtt(vttDir, sourcePath, filename);
-  const summaryPath = join60(summaryDir, client, outputName);
+  const summaryPath = join61(summaryDir, client, outputName);
   console.log(`Formatted transcript: ${formattedPath}`);
   console.log(`Summary target:       ${summaryPath}`);
 }
@@ -26450,38 +26513,38 @@ function registerVerify(program2) {
 
 // src/commands/voice/devices.ts
 import { spawnSync as spawnSync6 } from "child_process";
-import { join as join62 } from "path";
+import { join as join63 } from "path";
 
 // src/commands/voice/shared.ts
 import { homedir as homedir22 } from "os";
-import { dirname as dirname30, join as join61 } from "path";
+import { dirname as dirname30, join as join62 } from "path";
 import { fileURLToPath as fileURLToPath7 } from "url";
 var __dirname5 = dirname30(fileURLToPath7(import.meta.url));
-var VOICE_DIR = join61(homedir22(), ".assist", "voice");
+var VOICE_DIR = join62(homedir22(), ".assist", "voice");
 var voicePaths = {
   dir: VOICE_DIR,
-  pid: join61(VOICE_DIR, "voice.pid"),
-  log: join61(VOICE_DIR, "voice.log"),
-  venv: join61(VOICE_DIR, ".venv"),
-  lock: join61(VOICE_DIR, "voice.lock")
+  pid: join62(VOICE_DIR, "voice.pid"),
+  log: join62(VOICE_DIR, "voice.log"),
+  venv: join62(VOICE_DIR, ".venv"),
+  lock: join62(VOICE_DIR, "voice.lock")
 };
 function getPythonDir() {
-  return join61(__dirname5, "commands", "voice", "python");
+  return join62(__dirname5, "commands", "voice", "python");
 }
 function getVenvPython() {
-  return process.platform === "win32" ? join61(voicePaths.venv, "Scripts", "python.exe") : join61(voicePaths.venv, "bin", "python");
+  return process.platform === "win32" ? join62(voicePaths.venv, "Scripts", "python.exe") : join62(voicePaths.venv, "bin", "python");
 }
 function getLockDir() {
   const config = loadConfig();
   return config.voice?.lockDir ?? VOICE_DIR;
 }
 function getLockFile() {
-  return join61(getLockDir(), "voice.lock");
+  return join62(getLockDir(), "voice.lock");
 }
 
 // src/commands/voice/devices.ts
 function devices() {
-  const script = join62(getPythonDir(), "list_devices.py");
+  const script = join63(getPythonDir(), "list_devices.py");
   spawnSync6(getVenvPython(), [script], { stdio: "inherit" });
 }
 
@@ -26516,12 +26579,12 @@ function logs(options2) {
 // src/commands/voice/setup.ts
 import { spawnSync as spawnSync7 } from "child_process";
 import { mkdirSync as mkdirSync22 } from "fs";
-import { join as join64 } from "path";
+import { join as join65 } from "path";
 
 // src/commands/voice/checkLockFile.ts
 import { execSync as execSync59 } from "child_process";
 import { existsSync as existsSync55, mkdirSync as mkdirSync21, readFileSync as readFileSync45, writeFileSync as writeFileSync39 } from "fs";
-import { join as join63 } from "path";
+import { join as join64 } from "path";
 function isProcessAlive2(pid) {
   try {
     process.kill(pid, 0);
@@ -26558,7 +26621,7 @@ function bootstrapVenv() {
 }
 function writeLockFile(pid) {
   const lockFile = getLockFile();
-  mkdirSync21(join63(lockFile, ".."), { recursive: true });
+  mkdirSync21(join64(lockFile, ".."), { recursive: true });
   writeFileSync39(
     lockFile,
     JSON.stringify({
@@ -26574,7 +26637,7 @@ function setup() {
   mkdirSync22(voicePaths.dir, { recursive: true });
   bootstrapVenv();
   console.log("\nDownloading models...\n");
-  const script = join64(getPythonDir(), "setup_models.py");
+  const script = join65(getPythonDir(), "setup_models.py");
   const result = spawnSync7(getVenvPython(), [script], {
     stdio: "inherit",
     env: { ...process.env, VOICE_LOG_FILE: voicePaths.log }
@@ -26588,7 +26651,7 @@ function setup() {
 // src/commands/voice/start.ts
 import { spawn as spawn8 } from "child_process";
 import { mkdirSync as mkdirSync23, writeFileSync as writeFileSync40 } from "fs";
-import { join as join65 } from "path";
+import { join as join66 } from "path";
 
 // src/commands/voice/buildDaemonEnv.ts
 function buildDaemonEnv(options2) {
@@ -26626,7 +26689,7 @@ function start2(options2) {
   bootstrapVenv();
   const debug = options2.debug || options2.foreground || process.platform === "win32";
   const env = buildDaemonEnv({ debug });
-  const script = join65(getPythonDir(), "voice_daemon.py");
+  const script = join66(getPythonDir(), "voice_daemon.py");
   const python = getVenvPython();
   if (options2.foreground) {
     spawnForeground(python, script, env);
@@ -26674,7 +26737,7 @@ function status2() {
 }
 
 // src/commands/voice/stop.ts
-import { existsSync as existsSync57, readFileSync as readFileSync47, unlinkSync as unlinkSync19 } from "fs";
+import { existsSync as existsSync57, readFileSync as readFileSync47, unlinkSync as unlinkSync20 } from "fs";
 function stop2() {
   if (!existsSync57(voicePaths.pid)) {
     console.log("Voice daemon is not running (no PID file)");
@@ -26688,12 +26751,12 @@ function stop2() {
     console.log(`Voice daemon (PID ${pid}) is not running`);
   }
   try {
-    unlinkSync19(voicePaths.pid);
+    unlinkSync20(voicePaths.pid);
   } catch {
   }
   try {
     const lockFile = getLockFile();
-    if (existsSync57(lockFile)) unlinkSync19(lockFile);
+    if (existsSync57(lockFile)) unlinkSync20(lockFile);
   } catch {
   }
   console.log("Voice daemon stopped");
@@ -27153,17 +27216,17 @@ async function auth() {
 
 // src/commands/roam/postRoamActivity.ts
 import { execFileSync as execFileSync12 } from "child_process";
-import { readdirSync as readdirSync11, readFileSync as readFileSync48, statSync as statSync10 } from "fs";
-import { join as join66 } from "path";
+import { readdirSync as readdirSync12, readFileSync as readFileSync48, statSync as statSync10 } from "fs";
+import { join as join67 } from "path";
 function findPortFile(roamDir) {
   let entries;
   try {
-    entries = readdirSync11(roamDir);
+    entries = readdirSync12(roamDir);
   } catch {
     return void 0;
   }
   const candidates = entries.filter((name) => /^roam-local-api(-[^.]+)?\.port$/.test(name)).map((name) => {
-    const path71 = join66(roamDir, name);
+    const path71 = join67(roamDir, name);
     try {
       return { path: path71, mtimeMs: statSync10(path71).mtimeMs };
     } catch {
@@ -27175,7 +27238,7 @@ function findPortFile(roamDir) {
 function postRoamActivity(app, event) {
   const appData = process.env.APPDATA;
   if (!appData) return;
-  const portFile = findPortFile(join66(appData, "Roam"));
+  const portFile = findPortFile(join67(appData, "Roam"));
   if (!portFile) return;
   let port;
   try {
@@ -27408,13 +27471,13 @@ function runPreCommands(pre, cwd) {
 // src/commands/run/spawnRunCommand.ts
 import { execFileSync as execFileSync13, spawn as spawn9 } from "child_process";
 import { existsSync as existsSync58 } from "fs";
-import { dirname as dirname31, join as join67, resolve as resolve16 } from "path";
+import { dirname as dirname31, join as join68, resolve as resolve16 } from "path";
 function resolveCommand2(command) {
   if (process.platform !== "win32" || command !== "bash") return command;
   try {
     const gitPath = execFileSync13("where", ["git"], { encoding: "utf8" }).trim().split("\r\n")[0];
     const gitRoot = resolve16(dirname31(gitPath), "..");
-    const gitBash = join67(gitRoot, "bin", "bash.exe");
+    const gitBash = join68(gitRoot, "bin", "bash.exe");
     if (existsSync58(gitBash)) return gitBash;
   } catch {
   }
@@ -27503,7 +27566,7 @@ async function run3(name, args) {
 
 // src/commands/run/add.ts
 import { mkdirSync as mkdirSync24, writeFileSync as writeFileSync41 } from "fs";
-import { join as join68 } from "path";
+import { join as join69 } from "path";
 
 // src/commands/run/extractOption.ts
 function extractOption(args, flag) {
@@ -27564,7 +27627,7 @@ function saveNewRunConfig(name, command, args, cwd) {
   saveConfig(config);
 }
 function createCommandFile(name) {
-  const dir = join68(".claude", "commands");
+  const dir = join69(".claude", "commands");
   mkdirSync24(dir, { recursive: true });
   const content = `---
 description: Run ${name}
@@ -27572,7 +27635,7 @@ description: Run ${name}
 
 Run \`assist run ${name} $ARGUMENTS 2>&1\`.
 `;
-  const filePath = join68(dir, `${name}.md`);
+  const filePath = join69(dir, `${name}.md`);
   writeFileSync41(filePath, content);
   console.log(`Created command file: ${filePath}`);
 }
@@ -27628,8 +27691,8 @@ function link2() {
 }
 
 // src/commands/run/remove.ts
-import { existsSync as existsSync59, unlinkSync as unlinkSync20 } from "fs";
-import { join as join69 } from "path";
+import { existsSync as existsSync59, unlinkSync as unlinkSync21 } from "fs";
+import { join as join70 } from "path";
 function findRemoveIndex() {
   const idx = process.argv.indexOf("remove");
   if (idx === -1 || idx + 1 >= process.argv.length) return -1;
@@ -27644,9 +27707,9 @@ function parseRemoveName() {
   return process.argv[idx + 1];
 }
 function deleteCommandFile(name) {
-  const filePath = join69(".claude", "commands", `${name}.md`);
+  const filePath = join70(".claude", "commands", `${name}.md`);
   if (existsSync59(filePath)) {
-    unlinkSync20(filePath);
+    unlinkSync21(filePath);
     console.log(`Deleted command file: ${filePath}`);
   }
 }
@@ -27699,9 +27762,9 @@ function registerRun(program2) {
 
 // src/commands/screenshot/index.ts
 import { execSync as execSync61 } from "child_process";
-import { existsSync as existsSync60, mkdirSync as mkdirSync25, unlinkSync as unlinkSync21, writeFileSync as writeFileSync42 } from "fs";
+import { existsSync as existsSync60, mkdirSync as mkdirSync25, unlinkSync as unlinkSync22, writeFileSync as writeFileSync42 } from "fs";
 import { tmpdir as tmpdir8 } from "os";
-import { join as join70, resolve as resolve18 } from "path";
+import { join as join71, resolve as resolve18 } from "path";
 import chalk209 from "chalk";
 
 // src/commands/screenshot/captureWindowPs1.ts
@@ -27838,7 +27901,7 @@ function buildOutputPath(outputDir, processName) {
   return resolve18(outputDir, `${processName}-${timestamp6}.png`);
 }
 function runPowerShellScript(processName, outputPath) {
-  const scriptPath = join70(tmpdir8(), `assist-screenshot-${Date.now()}.ps1`);
+  const scriptPath = join71(tmpdir8(), `assist-screenshot-${Date.now()}.ps1`);
   writeFileSync42(scriptPath, captureWindowPs1, "utf8");
   try {
     execSync61(
@@ -27846,7 +27909,7 @@ function runPowerShellScript(processName, outputPath) {
       { stdio: ["ignore", "pipe", "pipe"], encoding: "utf8" }
     );
   } finally {
-    unlinkSync21(scriptPath);
+    unlinkSync22(scriptPath);
   }
 }
 function screenshot(processName) {
@@ -28503,12 +28566,12 @@ import { basename as basename18 } from "path";
 
 // src/commands/sessions/daemon/worktree/deleteStrandedTree.ts
 import { existsSync as existsSync62 } from "fs";
-import { join as join73 } from "path";
+import { join as join74 } from "path";
 
 // src/commands/sessions/daemon/worktree/deleteTreeDirectly.ts
 import { statSync as statSync12 } from "fs";
 import { rm as rm2 } from "fs/promises";
-import { join as join72 } from "path";
+import { join as join73 } from "path";
 async function deleteTreeDirectly(clone, worktreePath, why) {
   if (holdsAGitDirectoryRatherThanALink(worktreePath)) {
     daemonLog(
@@ -28535,7 +28598,7 @@ async function deleteTreeDirectly(clone, worktreePath, why) {
   return true;
 }
 function holdsAGitDirectoryRatherThanALink(worktreePath) {
-  return statSync12(join72(worktreePath, ".git"), {
+  return statSync12(join73(worktreePath, ".git"), {
     throwIfNoEntry: false
   })?.isDirectory() === true;
 }
@@ -28571,7 +28634,7 @@ async function deleteStrandedTree(clone, worktreePath, cause) {
   );
 }
 function strandedReason(worktreePath, cause) {
-  if (!existsSync62(join73(worktreePath, ".git")))
+  if (!existsSync62(join74(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";
@@ -31775,7 +31838,7 @@ var SessionManager = class {
 };
 
 // src/commands/sessions/daemon/startDaemonServer.ts
-import { unlinkSync as unlinkSync23 } from "fs";
+import { unlinkSync as unlinkSync24 } from "fs";
 import * as net3 from "net";
 
 // src/commands/sessions/daemon/handleConnection.ts
@@ -32106,7 +32169,7 @@ function handleConnection(socket, manager) {
 }
 
 // src/commands/sessions/daemon/onListening.ts
-import { unlinkSync as unlinkSync22, writeFileSync as writeFileSync43 } from "fs";
+import { unlinkSync as unlinkSync23, writeFileSync as writeFileSync43 } from "fs";
 
 // src/commands/sessions/daemon/startPidFileWatchdog.ts
 import { readFileSync as readFileSync52 } from "fs";
@@ -32149,12 +32212,12 @@ function onListening(manager, checkAutoExit) {
 function cleanupOwnedFiles() {
   if (!ownsPidFile()) return;
   try {
-    unlinkSync22(daemonPaths.pid);
+    unlinkSync23(daemonPaths.pid);
   } catch {
   }
   if (process.platform !== "win32") {
     try {
-      unlinkSync22(daemonPaths.socket);
+      unlinkSync23(daemonPaths.socket);
     } catch {
     }
   }
@@ -32201,7 +32264,7 @@ async function recoverFromAddrInUse(server, manager, checkAutoExit) {
   daemonLog("removing stale socket left by a crashed daemon");
   if (process.platform !== "win32") {
     try {
-      unlinkSync23(daemonPaths.socket);
+      unlinkSync24(daemonPaths.socket);
     } catch {
     }
   }
@@ -32538,9 +32601,9 @@ function buildLimitsSegment(rateLimits) {
 
 // src/commands/readGitBranch.ts
 import { readFileSync as readFileSync54, statSync as statSync14 } from "fs";
-import { isAbsolute as isAbsolute4, join as join75, resolve as resolve19 } from "path";
+import { isAbsolute as isAbsolute4, join as join76, resolve as resolve19 } from "path";
 function resolveGitDir(cwd) {
-  const dotGit = join75(cwd, ".git");
+  const dotGit = join76(cwd, ".git");
   let stat3;
   try {
     stat3 = statSync14(dotGit);
@@ -32570,7 +32633,7 @@ function readGitBranch(cwd) {
   }
   let head;
   try {
-    head = readFileSync54(join75(gitDir, "HEAD"), "utf8");
+    head = readFileSync54(join76(gitDir, "HEAD"), "utf8");
   } catch {
     return null;
   }