fix: support skills/ folder as module source location (#2149)

The installer now finds module.yaml in both skills/ and src/ directories,
including one level deep in subfolders. Updates bmb module-definition to
skills/module.yaml to match its actual structure.
This commit is contained in:
Brian 2026-03-28 00:33:10 -05:00 committed by GitHub
parent c91db0db4b
commit e0ea6a0500
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 4 deletions

View File

@ -4,7 +4,7 @@
modules: modules:
bmad-builder: bmad-builder:
url: https://github.com/bmad-code-org/bmad-builder url: https://github.com/bmad-code-org/bmad-builder
module-definition: src/module.yaml module-definition: skills/module.yaml
code: bmb code: bmb
name: "BMad Builder" name: "BMad Builder"
description: "Agent and Builder" description: "Agent and Builder"

View File

@ -313,10 +313,41 @@ class ExternalModuleManager {
// The module-definition specifies the path to module.yaml relative to repo root // The module-definition specifies the path to module.yaml relative to repo root
// We need to return the directory containing module.yaml // We need to return the directory containing module.yaml
const moduleDefinitionPath = moduleInfo.moduleDefinition; // e.g., 'src/module.yaml' const moduleDefinitionPath = moduleInfo.moduleDefinition; // e.g., 'skills/module.yaml'
const moduleDir = path.dirname(path.join(cloneDir, moduleDefinitionPath)); const configuredPath = path.join(cloneDir, moduleDefinitionPath);
return moduleDir; if (await fs.pathExists(configuredPath)) {
return path.dirname(configuredPath);
}
// Fallback: search skills/ and src/ (root level and one level deep for subfolders)
for (const dir of ['skills', 'src']) {
const rootCandidate = path.join(cloneDir, dir, 'module.yaml');
if (await fs.pathExists(rootCandidate)) {
return path.dirname(rootCandidate);
}
const dirPath = path.join(cloneDir, dir);
if (await fs.pathExists(dirPath)) {
const entries = await fs.readdir(dirPath, { withFileTypes: true });
for (const entry of entries) {
if (entry.isDirectory()) {
const subCandidate = path.join(dirPath, entry.name, 'module.yaml');
if (await fs.pathExists(subCandidate)) {
return path.dirname(subCandidate);
}
}
}
}
}
// Check repo root as last fallback
const rootCandidate = path.join(cloneDir, 'module.yaml');
if (await fs.pathExists(rootCandidate)) {
return path.dirname(rootCandidate);
}
// Nothing found: return configured path (preserves old behavior for error messaging)
return path.dirname(configuredPath);
} }
} }