switchroom 0.14.41 → 0.14.42

package/dist/cli/switchroom.js

@@ -49462,8 +49462,8 @@ var {
 } = import__.default;
 
 // src/build-info.ts
-var VERSION = "0.14.41";
-var COMMIT_SHA = "747ab2f1";
+var VERSION = "0.14.42";
+var COMMIT_SHA = "6da4313d";
 
 // src/cli/agent.ts
 init_source();

package/package.json

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

@@ -44777,6 +44777,12 @@ function resolveOutboundTopic(config, event) {
       return aliasToId(cfg, ADMIN_ALIAS) ?? cfg.default_topic_id;
   }
 }
+function topicForRecipient(args) {
+  const { recipientChatId, resolvedTopic, supergroupChatId } = args;
+  if (resolvedTopic == null || supergroupChatId == null)
+    return;
+  return String(recipientChatId) === String(supergroupChatId) ? resolvedTopic : undefined;
+}
 
 // ../src/agents/perf.ts
 import { existsSync as existsSync18, readFileSync as readFileSync14 } from "node:fs";
@@ -51865,10 +51871,10 @@ function sweepStaleTurnActiveMarker(stateDir, opts) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.14.41";
-var COMMIT_SHA = "747ab2f1";
-var COMMIT_DATE = "2026-06-02T11:03:39Z";
-var LATEST_PR = 2095;
+var VERSION = "0.14.42";
+var COMMIT_SHA = "6da4313d";
+var COMMIT_DATE = "2026-06-02T22:14:58Z";
+var LATEST_PR = 2097;
 var COMMITS_AHEAD_OF_TAG = 0;
 
 // gateway/boot-version.ts
@@ -53361,14 +53367,18 @@ function postPermissionResumeMessage(opts) {
     timeoutMinutes: opts.timeoutMinutes
   });
   const turn = currentTurn;
