terminator-mcp-agent 0.5.11 → 0.5.13

package/README.md

@@ -43,7 +43,22 @@ You can also use the CLI to configure your app automatically:
 npx -y terminator-mcp-agent --add-to-app [app]
 ```
 
-Replace `[app]` with one of: `cursor`, `claude`, `vscode`, `insiders`, `windsurf`.
+Replace `[app]` with one of:
+
+- cursor
+- claude
+- vscode
+- insiders
+- windsurf
+- cline
+- roocode
+- witsy
+- enconvo
+- boltai
+- amazon-bedrock
+- amazonq
+
+If you omit `[app]`, the CLI will prompt you to select from all available options.
 
 ---
 

package/config.js

@@ -0,0 +1,280 @@
+const fs = require("fs");
+const os = require("os");
+const path = require("path");
+const { execFileSync } = require("child_process");
+
+/**
+ * @typedef {Object} ClientConfig
+ * @property {Object.<string, any>} mcpServers
+ */
+
+/**
+ * @typedef {Object} ClientFileTarget
+ * @property {"file"} type
+ * @property {string} path
+ */
+
+/**
+ * @typedef {Object} ClientCommandTarget
+ * @property {"command"} type
+ * @property {string} command
+ */
+
+// Initialize platform-specific paths
+const homeDir = os.homedir();
+
+const platformPaths = {
+  win32: {
+    baseDir: process.env.APPDATA || path.join(homeDir, "AppData", "Roaming"),
+    vscodePath: path.join("Code", "User", "globalStorage"),
+  },
+  darwin: {
+    baseDir: path.join(homeDir, "Library", "Application Support"),
+    vscodePath: path.join("Code", "User", "globalStorage"),
+  },
+  linux: {
+    baseDir: process.env.XDG_CONFIG_HOME || path.join(homeDir, ".config"),
+    vscodePath: path.join("Code/User/globalStorage"),
+  },
+};
+
+const platform = process.platform;
+const { baseDir, vscodePath } = platformPaths[platform] || platformPaths.linux;
+const defaultClaudePath = path.join(
+  baseDir,
+  "Claude",
+  "claude_desktop_config.json",
+);
+
+// Define client paths using the platform-specific base directories
+const clientPaths = {
+  claude: { type: "file", path: defaultClaudePath },
+  cline: {
+    type: "file",
+    path: path.join(
+      baseDir,
+      vscodePath,
+      "saoudrizwan.claude-dev",
+      "settings",
+      "cline_mcp_settings.json",
+    ),
+  },
+  roocode: {
+    type: "file",
+    path: path.join(
+      baseDir,
+      vscodePath,
+      "rooveterinaryinc.roo-cline",
+      "settings",
+      "mcp_settings.json",
+    ),
+  },
+  windsurf: {
+    type: "file",
+    path: path.join(homeDir, ".codeium", "windsurf", "mcp_config.json"),
+  },
+  witsy: { type: "file", path: path.join(baseDir, "Witsy", "settings.json") },
+  enconvo: {
+    type: "file",
+    path: path.join(homeDir, ".config", "enconvo", "mcp_config.json"),
+  },
+  cursor: { type: "file", path: path.join(homeDir, ".cursor", "mcp.json") },
+  vscode: {
+    type: "command",
+    command: process.platform === "win32" ? "code.cmd" : "code",
+  },
+  "vscode-insiders": {
+    type: "command",
+    command:
+      process.platform === "win32" ? "code-insiders.cmd" : "code-insiders",
+  },
+  boltai: { type: "file", path: path.join(homeDir, ".boltai", "mcp.json") },
+  "amazon-bedrock": {
+    type: "file",
+    path: path.join(homeDir, "Amazon Bedrock Client", "mcp_config.json"),
+  },
+  amazonq: {
+    type: "file",
+    path: path.join(homeDir, ".aws", "amazonq", "mcp.json"),
+  },
+};
+
+/**
+ * @param {string} [client]
+ * @returns {ClientFileTarget|ClientCommandTarget}
+ */
+function getConfigPath(client) {
+  const normalizedClient = client ? client.toLowerCase() : "claude";
+  verbose(`Getting config path for client: ${normalizedClient}`);
+
+  const configTarget = clientPaths[normalizedClient] || {
+    type: "file",
+    path: path.join(
+      path.dirname(defaultClaudePath),
+      "..",
+      client || "claude",
+      `${normalizedClient}_config.json`,
+    ),
+  };
+
+  verbose(`Config path resolved to: ${JSON.stringify(configTarget)}`);
+  return configTarget;
+}
+
+/**
+ * @param {string} client
+ * @returns {ClientConfig}
+ */
+function readConfig(client) {
+  verbose(`Reading config for client: ${client}`);
+  try {
+    const configPath = getConfigPath(client);
+
+    // Command-based installers (i.e. VS Code) do not currently support listing servers
+    if (configPath.type === "command") {
+      return { mcpServers: {} };
+    }
+
+    verbose(`Checking if config file exists at: ${configPath.path}`);
+    if (!fs.existsSync(configPath.path)) {
+      verbose(`Config file not found, returning default empty config`);
+      return { mcpServers: {} };
+    }
+
+    verbose(`Reading config file content`);
+    const rawConfig = JSON.parse(fs.readFileSync(configPath.path, "utf8"));
+    verbose(
+      `Config loaded successfully: ${JSON.stringify(rawConfig, null, 2)}`,
+    );
+
+    return {
+      ...rawConfig,
+      mcpServers: rawConfig.mcpServers || {},
+    };
+  } catch (error) {
+    verbose(
+      `Error reading config: ${error instanceof Error ? error.stack : JSON.stringify(error)}`,
+    );
+    return { mcpServers: {} };
+  }
+}
+
+/**
+ * @param {ClientConfig} config
+ * @param {string} [client]
+ */
+function writeConfig(configObj, client) {
+  verbose(`Writing config for client: ${client || "default"}`);
+  verbose(`Config data: ${JSON.stringify(configObj, null, 2)}`);
+
+  if (!configObj.mcpServers || typeof configObj.mcpServers !== "object") {
+    verbose(`Invalid mcpServers structure in config`);
+    throw new Error("Invalid mcpServers structure");
+  }
+
+  const configPath = getConfigPath(client);
+  if (configPath.type === "command") {
+    writeConfigCommand(configObj, configPath);
+  } else {
+    writeConfigFile(configObj, configPath);
+  }
+}
+
+/**
+ * @param {ClientConfig} config
+ * @param {ClientCommandTarget} target
+ */
+function writeConfigCommand(config, target) {
+  const args = [];
+  for (const [name, server] of Object.entries(config.mcpServers)) {
+    args.push("--add-mcp", JSON.stringify({ ...server, name }));
+  }
+
+  verbose(`Running command: ${JSON.stringify([target.command, ...args])}`);
+
+  try {
+    const output = execFileSync(target.command, args);
+    verbose(`Executed command successfully: ${output.toString()}`);
+  } catch (error) {
+    verbose(
+      `Error executing command: ${error instanceof Error ? error.message : String(error)}`,
+    );
+
+    if (error && error.code === "ENOENT") {
+      throw new Error(
+        `Command '${target.command}' not found. Make sure ${target.command} is installed and on your PATH`,
+      );
+    }
+
+    throw error;
+  }
+}
+
+/**
+ * @param {ClientConfig} config
+ * @param {ClientFileTarget} target
+ */
+function writeConfigFile(config, target) {
+  const configDir = path.dirname(target.path);
+
+  verbose(`Ensuring config directory exists: ${configDir}`);
+  if (!fs.existsSync(configDir)) {
+    verbose(`Creating directory: ${configDir}`);
+    fs.mkdirSync(configDir, { recursive: true });
+  }
+
+  let existingConfig = { mcpServers: {} };
+  try {
+    if (fs.existsSync(target.path)) {
+      verbose(`Reading existing config file for merging`);
+      existingConfig = JSON.parse(fs.readFileSync(target.path, "utf8"));
+      verbose(
+        `Existing config loaded: ${JSON.stringify(existingConfig, null, 2)}`,
+      );
+    }
+  } catch (error) {
+    verbose(
+      `Error reading existing config for merge: ${error instanceof Error ? error.message : String(error)}`,
+    );
+    // If reading fails, continue with empty existing config
+  }
+
+  verbose(`Merging configs`);
+  const mergedConfig = {
+    ...existingConfig,
+    ...config,
+  };
+  verbose(`Merged config: ${JSON.stringify(mergedConfig, null, 2)}`);
+
+  verbose(`Writing config to file: ${target.path}`);
+  fs.writeFileSync(target.path, JSON.stringify(mergedConfig, null, 2));
+  verbose(`Config successfully written`);
+}
+
+function verbose(msg) {
+  if (process.env.MCP_VERBOSE) {
+    console.log(`[config] ${msg}`);
+  }
+}
+
+const supportedClients = [
+  { key: "cursor", label: "Cursor" },
+  { key: "claude", label: "Claude" },
+  { key: "vscode", label: "VS Code" },
+  { key: "insiders", label: "VS Code Insiders" },
+  { key: "windsurf", label: "Windsurf" },
+  { key: "cline", label: "Cline" },
+  { key: "roocode", label: "RooCode" },
+  { key: "witsy", label: "Witsy" },
+  { key: "enconvo", label: "Enconvo" },
+  { key: "boltai", label: "BoltAI" },
+  { key: "amazon-bedrock", label: "Amazon Bedrock" },
+  { key: "amazonq", label: "Amazon Q" },
+];
+
+module.exports = {
+  getConfigPath,
+  readConfig,
+  writeConfig,
+  supportedClients,
+};

package/index.js

@@ -5,6 +5,8 @@ const path = require("path");
 const fs = require("fs");
 const os = require("os");
 const readline = require("readline");
+const config = require("./config");
+const { supportedClients } = require("./config");
 
 function getPlatformInfo() {
   const platform = process.platform;
@@ -36,209 +38,24 @@ function getPlatformInfo() {
   throw new Error(`Unsupported platform: ${platform} ${arch}`);
 }
 
-function getMcpServerEntry() {
-  return {
-    command: "npx",
-    args: ["-y", "terminator-mcp-agent"],
-  };
-}
-
-function addToCursorConfig() {
-  const home = os.homedir();
-  const configDir = path.join(home, ".cursor");
-  const configFile = path.join(configDir, "mcp.json");
-  if (!fs.existsSync(configDir)) {
-    fs.mkdirSync(configDir, { recursive: true });
-  }
-  let config = {};
-  if (fs.existsSync(configFile)) {
-    try {
-      config = JSON.parse(fs.readFileSync(configFile, "utf8"));
-    } catch (e) {
-      config = {};
-    }
-  }
-  if (!config.mcpServers || typeof config.mcpServers !== "object") {
-    config.mcpServers = {};
-  }
-  config.mcpServers["terminator-mcp-agent"] = getMcpServerEntry();
-  fs.writeFileSync(configFile, JSON.stringify(config, null, 2));
-  console.log(`Cursor configuration saved to ${configFile}`);
-}
-
-function addToClaudeConfig() {
-  const platform = process.platform;
-  let configDir, configFile;
-  if (platform === "win32") {
-    const appData =
-      process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming");
-    configDir = path.join(appData, "Claude");
-    configFile = path.join(configDir, "claude_desktop_config.json");
-  } else if (platform === "darwin") {
-    configDir = path.join(
-      os.homedir(),
-      "Library",
-      "Application Support",
-      "Claude",
-    );
-    configFile = path.join(configDir, "claude_desktop_config.json");
-  } else {
-    console.error("Claude desktop is only supported on Windows and macOS.");
-    process.exit(1);
-  }
-  if (!fs.existsSync(configDir)) {
-    console.error(
-      `Claude desktop config directory does not exist: ${configDir}\nPlease make sure the Claude desktop app is installed for your platform.`,
-    );
-    process.exit(1);
-  }
-  let config = {};
-  if (fs.existsSync(configFile)) {
-    try {
-      config = JSON.parse(fs.readFileSync(configFile, "utf8"));
-    } catch (e) {
-      config = {};
-    }
-  }
-  if (!config.mcpServers || typeof config.mcpServers !== "object") {
-    config.mcpServers = {};
-  }
-  config.mcpServers["terminator-mcp-agent"] = getMcpServerEntry();
-  fs.writeFileSync(configFile, JSON.stringify(config, null, 2));
-  console.log(`Claude configuration saved to ${configFile}`);
-}
-
-function buildVSCodeMcpJsonArg(mcpJson) {
-  // VS Code expects: --add-mcp "{\"name\":\"...\",...}"
-  return `"${JSON.stringify(mcpJson).replace(/"/g, '\\"')}"`;
-}
-
-function addToVSCodeConfig() {
-  // VS Code CLI-based setup
-  console.log("Adding Terminator MCP to VS Code via code CLI...");
-  const mcpJson = {
-    name: "terminator-mcp-agent",
-    command: "npx",
-    args: ["-y", "terminator-mcp-agent"],
-  };
-  const jsonArg = buildVSCodeMcpJsonArg(mcpJson);
-  const vscodeCmd = "code";
-  try {
-    const { spawnSync } = require("child_process");
-    const result = spawnSync(`${vscodeCmd} --add-mcp ${jsonArg}`, [], {
-      stdio: "inherit",
-      shell: true,
-    });
-    if (result.error) {
-      if (result.error.code === "ENOENT") {
-        console.error(
-          "'code' command not found in PATH. Make sure VS Code CLI is installed and available.",
-        );
-      } else {
-        console.error("Failed to launch VS Code CLI:", result.error.message);
-      }
-      process.exit(1);
-    }
-    if (result.status !== 0) {
-      console.error(`VS Code CLI exited with code ${result.status}`);
-      process.exit(1);
-    }
-    console.log("Successfully added Terminator MCP to VS Code.");
-  } catch (e) {
-    console.error("Failed to add MCP to VS Code:", e.message);
-    process.exit(1);
-  }
-}
-
-function addToVSCodeInsidersConfig() {
-  // VS Code Insiders CLI-based setup
-  console.log(
-    "Adding Terminator MCP to VS Code Insiders via code-insiders CLI...",
-  );
-  const mcpJson = {
-    name: "terminator-mcp-agent",
-    command: "npx",
-    args: ["-y", "terminator-mcp-agent"],
-  };
-  const jsonArg = buildVSCodeMcpJsonArg(mcpJson);
-  const codeInsidersCmd = "code-insiders";
+function addToApp(app) {
   try {
-    const { spawnSync } = require("child_process");
-    const result = spawnSync(`${codeInsidersCmd} --add-mcp ${jsonArg}`, [], {
-      stdio: "inherit",
-      shell: true,
-    });
-    if (result.error) {
-      if (result.error.code === "ENOENT") {
-        console.error(
-          "'code-insiders' command not found in PATH. Make sure VS Code Insiders CLI is installed and available.",
-        );
-      } else {
-        console.error(
-          "Failed to launch VS Code Insiders CLI:",
-          result.error.message,
-        );
-      }
-      process.exit(1);
-    }
-    if (result.status !== 0) {
-      console.error(`VS Code Insiders CLI exited with code ${result.status}`);
-      process.exit(1);
-    }
-    console.log("Successfully added Terminator MCP to VS Code Insiders.");
+    const client = (app || "").toLowerCase();
+    const mcpServer = {
+      command: "npx",
+      args: ["-y", "terminator-mcp-agent"],
+    };
+    const currentConfig = config.readConfig(client);
+    currentConfig.mcpServers = currentConfig.mcpServers || {};
+    currentConfig.mcpServers["terminator-mcp-agent"] = mcpServer;
+    config.writeConfig(currentConfig, client);
+    console.log(`Configured MCP for ${client}`);
   } catch (e) {
-    console.error("Failed to add MCP to VS Code Insiders:", e.message);
+    console.error(`Failed to configure MCP for ${app}:`, e.message);
     process.exit(1);
   }
 }
 
-function addToWindsurfConfig() {
-  // Windsurf config: %USERPROFILE%/.codeium/windsurf/mcp_config.json
-  const home = os.homedir();
-  const configDir = path.join(home, ".codeium", "windsurf");
-  const configFile = path.join(configDir, "mcp_config.json");
-  if (!fs.existsSync(configDir)) {
-    fs.mkdirSync(configDir, { recursive: true });
-  }
-  let config = {};
-  if (fs.existsSync(configFile)) {
-    try {
-      config = JSON.parse(fs.readFileSync(configFile, "utf8"));
-    } catch (e) {
-      config = {};
-    }
-  }
-  if (!config.mcpServers || typeof config.mcpServers !== "object") {
-    config.mcpServers = {};
-  }
-  config.mcpServers["terminator-mcp-agent"] = getMcpServerEntry();
-  fs.writeFileSync(configFile, JSON.stringify(config, null, 2));
-  console.log(`Windsurf configuration saved to ${configFile}`);
-}
-
-function addToApp(app) {
-  switch ((app || "").toLowerCase()) {
-    case "cursor":
-      addToCursorConfig();
-      break;
-    case "claude":
-      addToClaudeConfig();
-      break;
-    case "vscode":
-      addToVSCodeConfig();
-      break;
-    case "insiders":
-      addToVSCodeInsidersConfig();
-      break;
-    case "windsurf":
-      addToWindsurfConfig();
-      break;
-    default:
-      console.error("Unknown app: " + app);
-      process.exit(1);
-  }
-}
-
 const argv = process.argv.slice(2);
 
 if (argv.includes("--add-to-app")) {
@@ -256,39 +73,27 @@ if (argv.includes("--add-to-app")) {
     console.log("========== Terminator MCP Setup ==========");
     console.log("Which app do you want to configure Terminator MCP for?");
     console.log("");
-    console.log("  1. Cursor");
-    console.log("  2. Claude");
-    console.log("  3. VS Code");
-    console.log("  4. VS Code Insiders");
-    console.log("  5. Windsurf");
+    const pad = (n) =>
+      String(n).padStart(String(supportedClients.length).length, " ");
+    supportedClients.forEach((client, idx) => {
+      console.log(`  ${pad(idx + 1)}. ${client.label}`);
+    });
     console.log("");
-    rl.question("Enter your choice (1-5): ", (answer) => {
-      let selectedApp = null;
-      switch (answer.trim()) {
-        case "1":
-          selectedApp = "cursor";
-          break;
-        case "2":
-          selectedApp = "claude";
-          break;
-        case "3":
-          selectedApp = "vscode";
-          break;
-        case "4":
-          selectedApp = "insiders";
-          break;
-        case "5":
-          selectedApp = "windsurf";
-          break;
-        default:
+    rl.question(
+      `Enter your choice (1-${supportedClients.length}): `,
+      (answer) => {
+        const idx = parseInt(answer.trim(), 10) - 1;
+        if (isNaN(idx) || idx < 0 || idx >= supportedClients.length) {
           console.error("Invalid choice. Skipping app configuration.");
           rl.close();
           process.exit(1);
-      }
-      rl.close();
-      addToApp(selectedApp);
-      process.exit(0);
-    });
+        }
+        const selectedApp = supportedClients[idx].key;
+        rl.close();
+        addToApp(selectedApp);
+        process.exit(0);
+      },
+    );
     return;
   } else {
     addToApp(app);
@@ -315,7 +120,10 @@ if (argv.length === 0 || argv.includes("--start")) {
     }
   }
 
-  const child = spawn(binary, [], { stdio: ["pipe", "pipe", "pipe"], shell: true });
+  const child = spawn(binary, [], {
+    stdio: ["pipe", "pipe", "pipe"],
+    shell: true,
+  });
 
   process.stdin.pipe(child.stdin);
   child.stdout.pipe(process.stdout);

package/package.json

@@ -1,20 +1,21 @@
 {
   "bin": {
-    "terminator-mcp": "index.js"
+    "terminator-mcp-agent": "index.js"
   },
   "description": "Cross-platform Model Context Protocol (MCP) agent for Terminator",
   "engines": {
     "node": ">= 10"
   },
   "files": [
-    "index.js"
+    "index.js",
+    "config.js"
   ],
   "name": "terminator-mcp-agent",
   "optionalDependencies": {
-    "terminator-mcp-darwin-arm64": "0.5.11",
-    "terminator-mcp-darwin-x64": "0.5.11",
-    "terminator-mcp-linux-x64-gnu": "0.5.11",
-    "terminator-mcp-win32-x64-msvc": "0.5.11"
+    "terminator-mcp-darwin-arm64": "0.5.13",
+    "terminator-mcp-darwin-x64": "0.5.13",
+    "terminator-mcp-linux-x64-gnu": "0.5.13",
+    "terminator-mcp-win32-x64-msvc": "0.5.13"
   },
   "repository": {
     "type": "git",
@@ -26,5 +27,5 @@
     "sync-version": "node ./utils/sync-version.js",
     "update-badges": "node ./utils/update-badges.js"
   },
-  "version": "0.5.11"
+  "version": "0.5.13"
 }