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

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';
 } | {