switchroom 0.13.52 → 0.13.53

package/telegram-plugin/dist/gateway/gateway.js

@@ -16105,11 +16105,11 @@ function decodeResponse(line) {
   }
   return ResponseSchema.parse(parsed);
 }
-var MAX_FRAME_BYTES, PROTOCOL_VERSION = 1, ProviderNameSchema, GetCredentialsRequestSchema, ListStateRequestSchema, SetActiveRequestSchema, MarkExhaustedRequestSchema, RefreshAccountRequestSchema, AnthropicCredentialsSchema, GoogleCredentialsSchema, ProviderCredentialsSchema, AddAccountRequestSchema, RmAccountRequestSchema, SetOverrideRequestSchema, ListGoogleAccountsRequestSchema, ProbeQuotaRequestSchema, RequestSchema, GetCredentialsDataSchema, AccountStateSchema, AgentStateSchema, ConsumerStateSchema, ListStateDataSchema, SetActiveDataSchema, MarkExhaustedDataSchema, RefreshAccountDataSchema, AddAccountDataSchema, RmAccountDataSchema, SetOverrideDataSchema, GoogleAccountStateSchema, ListGoogleAccountsDataSchema, ErrorBodySchema, SuccessResponseSchema, ErrorResponseSchema, ResponseSchema;
+var MAX_FRAME_BYTES, PROTOCOL_VERSION = 1, ProviderNameSchema, GetCredentialsRequestSchema, ListStateRequestSchema, SetActiveRequestSchema, MarkExhaustedRequestSchema, RefreshAccountRequestSchema, AnthropicCredentialsSchema, GoogleCredentialsSchema, MicrosoftCredentialsSchema, ProviderCredentialsSchema, AddAccountRequestSchema, RmAccountRequestSchema, SetOverrideRequestSchema, ListGoogleAccountsRequestSchema, ProbeQuotaRequestSchema, RequestSchema, GetCredentialsDataSchema, AccountStateSchema, AgentStateSchema, ConsumerStateSchema, ListStateDataSchema, SetActiveDataSchema, MarkExhaustedDataSchema, RefreshAccountDataSchema, AddAccountDataSchema, RmAccountDataSchema, SetOverrideDataSchema, GoogleAccountStateSchema, ListGoogleAccountsDataSchema, ErrorBodySchema, SuccessResponseSchema, ErrorResponseSchema, ResponseSchema;
 var init_protocol = __esm(() => {
   init_zod();
   MAX_FRAME_BYTES = 64 * 1024;
-  ProviderNameSchema = exports_external.enum(["anthropic", "google"]);
+  ProviderNameSchema = exports_external.enum(["anthropic", "google", "microsoft"]);
   GetCredentialsRequestSchema = exports_external.object({
     v: exports_external.literal(PROTOCOL_VERSION),
     op: exports_external.literal("get-credentials"),
@@ -16162,9 +16162,24 @@ var init_protocol = __esm(() => {
       tokenType: exports_external.literal("Bearer")
     })
   });
+  MicrosoftCredentialsSchema = exports_external.object({
+    microsoftOauth: exports_external.object({
+      accessToken: exports_external.string(),
+      refreshToken: exports_external.string(),
+      expiresAt: exports_external.number(),
+      scope: exports_external.string(),
+      clientId: exports_external.string(),
+      accountEmail: exports_external.string(),
+      tokenType: exports_external.literal("Bearer"),
+      tenantId: exports_external.string(),
+      accountType: exports_external.enum(["personal", "work"]),
+      homeAccountId: exports_external.string()
+    })
+  });
   ProviderCredentialsSchema = exports_external.union([
     AnthropicCredentialsSchema,
-    GoogleCredentialsSchema
+    GoogleCredentialsSchema,
+    MicrosoftCredentialsSchema
   ]);
   AddAccountRequestSchema = exports_external.object({
     v: exports_external.literal(PROTOCOL_VERSION),
@@ -23592,7 +23607,7 @@ var init_dist = __esm(() => {
 });
 
 // ../src/config/schema.ts
-var CodeRepoEntrySchema, AgentBindMountSchema, ScheduleEntrySchema, AgentSoulSchema, AgentToolsSchema, AgentMemorySchema, HookEntrySchema, AgentHooksSchema, SubagentSchema, SessionSchema, SessionContinuitySchema, TelegramChannelSchema, ChannelsSchema, TIMEZONE_REGEX, ApproverIdSchema, GoogleWorkspaceTierSchema, GoogleWorkspaceConfigSchema, AgentGoogleWorkspaceConfigSchema, ReactionsSchema, ReleaseBlock, NetworkIsolationSchema, profileFields, ProfileSchema, _omitExtends, defaultsFields, AgentDefaultsSchema, AgentSchema, TelegramConfigSchema, MemoryBackendConfigSchema, VaultConfigSchema, QuotaConfigSchema, AutoReleaseCheckSchema, HostControlConfigSchema, HostdConfigSchema, SwitchroomConfigSchema;
+var CodeRepoEntrySchema, AgentBindMountSchema, ScheduleEntrySchema, AgentSoulSchema, AgentToolsSchema, AgentMemorySchema, HookEntrySchema, AgentHooksSchema, SubagentSchema, SessionSchema, SessionContinuitySchema, TelegramChannelSchema, ChannelsSchema, TIMEZONE_REGEX, ApproverIdSchema, GoogleWorkspaceTierSchema, GoogleWorkspaceConfigSchema, MicrosoftWorkspaceConfigSchema, AgentGoogleWorkspaceConfigSchema, AgentMicrosoftWorkspaceConfigSchema, ReactionsSchema, ReleaseBlock, NetworkIsolationSchema, profileFields, ProfileSchema, _omitExtends, defaultsFields, AgentDefaultsSchema, AgentSchema, TelegramConfigSchema, MemoryBackendConfigSchema, VaultConfigSchema, QuotaConfigSchema, AutoReleaseCheckSchema, HostControlConfigSchema, HostdConfigSchema, SwitchroomConfigSchema;
 var init_schema = __esm(() => {
   init_zod();
   CodeRepoEntrySchema = exports_external.object({
@@ -23609,7 +23624,11 @@ var init_schema = __esm(() => {
     cron: exports_external.string().describe("Cron expression (e.g., '0 8 * * *')"),
     prompt: exports_external.string().describe("Prompt to send at the scheduled time"),
     model: exports_external.string().optional().describe("DEPRECATED / IGNORED. Pre-v0.8 the singleton scheduler ran each " + "task as an isolated headless invocation and could set --model per " + "task. Post cron-fold-in (v0.8) the fire is injected into the agent's " + "running session, so it always uses the agent's configured model " + "\u2014 this field has no effect. Accepted (optional) only so existing " + "configs keep validating; set the model at the agent level instead. " + "See docs/scheduling.md."),
-    secrets: exports_external.array(exports_external.string().regex(/^[a-zA-Z0-9_\-/]+$/, "Secret key names must contain only alphanumeric characters, underscores, hyphens, and forward slashes")).default([]).describe("Vault key names this cron task may read via the vault-broker daemon. " + "Empty by default \u2014 broker requests for unlisted keys are denied. " + "Note: this is misconfiguration protection (a typo in cron-A doesn't " + "accidentally read cron-B's keys) rather than a security boundary \u2014 " + "anyone who can edit cron scripts can also edit switchroom.yaml, and " + "anyone with the vault passphrase can read the vault file directly. " + "See docs/configuration.md for the full framing.")
+    secrets: exports_external.array(exports_external.string().regex(/^[a-zA-Z0-9_\-/]+$/, "Secret key names must contain only alphanumeric characters, underscores, hyphens, and forward slashes")).default([]).describe("Vault key names this cron task may read via the vault-broker daemon. " + "Empty by default \u2014 broker requests for unlisted keys are denied. " + "Note: this is misconfiguration protection (a typo in cron-A doesn't " + "accidentally read cron-B's keys) rather than a security boundary \u2014 " + "anyone who can edit cron scripts can also edit switchroom.yaml, and " + "anyone with the vault passphrase can read the vault file directly. " + "See docs/configuration.md for the full framing."),
+    topic: exports_external.union([
+      exports_external.string().min(1, "topic alias must be non-empty"),
+      exports_external.number().int().positive("topic ID must be a positive integer")
+    ]).optional().describe("Forum topic this cron fires into when the owning agent is in " + "supergroup-owned mode (channels.telegram.chat_id set). Either a " + 'string alias resolved against `topic_aliases` (e.g. "planning") ' + "or a numeric topic ID. Falls back to the agent's `default_topic_id` " + "when unset. Ignored for agents in fleet-shared or dm_only mode. " + "Alias-resolution happens at config-load \u2014 typos surface immediately. " + "See docs/rfcs/supergroup-mode.md.")
   });
   AgentSoulSchema = exports_external.object({
     name: exports_external.string().describe("Agent persona name (e.g., 'Coach', 'Sage')"),
@@ -23721,8 +23740,35 @@ var init_schema = __esm(() => {
     }).optional().describe("Auto-dispatch rules: when a verified webhook event matches a rule, " + "inject the rendered prompt into the agent's live session (#1625). " + "Supports cooldowns, quiet hours, and label/action matchers. " + "Off by default \u2014 opt in per agent. See src/web/webhook-dispatch.ts."),
     webhook_rate_limit: exports_external.object({
       rpm: exports_external.number().int().positive()
-    }).optional().describe("Per-source rate limit for the webhook ingest path (#714). " + "Off by default \u2014 when this key is absent the handler skips " + "rate-limit checks entirely. Opt in by setting `rpm` to an " + "integer requests-per-minute (token bucket per (agent, source); " + "burst equal to rpm). When enabled, exceeding the limit returns " + "429 with Retry-After header; first throttle event per " + "(agent, source) per 60s window is written to " + "<agent>/telegram/issues.jsonl. " + "Cascades from defaults.channels.telegram.webhook_rate_limit.")
-  }).optional();
+    }).optional().describe("Per-source rate limit for the webhook ingest path (#714). " + "Off by default \u2014 when this key is absent the handler skips " + "rate-limit checks entirely. Opt in by setting `rpm` to an " + "integer requests-per-minute (token bucket per (agent, source); " + "burst equal to rpm). When enabled, exceeding the limit returns " + "429 with Retry-After header; first throttle event per " + "(agent, source) per 60s window is written to " + "<agent>/telegram/issues.jsonl. " + "Cascades from defaults.channels.telegram.webhook_rate_limit."),
+    chat_id: exports_external.string().regex(/^-\d+$/, 'supergroup chat_id must be a negative integer as a string (e.g. "-1001234567890")').optional().describe("Per-agent supergroup ID \u2014 overrides fleet `telegram.forum_chat_id`. " + "When set, requires `default_topic_id`. Negative integer as string. " + "Forbidden when `dm_only: true`. See docs/rfcs/supergroup-mode.md."),
+    default_topic_id: exports_external.number().int().positive().optional().describe("Forum topic ID this agent's automated outbounds default to when " + "no more-specific alias resolves. Required when `chat_id` is set. " + "Telegram's General topic is `id=1` at MTProto but sends omit the " + "field \u2014 the outbound wrapper strips `message_thread_id === 1` " + "on send. Forbidden when `dm_only: true`."),
+    topic_aliases: exports_external.record(exports_external.string(), exports_external.number().int().positive()).optional().describe("Operator-friendly names for forum topic IDs (e.g. " + "`{ general: 1, planning: 17, cron: 23, admin: 31, alerts: 41 }`). " + "Referenced from per-cron `topic:` fields and the outbound router " + "for autonomous events (boot \u2192 alerts, hostd \u2192 admin, etc.). " + "Cascades per-key through defaults \u2192 profile \u2192 agent.")
+  }).optional().superRefine((tg, ctx) => {
+    if (!tg)
+      return;
+    if (tg.chat_id != null && tg.default_topic_id == null) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        message: "`channels.telegram.chat_id` requires `default_topic_id` \u2014 supergroup-mode agents need a fallback topic for unclassified outbounds.",
+        path: ["default_topic_id"]
+      });
+    }
+    if (tg.default_topic_id != null && tg.chat_id == null) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        message: "`channels.telegram.default_topic_id` requires `chat_id` \u2014 default_topic_id is only meaningful when the agent owns its own supergroup.",
+        path: ["chat_id"]
+      });
+    }
+    if (tg.topic_aliases != null && tg.chat_id == null) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        message: "`channels.telegram.topic_aliases` requires `chat_id` \u2014 aliases only resolve in supergroup-owned mode.",
+        path: ["topic_aliases"]
+      });
+    }
+  });
   ChannelsSchema = exports_external.object({
     telegram: TelegramChannelSchema
   }).optional();
