@strands-agents/sdk 1.0.0 → 1.2.0

package/dist/src/mcp.d.ts

@@ -1,5 +1,7 @@
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
+import type { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
+import { type ServerCapabilities, type Implementation, type LoggingMessageNotificationParams } from '@modelcontextprotocol/sdk/types.js';
 import type { JSONValue } from './types/json.js';
 import type { ElicitationCallback } from './types/elicitation.js';
 import { McpTool } from './tools/mcp-tool.js';
@@ -41,9 +43,32 @@ export interface TasksConfig {
      */
     pollTimeout?: number;
 }
+/** Connection state of an MCP client. */
+export type McpConnectionState = 'disconnected' | 'connected' | 'failed';
+/** Options for MCP tool invocation. */
+export interface McpCallToolOptions {
+    /** AbortSignal to cancel the in-flight request. */
+    signal?: AbortSignal;
+}
+/** OAuth client credentials for machine-to-machine authentication. */
+export interface McpClientCredentials {
+    clientId: string;
+    clientSecret: string;
+    /** OAuth scopes to request. Joined with spaces before sending to the token endpoint. */
+    scopes?: string[];
+}
 /** Arguments for configuring an MCP Client. */
 export type McpClientConfig = RuntimeConfig & {
-    transport: McpTransport;
+    /** Pre-constructed transport. Mutually exclusive with `url`. */
+    transport?: McpTransport;
+    /** Server URL. When provided, a StreamableHTTP transport is constructed automatically. */
+    url?: string | URL;
+    /** Client credentials for OAuth machine-to-machine auth. Requires `url`. */
+    auth?: McpClientCredentials;
+    /** Custom OAuth provider for advanced auth flows. Requires `url`. Mutually exclusive with `auth`. */
+    authProvider?: OAuthClientProvider;
+    /** Custom headers to include on every request to the server. Requires `url`. */
+    headers?: Record<string, string>;
     /** Disable OpenTelemetry MCP instrumentation. */
     disableMcpInstrumentation?: boolean;
     /**
@@ -58,6 +83,10 @@ export type McpClientConfig = RuntimeConfig & {
      * and routes incoming elicitation requests to this callback.
      */
     elicitationCallback?: ElicitationCallback;
+    /** When true, connection failures are logged as warnings instead of throwing. */
+    failOpen?: boolean;
+    /** Called when the server emits a log message. Defaults to routing through the Strands logger. */
+    logHandler?: (params: LoggingMessageNotificationParams) => void;
 };
 /** MCP Client for interacting with Model Context Protocol servers. */
 export declare class McpClient {
@@ -68,18 +97,32 @@ export declare class McpClient {
     private _clientName;
     private _clientVersion;
     private _transport;
-    private _connected;
+    private _state;
     private _client;
+    private _failOpen;
+    private _logHandler;
     private _disableMcpInstrumentation;
     private _tasksConfig;
     private _elicitationCallback;
+    private _registeredToolNames;
+    private _onToolsChanged;
+    private _refreshingTools;
+    private _pendingRefresh;
     constructor(args: McpClientConfig);
+    private static _resolveTransport;
     get client(): Client;
+    get serverCapabilities(): ServerCapabilities | undefined;
+    get serverVersion(): Implementation | undefined;
+    get serverInstructions(): string | undefined;
+    get connectionState(): McpConnectionState;
     /**
      * Connects the MCP client to the server.
      *
-     * This function is exposed to allow consumers to connect manually, but will be called lazily before any operations that require a connection.
+     * Called lazily before any operation that requires a connection. When `failOpen` is true,
+     * connection failures are swallowed and the client enters a `'failed'` state — subsequent
+     * calls are no-ops until `connect(true)` is called explicitly to retry.
      *
+     * @param reconnect - When true, forces a reconnect even if already connected or failed.
      * @returns A promise that resolves when the connection is established.
      */
     connect(reconnect?: boolean): Promise<void>;
@@ -89,12 +132,25 @@ export declare class McpClient {
      * @returns A promise that resolves when the disconnection is complete.
      */
     disconnect(): Promise<void>;
+    /**
+     * Enables the `await using` pattern for automatic resource cleanup.
+     * Delegates to {@link McpClient.disconnect}.
+     */
+    [Symbol.asyncDispose](): Promise<void>;
     /**
      * Lists the tools available on the server and returns them as executable McpTool instances.
      *
      * @returns A promise that resolves with an array of McpTool instances.
      */
     listTools(): Promise<McpTool[]>;
+    /**
+     * Sets a callback invoked when the MCP server's tool list changes at runtime.
+     *
+     * @param callback - Handler receiving the previous tool names and the refreshed tool instances,
+     *                   or undefined to remove the callback.
+     */
+    set onToolsChanged(callback: ((oldTools: string[], newTools: McpTool[]) => void) | undefined);
+    private _handleToolsChanged;
     /**
      * Invoke a tool on the connected MCP server using an McpTool instance.
      *
@@ -104,8 +160,9 @@ export declare class McpClient {
      *
      * @param tool - The McpTool instance to invoke.
      * @param args - The arguments to pass to the tool.
+     * @param options - Optional settings for the request.
      * @returns A promise that resolves with the result of the tool invocation.
      */
-    callTool(tool: McpTool, args: JSONValue): Promise<JSONValue>;
+    callTool(tool: McpTool, args: JSONValue, options?: McpCallToolOptions): Promise<JSONValue>;
 }
 //# sourceMappingURL=mcp.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAA;AAI9E,OAAO,KAAK,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAG7C;;;;;;;GAOG;AACH,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAA;AAE5F,8CAA8C;AAC9C,MAAM,WAAW,aAAa;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;IAEZ;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,+CAA+C;AAC/C,MAAM,MAAM,eAAe,GAAG,aAAa,GAAG;IAC5C,SAAS,EAAE,YAAY,CAAA;IAEvB,iDAAiD;IACjD,yBAAyB,CAAC,EAAE,OAAO,CAAA;IAEnC;;;;OAIG;IACH,WAAW,CAAC,EAAE,WAAW,CAAA;IAEzB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;CAC1C,CAAA;AAED,sEAAsE;AACtE,qBAAa,SAAS;IACpB,iEAAiE;IACjE,gBAAuB,WAAW,SAAQ;IAE1C,4EAA4E;IAC5E,gBAAuB,oBAAoB,UAAS;IAEpD,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,UAAU,CAAW;IAC7B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,0BAA0B,CAAS;IAC3C,OAAO,CAAC,YAAY,CAAyB;IAC7C,OAAO,CAAC,oBAAoB,CAAiC;gBAEjD,IAAI,EAAE,eAAe;IAkBjC,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;IACU,OAAO,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAqB/D;;;;OAIG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOxC;;;;OAIG;IACU,SAAS,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAgB5C;;;;;;;;;;OAUG;IACU,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;CAqC1E"}
+{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAA;AAG9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAA;AAEnF,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,gCAAgC,EACtC,MAAM,oCAAoC,CAAA;AAE3C,OAAO,KAAK,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAG7C;;;;;;;GAOG;AACH,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAA;AAE5F,8CAA8C;AAC9C,MAAM,WAAW,aAAa;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;IAEZ;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,yCAAyC;AACzC,MAAM,MAAM,kBAAkB,GAAG,cAAc,GAAG,WAAW,GAAG,QAAQ,CAAA;AAExE,uCAAuC;AACvC,MAAM,WAAW,kBAAkB;IACjC,mDAAmD;IACnD,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED,sEAAsE;AACtE,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,wFAAwF;IACxF,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAClB;AAED,+CAA+C;AAC/C,MAAM,MAAM,eAAe,GAAG,aAAa,GAAG;IAC5C,gEAAgE;IAChE,SAAS,CAAC,EAAE,YAAY,CAAA;IAExB,0FAA0F;IAC1F,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;IAElB,4EAA4E;IAC5E,IAAI,CAAC,EAAE,oBAAoB,CAAA;IAE3B,qGAAqG;IACrG,YAAY,CAAC,EAAE,mBAAmB,CAAA;IAElC,gFAAgF;IAChF,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAEhC,iDAAiD;IACjD,yBAAyB,CAAC,EAAE,OAAO,CAAA;IAEnC;;;;OAIG;IACH,WAAW,CAAC,EAAE,WAAW,CAAA;IAEzB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;IAEzC,iFAAiF;IACjF,QAAQ,CAAC,EAAE,OAAO,CAAA;IAElB,kGAAkG;IAClG,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,gCAAgC,KAAK,IAAI,CAAA;CAChE,CAAA;AAED,sEAAsE;AACtE,qBAAa,SAAS;IACpB,iEAAiE;IACjE,gBAAuB,WAAW,SAAQ;IAE1C,4EAA4E;IAC5E,gBAAuB,oBAAoB,UAAS;IAEpD,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,UAAU,CAAW;IAC7B,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAAoD;IACvE,OAAO,CAAC,0BAA0B,CAAS;IAC3C,OAAO,CAAC,YAAY,CAAyB;IAC7C,OAAO,CAAC,oBAAoB,CAAiC;IAC7D,OAAO,CAAC,oBAAoB,CAAoB;IAChD,OAAO,CAAC,eAAe,CAAiE;IACxF,OAAO,CAAC,gBAAgB,CAAQ;IAChC,OAAO,CAAC,eAAe,CAAQ;gBAEnB,IAAI,EAAE,eAAe;IAmCjC,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAoChC,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,kBAAkB,IAAI,kBAAkB,GAAG,SAAS,CAEvD;IAED,IAAI,aAAa,IAAI,cAAc,GAAG,SAAS,CAE9C;IAED,IAAI,kBAAkB,IAAI,MAAM,GAAG,SAAS,CAE3C;IAED,IAAI,eAAe,IAAI,kBAAkB,CAExC;IAED;;;;;;;;;OASG;IACU,OAAO,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B/D;;;;OAIG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOxC;;;OAGG;IACG,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5C;;;;OAIG;IACU,SAAS,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IA8B5C;;;;;OAKG;IACH,IAAI,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC,GAAG,SAAS,EAE3F;YAEa,mBAAmB;IAsBjC;;;;;;;;;;;OAWG;IACU,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;CAmCxG"}

package/dist/src/mcp.js

@@ -1,6 +1,8 @@
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { ClientCredentialsProvider } from '@modelcontextprotocol/sdk/client/auth-extensions.js';
 import { takeResult } from '@modelcontextprotocol/sdk/shared/responseMessage.js';
-import { ElicitRequestSchema } from '@modelcontextprotocol/sdk/types.js';
+import { ElicitRequestSchema, LoggingMessageNotificationSchema, } from '@modelcontextprotocol/sdk/types.js';
 import { context, propagation, trace } from '@opentelemetry/api';
 import { McpTool } from './tools/mcp-tool.js';
 import { logger } from './logging/index.js';
@@ -13,41 +15,105 @@ export class McpClient {
     _clientName;
     _clientVersion;
     _transport;
-    _connected;
+    _state;
     _client;
+    _failOpen;
+    _logHandler;
     _disableMcpInstrumentation;
     _tasksConfig;
     _elicitationCallback;
+    _registeredToolNames = new Set();
+    _onToolsChanged;
+    _refreshingTools = false;
+    _pendingRefresh = false;
     constructor(args) {
         this._clientName = args.applicationName || 'strands-agents-ts-sdk';
         this._clientVersion = args.applicationVersion || '0.0.1';
-        this._transport = args.transport;
-        this._connected = false;
+        this._transport = McpClient._resolveTransport(args);
+        this._state = 'disconnected';
+        this._failOpen = args.failOpen ?? false;
+        this._logHandler = args.logHandler ?? defaultLogHandler;
         this._tasksConfig = args.tasksConfig;
         this._elicitationCallback = args.elicitationCallback;
         this._client = new Client({
             name: this._clientName,
             version: this._clientVersion,
-        }, this._elicitationCallback ? { capabilities: { elicitation: { form: {}, url: {} } } } : undefined);
+        }, {
+            ...(this._elicitationCallback ? { capabilities: { elicitation: { form: {}, url: {} } } } : undefined),
+            listChanged: {
+                tools: {
+                    autoRefresh: false,
+                    debounceMs: 300,
+                    onChanged: () => {
+                        this._handleToolsChanged();
+                    },
+                },
+            },
+        });
+        this._client.setNotificationHandler(LoggingMessageNotificationSchema, (notification) => {
+            this._logHandler(notification.params);
+        });
         this._disableMcpInstrumentation = args.disableMcpInstrumentation ?? false;
     }
+    static _resolveTransport(args) {
+        if (args.transport && args.url) {
+            throw new Error('McpClientConfig: provide either "transport" or "url", not both');
+        }
+        if (!args.transport && !args.url) {
+            throw new Error('McpClientConfig: either "transport" or "url" must be provided');
+        }
+        if (args.transport) {
+            if (args.auth || args.authProvider || args.headers) {
+                throw new Error('McpClientConfig: "auth", "authProvider", and "headers" require "url" (not compatible with "transport")');
+            }
+            return args.transport;
+        }
+        if (args.auth && args.authProvider) {
+            throw new Error('McpClientConfig: provide either "auth" or "authProvider", not both');
+        }
+        const authProvider = args.auth
+            ? new ClientCredentialsProvider({
+                clientId: args.auth.clientId,
+                clientSecret: args.auth.clientSecret,
+                ...(args.auth.scopes && { scope: args.auth.scopes.join(' ') }),
+            })
+            : args.authProvider;
+        const url = args.url instanceof URL ? args.url : new URL(args.url);
+        return new StreamableHTTPClientTransport(url, authProvider || args.headers
+            ? { ...(authProvider && { authProvider }), ...(args.headers && { requestInit: { headers: args.headers } }) }
+            : undefined);
+    }
     get client() {
         return this._client;
     }
+    get serverCapabilities() {
+        return this._client.getServerCapabilities();
+    }
+    get serverVersion() {
+        return this._client.getServerVersion();
+    }
+    get serverInstructions() {
+        return this._client.getInstructions();
+    }
+    get connectionState() {
+        return this._state;
+    }
     /**
      * Connects the MCP client to the server.
      *
-     * This function is exposed to allow consumers to connect manually, but will be called lazily before any operations that require a connection.
+     * Called lazily before any operation that requires a connection. When `failOpen` is true,
+     * connection failures are swallowed and the client enters a `'failed'` state — subsequent
+     * calls are no-ops until `connect(true)` is called explicitly to retry.
      *
+     * @param reconnect - When true, forces a reconnect even if already connected or failed.
      * @returns A promise that resolves when the connection is established.
      */
     async connect(reconnect = false) {
-        if (this._connected && !reconnect) {
+        if (this._state !== 'disconnected' && !reconnect)
             return;
-        }
-        if (this._connected && reconnect) {
+        if (this._state === 'connected' && reconnect) {
             await this._client.close();
-            this._connected = false;
+            this._state = 'disconnected';
         }
         if (this._elicitationCallback) {
             const callback = this._elicitationCallback;
@@ -55,8 +121,16 @@ export class McpClient {
                 return await callback(extra, request.params);
             });
         }
-        await this._client.connect(this._transport);
-        this._connected = true;
+        try {
+            await this._client.connect(this._transport);
+            this._state = 'connected';
+        }
+        catch (error) {
+            if (!this._failOpen)
+                throw error;
+            this._state = 'failed';
+            logger.warn(`client=<${this._clientName}>, error=<${error}> | MCP server failed to connect, continuing with failOpen`);
+        }
     }
     /**
      * Disconnects the MCP client from the server and cleans up resources.
@@ -67,7 +141,14 @@ export class McpClient {
         // Must be done sequentially
         await this._client.close();
         await this._transport.close();
-        this._connected = false;
+        this._state = 'disconnected';
+    }
+    /**
+     * Enables the `await using` pattern for automatic resource cleanup.
+     * Delegates to {@link McpClient.disconnect}.
+     */
+    async [Symbol.asyncDispose]() {
+        await this.disconnect();
     }
     /**
      * Lists the tools available on the server and returns them as executable McpTool instances.
@@ -76,16 +157,52 @@ export class McpClient {
      */
     async listTools() {
         await this.connect();
-        const result = await this._client.listTools();
-        // Map the tool specifications to fully functional McpTool instances
-        return result.tools.map((toolSpec) => {
-            return new McpTool({
+        if (this._state === 'failed')
+            return [];
+        const tools = [];
+        let cursor;
+        do {
+            const result = await this._client.listTools(cursor ? { cursor } : undefined);
+            tools.push(...result.tools.map((toolSpec) => new McpTool({
                 name: toolSpec.name,
-                description: toolSpec.description ?? '',
+                description: toolSpec.description || `Tool which performs ${toolSpec.name}`,
                 inputSchema: toolSpec.inputSchema,
                 client: this,
-            });
-        });
+            })));
+            cursor = result.nextCursor;
+        } while (cursor);
+        this._registeredToolNames = new Set(tools.map((t) => t.name));
+        return tools;
+    }
+    /**
+     * Sets a callback invoked when the MCP server's tool list changes at runtime.
+     *
+     * @param callback - Handler receiving the previous tool names and the refreshed tool instances,
+     *                   or undefined to remove the callback.
+     */
+    set onToolsChanged(callback) {
+        this._onToolsChanged = callback;
+    }
+    async _handleToolsChanged() {
+        if (this._refreshingTools) {
+            this._pendingRefresh = true;
+            return;
+        }
+        this._refreshingTools = true;
+        try {
+            do {
+                this._pendingRefresh = false;
+                const oldTools = [...this._registeredToolNames];
+                const newTools = await this.listTools();
+                this._onToolsChanged?.(oldTools, newTools);
+            } while (this._pendingRefresh);
+        }
+        catch (err) {
+            logger.warn(`client=<${this._clientName}>, error=<${err}> | failed to refresh tools after toolsChanged notification`);
+        }
+        finally {
+            this._refreshingTools = false;
+        }
     }
     /**
      * Invoke a tool on the connected MCP server using an McpTool instance.
@@ -96,12 +213,15 @@ export class McpClient {
      *
      * @param tool - The McpTool instance to invoke.
      * @param args - The arguments to pass to the tool.
+     * @param options - Optional settings for the request.
      * @returns A promise that resolves with the result of the tool invocation.
      */
-    async callTool(tool, args) {
+    async callTool(tool, args, options) {
         await this.connect();
+        if (this._state === 'failed')
+            throw new Error('MCP server failed to connect. Call connect(true) to retry.');
         if (args === null || args === undefined) {
-            return await this.callTool(tool, {});
+            return await this.callTool(tool, {}, options);
         }
         if (typeof args !== 'object' || Array.isArray(args)) {
             throw new Error(`MCP Protocol Error: Tool arguments must be a JSON Object (named parameters). Received: ${Array.isArray(args) ? 'Array' : typeof args}`);
@@ -111,20 +231,36 @@ export class McpClient {
         const toolArgs = enhancedArgs;
         // When tasksConfig is undefined, call tools directly without task management
         if (this._tasksConfig === undefined) {
-            return (await this._client.callTool({ name: tool.name, arguments: toolArgs }));
+            return (await this._client.callTool({ name: tool.name, arguments: toolArgs }, undefined, options));
         }
         // When tasksConfig is defined (even as empty object), use task-based invocation
         // which supports long-running tools with progress tracking
-        const stream = this._client.experimental.tasks.callToolStream({ name: tool.name, arguments: toolArgs }, undefined, // resultSchema - use default CallToolResultSchema
-        {
+        const stream = this._client.experimental.tasks.callToolStream({ name: tool.name, arguments: toolArgs }, undefined, {
             timeout: this._tasksConfig.ttl ?? McpClient.DEFAULT_TTL,
             maxTotalTimeout: this._tasksConfig.pollTimeout ?? McpClient.DEFAULT_POLL_TIMEOUT,
             resetTimeoutOnProgress: true,
+            ...options,
         });
         const result = await takeResult(stream);
         return result;
     }
 }
+function defaultLogHandler(params) {
+    const { level, logger: serverLogger, data } = params;
+    const message = `logger=<${serverLogger ?? 'mcp'}>, data=<${JSON.stringify(data)}> | MCP server log`;
+    if (level === 'debug') {
+        logger.debug(message);
+    }
+    else if (level === 'info' || level === 'notice') {
+        logger.info(message);
+    }
+    else if (level === 'warning') {
+        logger.warn(message);
+    }
+    else {
+        logger.error(message);
+    }
+}
 /**
  * Injects OpenTelemetry trace context into MCP tool call arguments.
  * Returns the args with a `_meta` field containing W3C traceparent headers.

package/dist/src/mcp.js.map

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

package/dist/src/models/__tests__/anthropic.test.js

@@ -100,6 +100,41 @@ describe('AnthropicModel', () => {
             new AnthropicModel({ apiKey: 'sk-ant-test', modelId: 'claude-3-opus-20240229' });
             expect(warnOnce).not.toHaveBeenCalledWith(expect.objectContaining({ warn: expect.any(Function) }), expect.stringContaining('using default modelId'));
         });
+        it('auto-populates contextWindowLimit from model ID lookup', () => {
+            const provider = new AnthropicModel({ apiKey: 'sk-test', modelId: 'claude-sonnet-4-20250514' });
+            expect(provider.getConfig()).toStrictEqual({
+                modelId: 'claude-sonnet-4-20250514',
+                maxTokens: 64_000,
+                contextWindowLimit: 1_000_000,
+            });
+        });
+        it('auto-populates contextWindowLimit for default model ID', () => {
+            const provider = new AnthropicModel({ apiKey: 'sk-test' });
+            expect(provider.getConfig()).toStrictEqual({
+                modelId: 'claude-sonnet-4-6',
+                maxTokens: 64_000,
+                contextWindowLimit: 1_000_000,
+            });
+        });
+        it('does not override explicit contextWindowLimit', () => {
+            const provider = new AnthropicModel({
+                apiKey: 'sk-test',
+                modelId: 'claude-sonnet-4-20250514',
+                contextWindowLimit: 100_000,
+            });
+            expect(provider.getConfig()).toStrictEqual({
+                modelId: 'claude-sonnet-4-20250514',
+                maxTokens: 64_000,
+                contextWindowLimit: 100_000,
+            });
+        });
+        it('leaves contextWindowLimit undefined for unknown model IDs', () => {
+            const provider = new AnthropicModel({ apiKey: 'sk-test', modelId: 'unknown-model' });
+            expect(provider.getConfig()).toStrictEqual({
+                modelId: 'unknown-model',
+                maxTokens: 64_000,
+            });
+        });
     });
     describe('updateConfig', () => {
         it('merges new config with existing config', () => {
@@ -110,6 +145,18 @@ describe('AnthropicModel', () => {
                 maxTokens: 8192,
             });
         });
+        it('re-resolves contextWindowLimit when modelId changes and it was auto-resolved', () => {
+            const provider = new AnthropicModel({ apiKey: 'sk-test' });
+            expect(provider.getConfig().contextWindowLimit).toBe(1_000_000); // claude-sonnet-4-6 default
+            provider.updateConfig({ modelId: 'claude-sonnet-4-20250514' });
+            expect(provider.getConfig().contextWindowLimit).toBe(1_000_000); // claude-sonnet-4-20250514 value
+        });
+        it('preserves explicit contextWindowLimit when modelId changes', () => {
+            const provider = new AnthropicModel({ apiKey: 'sk-test', contextWindowLimit: 50_000 });
+            expect(provider.getConfig().contextWindowLimit).toBe(50_000);
+            provider.updateConfig({ modelId: 'claude-sonnet-4-20250514' });
+            expect(provider.getConfig().contextWindowLimit).toBe(50_000); // preserved
+        });
     });
     describe('stream event handling', () => {
         it('yields correct event sequence for simple text response', async () => {
@@ -242,10 +289,17 @@ describe('AnthropicModel', () => {
             const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             await expect(collectIterator(provider.stream(messages))).rejects.toThrow('API Error');
         });
-        it('maps overload error to ContextWindowOverflowError', async () => {
+        it.each([
+            'PROMPT IS TOO LONG: request exceeds context window',
+            'max_tokens exceeded',
+            'input too long',
+            'input is too long',
+            'input length exceeds context window',
+            'input and output tokens exceed your context limit',
+        ])('maps context overflow error "%s" to ContextWindowOverflowError', async (message) => {
             const mockClient = createMockClient(async function* () {
                 yield { type: 'ping' }; // Satisfy linter require-yield
-                throw new Error('prompt is too long');
+                throw new Error(message);
             });
             const provider = new AnthropicModel({ client: mockClient });
             const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
@@ -577,10 +631,18 @@ describe('AnthropicModel', () => {
                 },
             };
         }
+        it('should use heuristic by default when useNativeTokenCount is not set', async () => {
+            const mockCountTokens = vi.fn();
+            const client = createCountTokensClient(mockCountTokens);
+            const model = new AnthropicModel({ client, modelId: 'claude-sonnet-4-6' });
+            const result = await model.countTokens(messages);
+            expect(mockCountTokens).not.toHaveBeenCalled();
+            expect(result).toBe(2); // heuristic: Math.ceil('hello'.length / 4)
+        });
         it('should return native token count on success', async () => {
             const mockCountTokens = vi.fn(async () => ({ input_tokens: 42 }));
             const client = createCountTokensClient(mockCountTokens);
-            const model = new AnthropicModel({ client, modelId: 'claude-sonnet-4-6' });
+            const model = new AnthropicModel({ client, modelId: 'claude-sonnet-4-6', useNativeTokenCount: true });
             const result = await model.countTokens(messages);
             expect(result).toBe(42);
             expect(mockCountTokens).toHaveBeenCalledOnce();
@@ -588,7 +650,7 @@ describe('AnthropicModel', () => {
         it('should include system prompt in request', async () => {
             const mockCountTokens = vi.fn(async () => ({ input_tokens: 55 }));
             const client = createCountTokensClient(mockCountTokens);
-            const model = new AnthropicModel({ client, modelId: 'claude-sonnet-4-6' });
+            const model = new AnthropicModel({ client, modelId: 'claude-sonnet-4-6', useNativeTokenCount: true });
             const result = await model.countTokens(messages, { systemPrompt: 'Be helpful.' });
             expect(result).toBe(55);
             expect(mockCountTokens).toHaveBeenCalledWith({
@@ -600,7 +662,7 @@ describe('AnthropicModel', () => {
         it('should include tool specs in request', async () => {
             const mockCountTokens = vi.fn(async () => ({ input_tokens: 100 }));
             const client = createCountTokensClient(mockCountTokens);
-            const model = new AnthropicModel({ client, modelId: 'claude-sonnet-4-6' });
+            const model = new AnthropicModel({ client, modelId: 'claude-sonnet-4-6', useNativeTokenCount: true });
             const result = await model.countTokens(messages, { toolSpecs });
             expect(result).toBe(100);
             expect(mockCountTokens).toHaveBeenCalledWith({
@@ -612,7 +674,7 @@ describe('AnthropicModel', () => {
         it('should strip max_tokens from request', async () => {
             const mockCountTokens = vi.fn(async () => ({ input_tokens: 10 }));
             const client = createCountTokensClient(mockCountTokens);
-            const model = new AnthropicModel({ client, modelId: 'claude-sonnet-4-6' });
+            const model = new AnthropicModel({ client, modelId: 'claude-sonnet-4-6', useNativeTokenCount: true });
             await model.countTokens(messages);
             expect(mockCountTokens).toHaveBeenCalledWith({
                 model: 'claude-sonnet-4-6',
@@ -624,7 +686,7 @@ describe('AnthropicModel', () => {
                 throw new Error('Unsupported');
             });
             const client = createCountTokensClient(mockCountTokens);
-            const model = new AnthropicModel({ client, modelId: 'claude-sonnet-4-6' });
+            const model = new AnthropicModel({ client, modelId: 'claude-sonnet-4-6', useNativeTokenCount: true });
             const result = await model.countTokens(messages);
             expect(typeof result).toBe('number');
             expect(result).toBeGreaterThanOrEqual(0);
@@ -634,11 +696,19 @@ describe('AnthropicModel', () => {
                 throw new Error('Connection failed');
             });
             const client = createCountTokensClient(mockCountTokens);
-            const model = new AnthropicModel({ client, modelId: 'claude-sonnet-4-6' });
+            const model = new AnthropicModel({ client, modelId: 'claude-sonnet-4-6', useNativeTokenCount: true });
             const result = await model.countTokens(messages);
             expect(typeof result).toBe('number');
             expect(result).toBeGreaterThanOrEqual(0);
         });
+        it('should skip native API and use heuristic when useNativeTokenCount is false', async () => {
+            const mockCountTokens = vi.fn();
+            const client = createCountTokensClient(mockCountTokens);
+            const model = new AnthropicModel({ client, modelId: 'claude-sonnet-4-6', useNativeTokenCount: false });
+            const result = await model.countTokens(messages);
+            expect(mockCountTokens).not.toHaveBeenCalled();
+            expect(result).toBe(2); // heuristic: Math.ceil('hello'.length / 4)
+        });
     });
 });
 //# sourceMappingURL=anthropic.test.js.map