@cleocode/caamp 2026.5.83 → 2026.5.86

package/dist/cli.js

@@ -1,9 +1,12 @@
 #!/usr/bin/env node
 import {
   CANONICAL_SKILLS_DIR,
+  ErrorCategories,
+  ErrorCodes,
   MarketplaceClient,
   PiHarness,
   RECOMMENDATION_ERROR_CODES,
+  buildEnvelope,
   checkSkillUpdate,
   detectAllProviders,
   detectMcpInstallations,
@@ -12,6 +15,8 @@ import {
   discoverSkillsMulti,
   dispatchInstallSkillAcrossProviders,
   dispatchRemoveSkillAcrossProviders,
+  emitError,
+  emitJsonError,
   fetchWithTimeout,
   formatNetworkError,
   formatSkillRecommendations,
@@ -20,27 +25,31 @@ import {
   getSkill,
   getSkillDir,
   getTrackedSkills,
+  handleFormatError,
   installBatchWithRollback,
   installMcpServer,
   isCatalogAvailable,
   isHuman,
   isMarketplaceScoped,
-  isQuiet,
   isVerbose,
   listAllMcpServers,
   listCanonicalSkills,
   listMcpServers,
   listProfiles,
   listSkills,
+  outputSuccess,
   parseSource,
   readConfig,
   readLockFile,
   recommendSkills,
   recordSkillInstall,
+  registerDoctorBridge,
+  registerSkillsDoctorAdopt,
   removeMcpServer,
   removeMcpServerFromAll,
   removeSkillFromLock,
   resolveDefaultTargetProviders,
+  resolveFormat,
   resolveProfile,
   scanDirectory,
   scanFile,
@@ -52,7 +61,7 @@ import {
   tokenizeCriteriaValue,
   updateInstructionsSingleOperation,
   validateSkill
-} from "./chunk-4W35AEYA.js";
+} from "./chunk-WXL7RPS4.js";
 import {
   buildSkillsMap,
   checkAllInjections,
@@ -65,7 +74,7 @@ import {
   groupByInstructFile,
   injectAll,
   providerSupports
-} from "./chunk-OPUPNLUJ.js";
+} from "./chunk-PGETUTYZ.js";
 import {
   CANONICAL_HOOK_EVENTS,
   buildHookMatrix,
@@ -74,12 +83,12 @@ import {
   getHookSupport,
   getProviderSummary,
   translateToAll
-} from "./chunk-SV33CE5X.js";
+} from "./chunk-QKC2JRSG.js";
 import {
   buildSkillSubPathCandidates,
   resolveProviderConfigPath,
   resolveProviderSkillsDir
-} from "./chunk-OCI4RYI5.js";
+} from "./chunk-H5YXR2DC.js";
 
 // src/cli.ts
 import { Command } from "commander";
@@ -153,7 +162,7 @@ function emitSuccess(operation, result, mvi = "standard") {
   };
   console.log(JSON.stringify(envelope, null, 2));
 }
