@cleocode/caamp 1.4.0 → 1.5.0

package/dist/cli.js

@@ -50,6 +50,7 @@ import {
   readConfig,
   readLockFile,
   recommendSkills,
+  reconcileCleoLock,
   recordMcpInstall,
   recordSkillInstall,
   removeMcpFromLock,
@@ -73,7 +74,7 @@ import {
   tokenizeCriteriaValue,
   updateInstructionsSingleOperation,
   validateSkill
-} from "./chunk-QZOOTKAJ.js";
+} from "./chunk-G7UPJOYG.js";
 
 // src/cli.ts
 import { Command } from "commander";
@@ -1173,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();
@@ -1241,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;
@@ -1260,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(),
@@ -1281,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}`,
@@ -1377,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";
@@ -2066,14 +2157,14 @@ async function executeCleoShow(opts, operation) {
       const header = [
         "Channel".padEnd(10),
         "Version".padEnd(10),
-        "Provider".padEnd(15),
+        "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(99))}`);
+      console.log(`  ${pc6.dim("-".repeat(106))}`);
       for (const entry of entries) {
         const commandStr = entry.command ? `${entry.command} ${entry.args.join(" ")}`.slice(0, 31).padEnd(33) : pc6.dim("-").padEnd(33);
         const versionStr = (entry.version ?? "-").padEnd(10);
@@ -2087,7 +2178,7 @@ async function executeCleoShow(opts, operation) {
           statusStr = pc6.red("broken".padEnd(10));
         }
         console.log(
-          `  ${entry.channel.padEnd(10)}${versionStr}${entry.providerName.padEnd(15)}${entry.scope.padEnd(9)}${commandStr}${statusStr}${installedStr}`
+          `  ${entry.channel.padEnd(10)}${versionStr}${entry.providerName.padEnd(22)}${entry.scope.padEnd(9)}${commandStr}${statusStr}${installedStr}`
         );
       }
       console.log();
@@ -2121,6 +2212,71 @@ async function executeCleoShow(opts, operation) {
     );
   }
 }
+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, {
+      backfilled: result.backfilled,
+      pruned: result.pruned,
+      alreadyTracked: result.alreadyTracked,
+      dryRun: opts.dryRun ?? false,
+      errors: result.errors
+    });
+  }
+}
 function buildInstallOptions(command) {
   return command.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("-y, --yes", "Skip confirmation").option("--interactive", "Guided interactive setup").option("--json", "Output as JSON (default)").option("--human", "Output in human-readable format");
 }
@@ -2142,6 +2298,9 @@ function registerMcpCleoCommands(parent) {
   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) => {
@@ -2206,6 +2365,9 @@ function registerCleoCommands(program2) {
   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