@mastra/mcp 0.11.2 → 0.11.3-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +18 -0
- package/dist/client/client.d.ts.map +1 -1
- package/dist/index.cjs +20 -6
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +20 -6
- package/dist/index.js.map +1 -1
- package/dist/server/server.d.ts.map +1 -1
- package/integration-tests/node_modules/.bin/vitest +2 -2
- package/integration-tests/package.json +1 -1
- package/integration-tests/src/server.test.ts +1 -1
- package/package.json +8 -7
- package/src/client/client.ts +16 -3
- package/src/server/server.ts +7 -4
- package/integration-tests/node_modules/.bin/mastra +0 -21
package/.turbo/turbo-build.log
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @mastra/mcp
|
|
2
2
|
|
|
3
|
+
## 0.11.3-alpha.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#7274](https://github.com/mastra-ai/mastra/pull/7274) [`ad78bfc`](https://github.com/mastra-ai/mastra/commit/ad78bfc4ea6a1fff140432bf4f638e01af7af668) Thanks [@epinzur](https://github.com/epinzur)! - "piped tracingContext through inngest and mcp packages"
|
|
8
|
+
|
|
9
|
+
- Updated dependencies [[`ab48c97`](https://github.com/mastra-ai/mastra/commit/ab48c979098ea571faf998a55d3a00e7acd7a715), [`ff89505`](https://github.com/mastra-ai/mastra/commit/ff895057c8c7e91a5535faef46c5e5391085ddfa), [`183dc95`](https://github.com/mastra-ai/mastra/commit/183dc95596f391b977bd1a2c050b8498dac74891), [`a1111e2`](https://github.com/mastra-ai/mastra/commit/a1111e24e705488adfe5e0a6f20c53bddf26cb22), [`61debef`](https://github.com/mastra-ai/mastra/commit/61debefd80ad3a7ed5737e19df6a23d40091689a), [`9beaeff`](https://github.com/mastra-ai/mastra/commit/9beaeffa4a97b1d5fd01a7f8af8708b16067f67c), [`9eee594`](https://github.com/mastra-ai/mastra/commit/9eee594e35e0ca2a650fcc33fa82009a142b9ed0), [`979912c`](https://github.com/mastra-ai/mastra/commit/979912cfd180aad53287cda08af771df26454e2c), [`7dcf4c0`](https://github.com/mastra-ai/mastra/commit/7dcf4c04f44d9345b1f8bc5d41eae3f11ac61611), [`ad78bfc`](https://github.com/mastra-ai/mastra/commit/ad78bfc4ea6a1fff140432bf4f638e01af7af668), [`0ce418a`](https://github.com/mastra-ai/mastra/commit/0ce418a1ccaa5e125d4483a9651b635046152569), [`8387952`](https://github.com/mastra-ai/mastra/commit/838795227b4edf758c84a2adf6f7fba206c27719), [`5eca5d2`](https://github.com/mastra-ai/mastra/commit/5eca5d2655788863ea0442a46c9ef5d3c6dbe0a8)]:
|
|
10
|
+
- @mastra/core@0.15.3-alpha.4
|
|
11
|
+
|
|
12
|
+
## 0.11.3-alpha.0
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- [#7114](https://github.com/mastra-ai/mastra/pull/7114) [`3e0153a`](https://github.com/mastra-ai/mastra/commit/3e0153adcf2309f3ffb01c9ac9e0f5adc0caa259) Thanks [@DanielSLew](https://github.com/DanielSLew)! - Fix mcp getTools when using Zod v4
|
|
17
|
+
|
|
18
|
+
- Updated dependencies [[`00c74e7`](https://github.com/mastra-ai/mastra/commit/00c74e73b1926be0d475693bb886fb67a22ff352), [`af90672`](https://github.com/mastra-ai/mastra/commit/af906722d8da28688882193b1e531026f9e2e81e), [`56041d0`](https://github.com/mastra-ai/mastra/commit/56041d018863a3da6b98c512e47348647c075fb3), [`5de1555`](https://github.com/mastra-ai/mastra/commit/5de15554d3d6695211945a36928f6657e76cddc9), [`1ed5a3e`](https://github.com/mastra-ai/mastra/commit/1ed5a3e19330374c4347a4237cd2f4b9ffb60376)]:
|
|
19
|
+
- @mastra/core@0.15.3-alpha.0
|
|
20
|
+
|
|
3
21
|
## 0.11.2
|
|
4
22
|
|
|
5
23
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAMtD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AAGzF,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,oDAAoD,CAAC;AAG/G,OAAO,KAAK,EACV,kBAAkB,EAClB,aAAa,EACb,YAAY,EACZ,eAAe,EACf,iBAAiB,EACjB,YAAY,EACb,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAKL,iCAAiC,EAMlC,MAAM,oCAAoC,CAAC;AAG5C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"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"}
|
package/dist/index.cjs
CHANGED
|
@@ -14,6 +14,7 @@ var types_js = require('@modelcontextprotocol/sdk/types.js');
|
|
|
14
14
|
var exitHook = require('exit-hook');
|
|
15
15
|
var zod = require('zod');
|
|
16
16
|
var zodFromJsonSchema = require('zod-from-json-schema');
|
|
17
|
+
var zodFromJsonSchemaV3 = require('zod-from-json-schema-v3');
|
|
17
18
|
var equal = require('fast-deep-equal');
|
|
18
19
|
var uuid = require('uuid');
|
|
19
20
|
var crypto$1 = require('crypto');
|
|
@@ -512,7 +513,12 @@ var InternalMastraMCPClient = class extends base.MastraBase {
|
|
|
512
513
|
}
|
|
513
514
|
try {
|
|
514
515
|
await $RefParser__default.default.dereference(inputSchema);
|
|
515
|
-
|
|
516
|
+
const jsonSchemaToConvert = "jsonSchema" in inputSchema ? inputSchema.jsonSchema : inputSchema;
|
|
517
|
+
if ("toJSONSchema" in zod.z) {
|
|
518
|
+
return zodFromJsonSchema.convertJsonSchemaToZod(jsonSchemaToConvert);
|
|
519
|
+
} else {
|
|
520
|
+
return zodFromJsonSchemaV3.convertJsonSchemaToZod(jsonSchemaToConvert);
|
|
521
|
+
}
|
|
516
522
|
} catch (error$1) {
|
|
517
523
|
let errorDetails;
|
|
518
524
|
if (error$1 instanceof Error) {
|
|
@@ -543,7 +549,12 @@ var InternalMastraMCPClient = class extends base.MastraBase {
|
|
|
543
549
|
}
|
|
544
550
|
try {
|
|
545
551
|
await $RefParser__default.default.dereference(outputSchema);
|
|
546
|
-
|
|
552
|
+
const jsonSchemaToConvert = "jsonSchema" in outputSchema ? outputSchema.jsonSchema : outputSchema;
|
|
553
|
+
if ("toJSONSchema" in zod.z) {
|
|
554
|
+
return zodFromJsonSchema.convertJsonSchemaToZod(jsonSchemaToConvert);
|
|
555
|
+
} else {
|
|
556
|
+
return zodFromJsonSchemaV3.convertJsonSchemaToZod(jsonSchemaToConvert);
|
|
557
|
+
}
|
|
547
558
|
} catch (error$1) {
|
|
548
559
|
let errorDetails;
|
|
549
560
|
if (error$1 instanceof Error) {
|
|
@@ -1851,12 +1862,12 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
|
|
|
1851
1862
|
inputSchema: zod.z.object({
|
|
1852
1863
|
message: zod.z.string().describe("The question or input for the agent.")
|
|
1853
1864
|
}),
|
|
1854
|
-
execute: async ({ context, runtimeContext }) => {
|
|
1865
|
+
execute: async ({ context, runtimeContext, tracingContext }) => {
|
|
1855
1866
|
this.logger.debug(
|
|
1856
1867
|
`Executing agent tool '${agentToolName}' for agent '${agent.name}' with message: "${context.message}"`
|
|
1857
1868
|
);
|
|
1858
1869
|
try {
|
|
1859
|
-
const response = await agent.generate(context.message, { runtimeContext });
|
|
1870
|
+
const response = await agent.generate(context.message, { runtimeContext, tracingContext });
|
|
1860
1871
|
return response;
|
|
1861
1872
|
} catch (error) {
|
|
1862
1873
|
this.logger.error(`Error executing agent tool '${agentToolName}' for agent '${agent.name}':`, error);
|
|
@@ -1869,6 +1880,7 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
|
|
|
1869
1880
|
logger: this.logger,
|
|
1870
1881
|
mastra: this.mastra,
|
|
1871
1882
|
runtimeContext: new runtimeContext.RuntimeContext(),
|
|
1883
|
+
tracingContext: {},
|
|
1872
1884
|
description: agentToolDefinition.description
|
|
1873
1885
|
};
|
|
1874
1886
|
const coreTool = utils.makeCoreTool(agentToolDefinition, options);
|
|
@@ -1913,14 +1925,14 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
|
|
|
1913
1925
|
id: workflowToolName,
|
|
1914
1926
|
description: `Run workflow '${workflowKey}'. Workflow description: ${workflowDescription}`,
|
|
1915
1927
|
inputSchema: workflow.inputSchema,
|
|
1916
|
-
execute: async ({ context, runtimeContext }) => {
|
|
1928
|
+
execute: async ({ context, runtimeContext, tracingContext }) => {
|
|
1917
1929
|
this.logger.debug(
|
|
1918
1930
|
`Executing workflow tool '${workflowToolName}' for workflow '${workflow.id}' with input:`,
|
|
1919
1931
|
context
|
|
1920
1932
|
);
|
|
1921
1933
|
try {
|
|
1922
1934
|
const run2 = workflow.createRun({ runId: runtimeContext?.get("runId") });
|
|
1923
|
-
const response = await run2.start({ inputData: context, runtimeContext });
|
|
1935
|
+
const response = await run2.start({ inputData: context, runtimeContext, tracingContext });
|
|
1924
1936
|
return response;
|
|
1925
1937
|
} catch (error) {
|
|
1926
1938
|
this.logger.error(
|
|
@@ -1936,6 +1948,7 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
|
|
|
1936
1948
|
logger: this.logger,
|
|
1937
1949
|
mastra: this.mastra,
|
|
1938
1950
|
runtimeContext: new runtimeContext.RuntimeContext(),
|
|
1951
|
+
tracingContext: {},
|
|
1939
1952
|
description: workflowToolDefinition.description
|
|
1940
1953
|
};
|
|
1941
1954
|
const coreTool = utils.makeCoreTool(workflowToolDefinition, options);
|
|
@@ -1974,6 +1987,7 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
|
|
|
1974
1987
|
const options = {
|
|
1975
1988
|
name: toolName,
|
|
1976
1989
|
runtimeContext: new runtimeContext.RuntimeContext(),
|
|
1990
|
+
tracingContext: {},
|
|
1977
1991
|
mastra: this.mastra,
|
|
1978
1992
|
logger: this.logger,
|
|
1979
1993
|
description: toolInstance?.description
|