valent-pipeline 0.19.47 → 0.19.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valent-pipeline",
-  "version": "0.19.47",
+  "version": "0.19.49",
   "description": "v3 multi-agent AI pipeline for software development lifecycle",
   "type": "module",
   "bin": {

package/src/lib/git-flow.js

@@ -524,6 +524,10 @@ export function startStory({ root, story, targetBranch = '', prefix = 'story/',
   let refreshedFromTarget = false;
   let refreshConflict = false;
   if (basedOnStory && branchExists(root, target) && !isMergedInto(root, target, branch)) {
+    // Capture whether the vendored install is present BEFORE the sync, so the hazard guard below fires
+    // ONLY when the merge actually REMOVED it — not when a repo simply never had a materialized install
+    // (e.g. a bare test fixture), which must refresh normally.
+    const hadFrameworkInstall = existsSync(join(root, '.valent-pipeline', 'bin', 'cli.js'));
     try {
       git(root, ['merge', '--no-ff', '-m',
         buildCommitMessage({ storyId: story, phase: 'sync', summary: `sync ${target} into ${branch} (inherit shared state from a behind base)` }), target]);
@@ -532,6 +536,24 @@ export function startStory({ root, story, targetBranch = '', prefix = 'story/',
       if (mergeInProgress(root)) git(root, ['merge', '--abort']);
       refreshConflict = true;
     }
+    // M-52 transition hazard: when `target` UNTRACKS the vendored framework (the post-untrack install
+    // model) while THIS branch still TRACKS it (a pre-untrack branch), the merge above applied target's
+    // index-deletion to the WORKING TREE and removed the on-disk install — `.valent-pipeline/bin/cli.js`
+    // is gone, so the next `node .valent-pipeline/bin/cli.js` call would fail mid-sprint. Such a branch
+    // cannot be refreshed in place (keeping the merge loses the install; reverting it restores a STALE
+    // framework — the very thing untracking fixed), so undo the sync and surface it like a conflict: the
+    // caller must recut the branch FRESH off the untracked target. (The worktree create-path self-heals
+    // via setupWorktree's re-materialize; this serial path has no such restore.)
+    if (refreshedFromTarget && hadFrameworkInstall && !existsSync(join(root, '.valent-pipeline', 'bin', 'cli.js'))) {
+      git(root, ['reset', '--hard', 'ORIG_HEAD']);
+      refreshedFromTarget = false;
+      refreshConflict = true;
+      console.error(
+        `git-flow: sync of ${target} into ${branch} would DELETE the vendored framework install ` +
+        `(${target} untracks .valent-pipeline/ but ${branch} still tracks it — M-52 untrack transition). ` +
+        `Skipped the sync; ${branch} left at its base — recut it FRESH off ${target} instead of --from-story.`,
+      );
+    }
   }
   writeFlowRecord(root, story, {
     schema: 1,
@@ -560,7 +582,14 @@ export function storyStatus({ root, story, targetBranch = '', prefix = 'story/'
   const branch = storyBranchName(prefix, story);
   const exists = branchExists(root, branch);
   const record = readFlowRecord(root, story);
-  const target = targetBranch || record?.target || currentBranch(root);
+  // A `--from-story` item (an inline bug fix) ships `--into` its SOURCE story branch (recorded as
+  // basedOnStory), NOT the sprint target — so "did it land" is ancestry against basedOnStory. The sprint
+  // `--target` that the post-ship verify passes globally (gitFlags `--target`) is the wrong base for such
+  // an item: it reads a bug correctly merged into its source — but whose source hasn't reached the sprint
+  // target yet — as merged:false → a FALSE git-ship-failed that stranded the parent's revalidation
+  // (M-60, 2.17-BUG-002). basedOnStory is therefore AUTHORITATIVE when present (it overrides even an
+  // explicit --target); an ordinary story (basedOnStory null) still honors --target then the record.
+  const target = record?.basedOnStory || targetBranch || record?.target || currentBranch(root);
   // A missing branch is UNKNOWN (merged:null), never a verdict: the flow retains branches on
   // both ship and reject, so absence means the flow never ran here (or someone pruned by hand) —
   // the caller must treat the state as unverified rather than as landed.