@ikunin/sprintpilot 2.2.4 → 2.2.6

package/README.md

@@ -192,7 +192,7 @@ Before every commit the orchestrator runs deterministic checks against the stage
 | **Secrets scan** | Greps staged content for `API_KEY`, `SECRET`, `TOKEN`, `PASSWORD`, `aws_access`, `private_key`. WARN severity by default — surfaced in the log but does not block the commit. Allowlist patterns live in `.secrets-allowlist`. |
 | **File size** | Rejects files larger than `staging.max_file_size_mb` (default `1`). |
 | **Binary detection** | Warns on binary files detected via `file --mime-encoding`. |
-| **Gitignore check** | Verifies `.gitignore` covers `.autopilot.lock` and `.claude/.addon-backups/`. |
+| **Gitignore check** | Verifies `.gitignore` covers `.autopilot.lock` and `.claude/.sprintpilot-backups/`. |
 
 For each story, every commit (the main story commit + each code-review patch commit) runs the full check chain.
 

package/_Sprintpilot/bin/autopilot.js

@@ -526,9 +526,32 @@ function composeRuntimeState(persisted, profile, projectRoot) {
   // 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)
+  // Validate persisted.story_queue entries against sprint-status. Same
+  // rejection rules as current_story (epic-rollup shape / retrospective
+  // / missing from sprint-status / marked done) — applies to every queue
+  // member. Without this, a legacy queue persisted by an older
+  // orchestrator (or after a sprint-status edit that removed entries)
+  // would feed garbage keys to subsequent emissions.
+  //
+  // Defensive: if sprint-status can't be read, only the shape-based
+  // rejections (epic-N, retrospective) apply; presence/status checks
+  // are skipped. Same don't-punish-missing-artifact policy as
+  // current_story validation.
+  const rawPersistedQueue = Array.isArray(persisted.story_queue)
     ? persisted.story_queue.filter((k) => typeof k === 'string' && k.length > 0)
     : [];
+  const persistedQueue = [];
+  for (const k of rawPersistedQueue) {
+    const reason = persistedStoryRejectionReason(k, projectRoot);
+    if (reason) {
+      process.stderr.write(
+        `[autopilot] WARN story_queue entry "${k}" rejected: ${reason}. ` +
+          'Dropping from queue.\n',
+      );
+      continue;
+    }
+    persistedQueue.push(k);
+  }
   const isNewStoryStartPhase =
     phase === STATES.CREATE_STORY ||
     phase === STATES.NANO_QUICK_DEV ||

package/_Sprintpilot/lib/orchestrator/adapt.js

@@ -405,18 +405,39 @@ function handleUserInput(state, signal, profile, sideEffects) {
   // a specific story but autopilot-state.yaml still shows
   // `current_story: null` — subsequent emissions / persists / verify
   // checks all reference the wrong story.
+  //
+  // Phase advance: when the alternative carries `phase` and it's a
+  // valid STATES value, also advance state.phase. Pre-v2.2.6 the
+  // dispatch was one-shot — the alternative ran for ONE emission then
+  // state.phase reverted, defeating use cases like "skip dev_red /
+  // dev_green / code_review because the work is already done on the
+  // branch from a prior session." The user explicitly proposes the
+  // alternative including a target phase; they accept the consequences
+  // (e.g. verify may reject the new phase if its preconditions aren't
+  // met). Without this, accept_alternative is useless for cycle skips.
   const dispatch = applied.sideEffects.find((e) => e && e.kind === 'dispatch_action');
   if (dispatch && dispatch.action) {
     const a = dispatch.action;
     const slots = a.template_slots || {};
+    const KNOWN_PHASES = new Set(Object.values(STATES));
+    const phaseAdvance =
+      typeof a.phase === 'string' && KNOWN_PHASES.has(a.phase) && a.phase !== newState.phase
+        ? a.phase
+        : null;
     const enrichedState = {
       ...newState,
+      phase: phaseAdvance || newState.phase,
       story_key: newState.story_key || slots.story_key || a.story_key || null,
       current_epic:
         newState.current_epic || slots.current_epic || a.epic_key || null,
       story_file_path:
         newState.story_file_path || slots.story_file_path || null,
       ac_summary: newState.ac_summary || slots.ac_summary || null,
+      // Reset retry counters on phase advance so the new phase isn't
+      // immediately throttled by a stale retry budget from the phase
+      // we just skipped.
+      retry_count_this_phase: phaseAdvance ? 0 : newState.retry_count_this_phase,
+      verify_reject_count: phaseAdvance ? 0 : newState.verify_reject_count,
     };
     return {
       newState: enrichedState,

package/_Sprintpilot/manifest.yaml

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

package/_Sprintpilot/skills/sprintpilot-update/workflow.md

@@ -42,6 +42,6 @@
 7. **Verify.** Read `_Sprintpilot/manifest.yaml` again and confirm the version updated:
    ```
    Updated to v{latest}
-   Previous version backed up to .claude/.addon-backups/
+   Previous version backed up to .claude/.sprintpilot-backups/
    ```
    If the version did not change, warn the user that the update may have failed.

package/lib/commands/install.js

@@ -1262,9 +1262,18 @@ async function runInstall(options = {}) {
   for (const tool of selectedTools) {
     const toolDir = getToolDir(tool);
     const skillsDir = path.join(projectRoot, toolDir, 'skills');
-    const backupDir = path.join(projectRoot, toolDir, '.addon-backups');
+    // Backup dir was renamed in v2.2.6: `.addon-backups/` → `.sprintpilot-backups/`.
+    // Migrate the legacy name on upgrade so users don't end up with both
+    // an old (stale) and new (active) backup dir side-by-side. Migration
+    // is a single fs.rename — preserves all existing backups.
+    const legacyBackupDir = path.join(projectRoot, toolDir, '.addon-backups');
+    const backupDir = path.join(projectRoot, toolDir, '.sprintpilot-backups');
+    if (!dryRun && (await fs.pathExists(legacyBackupDir)) && !(await fs.pathExists(backupDir))) {
+      await fs.rename(legacyBackupDir, backupDir);
+      console.log(`Migrated ${toolDir}/.addon-backups/ → ${toolDir}/.sprintpilot-backups/`);
+    }
 
-    const backupIgnoreEntry = `${toolDir}/.addon-backups/`;
+    const backupIgnoreEntry = `${toolDir}/.sprintpilot-backups/`;
     const backupIgnoreResult = await addIgnoreEntry(ignore.path, backupIgnoreEntry, { dryRun });
     if (backupIgnoreResult.added) {
       const name = path.basename(ignore.path);

package/lib/commands/uninstall.js

@@ -170,10 +170,14 @@ async function runUninstall(options = {}) {
       totalRemoved += removed;
     }
 
-    const backupDir = path.join(projectRoot, toolDir, '.addon-backups');
-    if (await fs.pathExists(backupDir)) {
-      await fs.remove(backupDir);
-      console.log(`${tool}: removed backup directory`);
+    // Remove both the current backup dir AND the legacy name in case the
+    // user never ran install after v2.2.6 to migrate it.
+    for (const name of ['.sprintpilot-backups', '.addon-backups']) {
+      const backupDir = path.join(projectRoot, toolDir, name);
+      if (await fs.pathExists(backupDir)) {
+        await fs.remove(backupDir);
+        console.log(`${tool}: removed ${name}/`);
+      }
     }
 
     await removeSystemPrompt(tool, projectRoot);

package/package.json

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