moflo 4.8.67 → 4.8.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moflo",
-  "version": "4.8.67",
+  "version": "4.8.69",
   "description": "MoFlo — AI agent orchestration for Claude Code. Forked from ruflo/claude-flow with patches applied to source, plus feature-level orchestration.",
   "main": "dist/index.js",
   "type": "module",
@@ -112,7 +112,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^20.19.37",
     "eslint": "^8.0.0",
-    "moflo": "^4.8.66",
+    "moflo": "^4.8.68",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "vitest": "^4.0.0"

package/src/modules/cli/dist/src/epic/spells/auto-merge.yaml

@@ -88,7 +88,9 @@ steps:
             command: "git remote get-url origin"
             hint: "This repo has no 'origin' remote. Set one with: git remote add origin <url>"
         config:
-          command: "git stash --include-untracked -q 2>/dev/null; git checkout {args.base_branch} && git pull origin {args.base_branch}; git stash pop -q 2>/dev/null || true"
+          # set -e: fail fast if checkout/pull fails; otherwise the trailing
+          # `stash pop ... || true` would mask the real failure.
+          command: "set -e; git stash --include-untracked -q 2>/dev/null || true; git checkout {args.base_branch}; git pull origin {args.base_branch}; git stash pop -q 2>/dev/null || true"
           failOnError: true
 
       # 2: Spawn Claude agent to implement the story (creates branch + PR)
@@ -122,7 +124,8 @@ steps:
       - id: pull-merged
         type: bash
         config:
-          command: "git stash --include-untracked -q 2>/dev/null; git checkout {args.base_branch} && git pull origin {args.base_branch}; git stash pop -q 2>/dev/null || true"
+          # set -e: fail fast if checkout/pull fails (see checkout-base).
+          command: "set -e; git stash --include-untracked -q 2>/dev/null || true; git checkout {args.base_branch}; git pull origin {args.base_branch}; git stash pop -q 2>/dev/null || true"
           failOnError: true
 
       # 6: Comment on epic with progress

package/src/modules/cli/dist/src/epic/spells/single-branch.yaml

@@ -82,7 +82,11 @@ steps:
         command: "gh auth status"
         hint: "The GitHub CLI isn't signed in. Run: gh auth login"
     config:
-      command: "git stash --include-untracked -q 2>/dev/null; git checkout {args.base_branch} && git pull origin {args.base_branch} && (git show-ref --verify --quiet refs/heads/epic/{args.epic_number}-{args.epic_slug} && git checkout epic/{args.epic_number}-{args.epic_slug} || git checkout -b epic/{args.epic_number}-{args.epic_slug}); git stash pop -q 2>/dev/null || true"
+      # set -e: any failing step aborts the whole command. Without it, the
+      # trailing `git stash pop ... || true` would swallow real failures
+      # (e.g., checkout/pull/branch-create errors) and report success,
+      # leaving later steps to crash when the epic branch isn't there.
+      command: "set -e; git stash --include-untracked -q 2>/dev/null || true; git checkout {args.base_branch}; git pull origin {args.base_branch}; BRANCH=\"epic/{args.epic_number}-{args.epic_slug}\"; if git show-ref --verify --quiet \"refs/heads/$BRANCH\"; then git checkout \"$BRANCH\"; else git checkout -b \"$BRANCH\"; fi; git stash pop -q 2>/dev/null || true"
       timeout: 120000
       failOnError: true
 
@@ -95,11 +99,15 @@ steps:
     output: story_results
     steps:
       # 2a: Spawn Claude agent to implement the story and commit to epic branch
+      # Pin the branch before and after: subagents have wandered to main and
+      # landed commits there, leaving epic branch empty. We re-assert the epic
+      # branch up front, snapshot HEAD, and if the subagent strays we cherry-pick
+      # the stray commits back onto the epic branch before the step succeeds.
       - id: implement-story
         type: bash
         permissionLevel: elevated
         config:
-          command: "export PATH=\"$HOME/.local/bin:$PATH\" && claude -p \"Read GitHub issue #{loop.story_number} using gh issue view {loop.story_number}. Implement exactly what the issue asks for — nothing more. Commit your changes with a message referencing the issue number. Do not create a branch or PR.\""
+          command: "export PATH=\"$HOME/.local/bin:$PATH\" && EPIC_BRANCH=\"epic/{args.epic_number}-{args.epic_slug}\" && git checkout \"$EPIC_BRANCH\" && BEFORE=$(git rev-parse HEAD) && claude -p \"You are on git branch $EPIC_BRANCH. Stay on it — do NOT run git checkout, git switch, or git branch. Read GitHub issue #{loop.story_number} using gh issue view {loop.story_number}. Implement exactly what the issue asks for — nothing more. Commit your changes on $EPIC_BRANCH with a message referencing the issue number. Do not create a PR.\" && CURRENT=$(git rev-parse --abbrev-ref HEAD) && if [ \"$CURRENT\" != \"$EPIC_BRANCH\" ]; then echo \"[epic] agent strayed from $EPIC_BRANCH to $CURRENT — recovering commits\" >&2 && STRAY_HEAD=$(git rev-parse HEAD) && git checkout \"$EPIC_BRANCH\" && git cherry-pick \"$BEFORE\"..\"$STRAY_HEAD\"; fi"
           timeout: 600000
           failOnError: true
 

package/src/modules/cli/dist/src/version.js

@@ -2,5 +2,5 @@
  * Auto-generated by build. Do not edit manually.
  * Source of truth: root package.json → scripts/sync-version.mjs
  */
-export const VERSION = '4.8.67';
+export const VERSION = '4.8.69';
 //# sourceMappingURL=version.js.map

package/src/modules/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moflo/cli",
-  "version": "4.8.67",
+  "version": "4.8.69",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",