valent-pipeline 0.19.41 → 0.19.43

package/package.json

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

package/src/lib/git-flow.js

@@ -460,6 +460,25 @@ export function startStory({ root, story, targetBranch = '', prefix = 'story/',
       orphanMovedTo = aside;
     }
     git(root, ['worktree', 'add', wtPath, branch]);
+    // BUG-2 worktree variant (M-36/M-41, 2026-06-19): same fix as the non-worktree create path — a
+    // --from-story bug fix based on a source the TARGET has advanced past must inherit those target
+    // commits (the disposition's bug entries on the shared backlog), or `backlog ship --story <bug>`
+    // errors "not found". Here the branch lives in a WORKTREE, so the sync merge runs in the worktree
+    // checkout (wtPath), and BEFORE setupWorktree materializes .valent-pipeline/node_modules — a clean
+    // tree so no untracked file can block the merge. Same guards (create + basedOnStory + target-ahead);
+    // a conflict aborts cleanly in the worktree, leaving the branch at its base. Needed for parallel:2.
+    let refreshedFromTarget = false;
+    let refreshConflict = false;
+    if (creating && basedOnStory && branchExists(root, target) && !isMergedInto(root, target, branch)) {
+      try {
+        git(wtPath, ['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(wtPath)) git(wtPath, ['merge', '--abort']);
+        refreshConflict = true;
+      }
+    }
     const setup = setupWorktree(root, wtPath, setupCommands);
     if (creating) {
       writeFlowRecord(wtPath, story, {
@@ -477,6 +496,8 @@ export function startStory({ root, story, targetBranch = '', prefix = 'story/',
     return {
       branch, base, target, worktree: wtPath, created: creating, resumed: !creating, snapshotSha,
       ...(orphanMovedTo ? { orphanMovedTo, warning: `orphaned worktree directory moved aside to ${orphanMovedTo} (crashed run; inspect/delete it manually)` } : {}),
+      ...(refreshedFromTarget ? { refreshedFromTarget: true } : {}),
+      ...(refreshConflict ? { refreshConflict: true } : {}),
       ...setup,
     };
   }