@cleocode/caamp 1.0.3 → 1.0.5

package/dist/cli.js

@@ -34,6 +34,7 @@ import {
   isCatalogAvailable,
   isHuman,
   isMarketplaceScoped,
+  isQuiet,
   isVerbose,
   listCanonicalSkills,
   listMcpServers,
@@ -64,7 +65,7 @@ import {
   tokenizeCriteriaValue,
   updateInstructionsSingleOperation,
   validateSkill
-} from "./chunk-PBHH6KMJ.js";
+} from "./chunk-HUMRYJPE.js";
 
 // src/cli.ts
 import { Command } from "commander";
@@ -714,40 +715,188 @@ function registerAdvancedCommands(program2) {
 }
 
 // src/commands/config.ts
-import pc from "picocolors";
 import { existsSync } from "fs";
+import pc from "picocolors";
+
+// src/core/lafs.ts
+import { randomUUID as randomUUID2 } from "crypto";
+import { resolveOutputFormat } from "@cleocode/lafs-protocol";
+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").action(async (providerId, opts) => {
+  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(async (providerId, opts) => {
+    const operation = "config.show";
+    const mvi = "standard";
+    let format;
+    try {
+      format = resolveFormat({
+        jsonFlag: opts.json ?? false,
+        humanFlag: opts.human ?? false,
+        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);
+    }
     const provider = getProvider(providerId);
     if (!provider) {
-      console.error(pc.red(`Provider not found: ${providerId}`));
+      const message = `Provider not found: ${providerId}`;
+      if (format === "json") {
+        emitJsonError(operation, mvi, ErrorCodes.PROVIDER_NOT_FOUND, message, ErrorCategories.NOT_FOUND, {
+          providerId
+        });
+      } else {
+        console.error(pc.red(message));
+      }
       process.exit(1);
     }
-    const configPath = resolveProviderConfigPath(
-      provider,
-      opts.global ? "global" : "project"
-    ) ?? provider.configPathGlobal;
+    const scope = opts.global ? "global" : "project";
+    const configPath = resolveProviderConfigPath(provider, scope) ?? provider.configPathGlobal;
     if (!existsSync(configPath)) {
-      console.log(pc.dim(`No config file at: ${configPath}`));
-      return;
+      const message = `No config file at: ${configPath}`;
+      if (format === "json") {
+        emitJsonError(operation, mvi, ErrorCodes.FILE_NOT_FOUND, message, ErrorCategories.NOT_FOUND, {
+          configPath,
+          scope
+        });
+      } else {
+        console.log(pc.dim(message));
+      }
+      process.exit(1);
     }
     try {
       const data = await readConfig(configPath, provider.configFormat);
-      if (opts.json) {
-        console.log(JSON.stringify(data, null, 2));
-      } else {
-        console.log(pc.bold(`
+      if (format === "json") {
+        outputSuccess(operation, mvi, {
+          provider: provider.id,
+          config: data,
+          format: provider.configFormat,
+          scope
+        });
+        return;
+      }
+      console.log(pc.bold(`
 ${provider.toolName} config (${configPath}):
 `));
-        console.log(JSON.stringify(data, null, 2));
-      }
+      console.log(JSON.stringify(data, null, 2));
     } catch (err) {
-      console.error(pc.red(`Error reading config: ${err instanceof Error ? err.message : String(err)}`));
+      const message = `Error reading config: ${err instanceof Error ? err.message : String(err)}`;
+      if (format === "json") {
+        emitJsonError(operation, mvi, ErrorCodes.FILE_SYSTEM_ERROR, message, ErrorCategories.INTERNAL);
+      } else {
+        console.error(pc.red(message));
+      }
       process.exit(1);
     }
   });
-  config.command("path").description("Show config file path").argument("<provider>", "Provider ID or alias").argument("[scope]", "Scope: project (default) or global", "project").action((providerId, scope) => {
+  config.command("path").description("Show config file path (outputs raw path for piping)").argument("<provider>", "Provider ID or alias").argument("[scope]", "Scope: project (default) or global", "project").action((providerId, scope) => {
     const provider = getProvider(providerId);
     if (!provider) {
       console.error(pc.red(`Provider not found: ${providerId}`));
@@ -768,11 +917,11 @@ ${provider.toolName} config (${configPath}):
 }
 
 // src/commands/doctor.ts
-import pc2 from "picocolors";
 import { execFileSync } from "child_process";
-import { existsSync as existsSync2, readdirSync, lstatSync, readlinkSync } from "fs";
+import { existsSync as existsSync2, lstatSync, readdirSync, readlinkSync } from "fs";
 import { homedir } from "os";
 import { join as join2 } from "path";
+import pc2 from "picocolors";
 
 // src/core/version.ts
 import { readFileSync } from "fs";
@@ -1064,57 +1213,181 @@ function formatSection(section) {
   return lines.join("\n");
 }
 function registerDoctorCommand(program2) {
-  program2.command("doctor").description("Diagnose configuration issues and health").option("--json", "Output as JSON").action(async (opts) => {
-    const sections = [];
-    sections.push(checkEnvironment());
-    sections.push(checkRegistry());
-    sections.push(checkInstalledProviders());
-    sections.push(checkSkillSymlinks());
-    sections.push(await checkLockFile());
-    sections.push(await checkConfigFiles());
-    let passed = 0;
-    let warnings = 0;
-    let errors = 0;
-    for (const section of sections) {
-      for (const check of section.checks) {
-        if (check.status === "pass") passed++;
-        else if (check.status === "warn") warnings++;
-        else errors++;
-      }
-    }
-    if (opts.json) {
-      const output = {
-        version: getCaampVersion(),
-        sections: sections.map((s) => ({
-          name: s.name,
-          checks: s.checks
-        })),
-        summary: { passed, warnings, errors }
-      };
-      console.log(JSON.stringify(output, null, 2));
-      return;
+  program2.command("doctor").description("Diagnose configuration issues and health").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
+    const operation = "doctor.check";
+    const mvi = "standard";
+    let format;
+    try {
+      format = resolveFormat({
+        jsonFlag: opts.json ?? false,
+        humanFlag: opts.human ?? false,
+        projectDefault: "json"
+      });
+    } catch (error) {
+      handleFormatError(error, operation, mvi, opts.json);
     }
-    console.log(pc2.bold("\ncaamp doctor\n"));
-    for (const section of sections) {
-      console.log(formatSection(section));
+    try {
+      const sections = [];
+      sections.push(checkEnvironment());
+      sections.push(checkRegistry());
+      sections.push(checkInstalledProviders());
+      sections.push(checkSkillSymlinks());
+      sections.push(await checkLockFile());
+      sections.push(await checkConfigFiles());
+      let passed = 0;
+      let warnings = 0;
+      let errors = 0;
+      for (const section of sections) {
+        for (const check of section.checks) {
+          if (check.status === "pass") passed++;
+          else if (check.status === "warn") warnings++;
+          else errors++;
+        }
+      }
+      const npmVersion = getNpmVersion() ?? "not found";
+      const allProviders = getAllProviders();
+      const malformedCount = allProviders.filter(
+        (p) => !p.id || !p.toolName || !p.configKey || !p.configFormat
+      ).length;
+      const detectionResults = detectAllProviders();
+      const installedProviders = detectionResults.filter((r) => r.installed);
+      const { canonicalCount, brokenCount, staleCount } = countSkillIssues();
+      const result = {
+        environment: {
+          node: getNodeVersion(),
+          npm: npmVersion,
+          caamp: getCaampVersion(),
+          platform: `${process.platform} ${process.arch}`
+        },
+        registry: {
+          loaded: true,
+          count: getProviderCount(),
+          valid: malformedCount === 0
+        },
+        providers: {
+          installed: installedProviders.length,
+          list: installedProviders.map((r) => r.provider.id)
+        },
+        skills: {
+          canonical: canonicalCount,
+          brokenLinks: brokenCount,
+          staleLinks: staleCount
+        },
+        checks: sections.flatMap(
+          (s) => s.checks.map((c) => ({
+            label: `${s.name}: ${c.label}`,
+            status: c.status,
+            message: c.detail
+          }))
+        )
+      };
+      if (format === "json") {
+        outputSuccess(operation, mvi, result);
+        if (errors > 0) {
+          process.exit(1);
+        }
+        return;
+      }
+      console.log(pc2.bold("\ncaamp doctor\n"));
+      for (const section of sections) {
+        console.log(formatSection(section));
+        console.log();
+      }
+      const parts = [];
+      parts.push(pc2.green(`${passed} checks passed`));
+      if (warnings > 0) parts.push(pc2.yellow(`${warnings} warning${warnings !== 1 ? "s" : ""}`));
+      if (errors > 0) parts.push(pc2.red(`${errors} error${errors !== 1 ? "s" : ""}`));
+      console.log(`  ${pc2.bold("Summary")}: ${parts.join(", ")}`);
       console.log();
-    }
-    const parts = [];
-    parts.push(pc2.green(`${passed} checks passed`));
-    if (warnings > 0) parts.push(pc2.yellow(`${warnings} warning${warnings !== 1 ? "s" : ""}`));
-    if (errors > 0) parts.push(pc2.red(`${errors} error${errors !== 1 ? "s" : ""}`));
-    console.log(`  ${pc2.bold("Summary")}: ${parts.join(", ")}`);
-    console.log();
-    if (errors > 0) {
+      if (errors > 0) {
+        process.exit(1);
+      }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      if (format === "json") {
+        emitJsonError(
+          operation,
+          mvi,
+          ErrorCodes.INTERNAL_ERROR,
+          message,
+          ErrorCategories.INTERNAL
+        );
+      } else {
+        console.error(pc2.red(`Error: ${message}`));
+      }
       process.exit(1);
     }
   });
 }
+function countSkillIssues() {
+  const canonicalDir = CANONICAL_SKILLS_DIR;
+  let canonicalCount = 0;
+  if (existsSync2(canonicalDir)) {
+    try {
+      const names = readdirSync(canonicalDir).filter((name) => {
+        const full = join2(canonicalDir, name);
+        try {
+          const stat = lstatSync(full);
+          return stat.isDirectory() || stat.isSymbolicLink();
+        } catch {
+          return false;
+        }
+      });
+      canonicalCount = names.length;
+    } catch {
+    }
+  }
+  let brokenCount = 0;
+  let staleCount = 0;
+  const results = detectAllProviders();
+  const installed = results.filter((r) => r.installed);
+  for (const r of installed) {
+    const provider = r.provider;
+    const skillDir = provider.pathSkills;
+    if (!existsSync2(skillDir)) continue;
+    try {
+      const entries = readdirSync(skillDir);
+      for (const entry of entries) {
+        const fullPath = join2(skillDir, entry);
+        try {
+          const stat = lstatSync(fullPath);
+          if (!stat.isSymbolicLink()) continue;
+          if (!existsSync2(fullPath)) {
+            brokenCount++;
+          } else {
+            const target = readlinkSync(fullPath);
+            const isCanonical = target.includes("/.agents/skills/") || target.includes("\\.agents\\skills\\");
+            if (!isCanonical) {
+              staleCount++;
+            }
+          }
+        } catch {
+        }
+      }
+    } catch {
+    }
+  }
+  return { canonicalCount, brokenCount, staleCount };
+}
 
 // src/commands/instructions/inject.ts
 import pc3 from "picocolors";
 function registerInstructionsInject(parent) {
-  parent.command("inject").description("Inject instruction blocks into all provider files").option("-a, --agent <name>", "Target specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Inject into global instruction files").option("--content <text>", "Custom content to inject").option("--dry-run", "Preview without writing").option("--all", "Target all known providers").action(async (opts) => {
+  parent.command("inject").description("Inject instruction blocks into all provider files").option("-a, --agent <name>", "Target specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Inject into global instruction files").option("--content <text>", "Custom content to inject").option("--dry-run", "Preview without writing").option("--all", "Target all known providers").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
+    const operation = "instructions.inject";
+    const mvi = "standard";
+    let format;
+    try {
+      format = resolveFormat({
+        jsonFlag: opts.json ?? false,
+        humanFlag: opts.human ?? false,
+        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);
+    }
     let providers;
     if (opts.all) {
       providers = getAllProviders();
@@ -1124,36 +1397,80 @@ function registerInstructionsInject(parent) {
       providers = getInstalledProviders();
     }
     if (providers.length === 0) {
-      console.error(pc3.red("No providers found."));
+      const message = "No providers found.";
+      if (format === "json") {
+        emitJsonError(operation, mvi, ErrorCodes.PROVIDER_NOT_FOUND, message, ErrorCategories.NOT_FOUND);
+      } else {
+        console.error(pc3.red(message));
+      }
       process.exit(1);
     }
     const content = opts.content ?? generateInjectionContent();
     const scope = opts.global ? "global" : "project";
     const groups = groupByInstructFile(providers);
     if (opts.dryRun) {
-      console.log(pc3.bold("Dry run - would inject into:\n"));
-      for (const [file, group] of groups) {
-        console.log(`  ${pc3.bold(file)}: ${group.map((p) => p.id).join(", ")}`);
-      }
-      console.log(pc3.dim(`
+      if (format === "json") {
+        outputSuccess(operation, mvi, {
+          injected: [],
+          providers: providers.map((p) => p.id),
+          count: 0,
+          dryRun: true,
+          wouldInject: Array.from(groups.entries()).map(([file, group]) => ({
+            file,
+            providers: group.map((p) => p.id)
+          }))
+        });
+      } else {
+        console.log(pc3.bold("Dry run - would inject into:\n"));
+        for (const [file, group] of groups) {
+          console.log(`  ${pc3.bold(file)}: ${group.map((p) => p.id).join(", ")}`);
+        }
+        console.log(pc3.dim(`
   Scope: ${scope}`));
-      console.log(pc3.dim(`  Content length: ${content.length} chars`));
+        console.log(pc3.dim(`  Content length: ${content.length} chars`));
+      }
       return;
     }
     const results = await injectAll(providers, process.cwd(), scope, content);
-    for (const [file, action] of results) {
-      const icon = action === "created" ? pc3.green("+") : action === "updated" ? pc3.yellow("~") : pc3.blue("^");
-      console.log(`  ${icon} ${file} (${action})`);
+    const injected = [];
+    for (const [file] of results) {
+      injected.push(file);
     }
-    console.log(pc3.bold(`
+    if (format === "json") {
+      outputSuccess(operation, mvi, {
+        injected,
+        providers: providers.map((p) => p.id),
+        count: results.size
+      });
+    } else {
+      for (const [file, action] of results) {
+        const icon = action === "created" ? pc3.green("+") : action === "updated" ? pc3.yellow("~") : pc3.blue("^");
+        console.log(`  ${icon} ${file} (${action})`);
+      }
+      console.log(pc3.bold(`
 ${results.size} file(s) processed.`));
+    }
   });
 }
 
 // src/commands/instructions/check.ts
 import pc4 from "picocolors";
 function registerInstructionsCheck(parent) {
-  parent.command("check").description("Check injection status across providers").option("-a, --agent <name>", "Check specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Check global instruction files").option("--json", "Output as JSON").option("--all", "Check all known providers").action(async (opts) => {
+  parent.command("check").description("Check injection status across providers").option("-a, --agent <name>", "Check specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Check global instruction files").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").option("--all", "Check all known providers").action(async (opts) => {
+    const operation = "instructions.check";
+    const mvi = "standard";
+    let format;
+    try {
+      format = resolveFormat({
+        jsonFlag: opts.json ?? false,
+        humanFlag: opts.human ?? false,
+        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);
+    }
     let providers;
     if (opts.all) {
       providers = getAllProviders();
@@ -1164,8 +1481,19 @@ function registerInstructionsCheck(parent) {
     }
     const scope = opts.global ? "global" : "project";
     const results = await checkAllInjections(providers, process.cwd(), scope);
-    if (opts.json) {
-      console.log(JSON.stringify(results, null, 2));
+    const providerStatus = results.map((r) => ({
+      id: r.provider,
+      present: r.status === "current" || r.status === "outdated",
+      path: r.file
+    }));
+    const present = providerStatus.filter((p) => p.present).length;
+    const missing = providerStatus.filter((p) => !p.present).length;
+    if (format === "json") {
+      outputSuccess(operation, mvi, {
+        providers: providerStatus,
+        present,
+        missing
+      });
       return;
     }
     console.log(pc4.bold(`
@@ -1201,30 +1529,67 @@ Instruction file status (${scope}):
 // src/commands/instructions/update.ts
 import pc5 from "picocolors";
 function registerInstructionsUpdate(parent) {
-  parent.command("update").description("Update all instruction file injections").option("-g, --global", "Update global instruction files").option("-y, --yes", "Skip confirmation").action(async (opts) => {
+  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";
+    const mvi = "standard";
+    let format;
+    try {
+      format = resolveFormat({
+        jsonFlag: opts.json ?? false,
+        humanFlag: opts.human ?? false,
+        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);
+    }
     const providers = getInstalledProviders();
     const scope = opts.global ? "global" : "project";
     const content = generateInjectionContent();
     const checks = await checkAllInjections(providers, process.cwd(), scope, content);
     const needsUpdate = checks.filter((c) => c.status !== "current");
     if (needsUpdate.length === 0) {
-      console.log(pc5.green("All instruction files are up to date."));
+      if (format === "json") {
+        outputSuccess(operation, mvi, {
+          updated: [],
+          failed: [],
+          count: { updated: 0, failed: 0 }
+        });
+      } else {
+        console.log(pc5.green("All instruction files are up to date."));
+      }
       return;
     }
-    console.log(pc5.bold(`${needsUpdate.length} file(s) need updating:
+    if (format === "human") {
+      console.log(pc5.bold(`${needsUpdate.length} file(s) need updating:
 `));
-    for (const c of needsUpdate) {
-      console.log(`  ${c.file} (${c.status})`);
+      for (const c of needsUpdate) {
+        console.log(`  ${c.file} (${c.status})`);
+      }
     }
     const providerIds = new Set(needsUpdate.map((c) => c.provider));
     const toUpdate = providers.filter((p) => providerIds.has(p.id));
     const results = await injectAll(toUpdate, process.cwd(), scope, content);
-    console.log();
-    for (const [file, action] of results) {
-      console.log(`  ${pc5.green("\u2713")} ${file} (${action})`);
+    const updated = [];
+    for (const [file] of results) {
+      updated.push(file);
     }
-    console.log(pc5.bold(`
+    if (format === "human") {
+      console.log();
+      for (const [file, action] of results) {
+        console.log(`  ${pc5.green("\u2713")} ${file} (${action})`);
+      }
+      console.log(pc5.bold(`
 ${results.size} file(s) updated.`));
+    }
+    if (format === "json") {
+      outputSuccess(operation, mvi, {
+        updated,
+        failed: [],
+        count: { updated: updated.length, failed: 0 }
+      });
+    }
   });
 }
 
@@ -1239,7 +1604,21 @@ function registerInstructionsCommands(program2) {
 // src/commands/mcp/install.ts
 import pc6 from "picocolors";
 function registerMcpInstall(parent) {
-  parent.command("install").description("Install MCP server to agent configs").argument("<source>", "MCP server source (URL, npm package, or command)").option("-a, --agent <name>", "Target specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Install to global/user config").option("-n, --name <name>", "Override inferred server name").option("-t, --transport <type>", "Transport type: http (default) or sse", "http").option("--header <header>", "HTTP header (Key: Value)", (v, prev) => [...prev, v], []).option("-y, --yes", "Skip confirmation").option("--all", "Install to all detected agents").option("--dry-run", "Preview without writing").action(async (source, opts) => {
+  parent.command("install").description("Install MCP server to agent configs").argument("<source>", "MCP server source (URL, npm package, or command)").option("-a, --agent <name>", "Target specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Install to global/user config").option("-n, --name <name>", "Override inferred server name").option("-t, --transport <type>", "Transport type: http (default) or sse", "http").option("--header <header>", "HTTP header (Key: Value)", (v, prev) => [...prev, v], []).option("-y, --yes", "Skip confirmation").option("--all", "Install to all detected agents").option("--dry-run", "Preview without writing").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (source, opts) => {
+    const operation = "mcp.install";
+    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);
+    }
     const parsed = parseSource(source);
     const serverName = opts.name ?? parsed.inferredName;
     const headers = {};
@@ -1259,34 +1638,55 @@ function registerMcpInstall(parent) {
       providers = getInstalledProviders();
     }
     if (providers.length === 0) {
-      console.error(pc6.red("No target providers found."));
+      const message = "No target providers found.";
+      if (format === "json") {
+        emitJsonError(operation, mvi, ErrorCodes.PROVIDER_NOT_FOUND, message, ErrorCategories.NOT_FOUND);
+      } else {
+        console.error(pc6.red(message));
+      }
       process.exit(1);
     }
     const scope = opts.global ? "global" : "project";
     if (opts.dryRun) {
-      console.log(pc6.bold("Dry run - would install:"));
-      console.log(`  Server: ${pc6.bold(serverName)}`);
-      console.log(`  Config: ${JSON.stringify(config, null, 2)}`);
-      console.log(`  Scope: ${scope}`);
-      console.log(`  Providers: ${providers.map((p) => p.id).join(", ")}`);
+      if (format === "json") {
+        outputSuccess(operation, mvi, {
+          installed: [{
+            name: serverName,
+            providers: providers.map((p) => p.id),
+            config
+          }],
+          dryRun: true
+        });
+      } else {
+        console.log(pc6.bold("Dry run - would install:"));
+        console.log(`  Server: ${pc6.bold(serverName)}`);
+        console.log(`  Config: ${JSON.stringify(config, null, 2)}`);
+        console.log(`  Scope: ${scope}`);
+        console.log(`  Providers: ${providers.map((p) => p.id).join(", ")}`);
+      }
       return;
     }
-    console.log(pc6.dim(`Installing "${serverName}" to ${providers.length} provider(s)...
+    if (format === "human") {
+      console.log(pc6.dim(`Installing "${serverName}" to ${providers.length} provider(s)...
 `));
+    }
     const results = await installMcpServerToAll(
       providers,
       serverName,
       config,
       scope
     );
-    for (const r of results) {
-      if (r.success) {
-        console.log(`  ${pc6.green("\u2713")} ${r.provider.toolName.padEnd(22)} ${pc6.dim(r.configPath)}`);
-      } else {
-        console.log(`  ${pc6.red("\u2717")} ${r.provider.toolName.padEnd(22)} ${pc6.red(r.error ?? "failed")}`);
+    const succeeded = results.filter((r) => r.success);
+    const failed = results.filter((r) => !r.success);
+    if (format === "human") {
+      for (const r of results) {
+        if (r.success) {
+          console.log(`  ${pc6.green("\u2713")} ${r.provider.toolName.padEnd(22)} ${pc6.dim(r.configPath)}`);
+        } else {
+          console.log(`  ${pc6.red("\u2717")} ${r.provider.toolName.padEnd(22)} ${pc6.red(r.error ?? "failed")}`);
+        }
       }
     }
-    const succeeded = results.filter((r) => r.success);
     if (succeeded.length > 0) {
       await recordMcpInstall(
         serverName,
@@ -1296,15 +1696,40 @@ function registerMcpInstall(parent) {
         opts.global ?? false
       );
     }
-    console.log(pc6.bold(`
+    if (format === "json") {
+      outputSuccess(operation, mvi, {
+        installed: succeeded.map((r) => ({
+          name: serverName,
+          providers: [r.provider.id],
+          config
+        })),
+        dryRun: false
+      });
+    } else {
+      console.log(pc6.bold(`
 ${succeeded.length}/${results.length} providers configured.`));
+    }
   });
 }
 
 // src/commands/mcp/remove.ts
 import pc7 from "picocolors";
 function registerMcpRemove(parent) {
-  parent.command("remove").description("Remove MCP server from agent configs").argument("<name>", "MCP server name to remove").option("-a, --agent <name>", "Target specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Remove from global config").option("--all", "Remove from all detected agents").action(async (name, opts) => {
+  parent.command("remove").description("Remove MCP server from agent configs").argument("<name>", "MCP server name to remove").option("-a, --agent <name>", "Target specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Remove from global config").option("--all", "Remove from all detected agents").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (name, opts) => {
+    const operation = "mcp.remove";
+    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);
+    }
     let providers;
     if (opts.all) {
       providers = getInstalledProviders();
@@ -1313,21 +1738,45 @@ function registerMcpRemove(parent) {
     } else {
       providers = getInstalledProviders();
     }
+    if (providers.length === 0) {
+      const message = "No target providers found.";
+      if (format === "json") {
+        emitJsonError(operation, mvi, ErrorCodes.PROVIDER_NOT_FOUND, message, ErrorCategories.NOT_FOUND);
+      } else {
+        console.error(pc7.red(message));
+      }
+      process.exit(1);
+    }
     const scope = opts.global ? "global" : "project";
-    let removed = 0;
+    const removed = [];
+    const notFound = [];
     for (const provider of providers) {
       const success = await removeMcpServer(provider, name, scope);
       if (success) {
-        console.log(`  ${pc7.green("\u2713")} Removed from ${provider.toolName}`);
-        removed++;
+        removed.push(provider.id);
+        if (format === "human") {
+          console.log(`  ${pc7.green("\u2713")} Removed from ${provider.toolName}`);
+        }
+      } else {
+        notFound.push(provider.id);
       }
     }
-    if (removed > 0) {
+    if (removed.length > 0) {
       await removeMcpFromLock(name);
-      console.log(pc7.green(`
-\u2713 Removed "${name}" from ${removed} provider(s).`));
+    }
+    if (format === "json") {
+      outputSuccess(operation, mvi, {
+        removed,
+        providers: removed,
+        notFound: notFound.length > 0 ? notFound : void 0
+      });
     } else {
-      console.log(pc7.yellow(`Server "${name}" not found in any provider config.`));
+      if (removed.length > 0) {
+        console.log(pc7.green(`
+\u2713 Removed "${name}" from ${removed.length} provider(s).`));
+      } else {
+        console.log(pc7.yellow(`Server "${name}" not found in any provider config.`));
+      }
     }
   });
 }
@@ -1335,20 +1784,51 @@ function registerMcpRemove(parent) {
 // src/commands/mcp/list.ts
 import pc8 from "picocolors";
 function registerMcpList(parent) {
-  parent.command("list").description("List configured MCP servers").option("-a, --agent <name>", "List for specific agent").option("-g, --global", "List global config").option("--json", "Output as JSON").action(async (opts) => {
+  parent.command("list").description("List configured MCP servers").option("-a, --agent <name>", "List for specific agent").option("-g, --global", "List global config").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
+    const operation = "mcp.list";
+    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);
+    }
     const providers = opts.agent ? [getProvider(opts.agent)].filter((p) => p !== void 0) : getInstalledProviders();
+    if (opts.agent && providers.length === 0) {
+      const message = `Provider not found: ${opts.agent}`;
+      if (format === "json") {
+        emitJsonError(operation, mvi, ErrorCodes.PROVIDER_NOT_FOUND, message, ErrorCategories.NOT_FOUND, {
+          agent: opts.agent
+        });
+      } else {
+        console.error(pc8.red(message));
+      }
+      process.exit(1);
+    }
     const allEntries = [];
     for (const provider of providers) {
       const scope = resolvePreferredConfigScope(provider, opts.global);
       const entries = await listMcpServers(provider, scope);
-      allEntries.push(...entries);
-    }
-    if (opts.json) {
-      console.log(JSON.stringify(allEntries.map((e) => ({
-        provider: e.providerId,
-        name: e.name,
-        config: e.config
-      })), null, 2));
+      for (const entry of entries) {
+        allEntries.push({
+          name: entry.name,
+          command: typeof entry.config.command === "string" ? entry.config.command : void 0,
+          scope
+        });
+      }
+    }
+    if (format === "json") {
+      outputSuccess(operation, mvi, {
+        servers: allEntries,
+        count: allEntries.length,
+        scope: opts.global ? "global" : opts.agent ? `agent:${opts.agent}` : "project"
+      });
       return;
     }
     if (allEntries.length === 0) {
@@ -1359,45 +1839,70 @@ function registerMcpList(parent) {
 ${allEntries.length} MCP server(s) configured:
 `));
     for (const entry of allEntries) {
-      console.log(`  ${pc8.bold(entry.name.padEnd(25))} ${pc8.dim(entry.providerId)}`);
+      const scopeIndicator = entry.scope === "global" ? pc8.dim("[G] ") : pc8.dim("[P] ");
+      console.log(`  ${scopeIndicator}${pc8.bold(entry.name.padEnd(25))} ${entry.command ? pc8.dim(entry.command) : ""}`);
     }
     console.log();
+    console.log(pc8.dim("G = global config, P = project config"));
+    console.log();
   });
 }
 
 // src/commands/mcp/detect.ts
-import pc9 from "picocolors";
 import { existsSync as existsSync3 } from "fs";
+import pc9 from "picocolors";
 function registerMcpDetect(parent) {
-  parent.command("detect").description("Auto-detect installed MCP tools and their configurations").option("--json", "Output as JSON").action(async (opts) => {
+  parent.command("detect").description("Auto-detect installed MCP tools and their configurations").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
+    const operation = "mcp.detect";
+    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);
+    }
     const providers = getInstalledProviders();
-    const detected = [];
+    const providersResult = [];
+    let totalConfigs = 0;
     for (const provider of providers) {
       const globalPath = resolveConfigPath(provider, "global");
       const projectPath = resolveConfigPath(provider, "project");
       const globalEntries = await listMcpServers(provider, "global");
       const projectEntries = await listMcpServers(provider, "project");
-      detected.push({
-        provider: provider.id,
-        hasGlobalConfig: globalPath !== null && existsSync3(globalPath),
-        hasProjectConfig: projectPath !== null && existsSync3(projectPath),
-        globalServers: globalEntries.map((e) => e.name),
-        projectServers: projectEntries.map((e) => e.name)
+      const configsFound = (globalPath && existsSync3(globalPath) ? 1 : 0) + (projectPath && existsSync3(projectPath) ? 1 : 0);
+      totalConfigs += configsFound;
+      const allServers = [...globalEntries.map((e) => e.name), ...projectEntries.map((e) => e.name)];
+      providersResult.push({
+        id: provider.id,
+        configsFound,
+        servers: allServers
       });
     }
-    if (opts.json) {
-      console.log(JSON.stringify(detected, null, 2));
+    if (format === "json") {
+      outputSuccess(operation, mvi, {
+        providers: providersResult,
+        totalConfigs
+      });
       return;
     }
     console.log(pc9.bold(`
-${detected.length} provider(s) with MCP support:
+${providers.length} provider(s) with MCP support:
 `));
-    for (const d of detected) {
-      const globalIcon = d.hasGlobalConfig ? pc9.green("G") : pc9.dim("-");
-      const projectIcon = d.hasProjectConfig ? pc9.green("P") : pc9.dim("-");
-      const servers = [...d.globalServers, ...d.projectServers];
-      const serverList = servers.length > 0 ? pc9.dim(servers.join(", ")) : pc9.dim("no servers");
-      console.log(`  [${globalIcon}${projectIcon}] ${pc9.bold(d.provider.padEnd(20))} ${serverList}`);
+    for (const provider of providersResult) {
+      const globalPath = resolveConfigPath(providers.find((p) => p.id === provider.id), "global");
+      const projectPath = resolveConfigPath(providers.find((p) => p.id === provider.id), "project");
+      const hasGlobal = globalPath && existsSync3(globalPath);
+      const hasProject = projectPath && existsSync3(projectPath);
+      const globalIcon = hasGlobal ? pc9.green("G") : pc9.dim("-");
+      const projectIcon = hasProject ? pc9.green("P") : pc9.dim("-");
+      const serverList = provider.servers.length > 0 ? pc9.dim(provider.servers.join(", ")) : pc9.dim("no servers");
+      console.log(`  [${globalIcon}${projectIcon}] ${pc9.bold(provider.id.padEnd(20))} ${serverList}`);
     }
     console.log(pc9.dim("\nG = global config, P = project config"));
     console.log();
@@ -1414,13 +1919,40 @@ function registerMcpCommands(program2) {
 }
 
 // src/commands/providers.ts
+import { randomUUID as randomUUID3 } from "crypto";
+import { resolveOutputFormat as resolveOutputFormat2 } from "@cleocode/lafs-protocol";
 import pc10 from "picocolors";
 function registerProvidersCommand(program2) {
   const providers = program2.command("providers").description("Manage AI agent providers");
-  providers.command("list").description("List all supported providers").option("--json", "Output as JSON").option("--tier <tier>", "Filter by priority tier (high, medium, low)").action(async (opts) => {
+  providers.command("list").description("List all supported providers").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").option("--tier <tier>", "Filter by priority tier (high, medium, low)").action(async (opts) => {
+    const operation = "providers.list";
+    const mvi = "standard";
+    let format;
+    try {
+      format = resolveOutputFormat2({
+        jsonFlag: opts.json ?? false,
+        humanFlag: (opts.human ?? false) || isHuman(),
+        projectDefault: "json"
+      }).format;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      emitJsonError2(operation, mvi, "E_FORMAT_CONFLICT", message, "VALIDATION");
+      process.exit(1);
+    }
     const all = opts.tier ? getProvidersByPriority(opts.tier) : getAllProviders();
-    if (opts.json) {
-      console.log(JSON.stringify(all, null, 2));
+    if (format === "json") {
+      const envelope = buildEnvelope4(
+        operation,
+        mvi,
+        {
+          providers: all,
+          count: all.length,
+          version: getRegistryVersion(),
+          tier: opts.tier || null
+        },
+        null
+      );
+      console.log(JSON.stringify(envelope, null, 2));
       return;
     }
     console.log(pc10.bold(`
@@ -1440,16 +1972,43 @@ CAMP Provider Registry v${getRegistryVersion()}`));
       console.log();
     }
   });
-  providers.command("detect").description("Auto-detect installed providers").option("--json", "Output as JSON").option("--project", "Include project-level detection").action(async (opts) => {
+  providers.command("detect").description("Auto-detect installed providers").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").option("--project", "Include project-level detection").action(async (opts) => {
+    const operation = "providers.detect";
+    const mvi = "standard";
+    let format;
+    try {
+      format = resolveOutputFormat2({
+        jsonFlag: opts.json ?? false,
+        humanFlag: (opts.human ?? false) || isHuman(),
+        projectDefault: "json"
+      }).format;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      emitJsonError2(operation, mvi, "E_FORMAT_CONFLICT", message, "VALIDATION");
+      process.exit(1);
+    }
     const results = opts.project ? detectProjectProviders(process.cwd()) : detectAllProviders();
     const installed = results.filter((r) => r.installed);
-    if (opts.json) {
-      console.log(JSON.stringify(installed.map((r) => ({
-        id: r.provider.id,
-        toolName: r.provider.toolName,
-        methods: r.methods,
-        projectDetected: r.projectDetected
-      })), null, 2));
+    if (format === "json") {
+      const envelope = buildEnvelope4(
+        operation,
+        mvi,
+        {
+          installed: installed.map((r) => ({
+            id: r.provider.id,
+            toolName: r.provider.toolName,
+            methods: r.methods,
+            projectDetected: r.projectDetected
+          })),
+          notInstalled: results.filter((r) => !r.installed).map((r) => r.provider.id),
+          count: {
+            installed: installed.length,
+            total: results.length
+          }
+        },
+        null
+      );
+      console.log(JSON.stringify(envelope, null, 2));
       return;
     }
     console.log(pc10.bold(`
@@ -1467,14 +2026,43 @@ Detected ${installed.length} installed providers:
     }
     console.log();
   });
-  providers.command("show").description("Show provider details").argument("<id>", "Provider ID or alias").option("--json", "Output as JSON").action(async (id, opts) => {
+  providers.command("show").description("Show provider details").argument("<id>", "Provider ID or alias").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (id, opts) => {
+    const operation = "providers.show";
+    const mvi = "standard";
+    let format;
+    try {
+      format = resolveOutputFormat2({
+        jsonFlag: opts.json ?? false,
+        humanFlag: (opts.human ?? false) || isHuman(),
+        projectDefault: "json"
+      }).format;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      emitJsonError2(operation, mvi, "E_FORMAT_CONFLICT", message, "VALIDATION");
+      process.exit(1);
+    }
     const provider = getProvider(id);
     if (!provider) {
-      console.error(pc10.red(`Provider not found: ${id}`));
+      const message = `Provider not found: ${id}`;
+      if (format === "json") {
+        emitJsonError2(operation, mvi, "E_PROVIDER_NOT_FOUND", message, "NOT_FOUND", {
+          id
+        });
+      } else {
+        console.error(pc10.red(message));
+      }
       process.exit(1);
     }
-    if (opts.json) {
-      console.log(JSON.stringify(provider, null, 2));
+    if (format === "json") {
+      const envelope = buildEnvelope4(
+        operation,
+        mvi,
+        {
+          provider
+        },
+        null
+      );
+      console.log(JSON.stringify(envelope, null, 2));
       return;
     }
     console.log(pc10.bold(`
@@ -1505,6 +2093,37 @@ ${provider.toolName}`));
     console.log();
   });
 }
+function buildEnvelope4(operation, mvi, result, error) {
+  return {
+    $schema: "https://lafs.dev/schemas/v1/envelope.schema.json",
+    _meta: {
+      specVersion: "1.0.0",
+      schemaVersion: "1.0.0",
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      operation,
+      requestId: randomUUID3(),
+      transport: "cli",
+      strict: true,
+      mvi,
+      contextVersion: 0
+    },
+    success: error === null,
+    result,
+    error,
+    page: null
+  };
+}
+function emitJsonError2(operation, mvi, code, message, category, details = {}) {
+  const envelope = buildEnvelope4(operation, mvi, null, {
+    code,
+    message,
+    category,
+    retryable: false,
+    retryAfterMs: null,
+    details
+  });
+  console.error(JSON.stringify(envelope, null, 2));
+}
 
 // src/commands/skills/install.ts
 import { existsSync as existsSync4 } from "fs";
@@ -1564,7 +2183,21 @@ async function cloneGitLabRepo(owner, repo, ref, subPath) {
 
 // src/commands/skills/install.ts
 function registerSkillsInstall(parent) {
-  parent.command("install").description("Install a skill from GitHub, URL, marketplace, or ct-skills catalog").argument("[source]", "Skill source (GitHub URL, owner/repo, @author/name, skill-name)").option("-a, --agent <name>", "Target specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Install globally").option("-y, --yes", "Skip confirmation").option("--all", "Install to all detected agents").option("--profile <name>", "Install a ct-skills profile (minimal, core, recommended, full)").action(async (source, opts) => {
+  parent.command("install").description("Install a skill from GitHub, URL, marketplace, or ct-skills catalog").argument("[source]", "Skill source (GitHub URL, owner/repo, @author/name, skill-name)").option("-a, --agent <name>", "Target specific agent(s)", (v, prev) => [...prev, v], []).option("-g, --global", "Install globally").option("-y, --yes", "Skip confirmation").option("--all", "Install to all detected agents").option("--profile <name>", "Install a ct-skills profile (minimal, core, recommended, full)").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (source, opts) => {
+    const operation = "skills.install";
+    const mvi = "standard";
+    let format;
+    try {
+      format = resolveFormat({
+        jsonFlag: opts.json ?? false,
+        humanFlag: opts.human ?? false,
+        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);
+    }
     let providers;
     if (opts.all) {
       providers = getInstalledProviders();
@@ -1574,119 +2207,50 @@ function registerSkillsInstall(parent) {
       providers = getInstalledProviders();
     }
     if (providers.length === 0) {
-      console.error(pc11.red("No target providers found. Use --agent or --all."));
+      const message = "No target providers found. Use --agent or --all.";
+      if (format === "json") {
+        emitError2(operation, mvi, ErrorCodes.PROVIDER_NOT_FOUND, message, ErrorCategories.NOT_FOUND);
+      }
+      console.error(pc11.red(message));
       process.exit(1);
     }
     if (opts.profile) {
-      if (!isCatalogAvailable()) {
-        console.error(pc11.red("@cleocode/ct-skills is not installed. Run: npm install @cleocode/ct-skills"));
-        process.exit(1);
-      }
-      const profileSkills = resolveProfile(opts.profile);
-      if (profileSkills.length === 0) {
-        const available = listProfiles();
-        console.error(pc11.red(`Profile not found: ${opts.profile}`));
-        if (available.length > 0) {
-          console.log(pc11.dim("Available profiles: " + available.join(", ")));
-        }
-        process.exit(1);
-      }
-      console.log(`Installing profile ${pc11.bold(opts.profile)} (${profileSkills.length} skill(s))...`);
-      console.log(pc11.dim(`Target: ${providers.length} provider(s)`));
-      let installed = 0;
-      let failed = 0;
-      for (const name of profileSkills) {
-        const skillDir = getSkillDir(name);
-        try {
-          const result = await installSkill(
-            skillDir,
-            name,
-            providers,
-            opts.global ?? false
-          );
-          if (result.success) {
-            console.log(pc11.green(`  + ${name}`));
-            await recordSkillInstall(
-              name,
-              `@cleocode/ct-skills:${name}`,
-              `@cleocode/ct-skills:${name}`,
-              "package",
-              result.linkedAgents,
-              result.canonicalPath,
-              true
-            );
-            installed++;
-          } else {
-            console.log(pc11.yellow(`  ! ${name}: ${result.errors.join(", ")}`));
-            failed++;
-          }
-        } catch (err) {
-          console.log(pc11.red(`  x ${name}: ${err instanceof Error ? err.message : String(err)}`));
-          failed++;
-        }
-      }
-      console.log(`
-${pc11.green(`${installed} installed`)}, ${failed > 0 ? pc11.yellow(`${failed} failed`) : "0 failed"}`);
+      await handleProfileInstall(opts.profile, providers, opts.global ?? false, format, operation, mvi);
       return;
     }
     if (!source) {
-      console.error(pc11.red("Missing required argument: source"));
+      const message = "Missing required argument: source";
+      if (format === "json") {
+        emitError2(operation, mvi, ErrorCodes.INVALID_INPUT, message, ErrorCategories.VALIDATION);
+      }
+      console.error(pc11.red(message));
       console.log(pc11.dim("Usage: caamp skills install <source> or caamp skills install --profile <name>"));
       process.exit(1);
     }
-    console.log(pc11.dim(`Installing to ${providers.length} provider(s)...`));
+    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)) {
-      console.log(pc11.dim(`Searching marketplace for ${source}...`));
-      const client = new MarketplaceClient();
-      let skill;
-      try {
-        skill = await client.getSkill(source);
-      } catch (error) {
-        console.error(pc11.red(`Marketplace lookup failed: ${formatNetworkError(error)}`));
-        process.exit(1);
-      }
-      if (!skill) {
-        console.error(pc11.red(`Skill not found: ${source}`));
-        process.exit(1);
-      }
-      console.log(`  Found: ${pc11.bold(skill.name)} by ${skill.author} (${pc11.dim(skill.repoFullName)})`);
-      const parsed = parseSource(skill.githubUrl);
-      if (parsed.type !== "github" || !parsed.owner || !parsed.repo) {
-        console.error(pc11.red("Could not resolve GitHub source"));
-        process.exit(1);
-      }
-      try {
-        const subPathCandidates = buildSkillSubPathCandidates(skill.path, parsed.path);
-        let cloneError;
-        let cloned = false;
-        for (const subPath of subPathCandidates) {
-          try {
-            const result = await cloneRepo(parsed.owner, parsed.repo, parsed.ref, subPath);
-            if (subPath && !existsSync4(result.localPath)) {
-              await result.cleanup();
-              continue;
-            }
-            localPath = result.localPath;
-            cleanup = result.cleanup;
-            cloned = true;
-            break;
-          } catch (error) {
-            cloneError = error;
-          }
-        }
-        if (!cloned) {
-          throw cloneError ?? new Error("Unable to resolve skill path from marketplace metadata");
-        }
-        skillName = skill.name;
-        sourceValue = skill.githubUrl;
-        sourceType = parsed.type;
-      } catch (error) {
-        console.error(pc11.red(`Failed to fetch source repository: ${formatNetworkError(error)}`));
+      const sourceResult = await handleMarketplaceSource(
+        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 {
@@ -1700,7 +2264,11 @@ ${pc11.green(`${installed} installed`)}, ${failed > 0 ? pc11.yellow(`${failed} f
           localPath = result.localPath;
           cleanup = result.cleanup;
         } catch (error) {
-          console.error(pc11.red(`Failed to clone GitHub repository: ${formatNetworkError(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) {
@@ -1709,7 +2277,11 @@ ${pc11.green(`${installed} installed`)}, ${failed > 0 ? pc11.yellow(`${failed} f
           localPath = result.localPath;
           cleanup = result.cleanup;
         } catch (error) {
-          console.error(pc11.red(`Failed to clone GitLab repository: ${formatNetworkError(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") {
@@ -1720,7 +2292,11 @@ ${pc11.green(`${installed} installed`)}, ${failed > 0 ? pc11.yellow(`${failed} f
         }
       } else if (parsed.type === "package") {
         if (!isCatalogAvailable()) {
-          console.error(pc11.red("@cleocode/ct-skills is not installed. Run: npm install @cleocode/ct-skills"));
+          const message = "@cleocode/ct-skills is not installed. Run: npm install @cleocode/ct-skills";
+          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);
@@ -1729,64 +2305,351 @@ ${pc11.green(`${installed} installed`)}, ${failed > 0 ? pc11.yellow(`${failed} f
           skillName = catalogSkill.name;
           sourceValue = `@cleocode/ct-skills:${catalogSkill.name}`;
           sourceType = "package";
-          console.log(`  Found in catalog: ${pc11.bold(catalogSkill.name)} v${catalogSkill.version} (${pc11.dim(catalogSkill.category)})`);
+          if (format === "human") {
+            console.log(`  Found in catalog: ${pc11.bold(catalogSkill.name)} v${catalogSkill.version} (${pc11.dim(catalogSkill.category)})`);
+          }
         } else {
-          console.error(pc11.red(`Skill not found in catalog: ${parsed.inferredName}`));
+          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 {
-        console.error(pc11.red(`Unsupported source type: ${parsed.type}`));
+        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);
       }
     }
     try {
-      if (!localPath) {
-        throw new Error("No local skill path resolved for installation");
-      }
+      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);
+      }
+      const result = await installSkill(
+        localPath,
+        skillName,
+        providers,
+        opts.global ?? false
+      );
+      if (result.success) {
+        const isGlobal = 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}`);
+            }
+          }
+        }
+      } 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:"));
+          for (const err of result.errors) {
+            console.log(`  ${pc11.yellow("!")} ${err}`);
+          }
+        }
+        process.exit(1);
+      }
+    } finally {
+      if (cleanup) await cleanup();
+    }
+  });
+}
+async function handleProfileInstall(profileName, providers, isGlobal, format, operation, mvi) {
+  if (!isCatalogAvailable()) {
+    const message = "@cleocode/ct-skills is not installed. Run: npm install @cleocode/ct-skills";
+    if (format === "json") {
+      emitError2(operation, mvi, ErrorCodes.INVALID_INPUT, message, ErrorCategories.VALIDATION);
+    }
+    console.error(pc11.red(message));
+    process.exit(1);
+  }
+  const profileSkills = resolveProfile(profileName);
+  if (profileSkills.length === 0) {
+    const message = `Profile not found: ${profileName}`;
+    if (format === "json") {
+      emitJsonError(operation, mvi, ErrorCodes.SKILL_NOT_FOUND, message, ErrorCategories.NOT_FOUND, {
+        availableProfiles: listProfiles()
+      });
+    }
+    console.error(pc11.red(message));
+    const available = listProfiles();
+    if (available.length > 0) {
+      console.log(pc11.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)`));
+  }
+  const installed = [];
+  const failed = [];
+  for (const name of profileSkills) {
+    const skillDir = getSkillDir(name);
+    try {
       const result = await installSkill(
-        localPath,
-        skillName,
+        skillDir,
+        name,
         providers,
-        opts.global ?? false
+        isGlobal
       );
       if (result.success) {
-        console.log(pc11.green(`
-\u2713 Installed ${pc11.bold(skillName)}`));
-        console.log(`  Canonical: ${pc11.dim(result.canonicalPath)}`);
-        console.log(`  Linked to: ${result.linkedAgents.join(", ")}`);
-        const isGlobal = sourceType === "package" ? true : opts.global ?? false;
+        if (format === "human") {
+          console.log(pc11.green(`  + ${name}`));
+        }
         await recordSkillInstall(
-          skillName,
-          sourceValue,
-          sourceValue,
-          sourceType,
+          name,
+          `@cleocode/ct-skills:${name}`,
+          `@cleocode/ct-skills:${name}`,
+          "package",
           result.linkedAgents,
           result.canonicalPath,
-          isGlobal
+          true
         );
+        installed.push({
+          name,
+          scopedName: `@cleocode/ct-skills:${name}`,
+          canonicalPath: result.canonicalPath,
+          providers: result.linkedAgents
+        });
+      } else {
+        if (format === "human") {
+          console.log(pc11.yellow(`  ! ${name}: ${result.errors.join(", ")}`));
+        }
+        failed.push({
+          name,
+          error: result.errors.join(", ")
+        });
       }
-      if (result.errors.length > 0) {
-        console.log(pc11.yellow("\nWarnings:"));
-        for (const err of result.errors) {
-          console.log(`  ${pc11.yellow("!")} ${err}`);
+    } catch (err) {
+      const errorMsg = err instanceof Error ? err.message : String(err);
+      if (format === "human") {
+        console.log(pc11.red(`  x ${name}: ${errorMsg}`));
+      }
+      failed.push({
+        name,
+        error: errorMsg
+      });
+    }
+  }
+  const summary = {
+    installed,
+    failed,
+    count: {
+      installed: installed.length,
+      failed: failed.length,
+      total: profileSkills.length
+    }
+  };
+  if (format === "json") {
+    if (failed.length > 0) {
+      const envelope = buildEnvelope(operation, mvi, summary, {
+        code: ErrorCodes.INSTALL_FAILED,
+        message: `${failed.length} skill(s) failed to install`,
+        category: ErrorCategories.INTERNAL,
+        retryable: false,
+        retryAfterMs: null,
+        details: { failed: failed.map((f) => f.name) }
+      });
+      console.error(JSON.stringify(envelope, null, 2));
+      process.exit(1);
+    } else {
+      outputSuccess(operation, mvi, summary);
+    }
+  } else {
+    console.log(`
+${pc11.green(`${installed.length} installed`)}, ${failed.length > 0 ? pc11.yellow(`${failed.length} failed`) : "0 failed"}`);
+    if (failed.length > 0) {
+      process.exit(1);
+    }
+  }
+}
+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 && !existsSync4(result.localPath)) {
+          await result.cleanup();
+          continue;
         }
+        localPath = result.localPath;
+        cleanup = result.cleanup;
+        cloned = true;
+        break;
+      } catch (error) {
+        cloneError = error;
       }
-    } finally {
-      if (cleanup) await cleanup();
     }
-  });
+    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/remove.ts
 import pc12 from "picocolors";
 function registerSkillsRemove(parent) {
-  parent.command("remove").description("Remove installed skill(s)").argument("[name]", "Skill name to remove").option("-g, --global", "Remove from global scope").option("-y, --yes", "Skip confirmation").action(async (name, opts) => {
+  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) => {
+    const operation = "skills.remove";
+    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);
+    }
     const providers = getInstalledProviders();
     if (name) {
       const result = await removeSkill(name, providers, opts.global ?? false);
-      if (result.removed.length > 0) {
-        console.log(pc12.green(`\u2713 Removed ${pc12.bold(name)} from: ${result.removed.join(", ")}`));
+      const removed = result.removed;
+      const count = {
+        removed: removed.length,
+        total: providers.length
+      };
+      if (format === "json") {
+        if (removed.length > 0) {
+          await removeSkillFromLock(name);
+        }
+        const errors = result.errors.length > 0 ? result.errors.map((err) => ({ message: err })) : void 0;
+        outputSuccess(operation, mvi, {
+          removed,
+          providers: providers.map((p) => p.id),
+          count,
+          ...errors && { errors }
+        });
+        return;
+      }
+      if (removed.length > 0) {
+        console.log(pc12.green(`\u2713 Removed ${pc12.bold(name)} from: ${removed.join(", ")}`));
         await removeSkillFromLock(name);
       } else {
         console.log(pc12.yellow(`Skill ${name} not found in any provider.`));
@@ -1799,7 +2662,24 @@ function registerSkillsRemove(parent) {
     } else {
       const skills = await listCanonicalSkills();
       if (skills.length === 0) {
-        console.log(pc12.dim("No skills installed."));
+        if (format === "json") {
+          outputSuccess(operation, mvi, {
+            removed: [],
+            providers: [],
+            count: { removed: 0, total: 0 }
+          });
+        } else {
+          console.log(pc12.dim("No skills installed."));
+        }
+        return;
+      }
+      if (format === "json") {
+        outputSuccess(operation, mvi, {
+          removed: [],
+          providers: [],
+          count: { removed: 0, total: 0 },
+          available: skills
+        });
         return;
       }
       console.log(pc12.bold("Installed skills:"));
@@ -1812,23 +2692,23 @@ function registerSkillsRemove(parent) {
 }
 
 // src/commands/skills/list.ts
-import { randomUUID as randomUUID2 } from "crypto";
-import { resolveOutputFormat } from "@cleocode/lafs-protocol";
+import { randomUUID as randomUUID4 } from "crypto";
+import { resolveOutputFormat as resolveOutputFormat3 } from "@cleocode/lafs-protocol";
 import pc13 from "picocolors";
 function registerSkillsList(parent) {
   parent.command("list").description("List installed skills").option("-g, --global", "List global skills").option("-a, --agent <name>", "List skills for specific agent").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
     const operation = "skills.list";
-    const mvi = true;
+    const mvi = "standard";
     let format;
     try {
-      format = resolveOutputFormat({
+      format = resolveOutputFormat3({
         jsonFlag: opts.json ?? false,
         humanFlag: (opts.human ?? false) || isHuman(),
         projectDefault: "json"
       }).format;
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      emitJsonError(operation, mvi, "E_FORMAT_CONFLICT", message, "VALIDATION");
+      emitJsonError3(operation, mvi, "E_FORMAT_CONFLICT", message, "VALIDATION");
       process.exit(1);
     }
     let dirs = [];
@@ -1837,7 +2717,7 @@ function registerSkillsList(parent) {
       if (!provider) {
         const message = `Provider not found: ${opts.agent}`;
         if (format === "json") {
-          emitJsonError(operation, mvi, "E_PROVIDER_NOT_FOUND", message, "NOT_FOUND", {
+          emitJsonError3(operation, mvi, "E_PROVIDER_NOT_FOUND", message, "NOT_FOUND", {
             agent: opts.agent
           });
         } else {
@@ -1855,7 +2735,7 @@ function registerSkillsList(parent) {
     }
     const skills = await discoverSkillsMulti(dirs);
     if (format === "json") {
-      const envelope = buildEnvelope(
+      const envelope = buildEnvelope5(
         operation,
         mvi,
         {
@@ -1884,7 +2764,7 @@ Install with: caamp skills install <name>`));
     console.log(pc13.dim(`Remove with:  caamp skills remove <name>`));
   });
 }
-function buildEnvelope(operation, mvi, result, error) {
+function buildEnvelope5(operation, mvi, result, error) {
   return {
     $schema: "https://lafs.dev/schemas/v1/envelope.schema.json",
     _meta: {
@@ -1892,7 +2772,7 @@ function buildEnvelope(operation, mvi, result, error) {
       schemaVersion: "1.0.0",
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       operation,
-      requestId: randomUUID2(),
+      requestId: randomUUID4(),
       transport: "cli",
       strict: true,
       mvi,
@@ -1904,8 +2784,8 @@ function buildEnvelope(operation, mvi, result, error) {
     page: null
   };
 }
-function emitJsonError(operation, mvi, code, message, category, details = {}) {
-  const envelope = buildEnvelope(operation, mvi, null, {
+function emitJsonError3(operation, mvi, code, message, category, details = {}) {
+  const envelope = buildEnvelope5(operation, mvi, null, {
     code,
     message,
     category,
@@ -1917,9 +2797,9 @@ function emitJsonError(operation, mvi, code, message, category, details = {}) {
 }
 
 // src/commands/skills/find.ts
-import { randomUUID as randomUUID3 } from "crypto";
+import { randomUUID as randomUUID5 } from "crypto";
 import {
-  resolveOutputFormat as resolveOutputFormat2
+  resolveOutputFormat as resolveOutputFormat4
 } from "@cleocode/lafs-protocol";
 import pc14 from "picocolors";
 var SkillsFindValidationError = class extends Error {
@@ -1937,7 +2817,7 @@ function registerSkillsFind(parent) {
     const mvi = !details;
     let format;
     try {
-      format = resolveOutputFormat2({
+      format = resolveOutputFormat4({
         jsonFlag: opts.json ?? false,
         humanFlag: (opts.human ?? false) || isHuman(),
         projectDefault: "json"
@@ -1945,7 +2825,7 @@ function registerSkillsFind(parent) {
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       if (opts.json) {
-        emitJsonError2(operation, mvi, "E_FORMAT_CONFLICT", message, "VALIDATION");
+        emitJsonError4(operation, mvi, "E_FORMAT_CONFLICT", message, "VALIDATION");
       } else {
         console.error(pc14.red(message));
       }
@@ -1981,7 +2861,7 @@ function registerSkillsFind(parent) {
           const selectedObjects = resultOptions.filter(
             (option) => selectedRanks.includes(Number(option.rank ?? 0))
           );
-          const envelope = buildEnvelope2(
+          const envelope = buildEnvelope6(
             operation,
             mvi,
             {
@@ -2004,7 +2884,7 @@ function registerSkillsFind(parent) {
         const errorCode = error instanceof SkillsFindValidationError ? error.code : error.code ?? RECOMMENDATION_ERROR_CODES.SOURCE_UNAVAILABLE;
         const category = errorCode === RECOMMENDATION_ERROR_CODES.CRITERIA_CONFLICT ? "CONFLICT" : errorCode === RECOMMENDATION_ERROR_CODES.NO_MATCHES ? "NOT_FOUND" : errorCode === RECOMMENDATION_ERROR_CODES.QUERY_INVALID ? "VALIDATION" : "INTERNAL";
         if (format === "json") {
-          emitJsonError2(operation, mvi, errorCode, message, category, {
+          emitJsonError4(operation, mvi, errorCode, message, category, {
             query: query ?? null
           });
         } else {
@@ -2029,7 +2909,7 @@ function registerSkillsFind(parent) {
     } catch (error) {
       const message = formatNetworkError(error);
       if (format === "json") {
-        emitJsonError2(operation, mvi, "E_SEARCH_FAILED", message, "TRANSIENT", {
+        emitJsonError4(operation, mvi, "E_SEARCH_FAILED", message, "TRANSIENT", {
           query,
           limit
         });
@@ -2039,7 +2919,7 @@ function registerSkillsFind(parent) {
       process.exit(1);
     }
     if (format === "json") {
-      const envelope = buildEnvelope2(
+      const envelope = buildEnvelope6(
         operation,
         mvi,
         {
@@ -2149,7 +3029,7 @@ function validateSelectedRanks(selectedRanks, total) {
     }
   }
 }
-function buildEnvelope2(operation, mvi, result, error) {
+function buildEnvelope6(operation, mvi, result, error) {
   return {
     $schema: "https://lafs.dev/schemas/v1/envelope.schema.json",
     _meta: {
@@ -2157,7 +3037,7 @@ function buildEnvelope2(operation, mvi, result, error) {
       schemaVersion: "1.0.0",
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       operation,
-      requestId: randomUUID3(),
+      requestId: randomUUID5(),
       transport: "cli",
       strict: true,
       mvi,
@@ -2169,8 +3049,8 @@ function buildEnvelope2(operation, mvi, result, error) {
     page: null
   };
 }
-function emitJsonError2(operation, mvi, code, message, category, details = {}) {
-  const envelope = buildEnvelope2(operation, mvi, null, {
+function emitJsonError4(operation, mvi, code, message, category, details = {}) {
+  const envelope = buildEnvelope6(operation, mvi, null, {
     code,
     message,
     category,
@@ -2184,47 +3064,90 @@ function emitJsonError2(operation, mvi, code, message, category, details = {}) {
 // src/commands/skills/check.ts
 import pc15 from "picocolors";
 function registerSkillsCheck(parent) {
-  parent.command("check").description("Check for available skill updates").option("--json", "Output as JSON").action(async (opts) => {
+  parent.command("check").description("Check for available skill updates").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
+    const operation = "skills.check";
+    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);
+    }
     const tracked = await getTrackedSkills();
     const entries = Object.entries(tracked);
     if (entries.length === 0) {
-      console.log(pc15.dim("No tracked skills."));
+      if (format === "json") {
+        outputSuccess(operation, mvi, {
+          skills: [],
+          outdated: 0,
+          total: 0
+        });
+      } else {
+        console.log(pc15.dim("No tracked skills."));
+      }
       return;
     }
-    console.log(pc15.dim(`Checking ${entries.length} skill(s) for updates...
+    if (format === "human") {
+      console.log(pc15.dim(`Checking ${entries.length} skill(s) for updates...
 `));
-    const results = [];
+    }
+    const skillResults = [];
+    let updatesAvailable = 0;
     for (const [name, entry] of entries) {
       const update = await checkSkillUpdate(name);
-      results.push({ name, entry, ...update });
+      const hasUpdate = update.hasUpdate ?? false;
+      if (hasUpdate) {
+        updatesAvailable++;
+      }
+      skillResults.push({
+        name,
+        currentVersion: update.currentVersion ?? entry.version ?? "unknown",
+        latestVersion: update.latestVersion ?? "unknown",
+        hasUpdate,
+        source: entry.source,
+        agents: entry.agents
+      });
     }
-    if (opts.json) {
-      console.log(JSON.stringify(results, null, 2));
+    if (format === "json") {
+      outputSuccess(operation, mvi, {
+        skills: skillResults.map((s) => ({
+          name: s.name,
+          currentVersion: s.currentVersion,
+          latestVersion: s.latestVersion,
+          hasUpdate: s.hasUpdate
+        })),
+        outdated: updatesAvailable,
+        total: entries.length
+      });
       return;
     }
-    let updatesAvailable = 0;
-    for (const r of results) {
+    for (const r of skillResults) {
       let statusLabel;
-      if (r.status === "update-available") {
+      if (r.hasUpdate) {
         statusLabel = pc15.yellow("update available");
-        updatesAvailable++;
-      } else if (r.status === "up-to-date") {
+      } else if (r.currentVersion !== "unknown") {
         statusLabel = pc15.green("up to date");
       } else {
         statusLabel = pc15.dim("unknown");
       }
       console.log(`  ${pc15.bold(r.name.padEnd(30))} ${statusLabel}`);
-      if (r.currentVersion || r.latestVersion) {
-        const current = r.currentVersion ? r.currentVersion.slice(0, 12) : "?";
-        const latest = r.latestVersion ?? "?";
+      if (r.currentVersion !== "unknown" || r.latestVersion !== "unknown") {
+        const current = r.currentVersion !== "unknown" ? r.currentVersion.slice(0, 12) : "?";
+        const latest = r.latestVersion !== "unknown" ? r.latestVersion : "?";
         if (r.hasUpdate) {
           console.log(`  ${pc15.dim("current:")} ${current}  ${pc15.dim("->")}  ${pc15.cyan(latest)}`);
         } else {
           console.log(`  ${pc15.dim("version:")} ${current}`);
         }
       }
-      console.log(`  ${pc15.dim(`source: ${r.entry.source}`)}`);
-      console.log(`  ${pc15.dim(`agents: ${r.entry.agents.join(", ")}`)}`);
+      console.log(`  ${pc15.dim(`source: ${r.source}`)}`);
+      console.log(`  ${pc15.dim(`agents: ${r.agents.join(", ")}`)}`);
       console.log();
     }
     if (updatesAvailable > 0) {
@@ -2239,14 +3162,39 @@ function registerSkillsCheck(parent) {
 // src/commands/skills/update.ts
 import pc16 from "picocolors";
 function registerSkillsUpdate(parent) {
-  parent.command("update").description("Update all outdated skills").option("-y, --yes", "Skip confirmation").action(async (opts) => {
+  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";
+    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);
+    }
     const tracked = await getTrackedSkills();
     const entries = Object.entries(tracked);
     if (entries.length === 0) {
-      console.log(pc16.dim("No tracked skills to update."));
+      if (format === "json") {
+        outputSuccess(operation, mvi, {
+          updated: [],
+          failed: [],
+          skipped: [],
+          count: { updated: 0, failed: 0, skipped: 0 }
+        });
+      } else {
+        console.log(pc16.dim("No tracked skills to update."));
+      }
       return;
     }
-    console.log(pc16.dim(`Checking ${entries.length} skill(s) for updates...`));
+    if (format === "human") {
+      console.log(pc16.dim(`Checking ${entries.length} skill(s) for updates...`));
+    }
     const outdated = [];
     for (const [name] of entries) {
       const result = await checkSkillUpdate(name);
@@ -2259,18 +3207,29 @@ function registerSkillsUpdate(parent) {
       }
     }
     if (outdated.length === 0) {
-      console.log(pc16.green("\nAll skills are up to date."));
+      if (format === "json") {
+        outputSuccess(operation, mvi, {
+          updated: [],
+          failed: [],
+          skipped: [],
+          count: { updated: 0, failed: 0, skipped: 0 }
+        });
+      } else {
+        console.log(pc16.green("\nAll skills are up to date."));
+      }
       return;
     }
-    console.log(pc16.yellow(`
+    if (format === "human") {
+      console.log(pc16.yellow(`
 ${outdated.length} skill(s) have updates available:
 `));
-    for (const skill of outdated) {
-      const current = skill.currentVersion?.slice(0, 12) ?? "?";
-      const latest = skill.latestVersion ?? "?";
-      console.log(`  ${pc16.bold(skill.name)}  ${pc16.dim(current)}  ${pc16.dim("->")}  ${pc16.cyan(latest)}`);
+      for (const skill of outdated) {
+        const current = skill.currentVersion?.slice(0, 12) ?? "?";
+        const latest = skill.latestVersion ?? "?";
+        console.log(`  ${pc16.bold(skill.name)}  ${pc16.dim(current)}  ${pc16.dim("->")}  ${pc16.cyan(latest)}`);
+      }
     }
-    if (!opts.yes) {
+    if (!opts.yes && format === "human") {
       const readline = await import("readline");
       const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
       const answer = await new Promise((resolve) => {
@@ -2282,13 +3241,18 @@ ${outdated.length} skill(s) have updates available:
         return;
       }
     }
-    console.log();
-    let successCount = 0;
-    let failCount = 0;
+    if (format === "human") {
+      console.log();
+    }
+    const updated = [];
+    const failed = [];
+    const skipped = [];
     for (const skill of outdated) {
       const entry = tracked[skill.name];
       if (!entry) continue;
-      console.log(pc16.dim(`Updating ${pc16.bold(skill.name)}...`));
+      if (format === "human") {
+        console.log(pc16.dim(`Updating ${pc16.bold(skill.name)}...`));
+      }
       try {
         const parsed = parseSource(entry.source);
         let localPath;
@@ -2302,13 +3266,19 @@ ${outdated.length} skill(s) have updates available:
           localPath = result.localPath;
           cleanup = result.cleanup;
         } else {
-          console.log(pc16.yellow(`  Skipped ${skill.name}: source type "${parsed.type}" does not support auto-update`));
+          if (format === "human") {
+            console.log(pc16.yellow(`  Skipped ${skill.name}: source type "${parsed.type}" does not support auto-update`));
+          }
+          skipped.push(skill.name);
           continue;
         }
         try {
           const providers = entry.agents.map((a) => getProvider(a)).filter((p) => p !== void 0);
           if (providers.length === 0) {
-            console.log(pc16.yellow(`  Skipped ${skill.name}: no valid providers found`));
+            if (format === "human") {
+              console.log(pc16.yellow(`  Skipped ${skill.name}: no valid providers found`));
+            }
+            skipped.push(skill.name);
             continue;
           }
           const installResult = await installSkill(
@@ -2330,13 +3300,17 @@ ${outdated.length} skill(s) have updates available:
               entry.projectDir,
               skill.latestVersion
             );
-            console.log(pc16.green(`  Updated ${pc16.bold(skill.name)}`));
-            successCount++;
+            if (format === "human") {
+              console.log(pc16.green(`  Updated ${pc16.bold(skill.name)}`));
+            }
+            updated.push(skill.name);
           } else {
-            console.log(pc16.red(`  Failed to update ${skill.name}: no agents linked`));
-            failCount++;
+            if (format === "human") {
+              console.log(pc16.red(`  Failed to update ${skill.name}: no agents linked`));
+            }
+            failed.push({ name: skill.name, error: "no agents linked" });
           }
-          if (installResult.errors.length > 0) {
+          if (installResult.errors.length > 0 && format === "human") {
             for (const err of installResult.errors) {
               console.log(pc16.yellow(`    ${err}`));
             }
@@ -2346,31 +3320,67 @@ ${outdated.length} skill(s) have updates available:
         }
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
-        console.log(pc16.red(`  Failed to update ${skill.name}: ${msg}`));
-        failCount++;
+        if (format === "human") {
+          console.log(pc16.red(`  Failed to update ${skill.name}: ${msg}`));
+        }
+        failed.push({ name: skill.name, error: msg });
       }
     }
+    if (format === "json") {
+      outputSuccess(operation, mvi, {
+        updated,
+        failed,
+        skipped,
+        count: {
+          updated: updated.length,
+          failed: failed.length,
+          skipped: skipped.length
+        }
+      });
+      return;
+    }
     console.log();
-    if (successCount > 0) {
-      console.log(pc16.green(`Updated ${successCount} skill(s).`));
+    if (updated.length > 0) {
+      console.log(pc16.green(`Updated ${updated.length} skill(s).`));
     }
-    if (failCount > 0) {
-      console.log(pc16.red(`Failed to update ${failCount} skill(s).`));
+    if (failed.length > 0) {
+      console.log(pc16.red(`Failed to update ${failed.length} skill(s).`));
     }
   });
 }
 
 // src/commands/skills/init.ts
-import pc17 from "picocolors";
-import { writeFile, mkdir } from "fs/promises";
 import { existsSync as existsSync5 } from "fs";
+import { mkdir, writeFile } from "fs/promises";
 import { join as join5 } from "path";
+import pc17 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", ".").action(async (name, opts) => {
+  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) => {
+    const operation = "skills.init";
+    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);
+    }
     const skillName = name ?? "my-skill";
     const skillDir = join5(opts.dir, skillName);
     if (existsSync5(skillDir)) {
-      console.error(pc17.red(`Directory already exists: ${skillDir}`));
+      const message = `Directory already exists: ${skillDir}`;
+      if (format === "json") {
+        emitJsonError(operation, mvi, ErrorCodes.INVALID_CONSTRAINT, message, ErrorCategories.CONFLICT, {
+          path: skillDir
+        });
+      } else {
+        console.error(pc17.red(message));
+      }
       process.exit(1);
     }
     await mkdir(skillDir, { recursive: true });
@@ -2398,6 +3408,16 @@ Provide detailed instructions for the AI agent here.
 Show example inputs and expected outputs.
 `;
     await writeFile(join5(skillDir, "SKILL.md"), template, "utf-8");
+    const result = {
+      name: skillName,
+      directory: skillDir,
+      template: "SKILL.md",
+      created: true
+    };
+    if (format === "json") {
+      outputSuccess(operation, mvi, result);
+      return;
+    }
     console.log(pc17.green(`\u2713 Created skill template: ${skillDir}/SKILL.md`));
     console.log(pc17.dim("\nNext steps:"));
     console.log(pc17.dim("  1. Edit SKILL.md with your instructions"));
@@ -2410,32 +3430,126 @@ Show example inputs and expected outputs.
 import { existsSync as existsSync6, statSync } from "fs";
 import pc18 from "picocolors";
 function registerSkillsAudit(parent) {
-  parent.command("audit").description("Security scan skill files (46+ rules, SARIF output)").argument("[path]", "Path to SKILL.md or directory", ".").option("--sarif", "Output in SARIF format").option("--json", "Output as JSON").action(async (path, opts) => {
+  parent.command("audit").description("Security scan skill files (46+ rules, SARIF output)").argument("[path]", "Path to SKILL.md or directory", ".").option("--sarif", "Output in SARIF format (raw SARIF, not LAFS envelope)").option("--json", "Output as JSON (LAFS envelope)").option("--human", "Output in human-readable format").action(async (path, opts) => {
+    const operation = "skills.audit";
+    const mvi = "standard";
     if (!existsSync6(path)) {
-      console.error(pc18.red(`Path not found: ${path}`));
+      const message = `Path not found: ${path}`;
+      if (opts.sarif) {
+        console.error(JSON.stringify({
+          $schema: "https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json",
+          version: "2.1.0",
+          runs: [{
+            tool: { driver: { name: "caamp-skills-audit" } },
+            invocations: [{
+              executionSuccessful: false,
+              exitCode: 1,
+              exitCodeDescription: message
+            }],
+            results: []
+          }]
+        }, null, 2));
+      } else {
+        emitJsonError(operation, mvi, ErrorCodes.FILE_NOT_FOUND, message, ErrorCategories.NOT_FOUND, {
+          path
+        });
+      }
+      process.exit(1);
+    }
+    let format;
+    try {
+      if (opts.sarif) {
+        format = "sarif";
+      } else {
+        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);
     }
     const stat = statSync(path);
     let results;
-    if (stat.isFile()) {
-      results = [await scanFile(path)];
-    } else {
-      results = await scanDirectory(path);
+    try {
+      if (stat.isFile()) {
+        results = [await scanFile(path)];
+      } else {
+        results = await scanDirectory(path);
+      }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      if (format === "sarif") {
+        console.error(JSON.stringify({
+          $schema: "https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json",
+          version: "2.1.0",
+          runs: [{
+            tool: { driver: { name: "caamp-skills-audit" } },
+            invocations: [{
+              executionSuccessful: false,
+              exitCode: 1,
+              exitCodeDescription: message
+            }],
+            results: []
+          }]
+        }, null, 2));
+      } else {
+        emitJsonError(operation, mvi, ErrorCodes.AUDIT_FAILED, message, ErrorCategories.INTERNAL, {
+          path
+        });
+      }
+      process.exit(1);
     }
     if (results.length === 0) {
+      if (format === "sarif") {
+        console.log(JSON.stringify(toSarif([]), null, 2));
+        return;
+      }
+      if (format === "json") {
+        const summary2 = {
+          scanned: 0,
+          findings: 0,
+          files: []
+        };
+        outputSuccess(operation, mvi, summary2);
+        return;
+      }
       console.log(pc18.dim("No SKILL.md files found to scan."));
       return;
     }
-    if (opts.sarif) {
+    const summary = {
+      scanned: results.length,
+      findings: results.reduce((acc, r) => acc + r.findings.length, 0),
+      files: results.map((r) => ({
+        path: r.file,
+        score: r.score,
+        findings: r.findings.map((f) => ({
+          level: f.rule.severity,
+          code: f.rule.id,
+          message: `${f.rule.name}: ${f.rule.description}`,
+          line: f.line
+        }))
+      }))
+    };
+    const allPassed = results.every((r) => r.passed);
+    if (format === "sarif") {
       console.log(JSON.stringify(toSarif(results), null, 2));
+      if (!allPassed) {
+        process.exit(1);
+      }
       return;
     }
-    if (opts.json) {
-      console.log(JSON.stringify(results, null, 2));
+    if (format === "json") {
+      outputSuccess(operation, mvi, summary);
+      if (!allPassed) {
+        process.exit(1);
+      }
       return;
     }
     let totalFindings = 0;
-    let allPassed = true;
     for (const result of results) {
       const icon = result.passed ? pc18.green("\u2713") : pc18.red("\u2717");
       console.log(`
@@ -2445,7 +3559,6 @@ ${icon} ${pc18.bold(result.file)} (score: ${result.score}/100)`);
         continue;
       }
       totalFindings += result.findings.length;
-      if (!result.passed) allPassed = false;
       for (const f of result.findings) {
         const sev = f.rule.severity === "critical" ? pc18.red(f.rule.severity) : f.rule.severity === "high" ? pc18.red(f.rule.severity) : f.rule.severity === "medium" ? pc18.yellow(f.rule.severity) : pc18.dim(f.rule.severity);
         console.log(`  ${sev.padEnd(20)} ${f.rule.id} ${f.rule.name}`);
@@ -2461,22 +3574,64 @@ ${results.length} file(s) scanned, ${totalFindings} finding(s)`));
 }
 
 // src/commands/skills/validate.ts
+import { resolveOutputFormat as resolveOutputFormat5 } from "@cleocode/lafs-protocol";
 import pc19 from "picocolors";
 function registerSkillsValidate(parent) {
-  parent.command("validate").description("Validate SKILL.md format").argument("[path]", "Path to SKILL.md", "SKILL.md").option("--json", "Output as JSON").action(async (path, opts) => {
-    const result = await validateSkill(path);
-    if (opts.json) {
-      console.log(JSON.stringify(result, null, 2));
-      return;
+  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({
+        jsonFlag: opts.json ?? false,
+        humanFlag: (opts.human ?? false) || isHuman(),
+        projectDefault: "json"
+      }).format;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      emitJsonError(operation, mvi, ErrorCodes.FORMAT_CONFLICT, message, ErrorCategories.VALIDATION);
+      process.exit(1);
     }
-    if (result.valid) {
-      console.log(pc19.green(`\u2713 ${path} is valid`));
-    } else {
-      console.log(pc19.red(`\u2717 ${path} has validation errors`));
+    let result;
+    try {
+      result = await validateSkill(path);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      if (format === "json") {
+        emitJsonError(operation, mvi, ErrorCodes.FILE_NOT_FOUND, message, ErrorCategories.NOT_FOUND, {
+          path
+        });
+      } else {
+        console.error(pc19.red(message));
+      }
+      process.exit(1);
     }
-    for (const issue of result.issues) {
-      const icon = issue.level === "error" ? pc19.red("\u2717") : pc19.yellow("!");
-      console.log(`  ${icon} [${issue.field}] ${issue.message}`);
+    if (format === "json") {
+      const envelope = buildEnvelope(
+        operation,
+        mvi,
+        {
+          valid: result.valid,
+          file: path,
+          issues: result.issues.map((issue) => ({
+            level: issue.level === "error" ? "error" : "warn",
+            field: issue.field,
+            message: issue.message
+          }))
+        },
+        null
+      );
+      console.log(JSON.stringify(envelope, null, 2));
+    } else {
+      if (result.valid) {
+        console.log(pc19.green(`\u2713 ${path} is valid`));
+      } else {
+        console.log(pc19.red(`\u2717 ${path} has validation errors`));
+      }
+      for (const issue of result.issues) {
+        const icon = issue.level === "error" ? pc19.red("\u2717") : pc19.yellow("!");
+        console.log(`  ${icon} [${issue.field}] ${issue.message}`);
+      }
     }
     if (!result.valid) {
       process.exit(1);