@sideboard-ai/core 0.1.36 → 0.1.38

package/dist/agents/cursor-runner.js

@@ -2,7 +2,7 @@
 import {
   cursorSdkMessageToEvents,
   formatUnknownDetail
-} from "../chunk-BSZX63TV.js";
+} from "../chunk-PU27NUO4.js";
 import {
   appDataDir
 } from "../chunk-M37RITA6.js";

package/dist/{agents-JZK6TQG7.js → agents-DDW4NBBW.js}

@@ -21,12 +21,12 @@ import {
   opencodeAdapter,
   permissionMode,
   resolveCursorModelId
-} from "./chunk-EHUIPKBW.js";
+} from "./chunk-BEXVE7LX.js";
 import "./chunk-ILQK4P5R.js";
 import {
   cursorSdkMessageToEvents,
   parseCursorRunnerLine
-} from "./chunk-BSZX63TV.js";
+} from "./chunk-PU27NUO4.js";
 import "./chunk-YZ23S32T.js";
 import "./chunk-M37RITA6.js";
 import {

package/dist/{chunk-EHUIPKBW.js → chunk-BEXVE7LX.js}

@@ -10,7 +10,7 @@ import {
   formatUnknownDetail,
   looksLikeAgentFailureMessage,
   parseCursorRunnerLine
-} from "./chunk-BSZX63TV.js";
+} from "./chunk-PU27NUO4.js";
 import {
   claudeChromeEnabled,
   loadAppSettings,
@@ -434,6 +434,30 @@ import { createRequire } from "module";
 import { tmpdir } from "os";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
+
+// src/agents/node-launch.ts
+function isAsarPath(filePath) {
+  return /\.asar([/\\]|$)/.test(filePath);
+}
+async function resolveNodeLaunch(scriptPath) {
+  if (isAsarPath(scriptPath)) {
+    return {
+      file: process.execPath,
+      env: { ELECTRON_RUN_AS_NODE: "1" }
+    };
+  }
+  const whichNode = await run("which", ["node"], { reject: false });
+  const nodeBin = whichNode.exitCode === 0 && whichNode.stdout.trim() ? whichNode.stdout.trim() : null;
+  if (nodeBin) {
+    return { file: nodeBin, env: {} };
+  }
+  return {
+    file: process.execPath,
+    env: { ELECTRON_RUN_AS_NODE: "1" }
+  };
+}
+
+// src/agents/injected-mcp.ts
 var SIDEBOARD_MCP_ALLOWED_TOOLS = [
   "mcp__sideboard",
   "mcp__sideboard__*"
@@ -536,11 +560,13 @@ async function resolveSideboardMcpServer() {
   const entry = findSideboardMcpJsEntry();
   if (entry) {
     const isCli = /[/\\]cli[/\\]dist[/\\]index\.js$/.test(entry);
+    const scriptArgs = isCli ? [entry, "mcp"] : [entry];
+    const launch = await resolveNodeLaunch(entry);
     return {
       name: "sideboard",
-      // Use `node` (not process.execPath) — under Electron execPath is Electron itself.
-      command: "node",
-      args: isCli ? [entry, "mcp"] : [entry]
+      command: launch.file,
+      args: scriptArgs,
+      ...Object.keys(launch.env).length > 0 ? { env: launch.env } : {}
     };
   }
   const which = await run("which", ["sideboard"], { reject: false });
@@ -772,7 +798,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread } = await import("./global-workspace-LM4AA4RO.js");
+    const { isOrchestratorThread } = await import("./global-workspace-QSRP25HQ.js");
     const isOrchestrator = isOrchestratorThread(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -1324,16 +1350,14 @@ var cursorAdapter = {
     };
     const runner = cursorRunnerPath();
     const isTs = runner.endsWith(".ts");
-    const whichNode = await run("which", ["node"], { reject: false });
-    const nodeBin = whichNode.exitCode === 0 && whichNode.stdout.trim() ? whichNode.stdout.trim() : null;
-    const file = nodeBin || process.execPath;
+    const launch = await resolveNodeLaunch(runner);
     return {
-      file,
+      file: launch.file,
       args: isTs ? ["--import", "tsx", runner] : [runner],
       cwd: thread.worktreePath,
       stdin: JSON.stringify(req),
       env: {
-        ...nodeBin ? {} : { ELECTRON_RUN_AS_NODE: "1" },
+        ...launch.env,
         ...apiKey ? { CURSOR_API_KEY: apiKey } : {}
       }
     };

package/dist/{chunk-PER4N6LS.js → chunk-FVGRUZHI.js}

@@ -1,10 +1,10 @@
 import {
   isGlobalRepoPath
-} from "./chunk-Y2EWQ4TL.js";
+} from "./chunk-IS3AGU33.js";
 import {
   ensureGhPreferOrigin,
   resolveRepoRoot
-} from "./chunk-UFWEANLU.js";
+} from "./chunk-XBEQI5H4.js";
 import {
   appDataDir
 } from "./chunk-M37RITA6.js";

package/dist/{chunk-Y2EWQ4TL.js → chunk-IS3AGU33.js}

@@ -1,11 +1,11 @@
 import {
   ensureGlobalCoordinatorCwd
-} from "./chunk-BMB7WCGF.js";
+} from "./chunk-PTASB7SJ.js";
 import {
   allocateTeamName,
   takenSlugsFromThread,
   teamSlugFromName
-} from "./chunk-UFWEANLU.js";
+} from "./chunk-XBEQI5H4.js";
 import {
   createEmptyThread,
   listThreads,

package/dist/{chunk-BMB7WCGF.js → chunk-PTASB7SJ.js}

@@ -1,6 +1,6 @@
 import {
   resolveGithubRepoSlug
-} from "./chunk-UFWEANLU.js";
+} from "./chunk-XBEQI5H4.js";
 import {
   globalAgentCwd,
   sideboardReposDir

package/dist/{chunk-BSZX63TV.js → chunk-PU27NUO4.js}

@@ -52,6 +52,10 @@ function pushTurnStderr(tail, line, maxLines = 12) {
 }
 function summarizeTurnStderr(tail, maxChars = 500) {
   if (tail.length === 0) return "";
+  const moduleMissing = [...tail].reverse().find((line) => /cannot find module/i.test(line));
+  if (moduleMissing) {
+    return moduleMissing.length <= maxChars ? moduleMissing : moduleMissing.slice(0, maxChars);
+  }
   const joined = tail.slice(-6).join("\n").trim();
   if (joined.length <= maxChars) return joined;
   return joined.slice(joined.length - maxChars);

package/dist/{chunk-KSVPOIRV.js → chunk-UKDAGGTU.js}

@@ -3,7 +3,7 @@ import {
   ensureWorkspace,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-PER4N6LS.js";
+} from "./chunk-FVGRUZHI.js";
 import {
   GLOBAL_WORKSPACE_ID,
   createGlobalChat,
@@ -13,26 +13,26 @@ import {
   isGlobalThread,
   isOrchestratorThread,
   orchestratorSessionPoisonedByBuiltins
-} from "./chunk-Y2EWQ4TL.js";
+} from "./chunk-IS3AGU33.js";
 import {
   coordinatorSystemPrompt,
   coordinatorTurnReminder,
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd
-} from "./chunk-BMB7WCGF.js";
+} from "./chunk-PTASB7SJ.js";
 import {
   PLAN_MODE_INSTRUCTION,
   allAdapters,
   getAdapter,
   parseBrightsyCliLine
-} from "./chunk-EHUIPKBW.js";
+} from "./chunk-BEXVE7LX.js";
 import {
   fallbackTurnFailDetail,
   formatTurnExitError,
   looksLikeAgentFailureMessage,
   pushTurnStderr,
   summarizeTurnStderr
-} from "./chunk-BSZX63TV.js";
+} from "./chunk-PU27NUO4.js";
 import {
   childEnvWithAppSettings,
   getLinearApiKey,
@@ -71,7 +71,7 @@ import {
   takenSlugsFromThread,
   threadDisplayLabel,
   worktreeNameFromPath
-} from "./chunk-UFWEANLU.js";
+} from "./chunk-XBEQI5H4.js";
 import {
   appendMessage,
   createEmptyThread,
@@ -451,9 +451,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-LM4AA4RO.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-QSRP25HQ.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-QH35ES7Y.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-WIYQVMOG.js");
     ensureGlobalCoordinatorCwd2();
   }
   const adapter = getAdapter(thread.agent);
