valent-pipeline 0.19.40 → 0.19.42

package/package.json

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

package/src/lib/git-flow.js

@@ -489,6 +489,29 @@ export function startStory({ root, story, targetBranch = '', prefix = 'story/',
 
   git(root, ['checkout', base]);
   git(root, ['checkout', '-b', branch]);
+  // BUG-2 (M-36, 2026-06-19): a branch BASED ON a source story branch (--from-story, e.g. an inline bug
+  // fix) starts at the SOURCE's tip — which can predate commits made to the TARGET since the source was
+  // cut, most importantly the rejected story's BUG ENTRIES that the disposition filed to the shared
+  // backlog on the target. The freshly-based branch then can't see them, so `backlog ship --story <bug>`
+  // errors "not found" (and an eventual --into merge fights stale target state). The target is the source
+  // of truth for shared sprint state, so sync it into the new branch. Guarded tightly: ONLY when actually
+  // basing on another branch (basedOnStory) and the target is genuinely ahead — a fresh story off the
+  // target is already current (no-op) — and ONLY on this create path, never on a resume (a refresh after
+  // the critic pin would move HEAD past it). A conflict (source + target diverged on the SAME file) aborts
+  // cleanly and leaves the branch at its base — degraded but no worse than before, and surfaced — rather
+  // than wedging a half-merge that would hard-stop every later commit in this checkout.
+  let refreshedFromTarget = false;
+  let refreshConflict = false;
+  if (basedOnStory && branchExists(root, target) && !isMergedInto(root, target, branch)) {
+    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]);
+      refreshedFromTarget = true;
+    } catch {
+      if (mergeInProgress(root)) git(root, ['merge', '--abort']);
+      refreshConflict = true;
+    }
+  }
   writeFlowRecord(root, story, {
     schema: 1,
     kind: 'git-flow',
@@ -499,7 +522,9 @@ export function startStory({ root, story, targetBranch = '', prefix = 'story/',
     basedOnStory: basedOnStory ? storyBranchName(prefix, fromStory) : null,
     startedAt: new Date().toISOString(),
   });
-  return { branch, base, target, created: true, resumed: false, snapshotSha };
+  return { branch, base, target, created: true, resumed: false, snapshotSha,
+    ...(refreshedFromTarget ? { refreshedFromTarget: true } : {}),
+    ...(refreshConflict ? { refreshConflict: true } : {}) };
 }
 
 /**