@braid-cloud/cli 0.1.6 → 0.1.8

package/dist/index.js

@@ -60,7 +60,7 @@ import { homedir } from "os";
 import { dirname, join, parse } from "path";
 import process2 from "process";
 import { Data, Effect, pipe } from "effect";
-var CONFIG_DIR, CONFIG_FILE, PROJECT_CONFIG_FILENAME, USER_CONFIG_FILENAME, ConfigReadError, ConfigWriteError, findConfigFile, findProjectConfigFile, findUserConfigFile, loadProjectConfig, loadUserConfig, resolveUserConfigWritePath, saveUserConfig, saveProjectConfig, isValidServerUrl, resolveServerUrlFromConfig, applyConfigSource, applyEnvOverrides, createDefaultMergedConfig, loadMergedConfig, loadConfig, saveConfig, getApiKey, setApiKey, getServerUrl, clearApiKey, loadConfigAsync, loadProjectConfigAsync, loadUserConfigAsync, loadMergedConfigAsync, findProjectConfigFileAsync, findUserConfigFileAsync, saveConfigAsync, saveUserConfigAsync, saveProjectConfigAsync, getApiKeyAsync, setApiKeyAsync, getServerUrlAsync, clearApiKeyAsync;
+var CONFIG_DIR, CONFIG_FILE, PROJECT_CONFIG_FILENAME, USER_CONFIG_FILENAME, ConfigReadError, ConfigWriteError, findConfigFile, findProjectConfigFile, findUserConfigFile, loadProjectConfig, loadUserConfig, resolveUserConfigWritePath, resolveProjectConfigWritePath, saveUserConfig, saveProjectConfig, isValidServerUrl, resolveServerUrlFromConfig, applyConfigSource, applyEnvOverrides, createDefaultMergedConfig, loadMergedConfig, loadConfig, saveConfig, getApiKey, setApiKey, getServerUrl, clearApiKey, loadConfigAsync, loadProjectConfigAsync, loadUserConfigAsync, loadMergedConfigAsync, findProjectConfigFileAsync, findUserConfigFileAsync, saveConfigAsync, saveUserConfigAsync, saveProjectConfigAsync, getApiKeyAsync, setApiKeyAsync, getServerUrlAsync, clearApiKeyAsync;
 var init_config = __esm({
   "src/lib/config.ts"() {
     "use strict";
@@ -112,6 +112,7 @@ var init_config = __esm({
       catch: () => void 0
     }).pipe(Effect.orElseSucceed(() => void 0));
     resolveUserConfigWritePath = (startDir = process2.cwd()) => findUserConfigFile(startDir) ?? join(startDir, USER_CONFIG_FILENAME);
+    resolveProjectConfigWritePath = (startDir = process2.cwd()) => findProjectConfigFile(startDir) ?? join(startDir, PROJECT_CONFIG_FILENAME);
     saveUserConfig = (config, startDir = process2.cwd()) => {
       const targetPath = resolveUserConfigWritePath(startDir);
       return pipe(
@@ -129,7 +130,7 @@ var init_config = __esm({
       );
     };
     saveProjectConfig = (config, startDir = process2.cwd()) => {
-      const targetPath = join(startDir, PROJECT_CONFIG_FILENAME);
+      const targetPath = resolveProjectConfigWritePath(startDir);
       return pipe(
         Effect.tryPromise({
           try: async () => {
@@ -1085,7 +1086,7 @@ async function scopeCommand(options) {
   const config = await loadMergedConfigAsync();
   const targetFile = await selectTargetFile(options);
   const loadSpinner = spinner();
-  loadSpinner.start("Loading scope options from Braid...");
+  loadSpinner.start("Loading scope options from braid...");
   try {
     const serverUrl = options.server ?? config.serverUrl;
     const apiKey = options.apiKey ?? config.token;
@@ -1191,7 +1192,7 @@ async function authCommand(options) {
     }
   }
   const apiKey = await password({
-    message: "Enter your Braid API key:",
+    message: "Enter your braid API key:",
     validate: (value) => {
       if (!value) {
         return "API key is required";
@@ -1311,24 +1312,83 @@ import { join as join2 } from "path";
 import process6 from "process";
 import { Effect as Effect3, pipe as pipe3 } from "effect";
 var home = homedir2();
+var vscodeExtSettingsPath = (extensionId, filename) => {
+  if (process6.platform === "darwin") {
+    return join2(
+      home,
+      "Library",
+      "Application Support",
+      "Code",
+      "User",
+      "globalStorage",
+      extensionId,
+      "settings",
+      filename
+    );
+  }
+  if (process6.platform === "win32") {
+    const appData = process6.env.APPDATA ?? join2(home, "AppData", "Roaming");
+    return join2(
+      appData,
+      "Code",
+      "User",
+      "globalStorage",
+      extensionId,
+      "settings",
+      filename
+    );
+  }
+  return join2(
+    home,
+    ".config",
+    "Code",
+    "User",
+    "globalStorage",
+    extensionId,
+    "settings",
+    filename
+  );
+};
+var claudeDesktopConfigPath = () => {
+  if (process6.platform === "darwin") {
+    return join2(
+      home,
+      "Library",
+      "Application Support",
+      "Claude",
+      "claude_desktop_config.json"
+    );
+  }
+  if (process6.platform === "win32") {
+    const appData = process6.env.APPDATA ?? join2(home, "AppData", "Roaming");
+    return join2(appData, "Claude", "claude_desktop_config.json");
+  }
+  return join2(home, ".config", "Claude", "claude_desktop_config.json");
+};
 var AGENTS = [
   {
     id: "amp",
-    name: "Amp, Kimi Code CLI",
+    name: "Amp",
     projectPath: ".agents/skills",
-    globalPath: join2(home, ".config", "agents", "skills")
+    globalPath: join2(home, ".config", "agents", "skills"),
+    mcpProjectConfigPath: ".amp/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".amp", "mcp.json")
   },
   {
     id: "kimi-cli",
     name: "Kimi Code CLI",
     projectPath: ".agents/skills",
-    globalPath: join2(home, ".config", "agents", "skills")
+    globalPath: join2(home, ".config", "agents", "skills"),
+    mcpProjectConfigPath: ".agents/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".config", "agents", "mcp.json")
   },
   {
     id: "antigravity",
     name: "Antigravity",
     projectPath: ".agent/skills",
-    globalPath: join2(home, ".gemini", "antigravity", "global_skills")
+    globalPath: join2(home, ".gemini", "antigravity", "global_skills"),
+    mcpProjectConfigPath: ".agent/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".gemini", "antigravity", "mcp.json")
   },
   {
     id: "claude-code",
@@ -1339,13 +1399,24 @@ var AGENTS = [
     globalMarkerPath: join2(home, ".claude"),
     rulesProjectPath: ".claude/rules",
     rulesGlobalPath: join2(home, ".claude", "rules"),
-    ruleFormat: "markdown-dir"
+    ruleFormat: "markdown-dir",
+    mcpProjectConfigPath: ".mcp.json",
+    mcpEntryStyle: "typed-stdio"
+  },
+  {
+    id: "claude-desktop",
+    name: "Claude Desktop",
+    projectPath: "",
+    globalPath: "",
+    mcpGlobalConfigPath: claudeDesktopConfigPath()
   },
   {
     id: "moltbot",
     name: "Moltbot",
     projectPath: "skills",
-    globalPath: join2(home, ".moltbot", "skills")
+    globalPath: join2(home, ".moltbot", "skills"),
+    mcpProjectConfigPath: "mcp.json",
+    mcpGlobalConfigPath: join2(home, ".moltbot", "mcp.json")
   },
   {
     id: "cline",
@@ -1353,37 +1424,52 @@ var AGENTS = [
     projectPath: ".cline/skills",
     globalPath: join2(home, ".cline", "skills"),
     rulesProjectPath: ".clinerules",
-    ruleFormat: "append-single"
+    ruleFormat: "append-single",
+    mcpGlobalConfigPath: vscodeExtSettingsPath(
+      "saoudrizwan.claude-dev",
+      "cline_mcp_settings.json"
+    ),
+    mcpEntryStyle: "cline"
   },
   {
     id: "codebuddy",
     name: "CodeBuddy",
     projectPath: ".codebuddy/skills",
-    globalPath: join2(home, ".codebuddy", "skills")
+    globalPath: join2(home, ".codebuddy", "skills"),
+    mcpProjectConfigPath: ".codebuddy/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".codebuddy", "mcp.json")
   },
   {
     id: "codex",
     name: "Codex",
     projectPath: ".codex/skills",
-    globalPath: join2(home, ".codex", "skills")
+    globalPath: join2(home, ".codex", "skills"),
+    mcpProjectConfigPath: ".codex/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".codex", "mcp.json")
   },
   {
     id: "command-code",
     name: "Command Code",
     projectPath: ".commandcode/skills",
-    globalPath: join2(home, ".commandcode", "skills")
+    globalPath: join2(home, ".commandcode", "skills"),
+    mcpProjectConfigPath: ".commandcode/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".commandcode", "mcp.json")
   },
   {
     id: "continue",
     name: "Continue",
     projectPath: ".continue/skills",
-    globalPath: join2(home, ".continue", "skills")
+    globalPath: join2(home, ".continue", "skills"),
+    mcpProjectConfigPath: ".continue/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".continue", "mcp.json")
   },
   {
     id: "crush",
     name: "Crush",
     projectPath: ".crush/skills",
-    globalPath: join2(home, ".config", "crush", "skills")
+    globalPath: join2(home, ".config", "crush", "skills"),
+    mcpProjectConfigPath: ".crush/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".config", "crush", "mcp.json")
   },
   {
     id: "cursor",
@@ -1391,19 +1477,25 @@ var AGENTS = [
     projectPath: ".cursor/skills",
     globalPath: join2(home, ".cursor", "skills"),
     rulesProjectPath: ".cursor/rules",
-    ruleFormat: "mdc"
+    ruleFormat: "mdc",
+    mcpProjectConfigPath: ".cursor/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".cursor", "mcp.json")
   },
   {
     id: "droid",
     name: "Droid",
     projectPath: ".factory/skills",
-    globalPath: join2(home, ".factory", "skills")
+    globalPath: join2(home, ".factory", "skills"),
+    mcpProjectConfigPath: ".factory/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".factory", "mcp.json")
   },
   {
     id: "gemini-cli",
     name: "Gemini CLI",
     projectPath: ".gemini/skills",
-    globalPath: join2(home, ".gemini", "skills")
+    globalPath: join2(home, ".gemini", "skills"),
+    mcpProjectConfigPath: ".gemini/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".gemini", "mcp.json")
   },
   {
     id: "github-copilot",
@@ -1411,79 +1503,108 @@ var AGENTS = [
     projectPath: ".github/skills",
     globalPath: join2(home, ".copilot", "skills"),
     rulesProjectPath: ".github/copilot-instructions.md",
-    ruleFormat: "append-single"
+    ruleFormat: "append-single",
+    mcpProjectConfigPath: ".vscode/mcp.json",
+    mcpRootKey: "servers",
+    mcpEntryStyle: "typed-stdio"
   },
   {
     id: "goose",
     name: "Goose",
     projectPath: ".goose/skills",
-    globalPath: join2(home, ".config", "goose", "skills")
+    globalPath: join2(home, ".config", "goose", "skills"),
+    mcpGlobalConfigPath: join2(home, ".config", "goose", "mcp.json")
   },
   {
     id: "junie",
     name: "Junie",
     projectPath: ".junie/skills",
-    globalPath: join2(home, ".junie", "skills")
+    globalPath: join2(home, ".junie", "skills"),
+    mcpProjectConfigPath: ".junie/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".junie", "mcp.json")
   },
   {
     id: "kilo",
     name: "Kilo Code",
     projectPath: ".kilocode/skills",
-    globalPath: join2(home, ".kilocode", "skills")
+    globalPath: join2(home, ".kilocode", "skills"),
+    mcpGlobalConfigPath: vscodeExtSettingsPath(
+      "kilocode.kilo-code",
+      "mcp_settings.json"
+    ),
+    mcpEntryStyle: "cline"
   },
   {
     id: "kiro-cli",
     name: "Kiro CLI",
     projectPath: ".kiro/skills",
-    globalPath: join2(home, ".kiro", "skills")
+    globalPath: join2(home, ".kiro", "skills"),
+    mcpProjectConfigPath: ".kiro/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".kiro", "mcp.json")
   },
   {
     id: "kode",
     name: "Kode",
     projectPath: ".kode/skills",
-    globalPath: join2(home, ".kode", "skills")
+    globalPath: join2(home, ".kode", "skills"),
+    mcpProjectConfigPath: ".kode/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".kode", "mcp.json")
   },
   {
     id: "mcpjam",
     name: "MCPJam",
     projectPath: ".mcpjam/skills",
-    globalPath: join2(home, ".mcpjam", "skills")
+    globalPath: join2(home, ".mcpjam", "skills"),
+    mcpProjectConfigPath: ".mcpjam/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".mcpjam", "mcp.json")
   },
   {
     id: "mux",
     name: "Mux",
     projectPath: ".mux/skills",
-    globalPath: join2(home, ".mux", "skills")
+    globalPath: join2(home, ".mux", "skills"),
+    mcpProjectConfigPath: ".mux/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".mux", "mcp.json")
   },
   {
     id: "opencode",
     name: "OpenCode",
     projectPath: ".opencode/skills",
-    globalPath: join2(home, ".config", "opencode", "skills")
+    globalPath: join2(home, ".config", "opencode", "skills"),
+    mcpProjectConfigPath: ".opencode/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".config", "opencode", "mcp.json")
   },
   {
     id: "openhands",
     name: "OpenHands",
     projectPath: ".openhands/skills",
-    globalPath: join2(home, ".openhands", "skills")
+    globalPath: join2(home, ".openhands", "skills"),
+    mcpProjectConfigPath: ".openhands/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".openhands", "mcp.json")
   },
   {
     id: "pi",
     name: "Pi",
     projectPath: ".pi/skills",
-    globalPath: join2(home, ".pi", "agent", "skills")
+    globalPath: join2(home, ".pi", "agent", "skills"),
+    mcpProjectConfigPath: ".pi/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".pi", "agent", "mcp.json")
   },
   {
     id: "qoder",
     name: "Qoder",
     projectPath: ".qoder/skills",
-    globalPath: join2(home, ".qoder", "skills")
+    globalPath: join2(home, ".qoder", "skills"),
+    mcpProjectConfigPath: ".qoder/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".qoder", "mcp.json")
   },
   {
     id: "qwen-code",
     name: "Qwen Code",
     projectPath: ".qwen/skills",
-    globalPath: join2(home, ".qwen", "skills")
+    globalPath: join2(home, ".qwen", "skills"),
+    mcpProjectConfigPath: ".qwen/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".qwen", "mcp.json")
   },
   {
     id: "roo",
@@ -1492,13 +1613,20 @@ var AGENTS = [
     globalPath: join2(home, ".roo", "skills"),
     rulesProjectPath: ".roo/rules",
     rulesGlobalPath: join2(home, ".roo", "rules"),
-    ruleFormat: "markdown-dir"
+    ruleFormat: "markdown-dir",
+    mcpGlobalConfigPath: vscodeExtSettingsPath(
+      "rooveterinaryinc.roo-cline",
+      "mcp_settings.json"
+    ),
+    mcpEntryStyle: "cline"
   },
   {
     id: "trae",
     name: "Trae",
     projectPath: ".trae/skills",
-    globalPath: join2(home, ".trae", "skills")
+    globalPath: join2(home, ".trae", "skills"),
+    mcpProjectConfigPath: ".trae/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".trae", "mcp.json")
   },
   {
     id: "windsurf",
@@ -1506,25 +1634,32 @@ var AGENTS = [
     projectPath: ".windsurf/skills",
     globalPath: join2(home, ".codeium", "windsurf", "skills"),
     rulesProjectPath: ".windsurfrules",
-    ruleFormat: "append-single"
+    ruleFormat: "append-single",
+    mcpGlobalConfigPath: join2(home, ".codeium", "windsurf", "mcp_config.json")
   },
   {
     id: "zencoder",
     name: "Zencoder",
     projectPath: ".zencoder/skills",
-    globalPath: join2(home, ".zencoder", "skills")
+    globalPath: join2(home, ".zencoder", "skills"),
+    mcpProjectConfigPath: ".zencoder/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".zencoder", "mcp.json")
   },
   {
     id: "neovate",
     name: "Neovate",
     projectPath: ".neovate/skills",
-    globalPath: join2(home, ".neovate", "skills")
+    globalPath: join2(home, ".neovate", "skills"),
+    mcpProjectConfigPath: ".neovate/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".neovate", "mcp.json")
   },
   {
     id: "pochi",
     name: "Pochi",
     projectPath: ".pochi/skills",
-    globalPath: join2(home, ".pochi", "skills")
+    globalPath: join2(home, ".pochi", "skills"),
+    mcpProjectConfigPath: ".pochi/mcp.json",
+    mcpGlobalConfigPath: join2(home, ".pochi", "mcp.json")
   },
   {
     id: "zed",
@@ -1535,7 +1670,10 @@ var AGENTS = [
     globalMarkerPath: join2(home, ".config", "zed"),
     rulesProjectPath: ".zed/rules",
     rulesGlobalPath: join2(home, ".config", "zed", "rules"),
-    ruleFormat: "markdown-dir"
+    ruleFormat: "markdown-dir",
+    mcpGlobalConfigPath: join2(home, ".config", "zed", "settings.json"),
+    mcpRootKey: "context_servers",
+    mcpEntryStyle: "zed"
   }
 ];
 var directoryExists = (path2) => pipe3(
@@ -1605,6 +1743,40 @@ var resolveRulesInstallPath = (agent, options) => {
   const cwd = options.projectRoot ?? process6.cwd();
   return join2(cwd, agent.rulesProjectPath);
 };
+var hasMcpConfig = (agent) => Boolean(agent.mcpProjectConfigPath) || Boolean(agent.mcpGlobalConfigPath);
+var resolveMcpConfigPath = (agent, options) => {
+  if (options.global) {
+    return agent.mcpGlobalConfigPath;
+  }
+  if (agent.mcpProjectConfigPath) {
+    const cwd = options.projectRoot ?? process6.cwd();
+    return join2(cwd, agent.mcpProjectConfigPath);
+  }
+  return agent.mcpGlobalConfigPath;
+};
+var buildMcpEntry = (style, env) => {
+  const command = "npx";
+  const args = ["-y", "@braid-cloud/mcp"];
+  const envObj = Object.keys(env).length > 0 ? env : void 0;
+  switch (style) {
+    case "standard":
+      return envObj ? { command, args, env: envObj } : { command, args };
+    case "typed-stdio":
+      return envObj ? { type: "stdio", command, args, env: envObj } : { type: "stdio", command, args };
+    case "zed":
+      return envObj ? { command: { path: command, args, env: envObj } } : { command: { path: command, args } };
+    case "cline":
+      return envObj ? { command, args, env: envObj, disabled: false } : { command, args, disabled: false };
+    default:
+      return envObj ? { command, args, env: envObj } : { command, args };
+  }
+};
+var detectMcpAgents = (projectRoot) => Effect3.runPromise(
+  pipe3(
+    detectAgents(projectRoot),
+    Effect3.map((detected) => detected.filter(hasMcpConfig))
+  )
+);
 
 // src/commands/install.ts
 init_api();
@@ -2219,7 +2391,7 @@ async function installCommand(options) {
   const sourceDesc = buildSourceDescription(resolved);
   intro(`Installing from ${sourceDesc}`);
   const installSpinner = spinner();
-  installSpinner.start("Fetching from Braid...");
+  installSpinner.start("Fetching from braid...");
   try {
     const fetchOptions = buildFetchOptions(resolved);
     const response = await fetchSkillsAsync(fetchOptions);
@@ -2371,11 +2543,357 @@ async function listCommand(options) {
   }
 }
 
+// src/commands/mcp.ts
+init_esm_shims();
+import process7 from "process";
+init_config();
+
+// src/lib/mcp-config.ts
+init_esm_shims();
+import { mkdir as mkdir4, readFile as readFile4, writeFile as writeFile5 } from "fs/promises";
+import { dirname as dirname4 } from "path";
+import { Data as Data6, Effect as Effect7, pipe as pipe7 } from "effect";
+var McpConfigReadError = class extends Data6.TaggedError("McpConfigReadError") {
+};
+var McpConfigWriteError = class extends Data6.TaggedError("McpConfigWriteError") {
+};
+var readMcpConfig = (path2) => pipe7(
+  Effect7.tryPromise({
+    try: () => readFile4(path2, "utf-8"),
+    catch: (e) => new McpConfigReadError({ path: path2, cause: e })
+  }),
+  Effect7.flatMap(
+    (content) => Effect7.try({
+      try: () => JSON.parse(content),
+      catch: () => ({})
+    })
+  ),
+  Effect7.orElseSucceed(() => ({}))
+);
+var writeMcpConfig = (path2, config) => Effect7.tryPromise({
+  try: async () => {
+    await mkdir4(dirname4(path2), { recursive: true });
+    await writeFile5(path2, `${JSON.stringify(config, null, 2)}
+`, "utf-8");
+  },
+  catch: (e) => new McpConfigWriteError({ path: path2, cause: e })
+});
+var mergebraidEntry = (config, rootKey, entryName, entry) => {
+  const servers = config[rootKey] ?? {};
+  return {
+    ...config,
+    [rootKey]: {
+      ...servers,
+      [entryName]: entry
+    }
+  };
+};
+var removebraidEntry = (config, rootKey, entryName) => {
+  const servers = { ...config[rootKey] ?? {} };
+  delete servers[entryName];
+  return {
+    ...config,
+    [rootKey]: servers
+  };
+};
+var hasbraidEntry = (config, rootKey, entryName) => {
+  const servers = config[rootKey];
+  return servers !== void 0 && entryName in servers;
+};
+var readMcpConfigAsync = (path2) => Effect7.runPromise(readMcpConfig(path2));
+var writeMcpConfigAsync = (path2, config) => Effect7.runPromise(writeMcpConfig(path2, config));
+
+// src/commands/mcp.ts
+init_tui();
+var BRAID_ENTRY_NAME = "braid";
+function maskToken(token) {
+  if (token.length <= 10) {
+    return token;
+  }
+  return `${token.slice(0, 7)}...${token.slice(-4)}`;
+}
+function getMcpAgents() {
+  return AGENTS.filter(hasMcpConfig);
+}
+function resolveScope(agent, options) {
+  if (options.global) {
+    return "global";
+  }
+  if (agent.mcpProjectConfigPath) {
+    return "project";
+  }
+  return "global";
+}
+async function selectTool(mcpAgents, toolFlag) {
+  if (toolFlag) {
+    const agent = mcpAgents.find((a) => a.id === toolFlag);
+    if (!agent) {
+      log.error(`Unknown or unsupported tool: ${toolFlag}`);
+      log.info(`Supported tools: ${mcpAgents.map((a) => a.id).join(", ")}`);
+      process7.exit(1);
+    }
+    return agent;
+  }
+  const detected = await detectMcpAgents();
+  const detectedIds = new Set(detected.map((a) => a.id));
+  const toolChoice = await select({
+    message: "Select tool to configure:",
+    options: mcpAgents.map((agent) => ({
+      value: agent.id,
+      label: agent.name,
+      hint: [
+        agent.mcpProjectConfigPath ?? agent.mcpGlobalConfigPath,
+        detectedIds.has(agent.id) ? "detected" : void 0
+      ].filter(Boolean).join(" \u2014 ")
+    }))
+  });
+  if (isCancel(toolChoice)) {
+    cancel("MCP setup cancelled.");
+    process7.exit(0);
+  }
+  const found = mcpAgents.find((a) => a.id === toolChoice);
+  if (!found) {
+    log.error("Agent not found.");
+    process7.exit(1);
+  }
+  return found;
+}
+async function selectScope(agent, options) {
+  const initial = resolveScope(agent, options);
+  if (options.global || options.yes || !agent.mcpProjectConfigPath || !agent.mcpGlobalConfigPath) {
+    return initial;
+  }
+  const scopeChoice = await select({
+    message: "Where should this be configured?",
+    options: [
+      {
+        value: "project",
+        label: "Project",
+        hint: agent.mcpProjectConfigPath
+      },
+      {
+        value: "global",
+        label: "Global",
+        hint: agent.mcpGlobalConfigPath
+      }
+    ]
+  });
+  if (isCancel(scopeChoice)) {
+    cancel("MCP setup cancelled.");
+    process7.exit(0);
+  }
+  return scopeChoice;
+}
+async function resolveToken(options, existingToken) {
+  if (options.auth === false) {
+    return void 0;
+  }
+  if (options.token) {
+    return options.token;
+  }
+  if (existingToken && options.yes) {
+    return existingToken;
+  }
+  if (existingToken) {
+    const authChoice = await select({
+      message: "Authentication:",
+      options: [
+        {
+          value: "existing",
+          label: `Use existing token (${maskToken(existingToken)})`
+        },
+        { value: "new", label: "Enter a new token" },
+        {
+          value: "skip",
+          label: "Skip \u2014 set BRAID_TOKEN env var later"
+        }
+      ]
+    });
+    if (isCancel(authChoice)) {
+      cancel("MCP setup cancelled.");
+      process7.exit(0);
+    }
+    if (authChoice === "existing") {
+      return existingToken;
+    }
+    if (authChoice === "skip") {
+      return void 0;
+    }
+  }
+  const token = await password({
+    message: "Enter your braid API token:",
+    validate: (value) => {
+      if (!value) {
+        return "Token is required";
+      }
+      if (!value.startsWith("br_")) {
+        return "Token should start with 'br_'";
+      }
+      return void 0;
+    }
+  });
+  if (isCancel(token)) {
+    cancel("MCP setup cancelled.");
+    process7.exit(0);
+  }
+  return token;
+}
+function buildEnvVars(token, server) {
+  const env = {};
+  if (token) {
+    env.BRAID_TOKEN = token;
+  }
+  if (server) {
+    env.BRAID_MCP_URL = server;
+  }
+  return env;
+}
+async function writeEntry(agent, configPath, env) {
+  const entry = buildMcpEntry(agent.mcpEntryStyle ?? "standard", env);
+  const rootKey = agent.mcpRootKey ?? "mcpServers";
+  const existingConfig = await readMcpConfigAsync(configPath);
+  const updatedConfig = mergebraidEntry(
+    existingConfig,
+    rootKey,
+    BRAID_ENTRY_NAME,
+    entry
+  );
+  await writeMcpConfigAsync(configPath, updatedConfig);
+}
+async function addFlow(options) {
+  const config = await loadMergedConfigAsync();
+  const mcpAgents = getMcpAgents();
+  if (mcpAgents.length === 0) {
+    log.error("No agents with MCP configuration support found.");
+    process7.exit(1);
+  }
+  const selectedAgent = await selectTool(mcpAgents, options.tool);
+  const scope = await selectScope(selectedAgent, options);
+  const configPath = resolveMcpConfigPath(selectedAgent, {
+    global: scope === "global"
+  });
+  if (!configPath) {
+    log.error(`No ${scope} config path available for ${selectedAgent.name}.`);
+    process7.exit(1);
+  }
+  const token = await resolveToken(options, config.token);
+  const env = buildEnvVars(token, options.server);
+  if (options.scope) {
+    const { scopeCommand: scopeCommand2 } = await Promise.resolve().then(() => (init_scope(), scope_exports));
+    await scopeCommand2({
+      server: options.server ?? config.serverUrl,
+      ...config.token ? { apiKey: config.token } : {}
+    });
+  }
+  const mcpSpinner = spinner();
+  mcpSpinner.start(`Configuring ${selectedAgent.name}...`);
+  try {
+    await writeEntry(selectedAgent, configPath, env);
+    mcpSpinner.stop(`Configured ${selectedAgent.name}`);
+    log.info(`Config written to ${configPath}`);
+    if (!token) {
+      log.info("Set BRAID_TOKEN environment variable before using.");
+    }
+    outro(`Done! Restart ${selectedAgent.name} to activate.`);
+  } catch (error) {
+    mcpSpinner.stop("Configuration failed");
+    const message = error instanceof Error ? error.message : String(error);
+    log.error(`Failed to write config: ${message}`);
+    process7.exit(1);
+  }
+}
+async function removeFlow(options) {
+  const mcpAgents = getMcpAgents();
+  const selectedAgent = await selectTool(mcpAgents, options.tool);
+  const scope = resolveScope(selectedAgent, options);
+  const configPath = resolveMcpConfigPath(selectedAgent, {
+    global: scope === "global"
+  });
+  if (!configPath) {
+    log.error(`No ${scope} config path available for ${selectedAgent.name}.`);
+    process7.exit(1);
+  }
+  const removeSpinner = spinner();
+  removeSpinner.start(`Removing braid from ${selectedAgent.name}...`);
+  try {
+    const rootKey = selectedAgent.mcpRootKey ?? "mcpServers";
+    const existingConfig = await readMcpConfigAsync(configPath);
+    if (!hasbraidEntry(existingConfig, rootKey, BRAID_ENTRY_NAME)) {
+      removeSpinner.stop("No braid MCP entry found");
+      log.info(
+        `${selectedAgent.name} doesn't have a braid MCP entry at ${configPath}`
+      );
+      return;
+    }
+    const updatedConfig = removebraidEntry(
+      existingConfig,
+      rootKey,
+      BRAID_ENTRY_NAME
+    );
+    await writeMcpConfigAsync(configPath, updatedConfig);
+    removeSpinner.stop(`Removed braid from ${selectedAgent.name}`);
+    outro(`braid MCP removed from ${configPath}`);
+  } catch (error) {
+    removeSpinner.stop("Removal failed");
+    const message = error instanceof Error ? error.message : String(error);
+    log.error(`Failed to remove config: ${message}`);
+    process7.exit(1);
+  }
+}
+async function statusFlow() {
+  const mcpAgents = getMcpAgents();
+  const statusSpinner = spinner();
+  statusSpinner.start("Checking MCP configuration status...");
+  const results = [];
+  for (const agent of mcpAgents) {
+    const rootKey = agent.mcpRootKey ?? "mcpServers";
+    for (const scope of ["project", "global"]) {
+      const configPath = resolveMcpConfigPath(agent, {
+        global: scope === "global"
+      });
+      if (!configPath) {
+        continue;
+      }
+      const config = await readMcpConfigAsync(configPath);
+      if (hasbraidEntry(config, rootKey, BRAID_ENTRY_NAME)) {
+        results.push({
+          name: agent.name,
+          path: configPath,
+          scope
+        });
+      }
+    }
+  }
+  statusSpinner.stop(`Found ${results.length} configured tool(s)`);
+  if (results.length === 0) {
+    log.info("No tools have braid MCP configured.");
+    log.info("Run 'braid mcp' to set up MCP for your AI tools.");
+    return;
+  }
+  for (const result of results) {
+    log.info(`  ${result.name} (${result.scope}) \u2192 ${result.path}`);
+  }
+}
+async function mcpCommand(options) {
+  if (options.status) {
+    intro("braid mcp status");
+    await statusFlow();
+    return;
+  }
+  if (options.remove) {
+    intro("braid mcp remove");
+    await removeFlow(options);
+    return;
+  }
+  intro("braid mcp");
+  await addFlow(options);
+}
+
 // src/commands/remove.ts
 init_esm_shims();
 import { rm } from "fs/promises";
 import { join as join4, resolve as resolve3 } from "path";
-import process7 from "process";
+import process8 from "process";
 init_tui();
 async function collectInstalledSkills(detectedAgents, options) {
   const skillsToRemove = [];
@@ -2408,7 +2926,7 @@ async function selectSkillsToRemove(skillsToRemove, options) {
     if (selected.length === 0) {
       log.error(`Skill '${options.skill}' not found.`);
       log.info("Run 'braid list' to see installed skills.");
-      process7.exit(1);
+      process8.exit(1);
     }
     return selected;
   }
@@ -2427,7 +2945,7 @@ async function selectSkillsToRemove(skillsToRemove, options) {
   });
   if (isCancel(result)) {
     cancel("Remove cancelled.");
-    process7.exit(0);
+    process8.exit(0);
   }
   return result;
 }
@@ -2441,7 +2959,7 @@ async function confirmRemoval(selectedCount, options) {
   });
   if (isCancel(confirmed) || !confirmed) {
     cancel("Remove cancelled.");
-    process7.exit(0);
+    process8.exit(0);
   }
 }
 async function removeSkill(skill, removeSpinner) {
@@ -2505,7 +3023,7 @@ async function removeCommand(options) {
     removeSpinner.stop("Remove failed");
     const message = error instanceof Error ? error.message : String(error);
     log.error(message);
-    process7.exit(1);
+    process8.exit(1);
   }
 }
 
@@ -2522,11 +3040,11 @@ import {
   outro as outro2,
   spinner as spinner3
 } from "@clack/prompts";
-import { Data as Data6, Effect as Effect7, pipe as pipe7 } from "effect";
+import { Data as Data7, Effect as Effect8, pipe as pipe8 } from "effect";
 init_api();
-var UpdateError = class extends Data6.TaggedError("UpdateError") {
+var UpdateError = class extends Data7.TaggedError("UpdateError") {
 };
-var UserCancelledError = class extends Data6.TaggedError("UserCancelledError") {
+var UserCancelledError = class extends Data7.TaggedError("UserCancelledError") {
 };
 async function resolveValidInstallPath(agent, options) {
   const installPath = resolveInstallPath(agent, {
@@ -2538,7 +3056,7 @@ async function resolveValidInstallPath(agent, options) {
   const exists = await directoryExistsAsync(installPath);
   return exists ? installPath : null;
 }
-var collectSourcesFromAgent = (agent, options, sourcesToUpdate) => Effect7.tryPromise({
+var collectSourcesFromAgent = (agent, options, sourcesToUpdate) => Effect8.tryPromise({
   try: async () => {
     const installPath = await resolveValidInstallPath(agent, options);
     if (!installPath) {
@@ -2569,10 +3087,10 @@ var collectSourcesFromAgent = (agent, options, sourcesToUpdate) => Effect7.tryPr
   },
   catch: () => new UpdateError({ message: "Failed to collect sources" })
 });
-var collectSources = (detectedAgents, options) => pipe7(
-  Effect7.succeed(/* @__PURE__ */ new Map()),
-  Effect7.tap(
-    (sourcesToUpdate) => Effect7.forEach(
+var collectSources = (detectedAgents, options) => pipe8(
+  Effect8.succeed(/* @__PURE__ */ new Map()),
+  Effect8.tap(
+    (sourcesToUpdate) => Effect8.forEach(
       detectedAgents,
       (agent) => collectSourcesFromAgent(agent, options, sourcesToUpdate),
       { concurrency: 1 }
@@ -2581,9 +3099,9 @@ var collectSources = (detectedAgents, options) => pipe7(
 );
 var selectSources = (sourcesToUpdate, options) => {
   if (options.yes) {
-    return Effect7.succeed(sourcesToUpdate);
+    return Effect8.succeed(sourcesToUpdate);
   }
-  return Effect7.tryPromise({
+  return Effect8.tryPromise({
     try: async () => {
       const sources = Array.from(sourcesToUpdate.entries()).map(
         ([key, source]) => ({
@@ -2634,7 +3152,7 @@ var buildFetchOptionsForSource = (source, options) => {
   }
   return fetchOptions;
 };
-var updateAgentSkills = (agentId, agentName, installPath, response, serverUrl, updateSpinner) => Effect7.tryPromise({
+var updateAgentSkills = (agentId, agentName, installPath, response, serverUrl, updateSpinner) => Effect8.tryPromise({
   try: async () => {
     updateSpinner.start(`Updating ${agentName}...`);
     const result = await writeSkillsAsync(
@@ -2672,15 +3190,15 @@ var updateSource = (source, options, updateSpinner) => {
   const serverUrl = options.server ?? source.serverUrl;
   const fetchOptions = buildFetchOptionsForSource(source, options);
   if (fetchOptions === null) {
-    return Effect7.fail(
+    return Effect8.fail(
       new UpdateError({
         message: "Skills installed with legacy metadata format. Please reinstall using 'braid install --profile <name>' or 'braid install --projects <names>'.",
         source: sourceDesc
       })
     );
   }
-  return pipe7(
-    Effect7.tryPromise({
+  return pipe8(
+    Effect8.tryPromise({
       try: async () => {
         updateSpinner.start(`Fetching latest skills from ${sourceDesc}...`);
         const response = await fetchSkillsAsync(fetchOptions);
@@ -2694,9 +3212,9 @@ var updateSource = (source, options, updateSpinner) => {
         source: sourceDesc
       })
     }),
-    Effect7.flatMap(
-      (response) => pipe7(
-        Effect7.forEach(
+    Effect8.flatMap(
+      (response) => pipe8(
+        Effect8.forEach(
           source.agents,
           ({ agentId, agentName, installPath }) => updateAgentSkills(
             agentId,
@@ -2708,7 +3226,7 @@ var updateSource = (source, options, updateSpinner) => {
           ),
           { concurrency: 1 }
         ),
-        Effect7.map((results) => ({
+        Effect8.map((results) => ({
           updated: results.reduce((sum, r) => sum + r.updated, 0),
           errors: results.reduce((sum, r) => sum + r.errors, 0)
         }))
@@ -2716,22 +3234,22 @@ var updateSource = (source, options, updateSpinner) => {
     )
   );
 };
-var updateAllSources = (sources, options, updateSpinner) => pipe7(
-  Effect7.forEach(
+var updateAllSources = (sources, options, updateSpinner) => pipe8(
+  Effect8.forEach(
     Array.from(sources.values()),
-    (source) => pipe7(
+    (source) => pipe8(
       updateSource(source, options, updateSpinner),
-      Effect7.catchAll((error) => {
+      Effect8.catchAll((error) => {
         updateSpinner.stop(
           `Failed to update from ${getSourceDesc(source)}`
         );
         log3.error(`  ${error.message}`);
-        return Effect7.succeed({ updated: 0, errors: 1 });
+        return Effect8.succeed({ updated: 0, errors: 1 });
       })
     ),
     { concurrency: 1 }
   ),
-  Effect7.map((results) => ({
+  Effect8.map((results) => ({
     totalUpdated: results.reduce((sum, r) => sum + r.updated, 0),
     totalErrors: results.reduce((sum, r) => sum + r.errors, 0)
   }))
@@ -2770,28 +3288,28 @@ var handleProgramExit = (result, updateSpinner) => {
 async function updateCommand(options) {
   const updateSpinner = spinner3();
   updateSpinner.start("Scanning for installed skills...");
-  const program2 = pipe7(
-    Effect7.tryPromise({
+  const program2 = pipe8(
+    Effect8.tryPromise({
       try: () => detectAgentsAsync(),
       catch: () => new UpdateError({ message: "Failed to detect agents" })
     }),
-    Effect7.filterOrFail(
+    Effect8.filterOrFail(
       (agents) => agents.length > 0,
       () => new UpdateError({ message: "No AI coding agents detected." })
     ),
-    Effect7.flatMap((detectedAgents) => collectSources(detectedAgents, options)),
-    Effect7.tap((sources) => {
+    Effect8.flatMap((detectedAgents) => collectSources(detectedAgents, options)),
+    Effect8.tap((sources) => {
       updateSpinner.stop(`Found ${sources.size} source(s) to update`);
     }),
-    Effect7.filterOrFail(
+    Effect8.filterOrFail(
       (sources) => sources.size > 0,
       () => new UpdateError({ message: "No skills installed via braid." })
     ),
-    Effect7.flatMap((sources) => selectSources(sources, options)),
-    Effect7.flatMap(
+    Effect8.flatMap((sources) => selectSources(sources, options)),
+    Effect8.flatMap(
       (selectedSources) => updateAllSources(selectedSources, options, updateSpinner)
     ),
-    Effect7.tap(({ totalUpdated, totalErrors }) => {
+    Effect8.tap(({ totalUpdated, totalErrors }) => {
       if (totalErrors > 0) {
         outro2(`Updated ${totalUpdated} skills with ${totalErrors} errors.`);
       } else {
@@ -2799,7 +3317,7 @@ async function updateCommand(options) {
       }
     })
   );
-  const result = await Effect7.runPromiseExit(program2);
+  const result = await Effect8.runPromiseExit(program2);
   handleProgramExit(result, updateSpinner);
 }
 
@@ -2808,10 +3326,10 @@ var require2 = createRequire(import.meta.url);
 var { version: PACKAGE_VERSION } = require2("../package.json");
 var program = new Command();
 program.name("braid").description(
-  "Install Braid prompts as agent skills to your local development environment"
+  "Install braid prompts as agent skills to your local development environment"
 ).version(PACKAGE_VERSION);
-var auth = program.command("auth").description("Configure API key for Braid authentication");
-auth.command("login", { isDefault: true }).description("Configure API key").option("-s, --server <url>", "Braid server URL (for review apps, local dev)").action(authCommand);
+var auth = program.command("auth").description("Configure API key for braid authentication");
+auth.command("login", { isDefault: true }).description("Configure API key").option("-s, --server <url>", "braid server URL (for review apps, local dev)").action(authCommand);
 auth.command("status").description("Show current authentication status").action(authStatusCommand);
 auth.command("logout").description("Remove stored API key").action(authLogoutCommand);
 program.command("install").alias("add").description("Install skills from a profile or project").option("-p, --profile <name>", "Profile name to install from").option(
@@ -2829,7 +3347,7 @@ program.command("install").alias("add").description("Install skills from a profi
 ).option("--no-include-org-globals", "Exclude organization's global prompts").option(
   "-a, --agents <list>",
   "Comma-separated list of agents (e.g., claude-code,opencode)"
-).option("-g, --global", "Install to global agent directories").option("-y, --yes", "Skip confirmation prompts").option("-l, --list", "Preview skills without installing").option("-s, --server <url>", "Braid server URL (for review apps, local dev)").action(installCommand);
+).option("-g, --global", "Install to global agent directories").option("-y, --yes", "Skip confirmation prompts").option("-l, --list", "Preview skills without installing").option("-s, --server <url>", "braid server URL (for review apps, local dev)").action(installCommand);
 program.command("scope").description("Interactively configure braid.json or braid.user.json scope").option("--file <target>", "Config file target: user or project").option(
   "--organization <type>",
   "Scope organization for non-interactive mode: personal or organization"
@@ -2851,9 +3369,10 @@ program.command("scope").description("Interactively configure braid.json or brai
 ).option(
   "--include-org-global",
   "Include org global rules in non-interactive mode"
-).option("-s, --server <url>", "Braid server URL (for review apps, local dev)").action(scopeCommand);
+).option("-s, --server <url>", "braid server URL (for review apps, local dev)").action(scopeCommand);
 program.command("list").alias("ls").description("List installed skills").option("-g, --global", "List skills in global directories only").action(listCommand);
-program.command("update").alias("up").description("Update installed skills to the latest version").option("-g, --global", "Update skills in global directories only").option("-y, --yes", "Skip confirmation prompts").option("-s, --server <url>", "Braid server URL (for review apps, local dev)").action(updateCommand);
+program.command("update").alias("up").description("Update installed skills to the latest version").option("-g, --global", "Update skills in global directories only").option("-y, --yes", "Skip confirmation prompts").option("-s, --server <url>", "braid server URL (for review apps, local dev)").action(updateCommand);
 program.command("remove").alias("rm").description("Remove installed skills").option("-a, --all", "Remove all installed skills").option("-g, --global", "Remove skills from global directories only").option("-y, --yes", "Skip confirmation prompts").option("--skill <name>", "Remove a specific skill by name").action(removeCommand);
+program.command("mcp").description("Configure braid MCP in your AI coding tools").option("-t, --tool <name>", "Tool to configure").option("-g, --global", "Use global config instead of project").option("--token <token>", "API token to embed").option("--no-auth", "Skip authentication setup").option("--scope", "Run interactive scope configuration").option("--remove", "Remove braid MCP from a tool").option("--status", "Show which tools have braid MCP configured").option("-y, --yes", "Skip confirmation prompts").option("-s, --server <url>", "Custom MCP server URL").action(mcpCommand);
 program.parse();
 //# sourceMappingURL=index.js.map