captain-tool 0.0.30 → 0.0.32

package/README.md

@@ -54,7 +54,7 @@ Edit `%APPDATA%\Claude\claude_desktop_config.json` (Windows) or `~/Library/Appli
 ```json
 {
   "mcpServers": {
-    "captain-tool": {
+    "captain": {
       "command": "captain-tool",
       "env": {
         "CAPTAIN_API_URL": "https://app.getcaptain.dev/"
@@ -68,7 +68,7 @@ Edit `%APPDATA%\Claude\claude_desktop_config.json` (Windows) or `~/Library/Appli
 ```json
 {
   "mcpServers": {
-    "captain-tool": {
+    "captain": {
       "command": "cmd",
       "args": ["/c", "captain-tool"],
       "env": {
@@ -84,19 +84,21 @@ Restart Claude Desktop to activate.
 ### Claude Code (CLI)
 
 ```bash
-claude mcp add captain-tool -- cmd /c captain-tool
+claude mcp add captain -- cmd /c captain-tool
 ```
 
+> Registers under the short name `captain` (tool prefix `mcp__captain__`). If you previously added it as `captain-tool`, run `claude mcp remove captain-tool` to avoid a duplicate registration.
+
 ### VS Code + Copilot
 
-[![Install in VS Code](https://img.shields.io/badge/VS_Code-Install_MCP_Server-0098FF?logo=visualstudiocode)](vscode:mcp/install?%7B%22name%22%3A%22captain-tool%22%2C%22command%22%3A%22npx%22%2C%22args%22%3A%5B%22captain-tool%22%5D%2C%22env%22%3A%7B%22CAPTAIN_API_URL%22%3A%22https%3A%2F%2Fapp.getcaptain.dev%2F%22%7D%7D)
+[![Install in VS Code](https://img.shields.io/badge/VS_Code-Install_MCP_Server-0098FF?logo=visualstudiocode)](vscode:mcp/install?%7B%22name%22%3A%22captain%22%2C%22command%22%3A%22npx%22%2C%22args%22%3A%5B%22captain-tool%22%5D%2C%22env%22%3A%7B%22CAPTAIN_API_URL%22%3A%22https%3A%2F%2Fapp.getcaptain.dev%2F%22%7D%7D)
 
 Or edit `%APPDATA%\Code\User\mcp.json` (Windows) / `~/.config/Code/User/mcp.json` (Linux) / `~/Library/Application Support/Code/User/mcp.json` (macOS):
 
 ```json
 {
   "servers": {
-    "captain-tool": {
+    "captain": {
       "type": "stdio",
       "command": "captain-tool",
       "env": {
@@ -116,7 +118,7 @@ Edit `~/.cursor/mcp.json`:
 ```json
 {
   "mcpServers": {
-    "captain-tool": {
+    "captain": {
       "command": "captain-tool",
       "env": {
         "CAPTAIN_API_URL": "https://app.getcaptain.dev/"
@@ -135,7 +137,7 @@ Edit `~/.codeium/windsurf/mcp_config.json` (macOS/Linux) or `%USERPROFILE%\.code
 ```json
 {
   "mcpServers": {
-    "captain-tool": {
+    "captain": {
       "command": "captain-tool",
       "env": {
         "CAPTAIN_API_URL": "https://app.getcaptain.dev/"

package/bin/captain-tool-setup

@@ -25,6 +25,20 @@ const readline = require('readline');
 
 const CAPTAIN_API_URL = 'https://app.getcaptain.dev/';
 
+// The MCP server registration key. This becomes the `mcp__<name>__` tool prefix
+// the agent sees, so we keep it short: `captain`, not `captain-tool`. The npm
+// package and binary are still named `captain-tool`; only the registration key
+// is shortened.
+const SERVER_NAME = 'captain';
+
+// Names this server may have been registered under previously. On (re-)run we
+// remove any of these so an agent never has to search two prefixes (e.g. both
+// `mcp__captain__` and `mcp__captain-tool__`) — a duplicate that doubles tool
+// discovery cost. We only delete an entry that actually points at our binary
+// (see entryIsOurs), so an unrelated server a user happens to name `captain-tool`
+// is left alone.
+const LEGACY_NAMES = ['captain-tool'];
+
 // ── Binary resolution (same logic as the runner) ─────────────────────────────
 
 const PLATFORMS = [
@@ -232,10 +246,80 @@ function readJsonConfig(filePath) {
   }
 }
 
+// ── Legacy-registration cleanup ───────────────────────────────────────────────
+
+/**
+ * Return true if an existing MCP server entry points at OUR binary.
+ *
+ * Every entry we write invokes captain-tool one of three ways:
+ *   - the binary directly      → command basename is `captain-tool[.exe]`
+ *   - `npx captain-tool`       → an arg is exactly `captain-tool`
+ *   - `cmd /c npx captain-tool`→ an arg is exactly `captain-tool`
+ *
+ * We match on the command BASENAME (not a substring) and on an EXACT arg, so an
+ * unrelated server that merely contains the substring "captain-tool" in a path
+ * (e.g. command `/opt/my-captain-tools/run`) is NOT matched. Combined with the
+ * caller only ever checking keys in LEGACY_NAMES, this keeps deletion tightly
+ * scoped to registrations this installer actually created.
+ */
+function entryIsOurs(entry) {
+  if (!entry || typeof entry !== 'object') return false;
+  if (typeof entry.command === 'string') {
+    const base = entry.command.replace(/\\/g, '/').split('/').pop().toLowerCase();
+    if (base === 'captain-tool' || base === 'captain-tool.exe') return true;
+  }
+  if (Array.isArray(entry.args) && entry.args.some((a) => a === 'captain-tool')) {
+    return true;
+  }
+  return false;
+}
+
+/**
+ * Delete any LEGACY_NAMES entries from a single server-map (mcpServers / servers)
+ * that resolve to our binary, so re-running setup heals a duplicate registration.
+ */
+function removeLegacyEntries(root) {
+  if (!root || typeof root !== 'object') return;
+  for (const legacy of LEGACY_NAMES) {
+    if (legacy !== SERVER_NAME && entryIsOurs(root[legacy])) {
+      delete root[legacy];
+    }
+  }
+}
+
+/**
+ * Sweep legacy entries out of EVERY scope in a config object: the top-level
+ * server maps AND any per-project maps.
+ *
+ * WHY per-project: Claude Code's `~/.claude.json` stores MCP servers both at the
+ * top level (`mcpServers`) and per working directory under
+ * `projects[<cwd>].mcpServers`. The previous npm README registered with
+ * `claude mcp add captain-tool …` WITHOUT `-s user`, which defaults to *local*
+ * (project) scope — so the legacy duplicate often lives under `projects[*]`, not
+ * at the top level. Cleaning only the top level would leave exactly the
+ * two-prefix duplicate this is meant to remove.
+ */
+function removeLegacyEverywhere(config) {
+  removeLegacyEntries(config.mcpServers);
+  removeLegacyEntries(config.servers);
+  if (config.projects && typeof config.projects === 'object') {
+    for (const proj of Object.values(config.projects)) {
+      if (proj && typeof proj === 'object') {
+        removeLegacyEntries(proj.mcpServers);
+        removeLegacyEntries(proj.servers);
+      }
+    }
+  }
+}
+
 // ── Per-client config writer ──────────────────────────────────────────────────
 
 /**
- * Write (or update) the captain-tool entry in a single client's config file.
+ * Write (or update) the captain server entry in a single client's config file.
+ *
+ * Registers under SERVER_NAME ("captain") and removes any legacy registration
+ * (e.g. "captain-tool") that points at our binary, so the agent only ever sees
+ * one server prefix.
  *
  * Returns the absolute path that was written so the caller can print it.
  */
@@ -245,15 +329,19 @@ function configureClient(client, binaryPath) {
   // Read the existing config (or start with an empty object).
   const config = readJsonConfig(configPath);
 
+  // Heal duplicate registrations in every scope (top-level + per-project) before
+  // writing the canonical entry.
+  removeLegacyEverywhere(config);
+
   if (client.format === 'A') {
-    // Format A: { mcpServers: { "captain-tool": { command, args, env } } }
+    // Format A: { mcpServers: { "captain": { command, args, env } } }
     const rootKey = client.rootKey || 'mcpServers';
     if (!config[rootKey]) config[rootKey] = {};
-    config[rootKey]['captain-tool'] = buildEntryFormatA(binaryPath);
+    config[rootKey][SERVER_NAME] = buildEntryFormatA(binaryPath);
   } else {
-    // Format B: { servers: { "captain-tool": { type, command, args, env } } }
+    // Format B: { servers: { "captain": { type, command, args, env } } }
     if (!config.servers) config.servers = {};
-    config.servers['captain-tool'] = buildEntryFormatB(binaryPath);
+    config.servers[SERVER_NAME] = buildEntryFormatB(binaryPath);
   }
 
   atomicWriteJson(configPath, config);
@@ -366,10 +454,26 @@ async function main() {
     process.exit(1);
   }
 
-  console.log('Setup complete. captain-tool is registered and ready to use.');
+  console.log('Setup complete. The captain server is registered and ready to use.');
+}
+
+// Only run the interactive wizard when invoked directly. Guarding on
+// require.main lets tests `require()` this file to exercise the pure helpers
+// (entryIsOurs / removeLegacyEntries / configureClient) without launching the
+// stdin-driven prompt.
+if (require.main === module) {
+  main().catch((err) => {
+    console.error('Unexpected error:', err);
+    process.exit(1);
+  });
 }
 
-main().catch((err) => {
-  console.error('Unexpected error:', err);
-  process.exit(1);
-});
+module.exports = {
+  SERVER_NAME,
+  LEGACY_NAMES,
+  entryIsOurs,
+  removeLegacyEntries,
+  removeLegacyEverywhere,
+  configureClient,
+  resolveCommand,
+};

package/package.json

@@ -1,19 +1,20 @@
 {
   "name": "captain-tool",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "description": "MCP server connecting Claude Desktop and VS Code Copilot to Captain Cloud",
   "bin": {
     "captain-tool": "bin/captain-tool",
     "captain-tool-setup": "bin/captain-tool-setup"
   },
   "scripts": {
-    "postinstall": "node scripts/postinstall.js"
+    "postinstall": "node scripts/postinstall.js",
+    "test": "node test/setup.test.js"
   },
   "optionalDependencies": {
-    "@captain-tool/captain-tool-win32-x64": "0.0.30",
-    "@captain-tool/captain-tool-darwin-x64": "0.0.30",
-    "@captain-tool/captain-tool-darwin-arm64": "0.0.30",
-    "@captain-tool/captain-tool-linux-x64": "0.0.30"
+    "@captain-tool/captain-tool-win32-x64": "0.0.32",
+    "@captain-tool/captain-tool-darwin-x64": "0.0.32",
+    "@captain-tool/captain-tool-darwin-arm64": "0.0.32",
+    "@captain-tool/captain-tool-linux-x64": "0.0.32"
   },
   "files": [
     "bin/",