@@ -23739,6 +23785,12 @@ var init_schema = __esm(() => {
     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).")
   }).optional();
+  MicrosoftWorkspaceConfigSchema = exports_external.object({
+    microsoft_client_id: exports_external.string().min(1).describe("Microsoft OAuth application (client) ID from Entra portal " + "(literal string or vault reference e.g. " + "'vault:microsoft-oauth-client-id')."),
+    microsoft_client_secret: exports_external.string().min(1).optional().describe("Microsoft OAuth client secret. Optional \u2014 public-client apps " + "(Mobile + Desktop platform with 'Allow public client flows' " + "enabled) work without a secret; confidential clients pass " + "one. Either literal or vault reference e.g. " + "'vault:microsoft-oauth-client-secret'."),
+    authority: exports_external.string().url().optional().describe("Microsoft authority endpoint. Defaults to " + "'https://login.microsoftonline.com/common' which accepts both " + "personal MSA and work/school tenants. Override only for " + "single-tenant deployments."),
+    org_mode: exports_external.boolean().optional().describe("Opt-in to Teams + SharePoint surfaces (RFC \u00a76.4). When true, " + "the v1 scope set adds Sites.ReadWrite.All AND the launcher " + "spawns softeria with --org-mode. Defaults to false \u2014 personal " + "MSA + standard work surfaces only. Flipping for an existing " + "consented account requires re-running 'auth microsoft account " + "add --replace' to consent the additional scope.")
+  }).optional();
   AgentGoogleWorkspaceConfigSchema = exports_external.object({
     account: exports_external.string().regex(/^[^@\s:]+@[^@\s:]+\.[^@\s:]+$/, {
       message: "google_workspace.account must be a Google account email like " + "'alice@example.com' (colons not allowed)"
@@ -23746,6 +23798,12 @@ var init_schema = __esm(() => {
     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();
+  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 \u00a76.4). When set, replaces " + "the top-level microsoft_workspace.org_mode for this agent. " + "Defaults to top-level value (which defaults to false).")
+  }).optional();
   ReactionsSchema = exports_external.object({
     enabled: exports_external.boolean().optional().describe("Master switch for the reaction-trigger path. When false, " + "reactions are still persisted via recordReaction but never " + "dispatched to the agent as synthetic inbound turns. Default true."),
     trigger_emojis: exports_external.array(exports_external.string()).optional().describe("Emoji allowlist that triggers a synthetic inbound when reacted " + "to a bot message. Default ['\uD83D\uDC4E', '\u274c', '\uD83D\uDC4D', '\u2705']. Cascade " + "mode: REPLACE (not union) \u2014 setting this at a layer replaces " + "lower layers entirely, so an operator can narrow to [] to " + "disable triggering without flipping `enabled`."),
@@ -23881,6 +23939,7 @@ var init_schema = __esm(() => {
     code_repos: exports_external.array(CodeRepoEntrySchema).optional().describe("Git repositories this agent is allowed to claim worktrees from. " + "Each entry provides a short name alias, a source path, and an " + "optional concurrency cap (default 5). When code_repos is set, " + "claim_worktree accepts the alias as the repo argument. " + "Absolute paths may always be passed regardless of this list."),
     drive: AgentGoogleWorkspaceConfigSchema.describe("RFC D legacy key \u2014 use `google_workspace:` instead. Per-agent " + "google_workspace overrides (currently approvers + tier). When set, " + "replaces the top-level approvers list for this agent. " + "google_client_id/secret are not per-agent \u2014 they live at the top level."),
     google_workspace: AgentGoogleWorkspaceConfigSchema.describe("RFC G canonical key. Per-agent Google Workspace overrides \u2014 currently " + "approvers (replaces, does not extend the top-level list) and tier " + "(`core` | `extended` | `complete`, replaces top-level default). " + "google_client_id/secret are not per-agent \u2014 they live at the top level. " + "Mutually exclusive with `drive:` on the same agent (loader fails fast " + "if both are set)."),
+    microsoft_workspace: AgentMicrosoftWorkspaceConfigSchema.describe("RFC #1873 (Microsoft 365 integration). Per-agent Microsoft Workspace " + "override \u2014 pins the Microsoft account this agent reads via the " + "auth-broker (must be a key in top-level `microsoft_accounts:` with " + "this agent in its `enabled_for[]`) and optionally overrides org_mode. " + "microsoft_client_id/secret are not per-agent."),
     repos: exports_external.record(exports_external.string().regex(/^[a-z0-9][a-z0-9-]*$/, "Repo slug must be kebab-case ASCII: start with a lowercase letter or digit, contain only lowercase letters, digits, and hyphens"), exports_external.object({
       url: exports_external.string().min(1).describe("Git remote URL for the repo (e.g. 'git@github.com:org/repo.git' or " + "'https://github.com/org/repo.git'). Used verbatim for git clone."),
       branch_default: exports_external.string().optional().describe("Default branch to track (defaults to the remote's HEAD, typically 'main'). " + "The per-agent branch 'agent/<agentName>/main' fast-forwards to this branch " + "when the worktree is clean on session start.")
@@ -23895,6 +23954,33 @@ var init_schema = __esm(() => {
       pids_limit: exports_external.number().int().positive().optional(),
       cpus: exports_external.number().positive().optional()
     }).optional()
+  }).superRefine((agent, ctx) => {
+    if (agent.dm_only !== true)
+      return;
+    const tg = agent.channels?.telegram;
+    if (tg == null)
+      return;
+    if (tg.chat_id != null) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        message: "`dm_only: true` forbids `channels.telegram.chat_id` \u2014 DM-only agents have their own private chat, not a supergroup.",
+        path: ["channels", "telegram", "chat_id"]
+      });
+    }
+    if (tg.default_topic_id != null) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        message: "`dm_only: true` forbids `channels.telegram.default_topic_id` \u2014 DMs don't have forum topics.",
+        path: ["channels", "telegram", "default_topic_id"]
+      });
+    }
+    if (tg.topic_aliases != null) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        message: "`dm_only: true` forbids `channels.telegram.topic_aliases` \u2014 DMs don't have forum topics.",
+        path: ["channels", "telegram", "topic_aliases"]
+      });
+    }
   });
   TelegramConfigSchema = exports_external.object({
     bot_token: exports_external.string().describe("Telegram bot token or vault reference (e.g., 'vault:telegram-bot-token')"),
@@ -23976,6 +24062,7 @@ var init_schema = __esm(() => {
     }).optional().describe("Switchroom-auth-broker configuration (RFC H). Fleet-wide active account, " + "fallback order, admin-agent ACL, and ephemeral-consumer surface. " + "Required from the v0.8+ schema onwards; pre-v0.8 fleets are migrated " + "in-place by `switchroom apply` (see src/auth/migrate-schema.ts)."),
     drive: GoogleWorkspaceConfigSchema.describe("RFC D legacy key \u2014 use `google_workspace:` instead. Optional Google " + "Workspace onboarding configuration. When set, supplies Google OAuth " + "client credentials, the approver allowlist for `switchroom drive " + "connect`, and the optional tier knob. Env vars " + "(SWITCHROOM_GOOGLE_CLIENT_ID, SWITCHROOM_GOOGLE_CLIENT_SECRET, " + "SWITCHROOM_APPROVER_USER_ID) take precedence over this block when " + "set, preserving back-compat with the env-only flow shipped in #766."),
     google_workspace: GoogleWorkspaceConfigSchema.describe("RFC G canonical key. Top-level Google Workspace configuration \u2014 " + "OAuth client credentials, approver allowlist, and tier knob (`core` " + "| `extended` | `complete`, default `core`). Mutually exclusive with " + "`drive:` at the top level (loader fails fast if both are set)."),
+    microsoft_workspace: MicrosoftWorkspaceConfigSchema.describe("RFC #1873 (Microsoft 365 integration). Top-level Microsoft Workspace " + "configuration \u2014 OAuth client credentials (Entra app), authority " + "endpoint (defaults to /common for personal MSA + work), and the " + "org_mode opt-in for Teams/SharePoint surfaces. Block is optional; " + "when omitted the broker does not register the Microsoft provider."),
     quota: QuotaConfigSchema.optional().describe("Optional weekly/monthly USD spend budgets rendered in the session " + "greeting. Usage is read from ccusage at runtime; no network calls."),
     host_control: HostControlConfigSchema.default({}).describe("Host-control daemon configuration. Defaults to enabled=true since " + "RFC C Phase 2 (docs/rfcs/host-control-daemon.md). Omit the block " + "to accept defaults; set `enabled: false` only on legacy systemd-" + "mode installs (removal tracked as RFC C Phase 3)."),
     hostd: HostdConfigSchema.default({}).describe("hostd verb-level knobs (RFC admin-agent-config-edit). Distinct " + "from `host_control:` which governs whether the daemon runs at " + "all. Currently scopes the opt-in flag and rate cap for the new " + "`config_propose_edit` verb (PR 1a \u2014 disabled by default)."),
@@ -23986,6 +24073,13 @@ var init_schema = __esm(() => {
         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.")
     })).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)"
