mcp-google-multi 6.0.0-beta.2 → 6.0.0-beta.3

package/dist/tools/generated/workspaceevents.js

@@ -2,7 +2,7 @@
 import { z } from 'zod';
 import { coerceBoolean, coerceJson } from '../_coerce.js';
 import { accountField, registerGeneratedTool } from './_shared.js';
-export function registerWorkspaceeventsGeneratedTools(registry) {
+export function registerWorkspaceeventsGeneratedTools(registry, deps = {}) {
     // Interned method scope sets (shared across tools; see scope-observability).
     const S_workspaceevents_v1 = [
         ["https://www.googleapis.com/auth/chat.bot", "https://www.googleapis.com/auth/chat.memberships", "https://www.googleapis.com/auth/chat.memberships.readonly", "https://www.googleapis.com/auth/chat.messages", "https://www.googleapis.com/auth/chat.messages.reactions", "https://www.googleapis.com/auth/chat.messages.reactions.readonly", "https://www.googleapis.com/auth/chat.messages.readonly", "https://www.googleapis.com/auth/chat.spaces", "https://www.googleapis.com/auth/chat.spaces.readonly", "https://www.googleapis.com/auth/chat.users.availability", "https://www.googleapis.com/auth/chat.users.availability.readonly", "https://www.googleapis.com/auth/chat.users.readstate", "https://www.googleapis.com/auth/chat.users.readstate.readonly", "https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly", "https://www.googleapis.com/auth/meetings.space.created", "https://www.googleapis.com/auth/meetings.space.readonly"],
@@ -16,11 +16,11 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         params: [{ "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             body: coerceJson(z.record(z.string(), z.unknown())).describe("SendMessageRequest JSON request body. Top-level fields: configuration, message, metadata, tenant."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "workspaceevents_operations_get",
         cud: "read",
@@ -29,11 +29,11 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         params: [{ "field": "name", "api": "name", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             name: z.string().min(1).describe("The name of the operation resource."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "workspaceevents_subscriptions_create",
         cud: "create",
@@ -42,12 +42,12 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         params: [{ "field": "validateOnly", "api": "validateOnly", "location": "query" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             validateOnly: coerceBoolean.describe("Optional. If set to `true`, validates and previews the request, but doesn't create the subscription.").optional(),
             body: coerceJson(z.record(z.string(), z.unknown())).describe("Subscription JSON request body. Top-level fields: authority, createTime, driveOptions, etag, eventTypes, expireTime, name, notificationEndpoint, payloadOptions, reconciling, serviceAccountAuthority, state, +6 more."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "workspaceevents_subscriptions_delete",
         cud: "delete",
@@ -56,14 +56,14 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         params: [{ "field": "name", "api": "name", "location": "path" }, { "field": "allowMissing", "api": "allowMissing", "location": "query" }, { "field": "etag", "api": "etag", "location": "query" }, { "field": "validateOnly", "api": "validateOnly", "location": "query" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             name: z.string().min(1).describe("Required. Resource name of the subscription to delete. Format: `subscriptions/{subscription}`"),
             allowMissing: coerceBoolean.describe("Optional. If set to `true` and the subscription isn't found, the request succeeds but doesn't delete the subscription.").optional(),
             etag: z.string().describe("Optional. Etag of the subscription. If present, it must match with the server's etag. Otherwise, request fails with the status `ABORTED`.").optional(),
             validateOnly: coerceBoolean.describe("Optional. If set to `true`, validates and previews the request, but doesn't delete the subscription.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "workspaceevents_subscriptions_get",
         cud: "read",
@@ -72,11 +72,11 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         params: [{ "field": "name", "api": "name", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             name: z.string().min(1).describe("Required. Resource name of the subscription. Format: `subscriptions/{subscription}`"),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "workspaceevents_subscriptions_list",
         cud: "read",
@@ -85,13 +85,13 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         params: [{ "field": "filter", "api": "filter", "location": "query" }, { "field": "pageSize", "api": "pageSize", "location": "query" }, { "field": "pageToken", "api": "pageToken", "location": "query" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             filter: z.string().describe("Required. A query filter. You can filter subscriptions by event type (`event_types`) and target resource (`target_resource`). You must specify at least one event type in your query. To filter for mult").optional(),
             pageSize: z.number().describe("Optional. The maximum number of subscriptions to return. The service might return fewer than this value. If unspecified or set to `0`, up to 50 subscriptions are returned. The maximum value is 100. If").optional(),
             pageToken: z.string().describe("Optional. A page token, received from a previous list subscriptions call. Provide this parameter to retrieve the subsequent page. When paginating, the filter value should match the call that provided ").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "workspaceevents_subscriptions_patch",
         cud: "update",
@@ -100,14 +100,14 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         params: [{ "field": "name", "api": "name", "location": "path" }, { "field": "updateMask", "api": "updateMask", "location": "query" }, { "field": "validateOnly", "api": "validateOnly", "location": "query" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             name: z.string().min(1).describe("Identifier. Resource name of the subscription. Format: `subscriptions/{subscription}`"),
             updateMask: z.string().describe("Optional. The field to update. If omitted, updates any fields included in the request. You can update one of the following fields in a subscription: * `expire_time`: The timestamp when the subscriptio").optional(),
             validateOnly: coerceBoolean.describe("Optional. If set to `true`, validates and previews the request, but doesn't update the subscription.").optional(),
             body: coerceJson(z.record(z.string(), z.unknown())).describe("Subscription JSON request body. Top-level fields: authority, createTime, driveOptions, etag, eventTypes, expireTime, name, notificationEndpoint, payloadOptions, reconciling, serviceAccountAuthority, state, +6 more."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "workspaceevents_subscriptions_reactivate",
         cud: "update",
@@ -117,11 +117,11 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         hasBody: true,
         bodyParams: [],
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             name: z.string().min(1).describe("Required. Resource name of the subscription. Format: `subscriptions/{subscription}`"),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "workspaceevents_tasks_cancel",
         cud: "delete",
@@ -131,12 +131,12 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         hasBody: true,
         bodyParams: [{ "field": "tenant", "api": "tenant" }],
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             name: z.string().min(1).describe("The resource name of the task to cancel. Format: tasks/{task_id}"),
             tenant: z.string().describe("Optional tenant, provided as a path parameter. Experimental, might still change for 1.0 release.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "workspaceevents_tasks_get",
         cud: "read",
@@ -145,13 +145,13 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         params: [{ "field": "name", "api": "name", "location": "path" }, { "field": "historyLength", "api": "historyLength", "location": "query" }, { "field": "tenant", "api": "tenant", "location": "query" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             name: z.string().min(1).describe("Required. The resource name of the task. Format: tasks/{task_id}"),
             historyLength: z.number().describe("The number of most recent messages from the task's history to retrieve.").optional(),
             tenant: z.string().describe("Optional tenant, provided as a path parameter. Experimental, might still change for 1.0 release.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "workspaceevents_tasks_push_notification_configs_create",
         cud: "create",
@@ -160,14 +160,14 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         params: [{ "field": "parent", "api": "parent", "location": "path" }, { "field": "configId", "api": "configId", "location": "query" }, { "field": "tenant", "api": "tenant", "location": "query" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             parent: z.string().min(1).describe("Required. The parent task resource for this config. Format: tasks/{task_id}"),
             configId: z.string().describe("Required. The ID for the new config.").optional(),
             tenant: z.string().describe("Optional tenant, provided as a path parameter. Experimental, might still change for 1.0 release.").optional(),
             body: coerceJson(z.record(z.string(), z.unknown())).describe("TaskPushNotificationConfig JSON request body. Top-level fields: name, pushNotificationConfig."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "workspaceevents_tasks_push_notification_configs_delete",
         cud: "delete",
@@ -176,12 +176,12 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         params: [{ "field": "name", "api": "name", "location": "path" }, { "field": "tenant", "api": "tenant", "location": "query" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             name: z.string().min(1).describe("The resource name of the config to delete. Format: tasks/{task_id}/pushNotificationConfigs/{config_id}"),
             tenant: z.string().describe("Optional tenant, provided as a path parameter. Experimental, might still change for 1.0 release.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "workspaceevents_tasks_push_notification_configs_get",
         cud: "read",
@@ -190,12 +190,12 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         params: [{ "field": "name", "api": "name", "location": "path" }, { "field": "tenant", "api": "tenant", "location": "query" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             name: z.string().min(1).describe("The resource name of the config to retrieve. Format: tasks/{task_id}/pushNotificationConfigs/{config_id}"),
             tenant: z.string().describe("Optional tenant, provided as a path parameter. Experimental, might still change for 1.0 release.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "workspaceevents_tasks_push_notification_configs_list",
         cud: "read",
@@ -204,14 +204,14 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         params: [{ "field": "parent", "api": "parent", "location": "path" }, { "field": "pageSize", "api": "pageSize", "location": "query" }, { "field": "pageToken", "api": "pageToken", "location": "query" }, { "field": "tenant", "api": "tenant", "location": "query" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             parent: z.string().min(1).describe("The parent task resource. Format: tasks/{task_id}"),
             pageSize: z.number().describe("For AIP-158 these fields are present. Usually not used/needed. The maximum number of configurations to return. If unspecified, all configs will be returned.").optional(),
             pageToken: z.string().describe("A page token received from a previous ListTaskPushNotificationConfigRequest call. Provide this to retrieve the subsequent page. When paginating, all other parameters provided to `ListTaskPushNotificat").optional(),
             tenant: z.string().describe("Optional tenant, provided as a path parameter. Experimental, might still change for 1.0 release.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "workspaceevents_tasks_subscribe",
         cud: "read",
@@ -220,10 +220,10 @@ export function registerWorkspaceeventsGeneratedTools(registry) {
         params: [{ "field": "name", "api": "name", "location": "path" }, { "field": "tenant", "api": "tenant", "location": "query" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             name: z.string().min(1).describe("The resource name of the task to subscribe to. Format: tasks/{task_id}"),
             tenant: z.string().describe("Optional tenant, provided as a path parameter. Experimental, might still change for 1.0 release.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
 }

package/dist/tools/gmail.d.ts

@@ -1,5 +1,6 @@
 import type { ToolRegistry } from '../registry.js';
 import type { Account } from '../accounts.js';
+import { type CuratedToolDeps } from '../client.js';
 import { type ComposeAttachment } from './gmail-mime.js';
 import type { GmailMessageHeader, GmailMessageFull } from '../types.js';
 /** Re: prefix unless the subject already carries one (case-insensitive, after
@@ -42,5 +43,5 @@ export declare function compactMessageRow(m: GmailMessageHeader): {
     date: string;
     snippet: string;
 };
-export declare function registerGmailTools(server: ToolRegistry): void;
+export declare function registerGmailTools(server: ToolRegistry, deps?: CuratedToolDeps): void;
 export {};

package/dist/tools/gmail.js

@@ -1,11 +1,11 @@
 import { z } from 'zod';
 import { coerceArray, coerceBoolean, coerceJson, coerceNumber } from './_coerce.js';
 import { gmail as gmailClient } from '@googleapis/gmail';
-import { accountAliasSchema } from '../accounts.js';
+import { accountArgLive } from '../accounts.js';
 import { getClient } from '../client.js';
 import { handleGoogleApiError, invalidParams, mapGoogleError } from './_errors.js';
 import { buildReplyHeaders, composeRaw, renderMarkdown, htmlToMarkdown, HeaderInjectionError } from './gmail-mime.js';
-import { prepareLocalDest } from './_local-files.js';
+import { hostFilesRefused, prepareLocalDest } from './_local-files.js';
 import { checkOutbound } from '../outbound-allowlist.js';
 import addressparser from 'nodemailer/lib/addressparser/index.js';
 import { lookup as lookupMime } from 'mime-types';
@@ -14,7 +14,6 @@ import { getTokenDir } from '../accounts.js';
 import { sliceClean } from '../trim.js';
 import * as path from 'path';
 import * as fs from 'fs';
-const accountEnum = accountAliasSchema.optional();
 function getHeader(headers, name) {
     return headers?.find((h) => h.name?.toLowerCase() === name.toLowerCase())?.value ?? '';
 }
@@ -107,9 +106,11 @@ export function deriveReplySubject(sourceSubject) {
 // The account's own-address set (primary + Gmail send-as aliases) used to
 // exclude the caller from reply-all. Send-as rarely changes, so memoize per
 // process; a stale miss only costs one extra self-copy, never a wrong send.
+// Keyed by alias AND mailbox: two contexts can share an alias name.
 const ownAddressCache = new Map();
 function getOwnAddresses(gmail, account, primaryEmail) {
-    let cached = ownAddressCache.get(account);
+    const key = `${account} ${normAddr(primaryEmail)}`;
+    let cached = ownAddressCache.get(key);
     if (!cached) {
         cached = (async () => {
             const set = new Set([normAddr(primaryEmail)]);
@@ -125,7 +126,7 @@ function getOwnAddresses(gmail, account, primaryEmail) {
             }
             return set;
         })();
-        ownAddressCache.set(account, cached);
+        ownAddressCache.set(key, cached);
     }
     return cached;
 }
@@ -436,7 +437,14 @@ export function compactMessageRow(m) {
         snippet: snippet.length > 120 ? `${snippet.slice(0, 119)}…` : snippet,
     };
 }
-export function registerGmailTools(server) {
+export function registerGmailTools(server, deps = {}) {
+    // Per-registry, LIVE account enum + injectable client (S1.10): the
+    // schema follows the registry's account view at parse time, and the
+    // custody path is the context's, not the process global.
+    const accountEnum = accountArgLive(() => server.accountAliases()).optional();
+    const getClientFn = deps.getClientFn ?? getClient;
+    const localFiles = deps.localFiles ?? true;
+    const registerHostFileTool = localFiles ? server.registerTool : (() => undefined);
     server.registerTool('gmail_search', {
         description: 'Search messages in a Gmail account. Returns compact rows (id, from, subject, date, snippet); ' +
             'pass full=true for threadId, to, labelIds and the untruncated snippet.',
@@ -454,7 +462,7 @@ export function registerGmailTools(server) {
             if (query.trim() === '') {
                 return invalidParams(account, '`query` is empty, and Gmail reads an empty query as "match everything".', 'Pass a real Gmail search term such as "is:unread" or "from:someone@example.com". Returning the whole mailbox for a blank query would look like a successful search.');
             }
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             const listRes = await gmail.users.messages.list({
                 userId: 'me',
@@ -511,7 +519,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account, messageId, full, rawHtml }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.messages.get({
                 userId: 'me',
@@ -542,7 +550,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account, threadId, full, rawHtml, mode }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             if (mode === 'summary') {
                 const res = await gmail.users.threads.get({
@@ -592,7 +600,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account, ids, full, rawHtml }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             const result = await readBatch(gmail, account, ids ?? [], full === true, rawHtml === true);
             return {
@@ -622,13 +630,15 @@ export function registerGmailTools(server) {
                 .describe('With replyToMessageId: include the source To+Cc (minus your own addresses) in cc. Default false (reply to sender only).'),
             replyToThreadId: z.string().optional()
                 .describe('Thread ID to send the message in'),
-            attachments: coerceJson(attachmentSchema),
+            ...(localFiles ? { attachments: coerceJson(attachmentSchema) } : {}),
         },
     }, async ({ account, to, subject, body, htmlBody, allowRawHtml, cc, replyToMessageId, replyAll, replyToThreadId, attachments }) => {
+        if (!localFiles && attachments?.length)
+            return hostFilesRefused(account, 'attachments');
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
-            const config = (await import('../accounts.js')).getAccountSet().configs[account];
+            const config = server.accountSet().configs[account];
             if (htmlBody !== undefined) {
                 throw new GmailComposeError('E_HTMLBODY_REMOVED', 'htmlBody was removed in v6: author Markdown in `body`; for literal HTML pass `allowRawHtml: true`.');
             }
@@ -686,7 +696,7 @@ export function registerGmailTools(server) {
             return mapped ?? handleGmailError(error, account);
         }
     });
-    server.registerTool('gmail_download_attachment', {
+    registerHostFileTool('gmail_download_attachment', {
         description: 'Download an email attachment to local disk. Use gmail_read first to get the attachmentId.',
         inputSchema: {
             account: accountEnum.describe('Google account alias'),
@@ -697,7 +707,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account, messageId, attachmentId, filename, savePath }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.messages.attachments.get({
                 userId: 'me',
@@ -737,13 +747,15 @@ export function registerGmailTools(server) {
                 .describe('With replyToMessageId: include the source To+Cc (minus your own addresses) in cc. Default false (reply to sender only).'),
             replyToThreadId: z.string().optional()
                 .describe('Thread ID to associate the draft with'),
-            attachments: coerceJson(attachmentSchema),
+            ...(localFiles ? { attachments: coerceJson(attachmentSchema) } : {}),
         },
     }, async ({ account, to, subject, body, htmlBody, allowRawHtml, cc, replyToMessageId, replyAll, replyToThreadId, attachments }) => {
+        if (!localFiles && attachments?.length)
+            return hostFilesRefused(account, 'attachments');
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
-            const config = (await import('../accounts.js')).getAccountSet().configs[account];
+            const config = server.accountSet().configs[account];
             if (htmlBody !== undefined) {
                 throw new GmailComposeError('E_HTMLBODY_REMOVED', 'htmlBody was removed in v6: author Markdown in `body`; for literal HTML pass `allowRawHtml: true`.');
             }
@@ -811,7 +823,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account, messageId, addLabelIds, removeLabelIds }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.messages.modify({
                 userId: 'me',
@@ -838,7 +850,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account, messageId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.messages.trash({ userId: 'me', id: messageId });
             return {
@@ -858,7 +870,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account, messageId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             await gmail.users.messages.delete({ userId: 'me', id: messageId });
             return {
@@ -880,7 +892,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account, messageIds, addLabelIds, removeLabelIds }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             await gmail.users.messages.batchModify({
                 userId: 'me',
@@ -907,7 +919,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account, messageIds }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             await gmail.users.messages.batchDelete({
                 userId: 'me',
@@ -932,7 +944,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account, maxResults, query }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.drafts.list({
                 userId: 'me',
@@ -956,7 +968,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account, draftId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.drafts.get({
                 userId: 'me',
@@ -980,7 +992,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account, draftId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.drafts.send({
                 userId: 'me',
@@ -1002,7 +1014,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.labels.list({ userId: 'me' });
             return {
@@ -1026,7 +1038,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account, name, messageListVisibility, labelListVisibility }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.labels.create({
                 userId: 'me',
@@ -1053,7 +1065,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account, labelId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             await gmail.users.labels.delete({ userId: 'me', id: labelId });
             return {
@@ -1072,7 +1084,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.getProfile({ userId: 'me' });
             return {
@@ -1096,7 +1108,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account, startHistoryId, maxResults, historyTypes }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.history.list({
                 userId: 'me',
@@ -1120,7 +1132,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.settings.getVacation({ userId: 'me' });
             return {
@@ -1146,7 +1158,7 @@ export function registerGmailTools(server) {
         },
     }, async ({ account, enableAutoReply, responseSubject, responseBodyPlainText, startTime, endTime, restrictToContacts, restrictToDomain }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const gmail = gmailClient({ version: 'v1', auth });
             const res = await gmail.users.settings.updateVacation({
                 userId: 'me',

package/dist/tools/google-api.d.ts

@@ -1,10 +1,9 @@
 import type { ToolRegistry } from '../registry.js';
 import { type Policy } from '../write-control.js';
-import { getClient } from '../client.js';
 import { type Toolsets } from '../toolsets.js';
+import { type ExecuteDeps } from '../executor.js';
 import { type DiscoveryDeps, type DiscoveryMethod } from '../discovery-client.js';
-export interface EscapeDeps extends DiscoveryDeps {
-    getClientFn?: typeof getClient;
+export interface EscapeDeps extends DiscoveryDeps, ExecuteDeps {
     toolsets?: Toolsets;
 }
 /** Up to three closest known ids for the unknown_method did-you-mean hint;