@strands-agents/sdk 1.0.0-rc.4 → 1.0.0

package/README.md

@@ -17,7 +17,7 @@
     <a href="https://github.com/strands-agents/sdk-typescript/graphs/commit-activity"><img alt="GitHub commit activity" src="https://img.shields.io/github/commit-activity/m/strands-agents/sdk-typescript"/></a>
     <a href="https://github.com/strands-agents/sdk-typescript/issues"><img alt="GitHub open issues" src="https://img.shields.io/github/issues/strands-agents/sdk-typescript"/></a>
     <a href="https://github.com/strands-agents/sdk-typescript/pulls"><img alt="GitHub open pull requests" src="https://img.shields.io/github/issues-pr/strands-agents/sdk-typescript"/></a>
-    <a href="https://github.com/strands-agents/sdk-typescript/blob/main/LICENSE"><img alt="License" src="https://img.shields.io/github/license/strands-agents/sdk-typescript"/></a>
+    <a href="https://github.com/strands-agents/sdk-typescript/blob/main/LICENSE.APACHE"><img alt="License" src="https://img.shields.io/github/license/strands-agents/sdk-typescript"/></a>
     <a href="https://www.npmjs.com/package/@strands-agents/sdk"><img alt="NPM Version" src="https://img.shields.io/npm/v/@strands-agents/sdk"/></a>
   </div>
   
