mcp-google-multi 6.0.0-alpha.47 → 6.0.0-alpha.49

package/dist/accounts.d.ts

@@ -48,6 +48,13 @@ export declare function unknownAliasMessage(aliases: readonly string[], selector
 export declare function accountAliasSchemaFor(aliases: readonly string[]): z.ZodType<string>;
 /** Shared, load-time snapshot used by every tool's `account` field. */
 export declare const accountAliasSchema: z.ZodType<string>;
+/** Live account argument: validates at PARSE time against the accessor's
+ * CURRENT aliases, so an alias added mid-session (account_add, or a tenant
+ * alias link) is immediately valid on already-registered tools — a baked
+ * z.enum freezes the boot-time set until restart. An empty set stays
+ * permissive (same empty-safe rule as above); dispatch still resolves the
+ * alias against the live registry. */
+export declare function accountArgLive(aliases: () => readonly string[]): z.ZodType<string>;
 /**
  * BR-4: the stdio/http SERVER never boots with an empty registry — a fresh user
  * bootstraps via env / `migrate-config` / `account import` / `auth` first. The

package/dist/accounts.js

@@ -302,6 +302,20 @@ export function accountAliasSchemaFor(aliases) {
 }
 /** Shared, load-time snapshot used by every tool's `account` field. */
 export const accountAliasSchema = accountAliasSchemaFor(ACCOUNTS);
+/** Live account argument: validates at PARSE time against the accessor's
+ * CURRENT aliases, so an alias added mid-session (account_add, or a tenant
+ * alias link) is immediately valid on already-registered tools — a baked
+ * z.enum freezes the boot-time set until restart. An empty set stays
+ * permissive (same empty-safe rule as above); dispatch still resolves the
+ * alias against the live registry. */
+export function accountArgLive(aliases) {
+    return z.string().superRefine((value, ctx) => {
+        const current = aliases();
+        if (current.length > 0 && !current.includes(value)) {
+            ctx.addIssue({ code: 'custom', message: unknownAliasMessage(current) });
+        }
+    });
+}
 /**
  * BR-4: the stdio/http SERVER never boots with an empty registry — a fresh user
  * bootstraps via env / `migrate-config` / `account import` / `auth` first. The

package/dist/registry.d.ts

@@ -62,6 +62,9 @@ export declare class ToolRegistry {
     constructor(server: McpServer, policy: Policy, mode?: DiscoveryMode, metrics?: Metrics | null, accounts?: () => AccountSet);
     registerMeta: McpServer['registerTool'];
     services(): string[];
+    /** The registry's OWN alias list: registration-time schema builders (the
+     * generated account enums) read this, never the process global. */
+    accountAliases(): readonly string[];
     /** Declared input-schema keys + scalar kinds for one tool (tools/call arg
      * normalization; the kind drives value coercion on renamed keys). */
     argShape(name: string): ArgShape | undefined;
@@ -120,4 +123,11 @@ export declare class ToolRegistry {
     };
     installListHandler(): void;
     private toToolJson;
+    /** Advertise the CURRENT alias enum on every tools/list: account validation
+     * is (or is becoming) live, so a cached boot-time enum would go stale the
+     * moment account_add lands mid-session. The structural schema stays cached;
+     * only the account property's values are refreshed per call. Skipped for
+     * the subject-taking account tools (their `account` is the OPERAND, e.g. a
+     * brand-new alias name, not an identity to enumerate). */
+    private withLiveAccountEnum;
 }

package/dist/registry.js

@@ -245,6 +245,11 @@ export class ToolRegistry {
     services() {
         return [...new Set(this.tools.filter((t) => !t.meta).map((t) => t.service))];
     }
+    /** The registry's OWN alias list: registration-time schema builders (the
+     * generated account enums) read this, never the process global. */
+    accountAliases() {
+        return this.accounts().aliases;
+    }
     /** Declared input-schema keys + scalar kinds for one tool (tools/call arg
      * normalization; the kind drives value coercion on renamed keys). */
     argShape(name) {
@@ -446,9 +451,35 @@ export class ToolRegistry {
         return {
             name: tool.name,
             description: tool.description,
-            inputSchema,
+            inputSchema: this.withLiveAccountEnum(tool, inputSchema),
             annotations: tool.annotations,
             ...(tool.clientMeta ? { _meta: tool.clientMeta } : {}),
         };
     }
+    /** Advertise the CURRENT alias enum on every tools/list: account validation
+     * is (or is becoming) live, so a cached boot-time enum would go stale the
+     * moment account_add lands mid-session. The structural schema stays cached;
+     * only the account property's values are refreshed per call. Skipped for
+     * the subject-taking account tools (their `account` is the OPERAND, e.g. a
+     * brand-new alias name, not an identity to enumerate). */
+    withLiveAccountEnum(tool, schema) {
+        if (DEFAULT_ACCOUNT_EXCLUDE.has(tool.name))
+            return schema;
+        const s = schema;
+        const account = s?.properties?.account;
+        if (!account)
+            return schema;
+        const aliases = this.accounts().aliases;
+        if (aliases.length === 0)
+            return schema;
+        if (Array.isArray(account.anyOf)) {
+            // fan-out union: refresh the enum branch ('*' + aliases), keep the CSV branch
+            const hasEnumBranch = account.anyOf.some((b) => Array.isArray(b.enum));
+            if (!hasEnumBranch)
+                return schema;
+            const anyOf = account.anyOf.map((b) => (Array.isArray(b.enum) ? { ...b, enum: ['*', ...aliases] } : b));
+            return { ...s, properties: { ...s.properties, account: { ...account, anyOf } } };
+        }
+        return { ...s, properties: { ...s.properties, account: { ...account, enum: [...aliases] } } };
+    }
 }

package/dist/tools/account-wizard.js

@@ -297,6 +297,15 @@ export function registerAccountWizardTools(registry, server) {
             // S2: atomic write + make the alias callable without a restart (BR3).
             writeAccountRow(validated.alias, validated.email, validated.bundles, validated.admin);
             invalidateAccountSet();
+            // Live account args validate against the refreshed registry already;
+            // the list_changed nudge makes clients re-fetch tools/list, where the
+            // advertised account enums are rebuilt from the live set.
+            try {
+                server.sendToolListChanged();
+            }
+            catch {
+                // a client that cannot receive notifications loses nothing but the nudge
+            }
             // S3 + S4: consent + validate.
             const consent = await runConsent(server, validated.alias);
             if (consent.ok === 'pending')

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[]): 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,10 @@
-import { accountAliasSchema } from '../../accounts.js';
+import { accountAliasSchema, accountAliasSchemaFor } 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) {
+    // Per-registry enum when the caller supplies its alias list (regenerated
+    // code passes registry.accountAliases()); the no-arg form keeps the
+    // global-bound schema for compatibility.
+    return (aliases ? accountAliasSchemaFor(aliases) : accountAliasSchema).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;