epicmerch-mcp 1.3.19 → 1.3.21

package/src/install.js

@@ -3,6 +3,7 @@ import { existsSync, readFileSync, writeFileSync, mkdirSync, readdirSync, copyFi
 import { homedir, platform } from 'os';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
+import { execSync } from 'node:child_process';
 
 const SERVER_NAME = 'epicmerch';
 // `npx -y epicmerch-mcp@latest` instead of `npx epicmerch-mcp` so every
@@ -27,6 +28,56 @@ function defaultCommandsDir() {
   return join(homedir(), '.claude', 'commands');
 }
 
+// ── Claude Code CLI registration ────────────────────────────────────────────
+// Claude Code (the `claude` CLI) stores MCP servers in ~/.claude.json at user
+// scope. That file holds ALL of Claude Code's state (projects, history, auth),
+// so rather than editing it directly we drive Claude Code's own `claude mcp add`
+// command — the safe, official path. This is the piece the installer was missing:
+// it configured Claude Desktop / Cursor / Codex but never registered Claude Code,
+// so CLI users had to run `claude mcp add` by hand to see the merchant_* tools.
+
+// Is the `claude` CLI on PATH? (execSync uses a shell, so it resolves claude.cmd
+// on Windows too.) Cheap probe; returns false on any error/timeout.
+function claudeCliAvailable() {
+  try { execSync('claude --version', { stdio: 'ignore', timeout: 15000 }); return true; }
+  catch { return false; }
+}
+
+// The exact command we run — and show the user verbatim if `claude` isn't found.
+function claudeAddCommand() {
+  return `claude mcp add ${SERVER_NAME} -s user -- ${SERVER_CONFIG.command} ${SERVER_CONFIG.args.join(' ')}`;
+}
+
+/**
+ * Register the epicmerch MCP with the Claude Code CLI via `claude mcp add`
+ * (user scope). Idempotent — checks `claude mcp list` first and tolerates a
+ * duplicate-add error. Never edits ~/.claude.json directly.
+ * @returns {{ status: 'added'|'exists'|'absent'|'failed', addCmd: string, detail?: string }}
+ */
+export function registerClaudeCode({ force = false } = {}) {
+  const addCmd = claudeAddCommand();
+  if (!claudeCliAvailable()) return { status: 'absent', addCmd };
+
+  // Already configured? Avoid the duplicate-add error.
+  try {
+    const list = execSync('claude mcp list', { encoding: 'utf-8', timeout: 15000 });
+    const present = new RegExp(`(^|\\s)${SERVER_NAME}\\b`, 'm').test(list);
+    if (present && !force) return { status: 'exists', addCmd };
+    if (present && force) {
+      try { execSync(`claude mcp remove ${SERVER_NAME} -s user`, { stdio: 'ignore', timeout: 15000 }); } catch { /* ignore */ }
+    }
+  } catch { /* `mcp list` unavailable on this version — fall through; tolerate a dup error below */ }
+
+  try {
+    execSync(addCmd, { stdio: 'ignore', timeout: 30000 });
+    return { status: 'added', addCmd };
+  } catch (e) {
+    const msg = String(e.stderr || e.stdout || e.message || '');
+    if (/already (exists|configured)/i.test(msg)) return { status: 'exists', addCmd };
+    return { status: 'failed', addCmd, detail: msg.split('\n')[0].slice(0, 200) };
+  }
+}
+
 /**
  * Copy our bundled skill *.md files into ~/.claude/commands/ (or a
  * specified dir). Skips files that already exist with identical content.
@@ -284,13 +335,20 @@ export function writeConfigFile(configPath, desiredConfig) {
  */
 export async function install(opts = {}) {
   const clients = detectClients().filter((c) => !opts.client || c.client === opts.client);
-  if (clients.length === 0) {
-    console.error('No MCP-aware clients detected. Install one of: Claude Desktop, Cursor, or Codex CLI (`npm i -g @openai/codex`).');
+  // Claude Code (the `claude` CLI) is registered via its own command, not a config
+  // file, so it's NOT in detectClients(). Account for it here so a pure-Claude-Code
+  // user (no Desktop / Cursor / Codex) isn't turned away by the guard below.
+  const tryClaudeCode = (!opts.client || opts.client === 'claude-code');
+  const claudeCodeHere = tryClaudeCode && claudeCliAvailable();
+
+  if (clients.length === 0 && !claudeCodeHere) {
+    console.error('No MCP-aware clients detected. Install one of: Claude Code (`npm i -g @anthropic-ai/claude-code`), Claude Desktop, Cursor, or Codex CLI (`npm i -g @openai/codex`).');
     return 1;
   }
 
   console.error('Detected clients:');
-  for (const c of clients) console.error(`  ✓ ${c.client.padEnd(8)} → ${c.configPath}`);
+  for (const c of clients) console.error(`  ✓ ${c.client.padEnd(11)} → ${c.configPath}`);
+  if (claudeCodeHere) console.error(`  ✓ ${'claude-code'.padEnd(11)} → via \`claude mcp add\` (user scope)`);
   console.error('');
 
   if (opts.dryRun) {
@@ -338,6 +396,21 @@ export async function install(opts = {}) {
     }
   }
 
+  // Register with the Claude Code CLI — a separate mechanism from the config-file
+  // writers above (it drives `claude mcp add` rather than editing ~/.claude.json).
+  // Only acts when `claude` is actually on PATH, so we don't nag Desktop-only users.
+  if (claudeCodeHere) {
+    const cc = registerClaudeCode({ force: opts.force });
+    if (cc.status === 'added') {
+      console.error('✓ Added to claude-code (claude mcp add, user scope)');
+    } else if (cc.status === 'exists') {
+      console.error('⚠ claude-code: entry already exists — skipped. Re-run with --force to refresh.');
+    } else {
+      console.error(`✗ claude-code: ${cc.detail || 'registration failed'}. Add it manually:`);
+      console.error(`    ${cc.addCmd}`);
+    }
+  }
+
   // Also install slash commands (skills) unless explicitly opted out
   if (!opts.noSkills) {
     const result = await installSkills({
@@ -367,7 +440,9 @@ export async function install(opts = {}) {
   console.error('');
   console.error('Next:');
   console.error('  1. Run `npx epicmerch-mcp login` to authenticate (if you haven\'t already).');
-  console.error('  2. Restart Claude Desktop / Cursor / VS Code / Codex for the config to take effect.');
+  console.error('  2. Reload your AI client so the MCP loads:');
+  console.error('       • Claude Code — start a new `claude` session (or /mcp to reconnect)');
+  console.error('       • Claude Desktop / Cursor / VS Code / Codex — fully quit & reopen');
   return 0;
 }
 
@@ -450,7 +525,7 @@ export async function setup(opts = {}) {
   console.error('');
   console.error('━━━ ✓ Done — restart your AI client(s) ━━━');
   console.error('');
-  console.error('In Claude Desktop / Cursor, try a slash command:');
+  console.error('In Claude Code / Claude Desktop / Cursor, try a slash command:');
   console.error('  /epicmerch              full integration walkthrough');
   console.error('  /epicmerch-payments      configure Razorpay or Stripe');
   console.error('  /epicmerch-migrate      migrate a Shopify store');