@callumvass/forgeflow-dev 0.4.1 → 0.4.3

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,14 +755,11 @@ ${flags.customPrompt}` : "";
     };
   }
   if (resolved.branch) {
-    const branchExists = await exec(
-      `git rev-parse --verify ${resolved.branch} 2>/dev/null && echo yes || echo no`,
-      cwd
-    );
-    if (branchExists === "yes") {
-      await ensureBranch(cwd, resolved.branch);
+    const localExists = await exec(`git rev-parse --verify ${resolved.branch} 2>/dev/null && echo yes || echo no`, cwd);
+    if (localExists === "yes") {
       const ahead = await exec(`git rev-list main..${resolved.branch} --count`, cwd);
       if (parseInt(ahead, 10) > 0) {
+        await ensureBranch(cwd, resolved.branch);
         await exec(`git push -u origin ${resolved.branch}`, cwd);
         const prBody = buildPrBody(cwd, resolved);
         await createPr(cwd, resolved.title, prBody, resolved.branch);
@@ -767,6 +770,37 @@ ${flags.customPrompt}` : "";
           details: { pipeline: "implement", stages: stages2 }
         };
       }
+      await exec(`git branch -D ${resolved.branch}`, cwd);
+    }
+    const currentBranch = await exec("git branch --show-current", cwd);
+    if (currentBranch === "main" || currentBranch === "master") {
+      const dirty = await exec("git status --porcelain", cwd);
+      if (dirty) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: `Cannot switch to ${resolved.branch} \u2014 working tree is dirty. Please commit or stash your changes first.`
+            }
+          ],
+          details: { pipeline: "implement", stages: [] },
+          isError: true
+        };
+      }
+    }
+    await ensureBranch(cwd, resolved.branch);
+    const afterBranch = await exec("git branch --show-current", cwd);
+    if (afterBranch !== resolved.branch) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Failed to switch to ${resolved.branch} (still on ${afterBranch}). Check git state and retry.`
+          }
+        ],
+        details: { pipeline: "implement", stages: [] },
+        isError: true
+      };
     }
   }
   const stageList = [];
@@ -807,38 +841,6 @@ ${issueContext}${customPromptSection}`,
       }
     }
   }
-  if (resolved.branch) {
-    const currentBranch = await exec("git branch --show-current", cwd);
-    if (currentBranch === "main" || currentBranch === "master") {
-      const dirty = await exec("git status --porcelain", cwd);
-      if (dirty) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: `Cannot switch to ${resolved.branch} \u2014 working tree is dirty. Please commit or stash your changes first.`
-            }
-          ],
-          details: { pipeline: "implement", stages: [] },
-          isError: true
-        };
-      }
-      await ensureBranch(cwd, resolved.branch);
-      const afterBranch = await exec("git branch --show-current", cwd);
-      if (afterBranch !== resolved.branch) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: `Failed to switch to ${resolved.branch} (still on ${afterBranch}). Check git state and retry.`
-            }
-          ],
-          details: { pipeline: "implement", stages: [] },
-          isError: true
-        };
-      }
-    }
-  }
   cleanSignal(cwd, "blocked");
   const planSection = plan ? `
 

package/package.json

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