@sideboard-ai/core 0.1.99 → 0.1.100

package/dist/index.cjs

@@ -5147,7 +5147,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."
@@ -5270,7 +5270,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:",
@@ -6133,6 +6133,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;
@@ -6143,6 +6150,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)
   )) {
@@ -6165,6 +6173,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;
@@ -6209,11 +6231,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();
@@ -6227,12 +6260,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)";
   }
 });
@@ -6673,6 +6707,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_fs19.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_fs19.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_fs19.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_fs19, import_node_path19;
+var init_packaged_runtime = __esm({
+  "src/agents/packaged-runtime.ts"() {
+    "use strict";
+    import_node_fs19 = require("fs");
+    import_node_path19 = require("path");
+  }
+});
+
 // src/agents/node-launch.ts
 function isAsarPath(filePath) {
   if (/\.asar\.unpacked([/\\]|$)/.test(filePath)) return false;
@@ -6682,24 +6765,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_fs19.existsSync)(unpacked) ? unpacked : null;
+  return (0, import_node_fs20.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_fs20.existsSync)(root)) return [];
+  try {
+    return (0, import_node_fs20.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_fs19.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_fs20.existsSync)(p) || isElectronLikeCommand(p)) continue;
+    let key = p;
+    try {
+      key = (0, import_node_fs20.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 (path2) => {
+      const version = await probeNodeVersion(path2);
+      return version ? { path: path2, version } : null;
+    })
+  );
+  return pickPreferredNode(probed.filter((c) => c != null));
 }
 function applyNodeLaunch(launch, args) {
   const readableArgs = args.map(nodeReadableScriptPath);
@@ -6717,9 +6905,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 {
@@ -6727,61 +6919,17 @@ async function resolveNodeLaunch(scriptPath) {
     env: { ELECTRON_RUN_AS_NODE: "1" }
   };
 }
-var import_node_fs19, import_node_os7, import_node_path19, WELL_KNOWN_NODE_BINS;
+var import_node_fs20, import_node_os7, import_node_path20, PREFERRED_LTS_MAJORS;
 var init_node_launch = __esm({
   "src/agents/node-launch.ts"() {
     "use strict";
-    import_node_fs19 = require("fs");
+    import_node_fs20 = 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_fs20.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_fs20.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_fs20, import_node_path20;
-var init_packaged_runtime = __esm({
-  "src/agents/packaged-runtime.ts"() {
-    "use strict";
-    import_node_fs20 = require("fs");
-    import_node_path20 = require("path");
+    init_packaged_runtime();
+    PREFERRED_LTS_MAJORS = [24, 22, 20];
   }
 });
 
@@ -16133,19 +16281,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);
@@ -16194,10 +16339,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",
@@ -16605,10 +16747,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) {
@@ -18389,7 +18534,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()
@@ -18404,7 +18549,8 @@ async function startMcpServer() {
               text: JSON.stringify({
                 id: thread.id,
                 status: result.status,
-                text: result.text
+                text: result.text,
+                lastError: result.lastError
               })
             }
           ]
@@ -18413,7 +18559,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);

package/dist/index.d.cts

@@ -2953,6 +2953,7 @@ declare class Orchestrator {
         text: string;
         status: string;
         sessionId: string | null;
+        lastError: string | null;
     };
     private assertNotGlobal;
     /** MCP set_caffeinate is a detached hold — closing the chat must not leave the Mac awake. */
@@ -4190,7 +4191,7 @@ declare function userClaudeMcpConfigPath(): string;
 /** Merge a `sideboard` stdio server into an mcp.json-shaped document. Does not clobber other servers. */
 declare function mergeSideboardIntoMcpServersJson(existing: unknown, sideboard: UserMcpStdioLaunch): Record<string, unknown>;
 /**
- * Packaged Sideboard.app: upsert the same absolute `node` + extraResources MCP
+ * Packaged Sideboard.app: upsert the same absolute bundled `node` + extraResources MCP
  * into Cursor IDE (always) and Claude Code (only if ~/.claude.json already exists).
  * Codex is documented only — do not rewrite ~/.codex/config.toml.
  */

package/dist/index.d.ts

@@ -2953,6 +2953,7 @@ declare class Orchestrator {
         text: string;
         status: string;
         sessionId: string | null;
+        lastError: string | null;
     };
     private assertNotGlobal;
     /** MCP set_caffeinate is a detached hold — closing the chat must not leave the Mac awake. */
@@ -4190,7 +4191,7 @@ declare function userClaudeMcpConfigPath(): string;
 /** Merge a `sideboard` stdio server into an mcp.json-shaped document. Does not clobber other servers. */
 declare function mergeSideboardIntoMcpServersJson(existing: unknown, sideboard: UserMcpStdioLaunch): Record<string, unknown>;
 /**
- * Packaged Sideboard.app: upsert the same absolute `node` + extraResources MCP
+ * Packaged Sideboard.app: upsert the same absolute bundled `node` + extraResources MCP
  * into Cursor IDE (always) and Claude Code (only if ~/.claude.json already exists).
  * Codex is documented only — do not rewrite ~/.codex/config.toml.
  */

package/dist/index.js

@@ -4,7 +4,7 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-UYQYK2RY.js";
+} from "./chunk-MHJV4WS3.js";
 import {
   BRIGHTSY_MCP_ALLOWED_TOOLS,
   CLAUDE_MODEL_CATALOG,
@@ -65,7 +65,7 @@ import {
   threadRequestsBrightsyMcp,
   totalTokens,
   writeInjectedMcpConfig
-} from "./chunk-MBP3XG57.js";
+} from "./chunk-OXC3MEFI.js";
 import {
   CLOUD_COORDINATOR_BUSY_REPLY,
   CLOUD_COORDINATOR_STOPPED_REPLY,
@@ -93,7 +93,7 @@ import {
   parseForceStopMessage,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-FO67IJTY.js";
+} from "./chunk-GR4JKWR4.js";
 import {
   COORDINATOR_TOOL_PLAYBOOK,
   SLACK_REPLY_FORMATTING,
@@ -102,7 +102,7 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-XUWDLRAE.js";
+} from "./chunk-HYKZEP5A.js";
 import {
   brightsyConfigPath,
   brightsyMcpServerName,
@@ -133,13 +133,14 @@ import {
   cursorSdkMessageToEvents,
   fallbackTurnFailDetail,
   formatTurnExitError,
-  humanizeAgentFailDetail,
   looksLikeAgentFailureMessage,
   looksLikeInvalidAgentSession,
   parseCursorRunnerLine,
   pushTurnStderr,
-  summarizeTurnStderr
-} from "./chunk-GXSYI7FH.js";
+  shouldRetryFailedAgentTurn,
+  summarizeTurnStderr,
+  turnFailChatText
+} from "./chunk-HUKCGRAT.js";
 import {
   caffeinateHoldPath,
   getCaffeinateHold,
@@ -1385,9 +1386,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-RSQXRLT7.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-KYEBFWKB.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-AKEY4WSO.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-HHRKQWCX.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -3880,7 +3881,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-3MWWWSMF.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-OXZDMPSE.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -4433,7 +4434,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-4ZY4QPWQ.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-NNPD7QVV.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -6517,19 +6518,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);
@@ -6578,10 +6576,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",
@@ -6989,10 +6984,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) {
@@ -7446,7 +7444,7 @@ var Orchestrator = class {
     this.emit({ type: "status_changed", threadId: archived.id, status: "archived" });
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-4ZY4QPWQ.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-NNPD7QVV.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -8757,7 +8755,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: z3.string(),
         timeoutMs: z3.number().optional()
@@ -8772,7 +8770,8 @@ async function startMcpServer() {
               text: JSON.stringify({
                 id: thread.id,
                 status: result.status,
-                text: result.text
+                text: result.text,
+                lastError: result.lastError
               })
             }
           ]
@@ -8781,7 +8780,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: z3.string() },
       async ({ ref }) => {
         const result = orch.getTurnResult(ref);