Skip to content

Commit 578e4f2

Browse files
PierrunoYTclaude
andcommitted
fix(checkpoints): continue restore after per-entry cleanup failures
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
1 parent e0ce96c commit 578e4f2

2 files changed

Lines changed: 46 additions & 7 deletions

File tree

‎src/services/checkpoints/ShadowCheckpointService.ts‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,19 +339,35 @@ export abstract class ShadowCheckpointService extends EventEmitter {
339339
continue
340340
}
341341
const absPath = path.join(this.workspaceDir, relPath)
342-
await fs.rm(absPath, { force: true, recursive: relPath.endsWith("/") })
342+
// A per-entry failure must not abort restore before `git reset --hard` runs.
343+
await fs.rm(absPath, { force: true, recursive: relPath.endsWith("/") }).catch((error: unknown) => {
344+
this.log(
345+
`[${this.constructor.name}#removeUntrackedFiles] failed to remove ${relPath}: ${error instanceof Error ? error.message : String(error)}`,
346+
)
347+
})
343348
}
344349

345350
// --directory includes paths that never contained files. Walk these bottom-up,
346351
// using only rmdir so a directory containing protected files is never deleted.
347352
const removeEmptyDirectories = async (relDir: string): Promise<void> => {
348353
if (wasIgnored(relDir)) return
349354
const absDir = path.join(this.workspaceDir, relDir)
350-
for (const entry of await fs.readdir(absDir, { withFileTypes: true })) {
351-
if (entry.isDirectory()) await removeEmptyDirectories(`${relDir}${entry.name}/`)
355+
try {
356+
for (const entry of await fs.readdir(absDir, { withFileTypes: true })) {
357+
if (entry.isDirectory()) await removeEmptyDirectories(`${relDir}${entry.name}/`)
358+
}
359+
} catch (error: unknown) {
360+
this.log(
361+
`[${this.constructor.name}#removeUntrackedFiles] failed to read ${relDir}: ${error instanceof Error ? error.message : String(error)}`,
362+
)
363+
return
352364
}
353365
await fs.rmdir(absDir).catch((error: NodeJS.ErrnoException) => {
354-
if (error.code !== "ENOTEMPTY" && error.code !== "EEXIST" && error.code !== "ENOENT") throw error
366+
if (error.code !== "ENOTEMPTY" && error.code !== "EEXIST" && error.code !== "ENOENT") {
367+
this.log(
368+
`[${this.constructor.name}#removeUntrackedFiles] failed to remove ${relDir}: ${error.message}`,
369+
)
370+
}
355371
})
356372
}
357373
const directories = await git.raw(["ls-files", "--others", "--exclude-standard", "--directory", "-z"])

‎src/services/checkpoints/__tests__/ShadowCheckpointService.spec.ts‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,19 +338,36 @@ describe.each([[RepoPerTaskCheckpointService, "RepoPerTaskCheckpointService"]])(
338338
},
339339
)
340340

341-
it.each(["missing", "blob"])("rejects a %s object before cleanup", async (kind) => {
341+
it.each([
342+
["missing", /could not get object info/i],
343+
["blob", "Checkpoint hash does not identify a commit"],
344+
] as const)("rejects a %s object before cleanup", async (kind, expectedError) => {
342345
service.on("error", vitest.fn())
343346
const git = service["git"]!
344347
const hash = kind === "blob" ? await git.revparse(["HEAD:test.txt"]) : "a".repeat(40)
345348
const read = vitest.spyOn(fs, "readFile")
346349
const clean = vitest.spyOn(git, "clean")
347350
const reset = vitest.spyOn(git, "reset")
348-
await expect(service.restoreCheckpoint(hash)).rejects.toThrow()
351+
await expect(service.restoreCheckpoint(hash)).rejects.toThrow(expectedError)
349352
expect(read).not.toHaveBeenCalled()
350353
expect(clean).not.toHaveBeenCalled()
351354
expect(reset).not.toHaveBeenCalled()
352355
})
353356

357+
it("still resets tracked files when removing an untracked file fails", async () => {
358+
service.on("error", vitest.fn())
359+
const checkpoint = await service.saveCheckpoint("tracked state", { allowEmpty: true })
360+
await fs.writeFile(testFile, "modified")
361+
const untracked = path.join(service.workspaceDir, "stuck-untracked.txt")
362+
await fs.writeFile(untracked, "stuck")
363+
const rm = vitest
364+
.spyOn(fs, "rm")
365+
.mockRejectedValue(Object.assign(new Error("busy"), { code: "EBUSY" }))
366+
await service.restoreCheckpoint(checkpoint!.commit)
367+
rm.mockRestore()
368+
expect(await fs.readFile(testFile, "utf8")).toBe("Hello, world!")
369+
})
370+
354371
it("records files ignored before initialization for a baseHash restore", async () => {
355372
const gitignore = path.join(service.workspaceDir, ".gitignore")
356373
const secret = path.join(service.workspaceDir, "initial-secret.txt")
@@ -395,7 +412,13 @@ describe.each([[RepoPerTaskCheckpointService, "RepoPerTaskCheckpointService"]])(
395412
.spyOn(fs, "readFile")
396413
.mockRejectedValueOnce(Object.assign(new Error("denied"), { code: "EACCES" }))
397414
}
398-
await expect(service.restoreCheckpoint(checkpoint!.commit)).rejects.toThrow()
415+
const expectedError = {
416+
missing: /ENOENT|no such file/i,
417+
truncated: SyntaxError,
418+
invalid: "Invalid ignored-path record",
419+
unreadable: "denied",
420+
}[failure]
421+
await expect(service.restoreCheckpoint(checkpoint!.commit)).rejects.toThrow(expectedError)
399422
expect(await fs.readFile(testFile, "utf8")).toBe("must not reset")
400423
expect(await fs.readFile(untracked, "utf8")).toBe("must not clean")
401424
},

0 commit comments

Comments
 (0)