@mastra/mcp 1.4.1-alpha.0 → 1.4.2-alpha.0
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/CHANGELOG.md +22 -0
- package/dist/client/client.d.ts +0 -15
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/configuration.d.ts +3 -0
- package/dist/client/configuration.d.ts.map +1 -1
- package/dist/client/error-utils.d.ts +2 -0
- package/dist/client/error-utils.d.ts.map +1 -0
- package/dist/docs/SKILL.md +1 -1
- package/dist/docs/assets/SOURCE_MAP.json +1 -1
- package/dist/index.cjs +35 -26
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +35 -26
- package/dist/index.js.map +1 -1
- package/package.json +8 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# @mastra/mcp
|
|
2
2
|
|
|
3
|
+
## 1.4.2-alpha.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Improved MCP tool discovery to retry once after reconnectable connection errors like `Connection closed` during `tools/list`. ([#15141](https://github.com/mastra-ai/mastra/pull/15141))
|
|
8
|
+
|
|
9
|
+
`MCPClient.listToolsets()`, `listToolsetsWithErrors()`, and `listTools()` now attempt a reconnect before treating transient discovery failures as missing tools.
|
|
10
|
+
|
|
11
|
+
- Updated dependencies [[`153e864`](https://github.com/mastra-ai/mastra/commit/153e86476b425db7cd0dc8490050096e92964a38)]:
|
|
12
|
+
- @mastra/core@1.23.1-alpha.0
|
|
13
|
+
|
|
14
|
+
## 1.4.1
|
|
15
|
+
|
|
16
|
+
### Patch Changes
|
|
17
|
+
|
|
18
|
+
- Standardized all logger calls across the codebase to use static string messages with structured data objects. Dynamic values are now passed as key-value pairs in the second argument instead of being interpolated into template literal strings. This improves log filterability and searchability in observability storage. ([#14899](https://github.com/mastra-ai/mastra/pull/14899))
|
|
19
|
+
|
|
20
|
+
Removed ~150 redundant or noisy log calls including duplicate error logging after trackException and verbose in-memory storage CRUD traces.
|
|
21
|
+
|
|
22
|
+
- Updated dependencies [[`cbeec24`](https://github.com/mastra-ai/mastra/commit/cbeec24b3c97a1a296e7e461e66cc7f7d215dc50), [`cee146b`](https://github.com/mastra-ai/mastra/commit/cee146b5d858212e1df2b2730fc36d3ceda0e08d), [`aa0aeff`](https://github.com/mastra-ai/mastra/commit/aa0aeffa11efbef5e219fbd97bf43d263cfe3afe), [`2bcec65`](https://github.com/mastra-ai/mastra/commit/2bcec652d62b07eab15e9eb9822f70184526eede), [`ad9bded`](https://github.com/mastra-ai/mastra/commit/ad9bdedf86a824801f49928a8d40f6e31ff5450f), [`cbeec24`](https://github.com/mastra-ai/mastra/commit/cbeec24b3c97a1a296e7e461e66cc7f7d215dc50), [`208c0bb`](https://github.com/mastra-ai/mastra/commit/208c0bbacbf5a1da6318f2a0e0c544390e542ddc), [`f566ee7`](https://github.com/mastra-ai/mastra/commit/f566ee7d53a3da33a01103e2a5ac2070ddefe6b0)]:
|
|
23
|
+
- @mastra/core@1.20.0
|
|
24
|
+
|
|
3
25
|
## 1.4.1-alpha.0
|
|
4
26
|
|
|
5
27
|
### Patch Changes
|
package/dist/client/client.d.ts
CHANGED
|
@@ -122,21 +122,6 @@ export declare class InternalMastraMCPClient extends MastraBase {
|
|
|
122
122
|
*/
|
|
123
123
|
get stderr(): Stream | null;
|
|
124
124
|
disconnect(): Promise<void>;
|
|
125
|
-
/**
|
|
126
|
-
* Checks if an error indicates a session invalidation that requires reconnection.
|
|
127
|
-
*
|
|
128
|
-
* Common session-related errors include:
|
|
129
|
-
* - "No valid session ID provided" (HTTP 400)
|
|
130
|
-
* - "Server not initialized" (HTTP 400)
|
|
131
|
-
* - "Not connected" (protocol state error)
|
|
132
|
-
* - Connection refused errors
|
|
133
|
-
*
|
|
134
|
-
* @param error - The error to check
|
|
135
|
-
* @returns true if the error indicates a session problem requiring reconnection
|
|
136
|
-
*
|
|
137
|
-
* @internal
|
|
138
|
-
*/
|
|
139
|
-
private isSessionError;
|
|
140
125
|
/**
|
|
141
126
|
* Forces a reconnection to the MCP server by disconnecting and reconnecting.
|
|
142
127
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAS/C,OAAO,KAAK,EACV,WAAW,EACX,eAAe,EACf,iBAAiB,EACjB,mBAAmB,EACnB,2BAA2B,EAE3B,kBAAkB,EACnB,MAAM,oCAAoC,CAAC;AAmB5C,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -539,6 +539,7 @@ export declare class MCPClient extends MastraBase {
|
|
|
539
539
|
*
|
|
540
540
|
* @returns Object mapping namespaced tool names to tool implementations.
|
|
541
541
|
* Errors for individual servers are logged but don't throw - failed servers are skipped.
|
|
542
|
+
* Transient connection failures are retried once after reconnecting the affected server.
|
|
542
543
|
*
|
|
543
544
|
* @example
|
|
544
545
|
* ```typescript
|
|
@@ -583,6 +584,7 @@ export declare class MCPClient extends MastraBase {
|
|
|
583
584
|
* or list tools. This allows callers to report specific failure reasons per server.
|
|
584
585
|
*
|
|
585
586
|
* @returns Object with `toolsets` (successful servers) and `errors` (failed servers with error messages).
|
|
587
|
+
* Transient connection failures are retried once after reconnecting the affected server.
|
|
586
588
|
*
|
|
587
589
|
* @example
|
|
588
590
|
* ```typescript
|
|
@@ -624,5 +626,6 @@ export declare class MCPClient extends MastraBase {
|
|
|
624
626
|
getServerStderr(serverName: string): Stream | null;
|
|
625
627
|
private getConnectedClient;
|
|
626
628
|
private getConnectedClientForServer;
|
|
629
|
+
private getToolsForServer;
|
|
627
630
|
}
|
|
628
631
|
//# sourceMappingURL=configuration.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../src/client/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,KAAK,EACV,aAAa,EACb,YAAY,EACZ,oBAAoB,EACpB,MAAM,EACN,QAAQ,EACR,gBAAgB,EACjB,MAAM,oCAAoC,CAAC;AAI5C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../src/client/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,KAAK,EACV,aAAa,EACb,YAAY,EACZ,oBAAoB,EACpB,MAAM,EACN,QAAQ,EACR,gBAAgB,EACjB,MAAM,oCAAoC,CAAC;AAI5C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAM1D;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,wHAAwH;IACxH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,mFAAmF;IACnF,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;IACnD,iFAAiF;IACjF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,qBAAa,SAAU,SAAQ,UAAU;IACvC,OAAO,CAAC,aAAa,CAAiD;IACtE,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,cAAc,CAA8C;IACpE,OAAO,CAAC,iBAAiB,CAA8B;IAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;gBACS,IAAI,EAAE,gBAAgB;IA2ClC;;;;;;;;;;;;;;;;;;OAkBG;IACH,IAAW,QAAQ;+BAGc,MAAM,WAAW,CAAC,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,KAAK,IAAI;MAmBjG;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,IAAW,WAAW;QAGlB;;;;;;;;;;;;;;;;;;WAkBG;gCAC2B,MAAM,WAAW,CAAC,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,KAAK,OAAO,CAAC,YAAY,CAAC;MAmB7G;IAED;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,IAAW,SAAS;QAGhB;;;;;;;;;;;;;WAaG;oBACa,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAwBnD;;;;;;;;;;;;;WAaG;yBACkB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAwBhE;;;;;;;;;;;;;WAaG;2BACsB,MAAM,OAAO,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;QAmB5C;;;;;;;;;;;;WAYG;gCAC2B,MAAM,OAAO,MAAM;;;;;;;;;QAmBjD;;;;;;;;;;;;WAYG;kCAC6B,MAAM,OAAO,MAAM;;;;;;;;;QAmBnD;;;;;;;;;;;;;;;WAeG;gCAC2B,MAAM,WAAW,CAAC,MAAM,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,KAAK,IAAI;QAkBhF;;;;;;;;;;;;;;;WAeG;oCAC+B,MAAM,WAAW,MAAM,IAAI;MAmBhE;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,IAAW,OAAO;QAGd;;;;;;;;;;;;;WAaG;oBACa,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAwBjD;;;;;;;;;;;;;;;;;;;WAmBG;0CACqC;YAAE,UAAU,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;SAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAmBxG;;;;;;;;;;;;;;;WAeG;oCAC+B,MAAM,WAAW,MAAM,IAAI;MAmBhE;IAED,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,MAAM;IAOd;;;;;;;;;;;;;;OAcG;IACU,UAAU;IAsBvB;;;;;;;;;;;;;;OAcG;IACU,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/D;;;;;;;;;;;;;;;;;;;;OAoBG;IACU,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IA8B3E;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACU,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAK9F;;;;;;;;;;;;;;;;OAgBG;IACU,sBAAsB,IAAI,OAAO,CAAC;QAC7C,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;QACnE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAChC,CAAC;IAgCF;;;;;;;;;;;;;;OAcG;IACH,IAAI,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQvC;IAED;;;;;;;;OAQG;IACI,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;YAM3C,kBAAkB;YAyDlB,2BAA2B;YAQ3B,iBAAiB;CAuBhC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"error-utils.d.ts","sourceRoot":"","sources":["../../src/client/error-utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAsB/D"}
|
package/dist/docs/SKILL.md
CHANGED
package/dist/index.cjs
CHANGED
|
@@ -388,6 +388,15 @@ var ResourceClientActions = class {
|
|
|
388
388
|
}
|
|
389
389
|
};
|
|
390
390
|
|
|
391
|
+
// src/client/error-utils.ts
|
|
392
|
+
function isReconnectableMCPError(error) {
|
|
393
|
+
if (!(error instanceof Error)) {
|
|
394
|
+
return false;
|
|
395
|
+
}
|
|
396
|
+
const errorMessage = error.message.toLowerCase();
|
|
397
|
+
return errorMessage.includes("no valid session") || errorMessage.includes("session") || errorMessage.includes("server not initialized") || errorMessage.includes("not connected") || errorMessage.includes("http 400") || errorMessage.includes("http 401") || errorMessage.includes("http 403") || errorMessage.includes("econnrefused") || errorMessage.includes("fetch failed") || errorMessage.includes("connection refused") || errorMessage.includes("connection closed") || errorMessage.includes("sse stream disconnected") || errorMessage.includes("typeerror: terminated");
|
|
398
|
+
}
|
|
399
|
+
|
|
391
400
|
// src/client/client.ts
|
|
392
401
|
var DEFAULT_SERVER_CONNECT_TIMEOUT_MSEC = 3e3;
|
|
393
402
|
var SSE_FALLBACK_STATUS_CODES = [400, 404, 405];
|
|
@@ -746,27 +755,6 @@ var InternalMastraMCPClient = class extends base.MastraBase {
|
|
|
746
755
|
}
|
|
747
756
|
}
|
|
748
757
|
}
|
|
749
|
-
/**
|
|
750
|
-
* Checks if an error indicates a session invalidation that requires reconnection.
|
|
751
|
-
*
|
|
752
|
-
* Common session-related errors include:
|
|
753
|
-
* - "No valid session ID provided" (HTTP 400)
|
|
754
|
-
* - "Server not initialized" (HTTP 400)
|
|
755
|
-
* - "Not connected" (protocol state error)
|
|
756
|
-
* - Connection refused errors
|
|
757
|
-
*
|
|
758
|
-
* @param error - The error to check
|
|
759
|
-
* @returns true if the error indicates a session problem requiring reconnection
|
|
760
|
-
*
|
|
761
|
-
* @internal
|
|
762
|
-
*/
|
|
763
|
-
isSessionError(error) {
|
|
764
|
-
if (!(error instanceof Error)) {
|
|
765
|
-
return false;
|
|
766
|
-
}
|
|
767
|
-
const errorMessage = error.message.toLowerCase();
|
|
768
|
-
return errorMessage.includes("no valid session") || errorMessage.includes("session") || errorMessage.includes("server not initialized") || errorMessage.includes("not connected") || errorMessage.includes("http 400") || errorMessage.includes("http 401") || errorMessage.includes("http 403") || errorMessage.includes("econnrefused") || errorMessage.includes("fetch failed") || errorMessage.includes("connection refused") || errorMessage.includes("sse stream disconnected") || errorMessage.includes("typeerror: terminated");
|
|
769
|
-
}
|
|
770
758
|
/**
|
|
771
759
|
* Forces a reconnection to the MCP server by disconnecting and reconnecting.
|
|
772
760
|
*
|
|
@@ -956,7 +944,7 @@ var InternalMastraMCPClient = class extends base.MastraBase {
|
|
|
956
944
|
try {
|
|
957
945
|
return await executeToolCall();
|
|
958
946
|
} catch (e) {
|
|
959
|
-
if (
|
|
947
|
+
if (isReconnectableMCPError(e)) {
|
|
960
948
|
this.log("debug", `Session error detected for tool ${tool.name}, attempting reconnection...`, {
|
|
961
949
|
error: e instanceof Error ? e.message : String(e)
|
|
962
950
|
});
|
|
@@ -996,6 +984,7 @@ var InternalMastraMCPClient = class extends base.MastraBase {
|
|
|
996
984
|
}
|
|
997
985
|
};
|
|
998
986
|
var mcpClientInstances = /* @__PURE__ */ new Map();
|
|
987
|
+
var TOOL_DISCOVERY_MAX_ATTEMPTS = 2;
|
|
999
988
|
var MCPClient = class extends base.MastraBase {
|
|
1000
989
|
serverConfigs = {};
|
|
1001
990
|
id;
|
|
@@ -1649,6 +1638,7 @@ To fix this you have three different options:
|
|
|
1649
1638
|
*
|
|
1650
1639
|
* @returns Object mapping namespaced tool names to tool implementations.
|
|
1651
1640
|
* Errors for individual servers are logged but don't throw - failed servers are skipped.
|
|
1641
|
+
* Transient connection failures are retried once after reconnecting the affected server.
|
|
1652
1642
|
*
|
|
1653
1643
|
* @example
|
|
1654
1644
|
* ```typescript
|
|
@@ -1666,8 +1656,7 @@ To fix this you have three different options:
|
|
|
1666
1656
|
const connectedTools = {};
|
|
1667
1657
|
for (const serverName of Object.keys(this.serverConfigs)) {
|
|
1668
1658
|
try {
|
|
1669
|
-
const
|
|
1670
|
-
const tools = await client.tools();
|
|
1659
|
+
const tools = await this.getToolsForServer(serverName);
|
|
1671
1660
|
for (const [toolName, toolConfig] of Object.entries(tools)) {
|
|
1672
1661
|
connectedTools[`${serverName}_${toolName}`] = toolConfig;
|
|
1673
1662
|
}
|
|
@@ -1723,6 +1712,7 @@ To fix this you have three different options:
|
|
|
1723
1712
|
* or list tools. This allows callers to report specific failure reasons per server.
|
|
1724
1713
|
*
|
|
1725
1714
|
* @returns Object with `toolsets` (successful servers) and `errors` (failed servers with error messages).
|
|
1715
|
+
* Transient connection failures are retried once after reconnecting the affected server.
|
|
1726
1716
|
*
|
|
1727
1717
|
* @example
|
|
1728
1718
|
* ```typescript
|
|
@@ -1738,8 +1728,7 @@ To fix this you have three different options:
|
|
|
1738
1728
|
const errors = {};
|
|
1739
1729
|
for (const serverName of Object.keys(this.serverConfigs)) {
|
|
1740
1730
|
try {
|
|
1741
|
-
const
|
|
1742
|
-
const tools = await client.tools();
|
|
1731
|
+
const tools = await this.getToolsForServer(serverName);
|
|
1743
1732
|
if (tools) {
|
|
1744
1733
|
connectedToolsets[serverName] = tools;
|
|
1745
1734
|
}
|
|
@@ -1852,6 +1841,26 @@ To fix this you have three different options:
|
|
|
1852
1841
|
}
|
|
1853
1842
|
return this.getConnectedClient(serverName, serverConfig);
|
|
1854
1843
|
}
|
|
1844
|
+
async getToolsForServer(serverName) {
|
|
1845
|
+
for (let attempt = 1; attempt <= TOOL_DISCOVERY_MAX_ATTEMPTS; attempt++) {
|
|
1846
|
+
try {
|
|
1847
|
+
const client = await this.getConnectedClientForServer(serverName);
|
|
1848
|
+
return await client.tools();
|
|
1849
|
+
} catch (error) {
|
|
1850
|
+
if (attempt === TOOL_DISCOVERY_MAX_ATTEMPTS || !isReconnectableMCPError(error)) {
|
|
1851
|
+
throw error;
|
|
1852
|
+
}
|
|
1853
|
+
this.logger.debug("Retrying MCP tool discovery after reconnect", {
|
|
1854
|
+
serverName,
|
|
1855
|
+
attempt,
|
|
1856
|
+
maxAttempts: TOOL_DISCOVERY_MAX_ATTEMPTS,
|
|
1857
|
+
error: error instanceof Error ? error.message : String(error)
|
|
1858
|
+
});
|
|
1859
|
+
await this.reconnectServer(serverName);
|
|
1860
|
+
}
|
|
1861
|
+
}
|
|
1862
|
+
return {};
|
|
1863
|
+
}
|
|
1855
1864
|
};
|
|
1856
1865
|
|
|
1857
1866
|
// src/client/oauth-provider.ts
|