mcp-google-multi 5.1.0-alpha.3 → 5.1.0-alpha.4

package/README.md

@@ -82,6 +82,20 @@ The server does **not** dump ~170 tool schemas into your model's context. At boo
 
 Hidden is a listing concept, not a security boundary: operational tools stay callable at all times (existing prompts that call tools directly keep working), and write-control + OAuth scopes remain the real enforcement. Use `GOOGLE_TOOLSETS` to switch entire services off — it is a filter only: listing `forms`/`chat`/`admin` does not enable them without their `GOOGLE_OPTIONAL_SCOPES` / `GOOGLE_ADMIN_ACCOUNTS` gates.
 
+## Multi-account: fan out one call across accounts
+
+Every read tool's `account` argument also accepts `"*"` (all configured accounts) or a CSV subset (`"work,personal"`). The server runs the call once per account (bounded concurrency) and returns per-account results — one account failing never hides the others:
+
+```jsonc
+{ "results": [
+    { "account": "work", "ok": true, "data": { /* … */ } },
+    { "account": "personal", "ok": false, "error": { "error": "auth_required", /* … */ } }
+  ],
+  "partial": true }
+```
+
+Fan-out is **read-only by design** (write tools take exactly one account), and the three read tools that save files to disk (`drive_download`, `drive_export`, `gmail_download_attachment`) are excluded so parallel accounts can't clobber the same path. `account_list` shows what's configured: alias, email, token health (`ok` / `expired_refreshable` / `needs_reauth` / `missing` / `decrypt_error`), and granted-vs-configured scopes — without ever touching token values.
+
 ## Escape hatch: any Workspace REST method
 
 Two eager tools cover everything the curated set doesn't: `google_api_search` finds any method in Google's API Discovery index (including APIs with no dedicated tools here, like Slides), and `google_api_call` invokes a method by its Discovery id (`drive.revisions.list`, `slides.presentations.create`, …) with path/query params and a JSON body. Calls run through your account's OAuth client and the **same write-control policy** as named tools: the read/create/update/delete class is derived from the method's HTTP verb and name (POST deletes like `batchDelete`/`clear` count as deletes), and policy globs/`GOOGLE_TOOLSETS` match the same service names as named tools (`people` counts as `contacts`, `admin_*` as `admin`; `slides`/`driveactivity`/`drivelabels`/`groupssettings` have no named service and are always available).

package/dist/accounts.js

