switchroom 0.14.44 → 0.14.45

package/telegram-plugin/gateway/gateway.ts

@@ -3537,18 +3537,24 @@ function emitGatewayOperatorEvent(event: OperatorEvent): void {
   // Fleet-shared / DM agents see `undefined` → no `message_thread_id`
   // is added to the broadcast opts → behavior unchanged.
   const opEventTopic = resolveAgentOutboundTopic({ kind: 'compact-watchdog' })
+  const opEventSupergroup = resolveAgentSupergroupChatId()
 
   process.stderr.write(
     `telegram gateway: operator-event posting agent=${agent} kind=${kind} to ${access.allowFrom.length} chat(s)` +
       (opEventTopic != null ? ` topic=${opEventTopic}` : '') + '\n',
   )
   for (const chat_id of access.allowFrom) {
+    // The resolved topic is valid ONLY in the agent's supergroup — attaching
+    // it to an operator DM recipient yields 400 "message thread not found" and
+    // the event silently fails to deliver (the marko #2096 class). Guard it:
+    // DM recipients get a thread-less send; the supergroup owner gets the lane.
+    const opEventThread = topicForRecipient({ recipientChatId: chat_id, resolvedTopic: opEventTopic, supergroupChatId: opEventSupergroup })
     // grammy's Other<...> opts type is generated and stricter than our
     // call shape; runtime accepts both. Cast through unknown.
     const opts = {
       parse_mode: 'HTML' as const,
       ...(renderedKeyboard ? { reply_markup: renderedKeyboard } : {}),
-      ...(opEventTopic != null ? { message_thread_id: opEventTopic } : {}),
+      ...(opEventThread != null ? { message_thread_id: opEventThread } : {}),
     }
     // Comment-only context for the reader; the lint marker on the
     // very next line is what unlocks the raw bot.api call.
@@ -10159,7 +10165,14 @@ async function handleInbound(
     // No staged entry to act on — fall through to normal handling.
   }
 
-  void bot.api.sendChatAction(chat_id, 'typing').catch(() => {})
+  // Typing indicator in the ORIGINATING topic — on a supergroup-topic inbound,
+  // an un-threaded sendChatAction shows "typing" in General, not the topic the
+  // user is in. messageThreadId is the inbound's thread (undefined in a DM).
+  void bot.api.sendChatAction(
+    chat_id,
+    'typing',
+    messageThreadId != null ? { message_thread_id: messageThreadId } : {},
+  ).catch(() => {})
 
   // Parse explicit prefixes first. `/steer ` / `/s ` opts IN to steering;
   // `/queue ` / `/q ` are legacy aliases that opt in to the new default (queued).
@@ -11088,10 +11101,14 @@ function resolveBootChatId(
   // → behavior unchanged (lands at chat-root as today). PR4b of
   // supergroup-mode rollout (docs/rfcs/supergroup-mode.md).
   const supergroupBootTopic = resolveAgentOutboundTopic({ kind: 'boot' })
+  const bootSupergroup = resolveAgentSupergroupChatId()
+  // The boot topic is valid only in the agent's supergroup — attach it per
+  // recipient so a DM owner doesn't 400 (marko #2096 class); the supergroup
+  // owner gets the boot/alerts lane, a DM gets a thread-less boot card.
 
   // 2. Env var
   const envChat = process.env.SUBAGENT_OWNER_CHAT_ID
-  if (envChat) return { chatId: envChat, threadId: supergroupBootTopic, ackMsgId: undefined }
+  if (envChat) return { chatId: envChat, threadId: topicForRecipient({ recipientChatId: envChat, resolvedTopic: supergroupBootTopic, supergroupChatId: bootSupergroup }), ackMsgId: undefined }
   // 3. Most-recent inbound from history
   if (HISTORY_ENABLED) {
     try {
@@ -11099,7 +11116,7 @@ function resolveBootChatId(
       const ownerChatId = access.allowFrom[0]
       if (ownerChatId) {
         const recent = queryHistory({ chat_id: ownerChatId, limit: 1 })
-        if (recent.length > 0) return { chatId: ownerChatId, threadId: supergroupBootTopic, ackMsgId: undefined }
+        if (recent.length > 0) return { chatId: ownerChatId, threadId: topicForRecipient({ recipientChatId: ownerChatId, resolvedTopic: supergroupBootTopic, supergroupChatId: bootSupergroup }), ackMsgId: undefined }
       }
     } catch {}
   }

package/telegram-plugin/hooks/tool-label-pretool.mjs

@@ -133,8 +133,9 @@ export function computeLabel(toolName, input) {
     }
   }
 
-  // MCP allowlist.
+  // MCP tools.
   if (typeof toolName === 'string' && toolName.startsWith('mcp__')) {
+    // Explicit labels / suppressions for the built-in servers.
     switch (toolName) {
       case 'mcp__switchroom-telegram__reply':
       case 'mcp__switchroom-telegram__stream_reply':
@@ -150,15 +151,46 @@ export function computeLabel(toolName, input) {
         return 'Searching memory'
       case 'mcp__hindsight__retain':
         return 'Saving memory'
-      // Explicit suppressions — return null so we don't emit a sidecar
-      // line at all. (Falling through to the default below produces the
-      // same effect, but listing these makes the intent obvious.)
+      // Explicit suppressions — return null so we don't emit a sidecar line.
       case 'mcp__switchroom-telegram__send_typing':
       case 'mcp__hindsight__sync_retain':
         return null
     }
-    // Any other mcp__* tool: not on the allowlist, no label.
-    return null
+    // Generic fallback for ANY other MCP tool (operator-configured servers
+    // — perplexity, webkite, gdrive, notion, …). These previously returned
+    // null → invisible in the live activity feed, so a research turn driven
+    // entirely by MCP tools read as pure silence (only a typing dot + the
+    // 👀 reaction) — the "I can't see what it's doing" report. Mirror the
+    // gateway's describeToolUse: friendly per-server labels, else a
+    // model-authored field, else a humanized tool name. NEVER label
+    // switchroom-telegram surface/control tools (they ARE the conversation).
+    const m = /^mcp__(.+?)__(.+)$/.exec(toolName)
+    if (!m) return null
+    const server = m[1].toLowerCase()
+    const tool = m[2].toLowerCase()
+    if (server === 'switchroom-telegram') return null
+    if (server === 'hindsight') return 'Working with memory'
+    if (server === 'google-workspace' || server === 'claude_ai_google_calendar')
+      return 'Checking your calendar'
+    if (server === 'claude_ai_gmail') return 'Checking your email'
+    if (server === 'claude_ai_google_drive' || server === 'gdrive')
+      return 'Looking through your files'
+    if (server === 'notion' || server === 'claude_ai_notion') return 'Checking your notes'
+    if (server === 'perplexity') {
+      const q = clip(String(i.query ?? i.description ?? ''), 60).trim()
+      return q ? `Searching the web for ${q}` : 'Searching the web'
+    }
+    if (server === 'webkite') {
+      const u = clip(urlHostPath(i.url ?? ''), 60).trim()
+      return u ? `Reading ${u}` : 'Reading the web'
+    }
+    // Unknown MCP server: prefer a model-authored field, else humanized tool.
+    const desc =
+      clip(String(i.description ?? ''), 60).trim() ||
+      clip(String(i.query ?? ''), 50).trim() ||
+      clip(String(i.title ?? ''), 50).trim()
+    if (desc) return desc
+    return `Using ${tool.replace(/[-_]+/g, ' ')}`
   }
 
   return null