@cleocode/caamp 1.0.1 → 1.0.3

package/dist/cli.js

@@ -32,6 +32,7 @@ import {
   installMcpServerToAll,
   installSkill,
   isCatalogAvailable,
+  isHuman,
   isMarketplaceScoped,
   isVerbose,
   listCanonicalSkills,
@@ -56,1019 +57,1187 @@ import {
   scanDirectory,
   scanFile,
   selectProvidersByMinimumPriority,
+  setHuman,
   setQuiet,
   setVerbose,
   toSarif,
   tokenizeCriteriaValue,
   updateInstructionsSingleOperation,
   validateSkill
-} from "./chunk-VAFYP7CI.js";
+} from "./chunk-PBHH6KMJ.js";
 
 // src/cli.ts
 import { Command } from "commander";
 
-// src/commands/providers.ts
-import pc from "picocolors";
-function registerProvidersCommand(program2) {
-  const providers = program2.command("providers").description("Manage AI agent providers");
-  providers.command("list").description("List all supported providers").option("--json", "Output as JSON").option("--tier <tier>", "Filter by priority tier (high, medium, low)").action(async (opts) => {
-    const all = opts.tier ? getProvidersByPriority(opts.tier) : getAllProviders();
-    if (opts.json) {
-      console.log(JSON.stringify(all, null, 2));
-      return;
-    }
-    console.log(pc.bold(`
-CAMP Provider Registry v${getRegistryVersion()}`));
-    console.log(pc.dim(`${getProviderCount()} providers
-`));
-    const tiers = ["high", "medium", "low"];
-    for (const tier of tiers) {
-      const tierProviders = all.filter((p) => p.priority === tier);
-      if (tierProviders.length === 0) continue;
-      const tierLabel = tier === "high" ? pc.green("HIGH") : tier === "medium" ? pc.yellow("MEDIUM") : pc.dim("LOW");
-      console.log(`${tierLabel} priority:`);
-      for (const p of tierProviders) {
-        const status = p.status === "active" ? pc.green("active") : p.status === "beta" ? pc.yellow("beta") : pc.dim(p.status);
-        console.log(`  ${pc.bold(p.agentFlag.padEnd(20))} ${p.toolName.padEnd(22)} ${p.vendor.padEnd(16)} [${status}]`);
-      }
-      console.log();
-    }
-  });
-  providers.command("detect").description("Auto-detect installed providers").option("--json", "Output as JSON").option("--project", "Include project-level detection").action(async (opts) => {
-    const results = opts.project ? detectProjectProviders(process.cwd()) : detectAllProviders();
-    const installed = results.filter((r) => r.installed);
-    if (opts.json) {
-      console.log(JSON.stringify(installed.map((r) => ({
-        id: r.provider.id,
-        toolName: r.provider.toolName,
-        methods: r.methods,
-        projectDetected: r.projectDetected
-      })), null, 2));
-      return;
-    }
-    console.log(pc.bold(`
-Detected ${installed.length} installed providers:
-`));
-    for (const r of installed) {
-      const methods = r.methods.join(", ");
-      const project = r.projectDetected ? pc.green(" [project]") : "";
-      console.log(`  ${pc.green("\u2713")} ${pc.bold(r.provider.toolName.padEnd(22))} via ${pc.dim(methods)}${project}`);
-    }
-    const notInstalled = results.filter((r) => !r.installed);
-    if (notInstalled.length > 0) {
-      console.log(pc.dim(`
-  ${notInstalled.length} providers not detected`));
-    }
-    console.log();
-  });
-  providers.command("show").description("Show provider details").argument("<id>", "Provider ID or alias").option("--json", "Output as JSON").action(async (id, opts) => {
-    const provider = getProvider(id);
-    if (!provider) {
-      console.error(pc.red(`Provider not found: ${id}`));
-      process.exit(1);
-    }
-    if (opts.json) {
-      console.log(JSON.stringify(provider, null, 2));
-      return;
-    }
-    console.log(pc.bold(`
-${provider.toolName}`));
-    console.log(pc.dim(`by ${provider.vendor}
-`));
-    console.log(`  ID:              ${provider.id}`);
-    console.log(`  Flag:            --agent ${provider.agentFlag}`);
-    if (provider.aliases.length > 0) {
-      console.log(`  Aliases:         ${provider.aliases.join(", ")}`);
-    }
-    console.log(`  Status:          ${provider.status}`);
-    console.log(`  Priority:        ${provider.priority}`);
-    console.log();
-    console.log(`  Instruction:     ${provider.instructFile}`);
-    console.log(`  Config format:   ${provider.configFormat}`);
-    console.log(`  Config key:      ${provider.configKey}`);
-    console.log(`  Transports:      ${provider.supportedTransports.join(", ")}`);
-    console.log(`  Headers:         ${provider.supportsHeaders ? "yes" : "no"}`);
-    console.log();
-    console.log(pc.dim("  Paths:"));
-    console.log(`  Global dir:      ${provider.pathGlobal}`);
-    console.log(`  Project dir:     ${provider.pathProject || "(none)"}`);
-    console.log(`  Global config:   ${provider.configPathGlobal}`);
-    console.log(`  Project config:  ${provider.configPathProject || "(none)"}`);
-    console.log(`  Global skills:   ${provider.pathSkills}`);
-    console.log(`  Project skills:  ${provider.pathProjectSkills || "(none)"}`);
-    console.log();
-  });
-}
-
-// src/commands/skills/install.ts
-import { existsSync } from "fs";
-import pc2 from "picocolors";
+// src/commands/advanced/common.ts
+import { readFile } from "fs/promises";
 
-// src/core/sources/github.ts
-import { simpleGit } from "simple-git";
-import { mkdtemp, rm } from "fs/promises";
-import { tmpdir } from "os";
-import { join } from "path";
-async function cloneRepo(owner, repo, ref, subPath) {
-  const tmpDir = await mkdtemp(join(tmpdir(), "caamp-"));
-  const repoUrl = `https://github.com/${owner}/${repo}.git`;
-  const git = simpleGit();
-  const cloneOptions = ["--depth", "1"];
-  if (ref) {
-    cloneOptions.push("--branch", ref);
+// src/commands/advanced/lafs.ts
+import { randomUUID } from "crypto";
+import {
+  isRegisteredErrorCode
+} from "@cleocode/lafs-protocol";
+var LAFSCommandError = class extends Error {
+  code;
+  category;
+  recoverable;
+  suggestion;
+  retryAfterMs;
+  details;
+  constructor(code, message, suggestion, recoverable = true, details) {
+    super(message);
+    this.name = "LAFSCommandError";
+    this.code = code;
+    this.category = inferErrorCategory(code);
+    this.recoverable = recoverable;
+    this.suggestion = suggestion;
+    this.retryAfterMs = null;
+    this.details = details;
   }
-  await git.clone(repoUrl, tmpDir, cloneOptions);
-  const localPath = subPath ? join(tmpDir, subPath) : tmpDir;
+};
+function inferErrorCategory(code) {
+  if (code.includes("VALIDATION")) return "VALIDATION";
+  if (code.includes("NOT_FOUND")) return "NOT_FOUND";
+  if (code.includes("CONFLICT")) return "CONFLICT";
+  if (code.includes("AUTH")) return "AUTH";
+  if (code.includes("PERMISSION")) return "PERMISSION";
+  if (code.includes("RATE_LIMIT")) return "RATE_LIMIT";
+  if (code.includes("MIGRATION")) return "MIGRATION";
+  if (code.includes("CONTRACT")) return "CONTRACT";
+  return "INTERNAL";
+}
+function baseMeta(operation, mvi) {
   return {
-    localPath,
-    cleanup: async () => {
-      try {
-        await rm(tmpDir, { recursive: true });
-      } catch {
-      }
-    }
+    specVersion: "1.0.0",
+    schemaVersion: "1.0.0",
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    operation,
+    requestId: randomUUID(),
+    transport: "cli",
+    strict: true,
+    mvi,
+    contextVersion: 0
   };
 }
-
-// src/core/sources/gitlab.ts
-import { simpleGit as simpleGit2 } from "simple-git";
-import { mkdtemp as mkdtemp2, rm as rm2 } from "fs/promises";
-import { tmpdir as tmpdir2 } from "os";
-import { join as join2 } from "path";
-async function cloneGitLabRepo(owner, repo, ref, subPath) {
-  const tmpDir = await mkdtemp2(join2(tmpdir2(), "caamp-gl-"));
-  const repoUrl = `https://gitlab.com/${owner}/${repo}.git`;
-  const git = simpleGit2();
-  const cloneOptions = ["--depth", "1"];
-  if (ref) {
-    cloneOptions.push("--branch", ref);
-  }
-  await git.clone(repoUrl, tmpDir, cloneOptions);
-  const localPath = subPath ? join2(tmpDir, subPath) : tmpDir;
-  return {
-    localPath,
-    cleanup: async () => {
-      try {
-        await rm2(tmpDir, { recursive: true });
-      } catch {
-      }
-    }
+function emitSuccess(operation, result, mvi = true) {
+  const envelope = {
+    $schema: "https://lafs.dev/schemas/v1/envelope.schema.json",
+    _meta: {
+      ...baseMeta(operation, mvi)
+    },
+    success: true,
+    result,
+    error: null,
+    page: null
   };
+  console.log(JSON.stringify(envelope, null, 2));
 }
-
-// src/commands/skills/install.ts
-function registerSkillsInstall(parent) {
-  parent.command("install").description("Install a skill from GitHub, URL, marketplace, or ct-skills catalog").argument("[source]", "Skill source (GitHub URL, owner/repo, @author/name, skill-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").option("--profile <name>", "Install a ct-skills profile (minimal, core, recommended, full)").action(async (source, opts) => {
-    let providers;
-    if (opts.all) {
-      providers = getInstalledProviders();
-    } else if (opts.agent.length > 0) {
-      providers = opts.agent.map((a) => getProvider(a)).filter((p) => p !== void 0);
-    } else {
-      providers = getInstalledProviders();
-    }
-    if (providers.length === 0) {
-      console.error(pc2.red("No target providers found. Use --agent or --all."));
-      process.exit(1);
-    }
-    if (opts.profile) {
-      if (!isCatalogAvailable()) {
-        console.error(pc2.red("@cleocode/ct-skills is not installed. Run: npm install @cleocode/ct-skills"));
-        process.exit(1);
-      }
-      const profileSkills = resolveProfile(opts.profile);
-      if (profileSkills.length === 0) {
-        const available = listProfiles();
-        console.error(pc2.red(`Profile not found: ${opts.profile}`));
-        if (available.length > 0) {
-          console.log(pc2.dim("Available profiles: " + available.join(", ")));
-        }
-        process.exit(1);
-      }
-      console.log(`Installing profile ${pc2.bold(opts.profile)} (${profileSkills.length} skill(s))...`);
-      console.log(pc2.dim(`Target: ${providers.length} provider(s)`));
-      let installed = 0;
-      let failed = 0;
-      for (const name of profileSkills) {
-        const skillDir = getSkillDir(name);
-        try {
-          const result = await installSkill(
-            skillDir,
-            name,
-            providers,
-            opts.global ?? false
-          );
-          if (result.success) {
-            console.log(pc2.green(`  + ${name}`));
-            await recordSkillInstall(
-              name,
-              `@cleocode/ct-skills:${name}`,
-              `@cleocode/ct-skills:${name}`,
-              "package",
-              result.linkedAgents,
-              result.canonicalPath,
-              true
-            );
-            installed++;
-          } else {
-            console.log(pc2.yellow(`  ! ${name}: ${result.errors.join(", ")}`));
-            failed++;
-          }
-        } catch (err) {
-          console.log(pc2.red(`  x ${name}: ${err instanceof Error ? err.message : String(err)}`));
-          failed++;
+function emitError(operation, error, mvi = true) {
+  let envelope;
+  if (error instanceof LAFSCommandError) {
+    envelope = {
+      $schema: "https://lafs.dev/schemas/v1/envelope.schema.json",
+      _meta: {
+        ...baseMeta(operation, mvi)
+      },
+      success: false,
+      result: null,
+      error: {
+        code: isRegisteredErrorCode(error.code) ? error.code : "E_INTERNAL_UNEXPECTED",
+        message: error.message,
+        category: error.category,
+        retryable: error.recoverable,
+        retryAfterMs: error.retryAfterMs,
+        details: {
+          hint: error.suggestion,
+          ...error.details !== void 0 ? { payload: error.details } : {}
         }
-      }
-      console.log(`
-${pc2.green(`${installed} installed`)}, ${failed > 0 ? pc2.yellow(`${failed} failed`) : "0 failed"}`);
-      return;
-    }
-    if (!source) {
-      console.error(pc2.red("Missing required argument: source"));
-      console.log(pc2.dim("Usage: caamp skills install <source> or caamp skills install --profile <name>"));
-      process.exit(1);
-    }
-    console.log(pc2.dim(`Installing to ${providers.length} provider(s)...`));
-    let localPath;
-    let cleanup;
-    let skillName;
-    let sourceValue;
-    let sourceType;
-    if (isMarketplaceScoped(source)) {
-      console.log(pc2.dim(`Searching marketplace for ${source}...`));
-      const client = new MarketplaceClient();
-      let skill;
-      try {
-        skill = await client.getSkill(source);
-      } catch (error) {
-        console.error(pc2.red(`Marketplace lookup failed: ${formatNetworkError(error)}`));
-        process.exit(1);
-      }
-      if (!skill) {
-        console.error(pc2.red(`Skill not found: ${source}`));
-        process.exit(1);
-      }
-      console.log(`  Found: ${pc2.bold(skill.name)} by ${skill.author} (${pc2.dim(skill.repoFullName)})`);
-      const parsed = parseSource(skill.githubUrl);
-      if (parsed.type !== "github" || !parsed.owner || !parsed.repo) {
-        console.error(pc2.red("Could not resolve GitHub source"));
-        process.exit(1);
-      }
-      try {
-        const subPathCandidates = buildSkillSubPathCandidates(skill.path, parsed.path);
-        let cloneError;
-        let cloned = false;
-        for (const subPath of subPathCandidates) {
-          try {
-            const result = await cloneRepo(parsed.owner, parsed.repo, parsed.ref, subPath);
-            if (subPath && !existsSync(result.localPath)) {
-              await result.cleanup();
-              continue;
-            }
-            localPath = result.localPath;
-            cleanup = result.cleanup;
-            cloned = true;
-            break;
-          } catch (error) {
-            cloneError = error;
-          }
-        }
-        if (!cloned) {
-          throw cloneError ?? new Error("Unable to resolve skill path from marketplace metadata");
+      },
+      page: null
+    };
+  } else {
+    envelope = {
+      $schema: "https://lafs.dev/schemas/v1/envelope.schema.json",
+      _meta: {
+        ...baseMeta(operation, mvi)
+      },
+      success: false,
+      result: null,
+      error: {
+        code: "E_INTERNAL_UNEXPECTED",
+        message: error instanceof Error ? error.message : String(error),
+        category: "INTERNAL",
+        retryable: false,
+        retryAfterMs: null,
+        details: {
+          hint: "Rerun with --verbose and validate your inputs."
         }
-        skillName = skill.name;
-        sourceValue = skill.githubUrl;
-        sourceType = parsed.type;
-      } catch (error) {
-        console.error(pc2.red(`Failed to fetch source repository: ${formatNetworkError(error)}`));
-        process.exit(1);
+      },
+      page: null
+    };
+  }
+  console.error(JSON.stringify(envelope, null, 2));
+}
+async function runLafsCommand(command, mvi, action) {
+  try {
+    const result = await action();
+    emitSuccess(command, result, mvi);
+  } catch (error) {
+    emitError(command, error, mvi);
+    process.exit(1);
+  }
+}
+
+// src/commands/advanced/common.ts
+var VALID_PRIORITIES = /* @__PURE__ */ new Set(["high", "medium", "low"]);
+function parsePriority(value) {
+  if (!VALID_PRIORITIES.has(value)) {
+    throw new LAFSCommandError(
+      "E_ADVANCED_VALIDATION_PRIORITY",
+      `Invalid tier: ${value}`,
+      "Use one of: high, medium, low."
+    );
+  }
+  return value;
+}
+function resolveProviders(options) {
+  if (options.all) {
+    return getAllProviders();
+  }
+  const targetAgents = options.agent ?? [];
+  if (targetAgents.length === 0) {
+    return getInstalledProviders();
+  }
+  const providers = targetAgents.map((id) => getProvider(id)).filter((provider) => provider !== void 0);
+  if (providers.length !== targetAgents.length) {
+    const found = new Set(providers.map((provider) => provider.id));
+    const missing = targetAgents.filter((id) => !found.has(id));
+    throw new LAFSCommandError(
+      "E_ADVANCED_PROVIDER_NOT_FOUND",
+      `Unknown provider(s): ${missing.join(", ")}`,
+      "Check `caamp providers list` for valid provider IDs/aliases."
+    );
+  }
+  return providers;
+}
+async function readJsonFile(path) {
+  try {
+    const raw = await readFile(path, "utf-8");
+    return JSON.parse(raw);
+  } catch (error) {
+    throw new LAFSCommandError(
+      "E_ADVANCED_INPUT_JSON",
+      `Failed to read JSON file: ${path}`,
+      "Confirm the path exists and contains valid JSON.",
+      true,
+      { reason: error instanceof Error ? error.message : String(error) }
+    );
+  }
+}
+async function readMcpOperations(path) {
+  const value = await readJsonFile(path);
+  if (!Array.isArray(value)) {
+    throw new LAFSCommandError(
+      "E_ADVANCED_VALIDATION_MCP_ARRAY",
+      `MCP operations file must be a JSON array: ${path}`,
+      "Provide an array of objects with serverName and config fields."
+    );
+  }
+  const operations = [];
+  for (const [index, item] of value.entries()) {
+    if (!item || typeof item !== "object") {
+      throw new LAFSCommandError(
+        "E_ADVANCED_VALIDATION_MCP_ITEM",
+        `Invalid MCP operation at index ${index}`,
+        "Each operation must be an object with serverName and config."
+      );
+    }
+    const obj = item;
+    const serverName = obj.serverName;
+    const config = obj.config;
+    const scope = obj.scope;
+    if (typeof serverName !== "string" || serverName.length === 0) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_VALIDATION_MCP_NAME",
+        `Invalid serverName at index ${index}`,
+        "Set serverName to a non-empty string."
+      );
+    }
+    if (!config || typeof config !== "object" || Array.isArray(config)) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_VALIDATION_MCP_CONFIG",
+        `Invalid config at index ${index}`,
+        "Set config to an object matching McpServerConfig."
+      );
+    }
+    if (scope !== void 0 && scope !== "project" && scope !== "global") {
+      throw new LAFSCommandError(
+        "E_ADVANCED_VALIDATION_SCOPE",
+        `Invalid scope at index ${index}: ${String(scope)}`,
+        "Use scope value 'project' or 'global'."
+      );
+    }
+    operations.push({
+      serverName,
+      config,
+      ...scope ? { scope } : {}
+    });
+  }
+  return operations;
+}
+async function readSkillOperations(path) {
+  const value = await readJsonFile(path);
+  if (!Array.isArray(value)) {
+    throw new LAFSCommandError(
+      "E_ADVANCED_VALIDATION_SKILL_ARRAY",
+      `Skill operations file must be a JSON array: ${path}`,
+      "Provide an array of objects with sourcePath and skillName fields."
+    );
+  }
+  const operations = [];
+  for (const [index, item] of value.entries()) {
+    if (!item || typeof item !== "object") {
+      throw new LAFSCommandError(
+        "E_ADVANCED_VALIDATION_SKILL_ITEM",
+        `Invalid skill operation at index ${index}`,
+        "Each operation must be an object with sourcePath and skillName."
+      );
+    }
+    const obj = item;
+    const sourcePath = obj.sourcePath;
+    const skillName = obj.skillName;
+    const isGlobal = obj.isGlobal;
+    if (typeof sourcePath !== "string" || sourcePath.length === 0) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_VALIDATION_SKILL_SOURCE",
+        `Invalid sourcePath at index ${index}`,
+        "Set sourcePath to a non-empty string."
+      );
+    }
+    if (typeof skillName !== "string" || skillName.length === 0) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_VALIDATION_SKILL_NAME",
+        `Invalid skillName at index ${index}`,
+        "Set skillName to a non-empty string."
+      );
+    }
+    if (isGlobal !== void 0 && typeof isGlobal !== "boolean") {
+      throw new LAFSCommandError(
+        "E_ADVANCED_VALIDATION_SKILL_SCOPE",
+        `Invalid isGlobal value at index ${index}`,
+        "Set isGlobal to true or false when provided."
+      );
+    }
+    operations.push({
+      sourcePath,
+      skillName,
+      ...isGlobal !== void 0 ? { isGlobal } : {}
+    });
+  }
+  return operations;
+}
+async function readTextInput(inlineContent, filePath) {
+  if (inlineContent && filePath) {
+    throw new LAFSCommandError(
+      "E_ADVANCED_VALIDATION_INPUT_MODE",
+      "Provide either inline content or a content file, not both.",
+      "Use --content OR --content-file."
+    );
+  }
+  if (inlineContent) return inlineContent;
+  if (!filePath) return void 0;
+  try {
+    return await readFile(filePath, "utf-8");
+  } catch (error) {
+    throw new LAFSCommandError(
+      "E_ADVANCED_INPUT_TEXT",
+      `Failed to read content file: ${filePath}`,
+      "Confirm the file exists and is readable.",
+      true,
+      { reason: error instanceof Error ? error.message : String(error) }
+    );
+  }
+}
+
+// src/commands/advanced/providers.ts
+function registerAdvancedProviders(parent) {
+  parent.command("providers").description("Select providers by priority using advanced wrapper logic").option("-a, --agent <name>", "Target specific provider(s)", (v, prev) => [...prev, v], []).option("--all", "Use all registry providers (not only detected)").option("--min-tier <tier>", "Minimum priority tier: high|medium|low", "low").option("--details", "Include full provider objects").action(async (opts) => runLafsCommand("advanced.providers", !opts.details, async () => {
+    const providers = resolveProviders({ all: opts.all, agent: opts.agent });
+    const minTier = parsePriority(opts.minTier);
+    const selected = selectProvidersByMinimumPriority(providers, minTier);
+    return {
+      objective: "Filter providers by minimum priority tier",
+      constraints: {
+        minTier,
+        selectionMode: opts.all ? "registry" : "detected-or-explicit"
+      },
+      acceptanceCriteria: {
+        selectedCount: selected.length,
+        orderedByPriority: true
+      },
+      data: opts.details ? selected : selected.map((provider) => ({
+        id: provider.id,
+        priority: provider.priority,
+        status: provider.status,
+        configFormat: provider.configFormat
+      }))
+    };
+  }));
+}
+
+// src/commands/advanced/batch.ts
+function registerAdvancedBatch(parent) {
+  parent.command("batch").description("Run rollback-capable batch install for MCP + skills").option("-a, --agent <name>", "Target specific provider(s)", (v, prev) => [...prev, v], []).option("--all", "Use all registry providers (not only detected)").option("--min-tier <tier>", "Minimum priority tier: high|medium|low", "low").option("--mcp-file <path>", "JSON file containing McpBatchOperation[]").option("--skills-file <path>", "JSON file containing SkillBatchOperation[]").option("--project-dir <path>", "Project directory to resolve project-scope paths").option("--details", "Include detailed operation result").action(async (opts) => runLafsCommand("advanced.batch", !opts.details, async () => {
+    const baseProviders = resolveProviders({ all: opts.all, agent: opts.agent });
+    const minimumPriority = parsePriority(opts.minTier);
+    const providers = selectProvidersByMinimumPriority(baseProviders, minimumPriority);
+    const mcp = opts.mcpFile ? await readMcpOperations(opts.mcpFile) : [];
+    const skills = opts.skillsFile ? await readSkillOperations(opts.skillsFile) : [];
+    if (mcp.length === 0 && skills.length === 0) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_VALIDATION_NO_OPS",
+        "No operations provided.",
+        "Provide --mcp-file and/or --skills-file."
+      );
+    }
+    if (providers.length === 0) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_NO_TARGET_PROVIDERS",
+        "No target providers resolved for this batch operation.",
+        "Use --all or pass provider IDs with --agent."
+      );
+    }
+    const result = await installBatchWithRollback({
+      providers,
+      minimumPriority,
+      mcp,
+      skills,
+      projectDir: opts.projectDir
+    });
+    if (!result.success) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_BATCH_FAILED",
+        result.error ?? "Batch operation failed.",
+        "Check rollbackErrors and input configs, then retry.",
+        true,
+        result
+      );
+    }
+    return {
+      objective: "Install MCP and skills with rollback safety",
+      constraints: {
+        minimumPriority,
+        providerCount: providers.length,
+        mcpOps: mcp.length,
+        skillOps: skills.length
+      },
+      acceptanceCriteria: {
+        success: result.success,
+        rollbackPerformed: result.rollbackPerformed
+      },
+      data: opts.details ? result : {
+        providerCount: result.providerIds.length,
+        mcpApplied: result.mcpApplied,
+        skillsApplied: result.skillsApplied,
+        rollbackPerformed: result.rollbackPerformed
       }
-    } else {
-      const parsed = parseSource(source);
-      skillName = parsed.inferredName;
-      sourceValue = parsed.value;
-      sourceType = parsed.type;
-      if (parsed.type === "github" && parsed.owner && parsed.repo) {
-        try {
-          const result = await cloneRepo(parsed.owner, parsed.repo, parsed.ref, parsed.path);
-          localPath = result.localPath;
-          cleanup = result.cleanup;
-        } catch (error) {
-          console.error(pc2.red(`Failed to clone GitHub repository: ${formatNetworkError(error)}`));
-          process.exit(1);
-        }
-      } else if (parsed.type === "gitlab" && parsed.owner && parsed.repo) {
-        try {
-          const result = await cloneGitLabRepo(parsed.owner, parsed.repo, parsed.ref, parsed.path);
-          localPath = result.localPath;
-          cleanup = result.cleanup;
-        } catch (error) {
-          console.error(pc2.red(`Failed to clone GitLab repository: ${formatNetworkError(error)}`));
-          process.exit(1);
-        }
-      } else if (parsed.type === "local") {
-        localPath = parsed.value;
-        const discovered = await discoverSkill(localPath);
-        if (discovered) {
-          skillName = discovered.name;
-        }
-      } else if (parsed.type === "package") {
-        if (!isCatalogAvailable()) {
-          console.error(pc2.red("@cleocode/ct-skills is not installed. Run: npm install @cleocode/ct-skills"));
-          process.exit(1);
-        }
-        const catalogSkill = getSkill(parsed.inferredName);
-        if (catalogSkill) {
-          localPath = getSkillDir(catalogSkill.name);
-          skillName = catalogSkill.name;
-          sourceValue = `@cleocode/ct-skills:${catalogSkill.name}`;
-          sourceType = "package";
-          console.log(`  Found in catalog: ${pc2.bold(catalogSkill.name)} v${catalogSkill.version} (${pc2.dim(catalogSkill.category)})`);
-        } else {
-          console.error(pc2.red(`Skill not found in catalog: ${parsed.inferredName}`));
-          console.log(pc2.dim("Available skills: " + listSkills().join(", ")));
-          process.exit(1);
-        }
-      } else {
-        console.error(pc2.red(`Unsupported source type: ${parsed.type}`));
-        process.exit(1);
+    };
+  }));
+}
+
+// src/commands/advanced/conflicts.ts
+function registerAdvancedConflicts(parent) {
+  parent.command("conflicts").description("Preflight MCP conflict detection across providers").requiredOption("--mcp-file <path>", "JSON file containing McpBatchOperation[]").option("-a, --agent <name>", "Target specific provider(s)", (v, prev) => [...prev, v], []).option("--all", "Use all registry providers (not only detected)").option("--min-tier <tier>", "Minimum priority tier: high|medium|low", "low").option("--project-dir <path>", "Project directory to resolve project-scope paths").option("--details", "Include full conflict list").action(async (opts) => runLafsCommand("advanced.conflicts", !opts.details, async () => {
+    const baseProviders = resolveProviders({ all: opts.all, agent: opts.agent });
+    const minimumPriority = parsePriority(opts.minTier);
+    const providers = selectProvidersByMinimumPriority(baseProviders, minimumPriority);
+    const operations = await readMcpOperations(opts.mcpFile);
+    if (providers.length === 0) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_NO_TARGET_PROVIDERS",
+        "No target providers resolved for conflict detection.",
+        "Use --all or pass provider IDs with --agent."
+      );
+    }
+    const conflicts = await detectMcpConfigConflicts(
+      providers,
+      operations,
+      opts.projectDir
+    );
+    const countByCode = conflicts.reduce((acc, conflict) => {
+      acc[conflict.code] = (acc[conflict.code] ?? 0) + 1;
+      return acc;
+    }, {});
+    return {
+      objective: "Detect MCP configuration conflicts before mutation",
+      constraints: {
+        minimumPriority,
+        providerCount: providers.length,
+        operationCount: operations.length
+      },
+      acceptanceCriteria: {
+        conflictCount: conflicts.length
+      },
+      data: opts.details ? conflicts : {
+        conflictCount: conflicts.length,
+        countByCode,
+        sample: conflicts.slice(0, 5)
       }
+    };
+  }));
+}
+
+// src/commands/advanced/apply.ts
+var VALID_POLICIES = /* @__PURE__ */ new Set(["fail", "skip", "overwrite"]);
+function parsePolicy(value) {
+  if (!VALID_POLICIES.has(value)) {
+    throw new LAFSCommandError(
+      "E_ADVANCED_VALIDATION_POLICY",
+      `Invalid policy: ${value}`,
+      "Use one of: fail, skip, overwrite."
+    );
+  }
+  return value;
+}
+function registerAdvancedApply(parent) {
+  parent.command("apply").description("Apply MCP operations with configurable conflict policy").requiredOption("--mcp-file <path>", "JSON file containing McpBatchOperation[]").option("--policy <policy>", "Conflict policy: fail|skip|overwrite", "fail").option("-a, --agent <name>", "Target specific provider(s)", (v, prev) => [...prev, v], []).option("--all", "Use all registry providers (not only detected)").option("--min-tier <tier>", "Minimum priority tier: high|medium|low", "low").option("--project-dir <path>", "Project directory to resolve project-scope paths").option("--details", "Include detailed apply result").action(async (opts) => runLafsCommand("advanced.apply", !opts.details, async () => {
+    const baseProviders = resolveProviders({ all: opts.all, agent: opts.agent });
+    const minimumPriority = parsePriority(opts.minTier);
+    const providers = selectProvidersByMinimumPriority(baseProviders, minimumPriority);
+    const operations = await readMcpOperations(opts.mcpFile);
+    const policy = parsePolicy(opts.policy);
+    if (providers.length === 0) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_NO_TARGET_PROVIDERS",
+        "No target providers resolved for apply operation.",
+        "Use --all or pass provider IDs with --agent."
+      );
     }
-    try {
-      if (!localPath) {
-        throw new Error("No local skill path resolved for installation");
-      }
-      const result = await installSkill(
-        localPath,
-        skillName,
-        providers,
-        opts.global ?? false
+    const result = await applyMcpInstallWithPolicy(
+      providers,
+      operations,
+      policy,
+      opts.projectDir
+    );
+    if (policy === "fail" && result.conflicts.length > 0) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_CONFLICTS_BLOCKING",
+        "Conflicts detected and policy is set to fail.",
+        "Run `caamp advanced conflicts` to inspect, or rerun with --policy skip/overwrite.",
+        true,
+        result
       );
-      if (result.success) {
-        console.log(pc2.green(`
-\u2713 Installed ${pc2.bold(skillName)}`));
-        console.log(`  Canonical: ${pc2.dim(result.canonicalPath)}`);
-        console.log(`  Linked to: ${result.linkedAgents.join(", ")}`);
-        const isGlobal = sourceType === "package" ? true : opts.global ?? false;
-        await recordSkillInstall(
-          skillName,
-          sourceValue,
-          sourceValue,
-          sourceType,
-          result.linkedAgents,
-          result.canonicalPath,
-          isGlobal
-        );
-      }
-      if (result.errors.length > 0) {
-        console.log(pc2.yellow("\nWarnings:"));
-        for (const err of result.errors) {
-          console.log(`  ${pc2.yellow("!")} ${err}`);
-        }
-      }
-    } finally {
-      if (cleanup) await cleanup();
     }
-  });
+    const failedWrites = result.applied.filter((entry) => !entry.success);
+    if (failedWrites.length > 0) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_APPLY_WRITE_FAILED",
+        "One or more MCP writes failed.",
+        "Check result details, fix provider config issues, and retry.",
+        true,
+        result
+      );
+    }
+    return {
+      objective: "Apply MCP operations with policy-driven conflict handling",
+      constraints: {
+        policy,
+        minimumPriority,
+        providerCount: providers.length,
+        operationCount: operations.length
+      },
+      acceptanceCriteria: {
+        conflicts: result.conflicts.length,
+        writesSucceeded: result.applied.length
+      },
+      data: opts.details ? result : {
+        conflicts: result.conflicts.length,
+        applied: result.applied.length,
+        skipped: result.skipped.length
+      }
+    };
+  }));
 }
 
