switchroom 0.19.45 → 0.19.47

package/dist/cli/switchroom.js

@@ -2120,7 +2120,7 @@ var init_esm = __esm(() => {
 });
 
 // src/build-info.ts
-var VERSION = "0.19.45", COMMIT_SHA = "2ad33d5d";
+var VERSION = "0.19.47", COMMIT_SHA = "9693493e";
 
 // src/cli/resolve-version.ts
 import { existsSync, readFileSync } from "node:fs";
@@ -13595,7 +13595,7 @@ function isValidTimezone(value) {
 function resolveMemoryProfile(agentConfig) {
   return agentConfig?.memory?.profile ?? agentConfig?.extends ?? DEFAULT_PROFILE;
 }
-var CodeRepoEntrySchema, AgentBindMountSchema, HttpDiffPollSchema, PollSpecSchema, TelegramMessageActionSchema, WebhookActionSchema, ActionSpecSchema, ScheduleEntrySchema, AgentSoulSchema, AgentToolsSchema, ObservationScopesSchema, ObservationScopeStrategySchema, AntiConfabulationDirectiveSchema, AgentMemorySchema, HookEntrySchema, AgentHooksSchema, SubagentSchema, SessionSchema, SessionContinuitySchema, webhookDispatchRule, TelegramChannelSchema, ChannelsSchema, TIMEZONE_REGEX, ApproverIdSchema, GoogleWorkspaceTierSchema, GoogleWorkspaceConfigSchema, LiteLLMConfigSchema, HindsightPerOpLlmSchema, HindsightConfigSchema, MicrosoftWorkspaceConfigSchema, NotionWorkspaceConfigSchema, AgentGoogleWorkspaceConfigSchema, MicrosoftAccountEmailSchema, MicrosoftToolTokenSchema, MicrosoftAccountBindingSchema, AgentMicrosoftWorkspaceConfigSchema, AgentNotionWorkspaceConfigSchema, ReactionsSchema, ReactionDispatchSchema, releaseBlockFields, ReleaseBlock, RootReleaseBlock, NetworkIsolationSchema, servesField, knowsField, profileFields, ProfileSchema, _omitExtends, defaultsFields, AgentDefaultsSchema, DEFAULT_PROFILE = "default", AgentSchema, TelegramConfigSchema, MemoryBackendConfigSchema, VaultConfigSchema, QuotaConfigSchema, AutoReleaseCheckSchema, HostControlConfigSchema, WebServiceConfigSchema, FleetHealthConfigSchema, HostdConfigSchema, CronEgressSchema, CronConfigSchema, UserSchema, SwitchroomConfigSchema;
+var CodeRepoEntrySchema, AgentBindMountSchema, HttpDiffPollSchema, PollSpecSchema, TelegramMessageActionSchema, WebhookActionSchema, ActionSpecSchema, ScheduleEntrySchema, AgentSoulSchema, AgentToolsSchema, ObservationScopesSchema, ObservationScopeStrategySchema, AntiConfabulationDirectiveSchema, AgentMemorySchema, HookEntrySchema, AgentHooksSchema, SubagentSchema, SessionSchema, SessionContinuitySchema, webhookDispatchRule, TelegramChannelSchema, ChannelsSchema, TIMEZONE_REGEX, ApproverIdSchema, GoogleWorkspaceTierSchema, GoogleServiceTokenSchema, GoogleWorkspaceConfigSchema, LiteLLMConfigSchema, HindsightPerOpLlmSchema, HindsightConfigSchema, MicrosoftWorkspaceConfigSchema, NotionWorkspaceConfigSchema, AgentGoogleWorkspaceConfigSchema, MicrosoftAccountEmailSchema, MicrosoftToolTokenSchema, MicrosoftAccountBindingSchema, AgentMicrosoftWorkspaceConfigSchema, AgentNotionWorkspaceConfigSchema, ReactionsSchema, ReactionDispatchSchema, releaseBlockFields, ReleaseBlock, RootReleaseBlock, NetworkIsolationSchema, servesField, knowsField, profileFields, ProfileSchema, _omitExtends, defaultsFields, AgentDefaultsSchema, DEFAULT_PROFILE = "default", AgentSchema, TelegramConfigSchema, MemoryBackendConfigSchema, VaultConfigSchema, QuotaConfigSchema, AutoReleaseCheckSchema, HostControlConfigSchema, WebServiceConfigSchema, FleetHealthConfigSchema, HostdConfigSchema, CronEgressSchema, CronConfigSchema, UserSchema, SwitchroomConfigSchema;
 var init_schema = __esm(() => {
   init_zod();
   init_observation_scopes();
@@ -13982,11 +13982,18 @@ var init_schema = __esm(() => {
     "extended",
     "complete"
   ]);
+  GoogleServiceTokenSchema = exports_external.enum([
+    "cal",
+    "drive",
+    "docs",
+    "sheets",
+    "slides"
+  ]);
   GoogleWorkspaceConfigSchema = exports_external.object({
     google_client_id: exports_external.string().min(1).describe("Google OAuth client ID (literal string or vault reference e.g. 'vault:google-oauth-client-id')"),
     google_client_secret: exports_external.string().min(1).describe("Google OAuth client secret (literal string or vault reference e.g. 'vault:google-oauth-client-secret')"),
     approvers: exports_external.array(ApproverIdSchema).min(1).describe("Array of numeric Telegram user IDs authorized to approve drive onboarding. " + "At least one must be specified."),
-    tier: GoogleWorkspaceTierSchema.optional().describe("RFC G Phase 1: which upstream MCP tier to expose. " + "core (default) = ~16 tools (Drive+Docs+Sheets+Calendar). " + "extended = ~40 tools (+Slides, Forms, Tasks, Chat). " + "complete = ~60+ tools (+Gmail; not recommended yet \u2014 see RFC G \u00a75).")
+    tier: GoogleWorkspaceTierSchema.optional().describe("RFC G Phase 1: which upstream MCP tier to expose. " + "core (default) = ~16 tools (Drive+Docs+Sheets+Calendar tools; the " + "Calendar tools only authenticate when the account holds the opt-in " + "calendar scope \u2014 no tier mints it). " + "extended = ~40 tools (+Slides, Forms, Tasks, Chat). " + "complete = ~60+ tools (+Gmail; not recommended yet \u2014 see RFC G \u00a75).")
   }).optional();
   LiteLLMConfigSchema = exports_external.object({
     enabled: exports_external.boolean().optional().describe("Opt-in toggle. When true, `switchroom apply` provisions a per-agent " + "LiteLLM virtual key and injects routing env into the container. " + "Default OFF."),
@@ -14019,7 +14026,7 @@ var init_schema = __esm(() => {
       reflect: HindsightPerOpLlmSchema.optional().describe("Per-op override for the `reflect` LLM op (synthesis / mental-model " + "refresh). Emits `HINDSIGHT_API_REFLECT_LLM_*`. Absent \u2192 uses global."),
       consolidation: HindsightPerOpLlmSchema.optional().describe("Per-op override for the `consolidation` LLM op (background memory " + "merge). Emits `HINDSIGHT_API_CONSOLIDATION_LLM_*`. Absent \u2192 global.")
     }).optional().describe("LLM knob for the hindsight container. The flat `provider`/`model` set " + "the global default (backward-compatible); optional `retain`/`reflect`/" + "`consolidation` blocks override individual ops. All fields optional; " + "unset fields fall back to the hard-coded defaults."),
-    env: exports_external.record(exports_external.union([exports_external.string(), exports_external.number(), exports_external.boolean()])).optional().describe("Operator overrides for switchroom's capability-gated Hindsight " + "performance defaults. Only the keys switchroom actually manages are " + "honoured (`HINDSIGHT_PERF_ENV_KEYS` in " + "src/setup/hindsight-perf-defaults.ts: RERANKER_LOCAL_FP16, " + "RERANKER_LOCAL_BATCH_SIZE, LLM_MAX_CONCURRENT, " + "RETAIN/CONSOLIDATION_LLM_MAX_CONCURRENT, LLM_STRICT_SCHEMA, " + "LLM_MAX_RETRIES, CONSOLIDATION_LLM_PARALLELISM, " + "MAX_OBSERVATIONS_PER_SCOPE, " + "RECALL_MAX_CANDIDATES_PER_SOURCE, LINK_EXPANSION_PER_ENTITY_LIMIT, " + "LINK_EXPANSION_TIMEOUT, LLM_REASONING_EFFORT, " + "RERANKER_LOCAL_BUCKET_BATCHING, RERANKER_MAX_CANDIDATES, " + "RERANKER_LOCAL_MAX_CONCURRENT, RECALL_MAX_CONCURRENT, " + "REFLECT_WALL_TIMEOUT, WORKER_CONSOLIDATION_RESERVED_SLOTS, " + "WORKER_CONSOLIDATION_SLOT_LIMIT, " + "CONSOLIDATION_MAX_MEMORIES_PER_ROUND, GRAPH_SEED_MIN_SIMILARITY, " + "LLM_SUPPORTS_MAX_ITEMS, RECENCY_DECAY_FUNCTION, " + "RECENCY_DECAY_HALFLIFE_DAYS \u2014 switchroom defaults recall's recency " + "curve to `exponential` with a 30-day half-life so a fact retained " + "today outranks a stale one, instead of upstream's near-flat " + "linear/365-day window), the override-only keys " + "switchroom manages but ships NO default for " + "(`HINDSIGHT_PERF_OVERRIDE_ONLY_KEYS`: " + "HINDSIGHT_API_WORKER_CONSOLIDATION_BANK_PRIORITY \u2014 a per-deployment " + "`bank-pattern:priority,...` map; unset means upstream's flat " + "created_at FIFO across banks; and " + "HINDSIGHT_CE_DECISIVE_RELATIVE_GAP \u2014 the rollback knob for " + "switchroom's CE-saturation damping patch, a float; >= ~0.65 backs the " + "damping out entirely, unset means the patch's own derived gap; and " + "HINDSIGHT_API_RECENCY_DECAY_LINEAR_WINDOW_DAYS \u2014 only read when the " + "decay function is `linear`, so switchroom ships no default for it but " + "still honours an operator who flips the function back; and " + "HINDSIGHT_API_WORKER_MAX_SLOTS \u2014 the worker poller's TOTAL in-flight " + "task budget, the pool WORKER_CONSOLIDATION_RESERVED_SLOTS reserves out of; " + "unset means upstream's own default; and " + "HINDSIGHT_API_WORKER_RETAIN_RESERVED_SLOTS \u2014 the reserved slot FLOOR for the " + "retain (memory write) lane, carved from that same total; unset means " + "upstream's own 0, i.e. no floor and retain competes for the shared " + "pool; and " + "the pre-0.8.6 name HINDSIGHT_API_WORKER_<TYPE>_MAX_SLOTS is still " + "accepted for every operation type and normalised to " + "..._RESERVED_SLOTS on the way in, because setting both names for " + "one type is a hard boot failure in the engine and switchroom " + "therefore emits only the canonical name; and " + "HINDSIGHT_API_SEMANTIC_MIN_SIMILARITY \u2014 the cosine-similarity floor a " + "candidate must reach to be returned by the semantic retrieval arm at " + "all (0..1); unset means upstream's own 0.3, and where it should sit " + "depends on the bank's embedding model and phrasing diversity, so " + "switchroom ships no opinion; and " + "HINDSIGHT_MCP_RECALL_BUDGET_MODE \u2014 the rollback knob for switchroom's " + "mcp-recall-token-budget image patch; `legacy` restores upstream's " + "exact pre-patch recall returns, anything else or unset is the " + "honest-envelope mode; and " + "HINDSIGHT_API_LLM_TEMPERATURE_REFLECT \u2014 upstream's own per-op reflect " + "temperature knob, made live by switchroom's reflect-temperature image " + "patch; a float, or `none` to omit the kwarg (provider default, " + "upstream's accidental pre-patch behaviour); unset means the image's " + "baked default 0.1; and " + "HINDSIGHT_API_CONSOLIDATION_RECALL_MAX_CONCURRENT \u2014 the background " + "half of switchroom's recall-admission split (#3660): of the " + "RECALL_MAX_CONCURRENT admission slots, at most this many may be held " + "by background consolidation recalls at once, so foreground per-turn " + "recall always keeps the remainder; must be >= 1 and strictly less " + "than RECALL_MAX_CONCURRENT or the engine refuses to boot; unset " + "means the image's derived default min(2, RECALL_MAX_CONCURRENT - 1); " + "1 biases hard toward the interactive lane while a consolidation " + "backlog drains), plus the " + "embedded-PostgreSQL (pg0) sizing keys switchroom manages in " + "src/setup/hindsight-pg-defaults.ts (`HINDSIGHT_PG_ENV_KEYS`: " + "SWITCHROOM_HINDSIGHT_PG_EFFECTIVE_CACHE_SIZE, " + "SWITCHROOM_HINDSIGHT_PG_SHARED_BUFFERS \u2014 a postgres size string such " + "as `4GB`, or the sentinel `off` to leave pg0's own default for that " + "one knob). A value set here " + "REPLACES switchroom's default and is emitted even when the gating " + "capability is absent, so an operator can always force a knob. Other " + "`HINDSIGHT_API_*` keys are deliberately IGNORED \u2014 a blanket " + "passthrough would collide with the vars startHindsight() derives " + "itself (HINDSIGHT_API_PORT, the retain token/deadline budget).")
+    env: exports_external.record(exports_external.union([exports_external.string(), exports_external.number(), exports_external.boolean()])).optional().describe("Operator overrides for switchroom's capability-gated Hindsight " + "performance defaults. Only the keys switchroom actually manages are " + "honoured (`HINDSIGHT_PERF_ENV_KEYS` in " + "src/setup/hindsight-perf-defaults.ts: RERANKER_LOCAL_FP16, " + "RERANKER_LOCAL_BATCH_SIZE, LLM_MAX_CONCURRENT, " + "RETAIN/CONSOLIDATION_LLM_MAX_CONCURRENT, LLM_STRICT_SCHEMA, " + "LLM_MAX_RETRIES, CONSOLIDATION_LLM_PARALLELISM, " + "MAX_OBSERVATIONS_PER_SCOPE, " + "RECALL_MAX_CANDIDATES_PER_SOURCE, LINK_EXPANSION_PER_ENTITY_LIMIT, " + "LINK_EXPANSION_TIMEOUT, LLM_REASONING_EFFORT, " + "RERANKER_LOCAL_BUCKET_BATCHING, RERANKER_MAX_CANDIDATES, " + "RERANKER_LOCAL_MAX_CONCURRENT, RECALL_MAX_CONCURRENT, " + "REFLECT_WALL_TIMEOUT, WORKER_CONSOLIDATION_RESERVED_SLOTS, " + "WORKER_CONSOLIDATION_SLOT_LIMIT, " + "CONSOLIDATION_MAX_MEMORIES_PER_ROUND, GRAPH_SEED_MIN_SIMILARITY, " + "LLM_SUPPORTS_MAX_ITEMS, RECENCY_DECAY_FUNCTION, " + "RECENCY_DECAY_HALFLIFE_DAYS \u2014 switchroom defaults recall's recency " + "curve to `exponential` with a 30-day half-life so a fact retained " + "today outranks a stale one, instead of upstream's near-flat " + "linear/365-day window), the override-only keys " + "switchroom manages but ships NO default for " + "(`HINDSIGHT_PERF_OVERRIDE_ONLY_KEYS`: " + "HINDSIGHT_API_WORKER_CONSOLIDATION_BANK_PRIORITY \u2014 a per-deployment " + "`bank-pattern:priority,...` map; unset means upstream's flat " + "created_at FIFO across banks; and " + "HINDSIGHT_CE_DECISIVE_RELATIVE_GAP \u2014 the rollback knob for " + "switchroom's CE-saturation damping patch, a float; >= ~0.65 backs the " + "damping out entirely, unset means the patch's own derived gap; and " + "HINDSIGHT_API_RECENCY_DECAY_LINEAR_WINDOW_DAYS \u2014 only read when the " + "decay function is `linear`, so switchroom ships no default for it but " + "still honours an operator who flips the function back; and " + "HINDSIGHT_API_WORKER_MAX_SLOTS \u2014 the worker poller's TOTAL in-flight " + "task budget, the pool WORKER_CONSOLIDATION_RESERVED_SLOTS reserves out of; " + "unset means upstream's own default; and " + "HINDSIGHT_API_WORKER_RETAIN_RESERVED_SLOTS \u2014 the reserved slot FLOOR for the " + "retain (memory write) lane, carved from that same total; unset means " + "upstream's own 0, i.e. no floor and retain competes for the shared " + "pool; and " + "the pre-0.8.6 name HINDSIGHT_API_WORKER_<TYPE>_MAX_SLOTS is still " + "accepted for every operation type and normalised to " + "..._RESERVED_SLOTS on the way in, because setting both names for " + "one type is a hard boot failure in the engine and switchroom " + "therefore emits only the canonical name; and " + "HINDSIGHT_API_SEMANTIC_MIN_SIMILARITY \u2014 the cosine-similarity floor a " + "candidate must reach to be returned by the semantic retrieval arm at " + "all (0..1); unset means upstream's own 0.3, and where it should sit " + "depends on the bank's embedding model and phrasing diversity, so " + "switchroom ships no opinion; and " + "HINDSIGHT_MCP_RECALL_BUDGET_MODE \u2014 the rollback knob for switchroom's " + "mcp-recall-token-budget image patch; `legacy` restores upstream's " + "exact pre-patch recall returns, anything else or unset is the " + "honest-envelope mode; and " + "HINDSIGHT_API_LLM_TEMPERATURE_REFLECT \u2014 upstream's own per-op reflect " + "temperature knob, made live by switchroom's reflect-temperature image " + "patch; a float, or `none` to omit the kwarg (provider default, " + "upstream's accidental pre-patch behaviour); unset means the image's " + "baked default 0.1; and " + "HINDSIGHT_API_CONSOLIDATION_RECALL_MAX_CONCURRENT \u2014 the background " + "half of switchroom's recall-admission split (#3660): of the " + "RECALL_MAX_CONCURRENT admission slots, at most this many may be held " + "by background consolidation recalls at once, so foreground per-turn " + "recall always keeps the remainder; must be >= 1 and strictly less " + "than RECALL_MAX_CONCURRENT or the engine refuses to boot; unset " + "means the image's derived default min(2, RECALL_MAX_CONCURRENT - 1); " + "1 biases hard toward the interactive lane while a consolidation " + "backlog drains; and " + "HINDSIGHT_MM_REFRESH_MIN_INTERVAL_S \u2014 the rollback/tuning knob for " + "switchroom's MM-refresh-debounce image patch: the minimum seconds " + "between consolidation-triggered refreshes of one mental model; unset " + "means the image's baked 3600, 0 restores upstream's " + "refresh-every-round behaviour; explicit and cron-scheduled refreshes " + "are never debounced), plus the " + "embedded-PostgreSQL (pg0) sizing keys switchroom manages in " + "src/setup/hindsight-pg-defaults.ts (`HINDSIGHT_PG_ENV_KEYS`: " + "SWITCHROOM_HINDSIGHT_PG_EFFECTIVE_CACHE_SIZE, " + "SWITCHROOM_HINDSIGHT_PG_SHARED_BUFFERS \u2014 a postgres size string such " + "as `4GB`, or the sentinel `off` to leave pg0's own default for that " + "one knob). A value set here " + "REPLACES switchroom's default and is emitted even when the gating " + "capability is absent, so an operator can always force a knob. Other " + "`HINDSIGHT_API_*` keys are deliberately IGNORED \u2014 a blanket " + "passthrough would collide with the vars startHindsight() derives " + "itself (HINDSIGHT_API_PORT, the retain token/deadline budget).")
   });
   MicrosoftWorkspaceConfigSchema = exports_external.object({
     microsoft_client_id: exports_external.string().min(1).optional().describe("Microsoft OAuth application (client) ID from Entra portal " + "(literal string or vault reference e.g. " + "'vault:microsoft-oauth-client-id'). OPTIONAL \u2014 omit it to use " + "switchroom's shipped default Microsoft app (zero-config). " + "Set it only to bring your own Entra app (BYO)."),
@@ -14493,7 +14500,9 @@ var init_schema = __esm(() => {
     }).transform((v) => v.trim().toLowerCase()), exports_external.object({
       enabled_for: exports_external.array(exports_external.string().regex(/^[a-z0-9][a-z0-9_-]{0,50}$/, {
         message: "Agent name must match the standard agent-name pattern"
-      })).describe("Agent slugs that may read this account's vault slots " + "(`google:<account>:refresh_token` etc). Per-agent ACL is " + "enforced at the broker, not at the agent identity layer \u2014 " + "the agent still authenticates via socket-path-as-identity " + "per RFC D \u00a74.1, broker just gates the cross-agent token share.")
+      })).describe("Agent slugs that may read this account's vault slots " + "(`google:<account>:refresh_token` etc). Per-agent ACL is " + "enforced at the broker, not at the agent identity layer \u2014 " + "the agent still authenticates via socket-path-as-identity " + "per RFC D \u00a74.1, broker just gates the cross-agent token share."),
+      readonly: exports_external.boolean().optional().describe("Per-account read-only selection (v1 scope model). true \u2192 the " + "token minted by `auth google account add` carries ONLY " + ".readonly scope variants (zero write scopes), and the gdrive " + "MCP launcher passes upstream `--read-only` so write tools are " + "not exposed. Written by `account add --readonly`; re-read on " + "`--replace` so a re-consent cannot silently re-widen. Omitted " + "= legacy behaviour (tier-tied read-write document scopes)."),
+      services: exports_external.array(GoogleServiceTokenSchema).min(1).optional().describe("Per-account service selection (v1 scope model). Which Google " + "services the minted token covers AND the gdrive MCP exposes " + "(upstream `--tools`): cal, drive, docs, sheets, slides. " + "Written by `account add --services`; re-read on `--replace`. " + "Omitted = the tier's default services (drive,docs,sheets; " + "+slides at extended/complete).")
     })).optional().describe("RFC G Phase 2: per-Google-account ACL for vault slots holding " + "OAuth refresh tokens. Maps account email \u2192 list of agents " + "permitted to read that account's slots. Written by `switchroom " + "auth google enable|disable` (Phase 3); read by the broker on " + "every Google slot access. Replaces RFC D's per-agent vault slot " + "scope (which can't express 'two agents share one Google account')."),
     microsoft_accounts: exports_external.record(exports_external.string().regex(/^[^@\s:]+@[^@\s:]+\.[^@\s:]+$/, {
       message: "Account key must be a Microsoft account email like 'alice@outlook.com' or 'alice@contoso.com' (colons not allowed)"
@@ -16075,7 +16084,8 @@ var init_hindsight_perf_defaults = __esm(() => {
     "HINDSIGHT_MCP_RECALL_BUDGET_MODE",
     "HINDSIGHT_API_LLM_TEMPERATURE_REFLECT",
     "HINDSIGHT_API_RETAIN_WALL_TIMEOUT",
-    "HINDSIGHT_API_CONSOLIDATION_RECALL_MAX_CONCURRENT"
+    "HINDSIGHT_API_CONSOLIDATION_RECALL_MAX_CONCURRENT",
+    "HINDSIGHT_MM_REFRESH_MIN_INTERVAL_S"
   ]);
   HINDSIGHT_WORKER_SLOT_TYPES = [
     "consolidation",
@@ -27363,11 +27373,18 @@ function getPlaywrightMcpSettingsEntry() {
 }
 function getGdriveMcpSettingsEntry(switchroomCliPath, options = {}) {
   const tierArgs = options.tier ? ["--tier", options.tier] : [];
+  const servicesArgs = options.services && options.services.length > 0 ? ["--services", options.services.join(",")] : [];
+  const readOnlyArgs = options.readOnly ? ["--read-only"] : [];
   return {
     key: "gdrive",
     value: {
       command: switchroomCliPath,
-      args: ["drive-mcp-launcher", ...tierArgs]
+      args: [
+        "drive-mcp-launcher",
+        ...tierArgs,
+        ...servicesArgs,
+        ...readOnlyArgs
+      ]
     }
   };
 }
@@ -29941,7 +29958,12 @@ function resolveGdriveMcpEntry(agentName, agentConfig, switchroomConfig) {
   if (!shouldEmitGdriveMcp(agentName, account, googleAccounts))
     return null;
   const tier = agentConfig.google_workspace?.tier ?? switchroomConfig?.google_workspace?.tier;
-  const entry = getGdriveMcpSettingsEntry(DOCKER_SWITCHROOM_CLI_PATH, tier ? { tier } : {});
+  const accountRecord = account ? googleAccounts?.[account.trim().toLowerCase()] : undefined;
+  const entry = getGdriveMcpSettingsEntry(DOCKER_SWITCHROOM_CLI_PATH, {
+    ...tier ? { tier } : {},
+    ...accountRecord?.services && accountRecord.services.length > 0 ? { services: accountRecord.services } : {},
+    ...accountRecord?.readonly ? { readOnly: true } : {}
+  });
   entry.value.env = {
     SWITCHROOM_CONFIG: DOCKER_CONFIG_PATH,
     SWITCHROOM_AGENT_NAME: agentName,
@@ -37436,32 +37458,170 @@ var init_wait = __esm(() => {
 var exports_drive = {};
 __export(exports_drive, {
   workspaceScopesForTier: () => workspaceScopesForTier,
+  tierDefaultServices: () => tierDefaultServices,
   selectGoogleWorkspaceScopes: () => selectGoogleWorkspaceScopes,
   selectDriveAccountScopes: () => selectDriveAccountScopes,
+  scopesForSelection: () => scopesForSelection,
   runDriveOAuthFlow: () => runDriveOAuthFlow,
+  resolveScopeSelection: () => resolveScopeSelection,
+  resolveReconsentCapabilities: () => resolveReconsentCapabilities,
   registerDriveCommand: () => registerDriveCommand,
+  parseServicesOption: () => parseServicesOption,
+  capabilitiesFromScopeString: () => capabilitiesFromScopeString,
   __test: () => __test,
   GOOGLE_SLIDES_SCOPE: () => GOOGLE_SLIDES_SCOPE,
+  GOOGLE_SLIDES_READONLY_SCOPE: () => GOOGLE_SLIDES_READONLY_SCOPE,
   GOOGLE_SHEETS_SCOPE: () => GOOGLE_SHEETS_SCOPE,
+  GOOGLE_SHEETS_READONLY_SCOPE: () => GOOGLE_SHEETS_READONLY_SCOPE,
+  GOOGLE_SERVICES: () => GOOGLE_SERVICES,
   GOOGLE_DOCS_SCOPE: () => GOOGLE_DOCS_SCOPE,
+  GOOGLE_DOCS_READONLY_SCOPE: () => GOOGLE_DOCS_READONLY_SCOPE,
+  GOOGLE_CALENDAR_READONLY_SCOPE: () => GOOGLE_CALENDAR_READONLY_SCOPE,
   DRIVE_WRITE_SCOPES: () => DRIVE_WRITE_SCOPES,
   DRIVE_READONLY_SCOPES: () => DRIVE_READONLY_SCOPES
 });
 import { createInterface as createInterface2 } from "node:readline";
-function workspaceScopesForTier(tier) {
-  const docScopes = [GOOGLE_DOCS_SCOPE, GOOGLE_SHEETS_SCOPE];
+function parseServicesOption(raw) {
+  const tokens = raw.split(",").map((s) => s.trim().toLowerCase()).filter((s) => s.length > 0).map((s) => s === "calendar" ? "cal" : s);
+  if (tokens.length === 0) {
+    throw new Error(`--services requires at least one service (valid: ${GOOGLE_SERVICES.join(", ")})`);
+  }
+  for (const t of tokens) {
+    if (!GOOGLE_SERVICES.includes(t)) {
+      throw new Error(`--services: unknown service '${t}' (valid: ${GOOGLE_SERVICES.join(", ")}; ` + `'calendar' is accepted as an alias for 'cal')`);
+    }
+  }
+  const set = new Set(tokens);
+  return GOOGLE_SERVICES.filter((s) => set.has(s));
+}
+function tierDefaultServices(tier) {
   if (tier === "extended" || tier === "complete") {
-    return [...docScopes, GOOGLE_SLIDES_SCOPE];
+    return ["drive", "docs", "sheets", "slides"];
+  }
+  return ["drive", "docs", "sheets"];
+}
+function scopesForSelection(sel) {
+  const selected = new Set(sel.services);
+  const out = [];
+  if (selected.has("drive")) {
+    out.push(...DRIVE_READONLY_SCOPES);
+    if (sel.driveWrite && !sel.readonly) {
+      out.push("https://www.googleapis.com/auth/drive.file");
+    }
+  }
+  if (selected.has("docs")) {
+    out.push(sel.readonly ? GOOGLE_DOCS_READONLY_SCOPE : GOOGLE_DOCS_SCOPE);
+  }
+  if (selected.has("sheets")) {
+    out.push(sel.readonly ? GOOGLE_SHEETS_READONLY_SCOPE : GOOGLE_SHEETS_SCOPE);
+  }
+  if (selected.has("slides")) {
+    out.push(sel.readonly ? GOOGLE_SLIDES_READONLY_SCOPE : GOOGLE_SLIDES_SCOPE);
   }
-  return docScopes;
+  if (selected.has("cal")) {
+    out.push(GOOGLE_CALENDAR_READONLY_SCOPE);
+  }
+  return [...new Set(out)];
+}
+function workspaceScopesForTier(tier) {
+  return scopesForSelection({
+    readonly: false,
+    driveWrite: false,
+    services: tierDefaultServices(tier).filter((s) => s !== "drive")
+  });
 }
 function selectDriveAccountScopes(write) {
   return write ? DRIVE_WRITE_SCOPES : DRIVE_READONLY_SCOPES;
 }
 function selectGoogleWorkspaceScopes(opts) {
-  const base = selectDriveAccountScopes(opts.write);
-  const workspace = workspaceScopesForTier(opts.tier ?? "core");
-  return [...new Set([...base, ...workspace])];
+  if (opts.readonly && opts.write) {
+    throw new Error("--readonly and --write are mutually exclusive: a read-only " + "selection mints zero write scopes by definition.");
+  }
+  const services = opts.services ?? tierDefaultServices(opts.tier ?? "core");
+  const withCal = opts.calendar && !services.includes("cal") ? [...services, "cal"] : services;
+  const set = new Set(withCal);
+  return scopesForSelection({
+    readonly: opts.readonly ?? false,
+    driveWrite: opts.write,
+    services: GOOGLE_SERVICES.filter((s) => set.has(s))
+  });
+}
+function capabilitiesFromScopeString(scope) {
+  const have = new Set(scope.split(/\s+/).map((s) => s.trim()).filter((s) => s.length > 0));
+  return {
+    write: have.has("https://www.googleapis.com/auth/drive.file"),
+    calendar: have.has(GOOGLE_CALENDAR_READONLY_SCOPE)
+  };
+}
+function resolveReconsentCapabilities(requested, existing) {
+  const keys = ["write", "calendar"];
+  if (!existing) {
+    return { effective: { ...requested }, carried: [], added: [] };
+  }
+  return {
+    effective: {
+      write: requested.write || existing.write,
+      calendar: requested.calendar || existing.calendar
+    },
+    carried: keys.filter((k) => existing[k] && !requested[k]),
+    added: keys.filter((k) => requested[k] && !existing[k])
+  };
+}
+function resolveScopeSelection(args) {
+  const { flags, persisted, existing, tier } = args;
+  if (flags.readonly && flags.write) {
+    throw new Error("--readonly and --write are mutually exclusive. A read-only account " + "mints zero write scopes; use --write (without --readonly) for the " + "drive.file write grant.");
+  }
+  const dropped = [];
+  const readonly = flags.readonly ? true : flags.write ? false : persisted?.readonly ?? false;
+  if (flags.write && persisted?.readonly) {
+    dropped.push("read-only mode (persisted `readonly: true`) \u2014 dropped because --write was passed");
+  }
+  let driveWrite = existing.write;
+  if (readonly && existing.write) {
+    driveWrite = false;
+    dropped.push("Drive write (drive.file) \u2014 the existing token carries it, but --readonly was passed");
+  }
+  const explicitServices = !!(flags.services && flags.services.length > 0);
+  let services;
+  let persistServices;
+  if (explicitServices) {
+    services = [...flags.services];
+    persistServices = true;
+    if (flags.calendar && !services.includes("cal"))
+      services.push("cal");
+  } else if (persisted?.services && persisted.services.length > 0) {
+    services = [...persisted.services];
+    persistServices = true;
+    if ((flags.calendar || existing.calendar) && !services.includes("cal")) {
+      services.push("cal");
+    }
+  } else {
+    services = [...tierDefaultServices(tier)];
+    persistServices = false;
+    if ((flags.calendar || existing.calendar) && !services.includes("cal")) {
+      services.push("cal");
+    }
+  }
+  const set = new Set(services);
+  const canonical = GOOGLE_SERVICES.filter((s) => set.has(s));
+  if (explicitServices) {
+    const prior = persisted?.services ?? (existing.calendar ? [...tierDefaultServices(tier), "cal"] : tierDefaultServices(tier));
+    for (const s of prior) {
+      if (!set.has(s)) {
+        dropped.push(`service '${s}' \u2014 previously granted, not in the --services list passed`);
+      }
+    }
+  }
+  const persist = flags.readonly || persistServices || persisted !== undefined ? {
+    readonly,
+    services: canonical
+  } : null;
+  return {
+    selection: { readonly, services: canonical, driveWrite },
+    persist,
+    dropped
+  };
 }
 function getVaultPath(configPath) {
   try {
@@ -37875,7 +38035,7 @@ function registerDriveCommand(program3, deps = {}) {
     await runDisconnect({ agentName: agent }, deps);
   });
 }
-var EXIT_OK = 0, EXIT_DENIED = 1, EXIT_TIMEOUT = 2, EXIT_RATE_LIMITED = 3, EXIT_ERROR = 4, EXIT_ABORTED = 130, DRIVE_READONLY_SCOPES, DRIVE_WRITE_SCOPES, DEFAULT_SCOPES, GOOGLE_DOCS_SCOPE = "https://www.googleapis.com/auth/documents", GOOGLE_SHEETS_SCOPE = "https://www.googleapis.com/auth/spreadsheets", GOOGLE_SLIDES_SCOPE = "https://www.googleapis.com/auth/presentations", __test;
+var EXIT_OK = 0, EXIT_DENIED = 1, EXIT_TIMEOUT = 2, EXIT_RATE_LIMITED = 3, EXIT_ERROR = 4, EXIT_ABORTED = 130, DRIVE_READONLY_SCOPES, DRIVE_WRITE_SCOPES, DEFAULT_SCOPES, GOOGLE_DOCS_SCOPE = "https://www.googleapis.com/auth/documents", GOOGLE_SHEETS_SCOPE = "https://www.googleapis.com/auth/spreadsheets", GOOGLE_SLIDES_SCOPE = "https://www.googleapis.com/auth/presentations", GOOGLE_CALENDAR_READONLY_SCOPE = "https://www.googleapis.com/auth/calendar.readonly", GOOGLE_DOCS_READONLY_SCOPE = "https://www.googleapis.com/auth/documents.readonly", GOOGLE_SHEETS_READONLY_SCOPE = "https://www.googleapis.com/auth/spreadsheets.readonly", GOOGLE_SLIDES_READONLY_SCOPE = "https://www.googleapis.com/auth/presentations.readonly", GOOGLE_SERVICES, __test;
 var init_drive = __esm(() => {
   init_source();
   init_loader();
@@ -37895,6 +38055,13 @@ var init_drive = __esm(() => {
     "https://www.googleapis.com/auth/drive.file"
   ];
   DEFAULT_SCOPES = DRIVE_READONLY_SCOPES;
+  GOOGLE_SERVICES = [
+    "drive",
+    "docs",
+    "sheets",
+    "slides",
+    "cal"
+  ];
   __test = {
     runConnect,
     runDisconnect,
@@ -77008,6 +77175,23 @@ function listGoogleAccounts(yamlText) {
   }
   return out;
 }
+function setGoogleAccountSelection(yamlText, account, selection) {
+  const doc = import_yaml6.parseDocument(yamlText);
+  ensureGoogleAccountEntry(doc, account);
+  const currentReadonly = doc.getIn([
+    "google_accounts",
+    account,
+    "readonly"
+  ]);
+  const currentServices = doc.getIn(["google_accounts", account, "services"]);
+  const currentServicesArr = readEnabledFor(currentServices);
+  const unchanged = currentReadonly === selection.readonly && currentServicesArr.length === selection.services.length && currentServicesArr.every((s, i) => s === selection.services[i]);
+  if (unchanged)
+    return yamlText;
+  doc.setIn(["google_accounts", account, "readonly"], selection.readonly);
+  doc.setIn(["google_accounts", account, "services"], [...selection.services]);
+  return String(doc);
+}
 function readEnabledFor(node) {
   if (!import_yaml6.isSeq(node))
     return [];
@@ -77043,7 +77227,7 @@ function registerAuthGoogleSubcommands(program3, authParent) {
   registerDisable(google, program3);
   registerList(google, program3);
   const account = google.command("account").description("Manage Google account credentials in the auth-broker (add / remove / list).");
-  registerAccountAdd(account);
+  registerAccountAdd(account, program3);
   registerAccountRemove(account);
   registerAccountList(account);
 }
@@ -77303,11 +77487,18 @@ function expandAllAgents(agents, config) {
 function pad(s, width) {
   return s.length >= width ? s : s + " ".repeat(width - s.length);
 }
-function registerAccountAdd(accountParent) {
-  accountParent.command("add <account>").description("Mint a Google OAuth refresh token for <account> and register it with the auth-broker. For Drive scopes the effective flow is desktop-loopback (device-code returns invalid_scope for Drive; OOB is retired) \u2014 use a Desktop OAuth client; on a headless host complete the browser step over an SSH port-forward. Add --write for create/edit (drive.file); default is read-only.").option("--replace", "Overwrite existing credentials for <account> (default refuses if account already registered)", false).option("--write", "Request Drive WRITE scope (drive.file: create + edit app-created files) in addition to read. Default is read-only \u2014 a read grant never silently becomes a write grant. Re-consent an existing account with `--replace --write`.", false).action(withConfigError(async (account, opts) => {
+function registerAccountAdd(accountParent, program3) {
+  accountParent.command("add <account>").description("Mint a Google OAuth refresh token for <account> and register it with the auth-broker. For Drive scopes the effective flow is desktop-loopback (device-code returns invalid_scope for Drive; OOB is retired) \u2014 use a Desktop OAuth client; on a headless host complete the browser step over an SSH port-forward. Add --write for create/edit (drive.file) and --calendar for read-only Calendar; default is Drive read-only.").option("--replace", "Overwrite existing credentials for <account> (default refuses if account already registered)", false).option("--write", "Request Drive WRITE scope (drive.file: create + edit app-created files) in addition to read. Default is read-only \u2014 a read grant never silently becomes a write grant. Re-consent an existing account with `--replace --write`.", false).option("--calendar", "Request READ-ONLY Calendar scope (calendar.readonly) so the gdrive MCP's list_calendars / get_events tools authenticate. Opt-in \u2014 no tier grants it by default, and switchroom never requests a Calendar WRITE scope. Re-consent an existing account with `--replace --calendar`.", false).option("--readonly", "Mint ONLY read-only scope variants for every selected service (zero write scopes), and run the gdrive MCP in upstream --read-only mode. Mutually exclusive with --write. Persisted per account and carried forward on --replace \u2014 a read-only account cannot silently re-widen.", false).option("--services <list>", "Comma-separated per-account service selection: cal,drive,docs,sheets,slides ('calendar' accepted for 'cal'). Selects BOTH the OAuth scopes minted AND the tools the gdrive MCP exposes (upstream --tools). Omitted = the tier's default services (drive,docs,sheets; +slides at extended/complete). Persisted per account and carried forward on --replace.").action(withConfigError(async (account, opts) => {
     const normalizedAccount = validateAndNormalizeAccountEmail(account);
     const [
-      { runDriveOAuthFlow: runDriveOAuthFlow2, selectGoogleWorkspaceScopes: selectGoogleWorkspaceScopes2 },
+      {
+        runDriveOAuthFlow: runDriveOAuthFlow2,
+        selectGoogleWorkspaceScopes: selectGoogleWorkspaceScopes2,
+        capabilitiesFromScopeString: capabilitiesFromScopeString2,
+        resolveReconsentCapabilities: resolveReconsentCapabilities2,
+        parseServicesOption: parseServicesOption2,
+        resolveScopeSelection: resolveScopeSelection2
+      },
       { selectInitialTier: selectInitialTier2 },
       { brokerCall: brokerCall2 },
       { loadConfig: loadConfig2, resolvePath: resolvePath2 },
@@ -77377,8 +77568,41 @@ function registerAccountAdd(accountParent) {
       clientSecretRaw = await resolveRef(clientSecretRaw, "google_client_secret");
     }
     const tier = gw.tier ?? "core";
+    if (opts.readonly && opts.write) {
+      throw new Error("--readonly and --write are mutually exclusive. A read-only " + "account mints zero write scopes; drop one of the flags.");
+    }
+    const requestedServices = opts.services ? parseServicesOption2(opts.services) : undefined;
+    const persistedRecord = config.google_accounts?.[normalizedAccount];
+    const persistedSelection = persistedRecord && (persistedRecord.readonly !== undefined || persistedRecord.services !== undefined) ? {
+      readonly: persistedRecord.readonly,
+      services: persistedRecord.services
+    } : undefined;
+    const existingEntry = (await brokerCall2(async (client) => client.listGoogleAccounts())).accounts.find((a) => a.account === normalizedAccount);
+    const plan = resolveReconsentCapabilities2({ write: opts.write ?? false, calendar: opts.calendar ?? false }, existingEntry ? capabilitiesFromScopeString2(existingEntry.scope) : undefined);
+    if (existingEntry && !opts.replace && plan.added.length > 0) {
+      throw new Error(buildScopeReconsentRequiredError(normalizedAccount, plan.added));
+    }
+    if (existingEntry && !opts.replace && (opts.readonly || requestedServices)) {
+      throw new Error(buildSelectionReconsentRequiredError(normalizedAccount, {
+        readonly: opts.readonly ?? false,
+        services: opts.services
+      }));
+    }
+    const selPlan = resolveScopeSelection2({
+      flags: {
+        readonly: opts.readonly ?? false,
+        write: opts.write ?? false,
+        calendar: opts.calendar ?? false,
+        services: requestedServices
+      },
+      persisted: persistedSelection,
+      existing: plan.effective,
+      tier
+    });
     const accountScopes = selectGoogleWorkspaceScopes2({
-      write: opts.write ?? false,
+      write: selPlan.selection.driveWrite,
+      readonly: selPlan.selection.readonly,
+      services: selPlan.selection.services,
       tier
     });
     const oauthCfg = {
@@ -77386,10 +77610,27 @@ function registerAccountAdd(accountParent) {
       client_secret: clientSecretRaw,
       scopes: accountScopes
     };
-    if (opts.write) {
+    if (selPlan.selection.readonly) {
+      console.log(source_default.yellow("  READ-ONLY selection: minting only .readonly scope variants \u2014 zero write scopes."));
+    }
+    if (selPlan.selection.driveWrite && !selPlan.selection.readonly) {
       console.log(source_default.yellow("  Requesting Drive WRITE scope (drive.file \u2014 create/edit app-created files)."));
     }
-    console.log(source_default.gray(`  Workspace tier: ${tier} \u2014 requesting Docs + Sheets` + (tier === "extended" || tier === "complete" ? " + Slides" : "") + " API scopes so the tier's tools can authenticate."));
+    if (selPlan.selection.services.includes("cal")) {
+      console.log(source_default.yellow("  Requesting Calendar READ-ONLY scope (calendar.readonly \u2014 list calendars, read events)."));
+    }
+    for (const d of selPlan.dropped) {
+      console.log(source_default.yellow(`  NOT carried forward: ${d}.`));
+    }
+    const carried = plan.carried.filter((k) => !(k === "write" && selPlan.selection.readonly) && !(k === "calendar" && !selPlan.selection.services.includes("cal")));
+    for (const line of buildCarryForwardNotices(carried)) {
+      console.log(source_default.gray(line));
+    }
+    if (selPlan.persist) {
+      console.log(source_default.gray(`  Service selection: ${selPlan.selection.services.join(", ")}` + (selPlan.selection.readonly ? " (read-only)" : "") + " \u2014 persisted per account and carried forward on --replace."));
+    } else {
+      console.log(source_default.gray(`  Workspace tier: ${tier} \u2014 requesting Docs + Sheets` + (tier === "extended" || tier === "complete" ? " + Slides" : "") + " API scopes so the tier's tools can authenticate."));
+    }
     console.log(source_default.gray(`  Changing the tier later requires re-running this command
 ` + "  (`--replace`) \u2014 OAuth scopes are fixed at consent time."));
     const oauthEnv = {
@@ -77419,12 +77660,76 @@ function registerAccountAdd(accountParent) {
     });
     console.log();
     console.log(source_default.green(`  \u2713 Registered Google account ${source_default.bold(normalizedAccount)} with auth-broker.`));
+    if (selPlan.persist) {
+      const configPath = getConfigPath(program3);
+      const raw = readFileSync29(configPath, "utf-8");
+      const patched = setGoogleAccountSelection(raw, normalizedAccount, {
+        readonly: selPlan.persist.readonly ?? false,
+        services: selPlan.persist.services ?? []
+      });
+      if (patched !== raw) {
+        writeGoogleYaml(configPath, patched);
+        console.log(source_default.gray(`  Persisted selection to google_accounts.${normalizedAccount} ` + `(readonly: ${selPlan.persist.readonly ?? false}, services: ` + `${(selPlan.persist.services ?? []).join(",")}). Agents pick ` + `it up on their next restart.`));
+      }
+    }
     console.log();
     console.log(`  Next: enable on one or more agents:`);
     console.log(source_default.cyan(`    switchroom auth google enable ${normalizedAccount} <agent> [...]`));
     console.log();
   }));
 }
+var CAPABILITY_LABELS = {
+  write: {
+    flag: "--write",
+    scope: "drive.file",
+    summary: "Drive write (create + edit app-created files)"
+  },
+  calendar: {
+    flag: "--calendar",
+    scope: "calendar.readonly",
+    summary: "Calendar read-only (list calendars, read events)"
+  }
+};
+function buildScopeReconsentRequiredError(account, added) {
+  const flags = added.map((k) => CAPABILITY_LABELS[k].flag);
+  const scopes = added.map((k) => CAPABILITY_LABELS[k].scope).join(", ");
+  return [
+    `'${account}' is already registered with the auth-broker, and its stored ` + `token does not carry ${scopes}.`,
+    "",
+    "OAuth scopes are fixed at consent time \u2014 a stored token cannot be",
+    "widened in place. Re-consent to mint a new token that includes it:",
+    "",
+    `  switchroom auth google account add ${account} --replace ${flags.join(" ")}`,
+    "",
+    "Scopes the account already holds are carried forward automatically,",
+    "so re-consenting will not drop existing capabilities."
+  ].join(`
+`);
+}
+function buildSelectionReconsentRequiredError(account, requested) {
+  const flags = [
+    requested.readonly ? "--readonly" : "",
+    requested.services ? `--services ${requested.services}` : ""
+  ].filter((s) => s.length > 0).join(" ");
+  return [
+    `'${account}' is already registered with the auth-broker, and changing ` + `its readonly/services selection changes the OAuth scope set.`,
+    "",
+    "OAuth scopes are fixed at consent time \u2014 a stored token cannot be",
+    "reshaped in place. Re-consent to mint a token with the new selection:",
+    "",
+    `  switchroom auth google account add ${account} --replace ${flags}`,
+    "",
+    "The persisted selection (and any capabilities the flags don't",
+    "explicitly change) is carried forward, never silently widened."
+  ].join(`
+`);
+}
+function buildCarryForwardNotices(carried) {
+  return carried.map((k) => {
+    const { flag, scope, summary } = CAPABILITY_LABELS[k];
+    return `  Carrying forward ${summary} \u2014 the existing token holds ${scope}, ` + `so it is re-requested even though ${flag} was not passed ` + `(re-consent would otherwise silently revoke it).`;
+  });
+}
 function oauthClientSetupGuidance(reason) {
   return [
     reason,
@@ -95993,6 +96298,8 @@ init_agent_owned_tree();
 init_component_versions();
 var VERIFY_COMPONENTS_STEP = "verify-components";
 var ENSURE_BANKS_STEP = "ensure-banks";
+var ENSURE_BANKS_ATTEMPTS = 3;
+var ENSURE_BANKS_BACKOFF_MS = [2000, 5000];
 function normalizeVersion(v) {
   return v.trim().replace(/^v/, "");
 }
@@ -96314,25 +96621,47 @@ async function executeRollout(steps, target, deps, execOpts = {}) {
             break;
           }
           deps.log(`ROLL_STEP ensure-banks \u2014 creating any missing agent bank (idempotent) for ${rolled.length} agent(s)`);
+          const sleep4 = deps.sleepMs ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
+          const bankUnverified = [];
+          let lastUnreachableReason = "";
+          let concludedUnreachable = false;
           for (const a of rolled) {
-            let res;
-            try {
-              res = await deps.ensureBank(a);
-            } catch (e) {
-              res = { ok: false, reason: e.message };
+            let res = {
+              ok: false,
+              reason: "not probed"
+            };
+            const maxAttempts = concludedUnreachable ? 1 : ENSURE_BANKS_ATTEMPTS;
+            for (let attempt = 1;attempt <= maxAttempts; attempt++) {
+              try {
+                res = await deps.ensureBank(a);
+              } catch (e) {
+                res = { ok: false, reason: e.message };
+              }
+              if (res.ok || !/unreachable|timeout/i.test(res.reason))
+                break;
+              if (attempt < maxAttempts) {
+                const backoff = ENSURE_BANKS_BACKOFF_MS[attempt - 1] ?? ENSURE_BANKS_BACKOFF_MS[ENSURE_BANKS_BACKOFF_MS.length - 1] ?? 0;
+                deps.log(`  ${a}: bank check ${res.reason.toLowerCase()} \u2014 retrying in ${backoff}ms ` + `(attempt ${attempt}/${maxAttempts})`);
+                await sleep4(backoff);
+              }
             }
             if (res.ok) {
               deps.log(`  ${a}: bank present`);
               continue;
             }
             if (/unreachable|timeout/i.test(res.reason)) {
-              deps.log(`  ${a}: bank check ${res.reason.toLowerCase()} (degraded to warning)`);
-              warnings.push(`ensure-banks could not reach Hindsight to verify ${a}'s bank ` + `(${res.reason}). If ${a} is brand-new and its first \`retain\` ` + `fails with a foreign-key error, restart it to recreate the bank.`);
+              deps.log(`  ${a}: bank check ${res.reason.toLowerCase()} after ` + `${maxAttempts} attempt(s) (transient \u2014 not treated as a missing bank)`);
+              bankUnverified.push(a);
+              lastUnreachableReason = res.reason;
+              concludedUnreachable = true;
               continue;
             }
             deps.log(`  \u2717 ${a}: bank could NOT be created \u2014 ${res.reason}`);
             bankEnsureFailed.push(a);
           }
+          if (bankUnverified.length > 0) {
+            deps.log(`ensure-banks: Hindsight was busy/unreachable (${lastUnreachableReason}) while ` + `verifying ${bankUnverified.length} bank(s) (${bankUnverified.join(", ")}) \u2014 ` + `existing banks are unaffected and nothing needs doing; a brand-new agent's ` + `bank is created automatically on its next restart-reconcile.`);
+          }
           break;
         }
         case "verify-components": {
@@ -100174,15 +100503,83 @@ function findMissingWorkspaceScopes(seedScope, tier) {
   return requiredWorkspaceScopesForTier(tier).filter((s) => !have.has(s));
 }
 var DRIVE_FILE_SCOPE = "https://www.googleapis.com/auth/drive.file";
-function buildMissingScopeWarning(missing, tier, accountEmail, hasWriteScope) {
+var CALENDAR_READONLY_SCOPE = "https://www.googleapis.com/auth/calendar.readonly";
+var LAUNCHER_GOOGLE_SERVICES = [
+  "drive",
+  "docs",
+  "sheets",
+  "slides",
+  "cal"
+];
+var UPSTREAM_SERVICE_NAMES = {
+  drive: "drive",
+  docs: "docs",
+  sheets: "sheets",
+  slides: "slides",
+  cal: "calendar"
+};
+function parseLauncherServices(raw) {
+  const tokens = raw.split(",").map((s) => s.trim().toLowerCase()).filter((s) => s.length > 0).map((s) => s === "calendar" ? "cal" : s);
+  for (const t of tokens) {
+    if (!LAUNCHER_GOOGLE_SERVICES.includes(t)) {
+      throw new Error(`drive-mcp-launcher: unknown service '${t}' in --services ` + `(valid: ${LAUNCHER_GOOGLE_SERVICES.join(", ")})`);
+    }
+  }
+  const set = new Set(tokens);
+  return LAUNCHER_GOOGLE_SERVICES.filter((s) => set.has(s));
+}
+function requiredScopesForSelection(selection) {
+  const ro = selection.readonly;
+  const out = [];
+  for (const s of selection.services) {
+    switch (s) {
+      case "docs":
+        out.push(ro ? "https://www.googleapis.com/auth/documents.readonly" : "https://www.googleapis.com/auth/documents");
+        break;
+      case "sheets":
+        out.push(ro ? "https://www.googleapis.com/auth/spreadsheets.readonly" : "https://www.googleapis.com/auth/spreadsheets");
+        break;
+      case "slides":
+        out.push(ro ? "https://www.googleapis.com/auth/presentations.readonly" : "https://www.googleapis.com/auth/presentations");
+        break;
+      case "cal":
+        out.push(CALENDAR_READONLY_SCOPE);
+        break;
+      case "drive":
+        break;
+    }
+  }
+  return out;
+}
+function findMissingScopesForSelection(seedScope, tier, selection) {
+  if (!selection)
+    return findMissingWorkspaceScopes(seedScope, tier);
+  const have = new Set(seedScope.split(/\s+/).map((s) => s.trim()).filter((s) => s.length > 0));
+  return requiredScopesForSelection(selection).filter((s) => !have.has(s));
+}
+function seedOptInCapabilities(seedScope) {
+  const have = new Set(seedScope.split(/\s+/).map((s) => s.trim()).filter((s) => s.length > 0));
+  return {
+    write: have.has(DRIVE_FILE_SCOPE),
+    calendar: have.has(CALENDAR_READONLY_SCOPE)
+  };
+}
+function buildMissingScopeWarning(missing, tier, accountEmail, granted, selection) {
   const short = missing.map((s) => s.replace(/^https:\/\/www\.googleapis\.com\/auth\//, "")).join(", ");
-  return `drive-mcp-launcher: WARNING \u2014 the Google account '${accountEmail}' was ` + `consented WITHOUT the scope(s) needed for tier '${tier ?? "core"}': ` + `${short}.
-` + `  The matching MCP tools (Docs / Sheets / Slides create+edit) will FAIL ` + `to authenticate. OAuth scopes are fixed at consent time \u2014 re-run on the ` + `host to re-mint the token with the correct scopes:
-` + `    switchroom auth google account add ${accountEmail} --replace` + `${hasWriteScope ? " --write" : ""}
-` + `  (scopes are derived from \`google_workspace.tier\` \u2014 set the tier ` + `before re-running${hasWriteScope ? "; --write preserves the existing " + "Drive write capability" : ""}). Drive read/file tools are unaffected.
+  const suffix = selection ? (selection.readonly ? " --readonly" : granted.write ? " --write" : "") + ` --services ${selection.services.join(",")}` : (granted.write ? " --write" : "") + (granted.calendar ? " --calendar" : "");
+  const preserved = [
+    selection ? `--services ${selection.services.join(",")}` + `${selection.readonly ? " --readonly" : ""} preserves the persisted per-account selection` : "",
+    !selection && granted.write ? "--write preserves the existing Drive write capability" : "",
+    !selection && granted.calendar ? "--calendar preserves the existing Calendar read capability" : ""
+  ].filter((s) => s.length > 0);
+  const scopeSource = selection ? `for its persisted selection (services: ${selection.services.join(",")}` + `${selection.readonly ? ", read-only" : ""})` : `for tier '${tier ?? "core"}'`;
+  return `drive-mcp-launcher: WARNING \u2014 the Google account '${accountEmail}' was ` + `consented WITHOUT the scope(s) needed ${scopeSource}: ` + `${short}.
+` + `  The matching MCP tools will FAIL ` + `to authenticate. OAuth scopes are fixed at consent time \u2014 re-run on the ` + `host to re-mint the token with the correct scopes:
+` + `    switchroom auth google account add ${accountEmail} --replace` + `${suffix}
+` + `  (${selection ? "" : "scopes are derived from `google_workspace.tier` \u2014 set the tier before re-running"}${preserved.length > 0 ? (selection ? "" : "; ") + preserved.join("; ") : ""}). Drive read/file tools are unaffected.
 `;
 }
-function buildUvxArgs(tier) {
+function buildUvxArgs(tier, selection) {
   const args = [
     "--from",
     `git+https://github.com/taylorwilsdon/google_workspace_mcp.git@${GOOGLE_WORKSPACE_MCP_PINNED_SHA}`,
@@ -100196,6 +100593,12 @@ function buildUvxArgs(tier) {
   if (tier && tier.length > 0) {
     args.push("--tool-tier", tier);
   }
+  if (selection && selection.services.length > 0) {
+    args.push("--tools", ...selection.services.map((s) => UPSTREAM_SERVICE_NAMES[s]));
+  }
+  if (selection?.readonly) {
+    args.push("--read-only");
+  }
   return args;
 }
 function buildChildEnv(baseEnv, credentialsDir, accountEmail) {
@@ -100368,6 +100771,15 @@ async function resolveConfigSecret2(raw, label) {
   }
   throw new Error(`${label} vault key '${key}' unreachable via the vault-broker (${result.msg}). Refusing to spawn the Google Workspace MCP.`);
 }
+function resolveLauncherSelection(record2, tier) {
+  if (!record2)
+    return;
+  if (record2.readonly === undefined && record2.services === undefined) {
+    return;
+  }
+  const services = record2.services && record2.services.length > 0 ? parseLauncherServices(record2.services.join(",")) : tier === "extended" || tier === "complete" ? ["drive", "docs", "sheets", "slides"] : ["drive", "docs", "sheets"];
+  return { readonly: record2.readonly ?? false, services };
+}
 async function loadConfigSecrets() {
   const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_loader(), exports_loader));
   const config = loadConfig2();
@@ -100377,7 +100789,16 @@ async function loadConfigSecrets() {
   }
   const clientId = await resolveConfigSecret2(gw.google_client_id, "google_client_id");
   const clientSecret = await resolveConfigSecret2(gw.google_client_secret, "google_client_secret");
-  return { clientId, clientSecret, tier: gw.tier };
+  const googleAccounts = {};
+  for (const [email, record2] of Object.entries(config.google_accounts ?? {})) {
+    if (!record2)
+      continue;
+    googleAccounts[email.toLowerCase()] = {
+      readonly: record2.readonly,
+      services: record2.services
+    };
+  }
+  return { clientId, clientSecret, tier: gw.tier, googleAccounts };
 }
 async function runDriveMcpLauncher(opts) {
   let brokerCreds;
@@ -100425,12 +100846,27 @@ async function runDriveMcpLauncher(opts) {
     process.exit(1);
   }
   const tier = opts.tier ?? configSecrets.tier;
-  const missingScopes = findMissingWorkspaceScopes(brokerCreds.scope, tier);
+  let selection;
+  try {
+    const configSelection = resolveLauncherSelection(configSecrets.googleAccounts[brokerCreds.accountEmail.toLowerCase()], tier);
+    if (opts.services !== undefined || opts.readOnly) {
+      selection = {
+        readonly: opts.readOnly ?? configSelection?.readonly ?? false,
+        services: opts.services !== undefined ? parseLauncherServices(opts.services) : configSelection?.services ?? resolveLauncherSelection({ readonly: false }, tier).services
+      };
+    } else {
+      selection = configSelection;
+    }
+  } catch (err) {
+    process.stderr.write(`drive-mcp-launcher: ${err instanceof Error ? err.message : String(err)}
+`);
+    process.exit(1);
+  }
+  const missingScopes = findMissingScopesForSelection(brokerCreds.scope, tier, selection);
   if (missingScopes.length > 0) {
-    const hasWriteScope = brokerCreds.scope.split(/\s+/).map((s) => s.trim()).includes(DRIVE_FILE_SCOPE);
-    process.stderr.write(buildMissingScopeWarning(missingScopes, tier, brokerCreds.accountEmail, hasWriteScope));
+    process.stderr.write(buildMissingScopeWarning(missingScopes, tier, brokerCreds.accountEmail, seedOptInCapabilities(brokerCreds.scope), selection));
   }
-  const args = buildUvxArgs(tier);
+  const args = buildUvxArgs(tier, selection);
   const env2 = buildChildEnv(process.env, credentialsDir, brokerCreds.accountEmail);
   const { spawn: spawn6 } = await import("node:child_process");
   const os6 = await import("node:os");
@@ -100462,8 +100898,12 @@ async function runDriveMcpLauncher(opts) {
   return new Promise(() => {});
 }
 function registerDriveMcpLauncherCommand(program3) {
-  program3.command("drive-mcp-launcher", { hidden: true }).description("Internal: launch the Google Workspace MCP browserless, fed by the auth-broker. Spawned as the `gdrive` MCP command inside agents.").option("--tier <tier>", "Upstream --tool-tier (core|extended|complete). Overrides config.").action(async (opts) => {
-    await runDriveMcpLauncher({ tier: opts.tier });
+  program3.command("drive-mcp-launcher", { hidden: true }).description("Internal: launch the Google Workspace MCP browserless, fed by the auth-broker. Spawned as the `gdrive` MCP command inside agents.").option("--tier <tier>", "Upstream --tool-tier (core|extended|complete). Overrides config.").option("--services <list>", "Comma-separated per-account service selection (cal,drive,docs,sheets,slides) \u2192 upstream --tools. Overrides the persisted google_accounts.<email>.services record.").option("--read-only", "Run upstream in --read-only mode (readonly scopes, write tools not registered). Overrides the persisted google_accounts.<email>.readonly record.").action(async (opts) => {
+    await runDriveMcpLauncher({
+      tier: opts.tier,
+      services: opts.services,
+      readOnly: opts.readOnly
+    });
   });
 }