refactor: centralize group sender identity

src/web/auto-reply.broadcast-groups.broadcasts-sequentially-configured-order.test.ts

@@ -216,12 +216,14 @@ describe("broadcast groups", () => {
 
     expect(resolver).toHaveBeenCalledTimes(2);
     for (const call of resolver.mock.calls.slice(0, 2)) {
-      const payload = call[0] as { Body: string };
+      const payload = call[0] as { Body: string; SenderName?: string; SenderE164?: string; SenderId?: string };
       expect(payload.Body).toContain("Chat messages since your last reply");
       expect(payload.Body).toContain("Alice (+111): hello group");
       expect(payload.Body).toContain("[message_id: g1]");
       expect(payload.Body).toContain("@bot ping");
-      expect(payload.Body).toContain("[from: Bob (+222)]");
+      expect(payload.SenderName).toBe("Bob");
+      expect(payload.SenderE164).toBe("+222");
+      expect(payload.SenderId).toBe("+222");
     }
 
     await capturedOnMessage?.({

src/web/auto-reply.web-auto-reply.requires-mention-group-chats-injects-history-replying.test.ts

@@ -166,7 +166,9 @@ describe("web auto-reply", () => {
     expect(payload.Body).toContain("Alice (+111): hello group");
     expect(payload.Body).toContain("[message_id: g1]");
     expect(payload.Body).toContain("@bot ping");
-    expect(payload.Body).toContain("[from: Bob (+222)]");
+    expect(payload.SenderName).toBe("Bob");
+    expect(payload.SenderE164).toBe("+222");
+    expect(payload.SenderId).toBe("+222");
   });
 
   it("bypasses mention gating for owner /new in group chats", async () => {

src/web/auto-reply.web-auto-reply.supports-always-group-activation-silent-token-preserves.test.ts

@@ -183,7 +183,9 @@ describe("web auto-reply", () => {
     expect(payload.Body).not.toContain("Chat messages since your last reply");
     expect(payload.Body).not.toContain("Alice (+111): first");
     expect(payload.Body).not.toContain("[message_id: g-always-1]");
-    expect(payload.Body).toContain("Bob: second");
+    expect(payload.Body).toContain("second");
+    expect(payload.SenderName).toBe("Bob");
+    expect(payload.SenderE164).toBe("+222");
     expect(reply).toHaveBeenCalledTimes(1);
 
     await cleanup();

src/web/auto-reply/monitor/message-line.ts

@@ -22,12 +22,8 @@ export function buildInboundLine(params: {
     hasAllowFrom: (cfg.channels?.whatsapp?.allowFrom?.length ?? 0) > 0,
   });
   const prefixStr = messagePrefix ? `${messagePrefix} ` : "";
-  const senderLabel =
-    msg.chatType === "group" ? `${msg.senderName ?? msg.senderE164 ?? "Someone"}: ` : "";
   const replyContext = formatReplyContext(msg);
-  const baseLine = `${prefixStr}${senderLabel}${msg.body}${
-    replyContext ? `\n\n${replyContext}` : ""
-  }`;
+  const baseLine = `${prefixStr}${msg.body}${replyContext ? `\n\n${replyContext}` : ""}`;
 
   // Wrap with standardized envelope for the agent.
   return formatAgentEnvelope({

src/web/auto-reply/monitor/process-message.ts

@@ -9,7 +9,7 @@ import {
 } from "../../../auto-reply/reply/response-prefix-template.js";
 import { resolveTextChunkLimit } from "../../../auto-reply/chunk.js";
 import { formatAgentEnvelope } from "../../../auto-reply/envelope.js";
-import { buildHistoryContext } from "../../../auto-reply/reply/history.js";
+import { buildHistoryContextFromEntries, type HistoryEntry } from "../../../auto-reply/reply/history.js";
 import { dispatchReplyWithBufferedBlockDispatcher } from "../../../auto-reply/reply/provider-dispatcher.js";
 import type { getReplyFromConfig } from "../../../auto-reply/reply.js";
 import type { ReplyPayload } from "../../../auto-reply/types.js";
@@ -77,30 +77,27 @@ export async function processMessage(params: {
   if (params.msg.chatType === "group") {
     const history = params.groupHistory ?? params.groupHistories.get(params.groupHistoryKey) ?? [];
     if (history.length > 0) {
-      const lineBreak = "\\n";
-      const historyText = history
-        .map((m) => {
-          const bodyWithId = m.id ? `${m.body}\n[message_id: ${m.id}]` : m.body;
+      const historyEntries: HistoryEntry[] = history.map((m) => ({
+        sender: m.sender,
+        body: m.body,
+        timestamp: m.timestamp,
+        messageId: m.id,
+      }));
+      combinedBody = buildHistoryContextFromEntries({
+        entries: historyEntries,
+        currentMessage: combinedBody,
+        excludeLast: false,
+        formatEntry: (entry) => {
+          const bodyWithId = entry.messageId ? `${entry.body}\n[message_id: ${entry.messageId}]` : entry.body;
           return formatAgentEnvelope({
             channel: "WhatsApp",
             from: conversationId,
-            timestamp: m.timestamp,
-            body: `${m.sender}: ${bodyWithId}`,
+            timestamp: entry.timestamp,
+            body: `${entry.sender}: ${bodyWithId}`,
           });
-        })
-        .join(lineBreak);
-      combinedBody = buildHistoryContext({
-        historyText,
-        currentMessage: combinedBody,
-        lineBreak,
+        },
       });
     }
-    // Always surface who sent the triggering message so the agent can address them.
-    const senderLabel =
-      params.msg.senderName && params.msg.senderE164
-        ? `${params.msg.senderName} (${params.msg.senderE164})`
-        : (params.msg.senderName ?? params.msg.senderE164 ?? "Unknown");
-    combinedBody = `${combinedBody}\\n[from: ${senderLabel}]`;
     shouldClearGroupHistory = !(params.suppressGroupHistoryClear ?? false);
   }