Skip to content

feat(file-safety): atomic text publish primitive + safeWriteJson refactor (A4, #1375) #1395

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

Open
easonLiangWorldedtech wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat(file-safety): atomic text publish primitive + safeWriteJson refactor (A4, #1375) #1395

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
a37dd24
feat(file-safety): atomic text publish primitive + safeWriteJson refa…
easonliang28 Aug 27, 2026
7fd49bc
chore(ci): empty commit — re-trigger CI and the CodeRabbit current-he…
easonliang28 Aug 30, 2026
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
2 changes: 1 addition & 1 deletion src/eslint-suppressions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1721,7 +1721,7 @@
},
"utils/safeWriteJson.ts": {
"@typescript-eslint/no-explicit-any": {
"count": 4
"count": 3
}
},
"utils/tts.ts": {
Expand Down
3 changes: 2 additions & 1 deletion src/integrations/editor/DiffViewProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { arePathsEqual, getReadablePath } from "../../utils/path"
import { formatResponse } from "../../core/prompts/responses"
import { diagnosticsToProblemsString, getNewDiagnostics } from "../diagnostics"
import { Task } from "../../core/task/Task"
import { safeWriteText } from "../../services/file-safety/safeWriteText"

import { DecorationController } from "./DecorationController"

Expand Down Expand Up @@ -1156,7 +1157,7 @@ export class DiffViewProvider {

// Write the content directly to the file
await createDirectoriesForFile(absolutePath)
await fs.writeFile(absolutePath, content, "utf-8")
await safeWriteText(absolutePath, content)
Comment thread
coderabbitai[bot] marked this conversation as resolved.

// Open the document to ensure diagnostics are loaded
// When openFile is false (PREVENT_FOCUS_DISRUPTION enabled), we only open in memory
Expand Down
28 changes: 19 additions & 9 deletions src/integrations/editor/__tests__/DiffViewProvider.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ vi.mock("fs/promises", () => ({
readFile: vi.fn().mockResolvedValue("file content"),
writeFile: vi.fn().mockResolvedValue(undefined),
access: vi.fn().mockResolvedValue(undefined),
mkdir: vi.fn().mockResolvedValue(undefined),
rename: vi.fn().mockResolvedValue(undefined),
unlink: vi.fn().mockResolvedValue(undefined),
}))

// Mock safeWriteText (used by saveDirectly)
vi.mock("../../../services/file-safety/safeWriteText", () => ({
safeWriteText: vi.fn().mockResolvedValue(undefined),
}))

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

// Mock vscode
Expand Down Expand Up @@ -791,9 +801,9 @@ describe("DiffViewProvider", () => {

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

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

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

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

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

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

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

// Verify delay was NOT called
expect(mockDelay).not.toHaveBeenCalled()
Expand Down
Loading
Loading