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

package/dist/tools/analytics.d.ts

@@ -1,4 +1,6 @@
 import type { ToolRegistry } from '../registry.js';
+import type { Account } from '../accounts.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 +17,11 @@ 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;
+export declare function handleAnalyticsError(error: any, account: Account): {
+    content: {
+        type: "text";
+        text: string;
+    }[];
+    isError: true;
+};

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 {
@@ -274,11 +278,12 @@ function invalidProperty(hint, account) {
         isError: true,
     };
 }
-function handleAnalyticsError(error, account) {
+export function handleAnalyticsError(error, account) {
     return handleGoogleApiError(error, account, {
         scope: 'Needs the "analytics" bundle on this account: add it to the scope profile, then re-auth.',
         // GA4 answers PERMISSION_DENIED for a property ACL too, and the old
         // combined hint sent those callers to re-auth a scope they already had.
         resource: 'The scope is not the problem: this Google account has no access to that GA4 property. Grant it in GA4 Admin > Property Access Management, or call analytics_account_summaries to see the properties it can read.',
+        bundle: 'analytics',
     });
 }

package/dist/tools/calendar.d.ts

@@ -1,5 +1,6 @@
 import type { ToolRegistry } from '../registry.js';
-export declare function registerCalendarTools(server: ToolRegistry): void;
+import { type CuratedToolDeps } from '../client.js';
+export declare function registerCalendarTools(server: ToolRegistry, deps?: CuratedToolDeps): void;
 /** Google disagrees with itself on a backwards window: events.list answers 200
  * with [], which reads as "nothing scheduled", while freebusy.query 400s on the
  * identical input. Decide locally so an empty list always means empty. Returns

package/dist/tools/calendar.js

@@ -1,13 +1,17 @@
 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 (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('calendar_list_calendars', {
         description: 'List all calendars for a Google account',
         inputSchema: {
@@ -15,7 +19,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 +59,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 +102,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 +139,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 +194,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 +247,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 +272,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 +298,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 +333,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 +371,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: {
@@ -399,7 +403,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,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,
@@ -117,9 +121,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;
@@ -123,7 +122,12 @@ function dedupeCandidates(list) {
     }
     return [...byResource.values()];
 }
-export function registerContactsTools(server) {
+export function registerContactsTools(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('contacts_search', {
         description: 'Search contacts by name, email, phone, or organization',
         inputSchema: {
@@ -134,7 +138,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({
@@ -174,7 +178,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' });
@@ -213,7 +217,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 +248,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 +287,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 +334,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 +391,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 +413,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 +443,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,
@@ -503,7 +507,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;