Skip to content

fix(tools): Resolve intermittent hangs and lack of clear error feedback in apply_diff tool #5391

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
merged 3 commits into from
Jul 4, 2025
Merged

fix(tools): Resolve intermittent hangs and lack of clear error feedback in apply_diff tool #5391

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55be84c
fix(tools): Resolve intermittent hangs and lack of clear error feedba…
Jul 4, 2025
afa777e
fix: show user-friendly error message for XML parsing failures
daniel-lxs Jul 4, 2025
de923b0
feat: add telemetry for XML parsing errors
daniel-lxs Jul 4, 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
6 changes: 5 additions & 1 deletion src/core/tools/multiApplyDiffTool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,11 @@ Expected structure:
</args>

Original error: ${errorMessage}`
throw new Error(detailedError)
cline.consecutiveMistakeCount++
cline.recordToolError("apply_diff")
await cline.say("diff_error", `Failed to parse apply_diff XML: ${errorMessage}`)
pushToolResult(detailedError)
return
}
} else if (legacyPath && typeof legacyDiffContent === "string") {
// Handle legacy parameters (old way)
Expand Down