diff --git a/tools/installer/external-official-modules.yaml b/tools/installer/external-official-modules.yaml index 6a2fa259d..b62f3dc21 100644 --- a/tools/installer/external-official-modules.yaml +++ b/tools/installer/external-official-modules.yaml @@ -4,7 +4,7 @@ modules: bmad-builder: url: https://github.com/bmad-code-org/bmad-builder - module-definition: src/module.yaml + module-definition: skills/module.yaml code: bmb name: "BMad Builder" description: "Agent and Builder" diff --git a/tools/installer/ide/platform-codes.yaml b/tools/installer/ide/platform-codes.yaml index 3f3e068be..e7046d32f 100644 --- a/tools/installer/ide/platform-codes.yaml +++ b/tools/installer/ide/platform-codes.yaml @@ -102,6 +102,13 @@ platforms: - .iflow/commands target_dir: .iflow/skills + junie: + name: "Junie" + preferred: false + installer: + target_dir: .agents/skills + ancestor_conflict_check: false + kilo: name: "KiloCoder" preferred: false diff --git a/tools/installer/modules/external-manager.js b/tools/installer/modules/external-manager.js index 467520163..fceb94e22 100644 --- a/tools/installer/modules/external-manager.js +++ b/tools/installer/modules/external-manager.js @@ -313,10 +313,41 @@ class ExternalModuleManager { // The module-definition specifies the path to module.yaml relative to repo root // We need to return the directory containing module.yaml - const moduleDefinitionPath = moduleInfo.moduleDefinition; // e.g., 'src/module.yaml' - const moduleDir = path.dirname(path.join(cloneDir, moduleDefinitionPath)); + const moduleDefinitionPath = moduleInfo.moduleDefinition; // e.g., 'skills/module.yaml' + 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); } } diff --git a/tools/platform-codes.yaml b/tools/platform-codes.yaml index f643d7aa6..7227af0ce 100644 --- a/tools/platform-codes.yaml +++ b/tools/platform-codes.yaml @@ -127,6 +127,12 @@ platforms: category: ide description: "AI-powered IDE with cascade flows" + junie: + name: "Junie" + preferred: false + category: cli + description: "AI coding agent by JetBrains" + ona: name: "Ona" preferred: false