switchroom 0.12.20 → 0.12.21

package/dist/cli/switchroom.js

@@ -47247,8 +47247,8 @@ var {
 } = import__.default;
 
 // src/build-info.ts
-var VERSION = "0.12.20";
-var COMMIT_SHA = "5191cef3";
+var VERSION = "0.12.21";
+var COMMIT_SHA = "e32c064";
 
 // src/cli/agent.ts
 init_source();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "switchroom",
-  "version": "0.12.20",
+  "version": "0.12.21",
   "description": "Run Claude Code 24/7 on your Claude Pro/Max subscription over Telegram. Open-source alternative to OpenClaw and NanoClaw — no API keys.",
   "type": "module",
   "bin": {
@@ -26,12 +26,13 @@
     "test:vitest": "vitest run",
     "test:bun": "bun test src/watchdog/state.test.ts src/watchdog/policy.test.ts src/vault/grants.test.ts src/vault/write-grants.test.ts src/vault/broker/server-grants.test.ts src/vault/broker/server-write-grants.test.ts src/vault/broker/server-mint-grant-passphrase-attest.test.ts src/vault/broker/server-passphrase-attest.test.ts src/vault/broker/server-mint-grant-posture-attest.test.ts src/vault/broker/client-token.test.ts src/vault/broker/server-unlock.test.ts src/vault/broker/auto-unlock.test.ts src/vault/broker/drift-detection.test.ts tests/vault-broker-passphrase.test.ts src/cli/vault-get-broker.test.ts src/vault/resolver-via-broker.test.ts src/vault/broker/scope.test.ts src/vault/broker/server.test.ts src/drive/disconnect.test.ts src/drive/grants.test.ts src/drive/oauth.test.ts src/drive/onboarding.test.ts src/drive/reconciler.test.ts src/drive/vault-slots.test.ts src/drive/wrapper.test.ts src/vault/approvals/kernel.test.ts src/vault/approvals/schema-idempotent.test.ts src/vault/broker/server-approvals.test.ts telegram-plugin/tests/boot-probes.test.ts telegram-plugin/tests/boot-version-string.test.ts telegram-plugin/tests/history.test.ts telegram-plugin/tests/history-reaper.test.ts telegram-plugin/tests/ipc-server-client.test.ts telegram-plugin/tests/ipc-server-race.test.ts telegram-plugin/tests/gateway-bridge.test.ts telegram-plugin/tests/gateway-startup-mutex.test.ts telegram-plugin/tests/gateway-clean-shutdown-marker.test.ts telegram-plugin/tests/boot-card-dedupe.test.ts telegram-plugin/tests/boot-card-reason.test.ts telegram-plugin/tests/progress-update.test.ts telegram-plugin/tests/quota-cache.test.ts telegram-plugin/tests/silent-reply-guard.test.ts telegram-plugin/tests/unhandled-rejection-policy.test.ts telegram-plugin/tests/registry-turns.test.ts telegram-plugin/registry/subagents.test.ts telegram-plugin/tests/turns-writer.test.ts telegram-plugin/tests/resolve-calling-subagent.test.ts telegram-plugin/tests/gateway-update-placeholder-dispatch.test.ts telegram-plugin/tests/reaction-trigger.test.ts telegram-plugin/tests/reaction-trigger-flow.test.ts telegram-plugin/uat/load-env.test.ts",
     "test:watch": "vitest",
-    "lint": "tsc --noEmit && node scripts/check-plugin-references.mjs && bash scripts/check-bot-api-wrapping.sh && node scripts/check-bun-test-imports.mjs && node scripts/check-no-pii-secrets.mjs && node scripts/check-vault-test-hermeticity.mjs",
+    "lint": "tsc --noEmit && node scripts/check-plugin-references.mjs && bash scripts/check-bot-api-wrapping.sh && node scripts/check-bun-test-imports.mjs && node scripts/check-no-pii-secrets.mjs && node scripts/check-vault-test-hermeticity.mjs && node scripts/check-no-broadcast-delivery.mjs",
     "lint:tsc": "tsc --noEmit",
     "lint:plugin-references": "node scripts/check-plugin-references.mjs",
     "lint:bot-api-wrapping": "bash scripts/check-bot-api-wrapping.sh",
     "lint:bun-test-imports": "node scripts/check-bun-test-imports.mjs",
     "lint:no-pii": "node scripts/check-no-pii-secrets.mjs",
+    "lint:no-broadcast-delivery": "node scripts/check-no-broadcast-delivery.mjs",
     "prepublishOnly": "npm run build && npm run lint && npm test"
   },
   "dependencies": {

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

@@ -31461,7 +31461,8 @@ function createStreamController(cfg) {
 
 // pty-partial-handler.ts
 function streamKey(chatId, threadId) {
-  return `${chatId}:${threadId ?? "_"}`;
+  const t = threadId == null || threadId === 0 ? "_" : String(threadId);
+  return `${chatId}:${t}`;
 }
 function handlePtyPartialPure(text, state, deps) {
   if (state.currentSessionChatId == null) {
@@ -31547,7 +31548,8 @@ function buildAccentHeader(accent) {
   }
 }
 function streamKey2(chatId, threadId, lane, turnKey) {
-  const base = `${chatId}:${threadId ?? "_"}`;
+  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;
 }
@@ -43803,6 +43805,15 @@ function createPendingPermissionBuffer(opts = {}) {
   };
 }
 
+// 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}`;
+}
+
 // gateway/vault-grant-inbound-builders.ts
 function buildVaultGrantApprovedInbound(opts) {
   const ts = opts.nowMs ?? Date.now();
@@ -47115,11 +47126,11 @@ function sweepStaleTurnActiveMarker(stateDir, opts) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.12.20";
-var COMMIT_SHA = "5191cef3";
-var COMMIT_DATE = "2026-05-20T00:03:17Z";
-var LATEST_PR = 1565;
-var COMMITS_AHEAD_OF_TAG = 6;
+var VERSION = "0.12.21";
+var COMMIT_SHA = "e32c064";
+var COMMIT_DATE = "2026-05-20T02:05:49Z";
+var LATEST_PR = 1572;
+var COMMITS_AHEAD_OF_TAG = null;
 
 // gateway/boot-version.ts
 function formatRelativeAgo(iso) {
@@ -48062,10 +48073,10 @@ var CONTEXT_EXHAUSTION_COOLDOWN_MS = 600000;
 var lastContextExhaustionWarningAt = 0;
 var pendingPtyPartial = null;
 function statusKey(chatId, threadId) {
-  return `${chatId}:${threadId ?? "_"}`;
+  return chatKey(chatId, threadId);
 }
 function streamKey3(chatId, threadId) {
-  return `${chatId}:${threadId ?? "_"}`;
+  return chatKey(chatId, threadId);
 }
 function purgeReactionTracking(key) {
   const msgInfo = activeReactionMsgIds.get(key);
@@ -50526,7 +50537,7 @@ function resetOrphanedReplyTimeout() {
   }
 }
 function closeActivityLane(chatId, threadId) {
-  const key = `${chatId}:${threadId ?? "_"}:activity`;
+  const key = chatKeyWithSuffix(chatId, threadId, "activity");
   const stream = activeDraftStreams.get(key);
   if (stream == null)
     return;
@@ -50535,7 +50546,7 @@ function closeActivityLane(chatId, threadId) {
   stream.finalize().catch(() => {});
 }
 function closeProgressLane(chatId, threadId) {
-  const prefix = `${chatId}:${threadId ?? "_"}:progress`;
+  const prefix = chatKeyWithSuffix(chatId, threadId, "progress");
   for (const [key, stream] of activeDraftStreams) {
     if (key.startsWith(prefix)) {
       activeDraftStreams.delete(key);
@@ -50575,7 +50586,8 @@ function handleSessionEvent(ev) {
         currentTurn = next;
         preambleSuppressor.reset();
         if (turnsDb != null) {
-          const turnKey = `${ev.chatId}:${ev.threadId ?? "_"}:${startedAt}`;
+          const evThreadIdNum = ev.threadId != null ? Number(ev.threadId) : null;
+          const turnKey = chatKeyWithSuffix(ev.chatId, evThreadIdNum, String(startedAt));
           next.registryKey = turnKey;
           const userPromptPreview = extractUserPromptPreview(ev.rawContent);
           try {
@@ -50808,7 +50820,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 = `${chatId}:${threadId ?? "_"}:progress`;
+        const suppressPrefix = chatKeyWithSuffix(chatId, threadId, "progress");
         for (const [key] of activeDraftStreams) {
           if (key.startsWith(suppressPrefix)) {
             activeDraftStreams.delete(key);

package/telegram-plugin/gateway/chat-key.ts

@@ -0,0 +1,67 @@
+/**
+ * Canonical chat-key construction with branded type.
+ *
+ * The gateway tracks per-chat state (active turn, draft stream, status
+ * reactions, progress throttle, etc.) in `Map<string, ...>` instances
+ * keyed by a string derived from `(chatId, threadId | null)`. Multiple
+ * callsites historically constructed those keys inline as
+ * `` `${chatId}:${threadId ?? '_'}` ``. That worked until PR #1564 hit
+ * the silence-poke wedge: an `activeTurnStartedAt` entry survived a
+ * turn-end because the entry was set under one rendering of the key
+ * (`null` thread → `_`) and the cleanup ran against another
+ * (`undefined` thread → `_`, but also `0` thread → `0`, which doesn't
+ * coalesce). The fallback's `purgeReactionTracking` cleared one
+ * statusKey at a time; sibling keys for the same chat persisted, so
+ * `activeTurnStartedAt.size > 0` stayed true forever and every
+ * subsequent inbound was held mid-turn.
+ *
+ * This module makes the bug class hard to reintroduce:
+ *
+ *   1. `chatKey()` is the canonical constructor for "this chat+thread"
+ *      keys. It collapses `null`, `undefined`, and `0` thread IDs
+ *      into the same token (`_`). All sites in `gateway.ts`,
+ *      `stream-reply-handler.ts`, and `pty-partial-handler.ts` route
+ *      through it (or mirror its expression inline).
+ *   2. The returned `ChatKey` is a branded string — a documentation
+ *      marker for human readers. `telegram-plugin/` is bun-bundled
+ *      and NOT in `tsconfig.json`'s `include`; `lint:plugin-references`
+ *      filters tsc output to reference-class errors only (TS2304/2552/
+ *      2722/2561). A future opt-in `Map<ChatKey, T>` migration could
+ *      provide enforcement teeth, but that requires either bringing
+ *      `telegram-plugin/` into the strict tsc check or rewriting the
+ *      lint to fail on TS2345 type-mismatch. Today the brand is a
+ *      nudge, not a fence.
+ *
+ * `chatKeyWithSuffix()` extends a ChatKey with a lane suffix
+ * (`activity`, `progress`, etc.) — same documentation brand.
+ *
+ * Non-ChatKey keyspaces (chat:message, chat:user, chat:sender:reason)
+ * are deliberately NOT branded — they have different shape and
+ * different invariants, see `deferredKey` / `inboundCoalesceKey` /
+ * the gate-dedup helper in `gateway.ts`.
+ */
+
+export type ChatKey = string & { readonly __brand: 'ChatKey' }
+
+export function chatKey(chatId: string, threadId?: number | null): ChatKey {
+  const t = threadId == null || threadId === 0 ? '_' : String(threadId)
+  return `${chatId}:${t}` as ChatKey
+}
+
+export function chatKeyWithSuffix(
+  chatId: string,
+  threadId: number | null | undefined,
+  suffix: string,
+): ChatKey {
+  return `${chatKey(chatId, threadId)}:${suffix}` as ChatKey
+}
+
+/**
+ * Extract the chatId portion of a ChatKey. Used by sibling-key sweeps
+ * (PR #1564's `purgeStaleTurnsForChat`) that need to enumerate every
+ * thread under a single chat.
+ */
+export function chatIdOfChatKey(key: ChatKey): string {
+  const idx = key.indexOf(':')
+  return idx === -1 ? key : key.slice(0, idx)
+}

package/telegram-plugin/gateway/gateway.ts

@@ -253,6 +253,7 @@ import { createInboundSpool } from './inbound-spool.js'
 import { purgeStaleTurnsForChat } from './turn-state-purge.js'
 import { decideInboundDelivery } from './inbound-delivery-gate.js'
 import { createPendingPermissionBuffer } from './pending-permission-decisions.js'
+import { chatKey, chatKeyWithSuffix } from './chat-key.js'
 import {
   buildVaultGrantApprovedInbound,
   buildVaultGrantDeniedInbound,
@@ -1026,6 +1027,7 @@ function checkApprovals(): void {
   try { files = readdirSync(APPROVED_DIR) } catch { return }
   for (const senderId of files) {
     const file = join(APPROVED_DIR, senderId)
+    // allow-raw-bot-api: Paired! sendMessage to DM senderId; no thread_id, cannot trigger THREAD_NOT_FOUND
     void bot.api.sendMessage(senderId, "Paired! Say hi to Claude.").then(
       () => rmSync(file, { force: true }),
       err => {
@@ -1248,12 +1250,18 @@ let lastContextExhaustionWarningAt = 0
 
 let pendingPtyPartial: string | null = null
 
-function statusKey(chatId: string, threadId?: number): string {
-  return `${chatId}:${threadId ?? '_'}`
+// statusKey + streamKey are thin re-exports of the canonical chatKey()
+// constructor (see telegram-plugin/gateway/chat-key.ts). chatKey()
+// collapses 0/null/undefined thread IDs to the same token (`_`),
+// closing the sibling-key class behind #1564 (where one site set the
+// entry under `null → _` and another cleared under `0 → 0`, leaving
+// activeTurnStartedAt non-empty forever).
+function statusKey(chatId: string, threadId?: number | null): string {
+  return chatKey(chatId, threadId)
 }
 
-function streamKey(chatId: string, threadId?: number): string {
-  return `${chatId}:${threadId ?? '_'}`
+function streamKey(chatId: string, threadId?: number | null): string {
+  return chatKey(chatId, threadId)
 }
 
 function purgeReactionTracking(key: string): void {
@@ -2675,6 +2683,7 @@ function emitGatewayOperatorEvent(event: OperatorEvent): void {
       parse_mode: 'HTML' as const,
       ...(renderedKeyboard ? { reply_markup: renderedKeyboard } : {}),
     }
+    // allow-raw-bot-api: operator-event broadcast loop; opts has no message_thread_id
     void bot.api.sendMessage(chat_id, renderedText, opts as never).catch(e => {
       process.stderr.write(
         `telegram gateway: operator-event send to ${chat_id} failed agent=${agent} kind=${kind}: ${e}\n`,
@@ -3453,6 +3462,7 @@ const ipcServer: IpcServer = createIpcServer({
         .text(`🔁 Always allow ${alwaysRule.label}`, `perm:always:${requestId}`)
     }
     for (const chat_id of access.allowFrom) {
+      // allow-raw-bot-api: permission-request keyboard fan-out; reply_markup-only opts, no thread_id
       void bot.api.sendMessage(chat_id, text, { reply_markup: keyboard }).catch(e => {
         process.stderr.write(`telegram gateway: permission_request send to ${chat_id} failed: ${e}\n`)
       })
@@ -4069,6 +4079,7 @@ async function executeReply(args: Record<string, unknown>): Promise<{ content: A
           stripped.length > 0
             ? stripped
             : '⚠️ (a formatted fragment could not be rendered for Telegram)'
+        // allow-raw-bot-api: plaintext last-resort fallback; wrapping would re-enter the parse-mode policy that just rejected the payload
         const sent = await lockedBot.api.sendMessage(chat_id, plain, plainOpts as never)
         sentIds.push(sent.message_id)
         logOutbound('reply', chat_id, sent.message_id, plain.length, `chunk=${i + 1}/${chunks.length} plaintext-fallback`)
@@ -4090,6 +4101,7 @@ async function executeReply(args: Record<string, unknown>): Promise<{ content: A
           const retryOpts = { ...sendOpts }
           delete (retryOpts as any).message_thread_id
           try {
+            // allow-raw-bot-api: chunk-loop THREAD_NOT_FOUND fallback; thread already dropped, wrapping would re-enter the throw
             const sent = await lockedBot.api.sendMessage(chat_id, chunks[i], retryOpts as never)
             sentIds.push(sent.message_id)
           } catch (retryErr) {
@@ -5392,7 +5404,7 @@ function resetOrphanedReplyTimeout(): void {
 }
 
 function closeActivityLane(chatId: string, threadId: number | undefined): void {
-  const key = `${chatId}:${threadId ?? '_'}:activity`
+  const key = chatKeyWithSuffix(chatId, threadId, 'activity')
   const stream = activeDraftStreams.get(key)
   if (stream == null) return
   activeDraftStreams.delete(key)
@@ -5404,7 +5416,7 @@ function closeProgressLane(chatId: string, threadId: number | undefined): void {
   // Progress-card streams include a turnKey suffix in their key
   // (e.g. "chatId:_:progress:chatId:1"). Iterate and match by prefix
   // so the backstop actually finds the stream.
-  const prefix = `${chatId}:${threadId ?? '_'}:progress`
+  const prefix = chatKeyWithSuffix(chatId, threadId, 'progress')
   for (const [key, stream] of activeDraftStreams) {
     if (key.startsWith(prefix)) {
       activeDraftStreams.delete(key)
@@ -5460,7 +5472,11 @@ function handleSessionEvent(ev: SessionEvent): void {
         // progress-card-driver's per-chat sequence number (these are two
         // independent identifier schemes and don't need to align).
         if (turnsDb != null) {
-          const turnKey = `${ev.chatId}:${ev.threadId ?? '_'}:${startedAt}`
+          // ev.threadId is `string | null` (Telegram emits as string); convert
+          // to number for chatKeyWithSuffix. Number(null) = 0 which canonicalizes
+          // to '_' — same as the explicit `null` branch below.
+          const evThreadIdNum = ev.threadId != null ? Number(ev.threadId) : null
+          const turnKey = chatKeyWithSuffix(ev.chatId, evThreadIdNum, String(startedAt))
           next.registryKey = turnKey
           // Phase 1 of #332: capture first ~200 chars of the user's message.
           const userPromptPreview = extractUserPromptPreview(ev.rawContent)
@@ -5857,7 +5873,7 @@ function handleSessionEvent(ev: SessionEvent): void {
         // Drop progress-card streams without finalising — the normal
         // closeProgressLane call below would call stream.finalize() which
         // sends a final "Done" edit to Telegram. Skip that for silent turns.
-        const suppressPrefix = `${chatId}:${threadId ?? '_'}:progress`
+        const suppressPrefix = chatKeyWithSuffix(chatId, threadId, 'progress')
         for (const [key] of activeDraftStreams) {
           if (key.startsWith(suppressPrefix)) {
             activeDraftStreams.delete(key)
@@ -10978,6 +10994,7 @@ async function grantWizardStep2(ctx: Context, chatId: string, agent: string, wiz
   const kb = buildGrantKeysKeyboard(keys, selected)
   const text = `<b>Grant capability token — Step 2/3</b>\n\nWhich keys for <code>${escapeHtmlForTg(agent)}</code>?\n<i>Tap to toggle; tap Continue when done.</i>`
   if (wizardMsgId != null) {
+    // allow-raw-bot-api: vault grant wizard step 2/3; already .catch-swallows, tap-driven UI re-renders on retry
     await ctx.api.editMessageText(chatId, wizardMsgId, text, { parse_mode: 'HTML', reply_markup: kb }).catch(() => {})
   } else {
     const sent = await switchroomReply(ctx, text, { html: true, reply_markup: kb })
@@ -11001,6 +11018,7 @@ async function grantWizardStep3(ctx: Context, chatId: string, state: Extract<Pen
   const text = `<b>Grant capability token — Step 3/3</b>\n\nKeys for <code>${escapeHtmlForTg(state.agent!)}</code>:\n${keyList}\n\nHow long should this grant be valid?`
   const msgId = state.wizardMsgId
   if (msgId != null) {
+    // allow-raw-bot-api: vault grant wizard step 3/3 (TTL select); already .catch-swallows, tap-driven UI re-renders on retry
     await ctx.api.editMessageText(chatId, msgId, text, { parse_mode: 'HTML', reply_markup: kb }).catch(() => {})
   } else {
     const sent = await switchroomReply(ctx, text, { html: true, reply_markup: kb })
@@ -11025,6 +11043,7 @@ async function grantWizardConfirm(ctx: Context, chatId: string, state: Extract<P
   ].join('\n')
   const msgId = state.wizardMsgId
   if (msgId != null) {
+    // allow-raw-bot-api: vault grant wizard confirm step; already .catch-swallows, tap-driven UI re-renders on retry
     await ctx.api.editMessageText(chatId, msgId, text, { parse_mode: 'HTML', reply_markup: kb }).catch(() => {})
   } else {
     const sent = await switchroomReply(ctx, text, { html: true, reply_markup: kb })
@@ -13462,6 +13481,7 @@ function handleChecklistUpdate(
           ts: new Date(ts * 1000).toISOString(),
         },
       }
+      // allow-broadcast: informational checklist task notification, not turn-driving
       ipcServer.broadcast(inboundMsg)
       process.stderr.write(
         `telegram gateway: checklist ${kind}: chat_id=${chat_id} message_id=${message_id} task_id=${taskId} state=${state} user=${userName}\n`,
@@ -13913,7 +13933,7 @@ async function shutdown(signal: string): Promise<void> {
   // gateway no longer pre-allocates drafts on inbound, so there is
   // nothing to clear at SIGTERM time.
 
-  // Notify bridges so they can mark themselves disconnected.
+  // allow-broadcast: informational shutdown notify — bridges mark themselves disconnected
   ipcServer.broadcast({ type: 'status', status: 'gateway_shutting_down' })
 
   // Hard force-exit safety net at budget + 5s. systemd's TimeoutStopSec

package/telegram-plugin/pty-partial-handler.ts

@@ -94,7 +94,10 @@ export interface PtyHandlerDeps {
 }
 
 function streamKey(chatId: string, threadId?: number): string {
-  return `${chatId}:${threadId ?? '_'}`
+  // Canonical chat-key derivation lives in gateway/chat-key.ts — keep this
+  // expression in lockstep (treats 0/null/undefined the same). See #1564.
+  const t = threadId == null || threadId === 0 ? '_' : String(threadId)
+  return `${chatId}:${t}`
 }
 
 /**

package/telegram-plugin/stream-reply-handler.ts

@@ -313,7 +313,12 @@ function streamKey(
   lane?: string,
   turnKey?: string,
 ): string {
-  const base = `${chatId}:${threadId ?? '_'}`
+  // Canonical chat-key derivation lives in gateway/chat-key.ts — keep this
+  // expression in lockstep with that helper (treats 0/null/undefined the
+  // same), but inline here so this file doesn't introduce a cross-package
+  // import for one expression. See #1564 for the sibling-key bug class.
+  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
 }

package/telegram-plugin/tests/e2e.test.ts

@@ -50,7 +50,11 @@ function statusKey(chatId: string, threadId?: number): string {
 }
 
 function streamKey(chatId: string, threadId?: number): string {
-  return `${chatId}:${threadId ?? 'default'}`
+  // Mirrors production's canonical chat-key derivation (gateway/chat-key.ts):
+  // 0/null/undefined thread IDs all collapse to '_'. Diverging sentinels
+  // here would let the harness pass with a key shape production rejects.
+  const t = threadId == null || threadId === 0 ? '_' : String(threadId)
+  return `${chatId}:${t}`
 }
 
 interface PluginState {

package/telegram-plugin/tests/races.test.ts

@@ -29,7 +29,11 @@ function statusKey(chatId: string, threadId?: number): string {
   return `${chatId}:${threadId ?? '_'}`
 }
 function streamKey(chatId: string, threadId?: number): string {
-  return `${chatId}:${threadId ?? 'default'}`
+  // Mirrors production's canonical chat-key derivation (gateway/chat-key.ts):
+  // 0/null/undefined thread IDs all collapse to '_'. Diverging sentinels
+  // here would let the harness pass with a key shape production rejects.
+  const t = threadId == null || threadId === 0 ? '_' : String(threadId)
+  return `${chatId}:${t}`
 }
 
 interface PluginState {