github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-09 16:24:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Agent: repair malformed tool calls and session files

Browse Source
This commit is contained in:
Justin
2026-02-03 05:17:42 +08:00
committed by Shakker
parent 0eae9f456c
commit 0da6de6624
13 changed files with 383 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/agents/session-tool-result-guard.ts
View File

@@ -1,7 +1,7 @@
import type { AgentMessage } from "@mariozechner/pi-agent-core";
import type { SessionManager } from "@mariozechner/pi-coding-agent";
import { emitSessionTranscriptUpdate } from "../sessions/transcript-events.js";
import { makeMissingToolResult } from "./session-transcript-repair.js";
import { makeMissingToolResult, sanitizeToolCallInputs } from "./session-transcript-repair.js";
type ToolCall = { id: string; name?: string };
@@ -96,16 +96,25 @@ export function installSessionToolResultGuard(
};
const guardedAppend = (message: AgentMessage) => {
let nextMessage = message;
const role = (message as { role?: unknown }).role;
if (role === "assistant") {
const sanitized = sanitizeToolCallInputs([message]);
if (sanitized.length === 0) {
return undefined;
}
nextMessage = sanitized[0] as AgentMessage;
}
const nextRole = (nextMessage as { role?: unknown }).role;
if (role === "toolResult") {
const id = extractToolResultId(message as Extract<AgentMessage, { role: "toolResult" }>);
if (nextRole === "toolResult") {
const id = extractToolResultId(nextMessage as Extract<AgentMessage, { role: "toolResult" }>);
const toolName = id ? pending.get(id) : undefined;
if (id) {
pending.delete(id);
}
return originalAppend(
persistToolResult(message, {
persistToolResult(nextMessage, {
toolCallId: id ?? undefined,
toolName,
isSynthetic: false,
@@ -114,13 +123,13 @@ export function installSessionToolResultGuard(
}
const toolCalls =
role === "assistant"
? extractAssistantToolCalls(message as Extract<AgentMessage, { role: "assistant" }>)
nextRole === "assistant"
? extractAssistantToolCalls(nextMessage as Extract<AgentMessage, { role: "assistant" }>)
: [];
if (allowSyntheticToolResults) {
// If previous tool calls are still pending, flush before non-tool results.
if (pending.size > 0 && (toolCalls.length === 0 || role !== "assistant")) {
if (pending.size > 0 && (toolCalls.length === 0 || nextRole !== "assistant")) {
flushPendingToolResults();
}
// If new tool calls arrive while older ones are pending, flush the old ones first.
@@ -129,7 +138,7 @@ export function installSessionToolResultGuard(
}
}
const result = originalAppend(message as never);
const result = originalAppend(nextMessage as never);
const sessionFile = (
sessionManager as { getSessionFile?: () => string | null }