fix: normalize outbound media payloads

src/infra/outbound/deliver.test.ts

@@ -201,13 +201,12 @@ describe("deliverOutboundPayloads", () => {
   it("normalizes payloads and drops empty entries", () => {
     const normalized = normalizeOutboundPayloads([
       { text: "hi" },
-      { mediaUrl: "https://x.test/a.jpg" },
+      { text: "MEDIA:https://x.test/a.jpg" },
       { text: " ", mediaUrls: [] },
     ]);
     expect(normalized).toEqual([
       { text: "hi", mediaUrls: [] },
       { text: "", mediaUrls: ["https://x.test/a.jpg"] },
-      { text: " ", mediaUrls: [] },
     ]);
   });
 

src/infra/outbound/message-action-runner.ts

@@ -586,12 +586,24 @@ async function handleSendAction(ctx: ResolvedActionContext): Promise<MessageActi
     }) ?? "";
 
   const parsed = parseReplyDirectives(message);
+  const mergedMediaUrls: string[] = [];
+  const seenMedia = new Set<string>();
+  const pushMedia = (value?: string | null) => {
+    const trimmed = value?.trim();
+    if (!trimmed) return;
+    if (seenMedia.has(trimmed)) return;
+    seenMedia.add(trimmed);
+    mergedMediaUrls.push(trimmed);
+  };
+  pushMedia(mediaHint);
+  for (const url of parsed.mediaUrls ?? []) pushMedia(url);
+  pushMedia(parsed.mediaUrl);
   message = parsed.text;
   params.message = message;
   if (!params.replyTo && parsed.replyToId) params.replyTo = parsed.replyToId;
   if (!params.media) {
     // Use path/filePath if media not set, then fall back to parsed directives
-    params.media = mediaHint || parsed.mediaUrls?.[0] || parsed.mediaUrl || undefined;
+    params.media = mergedMediaUrls[0] || undefined;
   }
 
   message = await maybeApplyCrossContextMarker({
@@ -630,6 +642,7 @@ async function handleSendAction(ctx: ResolvedActionContext): Promise<MessageActi
     to,
     message,
     mediaUrl: mediaUrl || undefined,
+    mediaUrls: mergedMediaUrls.length ? mergedMediaUrls : undefined,
     gifPlayback,
     bestEffort: bestEffort ?? undefined,
   });

src/infra/outbound/message.ts

@@ -17,6 +17,7 @@ import {
   type OutboundDeliveryResult,
   type OutboundSendDeps,
 } from "./deliver.js";
+import { normalizeReplyPayloadsForDelivery } from "./payloads.js";
 import type { OutboundChannel } from "./targets.js";
 import { resolveOutboundTarget } from "./targets.js";
 
@@ -34,6 +35,7 @@ type MessageSendParams = {
   content: string;
   channel?: string;
   mediaUrl?: string;
+  mediaUrls?: string[];
   gifPlayback?: boolean;
   accountId?: string;
   dryRun?: boolean;
@@ -53,6 +55,7 @@ export type MessageSendResult = {
   to: string;
   via: "direct" | "gateway";
   mediaUrl: string | null;
+  mediaUrls?: string[];
   result?: OutboundDeliveryResult | { messageId: string };
   dryRun?: boolean;
 };
@@ -115,13 +118,29 @@ export async function sendMessage(params: MessageSendParams): Promise<MessageSen
     throw new Error(`Unknown channel: ${channel}`);
   }
   const deliveryMode = plugin.outbound?.deliveryMode ?? "direct";
+  const normalizedPayloads = normalizeReplyPayloadsForDelivery([
+    {
+      text: params.content,
+      mediaUrl: params.mediaUrl,
+      mediaUrls: params.mediaUrls,
+    },
+  ]);
+  const mirrorText = normalizedPayloads
+    .map((payload) => payload.text)
+    .filter(Boolean)
+    .join("\n");
+  const mirrorMediaUrls = normalizedPayloads.flatMap(
+    (payload) => payload.mediaUrls ?? (payload.mediaUrl ? [payload.mediaUrl] : []),
+  );
+  const primaryMediaUrl = mirrorMediaUrls[0] ?? params.mediaUrl ?? null;
 
   if (params.dryRun) {
     return {
       channel,
       to: params.to,
       via: deliveryMode === "gateway" ? "gateway" : "direct",
-      mediaUrl: params.mediaUrl ?? null,
+      mediaUrl: primaryMediaUrl,
+      mediaUrls: mirrorMediaUrls.length ? mirrorMediaUrls : undefined,
       dryRun: true,
     };
   }
@@ -142,15 +161,15 @@ export async function sendMessage(params: MessageSendParams): Promise<MessageSen
       channel: outboundChannel,
       to: resolvedTarget.to,
       accountId: params.accountId,
-      payloads: [{ text: params.content, mediaUrl: params.mediaUrl }],
+      payloads: normalizedPayloads,
       gifPlayback: params.gifPlayback,
       deps: params.deps,
       bestEffort: params.bestEffort,
       mirror: params.mirror
         ? {
             ...params.mirror,
-            text: params.content,
-            mediaUrls: params.mediaUrl ? [params.mediaUrl] : undefined,
+            text: mirrorText || params.content,
+            mediaUrls: mirrorMediaUrls.length ? mirrorMediaUrls : undefined,
           }
         : undefined,
     });
@@ -159,7 +178,8 @@ export async function sendMessage(params: MessageSendParams): Promise<MessageSen
       channel,
       to: params.to,
       via: "direct",
-      mediaUrl: params.mediaUrl ?? null,
+      mediaUrl: primaryMediaUrl,
+      mediaUrls: mirrorMediaUrls.length ? mirrorMediaUrls : undefined,
       result: results.at(-1),
     };
   }
