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

package/dist/tools/google-api.js

@@ -1,13 +1,13 @@
 import { z } from 'zod';
 import { isAllowed, writeDisabledResult } from '../write-control.js';
-import { accountAliasSchema } from '../accounts.js';
+import { accountArgLive } from '../accounts.js';
 import { getClient } from '../client.js';
 import { coerceJson } from './_coerce.js';
 import { getToolsets, toolsetEnabled } from '../toolsets.js';
-import { editDistance } from '../scope-catalog.js';
+import { editDistance, SUGGEST_MAX_INPUT } from '../scope-catalog.js';
 import { executeApiMethod, jsonResult } from '../executor.js';
-import { SUPPORTED_APIS, resolveApiAliases, cudFromMethod, loadMethodIndex, searchMethods, } from '../discovery-client.js';
-const accountEnum = accountAliasSchema.optional();
+import { SUPPORTED_APIS, resolveApiAliases, cudFromMethod, loadMethodIndex, searchMethods, MAX_SEARCH_QUERY, } from '../discovery-client.js';
+import { hints } from '../hint-provider.js';
 // Policy/toolset namespace for each API alias must match the NAMED tools' service
 // names, or user deny globs and GOOGLE_TOOLSETS silently miss escape-hatch calls.
 const SERVICE_FOR_ALIAS = {
@@ -32,12 +32,21 @@ const SERVICE_FOR_ALIAS = {
     analyticsadmin: 'analytics',
     analyticsdata: 'analytics',
 };
+/** Discovery ids are short dotted identifiers; the bound keeps a caller from
+ * sending megabytes through lookup, suggestion and the echoed message. */
+const MAX_METHOD_ID = 256;
+const MAX_API_ALIAS = 64;
 /** Up to three closest known ids for the unknown_method did-you-mean hint;
  * bounded distance so unrelated ids never masquerade as suggestions. */
 export function nearestMethodIds(methodId, index) {
+    if (methodId.length > SUGGEST_MAX_INPUT)
+        return [];
     const maxDist = Math.max(3, Math.floor(methodId.length / 3));
+    const wanted = methodId.toLowerCase();
     return index
-        .map((m) => ({ id: m.id, d: editDistance(methodId.toLowerCase(), m.id.toLowerCase()) }))
+        // the distance is at least the length gap, so most ids skip the DP
+        .filter((m) => Math.abs(m.id.length - wanted.length) <= maxDist)
+        .map((m) => ({ id: m.id, d: editDistance(wanted, m.id.toLowerCase()) }))
         .filter((x) => x.d <= maxDist)
         .sort((a, b) => a.d - b.d)
         .slice(0, 3)
@@ -55,6 +64,8 @@ function describeMethod(m) {
     };
 }
 export function registerEscapeTools(registry, policy, deps = {}) {
+    // Live per-registry account validation (S1.10), same as the curated files.
+    const accountEnum = accountArgLive(() => registry.accountAliases()).optional();
     const getClientFn = deps.getClientFn ?? getClient;
     const toolsets = deps.toolsets ?? getToolsets();
     const serviceForAlias = (alias) => SERVICE_FOR_ALIAS[alias] ?? alias;
@@ -63,19 +74,22 @@ export function registerEscapeTools(registry, policy, deps = {}) {
     };
     const enabledApis = Object.keys(SUPPORTED_APIS).filter(apiEnabled);
     const apiList = enabledApis.join(', ');
-    const toolsetDisabled = (alias) => jsonResult({
-        error: 'toolset_disabled',
-        message: `API "${alias}" maps to service "${serviceForAlias(alias)}", which is excluded by GOOGLE_TOOLSETS.`,
-        hint: 'Add the service to GOOGLE_TOOLSETS (or unset it) to use this API.',
-        retriable: false,
-    }, true);
+    const toolsetDisabled = (alias) => {
+        const rendered = hints()?.render({ kind: 'toolset_disabled', api: alias, service: serviceForAlias(alias) });
+        return jsonResult({
+            error: 'toolset_disabled',
+            message: rendered?.message ?? `API "${alias}" maps to service "${serviceForAlias(alias)}", which is excluded by GOOGLE_TOOLSETS.`,
+            hint: rendered?.hint ?? 'Add the service to GOOGLE_TOOLSETS (or unset it) to use this API.',
+            retriable: false,
+        }, true);
+    };
     registry.registerMeta('google_api_search', {
         description: 'Search the Google API Discovery index for any Workspace REST method, including ones with no ' +
             'dedicated tool here. Returns method ids + parameters to invoke via google_api_call. ' +
             `APIs: ${apiList}.`,
         inputSchema: {
-            query: z.string().describe('Keywords, e.g. "slides create presentation" or "drive revisions"'),
-            api: z.string().optional().describe('Restrict the search to one API alias'),
+            query: z.string().max(MAX_SEARCH_QUERY).describe('Keywords, e.g. "slides create presentation" or "drive revisions"'),
+            api: z.string().max(MAX_API_ALIAS).optional().describe('Restrict the search to one API alias'),
             maxResults: z.number().min(1).max(25).default(10).optional(),
         },
         annotations: { openWorldHint: true },
@@ -125,8 +139,8 @@ export function registerEscapeTools(registry, policy, deps = {}) {
             'drive.files.export) use drive_download / drive_export instead.',
         inputSchema: {
             account: accountEnum.describe('Google account alias (omit for the default account)'),
-            api: z.string().describe(`API alias: ${apiList}`),
-            methodId: z.string().min(1).describe('Discovery method id, e.g. "drive.revisions.list"'),
+            api: z.string().max(MAX_API_ALIAS).describe(`API alias: ${apiList}`),
+            methodId: z.string().min(1).max(MAX_METHOD_ID).describe('Discovery method id, e.g. "drive.revisions.list"'),
             pathParams: coerceJson(z.record(z.string(), z.union([z.string(), z.number()])).optional())
                 .describe('Values for {placeholders} in the method path'),
             queryParams: coerceJson(z
@@ -203,6 +217,6 @@ export function registerEscapeTools(registry, policy, deps = {}) {
             pathParams: pathParams,
             queryParams: queryParams,
             body,
-        }, { getClientFn });
+        }, { getClientFn, scopeDeps: deps.scopeDeps });
     });
 }

package/dist/tools/meet.d.ts

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

package/dist/tools/meet.js

@@ -1,10 +1,14 @@
 import { z } from 'zod';
 import { meet as meetClient } from '@googleapis/meet';
-import { accountAliasSchema } from '../accounts.js';
+import { accountArgLive } from '../accounts.js';
 import { getClient } from '../client.js';
 import { handleGoogleApiError } from './_errors.js';
-const accountEnum = accountAliasSchema.optional();
-export function registerMeetTools(server) {
+export function registerMeetTools(server, deps = {}) {
+    // Per-registry, LIVE account enum + injectable client (S1.10): the
+    // schema follows the registry's account view at parse time, and the
+    // custody path is the context's, not the process global.
+    const accountEnum = accountArgLive(() => server.accountAliases()).optional();
+    const getClientFn = deps.getClientFn ?? getClient;
     // ─── Conference records (past meetings) ────────────────────────────────
     server.registerTool('meet_conference_records_list', {
         description: 'List past conference records (completed Meet sessions) the user has access to',
@@ -16,7 +20,7 @@ export function registerMeetTools(server) {
         },
     }, async ({ account, pageSize, pageToken, filter }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const meet = meetClient({ version: 'v2', auth });
             const res = await meet.conferenceRecords.list({
                 pageSize: pageSize ?? 20,
@@ -39,7 +43,7 @@ export function registerMeetTools(server) {
         },
     }, async ({ account, name }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const meet = meetClient({ version: 'v2', auth });
             const res = await meet.conferenceRecords.get({ name });
             return {
@@ -61,7 +65,7 @@ export function registerMeetTools(server) {
         },
     }, async ({ account, parent, pageSize, pageToken }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const meet = meetClient({ version: 'v2', auth });
             const res = await meet.conferenceRecords.recordings.list({
                 parent,
@@ -87,7 +91,7 @@ export function registerMeetTools(server) {
         },
     }, async ({ account, parent, pageSize, pageToken }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const meet = meetClient({ version: 'v2', auth });
             const res = await meet.conferenceRecords.transcripts.list({
                 parent,
@@ -112,7 +116,7 @@ export function registerMeetTools(server) {
         },
     }, async ({ account, parent, pageSize, pageToken }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const meet = meetClient({ version: 'v2', auth });
             const res = await meet.conferenceRecords.transcripts.entries.list({
                 parent,
@@ -128,7 +132,7 @@ export function registerMeetTools(server) {
         }
     });
 }
-function handleMeetError(error, account) {
+export function handleMeetError(error, account) {
     return handleGoogleApiError(error, account, {
         scope: 'Meet needs the meetings.space.readonly scope and the Google Meet API enabled in Cloud Console. Confirm both for this account.',
         resource: `Meet denied this conference record to "${account}". Meet exposes records only to the organizer or a participant, so check which account hosted the meeting.`,

package/dist/tools/searchconsole.d.ts

@@ -1,2 +1,3 @@
 import type { ToolRegistry } from '../registry.js';
-export declare function registerSearchConsoleTools(server: ToolRegistry): void;
+import { type CuratedToolDeps } from '../client.js';
+export declare function registerSearchConsoleTools(server: ToolRegistry, deps?: CuratedToolDeps): void;

package/dist/tools/searchconsole.js

@@ -2,11 +2,15 @@ import { z } from 'zod';
 import { coerceArray, coerceJson } from './_coerce.js';
 import { searchconsole as searchconsoleClient } from '@googleapis/searchconsole';
 import { webmasters as webmastersClient } from '@googleapis/webmasters';
-import { accountAliasSchema } from '../accounts.js';
+import { accountArgLive } from '../accounts.js';
 import { getClient } from '../client.js';
 import { handleGoogleApiError } from './_errors.js';
-const accountEnum = accountAliasSchema.optional();
-export function registerSearchConsoleTools(server) {
+export function registerSearchConsoleTools(server, deps = {}) {
+    // Per-registry, LIVE account enum + injectable client (S1.10): the
+    // schema follows the registry's account view at parse time, and the
+    // custody path is the context's, not the process global.
+    const accountEnum = accountArgLive(() => server.accountAliases()).optional();
+    const getClientFn = deps.getClientFn ?? getClient;
     // ─── Sites ───────────────────────────────────────────────
     server.registerTool('searchconsole_sites_list', {
         description: 'List all sites (properties) the account has access to in Google Search Console',
@@ -15,7 +19,7 @@ export function registerSearchConsoleTools(server) {
         },
     }, async ({ account }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const wm = webmastersClient({ version: 'v3', auth });
             const res = await wm.sites.list();
             return {
@@ -34,7 +38,7 @@ export function registerSearchConsoleTools(server) {
         },
     }, async ({ account, siteUrl }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const wm = webmastersClient({ version: 'v3', auth });
             const res = await wm.sites.get({ siteUrl });
             return {
@@ -53,7 +57,7 @@ export function registerSearchConsoleTools(server) {
         },
     }, async ({ account, siteUrl }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const wm = webmastersClient({ version: 'v3', auth });
             await wm.sites.add({ siteUrl });
             return {
@@ -72,7 +76,7 @@ export function registerSearchConsoleTools(server) {
         },
     }, async ({ account, siteUrl }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const wm = webmastersClient({ version: 'v3', auth });
             await wm.sites.delete({ siteUrl });
             return {
@@ -92,7 +96,7 @@ export function registerSearchConsoleTools(server) {
         },
     }, async ({ account, siteUrl }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const wm = webmastersClient({ version: 'v3', auth });
             const res = await wm.sitemaps.list({ siteUrl });
             return {
@@ -112,7 +116,7 @@ export function registerSearchConsoleTools(server) {
         },
     }, async ({ account, siteUrl, feedpath }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const wm = webmastersClient({ version: 'v3', auth });
             const res = await wm.sitemaps.get({ siteUrl, feedpath });
             return {
@@ -132,7 +136,7 @@ export function registerSearchConsoleTools(server) {
         },
     }, async ({ account, siteUrl, feedpath }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const wm = webmastersClient({ version: 'v3', auth });
             await wm.sitemaps.submit({ siteUrl, feedpath });
             return {
@@ -152,7 +156,7 @@ export function registerSearchConsoleTools(server) {
         },
     }, async ({ account, siteUrl, feedpath }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const wm = webmastersClient({ version: 'v3', auth });
             await wm.sitemaps.delete({ siteUrl, feedpath });
             return {
@@ -195,7 +199,7 @@ export function registerSearchConsoleTools(server) {
         },
     }, async ({ account, siteUrl, startDate, endDate, dimensions, type, dimensionFilterGroups, rowLimit, startRow, aggregationType, dataState }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const wm = webmastersClient({ version: 'v3', auth });
             const requestBody = { startDate, endDate };
             if (dimensions)
@@ -237,7 +241,7 @@ export function registerSearchConsoleTools(server) {
         },
     }, async ({ account, siteUrl, inspectionUrl, languageCode }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const searchconsole = searchconsoleClient({ version: 'v1', auth });
             const res = await searchconsole.urlInspection.index.inspect({
                 requestBody: {

package/dist/tools/sheets.d.ts

@@ -1,5 +1,6 @@
 import type { ToolRegistry } from '../registry.js';
-export declare function registerSheetsTools(server: ToolRegistry): void;
+import { type CuratedToolDeps } from '../client.js';
+export declare function registerSheetsTools(server: ToolRegistry, deps?: CuratedToolDeps): void;
 export declare function buildCellFormat(input: {
     backgroundColor?: {
         red?: number;

package/dist/tools/sheets.js

@@ -1,11 +1,15 @@
 import { z } from 'zod';
 import { coerceArray, coerceBoolean, coerceJson } from './_coerce.js';
 import { sheets as sheetsClient } from '@googleapis/sheets';
-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 registerSheetsTools(server) {
+export function registerSheetsTools(server, deps = {}) {
+    // Per-registry, LIVE account enum + injectable client (S1.10): the
+    // schema follows the registry's account view at parse time, and the
+    // custody path is the context's, not the process global.
+    const accountEnum = accountArgLive(() => server.accountAliases()).optional();
+    const getClientFn = deps.getClientFn ?? getClient;
     server.registerTool('sheets_create', {
         description: 'Create a new Google Sheets spreadsheet',
         inputSchema: {
@@ -16,7 +20,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, title, sheetTitles }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const requestBody = {
                 properties: { title },
@@ -48,7 +52,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const res = await sheets.spreadsheets.get({
                 spreadsheetId,
@@ -85,7 +89,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, range, valueRenderOption }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const res = await sheets.spreadsheets.values.get({
                 spreadsheetId,
@@ -115,7 +119,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, range, values, valueInputOption }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const res = await sheets.spreadsheets.values.update({
                 spreadsheetId,
@@ -148,7 +152,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, range, values, valueInputOption }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const res = await sheets.spreadsheets.values.append({
                 spreadsheetId,
@@ -179,7 +183,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, range }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const res = await sheets.spreadsheets.values.clear({
                 spreadsheetId,
@@ -208,7 +212,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, ranges, valueRenderOption }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const res = await sheets.spreadsheets.values.batchGet({
                 spreadsheetId,
@@ -241,7 +245,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, data, valueInputOption }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const res = await sheets.spreadsheets.values.batchUpdate({
                 spreadsheetId,
@@ -277,7 +281,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, title, rowCount, columnCount }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const res = await sheets.spreadsheets.batchUpdate({
                 spreadsheetId,
@@ -318,7 +322,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, sheetId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             await sheets.spreadsheets.batchUpdate({
                 spreadsheetId,
@@ -343,7 +347,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, sourceSheetId, newSheetName, insertSheetIndex }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const res = await sheets.spreadsheets.batchUpdate({
                 spreadsheetId,
@@ -383,7 +387,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, sheetId, title, index, hidden, tabColor, frozenRowCount, frozenColumnCount, rowCount, columnCount }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const properties = { sheetId };
             const fields = [];
@@ -475,7 +479,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, range, ...format }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const built = buildCellFormat(format);
             if (built.fields.length === 0) {
@@ -516,7 +520,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, range, top, bottom, left, right, innerHorizontal, innerVertical }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const borders = { range };
             if (top)
@@ -556,7 +560,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, range, mergeType }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             await sheets.spreadsheets.batchUpdate({
                 spreadsheetId,
@@ -581,7 +585,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, range }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             await sheets.spreadsheets.batchUpdate({
                 spreadsheetId,
@@ -628,7 +632,7 @@ export function registerSheetsTools(server) {
             if (!booleanRule && !gradientRule) {
                 return invalidParams(account, 'A conditional format rule needs a rule body: neither booleanRule nor gradientRule was supplied.', 'Pass booleanRule for a condition-based rule, or gradientRule for a color scale.');
             }
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const rule = { ranges };
             if (booleanRule) {
@@ -692,7 +696,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, range, sortSpecs }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             await sheets.spreadsheets.batchUpdate({
                 spreadsheetId,
@@ -724,7 +728,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, range, sortSpecs, filterSpecs }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const filter = { range };
             if (sortSpecs)
@@ -766,7 +770,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, sheetId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             await sheets.spreadsheets.batchUpdate({
                 spreadsheetId,
@@ -799,7 +803,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, find, replacement, scope, sheetId, range, matchCase, matchEntireCell, searchByRegex, includeFormulas }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const findReplace = {
                 find,
@@ -855,7 +859,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, sheetId, dimension, startIndex, endIndex }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const dimensions = { sheetId, dimension };
             if (startIndex !== undefined)
@@ -887,7 +891,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, sheetId, dimension, startIndex, endIndex, inheritFromBefore }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             await sheets.spreadsheets.batchUpdate({
                 spreadsheetId,
@@ -920,7 +924,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, sheetId, dimension, startIndex, endIndex }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             await sheets.spreadsheets.batchUpdate({
                 spreadsheetId,
@@ -955,7 +959,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, range, conditionType, conditionValues, inputMessage, strict, showCustomUi }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const rule = {
                 condition: {
@@ -993,7 +997,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, name, range }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const res = await sheets.spreadsheets.batchUpdate({
                 spreadsheetId,
@@ -1019,7 +1023,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, namedRangeId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             await sheets.spreadsheets.batchUpdate({
                 spreadsheetId,
@@ -1043,7 +1047,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, ranges }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const res = await sheets.spreadsheets.values.batchClear({
                 spreadsheetId,
@@ -1073,7 +1077,7 @@ export function registerSheetsTools(server) {
         },
     }, async ({ account, spreadsheetId, requests, includeSpreadsheetInResponse, responseRanges, responseIncludeGridData }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const sheets = sheetsClient({ version: 'v4', auth });
             const res = await sheets.spreadsheets.batchUpdate({
                 spreadsheetId,

package/dist/tools/slides.d.ts

@@ -1,4 +1,13 @@
 import type { ToolRegistry } from '../registry.js';
-export declare function registerSlidesTools(server: ToolRegistry): void;
+import type { Account } from '../accounts.js';
+import { type CuratedToolDeps } from '../client.js';
+export declare function registerSlidesTools(server: ToolRegistry, deps?: CuratedToolDeps): void;
 export declare function extractPageText(elements: Array<Record<string, any>> | undefined): string;
 export declare function summarizePresentation(p: Record<string, any>): Record<string, unknown>;
+export declare function handleSlidesError(error: any, account: Account): {
+    content: {
+        type: "text";
+        text: string;
+    }[];
+    isError: true;
+};