fix(discord): add media dedup production code for messaging tool pipeline

Wire media URL tracking through the embedded agent pipeline so that
media already sent via messaging tools is not delivered again by the
reply dispatcher.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Yaroslav Boiko
2026-02-16 20:41:41 +01:00
committed by Peter Steinberger
parent c7681c3cff
commit 838259331f
14 changed files with 244 additions and 4 deletions

View File

@@ -15,6 +15,7 @@ export function makeAttemptResult(
messagesSnapshot: [],
didSendViaMessagingTool: false,
messagingToolSentTexts: [],
messagingToolSentMediaUrls: [],
messagingToolSentTargets: [],
cloudCodeAssistFormatError: false,
...overrides,

View File

@@ -980,6 +980,7 @@ export async function runEmbeddedPiAgent(
},
didSendViaMessagingTool: attempt.didSendViaMessagingTool,
messagingToolSentTexts: attempt.messagingToolSentTexts,
messagingToolSentMediaUrls: attempt.messagingToolSentMediaUrls,
messagingToolSentTargets: attempt.messagingToolSentTargets,
successfulCronAdds: attempt.successfulCronAdds,
};
@@ -1022,6 +1023,7 @@ export async function runEmbeddedPiAgent(
},
didSendViaMessagingTool: attempt.didSendViaMessagingTool,
messagingToolSentTexts: attempt.messagingToolSentTexts,
messagingToolSentMediaUrls: attempt.messagingToolSentMediaUrls,
messagingToolSentTargets: attempt.messagingToolSentTargets,
successfulCronAdds: attempt.successfulCronAdds,
};

View File

