switchroom 0.16.28 → 0.16.38

package/telegram-plugin/gateway/boot-card.ts

@@ -51,7 +51,7 @@ import {
   AGENT_LIVE_WINDOW_MS,
   AGENT_LIVE_POLL_INTERVAL_MS,
 } from './boot-probes.js'
-import { escapeMarkdown } from '../card-format.js'
+import { escapeMarkdown, stackCardLines } from '../card-format.js'
 import {
   loadCache as loadBootIssueCache,
   diffProbes as diffBootProbes,
@@ -468,7 +468,12 @@ export function renderBootCard(opts: RenderBootCardOpts): string {
     sections.push('', ...configChangeRows)
   }
   if (sections.length === 1) return ack
-  return sections.join('\n')
+  // Stack rows with GFM hard breaks so the boot card's styled prose rows don't
+  // collapse onto one visual line in the rich-message renderer (#2669). A
+  // section entry may itself carry an internal newline (a multi-line `ack`, an
+  // update-outcome blob), so flatten to single lines first — see stackCardLines.
+  const flatLines = sections.flatMap((s) => s.split('\n'))
+  return stackCardLines(flatLines)
 }
 
 /**

package/telegram-plugin/gateway/chat-id-fallback.ts

@@ -0,0 +1,46 @@
+/**
+ * Shared chat_id allowlist fallback for the reply / stream_reply final-answer
+ * paths.
+ *
+ * Non-Claude models (Gemini via LiteLLM `sr-*` routing) sometimes pass a
+ * chat_id that fails the allowlist:
+ *
+ *   - **Bug A (numeric coercion):** the model passes a JSON number, so the
+ *     caller must `String(...)`-coerce before the allowlist compare (the
+ *     allowlist is a string set). Without coercion `42 !== "42"` and every
+ *     reply looks un-allowlisted.
+ *   - **Bug B (executeReply fallback):** the raw value is wrong, so fall back
+ *     to the *active* turn's already-validated `sessionChatId`.
+ *   - **Bug D (lastActiveTurnChatId survives silence poke):** a ≥5-min silence
+ *     poke fires `clearTurnStarted`, so `currentTurn` is null by the time the
+ *     model finally replies. The active-turn tier is gone, but the last-known
+ *     turn's chat still routes the answer correctly.
+ *
+ * These hotfixes shipped test-free; this helper isolates the pure decision so
+ * each bug gets a focused regression test.
+ *
+ * Returns the resolved chat_id (rawChatId unchanged when no valid fallback
+ * exists, so the caller's `assertAllowedChat` throws the human-readable error)
+ * plus the tier used, for logging. Pure — no module state read.
+ */
+export interface ChatIdAllowlist {
+  allowFrom: string[]
+  groups: Record<string, unknown>
+}
+
+export function resolveChatIdFallback(
+  rawChatId: string,
+  access: ChatIdAllowlist,
+  turnSessionChatId: string | undefined,
+  lastKnownChatId: string | undefined,
+  hasLiveTurn: boolean,
+): { chatId: string; tier: 'raw' | 'active' | 'last-known' } {
+  if (access.allowFrom.includes(rawChatId) || rawChatId in access.groups) {
+    return { chatId: rawChatId, tier: 'raw' }
+  }
+  const fallbackChatId = turnSessionChatId ?? lastKnownChatId
+  if (fallbackChatId && (access.allowFrom.includes(fallbackChatId) || fallbackChatId in access.groups)) {
+    return { chatId: fallbackChatId, tier: hasLiveTurn ? 'active' : 'last-known' }
+  }
+  return { chatId: rawChatId, tier: 'raw' }
+}

package/telegram-plugin/gateway/config-approval-handler.ts

@@ -2,6 +2,7 @@
 // card, resolves the verdict back to hostd over IPC, and flips the card to
 // a terminal state on finalize.
 
