romtuck/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 5355b476f6 into 09be5d45d5

Browse Source
This commit is contained in:
Aswin Sreenivas 2026-01-30 11:59:33 -04:00 committed by GitHub
commit c11a72167c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/agents/pi-embedded-runner/run/attempt.ts
View File

@ -725,7 +725,28 @@ export async function runEmbeddedAttempt(
sessionManager.resetLeaf();
}
const sessionContext = sessionManager.buildSessionContext();
activeSession.agent.replaceMessages(sessionContext.messages);
// Re-sanitize the rebuilt messages to ensure tool_use/tool_result pairing is valid.
// Without this, Anthropic API rejects the request with "unexpected tool_use_id" errors.
const rebuiltSanitized = await sanitizeSessionHistory({
messages: sessionContext.messages,
modelApi: params.model.api,
modelId: params.modelId,
provider: params.provider,
sessionManager,
sessionId: params.sessionId,
policy: transcriptPolicy,
});
const rebuiltValidatedGemini = transcriptPolicy.validateGeminiTurns
? validateGeminiTurns(rebuiltSanitized)
: rebuiltSanitized;
const rebuiltValidated = transcriptPolicy.validateAnthropicTurns
? validateAnthropicTurns(rebuiltValidatedGemini)
: rebuiltValidatedGemini;
const rebuiltLimited = limitHistoryTurns(
rebuiltValidated,
getDmHistoryLimitFromSessionKey(params.sessionKey, params.config),
);
activeSession.agent.replaceMessages(rebuiltLimited);
log.warn(
`Removed orphaned user message to prevent consecutive user turns. ` +
`runId=${params.runId} sessionId=${params.sessionId}`,