@@ -297,7 +297,7 @@ const swarm = new Swarm({
 const result = await swarm.invoke('What is the largest ocean?')
 ```
 
-Both patterns support streaming via `.stream()` for real-time access to handoff and node execution events. See the [examples](./examples/) directory for complete working samples.
+Both patterns support streaming via `.stream()` for real-time access to handoff and node execution events. See the [examples](./strands-ts/examples/) directory for complete working samples.
 
 ---
 
@@ -306,11 +306,11 @@ Both patterns support streaming via `.stream()` for real-time access to handoff
 For detailed guidance, tutorials, and concept overviews, please visit:
 
 - **[Official Documentation](https://strandsagents.com/)**: Comprehensive guides and tutorials
-- **[API Reference](https://strandsagents.com/latest/documentation/docs/api-reference/typescript/)**: Complete API documentation
-- **[Examples](./examples/)**: Sample applications
-  - **[First Agent](./examples/first-agent/)**: Basic Node.js agent
-  - **[MCP](./examples/mcp/)**: MCP integration example
-  - **[Browser Agent](./examples/browser-agent/)**: Browser-based agent with DOM manipulation
+- **[API Reference](https://strandsagents.com/docs/api/typescript/)**: Complete API documentation
+- **[Examples](./strands-ts/examples/)**: Sample applications
+  - **[First Agent](./strands-ts/examples/first-agent/)**: Basic Node.js agent
+  - **[MCP](./strands-ts/examples/mcp/)**: MCP integration example
+  - **[Browser Agent](./strands-ts/examples/browser-agent/)**: Browser-based agent with DOM manipulation
 
 - **[Contributing Guide](CONTRIBUTING.md)**: Development setup and guidelines
 
@@ -330,7 +330,7 @@ We welcome contributions! See our [Contributing Guide](CONTRIBUTING.md) for deta
 
 ## License
 
-This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details.
+This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE.APACHE) file for details.
 
 ---
 
@@ -338,10 +338,3 @@ This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENS
 
 See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more information on reporting security issues.
 
----
-
-## ⚠️ Preview Status
-
-Strands Agents is currently in public preview. During this period:
-- APIs may change as we refine the SDK
-- We welcome feedback and contributions

package/dist/src/__fixtures__/agent-helpers.d.ts

@@ -94,6 +94,12 @@ export interface AgentResultMatcher extends Omit<LoopMetricsMatcher, 'cycleCount
      * When omitted, asserts traces array exists with at least one element.
      */
     traceCount?: number;
+    /**
+     * Expected `invocationState` on the result. When provided, the full object
+     * must match exactly — extra keys fail. When omitted, only asserts
+     * `invocationState` is present (any object).
+     */
+    invocationState?: Record<string, unknown>;
 }
 /**
  * Creates an asymmetric matcher that validates AgentResult structure and values.

package/dist/src/__fixtures__/agent-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-helpers.d.ts","sourceRoot":"","sources":["../../../src/__fixtures__/agent-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,OAAO,EAAa,MAAM,sBAAsB,CAAA;AACzD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAEhD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,KAAK,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAC/E,OAAO,EAAqB,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEjF;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,wBAAwB,CAAC,aAAa,CAAC,CAAA;IAClD,QAAQ,EAAE,YAAY,CAAC,aAAa,CAAC,CAAA;CACtC,CAAA;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;IACpB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACpC;;OAEG;IACH,YAAY,CAAC,EAAE,YAAY,CAAA;IAC3B;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;CACvB;AAED;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG;IAAE,YAAY,EAAE,WAAW,EAAE,CAAA;CAAE,CAAA;AAE/D;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,SAAS,CAiB/D;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,CAAC,SAAS,aAAa,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAM1G;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,IAAI,CAAC,kBAAkB,EAAE,YAAY,CAAC;IAChF;;OAEG;IACH,UAAU,EAAE,UAAU,CAAA;IAEtB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAA;IAElB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,WAAW,CA+B1E"}
+{"version":3,"file":"agent-helpers.d.ts","sourceRoot":"","sources":["../../../src/__fixtures__/agent-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,OAAO,EAAa,MAAM,sBAAsB,CAAA;AACzD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAEhD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,KAAK,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAC/E,OAAO,EAAqB,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEjF;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,wBAAwB,CAAC,aAAa,CAAC,CAAA;IAClD,QAAQ,EAAE,YAAY,CAAC,aAAa,CAAC,CAAA;CACtC,CAAA;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;IACpB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACpC;;OAEG;IACH,YAAY,CAAC,EAAE,YAAY,CAAA;IAC3B;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;CACvB;AAED;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG;IAAE,YAAY,EAAE,WAAW,EAAE,CAAA;CAAE,CAAA;AAE/D;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,SAAS,CAkB/D;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,CAAC,SAAS,aAAa,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAM1G;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,IAAI,CAAC,kBAAkB,EAAE,YAAY,CAAC;IAChF;;OAEG;IACH,UAAU,EAAE,UAAU,CAAA;IAEtB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAA;IAElB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC1C;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,WAAW,CAgC1E"}

package/dist/src/__fixtures__/agent-helpers.js

@@ -20,6 +20,7 @@ export function createMockAgent(data) {
     return {
         messages: data?.messages ?? [],
         appState: new StateStore(data?.appState ?? {}),
+        modelState: new StateStore(),
         toolRegistry: data?.toolRegistry ?? new ToolRegistry(),
         cancelSignal: new AbortController().signal,
         addHook: (eventType, callback) => {
@@ -74,7 +75,7 @@ export async function invokeTrackedHook(agent, event) {
  * ```
  */
 export function expectAgentResult(options) {
-    const { stopReason, messageText, cycleCount, traceCount, toolNames, usage } = options;
+    const { stopReason, messageText, cycleCount, traceCount, toolNames, usage, invocationState } = options;
     const expectedLastMessage = messageText
         ? expect.objectContaining({
             role: 'assistant',
@@ -98,6 +99,7 @@ export function expectAgentResult(options) {
         lastMessage: expectedLastMessage,
         metrics: expectLoopMetrics(metricsOptions),
         traces: expectedTraces,
+        invocationState: invocationState ?? expect.any(Object),
     });
 }
 //# sourceMappingURL=agent-helpers.js.map

package/dist/src/__fixtures__/agent-helpers.js.map

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

package/dist/src/__fixtures__/mock-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mock-plugin.d.ts","sourceRoot":"","sources":["../../../src/__fixtures__/mock-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAenD;;GAEG;AACH,qBAAa,UAAW,YAAW,MAAM;IACvC,WAAW,EAAE,aAAa,EAAE,CAAK;IAEjC,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,SAAS,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAqBlC,KAAK,IAAI,IAAI;CAGd"}
+{"version":3,"file":"mock-plugin.d.ts","sourceRoot":"","sources":["../../../src/__fixtures__/mock-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAiBnD;;GAEG;AACH,qBAAa,UAAW,YAAW,MAAM;IACvC,WAAW,EAAE,aAAa,EAAE,CAAK;IAEjC,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,SAAS,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAuBlC,KAAK,IAAI,IAAI;CAGd"}

package/dist/src/__fixtures__/mock-plugin.js

@@ -1,4 +1,4 @@
-import { InitializedEvent, BeforeInvocationEvent, AfterInvocationEvent, MessageAddedEvent, BeforeToolsEvent, AfterToolsEvent, BeforeToolCallEvent, AfterToolCallEvent, BeforeModelCallEvent, AfterModelCallEvent, } from '../hooks/index.js';
+import { InitializedEvent, BeforeInvocationEvent, AfterInvocationEvent, MessageAddedEvent, BeforeToolsEvent, AfterToolsEvent, BeforeToolCallEvent, AfterToolCallEvent, BeforeModelCallEvent, AfterModelCallEvent, ToolResultEvent, ToolStreamUpdateEvent, } from '../hooks/index.js';
 /**
  * Mock plugin that records all hookable event invocations for testing.
  */
@@ -19,6 +19,8 @@ export class MockPlugin {
             AfterToolCallEvent,
             BeforeModelCallEvent,
             AfterModelCallEvent,
+            ToolResultEvent,
+            ToolStreamUpdateEvent,
         ];
         for (const eventType of eventTypes) {
             agent.addHook(eventType, (e) => {

package/dist/src/__fixtures__/mock-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"mock-plugin.js","sourceRoot":"","sources":["../../../src/__fixtures__/mock-plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,oBAAoB,EACpB,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,mBAAmB,CAAA;AAG1B;;GAEG;AACH,MAAM,OAAO,UAAU;IACrB,WAAW,GAAoB,EAAE,CAAA;IAEjC,IAAI,IAAI;QACN,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,SAAS,CAAC,KAAiB;QACzB,MAAM,UAAU,GAA+B;YAC7C,gBAAgB;YAChB,qBAAqB;YACrB,oBAAoB;YACpB,iBAAiB;YACjB,gBAAgB;YAChB,eAAe;YACf,mBAAmB;YACnB,kBAAkB;YAClB,oBAAoB;YACpB,mBAAmB;SACpB,CAAA;QAED,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;gBAC7B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,WAAW,GAAG,EAAE,CAAA;IACvB,CAAC;CACF"}
+{"version":3,"file":"mock-plugin.js","sourceRoot":"","sources":["../../../src/__fixtures__/mock-plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,oBAAoB,EACpB,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EACf,qBAAqB,GACtB,MAAM,mBAAmB,CAAA;AAG1B;;GAEG;AACH,MAAM,OAAO,UAAU;IACrB,WAAW,GAAoB,EAAE,CAAA;IAEjC,IAAI,IAAI;QACN,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,SAAS,CAAC,KAAiB;QACzB,MAAM,UAAU,GAA+B;YAC7C,gBAAgB;YAChB,qBAAqB;YACrB,oBAAoB;YACpB,iBAAiB;YACjB,gBAAgB;YAChB,eAAe;YACf,mBAAmB;YACnB,kBAAkB;YAClB,oBAAoB;YACpB,mBAAmB;YACnB,eAAe;YACf,qBAAqB;SACtB,CAAA;QAED,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;gBAC7B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,WAAW,GAAG,EAAE,CAAA;IACvB,CAAC;CACF"}

package/dist/src/__fixtures__/tool-helpers.d.ts

@@ -5,18 +5,20 @@
 import type { Tool, ToolContext } from '../tools/tool.js';
 import type { JSONValue } from '../types/json.js';
 import type { PlainToolResultBlock } from './slim-types.js';
+import type { InvocationState } from '../types/agent.js';
 /**
  * Helper to create a mock ToolContext for testing.
  *
  * @param toolUse - The tool use request
  * @param appState - Optional initial app state
+ * @param invocationState - Optional initial invocation state
  * @returns Mock ToolContext object
  */
 export declare function createMockContext(toolUse: {
     name: string;
     toolUseId: string;
     input: JSONValue;
-}, appState?: Record<string, JSONValue>): ToolContext;
+}, appState?: Record<string, JSONValue>, invocationState?: InvocationState): ToolContext;
 /**
  * Result function type for createMockTool - accepts plain objects or class instances.
  */

package/dist/src/__fixtures__/tool-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-helpers.d.ts","sourceRoot":"","sources":["../../../src/__fixtures__/tool-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAGjD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AAG3D;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,EAC9D,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACnC,WAAW,CAWb;AAED;;GAEG;AACH,KAAK,YAAY,GAAG,MAAM,oBAAoB,GAAG,cAAc,CAAC,KAAK,EAAE,oBAAoB,EAAE,KAAK,CAAC,CAAA;AAEnG;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI,CA8BzE;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAWpD"}
+{"version":3,"file":"tool-helpers.d.ts","sourceRoot":"","sources":["../../../src/__fixtures__/tool-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAGjD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAc,MAAM,mBAAmB,CAAA;AAEpE;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,EAC9D,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EACpC,eAAe,CAAC,EAAE,eAAe,GAChC,WAAW,CAYb;AAED;;GAEG;AACH,KAAK,YAAY,GAAG,MAAM,oBAAoB,GAAG,cAAc,CAAC,KAAK,EAAE,oBAAoB,EAAE,KAAK,CAAC,CAAA;AAEnG;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI,CA8BzE;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAWpD"}

package/dist/src/__fixtures__/tool-helpers.js

@@ -10,9 +10,10 @@ import { ToolRegistry } from '../registry/tool-registry.js';
  *
  * @param toolUse - The tool use request
  * @param appState - Optional initial app state
+ * @param invocationState - Optional initial invocation state
  * @returns Mock ToolContext object
  */
-export function createMockContext(toolUse, appState) {
+export function createMockContext(toolUse, appState, invocationState) {
     return {
         toolUse,
         agent: {
@@ -22,6 +23,7 @@ export function createMockContext(toolUse, appState) {
             toolRegistry: new ToolRegistry(),
             addHook: () => () => { },
         },
+        invocationState: invocationState ?? {},
     };
 }
 /**

package/dist/src/__fixtures__/tool-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-helpers.js","sourceRoot":"","sources":["../../../src/__fixtures__/tool-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAI3D;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAC/B,OAA8D,EAC9D,QAAoC;IAEpC,OAAO;QACL,OAAO;QACP,KAAK,EAAE;YACL,EAAE,EAAE,YAAY;YAChB,QAAQ,EAAE,IAAI,UAAU,CAAC,QAAQ,CAAC;YAClC,QAAQ,EAAE,EAAE;YACZ,YAAY,EAAE,IAAI,YAAY,EAAE;YAChC,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAE,CAAC;SACC;KAC3B,CAAA;AACH,CAAC;AAOD;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,QAAsB;IACjE,OAAO;QACL,IAAI;QACJ,WAAW,EAAE,aAAa,IAAI,EAAE;QAChC,QAAQ,EAAE;YACR,IAAI;YACJ,WAAW,EAAE,aAAa,IAAI,EAAE;YAChC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE;SAChD;QACD,yCAAyC;QACzC,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ;YACpB,MAAM,MAAM,GAAG,QAAQ,EAAE,CAAA;YACzB,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,aAAa,IAAI,MAAM,EAAE,CAAC;gBACpF,mCAAmC;gBACnC,MAAM,GAAG,GAAG,MAAuD,CAAA;gBACnE,IAAI,IAAI,GAAG,KAAK,CAAA;gBAChB,OAAO,CAAC,IAAI,EAAE,CAAC;oBACb,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;oBAChD,IAAI,GAAG,MAAM,IAAI,KAAK,CAAA;oBACtB,IAAI,IAAI,EAAE,CAAC;wBACT,OAAO,KAAK,CAAA;oBACd,CAAC;gBACH,CAAC;gBACD,6DAA6D;gBAC7D,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;YACjD,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAyB,CAAA;YAClC,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAa;IAC5C,MAAM,QAAQ,GAAG,IAAI,IAAI,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,CAAA;IACvD,OAAO,cAAc,CACnB,QAAQ,EACR,GAAG,EAAE,CACH,IAAI,eAAe,CAAC;QAClB,SAAS,EAAE,SAAS;QACpB,MAAM,EAAE,SAAkB;QAC1B,OAAO,EAAE,EAAE;KACZ,CAAC,CACL,CAAA;AACH,CAAC"}
+{"version":3,"file":"tool-helpers.js","sourceRoot":"","sources":["../../../src/__fixtures__/tool-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAI3D;;;;;;;GAOG;AACH,MAAM,UAAU,iBAAiB,CAC/B,OAA8D,EAC9D,QAAoC,EACpC,eAAiC;IAEjC,OAAO;QACL,OAAO;QACP,KAAK,EAAE;YACL,EAAE,EAAE,YAAY;YAChB,QAAQ,EAAE,IAAI,UAAU,CAAC,QAAQ,CAAC;YAClC,QAAQ,EAAE,EAAE;YACZ,YAAY,EAAE,IAAI,YAAY,EAAE;YAChC,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAE,CAAC;SACC;QAC1B,eAAe,EAAE,eAAe,IAAI,EAAE;KACvC,CAAA;AACH,CAAC;AAOD;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,QAAsB;IACjE,OAAO;QACL,IAAI;QACJ,WAAW,EAAE,aAAa,IAAI,EAAE;QAChC,QAAQ,EAAE;YACR,IAAI;YACJ,WAAW,EAAE,aAAa,IAAI,EAAE;YAChC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE;SAChD;QACD,yCAAyC;QACzC,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ;YACpB,MAAM,MAAM,GAAG,QAAQ,EAAE,CAAA;YACzB,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,aAAa,IAAI,MAAM,EAAE,CAAC;gBACpF,mCAAmC;gBACnC,MAAM,GAAG,GAAG,MAAuD,CAAA;gBACnE,IAAI,IAAI,GAAG,KAAK,CAAA;gBAChB,OAAO,CAAC,IAAI,EAAE,CAAC;oBACb,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;oBAChD,IAAI,GAAG,MAAM,IAAI,KAAK,CAAA;oBACtB,IAAI,IAAI,EAAE,CAAC;wBACT,OAAO,KAAK,CAAA;oBACd,CAAC;gBACH,CAAC;gBACD,6DAA6D;gBAC7D,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;YACjD,CAAC;iBAAM,CAAC;gBACN,OAAO,MAAyB,CAAA;YAClC,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAa;IAC5C,MAAM,QAAQ,GAAG,IAAI,IAAI,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,CAAA;IACvD,OAAO,cAAc,CACnB,QAAQ,EACR,GAAG,EAAE,CACH,IAAI,eAAe,CAAC;QAClB,SAAS,EAAE,SAAS;QACpB,MAAM,EAAE,SAAkB;QAC1B,OAAO,EAAE,EAAE;KACZ,CAAC,CACL,CAAA;AACH,CAAC"}

package/dist/src/__tests__/mcp.test.js

@@ -1,8 +1,10 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { McpError, ErrorCode, ElicitRequestSchema, UrlElicitationRequiredError, } from '@modelcontextprotocol/sdk/types.js';
 import { McpClient } from '../mcp.js';
 import { McpTool } from '../tools/mcp-tool.js';
 import { JsonBlock } from '../types/messages.js';
+import { ImageBlock } from '../types/media.js';
 import { context, propagation, trace, TraceFlags } from '@opentelemetry/api';
 /**
  * Helper to create a mock async generator that yields a result message.
@@ -20,6 +22,7 @@ vi.mock('@modelcontextprotocol/sdk/client/index.js', () => ({
             close: vi.fn(),
             listTools: vi.fn(),
             callTool: vi.fn(),
+            setRequestHandler: vi.fn(),
             experimental: {
                 tasks: {
                     callToolStream: vi.fn(),
@@ -80,6 +83,22 @@ describe('MCP Integration', () => {
     afterEach(() => {
         vi.restoreAllMocks();
     });
+    function createElicitationClient(callback) {
+        const resultsLengthBefore = vi.mocked(Client).mock.results.length;
+        const elicitClient = new McpClient({
+            applicationName: 'TestApp',
+            transport: mockTransport,
+            elicitationCallback: callback,
+        });
+        const elicitSdkClientMock = vi.mocked(Client).mock.results[resultsLengthBefore].value;
+        return { elicitClient, elicitSdkClientMock };
+    }
+    async function connectAndGetElicitationHandler(callback) {
+        const { elicitClient, elicitSdkClientMock } = createElicitationClient(callback);
+        await elicitClient.connect();
+        const handler = elicitSdkClientMock.setRequestHandler.mock.calls[0][1];
+        return { handler, elicitSdkClientMock };
+    }
     describe('McpClient', () => {
         let client;
         let sdkClientMock;
@@ -91,7 +110,7 @@ describe('MCP Integration', () => {
             sdkClientMock = vi.mocked(Client).mock.results[0].value;
         });
         it('initializes SDK client with correct configuration', () => {
-            expect(Client).toHaveBeenCalledWith({ name: 'TestApp', version: '0.0.1' });
+            expect(Client).toHaveBeenCalledWith({ name: 'TestApp', version: '0.0.1' }, undefined);
         });
         it('injects trace context into tool arguments when active span exists', async () => {
             mockActiveSpan();
@@ -227,6 +246,88 @@ describe('MCP Integration', () => {
             expect(sdkClientMock.close).toHaveBeenCalled();
             expect(mockTransport.close).toHaveBeenCalled();
         });
+        it('registers elicitation handler before connecting when callback is provided', async () => {
+            const resultsLengthBefore = vi.mocked(Client).mock.results.length;
+            const callback = vi.fn();
+            const elicitClient = new McpClient({
+                applicationName: 'TestApp',
+                transport: mockTransport,
+                elicitationCallback: callback,
+            });
+            const elicitSdkClientMock = vi.mocked(Client).mock.results[resultsLengthBefore].value;
+            await elicitClient.connect();
+            expect(elicitSdkClientMock.setRequestHandler).toHaveBeenCalledWith(ElicitRequestSchema, expect.any(Function));
+            const setHandlerOrder = elicitSdkClientMock.setRequestHandler.mock.invocationCallOrder[0];
+            const connectOrder = elicitSdkClientMock.connect.mock.invocationCallOrder[0];
+            expect(setHandlerOrder).toBeLessThan(connectOrder);
+        });
+        it('does not register elicitation handler when no callback is provided', async () => {
+            await client.connect();
+            expect(sdkClientMock.setRequestHandler).not.toHaveBeenCalled();
+        });
+        it('passes elicitation capabilities to Client when callback is provided', () => {
+            const callback = vi.fn();
+            new McpClient({
+                applicationName: 'TestApp',
+                transport: mockTransport,
+                elicitationCallback: callback,
+            });
+            const lastCall = vi.mocked(Client).mock.calls.at(-1);
+            expect(lastCall[1]).toEqual({ capabilities: { elicitation: { form: {}, url: {} } } });
+        });
+        it('elicitation handler returns accepted result with content', async () => {
+            const callbackResult = { action: 'accept', content: { username: 'alice' } };
+            const callback = vi.fn().mockResolvedValue(callbackResult);
+            const { handler } = await connectAndGetElicitationHandler(callback);
+            const request = {
+                method: 'elicitation/create',
+                params: { message: 'Enter username', requestedSchema: { type: 'object' } },
+            };
+            const extra = { signal: new AbortController().signal };
+            const result = await handler(request, extra);
+            expect(callback).toHaveBeenCalledWith(extra, request.params);
+            expect(result).toEqual({ action: 'accept', content: { username: 'alice' } });
+        });
+        it.each([{ action: 'decline' }, { action: 'cancel' }])('elicitation handler returns $action result', async (callbackResult) => {
+            const callback = vi.fn().mockResolvedValue(callbackResult);
+            const { handler } = await connectAndGetElicitationHandler(callback);
+            const request = {
+                method: 'elicitation/create',
+                params: { message: 'Enter username', requestedSchema: { type: 'object' } },
+            };
+            const extra = { signal: new AbortController().signal };
+            const result = await handler(request, extra);
+            expect(callback).toHaveBeenCalledWith(extra, request.params);
+            expect(result).toEqual({ action: callbackResult.action });
+        });
+        it('elicitation handler works for URL mode params', async () => {
+            const callbackResult = { action: 'accept' };
+            const callback = vi.fn().mockResolvedValue(callbackResult);
+            const { handler } = await connectAndGetElicitationHandler(callback);
+            const request = {
+                method: 'elicitation/create',
+                params: {
+                    mode: 'url',
+                    message: 'Please authenticate',
+                    url: 'https://example.com/auth',
+                    elicitationId: 'elicit-123',
+                },
+            };
+            const extra = { signal: new AbortController().signal };
+            const result = await handler(request, extra);
+            expect(callback).toHaveBeenCalledWith(extra, request.params);
+            expect(result).toEqual({ action: 'accept' });
+        });
+        it('elicitation callback errors propagate', async () => {
+            const callback = vi.fn().mockRejectedValue(new Error('User cancelled'));
+            const { handler } = await connectAndGetElicitationHandler(callback);
+            const request = {
+                method: 'elicitation/create',
+                params: { message: 'Confirm?' },
+            };
+            const extra = { signal: new AbortController().signal };
+            await expect(handler(request, extra)).rejects.toThrow('User cancelled');
+        });
     });
     describe('McpTool', () => {
         const mockClientWrapper = { callTool: vi.fn() };
@@ -239,6 +340,7 @@ describe('MCP Integration', () => {
         const toolContext = {
             toolUse: { toolUseId: 'id-123', name: 'weather', input: { city: 'NYC' } },
             agent: {},
+            invocationState: {},
         };
         it('returns text results on success', async () => {
             vi.mocked(mockClientWrapper.callTool).mockResolvedValue({
@@ -285,6 +387,177 @@ describe('MCP Integration', () => {
             expect(result.status).toBe('error');
             expect(result.content[0].text).toContain('missing content array');
         });
+        it('maps MCP image content to ImageBlock', async () => {
+            // "iVBOR..." is a minimal base64 PNG prefix
+            const base64Data = 'iVBORw0KGgoAAAANSUhEUg==';
+            vi.mocked(mockClientWrapper.callTool).mockResolvedValue({
+                content: [{ type: 'image', data: base64Data, mimeType: 'image/png' }],
+            });
+            const result = await runTool(tool.stream(toolContext));
+            expect(result.status).toBe('success');
+            expect(result.content).toHaveLength(1);
+            const imageBlock = result.content[0];
+            expect(imageBlock).toBeInstanceOf(ImageBlock);
+            expect(imageBlock.format).toBe('png');
+            expect(imageBlock.source.type).toBe('imageSourceBytes');
+        });
+        it('falls back to JsonBlock for unsupported image mime type', async () => {
+            vi.mocked(mockClientWrapper.callTool).mockResolvedValue({
+                content: [{ type: 'image', data: 'abc123', mimeType: 'image/bmp' }],
+            });
+            const result = await runTool(tool.stream(toolContext));
+            expect(result.content[0]).toBeInstanceOf(JsonBlock);
+        });
+        it('falls back to JsonBlock for image content missing data', async () => {
+            vi.mocked(mockClientWrapper.callTool).mockResolvedValue({
+                content: [{ type: 'image', mimeType: 'image/png' }],
+            });
+            const result = await runTool(tool.stream(toolContext));
+            expect(result.content[0]).toBeInstanceOf(JsonBlock);
+        });
+        it('maps MCP text resource to TextBlock', async () => {
+            vi.mocked(mockClientWrapper.callTool).mockResolvedValue({
+                content: [
+                    { type: 'resource', resource: { uri: 'file:///doc.txt', text: 'hello world', mimeType: 'text/plain' } },
+                ],
+            });
+            const result = await runTool(tool.stream(toolContext));
+            expect(result.status).toBe('success');
+            expect(result.content[0].text).toBe('hello world');
+        });
+        it('maps MCP blob resource with image mime type to ImageBlock', async () => {
+            const base64Data = 'iVBORw0KGgoAAAANSUhEUg==';
+            vi.mocked(mockClientWrapper.callTool).mockResolvedValue({
+                content: [{ type: 'resource', resource: { uri: 'file:///img.png', blob: base64Data, mimeType: 'image/jpeg' } }],
+            });
+            const result = await runTool(tool.stream(toolContext));
+            expect(result.content[0]).toBeInstanceOf(ImageBlock);
+            expect(result.content[0].format).toBe('jpeg');
+        });
+        it('falls back to JsonBlock for blob resource with non-image mime type', async () => {
+            vi.mocked(mockClientWrapper.callTool).mockResolvedValue({
+                content: [
+                    { type: 'resource', resource: { uri: 'file:///doc.pdf', blob: 'abc123', mimeType: 'application/pdf' } },
+                ],
+            });
+            const result = await runTool(tool.stream(toolContext));
+            expect(result.content[0]).toBeInstanceOf(JsonBlock);
+        });
+        it('falls back to JsonBlock for resource with neither text nor blob', async () => {
+            vi.mocked(mockClientWrapper.callTool).mockResolvedValue({
+                content: [{ type: 'resource', resource: { uri: 'file:///unknown' } }],
+            });
+            const result = await runTool(tool.stream(toolContext));
+            expect(result.content[0]).toBeInstanceOf(JsonBlock);
+        });
+        it('handles mixed content types in a single result', async () => {
+            const base64Data = 'iVBORw0KGgoAAAANSUhEUg==';
+            vi.mocked(mockClientWrapper.callTool).mockResolvedValue({
+                content: [
+                    { type: 'text', text: 'Here is the image:' },
+                    { type: 'image', data: base64Data, mimeType: 'image/png' },
+                    { type: 'resource', resource: { uri: 'file:///notes.txt', text: 'Some notes' } },
+                ],
+            });
+            const result = await runTool(tool.stream(toolContext));
+            expect(result.content).toHaveLength(3);
+            expect(result.content[0].text).toBe('Here is the image:');
+            expect(result.content[1]).toBeInstanceOf(ImageBlock);
+            expect(result.content[2].text).toBe('Some notes');
+        });
+        it('surfaces elicitation data for McpError with code -32042', async () => {
+            const elicitations = [
+                {
+                    mode: 'url',
+                    message: 'Please authorize with GitHub',
+                    elicitationId: 'e-123',
+                    url: 'https://github.com/login/oauth/authorize?client_id=abc',
+                },
+            ];
+            const mcpError = new McpError(ErrorCode.UrlElicitationRequired, 'Authorization required', { elicitations });
+            vi.mocked(mockClientWrapper.callTool).mockRejectedValue(mcpError);
+            const result = await runTool(tool.stream(toolContext));
+            expect(result.status).toBe('error');
+            expect(result.content[0].text).toBe(`MCP Elicitation required: [${String(mcpError)}] with data ${JSON.stringify(elicitations)}`);
+        });
+        it('surfaces multiple elicitations for McpError with code -32042', async () => {
+            const elicitations = [
+                {
+                    mode: 'url',
+                    message: 'Authorize with GitHub',
+                    elicitationId: 'e-1',
+                    url: 'https://github.com/login/oauth/authorize',
+                },
+                {
+                    mode: 'url',
+                    message: 'Authorize with Google',
+                    elicitationId: 'e-2',
+                    url: 'https://accounts.google.com/o/oauth2/auth',
+                },
+            ];
+            const mcpError = new McpError(ErrorCode.UrlElicitationRequired, 'Authorization required', { elicitations });
+            vi.mocked(mockClientWrapper.callTool).mockRejectedValue(mcpError);
+            const result = await runTool(tool.stream(toolContext));
+            expect(result.status).toBe('error');
+            expect(result.content[0].text).toBe(`MCP Elicitation required: [${String(mcpError)}] with data ${JSON.stringify(elicitations)}`);
+        });
+        it('falls through to generic error for McpError -32042 with malformed data', async () => {
+            const mcpError = new McpError(ErrorCode.UrlElicitationRequired, 'Authorization required', {
+                unexpected: 'shape',
+            });
+            vi.mocked(mockClientWrapper.callTool).mockRejectedValue(mcpError);
+            const result = await runTool(tool.stream(toolContext));
+            expect(result.status).toBe('error');
+            expect(result.content[0].text).toBe('MCP error -32042: Authorization required');
+        });
+        it('surfaces elicitation data for UrlElicitationRequiredError', async () => {
+            const elicitations = [
+                {
+                    mode: 'url',
+                    message: 'Please authorize',
+                    elicitationId: 'e-1',
+                    url: 'https://example.com/auth',
+                },
+            ];
+            const error = new UrlElicitationRequiredError(elicitations, 'Auth required');
+            vi.mocked(mockClientWrapper.callTool).mockRejectedValue(error);
+            const result = await runTool(tool.stream(toolContext));
+            expect(result.status).toBe('error');
+            expect(result.content[0].text).toContain('MCP Elicitation required');
+            expect(result.content[0].text).toContain('https://example.com/auth');
+        });
+        it('falls through to generic error for McpError -32042 with undefined data', async () => {
+            const mcpError = new McpError(ErrorCode.UrlElicitationRequired, 'Auth required');
+            vi.mocked(mockClientWrapper.callTool).mockRejectedValue(mcpError);
+            const result = await runTool(tool.stream(toolContext));
+            expect(result.status).toBe('error');
+            expect(result.content[0].text).toBe('MCP error -32042: Auth required');
+        });
+        it('falls through to generic error for McpError -32042 with non-array elicitations', async () => {
+            const mcpError = new McpError(ErrorCode.UrlElicitationRequired, 'Auth required', {
+                elicitations: 'not-an-array',
+            });
+            vi.mocked(mockClientWrapper.callTool).mockRejectedValue(mcpError);
+            const result = await runTool(tool.stream(toolContext));
+            expect(result.status).toBe('error');
+            expect(result.content[0].text).toBe('MCP error -32042: Auth required');
+        });
+        it('falls through to generic error for McpError -32042 with empty elicitations', async () => {
+            const mcpError = new McpError(ErrorCode.UrlElicitationRequired, 'Auth required', {
+                elicitations: [],
+            });
+            vi.mocked(mockClientWrapper.callTool).mockRejectedValue(mcpError);
+            const result = await runTool(tool.stream(toolContext));
+            expect(result.status).toBe('error');
+            expect(result.content[0].text).toBe('MCP error -32042: Auth required');
+        });
+        it('falls through to generic error for McpError with a different code', async () => {
+            const mcpError = new McpError(ErrorCode.InvalidRequest, 'Bad request');
+            vi.mocked(mockClientWrapper.callTool).mockRejectedValue(mcpError);
+            const result = await runTool(tool.stream(toolContext));
+            expect(result.status).toBe('error');
+            expect(result.content[0].text).toBe('MCP error -32600: Bad request');
+        });
     });
 });
 //# sourceMappingURL=mcp.test.js.map