@callumvass/forgeflow-dev 0.4.1 → 0.4.2

package/extensions/index.js

@@ -422,9 +422,15 @@ var JIRA_BRANCH_RE = /feat\/([A-Z]+-\d+)/;
 async function ensureBranch(cwd, branch) {
   const currentBranch = await exec("git branch --show-current", cwd);
   if (currentBranch === branch) return;
-  const exists = await exec(`git rev-parse --verify ${branch} 2>/dev/null && echo yes || echo no`, cwd);
-  if (exists === "yes") {
+  const localExists = await exec(`git rev-parse --verify ${branch} 2>/dev/null && echo yes || echo no`, cwd);
+  if (localExists === "yes") {
     await exec(`git checkout ${branch}`, cwd);
+    return;
+  }
+  await exec("git fetch origin", cwd);
+  const remoteExists = await exec(`git rev-parse --verify origin/${branch} 2>/dev/null && echo yes || echo no`, cwd);
+  if (remoteExists === "yes") {
+    await exec(`git checkout -b ${branch} origin/${branch}`, cwd);
   } else {
     await exec(`git checkout -b ${branch}`, cwd);
   }
@@ -749,11 +755,12 @@ ${flags.customPrompt}` : "";
     };
   }
   if (resolved.branch) {
-    const branchExists = await exec(
-      `git rev-parse --verify ${resolved.branch} 2>/dev/null && echo yes || echo no`,
+    const localExists = await exec(`git rev-parse --verify ${resolved.branch} 2>/dev/null && echo yes || echo no`, cwd);
+    const remoteExists = localExists === "yes" ? "no" : await exec(
+      `git fetch origin && git rev-parse --verify origin/${resolved.branch} 2>/dev/null && echo yes || echo no`,
       cwd
     );
-    if (branchExists === "yes") {
+    if (localExists === "yes" || remoteExists === "yes") {
       await ensureBranch(cwd, resolved.branch);
       const ahead = await exec(`git rev-list main..${resolved.branch} --count`, cwd);
       if (parseInt(ahead, 10) > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@callumvass/forgeflow-dev",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "type": "module",
   "description": "Dev pipeline for Pi — TDD implementation, code review, architecture, and skill discovery.",
   "keywords": [