@codemcp/skills 2.1.0 → 2.2.0

package/dist/cli.js

@@ -3,9 +3,9 @@ import {
   M,
   Se,
   Y,
+  __toESM,
   agents,
   detectInstalledAgents,
-  discoverSkills,
   fe,
   fetchSkillFolderHash,
   getAllLockedSkills,
@@ -13,9 +13,7 @@ import {
   getCanonicalSkillsDir,
   getGitHubToken,
   getInstallPath,
-  getMCPCanonicalSkillsDir,
   getSkillFromLock,
-  he,
   initTelemetry,
   isRepoPrivate,
   listInstalledSkills,
@@ -29,28 +27,15 @@ import {
   runSync,
   sanitizeName,
   track,
-  ve,
   xe,
   ye
-} from "./chunk-US7NTYE7.js";
-import {
-  ConfigGeneratorRegistry,
-  GitHubCopilotGenerator,
-  KiroGenerator,
-  McpConfigAdapterRegistry,
-  OpenCodeAgentGenerator,
-  OpenCodeMcpGenerator,
-  VsCodeGenerator
-} from "./chunk-OAWSLH2D.js";
-import {
-  __toESM
-} from "./chunk-JSBRDJBE.js";
+} from "./chunk-ST4EFJHD.js";
 
 // src/cli.ts
 import { spawnSync } from "child_process";
 import { writeFileSync, readFileSync, existsSync, mkdirSync } from "fs";
-import { basename, join as join3, dirname as dirname2 } from "path";
-import { homedir as homedir4 } from "os";
+import { basename, join as join2, dirname } from "path";
+import { homedir as homedir2 } from "os";
 import { fileURLToPath } from "url";
 
 // src/find.ts
@@ -78,7 +63,7 @@ async function searchSkillsAPI(query) {
       slug: skill.id,
       source: skill.source || "",
       installs: skill.installs
-    }));
+    })).sort((a, b) => (b.installs || 0) - (a.installs || 0));
   } catch {
     return [];
   }
@@ -236,8 +221,8 @@ async function runFind(args) {
   const query = args.join(" ");
   const isNonInteractive = !process.stdin.isTTY;
   const agentTip = `${DIM}Tip: if running in a coding agent, follow these steps:${RESET}
-${DIM}  1) npx @codemcp/skills find [query]${RESET}
-${DIM}  2) npx @codemcp/skills add <owner/repo@skill>${RESET}`;
+${DIM}  1) npx skills find [query]${RESET}
+${DIM}  2) npx skills add <owner/repo@skill>${RESET}`;
   if (query) {
     const results = await searchSkillsAPI(query);
     track({
@@ -249,7 +234,7 @@ ${DIM}  2) npx @codemcp/skills add <owner/repo@skill>${RESET}`;
       console.log(`${DIM}No skills found for "${query}"${RESET}`);
       return;
     }