-  const targets = turn != null ? [{ chatId: turn.sessionChatId, threadId: turn.sessionThreadId }] : loadAccess().allowFrom.map((chatId) => ({
-    chatId,
-    threadId: resolveAgentOutboundTopic({
+  const targets = turn != null ? [{ chatId: turn.sessionChatId, threadId: turn.sessionThreadId }] : (() => {
+    const sg = resolveAgentSupergroupChatId();
+    const topic = resolveAgentOutboundTopic({
       kind: "permission",
       turnInitiated: false,
       originThreadId: undefined
-    })
-  }));
+    });
+    return loadAccess().allowFrom.map((chatId) => ({
+      chatId,
+      threadId: topicForRecipient({ recipientChatId: chatId, resolvedTopic: topic, supergroupChatId: sg })
+    }));
+  })();
   for (const { chatId, threadId } of targets) {
     swallowingApiCall(() => bot.api.sendMessage(chatId, text, {
       parse_mode: "HTML",
@@ -54479,11 +54489,13 @@ var ipcServer = createIpcServer({
       turnInitiated: activeTurn != null,
       originThreadId: activeTurn?.sessionThreadId
     });
+    const permSupergroup = resolveAgentSupergroupChatId();
     for (const chat_id of access.allowFrom) {
+      const permThread = topicForRecipient({ recipientChatId: chat_id, resolvedTopic: permTopic, supergroupChatId: permSupergroup });
       bot.api.sendMessage(chat_id, text, {
         parse_mode: "HTML",
         reply_markup: keyboard,
-        ...permTopic != null ? { message_thread_id: permTopic } : {}
+        ...permThread != null ? { message_thread_id: permThread } : {}
       }).catch((e) => {
         process.stderr.write(`telegram gateway: permission_request send to ${chat_id} failed: ${e}
 `);
@@ -54547,9 +54559,13 @@ var ipcServer = createIpcServer({
         if (operator === undefined)
           return null;
         const activeTurn = currentTurn;
-        const driveTopic = resolveAgentOutboundTopic({
-          kind: "hostd-approval",
-          originThreadId: activeTurn?.sessionThreadId
+        const driveTopic = topicForRecipient({
+          recipientChatId: operator,
+          resolvedTopic: resolveAgentOutboundTopic({
+            kind: "hostd-approval",
+            originThreadId: activeTurn?.sessionThreadId
+          }),
+          supergroupChatId: resolveAgentSupergroupChatId()
         });
         return {
           chatId: operator,
@@ -54605,9 +54621,13 @@ var ipcServer = createIpcServer({
         if (operator === undefined)
           return null;
         const activeTurn = currentTurn;
-        const ms365Topic = resolveAgentOutboundTopic({
-          kind: "hostd-approval",
-          originThreadId: activeTurn?.sessionThreadId
+        const ms365Topic = topicForRecipient({
+          recipientChatId: operator,
+          resolvedTopic: resolveAgentOutboundTopic({
+            kind: "hostd-approval",
+            originThreadId: activeTurn?.sessionThreadId
+          }),
+          supergroupChatId: resolveAgentSupergroupChatId()
         });
         return {
           chatId: operator,
@@ -54662,9 +54682,13 @@ var ipcServer = createIpcServer({
         if (operator === undefined)
           return null;
         const activeTurn = currentTurn;
-        const cfgTopic = resolveAgentOutboundTopic({
-          kind: "hostd-approval",
-          originThreadId: activeTurn?.sessionThreadId
+        const cfgTopic = topicForRecipient({
+          recipientChatId: operator,
+          resolvedTopic: resolveAgentOutboundTopic({
+            kind: "hostd-approval",
+            originThreadId: activeTurn?.sessionThreadId
+          }),
+          supergroupChatId: resolveAgentSupergroupChatId()
         });
         return {
           chatId: operator,
@@ -58229,6 +58253,22 @@ function resolveAgentOutboundTopic(event) {
     return;
   }
 }
+function resolveAgentSupergroupChatId() {
+  const agentName3 = process.env.SWITCHROOM_AGENT_NAME;
+  if (!agentName3)
+    return;
+  try {
+    const cfg = loadConfig2();
+    const rawAgent = cfg.agents?.[agentName3];
+    if (!rawAgent)
+      return;
+    const resolved = resolveAgentConfig2(cfg.defaults, cfg.profiles, rawAgent);
+    const tg = resolved.channels?.telegram;
+    return tg?.chat_id != null ? String(tg.chat_id) : undefined;
+  } catch {
+    return;
+  }
+}
 function stampUserRestartReason(reason) {
   try {
     writeCleanShutdownMarker(GATEWAY_CLEAN_SHUTDOWN_MARKER_PATH, {

package/telegram-plugin/gateway/gateway.ts

@@ -251,7 +251,7 @@ import { handleInjectCommand } from './inject-handler.js'
 import { type BannerState } from '../slot-banner.js'
 import { refreshBanner } from '../slot-banner-driver.js'
 import { loadConfig as loadSwitchroomConfig, findConfigFile as findSwitchroomConfigFile } from '../../src/config/loader.js'; import { resolveAgentConfig } from '../../src/config/merge.js'
-import { resolveOutboundTopic as resolveOutboundTopicHelper, type TopicRouterConfig as _OutboundRouterConfig } from '../../src/telegram/topic-router.js'
+import { resolveOutboundTopic as resolveOutboundTopicHelper, topicForRecipient, type TopicRouterConfig as _OutboundRouterConfig } from '../../src/telegram/topic-router.js'
 import { readTurnUsages } from '../../src/agents/perf.js'
 import { decideProactiveCompact, initialCompactState, type CompactState } from './proactive-compact.js'
 import { nextCompactNotify, idleCompactNotifyState, type CompactNotifyState } from './compact-notify.js'
@@ -2273,14 +2273,20 @@ function postPermissionResumeMessage(opts: {
   const targets: Array<{ chatId: string; threadId: number | undefined }> =
     turn != null
       ? [{ chatId: turn.sessionChatId, threadId: turn.sessionThreadId }]
-      : loadAccess().allowFrom.map(chatId => ({
-          chatId,
-          threadId: resolveAgentOutboundTopic({
+      : (() => {
+          const sg = resolveAgentSupergroupChatId()
+          const topic = resolveAgentOutboundTopic({
             kind: 'permission',
             turnInitiated: false,
             originThreadId: undefined,
-          }),
-        }))
+          })
+          // allowFrom is normally operator DMs — attach the topic only to a
+          // recipient that owns it (the supergroup), never a DM (marko wedge).
+          return loadAccess().allowFrom.map(chatId => ({
+            chatId,
+            threadId: topicForRecipient({ recipientChatId: chatId, resolvedTopic: topic, supergroupChatId: sg }),
+          }))
+        })()
   for (const { chatId, threadId } of targets) {
     // allow-raw-bot-api: wrapped in swallowingApiCall (retry policy); thread-aware send
     void swallowingApiCall(
@@ -4664,16 +4670,20 @@ const ipcServer: IpcServer = createIpcServer({
       turnInitiated: activeTurn != null,
       originThreadId: activeTurn?.sessionThreadId,
     })
+    const permSupergroup = resolveAgentSupergroupChatId()
     for (const chat_id of access.allowFrom) {
       // parse_mode=HTML pairs with formatPermissionCardBody (#1790)
       // so the <b>/<i> tags render as formatting.
-      // PR4b emitter sweep — opts now optionally carries
-      // message_thread_id when supergroup mode is on.
+      // The resolved topic is valid only in the agent's supergroup — attach
+      // it ONLY when this recipient IS that supergroup. allowFrom DMs get the
+      // card thread-less; attaching a topic to a DM yields 400 "message thread
+      // not found" → card never arrives → auto-deny → wedge (marko 2026-06-02).
+      const permThread = topicForRecipient({ recipientChatId: chat_id, resolvedTopic: permTopic, supergroupChatId: permSupergroup })
       // allow-raw-bot-api: permission-request keyboard fan-out; topic-aware opts
       void bot.api.sendMessage(chat_id, text, {
         parse_mode: 'HTML',
         reply_markup: keyboard,
-        ...(permTopic != null ? { message_thread_id: permTopic } : {}),
+        ...(permThread != null ? { message_thread_id: permThread } : {}),
       }).catch(e => {
         process.stderr.write(`telegram gateway: permission_request send to ${chat_id} failed: ${e}\n`)
       })
@@ -4811,9 +4821,15 @@ const ipcServer: IpcServer = createIpcServer({
         // topic. Drive approval cards follow the originating turn
         // (operator-initiated tool call), admin alias fallback.
         const activeTurn = currentTurn
-        const driveTopic = resolveAgentOutboundTopic({
-          kind: 'hostd-approval',
-          originThreadId: activeTurn?.sessionThreadId,
+        // Attach the topic only when `operator` IS the agent's supergroup —
+        // operator DMs have no topics (marko brevo wedge, 2026-06-02).
+        const driveTopic = topicForRecipient({
+          recipientChatId: operator,
+          resolvedTopic: resolveAgentOutboundTopic({
+            kind: 'hostd-approval',
+            originThreadId: activeTurn?.sessionThreadId,
+          }),
+          supergroupChatId: resolveAgentSupergroupChatId(),
         })
         return {
           chatId: operator,
@@ -4884,9 +4900,14 @@ const ipcServer: IpcServer = createIpcServer({
         // alias fallback for background cases. Same shape as hostd /
         // drive approvals below.
         const activeTurn = currentTurn
-        const ms365Topic = resolveAgentOutboundTopic({
-          kind: 'hostd-approval',
-          originThreadId: activeTurn?.sessionThreadId,
+        // Topic valid only in the agent's supergroup — never on the operator DM.
+        const ms365Topic = topicForRecipient({
+          recipientChatId: operator,
+          resolvedTopic: resolveAgentOutboundTopic({
+            kind: 'hostd-approval',
+            originThreadId: activeTurn?.sessionThreadId,
+          }),
+          supergroupChatId: resolveAgentSupergroupChatId(),
         })
         return {
           chatId: operator,
@@ -4963,9 +4984,14 @@ const ipcServer: IpcServer = createIpcServer({
         // returns undefined for non-supergroup agents → behavior
         // unchanged.
         const activeTurn = currentTurn
-        const cfgTopic = resolveAgentOutboundTopic({
-          kind: 'hostd-approval',
-          originThreadId: activeTurn?.sessionThreadId,
+        // Topic valid only in the agent's supergroup — never on the operator DM.
+        const cfgTopic = topicForRecipient({
+          recipientChatId: operator,
+          resolvedTopic: resolveAgentOutboundTopic({
+            kind: 'hostd-approval',
+            originThreadId: activeTurn?.sessionThreadId,
+          }),
+          supergroupChatId: resolveAgentSupergroupChatId(),
         })
         return {
           chatId: operator,
@@ -11067,6 +11093,30 @@ function resolveAgentOutboundTopic(
   }
 }
 
+/**
+ * The agent's supergroup chat id (`channels.telegram.chat_id`) when it is in
+ * supergroup-owned mode, else undefined. A forum topic id resolved by
+ * {@link resolveAgentOutboundTopic} is valid ONLY in this chat — used by
+ * {@link topicForRecipient} to decide whether an approval/permission card sent
+ * to a given recipient (operator DMs vs the supergroup itself) may carry a
+ * `message_thread_id`. Attaching a topic to a DM is the marko brevo wedge
+ * (2026-06-02): the card fails with "message thread not found" and auto-denies.
+ */
+function resolveAgentSupergroupChatId(): string | undefined {
+  const agentName = process.env.SWITCHROOM_AGENT_NAME
+  if (!agentName) return undefined
+  try {
+    const cfg = loadSwitchroomConfig()
+    const rawAgent = cfg.agents?.[agentName]
+    if (!rawAgent) return undefined
+    const resolved = resolveAgentConfig(cfg.defaults, cfg.profiles, rawAgent)
+    const tg = resolved.channels?.telegram as { chat_id?: string | number } | undefined
+    return tg?.chat_id != null ? String(tg.chat_id) : undefined
+  } catch {
+    return undefined
+  }
+}
+
 /**
  * Stamp a user-facing restart reason into the clean-shutdown marker
  * (same file the SIGTERM handler writes to and the next session greeting