@mastra/connect 1.0.4-alpha.0 → 1.1.0-alpha.2

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { tools } from './tools.js';
-export type { ToolsOptions, ToolsProviderOptions, ToolsResolver, ToolsResolverContext, ToolsWithInput, } from './tools.js';
+export type { ToolsOptions, ToolsOptionsInput, ToolsProviderOptions, ToolsResolver, ToolsResolverContext, ToolsWithInput, } from './tools.js';
 export { channels } from './channels.js';
 export type { ChannelsOptions, ChannelsProviderOptions, ChannelsResolver, ChannelsResolverContext, ResolvedChannels, } from './channels.js';
 export type { ChannelProviderRegistration, ChannelInstance, ChannelRuntime } from './providers/channel-provider.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,YAAY,EACV,YAAY,EACZ,oBAAoB,EACpB,aAAa,EACb,oBAAoB,EACpB,cAAc,GACf,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,YAAY,EACV,eAAe,EACf,uBAAuB,EACvB,gBAAgB,EAChB,uBAAuB,EACvB,gBAAgB,GACjB,MAAM,eAAe,CAAC;AACvB,YAAY,EAAE,2BAA2B,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACpH,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,YAAY,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAC1D,YAAY,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACjG,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACpD,YAAY,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,YAAY,EACV,YAAY,EACZ,iBAAiB,EACjB,oBAAoB,EACpB,aAAa,EACb,oBAAoB,EACpB,cAAc,GACf,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,YAAY,EACV,eAAe,EACf,uBAAuB,EACvB,gBAAgB,EAChB,uBAAuB,EACvB,gBAAgB,GACjB,MAAM,eAAe,CAAC;AACvB,YAAY,EAAE,2BAA2B,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACpH,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,YAAY,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAC1D,YAAY,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACjG,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACpD,YAAY,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC"}

package/dist/index.js

@@ -2,6 +2,7 @@ import { MCPClient } from "@mastra/mcp";
 import { z } from "zod";
 import { SpanType, resolveCurrentSpan } from "@mastra/core/observability";
 import { createTool } from "@mastra/core/tools";
