From 12e885da5f6935b88812bd6a910bf09d03e3457b Mon Sep 17 00:00:00 2001
From: Ayaan Zaidi <hi@obviy.us>
Date: Fri, 8 May 2026 18:17:45 +0530
Subject: [PATCH] refactor(telegram): simplify inbound watch log formatting

---
 .../src/bot-message-context.session.ts        |  9 ++++++-
 extensions/telegram/src/bot-message.ts        | 25 ++++++-------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/extensions/telegram/src/bot-message-context.session.ts b/extensions/telegram/src/bot-message-context.session.ts
index 930e5ce4b11..e7d7da22046 100644
--- a/extensions/telegram/src/bot-message-context.session.ts
+++ b/extensions/telegram/src/bot-message-context.session.ts
@@ -45,6 +45,13 @@ type FinalizedTelegramInboundContext = ReturnType<
   typeof import("./bot-message-context.session.runtime.js").finalizeInboundContext
 >;
 
+export type TelegramInboundContextPayload = FinalizedTelegramInboundContext & {
+  From: string;
+  To: string;
+  ChatType: string;
+  RawBody: string;
+};
+
 type TelegramMessageContextSessionRuntime =
   typeof import("./bot-message-context.session.runtime.js");
 
@@ -175,7 +182,7 @@ export async function buildTelegramInboundContextPayload(params: {
   topicName?: string;
   sessionRuntime?: TelegramMessageContextSessionRuntimeOverrides;
 }): Promise<{
-  ctxPayload: FinalizedTelegramInboundContext;
+  ctxPayload: TelegramInboundContextPayload;
   skillFilter: string[] | undefined;
   turn: {
     storePath: string;
diff --git a/extensions/telegram/src/bot-message.ts b/extensions/telegram/src/bot-message.ts
index 1cbf929f2f0..544ab337106 100644
--- a/extensions/telegram/src/bot-message.ts
+++ b/extensions/telegram/src/bot-message.ts
@@ -23,21 +23,16 @@ import type { TelegramReplyChainEntry } from "./message-cache.js";
 const telegramInboundLog = createSubsystemLogger("gateway/channels/telegram").child("inbound");
 
 export function formatTelegramInboundLogLine(params: {
-  from?: string;
-  to?: string;
-  chatType?: string;
-  body?: string;
+  from: string;
+  to: string;
+  chatType: string;
+  body: string;
   mediaType?: string;
 }): string {
-  const from = params.from || "unknown";
-  const to = params.to || "telegram";
-  const chatType = params.chatType || "direct";
   const kindLabel = params.mediaType ? `, ${params.mediaType}` : "";
-  const length = (params.body ?? "").length;
-  return `Inbound message ${from} -> ${to} (${chatType}${kindLabel}, ${length} chars)`;
+  return `Inbound message ${params.from} -> ${params.to} (${params.chatType}${kindLabel}, ${params.body.length} chars)`;
 }
 
-/** Dependencies injected once when creating the message processor. */
 type TelegramMessageProcessorDeps = Omit<
   BuildTelegramMessageContextParams,
   "primaryCtx" | "allMedia" | "storeAllowFrom" | "options"
@@ -142,11 +137,7 @@ export const createTelegramMessageProcessor = (deps: TelegramMessageProcessorDep
           ? `@${context.primaryCtx.me.username}`
           : context.ctxPayload.To,
         chatType: context.ctxPayload.ChatType,
-        body:
-          context.ctxPayload.RawBody ??
-          context.ctxPayload.BodyForCommands ??
-          context.ctxPayload.BodyForAgent ??
-          context.ctxPayload.Body,
+        body: context.ctxPayload.RawBody,
         mediaType: allMedia[0]?.contentType,
       }),
     );
@@ -177,9 +168,7 @@ export const createTelegramMessageProcessor = (deps: TelegramMessageProcessorDep
           "Something went wrong while processing your request. Please try again.",
           buildTelegramThreadParams(context.threadSpec),
         );
-      } catch {
-        // Best-effort fallback; delivery may fail if the bot was blocked or the chat is invalid.
-      }
+      } catch {}
     }
   };
 };