mcp-google-multi 6.0.0-alpha.72 → 6.0.0-alpha.74

package/dist/accounts.js

@@ -75,8 +75,7 @@ function noAccountsMessage() {
  */
 let warnedLegacy = false;
 export function resolveAccounts(env = process.env, filePath = configFilePath(), onInvalid = 'exit', 
-// emptyOk: zero accounts is a valid set, not an error, even with 'throw'
-// (a context that has linked nothing yet). An invalid file still fails.
+// emptyOk: zero accounts is a valid set, not an error, even with 'throw'.
 opts = {}) {
     const dir = opts.tokenDir ?? tokenDir;
     const adminEnv = parseCsv(env.GOOGLE_ADMIN_ACCOUNTS);
@@ -86,8 +85,7 @@ opts = {}) {
             throw new Error(`${slug}: ${message}`);
         failStartup(slug, message);
     };
-    // Validate the legacy global override AT BOOT, whatever GOOGLE_TOOLSETS
-    // selects — otherwise a typo only surfaces at dispatch time inside
+    // Validate at BOOT, or a typo only surfaces at dispatch time inside
     // account_list instead of the promised startup error.
     const legacyNames = parseCsv(env.GOOGLE_OPTIONAL_SCOPES);
     if (legacyNames.length > 0) {
@@ -120,19 +118,13 @@ opts = {}) {
             ...def,
         };
     }
-    // Stat BEFORE read: a cross-process write landing between the two makes the
-    // stamp conservative (flags stale again next dispatch) instead of pinning
-    // stale content behind a fresh stamp.
+    // Stat BEFORE read, so a race lands on the conservative (stale) side.
     const preStamp = fileStamp(filePath, CONFIG_VERSION);
     const config = loadConfigFile(filePath, onInvalid);
     const entries = Object.entries(config?.accounts ?? {});
     if (entries.length === 0) {
-        // Gap #23: an empty registry is NOT fatal at resolve time — the bootstrap and
-        // diagnostic CLIs (doctor/reset/account import/migrate-config/config check)
-        // must run on a fresh install. Only the stdio/http SERVER refuses to boot
-        // empty, enforced by assertServerAccountsConfigured() in index.ts.
-        // The dispatch-path reload ('throw') still throws so a mid-session emptied
-        // config.json keeps the last-good registry instead of dropping tools.
+        // Not fatal here: bootstrap/diagnostic CLIs must run on a fresh install;
+        // only the server refuses to boot empty (index.ts).
         if (onInvalid === 'throw' && !opts.emptyOk) {
             throw new Error(`E_NO_ACCOUNTS_CONFIGURED: ${noAccountsMessage()}`);
         }
@@ -144,9 +136,8 @@ opts = {}) {
             stamp: `${config?.version ?? CONFIG_VERSION}:${preStamp.split(':')[1]}`,
         };
     }
-    // Unknown bundle names fail loudly (a mis-scoped token is worse than a
-    // clear error); v5 silently filtered them. Null prototype: profile names are
-    // user input and must never collide with Object.prototype members.
+    // Unknown bundle names fail loudly (a mis-scoped token is worse than a clear
+    // error). Null prototype: profile names are user input, must never collide with Object.prototype.
     const scopeProfiles = Object.create(null);
     scopeProfiles.base = { bundles: [] };
     for (const [name, profile] of Object.entries(config?.scopeProfiles ?? {})) {
@@ -187,9 +178,8 @@ opts = {}) {
         ...def,
     };
 }
-/** env GOOGLE_DEFAULT_ACCOUNT > config.defaultAccount > unset. A configured
- * default naming an unknown alias refuses to start (E_DEFAULT_ACCOUNT_UNKNOWN —
- * deliberately NOT E_CONFIG_INVALID: the config is schema-valid). */
+// env GOOGLE_DEFAULT_ACCOUNT > config.defaultAccount > unset; an unknown alias
+// refuses to start as E_DEFAULT_ACCOUNT_UNKNOWN, not E_CONFIG_INVALID (the config is schema-valid).
 function resolveDefaultAccount(env, fromConfig, aliases, fail) {
     const fromEnv = env.GOOGLE_DEFAULT_ACCOUNT?.trim();
     const value = fromEnv || fromConfig || undefined;
@@ -208,17 +198,14 @@ export function fileStamp(filePath, version) {
         return `${version}:0`;
     }
 }