@@ -758,6 +758,7 @@ export async function runEmbeddedAttempt(
unsubscribe,
waitForCompactionRetry,
getMessagingToolSentTexts,
getMessagingToolSentMediaUrls,
getMessagingToolSentTargets,
getSuccessfulCronAdds,
didSendViaMessagingTool,
@@ -1178,6 +1179,7 @@ export async function runEmbeddedAttempt(
lastToolError: getLastToolError?.(),
didSendViaMessagingTool: didSendViaMessagingTool(),
messagingToolSentTexts: getMessagingToolSentTexts(),
messagingToolSentMediaUrls: getMessagingToolSentMediaUrls(),
messagingToolSentTargets: getMessagingToolSentTargets(),
successfulCronAdds: getSuccessfulCronAdds(),
cloudCodeAssistFormatError: Boolean(

View File

@@ -45,6 +45,7 @@ export type EmbeddedRunAttemptResult = {
};
didSendViaMessagingTool: boolean;
messagingToolSentTexts: string[];
messagingToolSentMediaUrls: string[];
messagingToolSentTargets: MessagingToolSend[];
successfulCronAdds?: number;
cloudCodeAssistFormatError: boolean;

View File

@@ -63,6 +63,8 @@ export type EmbeddedPiRunResult = {
didSendViaMessagingTool?: boolean;
// Texts successfully sent via messaging tools during the run.
messagingToolSentTexts?: string[];
// Media URLs successfully sent via messaging tools during the run.
messagingToolSentMediaUrls?: string[];
// Messaging tool targets that successfully sent a message during the run.
messagingToolSentTargets?: MessagingToolSend[];
// Count of successful cron.add tool calls in this run.

View File

@@ -0,0 +1,68 @@
import type { AgentEvent } from "@mariozechner/pi-agent-core";
import type { Mock } from "vitest";
import type { EmbeddedPiSubscribeContext } from "./pi-embedded-subscribe.handlers.types.js";
import type { SubscribeEmbeddedPiSessionParams } from "./pi-embedded-subscribe.types.js";
import {
handleToolExecutionEnd,
handleToolExecutionStart,
} from "./pi-embedded-subscribe.handlers.tools.js";
/**
* Narrowed params type that omits the `session` class instance (never accessed
* by the handler paths under test).
*/
type TestParams = Omit<SubscribeEmbeddedPiSessionParams, "session">;
/**
* The subset of {@link EmbeddedPiSubscribeContext} that the media-emission
* tests actually populate. Using this avoids the need for `as unknown as`
* double-assertion in every mock factory.
*/
export type MockEmbeddedContext = Omit<EmbeddedPiSubscribeContext, "params"> & {
params: TestParams;
};
/** Type-safe bridge: narrows parameter type so callers avoid assertions. */
function asFullContext(ctx: MockEmbeddedContext): EmbeddedPiSubscribeContext {
return ctx as unknown as EmbeddedPiSubscribeContext;
}
/** Typed wrapper around {@link handleToolExecutionStart}. */
export function callToolExecutionStart(
ctx: MockEmbeddedContext,
evt: AgentEvent & { toolName: string; toolCallId: string; args: unknown },
): Promise<void> {
return handleToolExecutionStart(asFullContext(ctx), evt);
}
/** Typed wrapper around {@link handleToolExecutionEnd}. */
export function callToolExecutionEnd(
ctx: MockEmbeddedContext,
evt: AgentEvent & {
toolName: string;
toolCallId: string;
isError: boolean;
result?: unknown;
},
): Promise<void> {
return handleToolExecutionEnd(asFullContext(ctx), evt);
}
/**
* Check whether a mock-call argument is an object containing `mediaUrls`
* but NOT `text` (i.e. a "direct media" emission).
*/
export function isDirectMediaCall(call: unknown[]): boolean {
const arg = call[0];
if (!arg || typeof arg !== "object") {
return false;
}
return "mediaUrls" in arg && !("text" in arg);
}
/**
* Filter a vi.fn() mock's call log to only direct-media emissions.
*/
export function filterDirectMediaCalls(mock: Mock): unknown[][] {
return mock.mock.calls.filter(isDirectMediaCall);
}

View File

@@ -145,6 +145,11 @@ export async function handleToolExecutionStart(
ctx.state.pendingMessagingTexts.set(toolCallId, text);
ctx.log.debug(`Tracking pending messaging text: tool=${toolName} len=${text.length}`);
}
// Track media URL from messaging tool args (pending until tool_execution_end)
const mediaUrl = argsRecord.mediaUrl ?? argsRecord.path ?? argsRecord.filePath;
if (mediaUrl && typeof mediaUrl === "string") {
ctx.state.pendingMessagingMediaUrls.set(toolCallId, mediaUrl);
}
}
}
}
@@ -248,6 +253,14 @@ export async function handleToolExecutionEnd(
ctx.trimMessagingToolSent();
}
}
const pendingMediaUrl = ctx.state.pendingMessagingMediaUrls.get(toolCallId);
if (pendingMediaUrl) {
ctx.state.pendingMessagingMediaUrls.delete(toolCallId);
if (!isToolError) {
ctx.state.messagingToolSentMediaUrls.push(pendingMediaUrl);
ctx.trimMessagingToolSent();
}
}
// Track committed reminders only when cron.add completed successfully.
if (!isToolError && toolName === "cron" && isCronAddAction(startData?.args)) {

View File

@@ -70,9 +70,11 @@ export type EmbeddedPiSubscribeState = {
messagingToolSentTexts: string[];
messagingToolSentTextsNormalized: string[];
messagingToolSentTargets: MessagingToolSend[];
messagingToolSentMediaUrls: string[];
pendingMessagingTexts: Map<string, string>;
pendingMessagingTargets: Map<string, MessagingToolSend>;
successfulCronAdds: number;
pendingMessagingMediaUrls: Map<string, string>;
lastAssistant?: AgentMessage;
};
@@ -122,6 +124,44 @@ export type EmbeddedPiSubscribeContext = {
getCompactionCount: () => number;
};
/**
* Minimal context type for tool execution handlers. Allows
* tests provide only the fields they exercise
* without needing the full `EmbeddedPiSubscribeContext`.
*/
export type ToolHandlerParams = Pick<
SubscribeEmbeddedPiSessionParams,
"runId" | "onBlockReplyFlush" | "onAgentEvent" | "onToolResult"
>;
export type ToolHandlerState = Pick<
EmbeddedPiSubscribeState,
| "toolMetaById"
| "toolMetas"
| "toolSummaryById"
| "lastToolError"
| "pendingMessagingTargets"
| "pendingMessagingTexts"
| "pendingMessagingMediaUrls"
| "messagingToolSentTexts"
| "messagingToolSentTextsNormalized"
| "messagingToolSentMediaUrls"
| "messagingToolSentTargets"
>;
export type ToolHandlerContext = {
params: ToolHandlerParams;
state: ToolHandlerState;
log: EmbeddedSubscribeLogger;
hookRunner?: HookRunner;
flushBlockReplyBuffer: () => void;
shouldEmitToolResult: () => boolean;
shouldEmitToolOutput: () => boolean;
emitToolSummary: (toolName?: string, meta?: string) => void;
emitToolOutput: (toolName?: string, meta?: string, output?: string) => void;
trimMessagingToolSent: () => void;
};
export type EmbeddedPiSubscribeEvent =
| AgentEvent
| { type: string; [k: string]: unknown }

View File

@@ -71,9 +71,11 @@ export function subscribeEmbeddedPiSession(params: SubscribeEmbeddedPiSessionPar
messagingToolSentTexts: [],
messagingToolSentTextsNormalized: [],
messagingToolSentTargets: [],
messagingToolSentMediaUrls: [],
pendingMessagingTexts: new Map(),
pendingMessagingTargets: new Map(),
successfulCronAdds: 0,
pendingMessagingMediaUrls: new Map(),
};
const usageTotals = {
input: 0,
@@ -91,6 +93,7 @@ export function subscribeEmbeddedPiSession(params: SubscribeEmbeddedPiSessionPar
const messagingToolSentTexts = state.messagingToolSentTexts;
const messagingToolSentTextsNormalized = state.messagingToolSentTextsNormalized;
const messagingToolSentTargets = state.messagingToolSentTargets;
const messagingToolSentMediaUrls = state.messagingToolSentMediaUrls;
const pendingMessagingTexts = state.pendingMessagingTexts;
const pendingMessagingTargets = state.pendingMessagingTargets;
const replyDirectiveAccumulator = createStreamingDirectiveAccumulator();
@@ -192,6 +195,7 @@ export function subscribeEmbeddedPiSession(params: SubscribeEmbeddedPiSessionPar
// These tools can send messages via sendMessage/threadReply actions (or sessions_send with message).
const MAX_MESSAGING_SENT_TEXTS = 200;
const MAX_MESSAGING_SENT_TARGETS = 200;
const MAX_MESSAGING_SENT_MEDIA_URLS = 200;
const trimMessagingToolSent = () => {
if (messagingToolSentTexts.length > MAX_MESSAGING_SENT_TEXTS) {
const overflow = messagingToolSentTexts.length - MAX_MESSAGING_SENT_TEXTS;
@@ -202,6 +206,10 @@ export function subscribeEmbeddedPiSession(params: SubscribeEmbeddedPiSessionPar
const overflow = messagingToolSentTargets.length - MAX_MESSAGING_SENT_TARGETS;
messagingToolSentTargets.splice(0, overflow);
}
if (messagingToolSentMediaUrls.length > MAX_MESSAGING_SENT_MEDIA_URLS) {
const overflow = messagingToolSentMediaUrls.length - MAX_MESSAGING_SENT_MEDIA_URLS;
messagingToolSentMediaUrls.splice(0, overflow);
}
};
const ensureCompactionPromise = () => {
@@ -577,9 +585,11 @@ export function subscribeEmbeddedPiSession(params: SubscribeEmbeddedPiSessionPar
messagingToolSentTexts.length = 0;
messagingToolSentTextsNormalized.length = 0;
messagingToolSentTargets.length = 0;
messagingToolSentMediaUrls.length = 0;
pendingMessagingTexts.clear();
pendingMessagingTargets.clear();
state.successfulCronAdds = 0;
state.pendingMessagingMediaUrls.clear();
resetAssistantMessageState(0);
};
@@ -663,6 +673,7 @@ export function subscribeEmbeddedPiSession(params: SubscribeEmbeddedPiSessionPar
isCompacting: () => state.compactionInFlight || state.pendingCompactionRetry > 0,
isCompactionInFlight: () => state.compactionInFlight,
getMessagingToolSentTexts: () => messagingToolSentTexts.slice(),
getMessagingToolSentMediaUrls: () => messagingToolSentMediaUrls.slice(),
getMessagingToolSentTargets: () => messagingToolSentTargets.slice(),
getSuccessfulCronAdds: () => state.successfulCronAdds,
// Returns true if any messaging tool successfully sent a message.

View File

@@ -10,6 +10,7 @@ import { normalizeReplyPayloadDirectives } from "./reply-delivery.js";
import {
applyReplyThreading,
filterMessagingToolDuplicates,
filterMessagingToolMediaDuplicates,
isRenderablePayload,
shouldSuppressMessagingToolReplies,
} from "./reply-payloads.js";
@@ -27,6 +28,7 @@ export function buildReplyPayloads(params: {
currentMessageId?: string;
messageProvider?: string;
messagingToolSentTexts?: string[];
messagingToolSentMediaUrls?: string[];
messagingToolSentTargets?: Parameters<
typeof shouldSuppressMessagingToolReplies
>[0]["messagingToolSentTargets"];
@@ -93,16 +95,22 @@ export function buildReplyPayloads(params: {
payloads: replyTaggedPayloads,
sentTexts: messagingToolSentTexts,
});
const mediaFilteredPayloads = filterMessagingToolMediaDuplicates({
payloads: dedupedPayloads,
sentMediaUrls: params.messagingToolSentMediaUrls ?? [],
});
// Filter out payloads already sent via pipeline or directly during tool flush.
const filteredPayloads = shouldDropFinalPayloads
? []
: params.blockStreamingEnabled
? dedupedPayloads.filter((payload) => !params.blockReplyPipeline?.hasSentPayload(payload))
? mediaFilteredPayloads.filter(
(payload) => !params.blockReplyPipeline?.hasSentPayload(payload),
)
: params.directlySentBlockKeys?.size
? dedupedPayloads.filter(
? mediaFilteredPayloads.filter(
(payload) => !params.directlySentBlockKeys!.has(createBlockReplyPayloadKey(payload)),
)
: dedupedPayloads;
: mediaFilteredPayloads;
const replyPayloads = suppressMessagingToolReplies ? [] : filteredPayloads;
return {

View File

@@ -444,6 +444,7 @@ export async function runReplyAgent(params: {
currentMessageId: sessionCtx.MessageSidFull ?? sessionCtx.MessageSid,
messageProvider: followupRun.run.messageProvider,
messagingToolSentTexts: runResult.messagingToolSentTexts,
messagingToolSentMediaUrls: runResult.messagingToolSentMediaUrls,
messagingToolSentTargets: runResult.messagingToolSentTargets,
originatingTo: sessionCtx.OriginatingTo ?? sessionCtx.To,
accountId: sessionCtx.AccountId,

View File

@@ -18,6 +18,7 @@ import { isSilentReplyText, SILENT_REPLY_TOKEN } from "../tokens.js";
import {
applyReplyThreading,
filterMessagingToolDuplicates,
filterMessagingToolMediaDuplicates,
shouldSuppressMessagingToolReplies,
} from "./reply-payloads.js";
import { resolveReplyToMode } from "./reply-threading.js";
@@ -252,13 +253,17 @@ export function createFollowupRunner(params: {
payloads: replyTaggedPayloads,
sentTexts: runResult.messagingToolSentTexts ?? [],
});
const mediaFilteredPayloads = filterMessagingToolMediaDuplicates({
payloads: dedupedPayloads,
sentMediaUrls: runResult.messagingToolSentMediaUrls ?? [],
});
const suppressMessagingToolReplies = shouldSuppressMessagingToolReplies({
messageProvider: queued.run.messageProvider,
messagingToolSentTargets: runResult.messagingToolSentTargets,
originatingTo: queued.originatingTo,
accountId: queued.run.agentAccountId,
});
const finalPayloads = suppressMessagingToolReplies ? [] : dedupedPayloads;
const finalPayloads = suppressMessagingToolReplies ? [] : mediaFilteredPayloads;
if (finalPayloads.length === 0) {
return;

View File

@@ -0,0 +1,61 @@
import { describe, expect, it } from "vitest";
import { filterMessagingToolMediaDuplicates } from "./reply-payloads.js";
describe("filterMessagingToolMediaDuplicates", () => {
it("strips mediaUrl when it matches sentMediaUrls", () => {
const result = filterMessagingToolMediaDuplicates({
payloads: [{ text: "hello", mediaUrl: "file:///tmp/photo.jpg" }],
sentMediaUrls: ["file:///tmp/photo.jpg"],
});
expect(result).toEqual([{ text: "hello", mediaUrl: undefined, mediaUrls: undefined }]);
});
it("preserves mediaUrl when it is not in sentMediaUrls", () => {
const result = filterMessagingToolMediaDuplicates({
payloads: [{ text: "hello", mediaUrl: "file:///tmp/photo.jpg" }],
sentMediaUrls: ["file:///tmp/other.jpg"],
});
expect(result).toEqual([{ text: "hello", mediaUrl: "file:///tmp/photo.jpg" }]);
});
it("filters matching entries from mediaUrls array", () => {
const result = filterMessagingToolMediaDuplicates({
payloads: [
{
text: "gallery",
mediaUrls: ["file:///tmp/a.jpg", "file:///tmp/b.jpg", "file:///tmp/c.jpg"],
},
],
sentMediaUrls: ["file:///tmp/b.jpg"],
});
expect(result).toEqual([
{ text: "gallery", mediaUrls: ["file:///tmp/a.jpg", "file:///tmp/c.jpg"] },
]);
});
it("clears mediaUrls when all entries match", () => {
const result = filterMessagingToolMediaDuplicates({
payloads: [{ text: "gallery", mediaUrls: ["file:///tmp/a.jpg"] }],
sentMediaUrls: ["file:///tmp/a.jpg"],
});
expect(result).toEqual([{ text: "gallery", mediaUrl: undefined, mediaUrls: undefined }]);
});
it("returns payloads unchanged when no media present", () => {
const payloads = [{ text: "plain text" }];
const result = filterMessagingToolMediaDuplicates({
payloads,
sentMediaUrls: ["file:///tmp/photo.jpg"],
});
expect(result).toStrictEqual(payloads);
});
it("returns payloads unchanged when sentMediaUrls is empty", () => {
const payloads = [{ text: "hello", mediaUrl: "file:///tmp/photo.jpg" }];
const result = filterMessagingToolMediaDuplicates({
payloads,
sentMediaUrls: [],
});
expect(result).toBe(payloads);
});
});

View File

@@ -95,6 +95,31 @@ export function filterMessagingToolDuplicates(params: {
return payloads.filter((payload) => !isMessagingToolDuplicate(payload.text ?? "", sentTexts));
}
export function filterMessagingToolMediaDuplicates(params: {
payloads: ReplyPayload[];
sentMediaUrls: string[];
}): ReplyPayload[] {
const { payloads, sentMediaUrls } = params;
if (sentMediaUrls.length === 0) {
return payloads;
}
const sentSet = new Set(sentMediaUrls);
return payloads.map((payload) => {
const mediaUrl = payload.mediaUrl;
const mediaUrls = payload.mediaUrls;
const stripSingle = mediaUrl && sentSet.has(mediaUrl);
const filteredUrls = mediaUrls?.filter((u) => !sentSet.has(u));
if (!stripSingle && (!mediaUrls || filteredUrls?.length === mediaUrls.length)) {
return payload; // No change
}
return {
...payload,
mediaUrl: stripSingle ? undefined : mediaUrl,
mediaUrls: filteredUrls?.length ? filteredUrls : undefined,
};
});
}
function normalizeAccountId(value?: string): string | undefined {
const trimmed = value?.trim();
return trimmed ? trimmed.toLowerCase() : undefined;