@sideboard-ai/core 0.1.111 → 0.1.116

package/dist/{chunk-363Z34PY.js → chunk-GBY7OOMB.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-4TR3HZFT.js";
 import {
   run
-} from "./chunk-LGXBYZZA.js";
+} from "./chunk-DVM4ID64.js";
 
 // src/agents/error-detail.ts
 function formatUnknownDetail(err) {
@@ -90,7 +90,7 @@ function looksLikeHomebrewLibuvCrash(text) {
 var NESTED_ELECTRON_SUMMARY = "Cursor local agent crashed at Electron startup (nested Chromium / HasCustomHostObject)";
 var HOMEBREW_LIBUV_SUMMARY = "Cursor runner crashed in Node (Homebrew Node + shared libuv). Install Node 22 LTS (`brew install node@22`) and retry.";
 var BUNDLED_NODE_CRASH_SUMMARY = "Cursor runner crashed in Node. Retry the turn.";
-var V8_OOM_SUMMARY = "Cursor runner ran out of memory (JavaScript heap). Retry; if it keeps happening, exclude large files from the project folder or start a new chat.";
+var V8_OOM_SUMMARY = "Agent ran out of memory (JavaScript heap). If it keeps happening, exclude large files from the project folder.";
 var MINIFIED_DUMP_SUMMARY = "Cursor local agent crashed during startup (truncated crash dump)";
 function clipStderr(text, maxChars) {
   const trimmed = text.trim();
@@ -145,6 +145,7 @@ function looksLikeRetryableRunnerCrash(text) {
 }
 function shouldRetryFailedAgentTurn(detail, opts) {
   if (looksLikeInvalidAgentSession(detail) && opts.hasSession) return true;
+  if (looksLikeV8Oom(detail) && opts.hasSession) return true;
   return looksLikeRetryableRunnerCrash(detail);
 }
 function looksLikeAgentFailureMessage(text) {
@@ -230,219 +231,6 @@ function formatTurnExitError(exitCode, stderrSummary) {
   return `exit ${code}: ${detail}`;
 }
 
-// src/agents/cursor-events.ts
-function usageFromCursor(usage) {
-  if (!usage) return null;
-  const inputTokens = Number(usage.inputTokens ?? 0);
-  const outputTokens = Number(usage.outputTokens ?? 0);
-  if (!inputTokens && !outputTokens) return null;
-  return {
-    inputTokens,
-    outputTokens,
-    cacheReadTokens: usage.cacheReadTokens ? Number(usage.cacheReadTokens) : void 0,
-    cacheWriteTokens: usage.cacheWriteTokens ? Number(usage.cacheWriteTokens) : void 0
-  };
-}
-function asRecord(value) {
-  if (value && typeof value === "object" && !Array.isArray(value)) {
-    return value;
-  }
-  return void 0;
-}
-function normalizeCursorToolCall(name, args) {
-  const raw = asRecord(args);
-  const toolName = typeof raw?.toolName === "string" && raw.toolName.trim() ? raw.toolName.trim() : null;
-  const looksLikeMcp = name === "mcp" || toolName != null && (typeof raw?.providerIdentifier === "string" || asRecord(raw?.args) != null);
-  if (looksLikeMcp && toolName) {
-    const providerRaw = typeof raw.providerIdentifier === "string" && raw.providerIdentifier.trim() ? raw.providerIdentifier.trim() : "sideboard";
-    const provider = providerRaw.replace(/[^a-zA-Z0-9_-]/g, "_");
-    const nested = asRecord(raw.args);
-    return {
-      name: `mcp__${provider}__${toolName}`,
-      input: nested ?? { toolName }
-    };
-  }
-  return { name, input: raw };
-}
-function unwrapCursorToolResult(result) {
-  if (result == null) return void 0;
-  if (typeof result === "string") return result;
-  const rec = asRecord(result);
-  if (!rec) {
-    try {
-      return JSON.stringify(result);
-    } catch {
-      return String(result);
-    }
-  }
-  const collectTexts = (items) => {
-    const texts = [];
-    for (const item of items) {
-      const row = asRecord(item);
-      if (!row) continue;
-      if (typeof row.text === "string") {
-        texts.push(row.text);
-        continue;
-      }
-      const nested = asRecord(row.text);
-      if (typeof nested?.text === "string") texts.push(nested.text);
-    }
-    return texts;
-  };
-  const value = asRecord(rec.value);
-  if (value && Array.isArray(value.content)) {
-    const texts = collectTexts(value.content);
-    if (texts.length) return texts.join("\n");
-  }
-  if (Array.isArray(rec.content)) {
-    const texts = collectTexts(rec.content);
-    if (texts.length) return texts.join("\n");
-  }
-  try {
-    return JSON.stringify(result);
-  } catch {
-    return String(result);
-  }
-}
-function cursorToolResultIsError(status, result) {
-  if (status === "error") return true;
-  const rec = asRecord(result);
-  if (!rec) return false;
-  if (rec.status === "error") return true;
-  const value = asRecord(rec.value);
-  return value?.isError === true;
-}
-function cursorSdkMessageToEvents(msg) {
-  if (!msg?.type) return [];
-  if (msg.type === "system" && msg.agent_id) {
-    return [{ type: "session_id", data: msg.agent_id }];
-  }
-  if (msg.type === "thinking" && msg.text) {
-    return [{ type: "thinking", data: msg.text }];
-  }
-  if (msg.type === "assistant" && msg.message?.content?.length) {
-    const out = [];
-    for (const block of msg.message.content) {
-      if (block?.type === "text" && block.text) {
-        out.push({ type: "stdout", data: block.text });
-      } else if (block?.type === "tool_use" && block.id && block.name) {
-        const normalized = normalizeCursorToolCall(block.name, block.input);
-        out.push({
-          type: "tool_use",
-          id: block.id,
-          name: normalized.name,
-          input: normalized.input
-        });
-      }
-    }
-    return out;
-  }
-  if (msg.type === "tool_call" && msg.call_id && msg.name) {
-    const normalized = normalizeCursorToolCall(msg.name, msg.args);
-    if (msg.status === "running") {
-      return [
-        {
-          type: "tool_use",
-          id: msg.call_id,
-          name: normalized.name,
-          input: normalized.input
-        }
-      ];
-    }
-    if (msg.status === "completed" || msg.status === "error") {
-      return [
-        {
-          type: "tool_use",
-          id: msg.call_id,
-          name: normalized.name,
-          input: normalized.input
-        },
-        {
-          type: "tool_result",
-          id: msg.call_id,
-          content: unwrapCursorToolResult(msg.result),
-          isError: cursorToolResultIsError(msg.status, msg.result)
-        }
-      ];
-    }
-  }
-  if (msg.type === "usage") {
-    const usage = usageFromCursor(msg.usage);
-    if (usage) return [{ type: "usage", data: usage, scope: "request" }];
-  }
-  if (msg.type === "status" && msg.status === "ERROR") {
-    const rawMessage = msg.message;
-    const detail = (typeof rawMessage === "string" ? rawMessage.trim() : "") || extractJsonErrorMessage(msg) || formatUnknownDetail(msg.error) || msg.text || "Cursor run entered ERROR status";
-    return [{ type: "stderr", data: detail }];
-  }
-  if (msg.type === "error") {
-    const detail = extractJsonErrorMessage(msg) || formatUnknownDetail(msg.error) || msg.text || "Cursor run error";
-    return [{ type: "stderr", data: detail }];
-  }
-  return [];
-}
-function nestedUpdateToEvents(update, parentId) {
-  if (update.type === "thinking-delta" && update.text) {
-    return [{ type: "thinking", data: update.text, parentId }];
-  }
-  if (update.type === "text-delta" && update.text) {
-    return [{ type: "stdout", data: update.text, parentId }];
-  }
-  if ((update.type === "tool-call-started" || update.type === "tool-call-completed") && update.callId && update.toolCall) {
-    const rawName = typeof update.toolCall.type === "string" ? update.toolCall.type : "tool";
-    const normalized = normalizeCursorToolCall(rawName, update.toolCall.args);
-    const events = [
-      {
-        type: "tool_use",
-        id: update.callId,
-        name: normalized.name,
-        input: normalized.input,
-        parentId
-      }
-    ];
-    if (update.type === "tool-call-completed") {
-      events.push({
-        type: "tool_result",
-        id: update.callId,
-        content: unwrapCursorToolResult(update.toolCall.result),
-        isError: cursorToolResultIsError(void 0, update.toolCall.result),
-        parentId
-      });
-    }
-    return events;
-  }
-  return [];
-}
-function cursorDeltaToEvents(update) {
-  if (!update?.type) return [];
-  if (update.type === "tool-call-delta" && update.callId && update.taskUpdate) {
-    return nestedUpdateToEvents(update.taskUpdate, update.callId);
-  }
-  return [];
-}
-function parseCursorRunnerLine(line) {
-  const trimmed = line.trim();
-  if (!trimmed) return null;
-  try {
-    const obj = JSON.parse(trimmed);
-    if (Array.isArray(obj)) return obj;
-    if (obj && typeof obj === "object" && "events" in obj && Array.isArray(obj.events)) {
-      return obj.events;
-    }
-    if (obj && typeof obj === "object" && "type" in obj) {
-      return obj;
-    }
-    return null;
-  } catch {
-    return { type: "stdout", data: line };
-  }
-}
-
-// src/agents/cursor-ripgrep.ts
-import { existsSync as existsSync3 } from "fs";
-import { createRequire } from "module";
-import { dirname, isAbsolute, join as join3, parse, resolve as resolvePath } from "path";
-
 // src/agents/node-launch.ts
 import { existsSync as existsSync2, readdirSync, realpathSync } from "fs";
 import { homedir } from "os";
@@ -492,6 +280,29 @@ function packagedCursorRipgrepCandidate(platformPkg, binName) {
 }
 
 // src/agents/node-launch.ts
+var AGENT_RUNNER_MAX_OLD_SPACE_MB = 8192;
+var MAX_OLD_SPACE_FLAG = /(?:^|\s)(--max[-_]old[-_]space[-_]size)(?:[= ](\d+))?(?=\s|$)/;
+function withMaxOldSpaceSize(nodeOptions, heapMb) {
+  const existing = (nodeOptions ?? "").trim();
+  const match = MAX_OLD_SPACE_FLAG.exec(existing);
+  if (match) {
+    const current = match[2] ? Number(match[2]) : 0;
+    if (Number.isFinite(current) && current >= heapMb) return existing;
+    return existing.replace(MAX_OLD_SPACE_FLAG, ` --max-old-space-size=${heapMb}`).trim();
+  }
+  return existing ? `${existing} --max-old-space-size=${heapMb}` : `--max-old-space-size=${heapMb}`;
+}
+function applyAgentRunnerHeapEnv(env) {
+  env.NODE_OPTIONS = withMaxOldSpaceSize(
+    env.NODE_OPTIONS,
+    AGENT_RUNNER_MAX_OLD_SPACE_MB
+  );
+}
+function envWithAgentHeap(env) {
+  const next = { ...env };
+  applyAgentRunnerHeapEnv(next);
+  return next;
+}
 function isAsarPath(filePath) {
   if (/\.asar\.unpacked([/\\]|$)/.test(filePath)) return false;
   return /\.asar([/\\]|$)/.test(filePath);
@@ -628,13 +439,21 @@ async function findSystemNode() {
 function applyNodeLaunch(launch, args) {
   const readableArgs = args.map(nodeReadableScriptPath);
   if (!launch.env.ELECTRON_RUN_AS_NODE) {
-    return { file: launch.file, args: readableArgs, env: launch.env };
+    return {
+      file: launch.file,
+      args: readableArgs,
+      env: envWithAgentHeap(launch.env)
+    };
   }
   const wrapped = wrapElectronAsNodeLaunch(launch.file, readableArgs);
   if (process.platform === "win32") {
-    return { file: wrapped.file, args: wrapped.args, env: launch.env };
+    return {
+      file: wrapped.file,
+      args: wrapped.args,
+      env: envWithAgentHeap(launch.env)
+    };
   }
-  const env = { ...launch.env };
+  const env = envWithAgentHeap(launch.env);
   delete env.ELECTRON_RUN_AS_NODE;
   return { file: wrapped.file, args: wrapped.args, env };
 }
@@ -656,7 +475,239 @@ async function resolveNodeLaunch(scriptPath) {
   };
 }
 
+// src/agents/cursor-events.ts
+function usageFromCursor(usage) {
+  if (!usage) return null;
+  const inputTokens = Number(usage.inputTokens ?? 0);
+  const outputTokens = Number(usage.outputTokens ?? 0);
+  if (!inputTokens && !outputTokens) return null;
+  return {
+    inputTokens,
+    outputTokens,
+    cacheReadTokens: usage.cacheReadTokens ? Number(usage.cacheReadTokens) : void 0,
+    cacheWriteTokens: usage.cacheWriteTokens ? Number(usage.cacheWriteTokens) : void 0
+  };
+}
+function asRecord(value) {
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    return value;
+  }
+  return void 0;
+}
+function normalizeCursorToolCall(name, args) {
+  const raw = asRecord(args);
+  const toolName = typeof raw?.toolName === "string" && raw.toolName.trim() ? raw.toolName.trim() : null;
+  const looksLikeMcp = name === "mcp" || toolName != null && (typeof raw?.providerIdentifier === "string" || asRecord(raw?.args) != null);
+  if (looksLikeMcp && toolName) {
+    const providerRaw = typeof raw.providerIdentifier === "string" && raw.providerIdentifier.trim() ? raw.providerIdentifier.trim() : "sideboard";
+    const provider = providerRaw.replace(/[^a-zA-Z0-9_-]/g, "_");
+    const nested = asRecord(raw.args);
+    return {
+      name: `mcp__${provider}__${toolName}`,
+      input: nested ?? { toolName }
+    };
+  }
+  return { name, input: raw };
+}
+function unwrapCursorToolResult(result) {
+  if (result == null) return void 0;
+  if (typeof result === "string") return result;
+  const rec = asRecord(result);
+  if (!rec) {
+    try {
+      return JSON.stringify(result);
+    } catch {
+      return String(result);
+    }
+  }
+  const collectTexts = (items) => {
+    const texts = [];
+    for (const item of items) {
+      const row = asRecord(item);
+      if (!row) continue;
+      if (typeof row.text === "string") {
+        texts.push(row.text);
+        continue;
+      }
+      const nested = asRecord(row.text);
+      if (typeof nested?.text === "string") texts.push(nested.text);
+    }
+    return texts;
+  };
+  const value = asRecord(rec.value);
+  if (value && Array.isArray(value.content)) {
+    const texts = collectTexts(value.content);
+    if (texts.length) return texts.join("\n");
+  }
+  if (Array.isArray(rec.content)) {
+    const texts = collectTexts(rec.content);
+    if (texts.length) return texts.join("\n");
+  }
+  try {
+    return JSON.stringify(result);
+  } catch {
+    return String(result);
+  }
+}
+function cursorToolResultIsError(status, result) {
+  if (status === "error") return true;
+  const rec = asRecord(result);
+  if (!rec) return false;
+  if (rec.status === "error") return true;
+  const value = asRecord(rec.value);
+  return value?.isError === true;
+}
+function cursorSdkMessageToEvents(msg) {
+  if (!msg?.type) return [];
+  if (msg.type === "system" && msg.agent_id) {
+    return [{ type: "session_id", data: msg.agent_id }];
+  }
+  if (msg.type === "thinking" && msg.text) {
+    return [{ type: "thinking", data: msg.text }];
+  }
+  if (msg.type === "assistant" && msg.message?.content?.length) {
+    const out = [];
+    for (const block of msg.message.content) {
+      if (block?.type === "text" && block.text) {
+        out.push({ type: "stdout", data: block.text });
+      } else if (block?.type === "tool_use" && block.id && block.name) {
+        const normalized = normalizeCursorToolCall(block.name, block.input);
+        out.push({
+          type: "tool_use",
+          id: block.id,
+          name: normalized.name,
+          input: normalized.input
+        });
+      }
+    }
+    return out;
+  }
+  if (msg.type === "tool_call" && msg.call_id && msg.name) {
+    const normalized = normalizeCursorToolCall(msg.name, msg.args);
+    if (msg.status === "running") {
+      const events = [
+        {
+          type: "tool_use",
+          id: msg.call_id,
+          name: normalized.name,
+          input: normalized.input
+        }
+      ];
+      const live = unwrapCursorToolResult(msg.result);
+      if (live) {
+        events.push({
+          type: "tool_result",
+          id: msg.call_id,
+          content: live,
+          partial: true
+        });
+      }
+      return events;
+    }
+    if (msg.status === "completed" || msg.status === "error") {
+      return [
+        {
+          type: "tool_use",
+          id: msg.call_id,
+          name: normalized.name,
+          input: normalized.input
+        },
+        {
+          type: "tool_result",
+          id: msg.call_id,
+          content: unwrapCursorToolResult(msg.result),
+          isError: cursorToolResultIsError(msg.status, msg.result)
+        }
+      ];
+    }
+  }
+  if (msg.type === "usage") {
+    const usage = usageFromCursor(msg.usage);
+    if (usage) return [{ type: "usage", data: usage, scope: "request" }];
+  }
+  if (msg.type === "status" && msg.status === "ERROR") {
+    const rawMessage = msg.message;
+    const detail = (typeof rawMessage === "string" ? rawMessage.trim() : "") || extractJsonErrorMessage(msg) || formatUnknownDetail(msg.error) || msg.text || "Cursor run entered ERROR status";
+    return [{ type: "stderr", data: detail }];
+  }
+  if (msg.type === "error") {
+    const detail = extractJsonErrorMessage(msg) || formatUnknownDetail(msg.error) || msg.text || "Cursor run error";
+    return [{ type: "stderr", data: detail }];
+  }
+  return [];
+}
+function nestedUpdateToEvents(update, parentId) {
+  if (update.type === "thinking-delta" && update.text) {
+    return [{ type: "thinking", data: update.text, parentId }];
+  }
+  if (update.type === "text-delta" && update.text) {
+    return [{ type: "stdout", data: update.text, parentId }];
+  }
+  if ((update.type === "tool-call-started" || update.type === "tool-call-completed") && update.callId && update.toolCall) {
+    const rawName = typeof update.toolCall.type === "string" ? update.toolCall.type : "tool";
+    const normalized = normalizeCursorToolCall(rawName, update.toolCall.args);
+    const events = [
+      {
+        type: "tool_use",
+        id: update.callId,
+        name: normalized.name,
+        input: normalized.input,
+        parentId
+      }
+    ];
+    if (update.type === "tool-call-completed") {
+      events.push({
+        type: "tool_result",
+        id: update.callId,
+        content: unwrapCursorToolResult(update.toolCall.result),
+        isError: cursorToolResultIsError(void 0, update.toolCall.result),
+        parentId
+      });
+    } else {
+      const live = unwrapCursorToolResult(update.toolCall.result);
+      if (live) {
+        events.push({
+          type: "tool_result",
+          id: update.callId,
+          content: live,
+          partial: true,
+          parentId
+        });
+      }
+    }
+    return events;
+  }
+  return [];
+}
+function cursorDeltaToEvents(update) {
+  if (!update?.type) return [];
+  if (update.type === "tool-call-delta" && update.callId && update.taskUpdate) {
+    return nestedUpdateToEvents(update.taskUpdate, update.callId);
+  }
+  return [];
+}
+function parseCursorRunnerLine(line) {
+  const trimmed = line.trim();
+  if (!trimmed) return null;
+  try {
+    const obj = JSON.parse(trimmed);
+    if (Array.isArray(obj)) return obj;
+    if (obj && typeof obj === "object" && "events" in obj && Array.isArray(obj.events)) {
+      return obj.events;
+    }
+    if (obj && typeof obj === "object" && "type" in obj) {
+      return obj;
+    }
+    return null;
+  } catch {
+    return { type: "stdout", data: line };
+  }
+}
+
 // src/agents/cursor-ripgrep.ts
+import { existsSync as existsSync3 } from "fs";
+import { createRequire } from "module";
+import { dirname, isAbsolute, join as join3, parse, resolve as resolvePath } from "path";
 var RIPGREP_ENV = "CURSOR_RIPGREP_PATH";
 function rgBinaryName() {
   return process.platform === "win32" ? "rg.exe" : "rg";
@@ -723,6 +774,7 @@ export {
   formatUnknownDetail,
   extractJsonErrorMessage,
   pushTurnStderr,
+  looksLikeV8Oom,
   summarizeTurnStderr,
   looksLikeInvalidAgentSession,
   shouldRetryFailedAgentTurn,
@@ -732,6 +784,9 @@ export {
   formatTurnExitError,
   packagedCursorRunnerPath,
   packagedMcpStdioPath,
+  AGENT_RUNNER_MAX_OLD_SPACE_MB,
+  withMaxOldSpaceSize,
+  applyAgentRunnerHeapEnv,
   isAsarPath,
   applyNodeLaunch,
   resolveNodeLaunch,

package/dist/{chunk-7KWYXGIU.js → chunk-K3TIQXOH.js}

@@ -1,10 +1,10 @@
 import {
   isGlobalRepoPath
-} from "./chunk-4EWPKYOU.js";
+} from "./chunk-4OJMZ6P2.js";
 import {
   ensureGhPreferOrigin,
   resolveRepoRoot
-} from "./chunk-C4KHDW3U.js";
+} from "./chunk-FZCIQYNQ.js";
 import {
   appDataDir
 } from "./chunk-QZQEXME2.js";

package/dist/{chunk-3KETJKYA.js → chunk-KPIYENTF.js}

@@ -99,6 +99,34 @@ function withExportedPath(command, pathValue) {
   return `export PATH=${posixShellSingleQuote(pathValue)} && ${trimmed}`;
 }
 
+// src/git/stale-lock.ts
+import { existsSync as existsSync2, statSync, unlinkSync } from "fs";
+import { join as join2 } from "path";
+var STALE_INDEX_LOCK_MS = 2e4;
+function isIndexLockError(text) {
+  return /Unable to create ['"][^'"]*index\.lock['"]: File exists/i.test(text);
+}
+function clearStaleIndexLock(gitDir, maxAgeMs = STALE_INDEX_LOCK_MS, now = Date.now()) {
+  const lockPath = join2(gitDir, "index.lock");
+  try {
+    if (!existsSync2(lockPath)) return null;
+    if (now - statSync(lockPath).mtimeMs < maxAgeMs) return null;
+    unlinkSync(lockPath);
+    return lockPath;
+  } catch {
+    return null;
+  }
+}
+function clearStaleIndexLocks(gitDirs, maxAgeMs = STALE_INDEX_LOCK_MS) {
+  const now = Date.now();
+  const removed = [];
+  for (const dir of new Set(gitDirs)) {
+    const cleared = clearStaleIndexLock(dir, maxAgeMs, now);
+    if (cleared) removed.push(cleared);
+  }
+  return removed;
+}
+
 // src/git/run.ts
 async function run(file, args, opts) {
   ensureAgentPath();
@@ -126,6 +154,21 @@ async function run(file, args, opts) {
     throw err;
   }
 }
+async function resolveGitDirsForLockRecovery(cwd, env = {}) {
+  const dirs = /* @__PURE__ */ new Set();
+  const [gitDir, commonDir] = await Promise.all([
+    run("git", ["rev-parse", "--absolute-git-dir"], { cwd, reject: false, env, timeoutMs: 5e3 }),
+    run("git", ["rev-parse", "--path-format=absolute", "--git-common-dir"], {
+      cwd,
+      reject: false,
+      env,
+      timeoutMs: 5e3
+    })
+  ]);
+  if (gitDir.exitCode === 0 && gitDir.stdout.trim()) dirs.add(gitDir.stdout.trim());
+  if (commonDir.exitCode === 0 && commonDir.stdout.trim()) dirs.add(commonDir.stdout.trim());
+  return [...dirs];
+}
 async function git(args, cwd, opts) {
   const prefix = [];
   if (opts?.config) {
@@ -134,21 +177,32 @@ async function git(args, cwd, opts) {
       prefix.push("-c", `${key}=${value}`);
     }
   }
-  return run("git", ["--no-pager", ...prefix, ...args], {
-    cwd,
-    reject: opts?.reject,
-    timeoutMs: opts?.timeoutMs,
+  const gitArgs = ["--no-pager", ...prefix, ...args];
+  const env = {
     // Never block forever on a credential/SSH prompt inside MCP / Electron.
-    env: {
-      GIT_TERMINAL_PROMPT: "0",
-      GIT_ASKPASS: process.env.GIT_ASKPASS || "echo",
-      SSH_ASKPASS: process.env.SSH_ASKPASS || "echo",
-      GIT_SSH_COMMAND: process.env.GIT_SSH_COMMAND || "ssh -o BatchMode=yes -o ConnectTimeout=15",
-      GCM_INTERACTIVE: "never",
-      GH_PROMPT_DISABLED: "1",
-      ...opts?.env
+    GIT_TERMINAL_PROMPT: "0",
+    GIT_ASKPASS: process.env.GIT_ASKPASS || "echo",
+    SSH_ASKPASS: process.env.SSH_ASKPASS || "echo",
+    GIT_SSH_COMMAND: process.env.GIT_SSH_COMMAND || "ssh -o BatchMode=yes -o ConnectTimeout=15",
+    GCM_INTERACTIVE: "never",
+    GH_PROMPT_DISABLED: "1",
+    ...opts?.env
+  };
+  let result = await run("git", gitArgs, { cwd, reject: false, timeoutMs: opts?.timeoutMs, env });
+  if (result.exitCode !== 0 && isIndexLockError(result.stderr)) {
+    const gitDirs = await resolveGitDirsForLockRecovery(cwd, env);
+    const cleared = clearStaleIndexLocks(gitDirs);
+    if (cleared.length > 0) {
+      result = await run("git", gitArgs, { cwd, reject: false, timeoutMs: opts?.timeoutMs, env });
     }
-  });
+  }
+  if ((opts?.reject ?? true) && result.exitCode !== 0) {
+    throw new Error(
+      `Command failed with exit code ${result.exitCode}: git ${gitArgs.join(" ")}
+${result.stderr}`
+    );
+  }
+  return result;
 }
 async function gh(args, cwd, opts) {
   return run("gh", args, {
@@ -176,7 +230,9 @@ export {
   posixShellSingleQuote,
   resolveCommandBinarySync,
   withExportedPath,
+  clearStaleIndexLocks,
   run,
+  resolveGitDirsForLockRecovery,
   git,
   gh,
   resolveGhAuthToken