@@ -40,6 +40,9 @@ function parseAccounts() {
         if (!/^[a-zA-Z0-9_-]+$/.test(alias)) {
             throw new Error(`Invalid alias "${alias}". Allowed characters: letters, digits, underscore, hyphen.`);
         }
+        if (aliases.includes(alias)) {
+            throw new Error(`Duplicate alias "${alias}" in GOOGLE_ACCOUNTS. Each alias must be unique.`);
+        }
         aliases.push(alias);
         configs[alias] = {
             email,

package/dist/fanout.d.ts

@@ -0,0 +1,32 @@
+import { z } from 'zod';
+export declare const CSV_RE: RegExp;
+export declare function fanoutAccountField(description: string): z.ZodType;
+export type AccountSelector = {
+    ok: true;
+    fanout: boolean;
+    aliases: string[];
+} | {
+    ok: false;
+    invalid: string[];
+};
+export declare function parseAccountSelector(value: string, accounts?: readonly string[]): AccountSelector;
+export declare function invalidAccountsResult(invalid: string[], accounts?: readonly string[]): {
+    content: {
+        type: "text";
+        text: string;
+    }[];
+    isError: true;
+};
+export interface FanoutEntry {
+    account: string;
+    ok: boolean;
+    data?: unknown;
+    error?: unknown;
+}
+export declare function runFanout(handler: (...a: unknown[]) => unknown, args: unknown[], aliases: string[]): Promise<{
+    content: {
+        type: 'text';
+        text: string;
+    }[];
+    isError?: true;
+}>;

package/dist/fanout.js

@@ -0,0 +1,85 @@
+import { z } from 'zod';
+import { ACCOUNTS } from './accounts.js';
+export const CSV_RE = /^[a-zA-Z0-9_-]+(\s*,\s*[a-zA-Z0-9_-]+)+$/;
+const FANOUT_CONCURRENCY = 5;
+export function fanoutAccountField(description) {
+    const csvExample = ACCOUNTS.length > 1 ? `; or a CSV subset like "${ACCOUNTS.slice(0, 2).join(',')}"` : '';
+    return z
+        .union([z.enum([...ACCOUNTS, '*']), z.string().regex(CSV_RE)])
+        .describe(`${description}; "*" = all accounts${csvExample}`);
+}
+export function parseAccountSelector(value, accounts = ACCOUNTS) {
+    if (value === '*')
+        return { ok: true, fanout: true, aliases: [...accounts] };
+    if (!value.includes(','))
+        return { ok: true, fanout: false, aliases: [value] };
+    const seen = new Set();
+    const aliases = [];
+    const invalid = [];
+    for (const token of value.split(',').map((t) => t.trim()).filter(Boolean)) {
+        if (!accounts.includes(token)) {
+            invalid.push(token);
+        }
+        else if (!seen.has(token)) {
+            seen.add(token);
+            aliases.push(token);
+        }
+    }
+    if (invalid.length > 0)
+        return { ok: false, invalid };
+    return { ok: true, fanout: aliases.length > 1, aliases };
+}
+export function invalidAccountsResult(invalid, accounts = ACCOUNTS) {
+    return {
+        content: [
+            {
+                type: 'text',
+                text: JSON.stringify({
+                    error: 'validation_error',
+                    message: `Unknown account alias(es): ${invalid.join(', ')}.`,
+                    hint: `Valid aliases: ${accounts.join(', ')}; or "*" for all accounts.`,
+                    retriable: false,
+                }),
+            },
+        ],
+        isError: true,
+    };
+}
+function parsePayload(result) {
+    const text = result?.content?.[0]?.text;
+    if (typeof text !== 'string')
+        return null;
+    try {
+        return JSON.parse(text);
+    }
+    catch {
+        return text;
+    }
+}
+export async function runFanout(handler, args, aliases) {
+    const results = new Array(aliases.length);
+    let next = 0;
+    const worker = async () => {
+        while (next < aliases.length) {
+            const i = next++;
+            const account = aliases[i];
+            try {
+                const res = (await handler({ ...args[0], account }, ...args.slice(1)));
+                const payload = parsePayload(res);
+                results[i] = res?.isError ? { account, ok: false, error: payload } : { account, ok: true, data: payload };
+            }
+            catch (err) {
+                results[i] = {
+                    account,
+                    ok: false,
+                    error: { error: 'internal', message: err.message, retriable: false, account },
+                };
+            }
+        }
+    };
+    await Promise.all(Array.from({ length: Math.min(FANOUT_CONCURRENCY, aliases.length) }, () => worker()));
+    const failed = results.filter((r) => !r.ok).length;
+    const body = { results, partial: failed > 0 };
+    const out = { content: [{ type: 'text', text: JSON.stringify(body) }] };
+    return failed === results.length ? { ...out, isError: true } : out;
+}

package/dist/index.js

@@ -21,6 +21,7 @@ import { getOptionalBundles, getAdminAccounts } from './auth.js';
 import { ToolRegistry } from './registry.js';
 import { registerDiscoverTools } from './discover.js';
 import { registerEscapeTools } from './tools/google-api.js';
+import { registerAccountTools } from './tools/accounts-tool.js';
 import { getToolsets, toolsetEnabled } from './toolsets.js';
 import { resolvePolicy, isAllowed, describePolicy } from './write-control.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -69,6 +70,7 @@ function buildRegistry(server, policy) {
     }
     registerDiscoverTools(registry, policy);
     registerEscapeTools(registry, policy);
+    registerAccountTools(registry);
     return registry;
 }
 async function main() {

package/dist/registry.js

@@ -2,12 +2,19 @@ import { ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
 import { z } from 'zod';
 import { isAllowed, writeDisabledResult } from './write-control.js';
 import { compactResult, trimEnabled } from './trim.js';
+import { fanoutAccountField, invalidAccountsResult, parseAccountSelector, runFanout } from './fanout.js';
 const CUD_OVERRIDES = {
     drive_untrash: 'update',
 };
 const SERVICE_OVERRIDES = {
     reports_activities_list: 'admin',
 };
+// Read tools that write to the local filesystem: fanning the same savePath
+// across accounts would clobber (last write wins).
+const FANOUT_EXCLUDE = new Set(['gmail_download_attachment', 'drive_download', 'drive_export']);
+function isAccountEnum(field) {
+    return field?._zod?.def?.type === 'enum';
+}
 const DELETE_VERB = /(^|_)(delete|remove|trash|clear|empty)(_|$)/;
 const CREATE_VERB = /(^|_)(create|add|insert|send|upload|copy|import|append|submit|duplicate|share|quick)(_|$)/;
 const UPDATE_VERB = /(^|_)(update|patch|modify|set|move|write|format|merge|unmerge|sort|replace|resize|publish|resolve)(_|$)/;
@@ -42,24 +49,41 @@ export class ToolRegistry {
                 destructiveHint: cud === 'delete' || cud === 'update',
                 ...config.annotations,
             };
+            // Fan-out is read-only and never applies to meta tools: google_api_call's
+            // registry cud is "read" but it executes arbitrary writes.
+            let inputShape = config.inputSchema ?? {};
+            let baseHandler = handler;
+            if (cud === 'read' && !this.registeringMeta && !FANOUT_EXCLUDE.has(name) && isAccountEnum(inputShape.account)) {
+                const description = inputShape.account.description ?? 'Google account alias';
+                inputShape = { ...inputShape, account: fanoutAccountField(description) };
+                baseHandler = async (...args) => {
+                    const first = args[0];
+                    const parsed = parseAccountSelector(typeof first?.account === 'string' ? first.account : '');
+                    if (!parsed.ok)
+                        return invalidAccountsResult(parsed.invalid);
+                    if (!parsed.fanout)
+                        return handler({ ...first, account: parsed.aliases[0] }, ...args.slice(1));
+                    return runFanout(handler, args, parsed.aliases);
+                };
+            }
             this.tools.push({
                 name,
                 service,
                 cud,
                 description: config.description ?? '',
-                inputShape: config.inputSchema ?? {},
+                inputShape,
                 annotations,
                 meta: this.registeringMeta,
             });
             const guarded = cud === 'read'
-                ? handler
+                ? baseHandler
                 : (...args) => isAllowed({ name, service, cud }, policy)
-                    ? handler(...args)
+                    ? baseHandler(...args)
                     : writeDisabledResult({ name, service, cud }, policy);
             const finalHandler = this.compactOutput
                 ? async (...args) => compactResult(await guarded(...args))
                 : guarded;
-            return server.registerTool(name, { ...config, annotations }, finalHandler);
+            return server.registerTool(name, { ...config, inputSchema: inputShape, annotations }, finalHandler);
         });
     }
     registerMeta = ((name, config, handler) => {

package/dist/tools/accounts-tool.d.ts

@@ -0,0 +1,29 @@
+import type { ToolRegistry } from '../registry.js';
+export interface AccountHealthDeps {
+    hasToken: (alias: string) => boolean;
+    readToken: (alias: string) => {
+        expiry_date?: number;
+        refresh_token?: string;
+        scope?: string;
+    } | null;
+    fileExists: (p: string) => boolean;
+    now: () => number;
+}
+export type TokenStatus = 'ok' | 'expired_refreshable' | 'needs_reauth' | 'missing' | 'decrypt_error';
+export interface AccountHealth {
+    alias: string;
+    email: string;
+    admin: boolean;
+    token: {
+        status: TokenStatus;
+        expiryDate?: string;
+        hint?: string;
+    };
+    scopes: {
+        configured: number;
+        granted: number;
+        missing: string[];
+    };
+}
+export declare function deriveAccountHealth(alias: string, deps?: AccountHealthDeps): AccountHealth;
+export declare function registerAccountTools(registry: ToolRegistry, deps?: AccountHealthDeps): void;

package/dist/tools/accounts-tool.js

@@ -0,0 +1,80 @@
+import * as fs from 'node:fs';
+import { ACCOUNTS, ACCOUNT_CONFIG } from '../accounts.js';
+import { getAdminAccounts, resolveScopesForAccount } from '../auth.js';
+import { hasToken, readToken } from '../token-store.js';
+const DEFAULT_DEPS = {
+    hasToken,
+    readToken,
+    fileExists: fs.existsSync,
+    now: Date.now,
+};
+export function deriveAccountHealth(alias, deps = DEFAULT_DEPS) {
+    const config = ACCOUNT_CONFIG[alias];
+    const admin = getAdminAccounts().includes(alias);
+    const configured = resolveScopesForAccount(alias);
+    const base = { alias, email: config.email, admin };
+    const noScopes = { configured: configured.length, granted: 0, missing: configured };
+    if (!deps.hasToken(alias)) {
+        const legacy = deps.fileExists(config.tokenPath);
+        return {
+            ...base,
+            token: {
+                status: 'missing',
+                hint: legacy
+                    ? 'Plaintext token.json found — run: npx mcp-google-multi migrate-tokens'
+                    : `Run: npx mcp-google-multi auth --account ${alias}`,
+            },
+            scopes: noScopes,
+        };
+    }
+    let token;
+    try {
+        token = deps.readToken(alias);
+    }
+    catch {
+        return {
+            ...base,
+            token: { status: 'decrypt_error', hint: 'Wrong MASTER_KEY or corrupt token file — re-auth or restore the key.' },
+            scopes: noScopes,
+        };
+    }
+    const granted = typeof token?.scope === 'string' ? token.scope.split(' ').filter(Boolean) : [];
+    const missing = configured.filter((s) => !granted.includes(s));
+    const expiry = typeof token?.expiry_date === 'number' ? token.expiry_date : undefined;
+    const refreshable = typeof token?.refresh_token === 'string' && token.refresh_token.length > 0;
+    let status;
+    if (expiry !== undefined && expiry > deps.now())
+        status = 'ok';
+    else if (refreshable)
+        status = 'expired_refreshable';
+    else
+        status = 'needs_reauth';
+    return {
+        ...base,
+        token: {
+            status,
+            expiryDate: expiry !== undefined ? new Date(expiry).toISOString() : undefined,
+            hint: status === 'needs_reauth'
+                ? `Run: npx mcp-google-multi auth --account ${alias}`
+                : missing.length > 0
+                    ? 'Re-auth to grant the missing scopes'
+                    : undefined,
+        },
+        scopes: { configured: configured.length, granted: granted.length, missing },
+    };
+}
+export function registerAccountTools(registry, deps = DEFAULT_DEPS) {
+    registry.registerMeta('account_list', {
+        description: 'List the configured Google accounts: alias, email, admin flag, token health ' +
+            '(ok / expired_refreshable / needs_reauth / missing / decrypt_error), and granted vs configured scopes. ' +
+            'Use this to see which account aliases are available and healthy.',
+        inputSchema: {},
+    }, async () => ({
+        content: [
+            {
+                type: 'text',
+                text: JSON.stringify({ accounts: ACCOUNTS.map((alias) => deriveAccountHealth(alias, deps)) }),
+            },
+        ],
+    }));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-google-multi",
-  "version": "5.1.0-alpha.3",
+  "version": "5.1.0-alpha.4",
   "description": "Local MCP server for Google Workspace (Gmail, Drive, Calendar, Sheets, Docs, Contacts, Tasks, Meet, Search Console, +Forms/Chat/Admin) across multiple accounts — OAuth-only, encrypted token storage, deny-by-default writes.",
   "type": "module",
   "license": "MIT",