fix(edit): add per-file lock to prevent read-before-write race (#4388)

This commit is contained in:
Spoon
2025-12-15 06:01:50 +01:00
committed by GitHub
parent 509f7d9617
commit 5cf126d489
2 changed files with 30 additions and 4 deletions

View File

@@ -76,7 +76,7 @@ export const EditTool = Tool.define("edit", {
let diff = ""
let contentOld = ""
let contentNew = ""
await (async () => {
await FileTime.withLock(filePath, async () => {
if (params.oldString === "") {
contentNew = params.newString
diff = trimDiff(createTwoFilesPatch(filePath, filePath, contentOld, contentNew))
@@ -97,6 +97,7 @@ export const EditTool = Tool.define("edit", {
await Bus.publish(File.Event.Edited, {
file: filePath,
})
FileTime.read(ctx.sessionID, filePath)
return
}
@@ -133,9 +134,8 @@ export const EditTool = Tool.define("edit", {
diff = trimDiff(
createTwoFilesPatch(filePath, filePath, normalizeLineEndings(contentOld), normalizeLineEndings(contentNew)),
)
})()
FileTime.read(ctx.sessionID, filePath)
FileTime.read(ctx.sessionID, filePath)
})
let output = ""
await LSP.touchFile(filePath, true)