switchroom 0.18.29 → 0.18.31

package/bin/handoff-briefing.sh

@@ -135,8 +135,14 @@ $RECALL_TEXT"
 fi
 
 # ── Source 3: Today's daily memory ─────────────────────────────────────────────
+# Resolve "today" in the agent's LOCAL time — NOT the process default (UTC on
+# most hosts/CI). TODAY keys the daily-memory lookup (memory/${TODAY}.md); using
+# UTC here would look up the wrong day's file during the window where the local
+# date is ahead of/behind UTC, silently dropping today's memory. Same
+# SWITCHROOM_TIMEZONE → TZ → UTC cascade the restart-timestamp render below uses.
+_TZ_VAL="${SWITCHROOM_TIMEZONE:-${TZ:-UTC}}"
 DAILY_SECTION=""
-TODAY=$(date +%Y-%m-%d 2>/dev/null || true)
+TODAY=$(TZ="$_TZ_VAL" date +%Y-%m-%d 2>/dev/null || date +%Y-%m-%d 2>/dev/null || true)
 if [ -n "$TODAY" ] && [ -n "$WORKSPACE_DIR" ]; then
   DAILY_FILE="$WORKSPACE_DIR/memory/${TODAY}.md"
   if [ -f "$DAILY_FILE" ] && [ -s "$DAILY_FILE" ]; then
@@ -156,7 +162,7 @@ fi
 # UTC "now" (the whole point of the deterministic-local-time work). Same
 # SWITCHROOM_TIMEZONE → TZ → UTC cascade and `%A %Y-%m-%d %I:%M %p %Z` am/pm
 # format the UserPromptSubmit local-time hook (bin/timezone-hook.sh) uses.
-_TZ_VAL="${SWITCHROOM_TIMEZONE:-${TZ:-UTC}}"
+# (_TZ_VAL is computed once above, in the daily-memory section.)
 TIMESTAMP=$(TZ="$_TZ_VAL" date '+%A %Y-%m-%d %I:%M %p %Z' 2>/dev/null || date '+%A %Y-%m-%d %I:%M %p %Z')
 
 # Determine restart reason if available

package/dist/agent-scheduler/index.js

@@ -11354,11 +11354,52 @@ var AgentGoogleWorkspaceConfigSchema = exports_external.object({
   approvers: exports_external.array(ApproverIdSchema).min(1).optional().describe("Per-agent approver override. When set, replaces (does not extend) " + "the top-level drive.approvers list for this agent's onboarding card."),
   tier: GoogleWorkspaceTierSchema.optional().describe("Per-agent tier override (RFC G Phase 1). When set, replaces the " + "top-level google_workspace.tier for this agent. Common case: most " + "agents on `core`, one specialist on `extended` for Slides access.")
 }).optional();
