switchroom 0.16.22 → 0.16.24

package/telegram-plugin/tests/gateway-disconnect-flush.test.ts

@@ -62,10 +62,9 @@ function makeDeps(agentName: string | null) {
     ['chat1:thr1:r1', { isFinal: () => false, finalize: finalizeA }],
     ['chat2:thr2:r2', { isFinal: () => true, finalize: finalizeB }],
   ])
-  const activeDraftParseModes = new Map<string, 'HTML' | 'MarkdownV2' | undefined>([
-    ['chat1:thr1:r1', 'HTML'],
-    ['chat2:thr2:r2', undefined],
-  ])
+  // #2669: the activeDraftParseModes map was retired with parse-mode rotation
+  // (single rich-markdown path now), so the disconnect-flush deps no longer
+  // carry or clear it.
 
   return {
     spies: { setDoneA, setDoneB, finalizeA, finalizeB, clearActiveReactions, disposeProgressDriver, log },
@@ -76,7 +75,6 @@ function makeDeps(agentName: string | null) {
       activeTurnStartedAt,
       claudeBusyKeys,
       activeDraftStreams,
-      activeDraftParseModes,
       clearActiveReactions,
       disposeProgressDriver,
       log,
@@ -103,7 +101,6 @@ describe('flushOnAgentDisconnect — anonymous clients (the regression scenario)
     expect(deps.activeReactionMsgIds.size).toBe(2)
     expect(deps.activeTurnStartedAt.size).toBe(2)
     expect(deps.activeDraftStreams.size).toBe(2)
-    expect(deps.activeDraftParseModes.size).toBe(2)
 
     // But it should log so the operator can correlate the no-op decision.
     expect(spies.log).toHaveBeenCalledTimes(1)
@@ -150,7 +147,6 @@ describe('flushOnAgentDisconnect — registered agent disconnects (existing beha
     expect(spies.finalizeB).not.toHaveBeenCalled()
     // Both stream maps cleared regardless.
     expect(deps.activeDraftStreams.size).toBe(0)
-    expect(deps.activeDraftParseModes.size).toBe(0)
   })
 })
 
