vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-21 22:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(text): strip Qwen-style XML tool call payloads from visible text (#63999)

Browse Source
This commit is contained in:
MoerAI
2026-04-10 18:17:45 +09:00
committed by Peter Steinberger
parent 9fd08f9d0f
commit a2fb063370
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/shared/text/assistant-visible-text.test.ts
View File

@@ -152,6 +152,27 @@ describe("stripAssistantInternalScaffolding", () => {
);
});
it("strips Qwen-style <tool_call> with nested <function=...> XML", () => {
expectVisibleText(
"prefix\n<tool_call><function=read><parameter=path>/home/user</parameter></function></tool_call>\nsuffix",
"prefix\n\nsuffix",
);
});
it("strips Qwen-style <tool_call> with whitespace before nested XML", () => {
expectVisibleText(
"prefix\n<tool_call>\n<function=search><parameter=query>test</parameter></function>\n</tool_call>\nsuffix",
"prefix\n\nsuffix",
);
});
it("strips dangling Qwen-style <tool_call> with nested XML to end", () => {
expectVisibleText(
"prefix\n<tool_call><function=read><parameter=path>/home",
"prefix\n",
);
});
it("does not close early on </tool_call> text inside JSON strings", () => {
expectVisibleText(
[

15
src/shared/text/assistant-visible-text.ts
View File

@@ -25,6 +25,8 @@ const TOOL_CALL_TAG_NAMES = new Set([
]);
const TOOL_CALL_JSON_PAYLOAD_START_RE =
/^(?:\s+[A-Za-z_:][-A-Za-z0-9_:.]*\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'=<>`]+))*\s*(?:\r?\n\s*)?[[{]/;
const TOOL_CALL_XML_PAYLOAD_START_RE =
/^\s*(?:\r?\n\s*)?<(?:function|invoke|parameters?|arguments?)\b/i;
function endsInsideQuotedString(text: string, start: number, end: number): boolean {
let quoteChar: "'" | '"' | null = null;
@@ -107,7 +109,11 @@ function findTagCloseIndex(text: string, start: number): number {
}
function looksLikeToolCallPayloadStart(text: string, start: number): boolean {
return TOOL_CALL_JSON_PAYLOAD_START_RE.test(text.slice(start));
const rest = text.slice(start);
return (
TOOL_CALL_JSON_PAYLOAD_START_RE.test(rest) ||
TOOL_CALL_XML_PAYLOAD_START_RE.test(rest)
);
}
function parseToolCallTagAt(text: string, start: number): ParsedToolCallTag | null {
@@ -212,9 +218,14 @@ export function stripToolCallXmlTags(text: string): string {
idx = Math.max(idx, tag.end - 1);
continue;
}
const payloadStart = tag.isTruncated ? tag.contentStart : tag.end;
const hasToolCallPayloadStart =
tag.tagName === "tool_call"
? looksLikeToolCallPayloadStart(text, payloadStart)
: TOOL_CALL_JSON_PAYLOAD_START_RE.test(text.slice(payloadStart));
if (
!tag.isClose &&
looksLikeToolCallPayloadStart(text, tag.isTruncated ? tag.contentStart : tag.end)
hasToolCallPayloadStart
) {
inToolCallBlock = true;
toolCallContentStart = tag.end;