@nexrall/code-core 1.4.71 → 1.4.73

package/dist/mcp/client.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.McpClient = exports.MCP_ELICITATION_CAPABILITY = void 0;
+exports.McpClient = exports.MCP_PROTOCOL_VERSION = exports.MCP_PROTOCOL_VERSIONS = exports.MCP_ELICITATION_CAPABILITY = void 0;
 exports.flattenResourceContents = flattenResourceContents;
 exports.flattenPromptMessages = flattenPromptMessages;
 exports.elicitationCapability = elicitationCapability;
@@ -9,16 +9,21 @@ 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) => {
+    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);
+    })
+        .filter(Boolean);
     const text = parts.join('\n');
-    return text.length > maxChars ? text.slice(0, maxChars) + `\n… [truncated, ${text.length - maxChars} more characters]` : text;
+    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
@@ -28,10 +33,12 @@ function flattenResourceContents(result, maxChars = 100000) {
  */
 function flattenPromptMessages(result, maxChars = 100000) {
     const messages = result?.messages ?? [];
-    const parts = messages.map((m) => {
+    const parts = messages
+        .map((m) => {
         const content = m?.content;
         const items = Array.isArray(content) ? content : content ? [content] : [];
-        return items.map((c) => {
+        return items
+            .map((c) => {
             const item = c;
             if (item?.type === 'text' && typeof item.text === 'string')
                 return item.text;
@@ -45,13 +52,33 @@ function flattenPromptMessages(result, maxChars = 100000) {
                 return `[resource prompt content (${item.resource?.uri ?? 'unknown uri'}) not shown]`;
             }
             return '';
-        }).filter(Boolean).join('\n');
-    }).filter(Boolean);
+        })
+            .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;
+    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: {} } };
+// ─── Protocol revisions ───────────────────────────────────────────────────────
+//
+// `initialize` advertises the first entry; the server answers with the revision IT
+// will use. That answer is recorded verbatim — including a revision newer than this
+// list (a 2026-07-28 server): everything after the handshake is gated by the
+// CAPABILITIES we advertise, not by the version string, so an unknown number is
+// informative, not fatal. (Claude Code tolerates exactly this — it shipped a fix for
+// 'calls failing until restart when the server changed its supported version'.)
+//
+// 2025-11-25 is the newest revision whose features this client implements
+// (elicitation incl. URL mode). Do not advertise 2026-07-28 until its requirements
+// are implemented and tested — a version is a promise, not a label.
+exports.MCP_PROTOCOL_VERSIONS = ['2025-11-25', '2025-06-18', '2025-03-26', '2024-11-05'];
+/** What every transport sends as `protocolVersion` in `initialize`. */
+exports.MCP_PROTOCOL_VERSION = exports.MCP_PROTOCOL_VERSIONS[0];
 /**
  * The `capabilities` object for initialize. `bare` (the per-server
  * `bareElicitationCapability` config) sends the older empty shape — the same escape
@@ -70,8 +97,11 @@ function normalizeElicitationRequest(params) {
         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,
+        elicitationId: typeof p.elicitationId === 'string'
+            ? p.elicitationId
+            : typeof p.elicitation_id === 'string'
+                ? p.elicitation_id
+                : undefined,
     };
 }
 /**
@@ -107,10 +137,24 @@ class McpClient {
         this._buf = '';
         this._tools = [];
         this._elicitationHandler = null;
+        this._notificationHandler = null;
         this.name = name;
     }
-    get tools() { return this._tools; }
-    setElicitationHandler(handler) { this._elicitationHandler = handler; }
+    get tools() {
+        return this._tools;
+    }
+    get protocolVersion() {
+        return this._protocolVersion;
+    }
+    get instructions() {
+        return this._instructions;
+    }
+    setElicitationHandler(handler) {
+        this._elicitationHandler = handler;
+    }
+    setNotificationHandler(handler) {
+        this._notificationHandler = handler;
+    }
     async connect() {
         if (!this.config.command)
             throw new Error(`MCP server "${this.name}" has no command (stdio transport requires one).`);
@@ -136,16 +180,29 @@ class McpClient {
         this._proc.on('exit', () => {
             this._rejectAll(new Error(`MCP server "${this.name}" exited unexpectedly`));
         });
-        // Handshake: initialize
-        await this._request('initialize', {
-            protocolVersion: '2024-11-05',
+        // Handshake: initialize. The reply carries the revision the server will use
+        // and often `instructions` — both recorded; see MCP_PROTOCOL_VERSIONS for
+        // why an unknown counter-offer is accepted rather than treated as an error.
+        const init = (await this._request('initialize', {
+            protocolVersion: exports.MCP_PROTOCOL_VERSION,
             capabilities: elicitationCapability(this.config.bareElicitationCapability),
             clientInfo: { name: 'nexrall-code', version: '1.0' },
-        });
+        }));
+        this._protocolVersion =
+            typeof init?.protocolVersion === 'string' && init.protocolVersion ? init.protocolVersion : undefined;
+        this._instructions =
+            typeof init?.instructions === 'string' && init.instructions.trim() ? init.instructions : undefined;
         // Send initialized notification (no response expected)
         this._notify('notifications/initialized');
-        // Fetch tools
-        const result = await this._request('tools/list', {});
+        await this.refreshTools();
+    }
+    /**
+     * Re-fetch `tools/list`. Called by the manager when a server announces
+     * `notifications/tools/list_changed`; on failure the OLD table stays in place
+     * (a transient error must not empty the toolset).
+     */
+    async refreshTools() {
+        const result = (await this._request('tools/list', {}));
         this._tools = result?.tools ?? [];
     }
     async listResources() {
@@ -176,7 +233,7 @@ class McpClient {
         return flattenPromptMessages(await this._request('prompts/get', params));
     }
     async callTool(name, args) {
-        const result = await this._request('tools/call', { name, arguments: args });
+        const result = (await this._request('tools/call', { name, arguments: args }));
         if (!result)
             return '';
         const text = (result.content ?? [])
@@ -192,7 +249,9 @@ class McpClient {
             try {
                 this._proc.kill('SIGTERM');
             }
-            catch { /* ignore */ }
+            catch {
+                /* ignore */
+            }
             this._proc = null;
         }
         this._rejectAll(new Error(`MCP server "${this.name}" disconnected`));
@@ -234,8 +293,14 @@ class McpClient {
             void this._handleServerRequest(msg.id, msg.method, msg.params);
             return;
         }
-        if (msg.id == null)
-            return; // notification, ignore
+        if (msg.id == null) {
+            // Server-initiated notification (list_changed for tools/prompts/resources).
+            // Forwarded to the manager, which decides what a method invalidates.
+            if (typeof msg.method === 'string') {
+                this._notificationHandler?.(msg.method, msg.params);
+            }
+            return;
+        }
         const pending = this._pending.get(msg.id);
         if (!pending)
             return;

package/dist/mcp/httpClient.d.ts

@@ -1,9 +1,24 @@
-import type { McpServerConfig, McpToolDefinition, McpTransport, McpResource, McpPrompt, McpElicitationHandler } from './client';
+import type { McpServerConfig, McpToolDefinition, McpTransport, McpResource, McpPrompt, McpElicitationHandler, McpNotificationHandler } from './client';
+/**
+ * The Bearer parameters of a `WWW-Authenticate` challenge, as far as they change
+ * behaviour. `error="insufficient_scope"` + `scope="a b"` is a token that WORKS but
+ * lacks permissions — a different user-facing story from a plain 401, and CC draws
+ * the same line (changelog 2.1.288 line 8, 1231). Unquoted values (`scope=read`)
+ * are legal in some hand-rolled servers, hence the fallback branch.
+ */
+export declare function parseOAuthChallenge(wwwAuthenticate: string): {
+    insufficientScope: boolean;
+    scope?: string;
+};
 /** Thrown when a remote MCP server replies 401 — the caller should run the OAuth flow. */
 export declare class McpOAuthRequiredError extends Error {
     readonly serverName: string;
     readonly serverUrl: string;
     readonly wwwAuthenticate: string;
+    /** The permissions the server says the token is missing (empty for a plain 401). */
+    readonly missingScope: string | undefined;
+    /** True when the token is valid but under-scoped — sign-in must ask for MORE, not just again. */
+    readonly insufficientScope: boolean;
     constructor(serverName: string, serverUrl: string, wwwAuthenticate: string);
 }
 export declare class McpHttpClient implements McpTransport {
@@ -12,10 +27,18 @@ export declare class McpHttpClient implements McpTransport {
     private _tools;
     private _sessionId;
     private _elicitationHandler;
+    private _notificationHandler;
+    private _protocolVersion;
+    private _instructions;
     readonly name: string;
     constructor(name: string, config: McpServerConfig);
     get tools(): McpToolDefinition[];
+    get protocolVersion(): string | undefined;
+    get instructions(): string | undefined;
     setElicitationHandler(handler: McpElicitationHandler | null): void;
+    setNotificationHandler(handler: McpNotificationHandler | null): void;
+    /** Re-fetch `tools/list` (see McpClient.refreshTools for the failure rule). */
+    refreshTools(): Promise<void>;
     connect(): Promise<void>;
     listResources(): Promise<McpResource[]>;
     readResource(uri: string): Promise<string>;

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"httpClient.d.ts","sourceRoot":"","sources":["../../src/mcp/httpClient.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EACjB,YAAY,EACZ,WAAW,EACX,SAAS,EACT,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,UAAU,CAAC;AAqBlB;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,MAAM,GAAG;IAAE,iBAAiB,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAS3G;AAED,0FAA0F;AAC1F,qBAAa,qBAAsB,SAAQ,KAAK;aAO5B,UAAU,EAAE,MAAM;aAClB,SAAS,EAAE,MAAM;aACjB,eAAe,EAAE,MAAM;IARzC,oFAAoF;IACpF,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,iGAAiG;IACjG,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;gBAGlB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM;CAY1C;AAED,qBAAa,aAAc,YAAW,YAAY;IAY9C,OAAO,CAAC,QAAQ,CAAC,MAAM;IAXzB,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,mBAAmB,CAAsC;IACjE,OAAO,CAAC,oBAAoB,CAAuC;IACnE,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,aAAa,CAAqB;IAC1C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAGpB,IAAI,EAAE,MAAM,EACK,MAAM,EAAE,eAAe;IAK1C,IAAI,KAAK,IAAI,iBAAiB,EAAE,CAE/B;IAED,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IAED,IAAI,YAAY,IAAI,MAAM,GAAG,SAAS,CAErC;IAED,qBAAqB,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,GAAG,IAAI;IAIlE,sBAAsB,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI,GAAG,IAAI;IAIpE,+EAA+E;IACzE,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAexB,aAAa,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IASvC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1C,WAAW,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IASnC,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;YAeJ,IAAI;YAMJ,OAAO;YAKP,KAAK;YA2BL,cAAc;IAkB5B;;;;;;OAMG;YACW,WAAW;IAoFzB,8FAA8F;IAC9F,OAAO,CAAC,oBAAoB;CAQ7B"}

package/dist/mcp/httpClient.js

@@ -4,17 +4,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.McpHttpClient = exports.McpOAuthRequiredError = void 0;
+exports.parseOAuthChallenge = parseOAuthChallenge;
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const client_1 = require("./client");
 const REQUEST_TIMEOUT_MS = 30000;
+/**
+ * The Bearer parameters of a `WWW-Authenticate` challenge, as far as they change
+ * behaviour. `error="insufficient_scope"` + `scope="a b"` is a token that WORKS but
+ * lacks permissions — a different user-facing story from a plain 401, and CC draws
+ * the same line (changelog 2.1.288 line 8, 1231). Unquoted values (`scope=read`)
+ * are legal in some hand-rolled servers, hence the fallback branch.
+ */
+function parseOAuthChallenge(wwwAuthenticate) {
+    const params = {};
+    for (const m of (wwwAuthenticate || '').matchAll(/([a-zA-Z_][\w-]*)\s*=\s*(?:"([^"]*)"|([^\s,]+))/g)) {
+        params[m[1].toLowerCase()] = m[2] ?? m[3] ?? '';
+    }
+    return {
+        insufficientScope: params.error === 'insufficient_scope',
+        scope: params.scope || undefined,
+    };
+}
 /** Thrown when a remote MCP server replies 401 — the caller should run the OAuth flow. */
 class McpOAuthRequiredError extends Error {
     constructor(serverName, serverUrl, wwwAuthenticate) {
-        super(`MCP server "${serverName}" requires authentication`);
+        const ch = parseOAuthChallenge(wwwAuthenticate);
+        super(ch.insufficientScope
+            ? `MCP server "${serverName}" needs additional permissions${ch.scope ? ` (missing scope: ${ch.scope})` : ''}. Run /mcp auth ${serverName} to re-authorize.`
+            : `MCP server "${serverName}" requires authentication — run /mcp auth ${serverName} to sign in.`);
         this.serverName = serverName;
         this.serverUrl = serverUrl;
         this.wwwAuthenticate = wwwAuthenticate;
         this.name = 'McpOAuthRequiredError';
+        this.missingScope = ch.scope;
+        this.insufficientScope = ch.insufficientScope;
     }
 }
 exports.McpOAuthRequiredError = McpOAuthRequiredError;
@@ -25,23 +48,43 @@ class McpHttpClient {
         this._tools = [];
         this._sessionId = null;
         this._elicitationHandler = null;
+        this._notificationHandler = null;
         this.name = name;
     }
     get tools() {
         return this._tools;
     }
-    setElicitationHandler(handler) { this._elicitationHandler = handler; }
+    get protocolVersion() {
+        return this._protocolVersion;
+    }
+    get instructions() {
+        return this._instructions;
+    }
+    setElicitationHandler(handler) {
+        this._elicitationHandler = handler;
+    }
+    setNotificationHandler(handler) {
+        this._notificationHandler = handler;
+    }
+    /** Re-fetch `tools/list` (see McpClient.refreshTools for the failure rule). */
+    async refreshTools() {
+        const res = (await this._rpc('tools/list', {}));
+        this._tools = res?.tools ?? [];
+    }
     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',
+        const init = (await this._rpc('initialize', {
+            protocolVersion: client_1.MCP_PROTOCOL_VERSION,
             capabilities: (0, client_1.elicitationCapability)(this.config.bareElicitationCapability),
             clientInfo: { name: 'nexrall-code', version: '1.0' },
-        });
+        }));
+        this._protocolVersion =
+            typeof init?.protocolVersion === 'string' && init.protocolVersion ? init.protocolVersion : undefined;
+        this._instructions =
+            typeof init?.instructions === 'string' && init.instructions.trim() ? init.instructions : undefined;
         await this._notify('notifications/initialized');
-        const res = (await this._rpc('tools/list', {}));
-        this._tools = res?.tools ?? [];
+        await this.refreshTools();
     }
     async listResources() {
         try {
@@ -88,7 +131,9 @@ class McpHttpClient {
             (0, node_fetch_1.default)(this.config.url, {
                 method: 'DELETE',
                 headers: { 'Mcp-Session-Id': this._sessionId, ...(this.config.headers ?? {}) },
-            }).catch(() => { });
+            }).catch(() => {
+                /* ignore */
+            });
         }
         this._sessionId = null;
     }
@@ -162,6 +207,13 @@ class McpHttpClient {
                 this._answerServerRequest(msg.id, msg.method, msg.params);
                 return;
             }
+            if (msg.id == null) {
+                // Server-initiated notification interleaved with our response stream.
+                if (typeof msg.method === 'string') {
+                    this._notificationHandler?.(msg.method, msg.params);
+                }
+                return;
+            }
             if (msg.id !== id)
                 return;
             if (msg.error)
@@ -183,7 +235,9 @@ class McpHttpClient {
                 try {
                     handle(JSON.parse(data));
                 }
-                catch { /* comment/ping frame */ }
+                catch {
+                    /* comment/ping frame */
+                }
             };
             try {
                 for await (const chunk of body) {
@@ -208,22 +262,32 @@ class McpHttpClient {
                 }
                 flush();
             }
-            catch { /* a torn-down stream is not itself an error; the checks below decide */ }
+            catch {
+                /* a torn-down stream is not itself an error; the checks below decide */
+            }
             try {
                 await body.cancel?.();
             }
-            catch { /* best-effort */ }
+            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');
+                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 */ }
+                catch {
+                    /* skip non-JSON frames */
+                }
             }
         }
         if (state.failure)
