ma-agents 3.17.0-beta.2 → 3.17.0-beta.3

package/lib/bmad-extension-plugin/.claude-plugin/marketplace.json

@@ -37,7 +37,7 @@
       "name": "ma-skills",
       "source": "./",
       "description": "ma-agents extension module providing enterprise SDLC personas and operational workflow skills.",
-      "version": "3.17.0-beta.2",
+      "version": "3.17.0-beta.3",
       "author": {
         "name": "Alon Mayaffit"
       },

package/lib/custom-marketplace.js

@@ -478,6 +478,64 @@ async function scanDirectModeSkillDirs(rootDir) {
     return scanSkillDirs(rootDir);
 }
 
+/**
+ * Recursively collect every directory that contains a `SKILL.md`, returned as
+ * POSIX paths RELATIVE to `rootDirAbs`. Unlike {@link scanSkillDirs} (DIRECT
+ * children only), this walks the whole subtree: real BMAD modules nest skills
+ * under `agents/`, `workflows/<phase>/…`, etc. A dir that IS a skill (has
+ * SKILL.md) is recorded and not descended into (skills don't nest in skills);
+ * `node_modules`/`.git` are skipped.
+ */
+async function findSkillDirsRecursive(baseDirAbs, rootDirAbs) {
+    const found = [];
+    async function walk(dirAbs) {
+        if (await fs.pathExists(path.join(dirAbs, 'SKILL.md'))) {
+            found.push(toPosix(path.relative(rootDirAbs, dirAbs)));
+            return;
+        }
+        let entries;
+        try {
+            entries = await fs.readdir(dirAbs, { withFileTypes: true });
+        } catch {
+            return;
+        }
+        for (const entry of entries) {
+            if (!entry.isDirectory()) continue;
+            if (entry.name === 'node_modules' || entry.name === '.git') continue;
+            await walk(path.join(dirAbs, entry.name));
+        }
+    }
+    await walk(baseDirAbs);
+    return found.sort();
+}
+
+/**
+ * Determine which directory to scan for a registry entry's skills, given the
+ * cloned repo root and the entry's `module_definition` (repo-relative path to
+ * its module.yaml). Skills are NOT always beside module.yaml:
+ *   - module.yaml at the skills' parent (`skills/module.yaml`,
+ *     `src/core-skills/module.yaml`, `src/module.yaml`) → scan THAT dir.
+ *   - module.yaml inside a `<name>-setup/assets/module.yaml` (bmad-method's
+ *     PluginResolver "setup skill" layout, e.g. suno-band-manager) → the
+ *     module's skills are SIBLINGS of the -setup skill, so scan the setup
+ *     skill's PARENT.
+ * Returns a POSIX path relative to the repo root ('.' = repo root). No
+ * module_definition → the repo root (direct-style scan).
+ */
+async function resolveRegistrySkillsRoot(entryRootDir, moduleDefPosix) {
+    if (!moduleDefPosix) return '.';
+    const mdDirPosix = path.posix.dirname(moduleDefPosix);
+    if (path.posix.basename(mdDirPosix) === 'assets') {
+        const setupSkillPosix = path.posix.dirname(mdDirPosix);
+        const setupSkillAbs = path.join(entryRootDir, ...setupSkillPosix.split('/'));
+        if (setupSkillPosix && (await fs.pathExists(path.join(setupSkillAbs, 'SKILL.md')))) {
+            const parentPosix = path.posix.dirname(setupSkillPosix);
+            return parentPosix === '' || parentPosix === '.' ? '.' : parentPosix;
+        }
+    }
+    return mdDirPosix === '' || mdDirPosix === '.' ? '.' : mdDirPosix;
+}
+
 /**
  * Resolve every selected plugin's installable skill/module layout via
  * bmad-method's own `CustomModuleManager#resolvePlugin` (the pinned-internal
@@ -784,10 +842,10 @@ async function resolveRegistryEntry(plugin, resolveSourceFn, resolvePluginFn) {
     // repo-relative path to the module's module.yaml; its directory is the
     // module root. Absent → fall back to the repo root (PluginResolver over the
     // whole clone), matching the AC3 fallback.
-    let relModuleDirPosix = '.';
+    let moduleDefPosix = null;
     if (plugin.moduleDefinition) {
-        const defPosix = toPosix(plugin.moduleDefinition).replace(/^\.\//, '');
-        const moduleYamlAbs = path.join(entryRootDir, ...defPosix.split('/'));
+        moduleDefPosix = toPosix(plugin.moduleDefinition).replace(/^\.\//, '');
+        const moduleYamlAbs = path.join(entryRootDir, ...moduleDefPosix.split('/'));
         if (!(await fs.pathExists(moduleYamlAbs))) {
             throw new CustomMarketplaceError(
                 `Registry entry '${plugin.code}': module_definition "${plugin.moduleDefinition}" ` +
@@ -795,27 +853,33 @@ async function resolveRegistryEntry(plugin, resolveSourceFn, resolvePluginFn) {
                 `repository layout changed; aborting before staging (FR238).`
             );
         }
-        relModuleDirPosix = path.posix.dirname(defPosix);
     }
 
-    const moduleBaseAbs =
-        relModuleDirPosix === '.' ? entryRootDir : path.join(entryRootDir, ...relModuleDirPosix.split('/'));
-    const skillNames = await scanSkillDirs(moduleBaseAbs);
-    const skillRelPaths = skillNames.map((n) => (relModuleDirPosix === '.' ? n : `${relModuleDirPosix}/${n}`));
+    // Skills are NOT necessarily beside module.yaml — resolve the module's real
+    // skills root (handles the setup-skill/assets layout and modules whose
+    // module.yaml sits at the skills' parent) and scan it RECURSIVELY. A shallow
+    // scan of module.yaml's own dir silently missed nested skills (gds/bmm) and
+    // the setup-skill layout entirely (suno), dropping those modules.
+    const skillsRootPosix = await resolveRegistrySkillsRoot(entryRootDir, moduleDefPosix);
+    const skillsRootAbs =
+        skillsRootPosix === '.' ? entryRootDir : path.join(entryRootDir, ...skillsRootPosix.split('/'));
+    const skillRelPaths = await findSkillDirsRecursive(skillsRootAbs, entryRootDir);
     diag('custom-source: registry entry resolved', {
         code: plugin.code,
-        moduleDir: relModuleDirPosix,
-        skillDirsFound: skillNames.length,
-        skills: skillNames,
+        moduleDef: moduleDefPosix,
+        skillsRoot: skillsRootPosix,
+        skillDirsFound: skillRelPaths.length,
+        skills: skillRelPaths,
     });
 
     const rawPlugin = {
         name: plugin.code,
         description: plugin.description || '',
         version: plugin.version || null,
-        source: relModuleDirPosix,
-        // Empty when the module dir has no SKILL.md subdirs — resolvePlugin then
-        // returns [] and the FR238 guard aborts cleanly (zero installable modules).
+        source: skillsRootPosix,
+        // Skill dirs relative to the repo root (what PluginResolver.resolve joins
+        // against repoPath). Empty → resolvePlugin returns [] and the selected
+        // entry surfaces in the per-entry guard below (never a silent drop).
         skills: skillRelPaths,
     };
 
@@ -884,6 +948,26 @@ async function stageRegistrySubset({ source, plugins, selectedCodes, projectRoot
         entries.push(await resolveRegistryEntry(plugin, resolveSourceFn, resolvePluginFn));
     }
 
+    // Per-entry LOUD guard: a SELECTED entry that resolves to zero modules must
+    // NOT be silently dropped while others install (which read as an overall
+    // "success"). Fail before staging, naming exactly which entries produced
+    // nothing — the user picked them explicitly, so a partial install is a
+    // fail-clean violation (FR238), not an acceptable default.
+    const emptyEntries = entries.filter(({ resolved }) => !resolved || resolved.length === 0);
+    if (emptyEntries.length > 0) {
+        const names = emptyEntries.map(({ plugin }) => plugin.code).join(', ');
+        diag('custom-source: registry entries resolved to zero modules', {
+            entries: emptyEntries.map(({ plugin }) => ({ code: plugin.code, repository: plugin.repository, moduleDefinition: plugin.moduleDefinition || null })),
+        });
+        throw new CustomMarketplaceError(
+            `Selected registry ${emptyEntries.length === 1 ? 'entry' : 'entries'} ${names} resolved to ` +
+            `zero installable modules — no SKILL.md directories were found for ${emptyEntries.length === 1 ? 'it' : 'them'} ` +
+            `(a stale registry pointer, a changed repo layout, or a module with no skills). ` +
+            `Aborting before staging so the selection is not silently partially installed (FR238). ` +
+            `Re-run and deselect ${emptyEntries.length === 1 ? 'it' : 'those'}, or report the registry entry as broken.`
+        );
+    }
+
     const allModules = assertResolutionNonEmptyAndUniqueLeaves(
         entries.map(({ plugin, rawPlugin, resolved }) => ({ plugin, rawPlugin, resolved })),
         { source, mode: 'registry' }
@@ -981,6 +1065,8 @@ module.exports = {
     CUSTOM_MARKETPLACE_STAGE_DIR_NAME,
     scanDirectModeSkillDirs,
     scanSkillDirs,
+    findSkillDirsRecursive,
+    resolveRegistrySkillsRoot,
     resolveSelectedPlugins,
     assertResolutionNonEmptyAndUniqueLeaves,
     stageCustomMarketplaceSubset,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ma-agents",
-  "version": "3.17.0-beta.2",
+  "version": "3.17.0-beta.3",
   "description": "NPX tool to install skills for AI coding agents (Claude Code, Gemini, Copilot, Kilocode, Cline, Cursor, Roo Code)",
   "main": "index.js",
   "bin": {