+import { escapeMarkdown } from '../format.js';
 import { randomBytes } from "node:crypto";
 import type { IpcClient } from "./ipc-server.js";
 import type {
@@ -180,10 +181,6 @@ const REASON_ELLIPSIS = "…";
  */
 export const DIFF_SENTINEL = "\n[… diff continues, see attached file]";
 
-function escapeMd(s: string): string {
-  return s.replace(/([\\`*_~=\[\]|])/g, "\\$1");
-}
-
 function clipReason(reason: string): string {
   if (reason.length <= REASON_MAX_CHARS) return reason;
   return reason.slice(0, REASON_MAX_CHARS - REASON_ELLIPSIS.length) +
@@ -214,7 +211,7 @@ export function buildConfigApprovalCardBody(args: {
   const render = (diff: string): string =>
     `🛠 **Config edit proposed**\n` +
     `Agent: \`${args.agentName}\`\n` +
-    `Reason: ${escapeMd(safeReason)}\n\n` +
+    `Reason: ${escapeMarkdown(safeReason)}\n\n` +
     "```\n" + diff + "\n```";
 
   return truncateRawToFit({
@@ -447,8 +444,8 @@ export function buildLiveNote(affectedAgents?: string[], fleetWide?: boolean): s
   }
   const agents = (affectedAgents ?? []).filter((a) => typeof a === "string" && a.length > 0);
   if (agents.length === 0) return "";
-  const list = agents.map(escapeMd).join(", ");
-  const cmds = agents.map((a) => `/restart ${escapeMd(a)}`).join(" · ");
+  const list = agents.map(escapeMarkdown).join(", ");
+  const cmds = agents.map((a) => `/restart ${escapeMarkdown(a)}`).join(" · ");
   return `\n\n🔄 Not live until restart — affects: **${list}**\n${cmds}`;
 }
 
@@ -476,8 +473,8 @@ export async function handleRequestConfigFinalize(
     msg.outcome === "applied" ? buildLiveNote(msg.affectedAgents, msg.fleetWide) : "";
   const body =
     msg.outcome === "applied"
-      ? `✅ **Applied**${msg.detail ? `\n${escapeMd(msg.detail)}` : ""}${liveNote}`
-      : `⚠️ **Reconcile failed; rolled back**${msg.detail ? `\n${escapeMd(msg.detail)}` : ""}`;
+      ? `✅ **Applied**${msg.detail ? `\n${escapeMarkdown(msg.detail)}` : ""}${liveNote}`
+      : `⚠️ **Reconcile failed; rolled back**${msg.detail ? `\n${escapeMarkdown(msg.detail)}` : ""}`;
   try {
     // Finalize is terminal — strip the keyboard so the buttons are gone.
     await deps.editCard({

package/telegram-plugin/gateway/diff-preview-card.ts

@@ -21,6 +21,7 @@
  * single-shot "do this edit now" intent.
  */
 
+import { escapeMarkdown } from '../format.js';
 import { InlineKeyboard } from "grammy";
 import type { DiffPreview } from "../../src/drive/diff-preview.js";
 
@@ -88,9 +89,9 @@ export function buildDiffPreviewCard(
   // The 📍 + line-count rows are surfaced verbatim — they're
   // wrapper-attested and the agent has no input into their content.
   const bodyLines: string[] = [];
-  bodyLines.push(`**${escapeHtml(preview.title)}**`);
+  bodyLines.push(`**${escapeMarkdown(preview.title)}**`);
   for (const line of preview.lines) {
-    bodyLines.push(escapeHtml(line.text));
+    bodyLines.push(escapeMarkdown(line.text));
   }
   const text = bodyLines.join("\n");
 
@@ -161,7 +162,3 @@ export function buildDiffPreviewCard(
 
   return { text, reply_markup: kb };
 }
-
-function escapeHtml(s: string): string {
-  return s.replace(/([\\`*_~=\[\]|])/g, "\\$1");
-}