@sideboard-ai/core 0.1.99 → 0.1.103

package/dist/{chunk-FYS2BULQ.js → chunk-LANDJIAI.js}

@@ -6,16 +6,16 @@ import {
   ensureCliTeamTracked,
   ensureConnectedBrightsyTeamTokens,
   loadBrightsyConfig
-} from "./chunk-DKHGWYWR.js";
+} from "./chunk-7YKXHBIW.js";
 import {
   isOrchestratorThread
-} from "./chunk-HI2OTFFR.js";
+} from "./chunk-OW34MVDN.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv,
   resolveCodexGitWritableRoots
-} from "./chunk-R7BQBSDT.js";
+} from "./chunk-WA3DVVWG.js";
 import {
   claudeChromeEnabled,
   isElectronLikeCommand,
@@ -24,10 +24,10 @@ import {
   resolveClaudeExecutable,
   unwrapStrippedElectronLaunch,
   wrapElectronAsNodeLaunch
-} from "./chunk-6LFV4VFI.js";
+} from "./chunk-WSYCND2U.js";
 import {
   appDataDir
-} from "./chunk-JL4SJ6V7.js";
+} from "./chunk-BD2ICC4D.js";
 import {
   enrichPathWithNpmGlobalBin,
   isConductorBundledCli,
@@ -178,7 +178,15 @@ function looksLikeMinifiedJsDump(line) {
 function looksLikeNestedElectronCrash(line) {
   return /HasCustomHostObject|ElectronInitializeICUandStartNode/i.test(line);
 }
+function looksLikeHomebrewLibuvCrash(line) {
+  const uvRun = /uv_run/i.test(line);
+  const spin = /SpinEventLoopInternal/i.test(line);
+  const homebrewUv = /Cellar\/libuv|libuv\.\d\.dylib/i.test(line);
+  const homebrewNode = /Cellar\/node\//i.test(line);
+  return uvRun && (homebrewUv || spin || homebrewNode) || spin && (homebrewUv || homebrewNode);
+}
 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 MINIFIED_DUMP_SUMMARY = "Cursor local agent crashed during startup (truncated crash dump)";
 function clipStderr(text, maxChars) {
   const trimmed = text.trim();
@@ -190,6 +198,7 @@ function summarizeTurnStderr(tail, maxChars = 500) {
   const cursorStartup = [...tail].reverse().find((line) => /cursor startup failed:/i.test(line));
   if (cursorStartup) return clipStderr(cursorStartup, maxChars);
   if (tail.some(looksLikeNestedElectronCrash)) return NESTED_ELECTRON_SUMMARY;
+  if (tail.some(looksLikeHomebrewLibuvCrash)) return HOMEBREW_LIBUV_SUMMARY;
   if (tail.some(
     (line) => /\[resource_exhausted\]|resource_exhausted/i.test(line) || /findFilesWithRipgrep/.test(line)
   )) {
@@ -212,6 +221,20 @@ function looksLikeInvalidAgentSession(text) {
   if (!lower) return false;
   return /session not found/.test(lower) || /no conversation found/.test(lower) || /conversation .+ not found/.test(lower) || /thread .+ not found/.test(lower) || /unknown session/.test(lower) || /invalid session/.test(lower) || /session .+ (missing|expired|deleted|gone)/.test(lower) || /cannot resume/.test(lower) || /failed to (load|resume|open) session/.test(lower) || /corrupt local agent checkpoint/.test(lower) || /missing root blob/.test(lower) || /\bagent\b.{0,120}\bnot found\b/.test(lower);
 }
+function looksLikeRetryableRunnerCrash(text) {
+  if (looksLikeAgentFailureMessage(text)) return false;
+  if (looksLikeInvalidAgentSession(text)) return false;
+  const lower = text.trim().toLowerCase();
+  if (/cannot find (?:package|module)|err_module_not_found/.test(lower)) return false;
+  if (!lower) return true;
+  return /uv_run|spineventloopinternal|libuv|homebrew node \+ shared libuv|hascustomhostobject|electroninitializeicuandstartnode|nested chromium|truncated crash dump|sig(?:segv|abrt|ill)|segmentation fault|illegal instruction|fatal error/.test(
+    lower
+  );
+}
+function shouldRetryFailedAgentTurn(detail, opts) {
+  if (looksLikeInvalidAgentSession(detail) && opts.hasSession) return true;
+  return looksLikeRetryableRunnerCrash(detail);
+}
 function looksLikeAgentFailureMessage(text) {
   const lower = text.trim().toLowerCase();
   if (!lower) return false;
@@ -256,11 +279,22 @@ function humanizeAgentFailDetail(detail) {
   if (/hascustomhostobject|electroninitializeicuandstartnode|nested chromium/i.test(lower)) {
     return `${raw} \u2014 retry the turn; if it keeps failing, pick another agent.`;
   }
+  if (/homebrew node \+ shared libuv|uv_run|spineventloopinternal/i.test(lower)) {
+    return /brew install node@22/i.test(raw) ? raw : `${raw} \u2014 install Node 22 LTS (\`brew install node@22\`) and retry.`;
+  }
   if (/corrupt local agent checkpoint|missing root blob|truncated crash dump/.test(lower)) {
     return `${raw} \u2014 retry the turn (Sideboard will start a fresh Cursor session).`;
   }
   return raw;
 }
+function turnFailChatText(opts) {
+  const chat = opts.assistantText.trim();
+  if (chat) return chat;
+  if (opts.exitCode === 0) return "";
+  const detail = opts.detail.trim();
+  if (detail) return humanizeAgentFailDetail(detail);
+  return formatTurnExitError(opts.exitCode ?? 1, "");
+}
 function formatTurnExitError(exitCode, stderrSummary) {
   const code = exitCode ?? 1;
   const raw = stderrSummary.trim();
@@ -639,9 +673,54 @@ function sideboardMcpProfile(env = process.env) {
 }
 
 // src/agents/node-launch.ts
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync3, readdirSync, realpathSync } from "fs";
 import { homedir } from "os";
+import { join as join2 } from "path";
+
+// src/agents/packaged-runtime.ts
+import { existsSync as existsSync2 } from "fs";
 import { join } from "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 = join(resources, "cursor-runtime");
+  if (!existsSync2(join(dir, "core-dist", "agents", "cursor-runner.js"))) return null;
+  return dir;
+}
+function packagedCursorRunnerPath() {
+  const dir = packagedCursorRuntimeDir();
+  return dir ? join(dir, "core-dist", "agents", "cursor-runner.js") : null;
+}
+function packagedMcpDir() {
+  const resources = electronResourcesPath();
+  if (!resources) return null;
+  const dir = join(resources, "sideboard-mcp");
+  if (!existsSync2(join(dir, "core-dist", "mcp", "run-stdio.js"))) return null;
+  return dir;
+}
+function packagedMcpStdioPath() {
+  const dir = packagedMcpDir();
+  return dir ? join(dir, "core-dist", "mcp", "run-stdio.js") : null;
+}
+function packagedBundledNodePath() {
+  const resources = electronResourcesPath();
+  if (!resources) return null;
+  const bin = join(resources, "node", "bin", "node");
+  if (!existsSync2(bin)) return null;
+  return bin;
+}
+function packagedCursorRipgrepCandidate(platformPkg, binName) {
+  const dir = packagedCursorRuntimeDir();
+  if (!dir) return null;
+  return join(dir, "node_modules", platformPkg, "bin", binName);
+}
+
+// src/agents/node-launch.ts
 function isAsarPath(filePath) {
   if (/\.asar\.unpacked([/\\]|$)/.test(filePath)) return false;
   return /\.asar([/\\]|$)/.test(filePath);
@@ -650,28 +729,130 @@ function unpackedAsarPath(filePath) {
   if (!isAsarPath(filePath)) return null;
   const unpacked = filePath.replace(/\.asar(?=[/\\])/, ".asar.unpacked");
   if (unpacked === filePath) return null;
-  return existsSync2(unpacked) ? unpacked : null;
+  return existsSync3(unpacked) ? unpacked : null;
 }
 function nodeReadableScriptPath(scriptPath) {
   return unpackedAsarPath(scriptPath) ?? scriptPath;
 }
-var WELL_KNOWN_NODE_BINS = [
-  "/opt/homebrew/bin/node",
-  "/usr/local/bin/node"
-];
-async function findSystemNode() {
-  const whichNode = await run("which", ["node"], { reject: false });
-  const fromWhich = whichNode.exitCode === 0 && whichNode.stdout.trim() ? whichNode.stdout.trim() : "";
-  if (fromWhich && !isElectronLikeCommand(fromWhich)) return fromWhich;
-  const fallbacks = [
-    ...WELL_KNOWN_NODE_BINS,
-    join(homedir(), ".local/share/fnm/aliases/default/bin/node"),
-    join(homedir(), ".nvm/current/bin/node")
+var PREFERRED_LTS_MAJORS = [24, 22, 20];
+function parseNodeMajor(version) {
+  const match = /^v?(\d+)/.exec(version.trim());
+  if (!match) return null;
+  const major = Number(match[1]);
+  return Number.isInteger(major) ? major : null;
+}
+function scoreNodeForAgentRuntime(candidate) {
+  const major = parseNodeMajor(candidate.version);
+  if (major == null) return Number.NEGATIVE_INFINITY;
+  if (major < 20) return major - 100;
+  const posix = candidate.path.replace(/\\/g, "/");
+  let score = 0;
+  if (major % 2 === 0) {
+    score += 1e3 + major * 10;
+  } else {
+    score += major;
+  }
+  if (/\/Cellar\/node\/\d/.test(posix) && !/\/Cellar\/node@\d+/.test(posix)) {
+    score -= 50;
+  }
+  return score;
+}
+function pickPreferredNode(candidates) {
+  let best = null;
+  let bestScore = Number.NEGATIVE_INFINITY;
+  for (const candidate of candidates) {
+    const score = scoreNodeForAgentRuntime(candidate);
+    if (score > bestScore) {
+      bestScore = score;
+      best = candidate;
+    }
+  }
+  return best;
+}
+function versionDirNodeBins(root, toBin) {
+  if (!existsSync3(root)) return [];
+  try {
+    return readdirSync(root).map(toBin);
+  } catch {
+    return [];
+  }
+}
+function defaultNodeBinCandidates(home = homedir()) {
+  const kegs = ["/opt/homebrew", "/usr/local"].flatMap(
+    (prefix) => PREFERRED_LTS_MAJORS.map((major) => join2(prefix, "opt", `node@${major}`, "bin", "node"))
+  );
+  return [
+    ...kegs,
+    "/opt/homebrew/bin/node",
+    "/usr/local/bin/node",
+    join2(home, ".local/share/fnm/aliases/default/bin/node"),
+    join2(home, ".nvm/current/bin/node"),
+    join2(home, ".volta/bin/node"),
+    join2(home, ".asdf/shims/node"),
+    join2(home, ".local/share/mise/shims/node"),
+    ...versionDirNodeBins(
+      join2(home, ".nvm", "versions", "node"),
+      (name) => join2(home, ".nvm", "versions", "node", name, "bin", "node")
+    ),
+    ...versionDirNodeBins(
+      join2(home, ".local/share/fnm", "node-versions"),
+      (name) => join2(home, ".local/share/fnm", "node-versions", name, "installation", "bin", "node")
+    ),
+    ...versionDirNodeBins(
+      join2(home, ".volta", "tools", "image", "node"),
+      (name) => join2(home, ".volta", "tools", "image", "node", name, "bin", "node")
+    )
   ];
-  for (const bin of fallbacks) {
-    if (existsSync2(bin) && !isElectronLikeCommand(bin)) return bin;
+}
+function uniqueExistingNodeBins(paths) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const raw of paths) {
+    const p = raw.trim();
+    if (!p || !existsSync3(p) || isElectronLikeCommand(p)) continue;
+    let key = p;
+    try {
+      key = realpathSync(p);
+    } catch {
+      continue;
+    }
+    if (seen.has(key)) continue;
+    seen.add(key);
+    out.push(p);
   }
-  return null;
+  return out;
+}
+async function whichAllNode() {
+  if (process.platform === "win32") {
+    const located = await run("where", ["node"], { reject: false, timeoutMs: 5e3 });
+    if (located.exitCode !== 0) return [];
+    return located.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+  }
+  const all = await run("which", ["-a", "node"], { reject: false, timeoutMs: 5e3 });
+  if (all.exitCode === 0 && all.stdout.trim()) {
+    return all.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+  }
+  const single = await run("which", ["node"], { reject: false, timeoutMs: 5e3 });
+  if (single.exitCode !== 0 || !single.stdout.trim()) return [];
+  return [single.stdout.trim()];
+}
+async function probeNodeVersion(bin) {
+  const probed = await run(bin, ["-v"], { reject: false, timeoutMs: 4e3 });
+  if (probed.exitCode !== 0) return null;
+  const version = probed.stdout.trim().split(/\r?\n/).find(Boolean);
+  return version || null;
+}
+async function findSystemNode() {
+  const fromPath = await whichAllNode();
+  const bins = uniqueExistingNodeBins([...fromPath, ...defaultNodeBinCandidates()]);
+  if (bins.length === 0) return null;
+  const probed = await Promise.all(
+    bins.map(async (path) => {
+      const version = await probeNodeVersion(path);
+      return version ? { path, version } : null;
+    })
+  );
+  return pickPreferredNode(probed.filter((c) => c != null));
 }
 function applyNodeLaunch(launch, args) {
   const readableArgs = args.map(nodeReadableScriptPath);
@@ -689,9 +870,13 @@ function applyNodeLaunch(launch, args) {
 async function resolveNodeLaunch(scriptPath) {
   const script = nodeReadableScriptPath(scriptPath);
   if (!isAsarPath(script)) {
-    const nodeBin = await findSystemNode();
-    if (nodeBin) {
-      return { file: nodeBin, env: {} };
+    const bundled = packagedBundledNodePath();
+    if (bundled && !isElectronLikeCommand(bundled)) {
+      return { file: bundled, env: {} };
+    }
+    const node = await findSystemNode();
+    if (node) {
+      return { file: node.path, env: {}, nodeVersion: node.version };
     }
   }
   return {
@@ -700,42 +885,6 @@ async function resolveNodeLaunch(scriptPath) {
   };
 }
 
-// src/agents/packaged-runtime.ts
-import { existsSync as existsSync3 } from "fs";
-import { join as join2 } from "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 = join2(resources, "cursor-runtime");
-  if (!existsSync3(join2(dir, "core-dist", "agents", "cursor-runner.js"))) return null;
-  return dir;
-}
-function packagedCursorRunnerPath() {
-  const dir = packagedCursorRuntimeDir();
-  return dir ? join2(dir, "core-dist", "agents", "cursor-runner.js") : null;
-}
-function packagedMcpDir() {
-  const resources = electronResourcesPath();
-  if (!resources) return null;
-  const dir = join2(resources, "sideboard-mcp");
-  if (!existsSync3(join2(dir, "core-dist", "mcp", "run-stdio.js"))) return null;
-  return dir;
-}
-function packagedMcpStdioPath() {
-  const dir = packagedMcpDir();
-  return dir ? join2(dir, "core-dist", "mcp", "run-stdio.js") : null;
-}
-function packagedCursorRipgrepCandidate(platformPkg, binName) {
-  const dir = packagedCursorRuntimeDir();
-  if (!dir) return null;
-  return join2(dir, "node_modules", platformPkg, "bin", binName);
-}
-
 // src/agents/injected-mcp.ts
 var SIDEBOARD_MCP_ALLOWED_TOOLS = [
   "mcp__sideboard",
@@ -1208,7 +1357,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-WMF3BJP5.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-KJQS5S2C.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -2841,9 +2990,10 @@ export {
   pushTurnStderr,
   summarizeTurnStderr,
   looksLikeInvalidAgentSession,
+  shouldRetryFailedAgentTurn,
   looksLikeAgentFailureMessage,
   fallbackTurnFailDetail,
-  humanizeAgentFailDetail,
+  turnFailChatText,
   formatTurnExitError,
   applyTurnUsage,
   encodeBrightsyTarget,

package/dist/{chunk-OANJQTVG.js → chunk-ND6AO7C5.js}

@@ -2,14 +2,14 @@
 
 import {
   isGlobalRepoPath
-} from "./chunk-HI2OTFFR.js";
+} from "./chunk-OW34MVDN.js";
 import {
   ensureGhPreferOrigin,
   resolveRepoRoot
-} from "./chunk-R7BQBSDT.js";
+} from "./chunk-WA3DVVWG.js";
 import {
   appDataDir
-} from "./chunk-JL4SJ6V7.js";
+} from "./chunk-BD2ICC4D.js";
 
 // src/store/workspaces.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";

package/dist/{chunk-HI2OTFFR.js → chunk-OW34MVDN.js}

@@ -2,25 +2,25 @@
 
 import {
   ensureGlobalCoordinatorCwd
-} from "./chunk-XH2GS2LO.js";
+} from "./chunk-YJADJH5U.js";
 import {
   allocateTeamName,
   takenSlugsFromThread,
   teamSlugFromName
-} from "./chunk-R7BQBSDT.js";
+} from "./chunk-WA3DVVWG.js";
 import {
   createEmptyThread,
   listThreads,
   updateThread,
   writeThread
-} from "./chunk-JOF3XIEM.js";
+} from "./chunk-P3BQ5DOL.js";
 import {
   resolveNewThreadOptions,
   resolveThreadDefaults
-} from "./chunk-6LFV4VFI.js";
+} from "./chunk-WSYCND2U.js";
 import {
   globalAgentCwd
-} from "./chunk-JL4SJ6V7.js";
+} from "./chunk-BD2ICC4D.js";
 
 // src/brightsy/cloud-connect-constants.ts
 var CLOUD_ORCHESTRATOR_GOAL = "Cloud-connected Sideboard orchestrator";

package/dist/{chunk-JOF3XIEM.js → chunk-P3BQ5DOL.js}

@@ -7,7 +7,7 @@ import {
   threadFilePath,
   threadLockPath,
   threadsDir
-} from "./chunk-JL4SJ6V7.js";
+} from "./chunk-BD2ICC4D.js";
 
 // src/store/thread-store.ts
 import { randomUUID } from "crypto";
@@ -119,8 +119,11 @@ function writeThread(thread) {
 function idPath(id) {
   return id;
 }
+function isThreadRecordFile(name) {
+  return name.endsWith(".json") && !name.endsWith(".live.json");
+}
 function listThreads(opts) {
-  const files = readdirSync(threadsDir()).filter((f) => f.endsWith(".json"));
+  const files = readdirSync(threadsDir()).filter(isThreadRecordFile);
   const threads = files.map((f) => {
     try {
       return normalizeThread(
@@ -129,7 +132,9 @@ function listThreads(opts) {
     } catch {
       return null;
     }
-  }).filter((t) => t !== null).sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
+  }).filter(
+    (t) => t !== null && typeof t.id === "string" && t.id.length > 0
+  ).sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
   if (opts?.includeArchived) return threads;
   return threads.filter((t) => t.status !== "archived");
 }
@@ -161,7 +166,9 @@ function setStatus(id, status, lastError) {
 }
 function findThreadByRef(ref) {
   const all = listThreads({ includeArchived: true });
-  return all.find((t) => t.id === ref || t.id.startsWith(ref) || t.branchName === ref || t.title === ref) ?? null;
+  return all.find(
+    (t) => t.id === ref || t.id.startsWith(ref) || t.branchName === ref || t.title === ref
+  ) ?? null;
 }
 
 export {

package/dist/{chunk-B4R2VB2A.js → chunk-QZQEXME2.js}

@@ -400,6 +400,9 @@ function worktreesRoot(repoPath) {
 function threadFilePath(id) {
   return join4(threadsDir(), `${id}.json`);
 }
+function threadLivePath(id) {
+  return join4(threadsDir(), `${id}.live.json`);
+}
 function threadLockPath(id) {
   return join4(locksDir(), `${id}.lock`);
 }
@@ -433,6 +436,7 @@ export {
   repoSlug,
   worktreesRoot,
   threadFilePath,
+  threadLivePath,
   threadLockPath,
   globalAgentCwd
 };

package/dist/{chunk-R7BQBSDT.js → chunk-WA3DVVWG.js}

@@ -5,14 +5,14 @@ import {
 } from "./chunk-B3SJXYIJ.js";
 import {
   listThreads
-} from "./chunk-JOF3XIEM.js";
+} from "./chunk-P3BQ5DOL.js";
 import {
   getGithubGitAuthMode,
   getGithubPat
-} from "./chunk-6LFV4VFI.js";
+} from "./chunk-WSYCND2U.js";
 import {
   worktreesRoot
-} from "./chunk-JL4SJ6V7.js";
+} from "./chunk-BD2ICC4D.js";
 import {
   gh,
   git,
@@ -787,7 +787,7 @@ function allocateTeamName(taken, random = Math.random) {
 
 // src/git/worktree-labels.ts
 function normalizeWorktreePath(worktreePath) {
-  const trimmed = worktreePath.replace(/\/+$/, "") || "/";
+  const trimmed = (worktreePath ?? "").replace(/\/+$/, "") || "/";
   const absolute = trimmed.startsWith("/");
   const parts = trimmed.split("/").filter((p) => p && p !== ".");
   const out = [];
@@ -1154,6 +1154,30 @@ function formatGitAuthModeDirective(mode) {
   }
 }
 
+// src/util/enqueue-by-key.ts
+var tails = /* @__PURE__ */ new Map();
+function enqueueByKey(key, fn) {
+  const prev = tails.get(key) ?? Promise.resolve();
+  const next = prev.then(fn, fn);
+  tails.set(
+    key,
+    next.then(
+      () => void 0,
+      () => void 0
+    )
+  );
+  return next;
+}
+
+// src/git/repo-git-lock.ts
+function repoLockKey(repoPath) {
+  const trimmed = repoPath.replace(/\/+$/, "");
+  return `git-worktree:${trimmed || "/"}`;
+}
+function withRepoGitLock(repoPath, fn) {
+  return enqueueByKey(repoLockKey(repoPath), fn);
+}
+
 // src/git/pr-gates.ts
 function prIsInMergeQueue(gate) {
   if (gate.isInMergeQueue) return true;
@@ -2223,12 +2247,13 @@ async function createThreadWorktree(opts) {
       `Invalid git reference: ${opts.sourceRef} (and fetch did not resolve it)`
     );
   }
-  const add = await git(
-    ["worktree", "add", "-b", branchName, worktreePath, startPoint],
-    opts.repoPath,
-    { reject: false, timeoutMs: 6e4 }
-  );
-  if (add.exitCode !== 0) {
+  const added = await withRepoGitLock(opts.repoPath, async () => {
+    const add = await git(
+      ["worktree", "add", "-b", branchName, worktreePath, startPoint],
+      opts.repoPath,
+      { reject: false, timeoutMs: 6e4 }
+    );
+    if (add.exitCode === 0) return branchName;
     const err = `${add.stderr}
 ${add.stdout}`;
     if (/already used by worktree|already exists|checked out/i.test(err)) {
@@ -2239,17 +2264,14 @@ ${add.stdout}`;
           opts.repoPath,
           { reject: false, timeoutMs: 6e4 }
         );
-        if (retry.exitCode === 0) {
-          branchName = alt;
-          await ensureGhPreferOrigin(worktreePath);
-          return { branchName, worktreePath };
-        }
+        if (retry.exitCode === 0) return alt;
       }
     }
     throw new Error(
       `Failed to create worktree: ${add.stderr.trim() || add.stdout.trim() || `exit ${add.exitCode}`}`
     );
-  }
+  });
+  branchName = added;
   await ensureGhPreferOrigin(worktreePath);
   return { branchName, worktreePath };
 }
@@ -2273,12 +2295,13 @@ async function createExistingBranchWorktree(opts) {
     );
   }
   const startPoint = await resolveWorktreeStartPoint(opts.repoPath, branchName);
-  const add = await git(
-    ["worktree", "add", worktreePath, startPoint],
-    opts.repoPath,
-    { reject: false }
-  );
-  if (add.exitCode !== 0) {
+  await withRepoGitLock(opts.repoPath, async () => {
+    const add = await git(
+      ["worktree", "add", worktreePath, startPoint],
+      opts.repoPath,
+      { reject: false }
+    );
+    if (add.exitCode === 0) return;
     const retry = await git(
       ["worktree", "add", worktreePath, branchName],
       opts.repoPath,
@@ -2289,7 +2312,7 @@ async function createExistingBranchWorktree(opts) {
         `Failed to create worktree for ${branchName}: ${retry.stderr.trim() || add.stderr.trim() || retry.stdout.trim() || add.stdout.trim() || `exit ${add.exitCode}`}`
       );
     }
-  }
+  });
   const head = await git(["rev-parse", "--abbrev-ref", "HEAD"], worktreePath, {
     reject: false
   });
@@ -2300,12 +2323,14 @@ async function createExistingBranchWorktree(opts) {
   return { branchName, worktreePath };
 }
 async function removeWorktree(repoPath, worktreePath, opts) {
-  await git(["worktree", "remove", "--force", worktreePath], repoPath, {
-    reject: false
+  await withRepoGitLock(repoPath, async () => {
+    await git(["worktree", "remove", "--force", worktreePath], repoPath, {
+      reject: false
+    });
+    if (opts?.deleteBranch) {
+      await git(["branch", "-D", opts.deleteBranch], repoPath, { reject: false });
+    }
   });
-  if (opts?.deleteBranch) {
-    await git(["branch", "-D", opts.deleteBranch], repoPath, { reject: false });
-  }
 }
 async function listWorktrees(repoPath) {
   const { stdout } = await git(
@@ -2606,6 +2631,8 @@ export {
   resolveCodexGitWritableRoots,
   codexUnattendedGitConfigArgs,
   formatGitAuthModeDirective,
+  enqueueByKey,
+  withRepoGitLock,
   detectGhStack,
   getPrStack,
   initPrStack,

package/dist/{chunk-6LFV4VFI.js → chunk-WSYCND2U.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-KGZBYWZ3.js";
 import {
   appDataDir
-} from "./chunk-JL4SJ6V7.js";
+} from "./chunk-BD2ICC4D.js";
 
 // src/store/app-settings.ts
 import { randomUUID } from "crypto";

package/dist/{chunk-FT2SQOL4.js → chunk-XHZJJWLI.js}

@@ -10,7 +10,7 @@ import {
 } from "./chunk-77WWLBCI.js";
 import {
   appDataDir
-} from "./chunk-B4R2VB2A.js";
+} from "./chunk-QZQEXME2.js";
 
 // src/store/app-settings.ts
 import { randomUUID } from "crypto";