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

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

package/dist/tools/drive.js

@@ -1,10 +1,10 @@
 import { z } from 'zod';
 import { coerceArray, coerceBoolean, coerceNumber } from './_coerce.js';
 import { drive as driveClient } from '@googleapis/drive';
-import { accountAliasSchema, getAccountSet } from '../accounts.js';
+import { accountArgLive } from '../accounts.js';
 import { getClient } from '../client.js';
 import { handleGoogleApiError, invalidParams, safeMessage, stringifyEnvelope } from './_errors.js';
-import { openLocalReadStream, prepareLocalDest } from './_local-files.js';
+import { hostFilesRefused, openLocalReadStream, prepareLocalDest } from './_local-files.js';
 import { checkOutbound, outboundDeniedEnvelope, resolveOutboundAllowlist } from '../outbound-allowlist.js';
 import { isAllowed, writeDisabledResult } from '../write-control.js';
 import { capText, listResult } from '../trim.js';
@@ -14,10 +14,8 @@ import * as os from 'os';
 import * as crypto from 'crypto';
 import { pipeline } from 'node:stream/promises';
 import mime from 'mime-types';
-const accountEnum = accountAliasSchema.optional();
 // drive_transfer's two-account form is the sanctioned schema exception and
 // stays REQUIRED: omission must fail at the schema, not as a runtime riddle.
