@ikunin/sprintpilot 2.0.7 → 2.0.9

package/lib/commands/install.js

@@ -368,7 +368,7 @@ async function stripLegacyMarkers(projectRoot) {
 // Evict v1 skill dirs from tool skill dirs INSIDE projectRoot only. We
 // deliberately do NOT touch user-global ~/.claude/skills/ — a project-level
 // install must not reach across projects on the same machine.
-async function evictV1SkillsFromToolDirs(projectRoot) {
+async function evictV1SkillsFromToolDirs(projectRoot, { dryRun = false } = {}) {
   const removed = [];
   const toolSkillDirs = [];
   for (const tool of ALL_TOOLS) {
@@ -382,7 +382,7 @@ async function evictV1SkillsFromToolDirs(projectRoot) {
     for (const v1Name of V1_SKILL_NAMES) {
       const target = path.join(dir, v1Name);
       if (await fs.pathExists(target)) {
-        await fs.remove(target);
+        if (!dryRun) await fs.remove(target);
         removed.push(path.relative(projectRoot, target));
       }
     }
@@ -1001,6 +1001,22 @@ async function runInstall(options = {}) {
     throw err;
   }
 
+  // 1b. Sweep orphaned v1-named skill dirs from tool dirs unconditionally.
+  //     evictV1Installation only fires when _bmad-addons/ is present, so a
+  //     user who upgraded long ago (and removed _bmad-addons/) never gets
+  //     stale .claude/skills/bmad-ma-* cleaned up — they linger as live
+  //     duplicates of the new sprintpilot-* skills. Idempotent, no-op when
+  //     nothing matches.
+  const orphanedV1Skills = await evictV1SkillsFromToolDirs(projectRoot, { dryRun });
+  if (orphanedV1Skills.length > 0) {
+    console.log('');
+    console.log(pc.yellow('Orphaned v1 skill directories found:'));
+    for (const e of orphanedV1Skills) {
+      console.log(`  ${dryRun ? 'Would remove' : 'Removed'} legacy skill: ${e}`);
+    }
+    console.log('');
+  }
+
   // 2. Resolve output_folder
   const outputFolder = await readOutputFolder(projectRoot);
   if (outputFolder !== '_bmad-output') {

package/lib/core/bmad-config.js

@@ -35,14 +35,19 @@ async function verifyBmadInstalled(projectRoot) {
   return data || {};
 }
 
-// BMad Method has used two manifest shapes:
-//   - flat:   { version: "6.3.0" }
-//   - nested: { bmad: { version: "6.2.0" } }
-// The shipping v6 installer writes the nested form; some older installs
-// and our own unit-test fixture use the flat form. Try nested first,
-// then fall back to flat so either layout resolves to a real version.
+// BMad Method has used three manifest shapes:
+//   - installation-scoped: { installation: { version: "6.2.2" }, modules: [...] }
+//     (the actual v6.2.x installer writes this — installation.version is
+//     the canonical source; modules[].version is per-module and not the
+//     overall BMad version)
+//   - nested:              { bmad: { version: "6.2.0" } }
+//   - flat:                { version: "6.3.0" }
+// Try installation-scoped first (matches what users actually have on
+// disk today), then nested, then flat. Older installs and our unit-test
+// fixture use the flat form.
 function extractBmadVersion(data) {
   if (!data) return null;
+  if (data.installation && data.installation.version) return data.installation.version;
   if (data.bmad && data.bmad.version) return data.bmad.version;
   if (data.version) return data.version;
   return null;

package/package.json

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