@cleocode/caamp 1.3.1 → 1.5.0

package/dist/cli.js

@@ -16,6 +16,7 @@ import {
   detectProjectProviders,
   discoverSkill,
   discoverSkillsMulti,
+  extractVersionTag,
   formatNetworkError,
   formatSkillRecommendations,
   generateInjectionContent,
@@ -27,6 +28,7 @@ import {
   getRegistryVersion,
   getSkill,
   getSkillDir,
+  getTrackedMcpServers,
   getTrackedSkills,
   groupByInstructFile,
   injectAll,
@@ -48,6 +50,7 @@ import {
   readConfig,
   readLockFile,
   recommendSkills,
+  reconcileCleoLock,
   recordMcpInstall,
   recordSkillInstall,
   removeMcpFromLock,
@@ -71,7 +74,7 @@ import {
   tokenizeCriteriaValue,
   updateInstructionsSingleOperation,
   validateSkill
-} from "./chunk-DT22SZ7X.js";
+} from "./chunk-G7UPJOYG.js";
 
 // src/cli.ts
 import { Command } from "commander";
@@ -1171,6 +1174,69 @@ async function checkLockFile() {
   }
   return { name: "Lock File", checks };
 }
+async function checkMcpLockEntries() {
+  const checks = [];
+  try {
+    const lock = await readLockFile();
+    const lockNames = Object.keys(lock.mcpServers);
+    checks.push({ label: `${lockNames.length} MCP server entries in lock`, status: "pass" });
+    const results = detectAllProviders();
+    const installed = results.filter((r) => r.installed);
+    const liveCleoNames = /* @__PURE__ */ new Set();
+    let untrackedCount = 0;
+    for (const scope of ["project", "global"]) {
+      for (const r of installed) {
+        try {
+          const entries = await listMcpServers(r.provider, scope);
+          for (const entry of entries) {
+            const channel = resolveChannelFromServerName(entry.name);
+            if (!channel) continue;
+            liveCleoNames.add(entry.name);
+            if (!lock.mcpServers[entry.name]) {
+              untrackedCount++;
+            }
+          }
+        } catch {
+        }
+      }
+    }
+    if (untrackedCount === 0) {
+      checks.push({ label: "All CLEO servers tracked in lock", status: "pass" });
+    } else {
+      checks.push({
+        label: `${untrackedCount} untracked CLEO server${untrackedCount !== 1 ? "s" : ""} (in config, not in lock)`,
+        status: "warn",
+        detail: "Run `caamp cleo repair` to backfill lock entries"
+      });
+    }
+    let orphanedCount = 0;
+    const orphanedNames = [];
+    for (const serverName of lockNames) {
+      const channel = resolveChannelFromServerName(serverName);
+      if (!channel) continue;
+      if (!liveCleoNames.has(serverName)) {
+        orphanedCount++;
+        orphanedNames.push(serverName);
+      }
+    }
+    if (orphanedCount === 0) {
+      checks.push({ label: "No orphaned CLEO lock entries", status: "pass" });
+    } else {
+      checks.push({
+        label: `${orphanedCount} orphaned CLEO lock entr${orphanedCount !== 1 ? "ies" : "y"} (in lock, not in any config)`,
+        status: "warn",
+        detail: orphanedNames.join(", ") + " \u2014 Run `caamp cleo repair --prune` to clean up"
+      });
+    }
+  } catch (err) {
+    checks.push({
+      label: "Failed to check MCP lock entries",
+      status: "fail",
+      detail: err instanceof Error ? err.message : String(err)
+    });
+  }
+  return { name: "MCP Lock", checks };
+}
 async function checkConfigFiles() {
   const checks = [];
   const results = detectAllProviders();
@@ -1239,6 +1305,7 @@ function registerDoctorCommand(program2) {
       sections.push(checkInstalledProviders());
       sections.push(checkSkillSymlinks());
       sections.push(await checkLockFile());
+      sections.push(await checkMcpLockEntries());
       sections.push(await checkConfigFiles());
       let passed = 0;
       let warnings = 0;
@@ -1258,6 +1325,7 @@ function registerDoctorCommand(program2) {
       const detectionResults = detectAllProviders();
       const installedProviders = detectionResults.filter((r) => r.installed);
       const { canonicalCount, brokenCount, staleCount } = countSkillIssues();
+      const { tracked: mcpTracked, untracked: mcpUntracked, orphaned: mcpOrphaned } = countMcpLockIssues(sections);
       const result = {
         environment: {
           node: getNodeVersion(),
@@ -1279,6 +1347,11 @@ function registerDoctorCommand(program2) {
           brokenLinks: brokenCount,
           staleLinks: staleCount
         },
+        mcpServers: {
+          tracked: mcpTracked,
+          untracked: mcpUntracked,
+          orphaned: mcpOrphaned
+        },
         checks: sections.flatMap(
           (s) => s.checks.map((c) => ({
             label: `${s.name}: ${c.label}`,
@@ -1375,6 +1448,26 @@ function countSkillIssues() {
   }
   return { canonicalCount, brokenCount, staleCount };
 }
+function countMcpLockIssues(sections) {
+  const mcpSection = sections.find((s) => s.name === "MCP Lock");
+  if (!mcpSection) return { tracked: 0, untracked: 0, orphaned: 0 };
+  let tracked = 0;
+  let untracked = 0;
+  let orphaned = 0;
+  for (const check of mcpSection.checks) {
+    const countMatch = check.label.match(/^(\d+)/);
+    if (!countMatch?.[1]) continue;
+    const count = Number.parseInt(countMatch[1], 10);
+    if (check.label.includes("MCP server entries in lock")) {
+      tracked = count;
+    } else if (check.label.includes("untracked")) {
+      untracked = count;
+    } else if (check.label.includes("orphaned")) {
+      orphaned = count;
+    }
+  }
+  return { tracked, untracked, orphaned };
+}
 
 // src/commands/instructions/inject.ts
 import pc3 from "picocolors";
@@ -1830,7 +1923,8 @@ async function executeCleoInstall(mode, opts, operation) {
       profile.packageSpec ?? resolvedOpts.command ?? "cleo-dev",
       channel === "dev" ? "command" : "package",
       succeeded.map((result) => result.provider.id),
-      resolvedOpts.global ?? false
+      resolvedOpts.global ?? false,
+      resolvedOpts.version ?? extractVersionTag(profile.packageSpec)
     );
   }
   if (format === "human") {
@@ -1946,6 +2040,34 @@ async function executeCleoUninstall(opts, operation) {
     });
   }
 }
+function checkCleoEntryHealth(command, lockTracked) {
+  if (!command) {
+    return {
+      commandReachable: true,
+      commandDetail: "(no command)",
+      configPresent: true,
+      lockTracked,
+      status: lockTracked ? "healthy" : "degraded"
+    };
+  }
+  const reachability = checkCommandReachability(command);
+  if (!reachability.reachable) {
+    return {
+      commandReachable: false,
+      commandDetail: reachability.detail,
+      configPresent: true,
+      lockTracked,
+      status: "broken"
+    };
+  }
+  return {
+    commandReachable: true,
+    commandDetail: reachability.detail,
+    configPresent: true,
+    lockTracked,
+    status: lockTracked ? "healthy" : "degraded"
+  };
+}
 async function executeCleoShow(opts, operation) {
   const mvi = "standard";
   let format;
@@ -1971,40 +2093,187 @@ async function executeCleoShow(opts, operation) {
     process.exit(1);
   }
   const channelFilter = opts.channel ? normalizeCleoChannel(opts.channel) : null;
-  const scope = opts.global ? "global" : "project";
+  const scopes = [];
+  if (opts.global && !opts.project) {
+    scopes.push("global");
+  } else if (opts.project && !opts.global) {
+    scopes.push("project");
+  } else {
+    scopes.push("project", "global");
+  }
+  const lockEntries = await getTrackedMcpServers();
   const entries = [];
-  for (const provider of providers) {
-    const providerEntries = await listMcpServers(provider, scope);
-    for (const entry of providerEntries) {
-      const channel = resolveChannelFromServerName(entry.name);
-      if (!channel) continue;
-      if (channelFilter && channel !== channelFilter) continue;
-      entries.push({
-        provider: provider.id,
-        serverName: entry.name,
-        channel,
-        command: typeof entry.config.command === "string" ? entry.config.command : void 0,
-        args: Array.isArray(entry.config.args) ? entry.config.args.filter((value) => typeof value === "string") : [],
-        env: typeof entry.config.env === "object" && entry.config.env !== null ? entry.config.env : {}
-      });
+  const warnings = [];
+  for (const scope of scopes) {
+    for (const provider of providers) {
+      const providerEntries = await listMcpServers(provider, scope);
+      for (const entry of providerEntries) {
+        const channel = resolveChannelFromServerName(entry.name);
+        if (!channel) continue;
+        if (channelFilter && channel !== channelFilter) continue;
+        const command = typeof entry.config.command === "string" ? entry.config.command : void 0;
+        const args = Array.isArray(entry.config.args) ? entry.config.args.filter((value) => typeof value === "string") : [];
+        const env = typeof entry.config.env === "object" && entry.config.env !== null ? entry.config.env : {};
+        const lockEntry = lockEntries[entry.name];
+        const lockTracked = lockEntry !== void 0;
+        const health = checkCleoEntryHealth(command, lockTracked);
+        entries.push({
+          provider: provider.id,
+          providerName: provider.toolName,
+          serverName: entry.name,
+          channel,
+          scope,
+          command,
+          args,
+          env,
+          version: lockEntry?.version ?? null,
+          source: lockEntry?.source ?? null,
+          sourceType: lockEntry?.sourceType ?? null,
+          installedAt: lockEntry?.installedAt ?? null,
+          updatedAt: lockEntry?.updatedAt ?? null,
+          health
+        });
+        if (health.status === "broken") {
+          warnings.push({
+            code: "W_COMMAND_UNREACHABLE",
+            message: `${entry.name} command not reachable on ${provider.toolName} (${health.commandDetail})`
+          });
+        } else if (health.status === "degraded") {
+          warnings.push({
+            code: "W_NOT_TRACKED",
+            message: `${entry.name} on ${provider.toolName} is not tracked in lock file`
+          });
+        }
+      }
     }
   }
+  const issueCount = entries.filter((e) => e.health.status !== "healthy").length;
   if (format === "human") {
     if (entries.length === 0) {
-      console.log(pc6.dim("No CLEO MCP profiles found."));
+      console.log(pc6.dim("No CLEO channel profiles found."));
     } else {
+      console.log(pc6.bold("CLEO Channel Profiles"));
+      console.log();
+      const header = [
+        "Channel".padEnd(10),
+        "Version".padEnd(10),
+        "Provider".padEnd(22),
+        "Scope".padEnd(9),
+        "Command".padEnd(33),
+        "Status".padEnd(10),
+        "Installed".padEnd(12)
+      ].join("");
+      console.log(`  ${pc6.dim(header)}`);
+      console.log(`  ${pc6.dim("-".repeat(106))}`);
       for (const entry of entries) {
-        console.log(`${pc6.bold(entry.provider.padEnd(22))} ${entry.serverName.padEnd(10)} ${pc6.dim(entry.channel)}`);
+        const commandStr = entry.command ? `${entry.command} ${entry.args.join(" ")}`.slice(0, 31).padEnd(33) : pc6.dim("-").padEnd(33);
+        const versionStr = (entry.version ?? "-").padEnd(10);
+        const installedStr = entry.installedAt ? entry.installedAt.slice(0, 10).padEnd(12) : "-".padEnd(12);
+        let statusStr;
+        if (entry.health.status === "healthy") {
+          statusStr = pc6.green("healthy".padEnd(10));
+        } else if (entry.health.status === "degraded") {
+          statusStr = pc6.yellow("degraded".padEnd(10));
+        } else {
+          statusStr = pc6.red("broken".padEnd(10));
+        }
+        console.log(
+          `  ${entry.channel.padEnd(10)}${versionStr}${entry.providerName.padEnd(22)}${entry.scope.padEnd(9)}${commandStr}${statusStr}${installedStr}`
+        );
+      }
+      console.log();
+      const summary = `  ${entries.length} profile${entries.length !== 1 ? "s" : ""}`;
+      if (issueCount > 0) {
+        console.log(`${summary}  |  ${pc6.yellow(`${issueCount} issue${issueCount !== 1 ? "s" : ""}`)}`);
+        console.log();
+        console.log("  Issues:");
+        for (const w of warnings) {
+          console.log(`    ${pc6.yellow("!")} ${w.message}`);
+        }
+      } else {
+        console.log(summary);
+      }
+    }
+  }
+  if (format === "json") {
+    outputSuccess(
+      operation,
+      mvi,
+      {
+        providers: providers.map((provider) => provider.id),
+        scopes,
+        channel: channelFilter,
+        profiles: entries,
+        count: entries.length
+      },
+      void 0,
+      void 0,
+      warnings.length > 0 ? warnings : void 0
+    );
+  }
+}
+async function executeCleoRepair(opts, operation) {
+  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 providerIds = opts.provider.length > 0 ? opts.provider : void 0;
+  const result = await reconcileCleoLock({
+    providerIds,
+    all: opts.all,
+    global: opts.global,
+    project: opts.project,
+    prune: opts.prune,
+    dryRun: opts.dryRun
+  });
+  if (format === "human") {
+    const prefix = opts.dryRun ? "CLEO Lock Repair (dry run)" : "CLEO Lock Repair";
+    console.log(pc6.bold(prefix));
+    console.log();
+    if (result.backfilled.length > 0) {
+      for (const entry of result.backfilled) {
+        const agents = entry.agents.join(", ");
+        const versionStr = entry.version ? `(${entry.version})` : "";
+        console.log(
+          `  ${pc6.green("+")} ${entry.serverName.padEnd(12)}${entry.channel.padEnd(10)}${agents.padEnd(22)}${entry.scope.padEnd(10)}${entry.source}  ${pc6.dim(versionStr)}`
+        );
+      }
+    }
+    if (result.pruned.length > 0) {
+      for (const name of result.pruned) {
+        console.log(`  ${pc6.red("-")} ${name} (removed from lock)`);
+      }
+    }
+    if (result.backfilled.length === 0 && result.pruned.length === 0) {
+      console.log(pc6.dim("  No changes needed. All CLEO entries are tracked."));
+    }
+    console.log();
+    console.log(
+      `  ${result.backfilled.length} backfilled  |  ${result.pruned.length} pruned  |  ${result.alreadyTracked} already tracked`
+    );
+    if (result.errors.length > 0) {
+      console.log();
+      for (const err of result.errors) {
+        console.log(`  ${pc6.red("!")} ${err.message}`);
       }
     }
   }
   if (format === "json") {
     outputSuccess(operation, mvi, {
-      providers: providers.map((provider) => provider.id),
-      scope,
-      channel: channelFilter,
-      profiles: entries,
-      count: entries.length
+      backfilled: result.backfilled,
+      pruned: result.pruned,
+      alreadyTracked: result.alreadyTracked,
+      dryRun: opts.dryRun ?? false,
+      errors: result.errors
     });
   }
 }
@@ -2026,9 +2295,12 @@ function registerMcpCleoCommands(parent) {
   cleo.command("uninstall").description("Uninstall CLEO MCP profile for a channel").requiredOption("--channel <channel>", "CLEO channel: stable|beta|dev").option("--provider <id>", "Target provider (repeatable)", collect, []).option("--all", "Apply to all detected providers").option("-g, --global", "Use global scope").option("--dry-run", "Preview without writing").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
     await executeCleoUninstall(opts, "mcp.cleo.uninstall");
   });
-  cleo.command("show").description("Show installed CLEO MCP channel profiles").option("--provider <id>", "Target provider (repeatable)", collect, []).option("--all", "Inspect all detected providers").option("-g, --global", "Use global scope").option("--channel <channel>", "Filter channel: stable|beta|dev").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
+  cleo.command("show").description("Show installed CLEO MCP channel profiles").option("--provider <id>", "Target provider (repeatable)", collect, []).option("--all", "Inspect all detected providers").option("-g, --global", "Global scope only").option("-p, --project", "Project scope only").option("--channel <channel>", "Filter channel: stable|beta|dev").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
     await executeCleoShow(opts, "mcp.cleo.show");
   });
+  cleo.command("repair").description("Repair lock file by backfilling untracked CLEO entries").option("--provider <id>", "Target provider (repeatable)", collect, []).option("--all", "Scan all detected providers").option("-g, --global", "Global scope only").option("-p, --project", "Project scope only").option("--prune", "Remove orphaned lock entries not in any config").option("--dry-run", "Preview without writing").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
+    await executeCleoRepair(opts, "mcp.cleo.repair");
+  });
 }
 function registerMcpCleoCompatibilityCommands(parent) {
   parent.command("update").description("Update channel-managed MCP profile").argument("<name>", "Managed MCP profile name (cleo)").requiredOption("--channel <channel>", "CLEO channel: stable|beta|dev").option("--provider <id>", "Target provider (repeatable)", collect, []).option("--all", "Apply to all detected providers").option("-g, --global", "Use global scope").option("--version <tag>", "Tag/version for stable or beta").option("--command <command>", "Dev channel command").option("--arg <arg>", "Dev command arg (repeatable)", collect, []).option("--env <kv>", "Environment assignment KEY=value (repeatable)", collect, []).option("--cleo-dir <path>", "CLEO_DIR override for dev channel").option("--dry-run", "Preview without writing").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (name, opts) => {
@@ -2045,7 +2317,7 @@ function registerMcpCleoCompatibilityCommands(parent) {
     }
     await executeCleoUninstall(opts, "mcp.uninstall");
   });
-  parent.command("show").description("Show channel-managed MCP profile").argument("<name>", "Managed MCP profile name (cleo)").option("--provider <id>", "Target provider (repeatable)", collect, []).option("--all", "Inspect all detected providers").option("-g, --global", "Use global scope").option("--channel <channel>", "Filter channel: stable|beta|dev").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (name, opts) => {
+  parent.command("show").description("Show channel-managed MCP profile").argument("<name>", "Managed MCP profile name (cleo)").option("--provider <id>", "Target provider (repeatable)", collect, []).option("--all", "Inspect all detected providers").option("-g, --global", "Global scope only").option("-p, --project", "Project scope only").option("--channel <channel>", "Filter channel: stable|beta|dev").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (name, opts) => {
     if (name !== "cleo") {
       emitJsonError("mcp.show", "standard", ErrorCodes.INVALID_INPUT, "Only managed profile 'cleo' is supported by mcp show.", ErrorCategories.VALIDATION, { name });
       process.exit(1);
@@ -2090,9 +2362,12 @@ function registerCleoCommands(program2) {
   cleo.command("uninstall").description("Uninstall CLEO profile for a channel").requiredOption("--channel <channel>", "CLEO channel: stable|beta|dev").option("--provider <id>", "Target provider (repeatable)", collect, []).option("--all", "Apply to all detected providers").option("-g, --global", "Use global scope").option("--dry-run", "Preview without writing").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
     await executeCleoUninstall(opts, "cleo.uninstall");
   });
-  cleo.command("show").description("Show installed CLEO channel profiles").option("--provider <id>", "Target provider (repeatable)", collect, []).option("--all", "Inspect all detected providers").option("-g, --global", "Use global scope").option("--channel <channel>", "Filter channel: stable|beta|dev").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
+  cleo.command("show").description("Show installed CLEO channel profiles").option("--provider <id>", "Target provider (repeatable)", collect, []).option("--all", "Inspect all detected providers").option("-g, --global", "Global scope only").option("-p, --project", "Project scope only").option("--channel <channel>", "Filter channel: stable|beta|dev").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
     await executeCleoShow(opts, "cleo.show");
   });
+  cleo.command("repair").description("Repair lock file by backfilling untracked CLEO entries").option("--provider <id>", "Target provider (repeatable)", collect, []).option("--all", "Scan all detected providers").option("-g, --global", "Global scope only").option("-p, --project", "Project scope only").option("--prune", "Remove orphaned lock entries not in any config").option("--dry-run", "Preview without writing").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format").action(async (opts) => {
+    await executeCleoRepair(opts, "cleo.repair");
+  });
 }
 
 // src/commands/mcp/detect.ts