@pentoshi/clai 4.14.0 → 4.14.1

package/dist/mcp/jsonrpc.js

@@ -16,9 +16,7 @@ export function createRequest(id, method, params) {
         : { jsonrpc: "2.0", id, method, params };
 }
 export function createNotification(method, params) {
-    return params === undefined
-        ? { jsonrpc: "2.0", method }
-        : { jsonrpc: "2.0", method, params };
+    return params === undefined ? { jsonrpc: "2.0", method } : { jsonrpc: "2.0", method, params };
 }
 export function encodeMessage(message) {
     return JSON.stringify(message);
@@ -32,9 +30,17 @@ export function isJsonRpcResponse(value) {
     const record = value;
     if (record.jsonrpc !== "2.0")
         return false;
-    if (!("id" in record))
+    const validId = typeof record.id === "string" || (typeof record.id === "number" && Number.isFinite(record.id));
+    if ("result" in record)
+        return validId && !("error" in record);
+    if (!validId && record.id !== null)
+        return false;
+    if (typeof record.error !== "object" || record.error === null)
         return false;
-    return "result" in record || "error" in record;
+    const error = record.error;
+    return (typeof error.code === "number" &&
+        Number.isFinite(error.code) &&
+        typeof error.message === "string");
 }
 export function isJsonRpcSuccess(value) {
     return "result" in value;
@@ -46,15 +52,15 @@ export function isJsonRpcRequest(value) {
     if (typeof value !== "object" || value === null)
         return false;
     const record = value;
-    return record.jsonrpc === "2.0" && typeof record.method === "string" && "id" in record;
+    return (record.jsonrpc === "2.0" &&
+        typeof record.method === "string" &&
+        (typeof record.id === "string" || (typeof record.id === "number" && Number.isFinite(record.id))));
 }
 export function isJsonRpcNotification(value) {
     if (typeof value !== "object" || value === null)
         return false;
     const record = value;
-    return (record.jsonrpc === "2.0" &&
-        typeof record.method === "string" &&
-        !("id" in record));
+    return record.jsonrpc === "2.0" && typeof record.method === "string" && !("id" in record);
 }
 export function parseMessage(line) {
     const trimmed = line.trim();
@@ -67,9 +73,7 @@ export function parseMessage(line) {
     catch {
         return undefined;
     }
-    if (isJsonRpcResponse(parsed) ||
-        isJsonRpcRequest(parsed) ||
-        isJsonRpcNotification(parsed)) {
+    if (isJsonRpcResponse(parsed) || isJsonRpcRequest(parsed) || isJsonRpcNotification(parsed)) {
         return parsed;
     }
     return undefined;
@@ -87,18 +91,21 @@ export class LineDecoder {
         this.maxBytes = maxBytes > 0 ? maxBytes : MCP_MAX_FRAME_BYTES;
     }
     push(chunk) {
-        this.buffer +=
-            typeof chunk === "string" ? chunk : this.decoder.decode(chunk, { stream: true });
+        this.buffer += typeof chunk === "string" ? chunk : this.decoder.decode(chunk, { stream: true });
         const lines = [];
         let index = this.buffer.indexOf("\n");
         while (index !== -1) {
             const line = this.buffer.slice(0, index).replace(/\r$/, "");
+            if (Buffer.byteLength(line, "utf8") > this.maxBytes) {
+                this.buffer = "";
+                throw new McpTransportError("too-large", `MCP message exceeded the ${this.maxBytes}-byte line framing limit.`);
+            }
             this.buffer = this.buffer.slice(index + 1);
             if (line.length > 0)
                 lines.push(line);
             index = this.buffer.indexOf("\n");
         }
-        if (this.buffer.length > this.maxBytes) {
+        if (Buffer.byteLength(this.buffer, "utf8") > this.maxBytes) {
             this.buffer = "";
             throw new McpTransportError("too-large", `MCP message exceeded the ${this.maxBytes}-byte line framing limit before a newline arrived.`);
         }
@@ -118,19 +125,22 @@ export class SseDecoder {
         this.maxBytes = maxBytes > 0 ? maxBytes : MCP_MAX_FRAME_BYTES;
     }
     push(chunk) {
-        this.buffer +=
-            typeof chunk === "string" ? chunk : this.decoder.decode(chunk, { stream: true });
+        this.buffer += typeof chunk === "string" ? chunk : this.decoder.decode(chunk, { stream: true });
         const events = [];
         let boundary = this.nextBoundary();
         while (boundary) {
             const block = this.buffer.slice(0, boundary.index);
+            if (Buffer.byteLength(block, "utf8") > this.maxBytes) {
+                this.buffer = "";
+                throw new McpTransportError("too-large", `MCP SSE event exceeded the ${this.maxBytes}-byte framing limit.`);
+            }
             this.buffer = this.buffer.slice(boundary.index + boundary.length);
             const parsed = this.parseBlock(block);
             if (parsed)
                 events.push(parsed);
             boundary = this.nextBoundary();
         }
-        if (this.buffer.length > this.maxBytes) {
+        if (Buffer.byteLength(this.buffer, "utf8") > this.maxBytes) {
             this.buffer = "";
             throw new McpTransportError("too-large", `MCP SSE event exceeded the ${this.maxBytes}-byte framing limit before a boundary arrived.`);
         }

package/dist/mcp/jsonrpc.js.map

@@ -1 +1 @@
-{"version":3,"file":"jsonrpc.js","sourceRoot":"","sources":["../../src/mcp/jsonrpc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jsonrpc.js","sourceRoot":"","sources":["../../src/mcp/jsonrpc.ts"],"names":[],"mappings":"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"}

package/dist/mcp/manager.d.ts

@@ -16,6 +16,7 @@ export interface McpManagerOptions {
     readonly oauthInteractive?: boolean | undefined;
     readonly onDeviceAuthorization?: AuthProviderDeps["onDeviceAuthorization"];
     readonly onAuthorizationUrl?: AuthProviderDeps["onAuthorizationUrl"];
+    readonly readCallbackUrl?: AuthProviderDeps["readCallbackUrl"];
     readonly authProviderFactory?: ((definition: McpServerDefinition) => McpAuthProvider | undefined) | undefined;
 }
 export declare class McpManager {
@@ -24,8 +25,17 @@ export declare class McpManager {
     private readonly authProviders;
     private readonly authSignatures;
     private readonly stopped;
+    private readonly listeners;
+    private readonly recoveries;
+    private readonly catalogRefreshes;
+    private readonly dirtyCatalogs;
+    private operations;
+    private readonly lifetime;
+    private closed;
     private discovery;
     constructor(options?: McpManagerOptions);
+    subscribe(listener: (snapshot: McpSnapshot) => void): () => void;
+    private enqueue;
     private get connectTimeoutMs();
     private get requestTimeoutMs();
     private createTransport;
@@ -41,21 +51,28 @@ export declare class McpManager {
     refresh(options?: {
         force?: boolean;
     }): Promise<McpSnapshot>;
+    private refreshConnections;
     forceRefresh(): Promise<McpSnapshot>;
     private setIdleConnection;
     isStopped(serverName: string): boolean;
     stop(serverName: string): Promise<McpSnapshot>;
+    private stopConnection;
     reconnect(name: string): Promise<McpSnapshot>;
+    private reconnectConnection;
     private connect;
     private fallbackTransportFor;
     private attemptConnect;
+    private catalogTools;
     private reconcileToolNames;
+    private scheduleCatalogRefresh;
     private disposeConnection;
     closeAll(): Promise<void>;
+    private disposeAll;
     snapshot(): McpSnapshot;
     private toStatus;
     getTool(name: string): McpToolMetadata | undefined;
     listTools(): McpToolMetadata[];
+    private recoverConnection;
     callTool(name: string, args: Record<string, unknown>, options?: McpRequestOptions): Promise<McpNormalizedResult>;
     login(serverName: string): Promise<{
         ok: boolean;

package/dist/mcp/manager.js

@@ -1,9 +1,11 @@
 import { discoverMcpServers } from "./discovery.js";
+import { pathToFileURL } from "node:url";
+import { safeCwd } from "../os/cwd.js";
 import { McpClient } from "./client.js";
 import { redactSecrets } from "./format.js";
 import { toToolMetadata } from "./results.js";
-import { allocateWireNames, canonicalToolName, toolIdentity, } from "./names.js";
-import { McpTransportError } from "./transport.js";
+import { allocateWireNames, canonicalToolName, toolIdentity } from "./names.js";
+import { awaitMcpOperation, McpTransportError, withTimeout, } from "./transport.js";
 import { StdioTransport } from "./transport-stdio.js";
 import { LegacySseTransport, StreamableHttpTransport, } from "./transport-http.js";
 import { createAuthProvider, } from "./auth/provider.js";
@@ -30,6 +32,13 @@ export class McpManager {
     authProviders = new Map();
     authSignatures = new Map();
     stopped = new Set();
+    listeners = new Set();
+    recoveries = new Map();
+    catalogRefreshes = new Set();
+    dirtyCatalogs = new Set();
+    operations = Promise.resolve();
+    lifetime = new AbortController();
+    closed = false;
     discovery = {
         servers: [],
         shadowed: [],
@@ -40,6 +49,15 @@ export class McpManager {
     constructor(options = {}) {
         this.options = options;
     }
+    subscribe(listener) {
+        this.listeners.add(listener);
+        return () => this.listeners.delete(listener);
+    }
+    enqueue(operation) {
+        const result = this.operations.then(operation);
+        this.operations = result.then(() => undefined, () => undefined);
+        return result;
+    }
     get connectTimeoutMs() {
         return this.options.connectTimeoutMs ?? DEFAULT_CONNECT_TIMEOUT_MS;
     }
@@ -51,13 +69,15 @@ export class McpManager {
         if (config.transport === "stdio") {
             if (this.options.transportFactory)
                 return this.options.transportFactory(definition);
-            return new StdioTransport(config, { requestTimeoutMs: this.requestTimeoutMs });
+            return new StdioTransport(config, {
+                requestTimeoutMs: config.timeoutMs ?? this.requestTimeoutMs,
+            });
         }
         const authProvider = this.buildAuthProvider(definition, config);
         if (this.options.transportFactory)
             return this.options.transportFactory(definition);
         const httpOptions = {
-            requestTimeoutMs: this.requestTimeoutMs,
+            requestTimeoutMs: config.timeoutMs ?? this.requestTimeoutMs,
             ...(authProvider ? { authProvider } : {}),
         };
         if (config.transport === "sse")
@@ -91,6 +111,7 @@ export class McpManager {
             ...(this.options.onAuthorizationUrl
                 ? { onAuthorizationUrl: this.options.onAuthorizationUrl }
                 : {}),
+            ...(this.options.readCallbackUrl ? { readCallbackUrl: this.options.readCallbackUrl } : {}),
         };
         const provider = createAuthProvider(config.auth ?? { kind: "oauth" }, deps);
         this.rememberAuthProvider(definition, provider);
@@ -133,6 +154,11 @@ export class McpManager {
         return this.options.discovery?.workspaceFolder;
     }
     async refresh(options = {}) {
+        return this.enqueue(() => this.refreshConnections(options));
+    }
+    async refreshConnections(options) {
+        if (this.closed)
+            return this.snapshot();
         this.discovery = discoverMcpServers(this.options.discovery ?? {});
         const next = new Map();
         for (const definition of this.discovery.servers)
@@ -200,6 +226,9 @@ export class McpManager {
         return this.stopped.has(this.resolveServerName(serverName) ?? serverName);
     }
     async stop(serverName) {
+        return this.enqueue(() => this.stopConnection(serverName));
+    }
+    async stopConnection(serverName) {
         const definition = this.findDefinition(serverName);
         if (!definition)
             return this.snapshot();
@@ -211,6 +240,11 @@ export class McpManager {
         return this.snapshot();
     }
     async reconnect(name) {
+        return this.enqueue(() => this.reconnectConnection(name));
+    }
+    async reconnectConnection(name) {
+        if (this.closed)
+            return this.snapshot();
         const definition = this.findDefinition(name);
         if (!definition)
             return this.snapshot();
@@ -271,7 +305,7 @@ export class McpManager {
         };
         const authProvider = this.buildAuthProvider(definition, config);
         const httpOptions = {
-            requestTimeoutMs: this.requestTimeoutMs,
+            requestTimeoutMs: config.timeoutMs ?? this.requestTimeoutMs,
             ...(authProvider ? { authProvider } : {}),
         };
         return alternate.transport === "sse"
@@ -280,24 +314,31 @@ export class McpManager {
     }
     async attemptConnect(definition, state, transport) {
         let client;
+        const timeoutMs = definition.config.connectTimeoutMs ?? this.connectTimeoutMs;
+        const { signal, dispose } = withTimeout(this.lifetime.signal, timeoutMs);
         try {
-            client = new McpClient(transport, this.options.clientOptions ?? {});
-            const init = await client.initialize({ timeoutMs: this.connectTimeoutMs });
+            client = new McpClient(transport, {
+                roots: () => [
+                    {
+                        uri: pathToFileURL(this.options.discovery?.workspaceFolder ?? safeCwd()).href,
+                    },
+                ],
+                ...this.options.clientOptions,
+            });
+            client.onToolsChanged(() => this.scheduleCatalogRefresh(state));
+            const init = await awaitMcpOperation(client.initialize({
+                timeoutMs,
+                signal,
+            }), signal);
             state.client = client;
             state.serverInfo = init.serverInfo;
             state.protocolVersion = init.protocolVersion;
             try {
-                const descriptors = await client.listTools({ timeoutMs: this.connectTimeoutMs });
-                const selected = descriptors
-                    .filter((descriptor) => definition.toolSelection === "all" ||
-                    definition.toolSelection.includes(descriptor.name))
-                    .filter((descriptor, index, list) => list.findIndex((candidate) => candidate.name === descriptor.name) === index)
-                    .sort((a, b) => a.name.localeCompare(b.name));
-                const allocated = allocateWireNames(selected.map((descriptor) => ({
-                    serverName: definition.name,
-                    toolName: descriptor.name,
-                })));
-                state.tools = selected.map((descriptor) => toToolMetadata(definition.name, descriptor, allocated.get(toolIdentity(definition.name, descriptor.name))));
+                const descriptors = await client.listTools({
+                    timeoutMs,
+                    signal,
+                });
+                state.tools = this.catalogTools(definition, descriptors);
                 state.status = "ready";
                 state.detail = undefined;
             }
@@ -316,8 +357,26 @@ export class McpManager {
             state.client = undefined;
             return error;
         }
+        finally {
+            dispose();
+        }
         return undefined;
     }
+    catalogTools(definition, descriptors) {
+        const unique = new Map();
+        for (const tool of descriptors) {
+            if (definition.toolSelection !== "all" && !definition.toolSelection.includes(tool.name))
+                continue;
+            if (!unique.has(tool.name))
+                unique.set(tool.name, tool);
+        }
+        const selected = [...unique.values()].sort((left, right) => left.name.localeCompare(right.name));
+        const allocated = allocateWireNames(selected.map((tool) => ({
+            serverName: definition.name,
+            toolName: tool.name,
+        })));
+        return selected.map((tool) => toToolMetadata(definition.name, tool, allocated.get(toolIdentity(definition.name, tool.name))));
+    }
     reconcileToolNames() {
         const all = [...this.connections.values()].flatMap((state) => state.status === "ready"
             ? state.tools.map((tool) => ({
@@ -327,14 +386,52 @@ export class McpManager {
             : []);
         const allocated = allocateWireNames(all);
         for (const state of this.connections.values()) {
-            state.tools = state.tools.map((tool) => ({
-                ...tool,
-                canonicalName: canonicalToolName(tool.serverName, tool.toolName),
-                wireName: allocated.get(toolIdentity(tool.serverName, tool.toolName)) ??
-                    tool.wireName,
-            }));
+            state.tools = state.tools.map((tool) => {
+                const canonicalName = canonicalToolName(tool.serverName, tool.toolName);
+                const wireName = allocated.get(toolIdentity(tool.serverName, tool.toolName)) ?? tool.wireName;
+                return canonicalName === tool.canonicalName && wireName === tool.wireName
+                    ? tool
+                    : { ...tool, canonicalName, wireName };
+            });
         }
     }
+    scheduleCatalogRefresh(state) {
+        if (this.closed)
+            return;
+        if (this.catalogRefreshes.has(state)) {
+            this.dirtyCatalogs.add(state);
+            return;
+        }
+        this.catalogRefreshes.add(state);
+        void this.enqueue(async () => {
+            if (this.closed || this.connections.get(state.definition.name) !== state || !state.client)
+                return;
+            this.dirtyCatalogs.delete(state);
+            try {
+                const descriptors = await state.client.listTools({
+                    timeoutMs: state.definition.config.connectTimeoutMs ?? this.connectTimeoutMs,
+                    signal: this.lifetime.signal,
+                });
+                state.tools = this.catalogTools(state.definition, descriptors);
+                state.status = "ready";
+                state.detail = undefined;
+            }
+            catch (error) {
+                state.detail = `Tool catalog refresh failed: ${describeError(error, this.mergedSecrets(state.definition))}`;
+            }
+            const snapshot = this.snapshot();
+            for (const listener of this.listeners)
+                listener(snapshot);
+        })
+            .catch(() => undefined)
+            .finally(() => {
+            this.catalogRefreshes.delete(state);
+            if (this.dirtyCatalogs.delete(state) &&
+                !this.closed &&
+                this.connections.get(state.definition.name) === state)
+                this.scheduleCatalogRefresh(state);
+        });
+    }
     async disposeConnection(state) {
         const client = state.client;
         state.client = undefined;
@@ -342,6 +439,12 @@ export class McpManager {
             await client.close().catch(() => undefined);
     }
     async closeAll() {
+        this.closed = true;
+        this.lifetime.abort(new McpTransportError("closed", "MCP manager closed."));
+        await this.enqueue(() => this.disposeAll());
+        this.listeners.clear();
+    }
+    async disposeAll() {
         const states = [...this.connections.values()];
         this.connections.clear();
         this.stopped.clear();
@@ -407,6 +510,26 @@ export class McpManager {
     listTools() {
         return this.snapshot().tools.slice();
     }
+    recoverConnection(serverName, client) {
+        const pending = this.recoveries.get(serverName);
+        if (pending)
+            return pending;
+        if (this.connections.get(serverName)?.client !== client)
+            return Promise.resolve(this.snapshot());
+        const recovery = this.reconnect(serverName).then((snapshot) => {
+            for (const listener of this.listeners)
+                listener(snapshot);
+            return snapshot;
+        });
+        this.recoveries.set(serverName, recovery);
+        void recovery
+            .finally(() => {
+            if (this.recoveries.get(serverName) === recovery)
+                this.recoveries.delete(serverName);
+        })
+            .catch(() => undefined);
+        return recovery;
+    }
     async callTool(name, args, options = {}) {
         const tool = this.getTool(name);
         if (!tool) {
@@ -416,10 +539,63 @@ export class McpManager {
         if (!state || !state.client || state.status !== "ready") {
             throw new McpTransportError("closed", `MCP server "${tool.serverName}" is not ready.`);
         }
-        return await state.client.callTool(tool.toolName, args, {
-            timeoutMs: this.requestTimeoutMs,
+        const requestOptions = {
             ...options,
-        });
+            timeoutMs: options.timeoutMs ?? state.definition.config.timeoutMs ?? this.requestTimeoutMs,
+            signal: options.signal
+                ? AbortSignal.any([options.signal, this.lifetime.signal])
+                : this.lifetime.signal,
+        };
+        const deadline = Date.now() + requestOptions.timeoutMs;
+        const client = state.client;
+        try {
+            return await client.callTool(tool.toolName, args, requestOptions);
+        }
+        catch (error) {
+            if (this.closed ||
+                this.stopped.has(tool.serverName) ||
+                options.signal?.aborted ||
+                !(error instanceof McpTransportError))
+                throw error;
+            const expiredSession = error.status === 404 && client.getSessionId() !== undefined;
+            const transient = ["closed", "network"].includes(error.kind) &&
+                (error.status === undefined || error.status >= 500);
+            if (!expiredSession && !transient)
+                throw error;
+            const remainingMs = deadline - Date.now();
+            const recovery = this.recoverConnection(tool.serverName, client);
+            if (remainingMs <= 0)
+                throw error;
+            const { signal, dispose } = withTimeout(requestOptions.signal, remainingMs);
+            try {
+                await awaitMcpOperation(recovery, signal);
+            }
+            finally {
+                dispose();
+            }
+            if (!expiredSession && !tool.readOnly && !tool.idempotent)
+                throw error;
+            const current = this.connections.get(tool.serverName);
+            const replacement = this.getTool(tool.canonicalName);
+            if (!current?.client ||
+                current.status !== "ready" ||
+                !replacement ||
+                replacement.readOnly !== tool.readOnly ||
+                replacement.idempotent !== tool.idempotent ||
+                replacement.destructive !== tool.destructive ||
+                replacement.openWorld !== tool.openWorld ||
+                JSON.stringify(replacement.inputSchema) !== JSON.stringify(tool.inputSchema))
+                throw error;
+            if (options.signal?.aborted)
+                throw new McpTransportError("cancelled", "MCP tool call cancelled during reconnect.");
+            const remaining = deadline - Date.now();
+            if (remaining <= 0)
+                throw new McpTransportError("timeout", "MCP tool deadline expired during reconnect.");
+            return current.client.callTool(tool.toolName, args, {
+                ...requestOptions,
+                timeoutMs: remaining,
+            });
+        }
     }
     async login(serverName) {
         const definition = this.findDefinition(serverName);
@@ -436,7 +612,10 @@ export class McpManager {
         }
         const provider = this.authProviders.get(resolved) ?? this.buildAuthProvider(definition, config);
         try {
-            const ok = await provider.onUnauthorized(undefined);
+            const ok = await provider.onUnauthorized(undefined, {
+                interactive: true,
+                signal: this.lifetime.signal,
+            });
             return ok
                 ? { ok: true, detail: `Authenticated MCP server ${resolved}.` }
                 : {
@@ -445,7 +624,10 @@ export class McpManager {
                 };
         }
         catch (error) {
-            return { ok: false, detail: describeError(error, this.mergedSecrets(definition)) };
+            return {
+                ok: false,
+                detail: describeError(error, this.mergedSecrets(definition)),
+            };
         }
     }
 }