@@ -2606,7 +2606,7 @@ async function createThread(input, onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-JZK6TQG7.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-DDW4NBBW.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -2826,7 +2826,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-23GHLR7I.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-DMYWHVJC.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -4331,7 +4331,7 @@ var Orchestrator = class {
       return setStatus(thread.id, "idle");
     }
     if (!existsSync11(thread.worktreePath)) {
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-RYTBDHHP.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-37FBII5A.js");
       const { execa: execa6 } = await import("execa");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
@@ -4414,7 +4414,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-RYTBDHHP.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-37FBII5A.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return createThread({

package/dist/{chunk-UFWEANLU.js → chunk-XBEQI5H4.js}

@@ -1473,11 +1473,83 @@ async function getPrDetails(cwd, selector) {
   };
 }
 async function fetchPrHead(repoPath, number, localBranch) {
-  await git(
-    ["fetch", "origin", `pull/${number}/head:${localBranch}`],
-    repoPath,
-    { reject: false }
-  );
+  const slug = await resolveGithubRepoSlug(repoPath);
+  const refspec = `+pull/${number}/head:${localBranch}`;
+  const errors = [];
+  const tryFetch = async (remote) => {
+    const result = await git(["fetch", remote, refspec], repoPath, {
+      reject: false
+    });
+    if (result.exitCode === 0) return true;
+    const detail = (result.stderr || result.stdout).trim();
+    if (detail) errors.push(`${remote}: ${detail}`);
+    return false;
+  };
+  let fetched = await tryFetch("origin");
+  if (!fetched && slug) {
+    fetched = await tryFetch(`https://github.com/${slug}.git`);
+  }
+  const localOk = async () => {
+    const verify = await git(["rev-parse", "--verify", localBranch], repoPath, {
+      reject: false
+    });
+    return verify.exitCode === 0;
+  };
+  if (!await localOk()) {
+    const viewArgs = [
+      "pr",
+      "view",
+      String(number),
+      "--json",
+      "headRefOid"
+    ];
+    if (slug) viewArgs.push("--repo", slug);
+    const view = await gh(viewArgs, repoPath, { reject: false });
+    let oid = "";
+    if (view.exitCode === 0 && view.stdout.trim()) {
+      try {
+        oid = String(
+          JSON.parse(view.stdout).headRefOid ?? ""
+        ).trim();
+      } catch {
+        oid = "";
+      }
+    }
+    if (oid) {
+      const ensureOid = async (remote) => {
+        const got = await git(["fetch", remote, oid], repoPath, {
+          reject: false
+        });
+        return got.exitCode === 0;
+      };
+      let haveObject = (await git(["cat-file", "-e", `${oid}^{commit}`], repoPath, {
+        reject: false
+      })).exitCode === 0;
+      if (!haveObject) haveObject = await ensureOid("origin");
+      if (!haveObject && slug) {
+        haveObject = await ensureOid(`https://github.com/${slug}.git`);
+      }
+      if (haveObject) {
+        const branched = await git(["branch", "-f", localBranch, oid], repoPath, {
+          reject: false
+        });
+        if (branched.exitCode !== 0) {
+          const detail = (branched.stderr || branched.stdout).trim();
+          if (detail) errors.push(`branch -f: ${detail}`);
+        }
+      } else {
+        errors.push(`could not fetch commit ${oid.slice(0, 12)}`);
+      }
+    } else if (view.stderr.trim()) {
+      errors.push(view.stderr.trim());
+    }
+  }
+  if (!await localOk()) {
+    const hint = errors.length ? ` (${errors.join(" | ")})` : "";
+    throw new Error(
+      `Failed to fetch PR #${number} head into ${localBranch}${hint}`
+    );
+  }
 }
 async function resolveWorktreeStartPoint(repoPath, sourceRef) {
   const ref = sourceRef.trim();
@@ -1487,6 +1559,7 @@ async function resolveWorktreeStartPoint(repoPath, sourceRef) {
       reject: false
     });
     if (ok.exitCode === 0) return ref;
+    throw new Error(`Invalid git reference: ${ref}`);
   }
   const remote = `origin/${ref}`;
   const remoteOk = await git(["rev-parse", "--verify", remote], repoPath, {
@@ -1497,7 +1570,10 @@ async function resolveWorktreeStartPoint(repoPath, sourceRef) {
     reject: false
   });
   if (localOk.exitCode === 0) return ref;
-  return ref;
+  throw new Error(`Invalid git reference: ${ref}`);
+}
+function isLocalPrFetchBranch(ref) {
+  return /^sideboard-pr-\d+$/.test(ref.trim());
 }
 async function createThreadWorktree(opts) {
   let branchName = `thread/${opts.slug}`;
@@ -1507,7 +1583,7 @@ async function createThreadWorktree(opts) {
   }
   await ensureGhPreferOrigin(opts.repoPath);
   await git(["fetch", "origin", "--prune"], opts.repoPath, { reject: false });
-  if (!opts.sourceRef.startsWith("origin/") && !opts.sourceRef.startsWith("refs/")) {
+  if (!isLocalPrFetchBranch(opts.sourceRef) && !opts.sourceRef.startsWith("origin/") && !opts.sourceRef.startsWith("refs/")) {
     await git(["fetch", "origin", opts.sourceRef], opts.repoPath, {
       reject: false
     });

package/dist/{coordinator-prompt-QH35ES7Y.js → coordinator-prompt-WIYQVMOG.js}

@@ -6,8 +6,8 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-BMB7WCGF.js";
-import "./chunk-UFWEANLU.js";
+} from "./chunk-PTASB7SJ.js";
+import "./chunk-XBEQI5H4.js";
 import "./chunk-HYRHI3QU.js";
 import "./chunk-M37RITA6.js";
 import "./chunk-AJ6ROGD7.js";

package/dist/{global-workspace-LM4AA4RO.js → global-workspace-QSRP25HQ.js}

@@ -11,9 +11,9 @@ import {
   orchestrationTitleNeedsSoccerNickname,
   orchestratorSessionPoisonedByBuiltins,
   takenTeamSlugsForOrchestration
-} from "./chunk-Y2EWQ4TL.js";
-import "./chunk-BMB7WCGF.js";
-import "./chunk-UFWEANLU.js";
+} from "./chunk-IS3AGU33.js";
+import "./chunk-PTASB7SJ.js";
+import "./chunk-XBEQI5H4.js";
 import "./chunk-HYRHI3QU.js";
 import {
   globalAgentCwd

package/dist/index.cjs

@@ -2579,11 +2579,83 @@ async function getPrDetails(cwd, selector) {
   };
 }
 async function fetchPrHead(repoPath, number, localBranch) {
-  await git(
-    ["fetch", "origin", `pull/${number}/head:${localBranch}`],
-    repoPath,
-    { reject: false }
-  );
+  const slug = await resolveGithubRepoSlug(repoPath);
+  const refspec = `+pull/${number}/head:${localBranch}`;
+  const errors = [];
+  const tryFetch = async (remote) => {
+    const result = await git(["fetch", remote, refspec], repoPath, {
+      reject: false
+    });
+    if (result.exitCode === 0) return true;
+    const detail = (result.stderr || result.stdout).trim();
+    if (detail) errors.push(`${remote}: ${detail}`);
+    return false;
+  };
+  let fetched = await tryFetch("origin");
+  if (!fetched && slug) {
+    fetched = await tryFetch(`https://github.com/${slug}.git`);
+  }
+  const localOk = async () => {
+    const verify = await git(["rev-parse", "--verify", localBranch], repoPath, {
+      reject: false
+    });
+    return verify.exitCode === 0;
+  };
+  if (!await localOk()) {
+    const viewArgs = [
+      "pr",
+      "view",
+      String(number),
+      "--json",
+      "headRefOid"
+    ];
+    if (slug) viewArgs.push("--repo", slug);
+    const view = await gh(viewArgs, repoPath, { reject: false });
+    let oid = "";
+    if (view.exitCode === 0 && view.stdout.trim()) {
+      try {
+        oid = String(
+          JSON.parse(view.stdout).headRefOid ?? ""
+        ).trim();
+      } catch {
+        oid = "";
+      }
+    }
+    if (oid) {
+      const ensureOid = async (remote) => {
+        const got = await git(["fetch", remote, oid], repoPath, {
+          reject: false
+        });
+        return got.exitCode === 0;
+      };
+      let haveObject = (await git(["cat-file", "-e", `${oid}^{commit}`], repoPath, {
+        reject: false
+      })).exitCode === 0;
+      if (!haveObject) haveObject = await ensureOid("origin");
+      if (!haveObject && slug) {
+        haveObject = await ensureOid(`https://github.com/${slug}.git`);
+      }
+      if (haveObject) {
+        const branched = await git(["branch", "-f", localBranch, oid], repoPath, {
+          reject: false
+        });
+        if (branched.exitCode !== 0) {
+          const detail = (branched.stderr || branched.stdout).trim();
+          if (detail) errors.push(`branch -f: ${detail}`);
+        }
+      } else {
+        errors.push(`could not fetch commit ${oid.slice(0, 12)}`);
+      }
+    } else if (view.stderr.trim()) {
+      errors.push(view.stderr.trim());
+    }
+  }
+  if (!await localOk()) {
+    const hint = errors.length ? ` (${errors.join(" | ")})` : "";
+    throw new Error(
+      `Failed to fetch PR #${number} head into ${localBranch}${hint}`
+    );
+  }
 }
 async function resolveWorktreeStartPoint(repoPath, sourceRef) {
   const ref = sourceRef.trim();
@@ -2593,6 +2665,7 @@ async function resolveWorktreeStartPoint(repoPath, sourceRef) {
       reject: false
     });
     if (ok.exitCode === 0) return ref;
+    throw new Error(`Invalid git reference: ${ref}`);
   }
   const remote = `origin/${ref}`;
   const remoteOk = await git(["rev-parse", "--verify", remote], repoPath, {
@@ -2603,7 +2676,10 @@ async function resolveWorktreeStartPoint(repoPath, sourceRef) {
     reject: false
   });
   if (localOk.exitCode === 0) return ref;
-  return ref;
+  throw new Error(`Invalid git reference: ${ref}`);
+}
+function isLocalPrFetchBranch(ref) {
+  return /^sideboard-pr-\d+$/.test(ref.trim());
 }
 async function createThreadWorktree(opts) {
   let branchName = `thread/${opts.slug}`;
@@ -2613,7 +2689,7 @@ async function createThreadWorktree(opts) {
   }
   await ensureGhPreferOrigin(opts.repoPath);
   await git(["fetch", "origin", "--prune"], opts.repoPath, { reject: false });
-  if (!opts.sourceRef.startsWith("origin/") && !opts.sourceRef.startsWith("refs/")) {
+  if (!isLocalPrFetchBranch(opts.sourceRef) && !opts.sourceRef.startsWith("origin/") && !opts.sourceRef.startsWith("refs/")) {
     await git(["fetch", "origin", opts.sourceRef], opts.repoPath, {
       reject: false
     });
@@ -3721,6 +3797,10 @@ function pushTurnStderr(tail, line, maxLines = 12) {
 }
 function summarizeTurnStderr(tail, maxChars = 500) {
   if (tail.length === 0) return "";
+  const moduleMissing = [...tail].reverse().find((line) => /cannot find module/i.test(line));
+  if (moduleMissing) {
+    return moduleMissing.length <= maxChars ? moduleMissing : moduleMissing.slice(0, maxChars);
+  }
   const joined = tail.slice(-6).join("\n").trim();
   if (joined.length <= maxChars) return joined;
   return joined.slice(joined.length - maxChars);
@@ -4180,6 +4260,34 @@ var init_claude_mcp = __esm({
   }
 });
 
+// src/agents/node-launch.ts
+function isAsarPath(filePath) {
+  return /\.asar([/\\]|$)/.test(filePath);
+}
+async function resolveNodeLaunch(scriptPath) {
+  if (isAsarPath(scriptPath)) {
+    return {
+      file: process.execPath,
+      env: { ELECTRON_RUN_AS_NODE: "1" }
+    };
+  }
+  const whichNode = await run("which", ["node"], { reject: false });
+  const nodeBin = whichNode.exitCode === 0 && whichNode.stdout.trim() ? whichNode.stdout.trim() : null;
+  if (nodeBin) {
+    return { file: nodeBin, env: {} };
+  }
+  return {
+    file: process.execPath,
+    env: { ELECTRON_RUN_AS_NODE: "1" }
+  };
+}
+var init_node_launch = __esm({
+  "src/agents/node-launch.ts"() {
+    "use strict";
+    init_run();
+  }
+});
+
 // src/agents/injected-mcp.ts
 async function resolveBrightsyMcpCommand() {
   const now = Date.now();
@@ -4269,11 +4377,13 @@ async function resolveSideboardMcpServer() {
   const entry = findSideboardMcpJsEntry();
   if (entry) {
     const isCli = /[/\\]cli[/\\]dist[/\\]index\.js$/.test(entry);
+    const scriptArgs = isCli ? [entry, "mcp"] : [entry];
+    const launch = await resolveNodeLaunch(entry);
     return {
       name: "sideboard",
-      // Use `node` (not process.execPath) — under Electron execPath is Electron itself.
-      command: "node",
-      args: isCli ? [entry, "mcp"] : [entry]
+      command: launch.file,
+      args: scriptArgs,
+      ...Object.keys(launch.env).length > 0 ? { env: launch.env } : {}
     };
   }
   const which = await run("which", ["sideboard"], { reject: false });
@@ -4334,6 +4444,7 @@ var init_injected_mcp = __esm({
     init_run();
     init_config();
     init_connected_teams();
+    init_node_launch();
     import_meta = {};
     SIDEBOARD_MCP_ALLOWED_TOOLS = [
       "mcp__sideboard",
@@ -5165,6 +5276,7 @@ var init_cursor = __esm({
     init_run();
     init_app_settings();
     init_cursor_events();
+    init_node_launch();
     init_turn_input();
     init_cursor_events();
     import_meta2 = {};
@@ -5225,16 +5337,14 @@ var init_cursor = __esm({
         };
         const runner = cursorRunnerPath();
         const isTs = runner.endsWith(".ts");
-        const whichNode = await run("which", ["node"], { reject: false });
-        const nodeBin = whichNode.exitCode === 0 && whichNode.stdout.trim() ? whichNode.stdout.trim() : null;
-        const file = nodeBin || process.execPath;
+        const launch = await resolveNodeLaunch(runner);
         return {
-          file,
+          file: launch.file,
           args: isTs ? ["--import", "tsx", runner] : [runner],
           cwd: thread.worktreePath,
           stdin: JSON.stringify(req),
           env: {
-            ...nodeBin ? {} : { ELECTRON_RUN_AS_NODE: "1" },
+            ...launch.env,
             ...apiKey ? { CURSOR_API_KEY: apiKey } : {}
           }
         };

package/dist/index.js

@@ -101,14 +101,14 @@ import {
   withAgentInstructions,
   worktreeCleanupSettings,
   writeWorktreeFile
-} from "./chunk-KSVPOIRV.js";
+} from "./chunk-UKDAGGTU.js";
 import {
   addWorkspace,
   ensureWorkspace,
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-PER4N6LS.js";
+} from "./chunk-FVGRUZHI.js";
 import {
   CLOUD_COORDINATOR_BUSY_REPLY,
   CLOUD_COORDINATOR_STOPPED_REPLY,
@@ -128,7 +128,7 @@ import {
   orchestratorSessionPoisonedByBuiltins,
   parseForceStopMessage,
   takenTeamSlugsForOrchestration
-} from "./chunk-Y2EWQ4TL.js";
+} from "./chunk-IS3AGU33.js";
 import {
   COORDINATOR_TOOL_PLAYBOOK,
   coordinatorSystemPrompt,
@@ -136,7 +136,7 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-BMB7WCGF.js";
+} from "./chunk-PTASB7SJ.js";
 import {
   BRIGHTSY_MCP_ALLOWED_TOOLS,
   MAX_ANTHROPIC_CACHE_CONTROL_BLOCKS,
@@ -176,7 +176,7 @@ import {
   resolveCursorModelId,
   sanitizeMcpServerName,
   writeInjectedMcpConfig
-} from "./chunk-EHUIPKBW.js";
+} from "./chunk-BEXVE7LX.js";
 import {
   brightsyConfigPath,
   brightsyMcpServerName,
@@ -192,7 +192,7 @@ import {
 import {
   cursorSdkMessageToEvents,
   parseCursorRunnerLine
-} from "./chunk-BSZX63TV.js";
+} from "./chunk-PU27NUO4.js";
 import {
   HARNESS_ENV_KEYS,
   appSettingsPath,
@@ -275,7 +275,7 @@ import {
   worktreeDisplayLabel,
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath
-} from "./chunk-UFWEANLU.js";
+} from "./chunk-XBEQI5H4.js";
 import {
   appendMessage,
   createEmptyThread,

package/dist/mcp/run-stdio.cjs

@@ -83,6 +83,10 @@ function pushTurnStderr(tail, line, maxLines = 12) {
 }
 function summarizeTurnStderr(tail, maxChars = 500) {
   if (tail.length === 0) return "";
+  const moduleMissing = [...tail].reverse().find((line) => /cannot find module/i.test(line));
+  if (moduleMissing) {
+    return moduleMissing.length <= maxChars ? moduleMissing : moduleMissing.slice(0, maxChars);
+  }
   const joined = tail.slice(-6).join("\n").trim();
   if (joined.length <= maxChars) return joined;
   return joined.slice(joined.length - maxChars);
@@ -2174,11 +2178,83 @@ async function getPrDetails(cwd, selector) {
   };
 }
 async function fetchPrHead(repoPath, number, localBranch) {
-  await git(
-    ["fetch", "origin", `pull/${number}/head:${localBranch}`],
-    repoPath,
-    { reject: false }
-  );
+  const slug = await resolveGithubRepoSlug(repoPath);
+  const refspec = `+pull/${number}/head:${localBranch}`;
+  const errors = [];
+  const tryFetch = async (remote) => {
+    const result = await git(["fetch", remote, refspec], repoPath, {
+      reject: false
+    });
+    if (result.exitCode === 0) return true;
+    const detail = (result.stderr || result.stdout).trim();
+    if (detail) errors.push(`${remote}: ${detail}`);
+    return false;
+  };
+  let fetched = await tryFetch("origin");
+  if (!fetched && slug) {
+    fetched = await tryFetch(`https://github.com/${slug}.git`);
+  }
+  const localOk = async () => {
+    const verify = await git(["rev-parse", "--verify", localBranch], repoPath, {
+      reject: false
+    });
+    return verify.exitCode === 0;
+  };
+  if (!await localOk()) {
+    const viewArgs = [
+      "pr",
+      "view",
+      String(number),
+      "--json",
+      "headRefOid"
+    ];
+    if (slug) viewArgs.push("--repo", slug);
+    const view = await gh(viewArgs, repoPath, { reject: false });
+    let oid = "";
+    if (view.exitCode === 0 && view.stdout.trim()) {
+      try {
+        oid = String(
+          JSON.parse(view.stdout).headRefOid ?? ""
+        ).trim();
+      } catch {
+        oid = "";
+      }
+    }
+    if (oid) {
+      const ensureOid = async (remote) => {
+        const got = await git(["fetch", remote, oid], repoPath, {
+          reject: false
+        });
+        return got.exitCode === 0;
+      };
+      let haveObject = (await git(["cat-file", "-e", `${oid}^{commit}`], repoPath, {
+        reject: false
+      })).exitCode === 0;
+      if (!haveObject) haveObject = await ensureOid("origin");
+      if (!haveObject && slug) {
+        haveObject = await ensureOid(`https://github.com/${slug}.git`);
+      }
+      if (haveObject) {
+        const branched = await git(["branch", "-f", localBranch, oid], repoPath, {
+          reject: false
+        });
+        if (branched.exitCode !== 0) {
+          const detail = (branched.stderr || branched.stdout).trim();
+          if (detail) errors.push(`branch -f: ${detail}`);
+        }
+      } else {
+        errors.push(`could not fetch commit ${oid.slice(0, 12)}`);
+      }
+    } else if (view.stderr.trim()) {
+      errors.push(view.stderr.trim());
+    }
+  }
+  if (!await localOk()) {
+    const hint = errors.length ? ` (${errors.join(" | ")})` : "";
+    throw new Error(
+      `Failed to fetch PR #${number} head into ${localBranch}${hint}`
+    );
+  }
 }
 async function resolveWorktreeStartPoint(repoPath, sourceRef) {
   const ref = sourceRef.trim();
@@ -2188,6 +2264,7 @@ async function resolveWorktreeStartPoint(repoPath, sourceRef) {
       reject: false
     });
     if (ok.exitCode === 0) return ref;
+    throw new Error(`Invalid git reference: ${ref}`);
   }
   const remote = `origin/${ref}`;
   const remoteOk = await git(["rev-parse", "--verify", remote], repoPath, {
@@ -2198,7 +2275,10 @@ async function resolveWorktreeStartPoint(repoPath, sourceRef) {
     reject: false
   });
   if (localOk.exitCode === 0) return ref;
-  return ref;
+  throw new Error(`Invalid git reference: ${ref}`);
+}
+function isLocalPrFetchBranch(ref) {
+  return /^sideboard-pr-\d+$/.test(ref.trim());
 }
 async function createThreadWorktree(opts) {
   let branchName = `thread/${opts.slug}`;
@@ -2208,7 +2288,7 @@ async function createThreadWorktree(opts) {
   }
   await ensureGhPreferOrigin(opts.repoPath);
   await git(["fetch", "origin", "--prune"], opts.repoPath, { reject: false });
-  if (!opts.sourceRef.startsWith("origin/") && !opts.sourceRef.startsWith("refs/")) {
+  if (!isLocalPrFetchBranch(opts.sourceRef) && !opts.sourceRef.startsWith("origin/") && !opts.sourceRef.startsWith("refs/")) {
     await git(["fetch", "origin", opts.sourceRef], opts.repoPath, {
       reject: false
     });
@@ -3826,6 +3906,34 @@ var init_claude_mcp = __esm({
   }
 });
 
+// src/agents/node-launch.ts
+function isAsarPath(filePath) {
+  return /\.asar([/\\]|$)/.test(filePath);
+}
+async function resolveNodeLaunch(scriptPath) {
+  if (isAsarPath(scriptPath)) {
+    return {
+      file: process.execPath,
+      env: { ELECTRON_RUN_AS_NODE: "1" }
+    };
+  }
+  const whichNode = await run("which", ["node"], { reject: false });
+  const nodeBin = whichNode.exitCode === 0 && whichNode.stdout.trim() ? whichNode.stdout.trim() : null;
+  if (nodeBin) {
+    return { file: nodeBin, env: {} };
+  }
+  return {
+    file: process.execPath,
+    env: { ELECTRON_RUN_AS_NODE: "1" }
+  };
+}
+var init_node_launch = __esm({
+  "src/agents/node-launch.ts"() {
+    "use strict";
+    init_run();
+  }
+});
+
 // src/agents/injected-mcp.ts
 async function resolveBrightsyMcpCommand() {
   const now = Date.now();
@@ -3915,11 +4023,13 @@ async function resolveSideboardMcpServer() {
   const entry = findSideboardMcpJsEntry();
   if (entry) {
     const isCli = /[/\\]cli[/\\]dist[/\\]index\.js$/.test(entry);
+    const scriptArgs = isCli ? [entry, "mcp"] : [entry];
+    const launch = await resolveNodeLaunch(entry);
     return {
       name: "sideboard",
-      // Use `node` (not process.execPath) — under Electron execPath is Electron itself.
-      command: "node",
-      args: isCli ? [entry, "mcp"] : [entry]
+      command: launch.file,
+      args: scriptArgs,
+      ...Object.keys(launch.env).length > 0 ? { env: launch.env } : {}
     };
   }
   const which = await run("which", ["sideboard"], { reject: false });
@@ -3977,6 +4087,7 @@ var init_injected_mcp = __esm({
     init_run();
     init_config();
     init_connected_teams();
+    init_node_launch();
     import_meta = {};
     SIDEBOARD_MCP_ALLOWED_TOOLS = [
       "mcp__sideboard",
@@ -4804,6 +4915,7 @@ var init_cursor = __esm({
     init_run();
     init_app_settings();
     init_cursor_events();
+    init_node_launch();
     init_turn_input();
     init_cursor_events();
     import_meta2 = {};
@@ -4864,16 +4976,14 @@ var init_cursor = __esm({
         };
         const runner = cursorRunnerPath();
         const isTs = runner.endsWith(".ts");
-        const whichNode = await run("which", ["node"], { reject: false });
-        const nodeBin = whichNode.exitCode === 0 && whichNode.stdout.trim() ? whichNode.stdout.trim() : null;
-        const file = nodeBin || process.execPath;
+        const launch = await resolveNodeLaunch(runner);
         return {
-          file,
+          file: launch.file,
           args: isTs ? ["--import", "tsx", runner] : [runner],
           cwd: thread.worktreePath,
           stdin: JSON.stringify(req),
           env: {
-            ...nodeBin ? {} : { ELECTRON_RUN_AS_NODE: "1" },
+            ...launch.env,
             ...apiKey ? { CURSOR_API_KEY: apiKey } : {}
           }
         };

package/dist/mcp/run-stdio.js

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 import {
   startMcpServer
-} from "../chunk-KSVPOIRV.js";
-import "../chunk-PER4N6LS.js";
-import "../chunk-Y2EWQ4TL.js";
-import "../chunk-BMB7WCGF.js";
-import "../chunk-EHUIPKBW.js";
+} from "../chunk-UKDAGGTU.js";
+import "../chunk-FVGRUZHI.js";
+import "../chunk-IS3AGU33.js";
+import "../chunk-PTASB7SJ.js";
+import "../chunk-BEXVE7LX.js";
 import "../chunk-ILQK4P5R.js";
-import "../chunk-BSZX63TV.js";
+import "../chunk-PU27NUO4.js";
 import "../chunk-YZ23S32T.js";
-import "../chunk-UFWEANLU.js";
+import "../chunk-XBEQI5H4.js";
 import "../chunk-HYRHI3QU.js";
 import "../chunk-M37RITA6.js";
 import "../chunk-AJ6ROGD7.js";

package/dist/{workspaces-23GHLR7I.js → workspaces-DMYWHVJC.js}

@@ -4,10 +4,10 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-PER4N6LS.js";
-import "./chunk-Y2EWQ4TL.js";
-import "./chunk-BMB7WCGF.js";
-import "./chunk-UFWEANLU.js";
+} from "./chunk-FVGRUZHI.js";
+import "./chunk-IS3AGU33.js";
+import "./chunk-PTASB7SJ.js";
+import "./chunk-XBEQI5H4.js";
 import "./chunk-HYRHI3QU.js";
 import "./chunk-M37RITA6.js";
 import "./chunk-AJ6ROGD7.js";

package/dist/{worktree-RYTBDHHP.js → worktree-37FBII5A.js}

@@ -41,7 +41,7 @@ import {
   worktreeDisplayLabel,
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath
-} from "./chunk-UFWEANLU.js";
+} from "./chunk-XBEQI5H4.js";
 import "./chunk-HYRHI3QU.js";
 import "./chunk-M37RITA6.js";
 import "./chunk-AJ6ROGD7.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sideboard-ai/core",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "description": "Sideboard core — orchestration, agents, git worktrees, MCP server",
   "license": "Apache-2.0",
   "type": "module",