-function emitError(operation, error, mvi = "standard") {
+function emitError2(operation, error, mvi = "standard") {
   let envelope;
   if (error instanceof LAFSCommandError) {
     envelope = {
@@ -204,7 +213,7 @@ async function runLafsCommand(command, mvi, action) {
     const result = await action();
     emitSuccess(command, result, mvi);
   } catch (error) {
-    emitError(command, error, mvi);
+    emitError2(command, error, mvi);
     process.exit(1);
   }
 }
@@ -499,117 +508,6 @@ function registerAdvancedCommands(program2) {
 // src/commands/config.ts
 import { existsSync } from "fs";
 import pc from "picocolors";
-
-// src/core/lafs.ts
-import { randomUUID as randomUUID2 } from "crypto";
-import { resolveOutputFormat } from "@cleocode/lafs";
-function resolveFormat(options) {
-  return resolveOutputFormat({
-    jsonFlag: options.jsonFlag ?? false,
-    humanFlag: (options.humanFlag ?? false) || isHuman(),
-    projectDefault: options.projectDefault ?? "json"
-  }).format;
-}
-function buildEnvelope(operation, mvi, result, error, page = null, sessionId, warnings) {
-  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: randomUUID2(),
-      transport: "cli",
-      strict: true,
-      mvi,
-      contextVersion: 0,
-      ...sessionId && { sessionId },
-      ...warnings && warnings.length > 0 && { warnings }
-    },
-    success: error === null,
-    result,
-    error,
-    page
-  };
-}
-function emitError2(operation, mvi, code, message, category, details = {}, exitCode = 1) {
-  const envelope = buildEnvelope(operation, mvi, null, {
-    code,
-    message,
-    category,
-    retryable: category === "TRANSIENT" || category === "RATE_LIMIT",
-    retryAfterMs: null,
-    details
-  });
-  console.error(JSON.stringify(envelope, null, 2));
-  process.exit(exitCode);
-}
-function emitJsonError(operation, mvi, code, message, category, details = {}) {
-  const envelope = buildEnvelope(operation, mvi, null, {
-    code,
-    message,
-    category,
-    retryable: category === "TRANSIENT" || category === "RATE_LIMIT",
-    retryAfterMs: null,
-    details
-  });
-  console.error(JSON.stringify(envelope, null, 2));
-}
-function outputSuccess(operation, mvi, result, page, sessionId, warnings) {
-  const envelope = buildEnvelope(operation, mvi, result, null, page ?? null, sessionId, warnings);
-  if (isQuiet() && !envelope.error) {
-    return;
-  }
-  console.log(JSON.stringify(envelope, null, 2));
-}
-function handleFormatError(error, operation, mvi, jsonFlag) {
-  const message = error instanceof Error ? error.message : String(error);
-  if (jsonFlag) {
-    emitJsonError(operation, mvi, "E_FORMAT_CONFLICT", message, "VALIDATION");
-  } else {
-    console.error(message);
-  }
-  process.exit(1);
-}
-var ErrorCategories = {
-  VALIDATION: "VALIDATION",
-  AUTH: "AUTH",
-  PERMISSION: "PERMISSION",
-  NOT_FOUND: "NOT_FOUND",
-  CONFLICT: "CONFLICT",
-  RATE_LIMIT: "RATE_LIMIT",
-  TRANSIENT: "TRANSIENT",
-  INTERNAL: "INTERNAL",
-  CONTRACT: "CONTRACT",
-  MIGRATION: "MIGRATION"
-};
-var ErrorCodes = {
-  // Format errors
-  FORMAT_CONFLICT: "E_FORMAT_CONFLICT",
-  INVALID_JSON: "E_INVALID_JSON",
-  // Not found errors
-  SKILL_NOT_FOUND: "E_SKILL_NOT_FOUND",
-  PROVIDER_NOT_FOUND: "E_PROVIDER_NOT_FOUND",
-  MCP_SERVER_NOT_FOUND: "E_MCP_SERVER_NOT_FOUND",
-  FILE_NOT_FOUND: "E_FILE_NOT_FOUND",
-  // Validation errors
-  INVALID_INPUT: "E_INVALID_INPUT",
-  INVALID_CONSTRAINT: "E_INVALID_CONSTRAINT",
-  INVALID_FORMAT: "E_INVALID_FORMAT",
-  // Operation errors
-  INSTALL_FAILED: "E_INSTALL_FAILED",
-  REMOVE_FAILED: "E_REMOVE_FAILED",
-  UPDATE_FAILED: "E_UPDATE_FAILED",
-  VALIDATION_FAILED: "E_VALIDATION_FAILED",
-  AUDIT_FAILED: "E_AUDIT_FAILED",
-  // System errors
-  NETWORK_ERROR: "E_NETWORK_ERROR",
-  FILE_SYSTEM_ERROR: "E_FILE_SYSTEM_ERROR",
-  PERMISSION_DENIED: "E_PERMISSION_DENIED",
-  INTERNAL_ERROR: "E_INTERNAL_ERROR"
-};
-
-// src/commands/config.ts
 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 (default)").option("--human", "Output in human-readable format").action(
@@ -2939,8 +2837,8 @@ function registerPiCommands(program2) {
 }
 
 // src/commands/providers.ts
-import { randomUUID as randomUUID3 } from "crypto";
-import { resolveOutputFormat as resolveOutputFormat2 } from "@cleocode/lafs";
+import { randomUUID as randomUUID2 } from "crypto";
+import { resolveOutputFormat } from "@cleocode/lafs";
 import pc6 from "picocolors";
 function registerProvidersCommand(program2) {
   const providers = program2.command("providers").description("Manage AI agent providers");
@@ -2949,7 +2847,7 @@ function registerProvidersCommand(program2) {
     const mvi = "standard";
     let format;
     try {
-      format = resolveOutputFormat2({
+      format = resolveOutputFormat({
         jsonFlag: opts.json ?? false,
         humanFlag: (opts.human ?? false) || isHuman(),
         projectDefault: "json"
@@ -2999,7 +2897,7 @@ CAMP Provider Registry v${getRegistryVersion()}`));
     const mvi = "standard";
     let format;
     try {
-      format = resolveOutputFormat2({
+      format = resolveOutputFormat({
         jsonFlag: opts.json ?? false,
         humanFlag: (opts.human ?? false) || isHuman(),
         projectDefault: "json"
@@ -3055,7 +2953,7 @@ Detected ${installed.length} installed providers:
     const mvi = "standard";
     let format;
     try {
-      format = resolveOutputFormat2({
+      format = resolveOutputFormat({
         jsonFlag: opts.json ?? false,
         humanFlag: (opts.human ?? false) || isHuman(),
         projectDefault: "json"
@@ -3128,7 +3026,7 @@ ${provider.toolName}`));
     const mvi = "standard";
     let format;
     try {
-      format = resolveOutputFormat2({
+      format = resolveOutputFormat({
         jsonFlag: opts.json ?? false,
         humanFlag: (opts.human ?? false) || isHuman(),
         projectDefault: "json"
@@ -3186,7 +3084,7 @@ ${provider.toolName}`));
     const mvi = "standard";
     let format;
     try {
-      format = resolveOutputFormat2({
+      format = resolveOutputFormat({
         jsonFlag: opts.json ?? false,
         humanFlag: (opts.human ?? false) || isHuman(),
         projectDefault: "json"
@@ -3254,7 +3152,7 @@ CAMP Hook Support (mappings v${getHookMappingsVersion()})
     const mvi = "standard";
     let format;
     try {
-      format = resolveOutputFormat2({
+      format = resolveOutputFormat({
         jsonFlag: opts.json ?? false,
         humanFlag: (opts.human ?? false) || isHuman(),
         projectDefault: "json"
@@ -3301,7 +3199,7 @@ CAMP Hook Support (mappings v${getHookMappingsVersion()})
       const mvi = "standard";
       let format;
       try {
-        format = resolveOutputFormat2({
+        format = resolveOutputFormat({
           jsonFlag: opts.json ?? false,
           humanFlag: (opts.human ?? false) || isHuman(),
           projectDefault: "json"
@@ -3349,7 +3247,7 @@ CAMP Hook Support (mappings v${getHookMappingsVersion()})
         return;
       }
       if (opts.from) {
-        const { toCanonical } = await import("./hooks-5EXBKPII.js");
+        const { toCanonical } = await import("./hooks-ZN3C4WCK.js");
         const canonical2 = toCanonical(event, opts.from);
         if (format === "json") {
           const envelope = buildEnvelope2(
@@ -3389,7 +3287,7 @@ CAMP Hook Support (mappings v${getHookMappingsVersion()})
         }
         process.exit(1);
       }
-      const { getMappedProviderIds } = await import("./hooks-5EXBKPII.js");
+      const { getMappedProviderIds } = await import("./hooks-ZN3C4WCK.js");
       const allIds = getMappedProviderIds();
       const translations = translateToAll(canonical, allIds);
       if (format === "json") {
@@ -3432,7 +3330,7 @@ CAMP Hook Support (mappings v${getHookMappingsVersion()})
     const mvi = "standard";
     let format;
     try {
-      format = resolveOutputFormat2({
+      format = resolveOutputFormat({
         jsonFlag: opts.json ?? false,
         humanFlag: (opts.human ?? false) || isHuman(),
         projectDefault: "json"
@@ -3502,7 +3400,7 @@ function buildEnvelope2(operation, mvi, result, error) {
       schemaVersion: "1.0.0",
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       operation,
-      requestId: randomUUID3(),
+      requestId: randomUUID2(),
       transport: "cli",
       strict: true,
       mvi,
@@ -3817,10 +3715,308 @@ function registerSkillsCheck(parent) {
   });
 }
 
-// src/commands/skills/find.ts
-import { randomUUID as randomUUID4 } from "crypto";
-import { resolveOutputFormat as resolveOutputFormat3 } from "@cleocode/lafs";
+// src/commands/skills/doctor.ts
+function registerSkillsDoctor(parent) {
+  const doctor = parent.command("doctor").description("Diagnose and repair the skill storage topology");
+  registerDoctorBridge(doctor);
+}
+
+// src/commands/skills/doctor-migrate.ts
 import pc9 from "picocolors";
+
+// src/core/skills/migration.ts
+import { execFile } from "child_process";
+import {
+  cpSync,
+  existsSync as existsSync10,
+  mkdirSync,
+  readdirSync as readdirSync2,
+  rmSync,
+  statSync as statSync3,
+  writeFileSync
+} from "fs";
+import { homedir as homedir2 } from "os";
+import { join as join8 } from "path";
+import { promisify } from "util";
+var execFileAsync = promisify(execFile);
+var LEGACY_MIGRATED_MARKER = ".MIGRATED-TO-CLEO";
+function defaultMigrationOptions(manifestNames) {
+  const home = homedir2();
+  return {
+    legacyRoot: join8(home, ".local", "share", "agents", "skills"),
+    canonicalRoot: join8(home, ".cleo", "skills"),
+    backupDir: join8(home, ".cleo", "backups", "skills"),
+    manifestNames,
+    now: () => /* @__PURE__ */ new Date(),
+    tarExec: systemTarExec,
+    recordRow: () => void 0
+  };
+}
+var systemTarExec = {
+  async create({ archivePath, sourceRoot }) {
+    const parent = join8(sourceRoot, "..");
+    const base = sourceRoot.slice(parent.length + 1);
+    await execFileAsync("tar", ["-czf", archivePath, "-C", parent, base]);
+  },
+  async extract({ archivePath, destinationRoot }) {
+    mkdirSync(destinationRoot, { recursive: true });
+    const parent = join8(destinationRoot, "..");
+    await execFileAsync("tar", ["-xzf", archivePath, "-C", parent]);
+  }
+};
+function isAlreadyMigrated(legacyRoot) {
+  if (!existsSync10(legacyRoot)) return true;
+  return existsSync10(join8(legacyRoot, LEGACY_MIGRATED_MARKER));
+}
+function listSkillDirs(root) {
+  if (!existsSync10(root)) return [];
+  const entries = readdirSync2(root, { withFileTypes: true });
+  return entries.filter((d) => d.isDirectory() && d.name !== LEGACY_MIGRATED_MARKER).map((d) => d.name).sort();
+}
+function planMigration(options) {
+  const start = Date.now();
+  const migrated = [];
+  const skipped = [];
+  if (isAlreadyMigrated(options.legacyRoot)) {
+    return {
+      action: "no-op",
+      migrated,
+      skipped,
+      backupPath: null,
+      legacyRoot: options.legacyRoot,
+      canonicalRoot: options.canonicalRoot,
+      durationMs: Date.now() - start
+    };
+  }
+  const names = listSkillDirs(options.legacyRoot);
+  for (const name of names) {
+    const legacyPath = join8(options.legacyRoot, name);
+    if (!statSync3(legacyPath).isDirectory()) {
+      skipped.push({ name, reason: "not-a-directory", legacyPath });
+      continue;
+    }
+    const destPath = join8(options.canonicalRoot, name);
+    if (existsSync10(destPath)) {
+      skipped.push({ name, reason: "already-present", legacyPath });
+      continue;
+    }
+    migrated.push({
+      name,
+      installPath: destPath,
+      legacyPath,
+      sourceType: options.manifestNames.includes(name) ? "canonical" : "user"
+    });
+  }
+  return {
+    action: "dry-run",
+    migrated,
+    skipped,
+    backupPath: null,
+    legacyRoot: options.legacyRoot,
+    canonicalRoot: options.canonicalRoot,
+    durationMs: Date.now() - start
+  };
+}
+function formatBackupTimestamp(now) {
+  const pad = (n) => n.toString().padStart(2, "0");
+  return `${now.getUTCFullYear()}${pad(now.getUTCMonth() + 1)}${pad(now.getUTCDate())}-${pad(now.getUTCHours())}${pad(now.getUTCMinutes())}${pad(now.getUTCSeconds())}`;
+}
+function listBackups(backupDir) {
+  if (!existsSync10(backupDir)) return [];
+  const files = readdirSync2(backupDir).filter(
+    (f) => f.startsWith("skills-pre-migrate-") && f.endsWith(".tgz")
+  );
+  files.sort().reverse();
+  return files.map((f) => join8(backupDir, f));
+}
+async function runMigration(options) {
+  const start = Date.now();
+  const now = (options.now ?? (() => /* @__PURE__ */ new Date()))();
+  const tar = options.tarExec ?? systemTarExec;
+  const sink = options.recordRow ?? (() => void 0);
+  if (isAlreadyMigrated(options.legacyRoot)) {
+    return {
+      action: "no-op",
+      migrated: [],
+      skipped: [],
+      backupPath: null,
+      legacyRoot: options.legacyRoot,
+      canonicalRoot: options.canonicalRoot,
+      durationMs: Date.now() - start
+    };
+  }
+  const plan = planMigration(options);
+  mkdirSync(options.canonicalRoot, { recursive: true });
+  mkdirSync(options.backupDir, { recursive: true });
+  const backupName = `skills-pre-migrate-${formatBackupTimestamp(now)}.tgz`;
+  const backupPath = join8(options.backupDir, backupName);
+  await tar.create({ archivePath: backupPath, sourceRoot: options.legacyRoot });
+  for (const entry of plan.migrated) {
+    cpSync(entry.legacyPath, entry.installPath, { recursive: true, dereference: false });
+    await sink(entry);
+  }
+  writeFileSync(
+    join8(options.legacyRoot, LEGACY_MIGRATED_MARKER),
+    JSON.stringify(
+      {
+        migratedAt: now.toISOString(),
+        backupPath,
+        canonicalRoot: options.canonicalRoot,
+        entries: plan.migrated.length
+      },
+      null,
+      2
+    ),
+    "utf-8"
+  );
+  return {
+    action: "migrate",
+    migrated: plan.migrated,
+    skipped: plan.skipped,
+    backupPath,
+    legacyRoot: options.legacyRoot,
+    canonicalRoot: options.canonicalRoot,
+    durationMs: Date.now() - start
+  };
+}
+async function runRollback(options) {
+  const start = Date.now();
+  const tar = options.tarExec ?? systemTarExec;
+  const backups = listBackups(options.backupDir);
+  const newest = backups[0];
+  if (!newest) {
+    throw new Error(
+      `No backup tarballs found under ${options.backupDir}. Run "cleo skills migrate" (without --rollback) first.`
+    );
+  }
+  if (existsSync10(options.legacyRoot)) {
+    rmSync(options.legacyRoot, { recursive: true, force: true });
+  }
+  await tar.extract({ archivePath: newest, destinationRoot: options.legacyRoot });
+  return {
+    action: "rollback",
+    migrated: [],
+    skipped: [],
+    backupPath: newest,
+    legacyRoot: options.legacyRoot,
+    canonicalRoot: options.canonicalRoot,
+    durationMs: Date.now() - start
+  };
+}
+
+// src/commands/skills/doctor-migrate.ts
+function buildOptions(opts) {
+  if (opts.__optionsOverride) return opts.__optionsOverride;
+  const manifestNames = opts.__manifestNamesOverride ?? [];
+  return defaultMigrationOptions(manifestNames);
+}
+function renderHuman(outcome) {
+  const lines = [];
+  lines.push(pc9.bold(`
+skills ${outcome.action}`));
+  lines.push(pc9.dim(`  legacy:    ${outcome.legacyRoot}`));
+  lines.push(pc9.dim(`  canonical: ${outcome.canonicalRoot}`));
+  if (outcome.backupPath) {
+    lines.push(pc9.dim(`  backup:    ${outcome.backupPath}`));
+  }
+  lines.push(pc9.dim(`  duration:  ${outcome.durationMs}ms`));
+  if (outcome.migrated.length > 0) {
+    lines.push(pc9.green(`
+Migrated (${outcome.migrated.length}):`));
+    for (const m of outcome.migrated) {
+      lines.push(`  + ${pc9.bold(m.name)} ${pc9.dim(`[${m.sourceType}]`)}`);
+    }
+  }
+  if (outcome.skipped.length > 0) {
+    lines.push(pc9.yellow(`
+Skipped (${outcome.skipped.length}):`));
+    for (const s of outcome.skipped) {
+      lines.push(`  ! ${pc9.bold(s.name)} ${pc9.dim(`(${s.reason})`)}`);
+    }
+  }
+  if (outcome.action === "no-op") {
+    lines.push(pc9.dim("\nLegacy store is already migrated (sentinel present)."));
+  }
+  if (outcome.action === "dry-run") {
+    lines.push(pc9.dim("\n(dry run \u2014 no filesystem changes were made)"));
+  }
+  return lines.join("\n");
+}
+function registerSkillsDoctorMigrate(parent) {
+  parent.command("migrate").description("Migrate legacy skills (~/.local/share/agents/skills) into ~/.cleo/skills").option("--dry-run", "Preview the plan without writing anything", false).option("--rollback", "Restore from the most recent backup tarball", false).option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
+    const operation = "skills.migrate";
+    const mvi = "standard";
+    let format;
+    try {
+      format = resolveFormat({
+        jsonFlag: opts.json ?? false,
+        humanFlag: (opts.human ?? false) || isHuman(),
+        projectDefault: "json"
+      });
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      emitJsonError(
+        operation,
+        mvi,
+        ErrorCodes.FORMAT_CONFLICT,
+        message,
+        ErrorCategories.VALIDATION
+      );
+      process.exit(1);
+    }
+    if (opts.dryRun && opts.rollback) {
+      const message = "Cannot combine --dry-run with --rollback";
+      if (format === "json") {
+        emitJsonError(
+          operation,
+          mvi,
+          ErrorCodes.INVALID_INPUT,
+          message,
+          ErrorCategories.VALIDATION
+        );
+      } else {
+        console.error(pc9.red(message));
+      }
+      process.exit(1);
+    }
+    const options = buildOptions(opts);
+    try {
+      let outcome;
+      if (opts.rollback) {
+        outcome = await runRollback(options);
+      } else if (opts.dryRun) {
+        outcome = planMigration(options);
+      } else {
+        outcome = await runMigration(options);
+      }
+      if (format === "json") {
+        outputSuccess(operation, mvi, outcome);
+      } else {
+        console.log(renderHuman(outcome));
+      }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      if (format === "json") {
+        emitJsonError(
+          operation,
+          mvi,
+          ErrorCodes.INTERNAL_ERROR,
+          message,
+          ErrorCategories.MIGRATION,
+          { legacyRoot: options.legacyRoot, canonicalRoot: options.canonicalRoot }
+        );
+      } else {
+        console.error(pc9.red(`migration failed: ${message}`));
+      }
+      process.exit(1);
+    }
+  });
+}
+
+// src/commands/skills/find.ts
+import { randomUUID as randomUUID3 } from "crypto";
+import { resolveOutputFormat as resolveOutputFormat2 } from "@cleocode/lafs";
+import pc10 from "picocolors";
 var SkillsFindValidationError = class extends Error {
   code;
   constructor(code, message) {
@@ -3851,7 +4047,7 @@ function registerSkillsFind(parent) {
     const mvi = details ? "full" : "standard";
     let format;
     try {
-      format = resolveOutputFormat3({
+      format = resolveOutputFormat2({
         jsonFlag: opts.json ?? false,
         humanFlag: (opts.human ?? false) || isHuman(),
         projectDefault: "json"
@@ -3861,7 +4057,7 @@ function registerSkillsFind(parent) {
       if (opts.json) {
         emitJsonError3(operation, mvi, "E_FORMAT_CONFLICT", message, "VALIDATION");
       } else {
-        console.error(pc9.red(message));
+        console.error(pc10.red(message));
       }
       process.exit(1);
     }
@@ -3928,19 +4124,19 @@ function registerSkillsFind(parent) {
             query: query ?? null
           });
         } else {
-          console.error(pc9.red(`Recommendation failed: ${message}`));
+          console.error(pc10.red(`Recommendation failed: ${message}`));
         }
         process.exit(1);
       }
     }
     if (!query) {
-      console.log(pc9.dim("Usage: caamp skills find <query>"));
+      console.log(pc10.dim("Usage: caamp skills find <query>"));
       return;
     }
     const limit = parseInt(opts.limit, 10);
     const client = new MarketplaceClient();
     if (format === "human") {
-      console.log(pc9.dim(`Searching marketplaces for "${query}"...
+      console.log(pc10.dim(`Searching marketplaces for "${query}"...
 `));
     }
     let results;
@@ -3954,7 +4150,7 @@ function registerSkillsFind(parent) {
           limit
         });
       } else {
-        console.error(pc9.red(`Marketplace search failed: ${message}`));
+        console.error(pc10.red(`Marketplace search failed: ${message}`));
       }
       process.exit(1);
     }
@@ -3974,21 +4170,21 @@ function registerSkillsFind(parent) {
       return;
     }
     if (results.length === 0) {
-      console.log(pc9.yellow("No results found."));
+      console.log(pc10.yellow("No results found."));
       return;
     }
-    console.log(pc9.dim(`Found ${results.length} result(s) for "${query}":
+    console.log(pc10.dim(`Found ${results.length} result(s) for "${query}":
 `));
     results.forEach((skill, index) => {
       const num = (index + 1).toString().padStart(2);
-      const stars = skill.stars > 0 ? pc9.yellow(`\u2605 ${formatStars(skill.stars)}`) : "";
-      console.log(`  ${pc9.cyan(num)}. ${pc9.bold(skill.scopedName)} ${stars}`);
-      console.log(`      ${pc9.dim(skill.description?.slice(0, 80) ?? "")}`);
-      console.log(`      ${pc9.dim(`from ${skill.source}`)}`);
+      const stars = skill.stars > 0 ? pc10.yellow(`\u2605 ${formatStars(skill.stars)}`) : "";
+      console.log(`  ${pc10.cyan(num)}. ${pc10.bold(skill.scopedName)} ${stars}`);
+      console.log(`      ${pc10.dim(skill.description?.slice(0, 80) ?? "")}`);
+      console.log(`      ${pc10.dim(`from ${skill.source}`)}`);
       console.log();
     });
-    console.log(pc9.dim("Install with: caamp skills install <name>"));
-    console.log(pc9.dim("Or select by number: caamp skills install <n>"));
+    console.log(pc10.dim("Install with: caamp skills install <name>"));
+    console.log(pc10.dim("Or select by number: caamp skills install <n>"));
   });
 }
 function formatStars(n) {
@@ -4080,7 +4276,7 @@ function buildEnvelope3(operation, mvi, result, error) {
       schemaVersion: "1.0.0",
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       operation,
-      requestId: randomUUID4(),
+      requestId: randomUUID3(),
       transport: "cli",
       strict: true,
       mvi,
@@ -4105,10 +4301,10 @@ function emitJsonError3(operation, mvi, code, message, category, details = {}) {
 }
 
 // src/commands/skills/init.ts
-import { existsSync as existsSync10 } from "fs";
+import { existsSync as existsSync11 } from "fs";
 import { mkdir, writeFile as writeFile3 } from "fs/promises";
-import { join as join8 } from "path";
-import pc10 from "picocolors";
+import { join as join9 } from "path";
+import pc11 from "picocolors";
 function registerSkillsInit(parent) {
   parent.command("init").description("Create a new SKILL.md template").argument("[name]", "Skill name").option("-d, --dir <path>", "Output directory", ".").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(
     async (name, opts) => {
@@ -4133,8 +4329,8 @@ function registerSkillsInit(parent) {
         process.exit(1);
       }
       const skillName = name ?? "my-skill";
-      const skillDir = join8(opts.dir, skillName);
-      if (existsSync10(skillDir)) {
+      const skillDir = join9(opts.dir, skillName);
+      if (existsSync11(skillDir)) {
         const message = `Directory already exists: ${skillDir}`;
         if (format === "json") {
           emitJsonError(
@@ -4148,7 +4344,7 @@ function registerSkillsInit(parent) {
             }
           );
         } else {
-          console.error(pc10.red(message));
+          console.error(pc11.red(message));
         }
         process.exit(1);
       }
@@ -4176,7 +4372,7 @@ Provide detailed instructions for the AI agent here.
 
 Show example inputs and expected outputs.
 `;
-      await writeFile3(join8(skillDir, "SKILL.md"), template, "utf-8");
+      await writeFile3(join9(skillDir, "SKILL.md"), template, "utf-8");
       const result = {
         name: skillName,
         directory: skillDir,
@@ -4187,18 +4383,88 @@ Show example inputs and expected outputs.
         outputSuccess(operation, mvi, result);
         return;
       }
-      console.log(pc10.green(`\u2713 Created skill template: ${skillDir}/SKILL.md`));
-      console.log(pc10.dim("\nNext steps:"));
-      console.log(pc10.dim("  1. Edit SKILL.md with your instructions"));
-      console.log(pc10.dim(`  2. Validate: caamp skills validate ${join8(skillDir, "SKILL.md")}`));
-      console.log(pc10.dim(`  3. Install: caamp skills install ${skillDir}`));
+      console.log(pc11.green(`\u2713 Created skill template: ${skillDir}/SKILL.md`));
+      console.log(pc11.dim("\nNext steps:"));
+      console.log(pc11.dim("  1. Edit SKILL.md with your instructions"));
+      console.log(pc11.dim(`  2. Validate: caamp skills validate ${join9(skillDir, "SKILL.md")}`));
+      console.log(pc11.dim(`  3. Install: caamp skills install ${skillDir}`));
     }
   );
 }
 
 // src/commands/skills/install.ts
-import { existsSync as existsSync11 } from "fs";
-import pc11 from "picocolors";
+import { existsSync as existsSync12 } from "fs";
+import pc12 from "picocolors";
+
+// src/core/skills/trust-gate-adapter.ts
+var cachedCore;
+async function resolveCore() {
+  if (cachedCore !== void 0) return cachedCore;
+  try {
+    const mod = await import("@cleocode/core");
+    cachedCore = mod;
+  } catch {
+    cachedCore = null;
+    process.stderr.write(
+      "[caamp] WARNING: @cleocode/core unavailable \u2014 skipping trust gate (skill installs not security-checked)\n"
+    );
+  }
+  return cachedCore;
+}
+async function evaluateSkillTrustGate(localPath, source, force = false) {
+  const core = await resolveCore();
+  if (!core) {
+    return {
+      decision: "allow",
+      reason: "Trust gate skipped \u2014 @cleocode/core not available",
+      scan: {
+        skillName: localPath.split("/").filter(Boolean).pop() ?? localPath,
+        source,
+        trustLevel: "community",
+        verdict: "safe",
+        findings: [],
+        scannedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        summary: "core-unavailable"
+      }
+    };
+  }
+  const scan = core.scanSkill(localPath, source);
+  const gate = core.shouldAllowInstall(scan, force);
+  return { decision: gate.decision, reason: gate.reason, scan };
+}
+async function evaluateFederationGate(source, opts = {}) {
+  const core = await resolveCore();
+  if (!core) {
+    return {
+      decision: "allow",
+      reason: "Federation gate skipped \u2014 @cleocode/core not available",
+      peer: null,
+      isFederationSource: false,
+      computedChecksum: null,
+      expectedChecksum: null
+    };
+  }
+  return core.evaluateFederationInstallGate({
+    source,
+    artefactPath: opts.artefactPath,
+    expectedChecksum: opts.expectedChecksum,
+    approveNewSource: opts.approveNewSource
+  });
+}
+async function recordSkillTrustBypass(scan, reason = null) {
+  const core = await resolveCore();
+  if (!core) return;
+  try {
+    core.recordTrustBypass(scan, reason);
+  } catch (err) {
+    process.stderr.write(
+      `[caamp] WARNING: failed to record trust-bypass audit row: ${err instanceof Error ? err.message : String(err)}
+`
+    );
+  }
+}
+
+// src/commands/skills/install.ts
 function registerSkillsInstall(parent) {
   parent.command("install").description("Install a skill from GitHub, URL, marketplace, or registered skill library").argument("[source]", "Skill source (GitHub URL, owner/repo, @author/name, skill-name)").option(
     "-a, --agent <name>",
@@ -4208,6 +4474,12 @@ function registerSkillsInstall(parent) {
   ).option("-g, --global", "Install globally").option("-y, --yes", "Skip confirmation").option("--all", "Install to all detected agents").option(
     "--profile <name>",
     "Install a skill library profile (minimal, core, recommended, full)"
+  ).option(
+    "--force",
+    "Override trust-gate block decisions (audited to .cleo/audit/skill-trust-bypass.jsonl)"
+  ).option(
+    "--allow-new-source",
+    "Bypass first-install confirmation prompt for unknown federation sources (non-TTY safe)"
   ).option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(
     async (source, opts) => {
       const operation = "skills.install";
@@ -4241,7 +4513,7 @@ function registerSkillsInstall(parent) {
       if (providers.length === 0) {
         const message = "No target providers found. Use --agent or --all.";
         if (format === "json") {
-          emitError2(
+          emitError(
             operation,
             mvi,
             ErrorCodes.PROVIDER_NOT_FOUND,
@@ -4249,7 +4521,7 @@ function registerSkillsInstall(parent) {
             ErrorCategories.NOT_FOUND
           );
         }
-        console.error(pc11.red(message));
+        console.error(pc12.red(message));
         process.exit(1);
       }
       if (opts.profile) {
@@ -4266,7 +4538,7 @@ function registerSkillsInstall(parent) {
       if (!source) {
         const message = "Missing required argument: source";
         if (format === "json") {
-          emitError2(
+          emitError(
             operation,
             mvi,
             ErrorCodes.INVALID_INPUT,
@@ -4274,14 +4546,14 @@ function registerSkillsInstall(parent) {
             ErrorCategories.VALIDATION
           );
         }
-        console.error(pc11.red(message));
+        console.error(pc12.red(message));
         console.log(
-          pc11.dim("Usage: caamp skills install <source> or caamp skills install --profile <name>")
+          pc12.dim("Usage: caamp skills install <source> or caamp skills install --profile <name>")
         );
         process.exit(1);
       }
       if (format === "human") {
-        console.log(pc11.dim(`Installing to ${providers.length} provider(s)...`));
+        console.log(pc12.dim(`Installing to ${providers.length} provider(s)...`));
       }
       let localPath;
       let cleanup;
@@ -4327,7 +4599,7 @@ function registerSkillsInstall(parent) {
                 ErrorCategories.TRANSIENT
               );
             }
-            console.error(pc11.red(message));
+            console.error(pc12.red(message));
             process.exit(1);
           }
         } else if (parsed.type === "gitlab" && parsed.owner && parsed.repo) {
@@ -4351,7 +4623,7 @@ function registerSkillsInstall(parent) {
                 ErrorCategories.TRANSIENT
               );
             }
-            console.error(pc11.red(message));
+            console.error(pc12.red(message));
             process.exit(1);
           }
         } else if (parsed.type === "local") {
@@ -4372,7 +4644,7 @@ function registerSkillsInstall(parent) {
                 ErrorCategories.VALIDATION
               );
             }
-            console.error(pc11.red(message));
+            console.error(pc12.red(message));
             process.exit(1);
           }
           const catalogSkill = getSkill(parsed.inferredName);
@@ -4383,7 +4655,7 @@ function registerSkillsInstall(parent) {
             sourceType = "library";
             if (format === "human") {
               console.log(
-                `  Found in catalog: ${pc11.bold(catalogSkill.name)} v${catalogSkill.version} (${pc11.dim(catalogSkill.category)})`
+                `  Found in catalog: ${pc12.bold(catalogSkill.name)} v${catalogSkill.version} (${pc12.dim(catalogSkill.category)})`
               );
             }
           } else {
@@ -4400,8 +4672,8 @@ function registerSkillsInstall(parent) {
                 }
               );
             }
-            console.error(pc11.red(message));
-            console.log(pc11.dim("Available skills: " + listSkills().join(", ")));
+            console.error(pc12.red(message));
+            console.log(pc12.dim("Available skills: " + listSkills().join(", ")));
             process.exit(1);
           }
         } else {
@@ -4415,7 +4687,7 @@ function registerSkillsInstall(parent) {
               ErrorCategories.VALIDATION
             );
           }
-          console.error(pc11.red(message));
+          console.error(pc12.red(message));
           process.exit(1);
         }
       }
@@ -4431,9 +4703,103 @@ function registerSkillsInstall(parent) {
               ErrorCategories.INTERNAL
             );
           }
-          console.error(pc11.red(message));
+          console.error(pc12.red(message));
           process.exit(1);
         }
+        if (sourceType !== "library" && sourceType !== "package") {
+          const fedGate = await evaluateFederationGate(sourceValue, {
+            artefactPath: localPath,
+            approveNewSource: opts.allowNewSource === true
+          });
+          if (fedGate.decision === "block-checksum") {
+            const message = `Federation install blocked: ${fedGate.reason}`;
+            if (format === "json") {
+              emitJsonError(
+                operation,
+                mvi,
+                ErrorCodes.FEDERATION_CHECKSUM_MISMATCH,
+                message,
+                ErrorCategories.VALIDATION,
+                {
+                  expectedChecksum: fedGate.expectedChecksum,
+                  computedChecksum: fedGate.computedChecksum
+                }
+              );
+            }
+            console.error(pc12.red(message));
+            process.exit(1);
+          }
+          if (fedGate.decision === "prompt-first-install") {
+            const message = `${fedGate.reason} Use --allow-new-source to approve in non-interactive contexts.`;
+            if (format === "json") {
+              emitJsonError(
+                operation,
+                mvi,
+                ErrorCodes.FEDERATION_UNKNOWN_SOURCE_INTERACTIVE_REQUIRED,
+                message,
+                ErrorCategories.VALIDATION,
+                { peer: fedGate.peer?.url ?? null }
+              );
+            }
+            console.error(pc12.yellow(message));
+            process.exit(1);
+          }
+        }
+        if (sourceType !== "library" && sourceType !== "package") {
+          const gate = await evaluateSkillTrustGate(localPath, sourceValue, opts.force ?? false);
+          if (gate.decision === "block") {
+            const message = `Trust gate blocked install: ${gate.reason}`;
+            if (format === "json") {
+              const envelope = buildEnvelope(
+                operation,
+                mvi,
+                { scan: gate.scan },
+                {
+                  code: ErrorCodes.SKILL_TRUST_GATE_BLOCKED,
+                  message,
+                  category: ErrorCategories.VALIDATION,
+                  retryable: false,
+                  retryAfterMs: null,
+                  details: {
+                    verdict: gate.scan.verdict,
+                    trustLevel: gate.scan.trustLevel,
+                    findingsCount: gate.scan.findings.length
+                  }
+                }
+              );
+              console.error(JSON.stringify(envelope, null, 2));
+            } else {
+              console.error(pc12.red(`
+${message}`));
+              for (const f of gate.scan.findings.slice(0, 5)) {
+                console.error(
+                  pc12.dim(
+                    `  [${f.severity}] ${f.category} ${f.file}:${f.line} \u2014 ${f.description}`
+                  )
+                );
+              }
+              console.error(pc12.yellow("  Use --force to override (audited)."));
+            }
+            process.exit(1);
+          }
+          if (gate.decision === "ask") {
+            const message = `Trust gate requires confirmation: ${gate.reason}`;
+            if (format === "json") {
+              emitJsonError(
+                operation,
+                mvi,
+                ErrorCodes.SKILL_TRUST_GATE_BLOCKED,
+                message,
+                ErrorCategories.VALIDATION
+              );
+            }
+            console.error(pc12.red(message));
+            process.exit(1);
+          }
+          if (opts.force === true && gate.scan.verdict !== "safe") {
+            await recordSkillTrustBypass(gate.scan, "operator --force on caamp skills install");
+          }
+        }
         const result = await dispatchInstallSkillAcrossProviders(
           localPath,
           skillName,
@@ -4469,14 +4835,14 @@ function registerSkillsInstall(parent) {
           if (format === "json") {
             outputSuccess(operation, mvi, summary);
           } else {
-            console.log(pc11.green(`
-\u2713 Installed ${pc11.bold(skillName)}`));
-            console.log(`  Canonical: ${pc11.dim(result.canonicalPath)}`);
+            console.log(pc12.green(`
+\u2713 Installed ${pc12.bold(skillName)}`));
+            console.log(`  Canonical: ${pc12.dim(result.canonicalPath)}`);
             console.log(`  Linked to: ${result.linkedAgents.join(", ")}`);
             if (result.errors.length > 0) {
-              console.log(pc11.yellow("\nWarnings:"));
+              console.log(pc12.yellow("\nWarnings:"));
               for (const err of result.errors) {
-                console.log(`  ${pc11.yellow("!")} ${err}`);
+                console.log(`  ${pc12.yellow("!")} ${err}`);
               }
             }
           }
@@ -4506,11 +4872,11 @@ function registerSkillsInstall(parent) {
             });
             console.error(JSON.stringify(envelope, null, 2));
           } else {
-            console.log(pc11.yellow(`
-\u2717 Failed to install ${pc11.bold(skillName)}`));
-            console.log(pc11.yellow("Errors:"));
+            console.log(pc12.yellow(`
+\u2717 Failed to install ${pc12.bold(skillName)}`));
+            console.log(pc12.yellow("Errors:"));
             for (const err of result.errors) {
-              console.log(`  ${pc11.yellow("!")} ${err}`);
+              console.log(`  ${pc12.yellow("!")} ${err}`);
             }
           }
           process.exit(1);
@@ -4525,9 +4891,9 @@ async function handleProfileInstall(profileName, providers, isGlobal, format, op
   if (!isCatalogAvailable()) {
     const message = "No skill library registered. Register one with registerSkillLibraryFromPath() or set CAAMP_SKILL_LIBRARY env var.";
     if (format === "json") {
-      emitError2(operation, mvi, ErrorCodes.INVALID_INPUT, message, ErrorCategories.VALIDATION);
+      emitError(operation, mvi, ErrorCodes.INVALID_INPUT, message, ErrorCategories.VALIDATION);
     }
-    console.error(pc11.red(message));
+    console.error(pc12.red(message));
     process.exit(1);
   }
   const profileSkills = resolveProfile(profileName);
@@ -4545,16 +4911,16 @@ async function handleProfileInstall(profileName, providers, isGlobal, format, op
         }
       );
     }
-    console.error(pc11.red(message));
+    console.error(pc12.red(message));
     const available = listProfiles();
     if (available.length > 0) {
-      console.log(pc11.dim("Available profiles: " + available.join(", ")));
+      console.log(pc12.dim("Available profiles: " + available.join(", ")));
     }
     process.exit(1);
   }
   if (format === "human") {
-    console.log(`Installing profile ${pc11.bold(profileName)} (${profileSkills.length} skill(s))...`);
-    console.log(pc11.dim(`Target: ${providers.length} provider(s)`));
+    console.log(`Installing profile ${pc12.bold(profileName)} (${profileSkills.length} skill(s))...`);
+    console.log(pc12.dim(`Target: ${providers.length} provider(s)`));
   }
   const installed = [];
   const failed = [];
@@ -4564,7 +4930,7 @@ async function handleProfileInstall(profileName, providers, isGlobal, format, op
       const result = await dispatchInstallSkillAcrossProviders(skillDir, name, providers, isGlobal);
       if (result.success) {
         if (format === "human") {
-          console.log(pc11.green(`  + ${name}`));
+          console.log(pc12.green(`  + ${name}`));
         }
         await recordSkillInstall(
           name,
@@ -4583,7 +4949,7 @@ async function handleProfileInstall(profileName, providers, isGlobal, format, op
         });
       } else {
         if (format === "human") {
-          console.log(pc11.yellow(`  ! ${name}: ${result.errors.join(", ")}`));
+          console.log(pc12.yellow(`  ! ${name}: ${result.errors.join(", ")}`));
         }
         failed.push({
           name,
@@ -4593,7 +4959,7 @@ async function handleProfileInstall(profileName, providers, isGlobal, format, op
     } catch (err) {
       const errorMsg = err instanceof Error ? err.message : String(err);
       if (format === "human") {
-        console.log(pc11.red(`  x ${name}: ${errorMsg}`));
+        console.log(pc12.red(`  x ${name}: ${errorMsg}`));
       }
       failed.push({
         name,
@@ -4628,7 +4994,7 @@ async function handleProfileInstall(profileName, providers, isGlobal, format, op
   } else {
     console.log(
       `
-${pc11.green(`${installed.length} installed`)}, ${failed.length > 0 ? pc11.yellow(`${failed.length} failed`) : "0 failed"}`
+${pc12.green(`${installed.length} installed`)}, ${failed.length > 0 ? pc12.yellow(`${failed.length} failed`) : "0 failed"}`
     );
     if (failed.length > 0) {
       process.exit(1);
@@ -4637,7 +5003,7 @@ ${pc11.green(`${installed.length} installed`)}, ${failed.length > 0 ? pc11.yello
 }
 async function handleMarketplaceSource(source, _providers, _isGlobal, format, operation, mvi) {
   if (format === "human") {
-    console.log(pc11.dim(`Searching marketplace for ${source}...`));
+    console.log(pc12.dim(`Searching marketplace for ${source}...`));
   }
   const client = new MarketplaceClient();
   let skill;
@@ -4648,7 +5014,7 @@ async function handleMarketplaceSource(source, _providers, _isGlobal, format, op
     if (format === "json") {
       emitJsonError(operation, mvi, ErrorCodes.NETWORK_ERROR, message, ErrorCategories.TRANSIENT);
     }
-    console.error(pc11.red(message));
+    console.error(pc12.red(message));
     return { success: false };
   }
   if (!skill) {
@@ -4656,12 +5022,12 @@ async function handleMarketplaceSource(source, _providers, _isGlobal, format, op
     if (format === "json") {
       emitJsonError(operation, mvi, ErrorCodes.SKILL_NOT_FOUND, message, ErrorCategories.NOT_FOUND);
     }
-    console.error(pc11.red(message));
+    console.error(pc12.red(message));
     return { success: false };
   }
   if (format === "human") {
     console.log(
-      `  Found: ${pc11.bold(skill.name)} by ${skill.author} (${pc11.dim(skill.repoFullName)})`
+      `  Found: ${pc12.bold(skill.name)} by ${skill.author} (${pc12.dim(skill.repoFullName)})`
     );
   }
   const parsed = parseSource(skill.githubUrl);
@@ -4670,7 +5036,7 @@ async function handleMarketplaceSource(source, _providers, _isGlobal, format, op
     if (format === "json") {
       emitJsonError(operation, mvi, ErrorCodes.INVALID_FORMAT, message, ErrorCategories.VALIDATION);
     }
-    console.error(pc11.red(message));
+    console.error(pc12.red(message));
     return { success: false };
   }
   try {
@@ -4682,7 +5048,7 @@ async function handleMarketplaceSource(source, _providers, _isGlobal, format, op
     for (const subPath of subPathCandidates) {
       try {
         const result = await cloneRepo(parsed.owner, parsed.repo, parsed.ref, subPath);
-        if (subPath && !existsSync11(result.localPath)) {
+        if (subPath && !existsSync12(result.localPath)) {
           await result.cleanup();
           continue;
         }
@@ -4710,22 +5076,22 @@ async function handleMarketplaceSource(source, _providers, _isGlobal, format, op
     if (format === "json") {
       emitJsonError(operation, mvi, ErrorCodes.NETWORK_ERROR, message, ErrorCategories.TRANSIENT);
     }
-    console.error(pc11.red(message));
+    console.error(pc12.red(message));
     return { success: false };
   }
 }
 
 // src/commands/skills/list.ts
-import { randomUUID as randomUUID5 } from "crypto";
-import { resolveOutputFormat as resolveOutputFormat4 } from "@cleocode/lafs";
-import pc12 from "picocolors";
+import { randomUUID as randomUUID4 } from "crypto";
+import { resolveOutputFormat as resolveOutputFormat3 } from "@cleocode/lafs";
+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 = "standard";
     let format;
     try {
-      format = resolveOutputFormat4({
+      format = resolveOutputFormat3({
         jsonFlag: opts.json ?? false,
         humanFlag: (opts.human ?? false) || isHuman(),
         projectDefault: "json"
@@ -4745,7 +5111,7 @@ function registerSkillsList(parent) {
             agent: opts.agent
           });
         } else {
-          console.error(pc12.red(message));
+          console.error(pc13.red(message));
         }
         process.exit(1);
       }
@@ -4773,21 +5139,21 @@ function registerSkillsList(parent) {
       return;
     }
     if (skills.length === 0) {
-      console.log(pc12.dim("No skills found."));
+      console.log(pc13.dim("No skills found."));
       return;
     }
-    console.log(pc12.bold(`
+    console.log(pc13.bold(`
 ${skills.length} skill(s) found:
 `));
     skills.forEach((skill, index) => {
       const num = (index + 1).toString().padStart(2);
       console.log(
-        `  ${pc12.cyan(num)}. ${pc12.bold(skill.name.padEnd(30))} ${pc12.dim(skill.metadata?.description ?? "")}`
+        `  ${pc13.cyan(num)}. ${pc13.bold(skill.name.padEnd(30))} ${pc13.dim(skill.metadata?.description ?? "")}`
       );
     });
-    console.log(pc12.dim(`
+    console.log(pc13.dim(`
 Install with: caamp skills install <name>`));
-    console.log(pc12.dim(`Remove with:  caamp skills remove <name>`));
+    console.log(pc13.dim(`Remove with:  caamp skills remove <name>`));
   });
 }
 function buildEnvelope4(operation, mvi, result, error) {
@@ -4798,7 +5164,7 @@ function buildEnvelope4(operation, mvi, result, error) {
       schemaVersion: "1.0.0",
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       operation,
-      requestId: randomUUID5(),
+      requestId: randomUUID4(),
       transport: "cli",
       strict: true,
       mvi,
@@ -4823,7 +5189,7 @@ function emitJsonError4(operation, mvi, code, message, category, details = {}) {
 }
 
 // src/commands/skills/remove.ts
-import pc13 from "picocolors";
+import pc14 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").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(
     async (name, opts) => {
@@ -4873,14 +5239,14 @@ function registerSkillsRemove(parent) {
           return;
         }
         if (removed.length > 0) {
-          console.log(pc13.green(`\u2713 Removed ${pc13.bold(name)} from: ${removed.join(", ")}`));
+          console.log(pc14.green(`\u2713 Removed ${pc14.bold(name)} from: ${removed.join(", ")}`));
           await removeSkillFromLock(name);
         } else {
-          console.log(pc13.yellow(`Skill ${name} not found in any provider.`));
+          console.log(pc14.yellow(`Skill ${name} not found in any provider.`));
         }
         if (result.errors.length > 0) {
           for (const err of result.errors) {
-            console.log(pc13.red(`  ${err}`));
+            console.log(pc14.red(`  ${err}`));
           }
         }
       } else {
@@ -4893,7 +5259,7 @@ function registerSkillsRemove(parent) {
               count: { removed: 0, total: 0 }
             });
           } else {
-            console.log(pc13.dim("No skills installed."));
+            console.log(pc14.dim("No skills installed."));
           }
           return;
         }
@@ -4906,18 +5272,18 @@ function registerSkillsRemove(parent) {
           });
           return;
         }
-        console.log(pc13.bold("Installed skills:"));
+        console.log(pc14.bold("Installed skills:"));
         for (const s of skills) {
           console.log(`  ${s}`);
         }
-        console.log(pc13.dim("\nUse: caamp skills remove <name>"));
+        console.log(pc14.dim("\nUse: caamp skills remove <name>"));
       }
     }
   );
 }
 
 // src/commands/skills/update.ts
-import pc14 from "picocolors";
+import pc15 from "picocolors";
 function registerSkillsUpdate(parent) {
   parent.command("update").description("Update all outdated skills").option("-y, --yes", "Skip confirmation").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
     const operation = "skills.update";
@@ -4951,12 +5317,12 @@ function registerSkillsUpdate(parent) {
           count: { updated: 0, failed: 0, skipped: 0 }
         });
       } else {
-        console.log(pc14.dim("No tracked skills to update."));
+        console.log(pc15.dim("No tracked skills to update."));
       }
       return;
     }
     if (format === "human") {
-      console.log(pc14.dim(`Checking ${entries.length} skill(s) for updates...`));
+      console.log(pc15.dim(`Checking ${entries.length} skill(s) for updates...`));
     }
     const outdated = [];
     for (const [name] of entries) {
@@ -4978,19 +5344,19 @@ function registerSkillsUpdate(parent) {
           count: { updated: 0, failed: 0, skipped: 0 }
         });
       } else {
-        console.log(pc14.green("\nAll skills are up to date."));
+        console.log(pc15.green("\nAll skills are up to date."));
       }
       return;
     }
     if (format === "human") {
-      console.log(pc14.yellow(`
+      console.log(pc15.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(
-          `  ${pc14.bold(skill.name)}  ${pc14.dim(current)}  ${pc14.dim("->")}  ${pc14.cyan(latest)}`
+          `  ${pc15.bold(skill.name)}  ${pc15.dim(current)}  ${pc15.dim("->")}  ${pc15.cyan(latest)}`
         );
       }
     }
@@ -4998,11 +5364,11 @@ ${outdated.length} skill(s) have updates available:
       const readline = await import("readline");
       const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
       const answer = await new Promise((resolve3) => {
-        rl.question(pc14.dim("\nProceed with update? [y/N] "), resolve3);
+        rl.question(pc15.dim("\nProceed with update? [y/N] "), resolve3);
       });
       rl.close();
       if (answer.toLowerCase() !== "y" && answer.toLowerCase() !== "yes") {
-        console.log(pc14.dim("Update cancelled."));
+        console.log(pc15.dim("Update cancelled."));
         return;
       }
     }
@@ -5016,7 +5382,7 @@ ${outdated.length} skill(s) have updates available:
       const entry = tracked[skill.name];
       if (!entry) continue;
       if (format === "human") {
-        console.log(pc14.dim(`Updating ${pc14.bold(skill.name)}...`));
+        console.log(pc15.dim(`Updating ${pc15.bold(skill.name)}...`));
       }
       try {
         const parsed = parseSource(entry.source);
@@ -5038,7 +5404,7 @@ ${outdated.length} skill(s) have updates available:
         } else {
           if (format === "human") {
             console.log(
-              pc14.yellow(
+              pc15.yellow(
                 `  Skipped ${skill.name}: source type "${parsed.type}" does not support auto-update`
               )
             );
@@ -5050,7 +5416,7 @@ ${outdated.length} skill(s) have updates available:
           const providers = entry.agents.map((a) => getProvider(a)).filter((p) => p !== void 0);
           if (providers.length === 0) {
             if (format === "human") {
-              console.log(pc14.yellow(`  Skipped ${skill.name}: no valid providers found`));
+              console.log(pc15.yellow(`  Skipped ${skill.name}: no valid providers found`));
             }
             skipped.push(skill.name);
             continue;
@@ -5075,18 +5441,18 @@ ${outdated.length} skill(s) have updates available:
               skill.latestVersion
             );
             if (format === "human") {
-              console.log(pc14.green(`  Updated ${pc14.bold(skill.name)}`));
+              console.log(pc15.green(`  Updated ${pc15.bold(skill.name)}`));
             }
             updated.push(skill.name);
           } else {
             if (format === "human") {
-              console.log(pc14.red(`  Failed to update ${skill.name}: no agents linked`));
+              console.log(pc15.red(`  Failed to update ${skill.name}: no agents linked`));
             }
             failed.push({ name: skill.name, error: "no agents linked" });
           }
           if (installResult.errors.length > 0 && format === "human") {
             for (const err of installResult.errors) {
-              console.log(pc14.yellow(`    ${err}`));
+              console.log(pc15.yellow(`    ${err}`));
             }
           }
         } finally {
@@ -5095,7 +5461,7 @@ ${outdated.length} skill(s) have updates available:
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
         if (format === "human") {
-          console.log(pc14.red(`  Failed to update ${skill.name}: ${msg}`));
+          console.log(pc15.red(`  Failed to update ${skill.name}: ${msg}`));
         }
         failed.push({ name: skill.name, error: msg });
       }
@@ -5115,24 +5481,24 @@ ${outdated.length} skill(s) have updates available:
     }
     console.log();
     if (updated.length > 0) {
-      console.log(pc14.green(`Updated ${updated.length} skill(s).`));
+      console.log(pc15.green(`Updated ${updated.length} skill(s).`));
     }
     if (failed.length > 0) {
-      console.log(pc14.red(`Failed to update ${failed.length} skill(s).`));
+      console.log(pc15.red(`Failed to update ${failed.length} skill(s).`));
     }
   });
 }
 
 // src/commands/skills/validate.ts
-import { resolveOutputFormat as resolveOutputFormat5 } from "@cleocode/lafs";
-import pc15 from "picocolors";
+import { resolveOutputFormat as resolveOutputFormat4 } from "@cleocode/lafs";
+import pc16 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 (default)").option("--human", "Output in human-readable format").action(async (path, opts) => {
     const operation = "skills.validate";
     const mvi = "standard";
     let format;
     try {
-      format = resolveOutputFormat5({
+      format = resolveOutputFormat4({
         jsonFlag: opts.json ?? false,
         humanFlag: (opts.human ?? false) || isHuman(),
         projectDefault: "json"
@@ -5165,7 +5531,7 @@ function registerSkillsValidate(parent) {
           }
         );
       } else {
-        console.error(pc15.red(message));
+        console.error(pc16.red(message));
       }
       process.exit(1);
     }
@@ -5187,12 +5553,12 @@ function registerSkillsValidate(parent) {
       console.log(JSON.stringify(envelope, null, 2));
     } else {
       if (result.valid) {
-        console.log(pc15.green(`\u2713 ${path} is valid`));
+        console.log(pc16.green(`\u2713 ${path} is valid`));
       } else {
-        console.log(pc15.red(`\u2717 ${path} has validation errors`));
+        console.log(pc16.red(`\u2717 ${path} has validation errors`));
       }
       for (const issue of result.issues) {
-        const icon = issue.level === "error" ? pc15.red("\u2717") : pc15.yellow("!");
+        const icon = issue.level === "error" ? pc16.red("\u2717") : pc16.yellow("!");
         console.log(`  ${icon} [${issue.field}] ${issue.message}`);
       }
     }
@@ -5214,6 +5580,9 @@ function registerSkillsCommands(program2) {
   registerSkillsInit(skills);
   registerSkillsAudit(skills);
   registerSkillsValidate(skills);
+  registerSkillsDoctorMigrate(skills);
+  registerSkillsDoctor(skills);
+  registerSkillsDoctorAdopt(skills);
 }
 
 // src/cli.ts