@knowsuchagency/fulcrum 5.9.4 → 5.9.5

package/bin/fulcrum.js

@@ -46869,7 +46869,7 @@ async function runMcpServer(urlOverride, portOverride) {
   const client = new FulcrumClient(urlOverride, portOverride);
   const server = new McpServer({
     name: "fulcrum",
-    version: "5.9.4"
+    version: "5.9.5"
   });
   registerTools(server, client);
   const transport = new StdioServerTransport;
@@ -49218,7 +49218,7 @@ var marketplace_default = `{
       "name": "fulcrum",
       "source": "./",
       "description": "Task orchestration for Claude Code",
-      "version": "5.9.4",
+      "version": "5.9.5",
       "skills": [
         "./skills/fulcrum"
       ],
@@ -49241,7 +49241,7 @@ var marketplace_default = `{
 var plugin_default = `{
   "name": "fulcrum",
   "description": "Fulcrum task orchestration for Claude Code",
-  "version": "5.9.4",
+  "version": "5.9.5",
   "author": {
     "name": "Fulcrum"
   },
@@ -50258,7 +50258,7 @@ function compareVersions(v1, v2) {
 var package_default = {
   name: "@knowsuchagency/fulcrum",
   private: true,
-  version: "5.9.4",
+  version: "5.9.5",
   description: "Harness Attention. Orchestrate Agents. Ship.",
   license: "PolyForm-Perimeter-1.0.0",
   type: "module",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knowsuchagency/fulcrum",
-  "version": "5.9.4",
+  "version": "5.9.5",
   "description": "Harness Attention. Orchestrate Agents. Ship.",
   "license": "PolyForm-Perimeter-1.0.0",
   "repository": {

package/server/index.js

@@ -1172278,6 +1172278,7 @@ var init_esm6 = __esm(() => {
 // server/lib/git-utils.ts
 var exports_git_utils = {};
 __export(exports_git_utils, {
+  resolveLocalBranch: () => resolveLocalBranch,
   isGitUrl: () => isGitUrl,
   gitPull: () => gitPull,
   fetchIfRemoteRef: () => fetchIfRemoteRef,
@@ -1172308,14 +1172309,14 @@ function extractRepoNameFromUrl(url) {
   }
   return cleaned;
 }
-function fetchIfRemoteRef(repoPath, baseBranch) {
+function parseRemoteRef(repoPath, baseBranch) {
   const slashIndex = baseBranch.indexOf("/");
   if (slashIndex <= 0)
-    return;
+    return null;
   const remoteName = baseBranch.slice(0, slashIndex);
   const branchName = baseBranch.slice(slashIndex + 1);
   if (!branchName)
-    return;
+    return null;
   try {
     const remotes = execSync4("git remote", {
       cwd: repoPath,
@@ -1172324,18 +1172325,76 @@ function fetchIfRemoteRef(repoPath, baseBranch) {
     }).trim().split(`
 `).map((r6) => r6.trim()).filter(Boolean);
     if (!remotes.includes(remoteName))
-      return;
+      return null;
   } catch {
-    return;
+    return null;
   }
+  return { remoteName, branchName };
+}
+function fetchIfRemoteRef(repoPath, baseBranch) {
+  const parsed = parseRemoteRef(repoPath, baseBranch);
+  if (!parsed)
+    return;
   try {
-    execSync4(`git fetch ${remoteName} ${branchName}`, {
+    execSync4(`git fetch ${parsed.remoteName} ${parsed.branchName}`, {
       cwd: repoPath,
       encoding: "utf-8",
       timeout: 30000
     });
   } catch {}
 }
+function resolveLocalBranch(repoPath, baseBranch) {
+  const parsed = parseRemoteRef(repoPath, baseBranch);
+  if (!parsed) {
+    return baseBranch;
+  }
+  const { remoteName, branchName } = parsed;
+  fetchIfRemoteRef(repoPath, baseBranch);
+  let currentBranch = "";
+  try {
+    currentBranch = execSync4("git rev-parse --abbrev-ref HEAD", {
+      cwd: repoPath,
+      encoding: "utf-8",
+      timeout: 1e4
+    }).trim();
+  } catch {}
+  let localExists = false;
+  try {
+    execSync4(`git rev-parse --verify ${branchName}`, {
+      cwd: repoPath,
+      encoding: "utf-8",
+      timeout: 1e4,
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    localExists = true;
+  } catch {
+    localExists = false;
+  }
+  if (localExists) {
+    if (currentBranch !== branchName) {
+      try {
+        execSync4(`git fetch ${remoteName} ${branchName}:${branchName}`, {
+          cwd: repoPath,
+          encoding: "utf-8",
+          timeout: 30000,
+          stdio: ["pipe", "pipe", "pipe"]
+        });
+      } catch {}
+    }
+    return branchName;
+  }
+  try {
+    execSync4(`git branch ${branchName} ${baseBranch}`, {
+      cwd: repoPath,
+      encoding: "utf-8",
+      timeout: 1e4,
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    return branchName;
+  } catch {
+    return null;
+  }
+}
 function gitPull(repoPath) {
   try {
     execSync4("git pull", {
@@ -1227502,7 +1227561,13 @@ app3.post("/merge-to-main", async (c2) => {
     if (dirtyCheck) {
       return c2.json(dirtyCheck, 409);
     }
-    const defaultBranch = getDefaultBranch(repoPath, baseBranch);
+    const rawDefaultBranch = getDefaultBranch(repoPath, baseBranch);
+    const defaultBranch = resolveLocalBranch(repoPath, rawDefaultBranch);
+    if (!defaultBranch) {
+      return c2.json({
+        error: `Could not resolve ${rawDefaultBranch} to a local branch. Create or check out a local branch tracking ${rawDefaultBranch} and try again.`
+      }, 400);
+    }
     let originalBranch;
     try {
       originalBranch = gitExec(repoPath, "rev-parse --abbrev-ref HEAD");
@@ -1227595,7 +1227660,13 @@ app3.post("/sync-parent", async (c2) => {
     if (!fs12.existsSync(repoPath)) {
       return c2.json({ error: "Repository path does not exist" }, 404);
     }
-    const defaultBranch = getDefaultBranch(repoPath, baseBranch);
+    const rawDefaultBranch = getDefaultBranch(repoPath, baseBranch);
+    const defaultBranch = resolveLocalBranch(repoPath, rawDefaultBranch);
+    if (!defaultBranch) {
+      return c2.json({
+        error: `Could not resolve ${rawDefaultBranch} to a local branch. Create or check out a local branch tracking ${rawDefaultBranch} and try again.`
+      }, 400);
+    }
     let originalBranch;
     try {
       originalBranch = gitExec(repoPath, "rev-parse --abbrev-ref HEAD");
@@ -1272924,7 +1272995,7 @@ mcpRoutes.all("/", async (c2) => {
   });
   const server2 = new McpServer({
     name: "fulcrum",
-    version: "5.9.4"
+    version: "5.9.5"
   });
   const client3 = new FulcrumClient(`http://localhost:${port}`);
   registerTools(server2, client3);