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

package/dist/tools/generated/gmail.js

@@ -2,7 +2,7 @@
 import { z } from 'zod';
 import { coerceArray, coerceBoolean, coerceJson } from '../_coerce.js';
 import { accountField, registerGeneratedTool } from './_shared.js';
-export function registerGmailGeneratedTools(registry) {
+export function registerGmailGeneratedTools(registry, deps = {}) {
     // Interned method scope sets (shared across tools; see scope-observability).
     const S_gmail_v1 = [
         ["https://mail.google.com/", "https://www.googleapis.com/auth/gmail.addons.current.action.compose", "https://www.googleapis.com/auth/gmail.compose", "https://www.googleapis.com/auth/gmail.modify"],
@@ -26,12 +26,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "id", "api": "id", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             id: z.string().min(1).describe("The ID of the draft to delete."),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_drafts_update",
         cud: "update",
@@ -40,13 +40,13 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "id", "api": "id", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             id: z.string().min(1).describe("The ID of the draft to update."),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             body: coerceJson(z.record(z.string(), z.unknown())).describe("Draft JSON request body. Top-level fields: id, message."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_labels_get",
         cud: "read",
@@ -55,12 +55,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "id", "api": "id", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             id: z.string().min(1).describe("The ID of the label to retrieve."),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_labels_patch",
         cud: "update",
@@ -69,13 +69,13 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "id", "api": "id", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             id: z.string().min(1).describe("The ID of the label to update."),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             body: coerceJson(z.record(z.string(), z.unknown())).describe("Label JSON request body. Top-level fields: color, id, labelListVisibility, messageListVisibility, messagesTotal, messagesUnread, name, threadsTotal, threadsUnread, type."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_labels_update",
         cud: "update",
@@ -84,13 +84,13 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "id", "api": "id", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             id: z.string().min(1).describe("The ID of the label to update."),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             body: coerceJson(z.record(z.string(), z.unknown())).describe("Label JSON request body. Top-level fields: color, id, labelListVisibility, messageListVisibility, messagesTotal, messagesUnread, name, threadsTotal, threadsUnread, type."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_messages_import",
         cud: "create",
@@ -99,7 +99,7 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "field": "deleted", "api": "deleted", "location": "query" }, { "field": "internalDateSource", "api": "internalDateSource", "location": "query" }, { "field": "neverMarkSpam", "api": "neverMarkSpam", "location": "query" }, { "field": "processForCalendar", "api": "processForCalendar", "location": "query" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             deleted: coerceBoolean.describe("Mark the email as permanently deleted (not TRASH) and only visible in Google Vault to a Vault administrator. Only used for Google Workspace accounts.").optional(),
             internalDateSource: z.enum(["receivedTime", "dateHeader"]).describe("Source for Gmail's internal date of the message.").optional(),
@@ -108,7 +108,7 @@ export function registerGmailGeneratedTools(registry) {
             body: coerceJson(z.record(z.string(), z.unknown())).describe("Message JSON request body. Top-level fields: classificationLabelValues, historyId, id, internalDate, labelIds, payload, raw, sizeEstimate, snippet, threadId."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_messages_insert",
         cud: "create",
@@ -117,14 +117,14 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "field": "deleted", "api": "deleted", "location": "query" }, { "field": "internalDateSource", "api": "internalDateSource", "location": "query" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             deleted: coerceBoolean.describe("Mark the email as permanently deleted (not TRASH) and only visible in Google Vault to a Vault administrator. Only used for Google Workspace accounts.").optional(),
             internalDateSource: z.enum(["receivedTime", "dateHeader"]).describe("Source for Gmail's internal date of the message.").optional(),
             body: coerceJson(z.record(z.string(), z.unknown())).describe("Message JSON request body. Top-level fields: classificationLabelValues, historyId, id, internalDate, labelIds, payload, raw, sizeEstimate, snippet, threadId."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_messages_untrash",
         cud: "update",
@@ -133,12 +133,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "id", "api": "id", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             id: z.string().min(1).describe("The ID of the message to remove from Trash."),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_cse_identities_create",
         cud: "create",
@@ -147,12 +147,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("The requester's primary email address. To indicate the authenticated user, you can use the special value `me`."),
             body: coerceJson(z.record(z.string(), z.unknown())).describe("CseIdentity JSON request body. Top-level fields: emailAddress, primaryKeyPairId, signAndEncryptKeyPairs."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_cse_identities_delete",
         cud: "delete",
@@ -161,12 +161,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "cseEmailAddress", "api": "cseEmailAddress", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             cseEmailAddress: z.string().min(1).describe("The primary email address associated with the client-side encryption identity configuration that's removed."),
             userId: z.string().min(1).describe("The requester's primary email address. To indicate the authenticated user, you can use the special value `me`."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_cse_identities_get",
         cud: "read",
@@ -175,12 +175,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "cseEmailAddress", "api": "cseEmailAddress", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             cseEmailAddress: z.string().min(1).describe("The primary email address associated with the client-side encryption identity configuration that's retrieved."),
             userId: z.string().min(1).describe("The requester's primary email address. To indicate the authenticated user, you can use the special value `me`."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_cse_identities_list",
         cud: "read",
@@ -189,13 +189,13 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "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()),
             userId: z.string().min(1).describe("The requester's primary email address. To indicate the authenticated user, you can use the special value `me`."),
             pageSize: z.number().describe("The number of identities to return. If not provided, the page size will default to 20 entries.").optional(),
             pageToken: z.string().describe("Pagination token indicating which page of identities to return. If the token is not supplied, then the API will return the first page of results.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_cse_identities_patch",
         cud: "update",
@@ -204,13 +204,13 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "emailAddress", "api": "emailAddress", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             emailAddress: z.string().min(1).describe("The email address of the client-side encryption identity to update."),
             userId: z.string().min(1).describe("The requester's primary email address. To indicate the authenticated user, you can use the special value `me`."),
             body: coerceJson(z.record(z.string(), z.unknown())).describe("CseIdentity JSON request body. Top-level fields: emailAddress, primaryKeyPairId, signAndEncryptKeyPairs."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_cse_keypairs_create",
         cud: "create",
@@ -219,13 +219,13 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "field": "chainValidation", "api": "chainValidation", "location": "query" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("The requester's primary email address. To indicate the authenticated user, you can use the special value `me`."),
             chainValidation: z.enum(["all", "none"]).describe("The type of certificate chain validation to perform at creation. The request will be rejected if the uploaded chain fails to satisfy the requested validation checks. When unspecified, this parameter d").optional(),
             body: coerceJson(z.record(z.string(), z.unknown())).describe("CseKeyPair JSON request body. Top-level fields: disableTime, enablementState, keyPairId, pem, pkcs7, privateKeyMetadata, subjectEmailAddresses."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_cse_keypairs_disable",
         cud: "update",
@@ -235,12 +235,12 @@ export function registerGmailGeneratedTools(registry) {
         hasBody: true,
         bodyParams: [],
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             keyPairId: z.string().min(1).describe("The identifier of the key pair to turn off."),
             userId: z.string().min(1).describe("The requester's primary email address. To indicate the authenticated user, you can use the special value `me`."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_cse_keypairs_enable",
         cud: "update",
@@ -250,12 +250,12 @@ export function registerGmailGeneratedTools(registry) {
         hasBody: true,
         bodyParams: [],
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             keyPairId: z.string().min(1).describe("The identifier of the key pair to turn on."),
             userId: z.string().min(1).describe("The requester's primary email address. To indicate the authenticated user, you can use the special value `me`."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_cse_keypairs_get",
         cud: "read",
@@ -264,12 +264,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "keyPairId", "api": "keyPairId", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             keyPairId: z.string().min(1).describe("The identifier of the key pair to retrieve."),
             userId: z.string().min(1).describe("The requester's primary email address. To indicate the authenticated user, you can use the special value `me`."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_cse_keypairs_list",
         cud: "read",
@@ -278,13 +278,13 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "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()),
             userId: z.string().min(1).describe("The requester's primary email address. To indicate the authenticated user, you can use the special value `me`."),
             pageSize: z.number().describe("The number of key pairs to return. If not provided, the page size will default to 20 entries.").optional(),
             pageToken: z.string().describe("Pagination token indicating which page of key pairs to return. If the token is not supplied, then the API will return the first page of results.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_cse_keypairs_obliterate",
         cud: "delete",
@@ -294,12 +294,12 @@ export function registerGmailGeneratedTools(registry) {
         hasBody: true,
         bodyParams: [],
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             keyPairId: z.string().min(1).describe("The identifier of the key pair to obliterate."),
             userId: z.string().min(1).describe("The requester's primary email address. To indicate the authenticated user, you can use the special value `me`."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_delegates_create",
         cud: "create",
@@ -309,13 +309,13 @@ export function registerGmailGeneratedTools(registry) {
         hasBody: true,
         bodyParams: [{ "field": "delegateEmail", "api": "delegateEmail" }, { "field": "verificationStatus", "api": "verificationStatus" }],
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             delegateEmail: z.string().describe("The email address of the delegate.").optional(),
             verificationStatus: z.enum(["verificationStatusUnspecified", "accepted", "pending", "rejected", "expired"]).describe("Indicates whether this address has been verified and can act as a delegate for the account. Read-only.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_delegates_delete",
         cud: "delete",
@@ -324,12 +324,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "delegateEmail", "api": "delegateEmail", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             delegateEmail: z.string().min(1).describe("The email address of the user to be removed as a delegate."),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_delegates_get",
         cud: "read",
@@ -338,12 +338,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "delegateEmail", "api": "delegateEmail", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             delegateEmail: z.string().min(1).describe("The email address of the user whose delegate relationship is to be retrieved."),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_delegates_list",
         cud: "read",
@@ -352,11 +352,11 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_filters_create",
         cud: "create",
@@ -365,12 +365,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             body: coerceJson(z.record(z.string(), z.unknown())).describe("Filter JSON request body. Top-level fields: action, criteria, id."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_filters_delete",
         cud: "delete",
@@ -379,12 +379,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "id", "api": "id", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             id: z.string().min(1).describe("The ID of the filter to be deleted."),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_filters_get",
         cud: "read",
@@ -393,12 +393,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "id", "api": "id", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             id: z.string().min(1).describe("The ID of the filter to be fetched."),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_filters_list",
         cud: "read",
@@ -407,11 +407,11 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_forwarding_addresses_create",
         cud: "create",
@@ -421,13 +421,13 @@ export function registerGmailGeneratedTools(registry) {
         hasBody: true,
         bodyParams: [{ "field": "forwardingEmail", "api": "forwardingEmail" }, { "field": "verificationStatus", "api": "verificationStatus" }],
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             forwardingEmail: z.string().describe("An email address to which messages can be forwarded.").optional(),
             verificationStatus: z.enum(["verificationStatusUnspecified", "accepted", "pending"]).describe("Indicates whether this address has been verified and is usable for forwarding. Read-only.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_forwarding_addresses_delete",
         cud: "delete",
@@ -436,12 +436,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "forwardingEmail", "api": "forwardingEmail", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             forwardingEmail: z.string().min(1).describe("The forwarding address to be deleted."),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_forwarding_addresses_get",
         cud: "read",
@@ -450,12 +450,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "forwardingEmail", "api": "forwardingEmail", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             forwardingEmail: z.string().min(1).describe("The forwarding address to be retrieved."),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_forwarding_addresses_list",
         cud: "read",
@@ -464,11 +464,11 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_get_auto_forwarding",
         cud: "read",
@@ -477,11 +477,11 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_get_imap",
         cud: "read",
@@ -490,11 +490,11 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_get_language",
         cud: "read",
@@ -503,11 +503,11 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_get_pop",
         cud: "read",
@@ -516,11 +516,11 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_send_as_create",
         cud: "create",
@@ -529,12 +529,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             body: coerceJson(z.record(z.string(), z.unknown())).describe("SendAs JSON request body. Top-level fields: displayName, isDefault, isPrimary, replyToAddress, sendAsEmail, signature, smtpMsa, treatAsAlias, verificationStatus."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_send_as_delete",
         cud: "delete",
@@ -543,12 +543,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "sendAsEmail", "api": "sendAsEmail", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             sendAsEmail: z.string().min(1).describe("The send-as alias to be deleted."),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_send_as_get",
         cud: "read",
@@ -557,12 +557,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "sendAsEmail", "api": "sendAsEmail", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             sendAsEmail: z.string().min(1).describe("The send-as alias to be retrieved."),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_send_as_list",
         cud: "read",
@@ -571,11 +571,11 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_send_as_patch",
         cud: "update",
@@ -584,13 +584,13 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "sendAsEmail", "api": "sendAsEmail", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             sendAsEmail: z.string().min(1).describe("The send-as alias to be updated."),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             body: coerceJson(z.record(z.string(), z.unknown())).describe("SendAs JSON request body. Top-level fields: displayName, isDefault, isPrimary, replyToAddress, sendAsEmail, signature, smtpMsa, treatAsAlias, verificationStatus."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_send_as_smime_info_delete",
         cud: "delete",
@@ -599,13 +599,13 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "id", "api": "id", "location": "path" }, { "field": "sendAsEmail", "api": "sendAsEmail", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             id: z.string().min(1).describe("The immutable ID for the SmimeInfo."),
             sendAsEmail: z.string().min(1).describe("The email address that appears in the \"From:\" header for mail sent using this alias."),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_send_as_smime_info_get",
         cud: "read",
@@ -614,13 +614,13 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "id", "api": "id", "location": "path" }, { "field": "sendAsEmail", "api": "sendAsEmail", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             id: z.string().min(1).describe("The immutable ID for the SmimeInfo."),
             sendAsEmail: z.string().min(1).describe("The email address that appears in the \"From:\" header for mail sent using this alias."),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_send_as_smime_info_insert",
         cud: "create",
@@ -630,7 +630,7 @@ export function registerGmailGeneratedTools(registry) {
         hasBody: true,
         bodyParams: [{ "field": "encryptedKeyPassword", "api": "encryptedKeyPassword" }, { "field": "expiration", "api": "expiration" }, { "field": "id", "api": "id" }, { "field": "isDefault", "api": "isDefault" }, { "field": "issuerCn", "api": "issuerCn" }, { "field": "pem", "api": "pem" }, { "field": "pkcs12", "api": "pkcs12" }],
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             sendAsEmail: z.string().min(1).describe("The email address that appears in the \"From:\" header for mail sent using this alias."),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             encryptedKeyPassword: z.string().describe("Encrypted key password, when key is encrypted.").optional(),
@@ -642,7 +642,7 @@ export function registerGmailGeneratedTools(registry) {
             pkcs12: z.string().describe("PKCS#12 format containing a single private/public key pair and certificate chain. This format is only accepted from client for creating a new SmimeInfo and is never returned, because the private key i").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_send_as_smime_info_list",
         cud: "read",
@@ -651,12 +651,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "sendAsEmail", "api": "sendAsEmail", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             sendAsEmail: z.string().min(1).describe("The email address that appears in the \"From:\" header for mail sent using this alias."),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_send_as_smime_info_set_default",
         cud: "update",
@@ -665,13 +665,13 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "id", "api": "id", "location": "path" }, { "field": "sendAsEmail", "api": "sendAsEmail", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             id: z.string().min(1).describe("The immutable ID for the SmimeInfo."),
             sendAsEmail: z.string().min(1).describe("The email address that appears in the \"From:\" header for mail sent using this alias."),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_send_as_update",
         cud: "update",
@@ -680,13 +680,13 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "sendAsEmail", "api": "sendAsEmail", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: true,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             sendAsEmail: z.string().min(1).describe("The send-as alias to be updated."),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             body: coerceJson(z.record(z.string(), z.unknown())).describe("SendAs JSON request body. Top-level fields: displayName, isDefault, isPrimary, replyToAddress, sendAsEmail, signature, smtpMsa, treatAsAlias, verificationStatus."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_send_as_verify",
         cud: "create",
@@ -695,12 +695,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "sendAsEmail", "api": "sendAsEmail", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             sendAsEmail: z.string().min(1).describe("The send-as alias to be verified."),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_update_auto_forwarding",
         cud: "update",
@@ -710,14 +710,14 @@ export function registerGmailGeneratedTools(registry) {
         hasBody: true,
         bodyParams: [{ "field": "disposition", "api": "disposition" }, { "field": "emailAddress", "api": "emailAddress" }, { "field": "enabled", "api": "enabled" }],
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             disposition: z.enum(["dispositionUnspecified", "leaveInInbox", "archive", "trash", "markRead"]).describe("The state that a message should be left in after it has been forwarded.").optional(),
             emailAddress: z.string().describe("Email address to which all incoming messages are forwarded. This email address must be a verified member of the forwarding addresses.").optional(),
             enabled: coerceBoolean.describe("Whether all incoming mail is automatically forwarded to another address.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_update_imap",
         cud: "update",
@@ -727,7 +727,7 @@ export function registerGmailGeneratedTools(registry) {
         hasBody: true,
         bodyParams: [{ "field": "autoExpunge", "api": "autoExpunge" }, { "field": "enabled", "api": "enabled" }, { "field": "expungeBehavior", "api": "expungeBehavior" }, { "field": "maxFolderSize", "api": "maxFolderSize" }],
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             autoExpunge: coerceBoolean.describe("If this value is true, Gmail will immediately expunge a message when it is marked as deleted in IMAP. Otherwise, Gmail will wait for an update from the client before expunging messages marked as delet").optional(),
             enabled: coerceBoolean.describe("Whether IMAP is enabled for the account.").optional(),
@@ -735,7 +735,7 @@ export function registerGmailGeneratedTools(registry) {
             maxFolderSize: z.number().describe("An optional limit on the number of messages that an IMAP folder may contain. Legal values are 0, 1000, 2000, 5000 or 10000. A value of zero is interpreted to mean that there is no limit.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_update_language",
         cud: "update",
@@ -745,12 +745,12 @@ export function registerGmailGeneratedTools(registry) {
         hasBody: true,
         bodyParams: [{ "field": "displayLanguage", "api": "displayLanguage" }],
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             displayLanguage: z.string().describe("The language to display Gmail in, formatted as an RFC 3066 Language Tag (for example `en-GB`, `fr` or `ja` for British English, French, or Japanese respectively). The set of languages supported by Gma").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_settings_update_pop",
         cud: "update",
@@ -760,13 +760,13 @@ export function registerGmailGeneratedTools(registry) {
         hasBody: true,
         bodyParams: [{ "field": "accessWindow", "api": "accessWindow" }, { "field": "disposition", "api": "disposition" }],
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("User's email address. The special value \"me\" can be used to indicate the authenticated user."),
             accessWindow: z.enum(["accessWindowUnspecified", "disabled", "fromNowOn", "allMail"]).describe("The range of messages which are accessible via POP.").optional(),
             disposition: z.enum(["dispositionUnspecified", "leaveInInbox", "archive", "trash", "markRead"]).describe("The action that will be executed on a message after it has been fetched via POP.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_stop",
         cud: "delete",
@@ -775,11 +775,11 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_threads_delete",
         cud: "delete",
@@ -788,12 +788,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "id", "api": "id", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             id: z.string().min(1).describe("ID of the Thread to delete."),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_threads_list",
         cud: "read",
@@ -802,7 +802,7 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "userId", "api": "userId", "location": "path" }, { "field": "includeSpamTrash", "api": "includeSpamTrash", "location": "query" }, { "field": "labelIds", "api": "labelIds", "location": "query" }, { "field": "maxResults", "api": "maxResults", "location": "query" }, { "field": "pageToken", "api": "pageToken", "location": "query" }, { "field": "q", "api": "q", "location": "query" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             includeSpamTrash: coerceBoolean.describe("Include threads from `SPAM` and `TRASH` in the results.").optional(),
             labelIds: coerceArray(z.string()).describe("Only return threads with labels that match all of the specified label IDs.").optional(),
@@ -811,7 +811,7 @@ export function registerGmailGeneratedTools(registry) {
             q: z.string().describe("Only return threads matching the specified query. Supports the same query format as the Gmail search box. For example, `\"from:someuser@example.com rfc822msgid: is:unread\"`. Parameter cannot be used wh").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_threads_modify",
         cud: "update",
@@ -821,14 +821,14 @@ export function registerGmailGeneratedTools(registry) {
         hasBody: true,
         bodyParams: [{ "field": "addLabelIds", "api": "addLabelIds" }, { "field": "removeLabelIds", "api": "removeLabelIds" }],
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             id: z.string().min(1).describe("The ID of the thread to modify."),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             addLabelIds: coerceArray(z.string()).describe("A list of IDs of labels to add to this thread. You can add up to 100 labels with each update.").optional(),
             removeLabelIds: coerceArray(z.string()).describe("A list of IDs of labels to remove from this thread. You can remove up to 100 labels with each update.").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_threads_trash",
         cud: "delete",
@@ -837,12 +837,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "id", "api": "id", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             id: z.string().min(1).describe("The ID of the thread to Trash."),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_threads_untrash",
         cud: "update",
@@ -851,12 +851,12 @@ export function registerGmailGeneratedTools(registry) {
         params: [{ "field": "id", "api": "id", "location": "path" }, { "field": "userId", "api": "userId", "location": "path" }, { "field": "fields", "api": "fields", "location": "query" }],
         hasBody: false,
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             id: z.string().min(1).describe("The ID of the thread to remove from Trash."),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
     registerGeneratedTool(registry, {
         name: "gmail_users_watch",
         cud: "create",
@@ -866,7 +866,7 @@ export function registerGmailGeneratedTools(registry) {
         hasBody: true,
         bodyParams: [{ "field": "labelFilterAction", "api": "labelFilterAction" }, { "field": "labelFilterBehavior", "api": "labelFilterBehavior" }, { "field": "labelIds", "api": "labelIds" }, { "field": "topicName", "api": "topicName" }],
         shape: {
-            account: accountField(),
+            account: accountField(() => registry.accountAliases()),
             userId: z.string().min(1).describe("The user's email address. The special value `me` can be used to indicate the authenticated user."),
             labelFilterAction: z.enum(["include", "exclude"]).describe("Filtering behavior of `labelIds list` specified. This field is deprecated because it caused incorrect behavior in some cases; use `label_filter_behavior` instead.").optional(),
             labelFilterBehavior: z.enum(["include", "exclude"]).describe("Filtering behavior of `labelIds list` specified. This field replaces `label_filter_action`; if set, `label_filter_action` is ignored.").optional(),
@@ -874,5 +874,5 @@ export function registerGmailGeneratedTools(registry) {
             topicName: z.string().describe("A fully qualified Google Cloud Pub/Sub API topic name to publish the events to. This topic name **must** already exist in Cloud Pub/Sub and you **must** have already granted gmail \"publish\" permission").optional(),
             fields: z.string().optional().describe('Response field mask.'),
         },
-    });
+    }, deps);
 }