@sideboard-ai/core 0.1.217 → 0.1.219

package/dist/index.cjs

@@ -6890,7 +6890,7 @@ async function run(file, args, opts) {
   try {
     const result = await (0, import_execa2.execa)(file, args, {
       cwd: opts?.cwd,
-      env: { ...process.env, ...opts?.env },
+      env: { ...stripNestedElectronEnv(process.env), ...opts?.env },
       reject: opts?.reject ?? true,
       ...opts?.timeoutMs != null ? { timeout: opts.timeoutMs } : {}
     });
@@ -6987,6 +6987,7 @@ var init_run = __esm({
     "use strict";
     import_execa2 = require("execa");
     init_path();
+    init_nested_electron_env();
     init_github_agent_auth();
     init_stale_lock();
   }
@@ -8079,7 +8080,14 @@ function slugify(input) {
 }
 async function resolveRepoRoot(cwd) {
   const { stdout } = await git(["rev-parse", "--show-toplevel"], cwd);
-  return canonicalizeRepoPath(stdout.trim());
+  const toplevel = canonicalizeRepoPath(stdout.trim());
+  try {
+    const listed = await listWorktrees(cwd);
+    const primary = listed[0]?.path;
+    if (primary) return canonicalizeRepoPath(primary);
+  } catch {
+  }
+  return toplevel;
 }
 function canonicalizeRepoPath(path2) {
   try {
@@ -8099,7 +8107,8 @@ function parseGithubSlugFromRemoteUrl(url) {
 }
 async function slugFromGitRemote(repoPath, remote) {
   const result = await git(["remote", "get-url", remote], repoPath, {
-    reject: false
+    reject: false,
+    timeoutMs: 5e3
   });
   if (result.exitCode !== 0 || !result.stdout.trim()) return null;
   return parseGithubSlugFromRemoteUrl(result.stdout);
@@ -8112,7 +8121,7 @@ async function resolveGithubRepoSlug(repoPath) {
     const viaGh = await gh(
       ["repo", "view", "--json", "nameWithOwner", "--jq", ".nameWithOwner"],
       repoPath,
-      { reject: false }
+      { reject: false, timeoutMs: 8e3 }
     );
     if (viaGh.exitCode === 0 && viaGh.stdout.trim()) {
       return viaGh.stdout.trim();
@@ -9041,7 +9050,7 @@ async function listWorktrees(repoPath) {
   const { stdout } = await git(
     ["worktree", "list", "--porcelain"],
     repoPath,
-    { reject: false }
+    { reject: false, timeoutMs: 8e3 }
   );
   if (!stdout.trim()) return [];
   const entries = [];
@@ -9465,6 +9474,7 @@ __export(workspaces_exports, {
   addWorkspace: () => addWorkspace,
   ensureWorkspace: () => ensureWorkspace,
   listWorkspaces: () => listWorkspaces,
+  primaryCheckoutFromLinkedWorktree: () => primaryCheckoutFromLinkedWorktree,
   removeWorkspace: () => removeWorkspace,
   syncWorkspacesFromThreads: () => syncWorkspacesFromThreads
 });
@@ -9520,6 +9530,41 @@ function listWorkspaces() {
   if (valid.length !== all.length) writeAll2(valid);
   return valid.sort((a, b) => a.name.localeCompare(b.name));
 }
+function isLinkedWorktreeOf(path2, mainRepo) {
+  if (!path2 || path2 === mainRepo) return false;
+  const git2 = (0, import_node_path22.join)(path2, ".git");
+  try {
+    if (!(0, import_node_fs19.existsSync)(git2) || (0, import_node_fs19.statSync)(git2).isDirectory()) return false;
+    const text7 = (0, import_node_fs19.readFileSync)(git2, "utf8");
+    const needle = `${mainRepo.replace(/\/+$/, "")}/.git`;
+    return text7.includes(needle);
+  } catch {
+    return false;
+  }
+}
+function primaryCheckoutFromLinkedWorktree(path2) {
+  if (!path2) return null;
+  const git2 = (0, import_node_path22.join)(path2, ".git");
+  try {
+    if (!(0, import_node_fs19.existsSync)(git2) || (0, import_node_fs19.statSync)(git2).isDirectory()) return null;
+    const text7 = (0, import_node_fs19.readFileSync)(git2, "utf8");
+    const match = /^\s*gitdir:\s*(.+)$/m.exec(text7);
+    if (!match) return null;
+    const gitdir = match[1].trim().replace(/\/+$/, "");
+    const worktrees = gitdir.lastIndexOf("/.git/worktrees/");
+    const root = worktrees > 0 ? gitdir.slice(0, worktrees) : gitdir.endsWith("/.git") ? gitdir.slice(0, -5) : null;
+    if (!root) return null;
+    return canonicalizeRepoPath(root);
+  } catch {
+    return null;
+  }
+}
+function resolveSyncWorkspacePath(path2) {
+  if (!path2 || path2 === "/") return null;
+  const primary = primaryCheckoutFromLinkedWorktree(path2);
+  if (primary) return primary;
+  return canonicalizeRepoPath(path2);
+}
 async function addWorkspace(repoPath) {
   const root = await resolveRepoRoot(repoPath);
   if (!root || root === "/") throw new Error(`Invalid repo path: ${repoPath}`);
@@ -9528,13 +9573,14 @@ async function addWorkspace(repoPath) {
   await ensureGhPreferOrigin(root);
   const current = readAll2();
   const existing = current.find((w) => w.path === root);
-  if (existing) return existing;
-  const next = {
+  const withoutLinked = current.filter((w) => !isLinkedWorktreeOf(w.path, root));
+  if (existing && withoutLinked.length === current.length) return existing;
+  const next = existing ?? {
     path: root,
     name: (0, import_node_path22.basename)(root),
     addedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
-  writeAll2([...current, next]);
+  writeAll2(existing ? withoutLinked : [...withoutLinked, next]);
   return next;
 }
 function removeWorkspace(repoPath) {
@@ -9547,9 +9593,24 @@ async function ensureWorkspace(repoPath) {
 function syncWorkspacesFromThreads(repoPaths) {
   const current = readAll2();
   const removed = readRemoved();
-  const byPath = new Map(current.map((w) => [w.path, w]));
+  const byPath = /* @__PURE__ */ new Map();
   let dirty = false;
-  for (const path2 of repoPaths) {
+  for (const w of current) {
+    const resolved = resolveSyncWorkspacePath(w.path) ?? w.path;
+    if (resolved !== w.path) dirty = true;
+    if (!resolved || resolved === "/" || isGlobalRepoPath(resolved) || removed.has(resolved)) {
+      dirty = true;
+      continue;
+    }
+    if (!byPath.has(resolved)) {
+      byPath.set(
+        resolved,
+        resolved === w.path ? w : { ...w, path: resolved, name: (0, import_node_path22.basename)(resolved) }
+      );
+    }
+  }
+  for (const raw of repoPaths) {
+    const path2 = resolveSyncWorkspacePath(raw);
     if (!path2 || path2 === "/" || isGlobalRepoPath(path2) || byPath.has(path2) || removed.has(path2)) {
       continue;
     }
@@ -9562,6 +9623,13 @@ function syncWorkspacesFromThreads(repoPaths) {
     byPath.set(path2, ws);
     dirty = true;
   }
+  for (const [path2] of byPath) {
+    const mains = [...byPath.keys()];
+    if (mains.some((main) => isLinkedWorktreeOf(path2, main))) {
+      byPath.delete(path2);
+      dirty = true;
+    }
+  }
   const next = [...byPath.values()];
   if (dirty) writeAll2(next);
   return next.sort((a, b) => a.name.localeCompare(b.name));
@@ -10647,36 +10715,71 @@ var init_outbound_watch = __esm({
   }
 });
 
+// src/agents/turn-trace.ts
+function traceTurn(phase, extra) {
+  try {
+    const line = `${JSON.stringify({ t: (/* @__PURE__ */ new Date()).toISOString(), phase, ...extra })}
+`;
+    (0, import_node_fs23.appendFileSync)((0, import_node_path27.join)(appDataDir(), "turn-spawn.log"), line);
+  } catch {
+  }
+}
+async function withTimeout(promise, ms, label) {
+  let timer;
+  try {
+    return await Promise.race([
+      promise,
+      new Promise((_, reject) => {
+        timer = setTimeout(
+          () => reject(new Error(`${label} timed out after ${ms}ms`)),
+          ms
+        );
+      })
+    ]);
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
+var import_node_fs23, import_node_path27;
+var init_turn_trace = __esm({
+  "src/agents/turn-trace.ts"() {
+    "use strict";
+    import_node_fs23 = require("fs");
+    import_node_path27 = require("path");
+    init_paths();
+  }
+});
+
 // src/brightsy/config.ts
 function brightsyConfigPath() {
   const override = process.env.BRIGHTSY_CONFIG?.trim();
   if (override) return override;
-  return (0, import_node_path27.join)((0, import_node_os7.homedir)(), ".brightsy", "config.json");
+  return (0, import_node_path28.join)((0, import_node_os7.homedir)(), ".brightsy", "config.json");
 }
 function loadBrightsyConfig() {
   const path2 = brightsyConfigPath();
-  if (!(0, import_node_fs23.existsSync)(path2)) {
+  if (!(0, import_node_fs24.existsSync)(path2)) {
     throw new Error("Brightsy not logged in \u2014 run `brightsy login` first");
   }
-  const raw = JSON.parse((0, import_node_fs23.readFileSync)(path2, "utf8"));
+  const raw = JSON.parse((0, import_node_fs24.readFileSync)(path2, "utf8"));
   if (!raw.access_token || !raw.account_id) {
     throw new Error("Brightsy config incomplete \u2014 run `brightsy login`");
   }
   return raw;
 }
 function saveBrightsyConfig(cfg) {
-  (0, import_node_fs23.writeFileSync)(brightsyConfigPath(), `${JSON.stringify(cfg, null, 2)}
+  (0, import_node_fs24.writeFileSync)(brightsyConfigPath(), `${JSON.stringify(cfg, null, 2)}
 `, {
     mode: 384
   });
 }
-var import_node_fs23, import_node_os7, import_node_path27;
+var import_node_fs24, import_node_os7, import_node_path28;
 var init_config = __esm({
   "src/brightsy/config.ts"() {
     "use strict";
-    import_node_fs23 = require("fs");
+    import_node_fs24 = require("fs");
     import_node_os7 = require("os");
-    import_node_path27 = require("path");
+    import_node_path28 = require("path");
   }
 });
 
@@ -10903,22 +11006,22 @@ __export(connected_teams_exports, {
   listConnectedBrightsyTeams: () => listConnectedBrightsyTeams
 });
 function storePath4() {
-  return (0, import_node_path28.join)(appDataDir(), "brightsy-teams.json");
+  return (0, import_node_path29.join)(appDataDir(), "brightsy-teams.json");
 }
 function readStore4() {
   const path2 = storePath4();
-  if (!(0, import_node_fs24.existsSync)(path2)) return [];
+  if (!(0, import_node_fs25.existsSync)(path2)) return [];
   try {
-    const parsed = JSON.parse((0, import_node_fs24.readFileSync)(path2, "utf8"));
+    const parsed = JSON.parse((0, import_node_fs25.readFileSync)(path2, "utf8"));
     return Array.isArray(parsed.teams) ? parsed.teams : [];
   } catch {
     return [];
   }
 }
 function writeStore3(teams) {
-  (0, import_node_fs24.mkdirSync)(appDataDir(), { recursive: true });
+  (0, import_node_fs25.mkdirSync)(appDataDir(), { recursive: true });
   const path2 = storePath4();
-  (0, import_node_fs24.writeFileSync)(path2, `${JSON.stringify({ teams }, null, 2)}
+  (0, import_node_fs25.writeFileSync)(path2, `${JSON.stringify({ teams }, null, 2)}
 `, {
     mode: 384
   });
@@ -11074,12 +11177,12 @@ function brightsyMcpServerName(slug) {
   const cleaned = slug.replace(/[^A-Za-z0-9_-]/g, "_").replace(/^_+|_+$/g, "");
   return `brightsy_${cleaned || "team"}`;
 }
-var import_node_fs24, import_node_path28;
+var import_node_fs25, import_node_path29;
 var init_connected_teams = __esm({
   "src/brightsy/connected-teams.ts"() {
     "use strict";
-    import_node_fs24 = require("fs");
-    import_node_path28 = require("path");
+    import_node_fs25 = require("fs");
+    import_node_path29 = require("path");
     init_paths();
     init_accounts();
     init_config();
@@ -11444,11 +11547,11 @@ async function syncCliForTarget(accountId) {
   }
   applyConnectedTeamToCli(team);
 }
-var import_node_fs25, brightsyAdapter;
+var import_node_fs26, brightsyAdapter;
 var init_brightsy = __esm({
   "src/agents/brightsy.ts"() {
     "use strict";
-    import_node_fs25 = require("fs");
+    import_node_fs26 = require("fs");
     init_run();
     init_connected_teams();
     init_config();
@@ -11463,7 +11566,7 @@ var init_brightsy = __esm({
       async detect() {
         const brightsy = resolveAgentExecutable("brightsy");
         if (brightsy !== "brightsy") {
-          if (!(0, import_node_fs25.existsSync)(brightsy)) {
+          if (!(0, import_node_fs26.existsSync)(brightsy)) {
             return {
               agent: "brightsy",
               installed: false,
@@ -11571,6 +11674,11 @@ function mcpAllowTools(servers) {
   }
   return out;
 }
+function mcpAllowToolsFromNames(names) {
+  return mcpAllowTools(
+    [...names].map((name) => name.trim()).filter(Boolean).map((name) => ({ name, connected: true, needsAuth: false }))
+  );
+}
 function mcpAuthWarnings(servers) {
   const needing = servers.filter((s) => s.needsAuth).map((s) => s.name);
   if (needing.length === 0) return [];
@@ -11639,7 +11747,7 @@ function splitPemCertificates(pem) {
 }
 function readExistingFile(path2) {
   try {
-    return (0, import_node_fs26.existsSync)(path2) ? (0, import_node_fs26.readFileSync)(path2, "utf8") : "";
+    return (0, import_node_fs27.existsSync)(path2) ? (0, import_node_fs27.readFileSync)(path2, "utf8") : "";
   } catch {
     return "";
   }
@@ -11671,13 +11779,13 @@ function collectSystemCaPem(io = {}) {
   return "";
 }
 function systemCaBundlePath(io = {}) {
-  return (0, import_node_path29.join)((io.appData ?? appDataDir)(), BUNDLE_NAME);
+  return (0, import_node_path30.join)((io.appData ?? appDataDir)(), BUNDLE_NAME);
 }
 function bundleIsFresh(path2, now) {
   try {
-    if (!(0, import_node_fs26.existsSync)(path2)) return false;
-    if (splitPemCertificates((0, import_node_fs26.readFileSync)(path2, "utf8")).length === 0) return false;
-    return now - (0, import_node_fs26.statSync)(path2).mtimeMs < BUNDLE_MAX_AGE_MS;
+    if (!(0, import_node_fs27.existsSync)(path2)) return false;
+    if (splitPemCertificates((0, import_node_fs27.readFileSync)(path2, "utf8")).length === 0) return false;
+    return now - (0, import_node_fs27.statSync)(path2).mtimeMs < BUNDLE_MAX_AGE_MS;
   } catch {
     return false;
   }
@@ -11698,11 +11806,11 @@ function materializeSystemCaBundle(io = {}) {
   if (bundleIsFresh(dest, now)) return dest;
   const pem = collectSystemCaPem(io);
   if (splitPemCertificates(pem).length === 0) {
-    return (0, import_node_fs26.existsSync)(dest) && splitPemCertificates(readExistingFile(dest)).length > 0 ? dest : void 0;
+    return (0, import_node_fs27.existsSync)(dest) && splitPemCertificates(readExistingFile(dest)).length > 0 ? dest : void 0;
   }
   try {
-    (0, import_node_fs26.mkdirSync)((0, import_node_path29.dirname)(dest), { recursive: true });
-    (0, import_node_fs26.writeFileSync)(dest, pem.endsWith("\n") ? pem : `${pem}
+    (0, import_node_fs27.mkdirSync)((0, import_node_path30.dirname)(dest), { recursive: true });
+    (0, import_node_fs27.writeFileSync)(dest, pem.endsWith("\n") ? pem : `${pem}
 `, { mode: 384 });
     return dest;
   } catch {
@@ -11742,13 +11850,13 @@ function trustSystemCertificates(io = {}) {
     return false;
   }
 }
-var import_node_child_process4, import_node_fs26, import_node_path29, import_node_tls, NODE_USE_SYSTEM_CA, NODE_EXTRA_CA_CERTS, BUNDLE_NAME, BUNDLE_MAX_AGE_MS, LINUX_CA_FILES, PEM_CERT_RE;
+var import_node_child_process4, import_node_fs27, import_node_path30, import_node_tls, NODE_USE_SYSTEM_CA, NODE_EXTRA_CA_CERTS, BUNDLE_NAME, BUNDLE_MAX_AGE_MS, LINUX_CA_FILES, PEM_CERT_RE;
 var init_system_ca = __esm({
   "src/http/system-ca.ts"() {
     "use strict";
     import_node_child_process4 = require("child_process");
-    import_node_fs26 = require("fs");
-    import_node_path29 = require("path");
+    import_node_fs27 = require("fs");
+    import_node_path30 = require("path");
     import_node_tls = __toESM(require("tls"), 1);
     init_paths();
     NODE_USE_SYSTEM_CA = "NODE_USE_SYSTEM_CA";
@@ -11774,43 +11882,43 @@ function electronResourcesPath() {
 function packagedCursorRuntimeDir() {
   const resources = electronResourcesPath();
   if (!resources) return null;
-  const dir = (0, import_node_path30.join)(resources, "cursor-runtime");
-  if (!(0, import_node_fs27.existsSync)((0, import_node_path30.join)(dir, "core-dist", "agents", "cursor-runner.js"))) return null;
+  const dir = (0, import_node_path31.join)(resources, "cursor-runtime");
+  if (!(0, import_node_fs28.existsSync)((0, import_node_path31.join)(dir, "core-dist", "agents", "cursor-runner.js"))) return null;
   return dir;
 }
 function packagedCursorRunnerPath() {
   const dir = packagedCursorRuntimeDir();
-  return dir ? (0, import_node_path30.join)(dir, "core-dist", "agents", "cursor-runner.js") : null;
+  return dir ? (0, import_node_path31.join)(dir, "core-dist", "agents", "cursor-runner.js") : null;
 }
 function packagedMcpDir() {
   const resources = electronResourcesPath();
   if (!resources) return null;
-  const dir = (0, import_node_path30.join)(resources, "sideboard-mcp");
-  if (!(0, import_node_fs27.existsSync)((0, import_node_path30.join)(dir, "core-dist", "mcp", "run-stdio.js"))) return null;
+  const dir = (0, import_node_path31.join)(resources, "sideboard-mcp");
+  if (!(0, import_node_fs28.existsSync)((0, import_node_path31.join)(dir, "core-dist", "mcp", "run-stdio.js"))) return null;
   return dir;
 }
 function packagedMcpStdioPath() {
   const dir = packagedMcpDir();
-  return dir ? (0, import_node_path30.join)(dir, "core-dist", "mcp", "run-stdio.js") : null;
+  return dir ? (0, import_node_path31.join)(dir, "core-dist", "mcp", "run-stdio.js") : null;
 }
 function packagedBundledNodePath() {
   const resources = electronResourcesPath();
   if (!resources) return null;
-  const bin = (0, import_node_path30.join)(resources, "node", "bin", "node");
-  if (!(0, import_node_fs27.existsSync)(bin)) return null;
+  const bin = (0, import_node_path31.join)(resources, "node", "bin", "node");
+  if (!(0, import_node_fs28.existsSync)(bin)) return null;
   return bin;
 }
 function packagedCursorRipgrepCandidate(platformPkg, binName) {
   const dir = packagedCursorRuntimeDir();
   if (!dir) return null;
-  return (0, import_node_path30.join)(dir, "node_modules", platformPkg, "bin", binName);
+  return (0, import_node_path31.join)(dir, "node_modules", platformPkg, "bin", binName);
 }
-var import_node_fs27, import_node_path30;
+var import_node_fs28, import_node_path31;
 var init_packaged_runtime = __esm({
   "src/agents/packaged-runtime.ts"() {
     "use strict";
-    import_node_fs27 = require("fs");
-    import_node_path30 = require("path");
+    import_node_fs28 = require("fs");
+    import_node_path31 = require("path");
   }
 });
 
@@ -11845,7 +11953,7 @@ function unpackedAsarPath(filePath) {
   if (!isAsarPath(filePath)) return null;
   const unpacked = filePath.replace(/\.asar(?=[/\\])/, ".asar.unpacked");
   if (unpacked === filePath) return null;
-  return (0, import_node_fs28.existsSync)(unpacked) ? unpacked : null;
+  return (0, import_node_fs29.existsSync)(unpacked) ? unpacked : null;
 }
 function nodeReadableScriptPath(scriptPath) {
   return unpackedAsarPath(scriptPath) ?? scriptPath;
@@ -11885,37 +11993,37 @@ function pickPreferredNode(candidates) {
   return best;
 }
 function versionDirNodeBins(root, toBin) {
-  if (!(0, import_node_fs28.existsSync)(root)) return [];
+  if (!(0, import_node_fs29.existsSync)(root)) return [];
   try {
-    return (0, import_node_fs28.readdirSync)(root).map(toBin);
+    return (0, import_node_fs29.readdirSync)(root).map(toBin);
   } catch {
     return [];
   }
 }
 function defaultNodeBinCandidates(home = (0, import_node_os8.homedir)()) {
   const kegs = ["/opt/homebrew", "/usr/local"].flatMap(
-    (prefix) => PREFERRED_LTS_MAJORS.map((major) => (0, import_node_path31.join)(prefix, "opt", `node@${major}`, "bin", "node"))
+    (prefix) => PREFERRED_LTS_MAJORS.map((major) => (0, import_node_path32.join)(prefix, "opt", `node@${major}`, "bin", "node"))
   );
   return [
     ...kegs,
     "/opt/homebrew/bin/node",
     "/usr/local/bin/node",
-    (0, import_node_path31.join)(home, ".local/share/fnm/aliases/default/bin/node"),
-    (0, import_node_path31.join)(home, ".nvm/current/bin/node"),
-    (0, import_node_path31.join)(home, ".volta/bin/node"),
-    (0, import_node_path31.join)(home, ".asdf/shims/node"),
-    (0, import_node_path31.join)(home, ".local/share/mise/shims/node"),
+    (0, import_node_path32.join)(home, ".local/share/fnm/aliases/default/bin/node"),
+    (0, import_node_path32.join)(home, ".nvm/current/bin/node"),
+    (0, import_node_path32.join)(home, ".volta/bin/node"),
+    (0, import_node_path32.join)(home, ".asdf/shims/node"),
+    (0, import_node_path32.join)(home, ".local/share/mise/shims/node"),
     ...versionDirNodeBins(
-      (0, import_node_path31.join)(home, ".nvm", "versions", "node"),
-      (name) => (0, import_node_path31.join)(home, ".nvm", "versions", "node", name, "bin", "node")
+      (0, import_node_path32.join)(home, ".nvm", "versions", "node"),
+      (name) => (0, import_node_path32.join)(home, ".nvm", "versions", "node", name, "bin", "node")
     ),
     ...versionDirNodeBins(
-      (0, import_node_path31.join)(home, ".local/share/fnm", "node-versions"),
-      (name) => (0, import_node_path31.join)(home, ".local/share/fnm", "node-versions", name, "installation", "bin", "node")
+      (0, import_node_path32.join)(home, ".local/share/fnm", "node-versions"),
+      (name) => (0, import_node_path32.join)(home, ".local/share/fnm", "node-versions", name, "installation", "bin", "node")
     ),
     ...versionDirNodeBins(
-      (0, import_node_path31.join)(home, ".volta", "tools", "image", "node"),
-      (name) => (0, import_node_path31.join)(home, ".volta", "tools", "image", "node", name, "bin", "node")
+      (0, import_node_path32.join)(home, ".volta", "tools", "image", "node"),
+      (name) => (0, import_node_path32.join)(home, ".volta", "tools", "image", "node", name, "bin", "node")
     )
   ];
 }
@@ -11924,10 +12032,10 @@ function uniqueExistingNodeBins(paths) {
   const out = [];
   for (const raw of paths) {
     const p = raw.trim();
-    if (!p || !(0, import_node_fs28.existsSync)(p) || isElectronLikeCommand(p)) continue;
+    if (!p || !(0, import_node_fs29.existsSync)(p) || isElectronLikeCommand(p)) continue;
     let key = p;
     try {
-      key = (0, import_node_fs28.realpathSync)(p);
+      key = (0, import_node_fs29.realpathSync)(p);
     } catch {
       continue;
     }
@@ -12007,13 +12115,13 @@ async function resolveNodeLaunch(scriptPath) {
     env: { ELECTRON_RUN_AS_NODE: "1" }
   };
 }
-var import_node_fs28, import_node_os8, import_node_path31, AGENT_RUNNER_MAX_OLD_SPACE_MB, MAX_OLD_SPACE_FLAG, PREFERRED_LTS_MAJORS;
+var import_node_fs29, import_node_os8, import_node_path32, AGENT_RUNNER_MAX_OLD_SPACE_MB, MAX_OLD_SPACE_FLAG, PREFERRED_LTS_MAJORS;
 var init_node_launch = __esm({
   "src/agents/node-launch.ts"() {
     "use strict";
-    import_node_fs28 = require("fs");
+    import_node_fs29 = require("fs");
     import_node_os8 = require("os");
-    import_node_path31 = require("path");
+    import_node_path32 = require("path");
     init_nested_electron_env();
     init_system_ca();
     init_run();
@@ -12115,37 +12223,37 @@ function corePackageDir() {
   try {
     const url = import_meta.url;
     if (typeof url === "string" && url.length > 0) {
-      return (0, import_node_path32.dirname)((0, import_node_url.fileURLToPath)(url));
+      return (0, import_node_path33.dirname)((0, import_node_url.fileURLToPath)(url));
     }
   } catch {
   }
   try {
-    const req = (0, import_node_module.createRequire)((0, import_node_path32.join)(process.cwd(), "package.json"));
-    return (0, import_node_path32.dirname)(req.resolve("@sideboard-ai/core"));
+    const req = (0, import_node_module.createRequire)((0, import_node_path33.join)(process.cwd(), "package.json"));
+    return (0, import_node_path33.dirname)(req.resolve("@sideboard-ai/core"));
   } catch {
     return process.cwd();
   }
 }
 function findSideboardMcpJsEntry() {
   const override = process.env.SIDEBOARD_MCP_ENTRY?.trim() || process.env.SIDEBOARD_CLI?.trim();
-  if (override && (0, import_node_fs29.existsSync)(override)) return override;
+  if (override && (0, import_node_fs30.existsSync)(override)) return override;
   const packaged = packagedMcpStdioPath();
   if (packaged) return packaged;
   let dir = corePackageDir();
   for (let i = 0; i < 10; i++) {
     const candidates = [
-      (0, import_node_path32.join)(dir, "mcp/run-stdio.js"),
-      (0, import_node_path32.join)(dir, "mcp/run-stdio.cjs"),
-      (0, import_node_path32.join)(dir, "dist/mcp/run-stdio.js"),
-      (0, import_node_path32.join)(dir, "dist/mcp/run-stdio.cjs"),
-      (0, import_node_path32.join)(dir, "packages/core/dist/mcp/run-stdio.js"),
-      (0, import_node_path32.join)(dir, "packages/cli/dist/index.js"),
-      (0, import_node_path32.join)(dir, "cli/dist/index.js")
+      (0, import_node_path33.join)(dir, "mcp/run-stdio.js"),
+      (0, import_node_path33.join)(dir, "mcp/run-stdio.cjs"),
+      (0, import_node_path33.join)(dir, "dist/mcp/run-stdio.js"),
+      (0, import_node_path33.join)(dir, "dist/mcp/run-stdio.cjs"),
+      (0, import_node_path33.join)(dir, "packages/core/dist/mcp/run-stdio.js"),
+      (0, import_node_path33.join)(dir, "packages/cli/dist/index.js"),
+      (0, import_node_path33.join)(dir, "cli/dist/index.js")
     ];
     for (const p of candidates) {
-      if ((0, import_node_fs29.existsSync)(p) && !isAsarPath(p)) return p;
+      if ((0, import_node_fs30.existsSync)(p) && !isAsarPath(p)) return p;
     }
-    const parent = (0, import_node_path32.dirname)(dir);
+    const parent = (0, import_node_path33.dirname)(dir);
     if (parent === dir) break;
     dir = parent;
   }
@@ -12281,8 +12389,16 @@ function toOpencodeMcpConfigContent(servers, opts) {
   }
   return JSON.stringify({ mcp });
 }
-function writeMcpServersConfig(servers) {
-  if (servers.length === 0) return null;
+function stripElectronFromUserMcpEntry(entry) {
+  const next = { ...entry };
+  const env = next.env;
+  if (!env || typeof env !== "object" || Array.isArray(env)) return next;
+  const cleaned = { ...env };
+  delete cleaned.ELECTRON_RUN_AS_NODE;
+  next.env = cleaned;
+  return next;
+}
+function writeMcpServersConfig(servers, extraServers) {
   const mcpServers = {};
   for (const s of servers) {
     const env = mcpSpawnEnv(s.env);
@@ -12292,22 +12408,30 @@ function writeMcpServersConfig(servers) {
       ...env ? { env } : {}
     };
   }
-  const dir = (0, import_node_fs29.mkdtempSync)((0, import_node_path32.join)((0, import_node_os9.tmpdir)(), "sideboard-mcp-"));
-  const cfgPath = (0, import_node_path32.join)(dir, "mcp.json");
-  (0, import_node_fs29.writeFileSync)(cfgPath, JSON.stringify({ mcpServers }, null, 2));
+  if (extraServers) {
+    for (const [rawName, entry] of Object.entries(extraServers)) {
+      const name = rawName.trim();
+      if (!name || mcpServers[name] || !entry) continue;
+      mcpServers[name] = stripElectronFromUserMcpEntry(entry);
+    }
+  }
+  if (Object.keys(mcpServers).length === 0) return null;
+  const dir = (0, import_node_fs30.mkdtempSync)((0, import_node_path33.join)((0, import_node_os9.tmpdir)(), "sideboard-mcp-"));
+  const cfgPath = (0, import_node_path33.join)(dir, "mcp.json");
+  (0, import_node_fs30.writeFileSync)(cfgPath, JSON.stringify({ mcpServers }, null, 2));
   return cfgPath;
 }
 async function writeInjectedMcpConfig(opts) {
   return writeMcpServersConfig(await buildInjectedMcpServers(opts));
 }
-var import_node_fs29, import_node_module, import_node_os9, import_node_path32, import_node_url, import_meta, SIDEBOARD_MCP_ALLOWED_TOOLS, SIDEBOARD_ARTIFACT_MCP_ALLOWED_TOOLS, SIDEBOARD_GITHUB_MCP_ALLOWED_TOOLS, SIDEBOARD_LINEAR_MCP_ALLOWED_TOOLS, SIDEBOARD_ABLETIME_MCP_ALLOWED_TOOLS, BRIGHTSY_MCP_ALLOWED_TOOLS, brightsyMcpCommandCache, BRIGHTSY_WORD;
+var import_node_fs30, import_node_module, import_node_os9, import_node_path33, import_node_url, import_meta, SIDEBOARD_MCP_ALLOWED_TOOLS, SIDEBOARD_ARTIFACT_MCP_ALLOWED_TOOLS, SIDEBOARD_GITHUB_MCP_ALLOWED_TOOLS, SIDEBOARD_LINEAR_MCP_ALLOWED_TOOLS, SIDEBOARD_ABLETIME_MCP_ALLOWED_TOOLS, BRIGHTSY_MCP_ALLOWED_TOOLS, brightsyMcpCommandCache, BRIGHTSY_WORD;
 var init_injected_mcp = __esm({
   "src/agents/injected-mcp.ts"() {
     "use strict";
-    import_node_fs29 = require("fs");
+    import_node_fs30 = require("fs");
     import_node_module = require("module");
     import_node_os9 = require("os");
-    import_node_path32 = require("path");
+    import_node_path33 = require("path");
     import_node_url = require("url");
     init_run();
     init_config();
@@ -12347,6 +12471,205 @@ var init_injected_mcp = __esm({
   }
 });
 
+// src/agents/user-mcp-config.ts
+function userCursorMcpConfigPath() {
+  return (0, import_node_path34.join)((0, import_node_os10.homedir)(), ".cursor", "mcp.json");
+}
+function userClaudeMcpConfigPath() {
+  return (0, import_node_path34.join)((0, import_node_os10.homedir)(), ".claude.json");
+}
+function asObject(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+  return { ...value };
+}
+function stripElectronSpawnEnv(env) {
+  if (!env) return void 0;
+  const next = { ...env };
+  delete next.ELECTRON_RUN_AS_NODE;
+  delete next.ELECTRON_RUN_AS_NODE;
+  return Object.keys(next).length > 0 ? next : void 0;
+}
+function mergeSideboardIntoMcpServersJson(existing, sideboard) {
+  const root = asObject(existing);
+  const servers = asObject(root.mcpServers);
+  const env = stripElectronSpawnEnv(sideboard.env);
+  servers.sideboard = {
+    type: "stdio",
+    command: sideboard.command,
+    ...sideboard.args && sideboard.args.length > 0 ? { args: sideboard.args } : {},
+    ...env ? { env } : {}
+  };
+  return { ...root, mcpServers: servers };
+}
+function writeMergedMcpServersJson(configPath, sideboard) {
+  let existing = {};
+  if ((0, import_node_fs31.existsSync)(configPath)) {
+    try {
+      existing = JSON.parse((0, import_node_fs31.readFileSync)(configPath, "utf8"));
+    } catch {
+      existing = {};
+    }
+  }
+  const next = mergeSideboardIntoMcpServersJson(existing, sideboard);
+  (0, import_node_fs31.mkdirSync)((0, import_node_path34.dirname)(configPath), { recursive: true });
+  (0, import_node_fs31.writeFileSync)(configPath, `${JSON.stringify(next, null, 2)}
+`);
+}
+function launchFromResolved(server) {
+  return {
+    command: server.command,
+    args: server.args,
+    env: {
+      ...server.env ?? {},
+      SIDEBOARD_APP_DATA: appDataDir()
+    }
+  };
+}
+async function registerPackagedUserMcpClients() {
+  const launch = launchFromResolved(await resolveSideboardMcpServer());
+  const cursor = userCursorMcpConfigPath();
+  writeMergedMcpServersJson(cursor, launch);
+  const claude = userClaudeMcpConfigPath();
+  if ((0, import_node_fs31.existsSync)(claude)) {
+    writeMergedMcpServersJson(claude, launch);
+    return { cursor, claude };
+  }
+  return { cursor };
+}
+var import_node_fs31, import_node_os10, import_node_path34;
+var init_user_mcp_config = __esm({
+  "src/agents/user-mcp-config.ts"() {
+    "use strict";
+    import_node_fs31 = require("fs");
+    import_node_os10 = require("os");
+    import_node_path34 = require("path");
+    init_paths();
+    init_injected_mcp();
+  }
+});
+
+// src/agents/orch-mcp-isolation.ts
+function isInjectedOrchMcpName(name) {
+  const n = name.trim().toLowerCase();
+  return n === "sideboard" || n === "brightsy" || n.startsWith("brightsy_");
+}
+function asObject2(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+  return value;
+}
+function listMcpNamesFromJsonMap(raw, key) {
+  return Object.keys(asObject2(asObject2(raw)[key])).filter((n) => n.trim());
+}
+function listMcpNamesFromCodexToml(text7) {
+  try {
+    const parsed = (0, import_smol_toml2.parse)(text7);
+    return Object.keys(asObject2(parsed.mcp_servers)).filter((n) => n.trim());
+  } catch {
+    return [];
+  }
+}
+function readJsonObject(path2) {
+  try {
+    return JSON.parse((0, import_node_fs32.readFileSync)(path2, "utf8"));
+  } catch {
+    return {};
+  }
+}
+function readText(path2) {
+  try {
+    return (0, import_node_fs32.readFileSync)(path2, "utf8");
+  } catch {
+    return "";
+  }
+}
+function userCodexConfigPaths(home = (0, import_node_os11.homedir)()) {
+  return [(0, import_node_path35.join)(home, ".codex", "config.toml"), (0, import_node_path35.join)(home, ".config", "codex", "config.toml")];
+}
+function userOpencodeConfigPaths(home = (0, import_node_os11.homedir)()) {
+  return [
+    (0, import_node_path35.join)(home, ".config", "opencode", "opencode.json"),
+    (0, import_node_path35.join)(home, ".config", "opencode", "opencode.jsonc")
+  ];
+}
+function userMcpNamesToDisable(opts) {
+  const keep = new Set(
+    [...opts.injectedNames ?? []].map((n) => n.trim().toLowerCase()).filter(Boolean)
+  );
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const raw of opts.names) {
+    const name = raw.trim();
+    if (!name) continue;
+    const key = name.toLowerCase();
+    if (seen.has(key) || keep.has(key) || isInjectedOrchMcpName(name)) continue;
+    seen.add(key);
+    out.push(name);
+  }
+  return out;
+}
+function listUserCodexMcpNames(home = (0, import_node_os11.homedir)()) {
+  const names = [];
+  for (const path2 of userCodexConfigPaths(home)) {
+    if (!(0, import_node_fs32.existsSync)(path2)) continue;
+    names.push(...listMcpNamesFromCodexToml(readText(path2)));
+  }
+  return names;
+}
+function listUserOpencodeMcpNames(home = (0, import_node_os11.homedir)()) {
+  const names = [];
+  for (const path2 of userOpencodeConfigPaths(home)) {
+    if (!(0, import_node_fs32.existsSync)(path2)) continue;
+    names.push(...listMcpNamesFromJsonMap(readJsonObject(path2), "mcp"));
+  }
+  return names;
+}
+function userClaudeMcpConfigObject(home = (0, import_node_os11.homedir)()) {
+  const claudePath = home === (0, import_node_os11.homedir)() ? userClaudeMcpConfigPath() : (0, import_node_path35.join)(home, ".claude.json");
+  if (!(0, import_node_fs32.existsSync)(claudePath)) return {};
+  return asObject2(asObject2(readJsonObject(claudePath)).mcpServers);
+}
+function listUserClaudeMcpServerEntries(home = (0, import_node_os11.homedir)()) {
+  const out = {};
+  for (const [rawName, value] of Object.entries(userClaudeMcpConfigObject(home))) {
+    const name = rawName.trim();
+    if (!name || isInjectedOrchMcpName(name)) continue;
+    if (!value || typeof value !== "object" || Array.isArray(value)) continue;
+    out[name] = value;
+  }
+  return out;
+}
+function toCodexDisableUserMcpArgs(names) {
+  const args = [];
+  for (const name of names) {
+    if (!/^[A-Za-z0-9_-]+$/.test(name)) continue;
+    args.push("-c", `mcp_servers.${name}.enabled=false`);
+  }
+  return args;
+}
+function toCodexUnattendedAppsArgs() {
+  return [
+    "-c",
+    "features.apps=false",
+    "-c",
+    "apps._default.enabled=false",
+    "-c",
+    "apps.posthog.enabled=false",
+    "-c",
+    "features.plugins=false"
+  ];
+}
+var import_node_fs32, import_node_os11, import_node_path35, import_smol_toml2;
+var init_orch_mcp_isolation = __esm({
+  "src/agents/orch-mcp-isolation.ts"() {
+    "use strict";
+    import_node_fs32 = require("fs");
+    import_node_os11 = require("os");
+    import_node_path35 = require("path");
+    import_smol_toml2 = require("smol-toml");
+    init_user_mcp_config();
+  }
+});
+
 // src/agents/types.ts
 function permissionMode(thread) {
   if (thread.sourceType === "orchestration") {
@@ -12395,16 +12718,8 @@ var init_types = __esm({
 });
 
 // src/agents/claude.ts
-async function loadMcpServers() {
-  if (mcpListCache && Date.now() - mcpListCache.at < 3e4) {
-    return mcpListCache.servers;
-  }
-  const claude = resolveClaudeExecutable();
-  const mcpText = await run(claude, ["mcp", "list"], { reject: false });
-  const servers = parseMcpList(`${mcpText.stdout}
-${mcpText.stderr}`);
-  mcpListCache = { at: Date.now(), servers };
-  return servers;
+function isLocalDevAppDataDir(dir = process.env.SIDEBOARD_APP_DATA) {
+  return /[/\\]\.sideboard[/\\]dev-app-data(?:[/\\]|$)/.test(dir ?? "");
 }
 function usageFromClaude(usage) {
   if (!usage) return null;
@@ -12712,14 +13027,15 @@ function parseIssuesJson(raw) {
   }
   return [];
 }
-var import_node_fs30, BASE_ALLOWED_TOOLS, CLAUDE_PRINT_BG_WAIT_CEILING_MS, CLAUDE_CHROME_ALLOWED_TOOLS, CLAUDE_PROMPT_ARG_MAX, mcpListCache, claudeAdapter;
+var import_node_fs33, BASE_ALLOWED_TOOLS, CLAUDE_PRINT_BG_WAIT_CEILING_MS, CLAUDE_CHROME_ALLOWED_TOOLS, CLAUDE_PROMPT_ARG_MAX, claudeAdapter;
 var init_claude = __esm({
   "src/agents/claude.ts"() {
     "use strict";
-    import_node_fs30 = require("fs");
+    import_node_fs33 = require("fs");
     init_run();
     init_app_settings();
     init_claude_mcp();
+    init_orch_mcp_isolation();
     init_error_detail();
     init_message_parts();
     init_injected_mcp();
@@ -12750,13 +13066,12 @@ var init_claude = __esm({
       "Skill(claude-in-chrome)"
     ];
     CLAUDE_PROMPT_ARG_MAX = 2e5;
-    mcpListCache = null;
     claudeAdapter = {
       kind: "claude",
       async detect() {
         const claude = resolveClaudeExecutable();
         if (claude !== "claude") {
-          if (!(0, import_node_fs30.existsSync)(claude)) {
+          if (!(0, import_node_fs33.existsSync)(claude)) {
             return {
               agent: "claude",
               installed: false,
@@ -12816,6 +13131,7 @@ var init_claude = __esm({
         });
         const injectedBrightsyNames = injectedServers.filter((s) => s.name === "brightsy" || s.name.startsWith("brightsy_")).map((s) => s.name);
         const chromeOn = claudeChromeEnabled();
+        const userMcpEntries = isOrchestrator ? {} : listUserClaudeMcpServerEntries();
         let allowedTools;
         if (isOrchestrator) {
           allowedTools = [
@@ -12824,10 +13140,9 @@ var init_claude = __esm({
             ...brightsyMcpAllowedTools(injectedBrightsyNames)
           ];
         } else {
-          const servers = await loadMcpServers();
           allowedTools = [
             ...BASE_ALLOWED_TOOLS,
-            ...mcpAllowTools(servers),
+            ...mcpAllowToolsFromNames(Object.keys(userMcpEntries)),
             ...sideboardWorktreeAllowedTools({
               github: true,
               linear: isLinearConnected(),
@@ -12852,12 +13167,10 @@ var init_claude = __esm({
         if (systemPrompt) {
           args.push("--append-system-prompt", systemPrompt);
         }
-        const mcpConfigPath = writeMcpServersConfig(injectedServers);
+        const mcpConfigPath = writeMcpServersConfig(injectedServers, userMcpEntries);
         if (mcpConfigPath) {
           args.push("--mcp-config", mcpConfigPath);
-          if (isOrchestrator) {
-            args.push("--strict-mcp-config");
-          }
+          args.push("--strict-mcp-config");
         }
         if (chromeOn) {
           args.push("--chrome");
@@ -12889,8 +13202,10 @@ var init_claude = __esm({
             CLAUDE_CODE_FORWARD_SUBAGENT_TEXT: "1",
             CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS: process.env.CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS ?? String(CLAUDE_PRINT_BG_WAIT_CEILING_MS),
             // `--strict-mcp-config` still fetches claude.ai connectors on some CLI
-            // builds (anthropics/claude-code#60252). Coordinators do not need them.
-            ...isOrchestrator ? { ENABLE_CLAUDEAI_MCP_SERVERS: "false" } : {}
+            // builds (anthropics/claude-code#60252). Coordinators never need them.
+            // Local `pnpm dev` also disables them: those HTTP connectors hang the
+            // first worktree turn when Electron's cwd is this Sideboard repo.
+            ...isOrchestrator || isLocalDevAppDataDir() ? { ENABLE_CLAUDEAI_MCP_SERVERS: "false" } : {}
           }
         };
       },
@@ -12952,249 +13267,65 @@ var init_claude = __esm({
             if (delta?.text) return withEventParentId({ type: "stdout", data: delta.text }, parentId);
             if (delta?.thinking) {
               return withEventParentId({ type: "thinking", data: delta.thinking }, parentId);
-            }
-            return null;
-          }
-          if (obj.type === "result") {
-            const events = [];
-            const errorDetail = claudeResultErrorDetail(obj);
-            if (errorDetail) {
-              events.push({ type: "stderr", data: errorDetail });
-            } else {
-              const text7 = obj.result;
-              if (typeof text7 === "string" && text7) events.push({ type: "stdout", data: text7 });
-            }
-            const usage = usageFromClaude(obj.usage);
-            if (usage) {
-              const costUsd = costUsdFromClaudeResult(obj);
-              if (costUsd != null) usage.costUsd = costUsd;
-              events.push({ type: "usage", data: usage, scope: "turn" });
-            }
-            if (events.length === 0) return null;
-            return events.length === 1 ? events[0] : events;
-          }
-          return null;
-        } catch {
-          return { type: "stdout", data: line };
-        }
-      },
-      async resolveSessionId(_worktreePath, cached) {
-        return cached;
-      },
-      async buildAttach(thread) {
-        const claude = resolveClaudeExecutable();
-        const sessionId = await this.resolveSessionId(thread.worktreePath, thread.sessionId);
-        const args = sessionId ? ["--resume", sessionId] : [];
-        if (claudeChromeEnabled()) {
-          args.push("--chrome");
-        }
-        return { file: claude, args, cwd: thread.worktreePath };
-      },
-      async listLinearIssues(_repoPath) {
-        const claude = resolveClaudeExecutable();
-        const prompt = "List my assigned Linear issues as JSON array only, no markdown. Each item: id, identifier, title, url, labels (string[]).";
-        const { stdout, exitCode } = await run(
-          claude,
-          [
-            "-p",
-            prompt,
-            "--output-format",
-            "json",
-            "--permission-mode",
-            "bypassPermissions",
-            "--allowedTools",
-            "mcp__linear__*"
-          ],
-          { reject: false }
-        );
-        if (exitCode !== 0) return [];
-        return parseIssuesJson(stdout);
-      }
-    };
-  }
-});
-
-// src/agents/user-mcp-config.ts
-function userCursorMcpConfigPath() {
-  return (0, import_node_path33.join)((0, import_node_os10.homedir)(), ".cursor", "mcp.json");
-}
-function userClaudeMcpConfigPath() {
-  return (0, import_node_path33.join)((0, import_node_os10.homedir)(), ".claude.json");
-}
-function asObject(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
-  return { ...value };
-}
-function stripElectronSpawnEnv(env) {
-  if (!env) return void 0;
-  const next = { ...env };
-  delete next.ELECTRON_RUN_AS_NODE;
-  delete next.ELECTRON_RUN_AS_NODE;
-  return Object.keys(next).length > 0 ? next : void 0;
-}
-function mergeSideboardIntoMcpServersJson(existing, sideboard) {
-  const root = asObject(existing);
-  const servers = asObject(root.mcpServers);
-  const env = stripElectronSpawnEnv(sideboard.env);
-  servers.sideboard = {
-    type: "stdio",
-    command: sideboard.command,
-    ...sideboard.args && sideboard.args.length > 0 ? { args: sideboard.args } : {},
-    ...env ? { env } : {}
-  };
-  return { ...root, mcpServers: servers };
-}
-function writeMergedMcpServersJson(configPath, sideboard) {
-  let existing = {};
-  if ((0, import_node_fs31.existsSync)(configPath)) {
-    try {
-      existing = JSON.parse((0, import_node_fs31.readFileSync)(configPath, "utf8"));
-    } catch {
-      existing = {};
-    }
-  }
-  const next = mergeSideboardIntoMcpServersJson(existing, sideboard);
-  (0, import_node_fs31.mkdirSync)((0, import_node_path33.dirname)(configPath), { recursive: true });
-  (0, import_node_fs31.writeFileSync)(configPath, `${JSON.stringify(next, null, 2)}
-`);
-}
-function launchFromResolved(server) {
-  return {
-    command: server.command,
-    args: server.args,
-    env: {
-      ...server.env ?? {},
-      SIDEBOARD_APP_DATA: appDataDir()
-    }
-  };
-}
-async function registerPackagedUserMcpClients() {
-  const launch = launchFromResolved(await resolveSideboardMcpServer());
-  const cursor = userCursorMcpConfigPath();
-  writeMergedMcpServersJson(cursor, launch);
-  const claude = userClaudeMcpConfigPath();
-  if ((0, import_node_fs31.existsSync)(claude)) {
-    writeMergedMcpServersJson(claude, launch);
-    return { cursor, claude };
-  }
-  return { cursor };
-}
-var import_node_fs31, import_node_os10, import_node_path33;
-var init_user_mcp_config = __esm({
-  "src/agents/user-mcp-config.ts"() {
-    "use strict";
-    import_node_fs31 = require("fs");
-    import_node_os10 = require("os");
-    import_node_path33 = require("path");
-    init_paths();
-    init_injected_mcp();
-  }
-});
-
-// src/agents/orch-mcp-isolation.ts
-function isInjectedOrchMcpName(name) {
-  const n = name.trim().toLowerCase();
-  return n === "sideboard" || n === "brightsy" || n.startsWith("brightsy_");
-}
-function asObject2(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
-  return value;
-}
-function listMcpNamesFromJsonMap(raw, key) {
-  return Object.keys(asObject2(asObject2(raw)[key])).filter((n) => n.trim());
-}
-function listMcpNamesFromCodexToml(text7) {
-  try {
-    const parsed = (0, import_smol_toml2.parse)(text7);
-    return Object.keys(asObject2(parsed.mcp_servers)).filter((n) => n.trim());
-  } catch {
-    return [];
-  }
-}
-function readJsonObject(path2) {
-  try {
-    return JSON.parse((0, import_node_fs32.readFileSync)(path2, "utf8"));
-  } catch {
-    return {};
-  }
-}
-function readText(path2) {
-  try {
-    return (0, import_node_fs32.readFileSync)(path2, "utf8");
-  } catch {
-    return "";
-  }
-}
-function userCodexConfigPaths(home = (0, import_node_os11.homedir)()) {
-  return [(0, import_node_path34.join)(home, ".codex", "config.toml"), (0, import_node_path34.join)(home, ".config", "codex", "config.toml")];
-}
-function userOpencodeConfigPaths(home = (0, import_node_os11.homedir)()) {
-  return [
-    (0, import_node_path34.join)(home, ".config", "opencode", "opencode.json"),
-    (0, import_node_path34.join)(home, ".config", "opencode", "opencode.jsonc")
-  ];
-}
-function userMcpNamesToDisable(opts) {
-  const keep = new Set(
-    [...opts.injectedNames ?? []].map((n) => n.trim().toLowerCase()).filter(Boolean)
-  );
-  const out = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const raw of opts.names) {
-    const name = raw.trim();
-    if (!name) continue;
-    const key = name.toLowerCase();
-    if (seen.has(key) || keep.has(key) || isInjectedOrchMcpName(name)) continue;
-    seen.add(key);
-    out.push(name);
-  }
-  return out;
-}
-function listUserCodexMcpNames(home = (0, import_node_os11.homedir)()) {
-  const names = [];
-  for (const path2 of userCodexConfigPaths(home)) {
-    if (!(0, import_node_fs32.existsSync)(path2)) continue;
-    names.push(...listMcpNamesFromCodexToml(readText(path2)));
-  }
-  return names;
-}
-function listUserOpencodeMcpNames(home = (0, import_node_os11.homedir)()) {
-  const names = [];
-  for (const path2 of userOpencodeConfigPaths(home)) {
-    if (!(0, import_node_fs32.existsSync)(path2)) continue;
-    names.push(...listMcpNamesFromJsonMap(readJsonObject(path2), "mcp"));
-  }
-  return names;
-}
-function toCodexDisableUserMcpArgs(names) {
-  const args = [];
-  for (const name of names) {
-    if (!/^[A-Za-z0-9_-]+$/.test(name)) continue;
-    args.push("-c", `mcp_servers.${name}.enabled=false`);
-  }
-  return args;
-}
-function toCodexUnattendedAppsArgs() {
-  return [
-    "-c",
-    "features.apps=false",
-    "-c",
-    "apps._default.enabled=false",
-    "-c",
-    "apps.posthog.enabled=false",
-    "-c",
-    "features.plugins=false"
-  ];
-}
-var import_node_fs32, import_node_os11, import_node_path34, import_smol_toml2;
-var init_orch_mcp_isolation = __esm({
-  "src/agents/orch-mcp-isolation.ts"() {
-    "use strict";
-    import_node_fs32 = require("fs");
-    import_node_os11 = require("os");
-    import_node_path34 = require("path");
-    import_smol_toml2 = require("smol-toml");
-    init_user_mcp_config();
+            }
+            return null;
+          }
+          if (obj.type === "result") {
+            const events = [];
+            const errorDetail = claudeResultErrorDetail(obj);
+            if (errorDetail) {
+              events.push({ type: "stderr", data: errorDetail });
+            } else {
+              const text7 = obj.result;
+              if (typeof text7 === "string" && text7) events.push({ type: "stdout", data: text7 });
+            }
+            const usage = usageFromClaude(obj.usage);
+            if (usage) {
+              const costUsd = costUsdFromClaudeResult(obj);
+              if (costUsd != null) usage.costUsd = costUsd;
+              events.push({ type: "usage", data: usage, scope: "turn" });
+            }
+            if (events.length === 0) return null;
+            return events.length === 1 ? events[0] : events;
+          }
+          return null;
+        } catch {
+          return { type: "stdout", data: line };
+        }
+      },
+      async resolveSessionId(_worktreePath, cached) {
+        return cached;
+      },
+      async buildAttach(thread) {
+        const claude = resolveClaudeExecutable();
+        const sessionId = await this.resolveSessionId(thread.worktreePath, thread.sessionId);
+        const args = sessionId ? ["--resume", sessionId] : [];
+        if (claudeChromeEnabled()) {
+          args.push("--chrome");
+        }
+        return { file: claude, args, cwd: thread.worktreePath };
+      },
+      async listLinearIssues(_repoPath) {
+        const claude = resolveClaudeExecutable();
+        const prompt = "List my assigned Linear issues as JSON array only, no markdown. Each item: id, identifier, title, url, labels (string[]).";
+        const { stdout, exitCode } = await run(
+          claude,
+          [
+            "-p",
+            prompt,
+            "--output-format",
+            "json",
+            "--permission-mode",
+            "bypassPermissions",
+            "--allowedTools",
+            "mcp__linear__*"
+          ],
+          { reject: false }
+        );
+        if (exitCode !== 0) return [];
+        return parseIssuesJson(stdout);
+      }
+    };
   }
 });
 
@@ -13208,7 +13339,7 @@ async function listCodexModels() {
   if (codex === "codex") {
     const which = await run("which", ["codex"], { reject: false });
     if (which.exitCode !== 0) return FALLBACK_CODEX_MODELS;
-  } else if (!(0, import_node_fs33.existsSync)(codex)) {
+  } else if (!(0, import_node_fs34.existsSync)(codex)) {
     return FALLBACK_CODEX_MODELS;
   }
   const listed = await run(codex, ["debug", "models"], { reject: false });
@@ -13243,12 +13374,12 @@ function usageFromCodex(usage) {
 }
 function codexConfigHasNetworkAccess() {
   const candidates = [
-    (0, import_node_path35.join)((0, import_node_os12.homedir)(), ".codex", "config.toml"),
-    (0, import_node_path35.join)((0, import_node_os12.homedir)(), ".config", "codex", "config.toml")
+    (0, import_node_path36.join)((0, import_node_os12.homedir)(), ".codex", "config.toml"),
+    (0, import_node_path36.join)((0, import_node_os12.homedir)(), ".config", "codex", "config.toml")
   ];
   for (const path2 of candidates) {
-    if (!(0, import_node_fs33.existsSync)(path2)) continue;
-    const text7 = (0, import_node_fs33.readFileSync)(path2, "utf8");
+    if (!(0, import_node_fs34.existsSync)(path2)) continue;
+    const text7 = (0, import_node_fs34.readFileSync)(path2, "utf8");
     if (/network_access\s*=\s*true/.test(text7)) return true;
   }
   return false;
@@ -13280,21 +13411,21 @@ function asRecord2(value) {
   return void 0;
 }
 function codexLooksAuthenticated() {
-  const authPath = (0, import_node_path35.join)((0, import_node_os12.homedir)(), ".codex", "auth.json");
-  if (!(0, import_node_fs33.existsSync)(authPath)) return false;
+  const authPath = (0, import_node_path36.join)((0, import_node_os12.homedir)(), ".codex", "auth.json");
+  if (!(0, import_node_fs34.existsSync)(authPath)) return false;
   try {
-    return (0, import_node_fs33.statSync)(authPath).size > 2;
+    return (0, import_node_fs34.statSync)(authPath).size > 2;
   } catch {
     return false;
   }
 }
-var import_node_fs33, import_node_os12, import_node_path35, CODEX_PROMPT_ARG_MAX, FALLBACK_CODEX_MODELS, cachedCodexModels, CODEX_MODEL_CACHE_MS, codexAdapter;
+var import_node_fs34, import_node_os12, import_node_path36, CODEX_PROMPT_ARG_MAX, FALLBACK_CODEX_MODELS, cachedCodexModels, CODEX_MODEL_CACHE_MS, codexAdapter;
 var init_codex = __esm({
   "src/agents/codex.ts"() {
     "use strict";
-    import_node_fs33 = require("fs");
+    import_node_fs34 = require("fs");
     import_node_os12 = require("os");
-    import_node_path35 = require("path");
+    import_node_path36 = require("path");
     init_run();
     init_app_settings();
     init_global_workspace();
@@ -13320,7 +13451,7 @@ var init_codex = __esm({
       async detect() {
         const codex = resolveAgentExecutable("codex");
         if (codex !== "codex") {
-          if (!(0, import_node_fs33.existsSync)(codex)) {
+          if (!(0, import_node_fs34.existsSync)(codex)) {
             return {
               agent: "codex",
               installed: false,
@@ -13820,21 +13951,21 @@ function platformRipgrepPackage() {
 }
 function usableRipgrepPath(candidate) {
   const raw = candidate?.trim();
-  if (!raw || !(0, import_node_path36.isAbsolute)(raw)) return null;
+  if (!raw || !(0, import_node_path37.isAbsolute)(raw)) return null;
   const readable = nodeReadableScriptPath(raw);
-  if (!(0, import_node_fs34.existsSync)(readable) || isAsarPath(readable)) return null;
+  if (!(0, import_node_fs35.existsSync)(readable) || isAsarPath(readable)) return null;
   return readable;
 }
 function walkForBundledRipgrep(startFile) {
   if (!startFile) return null;
   const pkg = platformRipgrepPackage();
   const name = rgBinaryName();
-  let dir = (0, import_node_path36.dirname)((0, import_node_path36.resolve)(startFile));
-  const root = (0, import_node_path36.parse)(dir).root;
+  let dir = (0, import_node_path37.dirname)((0, import_node_path37.resolve)(startFile));
+  const root = (0, import_node_path37.parse)(dir).root;
   while (dir !== root) {
-    const hit = usableRipgrepPath((0, import_node_path36.join)(dir, "node_modules", pkg, "bin", name));
+    const hit = usableRipgrepPath((0, import_node_path37.join)(dir, "node_modules", pkg, "bin", name));
     if (hit) return hit;
-    const next = (0, import_node_path36.dirname)(dir);
+    const next = (0, import_node_path37.dirname)(dir);
     if (next === dir) break;
     dir = next;
   }
@@ -13844,7 +13975,7 @@ function requireResolveBundledRipgrep(fromFile) {
   try {
     const req = (0, import_node_module2.createRequire)(fromFile);
     const pkgJson = req.resolve(`${platformRipgrepPackage()}/package.json`);
-    return usableRipgrepPath((0, import_node_path36.join)((0, import_node_path36.dirname)(pkgJson), "bin", rgBinaryName()));
+    return usableRipgrepPath((0, import_node_path37.join)((0, import_node_path37.dirname)(pkgJson), "bin", rgBinaryName()));
   } catch {
     return null;
   }
@@ -13866,13 +13997,13 @@ function cursorRipgrepEnv(opts) {
   const path2 = resolveCursorRipgrepPath(opts);
   return path2 ? { [RIPGREP_ENV]: path2 } : {};
 }
-var import_node_fs34, import_node_module2, import_node_path36, RIPGREP_ENV;
+var import_node_fs35, import_node_module2, import_node_path37, RIPGREP_ENV;
 var init_cursor_ripgrep = __esm({
   "src/agents/cursor-ripgrep.ts"() {
     "use strict";
-    import_node_fs34 = require("fs");
+    import_node_fs35 = require("fs");
     import_node_module2 = require("module");
-    import_node_path36 = require("path");
+    import_node_path37 = require("path");
     init_node_launch();
     init_packaged_runtime();
     RIPGREP_ENV = "CURSOR_RIPGREP_PATH";
@@ -13921,11 +14052,11 @@ function entryDir() {
   const cjsDir = typeof __dirname !== "undefined" ? __dirname : "";
   if (cjsDir) return cjsDir;
   try {
-    return (0, import_node_path37.dirname)((0, import_node_url2.fileURLToPath)(import_meta2.url));
+    return (0, import_node_path38.dirname)((0, import_node_url2.fileURLToPath)(import_meta2.url));
   } catch {
     try {
       const req = (0, import_node_module3.createRequire)(process.cwd() + "/");
-      return (0, import_node_path37.dirname)(req.resolve("@sideboard-ai/core"));
+      return (0, import_node_path38.dirname)(req.resolve("@sideboard-ai/core"));
     } catch {
       return process.cwd();
     }
@@ -13936,27 +14067,27 @@ function cursorRunnerPath() {
   if (packaged) return packaged;
   const root = entryDir();
   const candidates = [
-    (0, import_node_path37.join)(root, "agents", "cursor-runner.js"),
-    (0, import_node_path37.join)(root, "agents", "cursor-runner.cjs"),
+    (0, import_node_path38.join)(root, "agents", "cursor-runner.js"),
+    (0, import_node_path38.join)(root, "agents", "cursor-runner.cjs"),
     // If somehow resolved from package root instead of dist/
-    (0, import_node_path37.join)(root, "dist", "agents", "cursor-runner.js"),
-    (0, import_node_path37.join)(root, "dist", "agents", "cursor-runner.cjs"),
+    (0, import_node_path38.join)(root, "dist", "agents", "cursor-runner.js"),
+    (0, import_node_path38.join)(root, "dist", "agents", "cursor-runner.cjs"),
     // Source tree (dev): packages/core/src/agents/cursor-runner.ts
-    (0, import_node_path37.join)(root, "cursor-runner.ts"),
-    (0, import_node_path37.join)(root, "src", "agents", "cursor-runner.ts")
+    (0, import_node_path38.join)(root, "cursor-runner.ts"),
+    (0, import_node_path38.join)(root, "src", "agents", "cursor-runner.ts")
   ];
   for (const candidate of candidates) {
-    if ((0, import_node_fs35.existsSync)(candidate)) return candidate;
+    if ((0, import_node_fs36.existsSync)(candidate)) return candidate;
   }
   return candidates[0];
 }
-var import_node_fs35, import_node_module3, import_node_path37, import_node_url2, import_sdk, import_meta2, FALLBACK_CURSOR_MODELS, cachedModels, MODEL_CACHE_MS, cursorAdapter;
+var import_node_fs36, import_node_module3, import_node_path38, import_node_url2, import_sdk, import_meta2, FALLBACK_CURSOR_MODELS, cachedModels, MODEL_CACHE_MS, cursorAdapter;
 var init_cursor = __esm({
   "src/agents/cursor.ts"() {
     "use strict";
-    import_node_fs35 = require("fs");
+    import_node_fs36 = require("fs");
     import_node_module3 = require("module");
-    import_node_path37 = require("path");
+    import_node_path38 = require("path");
     import_node_url2 = require("url");
     import_sdk = require("@cursor/sdk");
     init_run();
@@ -14108,7 +14239,7 @@ async function listOpencodeModels() {
   if (opencode === "opencode") {
     const which = await run("which", ["opencode"], { reject: false });
     if (which.exitCode !== 0) return FALLBACK_OPENCODE_MODELS;
-  } else if (!(0, import_node_fs36.existsSync)(opencode)) {
+  } else if (!(0, import_node_fs37.existsSync)(opencode)) {
     return FALLBACK_OPENCODE_MODELS;
   }
   const listed = await run(opencode, ["models"], { reject: false });
@@ -14138,11 +14269,11 @@ function usageFromOpencode(tokens) {
     cacheWriteTokens: tokens.cache?.write ? Number(tokens.cache.write) : void 0
   };
 }
-var import_node_fs36, FALLBACK_OPENCODE_MODELS, cachedOpencodeModels, OPENCODE_MODEL_CACHE_MS, opencodeAdapter;
+var import_node_fs37, FALLBACK_OPENCODE_MODELS, cachedOpencodeModels, OPENCODE_MODEL_CACHE_MS, opencodeAdapter;
 var init_opencode = __esm({
   "src/agents/opencode.ts"() {
     "use strict";
-    import_node_fs36 = require("fs");
+    import_node_fs37 = require("fs");
     init_run();
     init_app_settings();
     init_global_workspace();
@@ -14170,7 +14301,7 @@ var init_opencode = __esm({
       async detect() {
         const opencode = resolveAgentExecutable("opencode");
         if (opencode !== "opencode") {
-          if (!(0, import_node_fs36.existsSync)(opencode)) {
+          if (!(0, import_node_fs37.existsSync)(opencode)) {
             return {
               agent: "opencode",
               installed: false,
@@ -14889,14 +15020,14 @@ function accessTokenFromCredentialsJson(raw) {
   }
 }
 function claudeCredentialsPath() {
-  const root = process.env.CLAUDE_CONFIG_DIR?.trim() || (0, import_node_path38.join)((0, import_node_os13.homedir)(), ".claude");
-  return (0, import_node_path38.join)(root, ".credentials.json");
+  const root = process.env.CLAUDE_CONFIG_DIR?.trim() || (0, import_node_path39.join)((0, import_node_os13.homedir)(), ".claude");
+  return (0, import_node_path39.join)(root, ".credentials.json");
 }
 async function readFileAccessToken() {
   const path2 = claudeCredentialsPath();
-  if (!(0, import_node_fs37.existsSync)(path2)) return null;
+  if (!(0, import_node_fs38.existsSync)(path2)) return null;
   try {
-    return accessTokenFromCredentialsJson((0, import_node_fs37.readFileSync)(path2, "utf8"));
+    return accessTokenFromCredentialsJson((0, import_node_fs38.readFileSync)(path2, "utf8"));
   } catch {
     return null;
   }
@@ -15000,13 +15131,13 @@ async function getClaudePlanUsage(opts = {}) {
   })();
   return inflight;
 }
-var import_node_fs37, import_node_os13, import_node_path38, CLAUDE_OAUTH_USAGE_URL, CLAUDE_USAGE_TTL_MS, CLAUDE_USAGE_ERROR_TTL_MS, CLAUDE_USAGE_STALE_OK_MS, KEYCHAIN_SERVICES, cache, errorUntil, inflight, lastGood, claudeVersion;
+var import_node_fs38, import_node_os13, import_node_path39, CLAUDE_OAUTH_USAGE_URL, CLAUDE_USAGE_TTL_MS, CLAUDE_USAGE_ERROR_TTL_MS, CLAUDE_USAGE_STALE_OK_MS, KEYCHAIN_SERVICES, cache, errorUntil, inflight, lastGood, claudeVersion;
 var init_claude_usage_client = __esm({
   "src/agents/claude-usage-client.ts"() {
     "use strict";
-    import_node_fs37 = require("fs");
+    import_node_fs38 = require("fs");
     import_node_os13 = require("os");
-    import_node_path38 = require("path");
+    import_node_path39 = require("path");
     init_run();
     init_fetch();
     init_app_settings();
@@ -15367,17 +15498,79 @@ var init_agents = __esm({
   }
 });
 
+// src/hook/agent-host-env.ts
+function isAgentHostEnvKey(key) {
+  if (DROP_EXACT.has(key)) return true;
+  return DROP_PREFIXES.some((prefix) => key.startsWith(prefix));
+}
+function stripHostToolingPath(pathValue) {
+  if (!pathValue?.trim()) return "";
+  return pathValue.split(import_node_path40.delimiter).filter((part) => part && !HOST_PATH_NOISE.test(part.replace(/\\/g, "/"))).join(import_node_path40.delimiter);
+}
+function sanitizeAgentHostEnv(env, cwd) {
+  for (const key of Object.keys(env)) {
+    if (isAgentHostEnvKey(key)) delete env[key];
+  }
+  env.PATH = stripHostToolingPath(env.PATH);
+  const worktree = cwd?.trim();
+  if (worktree) {
+    env.PWD = worktree;
+    env.INIT_CWD = worktree;
+  }
+  return env;
+}
+var import_node_path40, DROP_EXACT, DROP_PREFIXES, HOST_PATH_NOISE;
+var init_agent_host_env = __esm({
+  "src/hook/agent-host-env.ts"() {
+    "use strict";
+    import_node_path40 = require("path");
+    DROP_EXACT = /* @__PURE__ */ new Set([
+      "NODE_PATH",
+      "NODE_ENV_ELECTRON_VITE",
+      "INIT_CWD",
+      "npm_command",
+      "npm_execpath",
+      "npm_node_execpath",
+      "npm_lifecycle_event",
+      "npm_lifecycle_script",
+      "PNPM_SCRIPT_SRC_DIR",
+      "PNPM_STORE_DIR",
+      "PORT",
+      "SIDEBOARD_ROOT_PATH",
+      "SIDEBOARD_IS_LOCAL",
+      "SIDEBOARD_WORKSPACE_PATH",
+      "SIDEBOARD_WORKSPACE_NAME",
+      "SIDEBOARD_PORT",
+      "CONDUCTOR_ROOT_PATH",
+      "CONDUCTOR_IS_LOCAL",
+      "CONDUCTOR_WORKSPACE_PATH",
+      "CONDUCTOR_WORKSPACE_NAME",
+      "CONDUCTOR_PORT",
+      "CONDUCTOR_DEFAULT_BRANCH",
+      "SIDEBOARD_DEFAULT_BRANCH"
+    ]);
+    DROP_PREFIXES = [
+      "npm_package_",
+      "npm_config_",
+      "PNPM_",
+      "SIDEBOARD_PORT_",
+      "CONDUCTOR_PORT_"
+    ];
+    HOST_PATH_NOISE = /(?:^|\/)node_modules\/\.bin(?:\/|$)|node-gyp-bin|electron-vite/i;
+  }
+});
+
 // src/hook/worktree-pkg-cache.ts
 function worktreePkgCacheRoot(worktreePath) {
-  return (0, import_node_path39.join)(worktreePath, WORKTREE_PKG_CACHE_REL);
+  return (0, import_node_path41.join)(worktreePath, WORKTREE_PKG_CACHE_REL);
 }
 function worktreePkgCacheEnv(worktreePath) {
   const root = worktreePkgCacheRoot(worktreePath);
-  const store = (0, import_node_path39.join)(root, "pnpm-store");
-  const pnpmCache = (0, import_node_path39.join)(root, "pnpm");
-  const npmCache = (0, import_node_path39.join)(root, "npm");
-  const nodeGyp = (0, import_node_path39.join)(root, "node-gyp");
-  const electron = (0, import_node_path39.join)(root, "electron");
+  const store = (0, import_node_path41.join)(root, "pnpm-store");
+  const pnpmCache = (0, import_node_path41.join)(root, "pnpm");
+  const npmCache = (0, import_node_path41.join)(root, "npm");
+  const nodeGyp = (0, import_node_path41.join)(root, "node-gyp");
+  const electron = (0, import_node_path41.join)(root, "electron");
   return {
     npm_config_store_dir: store,
     PNPM_STORE_DIR: store,
@@ -15399,8 +15592,8 @@ function fillGroup(env, keys, values) {
   }
 }
 function ensureWorktreePkgCacheDirs(worktreePath) {
-  if (!(0, import_node_fs38.existsSync)(worktreePath)) return;
-  (0, import_node_fs38.mkdirSync)(worktreePkgCacheRoot(worktreePath), { recursive: true });
+  if (!(0, import_node_fs39.existsSync)(worktreePath)) return;
+  (0, import_node_fs39.mkdirSync)(worktreePkgCacheRoot(worktreePath), { recursive: true });
 }
 function applyWorktreePkgCacheEnv(env, worktreePath) {
   const cwd = worktreePath.trim();
@@ -15413,12 +15606,12 @@ function applyWorktreePkgCacheEnv(env, worktreePath) {
   fillGroup(env, ["electron_config_cache"], next);
   ensureWorktreePkgCacheDirs(cwd);
 }
-var import_node_fs38, import_node_path39, WORKTREE_PKG_CACHE_REL;
+var import_node_fs39, import_node_path41, WORKTREE_PKG_CACHE_REL;
 var init_worktree_pkg_cache = __esm({
   "src/hook/worktree-pkg-cache.ts"() {
     "use strict";
-    import_node_fs38 = require("fs");
-    import_node_path39 = require("path");
+    import_node_fs39 = require("fs");
+    import_node_path41 = require("path");
     WORKTREE_PKG_CACHE_REL = ".context/.sideboard/pkg-cache";
   }
 });
@@ -15516,26 +15709,54 @@ async function spawnAgentTurn(thread, input, onEvent) {
     assertOrchestratorCapableAgent(thread.agent);
   }
   const adapter = getAdapter(thread.agent);
-  const cmd = await adapter.buildTurn(thread, input);
+  const orch = isOrchestratorThread(thread);
+  traceTurn("spawn.buildTurn.start", {
+    threadId: thread.id,
+    agent: thread.agent,
+    orch,
+    cwd: thread.worktreePath
+  });
+  const cmd = await withTimeout(
+    adapter.buildTurn(thread, input),
+    2e4,
+    "buildTurn"
+  );
+  traceTurn("spawn.buildTurn.done", { file: cmd.file, cwd: cmd.cwd });
   if (cmd.cwd !== thread.worktreePath) {
     throw new Error(
       `Agent cwd must be the thread worktree (got ${cmd.cwd}, expected ${thread.worktreePath})`
     );
   }
   const env = childEnvWithAppSettings(cmd.env);
+  sanitizeAgentHostEnv(env, cmd.cwd);
+  ensureAgentPath(env);
   applyPromptCacheTtlEnv(thread.agent, env);
   applyAgentRunnerHeapEnv(env);
-  if (!isOrchestratorThread(thread)) {
+  if (!orch) {
     applyWorktreePkgCacheEnv(env, thread.worktreePath);
   }
   try {
-    if (isOrchestratorThread(thread)) {
-      mergeAgentGitAuthEnv(env, await resolveAgentGitAuthEnv(env));
-    } else {
-      mergeAgentGitAuthEnv(env, await originGhRepoEnv(thread.worktreePath, { env }));
+    traceTurn("spawn.gitAuth.start");
+    mergeAgentGitAuthEnv(
+      env,
+      await withTimeout(
+        resolveAgentGitAuthEnv(env, { cwd: thread.worktreePath }),
+        8e3,
+        "gitAuth"
+      )
+    );
+    if (!orch) {
+      const slug = await withTimeout(
+        resolveGithubRepoSlug(thread.worktreePath),
+        8e3,
+        "resolveGithubRepoSlug"
+      );
+      if (slug) env.GH_REPO = slug;
     }
+    traceTurn("spawn.gitAuth.done", { ghRepo: env.GH_REPO ?? null });
   } catch (err) {
     const detail = err instanceof Error ? err.message : String(err);
+    traceTurn("spawn.gitAuth.fail", { detail });
     console.warn(`[sideboard] git auth env failed (${thread.worktreePath}): ${detail}`);
   }
   const child = (0, import_execa3.execa)(cmd.file, cmd.args, {
@@ -15548,6 +15769,7 @@ async function spawnAgentTurn(thread, input, onEvent) {
     // so Claude doesn't wait ~3s for an empty pipe.
     stdin: cmd.stdin != null ? "pipe" : "ignore"
   });
+  traceTurn("spawn.execa", { pid: child.pid ?? null, file: cmd.file });
   if (cmd.stdin != null && child.stdin) {
     child.stdin.write(cmd.stdin);
     child.stdin.end();
@@ -15631,10 +15853,12 @@ var init_spawn = __esm({
     init_git_auth_mode();
     init_app_settings();
     init_global_workspace();
+    init_turn_trace();
     init_brightsy();
     init_agents();
     init_orchestrator_capable();
     init_message_parts();
+    init_agent_host_env();
     init_worktree_pkg_cache();
     init_node_launch();
     init_path();
@@ -16622,21 +16846,21 @@ function shouldRefreshReviewRequestTemplate(content) {
   return LEGACY_REVIEW_TEMPLATE_MARKERS.every((m) => trimmed.includes(m));
 }
 function readTextIfPresent(abs) {
-  if (!(0, import_node_fs39.existsSync)(abs)) return null;
+  if (!(0, import_node_fs40.existsSync)(abs)) return null;
   try {
-    const content = (0, import_node_fs39.readFileSync)(abs, "utf8");
+    const content = (0, import_node_fs40.readFileSync)(abs, "utf8");
     return content.trim() ? content : null;
   } catch {
     return null;
   }
 }
 function readLocalGuidelines(worktreePath) {
-  const localAbs = (0, import_node_path40.join)(worktreePath, REVIEW_REQUEST_PATH);
+  const localAbs = (0, import_node_path42.join)(worktreePath, REVIEW_REQUEST_PATH);
   const localContent = readTextIfPresent(localAbs);
   if (localContent && !shouldRefreshReviewRequestTemplate(localContent)) {
     return { path: REVIEW_REQUEST_PATH, content: localContent };
   }
-  const legacyAbs = (0, import_node_path40.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH);
+  const legacyAbs = (0, import_node_path42.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH);
   const legacyContent = readTextIfPresent(legacyAbs);
   if (legacyContent && !shouldRefreshReviewRequestTemplate(legacyContent)) {
     return { path: LEGACY_REVIEW_REQUEST_PATH, content: legacyContent };
@@ -16660,27 +16884,27 @@ function contextGuidelines(content, source) {
   };
 }
 function writeContextGuidelines(worktreePath, content) {
-  const abs = (0, import_node_path40.join)(worktreePath, CONTEXT_REVIEW_PATH);
-  (0, import_node_fs39.mkdirSync)((0, import_node_path40.dirname)(abs), { recursive: true });
+  const abs = (0, import_node_path42.join)(worktreePath, CONTEXT_REVIEW_PATH);
+  (0, import_node_fs40.mkdirSync)((0, import_node_path42.dirname)(abs), { recursive: true });
   const body = content.endsWith("\n") ? content : `${content}
 `;
-  (0, import_node_fs39.writeFileSync)(abs, body, "utf8");
+  (0, import_node_fs40.writeFileSync)(abs, body, "utf8");
   return body;
 }
 function readSideboardReview(worktreePath, repoPath) {
-  const fromWorktree = readTextIfPresent((0, import_node_path40.join)(worktreePath, REPO_REVIEW_PATH));
+  const fromWorktree = readTextIfPresent((0, import_node_path42.join)(worktreePath, REPO_REVIEW_PATH));
   if (fromWorktree) return fromWorktree;
   const repo = repoPath?.replace(/\/+$/, "");
   const wt = worktreePath.replace(/\/+$/, "");
   if (!repo || repo === wt) return null;
-  return readTextIfPresent((0, import_node_path40.join)(repo, REPO_REVIEW_PATH));
+  return readTextIfPresent((0, import_node_path42.join)(repo, REPO_REVIEW_PATH));
 }
 function ensureReviewGuidelinesFile(worktreePath, repoPath) {
-  const skillContent = readTextIfPresent((0, import_node_path40.join)(worktreePath, REVIEW_SKILL_PATH));
+  const skillContent = readTextIfPresent((0, import_node_path42.join)(worktreePath, REVIEW_SKILL_PATH));
   if (skillContent) {
     return { ...skillGuidelines(skillContent, "skill"), wrote: false };
   }
-  const contextContent = readTextIfPresent((0, import_node_path40.join)(worktreePath, CONTEXT_REVIEW_PATH));
+  const contextContent = readTextIfPresent((0, import_node_path42.join)(worktreePath, CONTEXT_REVIEW_PATH));
   if (contextContent && !shouldRefreshReviewRequestTemplate(contextContent)) {
     return { ...contextGuidelines(contextContent, "local"), wrote: false };
   }
@@ -16718,7 +16942,7 @@ function buildReviewRequestAttachment(content, opts) {
   };
 }
 function readExistingReviewRequestFile(worktreePath) {
-  return readTextIfPresent((0, import_node_path40.join)(worktreePath, REVIEW_SKILL_PATH)) ?? readTextIfPresent((0, import_node_path40.join)(worktreePath, CONTEXT_REVIEW_PATH)) ?? readTextIfPresent((0, import_node_path40.join)(worktreePath, REPO_REVIEW_PATH)) ?? readTextIfPresent((0, import_node_path40.join)(worktreePath, REVIEW_REQUEST_PATH)) ?? readTextIfPresent((0, import_node_path40.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH));
+  return readTextIfPresent((0, import_node_path42.join)(worktreePath, REVIEW_SKILL_PATH)) ?? readTextIfPresent((0, import_node_path42.join)(worktreePath, CONTEXT_REVIEW_PATH)) ?? readTextIfPresent((0, import_node_path42.join)(worktreePath, REPO_REVIEW_PATH)) ?? readTextIfPresent((0, import_node_path42.join)(worktreePath, REVIEW_REQUEST_PATH)) ?? readTextIfPresent((0, import_node_path42.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH));
 }
 async function requestReview(threadRef, send2) {
   const from = findThreadByRef(threadRef);
@@ -16745,13 +16969,13 @@ async function requestReview(threadRef, send2) {
   const started = await send2(tab.id, REVIEW_REQUEST_PREFILL);
   return { tab: started, from };
 }
-var import_node_crypto9, import_node_fs39, import_node_path40, REPO_REVIEW_PATH, REPO_REVIEW_NAME, CONTEXT_REVIEW_PATH, REVIEW_REQUEST_PATH, LEGACY_REVIEW_REQUEST_PATH, REVIEW_REQUEST_NAME, REVIEW_REQUEST_PREFILL, LEGACY_REVIEW_TEMPLATE_MARKERS;
+var import_node_crypto9, import_node_fs40, import_node_path42, REPO_REVIEW_PATH, REPO_REVIEW_NAME, CONTEXT_REVIEW_PATH, REVIEW_REQUEST_PATH, LEGACY_REVIEW_REQUEST_PATH, REVIEW_REQUEST_NAME, REVIEW_REQUEST_PREFILL, LEGACY_REVIEW_TEMPLATE_MARKERS;
 var init_request_review = __esm({
   "src/review/request-review.ts"() {
     "use strict";
     import_node_crypto9 = require("crypto");
-    import_node_fs39 = require("fs");
-    import_node_path40 = require("path");
+    import_node_fs40 = require("fs");
+    import_node_path42 = require("path");
     init_global_workspace();
     init_chat_tabs();
     init_thread_store();
@@ -16777,9 +17001,9 @@ function matchSimpleGlob(pattern, name) {
   return new RegExp(`^${escaped}$`).test(name);
 }
 function readWorktreeInclude(repoPath) {
-  const path2 = (0, import_node_path41.join)(repoPath, ".worktreeinclude");
-  if (!(0, import_node_fs40.existsSync)(path2)) return [];
-  return (0, import_node_fs40.readFileSync)(path2, "utf8").split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
+  const path2 = (0, import_node_path43.join)(repoPath, ".worktreeinclude");
+  if (!(0, import_node_fs41.existsSync)(path2)) return [];
+  return (0, import_node_fs41.readFileSync)(path2, "utf8").split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
 }
 function resolveFilesToCopy(repoPath) {
   const fromInclude = readWorktreeInclude(repoPath);
@@ -16789,10 +17013,10 @@ function resolveFilesToCopy(repoPath) {
   if (settings?.fileIncludeGlobs?.length) {
     const matched = [];
     try {
-      for (const entry of (0, import_node_fs40.readdirSync)(repoPath, { withFileTypes: true })) {
+      for (const entry of (0, import_node_fs41.readdirSync)(repoPath, { withFileTypes: true })) {
         if (!entry.isFile()) continue;
         for (const glob of settings.fileIncludeGlobs) {
-          if (matchSimpleGlob(glob, entry.name) || matchSimpleGlob((0, import_node_path41.basename)(glob), entry.name)) {
+          if (matchSimpleGlob(glob, entry.name) || matchSimpleGlob((0, import_node_path43.basename)(glob), entry.name)) {
             matched.push(entry.name);
             break;
           }
@@ -16804,7 +17028,7 @@ function resolveFilesToCopy(repoPath) {
   }
   const defaults = [];
   try {
-    for (const entry of (0, import_node_fs40.readdirSync)(repoPath, { withFileTypes: true })) {
+    for (const entry of (0, import_node_fs41.readdirSync)(repoPath, { withFileTypes: true })) {
       if (entry.isFile() && entry.name.startsWith(".env")) {
         defaults.push(entry.name);
       }
@@ -16818,11 +17042,11 @@ function copyConfiguredFiles(repoPath, worktreePath) {
   const patterns = resolveFilesToCopy(repoPath);
   const copied = [];
   for (const rel of patterns) {
-    const src = (0, import_node_path41.join)(repoPath, rel);
-    if (!(0, import_node_fs40.existsSync)(src)) continue;
-    const dest = (0, import_node_path41.join)(worktreePath, rel);
-    (0, import_node_fs40.mkdirSync)((0, import_node_path41.dirname)(dest), { recursive: true });
-    (0, import_node_fs40.copyFileSync)(src, dest);
+    const src = (0, import_node_path43.join)(repoPath, rel);
+    if (!(0, import_node_fs41.existsSync)(src)) continue;
+    const dest = (0, import_node_path43.join)(worktreePath, rel);
+    (0, import_node_fs41.mkdirSync)((0, import_node_path43.dirname)(dest), { recursive: true });
+    (0, import_node_fs41.copyFileSync)(src, dest);
     copied.push(rel);
   }
   return copied;
@@ -16857,7 +17081,7 @@ function buildWorkspaceScriptEnv(opts, baseEnv) {
   const env = stripNestedElectronEnv({
     ...baseEnv ?? process.env
   });
-  const name = opts.workspaceName ?? (0, import_node_path41.basename)(opts.worktreePath);
+  const name = opts.workspaceName ?? (0, import_node_path43.basename)(opts.worktreePath);
   const ports = opts.ports ?? [];
   const primary = ports[0];
   env.SIDEBOARD_WORKSPACE_NAME = name;
@@ -17120,13 +17344,13 @@ async function startDevServer(repoPath, worktreePath, onLine, opts) {
     done: handle.done
   };
 }
-var import_node_fs40, import_node_net, import_node_path41, import_execa4, import_node_readline3, PORT_RANGE_SIZE, cachedLoginEnv;
+var import_node_fs41, import_node_net, import_node_path43, import_execa4, import_node_readline3, PORT_RANGE_SIZE, cachedLoginEnv;
 var init_conductor = __esm({
   "src/hook/conductor.ts"() {
     "use strict";
-    import_node_fs40 = require("fs");
+    import_node_fs41 = require("fs");
     import_node_net = require("net");
-    import_node_path41 = require("path");
+    import_node_path43 = require("path");
     import_execa4 = require("execa");
     import_node_readline3 = require("readline");
     init_settings();
@@ -17154,9 +17378,9 @@ async function findOrphanWorktrees(repoPaths) {
     repoPaths?.length ? repoPaths : threads.map((t) => t.repoPath).filter(Boolean)
   );
   const homeRoot = sideboardWorkspacesDir();
-  if ((0, import_node_fs41.existsSync)(homeRoot)) {
+  if ((0, import_node_fs42.existsSync)(homeRoot)) {
     try {
-      for (const entry of (0, import_node_fs41.readdirSync)(homeRoot, { withFileTypes: true })) {
+      for (const entry of (0, import_node_fs42.readdirSync)(homeRoot, { withFileTypes: true })) {
         if (!entry.isDirectory()) continue;
         void entry;
       }
@@ -17166,7 +17390,7 @@ async function findOrphanWorktrees(repoPaths) {
   const orphans = [];
   const seen = /* @__PURE__ */ new Set();
   for (const repoPath of repos) {
-    if (!repoPath || !(0, import_node_fs41.existsSync)(repoPath)) continue;
+    if (!repoPath || !(0, import_node_fs42.existsSync)(repoPath)) continue;
     try {
       const wts = await listWorktrees(repoPath);
       for (const wt of wts) {
@@ -17177,7 +17401,7 @@ async function findOrphanWorktrees(repoPaths) {
         seen.add(path2);
         let mtimeMs = 0;
         try {
-          mtimeMs = (0, import_node_fs41.statSync)(path2).mtimeMs;
+          mtimeMs = (0, import_node_fs42.statSync)(path2).mtimeMs;
         } catch {
           mtimeMs = 0;
         }
@@ -17187,16 +17411,16 @@ async function findOrphanWorktrees(repoPaths) {
     }
     try {
       const root = worktreesRoot(repoPath);
-      if ((0, import_node_fs41.existsSync)(root)) {
-        for (const entry of (0, import_node_fs41.readdirSync)(root, { withFileTypes: true })) {
+      if ((0, import_node_fs42.existsSync)(root)) {
+        for (const entry of (0, import_node_fs42.readdirSync)(root, { withFileTypes: true })) {
           if (!entry.isDirectory()) continue;
-          const path2 = (0, import_node_path42.join)(root, entry.name).replace(/\/$/, "");
+          const path2 = (0, import_node_path44.join)(root, entry.name).replace(/\/$/, "");
           if (known.has(path2) || seen.has(path2)) continue;
-          if (!(0, import_node_fs41.existsSync)((0, import_node_path42.join)(path2, ".git"))) continue;
+          if (!(0, import_node_fs42.existsSync)((0, import_node_path44.join)(path2, ".git"))) continue;
           seen.add(path2);
           let mtimeMs = 0;
           try {
-            mtimeMs = (0, import_node_fs41.statSync)(path2).mtimeMs;
+            mtimeMs = (0, import_node_fs42.statSync)(path2).mtimeMs;
           } catch {
             mtimeMs = Date.now();
           }
@@ -17257,12 +17481,12 @@ function worktreeCleanupSettings() {
     autoCleanupOrphans: a.autoCleanupOrphans
   };
 }
-var import_node_fs41, import_node_path42;
+var import_node_fs42, import_node_path44;
 var init_orphan_cleanup = __esm({
   "src/git/orphan-cleanup.ts"() {
     "use strict";
-    import_node_fs41 = require("fs");
-    import_node_path42 = require("path");
+    import_node_fs42 = require("fs");
+    import_node_path44 = require("path");
     init_worktree();
     init_thread_store();
     init_paths();
@@ -17437,12 +17661,12 @@ async function cloneRepoIntoSideboard(opts) {
   if (!url) throw new Error("Clone URL is required");
   let name = opts.name?.trim();
   if (!name) {
-    const leaf = (0, import_node_path43.basename)(url.replace(/\/$/, "").replace(/\.git$/, ""));
+    const leaf = (0, import_node_path45.basename)(url.replace(/\/$/, "").replace(/\.git$/, ""));
     name = leaf || "repo";
   }
   name = name.replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "repo";
-  const dest = (0, import_node_path43.join)(sideboardReposDir(), name);
-  if ((0, import_node_fs42.existsSync)(dest)) {
+  const dest = (0, import_node_path45.join)(sideboardReposDir(), name);
+  if ((0, import_node_fs43.existsSync)(dest)) {
     const repoPath2 = await resolveRepoRoot(dest);
     const workspace2 = await ensureWorkspace(repoPath2);
     return { repoPath: repoPath2, workspace: workspace2 };
@@ -17457,12 +17681,12 @@ async function cloneRepoIntoSideboard(opts) {
   const workspace = await ensureWorkspace(repoPath);
   return { repoPath, workspace };
 }
-var import_node_fs42, import_node_path43, import_execa6;
+var import_node_fs43, import_node_path45, import_execa6;
 var init_clone_repo = __esm({
   "src/git/clone-repo.ts"() {
     "use strict";
-    import_node_fs42 = require("fs");
-    import_node_path43 = require("path");
+    import_node_fs43 = require("fs");
+    import_node_path45 = require("path");
     import_execa6 = require("execa");
     init_paths();
     init_workspaces();
@@ -17583,24 +17807,24 @@ function jobTreeAlive(pid) {
   return jobAlive(pid) || processGroupAlive(pid);
 }
 function readIntFile(file) {
-  if (!(0, import_node_fs43.existsSync)(file)) return null;
-  const n = Number.parseInt((0, import_node_fs43.readFileSync)(file, "utf8").trim(), 10);
+  if (!(0, import_node_fs44.existsSync)(file)) return null;
+  const n = Number.parseInt((0, import_node_fs44.readFileSync)(file, "utf8").trim(), 10);
   return Number.isInteger(n) ? n : null;
 }
 function jobDir(root, id, legacy = false) {
-  return (0, import_node_path44.join)(root, legacy ? LEGACY_DETACHED_JOBS_DIR : DETACHED_JOBS_DIR, id);
+  return (0, import_node_path46.join)(root, legacy ? LEGACY_DETACHED_JOBS_DIR : DETACHED_JOBS_DIR, id);
 }
 function resolveJobDir(root, id) {
   const modern = jobDir(root, id, false);
-  if ((0, import_node_fs43.existsSync)(modern)) return modern;
+  if ((0, import_node_fs44.existsSync)(modern)) return modern;
   const legacy = jobDir(root, id, true);
-  if ((0, import_node_fs43.existsSync)(legacy)) return legacy;
+  if ((0, import_node_fs44.existsSync)(legacy)) return legacy;
   return modern;
 }
 function listJobIdsIn(root, rel) {
-  const dir = (0, import_node_path44.join)(root, rel);
-  if (!(0, import_node_fs43.existsSync)(dir)) return [];
-  return (0, import_node_fs43.readdirSync)(dir, { withFileTypes: true }).filter((e) => e.isDirectory() && JOB_ID_RE.test(e.name)).map((e) => e.name);
+  const dir = (0, import_node_path46.join)(root, rel);
+  if (!(0, import_node_fs44.existsSync)(dir)) return [];
+  return (0, import_node_fs44.readdirSync)(dir, { withFileTypes: true }).filter((e) => e.isDirectory() && JOB_ID_RE.test(e.name)).map((e) => e.name);
 }
 function listRunningDetachedJobs(worktreePath) {
   const root = worktreePath.trim();
@@ -17612,7 +17836,7 @@ function listRunningDetachedJobs(worktreePath) {
   const running = [];
   for (const id of ids) {
     const dir = resolveJobDir(root, id);
-    const pid = readIntFile((0, import_node_path44.join)(dir, "pid"));
+    const pid = readIntFile((0, import_node_path46.join)(dir, "pid"));
     if (jobTreeAlive(pid)) running.push(id);
   }
   return running.sort();
@@ -17625,6 +17849,7 @@ function looksLikeDeferredDonePromise(text7) {
   return /\b(i['’]?ll|i will)\s+let you know\b/i.test(unquoted) || /\blet you know when\b/i.test(unquoted) || /\b(check back|ping me)\s+when\b/i.test(unquoted) || /\bi(?:['’]ll| will)\s+(report|update you)\s+when\b/i.test(unquoted);
 }
 function isJobContinuePrompt(text7) {
+  if (typeof text7 !== "string") return false;
   const t = text7.trim();
   return t.startsWith("Detached job still running:") || t.startsWith("You ended the turn after promising to report later");
 }
@@ -17694,8 +17919,8 @@ function planJobContinue(opts) {
   return { action: "none" };
 }
 function tailProgress(logFile, maxLines = 12) {
-  if (!(0, import_node_fs43.existsSync)(logFile)) return "(no log yet)";
-  const lines = (0, import_node_fs43.readFileSync)(logFile, "utf8").split("\n");
+  if (!(0, import_node_fs44.existsSync)(logFile)) return "(no log yet)";
+  const lines = (0, import_node_fs44.readFileSync)(logFile, "utf8").split("\n");
   return lines.slice(-maxLines).join("\n");
 }
 function lastProgressLine(progress) {
@@ -17703,8 +17928,8 @@ function lastProgressLine(progress) {
   return last ? last.slice(0, 72) : void 0;
 }
 function readLogLines(file) {
-  if (!(0, import_node_fs43.existsSync)(file)) return [];
-  const lines = (0, import_node_fs43.readFileSync)(file, "utf8").split("\n");
+  if (!(0, import_node_fs44.existsSync)(file)) return [];
+  const lines = (0, import_node_fs44.readFileSync)(file, "utf8").split("\n");
   if (lines.length && lines[lines.length - 1] === "") lines.pop();
   return lines;
 }
@@ -17715,15 +17940,15 @@ function takeDelta(logFile, cursorFile) {
   return { delta: capJobLogDelta(lines.slice(start).join("\n")), nextCursor: lines.length };
 }
 function snapshotJob(dir) {
-  const pid = readIntFile((0, import_node_path44.join)(dir, "pid"));
+  const pid = readIntFile((0, import_node_path46.join)(dir, "pid"));
   const running = jobTreeAlive(pid);
   return {
     pid,
     running,
-    exitCode: readIntFile((0, import_node_path44.join)(dir, "exit")),
-    log: (0, import_node_path44.join)(dir, "log"),
-    cursor: (0, import_node_path44.join)(dir, "present.cursor"),
-    progress: tailProgress((0, import_node_path44.join)(dir, "log"))
+    exitCode: readIntFile((0, import_node_path46.join)(dir, "exit")),
+    log: (0, import_node_path46.join)(dir, "log"),
+    cursor: (0, import_node_path46.join)(dir, "present.cursor"),
+    progress: tailProgress((0, import_node_path46.join)(dir, "log"))
   };
 }
 function toResult(id, snap, extra) {
@@ -17732,8 +17957,8 @@ function toResult(id, snap, extra) {
   const stillRunning = snap.running && !ok;
   const { delta, nextCursor } = takeDelta(snap.log, snap.cursor);
   try {
-    (0, import_node_fs43.mkdirSync)((0, import_node_path44.dirname)(snap.cursor), { recursive: true });
-    (0, import_node_fs43.writeFileSync)(snap.cursor, `${nextCursor}
+    (0, import_node_fs44.mkdirSync)((0, import_node_path46.dirname)(snap.cursor), { recursive: true });
+    (0, import_node_fs44.writeFileSync)(snap.cursor, `${nextCursor}
 `);
   } catch {
   }
@@ -17762,7 +17987,7 @@ async function waitForDetachedJob(cwd, id, opts) {
   const dir = resolveJobDir(root, jobId);
   const timeoutMs = mcpWaitForJobTimeoutMs(opts?.timeoutMs);
   const sleep2 = opts?.sleep ?? sleepMs;
-  if (!(0, import_node_fs43.existsSync)(dir)) {
+  if (!(0, import_node_fs44.existsSync)(dir)) {
     return {
       stillRunning: false,
       ok: false,
@@ -17808,10 +18033,10 @@ function killProcessTree(pid, signal) {
 }
 function appendJobLog(logFile, line) {
   try {
-    (0, import_node_fs43.mkdirSync)((0, import_node_path44.dirname)(logFile), { recursive: true });
+    (0, import_node_fs44.mkdirSync)((0, import_node_path46.dirname)(logFile), { recursive: true });
     const body = line.endsWith("\n") ? line : `${line}
 `;
-    (0, import_node_fs43.appendFileSync)(logFile, body);
+    (0, import_node_fs44.appendFileSync)(logFile, body);
   } catch {
   }
 }
@@ -17821,7 +18046,7 @@ async function stopDetachedJob(cwd, id, opts) {
   const dir = resolveJobDir(root, jobId);
   const sleep2 = opts?.sleep ?? sleepMs;
   const why = opts?.reason?.trim() ?? "";
-  if (!(0, import_node_fs43.existsSync)(dir)) {
+  if (!(0, import_node_fs44.existsSync)(dir)) {
     return {
       stillRunning: false,
       ok: false,
@@ -17857,10 +18082,10 @@ async function stopDetachedJob(cwd, id, opts) {
     killProcessTree(targetPid, "SIGKILL");
     await sleep2(100);
   }
-  const exitFile = (0, import_node_path44.join)(dir, "exit");
-  if (!(0, import_node_fs43.existsSync)(exitFile)) {
+  const exitFile = (0, import_node_path46.join)(dir, "exit");
+  if (!(0, import_node_fs44.existsSync)(exitFile)) {
     try {
-      (0, import_node_fs43.writeFileSync)(exitFile, "1\n");
+      (0, import_node_fs44.writeFileSync)(exitFile, "1\n");
     } catch {
     }
   }
@@ -17880,12 +18105,12 @@ async function stopDetachedJob(cwd, id, opts) {
     hint: stopped ? MCP_STOP_JOB_HINT : MCP_WAIT_JOB_STILL_RUNNING_HINT
   };
 }
-var import_node_fs43, import_node_path44, MAX_JOB_CONTINUES, MAX_JOB_DELTA_LINES, MAX_JOB_DELTA_CHARS, DEFERRED_DONE_MAX_CHARS, GH_WATCH_REFRESH, MCP_WAIT_JOB_STILL_RUNNING_HINT, MCP_STOP_JOB_HINT, JOB_ID_RE;
+var import_node_fs44, import_node_path46, MAX_JOB_CONTINUES, MAX_JOB_DELTA_LINES, MAX_JOB_DELTA_CHARS, DEFERRED_DONE_MAX_CHARS, GH_WATCH_REFRESH, MCP_WAIT_JOB_STILL_RUNNING_HINT, MCP_STOP_JOB_HINT, JOB_ID_RE;
 var init_wait_for_job = __esm({
   "src/mcp/wait-for-job.ts"() {
     "use strict";
-    import_node_fs43 = require("fs");
-    import_node_path44 = require("path");
+    import_node_fs44 = require("fs");
+    import_node_path46 = require("path");
     init_workspace_scratch();
     init_wait_for_turn();
     MAX_JOB_CONTINUES = 8;
@@ -19430,7 +19655,7 @@ function reuseLiveThread(input, repoPath, match) {
 }
 async function createThread(input, _onSetupLine) {
   const repoPath = await resolveRepoRoot(input.repoPath);
-  if (!(0, import_node_fs44.existsSync)(repoPath)) {
+  if (!(0, import_node_fs45.existsSync)(repoPath)) {
     throw new Error(`Repo not found: ${repoPath}`);
   }
   const reused = reuseLiveThread(input, repoPath, {
@@ -19615,11 +19840,11 @@ async function listLinearIssues(agent, repoPath) {
   }
   return adapter.listLinearIssues(repoPath);
 }
-var import_node_fs44;
+var import_node_fs45;
 var init_create = __esm({
   "src/threads/create.ts"() {
     "use strict";
-    import_node_fs44 = require("fs");
+    import_node_fs45 = require("fs");
     init_detect();
     init_worktree();
     init_home_board();
@@ -19771,20 +19996,20 @@ function writeTurnLive(threadId, progress) {
   const path2 = threadLivePath(threadId);
   const tmp = `${path2}.${process.pid}.tmp`;
   try {
-    (0, import_node_fs45.writeFileSync)(tmp, JSON.stringify(progress), "utf8");
-    (0, import_node_fs45.renameSync)(tmp, path2);
+    (0, import_node_fs46.writeFileSync)(tmp, JSON.stringify(progress), "utf8");
+    (0, import_node_fs46.renameSync)(tmp, path2);
   } catch {
     try {
-      (0, import_node_fs45.unlinkSync)(tmp);
+      (0, import_node_fs46.unlinkSync)(tmp);
     } catch {
     }
   }
 }
 function readTurnLive(threadId) {
   const path2 = threadLivePath(threadId);
-  if (!(0, import_node_fs45.existsSync)(path2)) return null;
+  if (!(0, import_node_fs46.existsSync)(path2)) return null;
   try {
-    const raw = JSON.parse((0, import_node_fs45.readFileSync)(path2, "utf8"));
+    const raw = JSON.parse((0, import_node_fs46.readFileSync)(path2, "utf8"));
     if (!raw || typeof raw.summary !== "string") return null;
     return raw;
   } catch {
@@ -19796,17 +20021,17 @@ function clearTurnLive(threadId) {
   if (buf?.timer) clearTimeout(buf.timer);
   buffers.delete(threadId);
   const path2 = threadLivePath(threadId);
-  if (!(0, import_node_fs45.existsSync)(path2)) return;
+  if (!(0, import_node_fs46.existsSync)(path2)) return;
   try {
-    (0, import_node_fs45.unlinkSync)(path2);
+    (0, import_node_fs46.unlinkSync)(path2);
   } catch {
   }
 }
-var import_node_fs45, buffers, FLUSH_MS, MAX_PARTS;
+var import_node_fs46, buffers, FLUSH_MS, MAX_PARTS;
 var init_turn_live = __esm({
   "src/store/turn-live.ts"() {
     "use strict";
-    import_node_fs45 = require("fs");
+    import_node_fs46 = require("fs");
     init_message_parts();
     init_paths();
     buffers = /* @__PURE__ */ new Map();
@@ -20050,7 +20275,7 @@ var init_quota_failover = __esm({
 // src/threads/adopt.ts
 function thisModuleFile() {
   const cjsFile = typeof __filename !== "undefined" ? __filename : "";
-  return cjsFile || process.argv[1] || (0, import_node_path45.join)(process.cwd(), "package.json");
+  return cjsFile || process.argv[1] || (0, import_node_path47.join)(process.cwd(), "package.json");
 }
 function openReadonlySqlite(file) {
   const req = (0, import_node_module4.createRequire)(thisModuleFile());
@@ -20068,21 +20293,21 @@ function mapAgentType(raw) {
   return null;
 }
 function resolveConductorCursorAgentId(workspacePath) {
-  if (!workspacePath || !(0, import_node_fs46.existsSync)(CURSOR_SDK_STORE)) return null;
+  if (!workspacePath || !(0, import_node_fs47.existsSync)(CURSOR_SDK_STORE)) return null;
   const normalized = workspacePath.replace(/\/$/, "");
   let best = null;
   let hashes;
   try {
-    hashes = (0, import_node_fs46.readdirSync)(CURSOR_SDK_STORE);
+    hashes = (0, import_node_fs47.readdirSync)(CURSOR_SDK_STORE);
   } catch {
     return null;
   }
   for (const hash of hashes) {
-    const agentsFile = (0, import_node_path45.join)(CURSOR_SDK_STORE, hash, "agents.ndjson");
-    if (!(0, import_node_fs46.existsSync)(agentsFile)) continue;
+    const agentsFile = (0, import_node_path47.join)(CURSOR_SDK_STORE, hash, "agents.ndjson");
+    if (!(0, import_node_fs47.existsSync)(agentsFile)) continue;
     let text7;
     try {
-      text7 = (0, import_node_fs46.readFileSync)(agentsFile, "utf8");
+      text7 = (0, import_node_fs47.readFileSync)(agentsFile, "utf8");
     } catch {
       continue;
     }
@@ -20106,7 +20331,7 @@ function resolveConductorCursorAgentId(workspacePath) {
   return best?.agentId ?? null;
 }
 async function adoptThread(input) {
-  if (!(0, import_node_fs46.existsSync)(input.worktreePath)) {
+  if (!(0, import_node_fs47.existsSync)(input.worktreePath)) {
     throw new Error(`Worktree not found: ${input.worktreePath}`);
   }
   const repoPath = await resolveRepoRoot(input.worktreePath);
@@ -20135,18 +20360,18 @@ function conductorDbPath() {
   return CONDUCTOR_DB;
 }
 function listConductorWorkspaces() {
-  if (!(0, import_node_fs46.existsSync)(CONDUCTOR_DB)) {
+  if (!(0, import_node_fs47.existsSync)(CONDUCTOR_DB)) {
     throw new Error(`Conductor DB not found at ${CONDUCTOR_DB}`);
   }
-  const tmp = (0, import_node_fs46.mkdtempSync)((0, import_node_path45.join)((0, import_node_os14.tmpdir)(), "sideboard-conductor-"));
-  const snapshot = (0, import_node_path45.join)(tmp, "conductor.db");
+  const tmp = (0, import_node_fs47.mkdtempSync)((0, import_node_path47.join)((0, import_node_os14.tmpdir)(), "sideboard-conductor-"));
+  const snapshot = (0, import_node_path47.join)(tmp, "conductor.db");
   try {
-    (0, import_node_fs46.copyFileSync)(CONDUCTOR_DB, snapshot);
+    (0, import_node_fs47.copyFileSync)(CONDUCTOR_DB, snapshot);
     for (const suffix of ["-wal", "-shm"]) {
       const src = `${CONDUCTOR_DB}${suffix}`;
-      if ((0, import_node_fs46.existsSync)(src)) {
+      if ((0, import_node_fs47.existsSync)(src)) {
         try {
-          (0, import_node_fs46.copyFileSync)(src, `${snapshot}${suffix}`);
+          (0, import_node_fs47.copyFileSync)(src, `${snapshot}${suffix}`);
         } catch {
         }
       }
@@ -20222,22 +20447,22 @@ function listConductorWorkspaces() {
       db.close();
     }
   } finally {
-    (0, import_node_fs46.rmSync)(tmp, { recursive: true, force: true });
+    (0, import_node_fs47.rmSync)(tmp, { recursive: true, force: true });
   }
 }
 function importConductorWorkspace(workspaceId) {
-  if (!(0, import_node_fs46.existsSync)(CONDUCTOR_DB)) {
+  if (!(0, import_node_fs47.existsSync)(CONDUCTOR_DB)) {
     throw new Error(`Conductor DB not found at ${CONDUCTOR_DB}`);
   }
-  const tmp = (0, import_node_fs46.mkdtempSync)((0, import_node_path45.join)((0, import_node_os14.tmpdir)(), "sideboard-conductor-"));
-  const snapshot = (0, import_node_path45.join)(tmp, "conductor.db");
+  const tmp = (0, import_node_fs47.mkdtempSync)((0, import_node_path47.join)((0, import_node_os14.tmpdir)(), "sideboard-conductor-"));
+  const snapshot = (0, import_node_path47.join)(tmp, "conductor.db");
   try {
-    (0, import_node_fs46.copyFileSync)(CONDUCTOR_DB, snapshot);
+    (0, import_node_fs47.copyFileSync)(CONDUCTOR_DB, snapshot);
     for (const suffix of ["-wal", "-shm"]) {
       const src = `${CONDUCTOR_DB}${suffix}`;
-      if ((0, import_node_fs46.existsSync)(src)) {
+      if ((0, import_node_fs47.existsSync)(src)) {
         try {
-          (0, import_node_fs46.copyFileSync)(src, `${snapshot}${suffix}`);
+          (0, import_node_fs47.copyFileSync)(src, `${snapshot}${suffix}`);
         } catch {
         }
       }
@@ -20255,7 +20480,7 @@ function importConductorWorkspace(workspaceId) {
       ).get(workspaceId);
       if (!row) throw new Error(`Conductor workspace not found: ${workspaceId}`);
       const worktreePath = String(row.workspacePath);
-      if (!(0, import_node_fs46.existsSync)(worktreePath)) {
+      if (!(0, import_node_fs47.existsSync)(worktreePath)) {
         throw new Error(`Conductor worktree missing on disk: ${worktreePath}`);
       }
       let sessionId = null;
@@ -20318,31 +20543,31 @@ function importConductorWorkspace(workspaceId) {
       db.close();
     }
   } finally {
-    (0, import_node_fs46.rmSync)(tmp, { recursive: true, force: true });
+    (0, import_node_fs47.rmSync)(tmp, { recursive: true, force: true });
   }
 }
 async function importConductorWorkspaceAsync(workspaceId) {
   return importConductorWorkspace(workspaceId);
 }
-var import_node_child_process5, import_node_fs46, import_node_os14, import_node_path45, import_node_module4, CONDUCTOR_APP_SUPPORT, CONDUCTOR_DB, CURSOR_SDK_STORE;
+var import_node_child_process5, import_node_fs47, import_node_os14, import_node_path47, import_node_module4, CONDUCTOR_APP_SUPPORT, CONDUCTOR_DB, CURSOR_SDK_STORE;
 var init_adopt = __esm({
   "src/threads/adopt.ts"() {
     "use strict";
     import_node_child_process5 = require("child_process");
-    import_node_fs46 = require("fs");
+    import_node_fs47 = require("fs");
     import_node_os14 = require("os");
-    import_node_path45 = require("path");
+    import_node_path47 = require("path");
     import_node_module4 = require("module");
     init_worktree();
     init_thread_store();
-    CONDUCTOR_APP_SUPPORT = (0, import_node_path45.join)(
+    CONDUCTOR_APP_SUPPORT = (0, import_node_path47.join)(
       process.env.HOME ?? "",
       "Library",
       "Application Support",
       "com.conductor.app"
     );
-    CONDUCTOR_DB = (0, import_node_path45.join)(CONDUCTOR_APP_SUPPORT, "conductor.db");
-    CURSOR_SDK_STORE = (0, import_node_path45.join)(CONDUCTOR_APP_SUPPORT, "cursor-sdk-store");
+    CONDUCTOR_DB = (0, import_node_path47.join)(CONDUCTOR_APP_SUPPORT, "conductor.db");
+    CURSOR_SDK_STORE = (0, import_node_path47.join)(CONDUCTOR_APP_SUPPORT, "cursor-sdk-store");
   }
 });
 
@@ -20409,7 +20634,7 @@ async function openStackLayer(input, _onSetupLine) {
   let createdWorktree = false;
   const trees = await listWorktrees(repoPath);
   const checkedOut = trees.find((w) => w.branch === branchName);
-  if (checkedOut?.path && (0, import_node_fs47.existsSync)(checkedOut.path)) {
+  if (checkedOut?.path && (0, import_node_fs48.existsSync)(checkedOut.path)) {
     if (input.reuseExistingWorktree !== false) {
       worktreePath = checkedOut.path;
     } else {
@@ -20551,7 +20776,7 @@ async function initStackFromThread(input, onSetupLine) {
 async function createPrStack(input, onSetupLine) {
   await requireAgent(input.agent);
   const repoPath = await resolveRepoRoot(input.repoPath);
-  if (!(0, import_node_fs47.existsSync)(repoPath)) throw new Error(`Repo not found: ${repoPath}`);
+  if (!(0, import_node_fs48.existsSync)(repoPath)) throw new Error(`Repo not found: ${repoPath}`);
   if (!input.branches.length) throw new Error("At least one branch name required");
   const status = await detectGhStack(repoPath);
   if (!status.available) throw new Error(status.reason);
@@ -20618,7 +20843,7 @@ async function createPrStack(input, onSetupLine) {
     }
   }
   const claimed = new Set(threads.map((t) => t.worktreePath));
-  if (!claimed.has(bootstrap.worktreePath) && (0, import_node_fs47.existsSync)(bootstrap.worktreePath)) {
+  if (!claimed.has(bootstrap.worktreePath) && (0, import_node_fs48.existsSync)(bootstrap.worktreePath)) {
     try {
       await removeWorktree(repoPath, bootstrap.worktreePath, {
         deleteBranch: bootstrap.branchName
@@ -20638,11 +20863,11 @@ function stackAgentDefaultsFrom(input) {
     planMode: input.planMode
   };
 }
-var import_node_fs47;
+var import_node_fs48;
 var init_stack_layers = __esm({
   "src/threads/stack-layers.ts"() {
     "use strict";
-    import_node_fs47 = require("fs");
+    import_node_fs48 = require("fs");
     init_detect();
     init_run();
     init_stack();
@@ -20655,7 +20880,7 @@ var init_stack_layers = __esm({
 
 // src/diff/diff.ts
 async function inspectGitWorktree(worktreePath) {
-  if (!worktreePath || !(0, import_node_fs48.existsSync)(worktreePath)) return "missing_worktree";
+  if (!worktreePath || !(0, import_node_fs49.existsSync)(worktreePath)) return "missing_worktree";
   const check = await git(["rev-parse", "--is-inside-work-tree"], worktreePath, {
     reject: false
   });
@@ -20663,7 +20888,7 @@ async function inspectGitWorktree(worktreePath) {
   return "ok";
 }
 async function initializeGitRepository(worktreePath) {
-  if (!worktreePath || !(0, import_node_fs48.existsSync)(worktreePath)) {
+  if (!worktreePath || !(0, import_node_fs49.existsSync)(worktreePath)) {
     throw new Error("Worktree not found");
   }
   const status = await inspectGitWorktree(worktreePath);
@@ -20797,11 +21022,11 @@ new file mode 100644
   };
 }
 async function untrackedPatch(worktreePath, path2, maxHunk) {
-  const abs = (0, import_node_path46.join)(worktreePath, path2);
+  const abs = (0, import_node_path48.join)(worktreePath, path2);
   try {
-    const st = (0, import_node_fs48.statSync)(abs);
+    const st = (0, import_node_fs49.statSync)(abs);
     if (st.isFile() && st.size > maxHunk) {
-      const buf = (0, import_node_fs48.readFileSync)(abs).subarray(0, maxHunk);
+      const buf = (0, import_node_fs49.readFileSync)(abs).subarray(0, maxHunk);
       return syntheticAddPatch(path2, buf.toString("utf8"), maxHunk);
     }
   } catch {
@@ -21266,6 +21491,15 @@ async function getDiff(worktreePath, repoPath, opts) {
     mergeBase: needsMergeBase ? mergeBase : null
   };
 }
+function statWorktreePath(worktreePath, relativePath) {
+  assertSafeRelativePath(relativePath);
+  const abs = (0, import_node_path48.join)(worktreePath, relativePath);
+  if (!(0, import_node_fs49.existsSync)(abs)) return "missing";
+  const st = (0, import_node_fs49.statSync)(abs);
+  if (st.isDirectory()) return "dir";
+  if (st.isFile()) return "file";
+  return "missing";
+}
 async function listWorktreeFiles(worktreePath, opts) {
   const maxFiles = opts?.maxFiles ?? 5e3;
   const tracked = await git(["ls-files", "-z"], worktreePath, { reject: false });
@@ -21290,8 +21524,8 @@ function isImageRelativePath(relativePath) {
 function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
   assertSafeRelativePath(relativePath);
   const maxBytes = opts?.maxBytes ?? DEFAULT_UPLOAD_MAX_BYTES;
-  const abs = (0, import_node_path46.join)(worktreePath, relativePath);
-  const st = (0, import_node_fs48.statSync)(abs);
+  const abs = (0, import_node_path48.join)(worktreePath, relativePath);
+  const st = (0, import_node_fs49.statSync)(abs);
   if (!st.isFile()) {
     throw new Error(`Not a file: ${relativePath}`);
   }
@@ -21300,7 +21534,7 @@ function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
       `File too large to upload (${st.size} bytes; max ${maxBytes})`
     );
   }
-  const buf = (0, import_node_fs48.readFileSync)(abs);
+  const buf = (0, import_node_fs49.readFileSync)(abs);
   return {
     path: relativePath,
     contentBase64: buf.toString("base64"),
@@ -21310,12 +21544,12 @@ function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
 function readWorktreeFile(worktreePath, relativePath, opts) {
   assertSafeRelativePath(relativePath);
   const maxBytes = opts?.maxBytes ?? 2e5;
-  const abs = (0, import_node_path46.join)(worktreePath, relativePath);
-  const st = (0, import_node_fs48.statSync)(abs);
+  const abs = (0, import_node_path48.join)(worktreePath, relativePath);
+  const st = (0, import_node_fs49.statSync)(abs);
   if (!st.isFile()) {
     throw new Error(`Not a file: ${relativePath}`);
   }
-  const buf = (0, import_node_fs48.readFileSync)(abs);
+  const buf = (0, import_node_fs49.readFileSync)(abs);
   if (isImageRelativePath(relativePath)) {
     const maxImageBytes = Math.max(maxBytes, 15e6);
     const truncated2 = buf.length > maxImageBytes;
@@ -21358,9 +21592,9 @@ function assertSafeRelativePath(relativePath) {
 }
 function writeWorktreeFile(worktreePath, relativePath, content) {
   assertSafeRelativePath(relativePath);
-  const abs = (0, import_node_path46.join)(worktreePath, relativePath);
-  (0, import_node_fs48.mkdirSync)((0, import_node_path46.dirname)(abs), { recursive: true });
-  (0, import_node_fs48.writeFileSync)(abs, content, "utf8");
+  const abs = (0, import_node_path48.join)(worktreePath, relativePath);
+  (0, import_node_fs49.mkdirSync)((0, import_node_path48.dirname)(abs), { recursive: true });
+  (0, import_node_fs49.writeFileSync)(abs, content, "utf8");
   return { path: relativePath };
 }
 async function getWorktreeDirtyStat(worktreePath) {
@@ -21400,12 +21634,12 @@ async function getDiffSummary(worktreePath, repoPath, opts) {
     truncated: full.files.length > maxFiles
   };
 }
-var import_node_fs48, import_node_path46, mergeBaseCache, MERGE_BASE_TTL_MS, SHA_RE, IMAGE_EXTENSIONS2, DEFAULT_UPLOAD_MAX_BYTES;
+var import_node_fs49, import_node_path48, mergeBaseCache, MERGE_BASE_TTL_MS, SHA_RE, IMAGE_EXTENSIONS2, DEFAULT_UPLOAD_MAX_BYTES;
 var init_diff = __esm({
   "src/diff/diff.ts"() {
     "use strict";
-    import_node_fs48 = require("fs");
-    import_node_path46 = require("path");
+    import_node_fs49 = require("fs");
+    import_node_path48 = require("path");
     init_run();
     init_worktree();
     mergeBaseCache = /* @__PURE__ */ new Map();
@@ -21762,7 +21996,7 @@ function parseFrontmatter(content) {
 }
 function readSkill(skillMd, source) {
   try {
-    const content = (0, import_node_fs49.readFileSync)(skillMd, "utf8");
+    const content = (0, import_node_fs50.readFileSync)(skillMd, "utf8");
     const { name: fmName, description } = parseFrontmatter(content);
     const dirName = skillMd.split("/").slice(-2, -1)[0] || "skill";
     const name = fmName || dirName;
@@ -21781,19 +22015,19 @@ function readSkill(skillMd, source) {
   }
 }
 function scanSkillsDir(dir, source, out) {
-  if (!(0, import_node_fs49.existsSync)(dir)) return;
+  if (!(0, import_node_fs50.existsSync)(dir)) return;
   let entries;
   try {
-    entries = (0, import_node_fs49.readdirSync)(dir);
+    entries = (0, import_node_fs50.readdirSync)(dir);
   } catch {
     return;
   }
   for (const entry of entries) {
     if (entry.startsWith(".")) continue;
-    const skillMd = (0, import_node_path47.join)(dir, entry, "SKILL.md");
-    if (!(0, import_node_fs49.existsSync)(skillMd)) continue;
+    const skillMd = (0, import_node_path49.join)(dir, entry, "SKILL.md");
+    if (!(0, import_node_fs50.existsSync)(skillMd)) continue;
     try {
-      if (!(0, import_node_fs49.statSync)(skillMd).isFile()) continue;
+      if (!(0, import_node_fs50.statSync)(skillMd).isFile()) continue;
     } catch {
       continue;
     }
@@ -21802,24 +22036,24 @@ function scanSkillsDir(dir, source, out) {
   }
 }
 function scanClaudePluginSkills(pluginsRoot, out) {
-  if (!(0, import_node_fs49.existsSync)(pluginsRoot)) return;
+  if (!(0, import_node_fs50.existsSync)(pluginsRoot)) return;
   const walk = (dir, depth, lookingForSkillsDir) => {
     if (depth > 7) return;
     let entries;
     try {
-      entries = (0, import_node_fs49.readdirSync)(dir);
+      entries = (0, import_node_fs50.readdirSync)(dir);
     } catch {
       return;
     }
     if (lookingForSkillsDir && entries.includes("SKILL.md")) {
-      const skill = readSkill((0, import_node_path47.join)(dir, "SKILL.md"), "cli");
+      const skill = readSkill((0, import_node_path49.join)(dir, "SKILL.md"), "cli");
       if (skill) out.push(skill);
     }
     for (const entry of entries) {
       if (entry === "node_modules" || entry === ".git") continue;
-      const full = (0, import_node_path47.join)(dir, entry);
+      const full = (0, import_node_path49.join)(dir, entry);
       try {
-        if (!(0, import_node_fs49.statSync)(full).isDirectory()) continue;
+        if (!(0, import_node_fs50.statSync)(full).isDirectory()) continue;
       } catch {
         continue;
       }
@@ -21837,17 +22071,17 @@ function discoverSkills(worktreePath) {
   const home = (0, import_node_os15.homedir)();
   const collected = [];
   for (const rel of [".claude/skills", ".cursor/skills", ".sideboard/skills", ".brightsy/skills", "skills"]) {
-    scanSkillsDir((0, import_node_path47.join)(worktreePath, rel), "workspace", collected);
+    scanSkillsDir((0, import_node_path49.join)(worktreePath, rel), "workspace", collected);
   }
   for (const abs of [
-    (0, import_node_path47.join)(home, ".claude/skills"),
-    (0, import_node_path47.join)(home, ".cursor/skills"),
-    (0, import_node_path47.join)(home, ".sideboard/skills"),
-    (0, import_node_path47.join)(home, ".brightsy/skills")
+    (0, import_node_path49.join)(home, ".claude/skills"),
+    (0, import_node_path49.join)(home, ".cursor/skills"),
+    (0, import_node_path49.join)(home, ".sideboard/skills"),
+    (0, import_node_path49.join)(home, ".brightsy/skills")
   ]) {
     scanSkillsDir(abs, "user", collected);
   }
-  scanClaudePluginSkills((0, import_node_path47.join)(home, ".claude/plugins"), collected);
+  scanClaudePluginSkills((0, import_node_path49.join)(home, ".claude/plugins"), collected);
   collected.push(...bundledSkills());
   const rank = {
     workspace: 0,
@@ -21873,7 +22107,7 @@ function readSkillBody(skillPath, maxChars = 12e3) {
 \u2026(truncated)` : body;
     }
   }
-  const raw = (0, import_node_fs49.readFileSync)(skillPath, "utf8");
+  const raw = (0, import_node_fs50.readFileSync)(skillPath, "utf8");
   if (raw.startsWith("---")) {
     const end = raw.indexOf("\n---", 3);
     if (end >= 0) {
@@ -21887,13 +22121,13 @@ function readSkillBody(skillPath, maxChars = 12e3) {
 
 \u2026(truncated)` : raw;
 }
-var import_node_fs49, import_node_os15, import_node_path47, BUNDLED_SKILL_PREFIX;
+var import_node_fs50, import_node_os15, import_node_path49, BUNDLED_SKILL_PREFIX;
 var init_discover = __esm({
   "src/skills/discover.ts"() {
     "use strict";
-    import_node_fs49 = require("fs");
+    import_node_fs50 = require("fs");
     import_node_os15 = require("os");
-    import_node_path47 = require("path");
+    import_node_path49 = require("path");
     init_long_running();
     BUNDLED_SKILL_PREFIX = "bundled:";
   }
@@ -22042,10 +22276,22 @@ var init_consume_attachments = __esm({
 });
 
 // src/skills/detached-job-path.ts
+function compiledModuleDir() {
+  const cjsDir = typeof __dirname !== "undefined" ? __dirname : "";
+  if (cjsDir) return cjsDir;
+  try {
+    const url = import_meta3.url;
+    if (typeof url === "string" && url.length > 0) {
+      return (0, import_node_path50.dirname)((0, import_node_url3.fileURLToPath)(url));
+    }
+  } catch {
+  }
+  return null;
+}
 function detachedJobScriptIn(dir) {
   for (const name of DETACHED_JOB_FILENAMES) {
-    const script = (0, import_node_path48.join)(dir, "scripts", name);
-    if ((0, import_node_fs50.existsSync)(script)) return script;
+    const script = (0, import_node_path50.join)(dir, "scripts", name);
+    if ((0, import_node_fs51.existsSync)(script)) return script;
   }
   return null;
 }
@@ -22057,11 +22303,12 @@ function packagedDetachedJobPath() {
 function resolveDetachedJobScript() {
   const packaged = packagedDetachedJobPath();
   if (packaged) return packaged;
-  let dir = (0, import_node_path48.dirname)((0, import_node_url3.fileURLToPath)(import_meta3.url));
+  let dir = compiledModuleDir();
+  if (!dir) return null;
   for (let i = 0; i < 8; i++) {
     const candidate = detachedJobScriptIn(dir);
     if (candidate) return candidate;
-    const parent = (0, import_node_path48.dirname)(dir);
+    const parent = (0, import_node_path50.dirname)(dir);
     if (parent === dir) break;
     dir = parent;
   }
@@ -22072,12 +22319,12 @@ function formatDetachedJobInvoke(scriptPath) {
   if (resolved) return `node ${JSON.stringify(resolved)}`;
   return "node scripts/detached-job.cjs";
 }
-var import_node_fs50, import_node_path48, import_node_url3, import_meta3, DETACHED_JOB_FILENAMES;
+var import_node_fs51, import_node_path50, import_node_url3, import_meta3, DETACHED_JOB_FILENAMES;
 var init_detached_job_path = __esm({
   "src/skills/detached-job-path.ts"() {
     "use strict";
-    import_node_fs50 = require("fs");
-    import_node_path48 = require("path");
+    import_node_fs51 = require("fs");
+    import_node_path50 = require("path");
     import_node_url3 = require("url");
     init_packaged_runtime();
     import_meta3 = {};
@@ -22259,9 +22506,9 @@ function formatPrGateDirective() {
 }
 function formatProcessGuideDirective(opts) {
   const worktree = opts?.worktreePath?.trim();
-  const hasGraphSkill = !!worktree && (0, import_node_fs51.existsSync)((0, import_node_path49.join)(worktree, ".claude/skills/graph-engineering/SKILL.md"));
-  const hasReviewSkill = !!worktree && (0, import_node_fs51.existsSync)((0, import_node_path49.join)(worktree, ".claude/skills/review/SKILL.md"));
-  const hasInstallSkill = !!worktree && (0, import_node_fs51.existsSync)((0, import_node_path49.join)(worktree, ".claude/skills/worktree-install/SKILL.md"));
+  const hasGraphSkill = !!worktree && (0, import_node_fs52.existsSync)((0, import_node_path51.join)(worktree, ".claude/skills/graph-engineering/SKILL.md"));
+  const hasReviewSkill = !!worktree && (0, import_node_fs52.existsSync)((0, import_node_path51.join)(worktree, ".claude/skills/review/SKILL.md"));
+  const hasInstallSkill = !!worktree && (0, import_node_fs52.existsSync)((0, import_node_path51.join)(worktree, ".claude/skills/worktree-install/SKILL.md"));
   return [
     "Process guides (recurring work only):",
     hasGraphSkill ? "- Migrations, ports, batch fixes, and other fan-out: follow `.claude/skills/graph-engineering/SKILL.md` (`/graph-engineering`). Judge first; state on disk; grow the rulebook; do not patch around it." : null,
@@ -22299,12 +22546,12 @@ function formatArtifactDirective() {
 function formatUiReminder() {
   return "Sideboard UI: markdown table is enough to read data; present_schema if they ask to edit/filter (even after markdown); present_files for the file manager. html fence or present_artifact, not both for the same document. type=log appends (same artifact_id, new lines only). ask_user only for a real multiple-choice (not hellos, \u201Cwhat next?\u201D, or after a review) \u2014 reply in chat. Do not say artifacts/CMS UI are unavailable.";
 }
-var import_node_fs51, import_node_path49, PR_GOAL_RE, GITHUB_TICKET_REF, KEYED_TICKET_REF;
+var import_node_fs52, import_node_path51, PR_GOAL_RE, GITHUB_TICKET_REF, KEYED_TICKET_REF;
 var init_instructions = __esm({
   "src/agents/instructions.ts"() {
     "use strict";
-    import_node_fs51 = require("fs");
-    import_node_path49 = require("path");
+    import_node_fs52 = require("fs");
+    import_node_path51 = require("path");
     init_git_auth_mode();
     init_branch_prefix();
     init_worktree_labels();
@@ -22690,40 +22937,40 @@ __export(plan_file_exports, {
   writePlanFile: () => writePlanFile
 });
 function ensureAttachmentsGitignore(worktreePath) {
-  const gitignoreAbs = (0, import_node_path50.join)(worktreePath, ATTACHMENTS_DIR, ".gitignore");
-  if ((0, import_node_fs52.existsSync)(gitignoreAbs)) return;
-  (0, import_node_fs52.mkdirSync)((0, import_node_path50.dirname)(gitignoreAbs), { recursive: true });
-  (0, import_node_fs52.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
+  const gitignoreAbs = (0, import_node_path52.join)(worktreePath, ATTACHMENTS_DIR, ".gitignore");
+  if ((0, import_node_fs53.existsSync)(gitignoreAbs)) return;
+  (0, import_node_fs53.mkdirSync)((0, import_node_path52.dirname)(gitignoreAbs), { recursive: true });
+  (0, import_node_fs53.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
 }
 function planFileAbs(worktreePath) {
-  return (0, import_node_path50.join)(worktreePath, PLAN_FILE_REL);
+  return (0, import_node_path52.join)(worktreePath, PLAN_FILE_REL);
 }
 function readTextIfPresent2(abs) {
-  if (!(0, import_node_fs52.existsSync)(abs)) return null;
+  if (!(0, import_node_fs53.existsSync)(abs)) return null;
   try {
-    const content = (0, import_node_fs52.readFileSync)(abs, "utf8");
+    const content = (0, import_node_fs53.readFileSync)(abs, "utf8");
     return content.trim() ? content : null;
   } catch {
     return null;
   }
 }
 function readPlanFile(worktreePath) {
-  return readTextIfPresent2(planFileAbs(worktreePath)) ?? readTextIfPresent2((0, import_node_path50.join)(worktreePath, `${LEGACY_ATTACHMENTS_DIR}/plan.md`)) ?? readTextIfPresent2((0, import_node_path50.join)(worktreePath, LEGACY_PLAN_FILE_REL));
+  return readTextIfPresent2(planFileAbs(worktreePath)) ?? readTextIfPresent2((0, import_node_path52.join)(worktreePath, `${LEGACY_ATTACHMENTS_DIR}/plan.md`)) ?? readTextIfPresent2((0, import_node_path52.join)(worktreePath, LEGACY_PLAN_FILE_REL));
 }
 function writePlanFile(worktreePath, content) {
   ensureAttachmentsGitignore(worktreePath);
   const abs = planFileAbs(worktreePath);
-  (0, import_node_fs52.mkdirSync)((0, import_node_path50.dirname)(abs), { recursive: true });
+  (0, import_node_fs53.mkdirSync)((0, import_node_path52.dirname)(abs), { recursive: true });
   const body = content.trimEnd() + (content.endsWith("\n") ? "" : "\n");
-  (0, import_node_fs52.writeFileSync)(abs, body, "utf8");
+  (0, import_node_fs53.writeFileSync)(abs, body, "utf8");
   return PLAN_FILE_REL;
 }
-var import_node_fs52, import_node_path50;
+var import_node_fs53, import_node_path52;
 var init_plan_file = __esm({
   "src/plan/plan-file.ts"() {
     "use strict";
-    import_node_fs52 = require("fs");
-    import_node_path50 = require("path");
+    import_node_fs53 = require("fs");
+    import_node_path52 = require("path");
     init_workspace_scratch();
     init_plan_present();
     init_plan_present();
@@ -22785,9 +23032,9 @@ function recoverFinishedCursorRun(opts) {
   return best;
 }
 function scanFinishedCursorRuns(runsPath, agentId, startedAfterMs) {
-  if (!(0, import_node_fs53.existsSync)(runsPath)) return null;
+  if (!(0, import_node_fs54.existsSync)(runsPath)) return null;
   try {
-    const lines = (0, import_node_fs53.readFileSync)(runsPath, "utf8").split("\n");
+    const lines = (0, import_node_fs54.readFileSync)(runsPath, "utf8").split("\n");
     let best = null;
     for (const line of lines) {
       const trimmed = line.trim();
@@ -22813,11 +23060,11 @@ function scanFinishedCursorRuns(runsPath, agentId, startedAfterMs) {
     return null;
   }
 }
-var import_node_fs53;
+var import_node_fs54;
 var init_cursor_recover = __esm({
   "src/agents/cursor-recover.ts"() {
     "use strict";
-    import_node_fs53 = require("fs");
+    import_node_fs54 = require("fs");
     init_cursor_store();
   }
 });
@@ -22960,17 +23207,18 @@ async function startOrchestration(opts) {
   }
   return updated;
 }
-var import_node_events, import_node_fs54, LIVE_TURN_SPAWN_GRACE_MS, STALE_AGENT_PID_WAIT_MS, LIGHT_RECONCILE_THROTTLE_MS, Orchestrator, singleton;
+var import_node_events, import_node_fs55, LIVE_TURN_SPAWN_GRACE_MS, STALE_AGENT_PID_WAIT_MS, LIGHT_RECONCILE_THROTTLE_MS, Orchestrator, singleton;
 var init_orchestrator = __esm({
   "src/orchestrator/orchestrator.ts"() {
     "use strict";
     import_node_events = require("events");
     init_outbound_watch();
-    import_node_fs54 = require("fs");
+    import_node_fs55 = require("fs");
     init_error_detail();
     init_run();
     init_stale_lock();
     init_spawn();
+    init_turn_trace();
     init_agents();
     init_worktree();
     init_stack();
@@ -23131,7 +23379,7 @@ var init_orchestrator = __esm({
           this.lightReconcileAt.set(repoPath, Date.now());
           for (const thread of listThreads()) {
             if (isGlobalThread(thread) || thread.repoPath !== repoPath) continue;
-            if (!(0, import_node_fs54.existsSync)(thread.worktreePath)) {
+            if (!(0, import_node_fs55.existsSync)(thread.worktreePath)) {
               setStatus(thread.id, "broken", "Worktree missing on disk");
               this.emit({ type: "status_changed", threadId: thread.id, status: "broken" });
             }
@@ -23160,7 +23408,7 @@ var init_orchestrator = __esm({
             }
             continue;
           }
-          if (!(0, import_node_fs54.existsSync)(thread.worktreePath)) {
+          if (!(0, import_node_fs55.existsSync)(thread.worktreePath)) {
             setStatus(thread.id, "broken", "Worktree missing on disk");
             this.emit({ type: "status_changed", threadId: thread.id, status: "broken" });
             continue;
@@ -23226,7 +23474,7 @@ var init_orchestrator = __esm({
           }
           if (thread.queue.length > 0) {
             this.haltDrain.delete(thread.id);
-            void this.drainQueue(thread.id);
+            this.armDrain(thread.id);
           }
         }
       }
@@ -23562,7 +23810,7 @@ var init_orchestrator = __esm({
             this.emit({ type: "status_changed", threadId: thread.id, status: "queued" });
           }
           if (thisProcessShouldDrainAgentQueues() && !shouldSteer) {
-            void this.drainQueue(thread.id);
+            this.armDrain(thread.id);
           }
           return this.requireThread(thread.id);
         });
@@ -23642,9 +23890,15 @@ var init_orchestrator = __esm({
         if (inFlight || foreignLive) {
           this.stop(thread.id, { clearQueue: false, continueQueue: true });
         }
-        void this.drainQueue(thread.id);
+        this.armDrain(thread.id);
         return this.requireThread(thread.id);
       }
+      armDrain(threadId) {
+        void this.drainQueue(threadId).catch((err) => {
+          const detail = err instanceof Error ? err.message : String(err);
+          console.error(`[sideboard] drainQueue ${threadId}: ${detail}`);
+        });
+      }
       async drainQueue(threadId) {
         if (this.draining.has(threadId)) return;
         this.draining.add(threadId);
@@ -23716,196 +23970,205 @@ var init_orchestrator = __esm({
         this.emit({ type: "status_changed", threadId, status: "running" });
         this.emit({ type: "turn_started", threadId, prompt });
         try {
-          const baseline = await captureTurnBaseline(thread.worktreePath);
-          if (baseline) this.turnBaselines.set(threadId, baseline);
-        } catch {
-        }
-        try {
-          const compact = await maybeCompactContext(thread);
-          if (compact.didCompact) {
-            thread = updateThread(threadId, {
-              messages: compact.thread.messages,
-              sessionId: compact.thread.sessionId
-            });
-            this.emit({
-              type: "context_compacted",
-              threadId,
-              olderCount: compact.olderCount ?? 0,
-              method: compact.method ?? "extractive"
-            });
+          try {
+            const baseline = await captureTurnBaseline(thread.worktreePath);
+            if (baseline) this.turnBaselines.set(threadId, baseline);
+          } catch {
           }
-        } catch (err) {
-          const message = err instanceof Error ? err.message : String(err);
-          this.emit({ type: "error", threadId, message: `context compact failed: ${message}` });
-          thread = this.requireThread(threadId);
-        }
-        const autoContinue = isJobContinuePrompt(prompt) || prompt.trim().startsWith("The previous agent process ended before it finished.");
-        const parked = takePendingTurnAttachments(thread);
-        const sentAttachments = !autoContinue && parked.length > 0 ? parked : void 0;
-        appendMessage(threadId, {
-          role: "user",
-          text: prompt,
-          ...sentAttachments ? { attachments: sentAttachments } : {},
-          ...autoContinue ? { origin: "continue" } : {},
-          ts: (/* @__PURE__ */ new Date()).toISOString()
-        });
-        thread = this.requireThread(threadId);
-        const gitPrompt = expandCanonicalGitRequest(prompt);
-        const { agentPrompt: expandedPrompt } = expandComposerPrompt(
-          thread.worktreePath,
-          gitPrompt,
-          {
-            attachments: autoContinue ? [] : sentAttachments ?? []
+          try {
+            const compact = await maybeCompactContext(thread);
+            if (compact.didCompact) {
+              thread = updateThread(threadId, {
+                messages: compact.thread.messages,
+                sessionId: compact.thread.sessionId
+              });
+              this.emit({
+                type: "context_compacted",
+                threadId,
+                olderCount: compact.olderCount ?? 0,
+                method: compact.method ?? "extractive"
+              });
+            }
+          } catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            this.emit({ type: "error", threadId, message: `context compact failed: ${message}` });
+            thread = this.requireThread(threadId);
           }
-        );
-        const slackInbound = /^(Slack DM|Slack @mention)(?:\n|$)/.test(
-          expandedPrompt.trim()
-        );
-        const orchestrationReminder = isOrchestratorThread(thread) ? [
-          coordinatorTurnReminder({
-            parentId: threadId,
-            goal: thread.sourceRef || thread.title
-          }),
-          slackInbound ? [
-            "This turn is a Slack DM or @mention. Your reply is posted back in Slack \u2014 keep it concise. Sideboard signs it with this Mac's destination name; do not prefix the name yourself.",
-            SLACK_REPLY_FORMATTING
-          ].join("\n") : null
-        ].filter(Boolean).join("\n") : null;
-        const artifactReminder = thread.agent !== "brightsy" ? formatUiReminder() : null;
-        const longRunningReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatLongRunningReminder() : null;
-        const worktreeReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatWorktreeReminder() : null;
-        const optionalServicesReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatOptionalServicesReminder(loadAppSettings().integrations) : null;
-        const issueTicket = issueTicketFromThread(thread, resolveEffectiveIssueSource());
-        const issueToolsReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatIssueToolsReminder({
-          linear: isLinearConnected(),
-          abletime: isAbleTimeConnected(),
-          github: true,
-          ticketId: issueTicket?.id,
-          ticketProvider: issueTicket?.provider
-        }) : null;
-        const viewerContextReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatViewerContextReminder() : null;
-        const reviewWriteGateReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) && isReviewWriteGatedThread(
-          thread,
-          thread.worktreePath ? threadsSharingWorktree(thread.worktreePath) : []
-        ) ? formatReviewWriteGateReminder() : null;
-        const slackReplyContext = formatSlackRepliesForTurn(
-          pendingSlackExternalReplies(thread.messages)
-        );
-        const turnReminders = [
-          worktreeReminder,
-          optionalServicesReminder,
-          issueToolsReminder,
-          reviewWriteGateReminder,
-          viewerContextReminder,
-          artifactReminder,
-          longRunningReminder
-        ].filter(Boolean).join("\n\n") || void 0;
-        const prGateDirective = thread.agent !== "brightsy" && !isOrchestratorThread(thread) && mentionsPrGoal(prompt) ? formatPrGateDirective() : null;
-        const agentPrompt = [
-          thread.planMode ? PLAN_MODE_INSTRUCTION : null,
-          orchestrationReminder,
-          prGateDirective,
-          slackReplyContext,
-          expandedPrompt
-        ].filter(Boolean).join("\n\n");
-        if (!autoContinue && sentAttachments) {
-          updateThread(threadId, { pendingTurnAttachments: [] });
-        }
-        const adapter = getAdapter(thread.agent);
-        const resolved = await adapter.resolveSessionId(thread.worktreePath, thread.sessionId);
-        if (resolved && resolved !== thread.sessionId) {
-          updateThread(threadId, { sessionId: resolved });
-        }
-        const fresh = this.requireThread(threadId);
-        if (!fresh.worktreePath?.trim()) {
-          throw new Error(
-            `Thread ${threadId} has no worktreePath \u2014 refusing to start an agent outside an isolated worktree`
+          const promptText = typeof prompt === "string" ? prompt : "";
+          const autoContinue = isJobContinuePrompt(promptText) || promptText.startsWith("The previous agent process ended before it finished.");
+          const parked = takePendingTurnAttachments(thread);
+          const sentAttachments = !autoContinue && parked.length > 0 ? parked : void 0;
+          appendMessage(threadId, {
+            role: "user",
+            text: promptText,
+            ...sentAttachments ? { attachments: sentAttachments } : {},
+            ...autoContinue ? { origin: "continue" } : {},
+            ts: (/* @__PURE__ */ new Date()).toISOString()
+          });
+          traceTurn("runTurn.afterUserMessage", {
+            threadId,
+            agent: thread.agent,
+            orch: isOrchestratorThread(thread)
+          });
+          thread = this.requireThread(threadId);
+          const gitPrompt = expandCanonicalGitRequest(promptText);
+          const { agentPrompt: expandedPrompt } = expandComposerPrompt(
+            thread.worktreePath,
+            gitPrompt,
+            {
+              attachments: autoContinue ? [] : sentAttachments ?? []
+            }
           );
-        }
-        const isBrightsy = fresh.agent === "brightsy";
-        const isOrchestration = isOrchestratorThread(fresh);
-        const { autoRenameBranchEnabled: autoRenameBranchEnabled2, getGithubGitAuthMode: getGithubGitAuthMode2, gitBranchPrefixSetting: gitBranchPrefixSetting2 } = await Promise.resolve().then(() => (init_app_settings(), app_settings_exports));
-        const gitAuthMode = getGithubGitAuthMode2();
-        const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
-          githubSlug: await resolveGithubRepoSlug(fresh.worktreePath).catch(
-            () => null
-          ),
-          gitAuthMode
-        });
-        const artifactDirective = isBrightsy ? null : formatArtifactDirective();
-        const longRunningDirective = isBrightsy || isOrchestration ? null : formatLongRunningDirective();
-        const optionalServicesDirective = isBrightsy || isOrchestration ? null : formatOptionalServicesDirective(loadAppSettings().integrations);
-        const freshIssueTicket = issueTicketFromThread(fresh, resolveEffectiveIssueSource());
-        const issueToolsDirective = isBrightsy || isOrchestration ? null : formatIssueToolsDirective({
-          linear: isLinearConnected(),
-          abletime: isAbleTimeConnected(),
-          github: true,
-          ticketId: freshIssueTicket?.id,
-          ticketProvider: freshIssueTicket?.provider
-        });
-        const reviewWriteGateDirective = isBrightsy || isOrchestration || !isReviewWriteGatedThread(
-          fresh,
-          fresh.worktreePath ? threadsSharingWorktree(fresh.worktreePath) : []
-        ) ? null : formatReviewWriteGateDirective();
-        let viewerContextDirective = null;
-        if (!isBrightsy && !isOrchestration) {
-          try {
-            viewerContextDirective = formatViewerContextDirective(
-              resolveViewerProfileForRepo(fresh.repoPath || fresh.worktreePath)
-            );
-          } catch {
-            viewerContextDirective = formatViewerContextDirective(
-              resolveViewerProfileForRepo()
+          const slackInbound = /^(Slack DM|Slack @mention)(?:\n|$)/.test(
+            expandedPrompt.trim()
+          );
+          const orchestrationReminder = isOrchestratorThread(thread) ? [
+            coordinatorTurnReminder({
+              parentId: threadId,
+              goal: thread.sourceRef || thread.title
+            }),
+            slackInbound ? [
+              "This turn is a Slack DM or @mention. Your reply is posted back in Slack \u2014 keep it concise. Sideboard signs it with this Mac's destination name; do not prefix the name yourself.",
+              SLACK_REPLY_FORMATTING
+            ].join("\n") : null
+          ].filter(Boolean).join("\n") : null;
+          const artifactReminder = thread.agent !== "brightsy" ? formatUiReminder() : null;
+          const longRunningReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatLongRunningReminder() : null;
+          const worktreeReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatWorktreeReminder() : null;
+          const optionalServicesReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatOptionalServicesReminder(loadAppSettings().integrations) : null;
+          const issueTicket = issueTicketFromThread(thread, resolveEffectiveIssueSource());
+          const issueToolsReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatIssueToolsReminder({
+            linear: isLinearConnected(),
+            abletime: isAbleTimeConnected(),
+            github: true,
+            ticketId: issueTicket?.id,
+            ticketProvider: issueTicket?.provider
+          }) : null;
+          const viewerContextReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatViewerContextReminder() : null;
+          const reviewWriteGateReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) && isReviewWriteGatedThread(
+            thread,
+            thread.worktreePath ? threadsSharingWorktree(thread.worktreePath) : []
+          ) ? formatReviewWriteGateReminder() : null;
+          const slackReplyContext = formatSlackRepliesForTurn(
+            pendingSlackExternalReplies(thread.messages)
+          );
+          const turnReminders = [
+            worktreeReminder,
+            optionalServicesReminder,
+            issueToolsReminder,
+            reviewWriteGateReminder,
+            viewerContextReminder,
+            artifactReminder,
+            longRunningReminder
+          ].filter(Boolean).join("\n\n") || void 0;
+          const prGateDirective = thread.agent !== "brightsy" && !isOrchestratorThread(thread) && mentionsPrGoal(promptText) ? formatPrGateDirective() : null;
+          const agentPrompt = [
+            thread.planMode ? PLAN_MODE_INSTRUCTION : null,
+            orchestrationReminder,
+            prGateDirective,
+            slackReplyContext,
+            expandedPrompt
+          ].filter(Boolean).join("\n\n");
+          if (!autoContinue && sentAttachments) {
+            updateThread(threadId, { pendingTurnAttachments: [] });
+          }
+          const adapter = getAdapter(thread.agent);
+          const resolved = await adapter.resolveSessionId(thread.worktreePath, thread.sessionId);
+          if (resolved && resolved !== thread.sessionId) {
+            updateThread(threadId, { sessionId: resolved });
+          }
+          const fresh = this.requireThread(threadId);
+          if (!fresh.worktreePath?.trim()) {
+            throw new Error(
+              `Thread ${threadId} has no worktreePath \u2014 refusing to start an agent outside an isolated worktree`
             );
           }
-        }
-        const settings = loadWorkspaceSettings(fresh.worktreePath, fresh.repoPath);
-        let renameBranchDirective = null;
-        if (!isBrightsy && !isOrchestration && autoRenameBranchEnabled2()) {
-          const { resolveGitBranchPrefix: resolveGitBranchPrefix2 } = await Promise.resolve().then(() => (init_branch_prefix(), branch_prefix_exports));
-          renameBranchDirective = formatRenameBranchDirective(fresh, {
-            customPrompt: settings?.prompts?.renameBranch,
-            branchPrefix: resolveGitBranchPrefix2({
-              setting: gitBranchPrefixSetting2()
-            })
+          const isBrightsy = fresh.agent === "brightsy";
+          const isOrchestration = isOrchestratorThread(fresh);
+          const { autoRenameBranchEnabled: autoRenameBranchEnabled2, getGithubGitAuthMode: getGithubGitAuthMode2, gitBranchPrefixSetting: gitBranchPrefixSetting2 } = await Promise.resolve().then(() => (init_app_settings(), app_settings_exports));
+          const gitAuthMode = getGithubGitAuthMode2();
+          const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
+            githubSlug: await withTimeout(
+              resolveGithubRepoSlug(fresh.worktreePath),
+              8e3,
+              "resolveGithubRepoSlug"
+            ).catch(() => null),
+            gitAuthMode
           });
-        }
-        let seed = null;
-        if (!fresh.sessionId) {
-          const prior = fresh.messages.slice(0, -1);
-          seed = isBrightsy ? buildBrightsySessionSeed(prior) : buildSessionSeed(prior);
-        }
-        let coordinatorDirective = null;
-        if (isOrchestration) {
-          if (isGlobalThread(fresh)) {
-            ensureGlobalCoordinatorCwd({ orchestratorThreadId: fresh.id });
+          const artifactDirective = isBrightsy ? null : formatArtifactDirective();
+          const longRunningDirective = isBrightsy || isOrchestration ? null : formatLongRunningDirective();
+          const optionalServicesDirective = isBrightsy || isOrchestration ? null : formatOptionalServicesDirective(loadAppSettings().integrations);
+          const freshIssueTicket = issueTicketFromThread(fresh, resolveEffectiveIssueSource());
+          const issueToolsDirective = isBrightsy || isOrchestration ? null : formatIssueToolsDirective({
+            linear: isLinearConnected(),
+            abletime: isAbleTimeConnected(),
+            github: true,
+            ticketId: freshIssueTicket?.id,
+            ticketProvider: freshIssueTicket?.provider
+          });
+          const reviewWriteGateDirective = isBrightsy || isOrchestration || !isReviewWriteGatedThread(
+            fresh,
+            fresh.worktreePath ? threadsSharingWorktree(fresh.worktreePath) : []
+          ) ? null : formatReviewWriteGateDirective();
+          let viewerContextDirective = null;
+          if (!isBrightsy && !isOrchestration) {
+            try {
+              viewerContextDirective = formatViewerContextDirective(
+                resolveViewerProfileForRepo(fresh.repoPath || fresh.worktreePath)
+              );
+            } catch {
+              viewerContextDirective = formatViewerContextDirective(
+                resolveViewerProfileForRepo()
+              );
+            }
           }
-          if (!fresh.sessionId) {
-            const inventory = await enrichWorkspacesWithGithub(this.listWorkspaces());
-            coordinatorDirective = coordinatorSystemPrompt({
-              goal: fresh.sourceRef || fresh.title || "Orchestration",
-              parentId: fresh.id,
-              workspaces: inventory,
-              audience: /^(Slack DM|Slack @mention)(?:\n|$)/.test(
-                expandedPrompt.trim()
-              ) ? "slack" : "desktop"
+          const settings = loadWorkspaceSettings(fresh.worktreePath, fresh.repoPath);
+          let renameBranchDirective = null;
+          if (!isBrightsy && !isOrchestration && autoRenameBranchEnabled2()) {
+            const { resolveGitBranchPrefix: resolveGitBranchPrefix2 } = await Promise.resolve().then(() => (init_branch_prefix(), branch_prefix_exports));
+            renameBranchDirective = formatRenameBranchDirective(fresh, {
+              customPrompt: settings?.prompts?.renameBranch,
+              branchPrefix: resolveGitBranchPrefix2({
+                setting: gitBranchPrefixSetting2()
+              })
             });
           }
-        }
-        const cachedPrefix = fresh.sessionId ? "" : [
-          coordinatorDirective,
-          worktreeDirective,
-          optionalServicesDirective,
-          issueToolsDirective,
-          reviewWriteGateDirective,
-          viewerContextDirective,
-          artifactDirective,
-          longRunningDirective,
-          renameBranchDirective,
-          seed
-        ].filter(Boolean).join("\n\n---\n\n");
-        try {
+          let seed = null;
+          if (!fresh.sessionId) {
+            const prior = fresh.messages.slice(0, -1);
+            seed = isBrightsy ? buildBrightsySessionSeed(prior) : buildSessionSeed(prior);
+          }
+          let coordinatorDirective = null;
+          if (isOrchestration) {
+            if (isGlobalThread(fresh)) {
+              ensureGlobalCoordinatorCwd({ orchestratorThreadId: fresh.id });
+            }
+            if (!fresh.sessionId) {
+              const inventory = await enrichWorkspacesWithGithub(this.listWorkspaces());
+              coordinatorDirective = coordinatorSystemPrompt({
+                goal: fresh.sourceRef || fresh.title || "Orchestration",
+                parentId: fresh.id,
+                workspaces: inventory,
+                audience: /^(Slack DM|Slack @mention)(?:\n|$)/.test(
+                  expandedPrompt.trim()
+                ) ? "slack" : "desktop"
+              });
+            }
+          }
+          const cachedPrefix = fresh.sessionId ? "" : [
+            coordinatorDirective,
+            worktreeDirective,
+            optionalServicesDirective,
+            issueToolsDirective,
+            reviewWriteGateDirective,
+            viewerContextDirective,
+            artifactDirective,
+            longRunningDirective,
+            renameBranchDirective,
+            seed
+          ].filter(Boolean).join("\n\n---\n\n");
           const stderrTail = [];
+          traceTurn("runTurn.beforeSpawn", { threadId, agent: fresh.agent });
           const handle = await spawnAgentTurn(
             fresh,
             {
@@ -24705,6 +24968,18 @@ var init_orchestrator = __esm({
         const thread = this.requireThread(threadRef);
         return listWorktreeFiles(thread.worktreePath);
       }
+      async statPath(threadRef, relativePath) {
+        const thread = this.requireThread(threadRef);
+        if (relativePath.includes("..") || relativePath.startsWith("/")) {
+          return "missing";
+        }
+        if (!relativePath || relativePath === ".") return "dir";
+        try {
+          return statWorktreePath(thread.worktreePath, relativePath);
+        } catch {
+          return "missing";
+        }
+      }
       async readFile(threadRef, relativePath) {
         const thread = this.requireThread(threadRef);
         if (relativePath.includes("..") || relativePath.startsWith("/")) {
@@ -25187,7 +25462,7 @@ var init_orchestrator = __esm({
           this.emit({ type: "status_changed", threadId: restored2.id, status: restored2.status });
           return restored2;
         }
-        if (!(0, import_node_fs54.existsSync)(thread.worktreePath)) {
+        if (!(0, import_node_fs55.existsSync)(thread.worktreePath)) {
           if (isCowboyThread(thread) || isPrimaryCheckoutThread(thread)) {
             throw new Error(
               `Cowboy checkout missing: ${thread.worktreePath}. Re-add the project folder, then restore.`
@@ -25967,6 +26242,7 @@ __export(index_exports, {
   maxConcurrentAgents: () => maxConcurrentAgents,
   maybeCompactContext: () => maybeCompactContext,
   mcpAllowTools: () => mcpAllowTools,
+  mcpAllowToolsFromNames: () => mcpAllowToolsFromNames,
   mcpAuthWarnings: () => mcpAuthWarnings,
   mcpStatusThinkingFromClaudeInit: () => mcpStatusThinkingFromClaudeInit,
   mentionsPrGoal: () => mentionsPrGoal,
@@ -26035,6 +26311,7 @@ __export(index_exports, {
   prepareTerminalCommand: () => prepareTerminalCommand,
   prependQueuedItem: () => prependQueuedItem,
   previewLand: () => previewLand,
+  primaryCheckoutFromLinkedWorktree: () => primaryCheckoutFromLinkedWorktree,
   promptMentionsBrightsy: () => promptMentionsBrightsy,
   pushBranch: () => pushBranch,
   readExistingReviewRequestFile: () => readExistingReviewRequestFile,
@@ -26179,6 +26456,7 @@ __export(index_exports, {
   startOrchestration: () => startOrchestration,
   startSlackOAuth: () => startSlackOAuth,
   startSlackRelayServer: () => startSlackRelayServer,
+  statWorktreePath: () => statWorktreePath,
   stripBrightsyNdjsonNoise: () => stripBrightsyNdjsonNoise,
   stripNestedElectronEnv: () => stripNestedElectronEnv,
   submitPrStack: () => submitPrStack,
@@ -28681,7 +28959,7 @@ var import_mcp = require("@modelcontextprotocol/sdk/server/mcp.js");
 var import_stdio = require("@modelcontextprotocol/sdk/server/stdio.js");
 var import_zod9 = require("zod");
 var import_node_crypto15 = require("crypto");
-var import_node_path53 = require("path");
+var import_node_path55 = require("path");
 init_orchestrator();
 init_worktree();
 init_global_workspace();
@@ -30401,27 +30679,27 @@ init_gh_errors();
 init_git_auth_mode();
 
 // src/board/load-home-board.ts
-var import_node_fs56 = require("fs");
-var import_node_path52 = require("path");
+var import_node_fs57 = require("fs");
+var import_node_path54 = require("path");
 init_worktree();
 init_paths();
 
 // src/board/board-pins.ts
 var import_node_crypto14 = require("crypto");
-var import_node_fs55 = require("fs");
-var import_node_path51 = require("path");
+var import_node_fs56 = require("fs");
+var import_node_path53 = require("path");
 init_paths();
 init_home_board();
 var FILE = "home-board-pins.json";
 var VERSION = 1;
 function pinsFile() {
-  return (0, import_node_path51.join)(appDataDir(), FILE);
+  return (0, import_node_path53.join)(appDataDir(), FILE);
 }
 function readDisk() {
   const path2 = pinsFile();
-  if (!(0, import_node_fs55.existsSync)(path2)) return [];
+  if (!(0, import_node_fs56.existsSync)(path2)) return [];
   try {
-    const raw = JSON.parse((0, import_node_fs55.readFileSync)(path2, "utf8"));
+    const raw = JSON.parse((0, import_node_fs56.readFileSync)(path2, "utf8"));
     if (raw?.version !== VERSION || !Array.isArray(raw.items)) return [];
     return raw.items.filter((item) => item?.id && item.kind && item.ref);
   } catch {
@@ -30429,8 +30707,8 @@ function readDisk() {
   }
 }
 function writeDisk(items) {
-  (0, import_node_fs55.mkdirSync)(appDataDir(), { recursive: true });
-  (0, import_node_fs55.writeFileSync)(pinsFile(), JSON.stringify({ version: VERSION, items }, null, 2), "utf8");
+  (0, import_node_fs56.mkdirSync)(appDataDir(), { recursive: true });
+  (0, import_node_fs56.writeFileSync)(pinsFile(), JSON.stringify({ version: VERSION, items }, null, 2), "utf8");
 }
 function listBoardPins() {
   return readDisk();
@@ -30482,7 +30760,7 @@ function replaceBoardPins(items) {
 }
 function clearBoardPins() {
   try {
-    (0, import_node_fs55.unlinkSync)(pinsFile());
+    (0, import_node_fs56.unlinkSync)(pinsFile());
   } catch {
   }
 }
@@ -30499,7 +30777,7 @@ function homeBoardWorkspaceKey(workspaces) {
   return workspaces.map((w) => w.path).filter(Boolean).sort().join("\n");
 }
 function cacheFile() {
-  return (0, import_node_path52.join)(appDataDir(), "home-board-cache.json");
+  return (0, import_node_path54.join)(appDataDir(), "home-board-cache.json");
 }
 function emptyInputs() {
   return {
@@ -30525,9 +30803,9 @@ function shouldCacheHomeBoardInputs(inputs) {
 }
 function readDiskCache() {
   const path2 = cacheFile();
-  if (!(0, import_node_fs56.existsSync)(path2)) return null;
+  if (!(0, import_node_fs57.existsSync)(path2)) return null;
   try {
-    const raw = JSON.parse((0, import_node_fs56.readFileSync)(path2, "utf8"));
+    const raw = JSON.parse((0, import_node_fs57.readFileSync)(path2, "utf8"));
     if (raw?.version !== CACHE_VERSION || typeof raw.fetchedAt !== "number") {
       return null;
     }
@@ -30541,14 +30819,14 @@ function readDiskCache() {
 }
 function writeDiskCache(entry) {
   try {
-    (0, import_node_fs56.mkdirSync)(appDataDir(), { recursive: true });
-    (0, import_node_fs56.writeFileSync)(cacheFile(), JSON.stringify(entry), "utf8");
+    (0, import_node_fs57.mkdirSync)(appDataDir(), { recursive: true });
+    (0, import_node_fs57.writeFileSync)(cacheFile(), JSON.stringify(entry), "utf8");
   } catch {
   }
 }
 function deleteDiskCache() {
   try {
-    (0, import_node_fs56.unlinkSync)(cacheFile());
+    (0, import_node_fs57.unlinkSync)(cacheFile());
   } catch {
   }
 }
@@ -30734,7 +31012,7 @@ function orchCreateThreadAgentNote(input) {
 // src/mcp/server.ts
 var MAX_ORCH_THREADS = 5;
 var CREATE_THREAD_TIMEOUT_MS = 9e4;
-function withTimeout(promise, ms, label) {
+function withTimeout2(promise, ms, label) {
   return new Promise((resolve, reject) => {
     const timer = setTimeout(() => {
       reject(new Error(`${label} timed out after ${Math.round(ms / 1e3)}s`));
@@ -30788,7 +31066,7 @@ async function createOrchChildThread(orch, args, resolveNewThreadOptions2) {
   const agentNote = orchCreateThreadAgentNote(opts);
   try {
     const priorIds = new Set(orch.getThreads(false).map((t) => t.id));
-    const thread = await withTimeout(
+    const thread = await withTimeout2(
       orch.createThread({
         sourceType: args.sourceType,
         sourceRef: args.sourceRef,
@@ -30898,7 +31176,7 @@ async function startMcpServer() {
       async () => {
         const threads = orch.getThreads(true);
         const lines = threads.map((t) => {
-          const repo = t.repoPath === GLOBAL_WORKSPACE_ID2 ? "Orchestration" : (0, import_node_path53.basename)(t.repoPath) || t.repoPath;
+          const repo = t.repoPath === GLOBAL_WORKSPACE_ID2 ? "Orchestration" : (0, import_node_path55.basename)(t.repoPath) || t.repoPath;
           const live = orch.threadLooksLive(t) ? readTurnLive(t.id) : null;
           const parent = t.parentThreadId ? `  parent:${t.parentThreadId.slice(0, 8)}` : "";
           const preview = lastMessagePreview(t.messages, 80);
@@ -33865,9 +34143,9 @@ var import_node_http4 = require("http");
 var import_ws3 = require("ws");
 
 // src/slack/relay-static.ts
-var import_node_fs57 = require("fs");
+var import_node_fs58 = require("fs");
 var import_promises = require("fs/promises");
-var import_node_path54 = __toESM(require("path"), 1);
+var import_node_path56 = __toESM(require("path"), 1);
 var TYPES = {
   ".css": "text/css; charset=utf-8",
   ".html": "text/html; charset=utf-8",
@@ -33898,9 +34176,9 @@ function resolveStaticPath(root, requestUrl) {
     return null;
   }
   if (!pathname.startsWith("/") || pathname.includes("\0")) return null;
-  const rootResolved = import_node_path54.default.resolve(root);
-  const candidate = import_node_path54.default.resolve(rootResolved, `.${pathname}`);
-  if (candidate !== rootResolved && !candidate.startsWith(rootResolved + import_node_path54.default.sep)) {
+  const rootResolved = import_node_path56.default.resolve(root);
+  const candidate = import_node_path56.default.resolve(rootResolved, `.${pathname}`);
+  if (candidate !== rootResolved && !candidate.startsWith(rootResolved + import_node_path56.default.sep)) {
     return null;
   }
   return candidate;
@@ -33914,7 +34192,7 @@ async function fileSize(file) {
   }
 }
 function sendFile(req, res, file, size) {
-  const ext = import_node_path54.default.extname(file).toLowerCase();
+  const ext = import_node_path56.default.extname(file).toLowerCase();
   res.writeHead(200, {
     "Content-Type": TYPES[ext] ?? "application/octet-stream",
     "Content-Length": size,
@@ -33924,7 +34202,7 @@ function sendFile(req, res, file, size) {
     res.end();
     return true;
   }
-  (0, import_node_fs57.createReadStream)(file).pipe(res);
+  (0, import_node_fs58.createReadStream)(file).pipe(res);
   return true;
 }
 async function tryServeStatic(req, res, root) {
@@ -33933,7 +34211,7 @@ async function tryServeStatic(req, res, root) {
   if (!candidate) return false;
   const direct = await fileSize(candidate);
   if (direct != null) return sendFile(req, res, candidate, direct);
-  const asIndex = import_node_path54.default.join(candidate, "index.html");
+  const asIndex = import_node_path56.default.join(candidate, "index.html");
   const indexSize = await fileSize(asIndex);
   if (indexSize != null) return sendFile(req, res, asIndex, indexSize);
   return false;
@@ -34756,6 +35034,7 @@ init_outbound_watch();
   maxConcurrentAgents,
   maybeCompactContext,
   mcpAllowTools,
+  mcpAllowToolsFromNames,
   mcpAuthWarnings,
   mcpStatusThinkingFromClaudeInit,
   mentionsPrGoal,
@@ -34824,6 +35103,7 @@ init_outbound_watch();
   prepareTerminalCommand,
   prependQueuedItem,
   previewLand,
+  primaryCheckoutFromLinkedWorktree,
   promptMentionsBrightsy,
   pushBranch,
   readExistingReviewRequestFile,
@@ -34968,6 +35248,7 @@ init_outbound_watch();
   startOrchestration,
   startSlackOAuth,
   startSlackRelayServer,
+  statWorktreePath,
   stripBrightsyNdjsonNoise,
   stripNestedElectronEnv,
   submitPrStack,