diff --git a/src/auto-reply/envelope.ts b/src/auto-reply/envelope.ts
index 357ae3d1f..026842013 100644
--- a/src/auto-reply/envelope.ts
+++ b/src/auto-reply/envelope.ts
@@ -196,8 +196,9 @@ export function formatInboundEnvelope(params: {
   const isDirect = !chatType || chatType === "direct";
   const resolvedSender = params.senderLabel?.trim() || resolveSenderLabel(params.sender ?? {});
   const body = !isDirect && resolvedSender ? `${resolvedSender}: ${params.body}` : params.body;
+  const channelWithType = !isDirect ? `${params.channel} (${chatType})` : params.channel;
   return formatAgentEnvelope({
-    channel: params.channel,
+    channel: channelWithType,
     from: params.from,
     timestamp: params.timestamp,
     previousTimestamp: params.previousTimestamp,
diff --git a/src/imessage/monitor/monitor-provider.ts b/src/imessage/monitor/monitor-provider.ts
index d8d4b99ec..60e6d85d0 100644
--- a/src/imessage/monitor/monitor-provider.ts
+++ b/src/imessage/monitor/monitor-provider.ts
@@ -466,7 +466,7 @@ export async function monitorIMessageProvider(opts: MonitorIMessageOpts = {}): P
       });
     }
 
-    const imessageTo = (isGroup ? chatTarget : undefined) || `imessage:${sender}`;
+    const imessageTo = chatId ? `chat_id:${chatId}` : `imessage:${sender}`;
     const ctxPayload = finalizeInboundContext({
       Body: combinedBody,
       RawBody: bodyText,