-// src/commands/skills/remove.ts
-import pc3 from "picocolors";
-function registerSkillsRemove(parent) {
-  parent.command("remove").description("Remove installed skill(s)").argument("[name]", "Skill name to remove").option("-g, --global", "Remove from global scope").option("-y, --yes", "Skip confirmation").action(async (name, opts) => {
-    const providers = getInstalledProviders();
-    if (name) {
-      const result = await removeSkill(name, providers, opts.global ?? false);
-      if (result.removed.length > 0) {
-        console.log(pc3.green(`\u2713 Removed ${pc3.bold(name)} from: ${result.removed.join(", ")}`));
-        await removeSkillFromLock(name);
-      } else {
-        console.log(pc3.yellow(`Skill ${name} not found in any provider.`));
+// src/commands/advanced/instructions.ts
+function registerAdvancedInstructions(parent) {
+  parent.command("instructions").description("Single-operation instruction update across providers").option("-a, --agent <name>", "Target specific provider(s)", (v, prev) => [...prev, v], []).option("--all", "Use all registry providers (not only detected)").option("--min-tier <tier>", "Minimum priority tier: high|medium|low", "low").option("--scope <scope>", "Instruction scope: project|global", "project").option("--content <text>", "Inline content to inject").option("--content-file <path>", "File containing content to inject").option("--project-dir <path>", "Project directory to resolve project-scope paths").option("--details", "Include detailed per-file actions").action(async (opts) => runLafsCommand("advanced.instructions", !opts.details, async () => {
+    const minimumPriority = parsePriority(opts.minTier);
+    const baseProviders = resolveProviders({ all: opts.all, agent: opts.agent });
+    const providers = selectProvidersByMinimumPriority(baseProviders, minimumPriority);
+    const scope = opts.scope === "global" ? "global" : opts.scope === "project" ? "project" : null;
+    if (!scope) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_VALIDATION_SCOPE",
+        `Invalid scope: ${opts.scope}`,
+        "Use --scope project or --scope global."
+      );
+    }
+    const content = await readTextInput(opts.content, opts.contentFile);
+    if (!content || content.trim().length === 0) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_VALIDATION_CONTENT",
+        "Instruction content is required.",
+        "Provide --content or --content-file with non-empty text."
+      );
+    }
+    if (providers.length === 0) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_NO_TARGET_PROVIDERS",
+        "No target providers resolved for instruction update.",
+        "Use --all or pass provider IDs with --agent."
+      );
+    }
+    const summary = await updateInstructionsSingleOperation(
+      providers,
+      content,
+      scope,
+      opts.projectDir
+    );
+    return {
+      objective: "Update instruction files across providers in one operation",
+      constraints: {
+        scope,
+        minimumPriority,
+        providerCount: providers.length
+      },
+      acceptanceCriteria: {
+        updatedFiles: summary.updatedFiles
+      },
+      data: opts.details ? summary : {
+        updatedFiles: summary.updatedFiles,
+        files: summary.actions.map((entry) => ({
+          file: entry.file,
+          action: entry.action
+        }))
       }
-      if (result.errors.length > 0) {
-        for (const err of result.errors) {
-          console.log(pc3.red(`  ${err}`));
+    };
+  }));
+}
+
+// src/commands/advanced/configure.ts
+function registerAdvancedConfigure(parent) {
+  parent.command("configure").description("Configure global + project scope for one provider in one operation").requiredOption("-a, --agent <name>", "Target provider ID or alias").option("--global-mcp-file <path>", "JSON file for global MCP operations").option("--project-mcp-file <path>", "JSON file for project MCP operations").option("--instruction <text>", "Instruction content for both scopes").option("--instruction-file <path>", "Instruction content file for both scopes").option("--instruction-global <text>", "Instruction content for global scope").option("--instruction-global-file <path>", "Instruction content file for global scope").option("--instruction-project <text>", "Instruction content for project scope").option("--instruction-project-file <path>", "Instruction content file for project scope").option("--project-dir <path>", "Project directory to resolve project-scope paths").option("--details", "Include detailed write results").action(async (opts) => runLafsCommand("advanced.configure", !opts.details, async () => {
+    const provider = getProvider(opts.agent);
+    if (!provider) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_PROVIDER_NOT_FOUND",
+        `Unknown provider: ${opts.agent}`,
+        "Check `caamp providers list` for valid provider IDs/aliases."
+      );
+    }
+    const globalMcp = opts.globalMcpFile ? await readMcpOperations(opts.globalMcpFile) : [];
+    const projectMcp = opts.projectMcpFile ? await readMcpOperations(opts.projectMcpFile) : [];
+    const sharedInstruction = await readTextInput(opts.instruction, opts.instructionFile);
+    const globalInstruction = await readTextInput(
+      opts.instructionGlobal,
+      opts.instructionGlobalFile
+    );
+    const projectInstruction = await readTextInput(
+      opts.instructionProject,
+      opts.instructionProjectFile
+    );
+    let instructionContent;
+    if (globalInstruction || projectInstruction) {
+      instructionContent = {
+        ...globalInstruction ? { global: globalInstruction } : {},
+        ...projectInstruction ? { project: projectInstruction } : {}
+      };
+    } else if (sharedInstruction) {
+      instructionContent = sharedInstruction;
+    }
+    if (globalMcp.length === 0 && projectMcp.length === 0 && !instructionContent) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_VALIDATION_NO_OPS",
+        "No configuration operations were provided.",
+        "Provide MCP files and/or instruction content."
+      );
+    }
+    const result = await configureProviderGlobalAndProject(provider, {
+      globalMcp: globalMcp.map((entry) => ({
+        serverName: entry.serverName,
+        config: entry.config
+      })),
+      projectMcp: projectMcp.map((entry) => ({
+        serverName: entry.serverName,
+        config: entry.config
+      })),
+      instructionContent,
+      projectDir: opts.projectDir
+    });
+    const globalFailures = result.mcp.global.filter((entry) => !entry.success);
+    const projectFailures = result.mcp.project.filter((entry) => !entry.success);
+    if (globalFailures.length > 0 || projectFailures.length > 0) {
+      throw new LAFSCommandError(
+        "E_ADVANCED_CONFIGURE_FAILED",
+        "One or more MCP writes failed during configure operation.",
+        "Inspect the failed write entries and provider config paths, then retry.",
+        true,
+        result
+      );
+    }
+    return {
+      objective: "Configure global and project settings in one operation",
+      constraints: {
+        provider: provider.id,
+        globalMcpOps: globalMcp.length,
+        projectMcpOps: projectMcp.length,
+        instructionMode: instructionContent ? typeof instructionContent === "string" ? "shared" : "scoped" : "none"
+      },
+      acceptanceCriteria: {
+        globalWrites: result.mcp.global.length,
+        projectWrites: result.mcp.project.length
+      },
+      data: opts.details ? result : {
+        providerId: result.providerId,
+        configPaths: result.configPaths,
+        globalWrites: result.mcp.global.length,
+        projectWrites: result.mcp.project.length,
+        instructionUpdates: {
+          global: result.instructions.global?.size ?? 0,
+          project: result.instructions.project?.size ?? 0
         }
       }
-    } else {
-      const skills = await listCanonicalSkills();
-      if (skills.length === 0) {
-        console.log(pc3.dim("No skills installed."));
-        return;
-      }
-      console.log(pc3.bold("Installed skills:"));
-      for (const s of skills) {
-        console.log(`  ${s}`);
-      }
-      console.log(pc3.dim("\nUse: caamp skills remove <name>"));
-    }
-  });
+    };
+  }));
 }
 
-// src/commands/skills/list.ts
-import pc4 from "picocolors";
-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 = [];
-    if (opts.agent) {
-      const provider = getProvider(opts.agent);
-      if (!provider) {
-        console.error(pc4.red(`Provider not found: ${opts.agent}`));
-        process.exit(1);
-      }
-      dirs = opts.global ? [resolveProviderSkillsDir(provider, "global")] : [resolveProviderSkillsDir(provider, "project")];
-    } else if (opts.global) {
-      const providers = getInstalledProviders();
-      dirs = providers.map((p) => resolveProviderSkillsDir(p, "global")).filter(Boolean);
-    } else {
-      const providers = getInstalledProviders();
-      dirs = providers.map((p) => resolveProviderSkillsDir(p, "project")).filter(Boolean);
-    }
-    const skills = await discoverSkillsMulti(dirs);
-    if (opts.json) {
-      console.log(JSON.stringify(skills, null, 2));
-      return;
-    }
-    if (skills.length === 0) {
-      console.log(pc4.dim("No skills found."));
-      return;
-    }
-    console.log(pc4.bold(`
-${skills.length} skill(s) found:
-`));
-    for (const skill of skills) {
-      console.log(`  ${pc4.bold(skill.name.padEnd(30))} ${pc4.dim(skill.metadata.description ?? "")}`);
-    }
-    console.log();
-  });
+// src/commands/advanced/index.ts
+function registerAdvancedCommands(program2) {
+  const advanced = program2.command("advanced").description("LAFS-compliant wrappers for advanced orchestration APIs");
+  registerAdvancedProviders(advanced);
+  registerAdvancedBatch(advanced);
+  registerAdvancedConflicts(advanced);
+  registerAdvancedApply(advanced);
+  registerAdvancedInstructions(advanced);
+  registerAdvancedConfigure(advanced);
 }
 
