Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.
TypeScript agentic-aiagentsaiai-agentsaiagentsdeveloper-toolsfunction-callinggpt-4javascriptjsllmllmopsmcppythonremote-mcp-serverssetypescript
feat(ts/e2e): add e2e tests for @composio/mastra + tool router + zod (v3, v4)
jkomyno00beaedb0e8d
diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 35dc3076d..0b012b04b 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -6,6 +6,9 @@ settings:catalogs:default:+ '@ai-sdk/openai':+ specifier: ^3.0.19+ version: 3.0.19'@arethetypeswrong/cli':specifier: ^0.18.2version: 0.18.2@@ -214,7 +217,7 @@ importers:version: 6.0.49([email protected])composio-core:specifier: ^0.5.39- version: 0.5.39(3053e361571666380203a2990eacf306)+ version: 0.5.39(9958f69effac5ea0e6101081f492dcab)hono:specifier: 'catalog:'version: 4.11.5@@ -422,6 +425,62 @@ importers:specifier: workspace:*version: link:../../../_utils+ ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v3:+ dependencies:+ '@ai-sdk/openai':+ specifier: 'catalog:'+ version: 3.0.19([email protected])+ '@composio/core':+ specifier: workspace:*+ version: link:../../../../packages/core+ '@composio/mastra':+ specifier: workspace:*+ version: link:../../../../packages/providers/mastra+ '@mastra/core':+ specifier: 'catalog:'+ version: 1.0.4(@cfworker/[email protected])(@standard-community/[email protected](@standard-schema/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected]))(@standard-community/[email protected](@standard-community/[email protected](@standard-schema/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected]))(@standard-schema/[email protected])([email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])+ '@mastra/mcp':+ specifier: ^1.0.0+ version: 1.0.0(@cfworker/[email protected])(@mastra/[email protected](@cfworker/[email protected])(@standard-community/[email protected](@standard-schema/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected]))(@standard-community/[email protected](@standard-community/[email protected](@standard-schema/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected]))(@standard-schema/[email protected])([email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])+ ai:+ specifier: 'catalog:'+ version: 6.0.49([email protected])+ zod:+ specifier: 3.25.76+ version: 3.25.76+ devDependencies:+ '@e2e-tests/utils':+ specifier: workspace:*+ version: link:../../../_utils++ ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v4:+ dependencies:+ '@ai-sdk/openai':+ specifier: 'catalog:'+ version: 3.0.19([email protected])+ '@composio/core':+ specifier: workspace:*+ version: link:../../../../packages/core+ '@composio/mastra':+ specifier: workspace:*+ version: link:../../../../packages/providers/mastra+ '@mastra/core':+ specifier: 'catalog:'+ version: 1.0.4(@cfworker/[email protected])(@standard-community/[email protected](@standard-schema/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected]))(@standard-community/[email protected](@standard-community/[email protected](@standard-schema/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected]))(@standard-schema/[email protected])([email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])+ '@mastra/mcp':+ specifier: ^1.0.0+ version: 1.0.0(@cfworker/[email protected])(@mastra/[email protected](@cfworker/[email protected])(@standard-community/[email protected](@standard-schema/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected]))(@standard-community/[email protected](@standard-community/[email protected](@standard-schema/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected]))(@standard-schema/[email protected])([email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])+ ai:+ specifier: 'catalog:'+ version: 6.0.49([email protected])+ zod:+ specifier: ^4.1.0+ version: 4.3.6+ devDependencies:+ '@e2e-tests/utils':+ specifier: workspace:*+ version: link:../../../_utils+ts/e2e-tests/runtimes/node/openai-zod4-compat:devDependencies:'@e2e-tests/utils':@@ -1447,6 +1506,12 @@ packages:peerDependencies:zod: ^3.25.76 || ^4.1.8+ '@ai-sdk/[email protected]':+ resolution: {integrity: sha512-qpMGKV6eYfW8IzErk/OppchQwVui3GPc4BEfg/sQGRzR89vf2Sa8qvSavXeZi5w/oUF56d+VtobwSH0FRooFCQ==}+ engines: {node: '>=18'}+ peerDependencies:+ zod: ^3.25.76 || ^4.1.8+'@ai-sdk/[email protected]':resolution: {integrity: sha512-fqhG+4sCVv8x7nFzYnFo19ryhAa3w096Kmc3hWxMQfW/TubPOmt3A6tYZhl4mUfQWWQMsuSkLrtjlWuXBVSGQA==}engines: {node: '>=18'}@@ -2985,6 +3050,13 @@ packages:'@mastra/core': '>=0.20.1-0 <0.25.0-0'zod: ^3.25.0 || ^4.0.0+ '@mastra/[email protected]':+ resolution: {integrity: sha512-g+N3L61Sq4dQGLjMlQmVAnAPVOi1fJHmSe+gJxamxTGJ/r8Tdl6Za0gOj4faSeDUAn2sim0dCz2FEDjXDvoDsQ==}+ engines: {node: '>=22.13.0'}+ peerDependencies:+ '@mastra/core': '>=1.0.0-0 <2.0.0-0'+ zod: ^3.25.0 || ^4.0.0+'@mastra/[email protected]':resolution: {integrity: sha512-jR5QsibhCO3lh2Vv3hNifd5XaKFnOV7ecduZyNxNg21Fw1+59ozpHkNtUAmDQW88uwvx/qHu1dKN/XtOhwWeyw==}engines: {node: '>=22.13.0'}@@ -4838,6 +4910,10 @@ packages:resolution: {integrity: sha512-Fqs7ChZm72y40wKjOFXBKg7nJZvQJmewP5/7LtePDdnah/+FH9Hp5sgMujSCMPXlxOAW2//1jrW9pnsY7o20vQ==}engines: {node: '>=18'}+ resolution: {integrity: sha512-LHebYV6wSOObiWC894M36qqoWbGWFDZFJnCAch+JUYTyI5EJAlF3Lhv9sqLKoUDjTj3X6SsIxwy41mw2AqFfdA==}+ engines: {node: '>=20'}+resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==}engines: {node: '>=12.0.0'}@@ -7230,6 +7306,13 @@ snapshots:'@ai-sdk/provider-utils': 2.2.8([email protected])zod: 4.3.6+ '@ai-sdk/[email protected]([email protected])':+ dependencies:+ '@ai-sdk/provider': 3.0.5+ '@ai-sdk/provider-utils': 4.0.9([email protected])+ '@vercel/oidc': 3.1.0+ zod: 3.25.76+'@ai-sdk/[email protected]([email protected])':dependencies:'@ai-sdk/provider': 3.0.5@@ -7269,6 +7352,18 @@ snapshots:'@ai-sdk/provider-utils': 4.0.9([email protected])zod: 4.3.6+ '@ai-sdk/[email protected]([email protected])':+ dependencies:+ '@ai-sdk/provider': 3.0.5+ '@ai-sdk/provider-utils': 4.0.9([email protected])+ zod: 3.25.76++ '@ai-sdk/[email protected]([email protected])':+ dependencies:+ '@ai-sdk/provider': 3.0.5+ '@ai-sdk/provider-utils': 4.0.9([email protected])+ zod: 4.3.6+'@ai-sdk/[email protected]([email protected])':dependencies:'@ai-sdk/provider': 1.1.3@@ -7325,6 +7420,13 @@ snapshots:eventsource-parser: 3.0.6zod: 4.3.6+ '@ai-sdk/[email protected]([email protected])':+ dependencies:+ '@ai-sdk/provider': 3.0.5+ '@standard-schema/spec': 1.1.0+ eventsource-parser: 3.0.6+ zod: 3.25.76+'@ai-sdk/[email protected]([email protected])':dependencies:'@ai-sdk/provider': 3.0.5@@ -8830,6 +8932,40 @@ snapshots:- hono- supports-color+ '@mastra/[email protected](@cfworker/[email protected])(@mastra/[email protected](@cfworker/[email protected])(@standard-community/[email protected](@standard-schema/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected]))(@standard-community/[email protected](@standard-community/[email protected](@standard-schema/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected]))(@standard-schema/[email protected])([email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])':+ dependencies:+ '@apidevtools/json-schema-ref-parser': 14.2.1(@types/[email protected])+ '@mastra/core': 1.0.4(@cfworker/[email protected])(@standard-community/[email protected](@standard-schema/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected]))(@standard-community/[email protected](@standard-community/[email protected](@standard-schema/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected]))(@standard-schema/[email protected])([email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])+ '@modelcontextprotocol/sdk': 1.25.3(@cfworker/[email protected])([email protected])([email protected])+ exit-hook: 5.0.1+ fast-deep-equal: 3.1.3+ uuid: 13.0.0+ zod: 3.25.76+ zod-from-json-schema: 0.5.2+ zod-from-json-schema-v3: [email protected]+ transitivePeerDependencies:+ - '@cfworker/json-schema'+ - '@types/json-schema'+ - hono+ - supports-color++ '@mastra/[email protected](@cfworker/[email protected])(@mastra/[email protected](@cfworker/[email protected])(@standard-community/[email protected](@standard-schema/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected]))(@standard-community/[email protected](@standard-community/[email protected](@standard-schema/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected]))(@standard-schema/[email protected])([email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])':+ dependencies:+ '@apidevtools/json-schema-ref-parser': 14.2.1(@types/[email protected])+ '@mastra/core': 1.0.4(@cfworker/[email protected])(@standard-community/[email protected](@standard-schema/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected]))(@standard-community/[email protected](@standard-community/[email protected](@standard-schema/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected]))(@standard-schema/[email protected])([email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])+ '@modelcontextprotocol/sdk': 1.25.3(@cfworker/[email protected])([email protected])([email protected])+ exit-hook: 5.0.1+ fast-deep-equal: 3.1.3+ uuid: 13.0.0+ zod: 4.3.6+ zod-from-json-schema: 0.5.2+ zod-from-json-schema-v3: [email protected]+ transitivePeerDependencies:+ - '@cfworker/json-schema'+ - '@types/json-schema'+ - hono+ - supports-color+'@mastra/[email protected]([email protected])':dependencies:json-schema-to-zod: 2.7.0@@ -9697,7 +9833,7 @@ snapshots:'@types/[email protected]':dependencies:- '@types/node': 20.19.30+ '@types/node': 24.10.9'@types/[email protected]':dependencies:@@ -9867,6 +10003,14 @@ snapshots:chai: 5.3.3tinyrainbow: 2.0.0+ '@vitest/[email protected]([email protected](@types/[email protected])([email protected])([email protected])([email protected]))':+ dependencies:+ '@vitest/spy': 3.2.4+ estree-walker: 3.0.3+ magic-string: 0.30.21+ optionalDependencies:+'@vitest/[email protected]([email protected](@types/[email protected])([email protected])([email protected])([email protected]))':dependencies:'@vitest/spy': 3.2.4@@ -9875,6 +10019,14 @@ snapshots:optionalDependencies:+ '@vitest/[email protected]([email protected](@types/[email protected])([email protected])([email protected])([email protected]))':+ dependencies:+ '@vitest/spy': 3.2.4+ estree-walker: 3.0.3+ magic-string: 0.30.21+ optionalDependencies:+'@vitest/[email protected]':dependencies:tinyrainbow: 2.0.0@@ -9904,7 +10056,7 @@ snapshots:sirv: 3.0.2tinyglobby: 0.2.15tinyrainbow: 2.0.0- vitest: 3.2.4(@types/[email protected])(@vitest/[email protected])([email protected])([email protected])([email protected])+ vitest: 3.2.4(@types/[email protected])(@vitest/[email protected])([email protected])([email protected])([email protected])'@vitest/[email protected]':dependencies:@@ -9942,6 +10094,14 @@ snapshots:dependencies:humanize-ms: 1.2.1+ dependencies:+ '@ai-sdk/gateway': 3.0.22([email protected])+ '@ai-sdk/provider': 3.0.5+ '@ai-sdk/provider-utils': 4.0.9([email protected])+ '@opentelemetry/api': 1.9.0+ zod: 3.25.76+dependencies:'@ai-sdk/gateway': 3.0.22([email protected])@@ -10285,9 +10445,9 @@ snapshots:core-util-is: 1.0.3esprima: 4.0.1- [email protected](3053e361571666380203a2990eacf306):+ [email protected](9958f69effac5ea0e6101081f492dcab):dependencies:- '@ai-sdk/openai': 3.0.18([email protected])+ '@ai-sdk/openai': 3.0.19([email protected])'@cloudflare/workers-types': 4.20260124.0'@composio/mcp': 1.0.3-0'@hey-api/client-axios': 0.2.12([email protected])@@ -10741,6 +10901,8 @@ snapshots:+ [email protected]: {}+@@ -13113,7 +13275,7 @@ snapshots:dependencies:'@types/chai': 5.2.3'@vitest/expect': 3.2.4- '@vitest/mocker': 3.2.4([email protected](@types/[email protected])([email protected])([email protected])([email protected]))+ '@vitest/mocker': 3.2.4([email protected](@types/[email protected])([email protected])([email protected])([email protected]))'@vitest/pretty-format': 3.2.4'@vitest/runner': 3.2.4'@vitest/snapshot': 3.2.4@@ -13197,7 +13359,7 @@ snapshots:dependencies:'@types/chai': 5.2.3'@vitest/expect': 3.2.4- '@vitest/mocker': 3.2.4([email protected](@types/[email protected])([email protected])([email protected])([email protected]))+ '@vitest/mocker': 3.2.4([email protected](@types/[email protected])([email protected])([email protected])([email protected]))'@vitest/pretty-format': 3.2.4'@vitest/runner': 3.2.4'@vitest/snapshot': 3.2.4diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yamlindex 261057985..cb6578649 100644--- a/pnpm-workspace.yaml+++ b/pnpm-workspace.yaml@@ -15,6 +15,7 @@ packages:- fern/snippets/*catalog:+ '@ai-sdk/openai': ^3.0.19'@arethetypeswrong/cli': ^0.18.2'@cloudflare/vitest-pool-workers': ^0.9.2'@cloudflare/workers-types': ^4.20250917.0diff --git a/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v3/README.md b/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v3/README.mdnew file mode 100644index 000000000..9e9fdee13--- /dev/null+++ b/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v3/README.md@@ -0,0 +1,24 @@+# @composio/mastra + Zod v3 Tool Router Test++Verifies that `@composio/mastra` works correctly with `[email protected]` in a Tool Router workflow.++## Why This Exists++Issue [#2109](https://github.com/ComposioHQ/composio/issues/2109) tracks Mastra integration support. The `@composio/mastra` provider must work with both Zod v3 and v4. This suite ensures:++- MastraProvider integrates correctly with Composio core+- MCP client can connect to Composio's Tool Router endpoint+- Mastra Agent can use Composio tools via MCP+- Structured output with Zod v3 schemas works correctly++## What It Tests++| Test | Description |+| -------------------- | -------------------------------------------------------- |+| Tool Router workflow | Creates session, connects MCP, runs agent with Zod v3 schema |++## Running++```bash+pnpm test:e2e+```diff --git a/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v3/e2e.test.ts b/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v3/e2e.test.tsnew file mode 100644index 000000000..bc6a7ca18--- /dev/null+++ b/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v3/e2e.test.ts@@ -0,0 +1,104 @@+/**+ * @composio/mastra + openai + zod 3+ *+ * Verifies that @composio/mastra works correctly with zod@3.+ *+ * See: https://github.com/ComposioHQ/composio/issues/2109.+ */++import { Composio } from '@composio/core';+import { MastraProvider } from '@composio/mastra';+import { MCPClient } from '@mastra/mcp';+import { Agent } from '@mastra/core/agent';+import { e2e } from '@e2e-tests/utils';+import { TIMEOUTS } from '@e2e-tests/utils/const';+import { describe, it, expect } from 'bun:test';+import { createOpenAI } from '@ai-sdk/openai';+import { stepCountIs } from 'ai';+import { z } from 'zod';++declare module 'bun' {+ interface Env {+ COMPOSIO_API_KEY: string;+ OPENAI_API_KEY: string;+ }+}++e2e(import.meta.url, {+ nodeVersions: ['current'],+ env: {+ COMPOSIO_API_KEY: Bun.env.COMPOSIO_API_KEY,+ OPENAI_API_KEY: Bun.env.OPENAI_API_KEY,+ },+ defineTests: () => {+ describe('@composio/mastra + openai + zod 4', () => {++ const composio = new Composio({+ apiKey: Bun.env.COMPOSIO_API_KEY,+ provider: new MastraProvider(),+ });++ it('should work with Tool Router', async () => {+ const session = await composio.create('default', {+ toolkits: ['hackernews'],+ manageConnections: true,+ tools: {+ hackernews: {+ enable: ['HACKERNEWS_GET_USER'],+ },+ },+ });++ const { mcp, sessionId } = session;+ expect(sessionId).toBeDefined();++ // Create a client with an HTTP server (tries Streamable HTTP, falls back to SSE)+ const mcpClient = new MCPClient({+ servers: {+ myHttpClient: {+ url: new URL(mcp.url),+ requestInit: {+ headers: mcp.headers,+ },+ },+ },+ });++ const tools = await mcpClient.listTools();+ const openai = createOpenAI({ apiKey: Bun.env.OPENAI_API_KEY });++ const hackernewsAgent = new Agent({+ id: 'test',+ name: 'test',+ instructions: `You're a helpful Hackernews agent, able to finding information about users.`,+ model: openai('gpt-5.1'),+ tools,+ });++ const result = await hackernewsAgent.generate('Look up user "pg", and tell me their karma score.', {+ structuredOutput: {+ schema: z.object({+ karma: z.number(),+ }),+ },+ stopWhen: stepCountIs(10),+ });++ const toolCalls = result.toolCalls.flatMap(toolCall =>+ toolCall.payload.toolName+ );+ const toolCount = Object.keys(tools).length;++ expect(toolCount).toBeGreaterThan(0);+ expect(toolCalls).toBeDefined();+ expect(result.error).toBeUndefined();+ expect(result.object).toBeDefined();+ expect(result.object.karma).toBeGreaterThan(150_000);++ await mcpClient.disconnect();+ }, {+ timeout: TIMEOUTS.LLM_SHORT,+ });+ });+ }+});diff --git a/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v3/package.json b/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v3/package.jsonnew file mode 100644index 000000000..f223456b2--- /dev/null+++ b/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v3/package.json@@ -0,0 +1,23 @@+{+ "name": "@e2e-tests/node-mastra-tool-router-zod-v3",+ "version": "0.0.0",+ "private": true,+ "type": "module",+ "scripts": {+ "typecheck": "tsc --noEmit",+ "test:e2e": "bun test e2e.test.ts",+ "test:e2e:node": "bun test e2e.test.ts"+ },+ "dependencies": {+ "@ai-sdk/openai": "catalog:",+ "@composio/core": "workspace:*",+ "@composio/mastra": "workspace:*",+ "@mastra/core": "catalog:",+ "@mastra/mcp": "^1.0.0",+ "ai": "catalog:",+ "zod": "3.25.76"+ },+ "devDependencies": {+ "@e2e-tests/utils": "workspace:*"+ }+}diff --git a/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v3/tsconfig.json b/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v3/tsconfig.jsonnew file mode 100644index 000000000..3eeaa418d--- /dev/null+++ b/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v3/tsconfig.json@@ -0,0 +1,12 @@+{+ "$schema": "https://json.schemastore.org/tsconfig",+ "compilerOptions": {+ "target": "es2022",+ "module": "esnext",+ "moduleResolution": "bundler",+ "strict": true,+ "skipLibCheck": true,+ "noEmit": true+ },+ "include": ["e2e.test.ts"]+}diff --git a/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v4/README.md b/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v4/README.mdnew file mode 100644index 000000000..9cd6c78ca--- /dev/null+++ b/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v4/README.md@@ -0,0 +1,24 @@+# @composio/mastra + Zod v4 Tool Router Test++Verifies that `@composio/mastra` works correctly with `zod@4` in a Tool Router workflow.++## Why This Exists++Issue [#2109](https://github.com/ComposioHQ/composio/issues/2109) tracks Mastra integration support. The `@composio/mastra` provider must work with both Zod v3 and v4. This suite ensures:++- MastraProvider integrates correctly with Composio core+- MCP client can connect to Composio's Tool Router endpoint+- Mastra Agent can use Composio tools via MCP+- Structured output with Zod v4 schemas works correctly++## What It Tests++| Test | Description |+| -------------------- | -------------------------------------------------------- |+| Tool Router workflow | Creates session, connects MCP, runs agent with Zod v4 schema |++## Running++```bash+pnpm test:e2e+```diff --git a/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v4/e2e.test.ts b/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v4/e2e.test.tsnew file mode 100644index 000000000..fd3ac1e0e--- /dev/null+++ b/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v4/e2e.test.ts@@ -0,0 +1,104 @@+/**+ * @composio/mastra + openai + zod 4+ *+ * Verifies that @composio/mastra works correctly with zod@4.+ *+ * See: https://github.com/ComposioHQ/composio/issues/2109.+ */++import { Composio } from '@composio/core';+import { MastraProvider } from '@composio/mastra';+import { MCPClient } from '@mastra/mcp';+import { Agent } from '@mastra/core/agent';+import { e2e } from '@e2e-tests/utils';+import { TIMEOUTS } from '@e2e-tests/utils/const';+import { describe, it, expect } from 'bun:test';+import { createOpenAI } from '@ai-sdk/openai';+import { stepCountIs } from 'ai';+import { z } from 'zod';++declare module 'bun' {+ interface Env {+ COMPOSIO_API_KEY: string;+ OPENAI_API_KEY: string;+ }+}++e2e(import.meta.url, {+ nodeVersions: ['current'],+ env: {+ COMPOSIO_API_KEY: Bun.env.COMPOSIO_API_KEY,+ OPENAI_API_KEY: Bun.env.OPENAI_API_KEY,+ },+ defineTests: () => {+ describe('@composio/mastra + openai + zod 4', () => {++ const composio = new Composio({+ apiKey: Bun.env.COMPOSIO_API_KEY,+ provider: new MastraProvider(),+ });++ it('should work with Tool Router', async () => {+ const session = await composio.create('default', {+ toolkits: ['hackernews'],+ manageConnections: true,+ tools: {+ hackernews: {+ enable: ['HACKERNEWS_GET_USER'],+ },+ },+ });++ const { mcp, sessionId } = session;+ expect(sessionId).toBeDefined();++ // Create a client with an HTTP server (tries Streamable HTTP, falls back to SSE)+ const mcpClient = new MCPClient({+ servers: {+ myHttpClient: {+ url: new URL(mcp.url),+ requestInit: {+ headers: mcp.headers,+ },+ },+ },+ });++ const tools = await mcpClient.listTools();+ const openai = createOpenAI({ apiKey: Bun.env.OPENAI_API_KEY });++ const hackernewsAgent = new Agent({+ id: 'test',+ name: 'test',+ instructions: `You're a helpful Hackernews agent, able to finding information about users.`,+ model: openai('gpt-5.1'),+ tools,+ });++ const result = await hackernewsAgent.generate('Look up user "pg", and tell me their karma score.', {+ structuredOutput: {+ schema: z.object({+ karma: z.number(),+ }),+ },+ stopWhen: stepCountIs(10),+ });++ const toolCalls = result.toolCalls.flatMap(toolCall =>+ toolCall.payload.toolName+ );+ const toolCount = Object.keys(tools).length;++ expect(toolCount).toBeGreaterThan(0);+ expect(toolCalls).toBeDefined();+ expect(result.error).toBeUndefined();+ expect(result.object).toBeDefined();+ expect(result.object.karma).toBeGreaterThan(150_000);++ await mcpClient.disconnect();+ }, {+ timeout: TIMEOUTS.LLM_SHORT,+ });+ });+ }+});diff --git a/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v4/package.json b/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v4/package.jsonnew file mode 100644index 000000000..420773f9c--- /dev/null+++ b/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v4/package.json@@ -0,0 +1,23 @@+{+ "name": "@e2e-tests/node-mastra-tool-router-zod-v4",+ "version": "0.0.0",+ "private": true,+ "type": "module",+ "scripts": {+ "typecheck": "tsc --noEmit",+ "test:e2e": "bun test e2e.test.ts",+ "test:e2e:node": "bun test e2e.test.ts"+ },+ "dependencies": {+ "@ai-sdk/openai": "catalog:",+ "@composio/core": "workspace:*",+ "@composio/mastra": "workspace:*",+ "@mastra/core": "catalog:",+ "@mastra/mcp": "^1.0.0",+ "ai": "catalog:",+ "zod": "^4.1.0"+ },+ "devDependencies": {+ "@e2e-tests/utils": "workspace:*"+ }+}diff --git a/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v4/tsconfig.json b/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v4/tsconfig.jsonnew file mode 100644index 000000000..3eeaa418d--- /dev/null+++ b/ts/e2e-tests/runtimes/node/mastra-tool-router-zod-v4/tsconfig.json@@ -0,0 +1,12 @@+{+ "$schema": "https://json.schemastore.org/tsconfig",+ "compilerOptions": {+ "target": "es2022",+ "module": "esnext",+ "moduleResolution": "bundler",+ "strict": true,+ "skipLibCheck": true,+ "noEmit": true+ },+ "include": ["e2e.test.ts"]+}