@phidiassj/aiyoperps-mcp-installer 0.6.8 → 0.7.0

package/bin/aiyoperps-mcp-installer.js

@@ -147,13 +147,11 @@ async function detectClaudeCode(url) {
 
 async function detectClaudeDesktop(url) {
   const candidates = getClaudeDesktopCandidates();
-  const configPath = candidates.find(fileExists) ??
-    candidates.find(candidate => fs.existsSync(path.dirname(candidate))) ??
-    candidates[0];
-  const exists = fileExists(configPath);
-  const parentExists = fs.existsSync(path.dirname(configPath));
-  const baseConfigRoot = path.dirname(path.dirname(configPath));
-  const baseRootExists = fs.existsSync(baseConfigRoot);
+  const configPaths = selectClaudeDesktopConfigPaths(candidates);
+  const primaryPath = configPaths[0];
+  const exists = configPaths.some(fileExists);
+  const parentExists = configPaths.some(configPath => fs.existsSync(path.dirname(configPath)));
+  const baseRootExists = configPaths.some(configPath => fs.existsSync(path.dirname(path.dirname(configPath))));
   const detected = exists || parentExists || baseRootExists;
   let supported = baseRootExists;
   let installed = false;
@@ -167,8 +165,12 @@ async function detectClaudeDesktop(url) {
 
   if (exists) {
     try {
-      const parsed = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-      installed = Boolean(parsed?.mcpServers?.[SERVER_NAME]);
+      installed = configPaths
+        .filter(fileExists)
+        .some(configPath => {
+          const parsed = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+          return Boolean(parsed?.mcpServers?.[SERVER_NAME]);
+        });
       reason = installed ? 'installed' : 'config parsed successfully';
     } catch (error) {
       supported = false;
@@ -184,27 +186,37 @@ async function detectClaudeDesktop(url) {
     supported,
     installed,
     reason,
-    path: configPath,
-    install: () => installClaudeDesktop(configPath, url),
-    uninstall: () => uninstallClaudeDesktop(configPath)
+    configPaths,
+    path: configPaths.join(' | '),
+    install: () => installClaudeDesktop(configPaths, url),
+    uninstall: () => uninstallClaudeDesktop(configPaths)
   };
 }
 
 async function detectOpenClaw(url) {
-  const cli = runCommand('openclaw', ['--version']);
-  const configPath = resolveOpenClawConfigPath();
-  const detected = cli.ok || fileExists(configPath);
+  const openclawCli = runCommand('openclaw', ['--version']);
+  const mcporterCli = runCommand('mcporter', ['--version']);
+  const configPath = resolveMcporterHomeConfigPath();
+  const detected = openclawCli.ok || fileExists(resolveOpenClawConfigPath());
+  const supported = openclawCli.ok && (mcporterCli.ok || Boolean(resolveExecutablePath(process.platform === 'win32' ? 'npx.cmd' : 'npx')));
 
   let installed = false;
-  let reason = cli.ok
-    ? 'official CLI config helpers available'
-    : fileExists(configPath)
-      ? 'config file found but CLI not detected'
-      : 'openclaw not detected';
-
-  if (cli.ok) {
-    const getResult = runCommand('openclaw', ['config', 'get', `mcp.servers.${SERVER_NAME}`]);
-    installed = getResult.ok && Boolean(getResult.stdout.trim());
+  let reason = !openclawCli.ok
+    ? 'openclaw not detected'
+    : mcporterCli.ok
+      ? 'mcporter config helpers available'
+      : supported
+        ? 'mcporter will be used via npx'
+        : 'mcporter runtime is unavailable';
+
+  if (fileExists(configPath)) {
+    try {
+      const payload = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+      installed = Boolean(payload?.mcpServers?.[SERVER_NAME]);
+    } catch {
+      installed = false;
+    }
+
     if (installed) {
       reason = 'installed';
     }
@@ -215,10 +227,10 @@ async function detectOpenClaw(url) {
     name: 'OpenClaw',
     kind: 'cli',
     detected,
-    supported: cli.ok,
+    supported,
     installed,
     reason,
-    path: cli.ok ? '~/.openclaw/openclaw.json (CLI-managed)' : configPath,
+    path: '~/.mcporter/mcporter.json (mcporter home config)',
     install: () => installOpenClaw(url),
     uninstall: () => uninstallOpenClaw()
   };
@@ -412,7 +424,7 @@ function createInstallAction(host, url) {
     case 'claude-code':
       return () => installClaudeCode(url);
     case 'claude-desktop':
-      return () => installClaudeDesktop(host.path, url);
+      return () => installClaudeDesktop(host.configPaths, url);
     case 'openclaw':
       return () => installOpenClaw(url);
     default:
@@ -463,37 +475,46 @@ function uninstallCodex(configPath) {
   fs.writeFileSync(configPath, next.trim() ? `${next.replace(/\s*$/, '')}\n` : '', 'utf8');
 }
 
-function installClaudeDesktop(configPath, url) {
-  ensureParentDir(configPath);
+function installClaudeDesktop(configPaths, url) {
+  const targets = configPaths.filter(fileExists);
+  if (targets.length === 0) {
+    targets.push(configPaths[0]);
+  }
 
-  const payload = fileExists(configPath)
-    ? JSON.parse(fs.readFileSync(configPath, 'utf8'))
-    : {};
+  for (const configPath of targets) {
+    ensureParentDir(configPath);
 
-  payload.mcpServers ??= {};
-  payload.mcpServers[SERVER_NAME] = buildJsonServerConfig(url);
+    const payload = fileExists(configPath)
+      ? JSON.parse(fs.readFileSync(configPath, 'utf8'))
+      : {};
 
-  backupIfExists(configPath);
-  fs.writeFileSync(configPath, `${JSON.stringify(payload, null, 2)}\n`, 'utf8');
-}
+    payload.mcpServers ??= {};
+    payload.mcpServers[SERVER_NAME] = buildJsonServerConfig(url);
 
-function uninstallClaudeDesktop(configPath) {
-  if (!fileExists(configPath)) {
-    return;
+    backupIfExists(configPath);
+    fs.writeFileSync(configPath, `${JSON.stringify(payload, null, 2)}\n`, 'utf8');
   }
+}
 
-  const payload = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-  if (!payload?.mcpServers?.[SERVER_NAME]) {
-    return;
-  }
+function uninstallClaudeDesktop(configPaths) {
+  for (const configPath of configPaths) {
+    if (!fileExists(configPath)) {
+      continue;
+    }
 
-  delete payload.mcpServers[SERVER_NAME];
-  if (Object.keys(payload.mcpServers).length === 0) {
-    delete payload.mcpServers;
-  }
+    const payload = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+    if (!payload?.mcpServers?.[SERVER_NAME]) {
+      continue;
+    }
 
-  backupIfExists(configPath);
-  fs.writeFileSync(configPath, `${JSON.stringify(payload, null, 2)}\n`, 'utf8');
+    delete payload.mcpServers[SERVER_NAME];
+    if (Object.keys(payload.mcpServers).length === 0) {
+      delete payload.mcpServers;
+    }
+
+    backupIfExists(configPath);
+    fs.writeFileSync(configPath, `${JSON.stringify(payload, null, 2)}\n`, 'utf8');
+  }
 }
 
 function installClaudeCode(url) {
@@ -529,17 +550,37 @@ function uninstallClaudeCode() {
 }
 
 function installOpenClaw(url) {
-  const value = JSON.stringify(buildJsonServerConfig(url));
-  const result = runCommand('openclaw', ['config', 'set', `mcp.servers.${SERVER_NAME}`, value, '--json']);
+  const result = runMcporterCommand([
+    'config',
+    'add',
+    SERVER_NAME,
+    url,
+    '--scope',
+    'home'
+  ]);
   if (!result.ok) {
-    throw new Error(result.stderr || 'openclaw config set failed');
+    throw new Error(result.stderr || 'mcporter config add failed');
   }
 }
 
 function uninstallOpenClaw() {
-  const result = runCommand('openclaw', ['config', 'unset', `mcp.servers.${SERVER_NAME}`]);
+  if (!fileExists(resolveMcporterHomeConfigPath())) {
+    return;
+  }
+
+  const result = runMcporterCommand([
+    '--config',
+    resolveMcporterHomeConfigPath(),
+    'config',
+    'remove',
+    SERVER_NAME
+  ]);
+  if (result.stderr && /does not exist/i.test(result.stderr)) {
+    return;
+  }
+
   if (!result.ok) {
-    throw new Error(result.stderr || 'openclaw config unset failed');
+    throw new Error(result.stderr || 'mcporter config remove failed');
   }
 }
 
@@ -1004,7 +1045,8 @@ function getClaudeDesktopCandidates() {
   if (process.platform === 'win32') {
     const appData = env.APPDATA || path.join(env.USERPROFILE || os.homedir(), 'AppData', 'Roaming');
     const localAppData = env.LOCALAPPDATA || path.join(env.USERPROFILE || os.homedir(), 'AppData', 'Local');
-    const candidates = [
+    const storeCandidates = [];
+    const roamingCandidates = [
       path.join(appData, 'Claude', 'claude_desktop_config.json'),
       path.join(appData, 'Claude', 'config.json')
     ];
@@ -1018,7 +1060,7 @@ function getClaudeDesktopCandidates() {
           .filter(name => name.toLowerCase().startsWith('claude_'));
 
         for (const packageDir of packageDirs) {
-          candidates.push(
+          storeCandidates.push(
             path.join(packagesRoot, packageDir, 'LocalCache', 'Roaming', 'Claude', 'claude_desktop_config.json'),
             path.join(packagesRoot, packageDir, 'LocalCache', 'Roaming', 'Claude', 'config.json'));
         }
@@ -1027,7 +1069,7 @@ function getClaudeDesktopCandidates() {
       }
     }
 
-    return [...new Set(candidates)];
+    return [...new Set([...storeCandidates, ...roamingCandidates])];
   }
 
   if (process.platform === 'darwin') {
@@ -1043,6 +1085,34 @@ function getClaudeDesktopCandidates() {
   ];
 }
 
+function selectClaudeDesktopConfigPaths(candidates) {
+  const existingPrimary = candidates.filter(candidate =>
+    fileExists(candidate) &&
+    path.basename(candidate).toLowerCase() === 'claude_desktop_config.json');
+  if (existingPrimary.length > 0) {
+    return existingPrimary;
+  }
+
+  const existingAny = candidates.filter(fileExists);
+  if (existingAny.length > 0) {
+    return existingAny;
+  }
+
+  const creatablePrimary = candidates.find(candidate =>
+    path.basename(candidate).toLowerCase() === 'claude_desktop_config.json' &&
+    fs.existsSync(path.dirname(candidate)));
+  if (creatablePrimary) {
+    return [creatablePrimary];
+  }
+
+  const creatableAny = candidates.find(candidate => fs.existsSync(path.dirname(candidate)));
+  if (creatableAny) {
+    return [creatableAny];
+  }
+
+  return [candidates[0]];
+}
+
 function resolveOpenClawConfigPath() {
   const explicit = env.OPENCLAW_CONFIG_PATH;
   if (explicit) {
@@ -1053,6 +1123,30 @@ function resolveOpenClawConfigPath() {
   return path.join(stateDir, 'openclaw.json');
 }
 
+function resolveMcporterHomeConfigPath() {
+  return path.join(os.homedir(), '.mcporter', 'mcporter.json');
+}
+
+function runMcporterCommand(args) {
+  const mcporter = resolveExecutablePath(process.platform === 'win32' ? 'mcporter.cmd' : 'mcporter');
+  if (mcporter) {
+    return runCommand(mcporter, args);
+  }
+
+  const npx = resolveExecutablePath(process.platform === 'win32' ? 'npx.cmd' : 'npx');
+  if (!npx) {
+    return {
+      ok: false,
+      status: null,
+      stdout: '',
+      stderr: 'mcporter and npx were not found in PATH',
+      error: null
+    };
+  }
+
+  return runCommand(npx, ['-y', 'mcporter', ...args]);
+}
+
 function runCommand(command, args) {
   const result = spawnSync(command, args, {
     encoding: 'utf8',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phidiassj/aiyoperps-mcp-installer",
-  "version": "0.6.8",
+  "version": "0.7.0",
   "description": "Interactive installer for registering AiyoPerps MCP with supported AI agent hosts.",
   "license": "MIT",
   "type": "module",