refactor: unify outbound delivery

2026-01-07 01:13:04 +00:00
parent 1ae5e9a26b
commit f5938f8114
9 changed files with 587 additions and 541 deletions
--- a/src/commands/agent.ts
+++ b/src/commands/agent.ts
@@ -22,11 +22,6 @@ import {
  DEFAULT_AGENT_WORKSPACE_DIR,
  ensureAgentWorkspace,
 } from "../agents/workspace.js";
-import {
-  chunkMarkdownText,
-  chunkText,
-  resolveTextChunkLimit,
-} from "../auto-reply/chunk.js";
 import type { MsgContext } from "../auto-reply/templating.js";
 import {
  normalizeThinkLevel,
@@ -49,9 +44,9 @@ import {
  emitAgentEvent,
  registerAgentRunContext,
 } from "../infra/agent-events.js";
+import { deliverOutboundPayloads } from "../infra/outbound/deliver.js";
 import { defaultRuntime, type RuntimeEnv } from "../runtime.js";
 import { resolveSendPolicy } from "../sessions/send-policy.js";
-import { resolveTelegramToken } from "../telegram/token.js";
 import { normalizeE164 } from "../utils.js";

 type AgentCommandOpts = {
@@ -260,8 +255,6 @@ export async function agentCommand(
    ? buildWorkspaceSkillSnapshot(workspaceDir, { config: cfg })
    : sessionEntry?.skillsSnapshot;

-  const { token: telegramToken } = resolveTelegramToken(cfg);
-
  if (skillsSnapshot && sessionStore && sessionKey && needsSkillsSnapshot) {
    const current = sessionEntry ?? {
      sessionId,
@@ -621,16 +614,6 @@ export async function agentCommand(
    return { payloads: [], meta: result.meta };
  }

-  const deliveryTextLimit =
-    deliveryProvider === "whatsapp" ||
-    deliveryProvider === "telegram" ||
-    deliveryProvider === "discord" ||
-    deliveryProvider === "slack" ||
-    deliveryProvider === "signal" ||
-    deliveryProvider === "imessage"
-      ? resolveTextChunkLimit(cfg, deliveryProvider)
-      : resolveTextChunkLimit(cfg, "whatsapp");
-
  for (const payload of payloads) {
    const mediaList =
      payload.mediaUrls ?? (payload.mediaUrl ? [payload.mediaUrl] : []);
@@ -648,154 +631,42 @@ export async function agentCommand(
    const media = mediaList;
    if (!text && media.length === 0) continue;

-    if (deliveryProvider === "whatsapp" && whatsappTarget) {
+    if (
+      deliveryProvider === "whatsapp" ||
+      deliveryProvider === "telegram" ||
+      deliveryProvider === "discord" ||
+      deliveryProvider === "slack" ||
+      deliveryProvider === "signal" ||
+      deliveryProvider === "imessage"
+    ) {
+      const target =
+        deliveryProvider === "whatsapp"
+          ? whatsappTarget
+          : deliveryProvider === "telegram"
+            ? telegramTarget
+            : deliveryProvider === "discord"
+              ? discordTarget
+              : deliveryProvider === "slack"
+                ? slackTarget
+                : deliveryProvider === "signal"
+                  ? signalTarget
+                  : imessageTarget;
+      if (!target) continue;
      try {
-        const primaryMedia = media[0];
-        await deps.sendMessageWhatsApp(whatsappTarget, text, {
-          verbose: false,
-          mediaUrl: primaryMedia,
+        await deliverOutboundPayloads({
+          cfg,
+          provider: deliveryProvider,
+          to: target,
+          payloads: [payload],
+          deps: {
+            sendWhatsApp: deps.sendMessageWhatsApp,
+            sendTelegram: deps.sendMessageTelegram,
+            sendDiscord: deps.sendMessageDiscord,
+            sendSlack: deps.sendMessageSlack,
+            sendSignal: deps.sendMessageSignal,
+            sendIMessage: deps.sendMessageIMessage,
+          },
        });
-        for (const extra of media.slice(1)) {
-          await deps.sendMessageWhatsApp(whatsappTarget, "", {
-            verbose: false,
-            mediaUrl: extra,
-          });
-        }
-      } catch (err) {
-        if (!bestEffortDeliver) throw err;
-        logDeliveryError(err);
-      }
-      continue;
-    }
-
-    if (deliveryProvider === "telegram" && telegramTarget) {
-      try {
-        if (media.length === 0) {
-          for (const chunk of chunkMarkdownText(text, deliveryTextLimit)) {
-            await deps.sendMessageTelegram(telegramTarget, chunk, {
-              verbose: false,
-              token: telegramToken || undefined,
-            });
-          }
-        } else {
-          let first = true;
-          for (const url of media) {
-            const caption = first ? text : "";
-            first = false;
-            await deps.sendMessageTelegram(telegramTarget, caption, {
-              verbose: false,
-              mediaUrl: url,
-              token: telegramToken || undefined,
-            });
-          }
-        }
-      } catch (err) {
-        if (!bestEffortDeliver) throw err;
-        logDeliveryError(err);
-      }
-    }
-
-    if (deliveryProvider === "discord" && discordTarget) {
-      try {
-        if (media.length === 0) {
-          await deps.sendMessageDiscord(discordTarget, text, {
-            token: process.env.DISCORD_BOT_TOKEN,
-          });
-        } else {
-          let first = true;
-          for (const url of media) {
-            const caption = first ? text : "";
-            first = false;
-            await deps.sendMessageDiscord(discordTarget, caption, {
-              token: process.env.DISCORD_BOT_TOKEN,
-              mediaUrl: url,
-            });
-          }
-        }
-      } catch (err) {
-        if (!bestEffortDeliver) throw err;
-        logDeliveryError(err);
-      }
-    }
-
-    if (deliveryProvider === "slack" && slackTarget) {
-      try {
-        if (media.length === 0) {
-          await deps.sendMessageSlack(slackTarget, text);
-        } else {
-          let first = true;
-          for (const url of media) {
-            const caption = first ? text : "";
-            first = false;
-            await deps.sendMessageSlack(slackTarget, caption, {
-              mediaUrl: url,
-            });
-          }
-        }
-      } catch (err) {
-        if (!bestEffortDeliver) throw err;
-        logDeliveryError(err);
-      }
-    }
-
-    if (deliveryProvider === "signal" && signalTarget) {
-      try {
-        if (media.length === 0) {
-          await deps.sendMessageSignal(signalTarget, text, {
-            maxBytes: cfg.signal?.mediaMaxMb
-              ? cfg.signal.mediaMaxMb * 1024 * 1024
-              : cfg.agent?.mediaMaxMb
-                ? cfg.agent.mediaMaxMb * 1024 * 1024
-                : undefined,
-          });
-        } else {
-          let first = true;
-          for (const url of media) {
-            const caption = first ? text : "";
-            first = false;
-            await deps.sendMessageSignal(signalTarget, caption, {
-              mediaUrl: url,
-              maxBytes: cfg.signal?.mediaMaxMb
-                ? cfg.signal.mediaMaxMb * 1024 * 1024
-                : cfg.agent?.mediaMaxMb
-                  ? cfg.agent.mediaMaxMb * 1024 * 1024
-                  : undefined,
-            });
-          }
-        }
-      } catch (err) {
-        if (!bestEffortDeliver) throw err;
-        logDeliveryError(err);
-      }
-    }
-
-    if (deliveryProvider === "imessage" && imessageTarget) {
-      try {
-        if (media.length === 0) {
-          for (const chunk of chunkText(text, deliveryTextLimit)) {
-            await deps.sendMessageIMessage(imessageTarget, chunk, {
-              maxBytes: cfg.imessage?.mediaMaxMb
-                ? cfg.imessage.mediaMaxMb * 1024 * 1024
-                : cfg.agent?.mediaMaxMb
-                  ? cfg.agent.mediaMaxMb * 1024 * 1024
-                  : undefined,
-            });
-          }
-        } else {
-          let first = true;
-          for (const url of media) {
-            const caption = first ? text : "";
-            first = false;
-            await deps.sendMessageIMessage(imessageTarget, caption, {
-              mediaUrl: url,
-              maxBytes: cfg.imessage?.mediaMaxMb
-                ? cfg.imessage.mediaMaxMb * 1024 * 1024
-                : cfg.agent?.mediaMaxMb
-                  ? cfg.agent.mediaMaxMb * 1024 * 1024
-                  : undefined,
-            });
-          }
-        }
      } catch (err) {
        if (!bestEffortDeliver) throw err;
        logDeliveryError(err);
--- a/src/commands/send.test.ts
+++ b/src/commands/send.test.ts
@@ -137,7 +137,7 @@ describe("sendCommand", () => {
    expect(deps.sendMessageTelegram).toHaveBeenCalledWith(
      "123",
      "hi",
-      expect.objectContaining({ token: "token-abc" }),
+      expect.objectContaining({ token: "token-abc", verbose: false }),
    );
    expect(deps.sendMessageWhatsApp).not.toHaveBeenCalled();
  });
@@ -158,7 +158,7 @@ describe("sendCommand", () => {
    expect(deps.sendMessageTelegram).toHaveBeenCalledWith(
      "123",
      "hi",
-      expect.objectContaining({ token: "cfg-token" }),
+      expect.objectContaining({ token: "cfg-token", verbose: false }),
    );
  });

@@ -176,7 +176,7 @@ describe("sendCommand", () => {
    expect(deps.sendMessageDiscord).toHaveBeenCalledWith(
      "channel:chan",
      "hi",
-      expect.objectContaining({ token: "token-discord" }),
+      expect.objectContaining({ verbose: false }),
    );
    expect(deps.sendMessageWhatsApp).not.toHaveBeenCalled();
  });
@@ -193,7 +193,7 @@ describe("sendCommand", () => {
    expect(deps.sendMessageSignal).toHaveBeenCalledWith(
      "+15551234567",
      "hi",
-      expect.objectContaining({ mediaUrl: undefined }),
+      expect.objectContaining({ maxBytes: undefined }),
    );
    expect(deps.sendMessageWhatsApp).not.toHaveBeenCalled();
  });
@@ -209,11 +209,7 @@ describe("sendCommand", () => {
      deps,
      runtime,
    );
-    expect(deps.sendMessageSlack).toHaveBeenCalledWith(
-      "channel:C123",
-      "hi",
-      expect.objectContaining({ mediaUrl: undefined }),
-    );
+    expect(deps.sendMessageSlack).toHaveBeenCalledWith("channel:C123", "hi");
    expect(deps.sendMessageWhatsApp).not.toHaveBeenCalled();
  });

@@ -229,7 +225,7 @@ describe("sendCommand", () => {
    expect(deps.sendMessageIMessage).toHaveBeenCalledWith(
      "chat_id:42",
      "hi",
-      expect.objectContaining({ mediaUrl: undefined }),
+      expect.objectContaining({ maxBytes: undefined }),
    );
    expect(deps.sendMessageWhatsApp).not.toHaveBeenCalled();
  });
--- a/src/commands/send.ts
+++ b/src/commands/send.ts
@@ -2,8 +2,9 @@ import type { CliDeps } from "../cli/deps.js";
 import { loadConfig } from "../config/config.js";
 import { callGateway, randomIdempotencyKey } from "../gateway/call.js";
 import { success } from "../globals.js";
+import { deliverOutboundPayloads } from "../infra/outbound/deliver.js";
+import type { OutboundDeliveryResult } from "../infra/outbound/deliver.js";
 import type { RuntimeEnv } from "../runtime.js";
-import { resolveTelegramToken } from "../telegram/token.js";

 export async function sendCommand(
  opts: {
@@ -19,7 +20,8 @@ export async function sendCommand(
  deps: CliDeps,
  runtime: RuntimeEnv,
 ) {
-  const provider = (opts.provider ?? "whatsapp").toLowerCase();
+  const providerRaw = (opts.provider ?? "whatsapp").toLowerCase();
+  const provider = providerRaw === "imsg" ? "imessage" : providerRaw;

  if (opts.dryRun) {
    runtime.log(
@@ -28,131 +30,41 @@ export async function sendCommand(
    return;
  }

-  if (provider === "telegram") {
-    const { token } = resolveTelegramToken(loadConfig());
-    const result = await deps.sendMessageTelegram(opts.to, opts.message, {
-      token: token || undefined,
-      mediaUrl: opts.media,
+  if (
+    provider === "telegram" ||
+    provider === "discord" ||
+    provider === "slack" ||
+    provider === "signal" ||
+    provider === "imessage"
+  ) {
+    const results = await deliverOutboundPayloads({
+      cfg: loadConfig(),
+      provider,
+      to: opts.to,
+      payloads: [{ text: opts.message, mediaUrl: opts.media }],
+      deps: {
+        sendWhatsApp: deps.sendMessageWhatsApp,
+        sendTelegram: deps.sendMessageTelegram,
+        sendDiscord: deps.sendMessageDiscord,
+        sendSlack: deps.sendMessageSlack,
+        sendSignal: deps.sendMessageSignal,
+        sendIMessage: deps.sendMessageIMessage,
+      },
    });
-    runtime.log(
-      success(
-        `✅ Sent via telegram. Message ID: ${result.messageId} (chat ${result.chatId})`,
-      ),
-    );
+    const last = results.at(-1);
+    const summary = formatDirectSendSummary(provider, last);
+    runtime.log(success(summary));
    if (opts.json) {
      runtime.log(
        JSON.stringify(
          {
-            provider: "telegram",
+            provider,
            via: "direct",
            to: opts.to,
-            chatId: result.chatId,
-            messageId: result.messageId,
-            mediaUrl: opts.media ?? null,
-          },
-          null,
-          2,
-        ),
-      );
-    }
-    return;
-  }
-
-  if (provider === "discord") {
-    const result = await deps.sendMessageDiscord(opts.to, opts.message, {
-      token: process.env.DISCORD_BOT_TOKEN,
-      mediaUrl: opts.media,
-    });
-    runtime.log(
-      success(
-        `✅ Sent via discord. Message ID: ${result.messageId} (channel ${result.channelId})`,
-      ),
-    );
-    if (opts.json) {
-      runtime.log(
-        JSON.stringify(
-          {
-            provider: "discord",
-            via: "direct",
-            to: opts.to,
-            channelId: result.channelId,
-            messageId: result.messageId,
-            mediaUrl: opts.media ?? null,
-          },
-          null,
-          2,
-        ),
-      );
-    }
-    return;
-  }
-
-  if (provider === "slack") {
-    const result = await deps.sendMessageSlack(opts.to, opts.message, {
-      mediaUrl: opts.media,
-    });
-    runtime.log(
-      success(
-        `✅ Sent via slack. Message ID: ${result.messageId} (channel ${result.channelId})`,
-      ),
-    );
-    if (opts.json) {
-      runtime.log(
-        JSON.stringify(
-          {
-            provider: "slack",
-            via: "direct",
-            to: opts.to,
-            channelId: result.channelId,
-            messageId: result.messageId,
-            mediaUrl: opts.media ?? null,
-          },
-          null,
-          2,
-        ),
-      );
-    }
-    return;
-  }
-
-  if (provider === "signal") {
-    const result = await deps.sendMessageSignal(opts.to, opts.message, {
-      mediaUrl: opts.media,
-    });
-    runtime.log(success(`✅ Sent via signal. Message ID: ${result.messageId}`));
-    if (opts.json) {
-      runtime.log(
-        JSON.stringify(
-          {
-            provider: "signal",
-            via: "direct",
-            to: opts.to,
-            messageId: result.messageId,
-            mediaUrl: opts.media ?? null,
-          },
-          null,
-          2,
-        ),
-      );
-    }
-    return;
-  }
-
-  if (provider === "imessage" || provider === "imsg") {
-    const result = await deps.sendMessageIMessage(opts.to, opts.message, {
-      mediaUrl: opts.media,
-    });
-    runtime.log(
-      success(`✅ Sent via iMessage. Message ID: ${result.messageId}`),
-    );
-    if (opts.json) {
-      runtime.log(
-        JSON.stringify(
-          {
-            provider: "imessage",
-            via: "direct",
-            to: opts.to,
-            messageId: result.messageId,
+            messageId: last?.messageId ?? "unknown",
+            ...(last && "chatId" in last ? { chatId: last.chatId } : {}),
+            ...(last && "channelId" in last ? { channelId: last.channelId } : {}),
+            ...(last && "timestamp" in last ? { timestamp: last.timestamp } : {}),
            mediaUrl: opts.media ?? null,
          },
          null,
@@ -206,3 +118,28 @@ export async function sendCommand(
    );
  }
 }
+
+function formatDirectSendSummary(
+  provider: string,
+  result: OutboundDeliveryResult | undefined,
+): string {
+  if (!result) {
+    return `✅ Sent via ${provider}. Message ID: unknown`;
+  }
+  if (result.provider === "telegram") {
+    return `✅ Sent via telegram. Message ID: ${result.messageId} (chat ${result.chatId})`;
+  }
+  if (result.provider === "discord") {
+    return `✅ Sent via discord. Message ID: ${result.messageId} (channel ${result.channelId})`;
+  }
+  if (result.provider === "slack") {
+    return `✅ Sent via slack. Message ID: ${result.messageId} (channel ${result.channelId})`;
+  }
+  if (result.provider === "signal") {
+    return `✅ Sent via signal. Message ID: ${result.messageId}`;
+  }
+  if (result.provider === "imessage") {
+    return `✅ Sent via iMessage. Message ID: ${result.messageId}`;
+  }
+  return `✅ Sent via ${provider}. Message ID: ${result.messageId}`;
+}