@@ -180,7 +176,6 @@ describe('flushOnAgentDisconnect — dangling-turn sweep (2026-05-23 wedge fix)'
       activeTurnStartedAt: new Map<string, number>([['ghost:thr:msg', 100]]),
       claudeBusyKeys: new Set<string>(['ghost:thr:msg']),
       activeDraftStreams: new Map<string, FakeStream>(),
-      activeDraftParseModes: new Map<string, 'HTML' | 'MarkdownV2' | undefined>(),
       clearActiveReactions,
       disposeProgressDriver,
       onDanglingTurnsSwept,
@@ -238,7 +233,6 @@ describe('flushOnAgentDisconnect — dangling-turn sweep (2026-05-23 wedge fix)'
       activeTurnStartedAt: new Map<string, number>([['real-turn:thr:msg', 100]]),
       claudeBusyKeys: new Set<string>(['real-turn:thr:msg']),
       activeDraftStreams: new Map<string, FakeStream>(),
-      activeDraftParseModes: new Map<string, 'HTML' | 'MarkdownV2' | undefined>(),
       clearActiveReactions: vi.fn(),
       disposeProgressDriver: vi.fn(),
       onDanglingTurnsSwept,
@@ -273,7 +267,6 @@ describe('flushOnAgentDisconnect — dangling-turn sweep (2026-05-23 wedge fix)'
       // handleInbound's fresh-turn branch.
       claudeBusyKeys: new Set<string>(['cron-only-key:_']),
       activeDraftStreams: new Map<string, FakeStream>(),
-      activeDraftParseModes: new Map<string, 'HTML' | 'MarkdownV2' | undefined>(),
       clearActiveReactions: vi.fn(),
       disposeProgressDriver: vi.fn(),
       onDanglingTurnsSwept,
@@ -306,7 +299,6 @@ describe('flushOnAgentDisconnect — dangling-turn sweep (2026-05-23 wedge fix)'
       activeReactionMsgIds: new Map<string, { chatId: string; messageId: number }>(),
       activeTurnStartedAt: new Map<string, number>(),
       activeDraftStreams: new Map<string, FakeStream>(),
-      activeDraftParseModes: new Map<string, 'HTML' | 'MarkdownV2' | undefined>(),
       clearActiveReactions: vi.fn(),
       disposeProgressDriver: vi.fn(),
     }
@@ -342,7 +334,6 @@ describe('flushOnAgentDisconnect — dangling-turn sweep (2026-05-23 wedge fix)'
       activeTurnStartedAt: new Map<string, number>(),
       claudeBusyKeys: new Set<string>(),
       activeDraftStreams: new Map<string, FakeStream>(),
-      activeDraftParseModes: new Map<string, 'HTML' | 'MarkdownV2' | undefined>(),
       clearActiveReactions: vi.fn(),
       disposeProgressDriver: vi.fn(),
       log,
@@ -362,7 +353,6 @@ describe('flushOnAgentDisconnect — dangling-turn sweep (2026-05-23 wedge fix)'
       activeTurnStartedAt: new Map<string, number>([['ghost:thr:msg', 100]]),
       claudeBusyKeys: new Set<string>(['ghost:thr:msg']),
       activeDraftStreams: new Map<string, FakeStream>(),
-      activeDraftParseModes: new Map<string, 'HTML' | 'MarkdownV2' | undefined>(),
       clearActiveReactions: vi.fn(),
       disposeProgressDriver: vi.fn(),
       // onDanglingTurnsSwept intentionally omitted.

package/telegram-plugin/tests/issues-card.test.ts

@@ -40,7 +40,7 @@ describe("renderIssuesCard", () => {
       makeEvent({ fingerprint: "a::3", code: "3", severity: "info" }),
     ];
     const out = renderIssuesCard({ agentName: "klanker", events });
-    expect(out).toMatch(/^🚨 <b>klanker<\/b>/);
+    expect(out).toMatch(/^🚨 \*\*klanker\*\*/);
     expect(out).toContain("3 issues");
   });
 
@@ -54,7 +54,7 @@ describe("renderIssuesCard", () => {
         }),
       ];
       const out = renderIssuesCard({ agentName: "kengpt", events });
-      expect(out).toContain("→ <i>switchroom vault unlock</i>");
+      expect(out).toContain("→ _switchroom vault unlock_");
       // Summary still rendered above the remediation.
       expect(out).toContain("Morning brief skipped");
     });
@@ -66,7 +66,7 @@ describe("renderIssuesCard", () => {
         }),
       ];
       const out = renderIssuesCard({ agentName: "kengpt", events });
