@sideboard-ai/core 0.1.291 → 0.1.293

package/dist/{chunk-QOUTSISS.js → chunk-LSHGJI4S.js}

@@ -14,7 +14,7 @@ import {
   parseSessionQuotaResetAt,
   planModeTurnInstruction,
   resolveQuotaFallbackAgent
-} from "./chunk-VNCPRMIK.js";
+} from "./chunk-XZW3BXZW.js";
 import {
   REVIEW_TAB_TITLE,
   applyWorktreePkgCacheEnv,
@@ -53,7 +53,7 @@ import {
   worktreeDevProcessKey,
   worktreeRunProcessKey,
   worktreeSetupProcessKey
-} from "./chunk-GBAACE3C.js";
+} from "./chunk-4YXXLWDI.js";
 import {
   applyAgentEvent,
   clipAgentEventForPaint,
@@ -100,7 +100,7 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-V3BSO2O6.js";
+} from "./chunk-ZRQWV3MS.js";
 import {
   addPrStackLayer,
   allocateTeamSlug,
@@ -142,7 +142,7 @@ import {
   resolveRepoRoot,
   switchWorktreeBranch,
   withRepoGitLock
-} from "./chunk-2IXKTAIT.js";
+} from "./chunk-2VGLZIU6.js";
 import {
   agentNicknameFromWorktreePath,
   appendMessage,
@@ -451,9 +451,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-YKOYXSB2.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-UGR6FQXI.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-5Q66Y5KW.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-NAM5JHLT.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -2740,7 +2740,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-4BBCKITL.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-SITR5V6F.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -3251,7 +3251,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { addWorkspace: addWorkspace2 } = await import("./workspaces-RFD6I4FM.js");
+  const { addWorkspace: addWorkspace2 } = await import("./workspaces-YNZXVBSF.js");
   await addWorkspace2(repoPath);
   const { ensureWorktreeSideboardIgnored } = await import("./worktree-exclude-RXZPTCNH.js");
   await ensureWorktreeSideboardIgnored(input.worktreePath);
@@ -6170,7 +6170,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-GSOW3RPA.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-BOGVTCWI.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -9042,7 +9042,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-TN7DZDJZ.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-ERRH4TAG.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({

package/dist/{chunk-O4324MXE.js → chunk-PO3PDNMV.js}

@@ -5,7 +5,7 @@ import {
   ensureGhPreferOrigin,
   resolveGithubRepoSlug,
   resolveRepoRoot
-} from "./chunk-5HPMKLJ7.js";
+} from "./chunk-UO5C2L2G.js";
 import {
   ATTACHMENTS_DIR,
   attachmentsGitignoreBody

package/dist/{chunk-LUQ7MIVD.js → chunk-RPCKGO3J.js}

@@ -24,13 +24,13 @@ import {
 } from "./chunk-AFLNFGGB.js";
 import {
   isOrchestratorThread
-} from "./chunk-O4324MXE.js";
+} from "./chunk-PO3PDNMV.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv,
   resolveCodexGitWritableRoots
-} from "./chunk-5HPMKLJ7.js";
+} from "./chunk-UO5C2L2G.js";
 import {
   npmGlobalNodeModules,
   run
@@ -2015,7 +2015,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-BTH2YGDZ.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-CTFQDG7G.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const rpc = worktreeAgentRpc(isOrchestrator);
     const injectedServers = await buildInjectedMcpServers({

package/dist/{chunk-5HPMKLJ7.js → chunk-UO5C2L2G.js}

@@ -1984,15 +1984,8 @@ async function fetchOriginForWorktree(repoPath, sourceRef, opts) {
 async function fastForwardMainCheckoutIfSafe(repoPath, opts) {
   try {
     const branch = opts?.branch?.trim() || await resolveDefaultBranch(repoPath, { network: false });
-    const head = await git(["rev-parse", "--abbrev-ref", "HEAD"], repoPath, {
-      reject: false
-    });
-    const current = head.stdout.trim();
-    if (head.exitCode !== 0 || !current || current === "HEAD" || current !== branch) {
-      return { updated: false, reason: "not-on-default" };
-    }
-    if (await isDirty(repoPath)) {
-      return { updated: false, reason: "dirty" };
+    if (!branch || branch === "HEAD" || branch.includes("..")) {
+      return { updated: false, reason: "ff-failed" };
     }
     const remote = `origin/${branch}`;
     const remoteOk = await git(["rev-parse", "--verify", remote], repoPath, {
@@ -2001,8 +1994,27 @@ async function fastForwardMainCheckoutIfSafe(repoPath, opts) {
     if (remoteOk.exitCode !== 0) {
       return { updated: false, reason: "no-origin-tip" };
     }
+    const worktrees = await listWorktrees(repoPath);
+    if (worktrees.length === 0) {
+      return { updated: false, reason: "ff-failed" };
+    }
+    const checkout = worktrees.find((entry) => entry.branch === branch) ?? null;
+    const localRef = `refs/heads/${branch}`;
+    const localOk = await git(["rev-parse", "--verify", localRef], repoPath, {
+      reject: false
+    });
+    if (localOk.exitCode !== 0) {
+      if (checkout) return { updated: false, reason: "ff-failed" };
+      const created = await git(["branch", "--track", branch, remote], repoPath, {
+        reject: false
+      });
+      if (created.exitCode !== 0) {
+        return { updated: false, reason: "ff-failed" };
+      }
+      return { updated: true, reason: "updated" };
+    }
     const ancestor = await git(
-      ["merge-base", "--is-ancestor", "HEAD", remote],
+      ["merge-base", "--is-ancestor", localRef, remote],
       repoPath,
       { reject: false }
     );
@@ -2010,7 +2022,7 @@ async function fastForwardMainCheckoutIfSafe(repoPath, opts) {
       return { updated: false, reason: "diverged" };
     }
     const behind = await git(
-      ["rev-list", "--count", `HEAD..${remote}`],
+      ["rev-list", "--count", `${localRef}..${remote}`],
       repoPath,
       { reject: false }
     );
@@ -2018,10 +2030,22 @@ async function fastForwardMainCheckoutIfSafe(repoPath, opts) {
     if (behind.exitCode !== 0 || !Number.isFinite(n) || n <= 0) {
       return { updated: false, reason: "already-current" };
     }
-    const ff = await git(["merge", "--ff-only", remote], repoPath, {
+    if (checkout) {
+      if (await isDirty(checkout.path)) {
+        return { updated: false, reason: "dirty" };
+      }
+      const ff = await git(["merge", "--ff-only", remote], checkout.path, {
+        reject: false
+      });
+      if (ff.exitCode !== 0) {
+        return { updated: false, reason: "ff-failed" };
+      }
+      return { updated: true, reason: "updated" };
+    }
+    const moved = await git(["branch", "-f", branch, remote], repoPath, {
       reject: false
     });
-    if (ff.exitCode !== 0) {
+    if (moved.exitCode !== 0) {
       return { updated: false, reason: "ff-failed" };
     }
     return { updated: true, reason: "updated" };

package/dist/{chunk-G74TSBJ3.js → chunk-WRDKJRWF.js}

@@ -11,11 +11,11 @@ import {
   isGlobalThread,
   isOrchestratorThread,
   isSlackCoordinatorThread
-} from "./chunk-O4324MXE.js";
+} from "./chunk-PO3PDNMV.js";
 import {
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv
-} from "./chunk-5HPMKLJ7.js";
+} from "./chunk-UO5C2L2G.js";
 import {
   ATTACHMENTS_DIR,
   DETACHED_JOBS_DIR,
@@ -1674,7 +1674,7 @@ var PORT_RANGE_SIZE = 10;
 var RECLAIM_RETRY_DELAY_MS = 40;
 var RECLAIM_TRIES = 8;
 async function killReclaimable(ports, worktreePath, signal) {
-  const { killListenersOnPorts: killListenersOnPorts2, killStaleWorktreeListeners: killStaleWorktreeListeners2 } = await import("./conductor-5MNGC25D.js");
+  const { killListenersOnPorts: killListenersOnPorts2, killStaleWorktreeListeners: killStaleWorktreeListeners2 } = await import("./conductor-P7XPGYF4.js");
   if (worktreePath) killStaleWorktreeListeners2(ports, worktreePath, signal);
   else killListenersOnPorts2(ports);
 }

package/dist/{chunk-VNCPRMIK.js → chunk-XZW3BXZW.js}

@@ -12,13 +12,13 @@ import {
 } from "./chunk-YSLCWCMJ.js";
 import {
   isOrchestratorThread
-} from "./chunk-V3BSO2O6.js";
+} from "./chunk-ZRQWV3MS.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv,
   resolveCodexGitWritableRoots
-} from "./chunk-2IXKTAIT.js";
+} from "./chunk-2VGLZIU6.js";
 import {
   loadBrightsyConfig
 } from "./chunk-33KDPEK4.js";
@@ -1752,7 +1752,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-YKOYXSB2.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-UGR6FQXI.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const rpc = worktreeAgentRpc(isOrchestrator);
     const injectedServers = await buildInjectedMcpServers({

package/dist/{chunk-V3BSO2O6.js → chunk-ZRQWV3MS.js}

@@ -3,7 +3,7 @@ import {
   ensureGhPreferOrigin,
   resolveGithubRepoSlug,
   resolveRepoRoot
-} from "./chunk-2IXKTAIT.js";
+} from "./chunk-2VGLZIU6.js";
 import {
   allocateTeamName,
   createEmptyThread,

package/dist/{conductor-UFJXJPTF.js → conductor-MAYZSFL6.js}

@@ -31,10 +31,10 @@ import {
   tryReservePort,
   tryReservePorts,
   worktreeRunPortsPath
-} from "./chunk-GBAACE3C.js";
+} from "./chunk-4YXXLWDI.js";
 import "./chunk-YSLCWCMJ.js";
-import "./chunk-V3BSO2O6.js";
-import "./chunk-2IXKTAIT.js";
+import "./chunk-ZRQWV3MS.js";
+import "./chunk-2VGLZIU6.js";
 import "./chunk-QB5MDOHL.js";
 import "./chunk-2P4XKWV2.js";
 import "./chunk-MIVX7QKI.js";

package/dist/{conductor-5MNGC25D.js → conductor-P7XPGYF4.js}

@@ -33,10 +33,10 @@ import {
   tryReservePort,
   tryReservePorts,
   worktreeRunPortsPath
-} from "./chunk-G74TSBJ3.js";
+} from "./chunk-WRDKJRWF.js";
 import "./chunk-AFLNFGGB.js";
-import "./chunk-O4324MXE.js";
-import "./chunk-5HPMKLJ7.js";
+import "./chunk-PO3PDNMV.js";
+import "./chunk-UO5C2L2G.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-DD67JWTN.js";
 import "./chunk-2UG25RMK.js";

package/dist/{coordinator-prompt-5Q66Y5KW.js → coordinator-prompt-NAM5JHLT.js}

@@ -7,8 +7,8 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-V3BSO2O6.js";
-import "./chunk-2IXKTAIT.js";
+} from "./chunk-ZRQWV3MS.js";
+import "./chunk-2VGLZIU6.js";
 import "./chunk-QB5MDOHL.js";
 import "./chunk-2P4XKWV2.js";
 import "./chunk-6K64FJDD.js";

package/dist/{coordinator-prompt-BYPEW6DE.js → coordinator-prompt-OZFKNCM3.js}

@@ -9,8 +9,8 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-O4324MXE.js";
-import "./chunk-5HPMKLJ7.js";
+} from "./chunk-PO3PDNMV.js";
+import "./chunk-UO5C2L2G.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-DD67JWTN.js";
 import "./chunk-2UG25RMK.js";

package/dist/{global-workspace-BTH2YGDZ.js → global-workspace-CTFQDG7G.js}

@@ -20,8 +20,8 @@ import {
   remoteCoordinatorSourceRef,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-O4324MXE.js";
-import "./chunk-5HPMKLJ7.js";
+} from "./chunk-PO3PDNMV.js";
+import "./chunk-UO5C2L2G.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-DD67JWTN.js";
 import "./chunk-2UG25RMK.js";

package/dist/{global-workspace-YKOYXSB2.js → global-workspace-UGR6FQXI.js}

@@ -18,8 +18,8 @@ import {
   remoteCoordinatorSourceRef,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-V3BSO2O6.js";
-import "./chunk-2IXKTAIT.js";
+} from "./chunk-ZRQWV3MS.js";
+import "./chunk-2VGLZIU6.js";
 import "./chunk-QB5MDOHL.js";
 import "./chunk-2P4XKWV2.js";
 import "./chunk-6K64FJDD.js";