+var MicrosoftAccountEmailSchema = exports_external.string().regex(/^[^@\s:]+@[^@\s:]+\.[^@\s:]+$/, {
+  message: "microsoft_workspace.account must be a Microsoft account email like " + "'alice@outlook.com' or 'alice@contoso.com' (colons not allowed)"
+}).transform((v) => v.trim().toLowerCase());
+var MicrosoftToolTokenSchema = exports_external.string().min(1).regex(/^[a-z0-9-]+$/, {
+  message: "microsoft_workspace tools[] tokens are forwarded to softeria's " + "--enabled-tools regex; each must be lowercase kebab-case " + "([a-z0-9-]+, e.g. 'mail', 'calendar', 'send-mail') so an unescaped " + "regex metacharacter can't crash the launcher"
+});
+var MicrosoftAccountBindingSchema = exports_external.object({
+  account: MicrosoftAccountEmailSchema.describe("The Microsoft account this binding uses. Must be a key in top-level " + "`microsoft_accounts:` with this agent in its `enabled_for[]`."),
+  tools: exports_external.array(MicrosoftToolTokenSchema).min(1).optional().describe("Per-account tool allowlist → softeria `--enabled-tools <regex>` " + "(tokens joined with `|`). Omitted = all tools exposed for this account."),
+  org_mode: exports_external.boolean().optional().describe("Per-binding org_mode override (RFC #1873 §6.4).")
+});
 var AgentMicrosoftWorkspaceConfigSchema = exports_external.object({
-  account: exports_external.string().regex(/^[^@\s:]+@[^@\s:]+\.[^@\s:]+$/, {
-    message: "microsoft_workspace.account must be a Microsoft account email like " + "'alice@outlook.com' or 'alice@contoso.com' (colons not allowed)"
-  }).transform((v) => v.trim().toLowerCase()).optional().describe("RFC #1873: the Microsoft account this agent uses for the M365 MCP. " + "Must be a key in top-level `microsoft_accounts:` with this agent " + "listed in its `enabled_for[]`. Read by the auth-broker " + "(get-credentials, provider=microsoft) and by the scaffold to " + "decide whether to emit the `ms-365` MCP entry. Normalized to " + "lowercase so it matches the microsoft_accounts key (which is " + "also normalized)."),
-  org_mode: exports_external.boolean().optional().describe("Per-agent org_mode override (RFC #1873 §6.4). When set, replaces " + "the top-level microsoft_workspace.org_mode for this agent. " + "Defaults to top-level value (which defaults to false).")
+  account: MicrosoftAccountEmailSchema.optional().describe("RFC #1873: the Microsoft account this agent uses for the M365 MCP. " + "Must be a key in top-level `microsoft_accounts:` with this agent " + "listed in its `enabled_for[]`. Read by the auth-broker " + "(get-credentials, provider=microsoft) and by the scaffold to " + "decide whether to emit the `ms-365` MCP entry. Normalized to " + "lowercase so it matches the microsoft_accounts key (which is " + "also normalized). Mutually exclusive with `accounts` (plural)."),
+  tools: exports_external.array(MicrosoftToolTokenSchema).min(1).optional().describe("Per-account tool allowlist for the SINGULAR `account` form → " + "softeria `--enabled-tools <regex>`. Omitted = all tools. Only " + "valid with the singular `account`; using it together with the " + "plural `accounts` (which carries per-binding `tools`) is an error."),
+  org_mode: exports_external.boolean().optional().describe("Per-agent org_mode override (RFC #1873 §6.4). When set, replaces " + "the top-level microsoft_workspace.org_mode for this agent. " + "Defaults to top-level value (which defaults to false)."),
+  accounts: exports_external.array(MicrosoftAccountBindingSchema).min(1).optional().describe("Plural multi-account form: bind MULTIPLE Microsoft accounts to " + "this agent, each with its own tool scope. Mutually exclusive with " + "the singular `account`. Each account gets its own `ms-365-<slug>` " + "MCP server.")
+}).superRefine((v, ctx) => {
+  const hasSingular = v.account !== undefined;
+  const hasPlural = v.accounts !== undefined;
+  if (hasSingular && hasPlural) {
+    ctx.addIssue({
+      code: exports_external.ZodIssueCode.custom,
+      message: "microsoft_workspace: use EITHER `account` (singular) OR " + "`accounts` (plural array), not both",
+      path: ["accounts"]
+    });
+  }
+  if (hasPlural && v.tools !== undefined) {
+    ctx.addIssue({
+      code: exports_external.ZodIssueCode.custom,
+      message: "microsoft_workspace: block-level `tools` applies to the singular " + "`account` only; with `accounts` put `tools` inside each binding",
+      path: ["tools"]
+    });
+  }
+  if (hasPlural) {
+    const seen = new Set;
+    for (const b of v.accounts) {
+      if (seen.has(b.account)) {
+        ctx.addIssue({
+          code: exports_external.ZodIssueCode.custom,
+          message: `microsoft_workspace: duplicate account '${b.account}' in accounts[]`,
+          path: ["accounts"]
+        });
+      }
+      seen.add(b.account);
+    }
+  }
 }).optional();
 var AgentNotionWorkspaceConfigSchema = exports_external.object({
   databases: exports_external.array(exports_external.string().regex(/^[a-z0-9][a-z0-9_-]{0,62}$/, {
@@ -11733,6 +11774,26 @@ var SwitchroomConfigSchema = exports_external.object({
   for (const [name, a] of Object.entries(cfg.agents ?? {})) {
     checkServes(a.serves, ["agents", name, "serves"]);
   }
+  const microsoftAccounts = cfg.microsoft_accounts;
+  for (const [name, a] of Object.entries(cfg.agents ?? {})) {
+    const mw = a.microsoft_workspace;
+    const accounts = mw?.accounts;
+    if (!accounts)
+      continue;
+    accounts.forEach((b, i) => {
+      const acct = b?.account?.trim().toLowerCase();
+      if (!acct)
+        return;
+      const enabledFor = microsoftAccounts?.[acct]?.enabled_for ?? [];
+      if (!enabledFor.includes(name)) {
+        ctx.addIssue({
+          code: exports_external.ZodIssueCode.custom,
+          message: `agent '${name}' binds Microsoft account '${acct}' but is not in ` + `microsoft_accounts['${acct}'].enabled_for[] — operator must run ` + `\`switchroom auth microsoft enable ${acct} ${name}\``,
+          path: ["agents", name, "microsoft_workspace", "accounts", i, "account"]
+        });
+      }
+    });
+  }
 });
 
 // src/config/paths.ts
@@ -12326,6 +12387,22 @@ function validateNotionWorkspaceConfig(config) {
   return issues;
 }
 
+// src/config/timezone.ts
+function isResolvableTimezone(zone) {
+  try {
+    new Intl.DateTimeFormat("en-US", { timeZone: zone });
+    return true;
+  } catch {
+    return false;
+  }
+}
+var CONTAINER_DEFAULT_UTC_ZONES = new Set([
+  "UTC",
+  "Etc/UTC",
+  "Etc/Universal",
+  "Universal"
+]);
+
 // src/config/loader.ts
 class ConfigError extends Error {
   details;
@@ -12449,8 +12526,30 @@ function loadConfig(configPath) {
   if (notionIssues.length > 0) {
     throw new ConfigError(`Invalid notion_workspace configuration in ${filePath}`, notionIssues);
   }
+  validateAllTimezones(config, filePath);
   return config;
 }
+function validateAllTimezones(config, filePath) {
+  const issues = [];
+  const check = (zone, where) => {
+    if (zone == null)
+      return;
+    if (!isResolvableTimezone(zone)) {
+      issues.push(`  ${where}: "${zone}" is not a resolvable IANA timezone ` + `(shape is valid but no such zone exists — check for a typo, ` + `e.g. "Australia/Melbourne", "America/New_York", "UTC").`);
+    }
+  };
+  check(config.switchroom?.timezone, "switchroom.timezone");
+  check(config.defaults?.timezone, "defaults.timezone");
+  for (const [profileName, profile] of Object.entries(config.profiles ?? {})) {
+    check(profile?.timezone, `profiles.${profileName}.timezone`);
+  }
+  for (const [agentName, agentRaw] of Object.entries(config.agents)) {
+    check(agentRaw?.timezone, `agents.${agentName}.timezone`);
+  }
+  if (issues.length > 0) {
+    throw new ConfigError(`Invalid timezone configuration in ${filePath}`, issues);
+  }
+}
 function validateAllCronTopicAliases(config, filePath) {
   const issues = [];
   for (const [agentName, agentRaw] of Object.entries(config.agents)) {
@@ -13691,7 +13790,8 @@ var GetCredentialsRequestSchema = exports_external.object({
   v: exports_external.literal(PROTOCOL_VERSION),
   op: exports_external.literal("get-credentials"),
   id: exports_external.string().min(1),
-  provider: ProviderNameSchema.optional()
+  provider: ProviderNameSchema.optional(),
+  account: exports_external.string().min(1).optional()
 });
 var ListStateRequestSchema = exports_external.object({
   v: exports_external.literal(PROTOCOL_VERSION),
@@ -14033,13 +14133,17 @@ class AuthBrokerClient {
       sock.destroy();
     }
   }
-  async getCredentials(provider) {
+  async getCredentials(provider, account) {
     const base = {
       v: PROTOCOL_VERSION,
       id: randomUUID(),
       op: "get-credentials"
     };
-    const req = provider !== undefined ? { ...base, provider } : base;
+    let req = base;
+    if (provider !== undefined)
+      req = { ...req, provider };
+    if (account !== undefined)
+      req = { ...req, account };
     const data = await this.send(req);
     return data;
   }

package/dist/auth-broker/index.js

@@ -16983,11 +16983,52 @@ var AgentGoogleWorkspaceConfigSchema = exports_external.object({
   approvers: exports_external.array(ApproverIdSchema).min(1).optional().describe("Per-agent approver override. When set, replaces (does not extend) " + "the top-level drive.approvers list for this agent's onboarding card."),
   tier: GoogleWorkspaceTierSchema.optional().describe("Per-agent tier override (RFC G Phase 1). When set, replaces the " + "top-level google_workspace.tier for this agent. Common case: most " + "agents on `core`, one specialist on `extended` for Slides access.")
 }).optional();
+var MicrosoftAccountEmailSchema = exports_external.string().regex(/^[^@\s:]+@[^@\s:]+\.[^@\s:]+$/, {
+  message: "microsoft_workspace.account must be a Microsoft account email like " + "'alice@outlook.com' or 'alice@contoso.com' (colons not allowed)"
+}).transform((v) => v.trim().toLowerCase());
+var MicrosoftToolTokenSchema = exports_external.string().min(1).regex(/^[a-z0-9-]+$/, {
+  message: "microsoft_workspace tools[] tokens are forwarded to softeria's " + "--enabled-tools regex; each must be lowercase kebab-case " + "([a-z0-9-]+, e.g. 'mail', 'calendar', 'send-mail') so an unescaped " + "regex metacharacter can't crash the launcher"
+});
+var MicrosoftAccountBindingSchema = exports_external.object({
+  account: MicrosoftAccountEmailSchema.describe("The Microsoft account this binding uses. Must be a key in top-level " + "`microsoft_accounts:` with this agent in its `enabled_for[]`."),
+  tools: exports_external.array(MicrosoftToolTokenSchema).min(1).optional().describe("Per-account tool allowlist → softeria `--enabled-tools <regex>` " + "(tokens joined with `|`). Omitted = all tools exposed for this account."),
+  org_mode: exports_external.boolean().optional().describe("Per-binding org_mode override (RFC #1873 §6.4).")
+});
 var AgentMicrosoftWorkspaceConfigSchema = exports_external.object({
-  account: exports_external.string().regex(/^[^@\s:]+@[^@\s:]+\.[^@\s:]+$/, {
-    message: "microsoft_workspace.account must be a Microsoft account email like " + "'alice@outlook.com' or 'alice@contoso.com' (colons not allowed)"
-  }).transform((v) => v.trim().toLowerCase()).optional().describe("RFC #1873: the Microsoft account this agent uses for the M365 MCP. " + "Must be a key in top-level `microsoft_accounts:` with this agent " + "listed in its `enabled_for[]`. Read by the auth-broker " + "(get-credentials, provider=microsoft) and by the scaffold to " + "decide whether to emit the `ms-365` MCP entry. Normalized to " + "lowercase so it matches the microsoft_accounts key (which is " + "also normalized)."),
-  org_mode: exports_external.boolean().optional().describe("Per-agent org_mode override (RFC #1873 §6.4). When set, replaces " + "the top-level microsoft_workspace.org_mode for this agent. " + "Defaults to top-level value (which defaults to false).")
+  account: MicrosoftAccountEmailSchema.optional().describe("RFC #1873: the Microsoft account this agent uses for the M365 MCP. " + "Must be a key in top-level `microsoft_accounts:` with this agent " + "listed in its `enabled_for[]`. Read by the auth-broker " + "(get-credentials, provider=microsoft) and by the scaffold to " + "decide whether to emit the `ms-365` MCP entry. Normalized to " + "lowercase so it matches the microsoft_accounts key (which is " + "also normalized). Mutually exclusive with `accounts` (plural)."),
+  tools: exports_external.array(MicrosoftToolTokenSchema).min(1).optional().describe("Per-account tool allowlist for the SINGULAR `account` form → " + "softeria `--enabled-tools <regex>`. Omitted = all tools. Only " + "valid with the singular `account`; using it together with the " + "plural `accounts` (which carries per-binding `tools`) is an error."),
+  org_mode: exports_external.boolean().optional().describe("Per-agent org_mode override (RFC #1873 §6.4). When set, replaces " + "the top-level microsoft_workspace.org_mode for this agent. " + "Defaults to top-level value (which defaults to false)."),
+  accounts: exports_external.array(MicrosoftAccountBindingSchema).min(1).optional().describe("Plural multi-account form: bind MULTIPLE Microsoft accounts to " + "this agent, each with its own tool scope. Mutually exclusive with " + "the singular `account`. Each account gets its own `ms-365-<slug>` " + "MCP server.")
+}).superRefine((v, ctx) => {
+  const hasSingular = v.account !== undefined;
+  const hasPlural = v.accounts !== undefined;
+  if (hasSingular && hasPlural) {
+    ctx.addIssue({
+      code: exports_external.ZodIssueCode.custom,
+      message: "microsoft_workspace: use EITHER `account` (singular) OR " + "`accounts` (plural array), not both",
+      path: ["accounts"]
+    });
+  }
+  if (hasPlural && v.tools !== undefined) {
+    ctx.addIssue({
+      code: exports_external.ZodIssueCode.custom,
+      message: "microsoft_workspace: block-level `tools` applies to the singular " + "`account` only; with `accounts` put `tools` inside each binding",
+      path: ["tools"]
+    });
+  }
+  if (hasPlural) {
+    const seen = new Set;
+    for (const b of v.accounts) {
+      if (seen.has(b.account)) {
+        ctx.addIssue({
+          code: exports_external.ZodIssueCode.custom,
+          message: `microsoft_workspace: duplicate account '${b.account}' in accounts[]`,
+          path: ["accounts"]
+        });
+      }
+      seen.add(b.account);
+    }
+  }
 }).optional();
 var AgentNotionWorkspaceConfigSchema = exports_external.object({
   databases: exports_external.array(exports_external.string().regex(/^[a-z0-9][a-z0-9_-]{0,62}$/, {
@@ -17362,6 +17403,26 @@ var SwitchroomConfigSchema = exports_external.object({
   for (const [name, a] of Object.entries(cfg.agents ?? {})) {
     checkServes(a.serves, ["agents", name, "serves"]);
   }
+  const microsoftAccounts = cfg.microsoft_accounts;
+  for (const [name, a] of Object.entries(cfg.agents ?? {})) {
+    const mw = a.microsoft_workspace;
+    const accounts = mw?.accounts;
+    if (!accounts)
+      continue;
+    accounts.forEach((b, i) => {
+      const acct = b?.account?.trim().toLowerCase();
+      if (!acct)
+        return;
+      const enabledFor = microsoftAccounts?.[acct]?.enabled_for ?? [];
+      if (!enabledFor.includes(name)) {
+        ctx.addIssue({
+          code: exports_external.ZodIssueCode.custom,
+          message: `agent '${name}' binds Microsoft account '${acct}' but is not in ` + `microsoft_accounts['${acct}'].enabled_for[] — operator must run ` + `\`switchroom auth microsoft enable ${acct} ${name}\``,
+          path: ["agents", name, "microsoft_workspace", "accounts", i, "account"]
+        });
+      }
+    });
+  }
 });
 
 // src/config/paths.ts
@@ -17956,6 +18017,22 @@ function validateNotionWorkspaceConfig(config) {
   return issues;
 }
 
+// src/config/timezone.ts
+function isResolvableTimezone(zone) {
+  try {
+    new Intl.DateTimeFormat("en-US", { timeZone: zone });
+    return true;
+  } catch {
+    return false;
+  }
+}
+var CONTAINER_DEFAULT_UTC_ZONES = new Set([
+  "UTC",
+  "Etc/UTC",
+  "Etc/Universal",
+  "Universal"
+]);
+
 // src/config/loader.ts
 class ConfigError extends Error {
   details;
@@ -18079,8 +18156,30 @@ function loadConfig(configPath) {
   if (notionIssues.length > 0) {
     throw new ConfigError(`Invalid notion_workspace configuration in ${filePath}`, notionIssues);
   }
+  validateAllTimezones(config, filePath);
   return config;
 }
+function validateAllTimezones(config, filePath) {
+  const issues = [];
+  const check = (zone, where) => {
+    if (zone == null)
+      return;
+    if (!isResolvableTimezone(zone)) {
+      issues.push(`  ${where}: "${zone}" is not a resolvable IANA timezone ` + `(shape is valid but no such zone exists — check for a typo, ` + `e.g. "Australia/Melbourne", "America/New_York", "UTC").`);
+    }
+  };
+  check(config.switchroom?.timezone, "switchroom.timezone");
+  check(config.defaults?.timezone, "defaults.timezone");
+  for (const [profileName, profile] of Object.entries(config.profiles ?? {})) {
+    check(profile?.timezone, `profiles.${profileName}.timezone`);
+  }
+  for (const [agentName, agentRaw] of Object.entries(config.agents)) {
+    check(agentRaw?.timezone, `agents.${agentName}.timezone`);
+  }
+  if (issues.length > 0) {
+    throw new ConfigError(`Invalid timezone configuration in ${filePath}`, issues);
+  }
+}
 function validateAllCronTopicAliases(config, filePath) {
   const issues = [];
   for (const [agentName, agentRaw] of Object.entries(config.agents)) {
@@ -18179,14 +18278,6 @@ function allocateAgentUid(name) {
   return AGENT_UID_MIN + u32 % range;
 }
 
-// src/config/timezone.ts
-var CONTAINER_DEFAULT_UTC_ZONES = new Set([
-  "UTC",
-  "Etc/UTC",
-  "Etc/Universal",
-  "Universal"
-]);
-
 // src/cli/agent-config.ts
 import { join } from "node:path";
 import { homedir as homedir2 } from "node:os";
@@ -18248,6 +18339,29 @@ var PROFILE_MEMORY_DEFAULTS = {
   }
 };
 
+// src/config/microsoft-workspace-acl.ts
+function normalizeMicrosoftBindings(mw) {
+  if (!mw)
+    return [];
+  if (mw.accounts !== undefined) {
+    return mw.accounts.filter((b) => b && typeof b.account === "string" && b.account.length > 0).map((b) => ({
+      account: b.account.trim().toLowerCase(),
+      tools: b.tools,
+      org_mode: b.org_mode
+    }));
+  }
+  if (typeof mw.account === "string" && mw.account.length > 0) {
+    return [
+      {
+        account: mw.account.trim().toLowerCase(),
+        tools: mw.tools,
+        org_mode: mw.org_mode
+      }
+    ];
+  }
+  return [];
+}
+
 // src/agents/reconcile-default-skills.ts
 var warnedMissingPool = new Set;
 
@@ -18605,6 +18719,12 @@ var SWITCHROOM_OWNED_SETTINGS_KEYS = new Set([
 var DOCKER_TELEGRAM_PLUGIN_PATH = "/opt/switchroom/telegram-plugin";
 var DOCKER_HOOKS_PATH = `${DOCKER_TELEGRAM_PLUGIN_PATH}/hooks`;
 
+// src/vault/grants-db-path.ts
+var GRANTS_DB_DIRNAME = "vault-broker";
+var GRANTS_DB_FILENAME = "vault-grants.db";
+var GRANTS_DB_CONTAINER_DIR = `/root/.switchroom/${GRANTS_DB_DIRNAME}`;
+var GRANTS_DB_CONTAINER_PATH = `${GRANTS_DB_CONTAINER_DIR}/${GRANTS_DB_FILENAME}`;
+
 // src/agents/compose.ts
 var BIND_MOUNT_EXACT_SOURCE_DENY = new Set(["/var/run/docker.sock"]);
 
@@ -19909,7 +20029,8 @@ var GetCredentialsRequestSchema = exports_external.object({
   v: exports_external.literal(PROTOCOL_VERSION),
   op: exports_external.literal("get-credentials"),
   id: exports_external.string().min(1),
-  provider: ProviderNameSchema.optional()
+  provider: ProviderNameSchema.optional(),
+  account: exports_external.string().min(1).optional()
 });
 var ListStateRequestSchema = exports_external.object({
   v: exports_external.literal(PROTOCOL_VERSION),
@@ -20599,7 +20720,7 @@ class AuthBroker {
             break;
           }
           if (provider === "microsoft") {
-            await this.opMicrosoftGetCredentials(socket, reqId, identity);
+            await this.opMicrosoftGetCredentials(socket, reqId, identity, req.account);
             break;
           }
           socket.write(encodeError(reqId, "INTERNAL", `unhandled provider '${provider}' in get-credentials dispatch`));
@@ -21698,14 +21819,31 @@ class AuthBroker {
     this.audit({ op: "rm-account", identity, account: label, accountKind: "google", ok: true });
     socket.write(encodeSuccess(id, { label }));
   }
-  async opMicrosoftGetCredentials(socket, id, identity) {
+  async opMicrosoftGetCredentials(socket, id, identity, requestedAccount) {
     if (identity.kind !== "agent") {
       socket.write(encodeError(id, "INVALID_ARGS", `Microsoft get-credentials is per-agent only (caller kind '${identity.kind}' not supported); use the agent's per-agent socket bind`));
       return;
     }
     const agentName = identity.name;
     const agent = (this.config.agents ?? {})[agentName];
-    const account = agent?.microsoft_workspace?.account;
+    const bindings = normalizeMicrosoftBindings(agent?.microsoft_workspace);
+    let account;
+    if (requestedAccount !== undefined) {
+      const wanted = requestedAccount.trim().toLowerCase();
+      const bound = bindings.find((b) => b.account === wanted);
+      if (!bound) {
+        this.audit({ op: "get-credentials", identity, account: wanted, accountKind: "microsoft", ok: false, error: "account-not-bound" });
+        socket.write(encodeError(id, "ACCOUNT_NOT_FOUND", `agent '${agentName}' is not bound to Microsoft account '${wanted}' in switchroom.yaml microsoft_workspace`));
+        return;
+      }
+      account = bound.account;
+    } else if (bindings.length > 1) {
+      this.audit({ op: "get-credentials", identity, accountKind: "microsoft", ok: false, error: "account-ambiguous" });
+      socket.write(encodeError(id, "INVALID_ARGS", `agent '${agentName}' is bound to ${bindings.length} Microsoft accounts (${bindings.map((b) => b.account).join(", ")}); an account must be specified — call getCredentials("microsoft", <account>)`));
+      return;
+    } else {
+      account = bindings[0]?.account;
+    }
     if (!account) {
       this.audit({ op: "get-credentials", identity, accountKind: "microsoft", ok: false, error: "no-microsoft-account-configured" });
       socket.write(encodeError(id, "ACCOUNT_NOT_FOUND", `agent '${agentName}' has no microsoft_workspace.account configured in switchroom.yaml`));

package/dist/cli/autoaccept-poll.js

@@ -4721,7 +4721,8 @@ var GetCredentialsRequestSchema = exports_external.object({
   v: exports_external.literal(PROTOCOL_VERSION),
   op: exports_external.literal("get-credentials"),
   id: exports_external.string().min(1),
-  provider: ProviderNameSchema.optional()
+  provider: ProviderNameSchema.optional(),
+  account: exports_external.string().min(1).optional()
 });
 var ListStateRequestSchema = exports_external.object({
   v: exports_external.literal(PROTOCOL_VERSION),
@@ -5063,13 +5064,17 @@ class AuthBrokerClient {
       sock.destroy();
     }
   }
-  async getCredentials(provider) {
+  async getCredentials(provider, account) {
     const base = {
       v: PROTOCOL_VERSION,
       id: randomUUID2(),
       op: "get-credentials"
     };
-    const req = provider !== undefined ? { ...base, provider } : base;
+    let req = base;
+    if (provider !== undefined)
+      req = { ...req, provider };
+    if (account !== undefined)
+      req = { ...req, account };
     const data = await this.send(req);
     return data;
   }

package/dist/cli/drive-write-pretool.mjs

@@ -4009,7 +4009,8 @@ var init_protocol = __esm(() => {
     v: exports_external.literal(PROTOCOL_VERSION),
     op: exports_external.literal("get-credentials"),
     id: exports_external.string().min(1),
-    provider: ProviderNameSchema.optional()
+    provider: ProviderNameSchema.optional(),
+    account: exports_external.string().min(1).optional()
   });
   ListStateRequestSchema = exports_external.object({
     v: exports_external.literal(PROTOCOL_VERSION),
@@ -4324,13 +4325,17 @@ class AuthBrokerClient {
       sock.destroy();
     }
   }
-  async getCredentials(provider) {
+  async getCredentials(provider, account) {
     const base = {
       v: PROTOCOL_VERSION,
       id: randomUUID(),
       op: "get-credentials"
     };
-    const req = provider !== undefined ? { ...base, provider } : base;
+    let req = base;
+    if (provider !== undefined)
+      req = { ...req, provider };
+    if (account !== undefined)
+      req = { ...req, account };
     const data = await this.send(req);
     return data;
   }