+import { hkdfSync } from "crypto";
 //#region src/errors.ts
 const MAX_DETAIL_LENGTH = 2e3;
 var MastraConnectError = class extends Error {
@@ -244,6 +245,8 @@ function resolveClient(options) {
 	};
 	const orgId = options?.orgId?.trim() || process.env.MASTRA_ORG_ID?.trim();
 	if (orgId) headers["x-organization-id"] = orgId;
+	const projectId = options?.projectId?.trim() || process.env.MASTRA_PROJECT_ID?.trim();
+	if (projectId) headers["x-mastra-project-id"] = projectId;
 	return {
 		baseUrl,
 		headers,
@@ -1026,7 +1029,6 @@ const CHANNELS$1 = [
 		integrationId: "microsoft-teams",
 		async create(options, runtime) {
 			const mod = await import("@mastra/teams");
-			if (!process.env.MASTRA_ENCRYPTION_KEY) throw new MastraConnectError("invalid_options", "Microsoft Teams channel: MASTRA_ENCRYPTION_KEY is not set. The Teams install store persists per-agent bot secrets and requires an at-rest encryption key (a 32-byte value, base64-encoded).");
 			const safeOptions = stripReservedOptions("microsoft-teams", options);
 			const tokenResolver = async (scope) => {
 				const fresh = await runtime.getCredential();
@@ -1035,10 +1037,22 @@ const CHANNELS$1 = [
 				if (!token) throw new MastraConnectError("no_active_connection", `Teams connection ${runtime.getConnectionId()} has no Dev Portal token on its credential. Reconnect with an integration that requests the ${mod.TEAMS_DEV_PORTAL_SCOPE} scope.`);
 				return token;
 			};
-			return { provider: new mod.TeamsProvider({
+			const config = {
 				tokenResolver,
 				...safeOptions ?? {}
-			}) };
+			};
+			const usingDerivedKey = !process.env.MASTRA_ENCRYPTION_KEY;
+			if (usingDerivedKey) config.encryptionKey = Buffer.from(hkdfSync("sha256", runtime.client.accessToken, "mastra-connect", "microsoft-teams-install-store", 32)).toString("base64");
+			let warnedDerivedKey = false;
+			return {
+				provider: new mod.TeamsProvider(config),
+				async sync() {
+					if (usingDerivedKey && !warnedDerivedKey) {
+						warnedDerivedKey = true;
+						console.warn("[@mastra/connect] MASTRA_ENCRYPTION_KEY is not set: encrypting the Microsoft Teams install store with a key derived from the platform access token. Set MASTRA_ENCRYPTION_KEY to use a dedicated key — otherwise rotating the platform access token makes stored bot credentials unreadable (disconnect and reconnect the channel to re-provision).");
+					}
+				}
+			};
 		}
 	}
 ];
@@ -7873,10 +7887,15 @@ const SentenceSchema = z.object({
 	speaker_name: z.string().nullish(),
 	speaker_id: z.string().nullish(),
 	raw_text: z.string().nullish(),
-	start_time: z.string().nullish(),
-	end_time: z.string().nullish(),
+	start_time: z.number().nullish(),
+	end_time: z.number().nullish(),
 	text: z.string().nullish()
 });
+const ProviderSentenceSchema = SentenceSchema.extend({
+	speaker_id: z.union([z.string(), z.number()]).nullish(),
+	start_time: z.union([z.number(), z.string()]).nullish(),
+	end_time: z.union([z.number(), z.string()]).nullish()
+});
 const SummarySectionSchema = z.object({
 	title: z.string().nullish(),
 	content: z.string().nullish()
@@ -7943,7 +7962,7 @@ const AnalyticsSchema = z.object({
 const TranscriptSchema = z.object({
 	id: z.string().nullish(),
 	title: z.string().nullish(),
-	sentences: z.array(SentenceSchema).nullish(),
+	sentences: z.array(ProviderSentenceSchema).nullish(),
 	summary: ProviderSummarySchema$1.nullable().optional(),
 	speakers: z.array(SpeakerSchema).nullish(),
 	meeting_info: MeetingInfoSchema.nullable().optional(),
@@ -7971,6 +7990,22 @@ const getTranscriptOutputSchema = z.object({
 function normalizeActionItems$1(actionItems) {
 	return Array.isArray(actionItems) ? actionItems.join("\n") : actionItems;
 }
+function toFiniteNumber(value) {
+	if (value == null) return void 0;
+	if (typeof value === "number") return Number.isFinite(value) ? value : void 0;
+	const trimmed = value.trim();
+	if (trimmed === "") return void 0;
+	const parsed = Number(trimmed);
+	return Number.isFinite(parsed) ? parsed : void 0;
+}
+function normalizeSentence(sentence) {
+	return {
+		...sentence,
+		speaker_id: sentence.speaker_id != null ? String(sentence.speaker_id) : sentence.speaker_id,
+		start_time: toFiniteNumber(sentence.start_time),
+		end_time: toFiniteNumber(sentence.end_time)
+	};
+}
 function getTranscriptTool(proxy) {
 	return createTool({
 		id: "fireflies_get_transcript",
@@ -8076,7 +8111,7 @@ function getTranscriptTool(proxy) {
 			return {
 				id: transcript.id ?? void 0,
 				title: transcript.title ?? void 0,
-				sentences: transcript.sentences ?? void 0,
+				sentences: transcript.sentences ? transcript.sentences.map(normalizeSentence) : void 0,
 				summary: transcript.summary ? {
 					...transcript.summary,
 					action_items: transcript.summary.action_items != null ? normalizeActionItems$1(transcript.summary.action_items) : transcript.summary.action_items
@@ -19805,11 +19840,11 @@ function insertTextTool(proxy) {
 }
 //#endregion
 //#region src/providers/google-docs/tools/list-revisions.ts
-const listRevisionsInputSchema = z.object({
+const listRevisionsInputSchema$1 = z.object({
 	documentId: z.string().describe("Google Docs document ID. Example: \"1Kj3d86Z-Sfd56YP4dImQ-ggMRyP2QZ_BRO33zOO224c\""),
 	pageToken: z.string().optional().describe("Pagination token from the previous response. Omit for the first page.")
 });
-const LastModifyingUserSchema = z.object({
+const LastModifyingUserSchema$1 = z.object({
 	kind: z.string().optional(),
 	displayName: z.string().optional(),
 	photoLink: z.string().optional(),
@@ -19817,27 +19852,27 @@ const LastModifyingUserSchema = z.object({
 	permissionId: z.string().optional(),
 	emailAddress: z.string().optional()
 });
-const RevisionSchema = z.object({
+const RevisionSchema$1 = z.object({
 	id: z.string(),
 	modifiedTime: z.string().optional(),
-	lastModifyingUser: LastModifyingUserSchema.optional(),
+	lastModifyingUser: LastModifyingUserSchema$1.optional(),
 	keepForever: z.boolean().optional(),
 	published: z.boolean().optional()
 });
-const listRevisionsOutputSchema = z.object({
-	revisions: z.array(RevisionSchema),
+const listRevisionsOutputSchema$1 = z.object({
+	revisions: z.array(RevisionSchema$1),
 	nextPageToken: z.string().optional()
 });
-const DriveRevisionsResponseSchema = z.object({
+const DriveRevisionsResponseSchema$1 = z.object({
 	nextPageToken: z.string().optional(),
 	revisions: z.array(z.unknown()).optional()
 });
-function listRevisionsTool(proxy) {
+function listRevisionsTool$1(proxy) {
 	return createTool({
 		id: "google_docs_list_revisions",
 		description: "List the revision history for a Google Doc.",
-		inputSchema: listRevisionsInputSchema,
-		outputSchema: listRevisionsOutputSchema,
+		inputSchema: listRevisionsInputSchema$1,
+		outputSchema: listRevisionsOutputSchema$1,
 		execute: async (input, { requestContext }) => {
 			const platformProxy = proxy.withRequestContext(requestContext);
 			const response = await platformProxy.get({
@@ -19850,7 +19885,7 @@ function listRevisionsTool(proxy) {
 				baseUrlOverride: "https://www.googleapis.com",
 				retries: 3
 			});
-			const parsedResponse = DriveRevisionsResponseSchema.safeParse(response.data);
+			const parsedResponse = DriveRevisionsResponseSchema$1.safeParse(response.data);
 			if (!parsedResponse.success) throw new platformProxy.ActionError({
 				type: "invalid_response",
 				message: "Invalid response from Google Drive API"
@@ -19858,7 +19893,7 @@ function listRevisionsTool(proxy) {
 			const rawRevisions = parsedResponse.data.revisions ?? [];
 			const revisions = [];
 			for (const rawRevision of rawRevisions) {
-				const parsedRevision = RevisionSchema.safeParse(rawRevision);
+				const parsedRevision = RevisionSchema$1.safeParse(rawRevision);
 				if (parsedRevision.success) revisions.push(parsedRevision.data);
 			}
 			return {
@@ -20754,7 +20789,7 @@ function createGoogleDocsTools(options) {
 		google_docs_insert_table_row: insertTableRowTool$1(platformProxy),
 		google_docs_insert_table: insertTableTool(platformProxy),
 		google_docs_insert_text: insertTextTool(platformProxy),
-		google_docs_list_revisions: listRevisionsTool(platformProxy),
+		google_docs_list_revisions: listRevisionsTool$1(platformProxy),
 		google_docs_merge_table_cells: mergeTableCellsTool(platformProxy),
 		google_docs_pin_table_header_rows: pinTableHeaderRowsTool(platformProxy),
 		google_docs_replace_all_text: replaceAllTextTool(platformProxy),
@@ -20908,7 +20943,10 @@ function createFolderTool(proxy) {
 			if (input.parentId) requestBody["parents"] = [input.parentId];
 			const response = await platformProxy.post({
 				endpoint: "/drive/v3/files",
-				params: { fields: "id,name,mimeType,createdTime,parents" },
+				params: {
+					supportsAllDrives: "true",
+					fields: "id,name,mimeType,createdTime,parents"
+				},
 				data: requestBody,
 				retries: 3
 			});
@@ -21107,6 +21145,56 @@ function emptyTrashTool(proxy) {
 	});
 }
 //#endregion
+//#region src/providers/google-drive/tools/export-file.ts
+const exportFileInputSchema = z.object({
+	fileId: z.string().describe("The ID of the Google Workspace file to export (Doc, Sheet, Slide, etc.). Example: \"1Kj3d86Z-Sfd56YP4dImQ-ggMRyP2QZ_BRO33zOO224c\""),
+	mimeType: z.enum([
+		"application/pdf",
+		"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+		"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+		"application/vnd.openxmlformats-officedocument.presentationml.presentation",
+		"text/html",
+		"text/plain",
+		"text/csv",
+		"application/rtf",
+		"application/epub+zip"
+	]).describe("The target MIME type for the export.")
+});
+const exportFileOutputSchema = z.object({
+	fileId: z.string(),
+	mimeType: z.string(),
+	data: z.string().describe("The exported file encoded as a base64 string."),
+	size: z.number().describe("The size of the exported data in bytes.")
+});
+function exportFileTool(proxy) {
+	return createTool({
+		id: "google_drive_export_file",
+		description: "Export a Google Workspace file (Doc, Sheet, Slide, etc.) to the specified MIME type.",
+		inputSchema: exportFileInputSchema,
+		outputSchema: exportFileOutputSchema,
+		execute: async (input, { requestContext }) => {
+			const platformProxy = proxy.withRequestContext(requestContext);
+			const rawData = (await platformProxy.get({
+				endpoint: `/drive/v3/files/${encodeURIComponent(input.fileId)}/export`,
+				params: { mimeType: input.mimeType },
+				responseType: "arraybuffer",
+				retries: 3
+			})).data;
+			if (typeof rawData !== "object" || rawData === null) throw new platformProxy.ActionError({
+				type: "invalid_response",
+				message: "Expected binary response from export API."
+			});
+			const buffer = Buffer.isBuffer(rawData) ? rawData : Buffer.from(rawData);
+			return {
+				fileId: input.fileId,
+				mimeType: input.mimeType,
+				data: buffer.toString("base64"),
+				size: buffer.length
+			};
+		}
+	});
+}
+//#endregion
 //#region src/providers/google-drive/tools/find-file.ts
 const findFileInputSchema = z.object({
 	query: z.string().optional().describe("Search query string. Uses Google Drive search query syntax. Example: \"name contains 'report'\" or \"mimeType = 'application/pdf'\". If not provided, returns all files."),
@@ -21932,6 +22020,70 @@ function listPermissionsTool(proxy) {
 	});
 }
 //#endregion
+//#region src/providers/google-drive/tools/list-revisions.ts
+const listRevisionsInputSchema = z.object({
+	fileId: z.string().describe("The Drive file ID. Example: \"1Kj3d86Z-Sfd56YP4dImQ-ggMRyP2QZ_BRO33zOO224c\""),
+	pageToken: z.string().optional().describe("Pagination token from the previous response. Omit for the first page.")
+});
+const LastModifyingUserSchema = z.object({
+	kind: z.string().optional(),
+	displayName: z.string().optional(),
+	photoLink: z.string().optional(),
+	me: z.boolean().optional(),
+	permissionId: z.string().optional(),
+	emailAddress: z.string().optional()
+});
+const RevisionSchema = z.object({
+	id: z.string(),
+	modifiedTime: z.string().optional(),
+	lastModifyingUser: LastModifyingUserSchema.optional(),
+	keepForever: z.boolean().optional(),
+	published: z.boolean().optional()
+});
+const listRevisionsOutputSchema = z.object({
+	revisions: z.array(RevisionSchema),
+	nextPageToken: z.string().optional()
+});
+const DriveRevisionsResponseSchema = z.object({
+	nextPageToken: z.string().optional(),
+	revisions: z.array(z.unknown()).optional()
+});
+function listRevisionsTool(proxy) {
+	return createTool({
+		id: "google_drive_list_revisions",
+		description: "List the revision history for a Drive file.",
+		inputSchema: listRevisionsInputSchema,
+		outputSchema: listRevisionsOutputSchema,
+		execute: async (input, { requestContext }) => {
+			const platformProxy = proxy.withRequestContext(requestContext);
+			const response = await platformProxy.get({
+				endpoint: `/drive/v3/files/${encodeURIComponent(input.fileId)}/revisions`,
+				params: {
+					fields: "nextPageToken,revisions(id,modifiedTime,lastModifyingUser,keepForever,published)",
+					pageSize: "100",
+					...input.pageToken !== void 0 && { pageToken: input.pageToken }
+				},
+				retries: 3
+			});
+			const parsedResponse = DriveRevisionsResponseSchema.safeParse(response.data);
+			if (!parsedResponse.success) throw new platformProxy.ActionError({
+				type: "invalid_response",
+				message: "Invalid response from Google Drive API"
+			});
+			const rawRevisions = parsedResponse.data.revisions ?? [];
+			const revisions = [];
+			for (const rawRevision of rawRevisions) {
+				const parsedRevision = RevisionSchema.safeParse(rawRevision);
+				if (parsedRevision.success) revisions.push(parsedRevision.data);
+			}
+			return {
+				revisions,
+				...parsedResponse.data.nextPageToken !== void 0 && { nextPageToken: parsedResponse.data.nextPageToken }
+			};
+		}
+	});
+}
+//#endregion
 //#region src/providers/google-drive/tools/move-file.ts
 const moveFileInputSchema = z.object({
 	fileId: z.string().describe("The ID of the file to move. Example: \"1mD3ukEAmRqo8u0RF_Cr6IJl9f_uWTYH03vesDhB5Svw\""),
@@ -21957,6 +22109,7 @@ function moveFileTool(proxy) {
 				params: {
 					addParents: input.toFolderId,
 					removeParents: input.fromFolderId,
+					supportsAllDrives: "true",
 					fields: "id,name,mimeType,parents"
 				},
 				retries: 3
@@ -22306,7 +22459,10 @@ function uploadDocumentTool(proxy) {
 			if (input.folderId) metadataBody["parents"] = [input.folderId];
 			const createResponse = await platformProxy.post({
 				endpoint: "/drive/v3/files",
-				params: { fields: "id,name,mimeType,webViewLink,webContentLink" },
+				params: {
+					supportsAllDrives: "true",
+					fields: "id,name,mimeType,webViewLink,webContentLink"
+				},
 				data: metadataBody,
 				retries: 3
 			});
@@ -22321,6 +22477,7 @@ function uploadDocumentTool(proxy) {
 					endpoint: `/upload/drive/v3/files/${fileId}`,
 					params: {
 						uploadType: "media",
+						supportsAllDrives: "true",
 						fields: "id,name,mimeType,webViewLink,webContentLink"
 					},
 					headers: { "Content-Type": input.mimeType },
@@ -22331,6 +22488,7 @@ function uploadDocumentTool(proxy) {
 				const status = error?.response?.status;
 				if (typeof status === "number" && status >= 400 && status < 500) await platformProxy.delete({
 					endpoint: `/drive/v3/files/${fileId}`,
+					params: { supportsAllDrives: "true" },
 					retries: 3
 				}).catch(() => void 0);
 				throw error;
@@ -22367,6 +22525,7 @@ function createGoogleDriveTools(options) {
 		google_drive_delete_permission: deletePermissionTool(platformProxy),
 		google_drive_delete_shared_drive: deleteSharedDriveTool(platformProxy),
 		google_drive_empty_trash: emptyTrashTool(platformProxy),
+		google_drive_export_file: exportFileTool(platformProxy),
 		google_drive_find_file: findFileTool(platformProxy),
 		google_drive_find_folder: findFolderTool(platformProxy),
 		google_drive_get_about: getAboutTool(platformProxy),
@@ -22381,6 +22540,7 @@ function createGoogleDriveTools(options) {
 		google_drive_list_drives: listDrivesTool(platformProxy),
 		google_drive_list_files_non_unified: listFilesNonUnifiedTool(platformProxy),
 		google_drive_list_permissions: listPermissionsTool(platformProxy),
+		google_drive_list_revisions: listRevisionsTool(platformProxy),
 		google_drive_move_file: moveFileTool(platformProxy),
 		google_drive_unhide_shared_drive: unhideSharedDriveTool(platformProxy),
 		google_drive_update_comment: updateCommentTool$2(platformProxy),
@@ -75088,13 +75248,23 @@ let nextResolverId = 0;
 * Expected provider absence is silently skipped. Actionable per-integration
 * problems during resolution (needs re-auth or ambiguity) are downgraded to
 * warn-and-skip so one bad integration never takes down the whole toolset.
+*
+* Pass a callback instead of an options object to vary options per request
+* (see {@link ToolsOptionsInput}). With the callback form, configuration
+* validation runs at the first resolution that produces a given options
+* value — still failing loudly — instead of at call time.
 */
 function tools(options = {}) {
+	if (typeof options === "function") return dynamicTools(options);
 	const projectId = options.projectId?.trim() || process.env.MASTRA_PROJECT_ID?.trim();
 	if (!projectId) throw new MastraConnectError("missing_project_id", "Missing project id: set MASTRA_PROJECT_ID or pass projectId.");
 	if (options.ttlMs !== void 0 && (!Number.isFinite(options.ttlMs) || options.ttlMs < 0)) throw new MastraConnectError("invalid_options", `Invalid ttlMs (${options.ttlMs}): expected a finite number of milliseconds >= 0.`);
 	const ttlMs = options.ttlMs ?? DEFAULT_TTL_MS$1;
-	const client = resolveClient(options.client);
+	const clientOptions = {
+		...options.client,
+		projectId
+	};
+	const client = resolveClient(clientOptions);
 	const resolverId = ++nextResolverId;
 	const mcpClients = /* @__PURE__ */ new Map();
 	const normalizedProviders = normalizeProviderOverrides(options.providers);
@@ -75142,7 +75312,7 @@ function tools(options = {}) {
 		if (!inflight) inflight = (async () => {
 			try {
 				const { connections, catalog, catalogAvailable } = await loadSnapshotInputs();
-				const snapshot = await mapTools(connections, buildRequests(normalizedProviders, catalog, catalogAvailable), options, client, mcpClients, resolverId);
+				const snapshot = await mapTools(connections, buildRequests(normalizedProviders, catalog, catalogAvailable), options, clientOptions, client, mcpClients, resolverId);
 				cache = {
 					snapshot,
 					fetchedAt: Date.now()
@@ -75193,6 +75363,130 @@ function tools(options = {}) {
 	return resolver;
 }
 /**
+* Most distinct options values a callback-form resolver keeps live caches
+* (and MCP clients) for at once. Callbacks are expected to produce a small,
+* closed set of option shapes (one per role, say); the cap exists so a
+* callback that accidentally derives options from unbounded per-request data
+* cannot leak an MCP client per request. Eviction is least-recently-used and
+* disconnects the evicted variant's transports.
+*/
+const MAX_OPTION_VARIANTS = 32;
+/**
+* Builds the callback-form resolver: each resolution invokes `getOptions`
+* with the request context, then delegates to a memoized static resolver for
+* that options value, so every distinct options value gets its own snapshot
+* cache with the normal TTL / stale-while-revalidate semantics. Options
+* validation happens when a value is first seen (inside `tools()`), so
+* configuration errors fail that resolution loudly instead of being
+* swallowed.
+*/
+function dynamicTools(getOptions) {
+	const variants = /* @__PURE__ */ new Map();
+	let closing;
+	const disconnectEvicted = (entry) => {
+		entry.resolver.disconnect().catch((error) => {
+			console.warn(`[@mastra/connect] Failed to disconnect evicted tools variant: ${error instanceof Error ? error.message : String(error)}`);
+		});
+	};
+	const releaseVariant = (entry) => {
+		entry.inUse -= 1;
+		if (entry.evicted && entry.inUse === 0) disconnectEvicted(entry);
+	};
+	const acquireVariant = async (ctx) => {
+		if (closing) await closing;
+		const options = await getOptions(ctx);
+		if (closing) await closing;
+		if (typeof options !== "object" || options === null || Array.isArray(options)) throw new MastraConnectError("invalid_options", `The tools() options callback must return a ToolsOptions object, got ${options === null ? "null" : Array.isArray(options) ? "an array" : typeof options}.`);
+		const key = hashOptions(options);
+		const existing = variants.get(key);
+		if (existing) {
+			variants.delete(key);
+			variants.set(key, existing);
+			existing.inUse += 1;
+			return existing;
+		}
+		const entry = {
+			resolver: tools(options),
+			inUse: 1,
+			evicted: false
+		};
+		variants.set(key, entry);
+		if (variants.size > MAX_OPTION_VARIANTS) {
+			const [oldestKey, oldest] = variants.entries().next().value;
+			variants.delete(oldestKey);
+			console.warn(`[@mastra/connect] tools() options callback produced more than ${MAX_OPTION_VARIANTS} distinct options values; evicting the least recently used variant. Derive options from a small, closed set of inputs (e.g. roles), not per-request data.`);
+			oldest.evicted = true;
+			if (oldest.inUse === 0) disconnectEvicted(oldest);
+		}
+		return entry;
+	};
+	const resolve = async (ctx) => {
+		const entry = await acquireVariant(ctx);
+		try {
+			return await entry.resolver(ctx);
+		} finally {
+			releaseVariant(entry);
+		}
+	};
+	const resolver = Object.assign(resolve, {
+		refresh: async () => {
+			const entry = await acquireVariant(void 0);
+			try {
+				return await entry.resolver.refresh();
+			} finally {
+				releaseVariant(entry);
+			}
+		},
+		disconnect: () => {
+			closing ??= (async () => {
+				try {
+					const all = Array.from(variants.values());
+					variants.clear();
+					await Promise.allSettled(all.map((entry) => entry.resolver.disconnect()));
+				} finally {
+					closing = void 0;
+				}
+			})();
+			return closing;
+		},
+		with: (extra) => withExtraTools(resolver, extra)
+	});
+	return resolver;
+}
+/** Identity registry for non-serializable option values (e.g. a custom `client.fetch`). */
+const functionIdentity = /* @__PURE__ */ new WeakMap();
+let nextFunctionIdentity = 0;
+/**
+* Stable key for an options value: JSON with sorted object keys, so two
+* callbacks returning structurally equal options share one cached variant.
+* Functions (and other non-plain values) hash by identity — the same
+* instance maps to the same key, two different instances to different keys —
+* which is the safe direction: at worst a duplicate cache entry, never a
+* false merge of different configurations.
+*/
+function hashOptions(options) {
+	const byIdentity = (value) => {
+		let id = functionIdentity.get(value);
+		if (id === void 0) {
+			id = ++nextFunctionIdentity;
+			functionIdentity.set(value, id);
+		}
+		return `__identity_${id}__`;
+	};
+	const encode = (value) => {
+		if (value === void 0) return "__undefined__";
+		if (typeof value === "function") return byIdentity(value);
+		if (Array.isArray(value)) return value.map(encode);
+		if (typeof value === "object" && value !== null) {
+			const proto = Object.getPrototypeOf(value);
+			if (proto !== Object.prototype && proto !== null) return byIdentity(value);
+			return Object.fromEntries(Object.entries(value).filter(([, entryValue]) => entryValue !== void 0).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([entryKey, entryValue]) => [entryKey, encode(entryValue)]));
+		}
+		return value;
+	};
+	return JSON.stringify(encode(options));
+}
+/**
 * Builds the resolver `.with()` returns: resolutions merge the base
 * resolver's tools with `extra` (extra wins on key collision), cache handles
 * delegate to the base, and further `.with()` calls chain.
@@ -75323,7 +75617,7 @@ function buildRequests(providers, catalog, catalogAvailable) {
 	return requests;
 }
 /** Maps one platform connection list snapshot to a flat tool record without allowing ambiguous tool ownership. */
-async function mapTools(connections, requests, options, client, mcpClients, resolverId) {
+async function mapTools(connections, requests, options, clientOptions, client, mcpClients, resolverId) {
 	const byIntegrationId = groupByIntegrationId(connections);
 	const activeMcpKeys = /* @__PURE__ */ new Set();
 	const result = {};
@@ -75356,7 +75650,7 @@ async function mapTools(connections, requests, options, client, mcpClients, reso
 			} else {
 				providerTools = request.registration.createTools({
 					connectionId: resolution.connectionId,
-					client: options.client,
+					client: clientOptions,
 					...providerFilterOptions(request.options)
 				});
 				applyProxyRequireApproval(providerTools, integrationId, request.options.requireApproval);
@@ -75379,7 +75673,7 @@ async function mapTools(connections, requests, options, client, mcpClients, reso
 					connections: resolution.connections,
 					allowTools: request.options.allowTools,
 					disallowTools: request.options.disallowTools,
-					client: options.client
+					client: clientOptions
 				});
 				applyProxyRequireApproval(providerTools, integrationId, request.options.requireApproval, [listConnectionsToolKey(integrationId)]);
 			}
@@ -75581,7 +75875,10 @@ async function channels(options = {}) {
 	const unknownChannelIds = Object.keys(providerOverrides).filter((integrationId) => !knownChannelIds.has(integrationId) && !providerOverrides[integrationId]?.disabled);
 	if (unknownChannelIds.length > 0) throw new MastraConnectError("invalid_options", `Unknown channel${unknownChannelIds.length > 1 ? "s" : ""} in the providers option: ${unknownChannelIds.map((id) => `'${id}'`).join(", ")}. Known channels: ${[...knownChannelIds].join(", ")}.`);
 	const ttlMs = options.ttlMs ?? DEFAULT_TTL_MS;
-	const client = resolveClient(options.client);
+	const client = resolveClient({
+		...options.client,
+		projectId
+	});
 	const states = [];
 	for (const registration of CHANNELS) {
 		if (only !== void 0 && !only.has(registration.integrationId)) continue;