Skip to content

fix: validate and fix tool_result IDs before API requests #9952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cte merged 9 commits into from
Dec 10, 2025
Merged

fix: validate and fix tool_result IDs before API requests #9952

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b7f7a41
fix: validate and fix tool_result IDs before API requests
daniel-lxs Dec 9, 2025
3a087a7
chore: remove unnecessary comment
daniel-lxs Dec 9, 2025
2e21a54
feat: add captureException method for telemetry error tracking
daniel-lxs Dec 9, 2025
a3e1da2
perf: optimize backwards walk for finding previous assistant message
daniel-lxs Dec 9, 2025
8386e83
fix: remove unnecessary comment in tool_result ID validation logic
daniel-lxs Dec 9, 2025
ddf88d8
refactor: use findLastIndex utility for consistency
daniel-lxs Dec 9, 2025
c07b9f9
Merge main
cte Dec 10, 2025
f4bb76a
refactor: DRY up validateAndFixToolResultIds by passing apiConversati…
roomote Dec 10, 2025
11fdfd8
fix: use indexOf to correctly handle duplicate tool_use_ids
hannesrudolph Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/core/task/Task.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ import { getMessagesSinceLastSummary, summarizeConversation, getEffectiveApiHist
import { MessageQueueService } from "../message-queue/MessageQueueService"
import { AutoApprovalHandler, checkAutoApproval } from "../auto-approval"
import { MessageManager } from "../message-manager"
import { validateAndFixToolResultIds } from "./validateToolResultIds"

const MAX_EXPONENTIAL_BACKOFF_SECONDS = 600 // 10 minutes
const DEFAULT_USAGE_COLLECTION_TIMEOUT_MS = 5000 // 5 seconds
Expand Down Expand Up @@ -811,7 +812,9 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {

this.apiConversationHistory.push(messageWithTs)
} else {
const messageWithTs = { ...message, ts: Date.now() }
// For user messages, validate and fix tool_result IDs against the previous assistant message
const validatedMessage = validateAndFixToolResultIds(message, this.apiConversationHistory)
const messageWithTs = { ...validatedMessage, ts: Date.now() }
this.apiConversationHistory.push(messageWithTs)
}

Expand Down Expand Up @@ -850,7 +853,9 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
content: this.userMessageContent,
}

const userMessageWithTs = { ...userMessage, ts: Date.now() }
// Validate and fix tool_result IDs against the previous assistant message
const validatedMessage = validateAndFixToolResultIds(userMessage, this.apiConversationHistory)
const userMessageWithTs = { ...validatedMessage, ts: Date.now() }
this.apiConversationHistory.push(userMessageWithTs as ApiMessage)

await this.saveApiConversationHistory()
Expand Down
Loading
Loading