@sideboard-ai/core 0.1.292 → 0.1.293

package/dist/mcp/run-stdio.cjs

@@ -8577,15 +8577,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, {
@@ -8594,8 +8587,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 }
     );
@@ -8603,7 +8615,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 }
     );
@@ -8611,10 +8623,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/mcp/run-stdio.js

@@ -50,7 +50,7 @@ import {
   syncBoardPins,
   updateSchedule,
   workspaceTagTargetRef
-} from "../chunk-4VXWLY3L.js";
+} from "../chunk-IP5WSADC.js";
 import "../chunk-LX5R5JOR.js";
 import {
   commentAbleTimeTask,
@@ -93,7 +93,7 @@ import {
   sideboardMcpProfile,
   trustSystemCertificates,
   worktreeMcpToolNames
-} from "../chunk-LUQ7MIVD.js";
+} from "../chunk-RPCKGO3J.js";
 import "../chunk-W2KZTDET.js";
 import "../chunk-7IAMHN2N.js";
 import "../chunk-PXMLMBMI.js";
@@ -110,7 +110,7 @@ import {
   waitForDetachedJob,
   waitForTurnToolResult,
   workspaceAgentChatSummaries
-} from "../chunk-G74TSBJ3.js";
+} from "../chunk-WRDKJRWF.js";
 import {
   clipToolResultForStore,
   isInternalAgentStatusText,
@@ -119,7 +119,7 @@ import {
 import {
   GLOBAL_WORKSPACE_ID,
   isCloudCoordinatorThread
-} from "../chunk-O4324MXE.js";
+} from "../chunk-PO3PDNMV.js";
 import {
   canonicalizeRepoPath,
   formatGhLandError,
@@ -130,7 +130,7 @@ import {
   resolveListPrsOptions,
   resolveRepoRoot,
   warmGithubAgentAuth
-} from "../chunk-5HPMKLJ7.js";
+} from "../chunk-UO5C2L2G.js";
 import {
   CLI_DIR
 } from "../chunk-N2WW62LF.js";

package/dist/{orchestrator-EQSK2RMI.js → orchestrator-4QVF6CE2.js}

@@ -11,20 +11,20 @@ import {
   resolveSendFollowUp,
   startOrchestration,
   waitForPidExit
-} from "./chunk-4VXWLY3L.js";
+} from "./chunk-IP5WSADC.js";
 import "./chunk-LX5R5JOR.js";
 import "./chunk-4BXRRHDC.js";
 import "./chunk-4GK32AYX.js";
 import "./chunk-5DZUWGKV.js";
-import "./chunk-LUQ7MIVD.js";
+import "./chunk-RPCKGO3J.js";
 import "./chunk-W2KZTDET.js";
 import "./chunk-7IAMHN2N.js";
 import "./chunk-PXMLMBMI.js";
 import "./chunk-2GPQZZLY.js";
-import "./chunk-G74TSBJ3.js";
+import "./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/{orchestrator-GSOW3RPA.js → orchestrator-BOGVTCWI.js}

@@ -9,17 +9,17 @@ import {
   resolveSendFollowUp,
   startOrchestration,
   waitForPidExit
-} from "./chunk-QOUTSISS.js";
+} from "./chunk-LSHGJI4S.js";
 import "./chunk-PGPSIEMW.js";
-import "./chunk-VNCPRMIK.js";
+import "./chunk-XZW3BXZW.js";
 import "./chunk-VGNLMGBK.js";
-import "./chunk-GBAACE3C.js";
+import "./chunk-4YXXLWDI.js";
 import "./chunk-YSLCWCMJ.js";
 import "./chunk-7H655NEW.js";
 import "./chunk-AF2DMY3K.js";
 import "./chunk-NXXQFLNQ.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-33KDPEK4.js";

package/dist/{workspaces-ELO2YVTU.js → workspaces-QNKFBA63.js}

@@ -11,8 +11,8 @@ import {
   removeWorkspace,
   sameWorkspacePath,
   syncWorkspacesFromThreads
-} 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/{workspaces-RFD6I4FM.js → workspaces-YNZXVBSF.js}

@@ -9,8 +9,8 @@ import {
   removeWorkspace,
   sameWorkspacePath,
   syncWorkspacesFromThreads
-} 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/{worktree-ADVQ6X6C.js → worktree-EMCWDPZJ.js}

@@ -50,7 +50,7 @@ import {
   slugify,
   suggestSlug,
   switchWorktreeBranch
-} from "./chunk-5HPMKLJ7.js";
+} from "./chunk-UO5C2L2G.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-DD67JWTN.js";
 import "./chunk-2UG25RMK.js";

package/dist/{worktree-TN7DZDJZ.js → worktree-ERRH4TAG.js}

@@ -48,7 +48,7 @@ import {
   slugify,
   suggestSlug,
   switchWorktreeBranch
-} from "./chunk-2IXKTAIT.js";
+} from "./chunk-2VGLZIU6.js";
 import {
   FAMOUS_SOCCER_TEAMS,
   allocateTeamName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sideboard-ai/core",
-  "version": "0.1.292",
+  "version": "0.1.293",
   "description": "Sideboard core — orchestration, agents, git worktrees, MCP server",
   "license": "Apache-2.0",
   "type": "module",