-const requiredAccountEnum = accountAliasSchema;
 const MAX_FILE_SIZE = 2 * 1024 * 1024; // 2MB
 const FALLBACK_MAX_BYTES = 1024 * 1024 * 1024; // 1GB
 const GOOGLE_WORKSPACE_TYPES = new Set([
@@ -26,9 +24,8 @@ const GOOGLE_WORKSPACE_TYPES = new Set([
     'application/vnd.google-apps.presentation',
     'application/vnd.google-apps.drawing',
 ]);
-// drive_read inlines only textual content. Beyond text/*, RFC 6839 structured-
-// syntax suffixes (+json/+xml/...) and a few bare application/* types are text
-// in practice — image/svg+xml was the motivating false "binary" refusal.
+// drive_read inlines only textual content; RFC 6839 +json/+xml/... suffixes and
+// a few bare application/* types count too (image/svg+xml was the motivating case).
 const TEXTUAL_EXACT = new Set([
     'application/json',
     'application/xml',
@@ -83,17 +80,14 @@ export const DRIVE_QUERY_HINT = "Drive search syntax: a plain keyword is treated
     "structured query needs an operator, e.g. \"name contains 'report'\", " +
     "\"mimeType = 'application/pdf'\", or \"'me' in owners\". " +
     'Reference: https://developers.google.com/drive/api/guides/search-files';
-// A bare keyword is not valid Drive `q` syntax (Google 400s "Invalid Value"), yet
-// it is the natural thing to pass to a "search" tool, so wrap it as a full-text
-// match. A query already carrying a comparison operator or a quoted literal is a
-// structured query and is passed through untouched.
+// A bare keyword isn't valid Drive `q` syntax (400s "Invalid Value"), so wrap it
+// as a full-text match; a query with a comparison operator is passed through untouched.
 export function normalizeDriveQuery(raw) {
     const q = raw.trim();
     if (q === '')
         return q;
-    // Structured iff it carries a comparison operator or the membership form
-    // "<value> in (parents|owners|writers|readers)". A bare apostrophe does NOT
-    // count (names like O'Brien are keywords, not query syntax).
+    // Structured iff it has a comparison operator or the membership form "<value> in
+    // (parents|owners|writers|readers)"; a bare apostrophe (e.g. O'Brien) doesn't count.
     const hasComparison = /(\bcontains\b|!=|<=|>=|[=<>])/i.test(q);
     const hasMembership = /\bin\s+(parents|owners|writers|readers)\b/i.test(q);
     if (hasComparison || hasMembership)
@@ -101,9 +95,8 @@ export function normalizeDriveQuery(raw) {
     const escaped = q.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
     return `fullText contains '${escaped}'`;
 }
-// Drive rejects a malformed query with HTTP 400 / reason "invalid" and the opaque
-// message "Invalid Value"; detect that so drive_search returns query-syntax help
-// instead of a generic upstream_error.
+// Drive 400s a malformed query with the opaque reason "invalid"/"Invalid Value";
+// detect it so drive_search returns query-syntax help instead of a generic upstream_error.
 export function isDriveInvalidQuery(error) {
     const raw = error?.code ?? error?.status ?? error?.response?.status;
     const status = typeof raw === 'string' ? Number(raw) : raw;
@@ -123,7 +116,14 @@ export function resolveShareNotification(opts) {
         return true;
     return opts.sendNotification ?? true;
 }
-export function registerDriveTools(server) {
+export function registerDriveTools(server, deps = {}) {
+    // Per-registry, live account enum + injectable client: the schema follows
+    // the registry's account view at parse time, not a process-global default.
+    const accountEnum = accountArgLive(() => server.accountAliases()).optional();
+    const requiredAccountEnum = accountArgLive(() => server.accountAliases());
+    const getClientFn = deps.getClientFn ?? getClient;
+    const localFiles = deps.localFiles ?? true;
+    const registerHostFileTool = localFiles ? server.registerTool : (() => undefined);
     // ─── Read / search / list ──────────────────────────────────────────────
     server.registerTool('drive_search', {
         description: 'Search files in a Google Drive account. A plain keyword is treated as a full-text search; pass Drive query syntax for a structured search.',
@@ -138,19 +138,18 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, query, maxResults, driveId, pageToken }) => {
         try {
-            // normalizeDriveQuery trims to '' and Drive reads that as "everything",
-            // so a blank query returned a raw directory listing as a search result.
+            // normalizeDriveQuery trims to '' and Drive reads that as "everything", so
+            // a blank query would list the whole drive as a "search" result.
             if (query.trim() === '') {
                 return invalidParams(account, '`query` is empty, and Drive reads an empty query as "match everything".', 'Pass a search term, or a structured Drive query such as "mimeType = \'application/pdf\'". To browse a folder instead, use drive_list.');
             }
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const params = {
                 q: normalizeDriveQuery(query),
                 pageSize: maxResults ?? 10,
-                // nextPageToken and incompleteSearch live OUTSIDE files(...): omit
-                // them from the mask and Drive drops them, so a partial result was
-                // indistinguishable from a complete one.
+                // nextPageToken and incompleteSearch live OUTSIDE files(...): omit them from
+                // the mask and Drive drops them, making a partial result indistinguishable from a complete one.
                 fields: 'nextPageToken,incompleteSearch,files(id,name,mimeType,modifiedTime,webViewLink,size,parents,driveId)',
                 supportsAllDrives: true,
                 includeItemsFromAllDrives: true,
@@ -176,9 +175,8 @@ export function registerDriveTools(server) {
         }
         catch (error) {
             if (isDriveInvalidQuery(error)) {
-                // Through safeMessage and stringifyEnvelope like every other
-                // envelope: this path used to read the upstream body directly, so a
-                // non-JSON response landed here uncapped.
+                // Goes through safeMessage/stringifyEnvelope like every other envelope
+                // so a non-JSON upstream response can't land here uncapped.
                 return {
                     content: [{ type: 'text', text: stringifyEnvelope({
                                 error: 'invalid_query',
@@ -206,7 +204,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, maxChars, offset }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const meta = await drive.files.get({
                 fileId,
@@ -316,7 +314,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, folderId, maxResults, pageToken }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             // Escape single quotes per Drive query syntax to prevent breaking out of the literal.
             const parent = (folderId ?? 'root').replace(/\\/g, '\\\\').replace(/'/g, "\\'");
@@ -339,7 +337,7 @@ export function registerDriveTools(server) {
         }
     });
     // ─── Write / upload / download ─────────────────────────────────────────
-    server.registerTool('drive_upload', {
+    registerHostFileTool('drive_upload', {
         description: 'Upload a local file to Google Drive. Pass `convertTo` to import it as a native, editable Google Doc/Sheet/Slides/Drawing instead of storing the raw bytes.',
         inputSchema: {
             account: accountEnum.describe('Google account alias'),
@@ -351,7 +349,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, localPath, filename, mimeType: mimeTypeArg, convertTo, parentFolderId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const resolvedMime = mimeTypeArg ?? (mime.lookup(localPath) || 'application/octet-stream');
             const fileStream = await openLocalReadStream(localPath);
@@ -377,7 +375,7 @@ export function registerDriveTools(server) {
             return handleDriveError(error, account);
         }
     });
-    server.registerTool('drive_download', {
+    registerHostFileTool('drive_download', {
         description: 'Download a binary file from Drive to local disk. For Google Workspace formats (Docs, Sheets, Slides), use drive_export instead.',
         inputSchema: {
             account: accountEnum.describe('Google account alias'),
@@ -387,7 +385,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, savePath, filename }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const name = filename
                 ?? (await drive.files.get({ fileId, fields: 'name', supportsAllDrives: true })).data.name
@@ -405,7 +403,7 @@ export function registerDriveTools(server) {
             return handleDriveError(error, account);
         }
     });
-    server.registerTool('drive_export', {
+    registerHostFileTool('drive_export', {
         description: 'Export a Google Workspace document (Doc, Sheet, Slide) to a standard format and save to disk. Supported: PDF, DOCX, XLSX, PPTX, TXT, CSV, Markdown (text/markdown for Docs).',
         inputSchema: {
             account: accountEnum.describe('Google account alias'),
@@ -416,7 +414,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, mimeType: exportMime, savePath, filename }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             let name = filename;
             if (!name) {
@@ -446,7 +444,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, name, parentFolderId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const res = await drive.files.create({
                 requestBody: {
@@ -472,13 +470,22 @@ export function registerDriveTools(server) {
             fileId: z.string().min(1).describe('Google Drive file ID'),
             newName: z.string().optional().describe('New filename'),
             newParentFolderId: z.string().optional().describe('Move to this folder, named newParentFolderId here, not parentFolderId'),
-            localPath: z.string().optional().describe('Replace file content with this local file (path on the machine running the server)'),
-            mimeType: z.string().optional().describe('MIME type of the replacement file (required if localPath is provided)'),
-            convertTo: z.enum(CONVERT_TO_VALUES).optional().describe('When replacing content via localPath, convert the new content into this native Google Workspace type on import: "document" | "spreadsheet" | "presentation" | "drawing" (full application/vnd.google-apps.* ids also accepted).'),
+            ...(localFiles
+                ? {
+                    localPath: z.string().optional().describe('Replace file content with this local file (path on the machine running the server)'),
+                    mimeType: z.string().optional().describe('MIME type of the replacement file (required if localPath is provided)'),
+                    convertTo: z.enum(CONVERT_TO_VALUES).optional().describe('When replacing content via localPath, convert the new content into this native Google Workspace type on import: "document" | "spreadsheet" | "presentation" | "drawing" (full application/vnd.google-apps.* ids also accepted).'),
+                }
+                : {}),
         },
-    }, async ({ account, fileId, newName, newParentFolderId, localPath: localPathArg, mimeType: mimeTypeArg, convertTo }) => {
+    }, async (args) => {
+        const { account, fileId, newName, newParentFolderId } = args;
+        // Declared only when the context may read host files (see the shape).
+        const { localPath: localPathArg, mimeType: mimeTypeArg, convertTo } = args;
+        if (localPathArg && !localFiles)
+            return hostFilesRefused(account, 'localPath');
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const requestBody = {};
             if (newName)
@@ -520,7 +527,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             await drive.files.delete({ fileId, supportsAllDrives: true });
             return {
@@ -539,7 +546,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             await drive.files.update({
                 fileId,
@@ -562,7 +569,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const res = await drive.files.update({
                 fileId,
@@ -585,7 +592,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             await drive.files.emptyTrash({});
             return {
@@ -607,7 +614,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, newName, parentFolderId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const res = await drive.files.copy({
                 fileId,
@@ -635,7 +642,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, newParentFolderId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const current = await drive.files.get({ fileId, fields: 'parents', supportsAllDrives: true });
             const res = await drive.files.update({
@@ -670,9 +677,8 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, type, role, emailAddress, domain, sendNotification, emailMessage, transferOwnership, expirationTime }) => {
         {
-            // Outbound allowlist (off unless GOOGLE_OUTBOUND_ALLOWLIST is set):
-            // user/group grantees must match; a domain share needs its exact
-            // "@domain" entry; "anyone" (link sharing) is refused while active.
+            // Outbound allowlist (off unless GOOGLE_OUTBOUND_ALLOWLIST is set): user/group
+            // grantees must match, a domain share needs its exact "@domain" entry, "anyone" is refused while active.
             const list = resolveOutboundAllowlist();
             if (list) {
                 if ((type === 'user' || type === 'group') && emailAddress) {
@@ -689,7 +695,7 @@ export function registerDriveTools(server) {
             }
         }
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const requestBody = { type, role, emailAddress, domain };
             if (expirationTime)
@@ -720,7 +726,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const res = await drive.permissions.list({
                 fileId,
@@ -752,7 +758,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, permissionId, role, expirationTime, removeExpiration, transferOwnership }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const requestBody = {};
             if (role)
@@ -785,7 +791,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, permissionId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             await drive.permissions.delete({ fileId, permissionId, supportsAllDrives: true });
             return {
@@ -811,7 +817,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, content, anchor, quotedFileContent }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const requestBody = { content };
             if (anchor)
@@ -843,7 +849,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, includeDeleted, pageSize, pageToken, startModifiedTime }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const res = await drive.comments.list({
                 fileId,
@@ -871,7 +877,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, commentId, includeDeleted }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const res = await drive.comments.get({
                 fileId,
@@ -897,7 +903,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, commentId, content }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const res = await drive.comments.update({
                 fileId,
@@ -922,7 +928,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, commentId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             await drive.comments.delete({ fileId, commentId });
             return {
@@ -946,7 +952,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, commentId, content, action }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const requestBody = { content };
             if (action)
@@ -977,7 +983,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, commentId, includeDeleted, pageSize, pageToken }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const res = await drive.replies.list({
                 fileId,
@@ -1006,7 +1012,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, commentId, replyId, content }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const res = await drive.replies.update({
                 fileId,
@@ -1033,7 +1039,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, commentId, replyId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             await drive.replies.delete({ fileId, commentId, replyId });
             return {
@@ -1055,7 +1061,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, pageSize, pageToken }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const res = await drive.revisions.list({
                 fileId,
@@ -1084,7 +1090,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, revisionId, keepForever, published, publishAuto, publishedOutsideDomain }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const requestBody = {};
             if (keepForever !== undefined)
@@ -1118,7 +1124,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, revisionId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             await drive.revisions.delete({ fileId, revisionId });
             return {
@@ -1140,7 +1146,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, pageSize, pageToken }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const res = await drive.accessproposals.list({
                 fileId,
@@ -1170,7 +1176,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, fileId, proposalId, action, role, view, sendNotification }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const requestBody = { action };
             if (role)
@@ -1203,7 +1209,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, pageSize, pageToken, q }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const res = await drive.drives.list({
                 pageSize: pageSize ?? 50,
@@ -1227,7 +1233,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account, driveId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const res = await drive.drives.get({
                 driveId,
@@ -1278,10 +1284,10 @@ export function registerDriveTools(server) {
         }
         let activeAccount = fromAccount;
         try {
-            const sourceAuth = await getClient(fromAccount);
+            const sourceAuth = await getClientFn(fromAccount);
             const sourceDrive = driveClient({ version: 'v3', auth: sourceAuth });
             activeAccount = toAccount;
-            const targetAuth = await getClient(toAccount);
+            const targetAuth = await getClientFn(toAccount);
             const targetDrive = driveClient({ version: 'v3', auth: targetAuth });
             activeAccount = fromAccount;
             const meta = await sourceDrive.files.get({
@@ -1305,7 +1311,7 @@ export function registerDriveTools(server) {
                 };
             }
             const intendedName = newName ?? meta.data.name ?? 'transferred-file';
-            const targetEmail = getAccountSet().configs[toAccount].email;
+            const targetEmail = server.accountSet().configs[toAccount].email;
             const finish = async (data, strategy, flags) => {
                 let moveFailed = false;
                 let moveSkipped = false;
@@ -1379,7 +1385,7 @@ export function registerDriveTools(server) {
         },
     }, async ({ account }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const drive = driveClient({ version: 'v3', auth });
             const res = await drive.about.get({
                 fields: 'user,storageQuota',

package/dist/tools/forms.d.ts

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

package/dist/tools/forms.js

@@ -1,11 +1,14 @@
 import { z } from 'zod';
 import { forms as formsClient } from '@googleapis/forms';
-import { accountAliasSchema } from '../accounts.js';
+import { accountArgLive } from '../accounts.js';
 import { getClient } from '../client.js';
 import { handleGoogleApiError } from './_errors.js';
 import { coerceArray, coerceBoolean, coerceJson } from './_coerce.js';
-const accountEnum = accountAliasSchema.optional();
-export function registerFormsTools(server) {
+export function registerFormsTools(server, deps = {}) {
+    // Per-registry, live account enum + injectable client: the schema follows
+    // the registry's account view at parse time, not a process-global default.
+    const accountEnum = accountArgLive(() => server.accountAliases()).optional();
+    const getClientFn = deps.getClientFn ?? getClient;
     server.registerTool('forms_get', {
         description: 'Get a Google Form (definition: questions, sections, settings). Requires forms.body scope.',
         inputSchema: {
@@ -14,7 +17,7 @@ export function registerFormsTools(server) {
         },
     }, async ({ account, formId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const forms = formsClient({ version: 'v1', auth });
             const res = await forms.forms.get({ formId });
             return {
@@ -36,7 +39,7 @@ export function registerFormsTools(server) {
         },
     }, async ({ account, formId, pageSize, pageToken, filter }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const forms = formsClient({ version: 'v1', auth });
             const res = await forms.forms.responses.list({
                 formId,
@@ -61,7 +64,7 @@ export function registerFormsTools(server) {
         },
     }, async ({ account, formId, responseId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const forms = formsClient({ version: 'v1', auth });
             const res = await forms.forms.responses.get({ formId, responseId });
             return {
@@ -80,7 +83,7 @@ export function registerFormsTools(server) {
         },
     }, async ({ account, formId }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const forms = formsClient({ version: 'v1', auth });
             const res = await forms.forms.watches.list({ formId });
             return {
@@ -100,7 +103,7 @@ export function registerFormsTools(server) {
         },
     }, async ({ account, title, documentTitle }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const forms = formsClient({ version: 'v1', auth });
             const res = await forms.forms.create({
                 requestBody: { info: { title, documentTitle } },
@@ -135,7 +138,7 @@ export function registerFormsTools(server) {
         },
     }, async ({ account, formId, requests, includeFormInResponse, writeControl }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const forms = formsClient({ version: 'v1', auth });
             const res = await forms.forms.batchUpdate({
                 formId,
@@ -163,7 +166,7 @@ export function registerFormsTools(server) {
         },
     }, async ({ account, formId, isPublished, isAcceptingResponses }) => {
         try {
-            const auth = await getClient(account);
+            const auth = await getClientFn(account);
             const forms = formsClient({ version: 'v1', auth });
             const updateMask = ['publishState.isPublished'];
             if (isAcceptingResponses !== undefined)
@@ -186,6 +189,9 @@ export function registerFormsTools(server) {
         }
     });
 }
-function handleFormsError(error, account) {
-    return handleGoogleApiError(error, account, "Forms tools require the optional \"forms\" scope bundle. Add GOOGLE_OPTIONAL_SCOPES=forms (or include \"forms\" in the list) and re-auth.");
+export function handleFormsError(error, account) {
+    return handleGoogleApiError(error, account, {
+        scope: "Forms tools require the optional \"forms\" scope bundle. Add GOOGLE_OPTIONAL_SCOPES=forms (or include \"forms\" in the list) and re-auth.",
+        bundle: 'forms',
+    });
 }

package/dist/tools/generated/_shared.d.ts

@@ -21,5 +21,6 @@ export interface GeneratedToolDef {
     }>;
     shape: z.ZodRawShape;
 }
-export declare function accountField(): z.ZodOptional<z.ZodType<string, unknown, z.core.$ZodTypeInternals<string, unknown>>>;
+export declare function accountField(aliases?: readonly string[] | (() => readonly string[])): z.ZodOptional<z.ZodType<string, unknown, z.core.$ZodTypeInternals<string, unknown>>>;
+export type { ExecuteDeps } from '../../executor.js';
 export declare function registerGeneratedTool(registry: ToolRegistry, def: GeneratedToolDef, deps?: ExecuteDeps): void;

package/dist/tools/generated/_shared.js

@@ -1,7 +1,11 @@
-import { accountAliasSchema } from '../../accounts.js';
+import { accountAliasSchema, accountAliasSchemaFor, accountArgLive } from '../../accounts.js';
 import { executeApiMethod } from '../../executor.js';
-export function accountField() {
-    return accountAliasSchema.optional().describe('Google account alias (omit for the default account)');
+export function accountField(aliases) {
+    // Generated code passes a getter over registry.accountAliases(), so the field
+    // validates against the registry's CURRENT set, as curated tools do. An
+    // array bakes that set; the no-arg form keeps the global-bound schema.
+    const schema = typeof aliases === 'function' ? accountArgLive(aliases) : aliases ? accountAliasSchemaFor(aliases) : accountAliasSchema;
+    return schema.optional().describe('Google account alias (omit for the default account)');
 }
 export function registerGeneratedTool(registry, def, deps = {}) {
     // Widened locally: `cud` is a registry extension the SDK config type doesn't

package/dist/tools/generated/admin.d.ts

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