@fprad0/skill-master-mcp 0.0.12 → 1.0.1

package/bin/skill-master-register-clients.mjs

@@ -1,153 +1,232 @@
-#!/usr/bin/env node
-import { spawnSync } from 'node:child_process';
-import { mkdirSync, writeFileSync } from 'node:fs';
-import os from 'node:os';
-import path, { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import {
-  appendCodexServer,
-  buildClaudeCodeAddArgs,
-  buildCodexBlock,
-  buildJsonMcpSnippet,
-  buildSkillMasterServerConfig,
-  defaultClientConfigPaths,
-  formatShellCommand,
-  mergeMcpServer,
-  writeJson,
-} from './lib/client-config.mjs';
-
-const args = process.argv.slice(2);
-const has = (flag) => args.includes(flag);
-const readValue = (flag, fallback) => {
-  const index = args.indexOf(flag);
-  return index >= 0 ? args[index + 1] : fallback;
-};
-
-const here = dirname(fileURLToPath(import.meta.url));
-const rootDir = dirname(here);
-
-if (has('--help')) {
-  console.log(`Skill Master client registration
-
-Uso:
-  skill-master-register-clients --write-snippets
-  skill-master-register-clients --apply-codex
-  skill-master-register-clients --apply-claude
-  skill-master-register-clients --apply-claude-code
-  skill-master-register-clients --apply-gemini
-  skill-master-register-clients --apply-antigravity
-  skill-master-register-clients --apply-all
-  skill-master-register-clients --apply-codex --force
-  skill-master-register-clients --apply-claude-code --claude-code-scope user
-
-Registra o servidor MCP skill_master como stdio usando Node absoluto e o
-entrypoint absoluto do pacote. Isso evita falhas de PATH em Windows, Linux,
-macOS e apps desktop que nao herdam o terminal.
-
-Para Claude Code, o registrador usa o CLI oficial: claude mcp add.
-`);
-  process.exit(0);
-}
-
-const clientPaths = defaultClientConfigPaths();
-const snippetsDir = readValue('--snippets-dir', path.join(process.env.SKILL_MASTER_HOME ?? path.join(os.homedir(), '.skill-master'), 'client-configs'));
-const codexConfig = readValue('--codex-config', clientPaths.codex);
-const claudeConfig = readValue('--claude-config', clientPaths.claude);
-const geminiConfig = readValue('--gemini-config', clientPaths.gemini);
-const antigravityConfig = readValue('--antigravity-config', clientPaths.antigravity);
-const claudeCodeScope = readValue('--claude-code-scope', 'user');
-const claudeCodeCommand = readValue('--claude-code-command', 'claude');
-
-const applyAll = has('--apply-all');
-const applyCodex = applyAll || has('--apply-codex');
-const applyClaude = applyAll || has('--apply-claude');
-const applyClaudeCode = applyAll || has('--apply-claude-code');
-const applyGemini = applyAll || has('--apply-gemini');
-const applyAntigravity = applyAll || has('--apply-antigravity');
-const writeSnippets = applyAll || has('--write-snippets') || !(applyCodex || applyClaude || applyClaudeCode || applyGemini || applyAntigravity);
-const force = has('--force');
-const serverConfig = buildSkillMasterServerConfig({ rootDir });
-const codexBlock = buildCodexBlock(serverConfig);
-const jsonSnippet = buildJsonMcpSnippet(serverConfig);
-const claudeCodeArgs = buildClaudeCodeAddArgs(serverConfig, { scope: claudeCodeScope });
-
-function commandExists(command) {
-  const lookup = process.platform === 'win32' ? 'where' : 'command';
-  const lookupArgs = process.platform === 'win32' ? [command] : ['-v', command];
-  const result = spawnSync(lookup, lookupArgs, { shell: process.platform !== 'win32', stdio: 'ignore' });
-  return result.status === 0;
-}
-
-function runClaudeCodeRegistration() {
-  if (!commandExists(claudeCodeCommand)) {
-    return {
-      ok: false,
-      skipped: true,
-      message: `Claude Code CLI '${claudeCodeCommand}' not found; run manually: ${formatShellCommand(claudeCodeCommand, claudeCodeArgs)}`,
-    };
-  }
-
-  const result = spawnSync(claudeCodeCommand, claudeCodeArgs, {
-    encoding: 'utf8',
-    stdio: ['ignore', 'pipe', 'pipe'],
-  });
-  const output = `${result.stdout ?? ''}${result.stderr ?? ''}`.trim();
-
-  return {
-    ok: result.status === 0,
-    skipped: false,
-    message: result.status === 0
-      ? `Claude Code registered via ${formatShellCommand(claudeCodeCommand, claudeCodeArgs)}`
-      : `Claude Code registration failed (${result.status ?? 'unknown'}): ${output || 'no output'}`,
-  };
-}
-
-const writeSnippetsFiles = () => {
-  mkdirSync(snippetsDir, { recursive: true });
-  writeFileSync(path.join(snippetsDir, 'codex.config.toml'), codexBlock.trimStart(), 'utf8');
-  writeJson(path.join(snippetsDir, 'claude_desktop_config.skill_master.json'), jsonSnippet);
-  writeFileSync(
-    path.join(snippetsDir, 'claude-code.commands.md'),
-    `# Claude Code - registrar skill_master\n\n\`\`\`bash\n${formatShellCommand(claudeCodeCommand, claudeCodeArgs)}\n\`\`\`\n\nDepois reinicie a sessao do Claude Code e valide com:\n\n\`\`\`bash\nclaude mcp list\n\`\`\`\n`,
-    'utf8',
-  );
-  writeJson(path.join(snippetsDir, 'claude-code.project.mcp.json'), jsonSnippet);
-  writeJson(path.join(snippetsDir, 'gemini.settings.skill_master.json'), jsonSnippet);
-  writeJson(path.join(snippetsDir, 'antigravity.mcp_config.skill_master.json'), jsonSnippet);
-};
-
-const actions = [];
-if (writeSnippets) {
-  writeSnippetsFiles();
-  actions.push(`snippets written to ${snippetsDir}`);
-}
-if (applyCodex) {
-  actions.push(appendCodexServer(codexConfig, serverConfig, { force }) ? `Codex registered at ${codexConfig}` : `Codex already had skill_master at ${codexConfig}`);
-}
-if (applyClaude) {
-  mergeMcpServer(claudeConfig, serverConfig, { recoverInvalidJson: force });
-  actions.push(`Claude Desktop config merged at ${claudeConfig}`);
-}
-if (applyClaudeCode) {
-  const result = runClaudeCodeRegistration();
-  actions.push(result.message);
-  if (!result.ok && !result.skipped) {
-    process.exitCode = 1;
-  }
-}
-if (applyGemini) {
-  mergeMcpServer(geminiConfig, serverConfig, { recoverInvalidJson: force });
-  actions.push(`Gemini config merged at ${geminiConfig}`);
-}
-if (applyAntigravity) {
-  mergeMcpServer(antigravityConfig, serverConfig, { recoverInvalidJson: force });
-  actions.push(`Antigravity config merged at ${antigravityConfig}`);
-}
-
-console.log('[skill_master] Client registration');
-console.log(`- Command: ${serverConfig.command}`);
-console.log(`- Args: ${serverConfig.args.join(' ')}`);
-for (const action of actions) {
-  console.log(`- ${action}`);
-}
-console.log('- Restart Codex, Claude Desktop, Claude Code, Gemini or Antigravity after registration.');
+#!/usr/bin/env node
+import { spawnSync } from 'node:child_process';
+import { mkdirSync, writeFileSync } from 'node:fs';
+import os from 'node:os';
+import path, { dirname } from 'node:path';
+import process from 'node:process';
+import { fileURLToPath } from 'node:url';
+import {
+  appendCodexServer,
+  buildClaudeCodeAddArgs,
+  buildCodexBlock,
+  buildJsonMcpSnippet,
+  buildSkillMasterServerConfig,
+  defaultClientConfigPaths,
+  formatShellCommand,
+  mergeMcpServer,
+  writeJson,
+} from './lib/client-config.mjs';
+import {
+  classifyClaudeCodeResult,
+  determineRegistrationExitCode,
+  resolveClaudeCodeCommand,
+  runCapturedCommand,
+  summarizeRegistrationResults,
+} from './lib/register-clients-core.mjs';
+import { OPERATION_EXIT_CODES } from './lib/operation-result.mjs';
+
+const args = process.argv.slice(2);
+const has = (flag) => args.includes(flag);
+const readValue = (flag, fallback) => {
+  const index = args.indexOf(flag);
+  return index >= 0 ? args[index + 1] : fallback;
+};
+
+const here = dirname(fileURLToPath(import.meta.url));
+const rootDir = dirname(here);
+
+if (has('--help')) {
+  console.log(`Skill Master client registration
+
+Uso:
+  skill-master-register-clients --write-snippets
+  skill-master-register-clients --apply-codex
+  skill-master-register-clients --apply-claude
+  skill-master-register-clients --apply-claude-code
+  skill-master-register-clients --apply-gemini
+  skill-master-register-clients --apply-antigravity
+  skill-master-register-clients --apply-all
+  skill-master-register-clients --apply-codex --force
+  skill-master-register-clients --apply-claude-code --claude-code-scope user
+
+Registra o servidor MCP skill_master como stdio usando Node absoluto e o
+entrypoint absoluto do pacote. Isso evita falhas de PATH em Windows, Linux,
+macOS e apps desktop que nao herdam o terminal.
+
+Para Claude Code, o registrador usa o CLI oficial: claude mcp add.
+`);
+  process.exit(0);
+}
+
+const clientPaths = defaultClientConfigPaths();
+const snippetsDir = readValue('--snippets-dir', path.join(process.env.SKILL_MASTER_HOME ?? path.join(os.homedir(), '.skill-master'), 'client-configs'));
+const codexConfig = readValue('--codex-config', clientPaths.codex);
+const claudeConfig = readValue('--claude-config', clientPaths.claude);
+const geminiConfig = readValue('--gemini-config', clientPaths.gemini);
+const antigravityConfig = readValue('--antigravity-config', clientPaths.antigravity);
+const claudeCodeScope = readValue('--claude-code-scope', 'user');
+const claudeCodeCommand = readValue('--claude-code-command', 'claude');
+
+const applyAll = has('--apply-all');
+const applyCodex = applyAll || has('--apply-codex');
+const applyClaude = applyAll || has('--apply-claude');
+const applyClaudeCode = applyAll || has('--apply-claude-code');
+const applyGemini = applyAll || has('--apply-gemini');
+const applyAntigravity = applyAll || has('--apply-antigravity');
+const writeSnippets = applyAll || has('--write-snippets') || !(applyCodex || applyClaude || applyClaudeCode || applyGemini || applyAntigravity);
+const force = has('--force');
+const serverConfig = buildSkillMasterServerConfig({ rootDir });
+const codexBlock = buildCodexBlock(serverConfig);
+const jsonSnippet = buildJsonMcpSnippet(serverConfig);
+const claudeCodeArgs = buildClaudeCodeAddArgs(serverConfig, { scope: claudeCodeScope });
+
+function runClaudeCodeRegistration() {
+  const resolved = resolveClaudeCodeCommand(claudeCodeCommand, {
+    platform: process.platform,
+    spawnSyncImpl: spawnSync,
+  });
+  if (!resolved.found || !resolved.command) {
+    return {
+      key: 'claude-code',
+      client: 'Claude Code',
+      status: 'warning',
+      message: `Claude Code CLI nao encontrado. Tentativas: ${resolved.tried.join(', ')}`,
+      next: `Execute manualmente: ${formatShellCommand(claudeCodeCommand, claudeCodeArgs)}`,
+    };
+  }
+
+  const versionProbe = runCapturedCommand(resolved.command, ['--version'], {
+    spawnSyncImpl: spawnSync,
+  });
+  const listProbe = runCapturedCommand(resolved.command, ['mcp', 'list'], {
+    spawnSyncImpl: spawnSync,
+  });
+  const addResult = runCapturedCommand(resolved.command, claudeCodeArgs, {
+    spawnSyncImpl: spawnSync,
+  });
+
+  return classifyClaudeCodeResult({
+    attemptedCommand: resolved.command,
+    addArgs: claudeCodeArgs,
+    versionProbe,
+    listProbe,
+    addResult,
+  });
+}
+
+const writeSnippetsFiles = () => {
+  mkdirSync(snippetsDir, { recursive: true });
+  writeFileSync(path.join(snippetsDir, 'codex.config.toml'), codexBlock.trimStart(), 'utf8');
+  writeJson(path.join(snippetsDir, 'claude_desktop_config.skill_master.json'), jsonSnippet);
+  writeFileSync(
+    path.join(snippetsDir, 'claude-code.commands.md'),
+    `# Claude Code - registrar skill_master\n\n\`\`\`bash\n${formatShellCommand(claudeCodeCommand, claudeCodeArgs)}\n\`\`\`\n\nDepois reinicie a sessao do Claude Code e valide com:\n\n\`\`\`bash\nclaude mcp list\n\`\`\`\n`,
+    'utf8',
+  );
+  writeJson(path.join(snippetsDir, 'claude-code.project.mcp.json'), jsonSnippet);
+  writeJson(path.join(snippetsDir, 'gemini.settings.skill_master.json'), jsonSnippet);
+  writeJson(path.join(snippetsDir, 'antigravity.mcp_config.skill_master.json'), jsonSnippet);
+};
+
+function main() {
+  const actions = [];
+  const results = [];
+  const selectedClients = [];
+
+  if (writeSnippets) {
+    writeSnippetsFiles();
+    actions.push(`snippets written to ${snippetsDir}`);
+  }
+  if (applyCodex) {
+    selectedClients.push('codex');
+    results.push({
+      key: 'codex',
+      client: 'Codex',
+      status: 'ok',
+      message: appendCodexServer(codexConfig, serverConfig, { force })
+        ? `Codex registered at ${codexConfig}`
+        : `Codex already had skill_master at ${codexConfig}`,
+      next: null,
+    });
+  }
+  if (applyClaude) {
+    selectedClients.push('claude');
+    mergeMcpServer(claudeConfig, serverConfig, { recoverInvalidJson: force });
+    results.push({
+      key: 'claude',
+      client: 'Claude Desktop',
+      status: 'ok',
+      message: `Claude Desktop config merged at ${claudeConfig}`,
+      next: null,
+    });
+  }
+  if (applyClaudeCode) {
+    selectedClients.push('claude-code');
+    results.push(runClaudeCodeRegistration());
+  }
+  if (applyGemini) {
+    selectedClients.push('gemini');
+    mergeMcpServer(geminiConfig, serverConfig, { recoverInvalidJson: force });
+    results.push({
+      key: 'gemini',
+      client: 'Gemini',
+      status: 'ok',
+      message: `Gemini config merged at ${geminiConfig}`,
+      next: null,
+    });
+  }
+  if (applyAntigravity) {
+    selectedClients.push('antigravity');
+    mergeMcpServer(antigravityConfig, serverConfig, { recoverInvalidJson: force });
+    results.push({
+      key: 'antigravity',
+      client: 'Antigravity',
+      status: 'ok',
+      message: `Antigravity config merged at ${antigravityConfig}`,
+      next: null,
+    });
+  }
+
+  const exitCode = determineRegistrationExitCode(results, {
+    applyAll,
+    selectedClients,
+  });
+  const summary = summarizeRegistrationResults(results, exitCode);
+
+  console.log('[skill_master] Client registration');
+  console.log(`- Command: ${serverConfig.command}`);
+  console.log(`- Args: ${serverConfig.args.join(' ')}`);
+  for (const action of actions) {
+    console.log(`- ${action}`);
+  }
+  for (const result of results) {
+    console.log(`- ${result.message}`);
+    if (result.next) {
+      console.log(`  next: ${result.next}`);
+    }
+  }
+  console.log('- Restart Codex, Claude Desktop, Claude Code, Gemini or Antigravity after registration.');
+  console.log('[skill_master] Summary');
+  console.log(`- Result: ${summary.result}`);
+  console.log(`- Applied: ${summary.applied}`);
+  console.log(`- Warnings: ${summary.warnings}`);
+  console.log(`- Failed: ${summary.failed}`);
+  console.log(`- Next: ${summary.next}`);
+
+  return exitCode;
+}
+
+try {
+  process.exitCode = main();
+} catch (error) {
+  const message = error instanceof Error ? error.message : String(error);
+  console.log('[skill_master] Client registration');
+  console.log(`- Fatal: ${message}`);
+  console.log('[skill_master] Summary');
+  console.log('- Result: error');
+  console.log('- Applied: 0');
+  console.log('- Warnings: 0');
+  console.log('- Failed: 1');
+  console.log('- Next: corrija o erro fatal acima e execute novamente');
+  process.exitCode = OPERATION_EXIT_CODES.fatal;
+}