@callumvass/forgeflow-dev 0.4.2 → 0.4.4

package/extensions/index.js

@@ -419,22 +419,6 @@ function slugify(text, maxLen = 40) {
 }
 var JIRA_KEY_RE = /^[A-Z]+-\d+$/;
 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 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);
-  }
-}
 async function resolveIssue(cwd, issueArg) {
   if (issueArg && JIRA_KEY_RE.test(issueArg)) {
     return resolveJiraIssue(cwd, issueArg);
@@ -755,25 +739,38 @@ ${flags.customPrompt}` : "";
     };
   }
   if (resolved.branch) {
-    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`,
+    const branch = resolved.branch;
+    const branchSetup = await exec(
+      `ahead=$(git rev-list main..${branch} --count 2>/dev/null || echo 0); if [ "$ahead" -gt 0 ] 2>/dev/null; then git checkout ${branch} && echo "RESUME:$ahead"; else git branch -D ${branch} 2>/dev/null; git branch -dr origin/${branch} 2>/dev/null; git checkout -b ${branch} && echo "FRESH"; fi`,
       cwd
     );
-    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) {
-        await exec(`git push -u origin ${resolved.branch}`, cwd);
-        const prBody = buildPrBody(cwd, resolved);
-        await createPr(cwd, resolved.title, prBody, resolved.branch);
-        const stages2 = [];
-        await refactorAndReview(cwd, signal, onUpdate, ctx, stages2, flags.skipReview);
-        return {
-          content: [{ type: "text", text: `Resumed ${issueLabel} \u2014 pushed existing commits and created PR.` }],
-          details: { pipeline: "implement", stages: stages2 }
-        };
-      }
+    if (branchSetup.startsWith("RESUME:")) {
+      await exec(`git push -u origin ${branch}`, cwd);
+      const prBody = buildPrBody(cwd, resolved);
+      await createPr(cwd, resolved.title, prBody, branch);
+      const stages2 = [];
+      await refactorAndReview(cwd, signal, onUpdate, ctx, stages2, flags.skipReview);
+      return {
+        content: [{ type: "text", text: `Resumed ${issueLabel} \u2014 pushed existing commits and created PR.` }],
+        details: { pipeline: "implement", stages: stages2 }
+      };
+    }
+    let afterBranch = await exec("git branch --show-current", cwd);
+    if (afterBranch !== branch) {
+      await exec(`git checkout ${branch} 2>/dev/null || git checkout -b ${branch}`, cwd);
+      afterBranch = await exec("git branch --show-current", cwd);
+    }
+    if (afterBranch !== branch) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Failed to switch to ${branch} (on ${afterBranch}). Setup output: ${branchSetup || "(empty)"}`
+          }
+        ],
+        details: { pipeline: "implement", stages: [] },
+        isError: true
+      };
     }
   }
   const stageList = [];
@@ -814,38 +811,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.2",
+  "version": "0.4.4",
   "type": "module",
   "description": "Dev pipeline for Pi — TDD implementation, code review, architecture, and skill discovery.",
   "keywords": [