@mastra/mcp 2.8.0-alpha.1 → 2.8.0-alpha.2
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/dist/client/client.d.ts +6 -1
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/index.d.ts +1 -1
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/tasks/suspend.d.ts +25 -0
- package/dist/client/tasks/suspend.d.ts.map +1 -0
- package/dist/client/tasks/wait.d.ts +14 -0
- package/dist/client/tasks/wait.d.ts.map +1 -1
- package/dist/client/types.d.ts +30 -0
- package/dist/client/types.d.ts.map +1 -1
- package/dist/docs/SKILL.md +1 -1
- package/dist/docs/assets/SOURCE_MAP.json +1 -1
- package/dist/docs/references/reference-tools-mcp-client.md +45 -1
- package/dist/docs/references/reference-tools-mcp-server.md +67 -0
- package/dist/index.cjs +323 -16
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +323 -16
- package/dist/index.js.map +1 -1
- package/dist/server/model-output-to-mcp.d.ts +14 -0
- package/dist/server/model-output-to-mcp.d.ts.map +1 -0
- package/dist/server/server.d.ts +14 -1
- package/dist/server/server.d.ts.map +1 -1
- package/dist/server/types.d.ts +31 -1
- package/dist/server/types.d.ts.map +1 -1
- package/package.json +7 -7
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { ContentBlock } from '@modelcontextprotocol/server';
|
|
2
|
+
/** MCP content built from a tool's `toModelOutput` value. */
|
|
3
|
+
export interface McpToolContent {
|
|
4
|
+
content: ContentBlock[];
|
|
5
|
+
isError: boolean;
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* Maps the value a Mastra tool's `toModelOutput` returns (an AI SDK tool-result output such as
|
|
9
|
+
* `{ type: 'text' }`, `{ type: 'json' }` or `{ type: 'content', value: [...] }`) to MCP content blocks.
|
|
10
|
+
*
|
|
11
|
+
* Returns `undefined` for any other shape, meaning the caller keeps its default result.
|
|
12
|
+
*/
|
|
13
|
+
export declare function modelOutputToMcpContent(value: unknown, toolName: string): McpToolContent | undefined;
|
|
14
|
+
//# sourceMappingURL=model-output-to-mcp.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model-output-to-mcp.d.ts","sourceRoot":"","sources":["../../src/server/model-output-to-mcp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEjE,6DAA6D;AAC7D,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;CAClB;AAID;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAoBpG"}
|
package/dist/server/server.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ import { ServerPromptActions, ServerResourceActions, ServerToolActions } from '.
|
|
|
10
10
|
import { ServerEventActions } from './events/actions.js';
|
|
11
11
|
import type { MCPServerEventDefinition, MCPServerEventsOptions } from './events/types.js';
|
|
12
12
|
import type { MCPServerTasksOptions } from './tasks/config.js';
|
|
13
|
-
import type { AppResources, MCPServerCacheHints, MCPServerHTTPRequestOptions, MCPServerPrompts, MCPServerRequestStateOptions, MCPServerResources } from './types.js';
|
|
13
|
+
import type { AppResources, MCPServerCacheHints, MCPServerHTTPRequestOptions, MCPServerPrompts, MCPServerRequestStateOptions, MCPServerResources, MCPServerToolResultOptions } from './types.js';
|
|
14
14
|
export interface MCPServerConfig extends CoreMCPServerConfig {
|
|
15
15
|
resources?: MCPServerResources;
|
|
16
16
|
prompts?: MCPServerPrompts;
|
|
@@ -52,6 +52,11 @@ export interface MCPServerConfig extends CoreMCPServerConfig {
|
|
|
52
52
|
* (suspend/resume, `subscriptions/listen`, events) are not available to these clients.
|
|
53
53
|
*/
|
|
54
54
|
legacy?: 'reject' | 'stateless';
|
|
55
|
+
/**
|
|
56
|
+
* How a tool's return value becomes the result an MCP client receives: build it from the tool's
|
|
57
|
+
* `toModelOutput` (`modelOutput`), and rewrite it before it is sent (`transform`).
|
|
58
|
+
*/
|
|
59
|
+
toolResult?: MCPServerToolResultOptions;
|
|
55
60
|
}
|
|
56
61
|
export interface MCPServerHTTPOptions {
|
|
57
62
|
url: URL;
|
|
@@ -125,6 +130,7 @@ export declare class MCPServer extends MCPServerBase {
|
|
|
125
130
|
private tasksInspector;
|
|
126
131
|
private readonly webhooks?;
|
|
127
132
|
private readonly legacy;
|
|
133
|
+
private readonly toolResultOptions;
|
|
128
134
|
private readonly tasks;
|
|
129
135
|
/** Where tasks are kept: `tasks.store`, or the store picked on first use. */
|
|
130
136
|
private readonly taskStore;
|
|
@@ -256,6 +262,7 @@ export declare class MCPServer extends MCPServerBase {
|
|
|
256
262
|
* workflow run started under `opened`) as attempt 1 of its task: the attempt span ends with that run.
|
|
257
263
|
*/
|
|
258
264
|
private tracedInitialAttempt;
|
|
265
|
+
/** Never rejects: a failure building the result completes the task with the tool error result. */
|
|
259
266
|
private toTaskOutcome;
|
|
260
267
|
/** A tool that throws inside a task completes it with `isError`, as a synchronous call would answer. */
|
|
261
268
|
private toolErrorOutcome;
|
|
@@ -298,6 +305,12 @@ export declare class MCPServer extends MCPServerBase {
|
|
|
298
305
|
* carried between rounds.
|
|
299
306
|
*/
|
|
300
307
|
private runTool;
|
|
308
|
+
/**
|
|
309
|
+
* The result of a tool call that completed: the default result, built from `toModelOutput` when
|
|
310
|
+
* `toolResult.modelOutput` is on, then passed through `toolResult.transform`. Throws what
|
|
311
|
+
* `toModelOutput` or `transform` throw.
|
|
312
|
+
*/
|
|
313
|
+
private completedToolResult;
|
|
301
314
|
private toCallToolResult;
|
|
302
315
|
private registerResourceHandlers;
|
|
303
316
|
private resourceContents;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,IAAI,MAAM,WAAW,CAAC;AACvC,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE5D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EACV,eAAe,IAAI,mBAAmB,EACtC,kBAAkB,EAClB,wBAAwB,EAExB,kBAAkB,EAClB,uBAAuB,EACvB,wBAAwB,EACxB,gBAAgB,EAChB,UAAU,EACX,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAyB,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAIrF,OAAO,KAAK,EAAE,gBAAgB,EAA2B,WAAW,EAAc,MAAM,oBAAoB,CAAC;AAG7G,OAAO,KAAK,EAAkB,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAmBvE,OAAO,KAAK,EAWV,QAAQ,EAMR,mBAAmB,EACpB,MAAM,8BAA8B,CAAC;AAWtC,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAItD,OAAO,KAAK,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,IAAI,MAAM,WAAW,CAAC;AACvC,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE5D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EACV,eAAe,IAAI,mBAAmB,EACtC,kBAAkB,EAClB,wBAAwB,EAExB,kBAAkB,EAClB,uBAAuB,EACvB,wBAAwB,EACxB,gBAAgB,EAChB,UAAU,EACX,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAyB,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAIrF,OAAO,KAAK,EAAE,gBAAgB,EAA2B,WAAW,EAAc,MAAM,oBAAoB,CAAC;AAG7G,OAAO,KAAK,EAAkB,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAmBvE,OAAO,KAAK,EAWV,QAAQ,EAMR,mBAAmB,EACpB,MAAM,8BAA8B,CAAC;AAWtC,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAItD,OAAO,KAAK,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAgBvF,OAAO,KAAK,EAAE,qBAAqB,EAA6C,MAAM,gBAAgB,CAAC;AAyBvG,OAAO,KAAK,EACV,YAAY,EAEZ,mBAAmB,EACnB,2BAA2B,EAC3B,gBAAgB,EAEhB,4BAA4B,EAC5B,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,eAAgB,SAAQ,mBAAmB;IAC1D,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,+DAA+D;IAC/D,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,uFAAuF;IACvF,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,oEAAoE;IACpE,YAAY,CAAC,EAAE,4BAA4B,CAAC;IAC5C;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAClD;;;;OAIG;IACH,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,qBAAqB,CAAC;IAC9B;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC;IAChC;;;OAGG;IACH,UAAU,CAAC,EAAE,0BAA0B,CAAC;CACzC;AAED,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC;IAC1B,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC/C,OAAO,CAAC,EAAE,2BAA2B,CAAC;CACvC;AAOD,4FAA4F;AAC5F,KAAK,QAAQ,GAAG;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC,CAAC;AAmCF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qBAAa,SAAU,SAAQ,aAAa;IAC1C,SAAkB,UAAU,EAAG,CAAC,CAAU;IAE1C,QAAQ,CAAC,SAAS,EAAE,qBAAqB,CAAC;IAC1C,QAAQ,CAAC,OAAO,EAAE,mBAAmB,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IACxC;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAEpC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAqB;IACtD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAmB;IAClD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6B;IAC7D,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAsB;IAC3D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAsB;IAClD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAA0B;IAC7D,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAqB;IAC1C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA0C;IAC5E,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IACpD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyB;IACvD,OAAO,CAAC,eAAe,CAAuC;IAC9D,OAAO,CAAC,cAAc,CAAsC;IAC5D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAoB;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyB;IAChD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA6B;IAC/D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAsB;IAC5C,6EAA6E;IAC7E,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAe;IACzC,8FAA8F;IAC9F,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiC;IAC/D,+FAA+F;IAC/F,OAAO,CAAC,mBAAmB,CAAC,CAA6B;IAEzD,OAAO,CAAC,WAAW,CAAC,CAAiB;IACrC,OAAO,CAAC,WAAW,CAAC,CAAwB;IAC5C,OAAO,CAAC,WAAW,CAAC,CAAoB;IACxC,OAAO,CAAC,aAAa,CAAC,CAAS;IAE/B,YAAY,MAAM,EAAE,eAAe,EA6ClC;IAED,OAAO,CAAC,uBAAuB;IAc/B,YAAY,CACV,KAAK,EAAE,UAAU,EACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC9B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GACnC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAoGlC;IAED;;;;OAIG;IACH,OAAO,CAAC,uBAAuB;IAc/B,oGAAoG;IACpG,OAAO,CAAC,iBAAiB;IAMzB;;;OAGG;IACH,OAAO,CAAC,UAAU;IAQlB;;;;;OAKG;IACH,OAAO,CAAC,UAAU;IAalB,OAAO,CAAC,QAAQ;IAchB,OAAO,CAAC,WAAW;IAsBnB,yFAAyF;IACzF,OAAO,CAAC,aAAa;IAIrB,iGAAiG;IACjG,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,cAAc;IAMtB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,QAAQ;IAchB,2EAA2E;IAC3E,OAAO,CAAC,SAAS;IAiBjB,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,YAAY;IAuBpB;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,oBAAoB;IAuD5B;;;;OAIG;YACW,kBAAkB;IAwBhC;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAoDxB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAyDxB;;;;OAIG;YACW,YAAY;IA2C1B;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAMrB,2FAA2F;YAC7E,aAAa;IAoB3B,+DAA+D;IAC/D,OAAO,CAAC,gBAAgB;YAcV,aAAa;IAoC3B,OAAO,CAAC,oBAAoB;IAkG5B,yEAAyE;IACzE,OAAO,CAAC,SAAS;IAkBjB;;;;OAIG;YACW,mBAAmB;IA2EjC;;;;OAIG;YACW,aAAa;IAyC3B,+DAA+D;IAC/D,OAAO,CAAC,yBAAyB;IAYjC,sGAAsG;YACxF,UAAU;IAgBxB;;;;OAIG;IACH,OAAO,CAAC,YAAY;IA2DpB;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAgCpB,oFAAoF;YACtE,cAAc;IAoC5B;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAuB5B,kGAAkG;YACpF,aAAa;IAgC3B,wGAAwG;IACxG,OAAO,CAAC,gBAAgB;IAWxB;;;OAGG;YACW,iBAAiB;IAuI/B,2FAA2F;IAC3F,OAAO,CAAC,mBAAmB;IAoB3B;;;OAGG;IACH,OAAO,CAAC,gBAAgB;YAmCV,iBAAiB;IA0D/B;;;OAGG;YACW,gBAAgB;IA0B9B;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAkC1B;;;;;;OAMG;YACW,iBAAiB;IAc/B,OAAO,CAAC,WAAW;IAInB;;;;OAIG;YACW,OAAO;IAqCrB;;;;OAIG;YACW,mBAAmB;IAwBjC,OAAO,CAAC,gBAAgB;IA6BxB,OAAO,CAAC,wBAAwB;IAkEhC,OAAO,CAAC,gBAAgB;IAexB,OAAO,CAAC,sBAAsB;IAwD9B,OAAO,CAAC,gBAAgB;YAqBV,uBAAuB;IAcrC;;;;OAIG;YACW,YAAY;YAsBZ,qBAAqB;IAqBnC,OAAO,CAAC,QAAQ;IAahB,OAAO,CAAC,cAAc;IAatB,wEAAwE;IAClE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAYhC;IAED;;;;OAIG;IACG,SAAS,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsCzF;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAsB3B;IAED,mHAAmH;IACnH,OAAO,CAAC,WAAW,CAAS;IAEnB,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAG9D;IAED,gBAAgB;IACP,gBAAgB,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAexF;IAED;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IAuBlC;;;OAGG;YACW,eAAe;IAmC7B,aAAa,IAAI,UAAU,CAQ1B;IAED,eAAe,IAAI,gBAAgB,CAOlC;IAED,eAAe,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG;QAAE,KAAK,EAAE,QAAQ,EAAE,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,QAAQ,EAAE,CAAA;KAAE,CAAC,CAQvG;IAED,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAGhD;IAED;;;;OAIG;IACG,WAAW,CACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,EACb,gBAAgB,GAAE,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAM,GACjE,OAAO,CAAC,wBAAwB,CAAC,CAsDnC;IAED,uFAAuF;IACjF,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;QACvC,QAAQ,EAAE,KAAK,CAAC;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;SAAE,CAAC,CAAC;KACpH,CAAC,CAaD;IAED,qFAAqF;IAC/E,aAAa,IAAI,OAAO,CAAC;QAAE,SAAS,EAAE,QAAQ,EAAE,CAAA;KAAE,CAAC,CAExD;IAED;;;OAGG;IACH,aAAa,IAAI;QAAE,MAAM,EAAE,kBAAkB,EAAE,CAAA;KAAE,GAAG,SAAS,CAG5D;IAED;;;;OAIG;IACH,kBAAkB,IAAI,wBAAwB,GAAG,SAAS,CAIzD;IAED;;;;OAIG;IACH,YAAY,IAAI,kBAAkB,GAAG,SAAS,CAG7C;IAED;;;;;OAKG;IACH,iBAAiB,IAAI,uBAAuB,GAAG,SAAS,CAOvD;IAED,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,UAAU;CASnB;AA6GD,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,CAAC"}
|
package/dist/server/types.d.ts
CHANGED
|
@@ -3,13 +3,43 @@ import type { RequestContext } from '@mastra/core/request-context';
|
|
|
3
3
|
import type { StandardSchemaWithJSON } from '@mastra/core/schema';
|
|
4
4
|
import type { MCPServerContext } from '@mastra/core/tools';
|
|
5
5
|
import type { McpUiResourceMeta } from '@modelcontextprotocol/ext-apps';
|
|
6
|
-
import type { CacheHint, InputRequiredResult, Prompt, PromptMessage, Resource, ResourceTemplateType } from '@modelcontextprotocol/server';
|
|
6
|
+
import type { CacheHint, CallToolResult, InputRequiredResult, Prompt, PromptMessage, Resource, ResourceTemplateType } from '@modelcontextprotocol/server';
|
|
7
7
|
/** The only protocol revision `@mastra/mcp` serves. */
|
|
8
8
|
export declare const MCP_PROTOCOL_VERSION: '2026-07-28';
|
|
9
9
|
/** Operations whose results can advertise cache hints. */
|
|
10
10
|
export type MCPServerCacheableMethod = 'tools/list' | 'prompts/list' | 'resources/list' | 'resources/templates/list' | 'resources/read' | 'server/discover';
|
|
11
11
|
/** Cache hints (`ttlMs` / `cacheScope`) advertised on cacheable results, keyed by operation. */
|
|
12
12
|
export type MCPServerCacheHints = Partial<Record<MCPServerCacheableMethod, CacheHint>>;
|
|
13
|
+
/** What `MCPServerToolResultOptions.transform` receives for a tool call that completed. */
|
|
14
|
+
export interface MCPServerToolResultContext {
|
|
15
|
+
/** The name the tool is served under, e.g. `readFile` or `ask_researcher`. */
|
|
16
|
+
toolName: string;
|
|
17
|
+
/** The value the tool returned. */
|
|
18
|
+
output: unknown;
|
|
19
|
+
/** The result the server would send, after `modelOutput` mapping when it is on. */
|
|
20
|
+
result: CallToolResult;
|
|
21
|
+
/** The request context the tool ran with. */
|
|
22
|
+
requestContext: RequestContext;
|
|
23
|
+
}
|
|
24
|
+
/** Controls how a tool's return value becomes the `CallToolResult` an MCP client receives. */
|
|
25
|
+
export interface MCPServerToolResultOptions {
|
|
26
|
+
/**
|
|
27
|
+
* Build the result content from each tool's `toModelOutput`, the same output a Mastra agent
|
|
28
|
+
* sends to its model. Text becomes text blocks, image and audio media become `image` and `audio`
|
|
29
|
+
* blocks, and other media become embedded resources. Tools with an `outputSchema` keep their
|
|
30
|
+
* `structuredContent` and JSON text block; the mapped blocks follow it.
|
|
31
|
+
*
|
|
32
|
+
* Defaults to `false`: the output is sent as JSON text. The default becomes `true` in the next
|
|
33
|
+
* major version; set `false` explicitly to keep today's output.
|
|
34
|
+
*/
|
|
35
|
+
modelOutput?: boolean;
|
|
36
|
+
/**
|
|
37
|
+
* Rewrites the result of every tool call that completed, including agent and workflow tools,
|
|
38
|
+
* before it is sent. Return `undefined` to keep `result`. Not called for thrown errors or for
|
|
39
|
+
* workflow tasks. If it throws, the client receives the tool error result.
|
|
40
|
+
*/
|
|
41
|
+
transform?: (context: MCPServerToolResultContext) => CallToolResult | undefined | Promise<CallToolResult | undefined>;
|
|
42
|
+
}
|
|
13
43
|
/**
|
|
14
44
|
* Protocol context handed to resource and prompt callbacks: the same object tools
|
|
15
45
|
* receive as `context.mcp.extra` (cancellation signal, request id, `_meta`, auth).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/server/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/server/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mastra/mcp",
|
|
3
|
-
"version": "2.8.0-alpha.
|
|
3
|
+
"version": "2.8.0-alpha.2",
|
|
4
4
|
"description": "",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -43,18 +43,18 @@
|
|
|
43
43
|
"zod": "^4.2.0"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
|
-
"@ai-sdk/openai-v5": "npm:@ai-sdk/openai@2.0.
|
|
46
|
+
"@ai-sdk/openai-v5": "npm:@ai-sdk/openai@2.0.139",
|
|
47
47
|
"@copilotkit/aimock": "^1.46.0",
|
|
48
48
|
"@mendable/firecrawl-js": "^1.29.3",
|
|
49
49
|
"@modelcontextprotocol/conformance": "0.2.0-alpha.12",
|
|
50
50
|
"@types/node": "22.19.15",
|
|
51
51
|
"@types/semver": "^7.8.0",
|
|
52
|
-
"@vitest/coverage-v8": "
|
|
53
|
-
"@vitest/ui": "
|
|
52
|
+
"@vitest/coverage-v8": "5.1.0",
|
|
53
|
+
"@vitest/ui": "5.1.0",
|
|
54
54
|
"semver": "^7.8.5",
|
|
55
55
|
"tsdown": "0.23.1",
|
|
56
56
|
"typescript": "^7.0.2",
|
|
57
|
-
"vitest": "
|
|
57
|
+
"vitest": "5.1.0",
|
|
58
58
|
"zod": "^4.6.7",
|
|
59
59
|
"zod-to-json-schema": "^3.25.2",
|
|
60
60
|
"@internal/ai-sdk-v5": "0.0.94",
|
|
@@ -62,8 +62,8 @@
|
|
|
62
62
|
"@internal/llm-recorder": "0.0.83",
|
|
63
63
|
"@internal/test-utils": "0.0.83",
|
|
64
64
|
"@internal/types-builder": "0.0.122",
|
|
65
|
-
"@mastra/core": "1.82.0-alpha.
|
|
66
|
-
"@mastra/libsql": "1.29.0-alpha.
|
|
65
|
+
"@mastra/core": "1.82.0-alpha.3",
|
|
66
|
+
"@mastra/libsql": "1.29.0-alpha.2",
|
|
67
67
|
"@mastra/observability": "1.23.1-alpha.1",
|
|
68
68
|
"@mastra/schema-compat": "1.3.17"
|
|
69
69
|
},
|