telegram: show name and id in envelope

src/telegram/bot.test.ts

@@ -53,6 +53,11 @@ describe("createTelegramBot", () => {
       chat: { id: 1234, type: "private" },
       text: "hello world",
       date: 1736380800, // 2025-01-09T00:00:00Z
+      from: {
+        first_name: "Ada",
+        last_name: "Lovelace",
+        username: "ada_bot",
+      },
     };
     await handler({
       message,
@@ -62,7 +67,9 @@ describe("createTelegramBot", () => {
 
     expect(replySpy).toHaveBeenCalledTimes(1);
     const payload = replySpy.mock.calls[0][0];
-    expect(payload.Body).toMatch(/^\[Telegram telegram:1234 2025-01-09 00:00]/);
+    expect(payload.Body).toMatch(
+      /^\[Telegram Ada Lovelace \(@ada_bot\) id:1234 2025-01-09 00:00]/,
+    );
     expect(payload.Body).toContain("hello world");
   });
 });

src/telegram/bot.ts

@@ -104,7 +104,9 @@ export function createTelegramBot(opts: TelegramBotOptions) {
 
       const body = formatAgentEnvelope({
         surface: "Telegram",
-        from: isGroup ? `group:${chatId}` : `telegram:${chatId}`,
+        from: isGroup
+          ? buildGroupLabel(msg, chatId)
+          : buildSenderLabel(msg, chatId),
         timestamp: msg.date ? msg.date * 1000 : undefined,
         body: rawBody,
       });
@@ -208,6 +210,25 @@ function buildSenderName(msg: TelegramMessage) {
   return name || undefined;
 }
 
+function buildSenderLabel(msg: TelegramMessage, chatId: number | string) {
+  const name = buildSenderName(msg);
+  const username = msg.from?.username ? `@${msg.from.username}` : undefined;
+  let label = name;
+  if (name && username) {
+    label = `${name} (${username})`;
+  } else if (!name && username) {
+    label = username;
+  }
+  const idPart = `id:${chatId}`;
+  return label ? `${label} ${idPart}` : idPart;
+}
+
+function buildGroupLabel(msg: TelegramMessage, chatId: number | string) {
+  const title = msg.chat?.title;
+  if (title) return `${title} id:${chatId}`;
+  return `group:${chatId}`;
+}
+
 function hasBotMention(msg: TelegramMessage, botUsername: string) {
   const text = (msg.text ?? msg.caption ?? "").toLowerCase();
   if (text.includes(`@${botUsername}`)) return true;