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

package/dist/tools/calendar.js

@@ -1,13 +1,16 @@
 import { z } from 'zod';
 import { coerceArray, coerceBoolean } from './_coerce.js';
 import { calendar as calendarClient } from '@googleapis/calendar';
-import { accountAliasSchema } from '../accounts.js';
+import { accountArgLive } from '../accounts.js';
 import { getClient } from '../client.js';
 import { checkOutbound } from '../outbound-allowlist.js';
 import { handleGoogleApiError, invalidParams } from './_errors.js';
 import { listResult, sliceClean } from '../trim.js';
-const accountEnum = accountAliasSchema.optional();
-export function registerCalendarTools(server) {
+export function registerCalendarTools(server, deps = {}) {
+    // Per-registry, live account enum + injectable client: the schema follows
+    // the registry's account view at parse time, not a process-global default.
+    const accountEnum = accountArgLive(() => server.accountAliases()).optional();
+    const getClientFn = deps.getClientFn ?? getClient;
     server.registerTool('calendar_list_calendars', {
         description: 'List all calendars for a Google account',
         inputSchema: {
@@ -15,7 +18,7 @@ export function registerCalendarTools(server) {
         },
     }, async ({ account }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const cal = calendarClient({ version: 'v3', auth });
             const res = await cal.calendarList.list();
             const calendars = (res.data.items ?? []).map((c) => ({
@@ -55,7 +58,7 @@ export function registerCalendarTools(server) {
         if (rangeError)
             return invalidParams(account, rangeError, TIME_RANGE_HINT);
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const cal = calendarClient({ version: 'v3', auth });
             const params = {
                 calendarId: calendarId ?? 'primary',
@@ -98,7 +101,7 @@ export function registerCalendarTools(server) {
         },
     }, async ({ account, eventId, calendarId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const cal = calendarClient({ version: 'v3', auth });
             const res = await cal.events.get({
                 calendarId: calendarId ?? 'primary',
@@ -135,7 +138,7 @@ export function registerCalendarTools(server) {
                 if (outbound)
                     return outbound;
             }
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const cal = calendarClient({ version: 'v3', auth });
             const event = { summary };
             if (allDay) {
@@ -190,7 +193,7 @@ export function registerCalendarTools(server) {
                 if (outbound)
                     return outbound;
             }
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const cal = calendarClient({ version: 'v3', auth });
             // Fetch the event first so a 404 surfaces before we attempt the patch.
             await cal.events.get({
@@ -243,7 +246,7 @@ export function registerCalendarTools(server) {
         },
     }, async ({ account, eventId, calendarId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const cal = calendarClient({ version: 'v3', auth });
             await cal.events.delete({
                 calendarId: calendarId ?? 'primary',
@@ -268,7 +271,7 @@ export function registerCalendarTools(server) {
         },
     }, async ({ account, calendarId, text, sendNotifications }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const cal = calendarClient({ version: 'v3', auth });
             const res = await cal.events.quickAdd({
                 calendarId: calendarId ?? 'primary',
@@ -294,7 +297,7 @@ export function registerCalendarTools(server) {
         },
     }, async ({ account, calendarId, eventId, destinationCalendarId, sendNotifications }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const cal = calendarClient({ version: 'v3', auth });
             const res = await cal.events.move({
                 calendarId,
@@ -329,7 +332,7 @@ export function registerCalendarTools(server) {
         if (rangeError)
             return invalidParams(account, rangeError, TIME_RANGE_HINT);
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const cal = calendarClient({ version: 'v3', auth });
             const res = await cal.events.instances({
                 calendarId: calendarId ?? 'primary',
@@ -367,7 +370,7 @@ export function registerCalendarTools(server) {
             const rangeError = timeRangeError(timeMin, timeMax);
             if (rangeError)
                 return invalidParams(account, rangeError, TIME_RANGE_HINT);
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const cal = calendarClient({ version: 'v3', auth });
             const res = await cal.freebusy.query({
                 requestBody: {
@@ -378,10 +381,8 @@ export function registerCalendarTools(server) {
                 },
             });
             return {
-                // freebusy answers 200 with NO `calendars` key on an empty items
-                // list, and JSON.stringify(undefined) returns undefined, not a
-                // string: the SDK then rejected our own result with -32602. The
-                // value is a map keyed by calendar id, so the fallback is {}.
+                // Empty items returns 200 with no `calendars` key; JSON.stringify(undefined)
+                // would make the SDK reject our own result, so fall back to {}.
                 content: [{ type: 'text', text: JSON.stringify(res.data.calendars ?? {}, null, 2) }],
             };
         }
@@ -399,7 +400,7 @@ export function registerCalendarTools(server) {
         },
     }, async ({ account, summary, description, timeZone }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const cal = calendarClient({ version: 'v3', auth });
             const res = await cal.calendars.insert({
                 requestBody: {

package/dist/tools/chat.d.ts

@@ -1,2 +1,11 @@
 import type { ToolRegistry } from '../registry.js';
-export declare function registerChatTools(server: ToolRegistry): void;
+import type { Account } from '../accounts.js';
+import { type CuratedToolDeps } from '../client.js';
+export declare function registerChatTools(server: ToolRegistry, deps?: CuratedToolDeps): void;
+export declare function handleChatError(error: any, account: Account): {
+    content: {
+        type: "text";
+        text: string;
+    }[];
+    isError: true;
+};

package/dist/tools/chat.js

@@ -1,11 +1,14 @@
 import { z } from 'zod';
 import { coerceJson } from './_coerce.js';
 import { chat as chatClient } from '@googleapis/chat';
-import { accountAliasSchema } from '../accounts.js';
+import { accountArgLive } from '../accounts.js';
 import { getClient } from '../client.js';
 import { handleGoogleApiError, invalidParams } from './_errors.js';
-const accountEnum = accountAliasSchema.optional();
-export function registerChatTools(server) {
+export function registerChatTools(server, deps = {}) {
+    // Per-registry, live account enum + injectable client: the schema follows
+    // the registry's account view at parse time, not a process-global default.
+    const accountEnum = accountArgLive(() => server.accountAliases()).optional();
+    const getClientFn = deps.getClientFn ?? getClient;
     server.registerTool('chat_spaces_list', {
         description: 'List Google Chat spaces the user is a member of',
         inputSchema: {
@@ -16,7 +19,7 @@ export function registerChatTools(server) {
         },
     }, async ({ account, pageSize, pageToken, filter }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const chat = chatClient({ version: 'v1', auth });
             const res = await chat.spaces.list({
                 pageSize: pageSize ?? 100,
@@ -39,7 +42,7 @@ export function registerChatTools(server) {
         },
     }, async ({ account, name }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const chat = chatClient({ version: 'v1', auth });
             const res = await chat.spaces.get({ name });
             return {
@@ -65,7 +68,7 @@ export function registerChatTools(server) {
             if (!text && (!cardsV2 || cardsV2.length === 0)) {
                 return invalidParams(account, 'A message needs content: neither text nor cardsV2 was supplied.', 'Pass text for a plain message, or cardsV2 for a Card v2 payload. Both may be sent together.');
             }
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const chat = chatClient({ version: 'v1', auth });
             const requestBody = {};
             if (text)
@@ -99,7 +102,7 @@ export function registerChatTools(server) {
         },
     }, async ({ account, parent, pageSize, pageToken, filter, orderBy }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const chat = chatClient({ version: 'v1', auth });
             const res = await chat.spaces.messages.list({
                 parent,
@@ -117,9 +120,10 @@ export function registerChatTools(server) {
         }
     });
 }
-function handleChatError(error, account) {
+export function handleChatError(error, account) {
     return handleGoogleApiError(error, account, {
         scope: 'Chat tools require the optional "chat" scope bundle: add it to this account\'s scope profile, then re-auth.',
         resource: `Google Chat denied this space or message to "${account}". The scope is not the problem: check that the account is a member of the space, and that Chat is turned on for the Workspace.`,
+        bundle: 'chat',
     });
 }

package/dist/tools/contacts.d.ts

@@ -1,4 +1,5 @@
 import type { ToolRegistry } from '../registry.js';
+import { type CuratedToolDeps } from '../client.js';
 export interface ResolveCandidate {
     resourceName: string;
     displayName: string;
@@ -39,4 +40,4 @@ export declare function resolveContacts(candidates: ResolveCandidate[], name: st
     }[];
     resolved?: undefined;
 };
-export declare function registerContactsTools(server: ToolRegistry): void;
+export declare function registerContactsTools(server: ToolRegistry, deps?: CuratedToolDeps): void;

package/dist/tools/contacts.js

@@ -1,11 +1,10 @@
 import { z } from 'zod';
 import { people as peopleClient } from '@googleapis/people';
-import { accountAliasSchema } from '../accounts.js';
+import { accountArgLive } from '../accounts.js';
 import { getClient } from '../client.js';
 import { coerceBoolean } from './_coerce.js';
 import { handleGoogleApiError, invalidParams } from './_errors.js';
 import { listResult } from '../trim.js';
-const accountEnum = accountAliasSchema.optional();
 const PERSON_FIELDS = 'names,emailAddresses,phoneNumbers,organizations,addresses,photos,memberships';
 // people.getBatchGet rejects more than 200 resource names per call.
 const BATCH_GET_LIMIT = 200;
@@ -35,7 +34,7 @@ function formatContact(person) {
         photo: person.photos?.[0]?.url ?? '',
     };
 }
-/** Accent-fold + lowercase for name comparison ("Rym" == "Rÿm"). */
+/** Accent-fold + lowercase for name comparison ("Zoe" == "Zoë"). */
 const foldName = (s) => s.normalize('NFD').replace(/\p{Diacritic}/gu, '').toLowerCase().trim();
 /** Canonical-address preference within one contact: explicit primary, then
  * People type order work > home > other. */
@@ -53,7 +52,7 @@ function pickEmail(c) {
     return [...c.emails].sort((a, b) => emailRank(b) - emailRank(a))[0];
 }
 /** Deterministic rank tuple; higher wins, compared lexicographically so the
- * first discriminating rule decides (A10 tie-break table). */
+ * first discriminating rule decides. */
 function scoreTuple(c, foldedQuery) {
     const exact = foldName(c.displayName) === foldedQuery ? 1 : 0; // 1. exact over prefix
     const saved = c.source === 'contacts' ? 1 : 0; // 2. saved over other-contact
@@ -123,7 +122,11 @@ function dedupeCandidates(list) {
     }
     return [...byResource.values()];
 }
-export function registerContactsTools(server) {
+export function registerContactsTools(server, deps = {}) {
+    // Per-registry, live account enum + injectable client: the schema follows
+    // the registry's account view at parse time, not a process-global default.
+    const accountEnum = accountArgLive(() => server.accountAliases()).optional();
+    const getClientFn = deps.getClientFn ?? getClient;
     server.registerTool('contacts_search', {
         description: 'Search contacts by name, email, phone, or organization',
         inputSchema: {
@@ -134,7 +137,7 @@ export function registerContactsTools(server) {
         },
     }, async ({ account, query, pageSize }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const people = peopleClient({ version: 'v1', auth });
             // Warmup request required by the People API
             await people.people.searchContacts({
@@ -166,7 +169,7 @@ export function registerContactsTools(server) {
         description: 'Resolve a free-text name/alias to ONE canonical email address (ranked + tie-broken), so you need not hand-expand transliteration OR-queries. Returns a single confident match, an explicit ambiguous candidate list, or null when nothing matches. For picking a recipient before gmail_send.',
         inputSchema: {
             account: accountEnum.describe('Google account alias'),
-            name: z.string().min(1).describe('Free-text name or alias to resolve (e.g. "Rym")'),
+            name: z.string().min(1).describe('Free-text name or alias to resolve (e.g. "Zoe")'),
             maxCandidates: z.number().min(1).max(10).default(5).optional()
                 .describe('Max candidates to return when ambiguous (1-10, default: 5)'),
             includeOtherContacts: coerceBoolean.optional()
@@ -174,7 +177,7 @@ export function registerContactsTools(server) {
         },
     }, async ({ account, name, maxCandidates, includeOtherContacts }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const people = peopleClient({ version: 'v1', auth });
             // Warmup request required by the People API before searchContacts returns hits.
             await people.people.searchContacts({ query: '', readMask: 'names' });
@@ -193,7 +196,7 @@ export function registerContactsTools(server) {
                     candidates.push(...(other.data.results ?? []).map((r) => toCandidate(r.person, 'otherContacts')));
                 }
                 catch {
-                    // otherContacts unavailable (scope/5xx): degrade to saved-contacts only.
+                    // otherContacts unavailable: degrade silently
                 }
             }
             const result = resolveContacts(dedupeCandidates(candidates), name, maxCandidates ?? 5);
@@ -213,7 +216,7 @@ export function registerContactsTools(server) {
         },
     }, async ({ account, resourceName }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const people = peopleClient({ version: 'v1', auth });
             const res = await people.people.get({
                 resourceName,
@@ -244,7 +247,7 @@ export function registerContactsTools(server) {
         },
     }, async ({ account, pageSize, pageToken, sortOrder }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const people = peopleClient({ version: 'v1', auth });
             const res = await people.people.connections.list({
                 resourceName: 'people/me',
@@ -283,7 +286,7 @@ export function registerContactsTools(server) {
         },
     }, async ({ account, givenName, familyName, email, emailType, phone, phoneType, organization, jobTitle }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const people = peopleClient({ version: 'v1', auth });
             const requestBody = {
                 names: [{ givenName, familyName: familyName ?? '' }],
@@ -330,7 +333,7 @@ export function registerContactsTools(server) {
         },
     }, async ({ account, resourceName, givenName, familyName, email, emailType, phone, phoneType, organization, jobTitle }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const people = peopleClient({ version: 'v1', auth });
             // Fetch current contact to get etag
             const current = await people.people.get({
@@ -387,7 +390,7 @@ export function registerContactsTools(server) {
         },
     }, async ({ account, resourceName }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const people = peopleClient({ version: 'v1', auth });
             await people.people.deleteContact({ resourceName });
             return {
@@ -409,7 +412,7 @@ export function registerContactsTools(server) {
         },
     }, async ({ account, pageSize }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const people = peopleClient({ version: 'v1', auth });
             const res = await people.contactGroups.list({
                 pageSize: pageSize ?? 100,
@@ -439,7 +442,7 @@ export function registerContactsTools(server) {
         },
     }, async ({ account, groupResourceName, maxMembers }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const people = peopleClient({ version: 'v1', auth });
             const groupRes = await people.contactGroups.get({
                 resourceName: groupResourceName,
@@ -449,8 +452,8 @@ export function registerContactsTools(server) {
             const members = [];
             let fetchFailures = 0;
             let firstError;
-            // getBatchGet caps at 200 names while maxMembers goes to 1000, so a
-            // large group used to fail outright rather than come back in pages.
+            // getBatchGet caps at 200 names while maxMembers goes to 1000, so fetch
+            // in chunks rather than fail outright on a large group.
             for (let i = 0; i < memberResourceNames.length; i += BATCH_GET_LIMIT) {
                 const chunk = memberResourceNames.slice(i, i + BATCH_GET_LIMIT);
                 try {
@@ -503,7 +506,7 @@ export function registerContactsTools(server) {
         },
     }, async ({ account, name }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const people = peopleClient({ version: 'v1', auth });
             const res = await people.contactGroups.create({
                 requestBody: {

package/dist/tools/docs.d.ts

@@ -1,4 +1,5 @@
 import type { ToolRegistry } from '../registry.js';
+import { type CuratedToolDeps } from '../client.js';
 export declare const DOCS_INSERT_CHUNK = 5000;
 export declare function splitInsertText(text: string, maxLen?: number): string[];
 export declare function buildInsertRequests(text: string, index?: number): any[];
@@ -24,7 +25,7 @@ export declare function listTabs(tabs: any[] | undefined): {
     tabId: string;
     title: string;
 }[];
-export declare function registerDocsTools(server: ToolRegistry): void;
+export declare function registerDocsTools(server: ToolRegistry, deps?: CuratedToolDeps): void;
 export declare function buildParagraphStyle(input: {
     namedStyleType?: string;
     alignment?: string;

package/dist/tools/docs.js

@@ -1,17 +1,12 @@
 import { z } from 'zod';
 import { coerceBoolean, coerceJson } from './_coerce.js';
 import { docs as docsClient } from '@googleapis/docs';
-import { accountAliasSchema } from '../accounts.js';
+import { accountArgLive } from '../accounts.js';
 import { getClient } from '../client.js';
 import { handleGoogleApiError, invalidParams } from './_errors.js';
 import { capText } from '../trim.js';
-const accountEnum = accountAliasSchema.optional();
-// A single very large insertText has been observed to apply only partially while
-// the request still returns success, silently dropping the tail. Split a large
-// insert into bounded pieces sent as sequential insertText requests in one atomic
-// batchUpdate: small inserts keep the exact single-request path, and a large one
-// can no longer be silently truncated. Docs indices are UTF-16 code units (= JS
-// string length), so index math advances by `.length`; never split a surrogate pair.
+// A single large insertText can silently apply only partially despite returning
+// success; split into <=DOCS_INSERT_CHUNK sequential inserts in one atomic batchUpdate (UTF-16-safe, no split surrogate pairs).
 export const DOCS_INSERT_CHUNK = 5000;
 export function splitInsertText(text, maxLen = DOCS_INSERT_CHUNK) {
     if (text.length === 0)
@@ -170,7 +165,11 @@ export function listTabs(tabs) {
     }
     return out;
 }
-export function registerDocsTools(server) {
+export function registerDocsTools(server, deps = {}) {
+    // Per-registry, live account enum + injectable client: the schema follows
+    // the registry's account view at parse time, not a process-global default.
+    const accountEnum = accountArgLive(() => server.accountAliases()).optional();
+    const getClientFn = deps.getClientFn ?? getClient;
     server.registerTool('docs_create', {
         description: 'Create a new Google Docs document',
         inputSchema: {
@@ -179,7 +178,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, title }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const res = await docs.documents.create({
                 requestBody: { title },
@@ -211,7 +210,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, includeTabsContent, suggestionsViewMode }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const res = await docs.documents.get({
                 documentId,
@@ -253,7 +252,7 @@ export function registerDocsTools(server) {
             if (heading !== undefined && headingIndex !== undefined) {
                 return invalidParams(account, 'Both heading and headingIndex were supplied, and they address different sections.', 'Pass heading to look a section up by its text, or headingIndex to address one by position. Not both.');
             }
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const res = await docs.documents.get({
                 documentId,
@@ -352,7 +351,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, text, index }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const requests = buildInsertRequests(text, index);
             if (requests.length === 0) {
@@ -392,7 +391,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, findText, replaceText, matchCase }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const res = await docs.documents.batchUpdate({
                 documentId,
@@ -427,7 +426,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, startIndex, endIndex }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const res = await docs.documents.batchUpdate({
                 documentId,
@@ -465,7 +464,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, startIndex, endIndex, bold, italic, underline, fontSize, fontFamily }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const textStyle = {};
             const fields = [];
@@ -528,7 +527,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, rows, columns, index }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const request = { insertTable: { rows, columns } };
             if (index !== undefined) {
@@ -564,7 +563,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, name, startIndex, endIndex }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const res = await docs.documents.batchUpdate({
                 documentId,
@@ -599,7 +598,7 @@ export function registerDocsTools(server) {
             if (!namedRangeId && !name) {
                 return invalidParams(account, 'Neither namedRangeId nor name was supplied, so no named range is addressed.', 'Pass namedRangeId to delete one specific range, or name to delete every range carrying that name.');
             }
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const req = {};
             if (namedRangeId)
@@ -632,7 +631,7 @@ export function registerDocsTools(server) {
             if (!namedRangeId && !namedRangeName) {
                 return invalidParams(account, 'Neither namedRangeId nor namedRangeName was supplied, so no named range is addressed.', 'Pass namedRangeId to replace one specific range, or namedRangeName to replace every range carrying that name.');
             }
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const req = { text };
             if (namedRangeId)
@@ -677,7 +676,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, startIndex, endIndex, ...style }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const built = buildParagraphStyle(style);
             if (built.fields.length === 0) {
@@ -723,7 +722,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, ...style }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const built = buildDocumentStyle(style);
             if (built.fields.length === 0) {
@@ -776,7 +775,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, startIndex, endIndex, bulletPreset }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             await docs.documents.batchUpdate({
                 documentId,
@@ -807,7 +806,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, startIndex, endIndex }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             await docs.documents.batchUpdate({
                 documentId,
@@ -840,7 +839,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, uri, index, width, height }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const request = { uri };
             if (index !== undefined)
@@ -876,7 +875,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, index }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const request = {};
             if (index !== undefined)
@@ -905,7 +904,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, index, sectionType }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const request = { sectionType: sectionType ?? 'NEXT_PAGE' };
             if (index !== undefined)
@@ -934,7 +933,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, sectionBreakIndex }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const request = { type: 'DEFAULT' };
             if (sectionBreakIndex !== undefined)
@@ -961,7 +960,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, headerId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             await docs.documents.batchUpdate({
                 documentId,
@@ -984,7 +983,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, sectionBreakIndex }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const request = { type: 'DEFAULT' };
             if (sectionBreakIndex !== undefined)
@@ -1011,7 +1010,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, footerId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             await docs.documents.batchUpdate({
                 documentId,
@@ -1044,7 +1043,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, operation, tableStartIndex, rowIndex, columnIndex, insertBelow, insertRight, rowSpan, columnSpan }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const cellLoc = {
                 tableStartLocation: { index: tableStartIndex },
@@ -1112,7 +1111,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, title, parentTabId, index }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const tabProperties = { title };
             if (parentTabId)
@@ -1141,7 +1140,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, tabId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             await docs.documents.batchUpdate({
                 documentId,
@@ -1167,7 +1166,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, tabId, title, index, parentTabId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const tabProperties = { tabId };
             const fields = [];
@@ -1221,7 +1220,7 @@ export function registerDocsTools(server) {
         },
     }, async ({ account, documentId, requests, writeControl }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const docs = docsClient({ version: 'v1', auth });
             const res = await docs.documents.batchUpdate({
                 documentId,