fix: unify inbound sender labels

src/imessage/monitor.skips-group-messages-without-mention-by-default.test.ts

@@ -461,4 +461,35 @@ describe("monitorIMessageProvider", () => {
 
     expect(replyMock).not.toHaveBeenCalled();
   });
+
+  it("prefixes group message bodies with sender", async () => {
+    const run = monitorIMessageProvider();
+    await waitForSubscribe();
+
+    notificationHandler?.({
+      method: "message",
+      params: {
+        message: {
+          id: 11,
+          chat_id: 99,
+          chat_name: "Test Group",
+          sender: "+15550001111",
+          is_from_me: false,
+          text: "@clawd hi",
+          is_group: true,
+          created_at: "2026-01-17T00:00:00Z",
+        },
+      },
+    });
+
+    await flush();
+    closeResolve?.();
+    await run;
+
+    expect(replyMock).toHaveBeenCalled();
+    const ctx = replyMock.mock.calls[0]?.[0];
+    const body = ctx?.Body ?? "";
+    expect(body).toContain("Test Group id:99");
+    expect(body).toContain("+15550001111: @clawd hi");
+  });
 });

src/imessage/monitor/monitor-provider.ts

@@ -11,7 +11,7 @@ import {
 } from "../../auto-reply/reply/response-prefix-template.js";
 import { resolveTextChunkLimit } from "../../auto-reply/chunk.js";
 import { hasControlCommand } from "../../auto-reply/command-detection.js";
-import { formatAgentEnvelope } from "../../auto-reply/envelope.js";
+import { formatInboundEnvelope } from "../../auto-reply/envelope.js";
 import {
   createInboundDebouncer,
   resolveInboundDebounceMs,
@@ -363,11 +363,13 @@ export async function monitorIMessageProvider(opts: MonitorIMessageOpts = {}): P
     const fromLabel = isGroup
       ? `${message.chat_name || "iMessage Group"} id:${chatId ?? "unknown"}`
       : `${senderNormalized} id:${sender}`;
-    const body = formatAgentEnvelope({
+    const body = formatInboundEnvelope({
       channel: "iMessage",
       from: fromLabel,
       timestamp: createdAt,
       body: bodyText,
+      chatType: isGroup ? "group" : "direct",
+      sender: { name: senderNormalized, id: sender },
     });
     let combinedBody = body;
     if (isGroup && historyKey && historyLimit > 0) {
@@ -377,13 +379,13 @@ export async function monitorIMessageProvider(opts: MonitorIMessageOpts = {}): P
         limit: historyLimit,
         currentMessage: combinedBody,
         formatEntry: (entry) =>
-          formatAgentEnvelope({
+          formatInboundEnvelope({
             channel: "iMessage",
             from: fromLabel,
             timestamp: entry.timestamp,
-            body: `${entry.sender}: ${entry.body}${
-              entry.messageId ? ` [id:${entry.messageId}]` : ""
-            }`,
+            body: `${entry.body}${entry.messageId ? ` [id:${entry.messageId}]` : ""}`,
+            chatType: "group",
+            senderLabel: entry.sender,
           }),
       });
     }