@cleocode/caamp 2026.9.18 → 2026.9.20

package/dist/cli.js

@@ -1,36 +1,42 @@
 #!/usr/bin/env node
 import {
+  ErrorCategories,
+  ErrorCodes,
   MarketplaceClient,
   PiHarness,
   RECOMMENDATION_ERROR_CODES,
+  SkillInstallError,
+  buildEnvelope,
   checkSkillUpdate,
+  cloneGitLabRepo,
+  cloneRepo,
   detectAllProviders,
   detectMcpInstallations,
   detectProjectProviders,
-  discoverSkill,
   discoverSkillsMulti,
-  dispatchInstallSkillAcrossProviders,
   dispatchRemoveSkillAcrossProviders,
+  emitError,
+  emitJsonError,
   fetchWithTimeout,
   formatNetworkError,
   formatSkillRecommendations,
   getHarnessFor,
   getInstalledProviders,
-  getSkill,
   getSkillDir,
   getTrackedSkills,
+  handleFormatError,
   installBatchWithRollback,
   installMcpServer,
+  installResolvedSkill,
+  installSkillFromSource,
   isCatalogAvailable,
   isHuman,
-  isMarketplaceScoped,
-  isQuiet,
   isVerbose,
   listAllMcpServers,
   listCanonicalSkills,
   listMcpServers,
   listProfiles,
-  listSkills,
+  outputSuccess,
   parseSource,
   readConfig,
   readLockFile,
@@ -40,6 +46,7 @@ import {
   removeMcpServerFromAll,
   removeSkillFromLock,
   resolveDefaultTargetProviders,
+  resolveFormat,
   resolveProfile,
   scanDirectory,
   scanFile,
@@ -47,11 +54,12 @@ import {
   setHuman,
   setQuiet,
   setVerbose,
+  syncGlobalInstructions,
   toSarif,
   tokenizeCriteriaValue,
   updateInstructionsSingleOperation,
   validateSkill
-} from "./chunk-52ZWZXEN.js";
+} from "./chunk-QC6CHW72.js";
 import {
   buildSkillsMap,
   checkAllInjections,
@@ -64,7 +72,7 @@ import {
   groupByInstructFile,
   injectAll,
   providerSupports
-} from "./chunk-G3CEXEW2.js";
+} from "./chunk-JELNPPLN.js";
 import {
   CANONICAL_HOOK_EVENTS,
   buildHookMatrix,
@@ -75,7 +83,6 @@ import {
   translateToAll
 } from "./chunk-YCAANESR.js";
 import {
-  buildSkillSubPathCandidates,
   resolveProviderConfigPath,
   resolveProviderSkillsDir
 } from "./chunk-HDZYZTR2.js";
@@ -152,7 +159,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 = {
@@ -203,7 +210,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);
   }
 }
@@ -498,121 +505,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",
-  // Skills federation gates (T9564 — Sphere B)
-  SKILL_TRUST_GATE_BLOCKED: "E_SKILL_TRUST_GATE_BLOCKED",
-  FEDERATION_UNKNOWN_SOURCE_INTERACTIVE_REQUIRED: "E_FEDERATION_UNKNOWN_SOURCE_INTERACTIVE_REQUIRED",
-  FEDERATION_CHECKSUM_MISMATCH: "E_FEDERATION_CHECKSUM_MISMATCH",
-  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(
@@ -1258,6 +1150,8 @@ function registerInstructionsCheck(parent) {
         providers = getAllProviders();
       } else if (opts.agent.length > 0) {
         providers = opts.agent.map((a) => getProvider(a)).filter((p) => p !== void 0);
+      } else if (opts.global) {
+        providers = getInstalledProviders();
       } else {
         providers = resolveDefaultTargetProviders();
       }
@@ -1416,12 +1310,24 @@ function registerInstructionsInject(parent) {
           }
         }
       }
