@sideboard-ai/core 0.1.88 → 0.1.92

package/dist/agents/cursor-runner.cjs

@@ -3,8 +3,8 @@
 
 // src/agents/cursor-runner.ts
 var import_sdk = require("@cursor/sdk");
-var import_node_fs5 = require("fs");
-var import_node_path6 = require("path");
+var import_node_fs9 = require("fs");
+var import_node_path10 = require("path");
 var import_node_readline2 = require("readline");
 
 // src/hook/nested-electron-env.ts
@@ -54,6 +54,120 @@ function appDataDir() {
   return base;
 }
 
+// src/agents/cursor-ripgrep.ts
+var import_node_fs8 = require("fs");
+var import_node_module = require("module");
+var import_node_path9 = require("path");
+var import_node_url = require("url");
+
+// src/agents/node-launch.ts
+var import_node_fs6 = require("fs");
+var import_node_os4 = require("os");
+var import_node_path7 = require("path");
+
+// src/git/run.ts
+var import_execa2 = require("execa");
+
+// src/agents/path.ts
+var import_node_fs5 = require("fs");
+var import_node_child_process = require("child_process");
+var import_node_os3 = require("os");
+var import_node_path6 = require("path");
+
+// src/agents/node-launch.ts
+function isAsarPath(filePath) {
+  if (/\.asar\.unpacked([/\\]|$)/.test(filePath)) return false;
+  return /\.asar([/\\]|$)/.test(filePath);
+}
+function unpackedAsarPath(filePath) {
+  if (!isAsarPath(filePath)) return null;
+  const unpacked = filePath.replace(/\.asar(?=[/\\])/, ".asar.unpacked");
+  if (unpacked === filePath) return null;
+  return (0, import_node_fs6.existsSync)(unpacked) ? unpacked : null;
+}
+function nodeReadableScriptPath(scriptPath) {
+  return unpackedAsarPath(scriptPath) ?? scriptPath;
+}
+
+// src/agents/packaged-runtime.ts
+var import_node_fs7 = require("fs");
+var import_node_path8 = require("path");
+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_path8.join)(resources, "cursor-runtime");
+  if (!(0, import_node_fs7.existsSync)((0, import_node_path8.join)(dir, "core-dist", "agents", "cursor-runner.js"))) return null;
+  return dir;
+}
+function packagedCursorRipgrepCandidate(platformPkg, binName) {
+  const dir = packagedCursorRuntimeDir();
+  if (!dir) return null;
+  return (0, import_node_path8.join)(dir, "node_modules", platformPkg, "bin", binName);
+}
+
+// src/agents/cursor-ripgrep.ts
+var import_meta = {};
+var RIPGREP_ENV = "CURSOR_RIPGREP_PATH";
+function rgBinaryName() {
+  return process.platform === "win32" ? "rg.exe" : "rg";
+}
+function platformRipgrepPackage() {
+  return `@cursor/sdk-${process.platform}-${process.arch}`;
+}
+function usableRipgrepPath(candidate) {
+  const raw = candidate?.trim();
+  if (!raw || !(0, import_node_path9.isAbsolute)(raw)) return null;
+  const readable = nodeReadableScriptPath(raw);
+  if (!(0, import_node_fs8.existsSync)(readable) || isAsarPath(readable)) return null;
+  return readable;
+}
+function walkForBundledRipgrep(startFile) {
+  if (!startFile) return null;
+  const pkg = platformRipgrepPackage();
+  const name = rgBinaryName();
+  let dir = (0, import_node_path9.dirname)((0, import_node_path9.resolve)(startFile));
+  const root = (0, import_node_path9.parse)(dir).root;
+  while (dir !== root) {
+    const hit = usableRipgrepPath((0, import_node_path9.join)(dir, "node_modules", pkg, "bin", name));
+    if (hit) return hit;
+    const next = (0, import_node_path9.dirname)(dir);
+    if (next === dir) break;
+    dir = next;
+  }
+  return null;
+}
+function requireResolveBundledRipgrep(fromFile) {
+  try {
+    const req = (0, import_node_module.createRequire)(fromFile);
+    const pkgJson = req.resolve(`${platformRipgrepPackage()}/package.json`);
+    return usableRipgrepPath((0, import_node_path9.join)((0, import_node_path9.dirname)(pkgJson), "bin", rgBinaryName()));
+  } catch {
+    return null;
+  }
+}
+function resolveCursorRipgrepPath(opts) {
+  const env = opts?.env ?? process.env;
+  const fromEnv = usableRipgrepPath(env[RIPGREP_ENV]);
+  if (fromEnv) return fromEnv;
+  const fromPackaged = usableRipgrepPath(
+    packagedCursorRipgrepCandidate(platformRipgrepPackage(), rgBinaryName())
+  );
+  if (fromPackaged) return fromPackaged;
+  const start = opts?.startFile?.trim() || process.argv[1] || (0, import_node_url.fileURLToPath)(import_meta.url);
+  return walkForBundledRipgrep(start) ?? requireResolveBundledRipgrep(start);
+}
+function ensureCursorRipgrepPath(opts) {
+  const target = opts?.env ?? process.env;
+  const path = resolveCursorRipgrepPath({ env: target, startFile: opts?.startFile });
+  if (path) target[RIPGREP_ENV] = path;
+  return path;
+}
+
 // src/agents/cursor-session.ts
 function cursorErrorMessage(err) {
   if (err instanceof Error) return err.message.trim();
@@ -286,8 +400,52 @@ function cursorSdkMessageToEvents(msg) {
   return [];
 }
 
+// src/agents/cursor-stream-coalesce.ts
+function isTextEvent(event) {
+  return event.type === "stdout" || event.type === "thinking";
+}
+function createAgentStreamCoalescer(emit2, opts) {
+  const intervalMs = opts?.intervalMs ?? 32;
+  let pending = null;
+  let timer = null;
+  const flush = () => {
+    if (timer) {
+      clearTimeout(timer);
+      timer = null;
+    }
+    if (!pending) return;
+    const event = pending;
+    pending = null;
+    emit2({ type: event.type, data: event.data });
+  };
+  const schedule = () => {
+    if (timer) return;
+    timer = setTimeout(flush, intervalMs);
+    timer.unref?.();
+  };
+  return {
+    push(event) {
+      if (!isTextEvent(event)) {
+        flush();
+        emit2(event);
+        return;
+      }
+      if (!event.data) return;
+      if (pending && pending.type === event.type) {
+        pending.data += event.data;
+      } else {
+        flush();
+        pending = { type: event.type, data: event.data };
+      }
+      schedule();
+    },
+    flush
+  };
+}
+
 // src/agents/cursor-runner.ts
 dropNestedElectronEnvFromProcess();
+ensureCursorRipgrepPath();
 function emit(event) {
   process.stdout.write(`${JSON.stringify(event)}
 `);
@@ -307,8 +465,8 @@ function modelSelection(model, opts) {
   return params.length > 0 ? { id, params } : { id };
 }
 function localAgentStore() {
-  const root = (0, import_node_path6.join)(appDataDir(), "cursor-sdk-store");
-  (0, import_node_fs5.mkdirSync)(root, { recursive: true });
+  const root = (0, import_node_path10.join)(appDataDir(), "cursor-sdk-store");
+  (0, import_node_fs9.mkdirSync)(root, { recursive: true });
   return new import_sdk.JsonlLocalAgentStore(root);
 }
 async function cancelStaleLocalRuns(agentId, opts) {
@@ -319,10 +477,10 @@ async function cancelStaleLocalRuns(agentId, opts) {
     limit: 20
   });
   let cancelled = 0;
-  for (const run of listed.items) {
-    if (run.status !== "running") continue;
+  for (const run2 of listed.items) {
+    if (run2.status !== "running") continue;
     try {
-      await import_sdk.Agent.cancelRun(run.id, {
+      await import_sdk.Agent.cancelRun(run2.id, {
         runtime: "local",
         cwd: opts.cwd,
         store: opts.store
@@ -418,11 +576,11 @@ async function main() {
   let liveRun = null;
   let shuttingDown = false;
   const cancelLiveRun = async () => {
-    const run = liveRun;
+    const run2 = liveRun;
     liveRun = null;
-    if (!run) return;
+    if (!run2) return;
     try {
-      await run.cancel();
+      await run2.cancel();
     } catch {
     }
   };
@@ -440,15 +598,17 @@ async function main() {
   process.once("SIGINT", onSignal);
   async function runTurn(agent) {
     emit({ type: "session_id", data: agent.agentId });
-    const run = await sendPrompt(agent);
-    liveRun = run;
+    const run2 = await sendPrompt(agent);
+    liveRun = run2;
+    const stream = createAgentStreamCoalescer(emit);
     try {
-      for await (const msg of run.stream()) {
+      for await (const msg of run2.stream()) {
         for (const event of cursorSdkMessageToEvents(msg)) {
-          emit(event);
+          stream.push(event);
         }
       }
-      const result = await run.wait();
+      stream.flush();
+      const result = await run2.wait();
       if (result.status === "error") {
         const detail = formatUnknownDetail(result.error);
         emit({
@@ -460,6 +620,7 @@ async function main() {
       if (result.status === "cancelled") return 0;
       return 0;
     } finally {
+      stream.flush();
       liveRun = null;
     }
   }

package/dist/agents/cursor-runner.js

@@ -1,14 +1,19 @@
 #!/usr/bin/env node
+import {
+  createAgentStreamCoalescer
+} from "../chunk-MMI4RJ5I.js";
 import {
   cursorSdkMessageToEvents,
+  ensureCursorRipgrepPath,
   formatUnknownDetail
-} from "../chunk-CBJSPTBG.js";
+} from "../chunk-GXSYI7FH.js";
 import {
   dropNestedElectronEnvFromProcess
 } from "../chunk-TLPJHLLM.js";
 import {
   appDataDir
 } from "../chunk-B4R2VB2A.js";
+import "../chunk-LGXBYZZA.js";
 
 // src/agents/cursor-runner.ts
 import { Agent, CursorAgentError, JsonlLocalAgentStore } from "@cursor/sdk";
@@ -54,6 +59,7 @@ function withCursorLocalHangGuards(local) {
 
 // src/agents/cursor-runner.ts
 dropNestedElectronEnvFromProcess();
+ensureCursorRipgrepPath();
 function emit(event) {
   process.stdout.write(`${JSON.stringify(event)}
 `);
@@ -208,12 +214,14 @@ async function main() {
     emit({ type: "session_id", data: agent.agentId });
     const run = await sendPrompt(agent);
     liveRun = run;
+    const stream = createAgentStreamCoalescer(emit);
     try {
       for await (const msg of run.stream()) {
         for (const event of cursorSdkMessageToEvents(msg)) {
-          emit(event);
+          stream.push(event);
         }
       }
+      stream.flush();
       const result = await run.wait();
       if (result.status === "error") {
         const detail = formatUnknownDetail(result.error);
@@ -226,6 +234,7 @@ async function main() {
       if (result.status === "cancelled") return 0;
       return 0;
     } finally {
+      stream.flush();
       liveRun = null;
     }
   }

package/dist/{agents-LMUFTGKF.js → agents-JXQ5QHDU.js}

@@ -32,16 +32,16 @@ import {
   resolveCursorModelId,
   resolveLoginCommand,
   resolveQuotaFallbackAgent
-} from "./chunk-JE75QW2I.js";
+} from "./chunk-GJ2HJQIU.js";
 import "./chunk-DKHGWYWR.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,
   coerceOrchestratorAgent,
   isOrchestratorCapableAgent
-} from "./chunk-UHTNJKZX.js";
-import "./chunk-OB6IRIFV.js";
-import "./chunk-ZXYWWSHZ.js";
+} from "./chunk-NR6APJLD.js";
+import "./chunk-XH2GS2LO.js";
+import "./chunk-R7BQBSDT.js";
 import "./chunk-B3SJXYIJ.js";
 import "./chunk-JOF3XIEM.js";
 import "./chunk-6LFV4VFI.js";

package/dist/{agents-ODBP7J6E.js → agents-TUV4NH7S.js}

@@ -28,20 +28,20 @@ import {
   resolveCursorModelId,
   resolveLoginCommand,
   resolveQuotaFallbackAgent
-} from "./chunk-RJLBSYUO.js";
+} from "./chunk-35LKGGOC.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,
   coerceOrchestratorAgent,
   isOrchestratorCapableAgent
-} from "./chunk-B2KIO2SD.js";
-import "./chunk-VZ2L4AEJ.js";
+} from "./chunk-CLGO7TLO.js";
+import "./chunk-XUWDLRAE.js";
 import "./chunk-QSLE4VEM.js";
 import {
   cursorSdkMessageToEvents,
   parseCursorRunnerLine
-} from "./chunk-CBJSPTBG.js";
-import "./chunk-7D27DD2X.js";
+} from "./chunk-GXSYI7FH.js";
+import "./chunk-CIRXAYWS.js";
 import "./chunk-FKOIHGKV.js";
 import "./chunk-FT2SQOL4.js";
 import "./chunk-TLPJHLLM.js";

package/dist/{chunk-RJLBSYUO.js → chunk-35LKGGOC.js}

@@ -1,6 +1,6 @@
 import {
   isOrchestratorThread
-} from "./chunk-B2KIO2SD.js";
+} from "./chunk-CLGO7TLO.js";
 import {
   applyConnectedTeamToCli,
   brightsyMcpServerName,
@@ -9,15 +9,23 @@ import {
   loadBrightsyConfig
 } from "./chunk-QSLE4VEM.js";
 import {
+  applyNodeLaunch,
+  cursorRipgrepEnv,
   extractJsonErrorMessage,
   formatUnknownDetail,
+  isAsarPath,
   looksLikeAgentFailureMessage,
-  parseCursorRunnerLine
-} from "./chunk-CBJSPTBG.js";
+  packagedCursorRunnerPath,
+  packagedMcpStdioPath,
+  parseCursorRunnerLine,
+  resolveNodeLaunch
+} from "./chunk-GXSYI7FH.js";
 import {
   codexUnattendedGitConfigArgs,
-  resolveAgentGitAuthEnv
-} from "./chunk-7D27DD2X.js";
+  mergeAgentGitAuthEnv,
+  resolveAgentGitAuthEnv,
+  resolveCodexGitWritableRoots
+} from "./chunk-CIRXAYWS.js";
 import {
   claudeChromeEnabled,
   loadAppSettings,
@@ -26,8 +34,7 @@ import {
 } from "./chunk-FT2SQOL4.js";
 import {
   isElectronLikeCommand,
-  unwrapStrippedElectronLaunch,
-  wrapElectronAsNodeLaunch
+  unwrapStrippedElectronLaunch
 } from "./chunk-TLPJHLLM.js";
 import {
   appDataDir
@@ -521,7 +528,7 @@ function mcpAuthWarnings(servers) {
 }
 
 // src/agents/injected-mcp.ts
-import { existsSync as existsSync2, mkdirSync, mkdtempSync, writeFileSync } from "fs";
+import { existsSync as existsSync2, mkdtempSync, writeFileSync } from "fs";
 import { createRequire } from "module";
 import { tmpdir } from "os";
 import { dirname, join } from "path";
@@ -533,40 +540,6 @@ function sideboardMcpProfile(env = process.env) {
   return env[SIDEBOARD_MCP_PROFILE_ENV]?.trim().toLowerCase() === "worktree" ? "worktree" : "orchestration";
 }
 
-// src/agents/node-launch.ts
-function isAsarPath(filePath) {
-  return /\.asar([/\\]|$)/.test(filePath);
-}
-function applyNodeLaunch(launch, args) {
-  if (!launch.env.ELECTRON_RUN_AS_NODE) {
-    return { file: launch.file, args, env: launch.env };
-  }
-  const wrapped = wrapElectronAsNodeLaunch(launch.file, args);
-  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)) {
-    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",
@@ -688,6 +661,8 @@ function corePackageDir() {
 function findSideboardMcpJsEntry() {
   const override = process.env.SIDEBOARD_MCP_ENTRY?.trim() || process.env.SIDEBOARD_CLI?.trim();
   if (override && existsSync2(override)) return override;
+  const packaged = packagedMcpStdioPath();
+  if (packaged) return packaged;
   let dir = corePackageDir();
   for (let i = 0; i < 10; i++) {
     const candidates = [
@@ -700,7 +675,7 @@ function findSideboardMcpJsEntry() {
       join(dir, "cli/dist/index.js")
     ];
     for (const p of candidates) {
-      if (existsSync2(p)) return p;
+      if (existsSync2(p) && !isAsarPath(p)) return p;
     }
     const parent = dirname(dir);
     if (parent === dir) break;
@@ -714,12 +689,14 @@ async function resolveSideboardMcpServer() {
     const isCli = /[/\\]cli[/\\]dist[/\\]index\.js$/.test(entry);
     const scriptArgs = isCli ? [entry, "mcp"] : [entry];
     const launch = applyNodeLaunch(await resolveNodeLaunch(entry), scriptArgs);
-    return {
-      name: "sideboard",
-      command: launch.file,
-      args: launch.args,
-      ...Object.keys(launch.env).length > 0 ? { env: launch.env } : {}
-    };
+    if (launch.file !== "/bin/sh" && !isElectronLikeCommand(launch.file)) {
+      return {
+        name: "sideboard",
+        command: launch.file,
+        args: launch.args,
+        ...Object.keys(launch.env).length > 0 ? { env: launch.env } : {}
+      };
+    }
   }
   const which = await run("which", ["sideboard"], { reject: false });
   if (which.exitCode === 0 && which.stdout.trim()) {
@@ -742,7 +719,10 @@ async function buildInjectedMcpServers(opts) {
       sideboard.env.SIDEBOARD_ORCHESTRATOR_THREAD_ID = orchId;
     }
     try {
-      Object.assign(sideboard.env, await resolveAgentGitAuthEnv(sideboard.env));
+      mergeAgentGitAuthEnv(
+        sideboard.env,
+        await resolveAgentGitAuthEnv(sideboard.env)
+      );
     } catch {
     }
     servers.push(sideboard);
@@ -764,9 +744,6 @@ async function buildInjectedMcpServers(opts) {
   }
   return servers;
 }
-function shSingleQuote(value) {
-  return `'${value.replace(/'/g, `'\\''`)}'`;
-}
 function cursorSafeMcpLaunch(command, args) {
   if (process.platform === "win32") {
     return args && args.length > 0 ? { command, args } : { command };
@@ -774,31 +751,13 @@ function cursorSafeMcpLaunch(command, args) {
   const unwrapped = unwrapStrippedElectronLaunch(command, args);
   const file = unwrapped?.file ?? command;
   const fileArgs = unwrapped?.args ?? args ?? [];
-  if (!isElectronLikeCommand(file)) {
-    return fileArgs.length > 0 ? { command: file, args: fileArgs } : { command: file };
-  }
-  const dir = join(appDataDir(), "mcp-launch");
-  mkdirSync(dir, { recursive: true });
-  const wrap = join(dir, "cursor-electron-as-node.sh");
-  const execLine = [file, ...fileArgs].map(shSingleQuote).join(" ");
-  writeFileSync(
-    wrap,
-    [
-      "#!/bin/sh",
-      "vars=`printenv | awk -F= '/^(ELECTRON_|CHROME_)/{print $1}'`",
-      '[ -n "$vars" ] && unset $vars',
-      "export ELECTRON_RUN_AS_NODE=1",
-      `exec ${execLine} "$@"`,
-      ""
-    ].join("\n"),
-    { mode: 493 }
-  );
-  return { command: wrap };
+  return fileArgs.length > 0 ? { command: file, args: fileArgs } : { command: file };
 }
 function mcpSpawnEnv(env) {
   if (!env) return void 0;
   const out = { ...env };
   delete out.ELECTRON_RUN_AS_NODE;
+  delete out.ELECTRON_RUN_AS_NODE;
   return Object.keys(out).length > 0 ? out : void 0;
 }
 function toCursorMcpServers(servers) {
@@ -868,7 +827,7 @@ async function writeInjectedMcpConfig(opts) {
 }
 
 // src/agents/types.ts
-var PLAN_MODE_INSTRUCTION = "Plan mode is active and must remain active until the user turns Plan mode off in the UI (or Approves / Hands off the plan). Analyze the codebase, search and read files as needed, and produce or refine a clear implementation plan. Do not modify, create, or delete any project files except via Sideboard MCP present_plan (writes .context/attachments/plan.md). When you need a clarifying decision (approach forks, auth choice, scope): (1) first write a short chat message that explains the decision and what each option means (tradeoffs, when to pick it) \u2014 do not leave the user staring at bare labels; (2) then call Sideboard MCP ask_user with the same options, including a description on every option. Sideboard shows questions in the composer and mirrors them in chat. After ask_user, wait for the user's next message with their answers before finalizing the plan. When the plan is ready for approval: (1) call present_plan with the full markdown plan (title + content) so Sideboard saves .context/attachments/plan.md and shows it in chat for Approve / Hand off / Copy; (2) Claude should also call ExitPlanMode after present_plan. Do not skip present_plan \u2014 the plan must be a markdown file, not only chat prose.";
+var PLAN_MODE_INSTRUCTION = "Plan mode is active and must remain active until the user turns Plan mode off in the UI (or Approves / Hands off the plan). Analyze the codebase, search and read files as needed, and produce or refine a clear implementation plan. Do not modify, create, or delete any project files except via Sideboard MCP present_plan (writes .context/attachments/plan.md). When you need a clarifying decision (approach forks, auth choice, scope) \u2014 not greetings, check-ins, or an invented task menu: (1) first write a short chat message that explains the decision and what each option means (tradeoffs, when to pick it) \u2014 do not leave the user staring at bare labels; (2) then call Sideboard MCP ask_user with the same options, including a description on every option. If one option is the obvious default, proceed without asking. Sideboard shows questions in the composer and mirrors them in chat. After ask_user, wait for the user's next message with their answers before finalizing the plan. When the plan is ready for approval: (1) call present_plan with the full markdown plan (title + content) so Sideboard saves .context/attachments/plan.md and shows it in chat for Approve / Hand off / Copy; (2) Claude should also call ExitPlanMode after present_plan. Do not skip present_plan \u2014 the plan must be a markdown file, not only chat prose.";
 function permissionMode(thread) {
   if (thread.sourceType === "orchestration") {
     return {
@@ -1059,7 +1018,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-JQQLPJM5.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-M3OMVDDH.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -1441,8 +1400,13 @@ 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),
+      // Seatbelt cannot use the login Keychain; inherit GH_CONFIG_DIR / GIT_CONFIG_*.
+      // Default policy also strips *TOKEN*. Linked worktrees need the main
+      // repo `.git` (+ `.git/worktrees/<name>`) as writable_roots so git commit
+      // can create index.lock.
+      ...codexUnattendedGitConfigArgs(mode.codexSandbox, {
+        writableRoots: mode.codexSandbox === "workspace-write" ? await resolveCodexGitWritableRoots(thread.worktreePath) : []
+      }),
       ...model ? ["--model", model] : [],
       ...mcpOverrides
     ];
@@ -1648,6 +1612,8 @@ function entryDir() {
   }
 }
 function cursorRunnerPath() {
+  const packaged = packagedCursorRunnerPath();
+  if (packaged) return packaged;
   const root = entryDir();
   const candidates = [
     join3(root, "agents", "cursor-runner.js"),
@@ -1723,6 +1689,7 @@ var cursorAdapter = {
       stdin: JSON.stringify(req),
       env: {
         ...launch.env,
+        ...cursorRipgrepEnv({ startFile: runner }),
         ...apiKey ? { CURSOR_API_KEY: apiKey } : {}
       }
     };
@@ -2483,6 +2450,7 @@ export {
   threadRequestsBrightsyMcp,
   shouldInjectBrightsyMcp,
   brightsyMcpAllowedTools,
+  resolveSideboardMcpServer,
   writeInjectedMcpConfig,
   PLAN_MODE_INSTRUCTION,
   permissionMode,

package/dist/{chunk-WANQFU3S.js → chunk-6XBXVXX2.js}

@@ -2,11 +2,11 @@
 
 import {
   isGlobalRepoPath
-} from "./chunk-UHTNJKZX.js";
+} from "./chunk-NR6APJLD.js";
 import {
   ensureGhPreferOrigin,
   resolveRepoRoot
-} from "./chunk-ZXYWWSHZ.js";
+} from "./chunk-R7BQBSDT.js";
 import {
   appDataDir
 } from "./chunk-JL4SJ6V7.js";