switchroom 0.16.10 → 0.16.12

package/dist/cli/switchroom.js

@@ -51674,8 +51674,8 @@ import { existsSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 
 // src/build-info.ts
-var VERSION = "0.16.10";
-var COMMIT_SHA = "8af198e9";
+var VERSION = "0.16.12";
+var COMMIT_SHA = "4cab85e1";
 
 // src/cli/resolve-version.ts
 function readPackageVersion() {
@@ -77783,6 +77783,13 @@ function extractBearerToken(req) {
     if (idx >= 0 && idx + 1 < parts.length)
       return parts[idx + 1];
   }
+  const url = new URL(req.url);
+  const queryToken = url.searchParams.get("token");
+  if (queryToken)
+    return queryToken;
+  const hermesHeader = req.headers.get("X-Hermes-Session-Token");
+  if (hermesHeader)
+    return hermesHeader;
   return null;
 }
 function checkAuth(req, token, server) {

package/dist/host-control/main.js

@@ -22587,7 +22587,7 @@ import { existsSync as existsSync6, readFileSync as readFileSync4 } from "node:f
 import { dirname as dirname4, join as join2 } from "node:path";
 
 // src/build-info.ts
-var VERSION = "0.16.10";
+var VERSION = "0.16.12";
 
 // src/cli/resolve-version.ts
 function readPackageVersion() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "switchroom",
-  "version": "0.16.10",
+  "version": "0.16.12",
   "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": {

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

@@ -46034,10 +46034,11 @@ function parseModelCommand(text) {
 }
 var PERSIST_NOTE = "<i>Session-only \u2014 lasts until restart. To persist, set <code>model:</code> in switchroom.yaml and restart.</i>";
 function helpText2(deps, reason) {
+  const srAliasExamples = Object.keys(SR_MODEL_ALIASES).map((a) => `<code>${a}</code>`).join(" \u00b7 ");
   const lines = [];
   if (reason)
     lines.push(`\u26a0\ufe0f ${deps.escapeHtml(reason)}`);
-  lines.push("<b>/model</b> \u2014 show or switch the Claude model", "<code>/model</code> \u2014 show the configured model", `<code>/model &lt;name&gt;</code> \u2014 switch the live session (${MODEL_ALIASES.map((a) => `<code>${a}</code>`).join(" \u00b7 ")} or a full model id)`, PERSIST_NOTE);
+  lines.push("<b>/model</b> \u2014 show or switch the Claude model", "<code>/model</code> \u2014 show the configured model", `<code>/model &lt;name&gt;</code> \u2014 switch the live session (${MODEL_ALIASES.map((a) => `<code>${a}</code>`).join(" \u00b7 ")} or a full model id)`, `<i>OpenRouter shortcuts:</i> ${srAliasExamples}`, PERSIST_NOTE);
   return { text: lines.join(`
 `), html: true };
 }
@@ -46047,11 +46048,13 @@ async function handleModelCommand(parsed, deps) {
   if (parsed.kind === "show") {
     const configured = deps.getConfiguredModel();
     const shown = configured && configured.length > 0 ? configured : "default";
+    const srAliasExamples = Object.keys(SR_MODEL_ALIASES).map((a) => `<code>/model ${a}</code>`).join(" \u00b7 ");
     return {
       text: [
         `<b>Model \u2014 ${deps.escapeHtml(deps.getAgentName())}</b>`,
         `Configured: <code>${deps.escapeHtml(shown)}</code>`,
         `Switch the live session: ${MODEL_ALIASES.map((a) => `<code>/model ${a}</code>`).join(" \u00b7 ")}`,
+        `OpenRouter shortcuts: ${srAliasExamples}`,
         "or <code>/model &lt;full-model-id&gt;</code>",
         PERSIST_NOTE
       ].join(`
@@ -46062,10 +46065,11 @@ async function handleModelCommand(parsed, deps) {
   if (!isValidModelArg(parsed.model)) {
     return helpText2(deps, `not a valid model name: ${parsed.model}`);
   }
+  const model = expandSrAlias(parsed.model);
   const currentSession = deps.getActiveSessionModel();
-  if (currentSession !== null && isSrModel(currentSession) && isClaudeModel(parsed.model)) {
+  if (currentSession !== null && isSrModel(currentSession) && isClaudeModel(model)) {
     try {
-      await deps.scheduleRestart(`user: /model ${parsed.model} (sr-to-claude restart)`);
+      await deps.scheduleRestart(`user: /model ${model} (sr-to-claude restart)`);
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       return {
@@ -46082,10 +46086,10 @@ async function handleModelCommand(parsed, deps) {
       html: true
     };
   }
-  const verbHtml = `<code>/model ${deps.escapeHtml(parsed.model)}</code>`;
+  const verbHtml = `<code>/model ${deps.escapeHtml(model)}</code>`;
   let result;
   try {
-    result = await deps.inject(deps.getAgentName(), `/model ${parsed.model}`);
+    result = await deps.inject(deps.getAgentName(), `/model ${model}`);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     return {
@@ -46136,8 +46140,20 @@ var SR_MODEL_LABELS = {
   "sr-gemini-2.5-flash": "Gemini 2.5 Flash",
   "sr-deepseek-r1": "DeepSeek R1",
   "sr-deepseek-v3": "DeepSeek V3",
-  "sr-glm-5": "GLM-5"
+  "sr-glm-5": "GLM-5",
+  "sr-codex-5.5": "Codex 5.5"
 };
+var SR_MODEL_ALIASES = {
+  flash: "sr-gemini-2.5-flash",
+  gemini: "sr-gemini-2.5-pro",
+  deepseek: "sr-deepseek-v3",
+  r1: "sr-deepseek-r1",
+  glm: "sr-glm-5",
+  codex: "sr-codex-5.5"
+};
+function expandSrAlias(arg) {
+  return SR_MODEL_ALIASES[arg.toLowerCase()] ?? arg;
+}
 function srFriendlyLabel(srName) {
   return SR_MODEL_LABELS[srName] ?? srName.replace(/^sr-/, "").replace(/-/g, " ");
 }
@@ -50046,7 +50062,8 @@ function buildObligationRepresentInbound(o, now) {
     meta: {
       source: "obligation_represent",
       origin_turn_id: o.originTurnId,
-      represent_count: String(o.representCount + 1)
+      represent_count: String(o.representCount + 1),
+      chat_id: o.chatId
     }
   };
 }
@@ -56047,10 +56064,10 @@ function readTurnActiveMarkerAgeMs(stateDir, now) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.16.10";
-var COMMIT_SHA = "8af198e9";
-var COMMIT_DATE = "2026-06-28T07:14:15Z";
-var LATEST_PR = 2625;
+var VERSION = "0.16.12";
+var COMMIT_SHA = "4cab85e1";
+var COMMIT_DATE = "2026-06-28T11:11:09Z";
+var LATEST_PR = 2634;
 var COMMITS_AHEAD_OF_TAG = 0;
 
 // gateway/boot-version.ts
@@ -57709,12 +57726,13 @@ function loadAccess() {
   return BOOT_ACCESS ?? readAccessFile();
 }
 function assertAllowedChat(chat_id) {
+  const id = String(chat_id);
   const access = loadAccess();
-  if (access.allowFrom.includes(chat_id))
+  if (access.allowFrom.includes(id))
     return;
-  if (chat_id in access.groups)
+  if (id in access.groups)
     return;
-  throw new Error(`chat ${chat_id} is not allowlisted \u2014 add via /telegram:access`);
+  throw new Error(`chat ${id} is not allowlisted \u2014 add via /telegram:access`);
 }
 function saveAccess(a) {
   if (STATIC)
@@ -60688,7 +60706,7 @@ async function executeToolCall(tool, args) {
   }
 }
 async function executeSendChecklist(args) {
-  const chat_id = args.chat_id;
+  const chat_id = String(args.chat_id ?? "");
   if (!chat_id)
     throw new Error("send_checklist: chat_id is required");
   const title = args.title;
@@ -60754,7 +60772,7 @@ async function executeLinearAgentSetup(args) {
   return runLinearAgentSetup(args);
 }
 async function executeUpdateChecklist(args) {
-  const chat_id = args.chat_id;
+  const chat_id = String(args.chat_id ?? "");
   if (!chat_id)
     throw new Error("update_checklist: chat_id is required");
   const message_id = args.message_id;
@@ -60778,9 +60796,20 @@ function redactOutboundText(text2, site) {
 }
 async function executeReply(args) {
   const turn = currentTurn;
-  const chat_id = args.chat_id;
-  if (!chat_id)
+  const _rawChatId = String(args.chat_id ?? "");
+  if (!_rawChatId)
     throw new Error("reply: chat_id is required");
+  const chat_id = (() => {
+    const _a = loadAccess();
+    if (_a.allowFrom.includes(_rawChatId) || _rawChatId in _a.groups)
+      return _rawChatId;
+    if (turn?.sessionChatId && (_a.allowFrom.includes(turn.sessionChatId) || (turn.sessionChatId in _a.groups))) {
+      process.stderr.write(`telegram gateway: reply: model passed chat_id "${_rawChatId}" (not allowlisted) \u2014 ` + `routing to active turn chat "${turn.sessionChatId}"
+`);
+      return turn.sessionChatId;
+    }
+    return _rawChatId;
+  })();
   const rawText = args.text;
   if (rawText == null || rawText === "")
     throw new Error("reply: text is required and cannot be empty");
@@ -61315,14 +61344,14 @@ async function executeStreamReply(args) {
       args.text = scrub.scrubbed;
       emitRuntimeMetric({
         kind: "voice_scrub_applied",
-        chatKey: statusKey(args.chat_id, args.message_thread_id != null ? Number(args.message_thread_id) : undefined),
+        chatKey: statusKey(String(args.chat_id ?? ""), args.message_thread_id != null ? Number(args.message_thread_id) : undefined),
         replaced: scrub.replaced,
         site: "stream_reply"
       });
     }
   }
   if (args.done === true) {
-    const sChatId = args.chat_id;
+    const sChatId = String(args.chat_id ?? "");
     const sThreadId = args.message_thread_id != null ? Number(args.message_thread_id) : undefined;
     const sText = args.text;
     const dup = outboundDedup.check(sChatId, sThreadId, sText, Date.now(), currentTurn?.registryKey ?? null);
@@ -61333,7 +61362,7 @@ async function executeStreamReply(args) {
     }
   }
   const access = loadAccess();
-  const streamChatId = args.chat_id;
+  const streamChatId = String(args.chat_id ?? "");
   const streamIsPrivate = isDmChatId(streamChatId);
   const streamIsForumTopic = args.message_thread_id != null && args.message_thread_id !== "";
   let streamReplyMarkup;
@@ -61433,18 +61462,18 @@ async function executeStreamReply(args) {
   });
   if (result.messageId != null) {
     try {
-      progressDriver?.recordOutboundDelivered(args.chat_id, args.message_thread_id);
+      progressDriver?.recordOutboundDelivered(String(args.chat_id ?? ""), args.message_thread_id);
     } catch {}
     try {
       const threadIdNum2 = args.message_thread_id != null ? Number(args.message_thread_id) : undefined;
-      noteSignal(statusKey(args.chat_id, threadIdNum2), Date.now());
+      noteSignal(statusKey(String(args.chat_id ?? ""), threadIdNum2), Date.now());
     } catch {}
   }
   if (args.done === true && result.messageId != null && streamButtonMeta != null && streamButtonMeta.size > 0) {
-    rememberAgentButtonMeta(args.chat_id, result.messageId, streamButtonMeta);
+    rememberAgentButtonMeta(String(args.chat_id ?? ""), result.messageId, streamButtonMeta);
   }
   if (args.done === true && result.messageId != null) {
-    const sChatId = args.chat_id;
+    const sChatId = String(args.chat_id ?? "");
     const sThreadId = args.message_thread_id != null ? Number(args.message_thread_id) : undefined;
     outboundDedup.record(sChatId, sThreadId, args.text, Date.now(), currentTurn?.registryKey ?? null);
     const streamFormat = args.format ?? (access.parseMode ?? "html");
@@ -61477,7 +61506,7 @@ async function executeStreamReply(args) {
     clearSilentEndState(statusKey(streamChatId, streamThreadIdForClear));
   }
   {
-    const sChat = args.chat_id;
+    const sChat = String(args.chat_id ?? "");
     const sThread = resolveThreadId(sChat, args.message_thread_id);
     releaseTurnBufferGate(statusKey(sChat, sThread), turn ?? undefined);
     if (turn?.finalAnswerDelivered === true) {
@@ -61491,7 +61520,7 @@ async function executeProgressUpdate(args) {
     throw new Error("progress_update: chat_id is required");
   if (!args.text)
     throw new Error("progress_update: text is required");
-  const chat_id = args.chat_id;
+  const chat_id = String(args.chat_id ?? "");
   let text2 = args.text;
   const threadId = resolveThreadId(chat_id, args.message_thread_id);
   const key = statusKey(chat_id, threadId);
@@ -61816,7 +61845,7 @@ function renderVaultRequestSaveCard(req, agentSlug) {
 `);
 }
 async function executeVaultRequestSave(args) {
-  const chat_id = args.chat_id;
+  const chat_id = String(args.chat_id ?? "");
   if (!chat_id)
     throw new Error("vault_request_save: chat_id is required");
   const key = args.key;
@@ -61904,7 +61933,7 @@ function renderSecretRequestCard(req) {
 `);
 }
 async function executeRequestSecret(args) {
-  const chat_id = args.chat_id;
+  const chat_id = String(args.chat_id ?? "");
   if (!chat_id)
     throw new Error("request_secret: chat_id is required");
   const key = args.key;
@@ -62110,7 +62139,7 @@ function renderVaultRequestAccessCard(req) {
 `);
 }
 async function executeVaultRequestAccess(args) {
-  const chat_id = args.chat_id;
+  const chat_id = String(args.chat_id ?? "");
   if (!chat_id)
     throw new Error("vault_request_access: chat_id is required");
   const key = args.key;
@@ -62195,8 +62224,8 @@ async function executeReact(args) {
     throw new Error("react: message_id is required");
   if (!args.emoji)
     throw new Error("react: emoji is required");
-  assertAllowedChat(args.chat_id);
-  await lockedBot.api.setMessageReaction(args.chat_id, Number(args.message_id), [
+  assertAllowedChat(String(args.chat_id ?? ""));
+  await lockedBot.api.setMessageReaction(String(args.chat_id ?? ""), Number(args.message_id), [
     { type: "emoji", emoji: args.emoji }
   ]);
   return { content: [{ type: "text", text: "reacted" }] };
@@ -62239,7 +62268,7 @@ async function executeEditMessage(args) {
     throw new Error("edit_message: message_id is required");
   if (args.text == null || args.text === "")
     throw new Error("edit_message: text is required and cannot be empty");
-  assertAllowedChat(args.chat_id);
+  assertAllowedChat(String(args.chat_id ?? ""));
   const editAccess = loadAccess();
   const editConfigMode = editAccess.parseMode ?? "html";
   const editFormat = args.format ?? editConfigMode;
@@ -62251,7 +62280,7 @@ async function executeEditMessage(args) {
       editRawText = scrub.scrubbed;
       emitRuntimeMetric({
         kind: "voice_scrub_applied",
-        chatKey: statusKey(args.chat_id, undefined),
+        chatKey: statusKey(String(args.chat_id ?? ""), undefined),
         replaced: scrub.replaced,
         site: "edit_message"
       });
@@ -62269,11 +62298,11 @@ async function executeEditMessage(args) {
     editParseMode = undefined;
     editText = editRawText;
   }
-  const edited = await robustApiCall(() => lockedBot.api.editMessageText(args.chat_id, Number(args.message_id), editText, ...editParseMode ? [{ parse_mode: editParseMode }] : []));
+  const edited = await robustApiCall(() => lockedBot.api.editMessageText(String(args.chat_id ?? ""), Number(args.message_id), editText, ...editParseMode ? [{ parse_mode: editParseMode }] : []));
   const id = typeof edited === "object" && edited ? edited.message_id : args.message_id;
   if (HISTORY_ENABLED) {
     try {
-      recordEdit({ chat_id: args.chat_id, message_id: Number(args.message_id), text: args.text });
+      recordEdit({ chat_id: String(args.chat_id ?? ""), message_id: Number(args.message_id), text: args.text });
     } catch (err) {
       process.stderr.write(`telegram gateway: history recordEdit failed: ${err}
 `);
@@ -62284,7 +62313,7 @@ async function executeEditMessage(args) {
 async function executeSendTyping(args) {
   if (!args.chat_id)
     throw new Error("send_typing: chat_id is required");
-  const stChatId = args.chat_id;
+  const stChatId = String(args.chat_id ?? "");
   assertAllowedChat(stChatId);
   const rawAction = args.action;
   let action = "typing";
@@ -62308,7 +62337,7 @@ async function executePinMessage(args) {
     throw new Error("pin_message: chat_id is required");
   if (!args.message_id)
     throw new Error("pin_message: message_id is required");
-  const pinChatId = args.chat_id;
+  const pinChatId = String(args.chat_id ?? "");
   assertAllowedChat(pinChatId);
   await robustApiCall(() => lockedBot.api.pinChatMessage(pinChatId, Number(args.message_id)), { chat_id: pinChatId, verb: "pin_message" });
   return { content: [{ type: "text", text: `pinned message ${args.message_id}` }] };
@@ -62318,7 +62347,7 @@ async function executeDeleteMessage(args) {
     throw new Error("delete_message: chat_id is required");
   if (!args.message_id)
     throw new Error("delete_message: message_id is required");
-  const delChatId = args.chat_id;
+  const delChatId = String(args.chat_id ?? "");
   const delMessageId = Number(args.message_id);
   assertAllowedChat(delChatId);
   await robustApiCall(() => lockedBot.api.deleteMessage(delChatId, delMessageId), { chat_id: delChatId });
@@ -62339,7 +62368,7 @@ async function executeForwardMessage(args) {
     throw new Error("forward_message: from_chat_id is required");
   if (!args.message_id)
     throw new Error("forward_message: message_id is required");
-  const fwdChatId = args.chat_id;
+  const fwdChatId = String(args.chat_id ?? "");
   const fwdFromChatId = args.from_chat_id;
   const fwdMsgId = Number(args.message_id);
   assertAllowedChat(fwdChatId);
@@ -62371,7 +62400,7 @@ async function executeGetRecentMessages(args) {
   }
   if (!args.chat_id)
     throw new Error("get_recent_messages: chat_id is required");
-  const chat_id = args.chat_id;
+  const chat_id = String(args.chat_id ?? "");
   assertAllowedChat(chat_id);
   const rawThread = args.message_thread_id;
   let thread_id;

package/telegram-plugin/gateway/gateway.ts

@@ -1030,11 +1030,12 @@ function loadAccess(): Access {
   return BOOT_ACCESS ?? readAccessFile()
 }
 
-function assertAllowedChat(chat_id: string): void {
+function assertAllowedChat(chat_id: string | number): void {
+  const id = String(chat_id)
   const access = loadAccess()
-  if (access.allowFrom.includes(chat_id)) return
-  if (chat_id in access.groups) return
-  throw new Error(`chat ${chat_id} is not allowlisted — add via /telegram:access`)
+  if (access.allowFrom.includes(id)) return
+  if (id in access.groups) return
+  throw new Error(`chat ${id} is not allowlisted — add via /telegram:access`)
 }
 
 function saveAccess(a: Access): void {
@@ -7834,7 +7835,7 @@ async function executeToolCall(tool: string, args: Record<string, unknown>): Pro
 }
 
 async function executeSendChecklist(args: Record<string, unknown>): Promise<{ content: Array<{ type: string; text: string }> }> {
-  const chat_id = args.chat_id as string
+  const chat_id = String(args.chat_id ?? '')
   if (!chat_id) throw new Error('send_checklist: chat_id is required')
   const title = args.title as string | undefined
   if (!title) throw new Error('send_checklist: title is required')
@@ -7922,7 +7923,7 @@ async function executeLinearAgentSetup(args: Record<string, unknown>): Promise<{
 }
 
 async function executeUpdateChecklist(args: Record<string, unknown>): Promise<{ content: Array<{ type: string; text: string }> }> {
-  const chat_id = args.chat_id as string
+  const chat_id = String(args.chat_id ?? '')
   if (!chat_id) throw new Error('update_checklist: chat_id is required')
   const message_id = args.message_id as string | undefined
   if (!message_id) throw new Error('update_checklist: message_id is required')
@@ -7971,8 +7972,25 @@ async function executeReply(args: Record<string, unknown>): Promise<{ content: A
   // module-scope currentTurn, which a future refactor could let roll over
   // mid-call.
   const turn = currentTurn
-  const chat_id = args.chat_id as string
-  if (!chat_id) throw new Error('reply: chat_id is required')
+  const _rawChatId = String(args.chat_id ?? '')
+  if (!_rawChatId) throw new Error('reply: chat_id is required')
+  // Non-Claude models (e.g. Gemini via LiteLLM sr-* routing) sometimes pass a
+  // chat_id that is not in the allowlist — either an int/string mismatch, or
+  // the model echoing the wrong identifier from context. When the raw value
+  // fails the allowlist check and the active turn has a validated sessionChatId,
+  // fall back to the turn's origin chat so the reply still lands correctly.
+  const chat_id = (() => {
+    const _a = loadAccess()
+    if (_a.allowFrom.includes(_rawChatId) || _rawChatId in _a.groups) return _rawChatId
+    if (turn?.sessionChatId && (_a.allowFrom.includes(turn.sessionChatId) || turn.sessionChatId in _a.groups)) {
+      process.stderr.write(
+        `telegram gateway: reply: model passed chat_id "${_rawChatId}" (not allowlisted) — ` +
+          `routing to active turn chat "${turn.sessionChatId}"\n`,
+      )
+      return turn.sessionChatId
+    }
+    return _rawChatId // let assertAllowedChat below throw the human-readable error
+  })()
   const rawText = args.text as string | undefined
   if (rawText == null || rawText === '') throw new Error('reply: text is required and cannot be empty')
   let text = repairEscapedWhitespace(rawText)
@@ -8997,7 +9015,7 @@ async function executeStreamReply(args: Record<string, unknown>): Promise<unknow
       args.text = scrub.scrubbed
       emitRuntimeMetric({
         kind: 'voice_scrub_applied',
-        chatKey: statusKey(args.chat_id as string, args.message_thread_id != null
+        chatKey: statusKey(String(args.chat_id ?? ''), args.message_thread_id != null
           ? Number(args.message_thread_id) : undefined),
         replaced: scrub.replaced,
         site: 'stream_reply',
@@ -9012,7 +9030,7 @@ async function executeStreamReply(args: Record<string, unknown>): Promise<unknow
   // Only check on done=true (the terminal call); intermediate
   // streaming chunks are progress edits, not full sends.
   if (args.done === true) {
-    const sChatId = args.chat_id as string
+    const sChatId = String(args.chat_id ?? '')
     const sThreadId = args.message_thread_id != null ? Number(args.message_thread_id) : undefined
     const sText = args.text as string
     const dup = outboundDedup.check(sChatId, sThreadId, sText, Date.now(), currentTurn?.registryKey ?? null)
@@ -9028,7 +9046,7 @@ async function executeStreamReply(args: Record<string, unknown>): Promise<unknow
   const access = loadAccess()
   // Detect chat type for throttle-default selection.
   // Private (DM) chats have positive numeric IDs; groups/channels are negative.
-  const streamChatId = args.chat_id as string
+  const streamChatId = String(args.chat_id ?? '')
   const streamIsPrivate = isDmChatId(streamChatId)
   const streamIsForumTopic = args.message_thread_id != null && args.message_thread_id !== ''
   // Pre-allocated draft handoff removed in #553 PR 5 — draft-stream
@@ -9192,7 +9210,7 @@ async function executeStreamReply(args: Record<string, unknown>): Promise<unknow
   if (result.messageId != null) {
     try {
       progressDriver?.recordOutboundDelivered(
-        args.chat_id as string,
+        String(args.chat_id ?? ''),
         args.message_thread_id as string | undefined,
       )
     } catch { /* best-effort signal */ }
@@ -9207,7 +9225,7 @@ async function executeStreamReply(args: Record<string, unknown>): Promise<unknow
         ? Number(args.message_thread_id)
         : undefined
       signalTracker.noteSignal(
-        statusKey(args.chat_id as string, threadIdNum),
+        statusKey(String(args.chat_id ?? ''), threadIdNum),
         Date.now(),
       )
     } catch { /* best-effort signal */ }
@@ -9220,13 +9238,13 @@ async function executeStreamReply(args: Record<string, unknown>): Promise<unknow
     && streamButtonMeta != null
     && streamButtonMeta.size > 0
   ) {
-    rememberAgentButtonMeta(args.chat_id as string, result.messageId, streamButtonMeta)
+    rememberAgentButtonMeta(String(args.chat_id ?? ''), result.messageId, streamButtonMeta)
   }
   // #546 dedup record: capture the final stream_reply text on the
   // terminal call so a subsequent retry (different bridge, same
   // content) lands as a no-op instead of a second message.
   if (args.done === true && result.messageId != null) {
-    const sChatId = args.chat_id as string
+    const sChatId = String(args.chat_id ?? '')
     const sThreadId = args.message_thread_id != null ? Number(args.message_thread_id) : undefined
     outboundDedup.record(sChatId, sThreadId, args.text as string, Date.now(), currentTurn?.registryKey ?? null)
     // #1445 cross-turn pending-async ambient. The terminal stream_reply
@@ -9306,7 +9324,7 @@ async function executeStreamReply(args: Record<string, unknown>): Promise<unknow
   // (stream-reply-handler.ts:305) at this point — earlier failures
   // throw or return before reaching here.
   {
-    const sChat = args.chat_id as string
+    const sChat = String(args.chat_id ?? '')
     const sThread = resolveThreadId(sChat, args.message_thread_id as string | undefined)
     // Component 1: pass the turn (finalAnswerDelivered set above for a
     // final stream emit). Interim stream chunks leave it false → no
@@ -9326,7 +9344,7 @@ async function executeProgressUpdate(args: Record<string, unknown>): Promise<unk
   if (!args.chat_id) throw new Error('progress_update: chat_id is required')
   if (!args.text) throw new Error('progress_update: text is required')
 
-  const chat_id = args.chat_id as string
+  const chat_id = String(args.chat_id ?? '')
   let text = args.text as string
   const threadId = resolveThreadId(chat_id, args.message_thread_id as string | undefined)
   const key = statusKey(chat_id, threadId)
@@ -9810,7 +9828,7 @@ function renderVaultRequestSaveCard(req: PendingVaultRequestSave, agentSlug: str
  * written to vault only on user tap. See #969 P1a.
  */
 async function executeVaultRequestSave(args: Record<string, unknown>): Promise<{ content: Array<{ type: string; text: string }> }> {
-  const chat_id = args.chat_id as string
+  const chat_id = String(args.chat_id ?? '')
   if (!chat_id) throw new Error('vault_request_save: chat_id is required')
   const key = args.key as string
   if (!key || typeof key !== 'string') throw new Error('vault_request_save: key is required')
@@ -9954,7 +9972,7 @@ function renderSecretRequestCard(req: PendingSecretRequest): string {
  * capture (the operator's next message after they tap [Provide securely]).
  */
 async function executeRequestSecret(args: Record<string, unknown>): Promise<{ content: Array<{ type: string; text: string }> }> {
-  const chat_id = args.chat_id as string
+  const chat_id = String(args.chat_id ?? '')
   if (!chat_id) throw new Error('request_secret: chat_id is required')
   const key = args.key as string
   if (!key || typeof key !== 'string') throw new Error('request_secret: key is required')
@@ -10238,7 +10256,7 @@ function renderVaultRequestAccessCard(req: PendingVaultRequestAccess): string {
  * the agent itself can only REQUEST.
  */
 async function executeVaultRequestAccess(args: Record<string, unknown>): Promise<{ content: Array<{ type: string; text: string }> }> {
-  const chat_id = args.chat_id as string
+  const chat_id = String(args.chat_id ?? '')
   if (!chat_id) throw new Error('vault_request_access: chat_id is required')
   const key = args.key as string
   if (!key || typeof key !== 'string') throw new Error('vault_request_access: key is required')
@@ -10356,8 +10374,8 @@ async function executeReact(args: Record<string, unknown>): Promise<unknown> {
   if (!args.chat_id) throw new Error('react: chat_id is required')
   if (!args.message_id) throw new Error('react: message_id is required')
   if (!args.emoji) throw new Error('react: emoji is required')
-  assertAllowedChat(args.chat_id as string)
-  await lockedBot.api.setMessageReaction(args.chat_id as string, Number(args.message_id), [
+  assertAllowedChat(String(args.chat_id ?? ''))
+  await lockedBot.api.setMessageReaction(String(args.chat_id ?? ''), Number(args.message_id), [
     { type: 'emoji', emoji: args.emoji as ReactionTypeEmoji['emoji'] },
   ])
   return { content: [{ type: 'text', text: 'reacted' }] }
@@ -10401,7 +10419,7 @@ async function executeEditMessage(args: Record<string, unknown>): Promise<unknow
   if (!args.chat_id) throw new Error('edit_message: chat_id is required')
   if (!args.message_id) throw new Error('edit_message: message_id is required')
   if (args.text == null || args.text === '') throw new Error('edit_message: text is required and cannot be empty')
-  assertAllowedChat(args.chat_id as string)
+  assertAllowedChat(String(args.chat_id ?? ''))
   const editAccess = loadAccess()
   const editConfigMode = editAccess.parseMode ?? 'html'
   const editFormat = (args.format as string | undefined) ?? editConfigMode
@@ -10419,7 +10437,7 @@ async function executeEditMessage(args: Record<string, unknown>): Promise<unknow
       editRawText = scrub.scrubbed
       emitRuntimeMetric({
         kind: 'voice_scrub_applied',
-        chatKey: statusKey(args.chat_id as string, undefined),
+        chatKey: statusKey(String(args.chat_id ?? ''), undefined),
         replaced: scrub.replaced,
         site: 'edit_message',
       })
@@ -10439,14 +10457,14 @@ async function executeEditMessage(args: Record<string, unknown>): Promise<unknow
   }
   const edited = await robustApiCall(
     () => lockedBot.api.editMessageText(
-      args.chat_id as string, Number(args.message_id), editText,
+      String(args.chat_id ?? ''), Number(args.message_id), editText,
       ...(editParseMode ? [{ parse_mode: editParseMode }] : []),
     ),
   )
   const id = typeof edited === 'object' && edited ? (edited as any).message_id : args.message_id
   if (HISTORY_ENABLED) {
     try {
-      recordEdit({ chat_id: args.chat_id as string, message_id: Number(args.message_id), text: args.text as string })
+      recordEdit({ chat_id: String(args.chat_id ?? ''), message_id: Number(args.message_id), text: args.text as string })
     } catch (err) {
       process.stderr.write(`telegram gateway: history recordEdit failed: ${err}\n`)
     }
@@ -10456,7 +10474,7 @@ async function executeEditMessage(args: Record<string, unknown>): Promise<unknow
 
 async function executeSendTyping(args: Record<string, unknown>): Promise<unknown> {
   if (!args.chat_id) throw new Error('send_typing: chat_id is required')
-  const stChatId = args.chat_id as string
+  const stChatId = String(args.chat_id ?? '')
   assertAllowedChat(stChatId)
   // #273: granular chat actions. Default 'typing' preserves the
   // existing tool semantics; agents can opt in to upload_document,
@@ -10490,7 +10508,7 @@ async function executeSendTyping(args: Record<string, unknown>): Promise<unknown
 async function executePinMessage(args: Record<string, unknown>): Promise<unknown> {
   if (!args.chat_id) throw new Error('pin_message: chat_id is required')
   if (!args.message_id) throw new Error('pin_message: message_id is required')
-  const pinChatId = args.chat_id as string
+  const pinChatId = String(args.chat_id ?? '')
   assertAllowedChat(pinChatId)
   // #1075: wrap through robustApiCall so flood-wait / transient network
   // errors are retried. THREAD_NOT_FOUND on a stale topic surfaces to the
@@ -10506,7 +10524,7 @@ async function executePinMessage(args: Record<string, unknown>): Promise<unknown
 async function executeDeleteMessage(args: Record<string, unknown>): Promise<unknown> {
   if (!args.chat_id) throw new Error('delete_message: chat_id is required')
   if (!args.message_id) throw new Error('delete_message: message_id is required')
-  const delChatId = args.chat_id as string
+  const delChatId = String(args.chat_id ?? '')
   const delMessageId = Number(args.message_id)
   assertAllowedChat(delChatId)
   await robustApiCall(() => lockedBot.api.deleteMessage(delChatId, delMessageId), { chat_id: delChatId })
@@ -10522,7 +10540,7 @@ async function executeForwardMessage(args: Record<string, unknown>): Promise<unk
   if (!args.chat_id) throw new Error('forward_message: chat_id is required')
   if (!args.from_chat_id) throw new Error('forward_message: from_chat_id is required')
   if (!args.message_id) throw new Error('forward_message: message_id is required')
-  const fwdChatId = args.chat_id as string
+  const fwdChatId = String(args.chat_id ?? '')
   const fwdFromChatId = args.from_chat_id as string
   const fwdMsgId = Number(args.message_id)
   assertAllowedChat(fwdChatId)
@@ -10556,7 +10574,7 @@ async function executeGetRecentMessages(args: Record<string, unknown>): Promise<
     }
   }
   if (!args.chat_id) throw new Error('get_recent_messages: chat_id is required')
-  const chat_id = args.chat_id as string
+  const chat_id = String(args.chat_id ?? '')
   assertAllowedChat(chat_id)
   const rawThread = args.message_thread_id as string | undefined
   let thread_id: number | null | undefined

package/telegram-plugin/gateway/model-command.ts

@@ -144,12 +144,14 @@ const PERSIST_NOTE =
   '<i>Session-only — lasts until restart. To persist, set <code>model:</code> in switchroom.yaml and restart.</i>'
 
 function helpText(deps: ModelCommandDeps, reason?: string): ModelCommandReply {
+  const srAliasExamples = Object.keys(SR_MODEL_ALIASES).map(a => `<code>${a}</code>`).join(' · ')
   const lines: string[] = []
   if (reason) lines.push(`⚠️ ${deps.escapeHtml(reason)}`)
   lines.push(
     '<b>/model</b> — show or switch the Claude model',
     '<code>/model</code> — show the configured model',
     `<code>/model &lt;name&gt;</code> — switch the live session (${MODEL_ALIASES.map(a => `<code>${a}</code>`).join(' · ')} or a full model id)`,
+    `<i>OpenRouter shortcuts:</i> ${srAliasExamples}`,
     PERSIST_NOTE,
   )
   return { text: lines.join('\n'), html: true }
@@ -164,11 +166,13 @@ export async function handleModelCommand(
   if (parsed.kind === 'show') {
     const configured = deps.getConfiguredModel()
     const shown = configured && configured.length > 0 ? configured : 'default'
+    const srAliasExamples = Object.keys(SR_MODEL_ALIASES).map(a => `<code>/model ${a}</code>`).join(' · ')
     return {
       text: [
         `<b>Model — ${deps.escapeHtml(deps.getAgentName())}</b>`,
         `Configured: <code>${deps.escapeHtml(shown)}</code>`,
         `Switch the live session: ${MODEL_ALIASES.map(a => `<code>/model ${a}</code>`).join(' · ')}`,
+        `OpenRouter shortcuts: ${srAliasExamples}`,
         'or <code>/model &lt;full-model-id&gt;</code>',
         PERSIST_NOTE,
       ].join('\n'),
@@ -182,15 +186,18 @@ export async function handleModelCommand(
     return helpText(deps, `not a valid model name: ${parsed.model}`)
   }
 
+  // Expand short aliases: `flash` → `sr-gemini-2.5-flash`, `codex` → `sr-codex-5.5`, etc.
+  const model = expandSrAlias(parsed.model)
+
   // sr-* → Claude: an in-place `/model` inject would leave LiteLLM routing
   // active in the live session because the sr-* model context was set by
   // the proxy at session start, not by claude's own REPL. A graceful restart
   // is the only clean path back to the native OAuth route. This matches the
   // behaviour of the `/restart` command (same mechanism, same marker logic).
   const currentSession = deps.getActiveSessionModel()
-  if (currentSession !== null && isSrModel(currentSession) && isClaudeModel(parsed.model)) {
+  if (currentSession !== null && isSrModel(currentSession) && isClaudeModel(model)) {
     try {
-      await deps.scheduleRestart(`user: /model ${parsed.model} (sr-to-claude restart)`)
+      await deps.scheduleRestart(`user: /model ${model} (sr-to-claude restart)`)
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err)
       return {
@@ -207,10 +214,10 @@ export async function handleModelCommand(
     }
   }
 
-  const verbHtml = `<code>/model ${deps.escapeHtml(parsed.model)}</code>`
+  const verbHtml = `<code>/model ${deps.escapeHtml(model)}</code>`
   let result: InjectResult
   try {
-    result = await deps.inject(deps.getAgentName(), `/model ${parsed.model}`)
+    result = await deps.inject(deps.getAgentName(), `/model ${model}`)
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err)
     return {
@@ -315,6 +322,27 @@ export const SR_MODEL_LABELS: Record<string, string> = {
   'sr-deepseek-r1': 'DeepSeek R1',
   'sr-deepseek-v3': 'DeepSeek V3',
   'sr-glm-5': 'GLM-5',
+  'sr-codex-5.5': 'Codex 5.5',
+}
+
+/**
+ * Short text-command aliases for sr-* models. These let the operator type
+ * `/model flash`, `/model codex`, etc. instead of the full `sr-*` id.
+ * Expanded in handleModelCommand before injection; the full sr-* id is what
+ * reaches the agent session and LiteLLM.
+ */
+export const SR_MODEL_ALIASES: Record<string, string> = {
+  flash: 'sr-gemini-2.5-flash',
+  gemini: 'sr-gemini-2.5-pro',
+  deepseek: 'sr-deepseek-v3',
+  r1: 'sr-deepseek-r1',
+  glm: 'sr-glm-5',
+  codex: 'sr-codex-5.5',
+}
+
+/** Expand a short alias (case-insensitive) to its full sr-* id, or return the original. */
+export function expandSrAlias(arg: string): string {
+  return SR_MODEL_ALIASES[arg.toLowerCase()] ?? arg
 }
 
 function srFriendlyLabel(srName: string): string {

package/telegram-plugin/gateway/obligation-ledger.ts

@@ -381,6 +381,7 @@ export function buildObligationRepresentInbound(o: Obligation, now: number): Inb
       source: 'obligation_represent',
       origin_turn_id: o.originTurnId,
       represent_count: String(o.representCount + 1),
+      chat_id: o.chatId,
     },
   }
 }

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

@@ -13,7 +13,7 @@
  *      REPL verb — already on the inject allowlist) and relays the
  *      captured output, with the session-only persistence caveat.
  */
-import { describe, it, expect } from "vitest";
+import { describe, it, expect, beforeAll } from "vitest";
 import {
   parseModelCommand,
   handleModelCommand,
@@ -344,6 +344,60 @@ describe("inject allowlist contract", () => {
 // Picker-driven menu (v2) — buildModelMenu + handleModelMenuCallback
 // ---------------------------------------------------------------------------
 
+describe("SR_MODEL_ALIASES / expandSrAlias", () => {
+  let expandSrAlias: (arg: string) => string;
+  let SR_MODEL_ALIASES: Record<string, string>;
+
+  beforeAll(async () => {
+    const mod = await import("../gateway/model-command.js");
+    expandSrAlias = mod.expandSrAlias;
+    SR_MODEL_ALIASES = mod.SR_MODEL_ALIASES;
+  });
+
+  it("expands known short aliases to full sr-* ids", () => {
+    expect(expandSrAlias("flash")).toBe("sr-gemini-2.5-flash");
+    expect(expandSrAlias("gemini")).toBe("sr-gemini-2.5-pro");
+    expect(expandSrAlias("deepseek")).toBe("sr-deepseek-v3");
+    expect(expandSrAlias("r1")).toBe("sr-deepseek-r1");
+    expect(expandSrAlias("glm")).toBe("sr-glm-5");
+    expect(expandSrAlias("codex")).toBe("sr-codex-5.5");
+  });
+
+  it("is case-insensitive", () => {
+    expect(expandSrAlias("Flash")).toBe("sr-gemini-2.5-flash");
+    expect(expandSrAlias("CODEX")).toBe("sr-codex-5.5");
+  });
+
+  it("passes through unknown names unchanged", () => {
+    expect(expandSrAlias("opus")).toBe("opus");
+    expect(expandSrAlias("sr-gemini-2.5-flash")).toBe("sr-gemini-2.5-flash");
+    expect(expandSrAlias("claude-opus-4-8")).toBe("claude-opus-4-8");
+  });
+
+  it("every alias target is a valid sr-* model arg", () => {
+    for (const [alias, target] of Object.entries(SR_MODEL_ALIASES)) {
+      expect(target.startsWith("sr-"), `${alias} → ${target} must start with sr-`).toBe(true);
+    }
+  });
+
+  it("handleModelCommand injects expanded sr-* id, not the short alias", async () => {
+    const { deps, calls } = makeDeps({ getActiveSessionModel: () => null });
+    await handleModelCommand({ kind: "set", model: "flash" }, deps);
+    expect(calls).toHaveLength(1);
+    expect(calls[0].command).toBe("/model sr-gemini-2.5-flash");
+  });
+
+  it("handleModelCommand with alias schedules restart when session is on sr-*", async () => {
+    const { deps, calls, restartCalls } = makeDeps({
+      getActiveSessionModel: () => "sr-deepseek-v3",
+    });
+    await handleModelCommand({ kind: "set", model: "opus" }, deps);
+    expect(calls).toHaveLength(0);
+    expect(restartCalls).toHaveLength(1);
+    expect(restartCalls[0]).toContain("opus");
+  });
+});
+
 import {
   buildModelMenu,
   handleModelMenuCallback,

package/telegram-plugin/tests/obligation-ledger.test.ts

@@ -184,6 +184,7 @@ describe("buildObligationRepresentInbound", () => {
     expect(m.meta.origin_turn_id).toBe("-100123:3#715");
     expect(m.meta.source).toBe("obligation_represent"); // synthetic → not tracked, no new obligation
     expect(m.meta.represent_count).toBe("1");
+    expect(m.meta.chat_id).toBe("-100123"); // Bug C fix: chat_id in meta drives the <channel> tag
     expect(m.text).toContain("do the Meta report");
     expect(m.text).toMatch(/answer it now|reply tool/i);
   });

package/telegram-plugin/uat/scenarios/jtbd-model-litellm-sr-dm.test.ts

@@ -42,9 +42,11 @@ describe("uat: /model sr-* LiteLLM routing — section headers + session switch
       const sc = await spinUp({ agent: AGENT });
       try {
         await sc.sendDM("/model");
+        // 60s — if an obligation turn is being processed when /model lands,
+        // the menu may be buffered until the turn drains (~40s max).
         const menu = await sc.expectMessage(/Default \(new sessions\):/i, {
           from: "bot",
-          timeout: 30_000,
+          timeout: 60_000,
         });
 
         // ── 1. Section headers ──────────────────────────────────────────