mcp-google-multi 6.0.0-alpha.50 → 6.0.0-alpha.52

package/dist/tools/admin.d.ts

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

package/dist/tools/admin.js

@@ -1,12 +1,16 @@
 import { z } from 'zod';
 import { coerceBoolean } from './_coerce.js';
 import { admin as adminClient } from '@googleapis/admin';
-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();
 // Admin SDK requires Workspace super-admin (or delegated admin) on the account — personal @gmail.com accounts 403 on every endpoint.
-export function registerAdminTools(server) {
+export function registerAdminTools(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;
     // ─── Reports / audit log ───────────────────────────────────────────────
     server.registerTool('reports_activities_list', {
         description: 'List Admin Activity audit log entries. Filter by application (login, drive, gmail, admin, token, etc.), user, date range, event. The single most useful admin endpoint for SMB visibility.',
@@ -34,7 +38,7 @@ export function registerAdminTools(server) {
         },
     }, async ({ account, applicationName, userKey, startTime, endTime, eventName, actorIpAddress, filters, orgUnitID, groupIdFilter, customerId, maxResults, pageToken }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const reports = adminClient({ version: 'reports_v1', auth });
             const res = await reports.activities.list({
                 applicationName,
@@ -74,7 +78,7 @@ export function registerAdminTools(server) {
         },
     }, async ({ account, customer, domain, query, maxResults, pageToken, orderBy, showDeleted, projection }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const directory = adminClient({ version: 'directory_v1', auth });
             const res = await directory.users.list({
                 customer: customer ?? 'my_customer',
@@ -103,7 +107,7 @@ export function registerAdminTools(server) {
         },
     }, async ({ account, userKey, projection }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const directory = adminClient({ version: 'directory_v1', auth });
             const res = await directory.users.get({
                 userKey,
@@ -131,7 +135,7 @@ export function registerAdminTools(server) {
         },
     }, async ({ account, userKey, givenName, familyName, suspended, password, changePasswordAtNextLogin, orgUnitPath }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const directory = adminClient({ version: 'directory_v1', auth });
             const requestBody = {};
             if (givenName !== undefined || familyName !== undefined) {
@@ -175,7 +179,7 @@ export function registerAdminTools(server) {
         },
     }, async ({ account, customer, domain, userKey, query, maxResults, pageToken }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const directory = adminClient({ version: 'directory_v1', auth });
             const res = await directory.groups.list({
                 customer: customer ?? 'my_customer',
@@ -205,7 +209,7 @@ export function registerAdminTools(server) {
         },
     }, async ({ account, groupKey, roles, includeDerivedMembership, maxResults, pageToken }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const directory = adminClient({ version: 'directory_v1', auth });
             const res = await directory.members.list({
                 groupKey,

package/dist/tools/analytics.d.ts

@@ -1,4 +1,5 @@
 import type { ToolRegistry } from '../registry.js';
+import { type CuratedToolDeps } from '../client.js';
 /** Accepts "213025502" or "properties/213025502"; rejects the identifiers
  * people paste by mistake (G-… measurement IDs, UA-… properties) with a
  * pointer to the right one. */
@@ -15,4 +16,4 @@ export declare function shapeAccountSummaries(data: any): Record<string, unknown
 /** Full metadata descriptions run to paragraphs; the first ~160 chars carry
  * the disambiguation the model needs without bloating a ~300-entry list. */
 export declare function shapeMetadata(data: any): Record<string, unknown>;
-export declare function registerAnalyticsTools(server: ToolRegistry): void;
+export declare function registerAnalyticsTools(server: ToolRegistry, deps?: CuratedToolDeps): void;

package/dist/tools/analytics.js

@@ -2,10 +2,9 @@ import { z } from 'zod';
 import { coerceArray, coerceBoolean, coerceJson } from './_coerce.js';
 import { analyticsdata as analyticsdataClient } from '@googleapis/analyticsdata';
 import { analyticsadmin as analyticsadminClient } from '@googleapis/analyticsadmin';
-import { accountAliasSchema } from '../accounts.js';
+import { accountArgLive } from '../accounts.js';
 import { getClient } from '../client.js';
 import { handleGoogleApiError } from './_errors.js';
-const accountEnum = accountAliasSchema.optional();
 /** Accepts "213025502" or "properties/213025502"; rejects the identifiers
  * people paste by mistake (G-… measurement IDs, UA-… properties) with a
  * pointer to the right one. */
@@ -105,7 +104,12 @@ export function shapeMetadata(data) {
 const propertySchema = z
     .string()
     .describe('GA4 property: numeric ID like "213025502" or "properties/213025502" — NOT a "G-..." measurement ID and not "UA-...". Find yours with analytics_account_summaries.');
-export function registerAnalyticsTools(server) {
+export function registerAnalyticsTools(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('analytics_account_summaries', {
         description: 'List every Google Analytics (GA4) account and property this Google account can access, with their numeric property IDs. The starting point for any Analytics question ("what properties do I have?").',
         inputSchema: {
@@ -115,7 +119,7 @@ export function registerAnalyticsTools(server) {
         },
     }, async ({ account, pageSize, pageToken }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const admin = analyticsadminClient({ version: 'v1beta', auth });
             const res = await admin.accountSummaries.list({ pageSize, pageToken });
             return {
@@ -159,7 +163,7 @@ export function registerAnalyticsTools(server) {
         if ('hint' in prop)
             return invalidProperty(prop.hint, account);
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const dataApi = analyticsdataClient({ version: 'v1beta', auth });
             const requestBody = {
                 dateRanges: [{ startDate, endDate }],
@@ -216,7 +220,7 @@ export function registerAnalyticsTools(server) {
         if ('hint' in prop)
             return invalidProperty(prop.hint, account);
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const dataApi = analyticsdataClient({ version: 'v1beta', auth });
             const requestBody = { metrics: metrics.map((name) => ({ name })) };
             if (dimensions?.length)
@@ -251,7 +255,7 @@ export function registerAnalyticsTools(server) {
         if ('hint' in prop)
             return invalidProperty(prop.hint, account);
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const dataApi = analyticsdataClient({ version: 'v1beta', auth });
             const res = await dataApi.properties.getMetadata({ name: `${prop.name}/metadata` });
             return {

package/dist/tools/chat.d.ts

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

package/dist/tools/chat.js

@@ -1,11 +1,15 @@
 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 (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('chat_spaces_list', {
         description: 'List Google Chat spaces the user is a member of',
         inputSchema: {
@@ -16,7 +20,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 +43,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 +69,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 +103,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,

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,11 +1,10 @@
 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
@@ -170,7 +169,12 @@ export function listTabs(tabs) {
     }
     return out;
 }
-export function registerDocsTools(server) {
+export function registerDocsTools(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('docs_create', {
         description: 'Create a new Google Docs document',
         inputSchema: {
@@ -179,7 +183,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 +215,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 +257,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 +356,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 +396,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 +431,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 +469,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 +532,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 +568,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 +603,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 +636,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 +681,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 +727,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 +780,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 +811,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 +844,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 +880,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 +909,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 +938,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 +965,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 +988,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 +1015,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 +1048,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 +1116,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 +1145,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 +1171,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 +1225,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,

package/dist/tools/drive.d.ts

@@ -1,4 +1,5 @@
 import type { ToolRegistry } from '../registry.js';
+import { type CuratedToolDeps } from '../client.js';
 export declare function isTextualMime(mimeType: string): boolean;
 export declare function resolveConvertTarget(convertTo: string | undefined): string | undefined;
 export declare const DRIVE_QUERY_HINT: string;
@@ -10,7 +11,7 @@ export declare function resolveShareNotification(opts: {
     transferOwnership?: boolean;
     sendNotification?: boolean;
 }): boolean | undefined;
-export declare function registerDriveTools(server: ToolRegistry): void;
+export declare function registerDriveTools(server: ToolRegistry, deps?: CuratedToolDeps): void;
 export type TransferPlan = {
     kind: 'binary';
 } | {