+    }).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 Microsoft account's broker " + "credentials. Per-agent ACL enforced at the broker; agents " + "still authenticate via socket-path-as-identity, broker just " + "gates the cross-agent token share. Mirrors google_accounts.")
+    })).optional().describe("RFC #1873: per-Microsoft-account ACL. Maps account email \u2192 list of " + "agents permitted to use that account's broker credentials. Written " + "by `switchroom auth microsoft enable|disable`; read by the broker " + "on get-credentials with provider=microsoft."),
     defaults: AgentDefaultsSchema.describe("Implicit bottom-of-cascade profile applied to every agent before " + "per-agent config and `extends:` resolution. Tools, mcp_servers, and " + "schedule are unioned/concatenated; scalars and nested objects are " + "shallow-merged with per-agent values winning."),
     profiles: exports_external.record(exports_external.string(), ProfileSchema).optional().describe("Named profile definitions. Agents reference via `extends: <name>`. " + "Inline profiles declared here take priority over filesystem " + "profiles/<name>/ directories when both exist."),
     agents: exports_external.record(exports_external.string().regex(/^[a-z0-9][a-z0-9_-]{0,50}$/, {
@@ -24165,6 +24259,317 @@ var init_overlay_loader = __esm(() => {
   OVERLAY_SOURCE = Symbol.for("switchroom.config.overlay-source");
 });
 
+// ../src/config/merge.ts
+function dedupe(items) {
+  const seen = new Set;
+  const out = [];
+  for (const item of items) {
+    if (seen.has(item))
+      continue;
+    seen.add(item);
+    out.push(item);
+  }
+  return out;
+}
+function deepMergeJson(base, override) {
+  if (override === undefined)
+    return base;
+  if (base === undefined)
+    return override;
+  if (typeof base !== "object" || base === null || Array.isArray(base) || typeof override !== "object" || override === null || Array.isArray(override)) {
+    return override;
+  }
+  const out = { ...base };
+  for (const [k, v] of Object.entries(override)) {
+    if (k === "__proto__" || k === "constructor" || k === "prototype")
+      continue;
+    out[k] = deepMergeJson(out[k], v);
+  }
+  return out;
+}
+function resolveAgentConfig(defaults, profiles, agent) {
+  if (!mergeAgentConfig.suppressDeprecationLogs && !mergeAgentConfig.notifiedWorkerIsolationMove && defaults?.subagents?.worker?.isolation === "worktree") {
+    mergeAgentConfig.notifiedWorkerIsolationMove = true;
+    console.warn("[switchroom] NOTICE: defaults.subagents.worker.isolation moved to the " + "`coding` profile in switchroom 0.6.6 (#682). Agents extending coding " + "still get worktree-isolated workers; other agents would have hard-failed " + "the first time they delegated. See CHANGELOG.");
+  }
+  const name = agent.extends;
+  const profile = name && profiles ? profiles[name] : undefined;
+  if (!profile) {
+    return mergeAgentConfig(defaults, agent);
+  }
+  const { extends: _unused, ...profileWithoutExtends } = profile;
+  const layered = mergeAgentConfig(defaults, profileWithoutExtends);
+  return mergeAgentConfig(layered, agent);
+}
+function foldDeprecatedTelegramFields(config) {
+  const c = config;
+  const root = c;
+  const deprecations = [];
+  const hasRoot = root.voice_in !== undefined || root.telegraph !== undefined || root.webhook_sources !== undefined;
+  if (!hasRoot)
+    return { config: c, deprecations };
+  const channels = { ...c.channels ?? {} };
+  const tg = { ...channels.telegram ?? {} };
+  if (root.voice_in !== undefined) {
+    if (tg.voice_in === undefined)
+      tg.voice_in = root.voice_in;
+    deprecations.push("voice_in at the agent root is deprecated; move under channels.telegram.voice_in (#596).");
+  }
+  if (root.telegraph !== undefined) {
+    if (tg.telegraph === undefined)
+      tg.telegraph = root.telegraph;
+    deprecations.push("telegraph at the agent root is deprecated; move under channels.telegram.telegraph (#596).");
+  }
+  if (root.webhook_sources !== undefined) {
+    if (tg.webhook_sources === undefined)
+      tg.webhook_sources = root.webhook_sources;
+    deprecations.push("webhook_sources at the agent root is deprecated; move under channels.telegram.webhook_sources (#596).");
+  }
+  channels.telegram = tg;
+  const { voice_in: _vi, telegraph: _tg, webhook_sources: _ws, ...rest } = root;
+  return {
+    config: { ...rest, channels },
+    deprecations
+  };
+}
+function mergeAgentConfig(defaultsIn, agentIn) {
+  const { config: agent, deprecations: agentDeprecations } = foldDeprecatedTelegramFields(agentIn);
+  const defaultsMigration = defaultsIn ? foldDeprecatedTelegramFields(defaultsIn) : null;
+  const defaults = defaultsMigration?.config;
+  const allDeprecations = [
+    ...agentDeprecations,
+    ...defaultsMigration?.deprecations ?? []
+  ];
+  if (allDeprecations.length > 0 && !mergeAgentConfig.suppressDeprecationLogs) {
+    for (const msg of allDeprecations) {
+      console.warn(`[switchroom] DEPRECATION: ${msg}`);
+    }
+  }
+  if (!defaults)
+    return agent;
+  const merged = { ...agent };
+  if (defaults.bot_token !== undefined && merged.bot_token === undefined) {
+    merged.bot_token = defaults.bot_token;
+  }
+  if (defaults.timezone !== undefined && merged.timezone === undefined) {
+    merged.timezone = defaults.timezone;
+  }
+  if (defaults.model !== undefined && merged.model === undefined) {
+    merged.model = defaults.model;
+  }
+  if (defaults.dangerous_mode !== undefined && merged.dangerous_mode === undefined) {
+    merged.dangerous_mode = defaults.dangerous_mode;
+  }
+  if (defaults.network_isolation !== undefined && merged.network_isolation === undefined) {
+    merged.network_isolation = defaults.network_isolation;
+  }
+  if (defaults.thinking_effort !== undefined && merged.thinking_effort === undefined) {
+    merged.thinking_effort = defaults.thinking_effort;
+  }
+  if (defaults.permission_mode !== undefined && merged.permission_mode === undefined) {
+    merged.permission_mode = defaults.permission_mode;
+  }
+  if (defaults.fallback_model !== undefined && merged.fallback_model === undefined) {
+    merged.fallback_model = defaults.fallback_model;
+  }
+  if (defaults.tools || merged.tools) {
+    const dAllow = defaults.tools?.allow ?? [];
+    const aAllow = merged.tools?.allow ?? [];
+    const dDeny = defaults.tools?.deny ?? [];
+    const aDeny = merged.tools?.deny ?? [];
+    merged.tools = {
+      allow: dedupe([...dAllow, ...aAllow]),
+      deny: dedupe([...dDeny, ...aDeny])
+    };
+  }
+  if (defaults.soul || merged.soul) {
+    const base = defaults.soul ?? {};
+    const override = merged.soul ?? {};
+    const combined = { ...base };
+    for (const [k, v] of Object.entries(override)) {
+      if (v !== undefined)
+        combined[k] = v;
+    }
+    merged.soul = combined;
+  }
+  if (defaults.memory || merged.memory) {
+    const base = defaults.memory ?? {};
+    const override = merged.memory ?? {};
+    const combined = { ...base };
+    for (const [k, v] of Object.entries(override)) {
+      if (v === undefined)
+        continue;
+      if (k === "recall" && base.recall && typeof v === "object" && v !== null && !Array.isArray(v)) {
+        combined[k] = { ...base.recall, ...v };
+      } else {
+        combined[k] = v;
+      }
+    }
+    merged.memory = combined;
+  }
+  if (defaults.mcp_servers || merged.mcp_servers) {
+    merged.mcp_servers = {
+      ...defaults.mcp_servers ?? {},
+      ...merged.mcp_servers ?? {}
+    };
+  }
+  const dBundled = defaults.bundled_skills;
+  const mBundled = merged.bundled_skills;
+  if (dBundled || mBundled) {
+    merged.bundled_skills = {
+      ...dBundled ?? {},
+      ...mBundled ?? {}
+    };
+  }
+  if (defaults.hooks || merged.hooks) {
+    const result = {};
+    const dHooks = defaults.hooks ?? {};
+    const aHooks = merged.hooks ?? {};
+    const events = new Set([
+      ...Object.keys(dHooks),
+      ...Object.keys(aHooks)
+    ]);
+    for (const event of events) {
+      const d = dHooks[event] ?? [];
+      const a = aHooks[event] ?? [];
+      result[event] = [...d, ...a];
+    }
+    merged.hooks = result;
+  }
+  if (defaults.env || merged.env) {
+    merged.env = {
+      ...defaults.env ?? {},
+      ...merged.env ?? {}
+    };
+  }
+  if (defaults.subagents || merged.subagents) {
+    const dSub = defaults.subagents ?? {};
+    const mSub = merged.subagents ?? {};
+    const out = { ...dSub };
+    for (const [name, override] of Object.entries(mSub)) {
+      const base = dSub[name];
+      if (base && typeof base === "object" && override && typeof override === "object") {
+        const combined = { ...base };
+        for (const [k, v] of Object.entries(override)) {
+          if (v !== undefined)
+            combined[k] = v;
+        }
+        out[name] = combined;
+      } else {
+        out[name] = override;
+      }
+    }
+    merged.subagents = out;
+  }
+  if (defaults.session || merged.session) {
+    const base = defaults.session ?? {};
+    const override = merged.session ?? {};
+    const combined = { ...base };
+    for (const [k, v] of Object.entries(override)) {
+      if (v !== undefined)
+        combined[k] = v;
+    }
+    merged.session = combined;
+  }
+  if (defaults.session_continuity || merged.session_continuity) {
+    const base = defaults.session_continuity ?? {};
+    const override = merged.session_continuity ?? {};
+    const combined = { ...base };
+    for (const [k, v] of Object.entries(override)) {
+      if (v !== undefined)
+        combined[k] = v;
+    }
+    merged.session_continuity = combined;
+  }
+  if (merged.release === undefined && defaults.release !== undefined) {
+    merged.release = defaults.release;
+  }
+  if (defaults.channels || merged.channels) {
+    const dChan = defaults.channels ?? {};
+    const aChan = merged.channels ?? {};
+    const combined = { ...dChan };
+    for (const [key, value] of Object.entries(aChan)) {
+      if (value === undefined)
+        continue;
+      const base = combined[key] ?? {};
+      const override = value;
+      const field = { ...base };
+      for (const [k, v] of Object.entries(override)) {
+        if (v !== undefined)
+          field[k] = v;
+      }
+      combined[key] = field;
+    }
+    merged.channels = combined;
+  }
+  if (defaults.system_prompt_append || merged.system_prompt_append) {
+    const parts = [
+      defaults.system_prompt_append,
+      merged.system_prompt_append
+    ].filter((p) => typeof p === "string" && p.length > 0);
+    merged.system_prompt_append = parts.join(`
+
+`);
+  }
+  if (defaults.schedule && defaults.schedule.length > 0) {
+    merged.schedule = [...defaults.schedule, ...merged.schedule ?? []];
+  }
+  if (defaults.skills || merged.skills) {
+    const d = defaults.skills ?? [];
+    const a = merged.skills ?? [];
+    merged.skills = dedupe([...d, ...a]);
+  }
+  if (defaults.settings_raw || merged.settings_raw) {
+    merged.settings_raw = deepMergeJson(defaults.settings_raw ?? {}, merged.settings_raw ?? {});
+  }
+  if (defaults.claude_md_raw || merged.claude_md_raw) {
+    const parts = [defaults.claude_md_raw, merged.claude_md_raw].filter((p) => typeof p === "string" && p.length > 0);
+    merged.claude_md_raw = parts.join(`
+
+`);
+  }
+  if (defaults.cli_args || merged.cli_args) {
+    merged.cli_args = [
+      ...defaults.cli_args ?? [],
+      ...merged.cli_args ?? []
+    ];
+  }
+  if (defaults.extra_stable_files || merged.extra_stable_files) {
+    const d = defaults.extra_stable_files ?? [];
+    const a = merged.extra_stable_files ?? [];
+    merged.extra_stable_files = dedupe([...d, ...a]);
+  }
+  const dReactions = defaults.reactions;
+  const mReactions = merged.reactions;
+  if (dReactions || mReactions) {
+    const base = dReactions ?? {};
+    const override = mReactions ?? {};
+    const combined = { ...base };
+    for (const [k, v] of Object.entries(override)) {
+      if (v !== undefined)
+        combined[k] = v;
+    }
+    merged.reactions = combined;
+  }
+  if (defaults.resources || merged.resources) {
+    const d = defaults.resources ?? {};
+    const a = merged.resources ?? {};
+    merged.resources = { ...d, ...a };
+  }
+  if (defaults.experimental || merged.experimental) {
+    const d = defaults.experimental ?? {};
+    const a = merged.experimental ?? {};
+    merged.experimental = { ...d, ...a };
+  }
+  return merged;
+}
+var init_merge = __esm(() => {
+  ((mergeAgentConfig) => {
+    mergeAgentConfig.suppressDeprecationLogs = false;
+    mergeAgentConfig.notifiedWorkerIsolationMove = false;
+  })(mergeAgentConfig ||= {});
+});
+
 // ../src/config/loader.ts
 import { readFileSync as readFileSync5, existsSync as existsSync9 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
@@ -24278,8 +24683,34 @@ function loadConfig(configPath) {
     throw err;
   }
   applyAgentOverlays(config);
+  validateAllCronTopicAliases(config, filePath);
   return config;
 }
+function validateAllCronTopicAliases(config, filePath) {
+  const issues = [];
+  for (const [agentName3, agentRaw] of Object.entries(config.agents)) {
+    if (!agentRaw)
+      continue;
+    const resolved = resolveAgentConfig(config.defaults, config.profiles, agentRaw);
+    const schedule = resolved.schedule ?? [];
+    if (schedule.length === 0)
+      continue;
+    const tg = resolved.channels?.telegram;
+    const aliases = new Set(Object.keys(tg?.topic_aliases ?? {}));
+    for (const entry of schedule) {
+      if (entry.topic == null)
+        continue;
+      if (typeof entry.topic === "number")
+        continue;
+      if (!aliases.has(entry.topic)) {
+        issues.push(`  agents.${agentName3}.schedule cron \`${entry.cron}\`: ` + `topic alias "${entry.topic}" is not defined in ` + `channels.telegram.topic_aliases.`);
+      }
+    }
+  }
+  if (issues.length > 0) {
+    throw new ConfigError(`Cron \`topic:\` alias references unknown topic_aliases in ${filePath}`, issues);
+  }
+}
 function resolvePath(pathStr) {
   return resolveDualPath(pathStr);
 }
@@ -24290,6 +24721,7 @@ var init_loader = __esm(() => {
   init_schema();
   init_paths();
   init_overlay_loader();
+  init_merge();
   ConfigError = class ConfigError extends Error {
     details;
     constructor(message, details) {
@@ -30801,8 +31233,9 @@ function createInboundCoalescer(opts) {
     }
   };
 }
-function inboundCoalesceKey(chatId, userId) {
-  return `${chatId}:${userId}`;
+function inboundCoalesceKey(chatId, threadId, userId) {
+  const t = threadId == null || threadId === 0 ? "_" : String(threadId);
+  return `${chatId}:${t}:${userId}`;
 }
 
 // status-reactions.ts
@@ -31270,29 +31703,41 @@ function prettifyServer(name) {
   return name.charAt(0).toUpperCase() + name.slice(1);
 }
 
+// gateway/chat-key.ts
+function chatKey(chatId, threadId) {
+  const t = threadId == null || threadId === 0 ? "_" : String(threadId);
+  return `${chatId}:${t}`;
+}
+function chatKeyWithSuffix(chatId, threadId, suffix) {
+  return `${chatKey(chatId, threadId)}:${suffix}`;
+}
+
 // typing-wrap.ts
 function createTypingWrapper(deps) {
   const debounceMs = deps.debounceMs ?? 500;
   const pending = new Map;
-  const activeChats = new Set;
+  const activeLanes = new Set;
   return {
-    onToolUse(toolUseId, chatId, toolName) {
+    onToolUse(toolUseId, chatId, toolName, threadId) {
       if (!toolUseId)
         return;
       if (deps.isSurfaceTool(toolName))
         return;
+      const tid = threadId ?? null;
+      const lane = chatKey(chatId, tid);
       const prior = pending.get(toolUseId);
       if (prior) {
         clearTimeout(prior.timer);
         if (prior.started)
-          deps.stopTypingLoop(prior.chatId);
+          deps.stopTypingLoop(prior.chatId, prior.threadId);
         pending.delete(toolUseId);
       }
-      if (!activeChats.has(chatId)) {
-        deps.startTypingLoop(chatId);
-        activeChats.add(chatId);
+      if (!activeLanes.has(lane)) {
+        deps.startTypingLoop(chatId, tid);
+        activeLanes.add(lane);
         const entry2 = {
           chatId,
+          threadId: tid,
           started: true,
           timer: setTimeout(() => {}, 0)
         };
@@ -31301,9 +31746,10 @@ function createTypingWrapper(deps) {
       }
       const entry = {
         chatId,
+        threadId: tid,
         started: false,
         timer: setTimeout(() => {
-          deps.startTypingLoop(chatId);
+          deps.startTypingLoop(chatId, tid);
           entry.started = true;
         }, debounceMs)
       };
@@ -31317,8 +31763,8 @@ function createTypingWrapper(deps) {
         return;
       clearTimeout(entry.timer);
       if (entry.started) {
-        deps.stopTypingLoop(entry.chatId);
-        activeChats.delete(entry.chatId);
+        deps.stopTypingLoop(entry.chatId, entry.threadId);
+        activeLanes.delete(chatKey(entry.chatId, entry.threadId));
       }
       pending.delete(toolUseId);
     },
@@ -31326,10 +31772,10 @@ function createTypingWrapper(deps) {
       for (const entry of pending.values()) {
         clearTimeout(entry.timer);
         if (entry.started)
-          deps.stopTypingLoop(entry.chatId);
+          deps.stopTypingLoop(entry.chatId, entry.threadId);
       }
       pending.clear();
-      activeChats.clear();
+      activeLanes.clear();
     }
   };
 }
@@ -32004,10 +32450,8 @@ function buildAccentHeader(accent) {
   }
 }
 function streamKey2(chatId, threadId, lane, turnKey) {
-  const t = threadId == null || threadId === 0 ? "_" : String(threadId);
-  const base = `${chatId}:${t}`;
-  const withLane = lane != null && lane.length > 0 ? `${base}:${lane}` : base;
-  return turnKey != null && turnKey.length > 0 ? `${withLane}:${turnKey}` : withLane;
+  const base = lane != null && lane.length > 0 ? chatKeyWithSuffix(chatId, threadId ?? null, lane) : chatKey(chatId, threadId ?? null);
+  return turnKey != null && turnKey.length > 0 ? `${base}:${turnKey}` : base;
 }
 async function handleStreamReply(args, state, deps) {
   const chat_id = args.chat_id;
@@ -32202,14 +32646,14 @@ async function handleStreamReply(args, state, deps) {
 // chat-lock.ts
 function createChatLock() {
   const chains = new Map;
-  function run(chatId, fn) {
-    const prior = chains.get(chatId) ?? Promise.resolve();
+  function run(key, fn) {
+    const prior = chains.get(key) ?? Promise.resolve();
     const next = prior.then(fn, fn);
     const tracked = next.finally(() => {
-      if (chains.get(chatId) === tracked)
-        chains.delete(chatId);
+      if (chains.get(key) === tracked)
+        chains.delete(key);
     });
-    chains.set(chatId, tracked);
+    chains.set(key, tracked);
     return next;
   }
   function wrapBot(bot) {
@@ -32220,8 +32664,21 @@ function createChatLock() {
           return orig;
         return function(...args) {
           const first = args[0];
-          const key = typeof first === "string" || typeof first === "number" ? String(first) : "__global__";
-          return run(key, () => orig.apply(target, args));
+          if (typeof first !== "string" && typeof first !== "number") {
+            return run("__global__", () => orig.apply(target, args));
+          }
+          const chatId = String(first);
+          const last = args[args.length - 1];
+          const lastIsOpts = last != null && typeof last === "object" && !Array.isArray(last);
+          const threadFromOpts = lastIsOpts ? last.message_thread_id : undefined;
+          let tid = typeof threadFromOpts === "number" ? threadFromOpts : null;
+          if (tid === 1) {
+            tid = null;
+            const cleanedOpts = { ...last };
+            delete cleanedOpts.message_thread_id;
+            args = args.slice(0, -1).concat([cleanedOpts]);
+          }
+          return run(chatKey(chatId, tid), () => orig.apply(target, args));
         };
       }
     });
@@ -41300,6 +41757,7 @@ function flushOnAgentDisconnect(deps) {
     activeStatusReactions,
     activeReactionMsgIds,
     activeTurnStartedAt,
+    claudeBusyKeys,
     activeDraftStreams,
     activeDraftParseModes,
     clearActiveReactions: clearActiveReactions3,
@@ -41316,6 +41774,7 @@ function flushOnAgentDisconnect(deps) {
     activeStatusReactions.delete(key);
     activeReactionMsgIds.delete(key);
     activeTurnStartedAt.delete(key);
+    claudeBusyKeys.delete(key);
   }
   clearActiveReactions3();
   const danglingKeys = [...activeTurnStartedAt.keys()];
@@ -41323,10 +41782,16 @@ function flushOnAgentDisconnect(deps) {
     for (const k of danglingKeys) {
       activeTurnStartedAt.delete(k);
       activeReactionMsgIds.delete(k);
+      claudeBusyKeys.delete(k);
     }
     log(`telegram gateway: disconnect-flush swept ${danglingKeys.length} dangling turn key(s) ` + `post-bridge-death (controller loop missed \u2014 finalize raced disconnect)`);
     onDanglingTurnsSwept?.(danglingKeys);
   }
+  if (claudeBusyKeys.size > 0) {
+    const orphanCount = claudeBusyKeys.size;
+    claudeBusyKeys.clear();
+    log(`telegram gateway: disconnect-flush cleared ${orphanCount} orphan claudeBusyKeys ` + `entr${orphanCount === 1 ? "y" : "ies"} (synthetic-inbound deliveries that never turn_ended)`);
+  }
   disposeProgressDriver();
   for (const [key, stream] of activeDraftStreams.entries()) {
     if (!stream.isFinal())
@@ -42715,6 +43180,7 @@ init_zod();
 init_schema();
 init_paths();
 init_overlay_loader();
+init_merge();
 import { readFileSync as readFileSync14, existsSync as existsSync18 } from "node:fs";
 import { homedir as homedir8 } from "node:os";
 import { resolve as resolve5 } from "node:path";
@@ -42836,11 +43302,37 @@ function loadConfig2(configPath) {
     throw err;
   }
   applyAgentOverlays(config);
+  validateAllCronTopicAliases2(config, filePath);
   return config;
 }
+function validateAllCronTopicAliases2(config, filePath) {
+  const issues = [];
+  for (const [agentName3, agentRaw] of Object.entries(config.agents)) {
+    if (!agentRaw)
+      continue;
+    const resolved = resolveAgentConfig(config.defaults, config.profiles, agentRaw);
+    const schedule = resolved.schedule ?? [];
+    if (schedule.length === 0)
+      continue;
+    const tg = resolved.channels?.telegram;
+    const aliases = new Set(Object.keys(tg?.topic_aliases ?? {}));
+    for (const entry of schedule) {
+      if (entry.topic == null)
+        continue;
+      if (typeof entry.topic === "number")
+        continue;
+      if (!aliases.has(entry.topic)) {
+        issues.push(`  agents.${agentName3}.schedule cron \`${entry.cron}\`: ` + `topic alias "${entry.topic}" is not defined in ` + `channels.telegram.topic_aliases.`);
+      }
+    }
+  }
+  if (issues.length > 0) {
+    throw new ConfigError2(`Cron \`topic:\` alias references unknown topic_aliases in ${filePath}`, issues);
+  }
+}
 
 // ../src/config/merge.ts
-function dedupe(items) {
+function dedupe2(items) {
   const seen = new Set;
   const out = [];
   for (const item of items) {
@@ -42851,7 +43343,7 @@ function dedupe(items) {
   }
   return out;
 }
-function deepMergeJson(base, override) {
+function deepMergeJson2(base, override) {
   if (override === undefined)
     return base;
   if (base === undefined)
@@ -42863,25 +43355,25 @@ function deepMergeJson(base, override) {
   for (const [k, v] of Object.entries(override)) {
     if (k === "__proto__" || k === "constructor" || k === "prototype")
       continue;
-    out[k] = deepMergeJson(out[k], v);
+    out[k] = deepMergeJson2(out[k], v);
   }
   return out;
 }
-function resolveAgentConfig(defaults, profiles, agent) {
-  if (!mergeAgentConfig.suppressDeprecationLogs && !mergeAgentConfig.notifiedWorkerIsolationMove && defaults?.subagents?.worker?.isolation === "worktree") {
-    mergeAgentConfig.notifiedWorkerIsolationMove = true;
+function resolveAgentConfig2(defaults, profiles, agent) {
+  if (!mergeAgentConfig2.suppressDeprecationLogs && !mergeAgentConfig2.notifiedWorkerIsolationMove && defaults?.subagents?.worker?.isolation === "worktree") {
+    mergeAgentConfig2.notifiedWorkerIsolationMove = true;
     console.warn("[switchroom] NOTICE: defaults.subagents.worker.isolation moved to the " + "`coding` profile in switchroom 0.6.6 (#682). Agents extending coding " + "still get worktree-isolated workers; other agents would have hard-failed " + "the first time they delegated. See CHANGELOG.");
   }
   const name = agent.extends;
   const profile = name && profiles ? profiles[name] : undefined;
   if (!profile) {
-    return mergeAgentConfig(defaults, agent);
+    return mergeAgentConfig2(defaults, agent);
   }
   const { extends: _unused, ...profileWithoutExtends } = profile;
-  const layered = mergeAgentConfig(defaults, profileWithoutExtends);
-  return mergeAgentConfig(layered, agent);
+  const layered = mergeAgentConfig2(defaults, profileWithoutExtends);
+  return mergeAgentConfig2(layered, agent);
 }
-function foldDeprecatedTelegramFields(config) {
+function foldDeprecatedTelegramFields2(config) {
   const c = config;
   const root = c;
   const deprecations = [];
@@ -42912,15 +43404,15 @@ function foldDeprecatedTelegramFields(config) {
     deprecations
   };
 }
-function mergeAgentConfig(defaultsIn, agentIn) {
-  const { config: agent, deprecations: agentDeprecations } = foldDeprecatedTelegramFields(agentIn);
-  const defaultsMigration = defaultsIn ? foldDeprecatedTelegramFields(defaultsIn) : null;
+function mergeAgentConfig2(defaultsIn, agentIn) {
+  const { config: agent, deprecations: agentDeprecations } = foldDeprecatedTelegramFields2(agentIn);
+  const defaultsMigration = defaultsIn ? foldDeprecatedTelegramFields2(defaultsIn) : null;
   const defaults = defaultsMigration?.config;
   const allDeprecations = [
     ...agentDeprecations,
     ...defaultsMigration?.deprecations ?? []
   ];
-  if (allDeprecations.length > 0 && !mergeAgentConfig.suppressDeprecationLogs) {
+  if (allDeprecations.length > 0 && !mergeAgentConfig2.suppressDeprecationLogs) {
     for (const msg of allDeprecations) {
       console.warn(`[switchroom] DEPRECATION: ${msg}`);
     }
@@ -42958,8 +43450,8 @@ function mergeAgentConfig(defaultsIn, agentIn) {
     const dDeny = defaults.tools?.deny ?? [];
     const aDeny = merged.tools?.deny ?? [];
     merged.tools = {
-      allow: dedupe([...dAllow, ...aAllow]),
-      deny: dedupe([...dDeny, ...aDeny])
+      allow: dedupe2([...dAllow, ...aAllow]),
+      deny: dedupe2([...dDeny, ...aDeny])
     };
   }
   if (defaults.soul || merged.soul) {
@@ -43097,10 +43589,10 @@ function mergeAgentConfig(defaultsIn, agentIn) {
   if (defaults.skills || merged.skills) {
     const d = defaults.skills ?? [];
     const a = merged.skills ?? [];
-    merged.skills = dedupe([...d, ...a]);
+    merged.skills = dedupe2([...d, ...a]);
   }
   if (defaults.settings_raw || merged.settings_raw) {
-    merged.settings_raw = deepMergeJson(defaults.settings_raw ?? {}, merged.settings_raw ?? {});
+    merged.settings_raw = deepMergeJson2(defaults.settings_raw ?? {}, merged.settings_raw ?? {});
   }
   if (defaults.claude_md_raw || merged.claude_md_raw) {
     const parts = [defaults.claude_md_raw, merged.claude_md_raw].filter((p) => typeof p === "string" && p.length > 0);
@@ -43117,7 +43609,7 @@ function mergeAgentConfig(defaultsIn, agentIn) {
   if (defaults.extra_stable_files || merged.extra_stable_files) {
     const d = defaults.extra_stable_files ?? [];
     const a = merged.extra_stable_files ?? [];
-    merged.extra_stable_files = dedupe([...d, ...a]);
+    merged.extra_stable_files = dedupe2([...d, ...a]);
   }
   const dReactions = defaults.reactions;
   const mReactions = merged.reactions;
@@ -43146,7 +43638,60 @@ function mergeAgentConfig(defaultsIn, agentIn) {
 ((mergeAgentConfig) => {
   mergeAgentConfig.suppressDeprecationLogs = false;
   mergeAgentConfig.notifiedWorkerIsolationMove = false;
-})(mergeAgentConfig ||= {});
+})(mergeAgentConfig2 ||= {});
+
+// ../src/telegram/topic-router.ts
+var ALERTS_ALIAS = "alerts";
+var ADMIN_ALIAS = "admin";
+function aliasToId(config, name) {
+  return config.topic_aliases?.[name];
+}
+function resolveOutboundTopic(config, event) {
+  const cfg = config ?? {};
+  const inSupergroupMode = cfg.default_topic_id != null;
+  switch (event.kind) {
+    case "reply":
+      return event.originThreadId;
+    case "subagent-progress":
+      return event.parentThreadId;
+    case "command-query":
+      return event.originThreadId;
+    case "vault":
+    case "permission":
+      if (event.turnInitiated) {
+        return event.originThreadId ?? cfg.default_topic_id;
+      }
+      if (!inSupergroupMode)
+        return;
+      return aliasToId(cfg, ADMIN_ALIAS) ?? cfg.default_topic_id;
+    case "hostd-approval":
+      if (event.originThreadId != null)
+        return event.originThreadId;
+      if (!inSupergroupMode)
+        return;
+      return aliasToId(cfg, ADMIN_ALIAS) ?? cfg.default_topic_id;
+    case "cron": {
+      if (typeof event.entryTopic === "number")
+        return event.entryTopic;
+      if (typeof event.entryTopic === "string") {
+        const resolved = aliasToId(cfg, event.entryTopic);
+        if (resolved != null)
+          return resolved;
+      }
+      return cfg.default_topic_id;
+    }
+    case "boot":
+    case "compact-watchdog":
+      if (!inSupergroupMode)
+        return;
+      return aliasToId(cfg, ALERTS_ALIAS) ?? cfg.default_topic_id;
+    case "command-mutation":
+    case "command-heavy":
+      if (!inSupergroupMode)
+        return;
+      return aliasToId(cfg, ADMIN_ALIAS) ?? cfg.default_topic_id;
+  }
+}
 
 // ../src/agents/perf.ts
 import { existsSync as existsSync19, readFileSync as readFileSync15 } from "node:fs";
@@ -44768,12 +45313,12 @@ function createPendingPermissionBuffer(opts = {}) {
 }
 
 // gateway/chat-key.ts
-function chatKey(chatId, threadId) {
+function chatKey2(chatId, threadId) {
   const t = threadId == null || threadId === 0 ? "_" : String(threadId);
   return `${chatId}:${t}`;
 }
-function chatKeyWithSuffix(chatId, threadId, suffix) {
-  return `${chatKey(chatId, threadId)}:${suffix}`;
+function chatKeyWithSuffix2(chatId, threadId, suffix) {
+  return `${chatKey2(chatId, threadId)}:${suffix}`;
 }
 function chatIdOfChatKey(key) {
   const idx = key.indexOf(":");
@@ -48732,11 +49277,11 @@ function sweepStaleTurnActiveMarker(stateDir, opts) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.13.52";
-var COMMIT_SHA = "3d68efa2";
-var COMMIT_DATE = "2026-05-26T00:48:06Z";
-var LATEST_PR = 1864;
-var COMMITS_AHEAD_OF_TAG = 0;
+var VERSION = "0.13.53";
+var COMMIT_SHA = "08726c33";
+var COMMIT_DATE = "2026-05-27T03:52:37Z";
+var LATEST_PR = 1885;
+var COMMITS_AHEAD_OF_TAG = 18;
 
 // gateway/boot-version.ts
 function formatRelativeAgo(iso) {
@@ -49650,6 +50195,16 @@ var outboundDedup = new OutboundDedupCache;
 var chatAvailableReactions = new Map;
 var chatProbesInFlight = new Set;
 var activeTurnStartedAt = new Map;
+var claudeBusyKeys = new Set;
+function markClaudeBusyForInbound(m) {
+  let tid = m.threadId ?? null;
+  if (tid == null && m.meta?.message_thread_id != null) {
+    const n = Number(m.meta.message_thread_id);
+    if (Number.isFinite(n))
+      tid = n;
+  }
+  claudeBusyKeys.add(chatKey2(m.chatId, tid));
+}
 var pendingRestarts = new Map;
 var lastSessionActiveFile = null;
 var compactState = initialCompactState();
@@ -49689,10 +50244,10 @@ var CONTEXT_EXHAUSTION_COOLDOWN_MS = 600000;
 var lastContextExhaustionWarningAt = 0;
 var pendingPtyPartial = null;
 function statusKey(chatId, threadId) {
-  return chatKey(chatId, threadId);
+  return chatKey2(chatId, threadId);
 }
 function streamKey3(chatId, threadId) {
-  return chatKey(chatId, threadId);
+  return chatKey2(chatId, threadId);
 }
 function purgeReactionTracking(key, endingTurn) {
   const outboundEmitted = endingTurn != null ? endingTurn.replyCalled === true : currentTurn?.replyCalled === true;
@@ -49701,16 +50256,29 @@ function purgeReactionTracking(key, endingTurn) {
   activeStatusReactions.delete(key);
   activeReactionMsgIds.delete(key);
   activeTurnStartedAt.delete(key);
-  stopTurnTypingLoop(chatIdOfChatKey(key));
+  claudeBusyKeys.delete(key);
+  if (endingTurn != null) {
+    stopTurnTypingLoop(endingTurn.sessionChatId, endingTurn.sessionThreadId ?? null);
+  } else {
+    const chatId = chatIdOfChatKey(key);
+    const threadPart = key.slice(chatId.length + 1);
+    const threadId = threadPart === "_" || threadPart === "" ? null : Number(threadPart);
+    stopTurnTypingLoop(chatId, Number.isFinite(threadId) ? threadId : null);
+  }
   if (msgInfo) {
     const agentDir = resolveAgentDirFromEnv();
     if (agentDir != null)
       removeActiveReaction(agentDir, msgInfo.chatId, msgInfo.messageId);
   }
-  if (activeTurnStartedAt.size === 0) {
+  if (claudeBusyKeys.size === 0) {
     const selfAgentForFlush = process.env.SWITCHROOM_AGENT_NAME ?? "";
     if (pendingInboundBuffer.depth(selfAgentForFlush) > 0) {
-      const fr = redeliverBufferedInbound(pendingInboundBuffer, selfAgentForFlush, (m) => ipcServer.sendToAgent(selfAgentForFlush, m), inboundSpool);
+      const fr = redeliverBufferedInbound(pendingInboundBuffer, selfAgentForFlush, (m) => {
+        const d = ipcServer.sendToAgent(selfAgentForFlush, m);
+        if (d)
+          markClaudeBusyForInbound(m);
+        return d;
+      }, inboundSpool);
       if (fr.redelivered > 0) {
         process.stderr.write(`telegram gateway: turn-complete flushed ${fr.redelivered}/${fr.drained} held inbound for ${selfAgentForFlush}${fr.rebuffered > 0 ? ` (${fr.rebuffered} re-buffered)` : ""}
 `);
@@ -49730,11 +50298,17 @@ function releaseTurnBufferGate(key) {
   if (!activeTurnStartedAt.has(key))
     return;
   activeTurnStartedAt.delete(key);
+  claudeBusyKeys.delete(key);
   shadowEmit({ kind: "turnEnd", key, at: Date.now(), outboundEmitted: true });
-  if (activeTurnStartedAt.size === 0) {
+  if (claudeBusyKeys.size === 0) {
     const selfAgentForFlush = process.env.SWITCHROOM_AGENT_NAME ?? "";
     if (pendingInboundBuffer.depth(selfAgentForFlush) > 0) {
-      const fr = redeliverBufferedInbound(pendingInboundBuffer, selfAgentForFlush, (m) => ipcServer.sendToAgent(selfAgentForFlush, m), inboundSpool);
+      const fr = redeliverBufferedInbound(pendingInboundBuffer, selfAgentForFlush, (m) => {
+        const d = ipcServer.sendToAgent(selfAgentForFlush, m);
+        if (d)
+          markClaudeBusyForInbound(m);
+        return d;
+      }, inboundSpool);
       if (fr.redelivered > 0) {
         process.stderr.write(`telegram gateway: reply-released-gate flushed ${fr.redelivered}/${fr.drained} held inbound for ${selfAgentForFlush}${fr.rebuffered > 0 ? ` (${fr.rebuffered} re-buffered)` : ""}
 `);
@@ -49758,7 +50332,7 @@ function maybeProactiveCompact() {
   try {
     const cfg = loadConfig2();
     const rawAgent = cfg.agents?.[agentName3] ?? {};
-    const resolved = resolveAgentConfig(cfg.defaults, cfg.profiles, rawAgent);
+    const resolved = resolveAgentConfig2(cfg.defaults, cfg.profiles, rawAgent);
     cap = resolved.session?.max_context_tokens;
   } catch {
     return;
@@ -49811,7 +50385,7 @@ async function postCompactCard(occ, cap) {
     const chatId = loadAccess().allowFrom[0];
     if (!chatId)
       return;
-    const threadId = chatThreadMap.get(chatId);
+    const threadId = resolveAgentOutboundTopic({ kind: "compact-watchdog" }) ?? chatThreadMap.get(chatId);
     const text = `\uD83D\uDDDC\uFE0F <b>Context compaction</b>
 ` + `Working context hit ~${occ.toLocaleString()} tokens (cap ${cap.toLocaleString()}) \u2014 running <code>/compact</code>. ` + `Older detail moves to Hindsight; I'll confirm here once the context has shrunk (may take a turn or two).`;
     const sent = await swallowingApiCall(() => bot.api.sendMessage(chatId, text, {
@@ -49986,53 +50560,59 @@ var CHAT_ACTION_WHITELIST = new Set([
   "record_video_note",
   "upload_video_note"
 ]);
-function startTypingLoop(chat_id, action = "typing") {
-  stopTypingLoop(chat_id);
+function startTypingLoop(chat_id, thread_id = null, action = "typing") {
+  stopTypingLoop(chat_id, thread_id);
+  const key = chatKey2(chat_id, thread_id);
+  const sendOpts = thread_id != null ? { message_thread_id: thread_id } : undefined;
   const send = () => {
-    bot.api.sendChatAction(chat_id, action).then(() => {
+    bot.api.sendChatAction(chat_id, action, sendOpts).then(() => {
       typingBackoffMs = 0;
     }, (err) => {
       const msg = err instanceof Error ? err.message : String(err);
       if (msg.includes("401") || msg.includes("Unauthorized")) {
         typingBackoffMs = Math.min(Math.max(typingBackoffMs * 2 || 1000, 1000), TYPING_BACKOFF_MAX);
-        stopTypingLoop(chat_id);
+        stopTypingLoop(chat_id, thread_id);
         const retry = setTimeout(() => {
-          typingRetryTimers.delete(chat_id);
-          startTypingLoop(chat_id, action);
+          typingRetryTimers.delete(key);
+          startTypingLoop(chat_id, thread_id, action);
         }, typingBackoffMs);
-        typingRetryTimers.set(chat_id, retry);
+        typingRetryTimers.set(key, retry);
       }
     });
   };
   send();
-  typingIntervals.set(chat_id, setInterval(send, 4000));
+  typingIntervals.set(key, setInterval(send, 4000));
 }
-function stopTypingLoop(chat_id) {
-  const iv = typingIntervals.get(chat_id);
+function stopTypingLoop(chat_id, thread_id = null) {
+  const key = chatKey2(chat_id, thread_id);
+  const iv = typingIntervals.get(key);
   if (iv) {
     clearInterval(iv);
-    typingIntervals.delete(chat_id);
+    typingIntervals.delete(key);
   }
-  const retry = typingRetryTimers.get(chat_id);
+  const retry = typingRetryTimers.get(key);
   if (retry) {
     clearTimeout(retry);
-    typingRetryTimers.delete(chat_id);
+    typingRetryTimers.delete(key);
   }
 }
 var turnTypingIntervals = new Map;
-function startTurnTypingLoop(chat_id) {
-  stopTurnTypingLoop(chat_id);
+function startTurnTypingLoop(chat_id, thread_id = null) {
+  stopTurnTypingLoop(chat_id, thread_id);
+  const key = chatKey2(chat_id, thread_id);
+  const sendOpts = thread_id != null ? { message_thread_id: thread_id } : undefined;
   const send = () => {
-    bot.api.sendChatAction(chat_id, "typing").catch(() => {});
+    bot.api.sendChatAction(chat_id, "typing", sendOpts).catch(() => {});
   };
   send();
-  turnTypingIntervals.set(chat_id, setInterval(send, 4000));
+  turnTypingIntervals.set(key, setInterval(send, 4000));
 }
-function stopTurnTypingLoop(chat_id) {
-  const iv = turnTypingIntervals.get(chat_id);
+function stopTurnTypingLoop(chat_id, thread_id = null) {
+  const key = chatKey2(chat_id, thread_id);
+  const iv = turnTypingIntervals.get(key);
   if (iv) {
     clearInterval(iv);
-    turnTypingIntervals.delete(chat_id);
+    turnTypingIntervals.delete(key);
   }
 }
 var typingWrapper = createTypingWrapper({
@@ -50635,7 +51215,12 @@ startTimer({
       clearSilentEndState(fbKey);
     } catch {}
     const fbSelfAgent = process.env.SWITCHROOM_AGENT_NAME ?? "";
-    const fbRedeliver = redeliverBufferedInbound(pendingInboundBuffer, fbSelfAgent, (m) => ipcServer.sendToAgent(fbSelfAgent, m), inboundSpool);
+    const fbRedeliver = redeliverBufferedInbound(pendingInboundBuffer, fbSelfAgent, (m) => {
+      const d = ipcServer.sendToAgent(fbSelfAgent, m);
+      if (d)
+        markClaudeBusyForInbound(m);
+      return d;
+    }, inboundSpool);
     process.stderr.write(`telegram gateway: silence-poke framework-fallback ended wedged turn chat=${fbChatId} thread=${ctx.threadId ?? "-"} silence_ms=${ctx.silenceMs} currentTurn_nulled=${turnMatchesFallback} drained_buffered=${fbRedeliver.redelivered}/${fbRedeliver.drained}${fbRedeliver.rebuffered > 0 ? ` rebuffered=${fbRedeliver.rebuffered}` : ""}${fbExtraPurge.purged.length > 0 ? ` extra_keys_purged=${fbExtraPurge.purged.length}` : ""}
 `);
   }
@@ -50818,6 +51403,7 @@ var ipcServer = createIpcServer({
       activeStatusReactions,
       activeReactionMsgIds,
       activeTurnStartedAt,
+      claudeBusyKeys,
       activeDraftStreams,
       activeDraftParseModes,
       clearActiveReactions: () => {
@@ -50931,7 +51517,7 @@ ${reminder}
   onHeartbeat(_client, _msg) {},
   onScheduleRestart(client3, msg) {
     const { agentName: agentName3 } = msg;
-    const turnInFlight = activeTurnStartedAt.size > 0;
+    const turnInFlight = claudeBusyKeys.size > 0;
     if (!turnInFlight) {
       try {
         client3.send({
@@ -51098,6 +51684,8 @@ ${reminder}
     const promptKey = typeof msg.inbound.meta?.prompt_key === "string" ? msg.inbound.meta.prompt_key : "unknown";
     const source = typeof msg.inbound.meta?.source === "string" ? msg.inbound.meta.source : "unknown";
     const delivered = ipcServer.sendToAgent(msg.agentName, msg.inbound);
+    if (delivered)
+      markClaudeBusyForInbound(msg.inbound);
     process.stderr.write(`telegram gateway: inject_inbound agent=${msg.agentName} source=${source} prompt_key=${promptKey} delivered=${delivered}
 `);
     if (!delivered) {
@@ -51112,11 +51700,16 @@ if (!STATIC) {
   setInterval(() => {
     const selfAgent = process.env.SWITCHROOM_AGENT_NAME ?? "";
     const r = idleDrainTick(pendingInboundBuffer, selfAgent, () => {
-      if (activeTurnStartedAt.size > 0)
+      if (claudeBusyKeys.size > 0)
         return false;
       const c = ipcServer.getClient(selfAgent);
       return c != null && c.isAlive();
-    }, (m) => ipcServer.sendToAgent(selfAgent, m), inboundSpool);
+    }, (m) => {
+      const d = ipcServer.sendToAgent(selfAgent, m);
+      if (d)
+        markClaudeBusyForInbound(m);
+      return d;
+    }, inboundSpool);
     if (r != null && r.redelivered > 0) {
       process.stderr.write(`telegram gateway: idle-drain flushed ${r.redelivered}/${r.drained} buffered inbound for ${selfAgent}${r.rebuffered > 0 ? ` (${r.rebuffered} re-buffered)` : ""}
 `);
@@ -51395,7 +51988,7 @@ ${url}`;
     await deleteStalePreview(previewMessageId);
     previewMessageId = null;
   }
-  startTypingLoop(chat_id);
+  startTypingLoop(chat_id, threadId ?? null);
   let silentAnchorEditDone = false;
   {
     const turn2 = currentTurn;
@@ -51464,7 +52057,7 @@ ${url}`;
     }
   }
   if (silentAnchorEditDone) {
-    stopTypingLoop(chat_id);
+    stopTypingLoop(chat_id, threadId ?? null);
     return {
       content: [
         {
@@ -51558,7 +52151,7 @@ ${url}`;
     const msg = err instanceof Error ? err.message : String(err);
     throw new Error(`reply failed after ${sentIds.length} of ${chunks.length} chunk(s) sent: ${msg}`);
   } finally {
-    stopTypingLoop(chat_id);
+    stopTypingLoop(chat_id, threadId ?? null);
   }
   if (replyButtonMeta != null && replyButtonMeta.size > 0 && sentIds.length >= chunks.length) {
     const keyboardMsgId = sentIds[chunks.length - 1];
@@ -52397,8 +52990,9 @@ async function executeSendTyping(args) {
     }
     action = rawAction;
   }
-  startTypingLoop(stChatId, action);
-  setTimeout(() => stopTypingLoop(stChatId), 30000);
+  const stThreadId = resolveThreadId(stChatId, args.message_thread_id) ?? null;
+  startTypingLoop(stChatId, stThreadId, action);
+  setTimeout(() => stopTypingLoop(stChatId, stThreadId), 30000);
   for (const [key, ctrl] of activeStatusReactions.entries()) {
     if (key.startsWith(`${stChatId}:`))
       ctrl.setTool();
@@ -52535,7 +53129,7 @@ function resetOrphanedReplyTimeout() {
   }
 }
 function closeActivityLane(chatId, threadId) {
-  const key = chatKeyWithSuffix(chatId, threadId, "activity");
+  const key = chatKeyWithSuffix2(chatId, threadId, "activity");
   const stream = activeDraftStreams.get(key);
   if (stream == null)
     return;
@@ -52544,7 +53138,7 @@ function closeActivityLane(chatId, threadId) {
   stream.finalize().catch(() => {});
 }
 function closeProgressLane(chatId, threadId) {
-  const prefix = chatKeyWithSuffix(chatId, threadId, "progress");
+  const prefix = chatKeyWithSuffix2(chatId, threadId, "progress");
   for (const [key, stream] of activeDraftStreams) {
     if (key.startsWith(prefix)) {
       activeDraftStreams.delete(key);
@@ -52593,7 +53187,7 @@ function handleSessionEvent(ev) {
         clearSilentEndState(statusKey(ev.chatId, ev.threadId != null ? Number(ev.threadId) : null));
         if (turnsDb != null) {
           const evThreadIdNum = ev.threadId != null ? Number(ev.threadId) : null;
-          const turnKey = chatKeyWithSuffix(ev.chatId, evThreadIdNum, String(startedAt));
+          const turnKey = chatKeyWithSuffix2(ev.chatId, evThreadIdNum, String(startedAt));
           next.registryKey = turnKey;
           const userPromptPreview = extractUserPromptPreview(ev.rawContent);
           try {
@@ -52656,7 +53250,7 @@ function handleSessionEvent(ev) {
         return;
       ctrl.setTool(name);
       if (ev.toolUseId) {
-        typingWrapper.onToolUse(ev.toolUseId, turn.sessionChatId, name);
+        typingWrapper.onToolUse(ev.toolUseId, turn.sessionChatId, name, turn.sessionThreadId ?? null);
       }
       return;
     }
@@ -52774,7 +53368,7 @@ function handleSessionEvent(ev) {
         return;
       if (!ev.toolUseId)
         return;
-      typingWrapper.onToolUse(ev.toolUseId, turn.sessionChatId, ev.toolName);
+      typingWrapper.onToolUse(ev.toolUseId, turn.sessionChatId, ev.toolName, turn.sessionThreadId ?? null);
       return;
     }
     case "sub_agent_tool_result": {
@@ -52853,7 +53447,7 @@ function handleSessionEvent(ev) {
       if (flushDecision.kind === "skip" && flushDecision.reason === "silent-marker") {
         process.stderr.write(`telegram gateway: silent-turn-suppression: chat=${chatId} turnKey=${turn.startedAt} reason=silent-marker
 `);
-        const suppressPrefix = chatKeyWithSuffix(chatId, threadId, "progress");
+        const suppressPrefix = chatKeyWithSuffix2(chatId, threadId, "progress");
         for (const [key] of activeDraftStreams) {
           if (key.startsWith(suppressPrefix)) {
             activeDraftStreams.delete(key);
@@ -53284,7 +53878,7 @@ async function handleInboundCoalesced(ctx, text, downloadImage, attachment) {
   if (!from)
     return;
   maybeEarlyAckReaction(ctx, from);
-  const key = inboundCoalesceKey(String(ctx.chat.id), String(from.id));
+  const key = inboundCoalesceKey(String(ctx.chat.id), ctx.message?.message_thread_id, String(from.id));
   const result = inboundCoalescer.enqueue(key, { text, ctx, downloadImage, attachment });
   if (result.bypass)
     return handleInbound(ctx, text, undefined, undefined);
@@ -53339,7 +53933,7 @@ async function handleInbound(ctx, text, downloadImage, attachment) {
     },
     at: Date.now()
   });
-  const turnInFlightAtReceipt = activeTurnStartedAt.size > 0;
+  const turnInFlightAtReceipt = claudeBusyKeys.size > 0;
   const access = result.access;
   const from = ctx.from;
   const chat_id = String(ctx.chat.id);
@@ -53435,11 +54029,12 @@ async function handleInbound(ctx, text, downloadImage, attachment) {
     }
     return;
   }
-  const pendingAdd = pendingAuthAddFlows.get(chat_id);
+  const interceptKey = chatKey2(chat_id, messageThreadId);
+  const pendingAdd = pendingAuthAddFlows.get(interceptKey);
   if (pendingAdd && looksLikeAuthCode(text)) {
     const elapsed = Date.now() - pendingAdd.startedAt;
     if (elapsed < REAUTH_INTERCEPT_TTL_MS) {
-      pendingAuthAddFlows.delete(chat_id);
+      pendingAuthAddFlows.delete(interceptKey);
       try {
         const credentials = await submitAccountAuthCode(pendingAdd, text.trim());
         try {
@@ -53458,13 +54053,13 @@ The fleet's active account hasn't changed. Send <code>/auth use ${escapeHtmlForT
       return;
     }
     cancelAccountAuthSession(pendingAdd);
-    pendingAuthAddFlows.delete(chat_id);
+    pendingAuthAddFlows.delete(interceptKey);
   }
-  const pendingReauth = pendingReauthFlows.get(chat_id);
+  const pendingReauth = pendingReauthFlows.get(interceptKey);
   if (pendingReauth && looksLikeAuthCode(text)) {
     const elapsed = Date.now() - pendingReauth.startedAt;
     if (elapsed < REAUTH_INTERCEPT_TTL_MS) {
-      pendingReauthFlows.delete(chat_id);
+      pendingReauthFlows.delete(interceptKey);
       const { result: result2, errorText } = execAuthCode(pendingReauth.agent, text.trim());
       if (errorText) {
         await switchroomReply(ctx, `<b>auth code failed:</b>
@@ -53483,7 +54078,7 @@ ${preBlock(formatSwitchroomOutput(errorText))}`, { html: true });
       redactAuthCodeMessage(bot.api, chat_id, msgId ?? null, (line) => process.stderr.write(line));
       return;
     }
-    pendingReauthFlows.delete(chat_id);
+    pendingReauthFlows.delete(interceptKey);
   }
   const pendingVault = pendingVaultOps.get(chat_id);
   if (pendingVault) {
@@ -53779,7 +54374,7 @@ ${preBlock(write.output)}`;
         reset(statusKey(chat_id, messageThreadId), Date.now());
         startTurn(statusKey(chat_id, messageThreadId), Date.now());
         clearPending(statusKey(chat_id, messageThreadId), "inbound");
-        startTurnTypingLoop(chat_id);
+        startTurnTypingLoop(chat_id, messageThreadId ?? null);
         emitRuntimeMetric({
           kind: "turn_started",
           chat_id,
@@ -53911,6 +54506,8 @@ ${preBlock(write.output)}`;
     return;
   }
   const delivered = ipcServer.sendToAgent(selfAgent, inboundMsg);
+  if (delivered)
+    markClaudeBusyForInbound(inboundMsg);
   if (!delivered) {
     pendingInboundBuffer.push(selfAgent, inboundMsg);
     const threadOpts = messageThreadId != null ? { message_thread_id: messageThreadId } : {};
@@ -54061,9 +54658,10 @@ function resolveBootChatId(marker, ageMs) {
       ackMsgId: marker.ack_message_id ?? undefined
     };
   }
+  const supergroupBootTopic = resolveAgentOutboundTopic({ kind: "boot" });
   const envChat = process.env.SUBAGENT_OWNER_CHAT_ID;
   if (envChat)
-    return { chatId: envChat, threadId: undefined, ackMsgId: undefined };
+    return { chatId: envChat, threadId: supergroupBootTopic, ackMsgId: undefined };
   if (HISTORY_ENABLED) {
     try {
       const access = loadAccess();
@@ -54071,12 +54669,30 @@ function resolveBootChatId(marker, ageMs) {
       if (ownerChatId) {
         const recent = query({ chat_id: ownerChatId, limit: 1 });
         if (recent.length > 0)
-          return { chatId: ownerChatId, threadId: undefined, ackMsgId: undefined };
+          return { chatId: ownerChatId, threadId: supergroupBootTopic, ackMsgId: undefined };
       }
     } catch {}
   }
   return null;
 }
+function resolveAgentOutboundTopic(event) {
+  const agentName3 = process.env.SWITCHROOM_AGENT_NAME;
+  if (!agentName3)
+    return;
+  try {
+    const cfg = loadConfig2();
+    const rawAgent = cfg.agents?.[agentName3];
+    if (!rawAgent)
+      return;
+    const resolved = resolveAgentConfig2(cfg.defaults, cfg.profiles, rawAgent);
+    const tg = resolved.channels?.telegram;
+    if (!tg)
+      return;
+    return resolveOutboundTopic(tg, event);
+  } catch {
+    return;
+  }
+}
 function stampUserRestartReason(reason) {
   try {
     writeCleanShutdownMarker(GATEWAY_CLEAN_SHUTDOWN_MARKER_PATH, {
@@ -55308,24 +55924,25 @@ bot.command("auth", async (ctx) => {
 Set <code>admin: true</code> on this agent in switchroom.yaml to unlock (the same flag that gates <code>/agents</code>, <code>/restart</code>, <code>/update</code> etc.).`, { html: true });
       return;
     }
+    const authAddKey = chatKey2(chatId, ctx.message?.message_thread_id ?? null);
     if (parsed.kind === "cancel") {
-      const existing = pendingAuthAddFlows.get(chatId);
+      const existing = pendingAuthAddFlows.get(authAddKey);
       if (!existing) {
         await switchroomReply(ctx, "<i>No pending <code>/auth add</code> flow in this chat.</i>", { html: true });
         return;
       }
       cancelAccountAuthSession(existing);
-      pendingAuthAddFlows.delete(chatId);
+      pendingAuthAddFlows.delete(authAddKey);
       await switchroomReply(ctx, "Cancelled.", { html: true });
       return;
     }
-    if (pendingAuthAddFlows.has(chatId)) {
+    if (pendingAuthAddFlows.has(authAddKey)) {
       await switchroomReply(ctx, "<i>An <code>/auth add</code> flow is already in progress for this chat. Finish the paste, or send <code>/auth cancel</code> to abort.</i>", { html: true });
       return;
     }
     try {
       const { loginUrl, scratchDir, child } = await startAccountAuthSession(parsed.label);
-      pendingAuthAddFlows.set(chatId, {
+      pendingAuthAddFlows.set(authAddKey, {
         label: parsed.label,
         scratchDir,
         child,
@@ -55569,6 +56186,8 @@ async function performVaultAccessApproval(ctx, pending2, stageId, senderId, atte
     operatorId: senderId
   });
   const delivered = ipcServer.sendToAgent(pending2.agent, synthetic);
+  if (delivered)
+    markClaudeBusyForInbound(synthetic);
   process.stderr.write(`telegram gateway: vault_grant_approved injection agent=${pending2.agent} key=${pending2.key} stage=${stageId} delivered=${delivered}
 `);
   if (!delivered) {
@@ -55615,6 +56234,8 @@ async function handleVaultRequestAccessCallback(ctx, data) {
       operatorId: senderId
     });
     const denyDelivered = ipcServer.sendToAgent(pending2.agent, denyInbound);
+    if (denyDelivered)
+      markClaudeBusyForInbound(denyInbound);
     process.stderr.write(`telegram gateway: vault_grant_denied injection agent=${pending2.agent} key=${pending2.key} stage=${stageId} delivered=${denyDelivered}
 `);
     if (!denyDelivered) {
@@ -55698,6 +56319,8 @@ async function handleVaultRequestSaveCallback(ctx, data) {
       operatorId: senderId
     });
     const dDelivered = ipcServer.sendToAgent(pending2.agent, discardInbound);
+    if (dDelivered)
+      markClaudeBusyForInbound(discardInbound);
     process.stderr.write(`telegram gateway: vault_save_discarded injection agent=${pending2.agent} key=${pending2.key} stage=${stageId} delivered=${dDelivered}
 `);
     if (!dDelivered)
@@ -55758,6 +56381,8 @@ async function handleVaultRequestSaveCallback(ctx, data) {
         reason: failReason
       });
       const fDelivered = ipcServer.sendToAgent(pending2.agent, failInbound);
+      if (fDelivered)
+        markClaudeBusyForInbound(failInbound);
       process.stderr.write(`telegram gateway: vault_save_failed injection agent=${pending2.agent} key=${pending2.key} stage=${stageId} delivered=${fDelivered}
 `);
       if (!fDelivered)
@@ -55775,6 +56400,8 @@ async function handleVaultRequestSaveCallback(ctx, data) {
       operatorId: senderId
     });
     const okDelivered = ipcServer.sendToAgent(pending2.agent, okInbound);
+    if (okDelivered)
+      markClaudeBusyForInbound(okInbound);
     process.stderr.write(`telegram gateway: vault_save_completed injection agent=${pending2.agent} key=${pending2.key} stage=${stageId} delivered=${okDelivered}
 `);
     if (!okDelivered)
@@ -56337,7 +56964,8 @@ async function handleOperatorEventCallback(ctx, data) {
         parseMode: "HTML",
         synthInbound: async () => {
           await runSwitchroomAuthCommand(ctx, ["auth", "reauth", agent], `auth reauth ${agent}`);
-          pendingReauthFlows.set(String(ctx.chat.id), { agent, startedAt: Date.now() });
+          const reauthThreadId = ctx.callbackQuery?.message?.message_thread_id;
+          pendingReauthFlows.set(chatKey2(String(ctx.chat.id), reauthThreadId ?? null), { agent, startedAt: Date.now() });
         }
       });
       return;
@@ -57216,6 +57844,8 @@ ${preBlock(formatSwitchroomOutput(err.message ?? "unknown error"))}`, { html: tr
 `);
     const selfAgentBtn = process.env.SWITCHROOM_AGENT_NAME ?? "";
     const btnDelivered = ipcServer.sendToAgent(selfAgentBtn, inboundMsg);
+    if (btnDelivered)
+      markClaudeBusyForInbound(inboundMsg);
     if (!btnDelivered) {
       pendingInboundBuffer.push(selfAgentBtn, inboundMsg);
       swallowingApiCall(() => bot.api.sendMessage(cbChatId, "\u23F3 Agent is restarting \u2014 your button tap is queued and will be processed when it comes back.", cbThreadId != null ? { message_thread_id: cbThreadId } : {}), {
@@ -57766,7 +58396,7 @@ function getReactionsConfig() {
     if (agentName3) {
       const rawAgent = cfg.agents?.[agentName3];
       if (rawAgent) {
-        const resolved = resolveAgentConfig(cfg.defaults, cfg.profiles, rawAgent);
+        const resolved = resolveAgentConfig2(cfg.defaults, cfg.profiles, rawAgent);
         raw = resolved.reactions;
       }
     }
@@ -57812,6 +58442,8 @@ function flushReactionBatch(batch) {
     meta
   };
   const delivered = ipcServer.sendToAgent(agentName3, inbound);
+  if (delivered)
+    markClaudeBusyForInbound(inbound);
   process.stderr.write(`telegram gateway: reactions.dispatch agent=${agentName3} chat=${batch.chatId} count=${batch.reactions.length} batched=${batch.batched} delivered=${delivered}
 `);
   if (!delivered) {