@nexrall/code-core 1.4.66 → 1.4.68

package/dist/mcp/client.js

@@ -1,7 +1,102 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.McpClient = void 0;
+exports.McpClient = exports.MCP_ELICITATION_CAPABILITY = void 0;
+exports.flattenResourceContents = flattenResourceContents;
+exports.flattenPromptMessages = flattenPromptMessages;
+exports.elicitationCapability = elicitationCapability;
+exports.normalizeElicitationRequest = normalizeElicitationRequest;
+exports.serverRequestReply = serverRequestReply;
 const child_process_1 = require("child_process");
+/** Shared parsing of a resources/read reply: text parts joined, binary parts summarised, never inlined. */
+function flattenResourceContents(result, maxChars = 100000) {
+    const contents = result?.contents ?? [];
+    const parts = contents.map((c) => {
+        if (typeof c.text === 'string')
+            return c.text;
+        if (typeof c.blob === 'string')
+            return `[binary resource ${c.uri ?? ''} (${c.mimeType ?? 'unknown type'}, ${Math.round(c.blob.length * 0.75)} bytes) not shown]`;
+        return '';
+    }).filter(Boolean);
+    const text = parts.join('\n');
+    return text.length > maxChars ? text.slice(0, maxChars) + `\n… [truncated, ${text.length - maxChars} more characters]` : text;
+}
+/**
+ * Shared parsing of a prompts/get reply: message texts joined in order, non-text
+ * parts summarised rather than inlined (the same rule as resources above). A
+ * prompt's `content` may be a single item or an array, so both shapes flatten to
+ * the same text; messages are separated by a blank line.
+ */
+function flattenPromptMessages(result, maxChars = 100000) {
+    const messages = result?.messages ?? [];
+    const parts = messages.map((m) => {
+        const content = m?.content;
+        const items = Array.isArray(content) ? content : content ? [content] : [];
+        return items.map((c) => {
+            const item = c;
+            if (item?.type === 'text' && typeof item.text === 'string')
+                return item.text;
+            if (item?.type === 'image')
+                return `[image prompt content (${item.mimeType ?? 'unknown type'}) not shown]`;
+            if (item?.type === 'audio')
+                return `[audio prompt content (${item.mimeType ?? 'unknown type'}) not shown]`;
+            if (item?.type === 'resource') {
+                if (typeof item.resource?.text === 'string')
+                    return item.resource.text;
+                return `[resource prompt content (${item.resource?.uri ?? 'unknown uri'}) not shown]`;
+            }
+            return '';
+        }).filter(Boolean).join('\n');
+    }).filter(Boolean);
+    const text = parts.join('\n\n');
+    return text.length > maxChars ? text.slice(0, maxChars) + `\n… [truncated, ${text.length - maxChars} more characters]` : text;
+}
+/** Advertised on initialize: we can render both forms. Older servers just see `elicitation` present. */
+exports.MCP_ELICITATION_CAPABILITY = { elicitation: { form: {}, url: {} } };
+/**
+ * The `capabilities` object for initialize. `bare` (the per-server
+ * `bareElicitationCapability` config) sends the older empty shape — the same escape
+ * hatch Claude Code offers a server that refuses the `{form,url}` object.
+ */
+function elicitationCapability(bare) {
+    return bare ? { elicitation: {} } : { elicitation: { form: {}, url: {} } };
+}
+/** Normalise what a server sent (field names differ across protocol revisions). */
+function normalizeElicitationRequest(params) {
+    const p = (params ?? {});
+    const url = typeof p.url === 'string' ? p.url : undefined;
+    const schema = (p.requestedSchema ?? p.schema);
+    return {
+        message: typeof p.message === 'string' && p.message.trim() ? p.message : 'An MCP server is asking for input.',
+        mode: p.mode === 'url' || (!p.mode && url) ? 'url' : 'form',
+        requestedSchema: schema && typeof schema === 'object' ? schema : undefined,
+        url,
+        elicitationId: typeof p.elicitationId === 'string' ? p.elicitationId
+            : typeof p.elicitation_id === 'string' ? p.elicitation_id : undefined,
+    };
+}
+/**
+ * The JSON-RPC body a transport sends back for a server→client request. Only
+ * elicitation is implemented; anything else gets a clean 'method not found' so the
+ * server fails fast instead of waiting out its own timeout.
+ */
+async function serverRequestReply(server, handler, method, params) {
+    if (method === 'elicitation/create') {
+        let resp = { action: 'decline' };
+        const request = normalizeElicitationRequest(params);
+        try {
+            if (handler)
+                resp = await handler(server, request);
+        }
+        catch {
+            resp = { action: 'decline' };
+        }
+        const result = { action: resp.action };
+        if (resp.action === 'accept' && resp.content)
+            result.content = resp.content;
+        return { result };
+    }
+    return { error: { code: -32601, message: `Method not found: ${method}` } };
+}
 // ─── McpClient ────────────────────────────────────────────────────────────────
 class McpClient {
     constructor(name, config) {
@@ -11,9 +106,11 @@ class McpClient {
         this._pending = new Map();
         this._buf = '';
         this._tools = [];
+        this._elicitationHandler = null;
         this.name = name;
     }
     get tools() { return this._tools; }
+    setElicitationHandler(handler) { this._elicitationHandler = handler; }
     async connect() {
         if (!this.config.command)
             throw new Error(`MCP server "${this.name}" has no command (stdio transport requires one).`);
@@ -42,7 +139,7 @@ class McpClient {
         // Handshake: initialize
         await this._request('initialize', {
             protocolVersion: '2024-11-05',
-            capabilities: {},
+            capabilities: elicitationCapability(this.config.bareElicitationCapability),
             clientInfo: { name: 'nexrall-code', version: '1.0' },
         });
         // Send initialized notification (no response expected)
@@ -51,6 +148,33 @@ class McpClient {
         const result = await this._request('tools/list', {});
         this._tools = result?.tools ?? [];
     }
+    async listResources() {
+        try {
+            const res = (await this._request('resources/list', {}));
+            return Array.isArray(res?.resources) ? res.resources : [];
+        }
+        catch {
+            return []; /* server has no resources capability */
+        }
+    }
+    async readResource(uri) {
+        return flattenResourceContents(await this._request('resources/read', { uri }));
+    }
+    async listPrompts() {
+        try {
+            const res = (await this._request('prompts/list', {}));
+            return Array.isArray(res?.prompts) ? res.prompts : [];
+        }
+        catch {
+            return []; /* server has no prompts capability */
+        }
+    }
+    async getPrompt(name, args) {
+        const params = { name };
+        if (Object.keys(args).length)
+            params.arguments = args;
+        return flattenPromptMessages(await this._request('prompts/get', params));
+    }
     async callTool(name, args) {
         const result = await this._request('tools/call', { name, arguments: args });
         if (!result)
@@ -105,6 +229,11 @@ class McpClient {
         catch {
             return;
         }
+        // A server→client REQUEST carries both an id and a method (elicitation/create).
+        if (typeof msg.method === 'string' && msg.id != null) {
+            void this._handleServerRequest(msg.id, msg.method, msg.params);
+            return;
+        }
         if (msg.id == null)
             return; // notification, ignore
         const pending = this._pending.get(msg.id);
@@ -118,6 +247,11 @@ class McpClient {
             pending.resolve(msg.result);
         }
     }
+    /** Answer a server→client request. Errors are swallowed — the server must get SOME reply. */
+    async _handleServerRequest(id, method, params) {
+        const reply = await serverRequestReply(this.name, this._elicitationHandler, method, params);
+        this._send({ jsonrpc: '2.0', id, ...reply });
+    }
     _rejectAll(err) {
         for (const { reject } of this._pending.values())
             reject(err);

package/dist/mcp/httpClient.d.ts

@@ -1,4 +1,4 @@
-import type { McpServerConfig, McpToolDefinition, McpTransport } from './client';
+import type { McpServerConfig, McpToolDefinition, McpTransport, McpResource, McpPrompt, McpElicitationHandler } from './client';
 /** Thrown when a remote MCP server replies 401 — the caller should run the OAuth flow. */
 export declare class McpOAuthRequiredError extends Error {
     readonly serverName: string;
@@ -11,15 +11,31 @@ export declare class McpHttpClient implements McpTransport {
     private _nextId;
     private _tools;
     private _sessionId;
+    private _elicitationHandler;
     readonly name: string;
     constructor(name: string, config: McpServerConfig);
     get tools(): McpToolDefinition[];
+    setElicitationHandler(handler: McpElicitationHandler | null): void;
     connect(): Promise<void>;
+    listResources(): Promise<McpResource[]>;
+    readResource(uri: string): Promise<string>;
+    listPrompts(): Promise<McpPrompt[]>;
+    getPrompt(name: string, args: Record<string, string>): Promise<string>;
     callTool(name: string, args: Record<string, unknown>): Promise<string>;
     disconnect(): void;
     private _rpc;
     private _notify;
     private _post;
     private _extractResult;
+    /**
+     * Read an SSE reply frame by frame. A server request (elicitation) is answered on the
+     * spot: the server WAITS for that answer before it sends our own result, so buffering
+     * the whole stream first would deadlock until the request timeout. As soon as our id
+     * arrives we stop and cancel the body (the stream may stay open for the session).
+     * Falls back to a buffered parse when the runtime hands us no readable body.
+     */
+    private _consumeSse;
+    /** Reply to a server→client request. Fire-and-forget: the in-flight reader must not block. */
+    private _answerServerRequest;
 }
 //# sourceMappingURL=httpClient.d.ts.map

package/dist/mcp/httpClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpClient.d.ts","sourceRoot":"","sources":["../../src/mcp/httpClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAqBjF,0FAA0F;AAC1F,qBAAa,qBAAsB,SAAQ,KAAK;aAE5B,UAAU,EAAE,MAAM;aAClB,SAAS,EAAE,MAAM;aACjB,eAAe,EAAE,MAAM;gBAFvB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM;CAK1C;AAED,qBAAa,aAAc,YAAW,YAAY;IAMtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IALjD,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,UAAU,CAAuB;IACzC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAEV,IAAI,EAAE,MAAM,EAAmB,MAAM,EAAE,eAAe;IAIlE,IAAI,KAAK,IAAI,iBAAiB,EAAE,CAE/B;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAYxB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAc5E,UAAU,IAAI,IAAI;YAaJ,IAAI;YAMJ,OAAO;YAKP,KAAK;YA2BL,cAAc;CAqC7B"}
+{"version":3,"file":"httpClient.d.ts","sourceRoot":"","sources":["../../src/mcp/httpClient.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAqBhI,0FAA0F;AAC1F,qBAAa,qBAAsB,SAAQ,KAAK;aAE5B,UAAU,EAAE,MAAM;aAClB,SAAS,EAAE,MAAM;aACjB,eAAe,EAAE,MAAM;gBAFvB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM;CAK1C;AAED,qBAAa,aAAc,YAAW,YAAY;IAOtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IANjD,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,mBAAmB,CAAsC;IACjE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAEV,IAAI,EAAE,MAAM,EAAmB,MAAM,EAAE,eAAe;IAIlE,IAAI,KAAK,IAAI,iBAAiB,EAAE,CAE/B;IAED,qBAAqB,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,GAAG,IAAI;IAE5D,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAYxB,aAAa,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAOvC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1C,WAAW,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAOnC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAMtE,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAc5E,UAAU,IAAI,IAAI;YAaJ,IAAI;YAMJ,OAAO;YAKP,KAAK;YA2BL,cAAc;IAkB5B;;;;;;OAMG;YACW,WAAW;IAoDzB,8FAA8F;IAC9F,OAAO,CAAC,oBAAoB;CAM7B"}

package/dist/mcp/httpClient.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.McpHttpClient = exports.McpOAuthRequiredError = void 0;
 const node_fetch_1 = __importDefault(require("node-fetch"));
+const client_1 = require("./client");
 const REQUEST_TIMEOUT_MS = 30000;
 /** Thrown when a remote MCP server replies 401 — the caller should run the OAuth flow. */
 class McpOAuthRequiredError extends Error {
@@ -23,23 +24,52 @@ class McpHttpClient {
         this._nextId = 1;
         this._tools = [];
         this._sessionId = null;
+        this._elicitationHandler = null;
         this.name = name;
     }
     get tools() {
         return this._tools;
     }
+    setElicitationHandler(handler) { this._elicitationHandler = handler; }
     async connect() {
         if (!this.config.url)
             throw new Error(`MCP server "${this.name}" has no url (http/sse transport requires one).`);
         await this._rpc('initialize', {
             protocolVersion: '2024-11-05',
-            capabilities: {},
+            capabilities: (0, client_1.elicitationCapability)(this.config.bareElicitationCapability),
             clientInfo: { name: 'nexrall-code', version: '1.0' },
         });
         await this._notify('notifications/initialized');
         const res = (await this._rpc('tools/list', {}));
         this._tools = res?.tools ?? [];
     }
+    async listResources() {
+        try {
+            const res = (await this._rpc('resources/list', {}));
+            return Array.isArray(res?.resources) ? res.resources : [];
+        }
+        catch {
+            return []; /* server has no resources capability */
+        }
+    }
+    async readResource(uri) {
+        return (0, client_1.flattenResourceContents)(await this._rpc('resources/read', { uri }));
+    }
+    async listPrompts() {
+        try {
+            const res = (await this._rpc('prompts/list', {}));
+            return Array.isArray(res?.prompts) ? res.prompts : [];
+        }
+        catch {
+            return []; /* server has no prompts capability */
+        }
+    }
+    async getPrompt(name, args) {
+        const params = { name };
+        if (Object.keys(args).length)
+            params.arguments = args;
+        return (0, client_1.flattenPromptMessages)(await this._rpc('prompts/get', params));
+    }
     async callTool(name, args) {
         const result = (await this._rpc('tools/call', { name, arguments: args }));
         if (!result)
@@ -108,35 +138,106 @@ class McpHttpClient {
             throw new Error(`MCP HTTP ${resp.status} ${resp.statusText}${body ? `: ${body.slice(0, 200)}` : ''}`);
         }
         const contentType = resp.headers.get('content-type') ?? '';
+        if (contentType.includes('text/event-stream'))
+            return await this._consumeSse(resp, id);
         const text = await resp.text();
         if (!text.trim())
             return null; // e.g. 202 ack for a notification
-        const consume = (msg) => {
+        const msg = JSON.parse(text);
+        if (msg.error)
+            throw new Error(`MCP error ${msg.error.code}: ${msg.error.message}`);
+        return msg.result ?? null;
+    }
+    /**
+     * Read an SSE reply frame by frame. A server request (elicitation) is answered on the
+     * spot: the server WAITS for that answer before it sends our own result, so buffering
+     * the whole stream first would deadlock until the request timeout. As soon as our id
+     * arrives we stop and cancel the body (the stream may stay open for the session).
+     * Falls back to a buffered parse when the runtime hands us no readable body.
+     */
+    async _consumeSse(resp, id) {
+        const state = { have: false };
+        const handle = (msg) => {
+            if (typeof msg.method === 'string' && msg.id != null) {
+                this._answerServerRequest(msg.id, msg.method, msg.params);
+                return;
+            }
+            if (msg.id !== id)
+                return;
             if (msg.error)
-                throw new Error(`MCP error ${msg.error.code}: ${msg.error.message}`);
-            return msg.result ?? null;
+                state.failure = new Error(`MCP error ${msg.error.code}: ${msg.error.message}`);
+            else {
+                state.result = msg.result ?? null;
+                state.have = true;
+            }
         };
-        if (contentType.includes('text/event-stream')) {
-            // Walk SSE frames; return the JSON-RPC message matching our request id.
-            for (const frame of text.split(/\r?\n\r?\n/)) {
-                const dataLines = frame
-                    .split(/\r?\n/)
-                    .filter((l) => l.startsWith('data:'))
-                    .map((l) => l.slice(5).trim());
+        const body = resp.body;
+        if (body && typeof body[Symbol.asyncIterator] === 'function') {
+            let buf = '';
+            const dataLines = [];
+            const flush = () => {
                 if (!dataLines.length)
-                    continue;
+                    return;
+                const data = dataLines.join('\n');
+                dataLines.length = 0;
                 try {
-                    const msg = JSON.parse(dataLines.join('\n'));
-                    if (msg.id === id)
-                        return consume(msg);
+                    handle(JSON.parse(data));
                 }
-                catch {
-                    /* skip non-JSON frames (comments, pings) */
+                catch { /* comment/ping frame */ }
+            };
+            try {
+                for await (const chunk of body) {
+                    buf += Buffer.from(chunk).toString('utf-8');
+                    let nl;
+                    while ((nl = buf.indexOf('\n')) !== -1) {
+                        let line = buf.slice(0, nl);
+                        buf = buf.slice(nl + 1);
+                        if (line.endsWith('\r'))
+                            line = line.slice(0, -1);
+                        if (!line) {
+                            flush();
+                            if (state.have || state.failure)
+                                break;
+                            continue;
+                        }
+                        if (line.startsWith('data:'))
+                            dataLines.push(line.slice(5).replace(/^ /, ''));
+                    }
+                    if (state.have || state.failure)
+                        break;
                 }
+                flush();
+            }
+            catch { /* a torn-down stream is not itself an error; the checks below decide */ }
+            try {
+                await body.cancel?.();
+            }
+            catch { /* best-effort */ }
+        }
+        else {
+            const text = await resp.text();
+            for (const frame of text.split(/\r?\n\r?\n/)) {
+                const data = frame.split(/\r?\n/).filter((l) => l.startsWith('data:')).map((l) => l.slice(5).trim()).join('\n');
+                if (!data)
+                    continue;
+                try {
+                    handle(JSON.parse(data));
+                }
+                catch { /* skip non-JSON frames */ }
             }
-            throw new Error('No matching JSON-RPC response found in SSE stream');
         }
-        return consume(JSON.parse(text));
+        if (state.failure)
+            throw state.failure;
+        if (!state.have)
+            throw new Error('No matching JSON-RPC response found in SSE stream');
+        return state.result;
+    }
+    /** Reply to a server→client request. Fire-and-forget: the in-flight reader must not block. */
+    _answerServerRequest(id, method, params) {
+        void (async () => {
+            const reply = await (0, client_1.serverRequestReply)(this.name, this._elicitationHandler, method, params);
+            await this._post({ jsonrpc: '2.0', id, ...reply });
+        })().catch(() => { });
     }
 }
 exports.McpHttpClient = McpHttpClient;

package/dist/mcp/manager.d.ts

@@ -1,6 +1,15 @@
-import { McpServerConfig, McpToolDefinition } from './client';
+import { McpServerConfig, McpToolDefinition, McpResource, McpPrompt } from './client';
+import type { McpElicitationHandler } from './client';
+import { ToolStats } from './stats';
 export interface McpConfig {
     mcpServers: Record<string, McpServerConfig>;
+    /**
+     * Names the user has switched off (spec §42). Stored as a list rather than a flag
+     * on the server so it also covers servers this file does not define — a plugin's
+     * mcp.json, for instance, which the user cannot edit but can perfectly well want
+     * to silence. Disabled servers are still listed by /mcp; they just never connect.
+     */
+    disabledServers?: string[];
 }
 export interface AnthropicTool {
     name: string;
@@ -14,9 +23,20 @@ export interface AnthropicTool {
 export declare class McpManager {
     private _clients;
     private _toolMap;
+    private _promptCache;
     private _configs;
     private _errors;
     private _needsAuth;
+    private _disabled;
+    /** Per-tool call counts and timings — the "is it slow or broken?" answer (spec §42). */
+    readonly stats: ToolStats;
+    private _elicitationHandler;
+    /**
+     * Route every server's elicitation (`elicitation/create`) through this handler —
+     * including servers that connect later, which is why it is also re-applied in
+     * connectAll/enable. Pass null to restore auto-decline.
+     */
+    setElicitationHandler(handler: McpElicitationHandler | null): void;
     /** Pick the transport for a server config: stdio (command), Streamable HTTP, or legacy SSE. */
     private static makeClient;
     /** Load config from ~/.nexrall/mcp.json, <workDir>/.nexrall/mcp.json, and plugin mcp.json files. */
@@ -45,28 +65,83 @@ export declare class McpManager {
     callTool(prefixedName: string, input: Record<string, unknown>, abortSignal?: {
         aborted: boolean;
     }): Promise<string | null>;
+    /** Resources across connected, enabled servers. One server failing never hides the others. */
+    listResources(server?: string): Promise<Array<McpResource & {
+        server: string;
+    }>>;
+    /** Read one resource. Throws a clear error for an unknown server; bounded by the tool timeout. */
+    readResource(server: string, uri: string): Promise<string>;
+    /**
+     * Prompt metadata for one connected server. Fetched once per connection and
+     * cached — including an empty list (server has no prompts capability), so the
+     * `/` menu does not re-ask a server on every keystroke; reconnecting clears
+     * the entry. Returns [] for a server that is not connected.
+     */
+    promptsFor(server: string): Promise<McpPrompt[]>;
+    /** Prompts across connected, enabled servers, tagged with the server they came from. */
+    listPrompts(server?: string): Promise<Array<McpPrompt & {
+        server: string;
+    }>>;
+    /**
+     * Expand one prompt to text. Positional values map, in order, onto the
+     * arguments the server declared in prompts/list — the same positional form
+     * Claude Code accepts (`/mcp__server__prompt first second`). Validation runs
+     * here, before the request, so mistakes read as sentences instead of raw
+     * JSON-RPC errors; the request itself is bounded by the same 60s timeout the
+     * resource reader uses.
+     */
+    getPrompt(server: string, name: string, values?: string[]): Promise<string>;
     /** True if this tool name belongs to an MCP server. */
     isMcpTool(name: string): boolean;
     get serverNames(): string[];
     get toolCount(): number;
     private static transportOf;
-    /** Returns per-server status for UI display, including failed / auth-required connections. */
+    /** Returns per-server status for UI display, including failed / auth-required / disabled. */
     getStatus(): Array<{
         name: string;
         transport: 'stdio' | 'http' | 'sse';
         tools: McpToolDefinition[];
         connected: boolean;
+        disabled: boolean;
         error?: string;
         needsAuth?: boolean;
     }>;
     /** The WWW-Authenticate challenge a server returned on 401 (empty if none/unknown). */
     authChallenge(name: string): string;
+    /** True when the user has switched this server off for the session. */
+    isDisabled(name: string): boolean;
+    /**
+     * Switch a server off in THIS session: drop its client and forget its tool map, so
+     * the next turn's tool list no longer offers it. The caller persists the choice
+     * (McpManager.setServerDisabled) — this method deliberately does not touch disk.
+     */
+    disable(name: string): boolean;
+    /**
+     * Switch a server back on and connect it, without a restart. Resolves to an error
+     * message when the connection fails, so the caller can print it and leave the
+     * server listed as broken instead of silently reporting success.
+     */
+    enable(name: string): Promise<string | null>;
+    /** Disconnect one server for the session (its config stays; `enable` brings it back). */
+    disconnect(name: string): boolean;
+    /** Forgets one server's client and tools, leaving its config and status alone. */
+    private _dropClient;
     /** Path to an mcp.json for the given scope. */
     static configPath(workDir: string, scope: 'project' | 'user'): string;
     private static readConfigFile;
     private static writeConfigFile;
     /** Add (or overwrite) a server in the given scope's mcp.json. */
     static addServer(workDir: string, name: string, server: McpServerConfig, scope?: 'project' | 'user'): void;
+    /**
+     * Switch a server off/on in the config FILE, so the choice survives a restart.
+     * Written to the project scope even when the server came from elsewhere (a plugin
+     * or the user file), because the project is the only scope this session is sure it
+     * may edit — and `disabledServers` is a name list, so it works for all three.
+     * Returns the file that was written.
+     */
+    static setServerDisabled(workDir: string, name: string, disabled: boolean, scope?: 'project' | 'user'): string;
+    /** Where a server's definition comes from, for messages that have to be honest about it. */
+    static serverScope(workDir: string, name: string): 'project' | 'user' | 'plugin' | 'none';
     /** Remove a server from whichever scope(s) define it. Returns true if anything was removed. */
     static removeServer(workDir: string, name: string): boolean;
     disconnectAll(): void;

package/dist/mcp/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/mcp/manager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,eAAe,EAAE,iBAAiB,EAAgB,MAAM,UAAU,CAAC;AAOvF,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC7C;AAGD,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE;QACZ,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACrC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;CACH;AAID,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAmC;IAEnD,OAAO,CAAC,QAAQ,CAA6B;IAE7C,OAAO,CAAC,QAAQ,CAAsC;IACtD,OAAO,CAAC,OAAO,CAA6B;IAE5C,OAAO,CAAC,UAAU,CAA6B;IAE/C,+FAA+F;IAC/F,OAAO,CAAC,MAAM,CAAC,UAAU;IAMzB,oGAAoG;IACpG,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS;IA2B7C,mFAAmF;IAC7E,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BlD,sEAAsE;IACtE,iBAAiB,IAAI,aAAa,EAAE;IAkBpC;;;;;;;;;;;;;;;;OAgBG;IACG,QAAQ,CACZ,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,WAAW,CAAC,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,GACjC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAoCzB,uDAAuD;IACvD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIhC,IAAI,WAAW,IAAI,MAAM,EAAE,CAE1B;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,OAAO,CAAC,MAAM,CAAC,WAAW;IAK1B,8FAA8F;IAC9F,SAAS,IAAI,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;QAAC,KAAK,EAAE,iBAAiB,EAAE,CAAC;QAAC,SAAS,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAY9J,uFAAuF;IACvF,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAMnC,+CAA+C;IAC/C,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM;IAMrE,OAAO,CAAC,MAAM,CAAC,cAAc;IAS7B,OAAO,CAAC,MAAM,CAAC,eAAe;IAK9B,iEAAiE;IACjE,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,GAAE,SAAS,GAAG,MAAkB,GAAG,IAAI;IAOrH,+FAA+F;IAC/F,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAc3D,aAAa,IAAI,IAAI;CAQtB"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/mcp/manager.ts"],"names":[],"mappings":"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"}