valent-pipeline 0.19.65 → 0.19.66

package/package.json

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

package/src/lib/git-flow.js

@@ -167,6 +167,42 @@ function isMergedInto(root, branch, target) {
   }
 }
 
+// RESUME-path backlog refresh (M-208). The create-path sync (startStory, the `merge --no-ff target`
+// below) fires ONLY on create — never on a RESUME, because a full merge there would move HEAD past the
+// critic pin (the documented constraint at the create-path guard). But a --from-story bug-fix branch
+// can still END UP missing the target-filed bug entry across a resume: if the entry is filed to the
+// target AFTER the branch is cut (the rejecting sprint's rollover-persist lands ~seconds after the
+// branch base, or the create launch dies before the entry exists) and the run then RESUMES the branch,
+// the create refresh never re-runs → `backlog ship --story <bug>` errors "backlog item not found"
+// (3.5-BUG-001, the M-36/M-65 class on the resume surface). Bring ONLY the target-canonical backlog
+// forward — a single path-scoped chore commit, NOT a merge — so the entry arrives while the pin and all
+// code stay exactly put (the backlog is already target-wins on every merge, REFRESH_TARGET_WINS). A
+// no-op when the branch backlog already matches the target (the create refresh delivered it, or nothing
+// was filed) so a resume never churns an empty commit; gated to inline --from-story fixes (basedOnStory)
+// whose target genuinely advanced, mirroring the create-path guard.
+function syncBacklogFromTargetOnResume(gitDir, root, story, target) {
+  const backlogFile = 'pipeline-backlog.yaml';
+  try {
+    if (!target || !branchExists(root, target)) return false;
+    const rec = readFlowRecord(gitDir, story) || readFlowRecord(root, story);
+    if (!rec || !rec.basedOnStory) return false;          // only inline bug fixes need this
+    if (mergeInProgress(gitDir)) return false;            // never touch a half-merged tree
+    const branch = rec.branch || currentBranch(gitDir);
+    if (!branch || isMergedInto(root, target, branch)) return false; // target not ahead → nothing to inherit
+    git(gitDir, ['checkout', target, '--', backlogFile]); // stage the target's canonical backlog blob
+    const staged = git(gitDir, ['diff', '--cached', '--name-only'])
+      .split('\n').map((s) => s.trim()).filter(Boolean);
+    if (!staged.includes(backlogFile)) return false;      // already current → no empty commit
+    git(gitDir, ['commit', '-m',
+      buildCommitMessage({ storyId: story, phase: 'sync',
+        summary: `inherit target backlog (filed bug entries) on resume — no code merge, pin intact (M-208)` }),
+      '--', backlogFile]);
+    return true;
+  } catch {
+    return false; // best-effort: a sync failure leaves the branch as it was (degraded, not wedged)
+  }
+}
+
 // --- worktree mode (parallel story execution) -------------------------------------------------
 // Each parallel story gets its own worktree under `<root>/<worktreeDir>/<storyId>` with the story
 // branch checked out there; the MAIN checkout stays on the target branch and is the only place
@@ -470,7 +506,10 @@ export function startStory({ root, story, targetBranch = '', prefix = 'story/',
   const onBranch = currentBranch(root);
 
   if (!worktree && onBranch === branch) {
-    return { branch, base: readFlowRecord(root, story)?.base ?? null, created: false, resumed: true };
+    const rec = readFlowRecord(root, story);
+    const backlogResynced = syncBacklogFromTargetOnResume(root, root, story, rec?.target);
+    return { branch, base: rec?.base ?? null, created: false, resumed: true,
+      ...(backlogResynced ? { backlogResynced: true } : {}) };
   }
 
   // Leftover dirt belongs to whatever produced it (planning artifacts, a prior crash) — sweep it
@@ -516,7 +555,10 @@ export function startStory({ root, story, targetBranch = '', prefix = 'story/',
       // when intact, and a half-created worktree (crash between `worktree add` and setup) gets
       // its missing pieces — setup_commands must therefore be idempotent (documented).
       const setup = setupWorktree(root, existing, setupCommands);
-      return { branch, base: readFlowRecord(existing, story)?.base ?? null, worktree: existing, created: false, resumed: true, snapshotSha, ...setup };
+      const rec = readFlowRecord(existing, story) || readFlowRecord(root, story);
+      const backlogResynced = syncBacklogFromTargetOnResume(existing, root, story, rec?.target);
+      return { branch, base: rec?.base ?? null, worktree: existing, created: false, resumed: true, snapshotSha,
+        ...(backlogResynced ? { backlogResynced: true } : {}), ...setup };
     }
     const creating = !branchExists(root, branch);
     if (creating) {
@@ -586,7 +628,10 @@ export function startStory({ root, story, targetBranch = '', prefix = 'story/',
 
   if (branchExists(root, branch)) {
     git(root, ['checkout', branch]);
-    return { branch, base: readFlowRecord(root, story)?.base ?? null, created: false, resumed: true, snapshotSha };
+    const rec = readFlowRecord(root, story);
+    const backlogResynced = syncBacklogFromTargetOnResume(root, root, story, rec?.target);
+    return { branch, base: rec?.base ?? null, created: false, resumed: true, snapshotSha,
+      ...(backlogResynced ? { backlogResynced: true } : {}) };
   }
   if (!branchExists(root, base)) throw new Error(`base branch "${base}" does not exist`);