-// src/commands/skills/find.ts
-import { randomUUID } from "crypto";
-import {
-  resolveOutputFormat
-} from "@cleocode/lafs-protocol";
-import pc5 from "picocolors";
-var SkillsFindValidationError = class extends Error {
-  code;
-  constructor(code, message) {
-    super(message);
-    this.code = code;
-    this.name = "SkillsFindValidationError";
-  }
-};
-function registerSkillsFind(parent) {
-  parent.command("find").description("Search marketplace for skills").argument("[query]", "Search query").option("--recommend", "Recommend skills from constraints").option("--top <n>", "Number of recommendation candidates", "3").option("--must-have <term>", "Required criteria term", (value, previous) => [...previous, value], []).option("--prefer <term>", "Preferred criteria term", (value, previous) => [...previous, value], []).option("--exclude <term>", "Excluded criteria term", (value, previous) => [...previous, value], []).option("--details", "Include expanded machine output").option("--human", "Force human-readable output").option("--json", "Output as JSON").option("--select <indexes>", "Pre-select recommendation ranks (comma-separated)").option("-l, --limit <n>", "Max results", "20").action(async (query, opts) => {
-    const operation = opts.recommend ? "skills.find.recommend" : "skills.find.search";
-    const details = Boolean(opts.details);
-    const mvi = !details;
-    let format;
-    try {
-      format = resolveOutputFormat({
-        jsonFlag: opts.json ?? false,
-        humanFlag: opts.human ?? false,
-        projectDefault: opts.recommend ? "json" : "human"
-      }).format;
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      if (opts.json) {
-        emitJsonError(operation, mvi, "E_FORMAT_CONFLICT", message, "VALIDATION");
-      } else {
-        console.error(pc5.red(message));
-      }
+// src/commands/config.ts
+import pc from "picocolors";
+import { existsSync } from "fs";
+function registerConfigCommand(program2) {
+  const config = program2.command("config").description("View provider configuration");
+  config.command("show").description("Show provider configuration").argument("<provider>", "Provider ID or alias").option("-g, --global", "Show global config").option("--json", "Output as JSON").action(async (providerId, opts) => {
+    const provider = getProvider(providerId);
+    if (!provider) {
+      console.error(pc.red(`Provider not found: ${providerId}`));
       process.exit(1);
     }
-    if (opts.recommend) {
-      try {
-        const top = parseTop(opts.top);
-        const mustHave = parseConstraintList(opts.mustHave);
-        const prefer = parseConstraintList(opts.prefer);
-        const exclude = parseConstraintList(opts.exclude);
-        validateCriteriaConflicts(mustHave, prefer, exclude);
-        const selectedRanks = parseSelectList(opts.select);
-        const seedQuery = buildSeedQuery(query, mustHave, prefer, exclude);
-        const recommendation = await recommendSkills(
-          seedQuery,
-          {
-            mustHave,
-            prefer,
-            exclude
-          },
-          {
-            top,
-            includeDetails: details
-          }
-        );
-        const options = normalizeRecommendationOptions(recommendation.ranking, details);
-        validateSelectedRanks(selectedRanks, options.length);
-        const selected = selectedRanks.length > 0 ? options.filter((option) => selectedRanks.includes(option.rank)) : [];
-        if (format === "json") {
-          const result = formatSkillRecommendations(recommendation, { mode: "json", details });
-          const resultOptions = Array.isArray(result.options) ? result.options : [];
-          const selectedObjects = resultOptions.filter(
-            (option) => selectedRanks.includes(Number(option.rank ?? 0))
-          );
-          const envelope = buildEnvelope(
-            operation,
-            mvi,
-            {
-              ...result,
-              selected: selectedObjects
-            },
-            null
-          );
-          console.log(JSON.stringify(envelope, null, 2));
-          return;
-        }
-        const human = formatSkillRecommendations(recommendation, { mode: "human", details });
-        console.log(human);
-        if (selected.length > 0) {
-          console.log(`Selected: ${selected.map((option) => option.scopedName).join(", ")}`);
-        }
-        return;
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        const errorCode = error instanceof SkillsFindValidationError ? error.code : error.code ?? RECOMMENDATION_ERROR_CODES.SOURCE_UNAVAILABLE;
-        const category = errorCode === RECOMMENDATION_ERROR_CODES.CRITERIA_CONFLICT ? "CONFLICT" : errorCode === RECOMMENDATION_ERROR_CODES.NO_MATCHES ? "NOT_FOUND" : errorCode === RECOMMENDATION_ERROR_CODES.QUERY_INVALID ? "VALIDATION" : "INTERNAL";
-        if (format === "json") {
-          emitJsonError(operation, mvi, errorCode, message, category, {
-            query: query ?? null
-          });
-        } else {
-          console.error(pc5.red(`Recommendation failed: ${message}`));
-        }
-        process.exit(1);
-      }
-    }
-    if (!query) {
-      console.log(pc5.dim("Usage: caamp skills find <query>"));
+    const configPath = resolveProviderConfigPath(
+      provider,
+      opts.global ? "global" : "project"
+    ) ?? provider.configPathGlobal;
+    if (!existsSync(configPath)) {
+      console.log(pc.dim(`No config file at: ${configPath}`));
       return;
     }
-    const limit = parseInt(opts.limit, 10);
-    const client = new MarketplaceClient();
-    if (format === "human") {
-      console.log(pc5.dim(`Searching marketplaces for "${query}"...
-`));
-    }
-    let results;
     try {
-      results = await client.search(query, limit);
-    } catch (error) {
-      const message = formatNetworkError(error);
-      if (format === "json") {
-        console.log(JSON.stringify({ error: message }));
+      const data = await readConfig(configPath, provider.configFormat);
+      if (opts.json) {
+        console.log(JSON.stringify(data, null, 2));
       } else {
-        console.error(pc5.red(`Marketplace search failed: ${message}`));
+        console.log(pc.bold(`
+${provider.toolName} config (${configPath}):
+`));
+        console.log(JSON.stringify(data, null, 2));
       }
+    } catch (err) {
+      console.error(pc.red(`Error reading config: ${err instanceof Error ? err.message : String(err)}`));
       process.exit(1);
     }
-    if (format === "json") {
-      console.log(JSON.stringify(results, null, 2));
-      return;
-    }
-    if (results.length === 0) {
-      console.log(pc5.yellow("No results found."));
-      return;
+  });
+  config.command("path").description("Show config file path").argument("<provider>", "Provider ID or alias").argument("[scope]", "Scope: project (default) or global", "project").action((providerId, scope) => {
+    const provider = getProvider(providerId);
+    if (!provider) {
+      console.error(pc.red(`Provider not found: ${providerId}`));
+      process.exit(1);
     }
-    for (const skill of results) {
-      const stars = skill.stars > 0 ? pc5.yellow(`\u2605 ${formatStars(skill.stars)}`) : "";
-      console.log(`  ${pc5.bold(skill.scopedName.padEnd(35))} ${stars}`);
-      console.log(`  ${pc5.dim(skill.description?.slice(0, 80) ?? "")}`);
-      console.log(`  ${pc5.dim(`from ${skill.source}`)}`);
-      console.log();
+    if (scope === "global") {
+      console.log(provider.configPathGlobal);
+    } else {
+      const projectPath = resolveProviderConfigPath(provider, "project");
+      if (projectPath) {
+        console.log(projectPath);
+      } else {
+        console.log(pc.dim(`${provider.toolName} has no project-level config`));
+        console.log(provider.configPathGlobal);
+      }
     }
-    console.log(pc5.dim("Install with: caamp skills install <scopedName>"));
   });
 }
-function formatStars(n) {
-  if (n >= 1e3) return `${(n / 1e3).toFixed(1)}k`;
-  return String(n);
+
+// src/commands/doctor.ts
+import pc2 from "picocolors";
+import { execFileSync } from "child_process";
+import { existsSync as existsSync2, readdirSync, lstatSync, readlinkSync } from "fs";
+import { homedir } from "os";
+import { join as join2 } from "path";
+
+// src/core/version.ts
+import { readFileSync } from "fs";
+import { dirname, join } from "path";
+import { fileURLToPath } from "url";
+var cachedVersion = null;
+function getCaampVersion() {
+  if (cachedVersion) return cachedVersion;
+  try {
+    const currentDir = dirname(fileURLToPath(import.meta.url));
+    const packageJsonPath = join(currentDir, "..", "package.json");
+    const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+    cachedVersion = packageJson.version ?? "0.0.0";
+  } catch {
+    cachedVersion = "0.0.0";
+  }
+  return cachedVersion;
 }
-function parseConstraintList(values) {
-  const normalized = values.flatMap((value) => tokenizeCriteriaValue(value));
-  return Array.from(new Set(normalized));
+
+// src/commands/doctor.ts
+function getNodeVersion() {
+  return process.version;
 }
-function parseTop(value) {
-  const parsed = Number.parseInt(value, 10);
-  if (!Number.isInteger(parsed) || parsed < 1 || parsed > 20) {
-    throw new SkillsFindValidationError(RECOMMENDATION_ERROR_CODES.QUERY_INVALID, "--top must be an integer between 1 and 20");
+function getNpmVersion() {
+  try {
+    return execFileSync("npm", ["--version"], { stdio: "pipe", encoding: "utf-8" }).trim();
+  } catch {
+    return null;
+  }
+}
+function checkEnvironment() {
+  const checks = [];
+  checks.push({ label: `Node.js ${getNodeVersion()}`, status: "pass" });
+  const npmVersion = getNpmVersion();
+  if (npmVersion) {
+    checks.push({ label: `npm ${npmVersion}`, status: "pass" });
+  } else {
+    checks.push({ label: "npm not found", status: "warn" });
+  }
+  checks.push({ label: `CAAMP v${getCaampVersion()}`, status: "pass" });
+  checks.push({ label: `${process.platform} ${process.arch}`, status: "pass" });
+  return { name: "Environment", checks };
+}
+function checkRegistry() {
+  const checks = [];
+  try {
+    const providers = getAllProviders();
+    const count = getProviderCount();
+    checks.push({ label: `${count} providers loaded`, status: "pass" });
+    const malformed = [];
+    for (const p of providers) {
+      if (!p.id || !p.toolName || !p.configKey || !p.configFormat) {
+        malformed.push(p.id || "(unknown)");
+      }
+    }
+    if (malformed.length === 0) {
+      checks.push({ label: "All entries valid", status: "pass" });
+    } else {
+      checks.push({
+        label: `${malformed.length} malformed entries`,
+        status: "fail",
+        detail: malformed.join(", ")
+      });
+    }
+  } catch (err) {
+    checks.push({
+      label: "Failed to load registry",
+      status: "fail",
+      detail: err instanceof Error ? err.message : String(err)
+    });
   }
-  return parsed;
+  return { name: "Registry", checks };
 }
-function parseSelectList(value) {
-  if (!value) return [];
-  const parsed = value.split(",").map((entry) => Number.parseInt(entry.trim(), 10)).filter((entry) => Number.isInteger(entry) && entry > 0);
-  return Array.from(new Set(parsed));
+function checkInstalledProviders() {
+  const checks = [];
+  try {
+    const results = detectAllProviders();
+    const installed = results.filter((r) => r.installed);
+    checks.push({ label: `${installed.length} found`, status: "pass" });
+    for (const r of installed) {
+      const methods = r.methods.join(", ");
+      checks.push({ label: `${r.provider.toolName} (${methods})`, status: "pass" });
+    }
+  } catch (err) {
+    checks.push({
+      label: "Detection failed",
+      status: "fail",
+      detail: err instanceof Error ? err.message : String(err)
+    });
+  }
+  return { name: "Installed Providers", checks };
 }
-function buildSeedQuery(query, mustHave, prefer, exclude) {
-  if (query && query.trim().length > 0) {
-    return query;
+function checkSkillSymlinks() {
+  const checks = [];
+  const canonicalDir = CANONICAL_SKILLS_DIR;
+  if (!existsSync2(canonicalDir)) {
+    checks.push({ label: "0 canonical skills", status: "pass" });
+    checks.push({ label: "No broken symlinks", status: "pass" });
+    return { name: "Skills", checks };
   }
-  const seedTerms = [...mustHave, ...prefer, ...exclude].filter((term) => term.length > 0);
-  if (seedTerms.length > 0) {
-    return seedTerms.join(" ");
+  let canonicalCount = 0;
+  let canonicalNames = [];
+  try {
+    canonicalNames = readdirSync(canonicalDir).filter((name) => {
+      const full = join2(canonicalDir, name);
+      try {
+        const stat = lstatSync(full);
+        return stat.isDirectory() || stat.isSymbolicLink();
+      } catch {
+        return false;
+      }
+    });
+    canonicalCount = canonicalNames.length;
+    checks.push({ label: `${canonicalCount} canonical skills`, status: "pass" });
+  } catch {
+    checks.push({ label: "Cannot read skills directory", status: "warn" });
+    return { name: "Skills", checks };
   }
-  throw new SkillsFindValidationError(
-    RECOMMENDATION_ERROR_CODES.QUERY_INVALID,
-    "Recommendation mode requires a query or at least one criteria flag."
-  );
-}
-function normalizeRecommendationOptions(ranking, details) {
-  return ranking.map((entry, index) => {
-    const whyCodes = entry.reasons.map((reason) => reason.code);
-    return {
-      rank: index + 1,
-      scopedName: entry.skill.scopedName,
-      description: entry.skill.description,
-      score: entry.score,
-      why: whyCodes.length > 0 ? whyCodes.join(", ") : "score-based match",
-      source: entry.skill.source,
-      ...details ? {
-        evidence: {
-          reasons: entry.reasons,
-          breakdown: entry.breakdown
+  const broken = [];
+  const stale = [];
+  const results = detectAllProviders();
+  const installed = results.filter((r) => r.installed);
+  for (const r of installed) {
+    const provider = r.provider;
+    const skillDir = provider.pathSkills;
+    if (!existsSync2(skillDir)) continue;
+    try {
+      const entries = readdirSync(skillDir);
+      for (const entry of entries) {
+        const fullPath = join2(skillDir, entry);
+        try {
+          const stat = lstatSync(fullPath);
+          if (!stat.isSymbolicLink()) continue;
+          if (!existsSync2(fullPath)) {
+            broken.push(`${provider.id}/${entry}`);
+          } else {
+            const target = readlinkSync(fullPath);
+            const isCanonical = target.includes("/.agents/skills/") || target.includes("\\.agents\\skills\\");
+            if (!isCanonical) {
+              stale.push(`${provider.id}/${entry}`);
+            }
+          }
+        } catch {
         }
-      } : {}
-    };
-  });
-}
-function validateCriteriaConflicts(mustHave, prefer, exclude) {
-  const overlap = mustHave.filter((term) => exclude.includes(term));
-  if (overlap.length > 0) {
-    throw new SkillsFindValidationError(
-      RECOMMENDATION_ERROR_CODES.CRITERIA_CONFLICT,
-      "A criteria term cannot be both required and excluded."
-    );
+      }
+    } catch {
+    }
   }
-  const preferOverlap = prefer.filter((term) => exclude.includes(term));
-  if (preferOverlap.length > 0) {
-    throw new SkillsFindValidationError(
-      RECOMMENDATION_ERROR_CODES.CRITERIA_CONFLICT,
-      "A criteria term cannot be both preferred and excluded."
-    );
+  if (broken.length === 0) {
+    checks.push({ label: "No broken symlinks", status: "pass" });
+  } else {
+    checks.push({
+      label: `${broken.length} broken symlink${broken.length !== 1 ? "s" : ""}`,
+      status: "warn",
+      detail: broken.join(", ")
+    });
   }
-}
-function validateSelectedRanks(selectedRanks, total) {
-  for (const rank of selectedRanks) {
-    if (rank < 1 || rank > total) {
-      throw new SkillsFindValidationError(
-        RECOMMENDATION_ERROR_CODES.QUERY_INVALID,
-        `--select rank ${rank} is out of range (1-${total}).`
-      );
-    }
+  if (stale.length === 0) {
+    checks.push({ label: "No stale symlinks", status: "pass" });
+  } else {
+    checks.push({
+      label: `${stale.length} stale symlink${stale.length !== 1 ? "s" : ""} (not pointing to ~/.agents/skills/)`,
+      status: "warn",
+      detail: stale.join(", ")
+    });
   }
+  return { name: "Skills", checks };
 }
-function buildEnvelope(operation, mvi, result, error) {
-  return {
-    $schema: "https://lafs.dev/schemas/v1/envelope.schema.json",
-    _meta: {
-      specVersion: "1.0.0",
-      schemaVersion: "1.0.0",
-      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-      operation,
-      requestId: randomUUID(),
-      transport: "cli",
-      strict: true,
-      mvi,
-      contextVersion: 0
-    },
-    success: error === null,
-    result,
-    error,
-    page: null
-  };
-}
-function emitJsonError(operation, mvi, code, message, category, details = {}) {
-  const envelope = buildEnvelope(operation, mvi, null, {
-    code,
-    message,
-    category,
-    retryable: false,
-    retryAfterMs: null,
-    details
-  });
-  console.error(JSON.stringify(envelope, null, 2));
-}
-
-// src/commands/skills/check.ts
-import pc6 from "picocolors";
-function registerSkillsCheck(parent) {
-  parent.command("check").description("Check for available skill updates").option("--json", "Output as JSON").action(async (opts) => {
-    const tracked = await getTrackedSkills();
-    const entries = Object.entries(tracked);
-    if (entries.length === 0) {
-      console.log(pc6.dim("No tracked skills."));
-      return;
-    }
-    console.log(pc6.dim(`Checking ${entries.length} skill(s) for updates...
-`));
-    const results = [];
-    for (const [name, entry] of entries) {
-      const update = await checkSkillUpdate(name);
-      results.push({ name, entry, ...update });
+async function checkLockFile() {
+  const checks = [];
+  try {
+    const lock = await readLockFile();
+    checks.push({ label: "Lock file valid", status: "pass" });
+    const lockSkillNames = Object.keys(lock.skills);
+    checks.push({ label: `${lockSkillNames.length} skill entries`, status: "pass" });
+    const orphaned = [];
+    for (const [name, entry] of Object.entries(lock.skills)) {
+      if (entry.canonicalPath && !existsSync2(entry.canonicalPath)) {
+        orphaned.push(name);
+      }
     }
-    if (opts.json) {
-      console.log(JSON.stringify(results, null, 2));
-      return;
+    if (orphaned.length === 0) {
+      checks.push({ label: "0 orphaned entries", status: "pass" });
+    } else {
+      checks.push({
+        label: `${orphaned.length} orphaned skill${orphaned.length !== 1 ? "s" : ""} (in lock, missing from disk)`,
+        status: "warn",
+        detail: orphaned.join(", ")
+      });
     }
-    let updatesAvailable = 0;
-    for (const r of results) {
-      let statusLabel;
-      if (r.status === "update-available") {
-        statusLabel = pc6.yellow("update available");
-        updatesAvailable++;
-      } else if (r.status === "up-to-date") {
-        statusLabel = pc6.green("up to date");
+    const canonicalDir = CANONICAL_SKILLS_DIR;
+    if (existsSync2(canonicalDir)) {
+      const onDisk = readdirSync(canonicalDir).filter((name) => {
+        try {
+          const stat = lstatSync(join2(canonicalDir, name));
+          return stat.isDirectory() || stat.isSymbolicLink();
+        } catch {
+          return false;
+        }
+      });
+      const untracked = onDisk.filter((name) => !lock.skills[name]);
+      if (untracked.length === 0) {
+        checks.push({ label: "0 untracked skills", status: "pass" });
       } else {
-        statusLabel = pc6.dim("unknown");
+        checks.push({
+          label: `${untracked.length} untracked skill${untracked.length !== 1 ? "s" : ""} (on disk, not in lock)`,
+          status: "warn",
+          detail: untracked.join(", ")
+        });
       }
-      console.log(`  ${pc6.bold(r.name.padEnd(30))} ${statusLabel}`);
-      if (r.currentVersion || r.latestVersion) {
-        const current = r.currentVersion ? r.currentVersion.slice(0, 12) : "?";
-        const latest = r.latestVersion ?? "?";
-        if (r.hasUpdate) {
-          console.log(`  ${pc6.dim("current:")} ${current}  ${pc6.dim("->")}  ${pc6.cyan(latest)}`);
-        } else {
-          console.log(`  ${pc6.dim("version:")} ${current}`);
+    }
+    const results = detectAllProviders();
+    const installed = results.filter((r) => r.installed);
+    const mismatches = [];
+    for (const [name, entry] of Object.entries(lock.skills)) {
+      if (!entry.agents || entry.agents.length === 0) continue;
+      for (const agentId of entry.agents) {
+        const provider = installed.find((r) => r.provider.id === agentId);
+        if (!provider) continue;
+        const linkPath = join2(provider.provider.pathSkills, name);
+        if (!existsSync2(linkPath)) {
+          mismatches.push(`${name} missing from ${agentId}`);
         }
       }
-      console.log(`  ${pc6.dim(`source: ${r.entry.source}`)}`);
-      console.log(`  ${pc6.dim(`agents: ${r.entry.agents.join(", ")}`)}`);
-      console.log();
     }
-    if (updatesAvailable > 0) {
-      console.log(pc6.yellow(`${updatesAvailable} update(s) available.`));
-      console.log(pc6.dim("Run `caamp skills update` to update all."));
+    if (mismatches.length === 0) {
+      checks.push({ label: "Lock agent-lists match symlinks", status: "pass" });
     } else {
-      console.log(pc6.green("All skills are up to date."));
+      checks.push({
+        label: `${mismatches.length} agent-list mismatch${mismatches.length !== 1 ? "es" : ""}`,
+        status: "warn",
+        detail: mismatches.slice(0, 5).join(", ") + (mismatches.length > 5 ? ` (+${mismatches.length - 5} more)` : "")
+      });
     }
-  });
+  } catch (err) {
+    checks.push({
+      label: "Failed to read lock file",
+      status: "fail",
+      detail: err instanceof Error ? err.message : String(err)
+    });
+  }
+  return { name: "Lock File", checks };
 }
-
-// src/commands/skills/update.ts
-import pc7 from "picocolors";
-function registerSkillsUpdate(parent) {
-  parent.command("update").description("Update all outdated skills").option("-y, --yes", "Skip confirmation").action(async (opts) => {
-    const tracked = await getTrackedSkills();
-    const entries = Object.entries(tracked);
-    if (entries.length === 0) {
-      console.log(pc7.dim("No tracked skills to update."));
-      return;
-    }
-    console.log(pc7.dim(`Checking ${entries.length} skill(s) for updates...`));
-    const outdated = [];
-    for (const [name] of entries) {
-      const result = await checkSkillUpdate(name);
-      if (result.hasUpdate) {
-        outdated.push({
-          name,
-          currentVersion: result.currentVersion,
-          latestVersion: result.latestVersion
-        });
-      }
-    }
-    if (outdated.length === 0) {
-      console.log(pc7.green("\nAll skills are up to date."));
-      return;
-    }
-    console.log(pc7.yellow(`
-${outdated.length} skill(s) have updates available:
-`));
-    for (const skill of outdated) {
-      const current = skill.currentVersion?.slice(0, 12) ?? "?";
-      const latest = skill.latestVersion ?? "?";
-      console.log(`  ${pc7.bold(skill.name)}  ${pc7.dim(current)}  ${pc7.dim("->")}  ${pc7.cyan(latest)}`);
+async function checkConfigFiles() {
+  const checks = [];
+  const results = detectAllProviders();
+  const installed = results.filter((r) => r.installed);
+  for (const r of installed) {
+    const provider = r.provider;
+    const configPath = provider.configPathGlobal;
+    if (!existsSync2(configPath)) {
+      checks.push({
+        label: `${provider.id}: no config file found`,
+        status: "warn",
+        detail: configPath
+      });
+      continue;
     }
-    if (!opts.yes) {
-      const readline = await import("readline");
-      const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-      const answer = await new Promise((resolve) => {
-        rl.question(pc7.dim("\nProceed with update? [y/N] "), resolve);
+    try {
+      await readConfig(configPath, provider.configFormat);
+      const relPath = configPath.replace(homedir(), "~");
+      checks.push({
+        label: `${provider.id}: ${relPath} readable`,
+        status: "pass"
+      });
+    } catch (err) {
+      checks.push({
+        label: `${provider.id}: config parse error`,
+        status: "fail",
+        detail: err instanceof Error ? err.message : String(err)
       });
-      rl.close();
-      if (answer.toLowerCase() !== "y" && answer.toLowerCase() !== "yes") {
-        console.log(pc7.dim("Update cancelled."));
-        return;
-      }
     }
-    console.log();
-    let successCount = 0;
-    let failCount = 0;
-    for (const skill of outdated) {
-      const entry = tracked[skill.name];
-      if (!entry) continue;
-      console.log(pc7.dim(`Updating ${pc7.bold(skill.name)}...`));
-      try {
-        const parsed = parseSource(entry.source);
-        let localPath;
-        let cleanup;
-        if (parsed.type === "github" && parsed.owner && parsed.repo) {
-          const result = await cloneRepo(parsed.owner, parsed.repo, parsed.ref, parsed.path);
-          localPath = result.localPath;
-          cleanup = result.cleanup;
-        } else if (parsed.type === "gitlab" && parsed.owner && parsed.repo) {
-          const result = await cloneGitLabRepo(parsed.owner, parsed.repo, parsed.ref, parsed.path);
-          localPath = result.localPath;
-          cleanup = result.cleanup;
-        } else {
-          console.log(pc7.yellow(`  Skipped ${skill.name}: source type "${parsed.type}" does not support auto-update`));
-          continue;
-        }
-        try {
-          const providers = entry.agents.map((a) => getProvider(a)).filter((p) => p !== void 0);
-          if (providers.length === 0) {
-            console.log(pc7.yellow(`  Skipped ${skill.name}: no valid providers found`));
-            continue;
-          }
-          const installResult = await installSkill(
-            localPath,
-            skill.name,
-            providers,
-            entry.isGlobal,
-            entry.projectDir
-          );
-          if (installResult.success) {
-            await recordSkillInstall(
-              skill.name,
-              entry.scopedName,
-              entry.source,
-              entry.sourceType,
-              installResult.linkedAgents,
-              installResult.canonicalPath,
-              entry.isGlobal,
-              entry.projectDir,
-              skill.latestVersion
-            );
-            console.log(pc7.green(`  Updated ${pc7.bold(skill.name)}`));
-            successCount++;
-          } else {
-            console.log(pc7.red(`  Failed to update ${skill.name}: no agents linked`));
-            failCount++;
-          }
-          if (installResult.errors.length > 0) {
-            for (const err of installResult.errors) {
-              console.log(pc7.yellow(`    ${err}`));
-            }
-          }
-        } finally {
-          if (cleanup) await cleanup();
-        }
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        console.log(pc7.red(`  Failed to update ${skill.name}: ${msg}`));
-        failCount++;
+  }
+  if (installed.length === 0) {
+    checks.push({ label: "No installed providers to check", status: "pass" });
+  }
+  return { name: "Config Files", checks };
+}
+function formatSection(section) {
+  const lines = [];
+  lines.push(`  ${pc2.bold(section.name)}`);
+  for (const check of section.checks) {
+    const icon = check.status === "pass" ? pc2.green("\u2713") : check.status === "warn" ? pc2.yellow("\u26A0") : pc2.red("\u2717");
+    lines.push(`    ${icon} ${check.label}`);
+    if (check.detail) {
+      lines.push(`      ${pc2.dim(check.detail)}`);
+    }
+  }
+  return lines.join("\n");
+}
+function registerDoctorCommand(program2) {
+  program2.command("doctor").description("Diagnose configuration issues and health").option("--json", "Output as JSON").action(async (opts) => {
+    const sections = [];
+    sections.push(checkEnvironment());
+    sections.push(checkRegistry());
+    sections.push(checkInstalledProviders());
+    sections.push(checkSkillSymlinks());
+    sections.push(await checkLockFile());
+    sections.push(await checkConfigFiles());
+    let passed = 0;
+    let warnings = 0;
+    let errors = 0;
+    for (const section of sections) {
+      for (const check of section.checks) {
+        if (check.status === "pass") passed++;
+        else if (check.status === "warn") warnings++;
+        else errors++;
       }
     }
-    console.log();
-    if (successCount > 0) {
-      console.log(pc7.green(`Updated ${successCount} skill(s).`));
+    if (opts.json) {
+      const output = {
+        version: getCaampVersion(),
+        sections: sections.map((s) => ({
+          name: s.name,
+          checks: s.checks
+        })),
+        summary: { passed, warnings, errors }
+      };
+      console.log(JSON.stringify(output, null, 2));
+      return;
     }
-    if (failCount > 0) {
-      console.log(pc7.red(`Failed to update ${failCount} skill(s).`));
+    console.log(pc2.bold("\ncaamp doctor\n"));
+    for (const section of sections) {
+      console.log(formatSection(section));
+      console.log();
     }
-  });
-}
-
-// src/commands/skills/init.ts
-import pc8 from "picocolors";
-import { writeFile, mkdir } from "fs/promises";
-import { existsSync as existsSync2 } from "fs";
-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 = join3(opts.dir, skillName);
-    if (existsSync2(skillDir)) {
-      console.error(pc8.red(`Directory already exists: ${skillDir}`));
+    const parts = [];
+    parts.push(pc2.green(`${passed} checks passed`));
+    if (warnings > 0) parts.push(pc2.yellow(`${warnings} warning${warnings !== 1 ? "s" : ""}`));
+    if (errors > 0) parts.push(pc2.red(`${errors} error${errors !== 1 ? "s" : ""}`));
+    console.log(`  ${pc2.bold("Summary")}: ${parts.join(", ")}`);
+    console.log();
+    if (errors > 0) {
       process.exit(1);
     }
-    await mkdir(skillDir, { recursive: true });
-    const template = `---
-name: ${skillName}
-description: Describe what this skill does and when to use it
-license: MIT
-metadata:
-  author: your-name
-  version: "1.0"
----
-
-# ${skillName}
-
-## When to use this skill
-
-Describe the conditions under which an AI agent should activate this skill.
-
-## Instructions
-
-Provide detailed instructions for the AI agent here.
-
-## Examples
-
-Show example inputs and expected outputs.
-`;
-    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 ${join3(skillDir, "SKILL.md")}`));
-    console.log(pc8.dim(`  3. Install: caamp skills install ${skillDir}`));
   });
 }
 
-// src/commands/skills/audit.ts
-import { existsSync as existsSync3, statSync } from "fs";
-import pc9 from "picocolors";
-function registerSkillsAudit(parent) {
-  parent.command("audit").description("Security scan skill files (46+ rules, SARIF output)").argument("[path]", "Path to SKILL.md or directory", ".").option("--sarif", "Output in SARIF format").option("--json", "Output as JSON").action(async (path, opts) => {
-    if (!existsSync3(path)) {
-      console.error(pc9.red(`Path not found: ${path}`));
-      process.exit(1);
-    }
-    const stat = statSync(path);
-    let results;
-    if (stat.isFile()) {
-      results = [await scanFile(path)];
+// src/commands/instructions/inject.ts
+import pc3 from "picocolors";
+function registerInstructionsInject(parent) {
+  parent.command("inject").description("Inject instruction blocks into all provider files").option("-a, --agent <name>", "Target specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Inject into global instruction files").option("--content <text>", "Custom content to inject").option("--dry-run", "Preview without writing").option("--all", "Target all known providers").action(async (opts) => {
+    let providers;
+    if (opts.all) {
+      providers = getAllProviders();
+    } else if (opts.agent.length > 0) {
+      providers = opts.agent.map((a) => getProvider(a)).filter((p) => p !== void 0);
     } else {
-      results = await scanDirectory(path);
+      providers = getInstalledProviders();
     }
-    if (results.length === 0) {
-      console.log(pc9.dim("No SKILL.md files found to scan."));
+    if (providers.length === 0) {
+      console.error(pc3.red("No providers found."));
+      process.exit(1);
+    }
+    const content = opts.content ?? generateInjectionContent();
+    const scope = opts.global ? "global" : "project";
+    const groups = groupByInstructFile(providers);
+    if (opts.dryRun) {
+      console.log(pc3.bold("Dry run - would inject into:\n"));
+      for (const [file, group] of groups) {
+        console.log(`  ${pc3.bold(file)}: ${group.map((p) => p.id).join(", ")}`);
+      }
+      console.log(pc3.dim(`
+  Scope: ${scope}`));
+      console.log(pc3.dim(`  Content length: ${content.length} chars`));
       return;
     }
-    if (opts.sarif) {
-      console.log(JSON.stringify(toSarif(results), null, 2));
-      return;
+    const results = await injectAll(providers, process.cwd(), scope, content);
+    for (const [file, action] of results) {
+      const icon = action === "created" ? pc3.green("+") : action === "updated" ? pc3.yellow("~") : pc3.blue("^");
+      console.log(`  ${icon} ${file} (${action})`);
+    }
+    console.log(pc3.bold(`
+${results.size} file(s) processed.`));
+  });
+}
+
+// src/commands/instructions/check.ts
+import pc4 from "picocolors";
+function registerInstructionsCheck(parent) {
+  parent.command("check").description("Check injection status across providers").option("-a, --agent <name>", "Check specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Check global instruction files").option("--json", "Output as JSON").option("--all", "Check all known providers").action(async (opts) => {
+    let providers;
+    if (opts.all) {
+      providers = getAllProviders();
+    } else if (opts.agent.length > 0) {
+      providers = opts.agent.map((a) => getProvider(a)).filter((p) => p !== void 0);
+    } else {
+      providers = getInstalledProviders();
     }
+    const scope = opts.global ? "global" : "project";
+    const results = await checkAllInjections(providers, process.cwd(), scope);
     if (opts.json) {
       console.log(JSON.stringify(results, null, 2));
       return;
     }
-    let totalFindings = 0;
-    let allPassed = true;
-    for (const result of results) {
-      const icon = result.passed ? pc9.green("\u2713") : pc9.red("\u2717");
-      console.log(`
-${icon} ${pc9.bold(result.file)} (score: ${result.score}/100)`);
-      if (result.findings.length === 0) {
-        console.log(pc9.dim("  No issues found."));
-        continue;
-      }
-      totalFindings += result.findings.length;
-      if (!result.passed) allPassed = false;
-      for (const f of result.findings) {
-        const sev = f.rule.severity === "critical" ? pc9.red(f.rule.severity) : f.rule.severity === "high" ? pc9.red(f.rule.severity) : f.rule.severity === "medium" ? pc9.yellow(f.rule.severity) : pc9.dim(f.rule.severity);
-        console.log(`  ${sev.padEnd(20)} ${f.rule.id} ${f.rule.name}`);
-        console.log(`  ${pc9.dim(`L${f.line}: ${f.context.slice(0, 80)}`)}`);
+    console.log(pc4.bold(`
+Instruction file status (${scope}):
+`));
+    for (const r of results) {
+      let icon;
+      let label;
+      switch (r.status) {
+        case "current":
+          icon = pc4.green("\u2713");
+          label = "current";
+          break;
+        case "outdated":
+          icon = pc4.yellow("~");
+          label = "outdated";
+          break;
+        case "missing":
+          icon = pc4.red("\u2717");
+          label = "missing";
+          break;
+        case "none":
+          icon = pc4.dim("-");
+          label = "no injection";
+          break;
       }
+      console.log(`  ${icon} ${r.file.padEnd(40)} ${label}`);
     }
-    console.log(pc9.bold(`
-${results.length} file(s) scanned, ${totalFindings} finding(s)`));
-    if (!allPassed) {
-      process.exit(1);
-    }
+    console.log();
   });
 }
 
-// src/commands/skills/validate.ts
-import pc10 from "picocolors";
-function registerSkillsValidate(parent) {
-  parent.command("validate").description("Validate SKILL.md format").argument("[path]", "Path to SKILL.md", "SKILL.md").option("--json", "Output as JSON").action(async (path, opts) => {
-    const result = await validateSkill(path);
-    if (opts.json) {
-      console.log(JSON.stringify(result, null, 2));
+// src/commands/instructions/update.ts
+import pc5 from "picocolors";
+function registerInstructionsUpdate(parent) {
+  parent.command("update").description("Update all instruction file injections").option("-g, --global", "Update global instruction files").option("-y, --yes", "Skip confirmation").action(async (opts) => {
+    const providers = getInstalledProviders();
+    const scope = opts.global ? "global" : "project";
+    const content = generateInjectionContent();
+    const checks = await checkAllInjections(providers, process.cwd(), scope, content);
+    const needsUpdate = checks.filter((c) => c.status !== "current");
+    if (needsUpdate.length === 0) {
+      console.log(pc5.green("All instruction files are up to date."));
       return;
     }
-    if (result.valid) {
-      console.log(pc10.green(`\u2713 ${path} is valid`));
-    } else {
-      console.log(pc10.red(`\u2717 ${path} has validation errors`));
-    }
-    for (const issue of result.issues) {
-      const icon = issue.level === "error" ? pc10.red("\u2717") : pc10.yellow("!");
-      console.log(`  ${icon} [${issue.field}] ${issue.message}`);
+    console.log(pc5.bold(`${needsUpdate.length} file(s) need updating:
+`));
+    for (const c of needsUpdate) {
+      console.log(`  ${c.file} (${c.status})`);
     }
-    if (!result.valid) {
-      process.exit(1);
+    const providerIds = new Set(needsUpdate.map((c) => c.provider));
+    const toUpdate = providers.filter((p) => providerIds.has(p.id));
+    const results = await injectAll(toUpdate, process.cwd(), scope, content);
+    console.log();
+    for (const [file, action] of results) {
+      console.log(`  ${pc5.green("\u2713")} ${file} (${action})`);
     }
+    console.log(pc5.bold(`
+${results.size} file(s) updated.`));
   });
 }
 
-// src/commands/skills/index.ts
-function registerSkillsCommands(program2) {
-  const skills = program2.command("skills").description("Manage AI agent skills");
-  registerSkillsInstall(skills);
-  registerSkillsRemove(skills);
-  registerSkillsList(skills);
-  registerSkillsFind(skills);
-  registerSkillsCheck(skills);
-  registerSkillsUpdate(skills);
-  registerSkillsInit(skills);
-  registerSkillsAudit(skills);
-  registerSkillsValidate(skills);
+// src/commands/instructions/index.ts
+function registerInstructionsCommands(program2) {
+  const instructions = program2.command("instructions").description("Manage instruction file injections");
+  registerInstructionsInject(instructions);
+  registerInstructionsCheck(instructions);
+  registerInstructionsUpdate(instructions);
 }
 
 // src/commands/mcp/install.ts
-import pc11 from "picocolors";
+import pc6 from "picocolors";
 function registerMcpInstall(parent) {
   parent.command("install").description("Install MCP server to agent configs").argument("<source>", "MCP server source (URL, npm package, or command)").option("-a, --agent <name>", "Target specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Install to global/user config").option("-n, --name <name>", "Override inferred server name").option("-t, --transport <type>", "Transport type: http (default) or sse", "http").option("--header <header>", "HTTP header (Key: Value)", (v, prev) => [...prev, v], []).option("-y, --yes", "Skip confirmation").option("--all", "Install to all detected agents").option("--dry-run", "Preview without writing").action(async (source, opts) => {
     const parsed = parseSource(source);
@@ -1090,19 +1259,19 @@ function registerMcpInstall(parent) {
       providers = getInstalledProviders();
     }
     if (providers.length === 0) {
-      console.error(pc11.red("No target providers found."));
+      console.error(pc6.red("No target providers found."));
       process.exit(1);
     }
     const scope = opts.global ? "global" : "project";
     if (opts.dryRun) {
-      console.log(pc11.bold("Dry run - would install:"));
-      console.log(`  Server: ${pc11.bold(serverName)}`);
+      console.log(pc6.bold("Dry run - would install:"));
+      console.log(`  Server: ${pc6.bold(serverName)}`);
       console.log(`  Config: ${JSON.stringify(config, null, 2)}`);
       console.log(`  Scope: ${scope}`);
       console.log(`  Providers: ${providers.map((p) => p.id).join(", ")}`);
       return;
     }
-    console.log(pc11.dim(`Installing "${serverName}" to ${providers.length} provider(s)...
+    console.log(pc6.dim(`Installing "${serverName}" to ${providers.length} provider(s)...
 `));
     const results = await installMcpServerToAll(
       providers,
@@ -1112,9 +1281,9 @@ function registerMcpInstall(parent) {
     );
     for (const r of results) {
       if (r.success) {
-        console.log(`  ${pc11.green("\u2713")} ${r.provider.toolName.padEnd(22)} ${pc11.dim(r.configPath)}`);
+        console.log(`  ${pc6.green("\u2713")} ${r.provider.toolName.padEnd(22)} ${pc6.dim(r.configPath)}`);
       } else {
-        console.log(`  ${pc11.red("\u2717")} ${r.provider.toolName.padEnd(22)} ${pc11.red(r.error ?? "failed")}`);
+        console.log(`  ${pc6.red("\u2717")} ${r.provider.toolName.padEnd(22)} ${pc6.red(r.error ?? "failed")}`);
       }
     }
     const succeeded = results.filter((r) => r.success);
@@ -1127,13 +1296,13 @@ function registerMcpInstall(parent) {
         opts.global ?? false
       );
     }
-    console.log(pc11.bold(`
+    console.log(pc6.bold(`
 ${succeeded.length}/${results.length} providers configured.`));
   });
 }
 
 // src/commands/mcp/remove.ts
-import pc12 from "picocolors";
+import pc7 from "picocolors";
 function registerMcpRemove(parent) {
   parent.command("remove").description("Remove MCP server from agent configs").argument("<name>", "MCP server name to remove").option("-a, --agent <name>", "Target specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Remove from global config").option("--all", "Remove from all detected agents").action(async (name, opts) => {
     let providers;
@@ -1149,1275 +1318,1194 @@ function registerMcpRemove(parent) {
     for (const provider of providers) {
       const success = await removeMcpServer(provider, name, scope);
       if (success) {
-        console.log(`  ${pc12.green("\u2713")} Removed from ${provider.toolName}`);
+        console.log(`  ${pc7.green("\u2713")} Removed from ${provider.toolName}`);
         removed++;
       }
     }
     if (removed > 0) {
       await removeMcpFromLock(name);
-      console.log(pc12.green(`
+      console.log(pc7.green(`
 \u2713 Removed "${name}" from ${removed} provider(s).`));
     } else {
-      console.log(pc12.yellow(`Server "${name}" not found in any provider config.`));
+      console.log(pc7.yellow(`Server "${name}" not found in any provider config.`));
     }
   });
 }
 
 // src/commands/mcp/list.ts
-import pc13 from "picocolors";
+import pc8 from "picocolors";
 function registerMcpList(parent) {
   parent.command("list").description("List configured MCP servers").option("-a, --agent <name>", "List for specific agent").option("-g, --global", "List global config").option("--json", "Output as JSON").action(async (opts) => {
     const providers = opts.agent ? [getProvider(opts.agent)].filter((p) => p !== void 0) : getInstalledProviders();
     const allEntries = [];
     for (const provider of providers) {
-      const scope = resolvePreferredConfigScope(provider, opts.global);
-      const entries = await listMcpServers(provider, scope);
-      allEntries.push(...entries);
-    }
-    if (opts.json) {
-      console.log(JSON.stringify(allEntries.map((e) => ({
-        provider: e.providerId,
-        name: e.name,
-        config: e.config
-      })), null, 2));
-      return;
-    }
-    if (allEntries.length === 0) {
-      console.log(pc13.dim("No MCP servers configured."));
-      return;
-    }
-    console.log(pc13.bold(`
-${allEntries.length} MCP server(s) configured:
-`));
-    for (const entry of allEntries) {
-      console.log(`  ${pc13.bold(entry.name.padEnd(25))} ${pc13.dim(entry.providerId)}`);
-    }
-    console.log();
-  });
-}
-
-// src/commands/mcp/detect.ts
-import pc14 from "picocolors";
-import { existsSync as existsSync4 } from "fs";
-function registerMcpDetect(parent) {
-  parent.command("detect").description("Auto-detect installed MCP tools and their configurations").option("--json", "Output as JSON").action(async (opts) => {
-    const providers = getInstalledProviders();
-    const detected = [];
-    for (const provider of providers) {
-      const globalPath = resolveConfigPath(provider, "global");
-      const projectPath = resolveConfigPath(provider, "project");
-      const globalEntries = await listMcpServers(provider, "global");
-      const projectEntries = await listMcpServers(provider, "project");
-      detected.push({
-        provider: provider.id,
-        hasGlobalConfig: globalPath !== null && existsSync4(globalPath),
-        hasProjectConfig: projectPath !== null && existsSync4(projectPath),
-        globalServers: globalEntries.map((e) => e.name),
-        projectServers: projectEntries.map((e) => e.name)
-      });
-    }
-    if (opts.json) {
-      console.log(JSON.stringify(detected, null, 2));
-      return;
-    }
-    console.log(pc14.bold(`
-${detected.length} provider(s) with MCP support:
-`));
-    for (const d of detected) {
-      const globalIcon = d.hasGlobalConfig ? pc14.green("G") : pc14.dim("-");
-      const projectIcon = d.hasProjectConfig ? pc14.green("P") : pc14.dim("-");
-      const servers = [...d.globalServers, ...d.projectServers];
-      const serverList = servers.length > 0 ? pc14.dim(servers.join(", ")) : pc14.dim("no servers");
-      console.log(`  [${globalIcon}${projectIcon}] ${pc14.bold(d.provider.padEnd(20))} ${serverList}`);
-    }
-    console.log(pc14.dim("\nG = global config, P = project config"));
-    console.log();
-  });
-}
-
-// src/commands/mcp/index.ts
-function registerMcpCommands(program2) {
-  const mcp = program2.command("mcp").description("Manage MCP server configurations");
-  registerMcpInstall(mcp);
-  registerMcpRemove(mcp);
-  registerMcpList(mcp);
-  registerMcpDetect(mcp);
-}
-
-// src/commands/instructions/inject.ts
-import pc15 from "picocolors";
-function registerInstructionsInject(parent) {
-  parent.command("inject").description("Inject instruction blocks into all provider files").option("-a, --agent <name>", "Target specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Inject into global instruction files").option("--content <text>", "Custom content to inject").option("--dry-run", "Preview without writing").option("--all", "Target all known providers").action(async (opts) => {
-    let providers;
-    if (opts.all) {
-      providers = getAllProviders();
-    } else if (opts.agent.length > 0) {
-      providers = opts.agent.map((a) => getProvider(a)).filter((p) => p !== void 0);
-    } else {
-      providers = getInstalledProviders();
-    }
-    if (providers.length === 0) {
-      console.error(pc15.red("No providers found."));
-      process.exit(1);
-    }
-    const content = opts.content ?? generateInjectionContent();
-    const scope = opts.global ? "global" : "project";
-    const groups = groupByInstructFile(providers);
-    if (opts.dryRun) {
-      console.log(pc15.bold("Dry run - would inject into:\n"));
-      for (const [file, group] of groups) {
-        console.log(`  ${pc15.bold(file)}: ${group.map((p) => p.id).join(", ")}`);
-      }
-      console.log(pc15.dim(`
-  Scope: ${scope}`));
-      console.log(pc15.dim(`  Content length: ${content.length} chars`));
-      return;
-    }
-    const results = await injectAll(providers, process.cwd(), scope, content);
-    for (const [file, action] of results) {
-      const icon = action === "created" ? pc15.green("+") : action === "updated" ? pc15.yellow("~") : pc15.blue("^");
-      console.log(`  ${icon} ${file} (${action})`);
-    }
-    console.log(pc15.bold(`
-${results.size} file(s) processed.`));
-  });
-}
-
-// src/commands/instructions/check.ts
-import pc16 from "picocolors";
-function registerInstructionsCheck(parent) {
-  parent.command("check").description("Check injection status across providers").option("-a, --agent <name>", "Check specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Check global instruction files").option("--json", "Output as JSON").option("--all", "Check all known providers").action(async (opts) => {
-    let providers;
-    if (opts.all) {
-      providers = getAllProviders();
-    } else if (opts.agent.length > 0) {
-      providers = opts.agent.map((a) => getProvider(a)).filter((p) => p !== void 0);
-    } else {
-      providers = getInstalledProviders();
-    }
-    const scope = opts.global ? "global" : "project";
-    const results = await checkAllInjections(providers, process.cwd(), scope);
-    if (opts.json) {
-      console.log(JSON.stringify(results, null, 2));
-      return;
-    }
-    console.log(pc16.bold(`
-Instruction file status (${scope}):
-`));
-    for (const r of results) {
-      let icon;
-      let label;
-      switch (r.status) {
-        case "current":
-          icon = pc16.green("\u2713");
-          label = "current";
-          break;
-        case "outdated":
-          icon = pc16.yellow("~");
-          label = "outdated";
-          break;
-        case "missing":
-          icon = pc16.red("\u2717");
-          label = "missing";
-          break;
-        case "none":
-          icon = pc16.dim("-");
-          label = "no injection";
-          break;
-      }
-      console.log(`  ${icon} ${r.file.padEnd(40)} ${label}`);
+      const scope = resolvePreferredConfigScope(provider, opts.global);
+      const entries = await listMcpServers(provider, scope);
+      allEntries.push(...entries);
+    }
+    if (opts.json) {
+      console.log(JSON.stringify(allEntries.map((e) => ({
+        provider: e.providerId,
+        name: e.name,
+        config: e.config
+      })), null, 2));
+      return;
+    }
+    if (allEntries.length === 0) {
+      console.log(pc8.dim("No MCP servers configured."));
+      return;
+    }
+    console.log(pc8.bold(`
+${allEntries.length} MCP server(s) configured:
+`));
+    for (const entry of allEntries) {
+      console.log(`  ${pc8.bold(entry.name.padEnd(25))} ${pc8.dim(entry.providerId)}`);
     }
     console.log();
   });
 }
 
-// src/commands/instructions/update.ts
-import pc17 from "picocolors";
-function registerInstructionsUpdate(parent) {
-  parent.command("update").description("Update all instruction file injections").option("-g, --global", "Update global instruction files").option("-y, --yes", "Skip confirmation").action(async (opts) => {
+// src/commands/mcp/detect.ts
+import pc9 from "picocolors";
+import { existsSync as existsSync3 } from "fs";
+function registerMcpDetect(parent) {
+  parent.command("detect").description("Auto-detect installed MCP tools and their configurations").option("--json", "Output as JSON").action(async (opts) => {
     const providers = getInstalledProviders();
-    const scope = opts.global ? "global" : "project";
-    const content = generateInjectionContent();
-    const checks = await checkAllInjections(providers, process.cwd(), scope, content);
-    const needsUpdate = checks.filter((c) => c.status !== "current");
-    if (needsUpdate.length === 0) {
-      console.log(pc17.green("All instruction files are up to date."));
+    const detected = [];
+    for (const provider of providers) {
+      const globalPath = resolveConfigPath(provider, "global");
+      const projectPath = resolveConfigPath(provider, "project");
+      const globalEntries = await listMcpServers(provider, "global");
+      const projectEntries = await listMcpServers(provider, "project");
+      detected.push({
+        provider: provider.id,
+        hasGlobalConfig: globalPath !== null && existsSync3(globalPath),
+        hasProjectConfig: projectPath !== null && existsSync3(projectPath),
+        globalServers: globalEntries.map((e) => e.name),
+        projectServers: projectEntries.map((e) => e.name)
+      });
+    }
+    if (opts.json) {
+      console.log(JSON.stringify(detected, null, 2));
       return;
     }
-    console.log(pc17.bold(`${needsUpdate.length} file(s) need updating:
+    console.log(pc9.bold(`
+${detected.length} provider(s) with MCP support:
 `));
-    for (const c of needsUpdate) {
-      console.log(`  ${c.file} (${c.status})`);
+    for (const d of detected) {
+      const globalIcon = d.hasGlobalConfig ? pc9.green("G") : pc9.dim("-");
+      const projectIcon = d.hasProjectConfig ? pc9.green("P") : pc9.dim("-");
+      const servers = [...d.globalServers, ...d.projectServers];
+      const serverList = servers.length > 0 ? pc9.dim(servers.join(", ")) : pc9.dim("no servers");
+      console.log(`  [${globalIcon}${projectIcon}] ${pc9.bold(d.provider.padEnd(20))} ${serverList}`);
     }
-    const providerIds = new Set(needsUpdate.map((c) => c.provider));
-    const toUpdate = providers.filter((p) => providerIds.has(p.id));
-    const results = await injectAll(toUpdate, process.cwd(), scope, content);
+    console.log(pc9.dim("\nG = global config, P = project config"));
     console.log();
-    for (const [file, action] of results) {
-      console.log(`  ${pc17.green("\u2713")} ${file} (${action})`);
-    }
-    console.log(pc17.bold(`
-${results.size} file(s) updated.`));
   });
 }
 
-// src/commands/instructions/index.ts
-function registerInstructionsCommands(program2) {
-  const instructions = program2.command("instructions").description("Manage instruction file injections");
-  registerInstructionsInject(instructions);
-  registerInstructionsCheck(instructions);
-  registerInstructionsUpdate(instructions);
+// src/commands/mcp/index.ts
+function registerMcpCommands(program2) {
+  const mcp = program2.command("mcp").description("Manage MCP server configurations");
+  registerMcpInstall(mcp);
+  registerMcpRemove(mcp);
+  registerMcpList(mcp);
+  registerMcpDetect(mcp);
 }
 
-// src/commands/config.ts
-import pc18 from "picocolors";
-import { existsSync as existsSync5 } from "fs";
-function registerConfigCommand(program2) {
-  const config = program2.command("config").description("View provider configuration");
-  config.command("show").description("Show provider configuration").argument("<provider>", "Provider ID or alias").option("-g, --global", "Show global config").option("--json", "Output as JSON").action(async (providerId, opts) => {
-    const provider = getProvider(providerId);
-    if (!provider) {
-      console.error(pc18.red(`Provider not found: ${providerId}`));
-      process.exit(1);
-    }
-    const configPath = resolveProviderConfigPath(
-      provider,
-      opts.global ? "global" : "project"
-    ) ?? provider.configPathGlobal;
-    if (!existsSync5(configPath)) {
-      console.log(pc18.dim(`No config file at: ${configPath}`));
+// src/commands/providers.ts
+import pc10 from "picocolors";
+function registerProvidersCommand(program2) {
+  const providers = program2.command("providers").description("Manage AI agent providers");
+  providers.command("list").description("List all supported providers").option("--json", "Output as JSON").option("--tier <tier>", "Filter by priority tier (high, medium, low)").action(async (opts) => {
+    const all = opts.tier ? getProvidersByPriority(opts.tier) : getAllProviders();
+    if (opts.json) {
+      console.log(JSON.stringify(all, null, 2));
       return;
     }
-    try {
-      const data = await readConfig(configPath, provider.configFormat);
-      if (opts.json) {
-        console.log(JSON.stringify(data, null, 2));
-      } else {
-        console.log(pc18.bold(`
-${provider.toolName} config (${configPath}):
+    console.log(pc10.bold(`
+CAMP Provider Registry v${getRegistryVersion()}`));
+    console.log(pc10.dim(`${getProviderCount()} providers
 `));
-        console.log(JSON.stringify(data, null, 2));
+    const tiers = ["high", "medium", "low"];
+    for (const tier of tiers) {
+      const tierProviders = all.filter((p) => p.priority === tier);
+      if (tierProviders.length === 0) continue;
+      const tierLabel = tier === "high" ? pc10.green("HIGH") : tier === "medium" ? pc10.yellow("MEDIUM") : pc10.dim("LOW");
+      console.log(`${tierLabel} priority:`);
+      for (const p of tierProviders) {
+        const status = p.status === "active" ? pc10.green("active") : p.status === "beta" ? pc10.yellow("beta") : pc10.dim(p.status);
+        console.log(`  ${pc10.bold(p.agentFlag.padEnd(20))} ${p.toolName.padEnd(22)} ${p.vendor.padEnd(16)} [${status}]`);
       }
-    } catch (err) {
-      console.error(pc18.red(`Error reading config: ${err instanceof Error ? err.message : String(err)}`));
-      process.exit(1);
+      console.log();
     }
   });
-  config.command("path").description("Show config file path").argument("<provider>", "Provider ID or alias").argument("[scope]", "Scope: project (default) or global", "project").action((providerId, scope) => {
-    const provider = getProvider(providerId);
+  providers.command("detect").description("Auto-detect installed providers").option("--json", "Output as JSON").option("--project", "Include project-level detection").action(async (opts) => {
+    const results = opts.project ? detectProjectProviders(process.cwd()) : detectAllProviders();
+    const installed = results.filter((r) => r.installed);
+    if (opts.json) {
+      console.log(JSON.stringify(installed.map((r) => ({
+        id: r.provider.id,
+        toolName: r.provider.toolName,
+        methods: r.methods,
+        projectDetected: r.projectDetected
+      })), null, 2));
+      return;
+    }
+    console.log(pc10.bold(`
+Detected ${installed.length} installed providers:
+`));
+    for (const r of installed) {
+      const methods = r.methods.join(", ");
+      const project = r.projectDetected ? pc10.green(" [project]") : "";
+      console.log(`  ${pc10.green("\u2713")} ${pc10.bold(r.provider.toolName.padEnd(22))} via ${pc10.dim(methods)}${project}`);
+    }
+    const notInstalled = results.filter((r) => !r.installed);
+    if (notInstalled.length > 0) {
+      console.log(pc10.dim(`
+  ${notInstalled.length} providers not detected`));
+    }
+    console.log();
+  });
+  providers.command("show").description("Show provider details").argument("<id>", "Provider ID or alias").option("--json", "Output as JSON").action(async (id, opts) => {
+    const provider = getProvider(id);
     if (!provider) {
-      console.error(pc18.red(`Provider not found: ${providerId}`));
+      console.error(pc10.red(`Provider not found: ${id}`));
       process.exit(1);
     }
-    if (scope === "global") {
-      console.log(provider.configPathGlobal);
-    } else {
-      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);
-      }
+    if (opts.json) {
+      console.log(JSON.stringify(provider, null, 2));
+      return;
+    }
+    console.log(pc10.bold(`
+${provider.toolName}`));
+    console.log(pc10.dim(`by ${provider.vendor}
+`));
+    console.log(`  ID:              ${provider.id}`);
+    console.log(`  Flag:            --agent ${provider.agentFlag}`);
+    if (provider.aliases.length > 0) {
+      console.log(`  Aliases:         ${provider.aliases.join(", ")}`);
     }
+    console.log(`  Status:          ${provider.status}`);
+    console.log(`  Priority:        ${provider.priority}`);
+    console.log();
+    console.log(`  Instruction:     ${provider.instructFile}`);
+    console.log(`  Config format:   ${provider.configFormat}`);
+    console.log(`  Config key:      ${provider.configKey}`);
+    console.log(`  Transports:      ${provider.supportedTransports.join(", ")}`);
+    console.log(`  Headers:         ${provider.supportsHeaders ? "yes" : "no"}`);
+    console.log();
+    console.log(pc10.dim("  Paths:"));
+    console.log(`  Global dir:      ${provider.pathGlobal}`);
+    console.log(`  Project dir:     ${provider.pathProject || "(none)"}`);
+    console.log(`  Global config:   ${provider.configPathGlobal}`);
+    console.log(`  Project config:  ${provider.configPathProject || "(none)"}`);
+    console.log(`  Global skills:   ${provider.pathSkills}`);
+    console.log(`  Project skills:  ${provider.pathProjectSkills || "(none)"}`);
+    console.log();
   });
 }
 
-// src/commands/doctor.ts
-import pc19 from "picocolors";
-import { execFileSync } from "child_process";
-import { existsSync as existsSync6, readdirSync, lstatSync, readlinkSync } from "fs";
-import { homedir } from "os";
-import { join as join5 } from "path";
-
-// src/core/version.ts
-import { readFileSync } from "fs";
-import { dirname, join as join4 } from "path";
-import { fileURLToPath } from "url";
-var cachedVersion = null;
-function getCaampVersion() {
-  if (cachedVersion) return cachedVersion;
-  try {
-    const currentDir = dirname(fileURLToPath(import.meta.url));
-    const packageJsonPath = join4(currentDir, "..", "..", "package.json");
-    const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-    cachedVersion = packageJson.version ?? "0.0.0";
-  } catch {
-    cachedVersion = "0.0.0";
-  }
-  return cachedVersion;
-}
+// src/commands/skills/install.ts
+import { existsSync as existsSync4 } from "fs";
+import pc11 from "picocolors";
 
-// src/commands/doctor.ts
-function getNodeVersion() {
-  return process.version;
-}
-function getNpmVersion() {
-  try {
-    return execFileSync("npm", ["--version"], { stdio: "pipe", encoding: "utf-8" }).trim();
-  } catch {
-    return null;
-  }
-}
-function checkEnvironment() {
-  const checks = [];
-  checks.push({ label: `Node.js ${getNodeVersion()}`, status: "pass" });
-  const npmVersion = getNpmVersion();
-  if (npmVersion) {
-    checks.push({ label: `npm ${npmVersion}`, status: "pass" });
-  } else {
-    checks.push({ label: "npm not found", status: "warn" });
-  }
-  checks.push({ label: `CAAMP v${getCaampVersion()}`, status: "pass" });
-  checks.push({ label: `${process.platform} ${process.arch}`, status: "pass" });
-  return { name: "Environment", checks };
-}
-function checkRegistry() {
-  const checks = [];
-  try {
-    const providers = getAllProviders();
-    const count = getProviderCount();
-    checks.push({ label: `${count} providers loaded`, status: "pass" });
-    const malformed = [];
-    for (const p of providers) {
-      if (!p.id || !p.toolName || !p.configKey || !p.configFormat) {
-        malformed.push(p.id || "(unknown)");
-      }
-    }
-    if (malformed.length === 0) {
-      checks.push({ label: "All entries valid", status: "pass" });
-    } else {
-      checks.push({
-        label: `${malformed.length} malformed entries`,
-        status: "fail",
-        detail: malformed.join(", ")
-      });
-    }
-  } catch (err) {
-    checks.push({
-      label: "Failed to load registry",
-      status: "fail",
-      detail: err instanceof Error ? err.message : String(err)
-    });
+// src/core/sources/github.ts
+import { simpleGit } from "simple-git";
+import { mkdtemp, rm } from "fs/promises";
+import { tmpdir } from "os";
+import { join as join3 } from "path";
+async function cloneRepo(owner, repo, ref, subPath) {
+  const tmpDir = await mkdtemp(join3(tmpdir(), "caamp-"));
+  const repoUrl = `https://github.com/${owner}/${repo}.git`;
+  const git = simpleGit();
+  const cloneOptions = ["--depth", "1"];
+  if (ref) {
+    cloneOptions.push("--branch", ref);
   }
-  return { name: "Registry", checks };
-}
-function checkInstalledProviders() {
-  const checks = [];
-  try {
-    const results = detectAllProviders();
-    const installed = results.filter((r) => r.installed);
-    checks.push({ label: `${installed.length} found`, status: "pass" });
-    for (const r of installed) {
-      const methods = r.methods.join(", ");
-      checks.push({ label: `${r.provider.toolName} (${methods})`, status: "pass" });
+  await git.clone(repoUrl, tmpDir, cloneOptions);
+  const localPath = subPath ? join3(tmpDir, subPath) : tmpDir;
+  return {
+    localPath,
+    cleanup: async () => {
+      try {
+        await rm(tmpDir, { recursive: true });
+      } catch {
+      }
     }
-  } catch (err) {
-    checks.push({
-      label: "Detection failed",
-      status: "fail",
-      detail: err instanceof Error ? err.message : String(err)
-    });
-  }
-  return { name: "Installed Providers", checks };
+  };
 }
-function checkSkillSymlinks() {
-  const checks = [];
-  const canonicalDir = CANONICAL_SKILLS_DIR;
-  if (!existsSync6(canonicalDir)) {
-    checks.push({ label: "0 canonical skills", status: "pass" });
-    checks.push({ label: "No broken symlinks", status: "pass" });
-    return { name: "Skills", checks };
+
+// src/core/sources/gitlab.ts
+import { simpleGit as simpleGit2 } from "simple-git";
+import { mkdtemp as mkdtemp2, rm as rm2 } from "fs/promises";
+import { tmpdir as tmpdir2 } from "os";
+import { join as join4 } from "path";
+async function cloneGitLabRepo(owner, repo, ref, subPath) {
+  const tmpDir = await mkdtemp2(join4(tmpdir2(), "caamp-gl-"));
+  const repoUrl = `https://gitlab.com/${owner}/${repo}.git`;
+  const git = simpleGit2();
+  const cloneOptions = ["--depth", "1"];
+  if (ref) {
+    cloneOptions.push("--branch", ref);
   }
-  let canonicalCount = 0;
-  let canonicalNames = [];
-  try {
-    canonicalNames = readdirSync(canonicalDir).filter((name) => {
-      const full = join5(canonicalDir, name);
+  await git.clone(repoUrl, tmpDir, cloneOptions);
+  const localPath = subPath ? join4(tmpDir, subPath) : tmpDir;
+  return {
+    localPath,
+    cleanup: async () => {
       try {
-        const stat = lstatSync(full);
-        return stat.isDirectory() || stat.isSymbolicLink();
+        await rm2(tmpDir, { recursive: true });
       } catch {
-        return false;
       }
-    });
-    canonicalCount = canonicalNames.length;
-    checks.push({ label: `${canonicalCount} canonical skills`, status: "pass" });
-  } catch {
-    checks.push({ label: "Cannot read skills directory", status: "warn" });
-    return { name: "Skills", checks };
-  }
-  const broken = [];
-  const stale = [];
-  const results = detectAllProviders();
-  const installed = results.filter((r) => r.installed);
-  for (const r of installed) {
-    const provider = r.provider;
-    const skillDir = provider.pathSkills;
-    if (!existsSync6(skillDir)) continue;
-    try {
-      const entries = readdirSync(skillDir);
-      for (const entry of entries) {
-        const fullPath = join5(skillDir, entry);
+    }
+  };
+}
+
+// src/commands/skills/install.ts
+function registerSkillsInstall(parent) {
+  parent.command("install").description("Install a skill from GitHub, URL, marketplace, or ct-skills catalog").argument("[source]", "Skill source (GitHub URL, owner/repo, @author/name, skill-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").option("--profile <name>", "Install a ct-skills profile (minimal, core, recommended, full)").action(async (source, opts) => {
+    let providers;
+    if (opts.all) {
+      providers = getInstalledProviders();
+    } else if (opts.agent.length > 0) {
+      providers = opts.agent.map((a) => getProvider(a)).filter((p) => p !== void 0);
+    } else {
+      providers = getInstalledProviders();
+    }
+    if (providers.length === 0) {
+      console.error(pc11.red("No target providers found. Use --agent or --all."));
+      process.exit(1);
+    }
+    if (opts.profile) {
+      if (!isCatalogAvailable()) {
+        console.error(pc11.red("@cleocode/ct-skills is not installed. Run: npm install @cleocode/ct-skills"));
+        process.exit(1);
+      }
+      const profileSkills = resolveProfile(opts.profile);
+      if (profileSkills.length === 0) {
+        const available = listProfiles();
+        console.error(pc11.red(`Profile not found: ${opts.profile}`));
+        if (available.length > 0) {
+          console.log(pc11.dim("Available profiles: " + available.join(", ")));
+        }
+        process.exit(1);
+      }
+      console.log(`Installing profile ${pc11.bold(opts.profile)} (${profileSkills.length} skill(s))...`);
+      console.log(pc11.dim(`Target: ${providers.length} provider(s)`));
+      let installed = 0;
+      let failed = 0;
+      for (const name of profileSkills) {
+        const skillDir = getSkillDir(name);
         try {
-          const stat = lstatSync(fullPath);
-          if (!stat.isSymbolicLink()) continue;
-          if (!existsSync6(fullPath)) {
-            broken.push(`${provider.id}/${entry}`);
+          const result = await installSkill(
+            skillDir,
+            name,
+            providers,
+            opts.global ?? false
+          );
+          if (result.success) {
+            console.log(pc11.green(`  + ${name}`));
+            await recordSkillInstall(
+              name,
+              `@cleocode/ct-skills:${name}`,
+              `@cleocode/ct-skills:${name}`,
+              "package",
+              result.linkedAgents,
+              result.canonicalPath,
+              true
+            );
+            installed++;
           } else {
-            const target = readlinkSync(fullPath);
-            const isCanonical = target.includes("/.agents/skills/") || target.includes("\\.agents\\skills\\");
-            if (!isCanonical) {
-              stale.push(`${provider.id}/${entry}`);
+            console.log(pc11.yellow(`  ! ${name}: ${result.errors.join(", ")}`));
+            failed++;
+          }
+        } catch (err) {
+          console.log(pc11.red(`  x ${name}: ${err instanceof Error ? err.message : String(err)}`));
+          failed++;
+        }
+      }
+      console.log(`
+${pc11.green(`${installed} installed`)}, ${failed > 0 ? pc11.yellow(`${failed} failed`) : "0 failed"}`);
+      return;
+    }
+    if (!source) {
+      console.error(pc11.red("Missing required argument: source"));
+      console.log(pc11.dim("Usage: caamp skills install <source> or caamp skills install --profile <name>"));
+      process.exit(1);
+    }
+    console.log(pc11.dim(`Installing to ${providers.length} provider(s)...`));
+    let localPath;
+    let cleanup;
+    let skillName;
+    let sourceValue;
+    let sourceType;
+    if (isMarketplaceScoped(source)) {
+      console.log(pc11.dim(`Searching marketplace for ${source}...`));
+      const client = new MarketplaceClient();
+      let skill;
+      try {
+        skill = await client.getSkill(source);
+      } catch (error) {
+        console.error(pc11.red(`Marketplace lookup failed: ${formatNetworkError(error)}`));
+        process.exit(1);
+      }
+      if (!skill) {
+        console.error(pc11.red(`Skill not found: ${source}`));
+        process.exit(1);
+      }
+      console.log(`  Found: ${pc11.bold(skill.name)} by ${skill.author} (${pc11.dim(skill.repoFullName)})`);
+      const parsed = parseSource(skill.githubUrl);
+      if (parsed.type !== "github" || !parsed.owner || !parsed.repo) {
+        console.error(pc11.red("Could not resolve GitHub source"));
+        process.exit(1);
+      }
+      try {
+        const subPathCandidates = buildSkillSubPathCandidates(skill.path, parsed.path);
+        let cloneError;
+        let cloned = false;
+        for (const subPath of subPathCandidates) {
+          try {
+            const result = await cloneRepo(parsed.owner, parsed.repo, parsed.ref, subPath);
+            if (subPath && !existsSync4(result.localPath)) {
+              await result.cleanup();
+              continue;
             }
+            localPath = result.localPath;
+            cleanup = result.cleanup;
+            cloned = true;
+            break;
+          } catch (error) {
+            cloneError = error;
           }
-        } catch {
+        }
+        if (!cloned) {
+          throw cloneError ?? new Error("Unable to resolve skill path from marketplace metadata");
+        }
+        skillName = skill.name;
+        sourceValue = skill.githubUrl;
+        sourceType = parsed.type;
+      } catch (error) {
+        console.error(pc11.red(`Failed to fetch source repository: ${formatNetworkError(error)}`));
+        process.exit(1);
+      }
+    } else {
+      const parsed = parseSource(source);
+      skillName = parsed.inferredName;
+      sourceValue = parsed.value;
+      sourceType = parsed.type;
+      if (parsed.type === "github" && parsed.owner && parsed.repo) {
+        try {
+          const result = await cloneRepo(parsed.owner, parsed.repo, parsed.ref, parsed.path);
+          localPath = result.localPath;
+          cleanup = result.cleanup;
+        } catch (error) {
+          console.error(pc11.red(`Failed to clone GitHub repository: ${formatNetworkError(error)}`));
+          process.exit(1);
+        }
+      } else if (parsed.type === "gitlab" && parsed.owner && parsed.repo) {
+        try {
+          const result = await cloneGitLabRepo(parsed.owner, parsed.repo, parsed.ref, parsed.path);
+          localPath = result.localPath;
+          cleanup = result.cleanup;
+        } catch (error) {
+          console.error(pc11.red(`Failed to clone GitLab repository: ${formatNetworkError(error)}`));
+          process.exit(1);
+        }
+      } else if (parsed.type === "local") {
+        localPath = parsed.value;
+        const discovered = await discoverSkill(localPath);
+        if (discovered) {
+          skillName = discovered.name;
+        }
+      } else if (parsed.type === "package") {
+        if (!isCatalogAvailable()) {
+          console.error(pc11.red("@cleocode/ct-skills is not installed. Run: npm install @cleocode/ct-skills"));
+          process.exit(1);
+        }
+        const catalogSkill = getSkill(parsed.inferredName);
+        if (catalogSkill) {
+          localPath = getSkillDir(catalogSkill.name);
+          skillName = catalogSkill.name;
+          sourceValue = `@cleocode/ct-skills:${catalogSkill.name}`;
+          sourceType = "package";
+          console.log(`  Found in catalog: ${pc11.bold(catalogSkill.name)} v${catalogSkill.version} (${pc11.dim(catalogSkill.category)})`);
+        } else {
+          console.error(pc11.red(`Skill not found in catalog: ${parsed.inferredName}`));
+          console.log(pc11.dim("Available skills: " + listSkills().join(", ")));
+          process.exit(1);
+        }
+      } else {
+        console.error(pc11.red(`Unsupported source type: ${parsed.type}`));
+        process.exit(1);
+      }
+    }
+    try {
+      if (!localPath) {
+        throw new Error("No local skill path resolved for installation");
+      }
+      const result = await installSkill(
+        localPath,
+        skillName,
+        providers,
+        opts.global ?? false
+      );
+      if (result.success) {
+        console.log(pc11.green(`
+\u2713 Installed ${pc11.bold(skillName)}`));
+        console.log(`  Canonical: ${pc11.dim(result.canonicalPath)}`);
+        console.log(`  Linked to: ${result.linkedAgents.join(", ")}`);
+        const isGlobal = sourceType === "package" ? true : opts.global ?? false;
+        await recordSkillInstall(
+          skillName,
+          sourceValue,
+          sourceValue,
+          sourceType,
+          result.linkedAgents,
+          result.canonicalPath,
+          isGlobal
+        );
+      }
+      if (result.errors.length > 0) {
+        console.log(pc11.yellow("\nWarnings:"));
+        for (const err of result.errors) {
+          console.log(`  ${pc11.yellow("!")} ${err}`);
         }
       }
-    } catch {
+    } finally {
+      if (cleanup) await cleanup();
     }
-  }
-  if (broken.length === 0) {
-    checks.push({ label: "No broken symlinks", status: "pass" });
-  } else {
-    checks.push({
-      label: `${broken.length} broken symlink${broken.length !== 1 ? "s" : ""}`,
-      status: "warn",
-      detail: broken.join(", ")
-    });
-  }
-  if (stale.length === 0) {
-    checks.push({ label: "No stale symlinks", status: "pass" });
-  } else {
-    checks.push({
-      label: `${stale.length} stale symlink${stale.length !== 1 ? "s" : ""} (not pointing to ~/.agents/skills/)`,
-      status: "warn",
-      detail: stale.join(", ")
-    });
-  }
-  return { name: "Skills", checks };
+  });
 }
-async function checkLockFile() {
-  const checks = [];
-  try {
-    const lock = await readLockFile();
-    checks.push({ label: "Lock file valid", status: "pass" });
-    const lockSkillNames = Object.keys(lock.skills);
-    checks.push({ label: `${lockSkillNames.length} skill entries`, status: "pass" });
-    const orphaned = [];
-    for (const [name, entry] of Object.entries(lock.skills)) {
-      if (entry.canonicalPath && !existsSync6(entry.canonicalPath)) {
-        orphaned.push(name);
-      }
-    }
-    if (orphaned.length === 0) {
-      checks.push({ label: "0 orphaned entries", status: "pass" });
-    } else {
-      checks.push({
-        label: `${orphaned.length} orphaned skill${orphaned.length !== 1 ? "s" : ""} (in lock, missing from disk)`,
-        status: "warn",
-        detail: orphaned.join(", ")
-      });
-    }
-    const canonicalDir = CANONICAL_SKILLS_DIR;
-    if (existsSync6(canonicalDir)) {
-      const onDisk = readdirSync(canonicalDir).filter((name) => {
-        try {
-          const stat = lstatSync(join5(canonicalDir, name));
-          return stat.isDirectory() || stat.isSymbolicLink();
-        } catch {
-          return false;
-        }
-      });
-      const untracked = onDisk.filter((name) => !lock.skills[name]);
-      if (untracked.length === 0) {
-        checks.push({ label: "0 untracked skills", status: "pass" });
+
+// src/commands/skills/remove.ts
+import pc12 from "picocolors";
+function registerSkillsRemove(parent) {
+  parent.command("remove").description("Remove installed skill(s)").argument("[name]", "Skill name to remove").option("-g, --global", "Remove from global scope").option("-y, --yes", "Skip confirmation").action(async (name, opts) => {
+    const providers = getInstalledProviders();
+    if (name) {
+      const result = await removeSkill(name, providers, opts.global ?? false);
+      if (result.removed.length > 0) {
+        console.log(pc12.green(`\u2713 Removed ${pc12.bold(name)} from: ${result.removed.join(", ")}`));
+        await removeSkillFromLock(name);
       } else {
-        checks.push({
-          label: `${untracked.length} untracked skill${untracked.length !== 1 ? "s" : ""} (on disk, not in lock)`,
-          status: "warn",
-          detail: untracked.join(", ")
-        });
+        console.log(pc12.yellow(`Skill ${name} not found in any provider.`));
       }
-    }
-    const results = detectAllProviders();
-    const installed = results.filter((r) => r.installed);
-    const mismatches = [];
-    for (const [name, entry] of Object.entries(lock.skills)) {
-      if (!entry.agents || entry.agents.length === 0) continue;
-      for (const agentId of entry.agents) {
-        const provider = installed.find((r) => r.provider.id === agentId);
-        if (!provider) continue;
-        const linkPath = join5(provider.provider.pathSkills, name);
-        if (!existsSync6(linkPath)) {
-          mismatches.push(`${name} missing from ${agentId}`);
+      if (result.errors.length > 0) {
+        for (const err of result.errors) {
+          console.log(pc12.red(`  ${err}`));
         }
       }
-    }
-    if (mismatches.length === 0) {
-      checks.push({ label: "Lock agent-lists match symlinks", status: "pass" });
     } else {
-      checks.push({
-        label: `${mismatches.length} agent-list mismatch${mismatches.length !== 1 ? "es" : ""}`,
-        status: "warn",
-        detail: mismatches.slice(0, 5).join(", ") + (mismatches.length > 5 ? ` (+${mismatches.length - 5} more)` : "")
-      });
-    }
-  } catch (err) {
-    checks.push({
-      label: "Failed to read lock file",
-      status: "fail",
-      detail: err instanceof Error ? err.message : String(err)
-    });
-  }
-  return { name: "Lock File", checks };
-}
-async function checkConfigFiles() {
-  const checks = [];
-  const results = detectAllProviders();
-  const installed = results.filter((r) => r.installed);
-  for (const r of installed) {
-    const provider = r.provider;
-    const configPath = provider.configPathGlobal;
-    if (!existsSync6(configPath)) {
-      checks.push({
-        label: `${provider.id}: no config file found`,
-        status: "warn",
-        detail: configPath
-      });
-      continue;
-    }
-    try {
-      await readConfig(configPath, provider.configFormat);
-      const relPath = configPath.replace(homedir(), "~");
-      checks.push({
-        label: `${provider.id}: ${relPath} readable`,
-        status: "pass"
-      });
-    } catch (err) {
-      checks.push({
-        label: `${provider.id}: config parse error`,
-        status: "fail",
-        detail: err instanceof Error ? err.message : String(err)
-      });
-    }
-  }
-  if (installed.length === 0) {
-    checks.push({ label: "No installed providers to check", status: "pass" });
-  }
-  return { name: "Config Files", checks };
-}
-function formatSection(section) {
-  const lines = [];
-  lines.push(`  ${pc19.bold(section.name)}`);
-  for (const check of section.checks) {
-    const icon = check.status === "pass" ? pc19.green("\u2713") : check.status === "warn" ? pc19.yellow("\u26A0") : pc19.red("\u2717");
-    lines.push(`    ${icon} ${check.label}`);
-    if (check.detail) {
-      lines.push(`      ${pc19.dim(check.detail)}`);
-    }
-  }
-  return lines.join("\n");
-}
-function registerDoctorCommand(program2) {
-  program2.command("doctor").description("Diagnose configuration issues and health").option("--json", "Output as JSON").action(async (opts) => {
-    const sections = [];
-    sections.push(checkEnvironment());
-    sections.push(checkRegistry());
-    sections.push(checkInstalledProviders());
-    sections.push(checkSkillSymlinks());
-    sections.push(await checkLockFile());
-    sections.push(await checkConfigFiles());
-    let passed = 0;
-    let warnings = 0;
-    let errors = 0;
-    for (const section of sections) {
-      for (const check of section.checks) {
-        if (check.status === "pass") passed++;
-        else if (check.status === "warn") warnings++;
-        else errors++;
+      const skills = await listCanonicalSkills();
+      if (skills.length === 0) {
+        console.log(pc12.dim("No skills installed."));
+        return;
       }
-    }
-    if (opts.json) {
-      const output = {
-        version: getCaampVersion(),
-        sections: sections.map((s) => ({
-          name: s.name,
-          checks: s.checks
-        })),
-        summary: { passed, warnings, errors }
-      };
-      console.log(JSON.stringify(output, null, 2));
-      return;
-    }
-    console.log(pc19.bold("\ncaamp doctor\n"));
-    for (const section of sections) {
-      console.log(formatSection(section));
-      console.log();
-    }
-    const parts = [];
-    parts.push(pc19.green(`${passed} checks passed`));
-    if (warnings > 0) parts.push(pc19.yellow(`${warnings} warning${warnings !== 1 ? "s" : ""}`));
-    if (errors > 0) parts.push(pc19.red(`${errors} error${errors !== 1 ? "s" : ""}`));
-    console.log(`  ${pc19.bold("Summary")}: ${parts.join(", ")}`);
-    console.log();
-    if (errors > 0) {
-      process.exit(1);
+      console.log(pc12.bold("Installed skills:"));
+      for (const s of skills) {
+        console.log(`  ${s}`);
+      }
+      console.log(pc12.dim("\nUse: caamp skills remove <name>"));
     }
   });
 }
 
-// src/commands/advanced/common.ts
-import { readFile } from "fs/promises";
-
-// src/commands/advanced/lafs.ts
+// src/commands/skills/list.ts
 import { randomUUID as randomUUID2 } from "crypto";
-import {
-  isRegisteredErrorCode
-} from "@cleocode/lafs-protocol";
-var LAFSCommandError = class extends Error {
-  code;
-  category;
-  recoverable;
-  suggestion;
-  retryAfterMs;
-  details;
-  constructor(code, message, suggestion, recoverable = true, details) {
-    super(message);
-    this.name = "LAFSCommandError";
-    this.code = code;
-    this.category = inferErrorCategory(code);
-    this.recoverable = recoverable;
-    this.suggestion = suggestion;
-    this.retryAfterMs = null;
-    this.details = details;
-  }
-};
-function inferErrorCategory(code) {
-  if (code.includes("VALIDATION")) return "VALIDATION";
-  if (code.includes("NOT_FOUND")) return "NOT_FOUND";
-  if (code.includes("CONFLICT")) return "CONFLICT";
-  if (code.includes("AUTH")) return "AUTH";
-  if (code.includes("PERMISSION")) return "PERMISSION";
-  if (code.includes("RATE_LIMIT")) return "RATE_LIMIT";
-  if (code.includes("MIGRATION")) return "MIGRATION";
-  if (code.includes("CONTRACT")) return "CONTRACT";
-  return "INTERNAL";
+import { resolveOutputFormat } from "@cleocode/lafs-protocol";
+import pc13 from "picocolors";
+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 (default)").option("--human", "Output in human-readable format").action(async (opts) => {
+    const operation = "skills.list";
+    const mvi = true;
+    let format;
+    try {
+      format = resolveOutputFormat({
+        jsonFlag: opts.json ?? false,
+        humanFlag: (opts.human ?? false) || isHuman(),
+        projectDefault: "json"
+      }).format;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      emitJsonError(operation, mvi, "E_FORMAT_CONFLICT", message, "VALIDATION");
+      process.exit(1);
+    }
+    let dirs = [];
+    if (opts.agent) {
+      const provider = getProvider(opts.agent);
+      if (!provider) {
+        const message = `Provider not found: ${opts.agent}`;
+        if (format === "json") {
+          emitJsonError(operation, mvi, "E_PROVIDER_NOT_FOUND", message, "NOT_FOUND", {
+            agent: opts.agent
+          });
+        } else {
+          console.error(pc13.red(message));
+        }
+        process.exit(1);
+      }
+      dirs = opts.global ? [resolveProviderSkillsDir(provider, "global")] : [resolveProviderSkillsDir(provider, "project")];
+    } else if (opts.global) {
+      const providers = getInstalledProviders();
+      dirs = providers.map((p) => resolveProviderSkillsDir(p, "global")).filter(Boolean);
+    } else {
+      const providers = getInstalledProviders();
+      dirs = providers.map((p) => resolveProviderSkillsDir(p, "project")).filter(Boolean);
+    }
+    const skills = await discoverSkillsMulti(dirs);
+    if (format === "json") {
+      const envelope = buildEnvelope(
+        operation,
+        mvi,
+        {
+          skills,
+          count: skills.length,
+          scope: opts.global ? "global" : opts.agent ? `agent:${opts.agent}` : "project"
+        },
+        null
+      );
+      console.log(JSON.stringify(envelope, null, 2));
+      return;
+    }
+    if (skills.length === 0) {
+      console.log(pc13.dim("No skills found."));
+      return;
+    }
+    console.log(pc13.bold(`
+${skills.length} skill(s) found:
+`));
+    skills.forEach((skill, index) => {
+      const num = (index + 1).toString().padStart(2);
+      console.log(`  ${pc13.cyan(num)}. ${pc13.bold(skill.name.padEnd(30))} ${pc13.dim(skill.metadata?.description ?? "")}`);
+    });
+    console.log(pc13.dim(`
+Install with: caamp skills install <name>`));
+    console.log(pc13.dim(`Remove with:  caamp skills remove <name>`));
+  });
 }
-function baseMeta(operation, mvi) {
+function buildEnvelope(operation, mvi, result, error) {
   return {
-    specVersion: "1.0.0",
-    schemaVersion: "1.0.0",
-    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-    operation,
-    requestId: randomUUID2(),
-    transport: "cli",
-    strict: true,
-    mvi,
-    contextVersion: 0
-  };
-}
-function emitSuccess(operation, result, mvi = true) {
-  const envelope = {
     $schema: "https://lafs.dev/schemas/v1/envelope.schema.json",
     _meta: {
-      ...baseMeta(operation, mvi)
+      specVersion: "1.0.0",
+      schemaVersion: "1.0.0",
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      operation,
+      requestId: randomUUID2(),
+      transport: "cli",
+      strict: true,
+      mvi,
+      contextVersion: 0
     },
-    success: true,
+    success: error === null,
     result,
-    error: null,
+    error,
     page: null
   };
-  console.log(JSON.stringify(envelope, null, 2));
 }
-function emitError(operation, error, mvi = true) {
-  let envelope;
-  if (error instanceof LAFSCommandError) {
-    envelope = {
-      $schema: "https://lafs.dev/schemas/v1/envelope.schema.json",
-      _meta: {
-        ...baseMeta(operation, mvi)
-      },
-      success: false,
-      result: null,
-      error: {
-        code: isRegisteredErrorCode(error.code) ? error.code : "E_INTERNAL_UNEXPECTED",
-        message: error.message,
-        category: error.category,
-        retryable: error.recoverable,
-        retryAfterMs: error.retryAfterMs,
-        details: {
-          hint: error.suggestion,
-          ...error.details !== void 0 ? { payload: error.details } : {}
-        }
-      },
-      page: null
-    };
-  } else {
-    envelope = {
-      $schema: "https://lafs.dev/schemas/v1/envelope.schema.json",
-      _meta: {
-        ...baseMeta(operation, mvi)
-      },
-      success: false,
-      result: null,
-      error: {
-        code: "E_INTERNAL_UNEXPECTED",
-        message: error instanceof Error ? error.message : String(error),
-        category: "INTERNAL",
-        retryable: false,
-        retryAfterMs: null,
-        details: {
-          hint: "Rerun with --verbose and validate your inputs."
-        }
-      },
-      page: null
-    };
-  }
+function emitJsonError(operation, mvi, code, message, category, details = {}) {
+  const envelope = buildEnvelope(operation, mvi, null, {
+    code,
+    message,
+    category,
+    retryable: false,
+    retryAfterMs: null,
+    details
+  });
   console.error(JSON.stringify(envelope, null, 2));
 }
-async function runLafsCommand(command, mvi, action) {
-  try {
-    const result = await action();
-    emitSuccess(command, result, mvi);
-  } catch (error) {
-    emitError(command, error, mvi);
-    process.exit(1);
-  }
-}
 
-// src/commands/advanced/common.ts
-var VALID_PRIORITIES = /* @__PURE__ */ new Set(["high", "medium", "low"]);
-function parsePriority(value) {
-  if (!VALID_PRIORITIES.has(value)) {
-    throw new LAFSCommandError(
-      "E_ADVANCED_VALIDATION_PRIORITY",
-      `Invalid tier: ${value}`,
-      "Use one of: high, medium, low."
-    );
-  }
-  return value;
-}
-function resolveProviders(options) {
-  if (options.all) {
-    return getAllProviders();
-  }
-  const targetAgents = options.agent ?? [];
-  if (targetAgents.length === 0) {
-    return getInstalledProviders();
-  }
-  const providers = targetAgents.map((id) => getProvider(id)).filter((provider) => provider !== void 0);
-  if (providers.length !== targetAgents.length) {
-    const found = new Set(providers.map((provider) => provider.id));
-    const missing = targetAgents.filter((id) => !found.has(id));
-    throw new LAFSCommandError(
-      "E_ADVANCED_PROVIDER_NOT_FOUND",
-      `Unknown provider(s): ${missing.join(", ")}`,
-      "Check `caamp providers list` for valid provider IDs/aliases."
-    );
-  }
-  return providers;
-}
-async function readJsonFile(path) {
-  try {
-    const raw = await readFile(path, "utf-8");
-    return JSON.parse(raw);
-  } catch (error) {
-    throw new LAFSCommandError(
-      "E_ADVANCED_INPUT_JSON",
-      `Failed to read JSON file: ${path}`,
-      "Confirm the path exists and contains valid JSON.",
-      true,
-      { reason: error instanceof Error ? error.message : String(error) }
-    );
-  }
-}
-async function readMcpOperations(path) {
-  const value = await readJsonFile(path);
-  if (!Array.isArray(value)) {
-    throw new LAFSCommandError(
-      "E_ADVANCED_VALIDATION_MCP_ARRAY",
-      `MCP operations file must be a JSON array: ${path}`,
-      "Provide an array of objects with serverName and config fields."
-    );
+// src/commands/skills/find.ts
+import { randomUUID as randomUUID3 } from "crypto";
+import {
+  resolveOutputFormat as resolveOutputFormat2
+} from "@cleocode/lafs-protocol";
+import pc14 from "picocolors";
+var SkillsFindValidationError = class extends Error {
+  code;
+  constructor(code, message) {
+    super(message);
+    this.code = code;
+    this.name = "SkillsFindValidationError";
   }
-  const operations = [];
-  for (const [index, item] of value.entries()) {
-    if (!item || typeof item !== "object") {
-      throw new LAFSCommandError(
-        "E_ADVANCED_VALIDATION_MCP_ITEM",
-        `Invalid MCP operation at index ${index}`,
-        "Each operation must be an object with serverName and config."
-      );
-    }
-    const obj = item;
-    const serverName = obj.serverName;
-    const config = obj.config;
-    const scope = obj.scope;
-    if (typeof serverName !== "string" || serverName.length === 0) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_VALIDATION_MCP_NAME",
-        `Invalid serverName at index ${index}`,
-        "Set serverName to a non-empty string."
-      );
+};
+function registerSkillsFind(parent) {
+  parent.command("find").description("Search marketplace for skills").argument("[query]", "Search query").option("--recommend", "Recommend skills from constraints").option("--top <n>", "Number of recommendation candidates", "3").option("--must-have <term>", "Required criteria term", (value, previous) => [...previous, value], []).option("--prefer <term>", "Preferred criteria term", (value, previous) => [...previous, value], []).option("--exclude <term>", "Excluded criteria term", (value, previous) => [...previous, value], []).option("--details", "Include expanded machine output").option("--human", "Force human-readable output").option("--json", "Output as JSON").option("--select <indexes>", "Pre-select recommendation ranks (comma-separated)").option("-l, --limit <n>", "Max results", "20").action(async (query, opts) => {
+    const operation = opts.recommend ? "skills.find.recommend" : "skills.find.search";
+    const details = Boolean(opts.details);
+    const mvi = !details;
+    let format;
+    try {
+      format = resolveOutputFormat2({
+        jsonFlag: opts.json ?? false,
+        humanFlag: (opts.human ?? false) || isHuman(),
+        projectDefault: "json"
+      }).format;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      if (opts.json) {
+        emitJsonError2(operation, mvi, "E_FORMAT_CONFLICT", message, "VALIDATION");
+      } else {
+        console.error(pc14.red(message));
+      }
+      process.exit(1);
     }
-    if (!config || typeof config !== "object" || Array.isArray(config)) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_VALIDATION_MCP_CONFIG",
-        `Invalid config at index ${index}`,
-        "Set config to an object matching McpServerConfig."
-      );
+    if (opts.recommend) {
+      try {
+        const top = parseTop(opts.top);
+        const mustHave = parseConstraintList(opts.mustHave);
+        const prefer = parseConstraintList(opts.prefer);
+        const exclude = parseConstraintList(opts.exclude);
+        validateCriteriaConflicts(mustHave, prefer, exclude);
+        const selectedRanks = parseSelectList(opts.select);
+        const seedQuery = buildSeedQuery(query, mustHave, prefer, exclude);
+        const recommendation = await recommendSkills(
+          seedQuery,
+          {
+            mustHave,
+            prefer,
+            exclude
+          },
+          {
+            top,
+            includeDetails: details
+          }
+        );
+        const options = normalizeRecommendationOptions(recommendation.ranking, details);
+        validateSelectedRanks(selectedRanks, options.length);
+        const selected = selectedRanks.length > 0 ? options.filter((option) => selectedRanks.includes(option.rank)) : [];
+        if (format === "json") {
+          const result = formatSkillRecommendations(recommendation, { mode: "json", details });
+          const resultOptions = Array.isArray(result.options) ? result.options : [];
+          const selectedObjects = resultOptions.filter(
+            (option) => selectedRanks.includes(Number(option.rank ?? 0))
+          );
+          const envelope = buildEnvelope2(
+            operation,
+            mvi,
+            {
+              ...result,
+              selected: selectedObjects
+            },
+            null
+          );
+          console.log(JSON.stringify(envelope, null, 2));
+          return;
+        }
+        const human = formatSkillRecommendations(recommendation, { mode: "human", details });
+        console.log(human);
+        if (selected.length > 0) {
+          console.log(`Selected: ${selected.map((option) => option.scopedName).join(", ")}`);
+        }
+        return;
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        const errorCode = error instanceof SkillsFindValidationError ? error.code : error.code ?? RECOMMENDATION_ERROR_CODES.SOURCE_UNAVAILABLE;
+        const category = errorCode === RECOMMENDATION_ERROR_CODES.CRITERIA_CONFLICT ? "CONFLICT" : errorCode === RECOMMENDATION_ERROR_CODES.NO_MATCHES ? "NOT_FOUND" : errorCode === RECOMMENDATION_ERROR_CODES.QUERY_INVALID ? "VALIDATION" : "INTERNAL";
+        if (format === "json") {
+          emitJsonError2(operation, mvi, errorCode, message, category, {
+            query: query ?? null
+          });
+        } else {
+          console.error(pc14.red(`Recommendation failed: ${message}`));
+        }
+        process.exit(1);
+      }
     }
-    if (scope !== void 0 && scope !== "project" && scope !== "global") {
-      throw new LAFSCommandError(
-        "E_ADVANCED_VALIDATION_SCOPE",
-        `Invalid scope at index ${index}: ${String(scope)}`,
-        "Use scope value 'project' or 'global'."
-      );
+    if (!query) {
+      console.log(pc14.dim("Usage: caamp skills find <query>"));
+      return;
     }
-    operations.push({
-      serverName,
-      config,
-      ...scope ? { scope } : {}
-    });
-  }
-  return operations;
-}
-async function readSkillOperations(path) {
-  const value = await readJsonFile(path);
-  if (!Array.isArray(value)) {
-    throw new LAFSCommandError(
-      "E_ADVANCED_VALIDATION_SKILL_ARRAY",
-      `Skill operations file must be a JSON array: ${path}`,
-      "Provide an array of objects with sourcePath and skillName fields."
-    );
-  }
-  const operations = [];
-  for (const [index, item] of value.entries()) {
-    if (!item || typeof item !== "object") {
-      throw new LAFSCommandError(
-        "E_ADVANCED_VALIDATION_SKILL_ITEM",
-        `Invalid skill operation at index ${index}`,
-        "Each operation must be an object with sourcePath and skillName."
-      );
+    const limit = parseInt(opts.limit, 10);
+    const client = new MarketplaceClient();
+    if (format === "human") {
+      console.log(pc14.dim(`Searching marketplaces for "${query}"...
+`));
     }
-    const obj = item;
-    const sourcePath = obj.sourcePath;
-    const skillName = obj.skillName;
-    const isGlobal = obj.isGlobal;
-    if (typeof sourcePath !== "string" || sourcePath.length === 0) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_VALIDATION_SKILL_SOURCE",
-        `Invalid sourcePath at index ${index}`,
-        "Set sourcePath to a non-empty string."
-      );
+    let results;
+    try {
+      results = await client.search(query, limit);
+    } catch (error) {
+      const message = formatNetworkError(error);
+      if (format === "json") {
+        emitJsonError2(operation, mvi, "E_SEARCH_FAILED", message, "TRANSIENT", {
+          query,
+          limit
+        });
+      } else {
+        console.error(pc14.red(`Marketplace search failed: ${message}`));
+      }
+      process.exit(1);
     }
-    if (typeof skillName !== "string" || skillName.length === 0) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_VALIDATION_SKILL_NAME",
-        `Invalid skillName at index ${index}`,
-        "Set skillName to a non-empty string."
+    if (format === "json") {
+      const envelope = buildEnvelope2(
+        operation,
+        mvi,
+        {
+          query,
+          results,
+          count: results.length,
+          limit
+        },
+        null
       );
+      console.log(JSON.stringify(envelope, null, 2));
+      return;
     }
-    if (isGlobal !== void 0 && typeof isGlobal !== "boolean") {
-      throw new LAFSCommandError(
-        "E_ADVANCED_VALIDATION_SKILL_SCOPE",
-        `Invalid isGlobal value at index ${index}`,
-        "Set isGlobal to true or false when provided."
-      );
+    if (results.length === 0) {
+      console.log(pc14.yellow("No results found."));
+      return;
     }
-    operations.push({
-      sourcePath,
-      skillName,
-      ...isGlobal !== void 0 ? { isGlobal } : {}
+    console.log(pc14.dim(`Found ${results.length} result(s) for "${query}":
+`));
+    results.forEach((skill, index) => {
+      const num = (index + 1).toString().padStart(2);
+      const stars = skill.stars > 0 ? pc14.yellow(`\u2605 ${formatStars(skill.stars)}`) : "";
+      console.log(`  ${pc14.cyan(num)}. ${pc14.bold(skill.scopedName)} ${stars}`);
+      console.log(`      ${pc14.dim(skill.description?.slice(0, 80) ?? "")}`);
+      console.log(`      ${pc14.dim(`from ${skill.source}`)}`);
+      console.log();
     });
+    console.log(pc14.dim("Install with: caamp skills install <name>"));
+    console.log(pc14.dim("Or select by number: caamp skills install <n>"));
+  });
+}
+function formatStars(n) {
+  if (n >= 1e3) return `${(n / 1e3).toFixed(1)}k`;
+  return String(n);
+}
+function parseConstraintList(values) {
+  const normalized = values.flatMap((value) => tokenizeCriteriaValue(value));
+  return Array.from(new Set(normalized));
+}
+function parseTop(value) {
+  const parsed = Number.parseInt(value, 10);
+  if (!Number.isInteger(parsed) || parsed < 1 || parsed > 20) {
+    throw new SkillsFindValidationError(RECOMMENDATION_ERROR_CODES.QUERY_INVALID, "--top must be an integer between 1 and 20");
   }
-  return operations;
+  return parsed;
 }
-async function readTextInput(inlineContent, filePath) {
-  if (inlineContent && filePath) {
-    throw new LAFSCommandError(
-      "E_ADVANCED_VALIDATION_INPUT_MODE",
-      "Provide either inline content or a content file, not both.",
-      "Use --content OR --content-file."
-    );
+function parseSelectList(value) {
+  if (!value) return [];
+  const parsed = value.split(",").map((entry) => Number.parseInt(entry.trim(), 10)).filter((entry) => Number.isInteger(entry) && entry > 0);
+  return Array.from(new Set(parsed));
+}
+function buildSeedQuery(query, mustHave, prefer, exclude) {
+  if (query && query.trim().length > 0) {
+    return query;
   }
-  if (inlineContent) return inlineContent;
-  if (!filePath) return void 0;
-  try {
-    return await readFile(filePath, "utf-8");
-  } catch (error) {
-    throw new LAFSCommandError(
-      "E_ADVANCED_INPUT_TEXT",
-      `Failed to read content file: ${filePath}`,
-      "Confirm the file exists and is readable.",
-      true,
-      { reason: error instanceof Error ? error.message : String(error) }
-    );
+  const seedTerms = [...mustHave, ...prefer, ...exclude].filter((term) => term.length > 0);
+  if (seedTerms.length > 0) {
+    return seedTerms.join(" ");
   }
+  throw new SkillsFindValidationError(
+    RECOMMENDATION_ERROR_CODES.QUERY_INVALID,
+    "Recommendation mode requires a query or at least one criteria flag."
+  );
 }
-
-// src/commands/advanced/providers.ts
-function registerAdvancedProviders(parent) {
-  parent.command("providers").description("Select providers by priority using advanced wrapper logic").option("-a, --agent <name>", "Target specific provider(s)", (v, prev) => [...prev, v], []).option("--all", "Use all registry providers (not only detected)").option("--min-tier <tier>", "Minimum priority tier: high|medium|low", "low").option("--details", "Include full provider objects").action(async (opts) => runLafsCommand("advanced.providers", !opts.details, async () => {
-    const providers = resolveProviders({ all: opts.all, agent: opts.agent });
-    const minTier = parsePriority(opts.minTier);
-    const selected = selectProvidersByMinimumPriority(providers, minTier);
+function normalizeRecommendationOptions(ranking, details) {
+  return ranking.map((entry, index) => {
+    const whyCodes = entry.reasons.map((reason) => reason.code);
     return {
-      objective: "Filter providers by minimum priority tier",
-      constraints: {
-        minTier,
-        selectionMode: opts.all ? "registry" : "detected-or-explicit"
-      },
-      acceptanceCriteria: {
-        selectedCount: selected.length,
-        orderedByPriority: true
-      },
-      data: opts.details ? selected : selected.map((provider) => ({
-        id: provider.id,
-        priority: provider.priority,
-        status: provider.status,
-        configFormat: provider.configFormat
-      }))
+      rank: index + 1,
+      scopedName: entry.skill.scopedName,
+      description: entry.skill.description,
+      score: entry.score,
+      why: whyCodes.length > 0 ? whyCodes.join(", ") : "score-based match",
+      source: entry.skill.source,
+      ...details ? {
+        evidence: {
+          reasons: entry.reasons,
+          breakdown: entry.breakdown
+        }
+      } : {}
     };
-  }));
+  });
 }
-
-// src/commands/advanced/batch.ts
-function registerAdvancedBatch(parent) {
-  parent.command("batch").description("Run rollback-capable batch install for MCP + skills").option("-a, --agent <name>", "Target specific provider(s)", (v, prev) => [...prev, v], []).option("--all", "Use all registry providers (not only detected)").option("--min-tier <tier>", "Minimum priority tier: high|medium|low", "low").option("--mcp-file <path>", "JSON file containing McpBatchOperation[]").option("--skills-file <path>", "JSON file containing SkillBatchOperation[]").option("--project-dir <path>", "Project directory to resolve project-scope paths").option("--details", "Include detailed operation result").action(async (opts) => runLafsCommand("advanced.batch", !opts.details, async () => {
-    const baseProviders = resolveProviders({ all: opts.all, agent: opts.agent });
-    const minimumPriority = parsePriority(opts.minTier);
-    const providers = selectProvidersByMinimumPriority(baseProviders, minimumPriority);
-    const mcp = opts.mcpFile ? await readMcpOperations(opts.mcpFile) : [];
-    const skills = opts.skillsFile ? await readSkillOperations(opts.skillsFile) : [];
-    if (mcp.length === 0 && skills.length === 0) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_VALIDATION_NO_OPS",
-        "No operations provided.",
-        "Provide --mcp-file and/or --skills-file."
+function validateCriteriaConflicts(mustHave, prefer, exclude) {
+  const overlap = mustHave.filter((term) => exclude.includes(term));
+  if (overlap.length > 0) {
+    throw new SkillsFindValidationError(
+      RECOMMENDATION_ERROR_CODES.CRITERIA_CONFLICT,
+      "A criteria term cannot be both required and excluded."
+    );
+  }
+  const preferOverlap = prefer.filter((term) => exclude.includes(term));
+  if (preferOverlap.length > 0) {
+    throw new SkillsFindValidationError(
+      RECOMMENDATION_ERROR_CODES.CRITERIA_CONFLICT,
+      "A criteria term cannot be both preferred and excluded."
+    );
+  }
+}
+function validateSelectedRanks(selectedRanks, total) {
+  for (const rank of selectedRanks) {
+    if (rank < 1 || rank > total) {
+      throw new SkillsFindValidationError(
+        RECOMMENDATION_ERROR_CODES.QUERY_INVALID,
+        `--select rank ${rank} is out of range (1-${total}).`
       );
     }
-    if (providers.length === 0) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_NO_TARGET_PROVIDERS",
-        "No target providers resolved for this batch operation.",
-        "Use --all or pass provider IDs with --agent."
-      );
+  }
+}
+function buildEnvelope2(operation, mvi, result, error) {
+  return {
+    $schema: "https://lafs.dev/schemas/v1/envelope.schema.json",
+    _meta: {
+      specVersion: "1.0.0",
+      schemaVersion: "1.0.0",
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      operation,
+      requestId: randomUUID3(),
+      transport: "cli",
+      strict: true,
+      mvi,
+      contextVersion: 0
+    },
+    success: error === null,
+    result,
+    error,
+    page: null
+  };
+}
+function emitJsonError2(operation, mvi, code, message, category, details = {}) {
+  const envelope = buildEnvelope2(operation, mvi, null, {
+    code,
+    message,
+    category,
+    retryable: false,
+    retryAfterMs: null,
+    details
+  });
+  console.error(JSON.stringify(envelope, null, 2));
+}
+
+// src/commands/skills/check.ts
+import pc15 from "picocolors";
+function registerSkillsCheck(parent) {
+  parent.command("check").description("Check for available skill updates").option("--json", "Output as JSON").action(async (opts) => {
+    const tracked = await getTrackedSkills();
+    const entries = Object.entries(tracked);
+    if (entries.length === 0) {
+      console.log(pc15.dim("No tracked skills."));
+      return;
     }
-    const result = await installBatchWithRollback({
-      providers,
-      minimumPriority,
-      mcp,
-      skills,
-      projectDir: opts.projectDir
-    });
-    if (!result.success) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_BATCH_FAILED",
-        result.error ?? "Batch operation failed.",
-        "Check rollbackErrors and input configs, then retry.",
-        true,
-        result
-      );
+    console.log(pc15.dim(`Checking ${entries.length} skill(s) for updates...
+`));
+    const results = [];
+    for (const [name, entry] of entries) {
+      const update = await checkSkillUpdate(name);
+      results.push({ name, entry, ...update });
     }
-    return {
-      objective: "Install MCP and skills with rollback safety",
-      constraints: {
-        minimumPriority,
-        providerCount: providers.length,
-        mcpOps: mcp.length,
-        skillOps: skills.length
-      },
-      acceptanceCriteria: {
-        success: result.success,
-        rollbackPerformed: result.rollbackPerformed
-      },
-      data: opts.details ? result : {
-        providerCount: result.providerIds.length,
-        mcpApplied: result.mcpApplied,
-        skillsApplied: result.skillsApplied,
-        rollbackPerformed: result.rollbackPerformed
+    if (opts.json) {
+      console.log(JSON.stringify(results, null, 2));
+      return;
+    }
+    let updatesAvailable = 0;
+    for (const r of results) {
+      let statusLabel;
+      if (r.status === "update-available") {
+        statusLabel = pc15.yellow("update available");
+        updatesAvailable++;
+      } else if (r.status === "up-to-date") {
+        statusLabel = pc15.green("up to date");
+      } else {
+        statusLabel = pc15.dim("unknown");
       }
-    };
-  }));
+      console.log(`  ${pc15.bold(r.name.padEnd(30))} ${statusLabel}`);
+      if (r.currentVersion || r.latestVersion) {
+        const current = r.currentVersion ? r.currentVersion.slice(0, 12) : "?";
+        const latest = r.latestVersion ?? "?";
+        if (r.hasUpdate) {
+          console.log(`  ${pc15.dim("current:")} ${current}  ${pc15.dim("->")}  ${pc15.cyan(latest)}`);
+        } else {
+          console.log(`  ${pc15.dim("version:")} ${current}`);
+        }
+      }
+      console.log(`  ${pc15.dim(`source: ${r.entry.source}`)}`);
+      console.log(`  ${pc15.dim(`agents: ${r.entry.agents.join(", ")}`)}`);
+      console.log();
+    }
+    if (updatesAvailable > 0) {
+      console.log(pc15.yellow(`${updatesAvailable} update(s) available.`));
+      console.log(pc15.dim("Run `caamp skills update` to update all."));
+    } else {
+      console.log(pc15.green("All skills are up to date."));
+    }
+  });
 }
 
-// src/commands/advanced/conflicts.ts
-function registerAdvancedConflicts(parent) {
-  parent.command("conflicts").description("Preflight MCP conflict detection across providers").requiredOption("--mcp-file <path>", "JSON file containing McpBatchOperation[]").option("-a, --agent <name>", "Target specific provider(s)", (v, prev) => [...prev, v], []).option("--all", "Use all registry providers (not only detected)").option("--min-tier <tier>", "Minimum priority tier: high|medium|low", "low").option("--project-dir <path>", "Project directory to resolve project-scope paths").option("--details", "Include full conflict list").action(async (opts) => runLafsCommand("advanced.conflicts", !opts.details, async () => {
-    const baseProviders = resolveProviders({ all: opts.all, agent: opts.agent });
-    const minimumPriority = parsePriority(opts.minTier);
-    const providers = selectProvidersByMinimumPriority(baseProviders, minimumPriority);
-    const operations = await readMcpOperations(opts.mcpFile);
-    if (providers.length === 0) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_NO_TARGET_PROVIDERS",
-        "No target providers resolved for conflict detection.",
-        "Use --all or pass provider IDs with --agent."
-      );
+// src/commands/skills/update.ts
+import pc16 from "picocolors";
+function registerSkillsUpdate(parent) {
+  parent.command("update").description("Update all outdated skills").option("-y, --yes", "Skip confirmation").action(async (opts) => {
+    const tracked = await getTrackedSkills();
+    const entries = Object.entries(tracked);
+    if (entries.length === 0) {
+      console.log(pc16.dim("No tracked skills to update."));
+      return;
     }
-    const conflicts = await detectMcpConfigConflicts(
-      providers,
-      operations,
-      opts.projectDir
-    );
-    const countByCode = conflicts.reduce((acc, conflict) => {
-      acc[conflict.code] = (acc[conflict.code] ?? 0) + 1;
-      return acc;
-    }, {});
-    return {
-      objective: "Detect MCP configuration conflicts before mutation",
-      constraints: {
-        minimumPriority,
-        providerCount: providers.length,
-        operationCount: operations.length
-      },
-      acceptanceCriteria: {
-        conflictCount: conflicts.length
-      },
-      data: opts.details ? conflicts : {
-        conflictCount: conflicts.length,
-        countByCode,
-        sample: conflicts.slice(0, 5)
+    console.log(pc16.dim(`Checking ${entries.length} skill(s) for updates...`));
+    const outdated = [];
+    for (const [name] of entries) {
+      const result = await checkSkillUpdate(name);
+      if (result.hasUpdate) {
+        outdated.push({
+          name,
+          currentVersion: result.currentVersion,
+          latestVersion: result.latestVersion
+        });
       }
-    };
-  }));
-}
-
-// src/commands/advanced/apply.ts
-var VALID_POLICIES = /* @__PURE__ */ new Set(["fail", "skip", "overwrite"]);
-function parsePolicy(value) {
-  if (!VALID_POLICIES.has(value)) {
-    throw new LAFSCommandError(
-      "E_ADVANCED_VALIDATION_POLICY",
-      `Invalid policy: ${value}`,
-      "Use one of: fail, skip, overwrite."
-    );
-  }
-  return value;
-}
-function registerAdvancedApply(parent) {
-  parent.command("apply").description("Apply MCP operations with configurable conflict policy").requiredOption("--mcp-file <path>", "JSON file containing McpBatchOperation[]").option("--policy <policy>", "Conflict policy: fail|skip|overwrite", "fail").option("-a, --agent <name>", "Target specific provider(s)", (v, prev) => [...prev, v], []).option("--all", "Use all registry providers (not only detected)").option("--min-tier <tier>", "Minimum priority tier: high|medium|low", "low").option("--project-dir <path>", "Project directory to resolve project-scope paths").option("--details", "Include detailed apply result").action(async (opts) => runLafsCommand("advanced.apply", !opts.details, async () => {
-    const baseProviders = resolveProviders({ all: opts.all, agent: opts.agent });
-    const minimumPriority = parsePriority(opts.minTier);
-    const providers = selectProvidersByMinimumPriority(baseProviders, minimumPriority);
-    const operations = await readMcpOperations(opts.mcpFile);
-    const policy = parsePolicy(opts.policy);
-    if (providers.length === 0) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_NO_TARGET_PROVIDERS",
-        "No target providers resolved for apply operation.",
-        "Use --all or pass provider IDs with --agent."
-      );
     }
-    const result = await applyMcpInstallWithPolicy(
-      providers,
-      operations,
-      policy,
-      opts.projectDir
-    );
-    if (policy === "fail" && result.conflicts.length > 0) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_CONFLICTS_BLOCKING",
-        "Conflicts detected and policy is set to fail.",
-        "Run `caamp advanced conflicts` to inspect, or rerun with --policy skip/overwrite.",
-        true,
-        result
-      );
+    if (outdated.length === 0) {
+      console.log(pc16.green("\nAll skills are up to date."));
+      return;
     }
-    const failedWrites = result.applied.filter((entry) => !entry.success);
-    if (failedWrites.length > 0) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_APPLY_WRITE_FAILED",
-        "One or more MCP writes failed.",
-        "Check result details, fix provider config issues, and retry.",
-        true,
-        result
-      );
+    console.log(pc16.yellow(`
+${outdated.length} skill(s) have updates available:
+`));
+    for (const skill of outdated) {
+      const current = skill.currentVersion?.slice(0, 12) ?? "?";
+      const latest = skill.latestVersion ?? "?";
+      console.log(`  ${pc16.bold(skill.name)}  ${pc16.dim(current)}  ${pc16.dim("->")}  ${pc16.cyan(latest)}`);
     }
-    return {
-      objective: "Apply MCP operations with policy-driven conflict handling",
-      constraints: {
-        policy,
-        minimumPriority,
-        providerCount: providers.length,
-        operationCount: operations.length
-      },
-      acceptanceCriteria: {
-        conflicts: result.conflicts.length,
-        writesSucceeded: result.applied.length
-      },
-      data: opts.details ? result : {
-        conflicts: result.conflicts.length,
-        applied: result.applied.length,
-        skipped: result.skipped.length
+    if (!opts.yes) {
+      const readline = await import("readline");
+      const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+      const answer = await new Promise((resolve) => {
+        rl.question(pc16.dim("\nProceed with update? [y/N] "), resolve);
+      });
+      rl.close();
+      if (answer.toLowerCase() !== "y" && answer.toLowerCase() !== "yes") {
+        console.log(pc16.dim("Update cancelled."));
+        return;
+      }
+    }
+    console.log();
+    let successCount = 0;
+    let failCount = 0;
+    for (const skill of outdated) {
+      const entry = tracked[skill.name];
+      if (!entry) continue;
+      console.log(pc16.dim(`Updating ${pc16.bold(skill.name)}...`));
+      try {
+        const parsed = parseSource(entry.source);
+        let localPath;
+        let cleanup;
+        if (parsed.type === "github" && parsed.owner && parsed.repo) {
+          const result = await cloneRepo(parsed.owner, parsed.repo, parsed.ref, parsed.path);
+          localPath = result.localPath;
+          cleanup = result.cleanup;
+        } else if (parsed.type === "gitlab" && parsed.owner && parsed.repo) {
+          const result = await cloneGitLabRepo(parsed.owner, parsed.repo, parsed.ref, parsed.path);
+          localPath = result.localPath;
+          cleanup = result.cleanup;
+        } else {
+          console.log(pc16.yellow(`  Skipped ${skill.name}: source type "${parsed.type}" does not support auto-update`));
+          continue;
+        }
+        try {
+          const providers = entry.agents.map((a) => getProvider(a)).filter((p) => p !== void 0);
+          if (providers.length === 0) {
+            console.log(pc16.yellow(`  Skipped ${skill.name}: no valid providers found`));
+            continue;
+          }
+          const installResult = await installSkill(
+            localPath,
+            skill.name,
+            providers,
+            entry.isGlobal,
+            entry.projectDir
+          );
+          if (installResult.success) {
+            await recordSkillInstall(
+              skill.name,
+              entry.scopedName,
+              entry.source,
+              entry.sourceType,
+              installResult.linkedAgents,
+              installResult.canonicalPath,
+              entry.isGlobal,
+              entry.projectDir,
+              skill.latestVersion
+            );
+            console.log(pc16.green(`  Updated ${pc16.bold(skill.name)}`));
+            successCount++;
+          } else {
+            console.log(pc16.red(`  Failed to update ${skill.name}: no agents linked`));
+            failCount++;
+          }
+          if (installResult.errors.length > 0) {
+            for (const err of installResult.errors) {
+              console.log(pc16.yellow(`    ${err}`));
+            }
+          }
+        } finally {
+          if (cleanup) await cleanup();
+        }
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        console.log(pc16.red(`  Failed to update ${skill.name}: ${msg}`));
+        failCount++;
       }
-    };
-  }));
+    }
+    console.log();
+    if (successCount > 0) {
+      console.log(pc16.green(`Updated ${successCount} skill(s).`));
+    }
+    if (failCount > 0) {
+      console.log(pc16.red(`Failed to update ${failCount} skill(s).`));
+    }
+  });
 }
 
-// src/commands/advanced/instructions.ts
-function registerAdvancedInstructions(parent) {
-  parent.command("instructions").description("Single-operation instruction update across providers").option("-a, --agent <name>", "Target specific provider(s)", (v, prev) => [...prev, v], []).option("--all", "Use all registry providers (not only detected)").option("--min-tier <tier>", "Minimum priority tier: high|medium|low", "low").option("--scope <scope>", "Instruction scope: project|global", "project").option("--content <text>", "Inline content to inject").option("--content-file <path>", "File containing content to inject").option("--project-dir <path>", "Project directory to resolve project-scope paths").option("--details", "Include detailed per-file actions").action(async (opts) => runLafsCommand("advanced.instructions", !opts.details, async () => {
-    const minimumPriority = parsePriority(opts.minTier);
-    const baseProviders = resolveProviders({ all: opts.all, agent: opts.agent });
-    const providers = selectProvidersByMinimumPriority(baseProviders, minimumPriority);
-    const scope = opts.scope === "global" ? "global" : opts.scope === "project" ? "project" : null;
-    if (!scope) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_VALIDATION_SCOPE",
-        `Invalid scope: ${opts.scope}`,
-        "Use --scope project or --scope global."
-      );
+// src/commands/skills/init.ts
+import pc17 from "picocolors";
+import { writeFile, mkdir } from "fs/promises";
+import { existsSync as existsSync5 } from "fs";
+import { join as join5 } 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 = join5(opts.dir, skillName);
+    if (existsSync5(skillDir)) {
+      console.error(pc17.red(`Directory already exists: ${skillDir}`));
+      process.exit(1);
     }
-    const content = await readTextInput(opts.content, opts.contentFile);
-    if (!content || content.trim().length === 0) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_VALIDATION_CONTENT",
-        "Instruction content is required.",
-        "Provide --content or --content-file with non-empty text."
-      );
+    await mkdir(skillDir, { recursive: true });
+    const template = `---
+name: ${skillName}
+description: Describe what this skill does and when to use it
+license: MIT
+metadata:
+  author: your-name
+  version: "1.0"
+---
+
+# ${skillName}
+
+## When to use this skill
+
+Describe the conditions under which an AI agent should activate this skill.
+
+## Instructions
+
+Provide detailed instructions for the AI agent here.
+
+## Examples
+
+Show example inputs and expected outputs.
+`;
+    await writeFile(join5(skillDir, "SKILL.md"), template, "utf-8");
+    console.log(pc17.green(`\u2713 Created skill template: ${skillDir}/SKILL.md`));
+    console.log(pc17.dim("\nNext steps:"));
+    console.log(pc17.dim("  1. Edit SKILL.md with your instructions"));
+    console.log(pc17.dim(`  2. Validate: caamp skills validate ${join5(skillDir, "SKILL.md")}`));
+    console.log(pc17.dim(`  3. Install: caamp skills install ${skillDir}`));
+  });
+}
+
+// src/commands/skills/audit.ts
+import { existsSync as existsSync6, statSync } from "fs";
+import pc18 from "picocolors";
+function registerSkillsAudit(parent) {
+  parent.command("audit").description("Security scan skill files (46+ rules, SARIF output)").argument("[path]", "Path to SKILL.md or directory", ".").option("--sarif", "Output in SARIF format").option("--json", "Output as JSON").action(async (path, opts) => {
+    if (!existsSync6(path)) {
+      console.error(pc18.red(`Path not found: ${path}`));
+      process.exit(1);
     }
-    if (providers.length === 0) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_NO_TARGET_PROVIDERS",
-        "No target providers resolved for instruction update.",
-        "Use --all or pass provider IDs with --agent."
-      );
+    const stat = statSync(path);
+    let results;
+    if (stat.isFile()) {
+      results = [await scanFile(path)];
+    } else {
+      results = await scanDirectory(path);
     }
-    const summary = await updateInstructionsSingleOperation(
-      providers,
-      content,
-      scope,
-      opts.projectDir
-    );
-    return {
-      objective: "Update instruction files across providers in one operation",
-      constraints: {
-        scope,
-        minimumPriority,
-        providerCount: providers.length
-      },
-      acceptanceCriteria: {
-        updatedFiles: summary.updatedFiles
-      },
-      data: opts.details ? summary : {
-        updatedFiles: summary.updatedFiles,
-        files: summary.actions.map((entry) => ({
-          file: entry.file,
-          action: entry.action
-        }))
+    if (results.length === 0) {
+      console.log(pc18.dim("No SKILL.md files found to scan."));
+      return;
+    }
+    if (opts.sarif) {
+      console.log(JSON.stringify(toSarif(results), null, 2));
+      return;
+    }
+    if (opts.json) {
+      console.log(JSON.stringify(results, null, 2));
+      return;
+    }
+    let totalFindings = 0;
+    let allPassed = true;
+    for (const result of results) {
+      const icon = result.passed ? pc18.green("\u2713") : pc18.red("\u2717");
+      console.log(`
+${icon} ${pc18.bold(result.file)} (score: ${result.score}/100)`);
+      if (result.findings.length === 0) {
+        console.log(pc18.dim("  No issues found."));
+        continue;
       }
-    };
-  }));
+      totalFindings += result.findings.length;
+      if (!result.passed) allPassed = false;
+      for (const f of result.findings) {
+        const sev = f.rule.severity === "critical" ? pc18.red(f.rule.severity) : f.rule.severity === "high" ? pc18.red(f.rule.severity) : f.rule.severity === "medium" ? pc18.yellow(f.rule.severity) : pc18.dim(f.rule.severity);
+        console.log(`  ${sev.padEnd(20)} ${f.rule.id} ${f.rule.name}`);
+        console.log(`  ${pc18.dim(`L${f.line}: ${f.context.slice(0, 80)}`)}`);
+      }
+    }
+    console.log(pc18.bold(`
+${results.length} file(s) scanned, ${totalFindings} finding(s)`));
+    if (!allPassed) {
+      process.exit(1);
+    }
+  });
 }
 
-// src/commands/advanced/configure.ts
-function registerAdvancedConfigure(parent) {
-  parent.command("configure").description("Configure global + project scope for one provider in one operation").requiredOption("-a, --agent <name>", "Target provider ID or alias").option("--global-mcp-file <path>", "JSON file for global MCP operations").option("--project-mcp-file <path>", "JSON file for project MCP operations").option("--instruction <text>", "Instruction content for both scopes").option("--instruction-file <path>", "Instruction content file for both scopes").option("--instruction-global <text>", "Instruction content for global scope").option("--instruction-global-file <path>", "Instruction content file for global scope").option("--instruction-project <text>", "Instruction content for project scope").option("--instruction-project-file <path>", "Instruction content file for project scope").option("--project-dir <path>", "Project directory to resolve project-scope paths").option("--details", "Include detailed write results").action(async (opts) => runLafsCommand("advanced.configure", !opts.details, async () => {
-    const provider = getProvider(opts.agent);
-    if (!provider) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_PROVIDER_NOT_FOUND",
-        `Unknown provider: ${opts.agent}`,
-        "Check `caamp providers list` for valid provider IDs/aliases."
-      );
+// src/commands/skills/validate.ts
+import pc19 from "picocolors";
+function registerSkillsValidate(parent) {
+  parent.command("validate").description("Validate SKILL.md format").argument("[path]", "Path to SKILL.md", "SKILL.md").option("--json", "Output as JSON").action(async (path, opts) => {
+    const result = await validateSkill(path);
+    if (opts.json) {
+      console.log(JSON.stringify(result, null, 2));
+      return;
     }
-    const globalMcp = opts.globalMcpFile ? await readMcpOperations(opts.globalMcpFile) : [];
-    const projectMcp = opts.projectMcpFile ? await readMcpOperations(opts.projectMcpFile) : [];
-    const sharedInstruction = await readTextInput(opts.instruction, opts.instructionFile);
-    const globalInstruction = await readTextInput(
-      opts.instructionGlobal,
-      opts.instructionGlobalFile
-    );
-    const projectInstruction = await readTextInput(
-      opts.instructionProject,
-      opts.instructionProjectFile
-    );
-    let instructionContent;
-    if (globalInstruction || projectInstruction) {
-      instructionContent = {
-        ...globalInstruction ? { global: globalInstruction } : {},
-        ...projectInstruction ? { project: projectInstruction } : {}
-      };
-    } else if (sharedInstruction) {
-      instructionContent = sharedInstruction;
+    if (result.valid) {
+      console.log(pc19.green(`\u2713 ${path} is valid`));
+    } else {
+      console.log(pc19.red(`\u2717 ${path} has validation errors`));
     }
-    if (globalMcp.length === 0 && projectMcp.length === 0 && !instructionContent) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_VALIDATION_NO_OPS",
-        "No configuration operations were provided.",
-        "Provide MCP files and/or instruction content."
-      );
+    for (const issue of result.issues) {
+      const icon = issue.level === "error" ? pc19.red("\u2717") : pc19.yellow("!");
+      console.log(`  ${icon} [${issue.field}] ${issue.message}`);
     }
-    const result = await configureProviderGlobalAndProject(provider, {
-      globalMcp: globalMcp.map((entry) => ({
-        serverName: entry.serverName,
-        config: entry.config
-      })),
-      projectMcp: projectMcp.map((entry) => ({
-        serverName: entry.serverName,
-        config: entry.config
-      })),
-      instructionContent,
-      projectDir: opts.projectDir
-    });
-    const globalFailures = result.mcp.global.filter((entry) => !entry.success);
-    const projectFailures = result.mcp.project.filter((entry) => !entry.success);
-    if (globalFailures.length > 0 || projectFailures.length > 0) {
-      throw new LAFSCommandError(
-        "E_ADVANCED_CONFIGURE_FAILED",
-        "One or more MCP writes failed during configure operation.",
-        "Inspect the failed write entries and provider config paths, then retry.",
-        true,
-        result
-      );
+    if (!result.valid) {
+      process.exit(1);
     }
-    return {
-      objective: "Configure global and project settings in one operation",
-      constraints: {
-        provider: provider.id,
-        globalMcpOps: globalMcp.length,
-        projectMcpOps: projectMcp.length,
-        instructionMode: instructionContent ? typeof instructionContent === "string" ? "shared" : "scoped" : "none"
-      },
-      acceptanceCriteria: {
-        globalWrites: result.mcp.global.length,
-        projectWrites: result.mcp.project.length
-      },
-      data: opts.details ? result : {
-        providerId: result.providerId,
-        configPaths: result.configPaths,
-        globalWrites: result.mcp.global.length,
-        projectWrites: result.mcp.project.length,
-        instructionUpdates: {
-          global: result.instructions.global?.size ?? 0,
-          project: result.instructions.project?.size ?? 0
-        }
-      }
-    };
-  }));
+  });
 }
 
-// src/commands/advanced/index.ts
-function registerAdvancedCommands(program2) {
-  const advanced = program2.command("advanced").description("LAFS-compliant wrappers for advanced orchestration APIs");
-  registerAdvancedProviders(advanced);
-  registerAdvancedBatch(advanced);
-  registerAdvancedConflicts(advanced);
-  registerAdvancedApply(advanced);
-  registerAdvancedInstructions(advanced);
-  registerAdvancedConfigure(advanced);
+// src/commands/skills/index.ts
+function registerSkillsCommands(program2) {
+  const skills = program2.command("skills").description("Manage AI agent skills");
+  registerSkillsInstall(skills);
+  registerSkillsRemove(skills);
+  registerSkillsList(skills);
+  registerSkillsFind(skills);
+  registerSkillsCheck(skills);
+  registerSkillsUpdate(skills);
+  registerSkillsInit(skills);
+  registerSkillsAudit(skills);
+  registerSkillsValidate(skills);
 }
 
 // src/cli.ts
 var program = new Command();
-program.name("caamp").description("Central AI Agent Managed Packages - unified provider registry and package manager").version(getCaampVersion()).option("-v, --verbose", "Show debug output").option("-q, --quiet", "Suppress non-error output");
+program.name("caamp").description("Central AI Agent Managed Packages - unified provider registry and package manager").version(getCaampVersion()).option("-v, --verbose", "Show debug output").option("-q, --quiet", "Suppress non-error output").option("--human", "Output in human-readable format (default: JSON for LLM agents)");
 program.hook("preAction", (thisCommand) => {
   const opts = thisCommand.optsWithGlobals();
   if (opts.verbose) setVerbose(true);
   if (opts.quiet) setQuiet(true);
+  if (opts.human) setHuman(true);
 });
 registerProvidersCommand(program);
 registerSkillsCommands(program);