@cleocode/caamp 0.4.0 → 0.4.1

package/dist/cli.js

@@ -4,6 +4,7 @@ import {
   RECOMMENDATION_ERROR_CODES,
   applyMcpInstallWithPolicy,
   buildServerConfig,
+  buildSkillSubPathCandidates,
   checkAllInjections,
   checkSkillUpdate,
   configureProviderGlobalAndProject,
@@ -40,6 +41,9 @@ import {
   removeSkill,
   removeSkillFromLock,
   resolveConfigPath,
+  resolvePreferredConfigScope,
+  resolveProviderConfigPath,
+  resolveProviderSkillsDir,
   scanDirectory,
   scanFile,
   selectProvidersByMinimumPriority,
@@ -49,7 +53,7 @@ import {
   tokenizeCriteriaValue,
   updateInstructionsSingleOperation,
   validateSkill
-} from "./chunk-ZYINKJDE.js";
+} from "./chunk-6HQDRJLS.js";
 
 // src/cli.ts
 import { Command } from "commander";
@@ -204,28 +208,6 @@ async function cloneGitLabRepo(owner, repo, ref, subPath) {
 }
 
 // src/commands/skills/install.ts
-function normalizeSkillSubPath(path) {
-  if (!path) return void 0;
-  const normalized = path.replace(/\\/g, "/").replace(/^\/+/, "").replace(/\/SKILL\.md$/i, "").trim();
-  return normalized.length > 0 ? normalized : void 0;
-}
-function marketplacePathCandidates(skillPath, parsedPath) {
-  const candidates = [];
-  const base = normalizeSkillSubPath(skillPath);
-  const parsed = normalizeSkillSubPath(parsedPath);
-  if (base) candidates.push(base);
-  if (parsed) candidates.push(parsed);
-  if (base && base.startsWith("skills/") && !base.startsWith(".claude/")) {
-    candidates.push(`.claude/${base}`);
-  }
-  if (parsed && parsed.startsWith("skills/") && !parsed.startsWith(".claude/")) {
-    candidates.push(`.claude/${parsed}`);
-  }
-  if (candidates.length === 0) {
-    candidates.push(void 0);
-  }
-  return Array.from(new Set(candidates));
-}
 function registerSkillsInstall(parent) {
   parent.command("install").description("Install a skill from GitHub, URL, or marketplace").argument("<source>", "Skill source (GitHub URL, owner/repo, @author/name)").option("-a, --agent <name>", "Target specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Install globally").option("-y, --yes", "Skip confirmation").option("--all", "Install to all detected agents").action(async (source, opts) => {
     let providers;
@@ -267,7 +249,7 @@ function registerSkillsInstall(parent) {
         process.exit(1);
       }
       try {
-        const subPathCandidates = marketplacePathCandidates(skill.path, parsed.path);
+        const subPathCandidates = buildSkillSubPathCandidates(skill.path, parsed.path);
         let cloneError;
         let cloned = false;
         for (const subPath of subPathCandidates) {
@@ -397,7 +379,6 @@ function registerSkillsRemove(parent) {
 
 // src/commands/skills/list.ts
 import pc4 from "picocolors";
-import { join as join3 } from "path";
 function registerSkillsList(parent) {
   parent.command("list").description("List installed skills").option("-g, --global", "List global skills").option("-a, --agent <name>", "List skills for specific agent").option("--json", "Output as JSON").action(async (opts) => {
     let dirs = [];
@@ -407,13 +388,13 @@ function registerSkillsList(parent) {
         console.error(pc4.red(`Provider not found: ${opts.agent}`));
         process.exit(1);
       }
-      dirs = opts.global ? [provider.pathSkills] : [join3(process.cwd(), provider.pathProjectSkills)];
+      dirs = opts.global ? [resolveProviderSkillsDir(provider, "global")] : [resolveProviderSkillsDir(provider, "project")];
     } else if (opts.global) {
       const providers = getInstalledProviders();
-      dirs = providers.map((p) => p.pathSkills).filter(Boolean);
+      dirs = providers.map((p) => resolveProviderSkillsDir(p, "global")).filter(Boolean);
     } else {
       const providers = getInstalledProviders();
-      dirs = providers.map((p) => join3(process.cwd(), p.pathProjectSkills)).filter(Boolean);
+      dirs = providers.map((p) => resolveProviderSkillsDir(p, "project")).filter(Boolean);
     }
     const skills = await discoverSkillsMulti(dirs);
     if (opts.json) {
@@ -864,11 +845,11 @@ ${outdated.length} skill(s) have updates available:
 import pc8 from "picocolors";
 import { writeFile, mkdir } from "fs/promises";
 import { existsSync as existsSync2 } from "fs";
-import { join as join4 } from "path";
+import { join as join3 } from "path";
 function registerSkillsInit(parent) {
   parent.command("init").description("Create a new SKILL.md template").argument("[name]", "Skill name").option("-d, --dir <path>", "Output directory", ".").action(async (name, opts) => {
     const skillName = name ?? "my-skill";
-    const skillDir = join4(opts.dir, skillName);
+    const skillDir = join3(opts.dir, skillName);
     if (existsSync2(skillDir)) {
       console.error(pc8.red(`Directory already exists: ${skillDir}`));
       process.exit(1);
@@ -897,11 +878,11 @@ Provide detailed instructions for the AI agent here.
 
 Show example inputs and expected outputs.
 `;
-    await writeFile(join4(skillDir, "SKILL.md"), template, "utf-8");
+    await writeFile(join3(skillDir, "SKILL.md"), template, "utf-8");
     console.log(pc8.green(`\u2713 Created skill template: ${skillDir}/SKILL.md`));
     console.log(pc8.dim("\nNext steps:"));
     console.log(pc8.dim("  1. Edit SKILL.md with your instructions"));
-    console.log(pc8.dim("  2. Validate: caamp skills validate " + join4(skillDir, "SKILL.md")));
+    console.log(pc8.dim("  2. Validate: caamp skills validate " + join3(skillDir, "SKILL.md")));
     console.log(pc8.dim("  3. Install: caamp skills install " + skillDir));
   });
 }
@@ -1101,7 +1082,7 @@ function registerMcpList(parent) {
     const providers = opts.agent ? [getProvider(opts.agent)].filter((p) => p !== void 0) : getInstalledProviders();
     const allEntries = [];
     for (const provider of providers) {
-      const scope = opts.global ? "global" : provider.configPathProject ? "project" : "global";
+      const scope = resolvePreferredConfigScope(provider, opts.global);
       const entries = await listMcpServers(provider, scope);
       allEntries.push(...entries);
     }
@@ -1302,7 +1283,6 @@ function registerInstructionsCommands(program2) {
 
 // src/commands/config.ts
 import pc18 from "picocolors";
-import { join as join5 } from "path";
 import { existsSync as existsSync5 } from "fs";
 function registerConfigCommand(program2) {
   const config = program2.command("config").description("View provider configuration");
@@ -1312,7 +1292,10 @@ function registerConfigCommand(program2) {
       console.error(pc18.red(`Provider not found: ${providerId}`));
       process.exit(1);
     }
-    const configPath = opts.global ? provider.configPathGlobal : provider.configPathProject ? join5(process.cwd(), provider.configPathProject) : provider.configPathGlobal;
+    const configPath = resolveProviderConfigPath(
+      provider,
+      opts.global ? "global" : "project"
+    ) ?? provider.configPathGlobal;
     if (!existsSync5(configPath)) {
       console.log(pc18.dim(`No config file at: ${configPath}`));
       return;
@@ -1341,8 +1324,9 @@ ${provider.toolName} config (${configPath}):
     if (scope === "global") {
       console.log(provider.configPathGlobal);
     } else {
-      if (provider.configPathProject) {
-        console.log(join5(process.cwd(), provider.configPathProject));
+      const projectPath = resolveProviderConfigPath(provider, "project");
+      if (projectPath) {
+        console.log(projectPath);
       } else {
         console.log(pc18.dim(`${provider.toolName} has no project-level config`));
         console.log(provider.configPathGlobal);
@@ -1356,7 +1340,7 @@ import pc19 from "picocolors";
 import { execFileSync } from "child_process";
 import { existsSync as existsSync6, readdirSync, lstatSync } from "fs";
 import { homedir } from "os";
-import { join as join6 } from "path";
+import { join as join4 } from "path";
 var CAAMP_VERSION = "0.2.0";
 function getNodeVersion() {
   return process.version;
@@ -1432,7 +1416,7 @@ function checkInstalledProviders() {
 }
 function checkSkillSymlinks() {
   const checks = [];
-  const canonicalDir = join6(homedir(), ".agents", "skills");
+  const canonicalDir = join4(homedir(), ".agents", "skills");
   if (!existsSync6(canonicalDir)) {
     checks.push({ label: "0 canonical skills", status: "pass" });
     checks.push({ label: "No broken symlinks", status: "pass" });
@@ -1455,7 +1439,7 @@ function checkSkillSymlinks() {
     try {
       const entries = readdirSync(skillDir);
       for (const entry of entries) {
-        const fullPath = join6(skillDir, entry);
+        const fullPath = join4(skillDir, entry);
         try {
           const stat = lstatSync(fullPath);
           if (stat.isSymbolicLink()) {