mirror of
https://github.com/openclaw/openclaw.git
synced 2026-07-29 14:21:16 +00:00
* fix(plugins): apply output text transforms to toolcall_delta and toolcall_end events toolcall_delta and toolcall_end events bypassed the output replacement pipeline, leaking masked tokens (e.g. PII placeholders) into tool call arguments and external systems. Closes #97761 * fix(plugins): transform nested tool call arguments in output replacements Add recursive transformToolCallArgumentText to handle strings, arrays, and nested objects in tool call arguments, not just the name field. * fix(plugins): keep tool names unchanged and cover result path - Remove toolCall.name transformation to prevent breaking tool routing - Add arguments transform to stream.result()/done.message via transformContentText for tool-call content blocks * fix(plugins): narrow argument transform to toolCall content blocks only Only transform arguments on content blocks with type=toolCall to avoid touching non-tool-call blocks that happen to have an arguments field. * test(plugins): assert stream.result() tool-call content block is transformed * test(plugins): fix result-path fixture to actually contain toolCall block The previous fixture used makeAssistantMessage('final') which produces a plain text content block, not a toolCall block. The stream.result() assertion was vacuously passing. * style(plugins): fix type cast in result-path test assertion * fix(agents): preserve tool argument transforms after repair * refactor(agents): keep tool transform boundary narrow --------- Co-authored-by: Peter Steinberger <steipete@golden-gate.local>
216 lines
7.4 KiB
TypeScript
216 lines
7.4 KiB
TypeScript
/**
|
|
* Plugin-defined text replacement transforms for stream boundaries.
|
|
*
|
|
* Provider and CLI plugins can rewrite prompt/event text without owning the transport implementation.
|
|
*/
|
|
import type { AssistantMessageEvent } from "../llm/types.js";
|
|
import type { PluginTextReplacement, PluginTextTransforms } from "../plugins/cli-backend.types.js";
|
|
import type { StreamFn } from "./runtime/index.js";
|
|
import type { MutableAssistantMessageEventStream } from "./stream-compat.js";
|
|
import { createStreamIteratorWrapper } from "./stream-iterator-wrapper.js";
|
|
|
|
// Applies plugin-defined text replacement transforms to stream input/output.
|
|
// Used by provider/CLI plugins that need compatibility rewrites at boundaries.
|
|
/** Merge multiple plugin text-transform sets. */
|
|
export function mergePluginTextTransforms(
|
|
...transforms: Array<PluginTextTransforms | undefined>
|
|
): PluginTextTransforms | undefined {
|
|
const input = transforms.flatMap((entry) => entry?.input ?? []);
|
|
const output = transforms.flatMap((entry) => entry?.output ?? []);
|
|
if (input.length === 0 && output.length === 0) {
|
|
return undefined;
|
|
}
|
|
return {
|
|
...(input.length > 0 ? { input } : {}),
|
|
...(output.length > 0 ? { output } : {}),
|
|
};
|
|
}
|
|
|
|
/** Apply sequential plugin text replacements to one string. */
|
|
export function applyPluginTextReplacements(
|
|
text: string,
|
|
replacements?: PluginTextReplacement[],
|
|
): string {
|
|
if (!replacements || replacements.length === 0 || !text) {
|
|
return text;
|
|
}
|
|
let next = text;
|
|
for (const replacement of replacements) {
|
|
next = next.replace(replacement.from, replacement.to);
|
|
}
|
|
return next;
|
|
}
|
|
|
|
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
return Boolean(value && typeof value === "object" && !Array.isArray(value));
|
|
}
|
|
|
|
function transformContentText(content: unknown, replacements?: PluginTextReplacement[]): unknown {
|
|
if (typeof content === "string") {
|
|
return applyPluginTextReplacements(content, replacements);
|
|
}
|
|
if (Array.isArray(content)) {
|
|
return content.map((entry) => transformContentText(entry, replacements));
|
|
}
|
|
if (!isRecord(content)) {
|
|
return content;
|
|
}
|
|
const next = { ...content };
|
|
if (typeof next.text === "string") {
|
|
next.text = applyPluginTextReplacements(next.text, replacements);
|
|
}
|
|
if (Object.hasOwn(next, "content")) {
|
|
next.content = transformContentText(next.content, replacements);
|
|
}
|
|
if (next.type === "toolCall" && Object.hasOwn(next, "arguments")) {
|
|
next.arguments = transformToolCallArgumentText(next.arguments, replacements);
|
|
}
|
|
return next;
|
|
}
|
|
|
|
function transformMessageText(message: unknown, replacements?: PluginTextReplacement[]): unknown {
|
|
if (!isRecord(message)) {
|
|
return message;
|
|
}
|
|
const next = { ...message };
|
|
if (Object.hasOwn(next, "content")) {
|
|
next.content = transformContentText(next.content, replacements);
|
|
}
|
|
if (typeof next.errorMessage === "string") {
|
|
next.errorMessage = applyPluginTextReplacements(next.errorMessage, replacements);
|
|
}
|
|
return next;
|
|
}
|
|
|
|
function transformToolCallArgumentText(
|
|
value: unknown,
|
|
replacements?: PluginTextReplacement[],
|
|
): unknown {
|
|
if (typeof value === "string") {
|
|
return applyPluginTextReplacements(value, replacements);
|
|
}
|
|
if (Array.isArray(value)) {
|
|
return value.map((entry) => transformToolCallArgumentText(entry, replacements));
|
|
}
|
|
if (!isRecord(value)) {
|
|
return value;
|
|
}
|
|
return Object.fromEntries(
|
|
Object.entries(value).map(([key, entry]) => [
|
|
key,
|
|
transformToolCallArgumentText(entry, replacements),
|
|
]),
|
|
);
|
|
}
|
|
|
|
/** Apply input text replacements to a stream context. */
|
|
function transformStreamContextText(
|
|
context: Parameters<StreamFn>[1],
|
|
replacements?: PluginTextReplacement[],
|
|
options?: { systemPrompt?: boolean },
|
|
): Parameters<StreamFn>[1] {
|
|
if (!replacements || replacements.length === 0) {
|
|
return context;
|
|
}
|
|
return {
|
|
...context,
|
|
systemPrompt:
|
|
options?.systemPrompt !== false && typeof context.systemPrompt === "string"
|
|
? applyPluginTextReplacements(context.systemPrompt, replacements)
|
|
: context.systemPrompt,
|
|
messages: Array.isArray(context.messages)
|
|
? context.messages.map((message) => transformMessageText(message, replacements))
|
|
: context.messages,
|
|
} as Parameters<StreamFn>[1];
|
|
}
|
|
|
|
function transformAssistantEventText(
|
|
event: unknown,
|
|
replacements?: PluginTextReplacement[],
|
|
): AssistantMessageEvent {
|
|
if (!isRecord(event) || !replacements || replacements.length === 0) {
|
|
return event as AssistantMessageEvent;
|
|
}
|
|
const next = { ...event };
|
|
if (next.type === "text_delta" && typeof next.delta === "string") {
|
|
next.delta = applyPluginTextReplacements(next.delta, replacements);
|
|
}
|
|
if (next.type === "text_end" && typeof next.content === "string") {
|
|
next.content = applyPluginTextReplacements(next.content, replacements);
|
|
}
|
|
if (
|
|
next.type === "toolcall_end" &&
|
|
isRecord(next.toolCall) &&
|
|
Object.hasOwn(next.toolCall, "arguments")
|
|
) {
|
|
// Tool names are routing identifiers; only argument values are text.
|
|
next.toolCall = {
|
|
...next.toolCall,
|
|
arguments: transformToolCallArgumentText(next.toolCall.arguments, replacements),
|
|
};
|
|
}
|
|
if (Object.hasOwn(next, "partial")) {
|
|
next.partial = transformMessageText(next.partial, replacements);
|
|
}
|
|
if (Object.hasOwn(next, "message")) {
|
|
next.message = transformMessageText(next.message, replacements);
|
|
}
|
|
if (Object.hasOwn(next, "error")) {
|
|
next.error = transformMessageText(next.error, replacements);
|
|
}
|
|
return next as AssistantMessageEvent;
|
|
}
|
|
|
|
function wrapStreamTextTransforms(
|
|
stream: MutableAssistantMessageEventStream,
|
|
replacements?: PluginTextReplacement[],
|
|
): MutableAssistantMessageEventStream {
|
|
if (!replacements || replacements.length === 0) {
|
|
return stream;
|
|
}
|
|
const originalResult = stream.result.bind(stream);
|
|
stream.result = async () => transformMessageText(await originalResult(), replacements) as never;
|
|
|
|
// Wrap async iteration so streamed deltas and the final result receive the
|
|
// same output replacement policy.
|
|
const originalAsyncIterator = stream[Symbol.asyncIterator].bind(stream);
|
|
(stream as { [Symbol.asyncIterator]: typeof originalAsyncIterator })[Symbol.asyncIterator] =
|
|
function () {
|
|
const iterator = originalAsyncIterator();
|
|
return createStreamIteratorWrapper({
|
|
iterator,
|
|
next: async (streamIterator) => {
|
|
const result = await streamIterator.next();
|
|
return result.done
|
|
? result
|
|
: {
|
|
done: false as const,
|
|
value: transformAssistantEventText(result.value, replacements),
|
|
};
|
|
},
|
|
});
|
|
};
|
|
return stream;
|
|
}
|
|
|
|
/** Wrap a stream function with plugin input/output text transforms. */
|
|
export function wrapStreamFnTextTransforms(params: {
|
|
streamFn: StreamFn;
|
|
input?: PluginTextReplacement[];
|
|
output?: PluginTextReplacement[];
|
|
transformSystemPrompt?: boolean;
|
|
}): StreamFn {
|
|
return (model, context, options) => {
|
|
const nextContext = transformStreamContextText(context, params.input, {
|
|
systemPrompt: params.transformSystemPrompt,
|
|
});
|
|
const maybeStream = params.streamFn(model, nextContext, options);
|
|
if (maybeStream && typeof maybeStream === "object" && "then" in maybeStream) {
|
|
return Promise.resolve(maybeStream).then((stream) =>
|
|
wrapStreamTextTransforms(stream, params.output),
|
|
);
|
|
}
|
|
return wrapStreamTextTransforms(maybeStream, params.output);
|
|
};
|
|
}
|