@bastani/atomic 0.9.26-alpha.2 → 0.9.26-alpha.3

package/dist/extensions/mcp/index.js

@@ -26,8 +26,7 @@
  * current session for registered servers.
  */
 import { join, resolve } from "node:path";
-import { hyperlink } from "@earendil-works/pi-tui";
-import { getAgentDir } from "../../config.js";
+import { CONFIG_DIR_NAME, getAgentDir } from "../../config.js";
 import { markNativeMcpToolDefinition, matchesMcpDirectToolSelection } from "../../core/mcp-child-policy.js";
 import { mcpNamespace } from "../../core/mcp-servers.js";
 import { openBrowser } from "../../utils/open-browser.js";
@@ -207,6 +206,8 @@ export function createMcpExtension(options = {}) {
         /** Servers from `mcp.json`, which take precedence over registered servers of the same name. */
         let configuredEntries = [];
         let configErrors = [];
+        /** The trusted project's `mcp.json`, where `/mcp` saves project overrides of global servers. */
+        let projectConfig;
         /** Registered servers that `mcp.json` overrides, shown in `/mcp`. */
         let overridden = [];
         let latestContext;
@@ -229,7 +230,10 @@ export function createMcpExtension(options = {}) {
         let modelRegistry;
         let serverLog;
         const openUrl = options.openUrl ?? openBrowser;
-        const updateConfig = options.updateConfig ?? ((entry, patch) => updateMcpServerConfig(entry.source, entry.name, patch));
+        const updateConfig = options.updateConfig ??
+            ((entry, patch) => updateMcpServerConfig(entry.override ?? entry.source, entry.name, patch, {
+                override: entry.override !== undefined,
+            }));
         const listeners = new Set();
         const emitChange = () => {
             for (const listener of listeners)
@@ -534,18 +538,20 @@ export function createMcpExtension(options = {}) {
         };
         /**
          * Save a config change; returns an error message when the file could not be updated. Changes to
-         * registered servers only apply to the current session.
+         * registered servers only apply to the current session. `inProject` adds a project override.
          */
-        const saveConfig = (server, patch) => {
-            if (server.entry.scope !== "extension") {
+        const saveConfig = (server, patch, inProject = false) => {
+            const override = inProject ? projectConfig : server.entry.override;
+            const entry = override ? { ...server.entry, override } : server.entry;
+            if (entry.scope !== "extension") {
                 try {
-                    updateConfig(server.entry, patch);
+                    updateConfig(entry, patch);
                 }
                 catch (error) {
-                    return `Could not update ${server.entry.source}: ${errorMessage(error)}`;
+                    return `Could not update ${entry.override ?? entry.source}: ${errorMessage(error)}`;
                 }
             }
-            server.entry = { ...server.entry, config: { ...server.entry.config, ...patch } };
+            server.entry = { ...entry, config: { ...entry.config, ...patch } };
             return undefined;
         };
         const signIn = async (server, prompt) => {
@@ -600,8 +606,8 @@ export function createMcpExtension(options = {}) {
             }
         };
         /** Returns an error message when the config could not be saved; connection errors show in the state. */
-        const setEnabled = async (server, enabled) => {
-            const failed = saveConfig(server, { enabled });
+        const setEnabled = async (server, enabled, inProject = false) => {
+            const failed = saveConfig(server, { enabled }, inProject);
             if (failed)
                 return failed;
             if (!enabled) {
@@ -647,9 +653,9 @@ export function createMcpExtension(options = {}) {
                 .map((server) => ({
                 value: server.entry.name,
                 label: server.entry.name,
-                description: `${describeState(server)} · ${exposureOf(server.entry)} · ${server.entry.scope ?? server.entry.source}`,
+                description: `${describeState(server)} · ${exposureOf(server.entry)} · ${server.entry.override ? "global, project override" : (server.entry.scope ?? server.entry.source)}`,
             })),
-            empty: `No MCP servers configured. Add them to ${resolve(getAgentDir(), "mcp.json")} or .pi/mcp.json.`,
+            empty: `No MCP servers configured. Add them to ${resolve(getAgentDir(), "mcp.json")} or ${CONFIG_DIR_NAME}/mcp.json.`,
             confirmLabel: "manage",
             cancelLabel: "close",
         });
@@ -667,12 +673,20 @@ export function createMcpExtension(options = {}) {
             const { entry, connection } = server;
             const saved = entry.scope === "extension"
                 ? "for this session"
-                : entry.scope
-                    ? `saved to the ${entry.scope} mcp.json`
-                    : "saved to mcp.json";
+                : entry.override
+                    ? "saved to the project mcp.json"
+                    : entry.scope
+                        ? `saved to the ${entry.scope} mcp.json`
+                        : "saved to mcp.json";
+            // Global servers without an override can be turned on or off for the trusted project alone.
+            const inProject = entry.scope === "global" && !entry.override && projectConfig !== undefined;
+            const inProjectSaved = "saved to the project mcp.json";
             const items = [];
             if (!isEnabled(server)) {
                 items.push({ value: "enable", label: "Enable", description: saved });
+                if (inProject) {
+                    items.push({ value: "enable-project", label: "Enable in this project", description: inProjectSaved });
+                }
             }
             else {
                 const state = connection?.state;
@@ -689,10 +703,14 @@ export function createMcpExtension(options = {}) {
                 }
                 items.push({ value: "exposure", label: "Exposure", description: exposureOf(entry) });
                 items.push({ value: "disable", label: "Disable", description: saved });
+                if (inProject) {
+                    items.push({ value: "disable-project", label: "Disable in this project", description: inProjectSaved });
+                }
             }
             const details = [
                 describeTransport(entry),
                 `${entry.scope ?? "config"}: ${entry.source}`,
+                ...(entry.override ? [`project override: ${entry.override}`] : []),
                 `State: ${describeState(server, false)}`,
             ];
             const error = [server.message, connection?.state === "connected" ? undefined : connection?.error]
@@ -734,7 +752,7 @@ export function createMcpExtension(options = {}) {
                 title: `Exposure of ${server.entry.name}`,
                 details: server.entry.scope === "extension"
                     ? `Applies to this session; the server is registered by ${server.entry.source}.`
-                    : `Saved to ${server.entry.source}.`,
+                    : `Saved to ${server.entry.override ?? server.entry.source}.`,
                 items: Object.keys(EXPOSURE_DESCRIPTIONS).map((exposure) => ({
                     value: exposure,
                     label: `${exposure === current ? "✓ " : "  "}${exposure}`,
@@ -748,27 +766,29 @@ export function createMcpExtension(options = {}) {
                 return undefined;
             return setExposure(server, choice);
         };
+        const signInWithUi = (ui, server) => {
+            const title = `Sign in to ${server.entry.name}`;
+            let authorizationUrl = "";
+            ui.status(title, "Contacting the authorization server…");
+            return signIn(server, {
+                showAuthorizationUrl: (url) => {
+                    authorizationUrl = url.href;
+                    openUrl(url.href);
+                },
+                promptForRedirectUrl: async (signal) => {
+                    const value = await ui.redirectUrl(title, authorizationUrl, signal);
+                    ui.status(title, "Connecting…");
+                    return value;
+                },
+            });
+        };
         const runAction = async (ui, ctx, server, action) => {
             const { name } = server.entry;
             let message;
             switch (action) {
-                case "signin": {
-                    const title = `Sign in to ${name}`;
-                    let authorizationUrl = "";
-                    ui.status(title, "Contacting the authorization server…");
-                    message = await signIn(server, {
-                        showAuthorizationUrl: (url) => {
-                            authorizationUrl = url.href;
-                            openUrl(url.href);
-                        },
-                        promptForRedirectUrl: async (signal) => {
-                            const value = await ui.redirectUrl(title, authorizationUrl, signal);
-                            ui.status(title, "Connecting…");
-                            return value;
-                        },
-                    });
+                case "signin":
+                    message = await signInWithUi(ui, server);
                     break;
-                }
                 case "reconnect":
                     // A failure shows as the connection's state and error.
                     ui.status(`MCP server ${name}`, "Reconnecting…");
@@ -785,9 +805,13 @@ export function createMcpExtension(options = {}) {
                     break;
                 case "enable":
                 case "disable":
-                    ui.status(`MCP server ${name}`, action === "enable" ? "Connecting…" : "Disconnecting…");
-                    message = await setEnabled(server, action === "enable");
+                case "enable-project":
+                case "disable-project": {
+                    const enable = action.startsWith("enable");
+                    ui.status(`MCP server ${name}`, enable ? "Connecting…" : "Disconnecting…");
+                    message = await setEnabled(server, enable, action.endsWith("-project"));
                     break;
+                }
             }
             server.message = message;
             ensureDiscoveryActive(ctx);
@@ -812,7 +836,7 @@ export function createMcpExtension(options = {}) {
         // ---------------------------------------------------------------------------------------
         const formatStatus = () => {
             if (servers.length === 0 && configErrors.length === 0 && overridden.length === 0) {
-                return `No MCP servers configured. Add them to ${resolve(getAgentDir(), "mcp.json")} or .pi/mcp.json.`;
+                return `No MCP servers configured. Add them to ${resolve(getAgentDir(), "mcp.json")} or ${CONFIG_DIR_NAME}/mcp.json.`;
             }
             const lines = servers.map((server) => {
                 const { name } = server.entry;
@@ -872,16 +896,25 @@ export function createMcpExtension(options = {}) {
                 ctx.ui.notify(`Signing in to MCP server "${name}" requires interactive mode.`, "error");
                 return;
             }
-            const failure = await signIn(server, {
-                showAuthorizationUrl: (url) => {
-                    const lines = ctx.mode === "tui"
-                        ? `${hyperlink(url.href, url.href)}\n${hyperlink(process.platform === "darwin" ? "Cmd+click to open" : "Ctrl+click to open", url.href)}`
-                        : url.href;
-                    ctx.ui.notify(`Sign in to MCP server "${name}" in your browser:\n${lines}`, "info");
-                    openUrl(url.href);
-                },
-                promptForRedirectUrl: (signal) => ctx.ui.input(`Waiting for sign-in to "${name}". If the browser cannot reach this machine, paste the URL it was redirected to.`, "http://127.0.0.1:.../callback?code=...", { signal }),
-            });
+            let failure;
+            if (ctx.mode === "tui") {
+                let completed = false;
+                await showMcpManager(ctx, async (ui) => {
+                    failure = await signInWithUi(ui, server);
+                    completed = true;
+                });
+                if (!completed)
+                    return;
+            }
+            else {
+                failure = await signIn(server, {
+                    showAuthorizationUrl: (url) => {
+                        ctx.ui.notify(`Sign in to MCP server "${name}" in your browser:\n${url.href}`, "info");
+                        openUrl(url.href);
+                    },
+                    promptForRedirectUrl: (signal) => ctx.ui.input(`Waiting for sign-in to "${name}". If the browser cannot reach this machine, paste the URL it was redirected to.`, "http://127.0.0.1:.../callback?code=...", { signal }),
+                });
+            }
             if (failure) {
                 ctx.ui.notify(failure, failure === "Sign-in cancelled." ? "info" : "error");
                 return;
@@ -894,6 +927,7 @@ export function createMcpExtension(options = {}) {
             subagentMcpDirectTools = ctx.subagentPolicy?.mcpDirectTools;
             const loaded = (options.loadConfig ?? defaultLoadConfig)(ctx);
             configErrors = loaded.errors;
+            projectConfig = loaded.projectConfig;
             autoEnableCodemode = (ctx.subagentPolicy ? false : loaded.autoEnableCodemode) ?? true;
             warnedUnreachable = false;
             waitedForStartup = false;