@cleocode/caamp 1.2.1 → 1.3.0

package/dist/cli.js

@@ -4,9 +4,11 @@ import {
   MarketplaceClient,
   RECOMMENDATION_ERROR_CODES,
   applyMcpInstallWithPolicy,
+  buildCleoProfile,
   buildServerConfig,
   buildSkillSubPathCandidates,
   checkAllInjections,
+  checkCommandReachability,
   checkSkillUpdate,
   configureProviderGlobalAndProject,
   detectAllProviders,
@@ -40,6 +42,8 @@ import {
   listMcpServers,
   listProfiles,
   listSkills,
+  normalizeCleoChannel,
+  parseEnvAssignments,
   parseSource,
   readConfig,
   readLockFile,
@@ -50,6 +54,8 @@ import {
   removeMcpServer,
   removeSkill,
   removeSkillFromLock,
+  resolveChannelFromServerName,
+  resolveCleoServerName,
   resolveConfigPath,
   resolvePreferredConfigScope,
   resolveProfile,
@@ -65,7 +71,7 @@ import {
   tokenizeCriteriaValue,
   updateInstructionsSingleOperation,
   validateSkill
-} from "./chunk-GR47LTXR.js";
+} from "./chunk-O2YG5HT7.js";
 
 // src/cli.ts
 import { Command } from "commander";
@@ -1604,134 +1610,6 @@ function registerInstructionsCommands(program2) {
 // src/commands/mcp/cleo.ts
 import { createInterface } from "readline/promises";
 import pc6 from "picocolors";
-
-// src/core/mcp/cleo.ts
-import { execFileSync as execFileSync2 } from "child_process";
-import { existsSync as existsSync3 } from "fs";
-import { homedir as homedir2 } from "os";
-import { isAbsolute, resolve } from "path";
-var CLEO_SERVER_NAMES = {
-  stable: "cleo",
-  beta: "cleo-beta",
-  dev: "cleo-dev"
-};
-var CLEO_MCP_NPM_PACKAGE = "@cleocode/cleo";
-var CLEO_DEV_DIR_DEFAULT = "~/.cleo-dev";
-function normalizeCleoChannel(value) {
-  if (!value || value.trim() === "") return "stable";
-  const normalized = value.trim().toLowerCase();
-  if (normalized === "stable" || normalized === "beta" || normalized === "dev") {
-    return normalized;
-  }
-  throw new Error(`Invalid channel "${value}". Expected stable, beta, or dev.`);
-}
-function resolveCleoServerName(channel) {
-  return CLEO_SERVER_NAMES[channel];
-}
-function resolveChannelFromServerName(serverName) {
-  if (serverName === CLEO_SERVER_NAMES.stable) return "stable";
-  if (serverName === CLEO_SERVER_NAMES.beta) return "beta";
-  if (serverName === CLEO_SERVER_NAMES.dev) return "dev";
-  return null;
-}
-function splitCommand(command, explicitArgs = []) {
-  if (explicitArgs.length > 0) {
-    return { command, args: explicitArgs };
-  }
-  const parts = command.trim().split(/\s+/);
-  const binary = parts[0] ?? "";
-  if (!binary) {
-    throw new Error("Command is required for dev channel.");
-  }
-  return {
-    command: binary,
-    args: parts.slice(1)
-  };
-}
-function normalizeEnv(env, channel, cleoDir) {
-  const result = { ...env ?? {} };
-  if (channel === "dev" && !result.CLEO_DIR) {
-    result.CLEO_DIR = cleoDir ?? CLEO_DEV_DIR_DEFAULT;
-  }
-  return Object.keys(result).length > 0 ? result : void 0;
-}
-function resolvePackageSpec(channel, version) {
-  const tag = version?.trim() || (channel === "stable" ? "latest" : "beta");
-  return `${CLEO_MCP_NPM_PACKAGE}@${tag}`;
-}
-function buildCleoProfile(options) {
-  const channel = options.channel;
-  const serverName = resolveCleoServerName(channel);
-  if (channel === "dev") {
-    if (!options.command || options.command.trim() === "") {
-      throw new Error("Dev channel requires --command.");
-    }
-    const parsed = splitCommand(options.command, options.args ?? []);
-    const env = normalizeEnv(options.env, channel, options.cleoDir);
-    return {
-      channel,
-      serverName,
-      config: {
-        command: parsed.command,
-        args: parsed.args,
-        ...env ? { env } : {}
-      }
-    };
-  }
-  const packageSpec = resolvePackageSpec(channel, options.version);
-  return {
-    channel,
-    serverName,
-    packageSpec,
-    config: {
-      command: "npx",
-      args: ["-y", packageSpec, "cleo-mcp"]
-    }
-  };
-}
-function expandHome(pathValue) {
-  if (pathValue === "~") return homedir2();
-  if (pathValue.startsWith("~/")) {
-    return resolve(homedir2(), pathValue.slice(2));
-  }
-  return pathValue;
-}
-function checkCommandReachability(command) {
-  const hasPathSeparator = command.includes("/") || command.includes("\\");
-  if (hasPathSeparator || command.startsWith("~")) {
-    const expanded = expandHome(command);
-    const candidate = isAbsolute(expanded) ? expanded : resolve(process.cwd(), expanded);
-    if (existsSync3(candidate)) {
-      return { reachable: true, method: "path", detail: candidate };
-    }
-    return { reachable: false, method: "path", detail: candidate };
-  }
-  try {
-    const lookup = process.platform === "win32" ? "where" : "which";
-    execFileSync2(lookup, [command], { stdio: "pipe" });
-    return { reachable: true, method: "lookup", detail: command };
-  } catch {
-    return { reachable: false, method: "lookup", detail: command };
-  }
-}
-function parseEnvAssignments(values) {
-  const env = {};
-  for (const value of values) {
-    const idx = value.indexOf("=");
-    if (idx <= 0) {
-      throw new Error(`Invalid --env value "${value}". Use KEY=value.`);
-    }
-    const key = value.slice(0, idx).trim();
-    const val = value.slice(idx + 1).trim();
-    if (!key) {
-      throw new Error(`Invalid --env value "${value}". Key cannot be empty.`);
-    }
-    env[key] = val;
-  }
-  return env;
-}
-
-// src/commands/mcp/cleo.ts
 function collect(value, previous) {
   return [...previous, value];
 }
@@ -2197,9 +2075,28 @@ function shouldUseCleoCompatibilityInstall(source, channel) {
   if (source.trim().toLowerCase() !== "cleo") return false;
   return typeof channel === "string" && channel.trim() !== "";
 }
+function registerCleoCommands(program2) {
+  const cleo = program2.command("cleo").description("Manage CLEO channel profiles");
+  buildInstallOptions(
+    cleo.command("install").description("Install CLEO profile by channel")
+  ).action(async (opts) => {
+    await executeCleoInstall("install", opts, "cleo.install");
+  });
+  buildInstallOptions(
+    cleo.command("update").description("Update CLEO profile by channel")
+  ).action(async (opts) => {
+    await executeCleoInstall("update", opts, "cleo.update");
+  });
+  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) => {
+    await executeCleoShow(opts, "cleo.show");
+  });
+}
 
 // src/commands/mcp/detect.ts
-import { existsSync as existsSync4 } from "fs";
+import { existsSync as existsSync3 } from "fs";
 import pc7 from "picocolors";
 function registerMcpDetect(parent) {
   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) => {
@@ -2225,7 +2122,7 @@ function registerMcpDetect(parent) {
       const projectPath = resolveConfigPath(provider, "project");
       const globalEntries = await listMcpServers(provider, "global");
       const projectEntries = await listMcpServers(provider, "project");
-      const configsFound = (globalPath && existsSync4(globalPath) ? 1 : 0) + (projectPath && existsSync4(projectPath) ? 1 : 0);
+      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({
@@ -2247,8 +2144,8 @@ ${providers.length} provider(s) with MCP support:
     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 && existsSync4(globalPath);
-      const hasProject = projectPath && existsSync4(projectPath);
+      const hasGlobal = globalPath && existsSync3(globalPath);
+      const hasProject = projectPath && existsSync3(projectPath);
       const globalIcon = hasGlobal ? pc7.green("G") : pc7.dim("-");
       const projectIcon = hasProject ? pc7.green("P") : pc7.dim("-");
       const serverList = provider.servers.length > 0 ? pc7.dim(provider.servers.join(", ")) : pc7.dim("no servers");
@@ -2735,7 +2632,7 @@ function emitJsonError2(operation, mvi, code, message, category, details = {}) {
 }
 
 // src/commands/skills/install.ts
-import { existsSync as existsSync5 } from "fs";
+import { existsSync as existsSync4 } from "fs";
 import pc12 from "picocolors";
 
 // src/core/sources/github.ts
@@ -3185,7 +3082,7 @@ async function handleMarketplaceSource(source, _providers, _isGlobal, format, op
     for (const subPath of subPathCandidates) {
       try {
         const result = await cloneRepo(parsed.owner, parsed.repo, parsed.ref, subPath);
-        if (subPath && !existsSync5(result.localPath)) {
+        if (subPath && !existsSync4(result.localPath)) {
           await result.cleanup();
           continue;
         }
@@ -3841,8 +3738,8 @@ ${outdated.length} skill(s) have updates available:
     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((resolve2) => {
-        rl.question(pc17.dim("\nProceed with update? [y/N] "), resolve2);
+      const answer = await new Promise((resolve) => {
+        rl.question(pc17.dim("\nProceed with update? [y/N] "), resolve);
       });
       rl.close();
       if (answer.toLowerCase() !== "y" && answer.toLowerCase() !== "yes") {
@@ -3959,7 +3856,7 @@ ${outdated.length} skill(s) have updates available:
 }
 
 // src/commands/skills/init.ts
-import { existsSync as existsSync6 } from "fs";
+import { existsSync as existsSync5 } from "fs";
 import { mkdir, writeFile } from "fs/promises";
 import { join as join5 } from "path";
 import pc18 from "picocolors";
@@ -3981,7 +3878,7 @@ function registerSkillsInit(parent) {
     }
     const skillName = name ?? "my-skill";
     const skillDir = join5(opts.dir, skillName);
-    if (existsSync6(skillDir)) {
+    if (existsSync5(skillDir)) {
       const message = `Directory already exists: ${skillDir}`;
       if (format === "json") {
         emitJsonError(operation, mvi, ErrorCodes.INVALID_CONSTRAINT, message, ErrorCategories.CONFLICT, {
@@ -4036,13 +3933,13 @@ Show example inputs and expected outputs.
 }
 
 // src/commands/skills/audit.ts
-import { existsSync as existsSync7, statSync } from "fs";
+import { existsSync as existsSync6, statSync } from "fs";
 import pc19 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 (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 (!existsSync7(path)) {
+    if (!existsSync6(path)) {
       const message = `Path not found: ${path}`;
       if (opts.sarif) {
         console.error(JSON.stringify({
@@ -4274,6 +4171,7 @@ program.hook("preAction", (thisCommand) => {
 registerProvidersCommand(program);
 registerSkillsCommands(program);
 registerMcpCommands(program);
+registerCleoCommands(program);
 registerInstructionsCommands(program);
 registerConfigCommand(program);
 registerDoctorCommand(program);