-// First-run shim: env is set and no config.json exists yet — materialize
-// the file so the wizard has something to edit. Env still wins this session;
-// a write failure must never block boot (warn on stderr and continue).
+// env is set and no config.json exists yet: materialize the file so the
+// wizard has something to edit; a write failure must never block boot.
 function materializeFirstRun(aliases, configs, filePath) {
     if (fs.existsSync(filePath))
         return;
     try {
         let wrote = false;
-        // mutateConfigFile = lock + re-check + atomic write, so a concurrent
-        // wizard/migrate writer is never clobbered (the loaded `current` is
-        // re-read under the lock; only a still-absent file gets the env content).
+        // lock + re-check + atomic write, so a concurrent wizard/migrate writer is never clobbered.
         mutateConfigFile((current) => {
             if (Object.keys(current.accounts ?? {}).length > 0)
                 return current;

package/dist/arg-normalize.js

@@ -1,10 +1,7 @@
 import { echoName, echoNames, screenArguments, unknownArgEnvelope, } from './arg-strict.js';
 import { logSafe, sliceClean } from './trim.js';
-// The SDK synthesizes input-validation failures as isError RESULTS, skipping
-// the handler entirely: no handler of ours runs, so no envelope exists and the
-// client gets free text. The text is prose in both SDK eras (v1 prefixed it
-// with "MCP error -32602: ", v2 dropped that prefix), while handler envelopes
-// are always JSON starting with "{".
+// The SDK synthesizes input-validation failures as isError RESULTS (no handler
+// runs), so the client gets free prose; handler envelopes always start with "{".
 const SCHEMA_VALIDATION_TEXT = /^(MCP error -32602: )?Input validation error:/;
 export function isSchemaValidationText(text) {
     return SCHEMA_VALIDATION_TEXT.test(text);
@@ -12,18 +9,11 @@ export function isSchemaValidationText(text) {
 /** Capture form of the v2 text. The tool-name class excludes ':' and ' ', so
  * the first ": " after the name is unambiguously the delimiter. */
 const VALIDATION_PROSE = /^(?:MCP error -32602: )?Input validation error: Invalid arguments for tool ([A-Za-z0-9_.-]+): ([\s\S]+)$/;
-/** The SDK's OTHER synthesized prose on the same catch. Both prefixes are
- * SDK-authored; a HANDLER's free text is not, and must survive untouched
- * (the account wizard answers in prose today). */
+/** The SDK's OTHER synthesized prose on the same catch; a HANDLER's free text
+ * is not SDK-authored and must survive untouched. */
 const SDK_OUTPUT_PROSE = /^(?:MCP error -32602: )?Output validation error: /;
-// Wire-level tools/call argument normalization. Clients (LLMs) recurringly
-// snake_case a camelCase parameter (thread_id for threadId) and burn a retry
-// on the -32602. A schema-level fix is off the table: the SDK advertises an
-// EMPTY input schema for any non-object wrapper (pipe/preprocess), so the
-// only seam that keeps tools/list intact is the JSON-RPC message itself —
-// which is versioned MCP spec, stabler than any SDK internal. The rename is
-// provably lossless: it fires only when the sent key is NOT in the tool's
-// schema, its camelCase twin IS, and that twin was not also sent.
+// Wire-level, not schema-level: the SDK advertises an EMPTY input schema for
+// any non-object wrapper, so the JSON-RPC message is the only stable seam. See docs/internals.md.
 export function argNormalizationEnabled(env = process.env) {
     return !/^(0|false|off|no)$/i.test((env.GOOGLE_ARG_NORMALIZE ?? '').trim());
 }
@@ -94,11 +84,8 @@ export function screenMessage(msg, opts, log = (l) => process.stderr.write(`${l}
         return { action: 'forward', msg };
     const tool = m.params.name;
     const declared = opts.declaredFor(tool);
-    // Unregistered tool. The spec keeps this a PROTOCOL error (unknown tool is
-    // not something the model can fix by adjusting arguments), so the channel
-    // stays a JSON-RPC error; only the message gets the did-you-mean and the
-    // gated-service next step. Without `unknownTool`, or on a notification,
-    // the SDK's own "not found" still answers.
+    // Unregistered tool stays a PROTOCOL error (not an arguments problem); only
+    // the message gets the did-you-mean. No `unknownTool`, or a notification: the SDK's own answers.
     if (!declared) {
         if (!opts.unknownTool || m.id === undefined)
             return { action: 'forward', msg };
@@ -115,8 +102,7 @@ export function screenMessage(msg, opts, log = (l) => process.stderr.write(`${l}
     if (screened.unknown.length === 0 && screened.redundant.length === 0)
         return { action: 'forward', msg };
     const all = [...screened.unknown.map((u) => u.sent), ...screened.redundant];
-    // Key names only; argument VALUES never reach the log. The names are the
-    // caller's, so they are escaped here and only here: the envelope is JSON.
+    // Key names only, escaped here and only here: the caller's names, never values, reach the log.
     log(`[args] ${tool}: undeclared ${logSafe(echoNames(all), 600)}${opts.mode === 'warn' ? ' (dropped)' : ' (rejected)'}`);
     try {
         // Only ever a DECLARED key or the literal placeholder, so the metrics
@@ -167,13 +153,10 @@ export function withArgNormalization(transport, shapeFor, log, onRename, strict)
                     if (outcome.action === 'forward')
                         return handler(outcome.msg, extra);
                     // Last-resort fallback: dispatch as before rather than hang the
-                    // caller. The stderr line and the counter already fired above.
-                    // `send` is async, so a rejected promise needs catching too: a
-                    // bare `void` left the client waiting for a frame that never came.
+                    // caller; send is async, so a bare `void` would leave it waiting forever on rejection.
                     const fallback = () => handler(normalized, extra);
                     try {
-                        // Answer on the INNER transport so the metrics tap still sees the
-                        // frame and clears its pending id.
+                        // On the INNER transport so the metrics tap still sees the frame and clears its pending id.
                         void Promise.resolve(transport.send(outcome.response)).catch(fallback);
                     }
                     catch {
@@ -195,10 +178,8 @@ export function withArgNormalization(transport, shapeFor, log, onRename, strict)
     if (transport.setProtocolVersion) {
         wrapper.setProtocolVersion = (v) => transport.setProtocolVersion(v);
     }
-    // v2-only, called by Protocol.connect() before start(). A no-op today (both
-    // sides default to the same exported constant), but a proxy that silently
-    // eats a member the SDK calls is a bug waiting for the first caller that
-    // passes supportedProtocolVersions explicitly.
+    // A no-op today, but a proxy silently eating an SDK-called member is a bug
+    // waiting for the first caller that passes this explicitly.
     if (transport.setSupportedProtocolVersions) {
         wrapper.setSupportedProtocolVersions = (v) => transport.setSupportedProtocolVersions(v);
     }
@@ -230,9 +211,8 @@ export function outputFailureEnvelope(tool, text, account) {
 }
 export function rewriteValidationFrame(message, pending, opts) {
     const m = message;
-    // Responses only. A server-initiated REQUEST (elicitation, sampling) also
-    // carries an id, from a different id space, and evicting on it would drop a
-    // real pending call.
+    // Responses only: a server-initiated REQUEST also carries an id (a
+    // different id space), and evicting on it would drop a real pending call.
     if (m.id === undefined || m.method !== undefined)
         return message;
     const call = pending.get(m.id);

package/dist/arg-strict.js

@@ -1,14 +1,5 @@
-// Unknown-argument screening (backlog item 14). zod strips undeclared keys
-// before a handler runs, so a misremembered argument name used to produce a
-// SUCCESS response with wrong behavior: `parentId` on drive_create_folder was
-// dropped and the folder landed in My Drive root. Field-reported, then
-// reproduced: the typo, the correct name and a wholly invented key all
-// returned byte-identical responses.
-//
-// This module is pure and holds no registry reference. It never rewrites a key
-// and never touches a VALUE: it only decides that a key is undeclared, and
-// suggests what the caller probably meant. Rewriting would risk sending a real
-// value to Google on a guess, which is strictly worse than refusing.
+// Unknown-argument screening: zod strips undeclared keys before a handler
+// runs, so a misremembered name used to produce a SUCCESS with wrong behavior. See docs/internals.md.
 import { editDistance, SUGGEST_MAX_INPUT } from './scope-catalog.js';
 import { sliceClean } from './trim.js';
 /**
@@ -26,24 +17,15 @@ export function unknownArgMode(env = process.env) {
     process.stderr.write(`GOOGLE_ARG_UNKNOWN="${raw}" is not valid (reject | warn | off); using warn\n`);
     return 'warn';
 }
-// The staged rollout is over: `warn` shipped first as pure observability, and
-// this is the flip it was staging for. An undeclared argument is dropped by
-// zod before the handler runs, so `warn` means the CLIENT sees a confident
-// success for a call the server did not perform: drive_list with a misspelled
-// folder key returned the My Drive root, byte-identical to no argument at all.
-// A wrong answer that reads as right is the failure mode agents recover from
-// worst, so the default refuses the call and says what it probably meant.
+// `warn` means the client sees a confident success for a call the server
+// didn't perform; a wrong answer that reads as right is the worst failure mode to recover from.
 const DEFAULT_MODE = 'reject';
 /** Tools that legitimately accept open-ended top-level keys. Empty at 6.0.0:
  * the escape hatch is NOT one, because its open-endedness lives in the VALUES
  * of queryParams/body, never in its six fixed top-level keys. */
 export const STRICT_EXEMPT_TOOLS = new Set();
-/** Keys a CLIENT adds on its own, not keys the model chose. `random_string`
- * is the long-standing probe some clients send to a tool they read as taking
- * no arguments; the others are call-plumbing that bridges and proxies have
- * been observed to fold into `arguments` instead of `params._meta`, where the
- * spec puts them. Rejecting these would fail a call the model got right.
- * Measured against the full tool surface: none is a declared key. */
+// Keys a CLIENT adds on its own, not keys the model chose (a probe some
+// clients send to argument-less tools, plus call-plumbing bridges fold into `arguments`).
 const CLIENT_ARTIFACT_KEYS = new Set([
     'random_string',
     'toolCallId',
@@ -138,10 +120,8 @@ export function screenArguments(tool, args, declared) {
     if (STRICT_EXEMPT_TOOLS.has(tool) || declared.length === 0)
         return out;
     const declaredSet = new Set(declared);
-    // Tier 0 (same key modulo case and separators) is a map lookup, so every key
-    // gets it and a redundant twin is recognised past the ranking budget too.
-    // A near-miss duplicate (a typo sent next to its declared key) is recognised
-    // only within the budget: a call needs 9 of them before one is refused.
+    // Tier 0 is a map lookup, so a redundant twin is recognised past the
+    // ranking budget too; a near-miss duplicate still needs that budget.
     const byFlat = new Map();
     for (const k of declared)
         byFlat.set(flatten(k), [...(byFlat.get(flatten(k)) ?? []), k]);

package/dist/auth.js

@@ -31,12 +31,8 @@ function parseCsvEnv(name) {
         .map(s => s.trim())
         .filter(Boolean);
 }
-/**
- * Legacy global override: a set GOOGLE_OPTIONAL_SCOPES acts as an
- * implicit "legacy-global" profile applied to every account (env wins over
- * file profiles). Unknown names now fail loudly where v5
- * silently dropped them — the intended migration signal.
- */
+// A set GOOGLE_OPTIONAL_SCOPES acts as an implicit profile applied to every
+// account (env wins over file profiles); unknown names fail loudly.
 function legacyGlobalProfile() {
     const names = parseCsvEnv('GOOGLE_OPTIONAL_SCOPES');
     if (names.length === 0)
@@ -130,9 +126,8 @@ export async function runAuthFlow(args) {
     // Auto-provisions on a fresh install (env > keychain > file > generate);
     // resolves eagerly so a provisioning failure surfaces before the browser opens.
     resolveMasterKey();
-    // Shared ephemeral-port loopback flow (oauth-consent.ts): listen first, then
-    // build the auth URL from the assigned redirect. CLI gets a patient timeout;
-    // errors propagate to main()'s fatal handler like every other CLI failure.
+    // Listen first, then build the auth URL from the assigned redirect; errors
+    // propagate to main()'s fatal handler like every other CLI failure.
     const loop = await openLoopbackConsent({ timeoutMs: 10 * 60_000 });
     const oauth2Client = buildConsentClient(loop.redirect);
     // CSRF protection for the OAuth callback (RFC 6749 §10.12).

package/dist/boot-gates.js

@@ -1,7 +1,5 @@
-// Multi-tenant boot gates. The free core never sets these — every
-// helper reduces to today's single-owner behavior when no gates are
-// installed. Deliberately a side-effect-free module (accounts.ts/auth.ts
-// resolve env at import time) so the tenancy module can import it cheaply.
+// Multi-tenant boot gates: every helper reduces to single-owner behavior when
+// no gates are installed. Deliberately side-effect-free, unlike accounts.ts/auth.ts.
 import { failStartup } from './config-file.js';
 let gates = null;
 export function setMtBootGates(g) {

package/dist/cimd-cache.js

@@ -1,9 +1,5 @@
-// GET /authorize is unauthenticated, and a client_id on an allowlisted
-// issuer with a path never seen before forces an outbound fetch. So the
-// fetches running at once are capped, one client_id is fetched once however
-// many requests wait on it, and only a document that passed validation is
-// kept. Errors are never cached (CIMD section 5.2), and a negative cache would
-// not help anyway: the attack varies the path, so its key never repeats.
+// Bounds the unauthenticated-fetch surface of GET /authorize: capped
+// in-flight fetches, one fetch per client_id, no error caching. See docs/internals.md.
 import { CimdHttpError, isTransientFetchError, SsrfBlockedError } from './ssrf-guard.js';
 import { logSafe } from './trim.js';
 export const CIMD_TTL_MS = 5 * 60_000;
@@ -69,16 +65,14 @@ export class CimdClientCache {
         }
         catch (e) {
             out = { error: e instanceof SsrfBlockedError ? 'E_CIMD_SSRF_BLOCKED' : 'E_CIMD_INVALID' };
-            // A document that went bad is never served stale. An issuer that is down
-            // or overloaded says nothing about the document, so the last good one
-            // stays and answers this fetch's requests too (stale-if-error; the error
-            // itself is never stored).
+            // stale-if-error: an issuer that's down/overloaded says nothing about
+            // the document, so the last good one stays and serves this fetch too.
             const stale = this.entries.get(clientId);
             if (!saysNothingAboutDocument(e))
                 this.entries.delete(clientId);
             else if (stale && this.deps.now() - stale.at < CIMD_MAX_STALE_MS)
                 out = { doc: stale.doc, fresh: false };
-            // #13: the detail goes to the log only; the caller gets a generic answer.
+            // The detail goes to the log only; the caller gets a generic answer.
             this.deps.log(`CIMD fetch failed for ${logSafe(clientId, 128)}: ${logSafe(e instanceof Error ? e.message : 'non-Error rejection', 200)}`);
         }
         finally {

package/dist/client-config.js

@@ -1,9 +1,5 @@
-// After the setup wizard finalizes an account, offer to register the
-// server with the user's MCP client so they never hand-edit JSON. Pure core
-// (detection + entry building + idempotent apply), deps-injectable for tests.
-// Consent + non-TTY behavior live in the CLI/tool surfaces; secrets are NEVER
-// inlined — the server self-loads its .env from ~/.config/mcp-google-multi, so
-// a stdio entry needs no secret env at all.
+// Registers the server with the user's MCP client so they never hand-edit
+// JSON. Pure core (detection + entry building + idempotent apply), deps-injectable for tests.
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
 import * as readline from 'node:readline';
 import path from 'node:path';
@@ -20,9 +16,8 @@ function resolve(deps) {
         mkdirp: deps.mkdirp ?? ((dir) => mkdirSync(dir, { recursive: true })),
     };
 }
-// Build paths for the TARGET platform's separators, not the running host's, so
-// the injected `platform` is honored deterministically (a Windows CI runner
-// must still produce posix paths for a linux target, and vice versa).
+// Build paths for the TARGET platform's separators, not the running host's,
+// so the injected `platform` is honored deterministically.
 function pp(r) {
     return r.platform === 'win32' ? path.win32 : path.posix;
 }
@@ -155,9 +150,8 @@ export function applyFileEntry(client, name, entry, deps = {}) {
     const had = Object.prototype.hasOwnProperty.call(prevServers, name);
     const next = { ...existing, mcpServers: { ...prevServers, [name]: entry } };
     r.mkdirp(pp(r).dirname(p));
-    // Back up the prior file before rewriting so a bad write is recoverable
-    // (these foreign configs are small and not concurrently written by us, so a
-    // backup + direct write is sufficient — our own config.json uses fs-atomic).
+    // Back up before rewriting so a bad write is recoverable; our own
+    // config.json uses fs-atomic, but these small foreign configs don't need it.
     let backup;
     if (priorRaw !== null) {
         backup = `${p}.bak`;

package/dist/compose.js

@@ -1,8 +1,5 @@
-// Registry composition, extracted from index.ts so the tenancy module
-// (and tests) can build registries without touching the CLI entrypoint. This
-// module must stay free of import-time side effects of its own: no argv
-// parsing, no process.exit, no prints (accounts.js module-load resolution is
-// the one inherited, pre-existing exception on the import chain).
+// Registry composition, extracted from index.ts so tests can build registries
+// without touching the CLI entrypoint. No import-time side effects of its own.
 import { McpServer } from "@modelcontextprotocol/server";
 import { GENERATED_SERVICES } from './tools/generated/index.js';
 import { GENERATED_GATES, SERVICES, servicesAwaitingRestart, unknownToolMessage } from './services.js';
@@ -25,13 +22,9 @@ export function createMcpServer(version, opts = {}) {
 }
 export function buildRegistry(server, ctx, mode, metrics = null) {
     const policy = ctx.policy;
-    // The registry's account view IS the context's: fan-out expansion,
-    // selector validation and default-account injection all follow this
-    // context, not the process global (identical for the free core's one ctx).
+    // The registry's account view IS the context's, not the process global.
     const registry = new ToolRegistry(server, policy, mode, metrics, () => ctx.accounts);
-    // Every handler resolves its client, token reads and scope hints through
-    // this context; ctx.accounts is read per call, never snapshotted here, so
-    // the owner's live getter stays live.
+    // ctx.accounts is read per call, never snapshotted here, so a live getter stays live.
     const owner = isOwnerContext(ctx);
     const clientDeps = { getClientFn: ctx.getClient, localFiles: owner };
     const execDeps = {

package/dist/config-file.js

@@ -13,9 +13,8 @@ export function configFilePath(env = process.env) {
 export function tenantsDir(env = process.env) {
     return path.join(configDir(env), 'tenants');
 }
-// A tenant id becomes a filesystem path segment exactly like an account
-// alias, so it rides the same traversal guard. 'owner' is the single-owner
-// context's subject and client lane, so no tenant may take it.
+// A tenant id becomes a filesystem path segment like an account alias (same
+// traversal guard); 'owner' is the single-owner subject, so no tenant may take it.
 function assertTenantId(tenantId) {
     if (!ALIAS_RE.test(tenantId) || isReservedAlias(tenantId) || tenantId === 'owner') {
         throw new Error(`E_TENANT_ID_INVALID: invalid tenant id "${tenantId}".`);
@@ -52,9 +51,7 @@ const accountEntrySchema = z.strictObject({
     admin: z.boolean().optional(),
 });
 // .strict() everywhere: any unknown or secret-shaped key (clientSecret,
-// masterKey, jwtKey, clientId) fails validation, structurally enforcing
-// secrets-env-only. scopeProfiles/defaultAccount/discovery/toolsets are part
-// of the frozen envelope; their consumers land in later slices.
+// masterKey, jwtKey, clientId) fails validation, structurally enforcing secrets-env-only.
 export const RESERVED_ALIASES = ['__proto__', 'constructor', 'prototype'];
 export function isReservedAlias(name) {
     return RESERVED_ALIASES.includes(name);
@@ -72,9 +69,8 @@ const configSchema = z.strictObject({
     defaultAccount: z.string().optional(),
     discovery: z.enum(['lazy', 'curated', 'eager']).optional(),
     toolsets: z.string().optional(),
-    // Local usage metrics (metrics-feature-spec): absent = off. Downgrade rule:
-    // a pre-6.0 build reading a config carrying this key fails E_CONFIG_INVALID
-    // (strictObject); remove the key first.
+    // Absent = off. A pre-6.0 build reading a config carrying this key fails
+    // E_CONFIG_INVALID (strictObject); remove the key first to downgrade.
     usageMetrics: z.boolean().optional(),
 });
 export function failStartup(slug, message) {
@@ -125,9 +121,8 @@ export function loadConfigFile(filePath = configFilePath(), onInvalid = 'exit')
         const issue = result.error.issues[0];
         fail('E_CONFIG_INVALID', `${filePath}: ${issue.path.join('.') || '(root)'}: ${issue.message}. Secrets never belong in config.json.`);
     }
-    // Post-schema because zod's key regex passes these; a __proto__ record key
-    // is a prototype-pollution foothold, and Object.prototype member names break
-    // plain-object lookups downstream.
+    // Post-schema: zod's key regex passes these, but a __proto__ record key is
+    // a prototype-pollution foothold downstream.
     const data = result.data;
     for (const [section, keys] of [
         ['accounts', Object.keys(data.accounts ?? {})],

package/dist/discover.js

@@ -1,9 +1,8 @@
 import { z } from 'zod';
 import { describePolicy } from './write-control.js';
 import { hints } from './hint-provider.js';
-// The description budget is the whole point of lazy mode: a full op list per
-// service put lazy tools/list at ~11.5k tokens, so descriptions carry a
-// CAPPED vocabulary and the complete catalog stays in this tool's RESULT.
+// The description budget is the whole point of lazy mode: descriptions carry
+// a CAPPED vocabulary, and the complete catalog stays in this tool's RESULT.
 const CURATED_OPS_CAP = 10;
 const GENERATED_GROUPS_CAP = 6;
 function opVocabulary(registry, service) {
@@ -15,8 +14,7 @@ function opVocabulary(registry, service) {
         parts.push(`${shown.join(', ')}${more > 0 ? ` +${more} more` : ''}`);
     }
     if (generated.length > 0) {
-        // The generated long tail compresses to its resource groups: denser and
-        // more selective than any truncated name list.
+        // Compresses to resource groups: denser than any truncated name list.
         const counts = new Map();
         for (const op of generated) {
             const group = op.split('_')[0];
@@ -31,10 +29,7 @@ function opVocabulary(registry, service) {
 }
 export function registerDiscoverTools(registry, policy) {
     const registerMeta = registry.registerMeta;
-    // Agent-controllable runtime expansion: reveal the whole
-    // curated quality layer for heavy Google work, collapse to reclaim the
-    // name/schema context budget after. stdio-only semantics — over stateless
-    // HTTP the mode is forced curated and these are no-ops.
+    // stdio-only semantics: over stateless HTTP the mode is forced curated and these are no-ops.
     registerMeta('discover_all', {
         description: 'Reveal ALL curated Google tools at once (instead of per-service discovery). Use when ' +
             'starting substantial Google work; prefer these over google_api_call. Pair with discover_reset.',
@@ -101,9 +96,8 @@ export function registerDiscoverTools(registry, policy) {
                             service,
                             operations,
                             writeControl: rendered?.hint ?? describePolicy(policy),
-                            next: operations.length > 0
-                                ? 'Call the chosen tool by name; it is now listed and callable.'
-                                : `No ${service} operation matches "${query}". Call again without query for the full catalog.`,
+                            // catalog() falls back to a full one-line listing when nothing matches, so this is never empty.
+                            next: 'Call the chosen tool by its exact name. A client that loads tools on demand may need its own tool-search or load step before the call succeeds.',
                         }),
                     },
                 ],

package/dist/discovery-client.js

@@ -35,10 +35,8 @@ export const SUPPORTED_APIS = {
     vault: { id: 'vault', version: 'v1' },
     workspaceevents: { id: 'workspaceevents', version: 'v1' },
 };
-// Names agents actually type for an API, mapped to real SUPPORTED_APIS keys.
-// Motivated by observed escape-hatch misses ("analytics" is two Discovery
-// APIs, the Admin SDK is three); keep entries plural-target only when the
-// split is real.
+// Names agents actually type for an API, mapped to real SUPPORTED_APIS keys;
+// plural-target entries only where the split ("analytics" is two APIs) is real.
 export const API_ALIASES = {
     analytics: ['analyticsadmin', 'analyticsdata'],
     ga4: ['analyticsadmin', 'analyticsdata'],
@@ -74,9 +72,8 @@ export function discoveryCacheDir(env = process.env) {
     return (env.DISCOVERY_CACHE_PATH ??
         path.join(env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config'), 'mcp-google-multi', 'discovery'));
 }
-// Default cache path only (an operator's DISCOVERY_CACHE_PATH may be shared,
-// even /tmp, and keeps its mode), only when this process owns it, and best
-// effort. Clears group/other bits and keeps setuid/setgid/sticky.
+// Default cache path only (an operator's DISCOVERY_CACHE_PATH may be shared
+// and keeps its mode), only when this process owns it; clears group/other bits.
 function tightenOwnDir(dir) {
     if (process.platform === 'win32')
         return;
@@ -110,9 +107,8 @@ export function buildMethodIndex(doc, api) {
             if (!method.id || !method.httpMethod || !method.path)
                 continue;
             const params = method.parameters ?? {};
-            // Google serves parameters{} with unstable key order between fetches;
-            // parameterOrder is the canonical sequence, so sort by it (alphabetical
-            // tie-break) to keep gen-tools output deterministic.
+            // parameters{} has unstable key order between fetches; sort by the
+            // canonical parameterOrder (alphabetical tie-break) for deterministic output.
             const order = method.parameterOrder ?? [];
             const pos = (n) => {
                 const i = order.indexOf(n);
@@ -174,9 +170,8 @@ export async function loadMethodIndex(api, deps = {}) {
     if (cacheFresh())
         doc = readCache();
     if (!doc) {
-        // Newer APIs (analyticsadmin/analyticsdata) are absent from the central
-        // discovery directory (404); each service's own $discovery endpoint is
-        // authoritative, so try both — same fallback as scripts/fetch-discovery.
+        // Newer APIs are absent from the central discovery directory (404); try
+        // each service's own $discovery endpoint too, as scripts/fetch-discovery does.
         const urls = [
             `https://www.googleapis.com/discovery/v1/apis/${spec.id}/${spec.version}/rest`,
             `https://${spec.id}.googleapis.com/$discovery/rest?version=${spec.version}`,
@@ -217,20 +212,11 @@ export function clearDiscoveryMemoryCache() {
 // GA4-style report execution (runReport, batchRunPivotReports, runAccessReport)
 // and check* predicates are POSTs purely for the request-body size — reads.
 const POST_READ_VERB = /^(get|list|search|query|lookup|count|batchGet|generateIds|export|download|inspect|check|suggest|(batch)?run\w*report)/i;
-// `cancelWipe` must be matched here, BEFORE `cancel` reaches the delete list:
-// it calls off a pending wipe, which is the opposite of one. Update is tested
-// before delete for exactly that reason.
-// State transitions on something that already exists: reversible, and none of
-// them creates anything, so `create` was both wrong and the most permissive
-// class available. `(batch)?` mirrors the delete list, without which every
-// `batchUpdate*` POST fell through to `create`.
+// Update, tested before delete, so cancelWipe (calling off a wipe) doesn't
+// reach the delete list via its "cancel" suffix. See docs/internals.md.
 const POST_UPDATE_VERB = /^(cancelWipe|(batch)?(untrash|undelete|restore|modify|move|set|sort|merge|unmerge|replace|resize|publish|resolve|update|patch|write|format|change|close|reopen|enable|disable|hide|unhide|accept|approve|decline|reassign|reactivate|renew|mark|turn|suspend|activate|make|return|reclaim|complete))/i;
-// archive sits with the deletes: in GA4 archiving a custom dimension/metric is
-// permanent, so the most restrictive write class is the safe classification.
-// So do the teardown verbs: `stop` and `cancel` tear down a push channel or a
-// long-running operation, `wipe`/`invalidate`/`signOut` destroy device data,
-// codes and sessions, `reset` discards a configuration, and `end` terminates a
-// live conference. Each removes something that existed.
+// archive/wipe/reset/stop/cancel/end etc. all remove or permanently discard
+// something that existed, so the most restrictive class is the safe one. See docs/internals.md.
 const POST_DELETE_VERB = /^(batch)?(delete|remove|trash|clear|empty|obliterate|purge|revoke|wipeout|archive|wipe|invalidate|signOut|stop|cancel|unregister|unreserve|reset|end)/i;
 export function cudFromMethod(method) {
     switch (method.httpMethod) {
@@ -262,13 +248,8 @@ export function expandPath(template, pathParams) {
         if (value === undefined) {
             throw new Error(`Missing required path parameter "${name}"`);
         }
-        // A blank segment collapses the path and Google routes the resulting
-        // trailing-slash URL to the COLLECTION: `sites.get` with siteUrl:"" came
-        // back as the whole site LIST, reported as success. Dot segments resolve
-        // at URL-parse time, so `../v1/contactGroups` retargets the call at a
-        // different endpoint and returns ITS response as success. Both are
-        // silent-wrong, so refuse locally rather than send a different request.
-        // `{+param}` keeps its slashes, so every segment has to be checked.
+        // Both a blank segment and a "." / ".." segment silently retarget the
+        // request to a different, successfully-answered endpoint. See docs/internals.md.
         const segments = plus ? String(value).split('/') : [String(value)];
         for (const segment of segments) {
             if (segment.trim() === '') {

package/dist/doctor.d.ts

@@ -55,7 +55,7 @@ export interface HttpProbeResult {
 /** Console deep-link to enable one API (section-6 hint). */
 export declare function apiEnableLink(api: string): string;
 /** One line, state AND source, so the people being measured can see both
- * here and in `diagnose` (metrics spec section 2). Read-only. */
+ * here and in `diagnose`. Read-only. */
 export declare function usageMetricsStatusLine(env: Record<string, string | undefined>): string;
 /** Roll section verdicts to an overall verdict. `unknown` never worsens it. */
 export declare function overallVerdict(sections: DiagnosticSection[]): Verdict;