@ikunin/sprintpilot 2.2.1 → 2.2.3

package/_Sprintpilot/bin/autopilot.js

@@ -426,21 +426,40 @@ function composeRuntimeState(persisted, profile, projectRoot) {
   // takes priority over the linear resolveNextStoryKey scan: when a
   // user specifies "start with stories 4-1, 4-2, 4-5" we honor that
   // order regardless of what comes first in sprint-status.yaml.
+  //
+  // Queue consumption is GATED to story-start phases. Without this gate,
+  // composeRuntimeState would pull the queue head as runtime.story_key
+  // during EPIC_BOUNDARY_CHECK / RETROSPECTIVE / STORY_LAND — phases
+  // where the orchestrator isn't starting a new story yet. That would
+  // pollute state and (via adapt.advanceState's signal-output
+  // propagation) overwrite current_epic with the next story's epic
+  // BEFORE retrospective runs.
+  //
   // Forward-compat for ma.parallel_stories: the queue is the source
   // multiple workers will pull from when the parallel-batch path is
   // wired into the state machine.
   const persistedQueue = Array.isArray(persisted.story_queue)
     ? persisted.story_queue.filter((k) => typeof k === 'string' && k.length > 0)
     : [];
-  if (!resolvedStoryKey && persistedQueue.length > 0) {
+  const isNewStoryStartPhase =
+    phase === STATES.CREATE_STORY ||
+    phase === STATES.NANO_QUICK_DEV ||
+    phase === STATES.PREPARE_STORY_BRANCH;
+  if (isNewStoryStartPhase && !resolvedStoryKey && persistedQueue.length > 0) {
     resolvedStoryKey = persistedQueue[0];
-    if (!resolvedEpic) resolvedEpic = deriveEpicFromStoryKey(resolvedStoryKey);
+    // Unconditional re-derive: when picking a new story_key, current_epic
+    // MUST match. A queue spanning multiple epics (e.g. [4-1, 5-1]) needs
+    // to update current_epic when crossing the boundary. The previous
+    // story's epic — preserved through EPIC_BOUNDARY_CHECK + RETROSPECTIVE
+    // by adapt.advanceState — would otherwise carry over and mislabel
+    // commits/branches.
+    resolvedEpic = deriveEpicFromStoryKey(resolvedStoryKey) || resolvedEpic;
   }
   if (phase === STATES.PREPARE_STORY_BRANCH && !resolvedStoryKey) {
     const next = resolveNextStoryKey(projectRoot);
     if (next) {
       resolvedStoryKey = next;
-      if (!resolvedEpic) resolvedEpic = deriveEpicFromStoryKey(next);
+      resolvedEpic = deriveEpicFromStoryKey(next) || resolvedEpic;
     } else {
       process.stderr.write(
         `[autopilot] WARN PREPARE_STORY_BRANCH needs a next-story key but sprint-status.yaml has none pending — falling back to ${flowStart}. ` +
@@ -450,6 +469,23 @@ function composeRuntimeState(persisted, profile, projectRoot) {
     }
   }
 
+  // Count non-done stories in the current epic. state-machine.js's
+  // EPIC_BOUNDARY_CHECK reads this to decide between RETROSPECTIVE (end
+  // of epic, count === 0) and next-story-start (count > 0). Pre-2.2.2
+  // this field was passthrough-only — never written by the orchestrator
+  // — so the count stayed at 0 and EVERY story triggered a
+  // retrospective. Now: recompute from sprint-status.yaml each emission
+  // when current_epic is known.
+  //
+  // Count semantics: excludes done stories AND non-story entries (epic
+  // rollup headers, -retrospective entries) via the same looksLikeStoryKey
+  // filter resolveNextStoryKey uses.
+  let remainingStoriesInEpic = persisted.remaining_stories_in_epic || 0;
+  if (resolvedEpic && projectRoot) {
+    const epicStories = resolveStoriesForEpic(projectRoot, resolvedEpic);
+    remainingStoriesInEpic = epicStories.length;
+  }
+
   return {
     phase,
     story_key: resolvedStoryKey,
@@ -461,7 +497,7 @@ function composeRuntimeState(persisted, profile, projectRoot) {
     prior_signals_summary: persisted.prior_signals_summary || null,
     patch_findings: persisted.patch_findings || null,
     tests_to_rerun: persisted.tests_to_rerun || null,
-    remaining_stories_in_epic: persisted.remaining_stories_in_epic || 0,
+    remaining_stories_in_epic: remainingStoriesInEpic,
     sprint_is_complete: !!persisted.sprint_is_complete,
     retry_count_this_phase: persisted.retry_count_this_phase || 0,
     verify_reject_count: persisted.verify_reject_count || 0,

package/_Sprintpilot/lib/orchestrator/adapt.js

@@ -550,18 +550,26 @@ function advanceState(state, profile, newPhase, signal) {
 
   // Story-completion boundary: STORY_DONE → EPIC_BOUNDARY_CHECK means
   // the current story is committed and pushed. Pop the explicit story
-  // queue (if any) — its head was THIS story — and clear story_key so
-  // composeRuntimeState picks queue[1] (now queue[0]) on the next
-  // emission. Without this pop, composeRuntimeState would re-pick the
-  // just-completed story (via the signal-output propagation above) and
-  // loop. This block runs AFTER propagation so the clearing wins.
+  // queue (if any) — its head was THIS story — and clear story_key /
+  // story_file_path / ac_summary so composeRuntimeState picks
+  // queue[1] (now queue[0]) on the next emission. Without this pop,
+  // composeRuntimeState would re-pick the just-completed story (via the
+  // signal-output propagation above) and loop. This block runs AFTER
+  // propagation so the clearing wins.
+  //
+  // current_epic is intentionally NOT cleared here. EPIC_BOUNDARY_CHECK
+  // and (downstream) RETROSPECTIVE both need it: state-machine reads
+  // current_epic to compute remaining_stories_in_epic, and
+  // verifyRetrospective uses it to locate `_bmad-output/retrospectives/
+  // <epic>.md`. composeRuntimeState re-derives current_epic from the
+  // new story_key when the queue head changes epics on next-story-start
+  // (CREATE_STORY / PREPARE_STORY_BRANCH / NANO_QUICK_DEV).
   if (state.phase === STATES.STORY_DONE && newPhase === STATES.EPIC_BOUNDARY_CHECK) {
     if (Array.isArray(state.story_queue) && state.story_queue.length > 0) {
       next.story_queue = state.story_queue.slice(1);
     }
     next.story_key = null;
     next.story_file_path = null;
-    next.current_epic = null;
     next.ac_summary = null;
   }
 

package/_Sprintpilot/lib/orchestrator/verify.js

@@ -57,6 +57,12 @@ function escapeRe(s) {
 // Extract a story's status from sprint-status.yaml without pulling in a
 // full YAML parser. Supports both inline form (`<key>: <status>`) and
 // block form (`<key>:\n  status: <status>\n  title: ...`).
+//
+// Tolerates trailing `# comment` on inline status lines — the BMad
+// convention is `<key>: done  # PR #N merged ...` and the previous
+// regex required `\s*$` immediately after the status token, rejecting
+// every commented entry. The block-form inner status regex never
+// anchored to end-of-line, so it always tolerated comments.
 function storyStatusFromSprintStatus(text, storyKey) {
   if (!text || !storyKey) return null;
   const k = escapeRe(storyKey);
@@ -69,7 +75,12 @@ function storyStatusFromSprintStatus(text, storyKey) {
     if (sm) return sm[1];
   }
   // Inline form: `  story-key: done` (status as scalar value).
-  const inlineRe = new RegExp(`^\\s+${k}:\\s*["']?([\\w-]+)["']?\\s*$`, 'm');
+  // Optional trailing `# comment` is allowed so `done  # PR #N merged`
+  // matches `done` instead of failing the whole line.
+  const inlineRe = new RegExp(
+    `^\\s+${k}:\\s*["']?([\\w-]+)["']?\\s*(?:#.*)?$`,
+    'm',
+  );
   const im = text.match(inlineRe);
   return im ? im[1] : null;
 }

package/_Sprintpilot/manifest.yaml

@@ -1,6 +1,6 @@
 addon:
   name: sprintpilot
-  version: 2.2.1
+  version: 2.2.3
   description: Sprintpilot — autopilot and multi-agent addon for BMad Method (git workflow, parallel agents, autonomous story execution)
   bmad_compatibility: ">=6.2.0"
   modules:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikunin/sprintpilot",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "Sprintpilot — autopilot and multi-agent addon for BMad Method v6: git workflow, parallel agents, autonomous story execution",
   "license": "Apache-2.0",
   "repository": {