mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-11 17:03:43 +00:00
fix(agents): normalize whitespace-padded tool call names before dispatch (#27094)
Fix tool-call lookup failures when models emit whitespace-padded names by normalizing both transcript history and live streamed embedded-runner tool calls before dispatch. Co-authored-by: wangchunyue <80630709+openperf@users.noreply.github.com> Co-authored-by: Sid <sidqin0410@gmail.com> Co-authored-by: Philipp Spiess <hello@philippspiess.com>
This commit is contained in:
@@ -60,7 +60,7 @@ function hasToolCallName(block: ToolCallBlock, allowedToolNames: Set<string> | n
|
||||
return false;
|
||||
}
|
||||
const trimmed = block.name.trim();
|
||||
if (!trimmed || trimmed !== block.name) {
|
||||
if (!trimmed) {
|
||||
return false;
|
||||
}
|
||||
if (trimmed.length > TOOL_CALL_NAME_MAX_CHARS || !TOOL_CALL_NAME_RE.test(trimmed)) {
|
||||
@@ -143,8 +143,9 @@ export function repairToolCallInputs(
|
||||
continue;
|
||||
}
|
||||
|
||||
const nextContent = [];
|
||||
const nextContent: typeof msg.content = [];
|
||||
let droppedInMessage = 0;
|
||||
let trimmedInMessage = 0;
|
||||
|
||||
for (const block of msg.content) {
|
||||
if (
|
||||
@@ -158,6 +159,19 @@ export function repairToolCallInputs(
|
||||
changed = true;
|
||||
continue;
|
||||
}
|
||||
// Normalize tool call names by trimming whitespace so that downstream
|
||||
// lookup (toolsByName map) matches correctly even when the model emits
|
||||
// names with leading/trailing spaces (e.g. " read" → "read").
|
||||
if (isToolCallBlock(block) && typeof (block as ToolCallBlock).name === "string") {
|
||||
const rawName = (block as ToolCallBlock).name as string;
|
||||
if (rawName !== rawName.trim()) {
|
||||
const normalized = { ...block, name: rawName.trim() } as typeof block;
|
||||
nextContent.push(normalized);
|
||||
trimmedInMessage += 1;
|
||||
changed = true;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
nextContent.push(block);
|
||||
}
|
||||
|
||||
@@ -171,6 +185,13 @@ export function repairToolCallInputs(
|
||||
continue;
|
||||
}
|
||||
|
||||
// When tool names were trimmed but nothing was dropped,
|
||||
// we still need to emit the message with the normalized content.
|
||||
if (trimmedInMessage > 0) {
|
||||
out.push({ ...msg, content: nextContent });
|
||||
continue;
|
||||
}
|
||||
|
||||
out.push(msg);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user