-    console.log(`${DIM}Install with${RESET} npx @codemcp/skills add <owner/repo@skill>`);
+    console.log(`${DIM}Install with${RESET} npx skills add <owner/repo@skill>`);
     console.log();
     for (const skill of results.slice(0, 6)) {
       const pkg2 = skill.source || skill.slug;
@@ -328,6 +313,8 @@ function parseListOptions(args) {
     const arg = args[i];
     if (arg === "-g" || arg === "--global") {
       options.global = true;
+    } else if (arg === "--json") {
+      options.json = true;
     } else if (arg === "-a" || arg === "--agent") {
       options.agent = options.agent || [];
       while (i + 1 < args.length && !args[i + 1].startsWith("-")) {
@@ -355,10 +342,24 @@ async function runList(args) {
     global: scope,
     agentFilter
   });
+  if (options.json) {
+    const jsonOutput = installedSkills.map((skill) => ({
+      name: skill.name,
+      path: skill.canonicalPath,
+      scope: skill.scope,
+      agents: skill.agents.map((a) => agents[a].displayName)
+    }));
+    console.log(JSON.stringify(jsonOutput, null, 2));
+    return;
+  }
   const lockedSkills = await getAllLockedSkills();
   const cwd = process.cwd();
   const scopeLabel = scope ? "Global" : "Project";
   if (installedSkills.length === 0) {
+    if (options.json) {
+      console.log("[]");
+      return;
+    }
     console.log(`${DIM2}No ${scopeLabel.toLowerCase()} skills found.${RESET2}`);
     if (scope) {
       console.log(`${DIM2}Try listing project skills without -g${RESET2}`);
@@ -649,679 +650,11 @@ function parseRemoveOptions(args) {
   return { skills, options };
 }
 
-// src/mcp.ts
-import { homedir as homedir3 } from "os";
-
-// src/mcp-configurator.ts
-import { promises as fs } from "fs";
-import { join as join2, dirname } from "path";
-import { homedir as homedir2 } from "os";
-var AGENT_TO_MCP_CLIENT = {
-  "claude-code": "claude-desktop",
-  claude: "claude-desktop",
-  cline: "cline",
-  cursor: "cursor",
-  "kiro-cli": "kiro",
-  kiro: "kiro",
-  junie: "junie",
-  opencode: "opencode",
-  zed: "zed",
-  continue: "continue",
-  "github-copilot": "github-copilot",
-  "mistral-vibe": "mistral-vibe",
-  windsurf: "windsurf",
-  codex: "codex",
-  "command-code": "command-code",
-  cortex: "cortex",
-  crush: "crush",
-  droid: "droid",
-  "gemini-cli": "gemini-cli",
-  goose: "goose",
-  "iflow-cli": "iflow-cli",
-  kilo: "kilo",
-  "kimi-cli": "kimi-cli",
-  kode: "kode",
-  mcpjam: "mcpjam",
-  mux: "mux",
-  neovate: "neovate",
-  openhands: "openhands",
-  pi: "pi",
-  qoder: "qoder",
-  "qwen-code": "qwen-code",
-  replit: "replit",
-  roo: "roo",
-  trae: "trae",
-  "trae-cn": "trae-cn",
-  zencoder: "zencoder",
-  pochi: "pochi",
-  adal: "adal",
-  universal: "universal",
-  amp: "amp",
-  antigravity: "antigravity",
-  augment: "augment",
-  openclaw: "openclaw",
-  codebuddy: "codebuddy"
-};
-function getAgentConfigPath(agentType, cwd, scope = "local") {
-  const mappedType = AGENT_TO_MCP_CLIENT[agentType] || agentType;
-  switch (mappedType) {
-    case "claude-desktop":
-      return join2(cwd, ".claude", "mcp.json");
-    case "cline":
-      return join2(cwd, ".cline", "mcp.json");
-    case "cursor":
-      return join2(cwd, ".cursor", "mcp.json");
-    case "kiro":
-      if (scope === "global") {
-        return join2(cwd, ".kiro", "agents", "default.json");
-      }
-      return join2(cwd, ".kiro", "mcp.json");
-    case "github-copilot":
-      return join2(cwd, ".vscode", "mcp.json");
-    case "junie":
-      return join2(cwd, ".junie", "mcp.json");
-    case "opencode":
-      if (scope === "global") {
-        return join2(cwd, ".config", "opencode", "opencode.json");
-      }
-      return join2(cwd, "opencode.json");
-    case "zed":
-      return join2(cwd, ".config", "zed", "settings.json");
-    case "continue":
-      return join2(cwd, ".continue", "config.json");
-    // For other agents, try to infer config path
-    default:
-      const sanitized = mappedType.replace(/[^a-z0-9-]/gi, "_").toLowerCase();
-      return join2(cwd, `.${sanitized}`, "mcp.json");
-  }
-}
-async function readAgentConfig(configPath, agentType) {
-  try {
-    const content = await fs.readFile(configPath, "utf-8");
-    const raw = JSON.parse(content);
-    if (agentType) {
-      const mappedType = AGENT_TO_MCP_CLIENT[agentType] || agentType;
-      const adapter = McpConfigAdapterRegistry.getAdapter(mappedType);
-      return adapter.toStandard(raw);
-    }
-    return raw;
-  } catch (error) {
-    if (error.code === "ENOENT") {
-      return { mcpServers: {} };
-    }
-    throw error;
-  }
-}
-async function writeAgentConfig(configPath, config) {
-  const dir = dirname(configPath);
-  await fs.mkdir(dir, { recursive: true });
-  await fs.writeFile(configPath, JSON.stringify(config, null, 2) + "\n");
-}
-async function configureAgentMcp(agentType, cwd, scope = "local") {
-  if (!agentType || typeof agentType !== "string") {
-    throw new Error(`Invalid agent type: ${agentType}`);
-  }
-  if (!AGENT_TO_MCP_CLIENT[agentType] && !isValidMcpClientType(agentType)) {
-    throw new Error(`Unknown agent type: ${agentType}`);
-  }
-  const configPath = getAgentConfigPath(agentType, cwd, scope);
-  let config = await readAgentConfig(configPath, agentType);
-  if (!config.mcpServers) {
-    config.mcpServers = {};
-  }
-  const mcpServerConfig = {
-    command: "npx",
-    args: ["-y", "@codemcp/skills-server"]
-  };
-  config.mcpServers.agentskills = mcpServerConfig;
-  const mappedType = AGENT_TO_MCP_CLIENT[agentType] || agentType;
-  const adapter = McpConfigAdapterRegistry.getAdapter(mappedType);
-  let existingAgentConfig;
-  try {
-    const existingContent = await fs.readFile(configPath, "utf-8");
-    existingAgentConfig = JSON.parse(existingContent);
-  } catch {
-    existingAgentConfig = void 0;
-  }
-  const agentSpecificConfig = adapter.toClient(config, existingAgentConfig);
-  await writeAgentConfig(configPath, agentSpecificConfig);
-}
-function isValidMcpClientType(type) {
-  const validTypes = [
-    "claude-desktop",
-    "cline",
-    "cursor",
-    "kiro",
-    "junie",
-    "opencode",
-    "zed",
-    "continue",
-    "codium"
-  ];
-  return validTypes.includes(type);
-}
-function buildConfigGeneratorRegistry() {
-  const registry = new ConfigGeneratorRegistry();
-  registry.register(new VsCodeGenerator());
-  registry.register(new KiroGenerator());
-  registry.register(new OpenCodeMcpGenerator());
-  return registry;
-}
-async function safeWrite(filePath, content) {
-  try {
-    const stat = await fs.stat(filePath);
-    if (stat.isDirectory()) {
-      throw new Error(
-        `Generator returned a directory path instead of a file path: ${filePath}. Generators must write to a specific named file and must never clear or overwrite directories.`
-      );
-    }
-  } catch (e) {
-    if (e.code !== "ENOENT") throw e;
-  }
-  const dir = dirname(filePath);
-  await fs.mkdir(dir, { recursive: true });
-  await fs.writeFile(filePath, content, "utf-8");
-}
-async function writeGeneratedConfig(generatedConfig) {
-  if (generatedConfig.files) {
-    for (const file of generatedConfig.files) {
-      const content = typeof file.content === "string" ? file.content : JSON.stringify(file.content, null, 2);
-      await safeWrite(file.path, content);
-    }
-  } else {
-    const content = typeof generatedConfig.content === "string" ? generatedConfig.content : JSON.stringify(generatedConfig.content, null, 2);
-    await safeWrite(generatedConfig.filePath, content);
-  }
-}
-async function generateSkillsMcpAgent(agentType, cwd, scope = "local", extraServers, includeAgentConfig = true) {
-  const registry = buildConfigGeneratorRegistry();
-  const skillsDir = scope === "global" ? homedir2() : cwd;
-  const baseConfig = {
-    id: "skills-mcp",
-    description: "Agent-skills MCP server with use_skill tool access",
-    mcp_servers: {
-      "agent-skills": {
-        type: "stdio",
-        command: "npx",
-        args: ["-y", "@codemcp/skills-server"],
-        tools: ["*"]
-      },
-      ...extraServers
-    },
-    tools: { use_skill: true },
-    permissions: { use_skill: "allow" }
-  };
-  const generatorOptions = {
-    skillsDir,
-    agentId: "skills-mcp",
-    scope,
-    isGlobal: scope === "global",
-    includeAgentConfig
-  };
-  const generator = registry.getGenerator(agentType);
-  if (!generator) {
-    throw new Error(
-      `No config generator found for agent type: ${agentType}. Supported types: ${registry.getSupportedAgentTypes().join(", ")}`
-    );
-  }
-  await writeGeneratedConfig(await generator.generate(baseConfig, generatorOptions));
-  if (includeAgentConfig && generator instanceof VsCodeGenerator) {
-    const agentFileGenerator = new GitHubCopilotGenerator();
-    await writeGeneratedConfig(await agentFileGenerator.generate(baseConfig, generatorOptions));
-  }
-  if (includeAgentConfig && generator instanceof OpenCodeMcpGenerator) {
-    const agentFileGenerator = new OpenCodeAgentGenerator();
-    await writeGeneratedConfig(await agentFileGenerator.generate(baseConfig, generatorOptions));
-  }
-}
-
-// src/mcp-skill-deps.ts
-import { promises as fs2 } from "fs";
-var import_picocolors2 = __toESM(require_picocolors(), 1);
-async function loadInstalledSkillMcpDeps(cwd, scope) {
-  const isGlobal = scope === "global";
-  const searchDirs = [
-    getCanonicalSkillsDir(isGlobal, cwd),
-    getMCPCanonicalSkillsDir(isGlobal, cwd)
-  ];
-  const seen = /* @__PURE__ */ new Map();
-  const serverToolSets = /* @__PURE__ */ new Map();
-  for (const dir of searchDirs) {
-    try {
-      const skills = await discoverSkills(dir, void 0, { fullDepth: true });
-      for (const skill of skills) {
-        for (const dep of skill.requiresMcpServers ?? []) {
-          if (!seen.has(dep.name)) {
-            seen.set(dep.name, dep);
-          }
-          const skillAllowedTools = skill.allowedTools;
-          const serverName = dep.name;
-          if (!skillAllowedTools || skillAllowedTools.length === 0) {
-            serverToolSets.set(serverName, "wildcard");
-          } else if (serverToolSets.get(serverName) !== "wildcard") {
-            const prefix = `@${serverName}/`;
-            const serverTools = skillAllowedTools.filter((t) => t.startsWith(prefix)).map((t) => t.slice(prefix.length));
-            if (serverTools.length === 0) {
-              serverToolSets.set(serverName, "wildcard");
-            } else {
-              const existing = serverToolSets.get(serverName);
-              if (existing instanceof Set) {
-                for (const t of serverTools) existing.add(t);
-              } else {
-                serverToolSets.set(serverName, new Set(serverTools));
-              }
-            }
-          }
-        }
-      }
-    } catch {
-    }
-  }
-  const allowedToolsByServer = {};
-  for (const [serverName, toolsOrWildcard] of serverToolSets.entries()) {
-    if (toolsOrWildcard instanceof Set) {
-      allowedToolsByServer[serverName] = [...toolsOrWildcard];
-    }
-  }
-  return { deps: [...seen.values()], allowedToolsByServer };
-}
-function substituteParam(value, params) {
-  return value.replace(
-    /\{\{([A-Za-z0-9_-]+)\}\}/g,
-    (_, key) => params[key] ?? `{{${key}}}`
-  );
-}
-function applyParams(dep, params) {
-  const result = {
-    command: dep.command
-  };
-  if (dep.args?.length) result.args = dep.args.map((a) => substituteParam(a, params));
-  if (dep.env && Object.keys(dep.env).length) {
-    result.env = Object.fromEntries(
-      Object.entries(dep.env).map(([k, v]) => [k, substituteParam(v, params)])
-    );
-  }
-  if (dep.cwd) result.cwd = dep.cwd;
-  return result;
-}
-async function resolveParameters(dep) {
-  const result = {};
-  if (!dep.parameters) return result;
-  for (const [paramName, spec] of Object.entries(dep.parameters)) {
-    let resolved = spec.default;
-    if (resolved?.startsWith("{{ENV:")) {
-      const m = resolved.match(/\{\{ENV:([A-Za-z0-9_]+)\}\}/);
-      if (m) resolved = process.env[m[1]] ?? void 0;
-    }
-    if (resolved !== void 0) {
-      result[paramName] = resolved;
-      continue;
-    }
-    if (!spec.required) continue;
-    const answer = await he({
-      message: `${import_picocolors2.default.cyan(dep.name)} needs ${import_picocolors2.default.bold(paramName)}: ${spec.description}`
-    });
-    if (pD(answer)) {
-      xe("MCP server configuration cancelled");
-      process.exit(0);
-    }
-    result[paramName] = answer;
-  }
-  return result;
-}
-async function configureSkillMcpDepsForAgents(deps, agentTypes, configCwd, scope, configMode = "agent-config", allowedToolsByServer = {}) {
-  if (deps.length === 0 || agentTypes.length === 0) return;
-  const resolvedConfigs = /* @__PURE__ */ new Map();
-  for (const dep of deps) {
-    const params = await resolveParameters(dep);
-    resolvedConfigs.set(dep.name, applyParams(dep, params));
-  }
-  const registry = buildConfigGeneratorRegistry();
-  let anyConfigured = false;
-  for (const agentType of agentTypes) {
-    const useAgentConfig = configMode === "agent-config" && registry.supports(agentType);
-    if (useAgentConfig) {
-      const missingServers = {};
-      for (const dep of deps) {
-        const resolved = resolvedConfigs.get(dep.name);
-        const restrictedTools = allowedToolsByServer[dep.name];
-        missingServers[dep.name] = {
-          command: resolved.command,
-          args: resolved.args,
-          env: resolved.env,
-          ...resolved.cwd ? { cwd: resolved.cwd } : {},
-          // Only whitelist specific tools when the skill declares allowedTools
-          // for this server; otherwise leave undefined so generators use wildcard.
-          ...restrictedTools ? { tools: restrictedTools } : {}
-        };
-      }
-      try {
-        await generateSkillsMcpAgent(agentType, configCwd, scope, missingServers);
-        for (const dep of deps) {
-          M.success(
-            `${import_picocolors2.default.green("\u2713")} Added ${import_picocolors2.default.cyan(dep.name)} to ${import_picocolors2.default.dim(agents[agentType]?.displayName || agentType)}`
-          );
-        }
-        anyConfigured = true;
-      } catch {
-        M.warn(
-          import_picocolors2.default.yellow(
-            `Could not update agent config for ${agents[agentType]?.displayName || agentType} \u2014 add skill MCP servers manually`
-          )
-        );
-      }
-    } else {
-      const { McpConfigAdapterRegistry: McpConfigAdapterRegistry2 } = await import("./dist-TGUYKB34.js");
-      const configPath = getAgentConfigPath(agentType, configCwd, scope);
-      const config = await readAgentConfig(configPath, agentType);
-      if (!config.mcpServers) config.mcpServers = {};
-      let anyServerAdded = false;
-      for (const dep of deps) {
-        if (config.mcpServers[dep.name]) continue;
-        config.mcpServers[dep.name] = resolvedConfigs.get(dep.name);
-        anyServerAdded = true;
-        M.success(
-          `${import_picocolors2.default.green("\u2713")} Added ${import_picocolors2.default.cyan(dep.name)} to ${import_picocolors2.default.dim(agents[agentType]?.displayName || agentType)}`
-        );
-      }
-      if (anyServerAdded) {
-        try {
-          const { McpConfigAdapterRegistry: McpConfigAdapterRegistry3 } = await import("./dist-TGUYKB34.js");
-          const adapter = McpConfigAdapterRegistry3.getAdapter(agentType);
-          let existingAgentConfig;
-          try {
-            const existingContent = await fs2.readFile(configPath, "utf-8");
-            existingAgentConfig = JSON.parse(existingContent);
-          } catch {
-            existingAgentConfig = void 0;
-          }
-          const agentSpecificConfig = adapter.toClient(config, existingAgentConfig);
-          await writeAgentConfig(configPath, agentSpecificConfig);
-          anyConfigured = true;
-        } catch (error) {
-          M.warn(
-            import_picocolors2.default.yellow(
-              `Could not update MCP config for ${agents[agentType]?.displayName || agentType} \u2014 add skills manually`
-            )
-          );
-        }
-      }
-    }
-  }
-  if (anyConfigured) {
-    console.log();
-  }
-}
-
-// src/mcp.ts
-function parseMcpOptions(args) {
-  const agentList = [];
-  let scope = "local";
-  let configMode;
-  for (let i = 0; i < args.length; i++) {
-    const arg = args[i];
-    if (arg === "-a" || arg === "--agent") {
-      i++;
-      let nextArg = args[i];
-      while (i < args.length && nextArg && !nextArg.startsWith("-")) {
-        agentList.push(nextArg);
-        i++;
-        nextArg = args[i];
-      }
-      i--;
-    } else if (arg === "-g" || arg === "--global") {
-      scope = "global";
-    } else if (arg === "--agent-config") {
-      configMode = "agent-config";
-    } else if (arg === "--mcp-json") {
-      configMode = "mcp-json";
-    }
-  }
-  const mode = agentList.length > 0 ? "cli" : "tui";
-  return {
-    mode,
-    agents: agentList,
-    scope,
-    configMode
-  };
-}
-async function runMcpSetup(options, cwd = process.cwd()) {
-  const scope = options.scope || "local";
-  const configCwd = scope === "global" ? homedir3() : cwd;
-  if (options.mode === "tui") {
-    await setupTuiMode(configCwd, scope, options.configMode);
-  } else {
-    await setupCliMode(options.agents, configCwd, scope, options.configMode);
-  }
-}
-function isGeneratorBacked(agentType) {
-  return buildConfigGeneratorRegistry().supports(agentType);
-}
-async function configureOneAgent(agentType, configCwd, scope, configMode) {
-  try {
-    if (configMode === "agent-config" && isGeneratorBacked(agentType)) {
-      await generateSkillsMcpAgent(agentType, configCwd, scope);
-    } else {
-      await configureAgentMcp(agentType, configCwd, scope);
-    }
-    return agentType;
-  } catch (error) {
-    console.error(
-      `\u2717 Failed to configure ${agents[agentType]?.displayName || agentType}:`,
-      error.message
-    );
-    return null;
-  }
-}
-function printAgentSummary(agentType, configMode, _scope) {
-  const agent = agents[agentType];
-  const displayName = agent?.displayName || agentType;
-  const isVerified = agent?.agentConfigSupport?.verified ?? false;
-  if (configMode === "agent-config" && isGeneratorBacked(agentType)) {
-    const hint = agent?.agentConfigSupport?.activationHint;
-    console.log(`  \u2713 ${displayName} \u2014 agent config written`);
-    if (hint) {
-      const looksLikeCli = !hint.includes(" ") || hint.startsWith("kiro") || hint.startsWith("opencode");
-      if (looksLikeCli) {
-        console.log(`    \u2192 To activate:  ${hint}`);
-      } else {
-        console.log(`    \u2192 ${hint}`);
-      }
-    }
-    if (!isVerified) {
-      console.log(
-        `    \u26A0\uFE0F  MCP integration not yet verified. Please ensure ${displayName} picks up the MCP server.`
-      );
-    }
-  } else {
-    console.log(`  \u2713 ${displayName} \u2014 MCP server registered in mcp.json`);
-    if (!isVerified) {
-      console.log(
-        `    \u26A0\uFE0F  MCP integration not yet verified. Please check that ${displayName} has loaded the MCP server.`
-      );
-    }
-  }
-}
-async function setupTuiMode(cwd, scope = "local", forcedConfigMode) {
-  const installedAgents = await detectInstalledAgents();
-  if (installedAgents.length === 0) {
-    console.log("No supported agents detected. Please install an agent first.");
-    return;
-  }
-  const selectedScope = await ve({
-    message: "Where should MCP configs be stored?",
-    options: [
-      { value: "local", label: "Local (Project directory) \u2014 shared via Git" },
-      { value: "global", label: "Global (Home directory) \u2014 personal settings only" }
-    ]
-  });
-  if (typeof selectedScope === "symbol") {
-    xe("Operation cancelled");
-    return;
-  }
-  scope = selectedScope;
-  const configCwd = scope === "global" ? homedir3() : cwd;
-  const selectedAgents = await fe({
-    message: "Select agents to configure for MCP:",
-    options: installedAgents.map((agentType) => {
-      const agent = agents[agentType];
-      const supportsAgentConfig = !!agent?.agentConfigSupport;
-      return {
-        value: agentType,
-        label: `${agent?.displayName || agentType}${supportsAgentConfig ? " \u2726" : ""}`,
-        hint: supportsAgentConfig ? "supports agent config" : void 0
-      };
-    })
-  });
-  if (typeof selectedAgents === "symbol") {
-    xe("Operation cancelled");
-    return;
-  }
-  if (!selectedAgents || selectedAgents.length === 0) {
-    console.log("No agents selected.");
-    return;
-  }
-  const agentConfigCapable = selectedAgents.filter(
-    (a) => isGeneratorBacked(a)
-  );
-  let configMode = "mcp-json";
-  if (forcedConfigMode) {
-    configMode = forcedConfigMode;
-  } else if (agentConfigCapable.length > 0) {
-    const capableNames = agentConfigCapable.map((a) => agents[a]?.displayName || a).join(", ");
-    const modeChoice = await ve({
-      message: `How should skills-mcp be configured for ${capableNames}?`,
-      options: [
-        {
-          value: "agent-config",
-          label: 'Agent config \u2014 creates a named "skills-mcp" agent with usage instructions',
-          hint: "Recommended: selectable by name; bundled prompt guides the agent"
-        },
-        {
-          value: "mcp-json",
-          label: "MCP server only \u2014 registers servers in mcp.json, no dedicated agent",
-          hint: "Simpler; MCP server is available in all conversations without a named agent"
-        }
-      ]
-    });
-    if (typeof modeChoice === "symbol") {
-      xe("Operation cancelled");
-      return;
-    }
-    configMode = modeChoice;
-  }
-  console.log("");
-  const configuredAgents = [];
-  for (const agentType of selectedAgents) {
-    const result = await configureOneAgent(agentType, configCwd, scope, configMode);
-    if (result !== null) configuredAgents.push(agentType);
-  }
-  if (configuredAgents.length > 0) {
-    const { deps: skillDeps, allowedToolsByServer } = await loadInstalledSkillMcpDeps(cwd, scope);
-    await configureSkillMcpDepsForAgents(
-      skillDeps,
-      configuredAgents,
-      configCwd,
-      scope,
-      configMode,
-      allowedToolsByServer
-    );
-  }
-  const scopeLabel = scope === "global" ? "global (home directory)" : "local (project directory)";
-  const failCount = selectedAgents.length - configuredAgents.length;
-  console.log("");
-  if (configuredAgents.length > 0) {
-    console.log(`Configured ${configuredAgents.length} agent(s) in ${scopeLabel}:`);
-    for (const agentType of configuredAgents) {
-      printAgentSummary(agentType, configMode, scope);
-    }
-  }
-  if (failCount > 0) {
-    console.error(`
-\u2717 Failed to configure ${failCount} agent(s) in ${scopeLabel}`);
-  }
-}
-async function setupCliMode(agentTypes, cwd, scope = "local", forcedConfigMode) {
-  if (agentTypes.includes("*")) {
-    const installedAgents = await detectInstalledAgents();
-    agentTypes = installedAgents;
-  }
-  const configuredAgents = [];
-  for (const agentType of agentTypes) {
-    const configMode = forcedConfigMode ?? (isGeneratorBacked(agentType) ? "agent-config" : "mcp-json");
-    const result = await configureOneAgent(agentType, cwd, scope, configMode);
-    if (result !== null) configuredAgents.push(agentType);
-  }
-  if (configuredAgents.length > 0) {
-    const { deps: skillDeps, allowedToolsByServer } = await loadInstalledSkillMcpDeps(cwd, scope);
-    if (forcedConfigMode) {
-      const generatorBacked = configuredAgents.filter((a) => isGeneratorBacked(a));
-      const rawMcp = configuredAgents.filter((a) => !isGeneratorBacked(a));
-      if (generatorBacked.length > 0) {
-        await configureSkillMcpDepsForAgents(
-          skillDeps,
-          generatorBacked,
-          cwd,
-          scope,
-          forcedConfigMode,
-          allowedToolsByServer
-        );
-      }
-      if (rawMcp.length > 0) {
-        await configureSkillMcpDepsForAgents(
-          skillDeps,
-          rawMcp,
-          cwd,
-          scope,
-          "mcp-json",
-          allowedToolsByServer
-        );
-      }
-    } else {
-      const generatorBacked = configuredAgents.filter((a) => isGeneratorBacked(a));
-      const rawMcp = configuredAgents.filter((a) => !isGeneratorBacked(a));
-      if (generatorBacked.length > 0) {
-        await configureSkillMcpDepsForAgents(
-          skillDeps,
-          generatorBacked,
-          cwd,
-          scope,
-          "agent-config",
-          allowedToolsByServer
-        );
-      }
-      if (rawMcp.length > 0) {
-        await configureSkillMcpDepsForAgents(
-          skillDeps,
-          rawMcp,
-          cwd,
-          scope,
-          "mcp-json",
-          allowedToolsByServer
-        );
-      }
-    }
-  }
-  const failCount = agentTypes.length - configuredAgents.length;
-  if (configuredAgents.length > 0) {
-    console.log(`
-Configured ${configuredAgents.length} agent(s):`);
-    for (const agentType of configuredAgents) {
-      const configMode = forcedConfigMode ?? (isGeneratorBacked(agentType) ? "agent-config" : "mcp-json");
-      printAgentSummary(agentType, configMode, scope);
-    }
-  }
-  if (failCount > 0) {
-    console.error(`
-\u2717 Failed to configure ${failCount} agent(s)`);
-  }
-}
-
 // src/cli.ts
-var __dirname = dirname2(fileURLToPath(import.meta.url));
+var __dirname = dirname(fileURLToPath(import.meta.url));
 function getVersion() {
   try {
-    const pkgPath = join3(__dirname, "..", "package.json");
+    const pkgPath = join2(__dirname, "..", "package.json");
     const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
     return pkg.version;
   } catch {
@@ -1335,12 +668,12 @@ var BOLD3 = "\x1B[1m";
 var DIM3 = "\x1B[38;5;102m";
 var TEXT2 = "\x1B[38;5;145m";
 var LOGO_LINES = [
-  "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2557  \u2588\u2588\u2557\u2588\u2588\u2557\u2588\u2588\u2557     \u2588\u2588\u2557     \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557      \u2588\u2588\u2588\u2557   \u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2557 ",
-  "\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2551 \u2588\u2588\u2554\u255D\u2588\u2588\u2551\u2588\u2588\u2551     \u2588\u2588\u2551     \u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D      \u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557",
-  "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2554\u255D \u2588\u2588\u2551\u2588\u2588\u2551     \u2588\u2588\u2551     \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2554\u2588\u2588\u2588\u2588\u2554\u2588\u2588\u2551\u2588\u2588\u2551     \u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D",
-  "\u255A\u2550\u2550\u2550\u2550\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2588\u2588\u2557 \u2588\u2588\u2551\u2588\u2588\u2551     \u2588\u2588\u2551     \u255A\u2550\u2550\u2550\u2550\u2588\u2588\u2551\u255A\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2551\u255A\u2588\u2588\u2554\u255D\u2588\u2588\u2551\u2588\u2588\u2551     \u2588\u2588\u2554\u2550\u2550\u2550\u255D ",
-  "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551      \u2588\u2588\u2551 \u255A\u2550\u255D \u2588\u2588\u2551\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2551     ",
-  "\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u255D\u255A\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D      \u255A\u2550\u255D     \u255A\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D     "
+  "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2557  \u2588\u2588\u2557\u2588\u2588\u2557\u2588\u2588\u2557     \u2588\u2588\u2557     \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557",
+  "\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2551 \u2588\u2588\u2554\u255D\u2588\u2588\u2551\u2588\u2588\u2551     \u2588\u2588\u2551     \u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D",
+  "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2554\u255D \u2588\u2588\u2551\u2588\u2588\u2551     \u2588\u2588\u2551     \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557",
+  "\u255A\u2550\u2550\u2550\u2550\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2588\u2588\u2557 \u2588\u2588\u2551\u2588\u2588\u2551     \u2588\u2588\u2551     \u255A\u2550\u2550\u2550\u2550\u2588\u2588\u2551",
+  "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551",
+  "\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u255D\u255A\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D"
 ];
 var GRAYS = [
   "\x1B[38;5;250m",
@@ -1365,43 +698,43 @@ function showBanner() {
   console.log(`${DIM3}The open agent skills ecosystem${RESET3}`);
   console.log();
   console.log(
-    `  ${DIM3}$${RESET3} ${TEXT2}npx @codemcp/skills add ${DIM3}<package>${RESET3}        ${DIM3}Add a new skill${RESET3}`
+    `  ${DIM3}$${RESET3} ${TEXT2}npx skills add ${DIM3}<package>${RESET3}        ${DIM3}Add a new skill${RESET3}`
   );
   console.log(
-    `  ${DIM3}$${RESET3} ${TEXT2}npx @codemcp/skills remove${RESET3}               ${DIM3}Remove installed skills${RESET3}`
+    `  ${DIM3}$${RESET3} ${TEXT2}npx skills remove${RESET3}               ${DIM3}Remove installed skills${RESET3}`
   );
   console.log(
-    `  ${DIM3}$${RESET3} ${TEXT2}npx @codemcp/skills list${RESET3}                 ${DIM3}List installed skills${RESET3}`
+    `  ${DIM3}$${RESET3} ${TEXT2}npx skills list${RESET3}                 ${DIM3}List installed skills${RESET3}`
   );
   console.log(
-    `  ${DIM3}$${RESET3} ${TEXT2}npx @codemcp/skills find ${DIM3}[query]${RESET3}         ${DIM3}Search for skills${RESET3}`
+    `  ${DIM3}$${RESET3} ${TEXT2}npx skills find ${DIM3}[query]${RESET3}         ${DIM3}Search for skills${RESET3}`
   );
   console.log();
   console.log(
-    `  ${DIM3}$${RESET3} ${TEXT2}npx @codemcp/skills check${RESET3}                ${DIM3}Check for updates${RESET3}`
+    `  ${DIM3}$${RESET3} ${TEXT2}npx skills check${RESET3}                ${DIM3}Check for updates${RESET3}`
   );
   console.log(
-    `  ${DIM3}$${RESET3} ${TEXT2}npx @codemcp/skills update${RESET3}               ${DIM3}Update all skills${RESET3}`
+    `  ${DIM3}$${RESET3} ${TEXT2}npx skills update${RESET3}               ${DIM3}Update all skills${RESET3}`
   );
   console.log();
   console.log(
-    `  ${DIM3}$${RESET3} ${TEXT2}npx @codemcp/skills experimental_install${RESET3} ${DIM3}Restore from skills-lock.json${RESET3}`
+    `  ${DIM3}$${RESET3} ${TEXT2}npx skills experimental_install${RESET3} ${DIM3}Restore from skills-lock.json${RESET3}`
   );
   console.log(
-    `  ${DIM3}$${RESET3} ${TEXT2}npx @codemcp/skills init ${DIM3}[name]${RESET3}          ${DIM3}Create a new skill${RESET3}`
+    `  ${DIM3}$${RESET3} ${TEXT2}npx skills init ${DIM3}[name]${RESET3}          ${DIM3}Create a new skill${RESET3}`
   );
   console.log(
-    `  ${DIM3}$${RESET3} ${TEXT2}npx @codemcp/skills experimental_sync${RESET3}    ${DIM3}Sync skills from node_modules${RESET3}`
+    `  ${DIM3}$${RESET3} ${TEXT2}npx skills experimental_sync${RESET3}    ${DIM3}Sync skills from node_modules${RESET3}`
   );
   console.log();
-  console.log(`${DIM3}try:${RESET3} npx @codemcp/skills add vercel-labs/agent-skills`);
+  console.log(`${DIM3}try:${RESET3} npx skills add vercel-labs/agent-skills`);
   console.log();
   console.log(`Discover more skills at ${TEXT2}https://skills.sh/${RESET3}`);
   console.log();
 }
 function showHelp() {
   console.log(`
-${BOLD3}Usage:${RESET3} npx @codemcp/skills <command> [options]
+${BOLD3}Usage:${RESET3} skills <command> [options]
 
 ${BOLD3}Manage Skills:${RESET3}
   add <package>        Add a skill package (alias: a)
@@ -1444,37 +777,39 @@ ${BOLD3}Experimental Sync Options:${RESET3}
 ${BOLD3}List Options:${RESET3}
   -g, --global           List global skills (default: project)
   -a, --agent <agents>   Filter by specific agents
+  --json                 Output as JSON (machine-readable, no ANSI codes)
 
 ${BOLD3}Options:${RESET3}
   --help, -h        Show this help message
   --version, -v     Show version number
 
 ${BOLD3}Examples:${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills add vercel-labs/agent-skills
-  ${DIM3}$${RESET3} npx @codemcp/skills add vercel-labs/agent-skills -g
-  ${DIM3}$${RESET3} npx @codemcp/skills add vercel-labs/agent-skills --agent claude-code cursor
-  ${DIM3}$${RESET3} npx @codemcp/skills add vercel-labs/agent-skills --skill pr-review commit
-  ${DIM3}$${RESET3} npx @codemcp/skills remove                        ${DIM3}# interactive remove${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills remove web-design             ${DIM3}# remove by name${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills rm --global frontend-design
-  ${DIM3}$${RESET3} npx @codemcp/skills list                          ${DIM3}# list project skills${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills ls -g                         ${DIM3}# list global skills${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills ls -a claude-code             ${DIM3}# filter by agent${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills find                          ${DIM3}# interactive search${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills find typescript               ${DIM3}# search by keyword${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills check
-  ${DIM3}$${RESET3} npx @codemcp/skills update
-  ${DIM3}$${RESET3} npx @codemcp/skills experimental_install            ${DIM3}# restore from skills-lock.json${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills init my-skill
-  ${DIM3}$${RESET3} npx @codemcp/skills experimental_sync              ${DIM3}# sync from node_modules${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills experimental_sync -y           ${DIM3}# sync without prompts${RESET3}
+  ${DIM3}$${RESET3} skills add vercel-labs/agent-skills
+  ${DIM3}$${RESET3} skills add vercel-labs/agent-skills -g
+  ${DIM3}$${RESET3} skills add vercel-labs/agent-skills --agent claude-code cursor
+  ${DIM3}$${RESET3} skills add vercel-labs/agent-skills --skill pr-review commit
+  ${DIM3}$${RESET3} skills remove                        ${DIM3}# interactive remove${RESET3}
+  ${DIM3}$${RESET3} skills remove web-design             ${DIM3}# remove by name${RESET3}
+  ${DIM3}$${RESET3} skills rm --global frontend-design
+  ${DIM3}$${RESET3} skills list                          ${DIM3}# list project skills${RESET3}
+  ${DIM3}$${RESET3} skills ls -g                         ${DIM3}# list global skills${RESET3}
+  ${DIM3}$${RESET3} skills ls -a claude-code             ${DIM3}# filter by agent${RESET3}
+  ${DIM3}$${RESET3} skills ls --json                      ${DIM3}# JSON output${RESET3}
+  ${DIM3}$${RESET3} skills find                          ${DIM3}# interactive search${RESET3}
+  ${DIM3}$${RESET3} skills find typescript               ${DIM3}# search by keyword${RESET3}
+  ${DIM3}$${RESET3} skills check
+  ${DIM3}$${RESET3} skills update
+  ${DIM3}$${RESET3} skills experimental_install            ${DIM3}# restore from skills-lock.json${RESET3}
+  ${DIM3}$${RESET3} skills init my-skill
+  ${DIM3}$${RESET3} skills experimental_sync              ${DIM3}# sync from node_modules${RESET3}
+  ${DIM3}$${RESET3} skills experimental_sync -y           ${DIM3}# sync without prompts${RESET3}
 
 Discover more skills at ${TEXT2}https://skills.sh/${RESET3}
 `);
 }
 function showRemoveHelp() {
   console.log(`
-${BOLD3}Usage:${RESET3} npx @codemcp/skills remove [skills...] [options]
+${BOLD3}Usage:${RESET3} skills remove [skills...] [options]
 
 ${BOLD3}Description:${RESET3}
   Remove installed skills from agents. If no skill names are provided,
@@ -1491,65 +826,23 @@ ${BOLD3}Options:${RESET3}
   --all              Shorthand for --skill '*' --agent '*' -y
 
 ${BOLD3}Examples:${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills remove                           ${DIM3}# interactive selection${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills remove my-skill                   ${DIM3}# remove specific skill${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills remove skill1 skill2 -y           ${DIM3}# remove multiple skills${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills remove --global my-skill          ${DIM3}# remove from global scope${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills rm --agent claude-code my-skill   ${DIM3}# remove from specific agent${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills remove --all                      ${DIM3}# remove all skills${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills remove --skill '*' -a cursor      ${DIM3}# remove all skills from cursor${RESET3}
+  ${DIM3}$${RESET3} skills remove                           ${DIM3}# interactive selection${RESET3}
+  ${DIM3}$${RESET3} skills remove my-skill                   ${DIM3}# remove specific skill${RESET3}
+  ${DIM3}$${RESET3} skills remove skill1 skill2 -y           ${DIM3}# remove multiple skills${RESET3}
+  ${DIM3}$${RESET3} skills remove --global my-skill          ${DIM3}# remove from global scope${RESET3}
+  ${DIM3}$${RESET3} skills rm --agent claude-code my-skill   ${DIM3}# remove from specific agent${RESET3}
+  ${DIM3}$${RESET3} skills remove --all                      ${DIM3}# remove all skills${RESET3}
+  ${DIM3}$${RESET3} skills remove --skill '*' -a cursor      ${DIM3}# remove all skills from cursor${RESET3}
 
 Discover more skills at ${TEXT2}https://skills.sh/${RESET3}
 `);
 }
-function showMcpHelp() {
-  console.log(`
-${BOLD3}Usage:${RESET3} npx @codemcp/skills mcp setup [options]
-
-${BOLD3}Description:${RESET3}
-  Configure MCP (Model Context Protocol) server for agent environments.
-  Supports both interactive (TUI) and command-line (CLI) modes.
-
-${BOLD3}Subcommands:${RESET3}
-  setup               Configure MCP server for agents (default if no subcommand)
-
-${BOLD3}Options:${RESET3}
-  -a, --agent         Specify agents to configure (space-separated)
-                      Use '*' to configure all detected agents
-  -g, --global        Write configs to home directory instead of project
-  --agent-config      Create a named agent file with usage instructions
-                      (Kiro, GitHub Copilot, OpenCode only; default for those agents)
-  --mcp-json          Register MCP servers in mcp.json only, no agent file
-                      (works for all agents; skips the TUI mode-selection prompt)
-
-${BOLD3}Modes:${RESET3}
-  ${DIM3}Interactive (TUI):${RESET3} npx @codemcp/skills mcp setup
-    Guides through scope \u2192 agent selection \u2192 config type \u2192 summary
-
-  ${DIM3}Command-line (CLI):${RESET3} npx @codemcp/skills mcp setup --agent <agents>
-    Configures specified agents without interaction
-
-${BOLD3}Examples:${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills mcp setup                                        ${DIM3}# interactive${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills mcp setup --agent claude-code                    ${DIM3}# mcp.json for Claude${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills mcp setup --agent kiro-cli --agent-config        ${DIM3}# Kiro agent file${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills mcp setup --agent kiro-cli --mcp-json            ${DIM3}# Kiro mcp.json only${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills mcp setup --agent claude-code cline --mcp-json   ${DIM3}# multiple, mcp.json${RESET3}
-  ${DIM3}$${RESET3} npx @codemcp/skills mcp setup --agent '*'                            ${DIM3}# all agents${RESET3}
-
-${BOLD3}Supported Agents:${RESET3}
-  claude-code, cline, cursor, kiro-cli, junie, opencode, and more
-  Agents marked \u2726 in the TUI support a rich agent config file.
-
-Discover more at ${TEXT2}https://skills.sh/${RESET3}
-`);
-}
 function runInit(args) {
   const cwd = process.cwd();
   const skillName = args[0] || basename(cwd);
   const hasName = args[0] !== void 0;
-  const skillDir = hasName ? join3(cwd, skillName) : cwd;
-  const skillFile = join3(skillDir, "SKILL.md");
+  const skillDir = hasName ? join2(cwd, skillName) : cwd;
+  const skillFile = join2(skillDir, "SKILL.md");
   const displayPath = hasName ? `${skillName}/SKILL.md` : "SKILL.md";
   if (existsSync(skillFile)) {
     console.log(`${TEXT2}Skill already exists at ${DIM3}${displayPath}${RESET3}`);
@@ -1591,10 +884,10 @@ Describe when this skill should be used.
   console.log();
   console.log(`${DIM3}Publishing:${RESET3}`);
   console.log(
-    `  ${DIM3}GitHub:${RESET3}  Push to a repo, then ${TEXT2}npx @codemcp/skills add <owner>/<repo>${RESET3}`
+    `  ${DIM3}GitHub:${RESET3}  Push to a repo, then ${TEXT2}npx skills add <owner>/<repo>${RESET3}`
   );
   console.log(
-    `  ${DIM3}URL:${RESET3}     Host the file, then ${TEXT2}npx @codemcp/skills add https://example.com/${displayPath}${RESET3}`
+    `  ${DIM3}URL:${RESET3}     Host the file, then ${TEXT2}npx skills add https://example.com/${displayPath}${RESET3}`
   );
   console.log();
   console.log(`Browse existing skills for inspiration at ${TEXT2}https://skills.sh/${RESET3}`);
@@ -1604,7 +897,11 @@ var AGENTS_DIR = ".agents";
 var LOCK_FILE = ".skill-lock.json";
 var CURRENT_LOCK_VERSION = 3;
 function getSkillLockPath() {
-  return join3(homedir4(), AGENTS_DIR, LOCK_FILE);
+  const xdgStateHome = process.env.XDG_STATE_HOME;
+  if (xdgStateHome) {
+    return join2(xdgStateHome, "skills", LOCK_FILE);
+  }
+  return join2(homedir2(), AGENTS_DIR, LOCK_FILE);
 }
 function readSkillLock() {
   const lockPath = getSkillLockPath();
@@ -1622,6 +919,30 @@ function readSkillLock() {
     return { version: CURRENT_LOCK_VERSION, skills: {} };
   }
 }
+function getSkipReason(entry) {
+  if (entry.sourceType === "local") {
+    return "Local path";
+  }
+  if (entry.sourceType === "git") {
+    return "Git URL (hash tracking not supported)";
+  }
+  if (!entry.skillFolderHash) {
+    return "No version hash available";
+  }
+  if (!entry.skillPath) {
+    return "No skill path recorded";
+  }
+  return "No version tracking";
+}
+function printSkippedSkills(skipped) {
+  if (skipped.length === 0) return;
+  console.log();
+  console.log(`${DIM3}${skipped.length} skill(s) cannot be checked automatically:${RESET3}`);
+  for (const skill of skipped) {
+    console.log(`  ${TEXT2}\u2022${RESET3} ${skill.name} ${DIM3}(${skill.reason})${RESET3}`);
+    console.log(`    ${DIM3}To update: ${TEXT2}npx skills add ${skill.sourceUrl} -g -y${RESET3}`);
+  }
+}
 async function runCheck(args = []) {
   console.log(`${TEXT2}Checking for skill updates...${RESET3}`);
   console.log();
@@ -1629,28 +950,27 @@ async function runCheck(args = []) {
   const skillNames = Object.keys(lock.skills);
   if (skillNames.length === 0) {
     console.log(`${DIM3}No skills tracked in lock file.${RESET3}`);
-    console.log(
-      `${DIM3}Install skills with${RESET3} ${TEXT2}npx @codemcp/skills add <package>${RESET3}`
-    );
+    console.log(`${DIM3}Install skills with${RESET3} ${TEXT2}npx skills add <package>${RESET3}`);
     return;
   }
   const token = getGitHubToken();
   const skillsBySource = /* @__PURE__ */ new Map();
-  let skippedCount = 0;
+  const skipped = [];
   for (const skillName of skillNames) {
     const entry = lock.skills[skillName];
     if (!entry) continue;
-    if (entry.sourceType !== "github" || !entry.skillFolderHash || !entry.skillPath) {
-      skippedCount++;
+    if (!entry.skillFolderHash || !entry.skillPath) {
+      skipped.push({ name: skillName, reason: getSkipReason(entry), sourceUrl: entry.sourceUrl });
       continue;
     }
     const existing = skillsBySource.get(entry.source) || [];
     existing.push({ name: skillName, entry });
     skillsBySource.set(entry.source, existing);
   }
-  const totalSkills = skillNames.length - skippedCount;
+  const totalSkills = skillNames.length - skipped.length;
   if (totalSkills === 0) {
     console.log(`${DIM3}No GitHub skills to check.${RESET3}`);
+    printSkippedSkills(skipped);
     return;
   }
   console.log(`${DIM3}Checking ${totalSkills} skill(s) for updates...${RESET3}`);
@@ -1688,13 +1008,14 @@ async function runCheck(args = []) {
     }
     console.log();
     console.log(
-      `${DIM3}Run${RESET3} ${TEXT2}npx @codemcp/skills update${RESET3} ${DIM3}to update all skills${RESET3}`
+      `${DIM3}Run${RESET3} ${TEXT2}npx skills update${RESET3} ${DIM3}to update all skills${RESET3}`
     );
   }
   if (errors.length > 0) {
     console.log();
     console.log(`${DIM3}Could not check ${errors.length} skill(s) (may need reinstall)${RESET3}`);
   }
+  printSkippedSkills(skipped);
   track({
     event: "check",
     skillCount: String(totalSkills),
@@ -1709,21 +1030,19 @@ async function runUpdate() {
   const skillNames = Object.keys(lock.skills);
   if (skillNames.length === 0) {
     console.log(`${DIM3}No skills tracked in lock file.${RESET3}`);
-    console.log(
-      `${DIM3}Install skills with${RESET3} ${TEXT2}npx @codemcp/skills add <package>${RESET3}`
-    );
+    console.log(`${DIM3}Install skills with${RESET3} ${TEXT2}npx skills add <package>${RESET3}`);
     return;
   }
   const token = getGitHubToken();
   const updates = [];
-  let checkedCount = 0;
+  const skipped = [];
   for (const skillName of skillNames) {
     const entry = lock.skills[skillName];
     if (!entry) continue;
-    if (entry.sourceType !== "github" || !entry.skillFolderHash || !entry.skillPath) {
+    if (!entry.skillFolderHash || !entry.skillPath) {
+      skipped.push({ name: skillName, reason: getSkipReason(entry), sourceUrl: entry.sourceUrl });
       continue;
     }
-    checkedCount++;
     try {
       const latestHash = await fetchSkillFolderHash(entry.source, entry.skillPath, token);
       if (latestHash && latestHash !== entry.skillFolderHash) {
@@ -1732,8 +1051,10 @@ async function runUpdate() {
     } catch {
     }
   }
+  const checkedCount = skillNames.length - skipped.length;
   if (checkedCount === 0) {
     console.log(`${DIM3}No skills to check.${RESET3}`);
+    printSkippedSkills(skipped);
     return;
   }
   if (updates.length === 0) {
@@ -1761,8 +1082,9 @@ async function runUpdate() {
       installUrl = update.entry.sourceUrl.replace(/\.git$/, "").replace(/\/$/, "");
       installUrl = `${installUrl}/tree/main/${skillFolder}`;
     }
-    const result = spawnSync("npx", ["-y", "@codemcp/skills", "add", installUrl, "-g", "-y"], {
-      stdio: ["inherit", "pipe", "pipe"]
+    const result = spawnSync("npx", ["-y", "skills", "add", installUrl, "-g", "-y"], {
+      stdio: ["inherit", "pipe", "pipe"],
+      shell: process.platform === "win32"
     });
     if (result.status === 0) {
       successCount++;
@@ -1850,23 +1172,6 @@ async function main() {
     case "upgrade":
       runUpdate();
       break;
-    case "mcp": {
-      if (!restArgs[0] || restArgs[0] === "--help" || restArgs[0] === "-h") {
-        showMcpHelp();
-        break;
-      }
-      const subcommand = restArgs[0];
-      const mcpArgs = restArgs.slice(1);
-      if (subcommand === "setup") {
-        showLogo();
-        const options = parseMcpOptions(mcpArgs);
-        await runMcpSetup(options);
-      } else {
-        console.error(`Unknown mcp subcommand: ${subcommand}`);
-        showMcpHelp();
-      }
-      break;
-    }
     case "--help":
     case "-h":
       showHelp();
@@ -1877,7 +1182,7 @@ async function main() {
       break;
     default:
       console.log(`Unknown command: ${command}`);
-      console.log(`Run ${BOLD3}npx @codemcp/skills --help${RESET3} for usage.`);
+      console.log(`Run ${BOLD3}skills --help${RESET3} for usage.`);
   }
 }
 main();