mcp-google-multi 5.4.1-alpha.2 → 6.0.0-alpha.1

package/README.md

@@ -4,15 +4,17 @@ The most complete **local Google Workspace MCP server**: Gmail, Drive, Calendar,
 
 [![npm](https://img.shields.io/npm/v/mcp-google-multi?label=npm&color=cb3837)](https://www.npmjs.com/package/mcp-google-multi)
 
-- 🧰 **Exhaustive** — 872 tools across 28 services + an escape hatch for anything else → [COVERAGE.md](./COVERAGE.md)
+- 🧰 **Exhaustive** — 874 tools across 28 services + an escape hatch for anything else → [COVERAGE.md](./COVERAGE.md)
 - 🔑 **Multi-account** — drive any number of Google accounts by alias, or fan one call out across all of them
 - 🔒 **Private by design** — your own OAuth app, tokens encrypted at rest (AES-256-GCM), writes deny-by-default, no telemetry, no metering — it talks only to Google
+- 🌐 **Local or remote** — runs locally over stdio, or self-hosted over HTTP with its own built-in OAuth 2.1 server (Claude Code's `/mcp` login and the claude.ai connector, zero custom UI) → [remote setup](./docs/http-setup.md)
+- ✉️ **Built for real work** — send and read email in Markdown with attachments and one-call replies, an interactive setup wizard with a `doctor` self-check, and per-account scope profiles → [features tour](./docs/features.md)
 
 ## Quick setup
 
 You don't need to know anything about MCP or OAuth — five steps, all copy-paste:
 
-1. **Install [Node.js](https://nodejs.org) 20 or newer**, then install the server:
+1. **Install [Node.js](https://nodejs.org) 22 or newer**, then install the server:
 
    ```bash
    npm install -g mcp-google-multi
@@ -46,7 +48,9 @@ You don't need to know anything about MCP or OAuth — five steps, all copy-past
 
 Restart your client and the tools appear. Check everything with `mcp-google-multi config check`.
 
-**Go deeper:** [Configuration reference](./docs/configuration.md) · [What's covered](./COVERAGE.md) · [Features tour](./docs/features.md) · [Secrets in a vault](./docs/secrets.md) · [Upgrading from v4](./docs/upgrading-v4.md) · [Security policy](./SECURITY.md) · [Roadmap](https://github.com/bakissation/mcp-google-multi/milestones)
+**Running it remotely?** To reach the server from [claude.ai](https://claude.ai) as a custom connector or from another machine, run it over HTTP — it ships its own OAuth 2.1 server, so no bearer tokens to paste. Follow [Remote HTTP setup](./docs/http-setup.md) (Cloudflare named tunnel, Docker, or one-click Render/Railway). Coming from v5? See the [v6 migration guide](./MIGRATION-v6.md).
+
+**Go deeper:** [Configuration reference](./docs/configuration.md) · [What's covered](./COVERAGE.md) · [Features tour](./docs/features.md) · [Remote / HTTP setup](./docs/http-setup.md) · [Secrets in a vault](./docs/secrets.md) · [Migrating to v6](./MIGRATION-v6.md) · [Upgrading from v4](./docs/upgrading-v4.md) · [Security policy](./SECURITY.md) · [Roadmap](https://github.com/bakissation/mcp-google-multi/milestones)
 
 ## Maintainer & credits
 
@@ -54,7 +58,7 @@ Built and maintained by **Abdelbaki Berkati** — [berkati.xyz](https://berkati.
 
 Development is **funded by [IdeaCrafters](https://ideacrafters.com)** ([@IdeaCraftersHQ](https://github.com/IdeaCraftersHQ)) — the studio that pays for this OSS to exist.
 
-Thanks to contributors [@obatried](https://github.com/obatried), [@trevor-commits](https://github.com/trevor-commits), and [@mjreddy](https://github.com/mjreddy). The project is maintainer-led (roadmap on [Milestones](https://github.com/bakissation/mcp-google-multi/milestones); bug reports welcome, feature PRs by prior agreement — see [CONTRIBUTING.md](./CONTRIBUTING.md)). **v5 is complete and in a feedback period: [open an issue](https://github.com/bakissation/mcp-google-multi/issues/new/choose) with bugs, pain points, or what you wish it did — it directly shapes the v6 roadmap.** Security reports go to [SECURITY.md](./SECURITY.md), never a public issue.
+Thanks to contributors [@obatried](https://github.com/obatried), [@trevor-commits](https://github.com/trevor-commits), and [@mjreddy](https://github.com/mjreddy). The project is maintainer-led (roadmap on [Milestones](https://github.com/bakissation/mcp-google-multi/milestones); bug reports welcome, feature PRs by prior agreement — see [CONTRIBUTING.md](./CONTRIBUTING.md)). **Feedback shapes the roadmap: [open an issue](https://github.com/bakissation/mcp-google-multi/issues/new/choose) with bugs, pain points, or what you wish it did.** Security reports go to [SECURITY.md](./SECURITY.md), never a public issue.
 
 ## License
 

package/dist/accounts.d.ts

@@ -1,11 +1,50 @@
+import { z } from 'zod';
+import type { ScopeProfile } from './scope-catalog.js';
+export declare function getTokenDir(): string;
 export interface AccountConfig {
     email: string;
     tokenPath: string;
     encPath: string;
+    scopeProfile?: string;
+    admin?: boolean;
+    source: 'config' | 'env';
 }
-/** Tuple of account aliases (at least one) — usable with z.enum() */
-export declare const ACCOUNTS: [string, ...string[]];
-/** Map of alias → { email, tokenPath } */
-export declare const ACCOUNT_CONFIG: Record<string, AccountConfig>;
-/** Valid account alias (string union isn't static, so tools use z.enum(ACCOUNTS)) */
+export interface AccountSet {
+    aliases: string[];
+    configs: Record<string, AccountConfig>;
+    scopeProfiles: Record<string, ScopeProfile>;
+    source: 'env' | 'file' | 'merged';
+    stamp: string;
+    defaultAccount?: string;
+    defaultAccountSource?: 'env' | 'config';
+}
+export declare function resolveAccounts(env?: NodeJS.ProcessEnv, filePath?: string, onInvalid?: 'exit' | 'throw'): AccountSet;
+/** Live accessor: dispatch-time readers use this, never a captured snapshot. */
+export declare function getAccountSet(): AccountSet;
+/** Re-resolve after a config.json mutation and swap the live set. */
+export declare function invalidateAccountSet(): AccountSet;
+export declare function refreshAccountSetIfStale(): void;
+/** Cross-process staleness probe (BR-7): one stat, compared against the stamp. */
+export declare function isAccountSetStale(): boolean;
+/** Account aliases (possibly empty on a fresh install).
+ * Snapshot from the initial load; enums widen only when the registry is
+ * rebuilt after a mutation (account_add, later slice). */
+export declare const ACCOUNTS: string[];
+/**
+ * The `account` param schema, empty-registry-safe. A `z.enum` requires at least
+ * one value, so a fresh install (zero aliases) would throw at schema-build time
+ * (module load) and take down every CLI — including `doctor`, which is meant to
+ * REPORT the empty registry (gap #23). Fall back to a plain string when there
+ * are no aliases: no alias exists to enumerate, the server refuses to boot empty
+ * anyway, and dispatch validates the account against the live set. */
+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>;
+/**
+ * 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
+ * bootstrap and diagnostic CLIs return before this guard, so it gates only the
+ * server path (called from index.ts after the CLI branches). */
+export declare function assertServerAccountsConfigured(): void;
+/** Valid account alias (string union isn't static, so tools use accountAliasSchema) */
 export type Account = string;

package/dist/accounts.js

@@ -1,23 +1,28 @@
-import dotenv from 'dotenv';
-import { fileURLToPath } from 'node:url';
 import path from 'node:path';
-import { homedir } from 'node:os';
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-// dotenv v17 prints a banner to stdout, corrupting the stdio JSON-RPC channel;
-// DOTENV_CONFIG_QUIET cannot help, it would be read from .env after config() ran.
-dotenv.config({ quiet: true });
-dotenv.config({ path: path.resolve(__dirname, '..', '.env'), quiet: true });
-const defaultTokenDir = path.join(process.env.XDG_CONFIG_HOME || path.join(homedir(), '.config'), 'mcp-google-multi', 'tokens');
+import fs from 'node:fs';
+import { z } from 'zod';
+import { loadEnvFiles } from './env-load.js';
+import { CONFIG_VERSION, configDir, configFilePath, failStartup, loadConfigFile, mutateConfigFile } from './config-file.js';
+import { BUNDLE_CATALOG, closestBundle, resolveBundleAliases } from './scope-catalog.js';
+const envLoad = loadEnvFiles();
+const defaultTokenDir = path.join(configDir(), 'tokens');
 const tokenDir = process.env.TOKEN_STORE_PATH
     ? path.resolve(process.env.TOKEN_STORE_PATH)
     : defaultTokenDir;
-/** Format: GOOGLE_ACCOUNTS="alias1:email1,alias2:email2". */
-function parseAccounts() {
-    const raw = process.env.GOOGLE_ACCOUNTS;
-    if (!raw || raw.trim() === '') {
-        throw new Error('GOOGLE_ACCOUNTS is not set. Define it in .env like:\n' +
-            'GOOGLE_ACCOUNTS=work:user@company.com,personal:user@gmail.com');
-    }
+export function getTokenDir() {
+    return tokenDir;
+}
+function parseCsv(value) {
+    return (value ?? '').split(',').map((s) => s.trim()).filter(Boolean);
+}
+function accountPaths(alias) {
+    return {
+        tokenPath: path.join(tokenDir, alias, 'token.json'),
+        encPath: path.join(tokenDir, `${alias}.enc`),
+    };
+}
+/** v5 env parser, guards verbatim. Format: GOOGLE_ACCOUNTS="alias1:email1,alias2:email2". */
+function parseEnvAccounts(raw, adminAliases) {
     const configs = {};
     const aliases = [];
     for (const entry of raw.split(',')) {
@@ -35,7 +40,7 @@ function parseAccounts() {
         }
         // Restrict alias to a safe charset so it can't escape `tokenDir` via path traversal
         // (e.g. "../../etc/passwd:foo@bar.com" in .env).
-        if (!/^[a-zA-Z0-9_-]+$/.test(alias)) {
+        if (!/^[a-zA-Z0-9_-]+$/.test(alias) || ['__proto__', 'constructor', 'prototype'].includes(alias)) {
             throw new Error(`Invalid alias "${alias}". Allowed characters: letters, digits, underscore, hyphen.`);
         }
         if (aliases.includes(alias)) {
@@ -44,17 +49,254 @@ function parseAccounts() {
         aliases.push(alias);
         configs[alias] = {
             email,
-            tokenPath: path.join(tokenDir, alias, 'token.json'),
-            encPath: path.join(tokenDir, `${alias}.enc`),
+            ...accountPaths(alias),
+            admin: adminAliases.includes(alias) || undefined,
+            source: 'env',
         };
     }
     if (aliases.length === 0) {
         throw new Error('GOOGLE_ACCOUNTS must define at least one account.');
     }
-    return { aliases: aliases, configs };
+    return { aliases, configs };
+}
+function noAccountsMessage() {
+    const envHint = envLoad.loaded.length === 0
+        ? ` No readable .env file was found (searched: ${envLoad.searched.join(', ')}).`
+        : '';
+    return (`no accounts configured. Add them to ${configFilePath()} (run: mcp-google-multi migrate-config), ` +
+        `or set GOOGLE_ACCOUNTS=work:user@company.com,personal:user@gmail.com in the environment.${envHint}`);
+}
+/**
+ * Registry resolution (BR-2): a non-empty GOOGLE_ACCOUNTS env takes the WHOLE
+ * registry from env (12-factor override, never merged key-by-key); otherwise
+ * the registry comes from config.json. GOOGLE_ADMIN_ACCOUNTS, when NON-EMPTY,
+ * overrides per-account admin flags from the file (env var > config field);
+ * empty behaves as unset, mirroring GOOGLE_ACCOUNTS semantics.
+ */
+let warnedLegacy = false;
+export function resolveAccounts(env = process.env, filePath = configFilePath(), onInvalid = 'exit') {
+    const adminEnv = parseCsv(env.GOOGLE_ADMIN_ACCOUNTS);
+    const rawEnv = env.GOOGLE_ACCOUNTS;
+    const fail = (slug, message) => {
+        if (onInvalid === 'throw')
+            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
+    // account_list instead of the promised startup error (BR3).
+    const legacyNames = parseCsv(env.GOOGLE_OPTIONAL_SCOPES);
+    if (legacyNames.length > 0) {
+        for (const bundle of resolveBundleAliases(legacyNames)) {
+            if (bundle === 'admin') {
+                fail('E_UNKNOWN_BUNDLE', '"admin" is not a global bundle: grant it per account via GOOGLE_ADMIN_ACCOUNTS or an "admin: true" scope profile.');
+            }
+            if (!(bundle in BUNDLE_CATALOG)) {
+                const hint = closestBundle(bundle);
+                fail('E_UNKNOWN_BUNDLE', `unknown bundle "${bundle}" in GOOGLE_OPTIONAL_SCOPES${hint ? ` — did you mean "${hint}"?` : ''}`);
+            }
+        }
+        if (!warnedLegacy) {
+            warnedLegacy = true;
+            process.stderr.write('E_LEGACY_GLOBAL_SCOPES: GOOGLE_OPTIONAL_SCOPES applies one global scope set to every account; migrate to per-account scopeProfiles (mcp-google-multi migrate-config).\n');
+        }
+    }
+    if (rawEnv && rawEnv.trim() !== '') {
+        const { aliases, configs } = parseEnvAccounts(rawEnv, adminEnv);
+        materializeFirstRun(aliases, configs, filePath);
+        const def = resolveDefaultAccount(env, null, aliases, fail);
+        return {
+            aliases,
+            configs,
+            // Env-sourced accounts cannot reference file profiles; the legacy
+            // GOOGLE_OPTIONAL_SCOPES override is applied live in auth.ts.
+            scopeProfiles: { base: { bundles: [] } },
+            source: 'env',
+            stamp: 'env:0',
+            ...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.
+    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 (BR-4), 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 (BR-7) instead of dropping tools.
+        if (onInvalid === 'throw') {
+            throw new Error(`E_NO_ACCOUNTS_CONFIGURED: ${noAccountsMessage()}`);
+        }
+        return {
+            aliases: [],
+            configs: {},
+            scopeProfiles: { base: { bundles: [] } },
+            source: 'file',
+            stamp: `${config?.version ?? CONFIG_VERSION}:${preStamp.split(':')[1]}`,
+        };
+    }
+    // BR3: 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.
+    const scopeProfiles = Object.create(null);
+    scopeProfiles.base = { bundles: [] };
+    for (const [name, profile] of Object.entries(config?.scopeProfiles ?? {})) {
+        const bundles = resolveBundleAliases(profile.bundles);
+        for (const bundle of bundles) {
+            if (!(bundle in BUNDLE_CATALOG)) {
+                const hint = closestBundle(bundle);
+                fail('E_UNKNOWN_BUNDLE', `unknown bundle "${bundle}" in scope profile "${name}"${hint ? ` — did you mean "${hint}"?` : ''}`);
+            }
+        }
+        if (profile.includesBase === false && bundles.length === 0 && profile.admin !== true) {
+            fail('E_CONFIG_INVALID', `scope profile "${name}" resolves to zero scopes (includesBase: false with no bundles); Google rejects an empty consent request.`);
+        }
+        scopeProfiles[name] = { ...profile, bundles };
+    }
+    const configs = {};
+    const aliases = [];
+    for (const [alias, entry] of entries) {
+        if (entry.scopeProfile && !Object.hasOwn(scopeProfiles, entry.scopeProfile)) {
+            fail('E_CONFIG_INVALID', `account "${alias}" references scope profile "${entry.scopeProfile}", which is not defined in scopeProfiles.`);
+        }
+        aliases.push(alias);
+        configs[alias] = {
+            email: entry.email,
+            ...accountPaths(alias),
+            scopeProfile: entry.scopeProfile,
+            admin: adminEnv.length > 0 ? adminEnv.includes(alias) : entry.admin,
+            source: 'config',
+        };
+    }
+    const def = resolveDefaultAccount(env, config?.defaultAccount ?? null, aliases, fail);
+    return {
+        aliases,
+        configs,
+        scopeProfiles,
+        source: 'file',
+        stamp: `${config?.version ?? CONFIG_VERSION}:${preStamp.split(':')[1]}`,
+        ...def,
+    };
+}
+/** A2: 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). */
+function resolveDefaultAccount(env, fromConfig, aliases, fail) {
+    const fromEnv = env.GOOGLE_DEFAULT_ACCOUNT?.trim();
+    const value = fromEnv || fromConfig || undefined;
+    if (!value)
+        return {};
+    if (!aliases.includes(value)) {
+        fail('E_DEFAULT_ACCOUNT_UNKNOWN', `default account "${value}" (from ${fromEnv ? 'GOOGLE_DEFAULT_ACCOUNT' : 'config.json defaultAccount'}) is not a configured alias. Valid: ${aliases.join(', ')}.`);
+    }
+    return { defaultAccount: value, defaultAccountSource: fromEnv ? 'env' : 'config' };
+}
+function fileStamp(filePath, version) {
+    try {
+        return `${version}:${fs.statSync(filePath).mtimeMs}`;
+    }
+    catch {
+        return `${version}:0`;
+    }
+}
+// First-run shim (BC6): 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).
+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).
+        mutateConfigFile((current) => {
+            if (Object.keys(current.accounts ?? {}).length > 0)
+                return current;
+            const accounts = {};
+            for (const alias of aliases) {
+                accounts[alias] = {
+                    email: configs[alias].email,
+                    ...(configs[alias].admin ? { admin: true } : {}),
+                };
+            }
+            wrote = true;
+            return { ...current, version: current.version || CONFIG_VERSION, accounts };
+        }, filePath);
+        if (wrote) {
+            process.stderr.write(`Materialized ${filePath} from GOOGLE_ACCOUNTS (env still overrides while set).\n`);
+        }
+    }
+    catch (e) {
+        process.stderr.write(`Could not materialize ${filePath}: ${e.message}\n`);
+    }
+}
+let current = resolveAccounts();
+/** Live accessor: dispatch-time readers use this, never a captured snapshot. */
+export function getAccountSet() {
+    return current;
+}
+/** Re-resolve after a config.json mutation and swap the live set. */
+export function invalidateAccountSet() {
+    current = resolveAccounts();
+    return current;
+}
+/**
+ * Dispatch-path reload (BR-7): NEVER exits and never throws — a mid-edit,
+ * corrupt, or deleted config.json keeps the last-good set and warns once per
+ * distinct failure on stderr. failStartup semantics are boot/CLI-only.
+ */
+let lastReloadWarning = '';
+export function refreshAccountSetIfStale() {
+    if (!isAccountSetStale())
+        return;
+    try {
+        current = resolveAccounts(process.env, configFilePath(), 'throw');
+        lastReloadWarning = '';
+    }
+    catch (e) {
+        const msg = e.message;
+        if (msg !== lastReloadWarning) {
+            process.stderr.write(`config.json reload skipped (keeping last-good registry): ${msg}\n`);
+            lastReloadWarning = msg;
+        }
+    }
+}
+/** Cross-process staleness probe (BR-7): one stat, compared against the stamp. */
+export function isAccountSetStale() {
+    if (current.source !== 'file')
+        return false;
+    const [version] = current.stamp.split(':');
+    return current.stamp !== fileStamp(configFilePath(), Number(version));
+}
+/** Account aliases (possibly empty on a fresh install).
+ * Snapshot from the initial load; enums widen only when the registry is
+ * rebuilt after a mutation (account_add, later slice). */
+export const ACCOUNTS = current.aliases;
+/**
+ * The `account` param schema, empty-registry-safe. A `z.enum` requires at least
+ * one value, so a fresh install (zero aliases) would throw at schema-build time
+ * (module load) and take down every CLI — including `doctor`, which is meant to
+ * REPORT the empty registry (gap #23). Fall back to a plain string when there
+ * are no aliases: no alias exists to enumerate, the server refuses to boot empty
+ * anyway, and dispatch validates the account against the live set. */
+export function accountAliasSchemaFor(aliases) {
+    return aliases.length > 0 ? z.enum(aliases) : z.string();
+}
+/** Shared, load-time snapshot used by every tool's `account` field. */
+export const accountAliasSchema = accountAliasSchemaFor(ACCOUNTS);
+/**
+ * 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
+ * bootstrap and diagnostic CLIs return before this guard, so it gates only the
+ * server path (called from index.ts after the CLI branches). */
+export function assertServerAccountsConfigured() {
+    if (current.aliases.length === 0) {
+        failStartup('E_NO_ACCOUNTS_CONFIGURED', noAccountsMessage());
+    }
 }
-const parsed = parseAccounts();
-/** Tuple of account aliases (at least one) — usable with z.enum() */
-export const ACCOUNTS = parsed.aliases;
-/** Map of alias → { email, tokenPath } */
-export const ACCOUNT_CONFIG = parsed.configs;

package/dist/auth.d.ts

@@ -1,10 +1,17 @@
+import { ADMIN_SCOPES } from './scope-catalog.js';
 export declare const BASE_SCOPES: string[];
 export declare const OPTIONAL_SCOPE_BUNDLES: Record<string, string[]>;
-export declare const ADMIN_SCOPES: string[];
-/** Bundle keys enabled via GOOGLE_OPTIONAL_SCOPES (e.g. ["forms","chat"]). */
+export { ADMIN_SCOPES };
+/** Union of every account's resolved bundles: a service registers if ANY
+ * account can authorize it; per-account authz happens at call time (BR2). */
 export declare function getOptionalBundles(): string[];
-/** Account aliases granted ADMIN_SCOPES via GOOGLE_ADMIN_ACCOUNTS. */
+/** Aliases granted ADMIN_SCOPES: per-account admin flag (env
+ * GOOGLE_ADMIN_ACCOUNTS overrides config.json at resolve) OR the account's
+ * scope profile carrying admin (boolean or "admin" bundle) — equivalent forms. */
 export declare function getAdminAccounts(): string[];
-/** Scopes are fixed at consent time: changing GOOGLE_OPTIONAL_SCOPES or GOOGLE_ADMIN_ACCOUNTS requires re-running auth. */
+/** Scopes are fixed at consent time: changing an account's profile (or the
+ * legacy env) changes its consent set and requires re-running auth. Evaluated
+ * per account: `work` can carry admin + gmail_settings while `personal` is
+ * never asked for them. */
 export declare function resolveScopesForAccount(alias: string): string[];
 export declare function runAuthFlow(args: string[]): Promise<void>;

package/dist/auth.js

@@ -2,8 +2,10 @@ import { OAuth2Client } from 'googleapis-common';
 import http from 'node:http';
 import { URL } from 'node:url';
 import { randomBytes } from 'node:crypto';
-import open from 'open';
-import { ACCOUNTS, ACCOUNT_CONFIG } from './accounts.js';
+import { openUrl } from './open-url.js';
+import { ACCOUNTS, getAccountSet } from './accounts.js';
+import { ADMIN_SCOPES, BUNDLE_CATALOG, closestBundle, resolveBundleAliases } from './scope-catalog.js';
+import { resolveMasterKey } from './master-key.js';
 import { writeToken } from './token-store.js';
 // Personal (non-Workspace) accounts 403 on admin scopes; ADMIN_SCOPES stays per-account opt-in, never granted by default.
 export const BASE_SCOPES = [
@@ -18,67 +20,12 @@ export const BASE_SCOPES = [
     'https://www.googleapis.com/auth/tasks',
     'https://www.googleapis.com/auth/meetings.space.readonly',
 ];
-export const OPTIONAL_SCOPE_BUNDLES = {
-    slides: [
-        'https://www.googleapis.com/auth/presentations',
-    ],
-    forms: [
-        'https://www.googleapis.com/auth/forms.body',
-        'https://www.googleapis.com/auth/forms.responses.readonly',
-    ],
-    chat: [
-        'https://www.googleapis.com/auth/chat.spaces',
-        'https://www.googleapis.com/auth/chat.messages',
-        'https://www.googleapis.com/auth/chat.messages.create',
-    ],
-    // These extend the always-on gmail service: users.settings.* writes require these
-    // scopes (reads already work via gmail.modify); sharing is split out as riskier.
-    gmail_settings: [
-        'https://www.googleapis.com/auth/gmail.settings.basic',
-    ],
-    gmail_settings_sharing: [
-        'https://www.googleapis.com/auth/gmail.settings.sharing',
-    ],
-    classroom: [
-        'https://www.googleapis.com/auth/classroom.courses',
-        'https://www.googleapis.com/auth/classroom.coursework.me',
-        'https://www.googleapis.com/auth/classroom.coursework.students',
-        'https://www.googleapis.com/auth/classroom.courseworkmaterials',
-        'https://www.googleapis.com/auth/classroom.rosters',
-        'https://www.googleapis.com/auth/classroom.announcements',
-        'https://www.googleapis.com/auth/classroom.topics',
-    ],
-    cloudidentity: [
-        'https://www.googleapis.com/auth/cloud-identity.groups',
-        'https://www.googleapis.com/auth/cloud-identity.devices',
-    ],
-    cloudsearch: ['https://www.googleapis.com/auth/cloud_search'],
-    vault: ['https://www.googleapis.com/auth/ediscovery'],
-    keep: ['https://www.googleapis.com/auth/keep'],
-    driveactivity: ['https://www.googleapis.com/auth/drive.activity.readonly'],
-    drivelabels: [
-        'https://www.googleapis.com/auth/drive.labels',
-        'https://www.googleapis.com/auth/drive.admin.labels',
-    ],
-    script: [
-        'https://www.googleapis.com/auth/script.projects',
-        'https://www.googleapis.com/auth/script.deployments',
-        'https://www.googleapis.com/auth/script.processes',
-        'https://www.googleapis.com/auth/script.metrics',
-    ],
-    postmaster: ['https://www.googleapis.com/auth/postmaster.readonly'],
-    groupssettings: ['https://www.googleapis.com/auth/apps.groups.settings'],
-    groupsmigration: ['https://www.googleapis.com/auth/apps.groups.migration'],
-    licensing: ['https://www.googleapis.com/auth/apps.licensing'],
-    reseller: ['https://www.googleapis.com/auth/apps.order'],
-    appsmarket: ['https://www.googleapis.com/auth/appsmarketplace.license'],
-};
-export const ADMIN_SCOPES = [
-    'https://www.googleapis.com/auth/admin.reports.audit.readonly',
-    'https://www.googleapis.com/auth/admin.directory.user',
-    'https://www.googleapis.com/auth/admin.directory.group.readonly',
-    'https://www.googleapis.com/auth/admin.directory.group.member.readonly',
-];
+// Kept as a derived view for compat (docs generator, tests); the catalog in
+// scope-catalog.ts is the source of truth. "admin" is not an optional bundle.
+export const OPTIONAL_SCOPE_BUNDLES = Object.fromEntries(Object.entries(BUNDLE_CATALOG)
+    .filter(([name]) => name !== 'admin')
+    .map(([name, entry]) => [name, entry.scopes]));
+export { ADMIN_SCOPES };
 /** Parse comma-separated env value into a deduplicated string array. */
 function parseCsvEnv(name) {
     return (process.env[name]?.trim() ?? '')
@@ -86,19 +33,79 @@ function parseCsvEnv(name) {
         .map(s => s.trim())
         .filter(Boolean);
 }
-/** Bundle keys enabled via GOOGLE_OPTIONAL_SCOPES (e.g. ["forms","chat"]). */
+/**
+ * Legacy global override (BC7): a set GOOGLE_OPTIONAL_SCOPES acts as an
+ * implicit "legacy-global" profile applied to every account (env wins over
+ * file profiles, cc-config R2). Unknown names now fail loudly (BR3) where v5
+ * silently dropped them — the intended migration signal.
+ */
+function legacyGlobalProfile() {
+    const names = parseCsvEnv('GOOGLE_OPTIONAL_SCOPES');
+    if (names.length === 0)
+        return null;
+    const bundles = resolveBundleAliases(names);
+    // Boot-time validation lives in resolveAccounts (runs whatever
+    // GOOGLE_TOOLSETS selects); this is defense-in-depth for direct callers.
+    for (const bundle of bundles) {
+        if (bundle === 'admin') {
+            throw new Error('E_UNKNOWN_BUNDLE: "admin" is not a global bundle: grant it per account via GOOGLE_ADMIN_ACCOUNTS or an "admin: true" scope profile.');
+        }
+        if (!(bundle in BUNDLE_CATALOG)) {
+            const hint = closestBundle(bundle);
+            throw new Error(`E_UNKNOWN_BUNDLE: unknown bundle "${bundle}" in GOOGLE_OPTIONAL_SCOPES${hint ? ` — did you mean "${hint}"?` : ''}`);
+        }
+    }
+    return { bundles };
+}
+function profileForAccount(alias) {
+    const legacy = legacyGlobalProfile();
+    if (legacy)
+        return legacy;
+    const set = getAccountSet();
+    const name = set.configs[alias]?.scopeProfile ?? 'base';
+    // hasOwn: a profile named like an Object.prototype member must never
+    // resolve to the inherited function.
+    return Object.hasOwn(set.scopeProfiles, name) ? set.scopeProfiles[name] : { bundles: [] };
+}
+/** Union of every account's resolved bundles: a service registers if ANY
+ * account can authorize it; per-account authz happens at call time (BR2). */
 export function getOptionalBundles() {
-    return parseCsvEnv('GOOGLE_OPTIONAL_SCOPES').filter(b => b in OPTIONAL_SCOPE_BUNDLES);
+    const legacy = legacyGlobalProfile();
+    if (legacy)
+        return legacy.bundles.filter(b => b !== 'admin');
+    const union = new Set();
+    const set = getAccountSet();
+    for (const alias of set.aliases) {
+        for (const b of profileForAccount(alias).bundles) {
+            if (b !== 'admin')
+                union.add(b);
+        }
+    }
+    return [...union];
 }
-/** Account aliases granted ADMIN_SCOPES via GOOGLE_ADMIN_ACCOUNTS. */
+/** Aliases granted ADMIN_SCOPES: per-account admin flag (env
+ * GOOGLE_ADMIN_ACCOUNTS overrides config.json at resolve) OR the account's
+ * scope profile carrying admin (boolean or "admin" bundle) — equivalent forms. */
 export function getAdminAccounts() {
-    return parseCsvEnv('GOOGLE_ADMIN_ACCOUNTS');
+    const { aliases, configs } = getAccountSet();
+    return aliases.filter((a) => {
+        if (configs[a].admin === true)
+            return true;
+        const p = profileForAccount(a);
+        return p.admin === true || p.bundles.includes('admin');
+    });
 }
-/** Scopes are fixed at consent time: changing GOOGLE_OPTIONAL_SCOPES or GOOGLE_ADMIN_ACCOUNTS requires re-running auth. */
+/** Scopes are fixed at consent time: changing an account's profile (or the
+ * legacy env) changes its consent set and requires re-running auth. Evaluated
+ * per account: `work` can carry admin + gmail_settings while `personal` is
+ * never asked for them. */
 export function resolveScopesForAccount(alias) {
-    const scopes = [...BASE_SCOPES];
-    for (const bundle of getOptionalBundles()) {
-        scopes.push(...OPTIONAL_SCOPE_BUNDLES[bundle]);
+    const profile = profileForAccount(alias);
+    const scopes = profile.includesBase === false ? [] : [...BASE_SCOPES];
+    for (const bundle of profile.bundles) {
+        if (bundle === 'admin')
+            continue;
+        scopes.push(...BUNDLE_CATALOG[bundle].scopes);
     }
     if (getAdminAccounts().includes(alias)) {
         scopes.push(...ADMIN_SCOPES);
@@ -122,12 +129,11 @@ export async function runAuthFlow(args) {
         console.error(`Unknown account "${alias}". Valid aliases: ${ACCOUNTS.join(', ')}`);
         process.exit(1);
     }
-    const config = ACCOUNT_CONFIG[alias];
+    const config = getAccountSet().configs[alias];
     const scopes = resolveScopesForAccount(alias);
-    if (!process.env.MASTER_KEY) {
-        console.error('MASTER_KEY is not set. Generate one (openssl rand -base64 32) and add it to .env before authenticating.');
-        process.exit(1);
-    }
+    // Auto-provisions on a fresh install (env > keychain > file > generate);
+    // resolves eagerly so a provisioning failure surfaces before the browser opens.
+    resolveMasterKey();
     const oauth2Client = new OAuth2Client(process.env.GOOGLE_CLIENT_ID, process.env.GOOGLE_CLIENT_SECRET, 'http://localhost:4242/oauth2callback');
     // CSRF protection for the OAuth callback (RFC 6749 §10.12).
     const expectedState = randomBytes(32).toString('hex');
@@ -198,9 +204,10 @@ export async function runAuthFlow(args) {
         })
             // Bind to loopback only — never expose the OAuth callback to the local network.
             .listen(4242, '127.0.0.1', () => {
-            // Always print the URL: `open` silently no-ops on headless/SSH sessions.
+            // Always print the URL first: the browser launch is best-effort and
+            // silently does nothing on headless/SSH sessions.
             console.log(`Opening your browser to authorize "${alias}". If nothing opens, visit:\n${authorizeUrl}`);
-            open(authorizeUrl, { wait: false }).then((cp) => cp.unref());
+            openUrl(authorizeUrl);
         });
         server.on('error', (err) => {
             if (err.code === 'EADDRINUSE') {