-      if (genericProviders.length > 0) {
-        const genericResults = await injectAll(genericProviders, process.cwd(), scope, content);
-        for (const [file, action] of genericResults) {
-          results.set(file, action);
+      const failed = [];
+      for (const provider of genericProviders) {
+        try {
+          for (const [file, action] of await injectAll(
+            [provider],
+            process.cwd(),
+            scope,
+            content
+          )) {
+            results.set(file, action);
+          }
+        } catch (err) {
+          const error = err instanceof Error ? err.message : String(err);
+          failed.push({ provider: provider.id, error });
+          if (format === "human") console.log(pc4.red(`  x ${provider.id}: ${error}`));
         }
       }
+      if (failed.length > 0) process.exitCode = 1;
       const injected = [];
       for (const [file] of results) {
         injected.push(file);
@@ -1430,7 +1336,8 @@ function registerInstructionsInject(parent) {
         outputSuccess(operation, mvi, {
           injected,
           providers: providers.map((p) => p.id),
-          count: results.size
+          count: results.size,
+          ...failed.length > 0 ? { failed } : {}
         });
       } else {
         for (const [file, action] of results) {
@@ -1446,6 +1353,44 @@ ${results.size} file(s) processed.`));
 
 // src/commands/instructions/update.ts
 import pc5 from "picocolors";
+async function updateGlobal(format) {
+  const operation = "instructions.update";
+  const mvi = "standard";
+  const result = await syncGlobalInstructions();
+  const updated = result.files.filter((file) => file.action !== "intact" && file.action !== "failed").map((file) => file.path);
+  const failed = [
+    ...result.files.filter((file) => file.action === "failed").map((file) => ({ provider: file.providers.join(","), error: file.error ?? "unknown" })),
+    ...result.findings.map((finding) => ({
+      provider: "hub",
+      error: `${finding.kind}: ${finding.path} (${finding.reason})`
+    }))
+  ];
+  if (failed.length > 0) process.exitCode = 1;
+  if (format === "json") {
+    outputSuccess(operation, mvi, {
+      status: result.status,
+      updated,
+      failed,
+      files: result.files,
+      skippedProviders: result.skippedProviders,
+      count: { updated: updated.length, failed: failed.length }
+    });
+    return;
+  }
+  if (result.status === "no-providers") {
+    console.log(pc5.yellow("No provider installations detected."));
+    return;
+  }
+  for (const file of result.files) {
+    const icon = file.action === "failed" ? pc5.red("x") : pc5.green("\u2713");
+    console.log(`  ${icon} ${file.path} (${file.action}${file.error ? `: ${file.error}` : ""})`);
+  }
+  for (const finding of result.findings) {
+    console.log(`  ${pc5.red("x")} ${finding.kind}: ${finding.path} \u2014 ${finding.reason}`);
+  }
+  console.log(pc5.bold(`
+${updated.length} file(s) updated.`));
+}
 function registerInstructionsUpdate(parent) {
   parent.command("update").description("Update all instruction file injections").option("-g, --global", "Update global instruction files").option("-y, --yes", "Skip confirmation").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
     const operation = "instructions.update";
@@ -1468,8 +1413,12 @@ function registerInstructionsUpdate(parent) {
       );
       process.exit(1);
     }
+    if (opts.global) {
+      await updateGlobal(format);
+      return;
+    }
     const providers = resolveDefaultTargetProviders();
-    const scope = opts.global ? "global" : "project";
+    const scope = "project";
     const content = generateInjectionContent();
     const harnessProviders = [];
     const genericProviders = [];
@@ -1503,9 +1452,21 @@ function registerInstructionsUpdate(parent) {
     }
     const providerIds = new Set(needsUpdate.map((c) => c.provider));
     const toUpdate = genericProviders.filter((p) => providerIds.has(p.id));
-    const results = await injectAll(toUpdate, process.cwd(), scope, content);
-    const harnessScope = scope === "global" ? { kind: "global" } : { kind: "project", projectDir: process.cwd() };
-    const harnessFailures = [];
+    const failures = [];
+    const results = /* @__PURE__ */ new Map();
+    for (const provider of toUpdate) {
+      try {
+        for (const [file, action] of await injectAll([provider], process.cwd(), scope, content)) {
+          results.set(file, action);
+        }
+      } catch (err) {
+        failures.push({
+          provider: provider.id,
+          error: err instanceof Error ? err.message : String(err)
+        });
+      }
+    }
+    const harnessScope = { kind: "project", projectDir: process.cwd() };
     for (const provider of harnessProviders) {
       const harness = getHarnessFor(provider);
       if (harness === null) continue;
@@ -1513,22 +1474,19 @@ function registerInstructionsUpdate(parent) {
         await harness.injectInstructions(content, harnessScope);
         results.set(`${provider.id}:AGENTS.md`, "updated");
       } catch (err) {
-        harnessFailures.push({
+        failures.push({
           provider: provider.id,
           error: err instanceof Error ? err.message : String(err)
         });
       }
     }
-    const updated = [];
-    for (const [file] of results) {
-      updated.push(file);
-    }
+    const updated = [...results.keys()];
     if (format === "human") {
       console.log();
       for (const [file, action] of results) {
         console.log(`  ${pc5.green("\u2713")} ${file} (${action})`);
       }
-      for (const failure of harnessFailures) {
+      for (const failure of failures) {
         console.log(`  ${pc5.red("x")} ${failure.provider}: ${failure.error}`);
       }
       console.log(pc5.bold(`
@@ -1537,8 +1495,8 @@ ${results.size} file(s) updated.`));
     if (format === "json") {
       outputSuccess(operation, mvi, {
         updated,
-        failed: harnessFailures,
-        count: { updated: updated.length, failed: harnessFailures.length }
+        failed: failures,
+        count: { updated: updated.length, failed: failures.length }
       });
     }
   });
@@ -1883,60 +1841,8 @@ function registerMcpCommands(program2) {
 // src/commands/pi/cant.ts
 import { existsSync as existsSync4 } from "fs";
 import { writeFile } from "fs/promises";
-import { tmpdir as tmpdir3 } from "os";
-import { isAbsolute, join as join5 } from "path";
-
-// src/core/sources/github.ts
-import { mkdtemp, rm } from "fs/promises";
 import { tmpdir } from "os";
-import { join as join3 } from "path";
-import { simpleGit } from "simple-git";
-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);
-  }
-  await git.clone(repoUrl, tmpDir, cloneOptions);
-  const localPath = subPath ? join3(tmpDir, subPath) : tmpDir;
-  return {
-    localPath,
-    cleanup: async () => {
-      try {
-        await rm(tmpDir, { recursive: true });
-      } catch {
-      }
-    }
-  };
-}
-
-// src/core/sources/gitlab.ts
-import { mkdtemp as mkdtemp2, rm as rm2 } from "fs/promises";
-import { tmpdir as tmpdir2 } from "os";
-import { join as join4 } from "path";
-import { simpleGit as simpleGit2 } from "simple-git";
-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);
-  }
-  await git.clone(repoUrl, tmpDir, cloneOptions);
-  const localPath = subPath ? join4(tmpDir, subPath) : tmpDir;
-  return {
-    localPath,
-    cleanup: async () => {
-      try {
-        await rm2(tmpDir, { recursive: true });
-      } catch {
-      }
-    }
-  };
-}
+import { isAbsolute, join as join3 } from "path";
 
 // src/commands/pi/common.ts
 var PI_ERROR_CODES = {
@@ -1999,7 +1905,7 @@ function resolveProjectDir2(tier, explicit) {
 // src/commands/pi/cant.ts
 async function resolveCantSource(source) {
   if (isAbsolute(source) || source.startsWith("./") || source.startsWith("../") || source.startsWith("~")) {
-    const expanded = source.startsWith("~/") ? join5(process.env["HOME"] ?? "", source.slice(2)) : source;
+    const expanded = source.startsWith("~/") ? join3(process.env["HOME"] ?? "", source.slice(2)) : source;
     if (!existsSync4(expanded)) {
       throw new LAFSCommandError(
         PI_ERROR_CODES.NOT_FOUND,
@@ -2019,7 +1925,7 @@ async function resolveCantSource(source) {
     const parsed2 = parseSource(source);
     if (parsed2.type === "github" && parsed2.owner !== void 0 && parsed2.repo !== void 0) {
       const cloneResult = await cloneRepo(parsed2.owner, parsed2.repo, parsed2.ref);
-      const filePath = parsed2.path !== void 0 ? join5(cloneResult.localPath, parsed2.path) : cloneResult.localPath;
+      const filePath = parsed2.path !== void 0 ? join3(cloneResult.localPath, parsed2.path) : cloneResult.localPath;
       if (!existsSync4(filePath)) {
         await cloneResult.cleanup();
         throw new LAFSCommandError(
@@ -2037,7 +1943,7 @@ async function resolveCantSource(source) {
     }
     if (parsed2.type === "gitlab" && parsed2.owner !== void 0 && parsed2.repo !== void 0) {
       const cloneResult = await cloneGitLabRepo(parsed2.owner, parsed2.repo, parsed2.ref);
-      const filePath = parsed2.path !== void 0 ? join5(cloneResult.localPath, parsed2.path) : cloneResult.localPath;
+      const filePath = parsed2.path !== void 0 ? join3(cloneResult.localPath, parsed2.path) : cloneResult.localPath;
       if (!existsSync4(filePath)) {
         await cloneResult.cleanup();
         throw new LAFSCommandError(
@@ -2064,7 +1970,7 @@ async function resolveCantSource(source) {
     }
     const body = await resp.text();
     const baseName = inferNameFromUrl(source);
-    const tmp = join5(tmpdir3(), `caamp-pi-cant-${process.pid}-${Date.now()}-${baseName}.cant`);
+    const tmp = join3(tmpdir(), `caamp-pi-cant-${process.pid}-${Date.now()}-${baseName}.cant`);
     await writeFile(tmp, body, "utf8");
     return {
       localPath: tmp,
@@ -2080,7 +1986,7 @@ async function resolveCantSource(source) {
   const parsed = parseSource(source);
   if (parsed.type === "github" && parsed.owner !== void 0 && parsed.repo !== void 0) {
     const cloneResult = await cloneRepo(parsed.owner, parsed.repo, parsed.ref);
-    const filePath = parsed.path !== void 0 ? join5(cloneResult.localPath, parsed.path) : cloneResult.localPath;
+    const filePath = parsed.path !== void 0 ? join3(cloneResult.localPath, parsed.path) : cloneResult.localPath;
     if (!existsSync4(filePath)) {
       await cloneResult.cleanup();
       throw new LAFSCommandError(
@@ -2244,11 +2150,11 @@ function registerPiCantCommands(parent) {
 // src/commands/pi/extensions.ts
 import { existsSync as existsSync5 } from "fs";
 import { writeFile as writeFile2 } from "fs/promises";
-import { tmpdir as tmpdir4 } from "os";
-import { isAbsolute as isAbsolute2, join as join6 } from "path";
+import { tmpdir as tmpdir2 } from "os";
+import { isAbsolute as isAbsolute2, join as join4 } from "path";
 async function resolveExtensionSource(source) {
   if (isAbsolute2(source) || source.startsWith("./") || source.startsWith("../") || source.startsWith("~")) {
-    const expanded = source.startsWith("~/") ? join6(process.env["HOME"] ?? "", source.slice(2)) : source;
+    const expanded = source.startsWith("~/") ? join4(process.env["HOME"] ?? "", source.slice(2)) : source;
     if (!existsSync5(expanded)) {
       throw new LAFSCommandError(
         PI_ERROR_CODES.NOT_FOUND,
@@ -2269,7 +2175,7 @@ async function resolveExtensionSource(source) {
     const parsed2 = parseSource(source);
     if (parsed2.type === "github" && parsed2.owner !== void 0 && parsed2.repo !== void 0) {
       const cloneResult = await cloneRepo(parsed2.owner, parsed2.repo, parsed2.ref);
-      const filePath = parsed2.path !== void 0 ? join6(cloneResult.localPath, parsed2.path) : cloneResult.localPath;
+      const filePath = parsed2.path !== void 0 ? join4(cloneResult.localPath, parsed2.path) : cloneResult.localPath;
       if (!existsSync5(filePath)) {
         await cloneResult.cleanup();
         throw new LAFSCommandError(
@@ -2287,7 +2193,7 @@ async function resolveExtensionSource(source) {
     }
     if (parsed2.type === "gitlab" && parsed2.owner !== void 0 && parsed2.repo !== void 0) {
       const cloneResult = await cloneGitLabRepo(parsed2.owner, parsed2.repo, parsed2.ref);
-      const filePath = parsed2.path !== void 0 ? join6(cloneResult.localPath, parsed2.path) : cloneResult.localPath;
+      const filePath = parsed2.path !== void 0 ? join4(cloneResult.localPath, parsed2.path) : cloneResult.localPath;
       if (!existsSync5(filePath)) {
         await cloneResult.cleanup();
         throw new LAFSCommandError(
@@ -2314,7 +2220,7 @@ async function resolveExtensionSource(source) {
     }
     const body = await resp.text();
     const baseName = inferNameFromUrl2(source);
-    const tmp = join6(tmpdir4(), `caamp-pi-ext-${process.pid}-${Date.now()}-${baseName}.ts`);
+    const tmp = join4(tmpdir2(), `caamp-pi-ext-${process.pid}-${Date.now()}-${baseName}.ts`);
     await writeFile2(tmp, body, "utf8");
     return {
       localPath: tmp,
@@ -2330,7 +2236,7 @@ async function resolveExtensionSource(source) {
   const parsed = parseSource(source);
   if (parsed.type === "github" && parsed.owner !== void 0 && parsed.repo !== void 0) {
     const cloneResult = await cloneRepo(parsed.owner, parsed.repo, parsed.ref);
-    const filePath = parsed.path !== void 0 ? join6(cloneResult.localPath, parsed.path) : cloneResult.localPath;
+    const filePath = parsed.path !== void 0 ? join4(cloneResult.localPath, parsed.path) : cloneResult.localPath;
     if (!existsSync5(filePath)) {
       await cloneResult.cleanup();
       throw new LAFSCommandError(
@@ -2599,7 +2505,7 @@ function registerPiModelsCommands(parent) {
 
 // src/commands/pi/prompts.ts
 import { existsSync as existsSync6 } from "fs";
-import { join as join7, resolve } from "path";
+import { join as join5, resolve } from "path";
 function inferPromptName(sourceDir) {
   const normalized = resolve(sourceDir).replace(/[\\/]+$/, "");
   const base = normalized.split(/[\\/]/).pop();
@@ -2629,7 +2535,7 @@ function registerPiPromptsCommands(parent) {
           false
         );
       }
-      if (!existsSync6(join7(absSource, "prompt.md"))) {
+      if (!existsSync6(join5(absSource, "prompt.md"))) {
         throw new LAFSCommandError(
           PI_ERROR_CODES.VALIDATION,
           `Source directory is missing prompt.md: ${absSource}`,
@@ -2946,8 +2852,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");
@@ -2956,7 +2862,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"
@@ -3006,7 +2912,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"
@@ -3062,7 +2968,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"
@@ -3135,7 +3041,7 @@ ${provider.toolName}`));
     const mvi = "standard";
     let format;
     try {
-      format = resolveOutputFormat2({
+      format = resolveOutputFormat({
         jsonFlag: opts.json ?? false,
         humanFlag: (opts.human ?? false) || isHuman(),
         projectDefault: "json"
@@ -3193,7 +3099,7 @@ ${provider.toolName}`));
     const mvi = "standard";
     let format;
     try {
-      format = resolveOutputFormat2({
+      format = resolveOutputFormat({
         jsonFlag: opts.json ?? false,
         humanFlag: (opts.human ?? false) || isHuman(),
         projectDefault: "json"
@@ -3261,7 +3167,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"
@@ -3308,7 +3214,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"
@@ -3439,7 +3345,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"
@@ -3509,7 +3415,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,
@@ -3825,8 +3731,8 @@ function registerSkillsCheck(parent) {
 }
 
 // src/commands/skills/find.ts
-import { randomUUID as randomUUID4 } from "crypto";
-import { resolveOutputFormat as resolveOutputFormat3 } from "@cleocode/lafs";
+import { randomUUID as randomUUID3 } from "crypto";
+import { resolveOutputFormat as resolveOutputFormat2 } from "@cleocode/lafs";
 import pc9 from "picocolors";
 var SkillsFindValidationError = class extends Error {
   code;
@@ -3858,7 +3764,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"
@@ -4087,7 +3993,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,
@@ -4114,7 +4020,7 @@ function emitJsonError3(operation, mvi, code, message, category, details = {}) {
 // src/commands/skills/init.ts
 import { existsSync as existsSync10 } from "fs";
 import { mkdir, writeFile as writeFile3 } from "fs/promises";
-import { join as join8 } from "path";
+import { join as join6 } from "path";
 import pc10 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(
@@ -4140,7 +4046,7 @@ function registerSkillsInit(parent) {
         process.exit(1);
       }
       const skillName = name ?? "my-skill";
-      const skillDir = join8(opts.dir, skillName);
+      const skillDir = join6(opts.dir, skillName);
       if (existsSync10(skillDir)) {
         const message = `Directory already exists: ${skillDir}`;
         if (format === "json") {
@@ -4183,7 +4089,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(join6(skillDir, "SKILL.md"), template, "utf-8");
       const result = {
         name: skillName,
         directory: skillDir,
@@ -4197,95 +4103,88 @@ Show example inputs and expected outputs.
       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(`  2. Validate: caamp skills validate ${join6(skillDir, "SKILL.md")}`));
       console.log(pc10.dim(`  3. Install: caamp skills install ${skillDir}`));
     }
   );
 }
 
 // src/commands/skills/install.ts
-import { existsSync as existsSync11 } from "fs";
-import { createRequire } from "module";
-import { pushWarning } from "@cleocode/lafs";
 import pc11 from "picocolors";
-var cachedCore;
-var defaultCoreResolver = async () => {
-  const require2 = createRequire(import.meta.url);
-  require2.resolve("@cleocode/core");
-  return await import("@cleocode/core");
-};
-var coreResolver = defaultCoreResolver;
-async function resolveCore() {
-  if (cachedCore !== void 0) return cachedCore;
-  try {
-    cachedCore = await coreResolver();
-  } catch (err) {
-    cachedCore = null;
-    pushWarning({
-      code: "W_CORE_UNAVAILABLE",
-      severity: "warn",
-      message: "caamp running without @cleocode/core \u2014 trust gate skipped (skill installs not security-checked)",
-      context: {
-        error: err instanceof Error ? err.message : String(err)
-      }
-    });
+function renderProgress(event) {
+  switch (event.kind) {
+    case "marketplace-search":
+      console.log(pc11.dim(`Searching marketplace for ${event.source}...`));
+      return;
+    case "marketplace-found":
+      console.log(`  Found: ${pc11.bold(event.name)} by ${event.author} (${pc11.dim(event.repo)})`);
+      return;
+    case "catalog-found":
+      console.log(
+        `  Found in catalog: ${pc11.bold(event.name)} v${event.version} (${pc11.dim(event.category)})`
+      );
+      return;
   }
-  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"
-      }
-    };
+function categoryFor(err) {
+  switch (err.code) {
+    case ErrorCodes.NETWORK_ERROR:
+      return ErrorCategories.TRANSIENT;
+    case ErrorCodes.SKILL_NOT_FOUND:
+      return ErrorCategories.NOT_FOUND;
+    case ErrorCodes.SKILL_GATE_UNAVAILABLE:
+      return ErrorCategories.INTERNAL;
+    default:
+      return ErrorCategories.VALIDATION;
   }
-  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
-    };
+function reportRefusal(err, format, operation, mvi) {
+  const scan = err.details.scan;
+  if (format === "json") {
+    if (scan && err.code === ErrorCodes.SKILL_TRUST_GATE_BLOCKED) {
+      const envelope = buildEnvelope(
+        operation,
+        mvi,
+        { scan },
+        {
+          code: err.code,
+          message: err.message,
+          category: categoryFor(err),
+          retryable: false,
+          retryAfterMs: null,
+          details: {
+            verdict: scan.verdict,
+            trustLevel: scan.trustLevel,
+            findingsCount: scan.findings.length
+          }
+        }
+      );
+      console.error(JSON.stringify(envelope, null, 2));
+    } else {
+      const details = {};
+      if (err.details.availableSkills) details.availableSkills = err.details.availableSkills;
+      if (err.details.federation) {
+        details.expectedChecksum = err.details.federation.expectedChecksum;
+        details.computedChecksum = err.details.federation.computedChecksum;
+        details.peer = err.details.federation.peer?.url ?? null;
+      }
+      if (err.details.cause) details.cause = err.details.cause;
+      emitJsonError(operation, mvi, err.code, err.message, categoryFor(err), details);
+    }
   }
-  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) {
-    const msg = err instanceof Error ? err.message : String(err);
-    pushWarning({
-      code: "W_AUDIT_LOG_FAILED",
-      severity: "warn",
-      message: "trust-bypass audit record failed",
-      context: { error: msg }
-    });
+  console.error(pc11.red(err.message));
+  if (scan && err.code === ErrorCodes.SKILL_TRUST_GATE_BLOCKED && format === "human") {
+    for (const f of scan.findings.slice(0, 5)) {
+      console.error(
+        pc11.dim(`  [${f.severity}] ${f.category} ${f.file}:${f.line} \u2014 ${f.description}`)
+      );
+    }
+    console.error(pc11.yellow("  Use --force to override (audited)."));
   }
+  if (err.details.availableSkills && format === "human") {
+    console.log(pc11.dim(`Available skills: ${err.details.availableSkills.join(", ")}`));
+  }
+  process.exit(1);
 }
 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(
@@ -4335,7 +4234,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,
@@ -4360,7 +4259,7 @@ function registerSkillsInstall(parent) {
       if (!source) {
         const message = "Missing required argument: source";
         if (format === "json") {
-          emitError2(
+          emitError(
             operation,
             mvi,
             ErrorCodes.INVALID_INPUT,
@@ -4377,335 +4276,74 @@ function registerSkillsInstall(parent) {
       if (format === "human") {
         console.log(pc11.dim(`Installing to ${providers.length} provider(s)...`));
       }
-      let localPath;
-      let cleanup;
-      let skillName;
-      let sourceValue;
-      let sourceType;
-      if (isMarketplaceScoped(source)) {
-        const sourceResult = await handleMarketplaceSource(
-          source,
+      let result;
+      try {
+        result = await installSkillFromSource(source, {
           providers,
-          opts.global ?? false,
-          format,
-          operation,
-          mvi
-        );
-        if (sourceResult.success) {
-          localPath = sourceResult.localPath;
-          cleanup = sourceResult.cleanup;
-          skillName = sourceResult.skillName;
-          sourceValue = sourceResult.sourceValue;
-          sourceType = sourceResult.sourceType;
-        } else {
-          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) {
-            const message = `Failed to clone GitHub repository: ${formatNetworkError(error)}`;
-            if (format === "json") {
-              emitJsonError(
-                operation,
-                mvi,
-                ErrorCodes.NETWORK_ERROR,
-                message,
-                ErrorCategories.TRANSIENT
-              );
-            }
-            console.error(pc11.red(message));
-            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) {
-            const message = `Failed to clone GitLab repository: ${formatNetworkError(error)}`;
-            if (format === "json") {
-              emitJsonError(
-                operation,
-                mvi,
-                ErrorCodes.NETWORK_ERROR,
-                message,
-                ErrorCategories.TRANSIENT
-              );
-            }
-            console.error(pc11.red(message));
-            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()) {
-            const message = "No skill library registered. Register one with registerSkillLibraryFromPath() or set CAAMP_SKILL_LIBRARY env var.";
-            if (format === "json") {
-              emitJsonError(
-                operation,
-                mvi,
-                ErrorCodes.INVALID_INPUT,
-                message,
-                ErrorCategories.VALIDATION
-              );
-            }
-            console.error(pc11.red(message));
-            process.exit(1);
-          }
-          const catalogSkill = getSkill(parsed.inferredName);
-          if (catalogSkill) {
-            localPath = getSkillDir(catalogSkill.name);
-            skillName = catalogSkill.name;
-            sourceValue = `library:${catalogSkill.name}`;
-            sourceType = "library";
-            if (format === "human") {
-              console.log(
-                `  Found in catalog: ${pc11.bold(catalogSkill.name)} v${catalogSkill.version} (${pc11.dim(catalogSkill.category)})`
-              );
-            }
-          } else {
-            const message = `Skill not found in catalog: ${parsed.inferredName}`;
-            if (format === "json") {
-              emitJsonError(
-                operation,
-                mvi,
-                ErrorCodes.SKILL_NOT_FOUND,
-                message,
-                ErrorCategories.NOT_FOUND,
-                {
-                  availableSkills: listSkills()
-                }
-              );
-            }
-            console.error(pc11.red(message));
-            console.log(pc11.dim("Available skills: " + listSkills().join(", ")));
-            process.exit(1);
-          }
-        } else {
-          const message = `Unsupported source type: ${parsed.type}`;
-          if (format === "json") {
-            emitJsonError(
-              operation,
-              mvi,
-              ErrorCodes.INVALID_FORMAT,
-              message,
-              ErrorCategories.VALIDATION
-            );
-          }
-          console.error(pc11.red(message));
-          process.exit(1);
+          isGlobal: opts.global ?? false,
+          force: opts.force ?? false,
+          allowNewSource: opts.allowNewSource === true,
+          recordLock: true,
+          onProgress: format === "human" ? renderProgress : void 0
+        });
+      } catch (error) {
+        if (error instanceof SkillInstallError) {
+          reportRefusal(error, format, operation, mvi);
         }
+        throw error;
       }
-      try {
-        if (!localPath) {
-          const message = "No local skill path resolved for installation";
-          if (format === "json") {
-            emitJsonError(
-              operation,
-              mvi,
-              ErrorCodes.INTERNAL_ERROR,
-              message,
-              ErrorCategories.INTERNAL
-            );
-          }
-          console.error(pc11.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(pc11.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(pc11.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(pc11.red(`
-${message}`));
-              for (const f of gate.scan.findings.slice(0, 5)) {
-                console.error(
-                  pc11.dim(
-                    `  [${f.severity}] ${f.category} ${f.file}:${f.line} \u2014 ${f.description}`
-                  )
-                );
-              }
-              console.error(pc11.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(pc11.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,
-          providers,
-          opts.global ?? false
-        );
-        if (result.success) {
-          const isGlobal = sourceType === "library" || sourceType === "package" ? true : opts.global ?? false;
-          await recordSkillInstall(
-            skillName,
-            sourceValue,
-            sourceValue,
-            sourceType,
-            result.linkedAgents,
-            result.canonicalPath,
-            isGlobal
-          );
-          const installedItem = {
-            name: skillName,
-            scopedName: sourceValue,
-            canonicalPath: result.canonicalPath,
-            providers: result.linkedAgents
-          };
-          const summary = {
-            installed: [installedItem],
-            failed: [],
-            count: {
-              installed: 1,
-              failed: 0,
-              total: 1
-            }
-          };
-          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(`  Linked to: ${result.linkedAgents.join(", ")}`);
-            if (result.errors.length > 0) {
-              console.log(pc11.yellow("\nWarnings:"));
-              for (const err of result.errors) {
-                console.log(`  ${pc11.yellow("!")} ${err}`);
-              }
-            }
-          }
+      if (result.success) {
+        const installedItem = {
+          name: result.name,
+          scopedName: result.sourceValue,
+          canonicalPath: result.canonicalPath,
+          providers: result.linkedAgents
+        };
+        const summary2 = {
+          installed: [installedItem],
+          failed: [],
+          count: { installed: 1, failed: 0, total: 1 }
+        };
+        if (format === "json") {
+          outputSuccess(operation, mvi, summary2);
         } else {
-          const summary = {
-            installed: [],
-            failed: [
-              {
-                name: skillName,
-                error: result.errors.join(", ")
-              }
-            ],
-            count: {
-              installed: 0,
-              failed: 1,
-              total: 1
-            }
-          };
-          if (format === "json") {
-            const envelope = buildEnvelope(operation, mvi, summary, {
-              code: ErrorCodes.INSTALL_FAILED,
-              message: result.errors.join(", "),
-              category: ErrorCategories.INTERNAL,
-              retryable: false,
-              retryAfterMs: null,
-              details: { skillName, sourceValue }
-            });
-            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(pc11.green(`
+\u2713 Installed ${pc11.bold(result.name)}`));
+          console.log(`  Canonical: ${pc11.dim(result.canonicalPath)}`);
+          console.log(`  Linked to: ${result.linkedAgents.join(", ")}`);
+          if (result.errors.length > 0) {
+            console.log(pc11.yellow("\nWarnings:"));
             for (const err of result.errors) {
               console.log(`  ${pc11.yellow("!")} ${err}`);
             }
           }
-          process.exit(1);
         }
-      } finally {
-        if (cleanup) await cleanup();
+        return;
       }
+      const summary = {
+        installed: [],
+        failed: [{ name: result.name, error: result.errors.join(", ") }],
+        count: { installed: 0, failed: 1, total: 1 }
+      };
+      if (format === "json") {
+        const envelope = buildEnvelope(operation, mvi, summary, {
+          code: ErrorCodes.INSTALL_FAILED,
+          message: result.errors.join(", "),
+          category: ErrorCategories.INTERNAL,
+          retryable: false,
+          retryAfterMs: null,
+          details: { skillName: result.name, sourceValue: result.sourceValue }
+        });
+        console.error(JSON.stringify(envelope, null, 2));
+      } else {
+        console.log(pc11.yellow(`
+\u2717 Failed to install ${pc11.bold(result.name)}`));
+        console.log(pc11.yellow("Errors:"));
+        for (const err of result.errors) {
+          console.log(`  ${pc11.yellow("!")} ${err}`);
+        }
+      }
+      process.exit(1);
     }
   );
 }
@@ -4713,7 +4351,7 @@ 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));
     process.exit(1);
@@ -4747,22 +4385,20 @@ async function handleProfileInstall(profileName, providers, isGlobal, format, op
   const installed = [];
   const failed = [];
   for (const name of profileSkills) {
-    const skillDir = getSkillDir(name);
     try {
-      const result = await dispatchInstallSkillAcrossProviders(skillDir, name, providers, isGlobal);
+      const result = await installResolvedSkill(
+        {
+          localPath: getSkillDir(name),
+          skillName: name,
+          sourceValue: `library:${name}`,
+          sourceType: "library"
+        },
+        { providers, isGlobal, recordLock: true }
+      );
       if (result.success) {
         if (format === "human") {
           console.log(pc11.green(`  + ${name}`));
         }
-        await recordSkillInstall(
-          name,
-          `library:${name}`,
-          `library:${name}`,
-          "library",
-          result.linkedAgents,
-          result.canonicalPath,
-          true
-        );
         installed.push({
           name,
           scopedName: `library:${name}`,
@@ -4823,89 +4459,10 @@ ${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}...`));
-  }
-  const client = new MarketplaceClient();
-  let skill;
-  try {
-    skill = await client.getSkill(source);
-  } catch (error) {
-    const message = `Marketplace lookup failed: ${formatNetworkError(error)}`;
-    if (format === "json") {
-      emitJsonError(operation, mvi, ErrorCodes.NETWORK_ERROR, message, ErrorCategories.TRANSIENT);
-    }
-    console.error(pc11.red(message));
-    return { success: false };
-  }
-  if (!skill) {
-    const message = `Skill not found: ${source}`;
-    if (format === "json") {
-      emitJsonError(operation, mvi, ErrorCodes.SKILL_NOT_FOUND, message, ErrorCategories.NOT_FOUND);
-    }
-    console.error(pc11.red(message));
-    return { success: false };
-  }
-  if (format === "human") {
-    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) {
-    const message = "Could not resolve GitHub source";
-    if (format === "json") {
-      emitJsonError(operation, mvi, ErrorCodes.INVALID_FORMAT, message, ErrorCategories.VALIDATION);
-    }
-    console.error(pc11.red(message));
-    return { success: false };
-  }
-  try {
-    const subPathCandidates = buildSkillSubPathCandidates(skill.path, parsed.path);
-    let cloneError;
-    let cloned = false;
-    let localPath;
-    let cleanup;
-    for (const subPath of subPathCandidates) {
-      try {
-        const result = await cloneRepo(parsed.owner, parsed.repo, parsed.ref, subPath);
-        if (subPath && !existsSync11(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");
-    }
-    return {
-      success: true,
-      localPath,
-      cleanup,
-      skillName: skill.name,
-      sourceValue: skill.githubUrl,
-      sourceType: parsed.type
-    };
-  } catch (error) {
-    const message = `Failed to fetch source repository: ${formatNetworkError(error)}`;
-    if (format === "json") {
-      emitJsonError(operation, mvi, ErrorCodes.NETWORK_ERROR, message, ErrorCategories.TRANSIENT);
-    }
-    console.error(pc11.red(message));
-    return { success: false };
-  }
-}
 
 // src/commands/skills/list.ts
-import { randomUUID as randomUUID5 } from "crypto";
-import { resolveOutputFormat as resolveOutputFormat4 } from "@cleocode/lafs";
+import { randomUUID as randomUUID4 } from "crypto";
+import { resolveOutputFormat as resolveOutputFormat3 } from "@cleocode/lafs";
 import pc12 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) => {
@@ -4913,7 +4470,7 @@ function registerSkillsList(parent) {
     const mvi = "standard";
     let format;
     try {
-      format = resolveOutputFormat4({
+      format = resolveOutputFormat3({
         jsonFlag: opts.json ?? false,
         humanFlag: (opts.human ?? false) || isHuman(),
         projectDefault: "json"
@@ -4986,7 +4543,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,
@@ -5243,12 +4800,14 @@ ${outdated.length} skill(s) have updates available:
             skipped.push(skill.name);
             continue;
           }
-          const installResult = await dispatchInstallSkillAcrossProviders(
-            localPath,
-            skill.name,
-            providers,
-            entry.isGlobal,
-            entry.projectDir
+          const installResult = await installResolvedSkill(
+            {
+              localPath,
+              skillName: skill.name,
+              sourceValue: entry.source,
+              sourceType: parsed.type
+            },
+            { providers, isGlobal: entry.isGlobal, projectDir: entry.projectDir }
           );
           if (installResult.success) {
             await recordSkillInstall(
@@ -5312,7 +4871,7 @@ ${outdated.length} skill(s) have updates available:
 }
 
 // src/commands/skills/validate.ts
-import { resolveOutputFormat as resolveOutputFormat5 } from "@cleocode/lafs";
+import { resolveOutputFormat as resolveOutputFormat4 } from "@cleocode/lafs";
 import pc15 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) => {
@@ -5320,7 +4879,7 @@ function registerSkillsValidate(parent) {
     const mvi = "standard";
     let format;
     try {
-      format = resolveOutputFormat5({
+      format = resolveOutputFormat4({
         jsonFlag: opts.json ?? false,
         humanFlag: (opts.human ?? false) || isHuman(),
         projectDefault: "json"