switchroom 0.15.45 → 0.16.5

package/telegram-plugin/tests/answer-stream-flag.test.ts

@@ -3,10 +3,14 @@
  * opt-in only on a truthy value. Guards against an accidental flip back to
  * default-on (which would reintroduce the unformatted-preliminary flash +
  * delete-on-every-reply — see the gateway gate comment).
+ *
+ * The draft transport (sendMessageDraft) is permanently retired — the lane is
+ * now either VISIBLE (opt-in) or DORMANT (the unconditional default). The
+ * resolveAnswerLaneConfig 2-state enumeration is the regression guard.
  */
 
 import { describe, it, expect } from 'vitest'
-import { parseVisibleAnswerStreamEnabled, parseDraftLaneRetiredEnabled, resolveAnswerLaneConfig } from '../answer-stream-flag.js'
+import { parseVisibleAnswerStreamEnabled, resolveAnswerLaneConfig } from '../answer-stream-flag.js'
 
 describe('parseVisibleAnswerStreamEnabled — default OFF, opt-in', () => {
   it('defaults OFF when unset', () => {
@@ -26,47 +30,24 @@ describe('parseVisibleAnswerStreamEnabled — default OFF, opt-in', () => {
   })
 })
 
-describe('parseDraftLaneRetiredEnabled — default RETIRED (2026-06-05), kill-switch off', () => {
-  it('defaults to RETIRED (true) when unset — the draft lane is gone by default', () => {
-    expect(parseDraftLaneRetiredEnabled(undefined)).toBe(true)
-  })
-
-  it('stays RETIRED for any non-disable value (including unrecognized)', () => {
-    for (const v of ['1', 'true', 'on', 'yes', '', '   ', 'whatever', 'retired']) {
-      expect(parseDraftLaneRetiredEnabled(v)).toBe(true)
-    }
-  })
-
-  it('restores the legacy draft (false) ONLY on an explicit disable (case/space-insensitive)', () => {
-    for (const v of ['0', 'false', 'off', 'no', ' FALSE ', 'Off', 'NO']) {
-      expect(parseDraftLaneRetiredEnabled(v)).toBe(false)
-    }
-  })
-})
-
 // ── resolveAnswerLaneConfig — TOTAL-ENUMERATION REGRESSION PROOF ─────────────
 //
-// This is the behavioural guard for the flash regression (the gateway IIFE is
-// not importable, so the decision lives in this pure function and the gateway
-// delegates to it). The input space is finite — visibleEnabled × draftFnAvailable
-// = 4 — so we enumerate ALL of it and assert the full decision table plus the
-// load-bearing INVARIANT: opensVisiblePreview === visibleEnabled, ALWAYS. That
-// invariant is exactly what v0.14.68 broke (it made the preview depend on the
-// draft flag), so a future change that re-conflates them fails here, not in prod.
+// The draft transport is permanently retired. The input space is now a single
+// boolean (visibleEnabled), yielding exactly 2 states: visible or dormant.
+// We enumerate ALL of it and assert the full decision table plus the load-bearing
+// INVARIANT: opensVisiblePreview === visibleEnabled, ALWAYS.
 describe('resolveAnswerLaneConfig — total enumeration (flash-regression proof)', () => {
   const MAX = Number.MAX_SAFE_INTEGER
   const ALL = [
-    { visibleEnabled: false, draftFnAvailable: false }, // the DEFAULT (visible off, draft retired)
-    { visibleEnabled: false, draftFnAvailable: true }, // draft kill switch on
-    { visibleEnabled: true, draftFnAvailable: false }, // opt-in visible
-    { visibleEnabled: true, draftFnAvailable: true }, // visible wins over draft
+    { visibleEnabled: false }, // the DEFAULT (visible off, draft permanently retired → dormant)
+    { visibleEnabled: true },  // opt-in visible
   ]
 
-  it('the input space is exactly 4 rows (2×2)', () => {
-    expect(ALL.length).toBe(4)
+  it('the input space is exactly 2 rows', () => {
+    expect(ALL.length).toBe(2)
   })
 
-  it('INVARIANT (the regression guard): opensVisiblePreview === visibleEnabled for EVERY draftFnAvailable', () => {
+  it('INVARIANT (the regression guard): opensVisiblePreview === visibleEnabled for EVERY input', () => {
     for (const input of ALL) {
       expect(resolveAnswerLaneConfig(input).opensVisiblePreview).toBe(input.visibleEnabled)
     }
@@ -79,39 +60,25 @@ describe('resolveAnswerLaneConfig — total enumeration (flash-regression proof)
     }
   })
 
-  it('DEFAULT (visible off, draft retired) → DORMANT: no preview, no draft, MAX gate (no flash)', () => {
-    expect(resolveAnswerLaneConfig({ visibleEnabled: false, draftFnAvailable: false })).toEqual({
+  it('DEFAULT (visible off) → DORMANT: no preview, MAX gate (no flash)', () => {
+    expect(resolveAnswerLaneConfig({ visibleEnabled: false })).toEqual({
       minInitialChars: MAX,
-      usesDraftTransport: false,
       opensVisiblePreview: false,
       state: 'dormant',
     })
   })
 
-  it('visible off + draft transport available → DRAFT: no visible preview, draft renders', () => {
-    expect(resolveAnswerLaneConfig({ visibleEnabled: false, draftFnAvailable: true })).toEqual({
-      minInitialChars: MAX,
-      usesDraftTransport: true,
-      opensVisiblePreview: false,
-      state: 'draft',
+  it('visible on → VISIBLE: preview opens on the first chunk (minChars 1)', () => {
+    expect(resolveAnswerLaneConfig({ visibleEnabled: true })).toEqual({
+      minInitialChars: 1,
+      opensVisiblePreview: true,
+      state: 'visible',
     })
   })
 
-  it('visible on → VISIBLE: preview opens on the first chunk (minChars 1), no draft', () => {
-    for (const draftFnAvailable of [false, true]) {
-      expect(resolveAnswerLaneConfig({ visibleEnabled: true, draftFnAvailable })).toEqual({
-        minInitialChars: 1,
-        usesDraftTransport: false,
-        opensVisiblePreview: true,
-        state: 'visible',
-      })
-    }
-  })
-
-  it('a visible preview NEVER opens unless explicitly enabled (no draftFnAvailable forces it on)', () => {
-    // The exact v0.14.68 failure shape: retiring the draft (draftFnAvailable=false)
-    // must NOT open a visible preview.
-    expect(resolveAnswerLaneConfig({ visibleEnabled: false, draftFnAvailable: false }).opensVisiblePreview).toBe(false)
-    expect(resolveAnswerLaneConfig({ visibleEnabled: false, draftFnAvailable: false }).minInitialChars).toBe(MAX)
+  it('a visible preview NEVER opens unless explicitly enabled', () => {
+    // The exact v0.14.68 failure shape: retiring the draft must NOT open a preview.
+    expect(resolveAnswerLaneConfig({ visibleEnabled: false }).opensVisiblePreview).toBe(false)
+    expect(resolveAnswerLaneConfig({ visibleEnabled: false }).minInitialChars).toBe(MAX)
   })
 })

package/telegram-plugin/tests/answer-stream-silent-markers.test.ts

@@ -1,10 +1,22 @@
-import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest'
+import { describe, expect, it, vi, beforeEach } from 'vitest'
 
 import {
   createAnswerStream,
-  __resetDraftIdForTests,
 } from '../answer-stream.js'
 
+// Throttle window anchored one hour ahead of "now". With lastSentAt=0 and a
+// real Date.now(), update() computes sinceLast = Date.now() - 0, which is
+// always < this anchor, so update() schedules a (cancelled-before-it-fires)
+// timer and buffers pendingText instead of sending immediately. materialize()
+// then cancels the scheduled timer and applies the silent-marker guard to the
+// buffered text. This replaces the old draft-transport path (which bypassed the
+// length gate). Anchoring to now+1h (rather than MAX_SAFE_INTEGER) keeps the
+// scheduled timer's delay within 32-bit range, so it stays runner-agnostic:
+// no vi.setSystemTime (which bun's vitest shim lacks) and no Node
+// TimeoutOverflowWarning under runners whose fake-timer shim is a no-op.
+const HOUR_MS = 60 * 60 * 1000
+let throttleAnchorMs = 0
+
 // ─── Helpers ──────────────────────────────────────────────────────────────────
 
 type SendMessageFn = (
@@ -29,13 +41,6 @@ type EditMessageTextFn = (
   },
 ) => Promise<unknown>
 
-type SendMessageDraftFn = (
-  chatId: string,
-  draftId: number,
-  text: string,
-  params?: { message_thread_id?: number },
-) => Promise<unknown>
-
 let nextMessageId = 9000
 
 function makeSendMessage(): ReturnType<typeof vi.fn> & SendMessageFn {
@@ -49,18 +54,9 @@ function makeEditMessageText(): ReturnType<typeof vi.fn> & EditMessageTextFn {
   return vi.fn(async () => {}) as unknown as ReturnType<typeof vi.fn> & EditMessageTextFn
 }
 
-function makeSendMessageDraft(): ReturnType<typeof vi.fn> & SendMessageDraftFn {
-  return vi.fn(async () => {}) as unknown as ReturnType<typeof vi.fn> & SendMessageDraftFn
-}
-
 beforeEach(() => {
-  __resetDraftIdForTests()
   nextMessageId = 9000
-  vi.useFakeTimers()
-})
-
-afterEach(() => {
-  vi.useRealTimers()
+  throttleAnchorMs = Date.now() + HOUR_MS
 })
 
 // ─── Tests ────────────────────────────────────────────────────────────────────
@@ -70,9 +66,16 @@ afterEach(() => {
  * NO_REPLY / HEARTBEAT_OK silent markers and suppress outbound Telegram
  * messages when the whole turn body is one of those tokens.
  *
- * Root cause: in private chats (DMs), usesDraftTransport=true bypasses the
- * minInitialChars length gate in update(), so even short markers like "NO_REPLY"
- * (8 chars) reach pendingText and then materialize() sends them as real messages.
+ * Previously in DMs the draft transport bypassed the minInitialChars length
+ * gate in update(), so short markers like "NO_REPLY" (8 chars) reached
+ * pendingText; then materialize() would send them as real messages.
+ *
+ * The draft transport is permanently retired. These tests now use:
+ *   - minInitialChars: 0 — bypasses the length gate so update() sets pendingText
+ *   - throttleMs: throttleAnchorMs (now + 1h) — with lastSentAt=0 and a real
+ *     Date.now(), sinceLast is always < the throttle window, so update() schedules
+ *     a timer rather than firing sendMessage immediately. materialize() cancels that
+ *     timer and applies the silent-marker guard to pendingText before any send.
  *
  * Mirrors the sentinel suppression already present in:
  *   - server.ts (reply/stream_reply MCP tool handlers)
@@ -81,26 +84,23 @@ afterEach(() => {
  */
 describe('answer-stream — silent-marker suppression at materialize()', () => {
   it('NO_REPLY as the sole chunk — no outbound message, suppression log line emitted', async () => {
-    // Use isPrivateChat: true + sendMessageDraft to replicate the exact repro
-    // conditions from #299: DM chat bypasses the minInitialChars length gate
-    // in update(), so "NO_REPLY" (8 chars) reaches pendingText and materialize()
-    // would previously send it as a real Telegram message.
     const sendMessage = makeSendMessage()
     const editMessageText = makeEditMessageText()
-    const sendMessageDraft = makeSendMessageDraft()
     const logs: string[] = []
     const stream = createAnswerStream({
       chatId: 'chat42',
-      isPrivateChat: true,
-      throttleMs: 250,
+      // minInitialChars: 0 bypasses the length gate so short markers like
+      // "NO_REPLY" (8 chars) set pendingText. Combined with vi.setSystemTime(0),
+      // the throttle keeps update() from firing sendMessage immediately, so
+      // materialize() can apply the silent-marker guard.
+      minInitialChars: 0,
+      throttleMs: throttleAnchorMs,
       sendMessage,
       editMessageText,
-      sendMessageDraft,
       log: (msg) => logs.push(msg),
     })
 
     // Simulate: model emits exactly NO_REPLY, no reply/stream_reply call.
-    // In a DM, update() bypasses the length gate and sets pendingText.
     stream.update('NO_REPLY')
     // materialize() is what gateway.ts calls at turn_end when no tool reply
     // was made — this is the path that was broken in #299 (msg id=8268).
@@ -115,14 +115,12 @@ describe('answer-stream — silent-marker suppression at materialize()', () => {
   it('HEARTBEAT_OK as the sole chunk — no outbound message', async () => {
     const sendMessage = makeSendMessage()
     const editMessageText = makeEditMessageText()
-    const sendMessageDraft = makeSendMessageDraft()
     const stream = createAnswerStream({
       chatId: 'chat43',
-      isPrivateChat: true,
-      throttleMs: 250,
+      minInitialChars: 0,
+      throttleMs: throttleAnchorMs,
       sendMessage,
       editMessageText,
-      sendMessageDraft,
     })
 
     stream.update('HEARTBEAT_OK')
@@ -135,15 +133,13 @@ describe('answer-stream — silent-marker suppression at materialize()', () => {
   it('NO_REPLY. (trailing period) — suppressed by trailing-punctuation tolerance', async () => {
     const sendMessage = makeSendMessage()
     const editMessageText = makeEditMessageText()
-    const sendMessageDraft = makeSendMessageDraft()
     const logs: string[] = []
     const stream = createAnswerStream({
       chatId: 'chat44',
-      isPrivateChat: true,
-      throttleMs: 250,
+      minInitialChars: 0,
+      throttleMs: throttleAnchorMs,
       sendMessage,
       editMessageText,
-      sendMessageDraft,
       log: (msg) => logs.push(msg),
     })
 
@@ -158,22 +154,19 @@ describe('answer-stream — silent-marker suppression at materialize()', () => {
   it('substring match ("the agent suggested NO_REPLY earlier") — NOT suppressed, materialises normally', async () => {
     const sendMessage = makeSendMessage()
     const editMessageText = makeEditMessageText()
-    const sendMessageDraft = makeSendMessageDraft()
     const stream = createAnswerStream({
       chatId: 'chat45',
-      isPrivateChat: true,
-      throttleMs: 250,
+      minInitialChars: 0,
+      throttleMs: throttleAnchorMs,
       sendMessage,
       editMessageText,
-      sendMessageDraft,
     })
 
     const prose = 'the agent suggested NO_REPLY earlier'
     stream.update(prose)
-    // materialize() should send a fresh message — only 1 call, from materialize
-    // itself (update() in draft mode sends a draft, not a sendMessage call).
     const msgId = await stream.materialize()
 
+    // materialize() sends a fresh message — prose is not a silent marker
     expect(sendMessage).toHaveBeenCalledTimes(1)
     expect(sendMessage).toHaveBeenCalledWith(
       'chat45',
@@ -190,15 +183,13 @@ describe('answer-stream — silent-marker suppression at materialize()', () => {
     // not on any intermediate chunk.
     const sendMessage = makeSendMessage()
     const editMessageText = makeEditMessageText()
-    const sendMessageDraft = makeSendMessageDraft()
     const logs: string[] = []
     const stream = createAnswerStream({
       chatId: 'chat47',
-      isPrivateChat: true,
-      throttleMs: 250,
+      minInitialChars: 0,
+      throttleMs: throttleAnchorMs,
       sendMessage,
       editMessageText,
-      sendMessageDraft,
       log: (msg) => logs.push(msg),
     })
 
@@ -218,8 +209,7 @@ describe('answer-stream — silent-marker suppression at materialize()', () => {
     const logs: string[] = []
     const stream = createAnswerStream({
       chatId: 'chat46',
-      isPrivateChat: false,
-      throttleMs: 250,
+      throttleMs: throttleAnchorMs,
       sendMessage,
       editMessageText,
       log: (msg) => logs.push(msg),