Skip to content

Commit bf786b6

Browse files
committed
feat(file-safety): atomic text publish primitive + safeWriteJson refactor (A4, #1375)
1 parent 78c712a commit bf786b6

7 files changed

Lines changed: 933 additions & 109 deletions

File tree

‎src/eslint-suppressions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1721,7 +1721,7 @@
17211721
},
17221722
"utils/safeWriteJson.ts": {
17231723
"@typescript-eslint/no-explicit-any": {
1724-
"count": 4
1724+
"count": 3
17251725
}
17261726
},
17271727
"utils/tts.ts": {

‎src/integrations/editor/DiffViewProvider.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { arePathsEqual, getReadablePath } from "../../utils/path"
1818
import { formatResponse } from "../../core/prompts/responses"
1919
import { diagnosticsToProblemsString, getNewDiagnostics } from "../diagnostics"
2020
import { Task } from "../../core/task/Task"
21+
import { safeWriteText } from "../../services/file-safety/safeWriteText"
2122

2223
import { DecorationController } from "./DecorationController"
2324

@@ -1156,7 +1157,7 @@ export class DiffViewProvider {
11561157

11571158
// Write the content directly to the file
11581159
await createDirectoriesForFile(absolutePath)
1159-
await fs.writeFile(absolutePath, content, "utf-8")
1160+
await safeWriteText(absolutePath, content)
11601161

11611162
// Open the document to ensure diagnostics are loaded
11621163
// When openFile is false (PREVENT_FOCUS_DISRUPTION enabled), we only open in memory

‎src/integrations/editor/__tests__/DiffViewProvider.spec.ts‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ vi.mock("fs/promises", () => ({
1515
readFile: vi.fn().mockResolvedValue("file content"),
1616
writeFile: vi.fn().mockResolvedValue(undefined),
1717
access: vi.fn().mockResolvedValue(undefined),
18+
mkdir: vi.fn().mockResolvedValue(undefined),
19+
rename: vi.fn().mockResolvedValue(undefined),
20+
unlink: vi.fn().mockResolvedValue(undefined),
21+
}))
22+
23+
// Mock safeWriteText (used by saveDirectly)
24+
vi.mock("../../../services/file-safety/safeWriteText", () => ({
25+
safeWriteText: vi.fn().mockResolvedValue(undefined),
1826
}))
1927

2028
// Mock utils
@@ -26,6 +34,8 @@ vi.mock("../../../utils/fs", () => ({
2634
vi.mock("path", () => ({
2735
resolve: vi.fn((cwd, relPath) => `${cwd}/${relPath}`),
2836
basename: vi.fn((path) => path.split("/").pop()),
37+
dirname: vi.fn((path) => path.split("/").slice(0, -1).join("/") || "/"),
38+
join: (...args: string[]) => args.join("/"),
2939
}))
3040

3141
// Mock vscode
@@ -791,9 +801,9 @@ describe("DiffViewProvider", () => {
791801

792802
const result = await diffViewProvider.saveDirectly("test.ts", "new content", true, true, 2000)
793803

794-
// Verify file was written
795-
const fs = await import("fs/promises")
796-
expect(fs.writeFile).toHaveBeenCalledWith(`${mockCwd}/test.ts`, "new content", "utf-8")
804+
// Verify file was written via safeWriteText
805+
const { safeWriteText } = await import("../../../services/file-safety/safeWriteText")
806+
expect(safeWriteText).toHaveBeenCalledWith(`${mockCwd}/test.ts`, "new content")
797807

798808
// Verify file was opened without focus
799809
expect(vscode.window.showTextDocument).toHaveBeenCalledWith(
@@ -814,9 +824,9 @@ describe("DiffViewProvider", () => {
814824
it("should not open file when openWithoutFocus is false", async () => {
815825
await diffViewProvider.saveDirectly("test.ts", "new content", false, true, 1000)
816826

817-
// Verify file was written
818-
const fs = await import("fs/promises")
819-
expect(fs.writeFile).toHaveBeenCalledWith(`${mockCwd}/test.ts`, "new content", "utf-8")
827+
// Verify file was written via safeWriteText
828+
const { safeWriteText } = await import("../../../services/file-safety/safeWriteText")
829+
expect(safeWriteText).toHaveBeenCalledWith(`${mockCwd}/test.ts`, "new content")
820830

821831
// Verify file was NOT opened
822832
expect(vscode.window.showTextDocument).not.toHaveBeenCalled()
@@ -829,9 +839,9 @@ describe("DiffViewProvider", () => {
829839

830840
await diffViewProvider.saveDirectly("test.ts", "new content", true, false, 1000)
831841

832-
// Verify file was written
833-
const fs = await import("fs/promises")
834-
expect(fs.writeFile).toHaveBeenCalledWith(`${mockCwd}/test.ts`, "new content", "utf-8")
842+
// Verify file was written via safeWriteText
843+
const { safeWriteText } = await import("../../../services/file-safety/safeWriteText")
844+
expect(safeWriteText).toHaveBeenCalledWith(`${mockCwd}/test.ts`, "new content")
835845

836846
// Verify delay was NOT called
837847
expect(mockDelay).not.toHaveBeenCalled()

0 commit comments

Comments
 (0)