@@ -173,6 +193,7 @@ export async function sendMessage(params: MessageSendParams): Promise<MessageSen
       to: params.to,
       message: params.content,
       mediaUrl: params.mediaUrl,
+      mediaUrls: mirrorMediaUrls.length ? mirrorMediaUrls : params.mediaUrls,
       gifPlayback: params.gifPlayback,
       accountId: params.accountId,
       channel,
@@ -189,7 +210,8 @@ export async function sendMessage(params: MessageSendParams): Promise<MessageSen
     channel,
     to: params.to,
     via: "gateway",
-    mediaUrl: params.mediaUrl ?? null,
+    mediaUrl: primaryMediaUrl,
+    mediaUrls: mirrorMediaUrls.length ? mirrorMediaUrls : undefined,
     result,
   };
 }

src/infra/outbound/outbound-send-service.ts

@@ -58,6 +58,7 @@ export async function executeSendAction(params: {
   to: string;
   message: string;
   mediaUrl?: string;
+  mediaUrls?: string[];
   gifPlayback?: boolean;
   bestEffort?: boolean;
 }): Promise<{
@@ -91,6 +92,7 @@ export async function executeSendAction(params: {
     to: params.to,
     content: params.message,
     mediaUrl: params.mediaUrl || undefined,
+    mediaUrls: params.mediaUrls,
     channel: params.ctx.channel || undefined,
     accountId: params.ctx.accountId ?? undefined,
     gifPlayback: params.gifPlayback,

src/infra/outbound/payloads.test.ts

@@ -24,6 +24,22 @@ describe("normalizeOutboundPayloadsForJson", () => {
       },
     ]);
   });
+
+  it("keeps mediaUrl null for multi MEDIA tags", () => {
+    expect(
+      normalizeOutboundPayloadsForJson([
+        {
+          text: "MEDIA:https://x.test/a.png\nMEDIA:https://x.test/b.png",
+        },
+      ]),
+    ).toEqual([
+      {
+        text: "",
+        mediaUrl: null,
+        mediaUrls: ["https://x.test/a.png", "https://x.test/b.png"],
+      },
+    ]);
+  });
 });
 
 describe("formatOutboundPayloadLog", () => {

src/infra/outbound/payloads.ts

@@ -1,3 +1,5 @@
+import { parseReplyDirectives } from "../../auto-reply/reply/reply-directives.js";
+import { isRenderablePayload } from "../../auto-reply/reply/reply-payloads.js";
 import type { ReplyPayload } from "../../auto-reply/types.js";
 
 export type NormalizedOutboundPayload = {
@@ -11,8 +13,51 @@ export type OutboundPayloadJson = {
   mediaUrls?: string[];
 };
 
+function mergeMediaUrls(...lists: Array<Array<string | undefined> | undefined>): string[] {
+  const seen = new Set<string>();
+  const merged: string[] = [];
+  for (const list of lists) {
+    if (!list) continue;
+    for (const entry of list) {
+      const trimmed = entry?.trim();
+      if (!trimmed) continue;
+      if (seen.has(trimmed)) continue;
+      seen.add(trimmed);
+      merged.push(trimmed);
+    }
+  }
+  return merged;
+}
+
+export function normalizeReplyPayloadsForDelivery(payloads: ReplyPayload[]): ReplyPayload[] {
+  return payloads.flatMap((payload) => {
+    const parsed = parseReplyDirectives(payload.text ?? "");
+    const explicitMediaUrls = payload.mediaUrls ?? parsed.mediaUrls;
+    const explicitMediaUrl = payload.mediaUrl ?? parsed.mediaUrl;
+    const mergedMedia = mergeMediaUrls(
+      explicitMediaUrls,
+      explicitMediaUrl ? [explicitMediaUrl] : undefined,
+    );
+    const hasMultipleMedia = (explicitMediaUrls?.length ?? 0) > 1;
+    const resolvedMediaUrl = hasMultipleMedia ? undefined : explicitMediaUrl;
+    const next: ReplyPayload = {
+      ...payload,
+      text: parsed.text ?? "",
+      mediaUrls: mergedMedia.length ? mergedMedia : undefined,
+      mediaUrl: resolvedMediaUrl,
+      replyToId: payload.replyToId ?? parsed.replyToId,
+      replyToTag: payload.replyToTag || parsed.replyToTag,
+      replyToCurrent: payload.replyToCurrent || parsed.replyToCurrent,
+      audioAsVoice: Boolean(payload.audioAsVoice || parsed.audioAsVoice),
+    };
+    if (parsed.isSilent && mergedMedia.length === 0) return [];
+    if (!isRenderablePayload(next)) return [];
+    return [next];
+  });
+}
+
 export function normalizeOutboundPayloads(payloads: ReplyPayload[]): NormalizedOutboundPayload[] {
-  return payloads
+  return normalizeReplyPayloadsForDelivery(payloads)
     .map((payload) => ({
       text: payload.text ?? "",
       mediaUrls: payload.mediaUrls ?? (payload.mediaUrl ? [payload.mediaUrl] : []),
@@ -21,7 +66,7 @@ export function normalizeOutboundPayloads(payloads: ReplyPayload[]): NormalizedO
 }
 
 export function normalizeOutboundPayloadsForJson(payloads: ReplyPayload[]): OutboundPayloadJson[] {
-  return payloads.map((payload) => ({
+  return normalizeReplyPayloadsForDelivery(payloads).map((payload) => ({
     text: payload.text ?? "",
     mediaUrl: payload.mediaUrl ?? null,
     mediaUrls: payload.mediaUrls ?? (payload.mediaUrl ? [payload.mediaUrl] : undefined),