@sideboard-ai/core 0.1.98 → 0.1.100

package/dist/mcp/run-stdio.cjs

@@ -883,6 +883,13 @@ function looksLikeMinifiedJsDump(line) {
 function looksLikeNestedElectronCrash(line) {
   return /HasCustomHostObject|ElectronInitializeICUandStartNode/i.test(line);
 }
+function looksLikeHomebrewLibuvCrash(line) {
+  const uvRun = /uv_run/i.test(line);
+  const spin = /SpinEventLoopInternal/i.test(line);
+  const homebrewUv = /Cellar\/libuv|libuv\.\d\.dylib/i.test(line);
+  const homebrewNode = /Cellar\/node\//i.test(line);
+  return uvRun && (homebrewUv || spin || homebrewNode) || spin && (homebrewUv || homebrewNode);
+}
 function clipStderr(text3, maxChars) {
   const trimmed = text3.trim();
   if (trimmed.length <= maxChars) return trimmed;
@@ -893,6 +900,7 @@ function summarizeTurnStderr(tail, maxChars = 500) {
   const cursorStartup = [...tail].reverse().find((line) => /cursor startup failed:/i.test(line));
   if (cursorStartup) return clipStderr(cursorStartup, maxChars);
   if (tail.some(looksLikeNestedElectronCrash)) return NESTED_ELECTRON_SUMMARY;
+  if (tail.some(looksLikeHomebrewLibuvCrash)) return HOMEBREW_LIBUV_SUMMARY;
   if (tail.some(
     (line) => /\[resource_exhausted\]|resource_exhausted/i.test(line) || /findFilesWithRipgrep/.test(line)
   )) {
@@ -915,6 +923,20 @@ function looksLikeInvalidAgentSession(text3) {
   if (!lower) return false;
   return /session not found/.test(lower) || /no conversation found/.test(lower) || /conversation .+ not found/.test(lower) || /thread .+ not found/.test(lower) || /unknown session/.test(lower) || /invalid session/.test(lower) || /session .+ (missing|expired|deleted|gone)/.test(lower) || /cannot resume/.test(lower) || /failed to (load|resume|open) session/.test(lower) || /corrupt local agent checkpoint/.test(lower) || /missing root blob/.test(lower) || /\bagent\b.{0,120}\bnot found\b/.test(lower);
 }
+function looksLikeRetryableRunnerCrash(text3) {
+  if (looksLikeAgentFailureMessage(text3)) return false;
+  if (looksLikeInvalidAgentSession(text3)) return false;
+  const lower = text3.trim().toLowerCase();
+  if (/cannot find (?:package|module)|err_module_not_found/.test(lower)) return false;
+  if (!lower) return true;
+  return /uv_run|spineventloopinternal|libuv|homebrew node \+ shared libuv|hascustomhostobject|electroninitializeicuandstartnode|nested chromium|truncated crash dump|sig(?:segv|abrt|ill)|segmentation fault|illegal instruction|fatal error/.test(
+    lower
+  );
+}
+function shouldRetryFailedAgentTurn(detail, opts) {
+  if (looksLikeInvalidAgentSession(detail) && opts.hasSession) return true;
+  return looksLikeRetryableRunnerCrash(detail);
+}
 function looksLikeAgentFailureMessage(text3) {
   const lower = text3.trim().toLowerCase();
   if (!lower) return false;
@@ -959,11 +981,22 @@ function humanizeAgentFailDetail(detail) {
   if (/hascustomhostobject|electroninitializeicuandstartnode|nested chromium/i.test(lower)) {
     return `${raw} \u2014 retry the turn; if it keeps failing, pick another agent.`;
   }
+  if (/homebrew node \+ shared libuv|uv_run|spineventloopinternal/i.test(lower)) {
+    return /brew install node@22/i.test(raw) ? raw : `${raw} \u2014 install Node 22 LTS (\`brew install node@22\`) and retry.`;
+  }
   if (/corrupt local agent checkpoint|missing root blob|truncated crash dump/.test(lower)) {
     return `${raw} \u2014 retry the turn (Sideboard will start a fresh Cursor session).`;
   }
   return raw;
 }
+function turnFailChatText(opts) {
+  const chat = opts.assistantText.trim();
+  if (chat) return chat;
+  if (opts.exitCode === 0) return "";
+  const detail = opts.detail.trim();
+  if (detail) return humanizeAgentFailDetail(detail);
+  return formatTurnExitError(opts.exitCode ?? 1, "");
+}
 function formatTurnExitError(exitCode, stderrSummary) {
   const code = exitCode ?? 1;
   const raw = stderrSummary.trim();
@@ -977,12 +1010,13 @@ function formatTurnExitError(exitCode, stderrSummary) {
   if (looksLikeAgentFailureMessage(raw)) return detail;
   return `exit ${code}: ${detail}`;
 }
-var NODE_VERSION_FOOTER, NESTED_ELECTRON_SUMMARY, MINIFIED_DUMP_SUMMARY;
+var NODE_VERSION_FOOTER, NESTED_ELECTRON_SUMMARY, HOMEBREW_LIBUV_SUMMARY, MINIFIED_DUMP_SUMMARY;
 var init_error_detail = __esm({
   "src/agents/error-detail.ts"() {
     "use strict";
     NODE_VERSION_FOOTER = /^Node\.js v\d+/i;
     NESTED_ELECTRON_SUMMARY = "Cursor local agent crashed at Electron startup (nested Chromium / HasCustomHostObject)";
+    HOMEBREW_LIBUV_SUMMARY = "Cursor runner crashed in Node (Homebrew Node + shared libuv). Install Node 22 LTS (`brew install node@22`) and retry.";
     MINIFIED_DUMP_SUMMARY = "Cursor local agent crashed during startup (truncated crash dump)";
   }
 });
@@ -5007,7 +5041,7 @@ function coordinatorTurnReminder(opts) {
     goal ? `- Goal / title: ${goal}` : null,
     accountDefaultsPlaybookLine(),
     `- For "what's going on": call list_threads (and list_workspaces if needed). Summarize fleet status \u2014 do not ls/git-status this synthetic home.`,
-    "- Existing repo: create_thread on a repoPath \u2192 send_to_thread \u2192 wait_for_turn. Commit/push/draft PR with ask_git on the child, then wait_for_turn \u2014 never git/gh from this cwd. Call ask_git merge only if the user explicitly asked to merge.",
+    "- Existing repo: create_thread on a repoPath \u2192 send_to_thread \u2192 wait_for_turn. If status is error, lastError/text is the failure \u2014 adapt (switch agent, tell the user). Commit/push/draft PR with ask_git on the child, then wait_for_turn \u2014 never git/gh from this cwd. Call ask_git merge only if the user explicitly asked to merge.",
     "- New repo: Bash (clone or gh repo create under ~/sideboard/repos/<name>) \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn \u2192 ask_git create-draft.",
     "- When naming threads for the user, link them as `[Title](sideboard://thread/<id>)`.",
     "- If they will wait on Slack or leave the Mac, call set_caffeinate enabled=true. When they say they are done / wrapping up / going to sleep, call set_caffeinate enabled=false. Closing this chat also turns it off."
@@ -5130,7 +5164,7 @@ var init_coordinator_prompt = __esm({
       "- fork_worktree \u2014 fork a worktree chat into a NEW git worktree + chat (transcript attached); optional agent; leave model unset (Auto) unless you have a reason. Not for orchestration chats.",
       "- fork_chat \u2014 fork a worktree chat (same worktree tab) OR a Global orchestration chat (new orchestration tab); optional agent; leave model unset (Auto) unless you have a reason. Remote coordinators: use this to continue another orchestration chat on a different agent after session limits.",
       "- send_to_thread \u2014 queue a prompt (start/continue a chat turn); pass force_stop: true to interrupt mid-turn / clear stale queued prompts before replacing with a new request",
-      "- wait_for_turn / get_turn_result \u2014 wait for and read the agent reply",
+      "- wait_for_turn / get_turn_result \u2014 wait for and read the agent reply. On status error, lastError (and text) is the failure \u2014 switch agent, tell the user, or retry; do not treat empty text as success.",
       "- stop_thread \u2014 force-stop: kill in-flight turn AND clear queued prompts (do not leave stale queue after an interrupt)",
       "- archive_thread / restore_thread \u2014 archive (tears down worktree when last tab) or restore",
       "Setup / run:",
@@ -6046,6 +6080,55 @@ var init_profile = __esm({
   }
 });
 
+// src/agents/packaged-runtime.ts
+function electronResourcesPath() {
+  const resources = process.resourcesPath;
+  if (typeof resources !== "string" || !resources) return null;
+  return resources;
+}
+function packagedCursorRuntimeDir() {
+  const resources = electronResourcesPath();
+  if (!resources) return null;
+  const dir = (0, import_node_path19.join)(resources, "cursor-runtime");
+  if (!(0, import_node_fs18.existsSync)((0, import_node_path19.join)(dir, "core-dist", "agents", "cursor-runner.js"))) return null;
+  return dir;
+}
+function packagedCursorRunnerPath() {
+  const dir = packagedCursorRuntimeDir();
+  return dir ? (0, import_node_path19.join)(dir, "core-dist", "agents", "cursor-runner.js") : null;
+}
+function packagedMcpDir() {
+  const resources = electronResourcesPath();
+  if (!resources) return null;
+  const dir = (0, import_node_path19.join)(resources, "sideboard-mcp");
+  if (!(0, import_node_fs18.existsSync)((0, import_node_path19.join)(dir, "core-dist", "mcp", "run-stdio.js"))) return null;
+  return dir;
+}
+function packagedMcpStdioPath() {
+  const dir = packagedMcpDir();
+  return dir ? (0, import_node_path19.join)(dir, "core-dist", "mcp", "run-stdio.js") : null;
+}
+function packagedBundledNodePath() {
+  const resources = electronResourcesPath();
+  if (!resources) return null;
+  const bin = (0, import_node_path19.join)(resources, "node", "bin", "node");
+  if (!(0, import_node_fs18.existsSync)(bin)) return null;
+  return bin;
+}
+function packagedCursorRipgrepCandidate(platformPkg, binName) {
+  const dir = packagedCursorRuntimeDir();
+  if (!dir) return null;
+  return (0, import_node_path19.join)(dir, "node_modules", platformPkg, "bin", binName);
+}
+var import_node_fs18, import_node_path19;
+var init_packaged_runtime = __esm({
+  "src/agents/packaged-runtime.ts"() {
+    "use strict";
+    import_node_fs18 = require("fs");
+    import_node_path19 = require("path");
+  }
+});
+
 // src/agents/node-launch.ts
 function isAsarPath(filePath) {
   if (/\.asar\.unpacked([/\\]|$)/.test(filePath)) return false;
@@ -6055,24 +6138,129 @@ function unpackedAsarPath(filePath) {
   if (!isAsarPath(filePath)) return null;
   const unpacked = filePath.replace(/\.asar(?=[/\\])/, ".asar.unpacked");
   if (unpacked === filePath) return null;
-  return (0, import_node_fs18.existsSync)(unpacked) ? unpacked : null;
+  return (0, import_node_fs19.existsSync)(unpacked) ? unpacked : null;
 }
 function nodeReadableScriptPath(scriptPath) {
   return unpackedAsarPath(scriptPath) ?? scriptPath;
 }
-async function findSystemNode() {
-  const whichNode = await run("which", ["node"], { reject: false });
-  const fromWhich = whichNode.exitCode === 0 && whichNode.stdout.trim() ? whichNode.stdout.trim() : "";
-  if (fromWhich && !isElectronLikeCommand(fromWhich)) return fromWhich;
-  const fallbacks = [
-    ...WELL_KNOWN_NODE_BINS,
-    (0, import_node_path19.join)((0, import_node_os7.homedir)(), ".local/share/fnm/aliases/default/bin/node"),
-    (0, import_node_path19.join)((0, import_node_os7.homedir)(), ".nvm/current/bin/node")
+function parseNodeMajor(version) {
+  const match = /^v?(\d+)/.exec(version.trim());
+  if (!match) return null;
+  const major = Number(match[1]);
+  return Number.isInteger(major) ? major : null;
+}
+function scoreNodeForAgentRuntime(candidate) {
+  const major = parseNodeMajor(candidate.version);
+  if (major == null) return Number.NEGATIVE_INFINITY;
+  if (major < 20) return major - 100;
+  const posix = candidate.path.replace(/\\/g, "/");
+  let score = 0;
+  if (major % 2 === 0) {
+    score += 1e3 + major * 10;
+  } else {
+    score += major;
+  }
+  if (/\/Cellar\/node\/\d/.test(posix) && !/\/Cellar\/node@\d+/.test(posix)) {
+    score -= 50;
+  }
+  return score;
+}
+function pickPreferredNode(candidates) {
+  let best = null;
+  let bestScore = Number.NEGATIVE_INFINITY;
+  for (const candidate of candidates) {
+    const score = scoreNodeForAgentRuntime(candidate);
+    if (score > bestScore) {
+      bestScore = score;
+      best = candidate;
+    }
+  }
+  return best;
+}
+function versionDirNodeBins(root, toBin) {
+  if (!(0, import_node_fs19.existsSync)(root)) return [];
+  try {
+    return (0, import_node_fs19.readdirSync)(root).map(toBin);
+  } catch {
+    return [];
+  }
+}
+function defaultNodeBinCandidates(home = (0, import_node_os7.homedir)()) {
+  const kegs = ["/opt/homebrew", "/usr/local"].flatMap(
+    (prefix) => PREFERRED_LTS_MAJORS.map((major) => (0, import_node_path20.join)(prefix, "opt", `node@${major}`, "bin", "node"))
+  );
+  return [
+    ...kegs,
+    "/opt/homebrew/bin/node",
+    "/usr/local/bin/node",
+    (0, import_node_path20.join)(home, ".local/share/fnm/aliases/default/bin/node"),
+    (0, import_node_path20.join)(home, ".nvm/current/bin/node"),
+    (0, import_node_path20.join)(home, ".volta/bin/node"),
+    (0, import_node_path20.join)(home, ".asdf/shims/node"),
+    (0, import_node_path20.join)(home, ".local/share/mise/shims/node"),
+    ...versionDirNodeBins(
+      (0, import_node_path20.join)(home, ".nvm", "versions", "node"),
+      (name) => (0, import_node_path20.join)(home, ".nvm", "versions", "node", name, "bin", "node")
+    ),
+    ...versionDirNodeBins(
+      (0, import_node_path20.join)(home, ".local/share/fnm", "node-versions"),
+      (name) => (0, import_node_path20.join)(home, ".local/share/fnm", "node-versions", name, "installation", "bin", "node")
+    ),
+    ...versionDirNodeBins(
+      (0, import_node_path20.join)(home, ".volta", "tools", "image", "node"),
+      (name) => (0, import_node_path20.join)(home, ".volta", "tools", "image", "node", name, "bin", "node")
+    )
   ];
-  for (const bin of fallbacks) {
-    if ((0, import_node_fs18.existsSync)(bin) && !isElectronLikeCommand(bin)) return bin;
+}
+function uniqueExistingNodeBins(paths) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const raw of paths) {
+    const p = raw.trim();
+    if (!p || !(0, import_node_fs19.existsSync)(p) || isElectronLikeCommand(p)) continue;
+    let key = p;
+    try {
+      key = (0, import_node_fs19.realpathSync)(p);
+    } catch {
+      continue;
+    }
+    if (seen.has(key)) continue;
+    seen.add(key);
+    out.push(p);
   }
-  return null;
+  return out;
+}
+async function whichAllNode() {
+  if (process.platform === "win32") {
+    const located = await run("where", ["node"], { reject: false, timeoutMs: 5e3 });
+    if (located.exitCode !== 0) return [];
+    return located.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+  }
+  const all = await run("which", ["-a", "node"], { reject: false, timeoutMs: 5e3 });
+  if (all.exitCode === 0 && all.stdout.trim()) {
+    return all.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+  }
+  const single = await run("which", ["node"], { reject: false, timeoutMs: 5e3 });
+  if (single.exitCode !== 0 || !single.stdout.trim()) return [];
+  return [single.stdout.trim()];
+}
+async function probeNodeVersion(bin) {
+  const probed = await run(bin, ["-v"], { reject: false, timeoutMs: 4e3 });
+  if (probed.exitCode !== 0) return null;
+  const version = probed.stdout.trim().split(/\r?\n/).find(Boolean);
+  return version || null;
+}
+async function findSystemNode() {
+  const fromPath = await whichAllNode();
+  const bins = uniqueExistingNodeBins([...fromPath, ...defaultNodeBinCandidates()]);
+  if (bins.length === 0) return null;
+  const probed = await Promise.all(
+    bins.map(async (path) => {
+      const version = await probeNodeVersion(path);
+      return version ? { path, version } : null;
+    })
+  );
+  return pickPreferredNode(probed.filter((c) => c != null));
 }
 function applyNodeLaunch(launch, args) {
   const readableArgs = args.map(nodeReadableScriptPath);
@@ -6090,9 +6278,13 @@ function applyNodeLaunch(launch, args) {
 async function resolveNodeLaunch(scriptPath) {
   const script = nodeReadableScriptPath(scriptPath);
   if (!isAsarPath(script)) {
-    const nodeBin = await findSystemNode();
-    if (nodeBin) {
-      return { file: nodeBin, env: {} };
+    const bundled = packagedBundledNodePath();
+    if (bundled && !isElectronLikeCommand(bundled)) {
+      return { file: bundled, env: {} };
+    }
+    const node = await findSystemNode();
+    if (node) {
+      return { file: node.path, env: {}, nodeVersion: node.version };
     }
   }
   return {
@@ -6100,61 +6292,17 @@ async function resolveNodeLaunch(scriptPath) {
     env: { ELECTRON_RUN_AS_NODE: "1" }
   };
 }
-var import_node_fs18, import_node_os7, import_node_path19, WELL_KNOWN_NODE_BINS;
+var import_node_fs19, import_node_os7, import_node_path20, PREFERRED_LTS_MAJORS;
 var init_node_launch = __esm({
   "src/agents/node-launch.ts"() {
     "use strict";
-    import_node_fs18 = require("fs");
+    import_node_fs19 = require("fs");
     import_node_os7 = require("os");
-    import_node_path19 = require("path");
+    import_node_path20 = require("path");
     init_nested_electron_env();
     init_run();
-    WELL_KNOWN_NODE_BINS = [
-      "/opt/homebrew/bin/node",
-      "/usr/local/bin/node"
-    ];
-  }
-});
-
-// src/agents/packaged-runtime.ts
-function electronResourcesPath() {
-  const resources = process.resourcesPath;
-  if (typeof resources !== "string" || !resources) return null;
-  return resources;
-}
-function packagedCursorRuntimeDir() {
-  const resources = electronResourcesPath();
-  if (!resources) return null;
-  const dir = (0, import_node_path20.join)(resources, "cursor-runtime");
-  if (!(0, import_node_fs19.existsSync)((0, import_node_path20.join)(dir, "core-dist", "agents", "cursor-runner.js"))) return null;
-  return dir;
-}
-function packagedCursorRunnerPath() {
-  const dir = packagedCursorRuntimeDir();
-  return dir ? (0, import_node_path20.join)(dir, "core-dist", "agents", "cursor-runner.js") : null;
-}
-function packagedMcpDir() {
-  const resources = electronResourcesPath();
-  if (!resources) return null;
-  const dir = (0, import_node_path20.join)(resources, "sideboard-mcp");
-  if (!(0, import_node_fs19.existsSync)((0, import_node_path20.join)(dir, "core-dist", "mcp", "run-stdio.js"))) return null;
-  return dir;
-}
-function packagedMcpStdioPath() {
-  const dir = packagedMcpDir();
-  return dir ? (0, import_node_path20.join)(dir, "core-dist", "mcp", "run-stdio.js") : null;
-}
-function packagedCursorRipgrepCandidate(platformPkg, binName) {
-  const dir = packagedCursorRuntimeDir();
-  if (!dir) return null;
-  return (0, import_node_path20.join)(dir, "node_modules", platformPkg, "bin", binName);
-}
-var import_node_fs19, import_node_path20;
-var init_packaged_runtime = __esm({
-  "src/agents/packaged-runtime.ts"() {
-    "use strict";
-    import_node_fs19 = require("fs");
-    import_node_path20 = require("path");
+    init_packaged_runtime();
+    PREFERRED_LTS_MAJORS = [24, 22, 20];
   }
 });
 
@@ -8644,40 +8792,40 @@ __export(plan_file_exports, {
   writePlanFile: () => writePlanFile
 });
 function ensureAttachmentsGitignore2(worktreePath) {
-  const gitignoreAbs = (0, import_node_path35.join)(worktreePath, ATTACHMENTS_DIR, ".gitignore");
-  if ((0, import_node_fs38.existsSync)(gitignoreAbs)) return;
-  (0, import_node_fs38.mkdirSync)((0, import_node_path35.dirname)(gitignoreAbs), { recursive: true });
-  (0, import_node_fs38.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
+  const gitignoreAbs = (0, import_node_path36.join)(worktreePath, ATTACHMENTS_DIR, ".gitignore");
+  if ((0, import_node_fs39.existsSync)(gitignoreAbs)) return;
+  (0, import_node_fs39.mkdirSync)((0, import_node_path36.dirname)(gitignoreAbs), { recursive: true });
+  (0, import_node_fs39.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
 }
 function planFileAbs(worktreePath) {
-  return (0, import_node_path35.join)(worktreePath, PLAN_FILE_REL);
+  return (0, import_node_path36.join)(worktreePath, PLAN_FILE_REL);
 }
 function readTextIfPresent2(abs) {
-  if (!(0, import_node_fs38.existsSync)(abs)) return null;
+  if (!(0, import_node_fs39.existsSync)(abs)) return null;
   try {
-    const content = (0, import_node_fs38.readFileSync)(abs, "utf8");
+    const content = (0, import_node_fs39.readFileSync)(abs, "utf8");
     return content.trim() ? content : null;
   } catch {
     return null;
   }
 }
 function readPlanFile(worktreePath) {
-  return readTextIfPresent2(planFileAbs(worktreePath)) ?? readTextIfPresent2((0, import_node_path35.join)(worktreePath, `${LEGACY_ATTACHMENTS_DIR}/plan.md`)) ?? readTextIfPresent2((0, import_node_path35.join)(worktreePath, LEGACY_PLAN_FILE_REL));
+  return readTextIfPresent2(planFileAbs(worktreePath)) ?? readTextIfPresent2((0, import_node_path36.join)(worktreePath, `${LEGACY_ATTACHMENTS_DIR}/plan.md`)) ?? readTextIfPresent2((0, import_node_path36.join)(worktreePath, LEGACY_PLAN_FILE_REL));
 }
 function writePlanFile(worktreePath, content) {
   ensureAttachmentsGitignore2(worktreePath);
   const abs = planFileAbs(worktreePath);
-  (0, import_node_fs38.mkdirSync)((0, import_node_path35.dirname)(abs), { recursive: true });
+  (0, import_node_fs39.mkdirSync)((0, import_node_path36.dirname)(abs), { recursive: true });
   const body = content.trimEnd() + (content.endsWith("\n") ? "" : "\n");
-  (0, import_node_fs38.writeFileSync)(abs, body, "utf8");
+  (0, import_node_fs39.writeFileSync)(abs, body, "utf8");
   return PLAN_FILE_REL;
 }
-var import_node_fs38, import_node_path35;
+var import_node_fs39, import_node_path36;
 var init_plan_file = __esm({
   "src/plan/plan-file.ts"() {
     "use strict";
-    import_node_fs38 = require("fs");
-    import_node_path35 = require("path");
+    import_node_fs39 = require("fs");
+    import_node_path36 = require("path");
     init_workspace_scratch();
     init_plan_present();
     init_plan_present();
@@ -8698,7 +8846,7 @@ function setCaffeinateHoldHooks(next) {
   hooks = next;
 }
 function caffeinateHoldPath() {
-  return (0, import_node_path36.join)(appDataDir(), "caffeinate-hold.json");
+  return (0, import_node_path37.join)(appDataDir(), "caffeinate-hold.json");
 }
 function processAlive(pid) {
   if (hooks.processAlive) return hooks.processAlive(pid);
@@ -8732,9 +8880,9 @@ function uniqueIds(ids) {
 }
 function readHold() {
   const path = caffeinateHoldPath();
-  if (!(0, import_node_fs39.existsSync)(path)) return null;
+  if (!(0, import_node_fs40.existsSync)(path)) return null;
   try {
-    const parsed = JSON.parse((0, import_node_fs39.readFileSync)(path, "utf8"));
+    const parsed = JSON.parse((0, import_node_fs40.readFileSync)(path, "utf8"));
     if (typeof parsed?.pid === "number" && parsed.pid > 0) {
       return {
         pid: parsed.pid,
@@ -8756,7 +8904,7 @@ function writeHold(pid, threadIds) {
 }
 function clearHold() {
   try {
-    (0, import_node_fs39.unlinkSync)(caffeinateHoldPath());
+    (0, import_node_fs40.unlinkSync)(caffeinateHoldPath());
   } catch {
   }
 }
@@ -8841,13 +8989,13 @@ function releaseCaffeinateHoldForThread(threadId) {
   }
   return setCaffeinateHold(false, { threadId: id });
 }
-var import_node_child_process4, import_node_fs39, import_node_path36, hooks;
+var import_node_child_process4, import_node_fs40, import_node_path37, hooks;
 var init_caffeinate_hold = __esm({
   "src/store/caffeinate-hold.ts"() {
     "use strict";
     import_node_child_process4 = require("child_process");
-    import_node_fs39 = require("fs");
-    import_node_path36 = require("path");
+    import_node_fs40 = require("fs");
+    import_node_path37 = require("path");
     init_paths();
     init_private_file();
     hooks = {};
@@ -8862,10 +9010,10 @@ __export(cursor_recover_exports, {
 function recoverFinishedCursorRun(opts) {
   const agentId = opts.agentId.trim();
   if (!agentId) return null;
-  const runsPath = (0, import_node_path37.join)(appDataDir(), "cursor-sdk-store", "runs.ndjson");
-  if (!(0, import_node_fs40.existsSync)(runsPath)) return null;
+  const runsPath = (0, import_node_path38.join)(appDataDir(), "cursor-sdk-store", "runs.ndjson");
+  if (!(0, import_node_fs41.existsSync)(runsPath)) return null;
   try {
-    const lines = (0, import_node_fs40.readFileSync)(runsPath, "utf8").split("\n");
+    const lines = (0, import_node_fs41.readFileSync)(runsPath, "utf8").split("\n");
     let best = null;
     for (const line of lines) {
       const trimmed = line.trim();
@@ -8891,12 +9039,12 @@ function recoverFinishedCursorRun(opts) {
     return null;
   }
 }
-var import_node_fs40, import_node_path37;
+var import_node_fs41, import_node_path38;
 var init_cursor_recover = __esm({
   "src/agents/cursor-recover.ts"() {
     "use strict";
-    import_node_fs40 = require("fs");
-    import_node_path37 = require("path");
+    import_node_fs41 = require("fs");
+    import_node_path38 = require("path");
     init_paths();
   }
 });
@@ -8908,7 +9056,7 @@ init_nested_electron_env();
 var import_mcp = require("@modelcontextprotocol/sdk/server/mcp.js");
 var import_stdio = require("@modelcontextprotocol/sdk/server/stdio.js");
 var import_zod3 = require("zod");
-var import_node_path38 = require("path");
+var import_node_path39 = require("path");
 
 // src/orchestrator/orchestrator.ts
 var import_node_events = require("events");
@@ -9419,7 +9567,7 @@ async function refreshSlackReplyBadges(opts) {
 }
 
 // src/orchestrator/orchestrator.ts
-var import_node_fs41 = require("fs");
+var import_node_fs42 = require("fs");
 init_error_detail();
 
 // src/agents/spawn.ts
@@ -10536,8 +10684,44 @@ async function cloneRepoIntoSideboard(opts) {
 // src/orchestrator/orchestrator.ts
 init_thread_store();
 
-// src/threads/create.ts
+// src/store/desktop-host.ts
 var import_node_fs30 = require("fs");
+var import_node_path29 = require("path");
+init_paths();
+function desktopHostPidPath() {
+  return (0, import_node_path29.join)(appDataDir(), "desktop-host.pid");
+}
+function readDesktopHostPid() {
+  try {
+    const pid = Number.parseInt((0, import_node_fs30.readFileSync)(desktopHostPidPath(), "utf8").trim(), 10);
+    if (!Number.isFinite(pid) || pid <= 0) return null;
+    return pid;
+  } catch {
+    return null;
+  }
+}
+function pidAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isDesktopHostAlive() {
+  const pid = readDesktopHostPid();
+  return pid != null && pidAlive(pid);
+}
+function isThisProcessDesktopHost() {
+  return readDesktopHostPid() === process.pid && pidAlive(process.pid);
+}
+function thisProcessShouldDrainAgentQueues() {
+  if (isThisProcessDesktopHost()) return true;
+  return !isDesktopHostAlive();
+}
+
+// src/threads/create.ts
+var import_node_fs31 = require("fs");
 
 // src/detect/detect.ts
 init_agents();
@@ -10582,7 +10766,7 @@ async function createThread(input, _onSetupLine) {
   });
   await requireAgent(resolved.agent);
   const repoPath = await resolveRepoRoot(input.repoPath);
-  if (!(0, import_node_fs30.existsSync)(repoPath)) {
+  if (!(0, import_node_fs31.existsSync)(repoPath)) {
     throw new Error(`Repo not found: ${repoPath}`);
   }
   let sourceRef = input.sourceRef;
@@ -11058,8 +11242,8 @@ function forkChatTab(input) {
 
 // src/review/request-review.ts
 var import_node_crypto5 = require("crypto");
-var import_node_fs31 = require("fs");
-var import_node_path29 = require("path");
+var import_node_fs32 = require("fs");
+var import_node_path30 = require("path");
 init_global_workspace();
 init_thread_store();
 
@@ -11207,22 +11391,22 @@ function shouldRefreshReviewRequestTemplate(content) {
   return LEGACY_REVIEW_TEMPLATE_MARKERS.every((m) => trimmed.includes(m));
 }
 function readTextIfPresent(abs) {
-  if (!(0, import_node_fs31.existsSync)(abs)) return null;
+  if (!(0, import_node_fs32.existsSync)(abs)) return null;
   try {
-    const content = (0, import_node_fs31.readFileSync)(abs, "utf8");
+    const content = (0, import_node_fs32.readFileSync)(abs, "utf8");
     return content.trim() ? content : null;
   } catch {
     return null;
   }
 }
 function ensureAttachmentsGitignore(worktreePath) {
-  const gitignoreAbs = (0, import_node_path29.join)(worktreePath, ATTACHMENTS_DIR, ".gitignore");
-  if ((0, import_node_fs31.existsSync)(gitignoreAbs)) return;
-  (0, import_node_fs31.mkdirSync)((0, import_node_path29.dirname)(gitignoreAbs), { recursive: true });
-  (0, import_node_fs31.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
+  const gitignoreAbs = (0, import_node_path30.join)(worktreePath, ATTACHMENTS_DIR, ".gitignore");
+  if ((0, import_node_fs32.existsSync)(gitignoreAbs)) return;
+  (0, import_node_fs32.mkdirSync)((0, import_node_path30.dirname)(gitignoreAbs), { recursive: true });
+  (0, import_node_fs32.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
 }
 function resolveReviewGuidelines(worktreePath) {
-  const repoAbs = (0, import_node_path29.join)(worktreePath, REPO_REVIEW_PATH);
+  const repoAbs = (0, import_node_path30.join)(worktreePath, REPO_REVIEW_PATH);
   const repoContent = readTextIfPresent(repoAbs);
   if (repoContent) {
     return {
@@ -11232,7 +11416,7 @@ function resolveReviewGuidelines(worktreePath) {
       source: "repo"
     };
   }
-  const localAbs = (0, import_node_path29.join)(worktreePath, REVIEW_REQUEST_PATH);
+  const localAbs = (0, import_node_path30.join)(worktreePath, REVIEW_REQUEST_PATH);
   const localContent = readTextIfPresent(localAbs);
   if (localContent && !shouldRefreshReviewRequestTemplate(localContent)) {
     return {
@@ -11242,7 +11426,7 @@ function resolveReviewGuidelines(worktreePath) {
       source: "local"
     };
   }
-  const legacyAbs = (0, import_node_path29.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH);
+  const legacyAbs = (0, import_node_path30.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH);
   const legacyContent = readTextIfPresent(legacyAbs);
   if (legacyContent && !shouldRefreshReviewRequestTemplate(legacyContent)) {
     return {
@@ -11253,8 +11437,8 @@ function resolveReviewGuidelines(worktreePath) {
     };
   }
   ensureAttachmentsGitignore(worktreePath);
-  (0, import_node_fs31.mkdirSync)((0, import_node_path29.dirname)(localAbs), { recursive: true });
-  (0, import_node_fs31.writeFileSync)(localAbs, REVIEW_REQUEST_TEMPLATE, "utf8");
+  (0, import_node_fs32.mkdirSync)((0, import_node_path30.dirname)(localAbs), { recursive: true });
+  (0, import_node_fs32.writeFileSync)(localAbs, REVIEW_REQUEST_TEMPLATE, "utf8");
   return {
     path: REVIEW_REQUEST_PATH,
     name: REVIEW_REQUEST_NAME,
@@ -11454,21 +11638,21 @@ function createQuotaFailoverChat(from, fallbackAgent, limitText) {
 
 // src/threads/adopt.ts
 var import_node_child_process3 = require("child_process");
-var import_node_fs32 = require("fs");
+var import_node_fs33 = require("fs");
 var import_node_os10 = require("os");
-var import_node_path30 = require("path");
+var import_node_path31 = require("path");
 var import_node_module4 = require("module");
 init_worktree();
 init_thread_store();
 var import_meta4 = {};
-var CONDUCTOR_APP_SUPPORT = (0, import_node_path30.join)(
+var CONDUCTOR_APP_SUPPORT = (0, import_node_path31.join)(
   process.env.HOME ?? "",
   "Library",
   "Application Support",
   "com.conductor.app"
 );
-var CONDUCTOR_DB = (0, import_node_path30.join)(CONDUCTOR_APP_SUPPORT, "conductor.db");
-var CURSOR_SDK_STORE = (0, import_node_path30.join)(CONDUCTOR_APP_SUPPORT, "cursor-sdk-store");
+var CONDUCTOR_DB = (0, import_node_path31.join)(CONDUCTOR_APP_SUPPORT, "conductor.db");
+var CURSOR_SDK_STORE = (0, import_node_path31.join)(CONDUCTOR_APP_SUPPORT, "cursor-sdk-store");
 function openReadonlySqlite(file) {
   const req = (0, import_node_module4.createRequire)(import_meta4.url);
   const Database = req("better-sqlite3");
@@ -11485,21 +11669,21 @@ function mapAgentType(raw) {
   return null;
 }
 function resolveConductorCursorAgentId(workspacePath) {
-  if (!workspacePath || !(0, import_node_fs32.existsSync)(CURSOR_SDK_STORE)) return null;
+  if (!workspacePath || !(0, import_node_fs33.existsSync)(CURSOR_SDK_STORE)) return null;
   const normalized = workspacePath.replace(/\/$/, "");
   let best = null;
   let hashes;
   try {
-    hashes = (0, import_node_fs32.readdirSync)(CURSOR_SDK_STORE);
+    hashes = (0, import_node_fs33.readdirSync)(CURSOR_SDK_STORE);
   } catch {
     return null;
   }
   for (const hash of hashes) {
-    const agentsFile = (0, import_node_path30.join)(CURSOR_SDK_STORE, hash, "agents.ndjson");
-    if (!(0, import_node_fs32.existsSync)(agentsFile)) continue;
+    const agentsFile = (0, import_node_path31.join)(CURSOR_SDK_STORE, hash, "agents.ndjson");
+    if (!(0, import_node_fs33.existsSync)(agentsFile)) continue;
     let text3;
     try {
-      text3 = (0, import_node_fs32.readFileSync)(agentsFile, "utf8");
+      text3 = (0, import_node_fs33.readFileSync)(agentsFile, "utf8");
     } catch {
       continue;
     }
@@ -11523,7 +11707,7 @@ function resolveConductorCursorAgentId(workspacePath) {
   return best?.agentId ?? null;
 }
 async function adoptThread(input) {
-  if (!(0, import_node_fs32.existsSync)(input.worktreePath)) {
+  if (!(0, import_node_fs33.existsSync)(input.worktreePath)) {
     throw new Error(`Worktree not found: ${input.worktreePath}`);
   }
   const repoPath = await resolveRepoRoot(input.worktreePath);
@@ -11547,18 +11731,18 @@ async function adoptThread(input) {
   return thread;
 }
 function listConductorWorkspaces() {
-  if (!(0, import_node_fs32.existsSync)(CONDUCTOR_DB)) {
+  if (!(0, import_node_fs33.existsSync)(CONDUCTOR_DB)) {
     throw new Error(`Conductor DB not found at ${CONDUCTOR_DB}`);
   }
-  const tmp = (0, import_node_fs32.mkdtempSync)((0, import_node_path30.join)((0, import_node_os10.tmpdir)(), "sideboard-conductor-"));
-  const snapshot = (0, import_node_path30.join)(tmp, "conductor.db");
+  const tmp = (0, import_node_fs33.mkdtempSync)((0, import_node_path31.join)((0, import_node_os10.tmpdir)(), "sideboard-conductor-"));
+  const snapshot = (0, import_node_path31.join)(tmp, "conductor.db");
   try {
-    (0, import_node_fs32.copyFileSync)(CONDUCTOR_DB, snapshot);
+    (0, import_node_fs33.copyFileSync)(CONDUCTOR_DB, snapshot);
     for (const suffix of ["-wal", "-shm"]) {
       const src = `${CONDUCTOR_DB}${suffix}`;
-      if ((0, import_node_fs32.existsSync)(src)) {
+      if ((0, import_node_fs33.existsSync)(src)) {
         try {
-          (0, import_node_fs32.copyFileSync)(src, `${snapshot}${suffix}`);
+          (0, import_node_fs33.copyFileSync)(src, `${snapshot}${suffix}`);
         } catch {
         }
       }
@@ -11634,22 +11818,22 @@ function listConductorWorkspaces() {
       db.close();
     }
   } finally {
-    (0, import_node_fs32.rmSync)(tmp, { recursive: true, force: true });
+    (0, import_node_fs33.rmSync)(tmp, { recursive: true, force: true });
   }
 }
 function importConductorWorkspace(workspaceId) {
-  if (!(0, import_node_fs32.existsSync)(CONDUCTOR_DB)) {
+  if (!(0, import_node_fs33.existsSync)(CONDUCTOR_DB)) {
     throw new Error(`Conductor DB not found at ${CONDUCTOR_DB}`);
   }
-  const tmp = (0, import_node_fs32.mkdtempSync)((0, import_node_path30.join)((0, import_node_os10.tmpdir)(), "sideboard-conductor-"));
-  const snapshot = (0, import_node_path30.join)(tmp, "conductor.db");
+  const tmp = (0, import_node_fs33.mkdtempSync)((0, import_node_path31.join)((0, import_node_os10.tmpdir)(), "sideboard-conductor-"));
+  const snapshot = (0, import_node_path31.join)(tmp, "conductor.db");
   try {
-    (0, import_node_fs32.copyFileSync)(CONDUCTOR_DB, snapshot);
+    (0, import_node_fs33.copyFileSync)(CONDUCTOR_DB, snapshot);
     for (const suffix of ["-wal", "-shm"]) {
       const src = `${CONDUCTOR_DB}${suffix}`;
-      if ((0, import_node_fs32.existsSync)(src)) {
+      if ((0, import_node_fs33.existsSync)(src)) {
         try {
-          (0, import_node_fs32.copyFileSync)(src, `${snapshot}${suffix}`);
+          (0, import_node_fs33.copyFileSync)(src, `${snapshot}${suffix}`);
         } catch {
         }
       }
@@ -11667,7 +11851,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_fs32.existsSync)(worktreePath)) {
+      if (!(0, import_node_fs33.existsSync)(worktreePath)) {
         throw new Error(`Conductor worktree missing on disk: ${worktreePath}`);
       }
       let sessionId = null;
@@ -11730,7 +11914,7 @@ function importConductorWorkspace(workspaceId) {
       db.close();
     }
   } finally {
-    (0, import_node_fs32.rmSync)(tmp, { recursive: true, force: true });
+    (0, import_node_fs33.rmSync)(tmp, { recursive: true, force: true });
   }
 }
 async function importConductorWorkspaceAsync(workspaceId) {
@@ -11738,7 +11922,7 @@ async function importConductorWorkspaceAsync(workspaceId) {
 }
 
 // src/threads/stack-layers.ts
-var import_node_fs33 = require("fs");
+var import_node_fs34 = require("fs");
 init_run();
 init_stack();
 init_worktree();
@@ -11806,7 +11990,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_fs33.existsSync)(checkedOut.path)) {
+  if (checkedOut?.path && (0, import_node_fs34.existsSync)(checkedOut.path)) {
     if (input.reuseExistingWorktree !== false) {
       worktreePath = checkedOut.path;
     } else {
@@ -11948,7 +12132,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_fs33.existsSync)(repoPath)) throw new Error(`Repo not found: ${repoPath}`);
+  if (!(0, import_node_fs34.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);
@@ -12015,7 +12199,7 @@ async function createPrStack(input, onSetupLine) {
     }
   }
   const claimed = new Set(threads.map((t) => t.worktreePath));
-  if (!claimed.has(bootstrap.worktreePath) && (0, import_node_fs33.existsSync)(bootstrap.worktreePath)) {
+  if (!claimed.has(bootstrap.worktreePath) && (0, import_node_fs34.existsSync)(bootstrap.worktreePath)) {
     try {
       await removeWorktree(repoPath, bootstrap.worktreePath, {
         deleteBranch: bootstrap.branchName
@@ -12030,12 +12214,12 @@ async function createPrStack(input, onSetupLine) {
 init_worktree();
 
 // src/diff/diff.ts
-var import_node_fs34 = require("fs");
-var import_node_path31 = require("path");
+var import_node_fs35 = require("fs");
+var import_node_path32 = require("path");
 init_run();
 init_worktree();
 async function inspectGitWorktree(worktreePath) {
-  if (!worktreePath || !(0, import_node_fs34.existsSync)(worktreePath)) return "missing_worktree";
+  if (!worktreePath || !(0, import_node_fs35.existsSync)(worktreePath)) return "missing_worktree";
   const check = await git(["rev-parse", "--is-inside-work-tree"], worktreePath, {
     reject: false
   });
@@ -12043,7 +12227,7 @@ async function inspectGitWorktree(worktreePath) {
   return "ok";
 }
 async function initializeGitRepository(worktreePath) {
-  if (!worktreePath || !(0, import_node_fs34.existsSync)(worktreePath)) {
+  if (!worktreePath || !(0, import_node_fs35.existsSync)(worktreePath)) {
     throw new Error("Worktree not found");
   }
   const status = await inspectGitWorktree(worktreePath);
@@ -12179,11 +12363,11 @@ new file mode 100644
   };
 }
 async function untrackedPatch(worktreePath, path, maxHunk) {
-  const abs = (0, import_node_path31.join)(worktreePath, path);
+  const abs = (0, import_node_path32.join)(worktreePath, path);
   try {
-    const st = (0, import_node_fs34.statSync)(abs);
+    const st = (0, import_node_fs35.statSync)(abs);
     if (st.isFile() && st.size > maxHunk) {
-      const buf = (0, import_node_fs34.readFileSync)(abs).subarray(0, maxHunk);
+      const buf = (0, import_node_fs35.readFileSync)(abs).subarray(0, maxHunk);
       return syntheticAddPatch(path, buf.toString("utf8"), maxHunk);
     }
   } catch {
@@ -12684,8 +12868,8 @@ var DEFAULT_UPLOAD_MAX_BYTES = 5e7;
 function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
   assertSafeRelativePath(relativePath);
   const maxBytes = opts?.maxBytes ?? DEFAULT_UPLOAD_MAX_BYTES;
-  const abs = (0, import_node_path31.join)(worktreePath, relativePath);
-  const st = (0, import_node_fs34.statSync)(abs);
+  const abs = (0, import_node_path32.join)(worktreePath, relativePath);
+  const st = (0, import_node_fs35.statSync)(abs);
   if (!st.isFile()) {
     throw new Error(`Not a file: ${relativePath}`);
   }
@@ -12694,7 +12878,7 @@ function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
       `File too large to upload (${st.size} bytes; max ${maxBytes})`
     );
   }
-  const buf = (0, import_node_fs34.readFileSync)(abs);
+  const buf = (0, import_node_fs35.readFileSync)(abs);
   return {
     path: relativePath,
     contentBase64: buf.toString("base64"),
@@ -12704,12 +12888,12 @@ function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
 function readWorktreeFile(worktreePath, relativePath, opts) {
   assertSafeRelativePath(relativePath);
   const maxBytes = opts?.maxBytes ?? 2e5;
-  const abs = (0, import_node_path31.join)(worktreePath, relativePath);
-  const st = (0, import_node_fs34.statSync)(abs);
+  const abs = (0, import_node_path32.join)(worktreePath, relativePath);
+  const st = (0, import_node_fs35.statSync)(abs);
   if (!st.isFile()) {
     throw new Error(`Not a file: ${relativePath}`);
   }
-  const buf = (0, import_node_fs34.readFileSync)(abs);
+  const buf = (0, import_node_fs35.readFileSync)(abs);
   if (isImageRelativePath(relativePath)) {
     const maxImageBytes = Math.max(maxBytes, 15e6);
     const truncated2 = buf.length > maxImageBytes;
@@ -12752,9 +12936,9 @@ function assertSafeRelativePath(relativePath) {
 }
 function writeWorktreeFile(worktreePath, relativePath, content) {
   assertSafeRelativePath(relativePath);
-  const abs = (0, import_node_path31.join)(worktreePath, relativePath);
-  (0, import_node_fs34.mkdirSync)((0, import_node_path31.dirname)(abs), { recursive: true });
-  (0, import_node_fs34.writeFileSync)(abs, content, "utf8");
+  const abs = (0, import_node_path32.join)(worktreePath, relativePath);
+  (0, import_node_fs35.mkdirSync)((0, import_node_path32.dirname)(abs), { recursive: true });
+  (0, import_node_fs35.writeFileSync)(abs, content, "utf8");
   return { path: relativePath };
 }
 async function getDiffSummary(worktreePath, repoPath, opts) {
@@ -12858,9 +13042,9 @@ async function confirmLand(thread, opts) {
 }
 
 // src/skills/discover.ts
-var import_node_fs35 = require("fs");
+var import_node_fs36 = require("fs");
 var import_node_os11 = require("os");
-var import_node_path32 = require("path");
+var import_node_path33 = require("path");
 function toCommand(name) {
   return name.normalize("NFKD").replace(/[\u0300-\u036f]/g, "").toLowerCase().trim().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 }
@@ -12892,7 +13076,7 @@ function parseFrontmatter(content) {
 }
 function readSkill(skillMd, source) {
   try {
-    const content = (0, import_node_fs35.readFileSync)(skillMd, "utf8");
+    const content = (0, import_node_fs36.readFileSync)(skillMd, "utf8");
     const { name: fmName, description } = parseFrontmatter(content);
     const dirName = skillMd.split("/").slice(-2, -1)[0] || "skill";
     const name = fmName || dirName;
@@ -12911,19 +13095,19 @@ function readSkill(skillMd, source) {
   }
 }
 function scanSkillsDir(dir, source, out) {
-  if (!(0, import_node_fs35.existsSync)(dir)) return;
+  if (!(0, import_node_fs36.existsSync)(dir)) return;
   let entries;
   try {
-    entries = (0, import_node_fs35.readdirSync)(dir);
+    entries = (0, import_node_fs36.readdirSync)(dir);
   } catch {
     return;
   }
   for (const entry of entries) {
     if (entry.startsWith(".")) continue;
-    const skillMd = (0, import_node_path32.join)(dir, entry, "SKILL.md");
-    if (!(0, import_node_fs35.existsSync)(skillMd)) continue;
+    const skillMd = (0, import_node_path33.join)(dir, entry, "SKILL.md");
+    if (!(0, import_node_fs36.existsSync)(skillMd)) continue;
     try {
-      if (!(0, import_node_fs35.statSync)(skillMd).isFile()) continue;
+      if (!(0, import_node_fs36.statSync)(skillMd).isFile()) continue;
     } catch {
       continue;
     }
@@ -12932,24 +13116,24 @@ function scanSkillsDir(dir, source, out) {
   }
 }
 function scanClaudePluginSkills(pluginsRoot, out) {
-  if (!(0, import_node_fs35.existsSync)(pluginsRoot)) return;
+  if (!(0, import_node_fs36.existsSync)(pluginsRoot)) return;
   const walk = (dir, depth, lookingForSkillsDir) => {
     if (depth > 7) return;
     let entries;
     try {
-      entries = (0, import_node_fs35.readdirSync)(dir);
+      entries = (0, import_node_fs36.readdirSync)(dir);
     } catch {
       return;
     }
     if (lookingForSkillsDir && entries.includes("SKILL.md")) {
-      const skill = readSkill((0, import_node_path32.join)(dir, "SKILL.md"), "cli");
+      const skill = readSkill((0, import_node_path33.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_path32.join)(dir, entry);
+      const full = (0, import_node_path33.join)(dir, entry);
       try {
-        if (!(0, import_node_fs35.statSync)(full).isDirectory()) continue;
+        if (!(0, import_node_fs36.statSync)(full).isDirectory()) continue;
       } catch {
         continue;
       }
@@ -12967,17 +13151,17 @@ function discoverSkills(worktreePath) {
   const home = (0, import_node_os11.homedir)();
   const collected = [];
   for (const rel of [".claude/skills", ".cursor/skills", ".sideboard/skills", ".brightsy/skills", "skills"]) {
-    scanSkillsDir((0, import_node_path32.join)(worktreePath, rel), "workspace", collected);
+    scanSkillsDir((0, import_node_path33.join)(worktreePath, rel), "workspace", collected);
   }
   for (const abs of [
-    (0, import_node_path32.join)(home, ".claude/skills"),
-    (0, import_node_path32.join)(home, ".cursor/skills"),
-    (0, import_node_path32.join)(home, ".sideboard/skills"),
-    (0, import_node_path32.join)(home, ".brightsy/skills")
+    (0, import_node_path33.join)(home, ".claude/skills"),
+    (0, import_node_path33.join)(home, ".cursor/skills"),
+    (0, import_node_path33.join)(home, ".sideboard/skills"),
+    (0, import_node_path33.join)(home, ".brightsy/skills")
   ]) {
     scanSkillsDir(abs, "user", collected);
   }
-  scanClaudePluginSkills((0, import_node_path32.join)(home, ".claude/plugins"), collected);
+  scanClaudePluginSkills((0, import_node_path33.join)(home, ".claude/plugins"), collected);
   const rank = { workspace: 0, user: 1, cli: 2 };
   const byCommand = /* @__PURE__ */ new Map();
   for (const skill of collected) {
@@ -12989,7 +13173,7 @@ function discoverSkills(worktreePath) {
   return [...byCommand.values()].sort((a, b) => a.command.localeCompare(b.command));
 }
 function readSkillBody(skillPath, maxChars = 12e3) {
-  const raw = (0, import_node_fs35.readFileSync)(skillPath, "utf8");
+  const raw = (0, import_node_fs36.readFileSync)(skillPath, "utf8");
   if (raw.startsWith("---")) {
     const end = raw.indexOf("\n---", 3);
     if (end >= 0) {
@@ -13082,8 +13266,8 @@ function expandComposerPrompt(worktreePath, prompt, opts) {
 }
 
 // src/composer/stage-files.ts
-var import_node_fs36 = require("fs");
-var import_node_path33 = require("path");
+var import_node_fs37 = require("fs");
+var import_node_path34 = require("path");
 var import_node_crypto7 = require("crypto");
 init_workspace_scratch();
 var IMAGE_EXTENSIONS2 = /* @__PURE__ */ new Set([
@@ -13109,7 +13293,7 @@ var IMAGE_MIME_BY_EXT = {
 var MAX_INLINE_BYTES = 4e5;
 var MAX_PREVIEW_BYTES = 5e6;
 function fileExtension(filePath) {
-  const base = (0, import_node_path33.basename)(filePath).toLowerCase();
+  const base = (0, import_node_path34.basename)(filePath).toLowerCase();
   return base.includes(".") ? base.split(".").pop() || "" : "";
 }
 function isImageFilePath(filePath) {
@@ -13119,22 +13303,22 @@ function imageMimeType(filePath) {
   return IMAGE_MIME_BY_EXT[fileExtension(filePath)] || "image/png";
 }
 function ensureAttachmentsDir(worktreePath) {
-  const dir = (0, import_node_path33.join)(worktreePath, ATTACHMENTS_DIR);
-  (0, import_node_fs36.mkdirSync)(dir, { recursive: true });
-  const gi = (0, import_node_path33.join)(dir, ".gitignore");
-  if (!(0, import_node_fs36.existsSync)(gi)) {
-    (0, import_node_fs36.writeFileSync)(gi, attachmentsGitignoreBody(), "utf8");
+  const dir = (0, import_node_path34.join)(worktreePath, ATTACHMENTS_DIR);
+  (0, import_node_fs37.mkdirSync)(dir, { recursive: true });
+  const gi = (0, import_node_path34.join)(dir, ".gitignore");
+  if (!(0, import_node_fs37.existsSync)(gi)) {
+    (0, import_node_fs37.writeFileSync)(gi, attachmentsGitignoreBody(), "utf8");
   }
   return dir;
 }
 function uniqueAttachmentName(dir, originalName) {
   const safe = originalName.replace(/[/\\]/g, "_") || "file";
-  if (!(0, import_node_fs36.existsSync)((0, import_node_path33.join)(dir, safe))) return safe;
-  const ext = (0, import_node_path33.extname)(safe);
+  if (!(0, import_node_fs37.existsSync)((0, import_node_path34.join)(dir, safe))) return safe;
+  const ext = (0, import_node_path34.extname)(safe);
   const stem = ext ? safe.slice(0, -ext.length) : safe;
   for (let i = 1; i < 1e4; i++) {
     const candidate = `${stem}-${i}${ext}`;
-    if (!(0, import_node_fs36.existsSync)((0, import_node_path33.join)(dir, candidate))) return candidate;
+    if (!(0, import_node_fs37.existsSync)((0, import_node_path34.join)(dir, candidate))) return candidate;
   }
   return `${stem}-${(0, import_node_crypto7.randomUUID)()}${ext}`;
 }
@@ -13190,15 +13374,15 @@ function stageAbsolutePathsAsAttachments(worktreePath, absolutePaths) {
   const dir = ensureAttachmentsDir(worktreePath);
   const out = [];
   for (const abs of absolutePaths) {
-    const originalName = (0, import_node_path33.basename)(abs);
+    const originalName = (0, import_node_path34.basename)(abs);
     try {
-      const st = (0, import_node_fs36.statSync)(abs);
+      const st = (0, import_node_fs37.statSync)(abs);
       if (!st.isFile()) continue;
       const name = uniqueAttachmentName(dir, originalName);
-      const destAbs = (0, import_node_path33.join)(dir, name);
-      (0, import_node_fs36.copyFileSync)(abs, destAbs);
+      const destAbs = (0, import_node_path34.join)(dir, name);
+      (0, import_node_fs37.copyFileSync)(abs, destAbs);
       const rel = `${ATTACHMENTS_DIR}/${name}`;
-      const buf = (0, import_node_fs36.readFileSync)(destAbs);
+      const buf = (0, import_node_fs37.readFileSync)(destAbs);
       out.push(attachmentFromBuffer(name, buf, { path: rel, sourceLabel: abs }));
     } catch (err) {
       out.push({
@@ -13220,8 +13404,8 @@ function stageBuffersAsAttachments(worktreePath, buffers) {
     try {
       const buf = Buffer.from(item.dataBase64, "base64");
       const name = uniqueAttachmentName(dir, originalName);
-      const destAbs = (0, import_node_path33.join)(dir, name);
-      (0, import_node_fs36.writeFileSync)(destAbs, buf);
+      const destAbs = (0, import_node_path34.join)(dir, name);
+      (0, import_node_fs37.writeFileSync)(destAbs, buf);
       const rel = `${ATTACHMENTS_DIR}/${name}`;
       out.push(attachmentFromBuffer(name, buf, { path: rel }));
     } catch (err) {
@@ -13241,18 +13425,18 @@ function attachmentsFromWorktreePaths(worktreePath, relativePaths) {
     if (!rel || rel.includes("..") || rel.startsWith("/")) {
       out.push({
         id: (0, import_node_crypto7.randomUUID)(),
-        name: (0, import_node_path33.basename)(rel) || "file",
+        name: (0, import_node_path34.basename)(rel) || "file",
         kind: "file",
         content: `(invalid path: ${rel})`
       });
       continue;
     }
-    const name = (0, import_node_path33.basename)(rel);
+    const name = (0, import_node_path34.basename)(rel);
     try {
-      const abs = (0, import_node_path33.join)(worktreePath, rel);
-      const st = (0, import_node_fs36.statSync)(abs);
+      const abs = (0, import_node_path34.join)(worktreePath, rel);
+      const st = (0, import_node_fs37.statSync)(abs);
       if (!st.isFile()) continue;
-      const buf = (0, import_node_fs36.readFileSync)(abs);
+      const buf = (0, import_node_fs37.readFileSync)(abs);
       out.push(attachmentFromBuffer(name, buf, { path: rel, sourceLabel: abs }));
     } catch (err) {
       out.push({
@@ -13267,8 +13451,8 @@ function attachmentsFromWorktreePaths(worktreePath, relativePaths) {
 }
 
 // src/agents/instructions.ts
-var import_node_fs37 = require("fs");
-var import_node_path34 = require("path");
+var import_node_fs38 = require("fs");
+var import_node_path35 = require("path");
 init_git_auth_mode();
 init_worktree_labels();
 function normPath3(p) {
@@ -13548,7 +13732,7 @@ var Orchestrator = class {
         }
         continue;
       }
-      if (!(0, import_node_fs41.existsSync)(thread.worktreePath)) {
+      if (!(0, import_node_fs42.existsSync)(thread.worktreePath)) {
         setStatus(thread.id, "broken", "Worktree missing on disk");
         this.emit({ type: "status_changed", threadId: thread.id, status: "broken" });
         continue;
@@ -13799,7 +13983,9 @@ var Orchestrator = class {
       updateThread(thread.id, patch);
       this.emit({ type: "queue_changed", threadId: thread.id, queue });
       this.emit({ type: "status_changed", threadId: thread.id, status: "queued" });
-      void this.drainQueue(thread.id);
+      if (thisProcessShouldDrainAgentQueues()) {
+        void this.drainQueue(thread.id);
+      }
       return this.requireThread(thread.id);
     });
   }
@@ -13852,10 +14038,10 @@ var Orchestrator = class {
   async sendQueuedMessageNow(threadRef, index) {
     const thread = this.requireThread(threadRef);
     const promoted = await withThreadLock(thread.id, async () => {
-      const current = this.requireThread(thread.id);
-      if (index < 0 || index >= current.queue.length) return false;
-      const item = current.queue[index];
-      const rest = current.queue.filter((_, i) => i !== index);
+      const current2 = this.requireThread(thread.id);
+      if (index < 0 || index >= current2.queue.length) return false;
+      const item = current2.queue[index];
+      const rest = current2.queue.filter((_, i) => i !== index);
       const queue = [item, ...rest];
       this.haltDrain.delete(thread.id);
       updateThread(thread.id, { queue });
@@ -13863,10 +14049,16 @@ var Orchestrator = class {
       return true;
     });
     if (!promoted) return this.requireThread(thread.id);
+    const current = this.requireThread(thread.id);
     const inFlight = this.activeTurns.has(thread.id) || this.startingTurns.has(thread.id);
+    const livePid = current.agentPid;
+    const foreignLive = !inFlight && typeof livePid === "number" && livePid > 0 && isPidAlive(livePid);
     if (inFlight) {
       this.stop(thread.id, { clearQueue: false, continueQueue: true });
     } else {
+      if (foreignLive) {
+        this.stop(thread.id, { clearQueue: false, continueQueue: true });
+      }
       void this.drainQueue(thread.id);
     }
     return this.requireThread(thread.id);
@@ -14117,19 +14309,16 @@ var Orchestrator = class {
       }
       let lastStderr = summarizeTurnStderr(stderrTail);
       let detail = lastStderr || (exitCode !== 0 ? fallbackTurnFailDetail(assistantText) : "");
-      if (exitCode !== 0 && !assistantText && parts.length === 0 && !this.stoppedTurns.has(threadId) && looksLikeInvalidAgentSession(detail) && this.requireThread(threadId).sessionId && this.requireThread(threadId).agent !== "brightsy") {
+      if (exitCode !== 0 && !assistantText && parts.length === 0 && !this.stoppedTurns.has(threadId) && this.requireThread(threadId).agent !== "brightsy" && shouldRetryFailedAgentTurn(detail, {
+        hasSession: Boolean(this.requireThread(threadId).sessionId)
+      })) {
         updateThread(threadId, { sessionId: null });
-        pushTurnStderr(
-          stderrTail,
-          "Agent session missing \u2014 starting a fresh session"
-        );
+        const retryNote = looksLikeInvalidAgentSession(detail) ? "Agent session missing \u2014 starting a fresh session" : "Agent runner crashed \u2014 restarting Node once";
+        pushTurnStderr(stderrTail, retryNote);
         this.emit({
           type: "turn_output",
           threadId,
-          event: {
-            type: "stderr",
-            data: "Agent session missing \u2014 starting a fresh session"
-          }
+          event: { type: "stderr", data: retryNote }
         });
         const retryThread = this.requireThread(threadId);
         const prior = retryThread.messages.slice(0, -1);
@@ -14178,10 +14367,7 @@ var Orchestrator = class {
         lastStderr = summarizeTurnStderr(stderrTail);
         detail = lastStderr || (exitCode !== 0 ? fallbackTurnFailDetail(assistantText) : "");
       }
-      let chatText = assistantText;
-      if (exitCode !== 0 && !chatText && looksLikeAgentFailureMessage(detail)) {
-        chatText = humanizeAgentFailDetail(detail);
-      }
+      let chatText = this.stoppedTurns.has(threadId) ? assistantText : turnFailChatText({ exitCode, assistantText, detail });
       if (chatText || parts.length > 0) {
         appendMessage(threadId, {
           role: "agent",
@@ -14301,6 +14487,13 @@ var Orchestrator = class {
     if (handle) handle.kill();
     const proc = this.processes.get(`${thread.id}:agent`);
     if (proc) proc.kill();
+    const pid = thread.agentPid;
+    if (typeof pid === "number" && pid > 0 && isPidAlive(pid)) {
+      try {
+        process.kill(pid, "SIGTERM");
+      } catch {
+      }
+    }
     const stopped = writeLiveStatus(thread.id, "stopped") ?? readThread(thread.id) ?? thread;
     if (stopped.status === "stopped") {
       this.emit({ type: "status_changed", threadId: thread.id, status: "stopped" });
@@ -14582,10 +14775,13 @@ var Orchestrator = class {
   getTurnResult(threadRef) {
     const thread = this.requireThread(threadRef);
     const lastAgent = [...thread.messages].reverse().find((m) => m.role === "agent");
+    const lastError = thread.lastError ?? null;
+    const text3 = (lastAgent?.text ?? "").trim() || (thread.status === "error" ? lastError ?? "" : "");
     return {
-      text: lastAgent?.text ?? "",
+      text: text3,
       status: thread.status,
-      sessionId: thread.sessionId
+      sessionId: thread.sessionId,
+      lastError
     };
   }
   assertNotGlobal(thread, action) {
@@ -15081,7 +15277,7 @@ var Orchestrator = class {
       this.emit({ type: "status_changed", threadId: restored2.id, status: restored2.status });
       return restored2;
     }
-    if (!(0, import_node_fs41.existsSync)(thread.worktreePath)) {
+    if (!(0, import_node_fs42.existsSync)(thread.worktreePath)) {
       const { createThreadWorktree: createThreadWorktree2 } = await Promise.resolve().then(() => (init_worktree(), worktree_exports));
       const { execa: execa7 } = await import("execa");
       const slug = thread.worktreePath.split("/").pop();
@@ -16321,7 +16517,7 @@ async function startMcpServer() {
     async () => {
       const threads = orch.getThreads(true);
       const lines = threads.map((t) => {
-        const repo = t.repoPath === GLOBAL_WORKSPACE_ID ? "Orchestration" : (0, import_node_path38.basename)(t.repoPath) || t.repoPath;
+        const repo = t.repoPath === GLOBAL_WORKSPACE_ID ? "Orchestration" : (0, import_node_path39.basename)(t.repoPath) || t.repoPath;
         return `${t.id.slice(0, 8)}  ${t.status.padEnd(9)}  ${t.agent.padEnd(8)}  ${repo}  ${t.sourceType}:${t.sourceRef}  ${t.title}  sideboard://thread/${t.id}${t.devPort ? `  http://localhost:${t.devPort}` : ""}`;
       });
       return {
@@ -16678,7 +16874,7 @@ async function startMcpServer() {
     );
     server.tool(
       "wait_for_turn",
-      "Block until the thread finishes its current/queued turn (avoids polling). Use after send_to_thread or ask_git to read the agent reply.",
+      "Block until the thread finishes its current/queued turn (avoids polling). Use after send_to_thread or ask_git. Returns status, text, and lastError. If status is error, lastError/text is the failure \u2014 switch agent, tell the user, or retry; do not treat empty text as success.",
       {
         ref: import_zod3.z.string(),
         timeoutMs: import_zod3.z.number().optional()
@@ -16693,7 +16889,8 @@ async function startMcpServer() {
               text: JSON.stringify({
                 id: thread.id,
                 status: result.status,
-                text: result.text
+                text: result.text,
+                lastError: result.lastError
               })
             }
           ]
@@ -16702,7 +16899,7 @@ async function startMcpServer() {
     );
     server.tool(
       "get_turn_result",
-      "Final assistant message only (not full transcript)",
+      "Final assistant message (and lastError when the turn failed). Not the full transcript.",
       { ref: import_zod3.z.string() },
       async ({ ref }) => {
         const result = orch.getTurnResult(ref);