valent-pipeline 0.19.39 → 0.19.40

package/package.json

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

package/pipeline/orchestrators/claude-code/sprint.workflow.js

@@ -1672,6 +1672,25 @@ async function runShipStep(sid, commandStr, stepPhase) {
       log(`${sid}: ship-story attempt ${attempt}/${shipMergeAttempts} did not land (${res ? 'transient git-runner failure' : 'GIT runner died'}) — retrying the deterministic, idempotent merge`)
     }
   }
+  // Deterministic post-ship verify (M-36/M-37, 2026-06-19): ship-story is a code-owned git merge, but
+  // its result is transcribed by a haiku GIT runner — a transcription slip (or an agent death AFTER the
+  // merge landed) drops `merged:true`, so the loop above reports "did not land" on a merge that ACTUALLY
+  // SUCCEEDED, falsely blocking a shipped story (the git-ship-failed false-positive that stranded 2.20).
+  // Git is the ground truth: when we did NOT confirm a land/conflict/skip, ask `git story-status` — its
+  // `merged` is `isMergedInto` (computed in code, not by the agent); if the branch IS now an ancestor of
+  // the target, the merge LANDED regardless of what the ship runner said → recover to merged:true. A real
+  // conflict (broken out above) and a genuine non-landing (story-status merged:false → real merge-block)
+  // are untouched. The ancestor check cleanly separates the two classes — field-validated by hand on 2.20
+  // (M-38). Only runs on the rare non-landed path, so the happy ship adds zero overhead.
+  const confirmed = !!(res && (res.merged === true || res.skipped === true || res.conflict === true))
+  if (gitFlowEnabled && !confirmed) {
+    const status = await runGitStep(sid,
+      [`node .valent-pipeline/bin/cli.js git story-status --story ${sid}${gitFlags}`], 'merge-verify', stepPhase)
+    if (status && status.merged === true) {
+      log(`${sid}: ship-story runner reported no-land but git story-status confirms the branch IS merged into the target — recovering to merged:true (transcription false-failure, NOT a real merge-block)`)
+      return { ...(res || {}), merged: true, recoveredByVerify: true }
+    }
+  }
   return res
 }