@@ -237,7 +301,9 @@ class McpHttpClient {
         void (async () => {
             const reply = await (0, client_1.serverRequestReply)(this.name, this._elicitationHandler, method, params);
             await this._post({ jsonrpc: '2.0', id, ...reply });
-        })().catch(() => { });
+        })().catch(() => {
+            /* stream may be gone; the server times the request out itself */
+        });
     }
 }
 exports.McpHttpClient = McpHttpClient;

package/dist/mcp/instructions.d.ts

@@ -0,0 +1,11 @@
+export declare const MCP_INSTRUCTIONS_PER_SERVER = 2000;
+export declare const MCP_INSTRUCTIONS_TOTAL = 8000;
+/**
+ * Render the block, or null when there is nothing to inject — callers join the
+ * result with the project brief, and a null must not leave an empty section behind.
+ */
+export declare function formatMcpInstructions(entries: Array<{
+    server: string;
+    instructions: string;
+}>): string | null;
+//# sourceMappingURL=instructions.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../src/mcp/instructions.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAChD,eAAO,MAAM,sBAAsB,OAAO,CAAC;AAE3C;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,KAAK,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,MAAM,GAAG,IAAI,CAkB7G"}

package/dist/mcp/instructions.js

@@ -0,0 +1,42 @@
+"use strict";
+// The `initialize.instructions` prompt block — a server's own reference notes,
+// injected into the same system-prompt channel as nexrallMd (loop.ts composes it
+// per request, so a server connected or enabled mid-session contributes on the
+// very next call without rebuilding the session brief).
+//
+// Kept as a pure function in its own module because the caps are policy, not
+// plumbing: the strings come from a third-party process, so one server may add
+// MCP_INSTRUCTIONS_PER_SERVER characters and all servers together
+// MCP_INSTRUCTIONS_TOTAL — beyond that the note is truncated (visibly, with a
+// marker) or omitted, rather than allowed to crowd out the real project brief.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MCP_INSTRUCTIONS_TOTAL = exports.MCP_INSTRUCTIONS_PER_SERVER = void 0;
+exports.formatMcpInstructions = formatMcpInstructions;
+exports.MCP_INSTRUCTIONS_PER_SERVER = 2000;
+exports.MCP_INSTRUCTIONS_TOTAL = 8000;
+/**
+ * Render the block, or null when there is nothing to inject — callers join the
+ * result with the project brief, and a null must not leave an empty section behind.
+ */
+function formatMcpInstructions(entries) {
+    const parts = [];
+    let used = 0;
+    for (const e of entries) {
+        let text = e.instructions.trim();
+        if (!text)
+            continue;
+        if (text.length > exports.MCP_INSTRUCTIONS_PER_SERVER) {
+            text = text.slice(0, exports.MCP_INSTRUCTIONS_PER_SERVER) + '\n[truncated]';
+        }
+        if (used + text.length > exports.MCP_INSTRUCTIONS_TOTAL) {
+            parts.push(`(more servers omitted — the ${exports.MCP_INSTRUCTIONS_TOTAL}-character budget was reached)`);
+            break;
+        }
+        used += text.length;
+        parts.push(`## ${e.server}\n${text}`);
+    }
+    if (!parts.length)
+        return null;
+    return ['# MCP server instructions', '', ...parts].join('\n');
+}
+//# sourceMappingURL=instructions.js.map

