Skip to content

feat: enhance checkpoint frequency - add checkpoints before file edits #6803

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

Closed
wants to merge 2 commits into from
Closed

feat: enhance checkpoint frequency - add checkpoints before file edits #6803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67e6a22
fix: improve checkpoint timing logic
roomote Aug 7, 2025
9789925
feat: add checkpoints before file edits for increased checkpoint freq…
roomote Aug 7, 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
39 changes: 30 additions & 9 deletions src/core/assistant-message/presentAssistantMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,11 @@ export async function presentAssistantMessage(cline: Task) {

switch (block.name) {
case "write_to_file":
await checkpointSaveAndMark(cline)
// Save checkpoint BEFORE file edit
await checkpointSaveAndMark(cline, "before")
await writeToFileTool(cline, block, askApproval, handleError, pushToolResult, removeClosingTag)
// Save checkpoint AFTER file edit
await checkpointSaveAndMark(cline, "after")
break
case "update_todo_list":
await updateTodoListTool(cline, block, askApproval, handleError, pushToolResult, removeClosingTag)
Expand All @@ -429,11 +432,12 @@ export async function presentAssistantMessage(cline: Task) {
)
}

// Save checkpoint BEFORE file edit
await checkpointSaveAndMark(cline, "before")

if (isMultiFileApplyDiffEnabled) {
await checkpointSaveAndMark(cline)
await applyDiffTool(cline, block, askApproval, handleError, pushToolResult, removeClosingTag)
} else {
await checkpointSaveAndMark(cline)
await applyDiffToolLegacy(
cline,
block,
Expand All @@ -443,15 +447,23 @@ export async function presentAssistantMessage(cline: Task) {
removeClosingTag,
)
}
// Save checkpoint AFTER file edit
await checkpointSaveAndMark(cline, "after")
break
}
case "insert_content":
await checkpointSaveAndMark(cline)
// Save checkpoint BEFORE file edit
await checkpointSaveAndMark(cline, "before")
await insertContentTool(cline, block, askApproval, handleError, pushToolResult, removeClosingTag)
// Save checkpoint AFTER file edit
await checkpointSaveAndMark(cline, "after")
break
case "search_and_replace":
await checkpointSaveAndMark(cline)
// Save checkpoint BEFORE file edit
await checkpointSaveAndMark(cline, "before")
await searchAndReplaceTool(cline, block, askApproval, handleError, pushToolResult, removeClosingTag)
// Save checkpoint AFTER file edit
await checkpointSaveAndMark(cline, "after")
break
case "read_file":
await readFileTool(cline, block, askApproval, handleError, pushToolResult, removeClosingTag)
Expand Down Expand Up @@ -583,16 +595,25 @@ export async function presentAssistantMessage(cline: Task) {
/**
* save checkpoint and mark done in the current streaming task.
* @param task The Task instance to checkpoint save and mark.
* @param timing Whether this is a "before" or "after" checkpoint for file edits
* @returns
*/
async function checkpointSaveAndMark(task: Task) {
if (task.currentStreamingDidCheckpoint) {
async function checkpointSaveAndMark(task: Task, timing?: "before" | "after") {
Copy link
Contributor Author

@roomote roomote bot Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice implementation of the dual checkpoint strategy! The optional timing parameter is a clean way to distinguish between "before" and "after" checkpoints while maintaining backward compatibility.

One suggestion for future improvement: Consider adding a brief comment here explaining the checkpoint strategy (before for recovery, after for progression) to help future maintainers understand the design decision.

// For "before" checkpoints, always save regardless of currentStreamingDidCheckpoint
// For "after" checkpoints or no timing specified, use the original logic
if (timing !== "before" && task.currentStreamingDidCheckpoint) {
return
}
try {
await task.checkpointSave(true)
task.currentStreamingDidCheckpoint = true
// Only mark as done for "after" checkpoints or when no timing is specified
if (timing !== "before") {
task.currentStreamingDidCheckpoint = true
}
} catch (error) {
console.error(`[Task#presentAssistantMessage] Error saving checkpoint: ${error.message}`, error)
console.error(
`[Task#presentAssistantMessage] Error saving checkpoint (${timing || "default"}): ${error.message}`,
error,
)
}
}
Loading
Loading