Discord: preserve accountId in message actions (refs #1489)

src/channels/plugins/actions/discord.test.ts

@@ -1,11 +1,41 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 
 import type { ClawdbotConfig } from "../../../config/config.js";
-import { discordMessageActions } from "./discord.js";
+type SendMessageDiscord = typeof import("../../../discord/send.js").sendMessageDiscord;
+type SendPollDiscord = typeof import("../../../discord/send.js").sendPollDiscord;
+
+const sendMessageDiscord = vi.fn<Parameters<SendMessageDiscord>, ReturnType<SendMessageDiscord>>(
+  async () => ({ ok: true }) as Awaited<ReturnType<SendMessageDiscord>>,
+);
+const sendPollDiscord = vi.fn<Parameters<SendPollDiscord>, ReturnType<SendPollDiscord>>(
+  async () => ({ ok: true }) as Awaited<ReturnType<SendPollDiscord>>,
+);
+
+vi.mock("../../../discord/send.js", async () => {
+  const actual = await vi.importActual<typeof import("../../../discord/send.js")>(
+    "../../../discord/send.js",
+  );
+  return {
+    ...actual,
+    sendMessageDiscord: (...args: Parameters<SendMessageDiscord>) => sendMessageDiscord(...args),
+    sendPollDiscord: (...args: Parameters<SendPollDiscord>) => sendPollDiscord(...args),
+  };
+});
+
+const loadHandleDiscordMessageAction = async () => {
+  const mod = await import("./discord/handle-action.js");
+  return mod.handleDiscordMessageAction;
+};
+
+const loadDiscordMessageActions = async () => {
+  const mod = await import("./discord.js");
+  return mod.discordMessageActions;
+};
 
 describe("discord message actions", () => {
-  it("lists channel and upload actions by default", () => {
+  it("lists channel and upload actions by default", async () => {
     const cfg = { channels: { discord: { token: "d0" } } } as ClawdbotConfig;
+    const discordMessageActions = await loadDiscordMessageActions();
     const actions = discordMessageActions.listActions?.({ cfg }) ?? [];
 
     expect(actions).toContain("emoji-upload");
@@ -13,12 +43,65 @@ describe("discord message actions", () => {
     expect(actions).toContain("channel-create");
   });
 
-  it("respects disabled channel actions", () => {
+  it("respects disabled channel actions", async () => {
     const cfg = {
       channels: { discord: { token: "d0", actions: { channels: false } } },
     } as ClawdbotConfig;
+    const discordMessageActions = await loadDiscordMessageActions();
     const actions = discordMessageActions.listActions?.({ cfg }) ?? [];
 
     expect(actions).not.toContain("channel-create");
   });
 });
+
+describe("handleDiscordMessageAction", () => {
+  it("forwards context accountId for send", async () => {
+    sendMessageDiscord.mockClear();
+    const handleDiscordMessageAction = await loadHandleDiscordMessageAction();
+
+    await handleDiscordMessageAction({
+      action: "send",
+      params: {
+        to: "channel:123",
+        message: "hi",
+      },
+      cfg: {} as ClawdbotConfig,
+      accountId: "ops",
+    });
+
+    expect(sendMessageDiscord).toHaveBeenCalledWith(
+      "channel:123",
+      "hi",
+      expect.objectContaining({
+        accountId: "ops",
+      }),
+    );
+  });
+
+  it("falls back to params accountId when context missing", async () => {
+    sendPollDiscord.mockClear();
+    const handleDiscordMessageAction = await loadHandleDiscordMessageAction();
+
+    await handleDiscordMessageAction({
+      action: "poll",
+      params: {
+        to: "channel:123",
+        pollQuestion: "Ready?",
+        pollOption: ["Yes", "No"],
+        accountId: "marve",
+      },
+      cfg: {} as ClawdbotConfig,
+    });
+
+    expect(sendPollDiscord).toHaveBeenCalledWith(
+      "channel:123",
+      expect.objectContaining({
+        question: "Ready?",
+        options: ["Yes", "No"],
+      }),
+      expect.objectContaining({
+        accountId: "marve",
+      }),
+    );
+  });
+});

src/channels/plugins/actions/discord.ts

@@ -80,7 +80,7 @@ export const discordMessageActions: ChannelMessageActionAdapter = {
     }
     return null;
   },
-  handleAction: async ({ action, params, cfg }) => {
-    return await handleDiscordMessageAction({ action, params, cfg });
+  handleAction: async ({ action, params, cfg, accountId }) => {
+    return await handleDiscordMessageAction({ action, params, cfg, accountId });
   },
 };

src/channels/plugins/actions/discord/handle-action.ts

@@ -18,9 +18,10 @@ function readParentIdParam(params: Record<string, unknown>): string | null | und
 }
 
 export async function handleDiscordMessageAction(
-  ctx: Pick<ChannelMessageActionContext, "action" | "params" | "cfg">,
+  ctx: Pick<ChannelMessageActionContext, "action" | "params" | "cfg" | "accountId">,
 ): Promise<AgentToolResult<unknown>> {
   const { action, params, cfg } = ctx;
+  const accountId = ctx.accountId ?? readStringParam(params, "accountId");
 
   const resolveChannelId = () =>
     resolveDiscordChannelId(
@@ -39,6 +40,7 @@ export async function handleDiscordMessageAction(
     return await handleDiscordAction(
       {
         action: "sendMessage",
+        accountId: accountId ?? undefined,
         to,
         content,
         mediaUrl: mediaUrl ?? undefined,
@@ -62,6 +64,7 @@ export async function handleDiscordMessageAction(
     return await handleDiscordAction(
       {
         action: "poll",
+        accountId: accountId ?? undefined,
         to,
         question,
         answers,