package/dist/mcp/manager.d.ts

@@ -37,6 +37,15 @@ export declare class McpManager {
      * connectAll/enable. Pass null to restore auto-decline.
      */
     setElicitationHandler(handler: McpElicitationHandler | null): void;
+    /**
+     * Route server→client notifications for one client: `tools/list_changed` re-fetches
+     * the tool table and rebuilds the prefixed map in place (new tools appear on the next
+     * turn — no restart), `prompts/list_changed` drops the cached prompt list. A failed
+     * refresh keeps the OLD table: a transient error must not empty the toolset.
+     */
+    private _wireNotifications;
+    /** Replace one server's entries in the prefixed tool map with its current list. */
+    private _refreshToolMap;
     /** 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. */
@@ -95,6 +104,15 @@ export declare class McpManager {
     isMcpTool(name: string): boolean;
     get serverNames(): string[];
     get toolCount(): number;
+    /**
+     * Names of configured servers whose entry sets `alwaysLoad: true` (CC parity).
+     * The agent loop sends this per request; the backend keeps those servers' tools
+     * out of BOTH deferral paths (tool-search `defer_loading` and the cap selector's
+     * droppable set). Config-level — a server that failed to connect still contributes
+     * an inert name, since it sends no tools to protect. Sorted because the list rides
+     * in the request body, which is part of the tools-cache key.
+     */
+    alwaysLoadServers(): string[];
     private static transportOf;
     /** Returns per-server status for UI display, including failed / auth-required / disabled. */
     getStatus(): Array<{
@@ -105,9 +123,26 @@ export declare class McpManager {
         disabled: boolean;
         error?: string;
         needsAuth?: boolean;
+        /** Permissions the server says are missing, when `needsAuth` came from an insufficient_scope 401. */
+        missingScope?: string;
+        /** Revision the server agreed to in `initialize` (connected servers only). */
+        protocolVersion?: string;
+        /** mcp.json entry sets `alwaysLoad: true` — its tools resist the backend tool cap. */
+        alwaysLoad: boolean;
     }>;
     /** The WWW-Authenticate challenge a server returned on 401 (empty if none/unknown). */
     authChallenge(name: string): string;
+    /** Permissions an auth-required server says are missing ('' when unknown/plain 401). */
+    missingScope(name: string): string;
+    /**
+     * `initialize.instructions` from every connected server that sent one — static
+     * reference notes (workflow rules, repo layout) the conversation should carry.
+     * The caller decides where they go; ordering is by server name for stable output.
+     */
+    serverInstructions(): Array<{
+        server: string;
+        instructions: string;
+    }>;
     /** True when the user has switched this server off for the session. */
     isDisabled(name: string): boolean;
     /**

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,WAAW,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC/G,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAItD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAIpC,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC5C;;;;;OAKG;IACH,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;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;IAI7C,OAAO,CAAC,YAAY,CAAkC;IAEtD,OAAO,CAAC,QAAQ,CAAsC;IACtD,OAAO,CAAC,OAAO,CAA6B;IAE5C,OAAO,CAAC,UAAU,CAA6B;IAG/C,OAAO,CAAC,SAAS,CAAqB;IACtC,wFAAwF;IACxF,QAAQ,CAAC,KAAK,YAAmB;IAGjC,OAAO,CAAC,mBAAmB,CAAsC;IAEjE;;;;OAIG;IACH,qBAAqB,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,GAAG,IAAI;IAKlE,+FAA+F;IAC/F,OAAO,CAAC,MAAM,CAAC,UAAU;IAMzB,oGAAoG;IACpG,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS;IAiC7C,mFAAmF;IAC7E,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAiClD,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;IA+CzB,8FAA8F;IACxF,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAStF,kGAAkG;IAC5F,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAQhE;;;;;OAKG;IACG,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAUtD,wFAAwF;IAClF,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IASlF;;;;;;;OAOG;IACG,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAsBrF,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,6FAA6F;IAC7F,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,QAAQ,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAuBjL,uFAAuF;IACvF,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAInC,uEAAuE;IACvE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIjC;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAO9B;;;;OAIG;IACG,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAsBlD,yFAAyF;IACzF,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAOjC,kFAAkF;IAClF,OAAO,CAAC,WAAW;IAanB,+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;IAa7B,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;;;;;;OAMG;IACH,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,GAAE,SAAS,GAAG,MAAkB,GAAG,MAAM;IAWzH,4FAA4F;IAC5F,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM;IAWzF,+FAA+F;IAC/F,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAqB3D,aAAa,IAAI,IAAI;CAUtB"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/mcp/manager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,eAAe,EAAE,iBAAiB,EAAgB,WAAW,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC/G,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAItD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAIpC,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC5C;;;;;OAKG;IACH,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;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;IAI7C,OAAO,CAAC,YAAY,CAAkC;IAEtD,OAAO,CAAC,QAAQ,CAAsC;IACtD,OAAO,CAAC,OAAO,CAA6B;IAE5C,OAAO,CAAC,UAAU,CAA6B;IAG/C,OAAO,CAAC,SAAS,CAAqB;IACtC,wFAAwF;IACxF,QAAQ,CAAC,KAAK,YAAmB;IAGjC,OAAO,CAAC,mBAAmB,CAAsC;IAEjE;;;;OAIG;IACH,qBAAqB,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,GAAG,IAAI;IAKlE;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAe1B,mFAAmF;IACnF,OAAO,CAAC,eAAe;IAOvB,+FAA+F;IAC/F,OAAO,CAAC,MAAM,CAAC,UAAU;IAMzB,oGAAoG;IACpG,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS;IAgC7C,mFAAmF;IAC7E,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAkClD,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;IAkEzB,8FAA8F;IACxF,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAStF,kGAAkG;IAC5F,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBhE;;;;;OAKG;IACG,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAUtD,wFAAwF;IAClF,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IASlF;;;;;;;OAOG;IACG,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAyCrF,uDAAuD;IACvD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIhC,IAAI,WAAW,IAAI,MAAM,EAAE,CAE1B;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;;;;;OAOG;IACH,iBAAiB,IAAI,MAAM,EAAE;IAM7B,OAAO,CAAC,MAAM,CAAC,WAAW;IAK1B,6FAA6F;IAC7F,SAAS,IAAI,KAAK,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;QACpC,KAAK,EAAE,iBAAiB,EAAE,CAAC;QAC3B,SAAS,EAAE,OAAO,CAAC;QACnB,QAAQ,EAAE,OAAO,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,qGAAqG;QACrG,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,8EAA8E;QAC9E,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,sFAAsF;QACtF,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC;IA4DF,uFAAuF;IACvF,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAInC,wFAAwF;IACxF,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIlC;;;;OAIG;IACH,kBAAkB,IAAI,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;IAQrE,uEAAuE;IACvE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIjC;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAO9B;;;;OAIG;IACG,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAuBlD,yFAAyF;IACzF,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAOjC,kFAAkF;IAClF,OAAO,CAAC,WAAW;IAoBnB,+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;IAa7B,OAAO,CAAC,MAAM,CAAC,eAAe;IAK9B,iEAAiE;IACjE,MAAM,CAAC,SAAS,CACd,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,eAAe,EACvB,KAAK,GAAE,SAAS,GAAG,MAAkB,GACpC,IAAI;IAOP;;;;;;OAMG;IACH,MAAM,CAAC,iBAAiB,CACtB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,EACjB,KAAK,GAAE,SAAS,GAAG,MAAkB,GACpC,MAAM;IAYT,4FAA4F;IAC5F,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM;IAazF,+FAA+F;IAC/F,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAqB3D,aAAa,IAAI,IAAI;CAUtB"}