@sideboard-ai/core 0.1.83 → 0.1.85

package/dist/agents/cursor-runner.cjs

@@ -44,6 +44,32 @@ function appDataDir() {
   return base;
 }
 
+// src/agents/cursor-session.ts
+function cursorErrorMessage(err) {
+  if (err instanceof Error) return err.message.trim();
+  return String(err).trim();
+}
+function isAgentBusyError(err) {
+  const name = err instanceof Error ? err.name : "";
+  if (name === "AgentBusyError") return true;
+  return /already has active run/i.test(cursorErrorMessage(err));
+}
+function isUnresumableCursorSession(err) {
+  const name = err instanceof Error ? err.name : "";
+  if (name === "AgentNotFoundError") return true;
+  const lower = cursorErrorMessage(err).toLowerCase();
+  if (!lower) return false;
+  return /corrupt local agent checkpoint/.test(lower) || /missing root blob/.test(lower) || /\bagent\b.{0,120}\bnot found\b/.test(lower) || /cannot resume/.test(lower);
+}
+function cursorSessionRecoveryMessage(err, agentId) {
+  const detail = cursorErrorMessage(err) || "unresumable session";
+  const id = (agentId ?? "").trim();
+  if (id) {
+    return `Cursor agent ${id} is unresumable (${detail}) \u2014 starting a new session`;
+  }
+  return `Cursor session is unresumable (${detail}) \u2014 starting a new session`;
+}
+
 // src/agents/error-detail.ts
 function formatUnknownDetail(err) {
   if (err == null) return "";
@@ -265,11 +291,6 @@ function localAgentStore() {
   (0, import_node_fs3.mkdirSync)(root, { recursive: true });
   return new import_sdk.JsonlLocalAgentStore(root);
 }
-function isAgentBusyError(err) {
-  if (err instanceof import_sdk.AgentBusyError) return true;
-  const message = err instanceof Error ? err.message : String(err);
-  return /already has active run/i.test(message);
-}
 async function cancelStaleLocalRuns(agentId, opts) {
   const listed = await import_sdk.Agent.listRuns(agentId, {
     runtime: "local",
@@ -328,75 +349,89 @@ async function main() {
   const store = localAgentStore();
   const local = { cwd: req.cwd, store };
   const mcpServers = req.mcpServers && Object.keys(req.mcpServers).length > 0 ? req.mcpServers : void 0;
-  try {
-    let agent;
+  const createOpts = {
+    apiKey,
+    model,
+    mode,
+    local,
+    name: "Sideboard",
+    ...mcpServers ? { mcpServers } : {}
+  };
+  async function createAgent() {
+    return import_sdk.Agent.create(createOpts);
+  }
+  async function openAgent() {
     try {
-      agent = req.agentId ? await import_sdk.Agent.resume(req.agentId, {
-        apiKey,
-        model,
-        mode,
-        local,
-        ...mcpServers ? { mcpServers } : {}
-      }) : await import_sdk.Agent.create({
+      return req.agentId ? await import_sdk.Agent.resume(req.agentId, {
         apiKey,
         model,
         mode,
         local,
-        name: "Sideboard",
         ...mcpServers ? { mcpServers } : {}
+      }) : await createAgent();
+    } catch (err) {
+      if (!isUnresumableCursorSession(err)) throw err;
+      emit({
+        type: "stderr",
+        data: cursorSessionRecoveryMessage(err, req.agentId)
       });
+      return createAgent();
+    }
+  }
+  async function sendPrompt(agent) {
+    const sendOpts = mcpServers ? { mcpServers } : void 0;
+    try {
+      return await agent.send(req.prompt, sendOpts);
     } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      if (!req.agentId || !/not found/i.test(message)) throw err;
+      if (!isAgentBusyError(err)) throw err;
+      const n = await cancelStaleLocalRuns(agent.agentId, {
+        cwd: req.cwd,
+        store
+      });
       emit({
         type: "stderr",
-        data: `Cursor agent ${req.agentId} not found \u2014 starting a new session`
+        data: n > 0 ? `Cursor agent had ${n} stale active run(s) \u2014 cancelled and retrying` : "Cursor agent busy \u2014 retrying send"
       });
-      agent = await import_sdk.Agent.create({
-        apiKey,
-        model,
-        mode,
-        local,
-        name: "Sideboard",
-        ...mcpServers ? { mcpServers } : {}
+      return agent.send(req.prompt, sendOpts);
+    }
+  }
+  async function runTurn(agent) {
+    emit({ type: "session_id", data: agent.agentId });
+    const run = await sendPrompt(agent);
+    for await (const msg of run.stream()) {
+      for (const event of cursorSdkMessageToEvents(msg)) {
+        emit(event);
+      }
+    }
+    const result = await run.wait();
+    if (result.status === "error") {
+      const detail = formatUnknownDetail(result.error);
+      emit({
+        type: "stderr",
+        data: detail ? `Cursor run failed (${result.id}): ${detail}` : `Cursor run failed (${result.id})`
       });
+      return 2;
     }
+    if (result.status === "cancelled") return 0;
+    return 0;
+  }
+  try {
+    let agent = await openAgent();
     try {
-      emit({ type: "session_id", data: agent.agentId });
-      const sendOpts = mcpServers ? { mcpServers } : void 0;
-      let run;
       try {
-        run = await agent.send(req.prompt, sendOpts);
+        return await runTurn(agent);
       } catch (err) {
-        if (!isAgentBusyError(err)) throw err;
-        const n = await cancelStaleLocalRuns(agent.agentId, {
-          cwd: req.cwd,
-          store
-        });
-        emit({
-          type: "stderr",
-          data: n > 0 ? `Cursor agent had ${n} stale active run(s) \u2014 cancelled and retrying` : "Cursor agent busy \u2014 retrying send"
-        });
-        run = await agent.send(req.prompt, sendOpts);
-      }
-      for await (const msg of run.stream()) {
-        for (const event of cursorSdkMessageToEvents(msg)) {
-          emit(event);
-        }
-      }
-      const result = await run.wait();
-      if (result.status === "error") {
-        const detail = formatUnknownDetail(result.error);
+        if (!isUnresumableCursorSession(err)) throw err;
         emit({
           type: "stderr",
-          data: detail ? `Cursor run failed (${result.id}): ${detail}` : `Cursor run failed (${result.id})`
+          data: cursorSessionRecoveryMessage(err, agent.agentId)
         });
-        return 2;
+        await agent[Symbol.asyncDispose]().catch(() => void 0);
+        agent = await createAgent();
+        return await runTurn(agent);
       }
-      if (result.status === "cancelled") return 0;
-      return 0;
     } finally {
-      await agent[Symbol.asyncDispose]();
+      await agent[Symbol.asyncDispose]().catch(() => void 0);
     }
   } catch (err) {
     if (err instanceof import_sdk.CursorAgentError) {

package/dist/agents/cursor-runner.js

@@ -2,19 +2,47 @@
 import {
   cursorSdkMessageToEvents,
   formatUnknownDetail
-} from "../chunk-SEOICVGB.js";
+} from "../chunk-CBJSPTBG.js";
 import {
   dropNestedElectronEnvFromProcess
-} from "../chunk-IZ7RPF54.js";
+} from "../chunk-5KLC2MWZ.js";
 import {
   appDataDir
 } from "../chunk-M37RITA6.js";
 
 // src/agents/cursor-runner.ts
-import { Agent, AgentBusyError, CursorAgentError, JsonlLocalAgentStore } from "@cursor/sdk";
+import { Agent, CursorAgentError, JsonlLocalAgentStore } from "@cursor/sdk";
 import { mkdirSync } from "fs";
 import { join } from "path";
 import { createInterface } from "readline";
+
+// src/agents/cursor-session.ts
+function cursorErrorMessage(err) {
+  if (err instanceof Error) return err.message.trim();
+  return String(err).trim();
+}
+function isAgentBusyError(err) {
+  const name = err instanceof Error ? err.name : "";
+  if (name === "AgentBusyError") return true;
+  return /already has active run/i.test(cursorErrorMessage(err));
+}
+function isUnresumableCursorSession(err) {
+  const name = err instanceof Error ? err.name : "";
+  if (name === "AgentNotFoundError") return true;
+  const lower = cursorErrorMessage(err).toLowerCase();
+  if (!lower) return false;
+  return /corrupt local agent checkpoint/.test(lower) || /missing root blob/.test(lower) || /\bagent\b.{0,120}\bnot found\b/.test(lower) || /cannot resume/.test(lower);
+}
+function cursorSessionRecoveryMessage(err, agentId) {
+  const detail = cursorErrorMessage(err) || "unresumable session";
+  const id = (agentId ?? "").trim();
+  if (id) {
+    return `Cursor agent ${id} is unresumable (${detail}) \u2014 starting a new session`;
+  }
+  return `Cursor session is unresumable (${detail}) \u2014 starting a new session`;
+}
+
+// src/agents/cursor-runner.ts
 dropNestedElectronEnvFromProcess();
 function emit(event) {
   process.stdout.write(`${JSON.stringify(event)}
@@ -39,11 +67,6 @@ function localAgentStore() {
   mkdirSync(root, { recursive: true });
   return new JsonlLocalAgentStore(root);
 }
-function isAgentBusyError(err) {
-  if (err instanceof AgentBusyError) return true;
-  const message = err instanceof Error ? err.message : String(err);
-  return /already has active run/i.test(message);
-}
 async function cancelStaleLocalRuns(agentId, opts) {
   const listed = await Agent.listRuns(agentId, {
     runtime: "local",
@@ -102,75 +125,89 @@ async function main() {
   const store = localAgentStore();
   const local = { cwd: req.cwd, store };
   const mcpServers = req.mcpServers && Object.keys(req.mcpServers).length > 0 ? req.mcpServers : void 0;
-  try {
-    let agent;
+  const createOpts = {
+    apiKey,
+    model,
+    mode,
+    local,
+    name: "Sideboard",
+    ...mcpServers ? { mcpServers } : {}
+  };
+  async function createAgent() {
+    return Agent.create(createOpts);
+  }
+  async function openAgent() {
     try {
-      agent = req.agentId ? await Agent.resume(req.agentId, {
+      return req.agentId ? await Agent.resume(req.agentId, {
         apiKey,
         model,
         mode,
         local,
         ...mcpServers ? { mcpServers } : {}
-      }) : await Agent.create({
-        apiKey,
-        model,
-        mode,
-        local,
-        name: "Sideboard",
-        ...mcpServers ? { mcpServers } : {}
+      }) : await createAgent();
+    } catch (err) {
+      if (!isUnresumableCursorSession(err)) throw err;
+      emit({
+        type: "stderr",
+        data: cursorSessionRecoveryMessage(err, req.agentId)
       });
+      return createAgent();
+    }
+  }
+  async function sendPrompt(agent) {
+    const sendOpts = mcpServers ? { mcpServers } : void 0;
+    try {
+      return await agent.send(req.prompt, sendOpts);
     } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      if (!req.agentId || !/not found/i.test(message)) throw err;
+      if (!isAgentBusyError(err)) throw err;
+      const n = await cancelStaleLocalRuns(agent.agentId, {
+        cwd: req.cwd,
+        store
+      });
       emit({
         type: "stderr",
-        data: `Cursor agent ${req.agentId} not found \u2014 starting a new session`
+        data: n > 0 ? `Cursor agent had ${n} stale active run(s) \u2014 cancelled and retrying` : "Cursor agent busy \u2014 retrying send"
       });
-      agent = await Agent.create({
-        apiKey,
-        model,
-        mode,
-        local,
-        name: "Sideboard",
-        ...mcpServers ? { mcpServers } : {}
+      return agent.send(req.prompt, sendOpts);
+    }
+  }
+  async function runTurn(agent) {
+    emit({ type: "session_id", data: agent.agentId });
+    const run = await sendPrompt(agent);
+    for await (const msg of run.stream()) {
+      for (const event of cursorSdkMessageToEvents(msg)) {
+        emit(event);
+      }
+    }
+    const result = await run.wait();
+    if (result.status === "error") {
+      const detail = formatUnknownDetail(result.error);
+      emit({
+        type: "stderr",
+        data: detail ? `Cursor run failed (${result.id}): ${detail}` : `Cursor run failed (${result.id})`
       });
+      return 2;
     }
+    if (result.status === "cancelled") return 0;
+    return 0;
+  }
+  try {
+    let agent = await openAgent();
     try {
-      emit({ type: "session_id", data: agent.agentId });
-      const sendOpts = mcpServers ? { mcpServers } : void 0;
-      let run;
       try {
-        run = await agent.send(req.prompt, sendOpts);
+        return await runTurn(agent);
       } catch (err) {
-        if (!isAgentBusyError(err)) throw err;
-        const n = await cancelStaleLocalRuns(agent.agentId, {
-          cwd: req.cwd,
-          store
-        });
-        emit({
-          type: "stderr",
-          data: n > 0 ? `Cursor agent had ${n} stale active run(s) \u2014 cancelled and retrying` : "Cursor agent busy \u2014 retrying send"
-        });
-        run = await agent.send(req.prompt, sendOpts);
-      }
-      for await (const msg of run.stream()) {
-        for (const event of cursorSdkMessageToEvents(msg)) {
-          emit(event);
-        }
-      }
-      const result = await run.wait();
-      if (result.status === "error") {
-        const detail = formatUnknownDetail(result.error);
+        if (!isUnresumableCursorSession(err)) throw err;
         emit({
           type: "stderr",
-          data: detail ? `Cursor run failed (${result.id}): ${detail}` : `Cursor run failed (${result.id})`
+          data: cursorSessionRecoveryMessage(err, agent.agentId)
         });
-        return 2;
+        await agent[Symbol.asyncDispose]().catch(() => void 0);
+        agent = await createAgent();
+        return await runTurn(agent);
       }
-      if (result.status === "cancelled") return 0;
-      return 0;
     } finally {
-      await agent[Symbol.asyncDispose]();
+      await agent[Symbol.asyncDispose]().catch(() => void 0);
     }
   } catch (err) {
     if (err instanceof CursorAgentError) {

package/dist/{agents-4KRD46KG.js → agents-FD77JUOP.js}

@@ -32,18 +32,22 @@ import {
   resolveCursorModelId,
   resolveLoginCommand,
   resolveQuotaFallbackAgent
-} from "./chunk-JMRJ4F5B.js";
-import "./chunk-VROPG6QF.js";
+} from "./chunk-3CCRD6WS.js";
+import "./chunk-6K5VAPVR.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,
   coerceOrchestratorAgent,
   isOrchestratorCapableAgent
-} from "./chunk-DJFGX4RT.js";
-import "./chunk-ERJS3ZDP.js";
-import "./chunk-HBBXS2FR.js";
+} from "./chunk-6GKDYUTJ.js";
+import "./chunk-XVFV56JG.js";
+import "./chunk-6WQAYBVE.js";
 import "./chunk-B3SJXYIJ.js";
 import "./chunk-7FD7COKE.js";
+import "./chunk-AY53MPDE.js";
+import "./chunk-NSTQ6QKD.js";
+import "./chunk-KGZBYWZ3.js";
+import "./chunk-7MV3RXSC.js";
 import {
   conductorBundledBinDir,
   enrichPathWithNpmGlobalBin,
@@ -52,11 +56,7 @@ import {
   posixShellSingleQuote,
   resolveCommandBinarySync,
   withExportedPath
-} from "./chunk-AE5VBOFE.js";
-import "./chunk-UHGN4KCL.js";
-import "./chunk-NSTQ6QKD.js";
-import "./chunk-KGZBYWZ3.js";
-import "./chunk-7MV3RXSC.js";
+} from "./chunk-3KETJKYA.js";
 export {
   CLAUDE_MODEL_CATALOG,
   ORCHESTRATOR_AGENT_KINDS,

package/dist/{agents-3YPUZME7.js → agents-YAYNNJWC.js}

@@ -28,23 +28,23 @@ import {
   resolveCursorModelId,
   resolveLoginCommand,
   resolveQuotaFallbackAgent
-} from "./chunk-JW6YFPQE.js";
+} from "./chunk-WGI6KXKJ.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,
   coerceOrchestratorAgent,
   isOrchestratorCapableAgent
-} from "./chunk-NXXT5SE3.js";
-import "./chunk-E2MIA7DO.js";
-import "./chunk-BTL7EMGT.js";
+} from "./chunk-JTHWVYSD.js";
+import "./chunk-SH75CXJR.js";
+import "./chunk-HHTHF5BQ.js";
 import {
   cursorSdkMessageToEvents,
   parseCursorRunnerLine
-} from "./chunk-SEOICVGB.js";
-import "./chunk-GD2FM6FN.js";
+} from "./chunk-CBJSPTBG.js";
+import "./chunk-KRAUS3RF.js";
 import "./chunk-FKOIHGKV.js";
-import "./chunk-YO3CYL6B.js";
-import "./chunk-IZ7RPF54.js";
+import "./chunk-I3FRXL7J.js";
+import "./chunk-5KLC2MWZ.js";
 import "./chunk-JT7R45JB.js";
 import "./chunk-FWJYLBO6.js";
 import "./chunk-77WWLBCI.js";
@@ -57,7 +57,7 @@ import {
   posixShellSingleQuote,
   resolveCommandBinarySync,
   withExportedPath
-} from "./chunk-D4DPQ552.js";
+} from "./chunk-LGXBYZZA.js";
 export {
   CLAUDE_MODEL_CATALOG,
   ORCHESTRATOR_AGENT_KINDS,

package/dist/{app-settings-MQXL7OUF.js → app-settings-K6RFCRF6.js}

@@ -52,8 +52,8 @@ import {
   updateDefaultsSettings,
   updateIntegrationsSettings,
   updateOpencodeSettings
-} from "./chunk-YO3CYL6B.js";
-import "./chunk-IZ7RPF54.js";
+} from "./chunk-I3FRXL7J.js";
+import "./chunk-5KLC2MWZ.js";
 import "./chunk-JT7R45JB.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-M37RITA6.js";

package/dist/{app-settings-GVSOIJLZ.js → app-settings-PEXK5VEX.js}

@@ -54,7 +54,7 @@ import {
   updateDefaultsSettings,
   updateIntegrationsSettings,
   updateOpencodeSettings
-} from "./chunk-UHGN4KCL.js";
+} from "./chunk-AY53MPDE.js";
 import "./chunk-NSTQ6QKD.js";
 import "./chunk-KGZBYWZ3.js";
 import "./chunk-7MV3RXSC.js";

package/dist/{chunk-LVTNWH7B.js → chunk-2N5DVTGH.js}

@@ -1,10 +1,10 @@
 import {
   isGlobalRepoPath
-} from "./chunk-NXXT5SE3.js";
+} from "./chunk-JTHWVYSD.js";
 import {
   ensureGhPreferOrigin,
   resolveRepoRoot
-} from "./chunk-GD2FM6FN.js";
+} from "./chunk-KRAUS3RF.js";
 import {
   appDataDir
 } from "./chunk-M37RITA6.js";

package/dist/{chunk-JMRJ4F5B.js → chunk-3CCRD6WS.js}

@@ -6,27 +6,32 @@ import {
   ensureCliTeamTracked,
   ensureConnectedBrightsyTeamTokens,
   loadBrightsyConfig
-} from "./chunk-VROPG6QF.js";
+} from "./chunk-6K5VAPVR.js";
 import {
   isOrchestratorThread
-} from "./chunk-DJFGX4RT.js";
+} from "./chunk-6GKDYUTJ.js";
 import {
-  enrichPathWithNpmGlobalBin,
-  isConductorBundledCli,
-  resolveCommandBinarySync,
-  run,
-  withExportedPath
-} from "./chunk-AE5VBOFE.js";
+  codexUnattendedGitConfigArgs,
+  resolveAgentGitAuthEnv
+} from "./chunk-6WQAYBVE.js";
 import {
   claudeChromeEnabled,
+  isStrippedElectronLaunch,
   loadAppSettings,
   resolveAgentExecutable,
   resolveClaudeExecutable,
   wrapElectronAsNodeLaunch
-} from "./chunk-UHGN4KCL.js";
+} from "./chunk-AY53MPDE.js";
 import {
   appDataDir
 } from "./chunk-7MV3RXSC.js";
+import {
+  enrichPathWithNpmGlobalBin,
+  isConductorBundledCli,
+  resolveCommandBinarySync,
+  run,
+  withExportedPath
+} from "./chunk-3KETJKYA.js";
 
 // src/agents/brightsy.ts
 import { existsSync } from "fs";
@@ -153,20 +158,38 @@ function pushTurnStderr(tail, line, maxLines = 12) {
   tail.push(trimmed);
   while (tail.length > maxLines) tail.shift();
 }
+function looksLikeMinifiedJsDump(line) {
+  if (line.length < 200) return false;
+  return /yield Promise\.all/.test(line) || /\(0,[A-Za-z$]\.\w+\)/.test(line) || /CURSOR_RIPGREP_PATH/.test(line);
+}
+function looksLikeNestedElectronCrash(line) {
+  return /HasCustomHostObject|ElectronInitializeICUandStartNode/i.test(line);
+}
+var NESTED_ELECTRON_SUMMARY = "Cursor local agent crashed at Electron startup (nested Chromium / HasCustomHostObject)";
+var MINIFIED_DUMP_SUMMARY = "Cursor local agent crashed during startup (truncated crash dump)";
+function clipStderr(text, maxChars) {
+  const trimmed = text.trim();
+  if (trimmed.length <= maxChars) return trimmed;
+  return trimmed.slice(0, maxChars);
+}
 function summarizeTurnStderr(tail, maxChars = 500) {
   if (tail.length === 0) return "";
+  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;
   const moduleMissing = [...tail].reverse().find((line) => /cannot find module/i.test(line));
-  if (moduleMissing) {
-    return moduleMissing.length <= maxChars ? moduleMissing : moduleMissing.slice(0, maxChars);
+  if (moduleMissing) return clipStderr(moduleMissing, maxChars);
+  const useful = tail.filter((line) => !looksLikeMinifiedJsDump(line));
+  if (useful.length === 0 && tail.some(looksLikeMinifiedJsDump)) {
+    return MINIFIED_DUMP_SUMMARY;
   }
-  const joined = tail.slice(-6).join("\n").trim();
-  if (joined.length <= maxChars) return joined;
-  return joined.slice(joined.length - maxChars);
+  const joined = (useful.length ? useful : tail).slice(-6).join("\n").trim();
+  return clipStderr(joined, maxChars);
 }
 function looksLikeInvalidAgentSession(text) {
   const lower = text.trim().toLowerCase();
   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);
+  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 looksLikeAgentFailureMessage(text) {
   const lower = text.trim().toLowerCase();
@@ -206,6 +229,12 @@ function humanizeAgentFailDetail(detail) {
   if (/context.*(too long|exceed)|prompt is too long|conversation too long/.test(lower)) {
     return `${raw} \u2014 start a new chat or compact context, then retry.`;
   }
+  if (/hascustomhostobject|electroninitializeicuandstartnode|nested chromium/i.test(lower)) {
+    return `${raw} \u2014 retry the turn; if it keeps failing, pick another agent.`;
+  }
+  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 formatTurnExitError(exitCode, stderrSummary) {
@@ -594,7 +623,12 @@ function applyNodeLaunch(launch, args) {
     return { file: launch.file, args, env: launch.env };
   }
   const wrapped = wrapElectronAsNodeLaunch(launch.file, args);
-  return { file: wrapped.file, args: wrapped.args, env: launch.env };
+  if (process.platform === "win32") {
+    return { file: wrapped.file, args: wrapped.args, env: launch.env };
+  }
+  const env = { ...launch.env };
+  delete env.ELECTRON_RUN_AS_NODE;
+  return { file: wrapped.file, args: wrapped.args, env };
 }
 async function resolveNodeLaunch(scriptPath) {
   if (isAsarPath(scriptPath)) {
@@ -784,6 +818,10 @@ async function buildInjectedMcpServers(opts) {
     if (orchId) {
       sideboard.env.SIDEBOARD_ORCHESTRATOR_THREAD_ID = orchId;
     }
+    try {
+      Object.assign(sideboard.env, await resolveAgentGitAuthEnv(sideboard.env));
+    } catch {
+    }
     servers.push(sideboard);
   }
   if (opts.includeBrightsy && isBrightsyConnected()) {
@@ -806,10 +844,19 @@ async function buildInjectedMcpServers(opts) {
 function toCursorMcpServers(servers) {
   const out = {};
   for (const s of servers) {
+    const env = s.env ? { ...s.env } : void 0;
+    if (env) delete env.ELECTRON_RUN_AS_NODE;
+    let command = s.command;
+    let args = s.args;
+    if (process.platform !== "win32" && !isStrippedElectronLaunch(command, args)) {
+      const wrapped = wrapElectronAsNodeLaunch(command, args ?? []);
+      command = wrapped.file;
+      args = wrapped.args;
+    }
     out[s.name] = {
-      command: s.command,
-      ...s.args ? { args: s.args } : {},
-      ...s.env ? { env: s.env } : {}
+      command,
+      ...args && args.length > 0 ? { args } : {},
+      ...env && Object.keys(env).length > 0 ? { env } : {}
     };
   }
   return out;
@@ -1053,7 +1100,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-OBRWUPZG.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-U3XVTQLL.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -1435,6 +1482,8 @@ var codexAdapter = {
       // `codex exec` rejects `--ask-for-approval` (global-only on newer CLIs).
       "-c",
       'approval_policy="never"',
+      // Seatbelt cannot use the login Keychain; default policy also strips GH_TOKEN.
+      ...codexUnattendedGitConfigArgs(mode.codexSandbox),
       ...model ? ["--model", model] : [],
       ...mcpOverrides
     ];