-      expect(out).toMatch(/→ <i>run.*auth heal/);
+      expect(out).toMatch(/→ _run.*auth heal/);
     });
 
     it("ignores multi-line detail (likely stderr tail, not remediation)", () => {
@@ -98,13 +98,12 @@ describe("renderIssuesCard", () => {
       expect((out ?? "").split("\n").every((line) => line.length < 600)).toBe(true);
     });
 
-    it("escapes HTML in remediation hints", () => {
+    it("passes < > literally in remediation hints (markdown, #2669)", () => {
       const events = [
         makeEvent({ detail: "Fix: <script>alert('xss')</script>" }),
       ];
       const out = renderIssuesCard({ agentName: "kengpt", events });
-      expect(out).not.toContain("<script>");
-      expect(out).toContain("&lt;script&gt;");
+      expect(out).toContain("<script>alert('xss')</script>");
     });
   });
 
@@ -158,7 +157,7 @@ describe("renderIssuesCard", () => {
     expect(out).toContain("+10 more not shown");
   });
 
-  it("HTML-escapes user-supplied fields", () => {
+  it("passes < > & literally in user-supplied fields (markdown, #2669)", () => {
     const events = [
       makeEvent({
         agent: "<script>",
@@ -169,10 +168,12 @@ describe("renderIssuesCard", () => {
       }),
     ];
     const out = renderIssuesCard({ agentName: "<script>", events });
-    expect(out).not.toContain("<script>");
-    expect(out).toContain("&lt;script&gt;");
-    expect(out).toContain("&lt;x&gt;::&lt;y&gt;");
-    expect(out).toContain("&lt;dangerous &amp; stuff&gt;");
+    // < > & are literal in rich markdown — no HTML entities. The fingerprint
+    // rides in a `code span` (also literal) and the summary is escaped only
+    // for emphasis specials.
+    expect(out).toContain("<script>");
+    expect(out).toContain("`<x>::<y>`");
+    expect(out).toContain("<dangerous & stuff>");
   });
 });
 
@@ -233,7 +234,9 @@ describe("createIssuesCardHandle", () => {
     });
     await handle.refresh([makeEvent({})]);
     expect(bot.sent).toHaveLength(1);
-    expect(bot.sent[0].opts?.parse_mode).toBe("HTML");
+    // #2669: the card body is raw GFM markdown sent through the rich path
+    // (the gateway wires sendMessage → sendRichMessage). No parse_mode.
+    expect(bot.sent[0].opts?.parse_mode).toBeUndefined();
     expect(handle.messageId()).toBe(1000);
   });
 

package/telegram-plugin/tests/linear-agent-activity.test.ts

@@ -247,7 +247,7 @@ describe('emitLinearAgentActivity — operator alert when auth is unrecoverable
   it('buildLinearAuthDeadMessage: no_bundle names the missing oauth key + re-auth command', () => {
     const msg = buildLinearAuthDeadMessage('clerk', 'no_bundle')
     expect(msg).toMatch(/Linear auth needs you/)
-    expect(msg).toContain('<code>linear/clerk/oauth</code>')
+    expect(msg).toContain('`linear/clerk/oauth`')
     expect(msg).toContain('switchroom linear-agent setup --agent clerk')
   })
 
@@ -257,10 +257,13 @@ describe('emitLinearAgentActivity — operator alert when auth is unrecoverable
     expect(msg).not.toContain('/oauth</code> is missing')
   })
 
-  it('buildLinearAuthDeadMessage: HTML-escapes a hostile agent slug', () => {
-    const msg = buildLinearAuthDeadMessage('a<b>&c', 'no_bundle')
-    expect(msg).toContain('a&lt;b&gt;&amp;c')
-    expect(msg).not.toContain('a<b>&c')
+  it('buildLinearAuthDeadMessage: markdown-escapes a hostile agent slug in prose (#2669)', () => {
+    // < > & are literal in rich markdown; an emphasis special is escaped so it
+    // can't break out of the **…** bold run.
+    const msg = buildLinearAuthDeadMessage('a_b*c', 'no_bundle')
+    expect(msg).toContain('**a\\_b\\*c**')
+    // Inside the `code span`, the slug is literal (no escaping).
+    expect(msg).toContain('`linear/a_b*c/oauth`')
   })
 
   it('successful auto-refresh does NOT page the operator', async () => {

package/telegram-plugin/tests/model-command.test.ts

@@ -172,7 +172,7 @@ describe("handleModelCommand — show / help never inject (picker-wedge guard)",
     const { deps, calls } = makeDeps({ getConfiguredModel: () => null });
     const reply = await handleModelCommand({ kind: "show" }, deps);
     expect(calls.length).toBe(0);
-    expect(reply.text).toContain("<code>default</code>");
+    expect(reply.text).toContain("`default`");
   });
 
   it("help never injects", async () => {
@@ -445,7 +445,7 @@ describe("buildModelMenu", () => {
     const { deps, calls } = makeMenuDeps();
     const menu = await buildModelMenu(deps);
     expect(calls.discover).toBe(1);
-    expect(menu.text).toContain("<b>Sonnet</b>");
+    expect(menu.text).toContain("**Sonnet**");
     expect(menu.text).toContain("29% / 5h · 33% / 7d");
     expect(menu.keyboard).toBeDefined();
     // 3 option rows + refresh row

package/telegram-plugin/tests/model-unavailable.test.ts

@@ -288,13 +288,13 @@ describe('formatModelUnavailableCard — actionable card', () => {
       { now: NOW },
     )
     expect(card).toMatchInlineSnapshot(`
-      "⚠️ <b>Model unavailable</b> on agent <b>gymbro</b>
+      "⚠️ **Model unavailable** on agent **gymbro**
       Reason: quota exhausted (resets in 5h)
 
-      <b>What to try</b>
-      • <code>/auth use &lt;label&gt;</code> — switch the fleet to a healthy account
-      • <code>/auth add</code> — attach another subscription
-      • <code>/usage</code> — show quota breakdown"
+      **What to try**
+      • \`/auth use <label>\` — switch the fleet to a healthy account
+      • \`/auth add\` — attach another subscription
+      • \`/usage\` — show quota breakdown"
     `)
   })
 
@@ -330,9 +330,9 @@ describe('formatModelUnavailableCard — actionable card', () => {
 
   it('default (no autoFallback) variant includes the actionable suggestions', () => {
     const card = formatModelUnavailableCard(detection('quota_exhausted'), 'gymbro', { now: NOW })
-    expect(card).toContain('<code>/auth use')
-    expect(card).toContain('<code>/auth add</code>')
-    expect(card).toContain('<code>/usage</code>')
+    expect(card).toContain('`/auth use')
+    expect(card).toContain('`/auth add`')
+    expect(card).toContain('`/usage`')
     // Regression — `/authfallback` is no longer a verb (post-RFC-H);
     // pre-fix the card lied by suggesting it.
     expect(card).not.toContain('/authfallback')
@@ -343,17 +343,17 @@ describe('formatModelUnavailableCard — actionable card', () => {
       slot: 'pro-1',
       now: NOW,
     })
-    expect(card).toContain('slot <b>pro-1</b>')
+    expect(card).toContain('slot **pro-1**')
   })
 
-  it('escapes HTML in agent and slot names', () => {
+  it('passes < > literally in agent and slot names (markdown, #2669)', () => {
+    // < > " are literal in rich markdown; emphasis specials are escaped.
     const card = formatModelUnavailableCard(detection('overload'), '<evil>', {
       slot: '"injected"',
       now: NOW,
     })
-    expect(card).toContain('&lt;evil&gt;')
-    expect(card).toContain('&quot;injected&quot;')
-    expect(card).not.toContain('<evil>')
+    expect(card).toContain('<evil>')
+    expect(card).toContain('"injected"')
   })
 })
 

package/telegram-plugin/tests/multi-turn-continuity.test.ts

@@ -2,9 +2,10 @@
  * Integration tests for multi-turn state isolation.
  *
  * Verifies that state carried across turns in the same chat+thread
- * (activeDraftStreams, activeDraftParseModes, suppressPtyPreview)
- * resets cleanly when a new turn starts — i.e. the previous turn's
- * stream handle is finalized/discarded before the next begins.
+ * (activeDraftStreams, suppressPtyPreview) resets cleanly when a new turn
+ * starts — i.e. the previous turn's stream handle is finalized/discarded
+ * before the next begins. (The activeDraftParseModes map was retired with
+ * parse-mode rotation — there is one rich-markdown path now, #2669.)
  *
  * This is one of the "per-chat continuity" gaps the plan called out:
  * previously tested only through the full server.ts orchestration in
@@ -14,13 +15,11 @@
 import { describe, it, expect, beforeEach } from 'vitest'
 import { handleStreamReply, type StreamReplyDeps, type StreamReplyState } from '../stream-reply-handler.js'
 import type { DraftStreamHandle } from '../draft-stream.js'
-import { markdownToHtml as realMarkdownToHtml } from '../format.js'
 import { createFakeBotApi, type FakeBot } from './fake-bot-api.js'
 
 function makeState(): StreamReplyState {
   return {
     activeDraftStreams: new Map<string, DraftStreamHandle>(),
-    activeDraftParseModes: new Map<string, 'HTML' | 'MarkdownV2' | undefined>(),
     suppressPtyPreview: new Set<string>(),
   }
 }
@@ -28,13 +27,11 @@ function makeState(): StreamReplyState {
 function makeDeps(bot: FakeBot, overrides?: Partial<StreamReplyDeps>): StreamReplyDeps {
   return {
     bot: bot as unknown as StreamReplyDeps['bot'],
-    markdownToHtml: (t) => realMarkdownToHtml(t),
-    escapeMarkdownV2: (t) => t,
     repairEscapedWhitespace: (t) => t,
     assertAllowedChat: () => {},
     resolveThreadId: (_, explicit) => (explicit != null ? Number(explicit) : undefined),
     disableLinkPreview: true,
-    defaultFormat: 'html',
+    defaultFormat: 'markdown',
     logStreamingEvent: () => {},
     historyEnabled: false,
     recordOutbound: () => {},
@@ -51,13 +48,12 @@ describe('multi-turn continuity', () => {
     bot = createFakeBotApi({ startMessageId: 500 })
   })
 
-  it('done=true clears the stream entry and parse-mode map', async () => {
+  it('done=true clears the stream entry', async () => {
     const state = makeState()
     const deps = makeDeps(bot)
 
     await handleStreamReply({ chat_id: 'c', text: 'turn-1', done: true }, state, deps)
     expect(state.activeDraftStreams.has('c:_')).toBe(false)
-    expect(state.activeDraftParseModes.has('c:_')).toBe(false)
   })
 
   it('two sequential turns on the same chat each get their own message', async () => {

package/telegram-plugin/tests/operator-events.test.ts

@@ -158,7 +158,7 @@ describe('renderOperatorEvent — credentials-expired', () => {
   it('produces reauth button', () => {
     const { text, keyboard } = renderOperatorEvent(makeEvent('credentials-expired'))
     expect(text).toContain('expired')
-    expect(text).toContain('<b>gymbro</b>')
+    expect(text).toContain('**gymbro**')
     expect(keyboard.inline_keyboard.flat().some(b => b.callback_data?.includes('reauth'))).toBe(true)
   })
 
@@ -193,7 +193,7 @@ describe('renderOperatorEvent — quota-exhausted', () => {
   it('renders quota text with /auth use hint and no stub buttons (E5)', () => {
     const { text, keyboard } = renderOperatorEvent(makeEvent('quota-exhausted'))
     expect(text).toContain('Quota exhausted')
-    expect(text).toContain('<b>gymbro</b>')
+    expect(text).toContain('**gymbro**')
     expect(text).toContain('/auth use')
     const buttons = keyboard.inline_keyboard.flat()
     // swap-slot and add-slot buttons removed (E5 — they redirected to terminal)
@@ -253,17 +253,15 @@ describe('renderOperatorEvent — unknown-5xx', () => {
   })
 })
 
-describe('renderOperatorEvent — HTML escaping', () => {
-  it('escapes agent name with special chars', () => {
+describe('renderOperatorEvent — markdown escaping (#2669)', () => {
+  it('passes < > literally in agent name (markdown, #2669)', () => {
     const { text } = renderOperatorEvent(makeEvent('unknown-4xx', { agent: '<evil>' }))
-    expect(text).toContain('&lt;evil&gt;')
-    expect(text).not.toContain('<evil>')
+    expect(text).toContain('<evil>')
   })
 
-  it('escapes detail with special chars', () => {
+  it('passes < > literally in detail (markdown, #2669)', () => {
     const { text } = renderOperatorEvent(makeEvent('credentials-expired', { detail: '<script>alert(1)</script>' }))
-    expect(text).toContain('&lt;script&gt;')
-    expect(text).not.toContain('<script>')
+    expect(text).toContain('<script>alert(1)</script>')
   })
 })
 

package/telegram-plugin/tests/pending-work-progress.test.ts

@@ -139,7 +139,7 @@ describe('pending-work-progress', () => {
     expect(cap.edits).toHaveLength(1)
     expect(cap.edits[0].messageId).toBe(100)
     expect(cap.edits[0].newText).toBe(
-      "Background sleep running; awaiting completion.\n\n— still working (1m) · message me anytime, I'll keep you posted",
+      "Background sleep running; awaiting completion.\n\n_still working (1m) · message me anytime, I'll keep you posted_",
     )
 
     // Tick at 3 intervals total — second edit, "3m".
@@ -148,7 +148,7 @@ describe('pending-work-progress', () => {
     await flush()
     expect(cap.edits).toHaveLength(2)
     expect(cap.edits[1].newText).toBe(
-      "Background sleep running; awaiting completion.\n\n— still working (3m) · message me anytime, I'll keep you posted",
+      "Background sleep running; awaiting completion.\n\n_still working (3m) · message me anytime, I'll keep you posted_",
     )
   })
 
@@ -168,7 +168,7 @@ describe('pending-work-progress', () => {
     await flush()
     // The new edit should be based on 'worker dispatched' alone.
     expect(cap.edits[0].newText).toBe(
-      "worker dispatched\n\n— still working (1m) · message me anytime, I'll keep you posted",
+      "worker dispatched\n\n_still working (1m) · message me anytime, I'll keep you posted_",
     )
   })
 
@@ -186,7 +186,7 @@ describe('pending-work-progress', () => {
     __tickForTests(cap.now)
     await flush()
     expect(cap.edits[0].newText).toBe(
-      "worker dispatched\n\n— still working (1m) · message me anytime, I'll keep you posted",
+      "worker dispatched\n\n_still working (1m) · message me anytime, I'll keep you posted_",
     )
   })
 
@@ -336,17 +336,17 @@ describe('pending-work-progress', () => {
     expect(cap.edits).toHaveLength(0)
   })
 
-  // ─── #1698 regression — preserve parse_mode on the cross-turn edit ───
-  it("preserves the anchor's parse_mode on every edit (#1698)", async () => {
+  // ─── #1698 successor — preserve the anchor's send shape (literalText) on
+  //     every cross-turn edit (#2669 single-rich-path contract) ───
+  it("preserves the anchor's rich shape on every edit (default literalText=false)", async () => {
     const cap = setup()
     startTurn(KEY)
     noteAsyncDispatch(KEY)
-    // Anchor was sent through the reply tool with format='html', so
-    // the captured text is already rendered Telegram HTML.
+    // Anchor was sent via the rich-markdown path (the default), so the
+    // captured text is raw GFM markdown and the edit re-sends it richly.
     noteOutbound(KEY, {
       messageId: 100,
-      text: '<b>Worker back.</b> Both blockers fixed.',
-      parseMode: 'HTML',
+      text: '**Worker back.** Both blockers fixed.',
     })
     cap.now = 0
     noteTurnEnd(KEY)
@@ -354,42 +354,41 @@ describe('pending-work-progress', () => {
     __tickForTests(cap.now)
     await flush()
     expect(cap.edits).toHaveLength(1)
-    expect(cap.edits[0].parseMode).toBe('HTML')
+    expect(cap.edits[0].literalText).toBe(false)
     expect(cap.edits[0].newText).toBe(
-      "<b>Worker back.</b> Both blockers fixed.\n\n— still working (1m) · message me anytime, I'll keep you posted",
+      "**Worker back.** Both blockers fixed.\n\n_still working (1m) · message me anytime, I'll keep you posted_",
     )
   })
 
-  it('passes undefined parseMode through when the anchor was plain text', async () => {
+  it('threads literalText=true through when the anchor was a literal format:text send', async () => {
     const cap = setup()
     startTurn(KEY)
     noteAsyncDispatch(KEY)
-    // format: 'text' path — anchor was sent without parse_mode.
+    // format: 'text' path — the anchor was a literal plain send.
     noteOutbound(KEY, {
       messageId: 100,
       text: 'plain text reply',
-      parseMode: undefined,
+      literalText: true,
     })
     noteTurnEnd(KEY)
     cap.now = EDIT_INTERVAL_MS
     __tickForTests(cap.now)
     await flush()
-    expect(cap.edits[0].parseMode).toBeUndefined()
+    expect(cap.edits[0].literalText).toBe(true)
   })
 
-  it('defaults parseMode to undefined when caller omits it (test ergonomics)', async () => {
+  it('defaults literalText to false when caller omits it (rich path, test ergonomics)', async () => {
     const cap = setup()
     startTurn(KEY)
     noteAsyncDispatch(KEY)
-    // Callsite that hasn't been updated for the new field — must not
-    // typecheck-fail nor crash. The edit goes out parse_mode-less,
-    // matching the pre-#1698 behaviour for legacy callers.
+    // Callsite that omits the field — must not typecheck-fail nor crash.
+    // The edit goes out on the rich path (literalText=false).
     noteOutbound(KEY, { messageId: 100, text: 'wd' })
     noteTurnEnd(KEY)
     cap.now = EDIT_INTERVAL_MS
     __tickForTests(cap.now)
     await flush()
-    expect(cap.edits[0].parseMode).toBeUndefined()
+    expect(cap.edits[0].literalText).toBe(false)
   })
 
   it('multiple chats — independent state', async () => {