fix(media): enforce agent media roots in plugin send actions

Co-authored-by: Oliver Drobnik <333270+odrobnik@users.noreply.github.com>
Co-authored-by: thisischappy <257418353+thisischappy@users.noreply.github.com>
This commit is contained in:
Peter Steinberger
2026-02-22 21:17:09 +01:00
parent 33a43a151d
commit 7bbd597383
13 changed files with 193 additions and 10 deletions

View File

@@ -4,6 +4,7 @@ const mocks = vi.hoisted(() => ({
dispatchChannelMessageAction: vi.fn(),
sendMessage: vi.fn(),
sendPoll: vi.fn(),
getAgentScopedMediaLocalRoots: vi.fn(() => ["/tmp/agent-roots"]),
}));
vi.mock("../../channels/plugins/message-actions.js", () => ({
@@ -15,6 +16,11 @@ vi.mock("./message.js", () => ({
sendPoll: (...args: unknown[]) => mocks.sendPoll(...args),
}));
vi.mock("../../media/local-roots.js", () => ({
getAgentScopedMediaLocalRoots: (...args: unknown[]) =>
mocks.getAgentScopedMediaLocalRoots(...args),
}));
import { executePollAction, executeSendAction } from "./outbound-send-service.js";
describe("executeSendAction", () => {
@@ -22,6 +28,7 @@ describe("executeSendAction", () => {
mocks.dispatchChannelMessageAction.mockClear();
mocks.sendMessage.mockClear();
mocks.sendPoll.mockClear();
mocks.getAgentScopedMediaLocalRoots.mockClear();
});
it("forwards ctx.agentId to sendMessage on core outbound path", async () => {
@@ -83,6 +90,37 @@ describe("executeSendAction", () => {
expect(mocks.sendPoll).not.toHaveBeenCalled();
});
it("passes agent-scoped media local roots to plugin dispatch", async () => {
mocks.dispatchChannelMessageAction.mockResolvedValue({
ok: true,
value: { messageId: "msg-plugin" },
continuePrompt: "",
output: "",
sessionId: "s1",
model: "gpt-5.2",
usage: {},
});
await executeSendAction({
ctx: {
cfg: {},
channel: "discord",
params: { to: "channel:123", message: "hello" },
agentId: "agent-1",
dryRun: false,
},
to: "channel:123",
message: "hello",
});
expect(mocks.getAgentScopedMediaLocalRoots).toHaveBeenCalledWith({}, "agent-1");
expect(mocks.dispatchChannelMessageAction).toHaveBeenCalledWith(
expect.objectContaining({
mediaLocalRoots: ["/tmp/agent-roots"],
}),
);
});
it("forwards poll args to sendPoll on core outbound path", async () => {
mocks.dispatchChannelMessageAction.mockResolvedValue(null);
mocks.sendPoll.mockResolvedValue({

View File

@@ -3,6 +3,7 @@ import { dispatchChannelMessageAction } from "../../channels/plugins/message-act
import type { ChannelId, ChannelThreadingToolContext } from "../../channels/plugins/types.js";
import type { OpenClawConfig } from "../../config/config.js";
import { appendAssistantMessageToSessionTranscript } from "../../config/sessions.js";
import { getAgentScopedMediaLocalRoots } from "../../media/local-roots.js";
import type { GatewayClientMode, GatewayClientName } from "../../utils/message-channel.js";
import { throwIfAborted } from "./abort.js";
import type { OutboundSendDeps } from "./deliver.js";
@@ -54,11 +55,16 @@ async function tryHandleWithPluginAction(params: {
if (params.ctx.dryRun) {
return null;
}
const mediaLocalRoots = getAgentScopedMediaLocalRoots(
params.ctx.cfg,
params.ctx.agentId ?? params.ctx.mirror?.agentId,
);
const handled = await dispatchChannelMessageAction({
channel: params.ctx.channel,
action: params.action,
cfg: params.ctx.cfg,
params: params.ctx.params,
mediaLocalRoots,
accountId: params.ctx.accountId ?? undefined,
gateway: params.ctx.gateway,
toolContext: params.ctx.toolContext,