fix: use safeWriteJson for all JSON file writes with race condition fix

.roo/rules-code/use-safeWriteJson.md

@@ -0,0 +1,6 @@
+# JSON File Writing Must Be Atomic
+
+- You MUST use `safeWriteJson(filePath: string, data: any): Promise<void>` from `src/utils/safeWriteJson.ts` instead of `JSON.stringify` with file-write operations
+- `safeWriteJson` will create parent directories if necessary, so do not call `mkdir` prior to `safeWriteJson`
+- `safeWriteJson` prevents data corruption via atomic writes with locking and streams the write to minimize memory footprint
+- Test files are exempt from this rule

src/api/providers/fetchers/modelCache.ts

@@ -2,6 +2,7 @@ import * as path from "path"
 import fs from "fs/promises"
 
 import NodeCache from "node-cache"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import { ContextProxy } from "../../../core/config/ContextProxy"
 import { getCacheDirectoryPath } from "../../../utils/storage"
@@ -22,7 +23,7 @@ const memoryCache = new NodeCache({ stdTTL: 5 * 60, checkperiod: 5 * 60 })
 async function writeModels(router: RouterName, data: ModelRecord) {
 	const filename = `${router}_models.json`
 	const cacheDir = await getCacheDirectoryPath(ContextProxy.instance.globalStorageUri.fsPath)
-	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data))
+	await safeWriteJson(path.join(cacheDir, filename), data)
 }
 
 async function readModels(router: RouterName): Promise<ModelRecord | undefined> {

src/api/providers/fetchers/modelEndpointCache.ts

@@ -2,6 +2,7 @@ import * as path from "path"
 import fs from "fs/promises"
 
 import NodeCache from "node-cache"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 import sanitize from "sanitize-filename"
 
 import { ContextProxy } from "../../../core/config/ContextProxy"
@@ -18,7 +19,7 @@ const getCacheKey = (router: RouterName, modelId: string) => sanitize(`${router}
 async function writeModelEndpoints(key: string, data: ModelRecord) {
 	const filename = `${key}_endpoints.json`
 	const cacheDir = await getCacheDirectoryPath(ContextProxy.instance.globalStorageUri.fsPath)
-	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data, null, 2))
+	await safeWriteJson(path.join(cacheDir, filename), data)
 }
 
 async function readModelEndpoints(key: string): Promise<ModelRecord | undefined> {

src/core/config/__tests__/importExport.spec.ts

@@ -12,6 +12,7 @@ import { importSettings, exportSettings } from "../importExport"
 import { ProviderSettingsManager } from "../ProviderSettingsManager"
 import { ContextProxy } from "../ContextProxy"
 import { CustomModesManager } from "../CustomModesManager"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import type { Mock } from "vitest"
 
@@ -43,6 +44,8 @@ vi.mock("os", () => ({
 	homedir: vi.fn(() => "/mock/home"),
 }))
 
+vi.mock("../../../utils/safeWriteJson")
+
 describe("importExport", () => {
 	let mockProviderSettingsManager: ReturnType<typeof vi.mocked<ProviderSettingsManager>>
 	let mockContextProxy: ReturnType<typeof vi.mocked<ContextProxy>>
@@ -384,11 +387,10 @@ describe("importExport", () => {
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
 
- expect(fs.writeFile).toHaveBeenCalledWith(
- "/mock/path/roo-code-settings.json",
- JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
- "utf-8",
- )
+ expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
+ providerProfiles: mockProviderProfiles,
+ globalSettings: mockGlobalSettings,
+ })
  })
 
  it("should include globalSettings when allowedMaxRequests is null", async () => {
@@ -417,11 +419,10 @@ describe("importExport", () => {
  contextProxy: mockContextProxy,
  })
 
- expect(fs.writeFile).toHaveBeenCalledWith(
- "/mock/path/roo-code-settings.json",
- JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
- "utf-8",
- )
+ expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
+ providerProfiles: mockProviderProfiles,
+ globalSettings: mockGlobalSettings,
+ })
  })
 
  it("should handle errors during the export process", async () => {
@@ -436,7 +437,8 @@ describe("importExport", () => {
  })
 
  mockContextProxy.export.mockResolvedValue({ mode: "code" })
- ;(fs.writeFile as Mock).mockRejectedValue(new Error("Write error"))
+ // Simulate an error during the safeWriteJson operation
+ ;(safeWriteJson as Mock).mockRejectedValueOnce(new Error("Safe write error"))
 
  await exportSettings({
  providerSettingsManager: mockProviderSettingsManager,
@@ -447,8 +449,10 @@ describe("importExport", () => {
  expect(mockProviderSettingsManager.export).toHaveBeenCalled()
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
- expect(fs.writeFile).toHaveBeenCalled()
+ expect(safeWriteJson).toHaveBeenCalled() // safeWriteJson is called, but it will throw
  // The error is caught and the function exits silently.
+ // Optionally, ensure no error message was shown if that's part of "silent"
+ // expect(vscode.window.showErrorMessage).not.toHaveBeenCalled();
  })
 
  it("should handle errors during directory creation", async () => {
@@ -474,7 +478,7 @@ describe("importExport", () => {
  expect(mockProviderSettingsManager.export).toHaveBeenCalled()
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalled()
- expect(fs.writeFile).not.toHaveBeenCalled() // Should not be called since mkdir failed.
+ expect(safeWriteJson).not.toHaveBeenCalled() // Should not be called since mkdir failed.
  })
 
  it("should use the correct default save location", async () => {

src/core/config/importExport.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import os from "os"
 import * as path from "path"
 import fs from "fs/promises"
@@ -116,6 +117,6 @@ export const exportSettings = async ({ providerSettingsManager, contextProxy }:
 
  const dirname = path.dirname(uri.fsPath)
  await fs.mkdir(dirname, { recursive: true })
- await fs.writeFile(uri.fsPath, JSON.stringify({ providerProfiles, globalSettings }, null, 2), "utf-8")
+ await safeWriteJson(uri.fsPath, { providerProfiles, globalSettings })
 	} catch (e) {}
 }

src/core/context-tracking/FileContextTracker.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as vscode from "vscode"
 import { getTaskDirectoryPath } from "../../utils/storage"
@@ -130,7 +131,7 @@ export class FileContextTracker {
  const globalStoragePath = this.getContextProxy()!.globalStorageUri.fsPath
  const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
  const filePath = path.join(taskDir, GlobalFileNames.taskMetadata)
- await fs.writeFile(filePath, JSON.stringify(metadata, null, 2))
+ await safeWriteJson(filePath, metadata)
  } catch (error) {
  console.error("Failed to save task metadata:", error)
  }

src/core/task-persistence/apiMessages.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as fs from "fs/promises"
 
@@ -78,5 +79,5 @@ export async function saveApiMessages({
 }) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
 	const filePath = path.join(taskDir, GlobalFileNames.apiConversationHistory)
-	await fs.writeFile(filePath, JSON.stringify(messages))
+	await safeWriteJson(filePath, messages)
 }

src/core/task-persistence/taskMessages.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as fs from "fs/promises"
 
@@ -37,5 +38,5 @@ export type SaveTaskMessagesOptions = {
 export async function saveTaskMessages({ messages, taskId, globalStoragePath }: SaveTaskMessagesOptions) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
 	const filePath = path.join(taskDir, GlobalFileNames.uiMessages)
-	await fs.writeFile(filePath, JSON.stringify(messages))
+	await safeWriteJson(filePath, messages)
 }

src/core/webview/__tests__/ClineProvider.spec.ts

@@ -13,6 +13,7 @@ import { experimentDefault } from "../../../shared/experiments"
 import { setTtsEnabled } from "../../../utils/tts"
 import { ContextProxy } from "../../config/ContextProxy"
 import { Task, TaskOptions } from "../../task/Task"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import { ClineProvider } from "../ClineProvider"
 
@@ -43,6 +44,8 @@ vi.mock("axios", () => ({
 	post: vi.fn(),
 }))
 
+vi.mock("../../../utils/safeWriteJson")
+
 vi.mock("@modelcontextprotocol/sdk/types.js", () => ({
 	CallToolResultSchema: {},
 	ListResourcesResultSchema: {},
@@ -1976,11 +1979,8 @@ describe("Project MCP Settings", () => {
  // Check that fs.mkdir was called with the correct path
  expect(mockedFs.mkdir).toHaveBeenCalledWith("/test/workspace/.roo", { recursive: true })
 
- // Check that fs.writeFile was called with default content
- expect(mockedFs.writeFile).toHaveBeenCalledWith(
- "/test/workspace/.roo/mcp.json",
- JSON.stringify({ mcpServers: {} }, null, 2),
- )
+ // Verify file was created with default content
+ expect(safeWriteJson).toHaveBeenCalledWith("/test/workspace/.roo/mcp.json", { mcpServers: {} })
 
  // Check that openFile was called
  expect(openFileSpy).toHaveBeenCalledWith("/test/workspace/.roo/mcp.json")

.roo/rules-code/use-safeWriteJson.md

@@ -0,0 +1,6 @@
+# JSON File Writing Must Be Atomic
+
+- You MUST use `safeWriteJson(filePath: string, data: any): Promise<void>` from `src/utils/safeWriteJson.ts` instead of `JSON.stringify` with file-write operations
+- `safeWriteJson` will create parent directories if necessary, so do not call `mkdir` prior to `safeWriteJson`
+- `safeWriteJson` prevents data corruption via atomic writes with locking and streams the write to minimize memory footprint
+- Test files are exempt from this rule

src/api/providers/fetchers/modelCache.ts

@@ -2,6 +2,7 @@ import * as path from "path"
 import fs from "fs/promises"
 
 import NodeCache from "node-cache"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import { ContextProxy } from "../../../core/config/ContextProxy"
 import { getCacheDirectoryPath } from "../../../utils/storage"
@@ -22,7 +23,7 @@ const memoryCache = new NodeCache({ stdTTL: 5 * 60, checkperiod: 5 * 60 })
 async function writeModels(router: RouterName, data: ModelRecord) {
 	const filename = `${router}_models.json`
 	const cacheDir = await getCacheDirectoryPath(ContextProxy.instance.globalStorageUri.fsPath)
-	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data))
+	await safeWriteJson(path.join(cacheDir, filename), data)
 }
 
 async function readModels(router: RouterName): Promise<ModelRecord | undefined> {

src/api/providers/fetchers/modelEndpointCache.ts

@@ -2,6 +2,7 @@ import * as path from "path"
 import fs from "fs/promises"
 
 import NodeCache from "node-cache"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 import sanitize from "sanitize-filename"
 
 import { ContextProxy } from "../../../core/config/ContextProxy"
@@ -18,7 +19,7 @@ const getCacheKey = (router: RouterName, modelId: string) => sanitize(`${router}
 async function writeModelEndpoints(key: string, data: ModelRecord) {
 	const filename = `${key}_endpoints.json`
 	const cacheDir = await getCacheDirectoryPath(ContextProxy.instance.globalStorageUri.fsPath)
-	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data, null, 2))
+	await safeWriteJson(path.join(cacheDir, filename), data)
 }
 
 async function readModelEndpoints(key: string): Promise<ModelRecord | undefined> {

src/core/config/__tests__/importExport.spec.ts

@@ -12,6 +12,7 @@ import { importSettings, exportSettings } from "../importExport"
 import { ProviderSettingsManager } from "../ProviderSettingsManager"
 import { ContextProxy } from "../ContextProxy"
 import { CustomModesManager } from "../CustomModesManager"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import type { Mock } from "vitest"
 
@@ -43,6 +44,8 @@ vi.mock("os", () => ({
 	homedir: vi.fn(() => "/mock/home"),
 }))
 
+vi.mock("../../../utils/safeWriteJson")
+
 describe("importExport", () => {
 	let mockProviderSettingsManager: ReturnType<typeof vi.mocked<ProviderSettingsManager>>
 	let mockContextProxy: ReturnType<typeof vi.mocked<ContextProxy>>
@@ -384,11 +387,10 @@ describe("importExport", () => {
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
 
- expect(fs.writeFile).toHaveBeenCalledWith(
- "/mock/path/roo-code-settings.json",
- JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
- "utf-8",
- )
+ expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
+ providerProfiles: mockProviderProfiles,
+ globalSettings: mockGlobalSettings,
+ })
  })
 
  it("should include globalSettings when allowedMaxRequests is null", async () => {
@@ -417,11 +419,10 @@ describe("importExport", () => {
  contextProxy: mockContextProxy,
  })
 
- expect(fs.writeFile).toHaveBeenCalledWith(
- "/mock/path/roo-code-settings.json",
- JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
- "utf-8",
- )
+ expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
+ providerProfiles: mockProviderProfiles,
+ globalSettings: mockGlobalSettings,
+ })
  })
 
  it("should handle errors during the export process", async () => {
@@ -436,7 +437,8 @@ describe("importExport", () => {
  })
 
  mockContextProxy.export.mockResolvedValue({ mode: "code" })
- ;(fs.writeFile as Mock).mockRejectedValue(new Error("Write error"))
+ // Simulate an error during the safeWriteJson operation
+ ;(safeWriteJson as Mock).mockRejectedValueOnce(new Error("Safe write error"))
 
  await exportSettings({
  providerSettingsManager: mockProviderSettingsManager,
@@ -447,8 +449,10 @@ describe("importExport", () => {
  expect(mockProviderSettingsManager.export).toHaveBeenCalled()
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
- expect(fs.writeFile).toHaveBeenCalled()
+ expect(safeWriteJson).toHaveBeenCalled() // safeWriteJson is called, but it will throw
  // The error is caught and the function exits silently.
+ // Optionally, ensure no error message was shown if that's part of "silent"
+ // expect(vscode.window.showErrorMessage).not.toHaveBeenCalled();
  })
 
  it("should handle errors during directory creation", async () => {
@@ -474,7 +478,7 @@ describe("importExport", () => {
  expect(mockProviderSettingsManager.export).toHaveBeenCalled()
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalled()
- expect(fs.writeFile).not.toHaveBeenCalled() // Should not be called since mkdir failed.
+ expect(safeWriteJson).not.toHaveBeenCalled() // Should not be called since mkdir failed.
  })
 
  it("should use the correct default save location", async () => {

src/core/config/importExport.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import os from "os"
 import * as path from "path"
 import fs from "fs/promises"
@@ -116,6 +117,6 @@ export const exportSettings = async ({ providerSettingsManager, contextProxy }:
 
  const dirname = path.dirname(uri.fsPath)
  await fs.mkdir(dirname, { recursive: true })
- await fs.writeFile(uri.fsPath, JSON.stringify({ providerProfiles, globalSettings }, null, 2), "utf-8")
+ await safeWriteJson(uri.fsPath, { providerProfiles, globalSettings })
 	} catch (e) {}
 }

src/core/context-tracking/FileContextTracker.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as vscode from "vscode"
 import { getTaskDirectoryPath } from "../../utils/storage"
@@ -130,7 +131,7 @@ export class FileContextTracker {
  const globalStoragePath = this.getContextProxy()!.globalStorageUri.fsPath
  const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
  const filePath = path.join(taskDir, GlobalFileNames.taskMetadata)
- await fs.writeFile(filePath, JSON.stringify(metadata, null, 2))
+ await safeWriteJson(filePath, metadata)
  } catch (error) {
  console.error("Failed to save task metadata:", error)
  }

src/core/task-persistence/apiMessages.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as fs from "fs/promises"
 
@@ -78,5 +79,5 @@ export async function saveApiMessages({
 }) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
 	const filePath = path.join(taskDir, GlobalFileNames.apiConversationHistory)
-	await fs.writeFile(filePath, JSON.stringify(messages))
+	await safeWriteJson(filePath, messages)
 }

src/core/task-persistence/taskMessages.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as fs from "fs/promises"
 
@@ -37,5 +38,5 @@ export type SaveTaskMessagesOptions = {
 export async function saveTaskMessages({ messages, taskId, globalStoragePath }: SaveTaskMessagesOptions) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
 	const filePath = path.join(taskDir, GlobalFileNames.uiMessages)
-	await fs.writeFile(filePath, JSON.stringify(messages))
+	await safeWriteJson(filePath, messages)
 }

src/core/webview/__tests__/ClineProvider.spec.ts

@@ -13,6 +13,7 @@ import { experimentDefault } from "../../../shared/experiments"
 import { setTtsEnabled } from "../../../utils/tts"
 import { ContextProxy } from "../../config/ContextProxy"
 import { Task, TaskOptions } from "../../task/Task"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import { ClineProvider } from "../ClineProvider"
 
@@ -43,6 +44,8 @@ vi.mock("axios", () => ({
 	post: vi.fn(),
 }))
 
+vi.mock("../../../utils/safeWriteJson")
+
 vi.mock("@modelcontextprotocol/sdk/types.js", () => ({
 	CallToolResultSchema: {},
 	ListResourcesResultSchema: {},
@@ -1976,11 +1979,8 @@ describe("Project MCP Settings", () => {
  // Check that fs.mkdir was called with the correct path
  expect(mockedFs.mkdir).toHaveBeenCalledWith("/test/workspace/.roo", { recursive: true })
 
- // Check that fs.writeFile was called with default content
- expect(mockedFs.writeFile).toHaveBeenCalledWith(
- "/test/workspace/.roo/mcp.json",
- JSON.stringify({ mcpServers: {} }, null, 2),
- )
+ // Verify file was created with default content
+ expect(safeWriteJson).toHaveBeenCalledWith("/test/workspace/.roo/mcp.json", { mcpServers: {} })
 
  // Check that openFile was called
  expect(openFileSpy).toHaveBeenCalledWith("/test/workspace/.roo/mcp.json")

.roo/rules-code/use-safeWriteJson.md

@@ -0,0 +1,6 @@
+# JSON File Writing Must Be Atomic
+
+- You MUST use `safeWriteJson(filePath: string, data: any): Promise<void>` from `src/utils/safeWriteJson.ts` instead of `JSON.stringify` with file-write operations
+- `safeWriteJson` will create parent directories if necessary, so do not call `mkdir` prior to `safeWriteJson`
+- `safeWriteJson` prevents data corruption via atomic writes with locking and streams the write to minimize memory footprint
+- Test files are exempt from this rule

src/api/providers/fetchers/modelCache.ts

@@ -2,6 +2,7 @@ import * as path from "path"
 import fs from "fs/promises"
 
 import NodeCache from "node-cache"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import { ContextProxy } from "../../../core/config/ContextProxy"
 import { getCacheDirectoryPath } from "../../../utils/storage"
@@ -22,7 +23,7 @@ const memoryCache = new NodeCache({ stdTTL: 5 * 60, checkperiod: 5 * 60 })
 async function writeModels(router: RouterName, data: ModelRecord) {
 	const filename = `${router}_models.json`
 	const cacheDir = await getCacheDirectoryPath(ContextProxy.instance.globalStorageUri.fsPath)
-	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data))
+	await safeWriteJson(path.join(cacheDir, filename), data)
 }
 
 async function readModels(router: RouterName): Promise<ModelRecord | undefined> {

src/api/providers/fetchers/modelEndpointCache.ts

@@ -2,6 +2,7 @@ import * as path from "path"
 import fs from "fs/promises"
 
 import NodeCache from "node-cache"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 import sanitize from "sanitize-filename"
 
 import { ContextProxy } from "../../../core/config/ContextProxy"
@@ -18,7 +19,7 @@ const getCacheKey = (router: RouterName, modelId: string) => sanitize(`${router}
 async function writeModelEndpoints(key: string, data: ModelRecord) {
 	const filename = `${key}_endpoints.json`
 	const cacheDir = await getCacheDirectoryPath(ContextProxy.instance.globalStorageUri.fsPath)
-	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data, null, 2))
+	await safeWriteJson(path.join(cacheDir, filename), data)
 }
 
 async function readModelEndpoints(key: string): Promise<ModelRecord | undefined> {

src/core/config/__tests__/importExport.spec.ts

@@ -12,6 +12,7 @@ import { importSettings, exportSettings } from "../importExport"
 import { ProviderSettingsManager } from "../ProviderSettingsManager"
 import { ContextProxy } from "../ContextProxy"
 import { CustomModesManager } from "../CustomModesManager"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import type { Mock } from "vitest"
 
@@ -43,6 +44,8 @@ vi.mock("os", () => ({
 	homedir: vi.fn(() => "/mock/home"),
 }))
 
+vi.mock("../../../utils/safeWriteJson")
+
 describe("importExport", () => {
 	let mockProviderSettingsManager: ReturnType<typeof vi.mocked<ProviderSettingsManager>>
 	let mockContextProxy: ReturnType<typeof vi.mocked<ContextProxy>>
@@ -384,11 +387,10 @@ describe("importExport", () => {
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
 
- expect(fs.writeFile).toHaveBeenCalledWith(
- "/mock/path/roo-code-settings.json",
- JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
- "utf-8",
- )
+ expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
+ providerProfiles: mockProviderProfiles,
+ globalSettings: mockGlobalSettings,
+ })
  })
 
  it("should include globalSettings when allowedMaxRequests is null", async () => {
@@ -417,11 +419,10 @@ describe("importExport", () => {
  contextProxy: mockContextProxy,
  })
 
- expect(fs.writeFile).toHaveBeenCalledWith(
- "/mock/path/roo-code-settings.json",
- JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
- "utf-8",
- )
+ expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
+ providerProfiles: mockProviderProfiles,
+ globalSettings: mockGlobalSettings,
+ })
  })
 
  it("should handle errors during the export process", async () => {
@@ -436,7 +437,8 @@ describe("importExport", () => {
  })
 
  mockContextProxy.export.mockResolvedValue({ mode: "code" })
- ;(fs.writeFile as Mock).mockRejectedValue(new Error("Write error"))
+ // Simulate an error during the safeWriteJson operation
+ ;(safeWriteJson as Mock).mockRejectedValueOnce(new Error("Safe write error"))
 
  await exportSettings({
  providerSettingsManager: mockProviderSettingsManager,
@@ -447,8 +449,10 @@ describe("importExport", () => {
  expect(mockProviderSettingsManager.export).toHaveBeenCalled()
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
- expect(fs.writeFile).toHaveBeenCalled()
+ expect(safeWriteJson).toHaveBeenCalled() // safeWriteJson is called, but it will throw
  // The error is caught and the function exits silently.
+ // Optionally, ensure no error message was shown if that's part of "silent"
+ // expect(vscode.window.showErrorMessage).not.toHaveBeenCalled();
  })
 
  it("should handle errors during directory creation", async () => {
@@ -474,7 +478,7 @@ describe("importExport", () => {
  expect(mockProviderSettingsManager.export).toHaveBeenCalled()
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalled()
- expect(fs.writeFile).not.toHaveBeenCalled() // Should not be called since mkdir failed.
+ expect(safeWriteJson).not.toHaveBeenCalled() // Should not be called since mkdir failed.
  })
 
  it("should use the correct default save location", async () => {

src/core/config/importExport.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import os from "os"
 import * as path from "path"
 import fs from "fs/promises"
@@ -116,6 +117,6 @@ export const exportSettings = async ({ providerSettingsManager, contextProxy }:
 
  const dirname = path.dirname(uri.fsPath)
  await fs.mkdir(dirname, { recursive: true })
- await fs.writeFile(uri.fsPath, JSON.stringify({ providerProfiles, globalSettings }, null, 2), "utf-8")
+ await safeWriteJson(uri.fsPath, { providerProfiles, globalSettings })
 	} catch (e) {}
 }

src/core/context-tracking/FileContextTracker.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as vscode from "vscode"
 import { getTaskDirectoryPath } from "../../utils/storage"
@@ -130,7 +131,7 @@ export class FileContextTracker {
  const globalStoragePath = this.getContextProxy()!.globalStorageUri.fsPath
  const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
  const filePath = path.join(taskDir, GlobalFileNames.taskMetadata)
- await fs.writeFile(filePath, JSON.stringify(metadata, null, 2))
+ await safeWriteJson(filePath, metadata)
  } catch (error) {
  console.error("Failed to save task metadata:", error)
  }

src/core/task-persistence/apiMessages.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as fs from "fs/promises"
 
@@ -78,5 +79,5 @@ export async function saveApiMessages({
 }) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
 	const filePath = path.join(taskDir, GlobalFileNames.apiConversationHistory)
-	await fs.writeFile(filePath, JSON.stringify(messages))
+	await safeWriteJson(filePath, messages)
 }

src/core/task-persistence/taskMessages.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as fs from "fs/promises"
 
@@ -37,5 +38,5 @@ export type SaveTaskMessagesOptions = {
 export async function saveTaskMessages({ messages, taskId, globalStoragePath }: SaveTaskMessagesOptions) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
 	const filePath = path.join(taskDir, GlobalFileNames.uiMessages)
-	await fs.writeFile(filePath, JSON.stringify(messages))
+	await safeWriteJson(filePath, messages)
 }

src/core/webview/__tests__/ClineProvider.spec.ts

@@ -13,6 +13,7 @@ import { experimentDefault } from "../../../shared/experiments"
 import { setTtsEnabled } from "../../../utils/tts"
 import { ContextProxy } from "../../config/ContextProxy"
 import { Task, TaskOptions } from "../../task/Task"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import { ClineProvider } from "../ClineProvider"
 
@@ -43,6 +44,8 @@ vi.mock("axios", () => ({
 	post: vi.fn(),
 }))
 
+vi.mock("../../../utils/safeWriteJson")
+
 vi.mock("@modelcontextprotocol/sdk/types.js", () => ({
 	CallToolResultSchema: {},
 	ListResourcesResultSchema: {},
@@ -1976,11 +1979,8 @@ describe("Project MCP Settings", () => {
  // Check that fs.mkdir was called with the correct path
  expect(mockedFs.mkdir).toHaveBeenCalledWith("/test/workspace/.roo", { recursive: true })
 
- // Check that fs.writeFile was called with default content
- expect(mockedFs.writeFile).toHaveBeenCalledWith(
- "/test/workspace/.roo/mcp.json",
- JSON.stringify({ mcpServers: {} }, null, 2),
- )
+ // Verify file was created with default content
+ expect(safeWriteJson).toHaveBeenCalledWith("/test/workspace/.roo/mcp.json", { mcpServers: {} })
 
  // Check that openFile was called
  expect(openFileSpy).toHaveBeenCalledWith("/test/workspace/.roo/mcp.json")

.roo/rules-code/use-safeWriteJson.md

@@ -0,0 +1,6 @@
+# JSON File Writing Must Be Atomic
+
+- You MUST use `safeWriteJson(filePath: string, data: any): Promise<void>` from `src/utils/safeWriteJson.ts` instead of `JSON.stringify` with file-write operations
+- `safeWriteJson` will create parent directories if necessary, so do not call `mkdir` prior to `safeWriteJson`
+- `safeWriteJson` prevents data corruption via atomic writes with locking and streams the write to minimize memory footprint
+- Test files are exempt from this rule

src/api/providers/fetchers/modelCache.ts

@@ -2,6 +2,7 @@ import * as path from "path"
 import fs from "fs/promises"
 
 import NodeCache from "node-cache"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import { ContextProxy } from "../../../core/config/ContextProxy"
 import { getCacheDirectoryPath } from "../../../utils/storage"
@@ -22,7 +23,7 @@ const memoryCache = new NodeCache({ stdTTL: 5 * 60, checkperiod: 5 * 60 })
 async function writeModels(router: RouterName, data: ModelRecord) {
 	const filename = `${router}_models.json`
 	const cacheDir = await getCacheDirectoryPath(ContextProxy.instance.globalStorageUri.fsPath)
-	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data))
+	await safeWriteJson(path.join(cacheDir, filename), data)
 }
 
 async function readModels(router: RouterName): Promise<ModelRecord | undefined> {

src/api/providers/fetchers/modelEndpointCache.ts

@@ -2,6 +2,7 @@ import * as path from "path"
 import fs from "fs/promises"
 
 import NodeCache from "node-cache"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 import sanitize from "sanitize-filename"
 
 import { ContextProxy } from "../../../core/config/ContextProxy"
@@ -18,7 +19,7 @@ const getCacheKey = (router: RouterName, modelId: string) => sanitize(`${router}
 async function writeModelEndpoints(key: string, data: ModelRecord) {
 	const filename = `${key}_endpoints.json`
 	const cacheDir = await getCacheDirectoryPath(ContextProxy.instance.globalStorageUri.fsPath)
-	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data, null, 2))
+	await safeWriteJson(path.join(cacheDir, filename), data)
 }
 
 async function readModelEndpoints(key: string): Promise<ModelRecord | undefined> {

src/core/config/__tests__/importExport.spec.ts

@@ -12,6 +12,7 @@ import { importSettings, exportSettings } from "../importExport"
 import { ProviderSettingsManager } from "../ProviderSettingsManager"
 import { ContextProxy } from "../ContextProxy"
 import { CustomModesManager } from "../CustomModesManager"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import type { Mock } from "vitest"
 
@@ -43,6 +44,8 @@ vi.mock("os", () => ({
 	homedir: vi.fn(() => "/mock/home"),
 }))
 
+vi.mock("../../../utils/safeWriteJson")
+
 describe("importExport", () => {
 	let mockProviderSettingsManager: ReturnType<typeof vi.mocked<ProviderSettingsManager>>
 	let mockContextProxy: ReturnType<typeof vi.mocked<ContextProxy>>
@@ -384,11 +387,10 @@ describe("importExport", () => {
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
 
- expect(fs.writeFile).toHaveBeenCalledWith(
- "/mock/path/roo-code-settings.json",
- JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
- "utf-8",
- )
+ expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
+ providerProfiles: mockProviderProfiles,
+ globalSettings: mockGlobalSettings,
+ })
  })
 
  it("should include globalSettings when allowedMaxRequests is null", async () => {
@@ -417,11 +419,10 @@ describe("importExport", () => {
  contextProxy: mockContextProxy,
  })
 
- expect(fs.writeFile).toHaveBeenCalledWith(
- "/mock/path/roo-code-settings.json",
- JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
- "utf-8",
- )
+ expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
+ providerProfiles: mockProviderProfiles,
+ globalSettings: mockGlobalSettings,
+ })
  })
 
  it("should handle errors during the export process", async () => {
@@ -436,7 +437,8 @@ describe("importExport", () => {
  })
 
  mockContextProxy.export.mockResolvedValue({ mode: "code" })
- ;(fs.writeFile as Mock).mockRejectedValue(new Error("Write error"))
+ // Simulate an error during the safeWriteJson operation
+ ;(safeWriteJson as Mock).mockRejectedValueOnce(new Error("Safe write error"))
 
  await exportSettings({
  providerSettingsManager: mockProviderSettingsManager,
@@ -447,8 +449,10 @@ describe("importExport", () => {
  expect(mockProviderSettingsManager.export).toHaveBeenCalled()
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
- expect(fs.writeFile).toHaveBeenCalled()
+ expect(safeWriteJson).toHaveBeenCalled() // safeWriteJson is called, but it will throw
  // The error is caught and the function exits silently.
+ // Optionally, ensure no error message was shown if that's part of "silent"
+ // expect(vscode.window.showErrorMessage).not.toHaveBeenCalled();
  })
 
  it("should handle errors during directory creation", async () => {
@@ -474,7 +478,7 @@ describe("importExport", () => {
  expect(mockProviderSettingsManager.export).toHaveBeenCalled()
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalled()
- expect(fs.writeFile).not.toHaveBeenCalled() // Should not be called since mkdir failed.
+ expect(safeWriteJson).not.toHaveBeenCalled() // Should not be called since mkdir failed.
  })
 
  it("should use the correct default save location", async () => {

src/core/config/importExport.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import os from "os"
 import * as path from "path"
 import fs from "fs/promises"
@@ -116,6 +117,6 @@ export const exportSettings = async ({ providerSettingsManager, contextProxy }:
 
  const dirname = path.dirname(uri.fsPath)
  await fs.mkdir(dirname, { recursive: true })
- await fs.writeFile(uri.fsPath, JSON.stringify({ providerProfiles, globalSettings }, null, 2), "utf-8")
+ await safeWriteJson(uri.fsPath, { providerProfiles, globalSettings })
 	} catch (e) {}
 }

src/core/context-tracking/FileContextTracker.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as vscode from "vscode"
 import { getTaskDirectoryPath } from "../../utils/storage"
@@ -130,7 +131,7 @@ export class FileContextTracker {
  const globalStoragePath = this.getContextProxy()!.globalStorageUri.fsPath
  const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
  const filePath = path.join(taskDir, GlobalFileNames.taskMetadata)
- await fs.writeFile(filePath, JSON.stringify(metadata, null, 2))
+ await safeWriteJson(filePath, metadata)
  } catch (error) {
  console.error("Failed to save task metadata:", error)
  }

src/core/task-persistence/apiMessages.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as fs from "fs/promises"
 
@@ -78,5 +79,5 @@ export async function saveApiMessages({
 }) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
 	const filePath = path.join(taskDir, GlobalFileNames.apiConversationHistory)
-	await fs.writeFile(filePath, JSON.stringify(messages))
+	await safeWriteJson(filePath, messages)
 }

src/core/task-persistence/taskMessages.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as fs from "fs/promises"
 
@@ -37,5 +38,5 @@ export type SaveTaskMessagesOptions = {
 export async function saveTaskMessages({ messages, taskId, globalStoragePath }: SaveTaskMessagesOptions) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
 	const filePath = path.join(taskDir, GlobalFileNames.uiMessages)
-	await fs.writeFile(filePath, JSON.stringify(messages))
+	await safeWriteJson(filePath, messages)
 }

src/core/webview/__tests__/ClineProvider.spec.ts

@@ -13,6 +13,7 @@ import { experimentDefault } from "../../../shared/experiments"
 import { setTtsEnabled } from "../../../utils/tts"
 import { ContextProxy } from "../../config/ContextProxy"
 import { Task, TaskOptions } from "../../task/Task"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import { ClineProvider } from "../ClineProvider"
 
@@ -43,6 +44,8 @@ vi.mock("axios", () => ({
 	post: vi.fn(),
 }))
 
+vi.mock("../../../utils/safeWriteJson")
+
 vi.mock("@modelcontextprotocol/sdk/types.js", () => ({
 	CallToolResultSchema: {},
 	ListResourcesResultSchema: {},
@@ -1976,11 +1979,8 @@ describe("Project MCP Settings", () => {
  // Check that fs.mkdir was called with the correct path
  expect(mockedFs.mkdir).toHaveBeenCalledWith("/test/workspace/.roo", { recursive: true })
 
- // Check that fs.writeFile was called with default content
- expect(mockedFs.writeFile).toHaveBeenCalledWith(
- "/test/workspace/.roo/mcp.json",
- JSON.stringify({ mcpServers: {} }, null, 2),
- )
+ // Verify file was created with default content
+ expect(safeWriteJson).toHaveBeenCalledWith("/test/workspace/.roo/mcp.json", { mcpServers: {} })
 
  // Check that openFile was called
  expect(openFileSpy).toHaveBeenCalledWith("/test/workspace/.roo/mcp.json")

.roo/rules-code/use-safeWriteJson.md

@@ -0,0 +1,6 @@
+# JSON File Writing Must Be Atomic
+
+- You MUST use `safeWriteJson(filePath: string, data: any): Promise<void>` from `src/utils/safeWriteJson.ts` instead of `JSON.stringify` with file-write operations
+- `safeWriteJson` will create parent directories if necessary, so do not call `mkdir` prior to `safeWriteJson`
+- `safeWriteJson` prevents data corruption via atomic writes with locking and streams the write to minimize memory footprint
+- Test files are exempt from this rule

src/api/providers/fetchers/modelCache.ts

@@ -2,6 +2,7 @@ import * as path from "path"
 import fs from "fs/promises"
 
 import NodeCache from "node-cache"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import { ContextProxy } from "../../../core/config/ContextProxy"
 import { getCacheDirectoryPath } from "../../../utils/storage"
@@ -22,7 +23,7 @@ const memoryCache = new NodeCache({ stdTTL: 5 * 60, checkperiod: 5 * 60 })
 async function writeModels(router: RouterName, data: ModelRecord) {
 	const filename = `${router}_models.json`
 	const cacheDir = await getCacheDirectoryPath(ContextProxy.instance.globalStorageUri.fsPath)
-	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data))
+	await safeWriteJson(path.join(cacheDir, filename), data)
 }
 
 async function readModels(router: RouterName): Promise<ModelRecord | undefined> {

src/api/providers/fetchers/modelEndpointCache.ts

@@ -2,6 +2,7 @@ import * as path from "path"
 import fs from "fs/promises"
 
 import NodeCache from "node-cache"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 import sanitize from "sanitize-filename"
 
 import { ContextProxy } from "../../../core/config/ContextProxy"
@@ -18,7 +19,7 @@ const getCacheKey = (router: RouterName, modelId: string) => sanitize(`${router}
 async function writeModelEndpoints(key: string, data: ModelRecord) {
 	const filename = `${key}_endpoints.json`
 	const cacheDir = await getCacheDirectoryPath(ContextProxy.instance.globalStorageUri.fsPath)
-	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data, null, 2))
+	await safeWriteJson(path.join(cacheDir, filename), data)
 }
 
 async function readModelEndpoints(key: string): Promise<ModelRecord | undefined> {

src/core/config/__tests__/importExport.spec.ts

@@ -12,6 +12,7 @@ import { importSettings, exportSettings } from "../importExport"
 import { ProviderSettingsManager } from "../ProviderSettingsManager"
 import { ContextProxy } from "../ContextProxy"
 import { CustomModesManager } from "../CustomModesManager"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import type { Mock } from "vitest"
 
@@ -43,6 +44,8 @@ vi.mock("os", () => ({
 	homedir: vi.fn(() => "/mock/home"),
 }))
 
+vi.mock("../../../utils/safeWriteJson")
+
 describe("importExport", () => {
 	let mockProviderSettingsManager: ReturnType<typeof vi.mocked<ProviderSettingsManager>>
 	let mockContextProxy: ReturnType<typeof vi.mocked<ContextProxy>>
@@ -384,11 +387,10 @@ describe("importExport", () => {
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
 
- expect(fs.writeFile).toHaveBeenCalledWith(
- "/mock/path/roo-code-settings.json",
- JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
- "utf-8",
- )
+ expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
+ providerProfiles: mockProviderProfiles,
+ globalSettings: mockGlobalSettings,
+ })
  })
 
  it("should include globalSettings when allowedMaxRequests is null", async () => {
@@ -417,11 +419,10 @@ describe("importExport", () => {
  contextProxy: mockContextProxy,
  })
 
- expect(fs.writeFile).toHaveBeenCalledWith(
- "/mock/path/roo-code-settings.json",
- JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
- "utf-8",
- )
+ expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
+ providerProfiles: mockProviderProfiles,
+ globalSettings: mockGlobalSettings,
+ })
  })
 
  it("should handle errors during the export process", async () => {
@@ -436,7 +437,8 @@ describe("importExport", () => {
  })
 
  mockContextProxy.export.mockResolvedValue({ mode: "code" })
- ;(fs.writeFile as Mock).mockRejectedValue(new Error("Write error"))
+ // Simulate an error during the safeWriteJson operation
+ ;(safeWriteJson as Mock).mockRejectedValueOnce(new Error("Safe write error"))
 
  await exportSettings({
  providerSettingsManager: mockProviderSettingsManager,
@@ -447,8 +449,10 @@ describe("importExport", () => {
  expect(mockProviderSettingsManager.export).toHaveBeenCalled()
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
- expect(fs.writeFile).toHaveBeenCalled()
+ expect(safeWriteJson).toHaveBeenCalled() // safeWriteJson is called, but it will throw
  // The error is caught and the function exits silently.
+ // Optionally, ensure no error message was shown if that's part of "silent"
+ // expect(vscode.window.showErrorMessage).not.toHaveBeenCalled();
  })
 
  it("should handle errors during directory creation", async () => {
@@ -474,7 +478,7 @@ describe("importExport", () => {
  expect(mockProviderSettingsManager.export).toHaveBeenCalled()
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalled()
- expect(fs.writeFile).not.toHaveBeenCalled() // Should not be called since mkdir failed.
+ expect(safeWriteJson).not.toHaveBeenCalled() // Should not be called since mkdir failed.
  })
 
  it("should use the correct default save location", async () => {

src/core/config/importExport.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import os from "os"
 import * as path from "path"
 import fs from "fs/promises"
@@ -116,6 +117,6 @@ export const exportSettings = async ({ providerSettingsManager, contextProxy }:
 
  const dirname = path.dirname(uri.fsPath)
  await fs.mkdir(dirname, { recursive: true })
- await fs.writeFile(uri.fsPath, JSON.stringify({ providerProfiles, globalSettings }, null, 2), "utf-8")
+ await safeWriteJson(uri.fsPath, { providerProfiles, globalSettings })
 	} catch (e) {}
 }

src/core/context-tracking/FileContextTracker.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as vscode from "vscode"
 import { getTaskDirectoryPath } from "../../utils/storage"
@@ -130,7 +131,7 @@ export class FileContextTracker {
  const globalStoragePath = this.getContextProxy()!.globalStorageUri.fsPath
  const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
  const filePath = path.join(taskDir, GlobalFileNames.taskMetadata)
- await fs.writeFile(filePath, JSON.stringify(metadata, null, 2))
+ await safeWriteJson(filePath, metadata)
  } catch (error) {
  console.error("Failed to save task metadata:", error)
  }

src/core/task-persistence/apiMessages.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as fs from "fs/promises"
 
@@ -78,5 +79,5 @@ export async function saveApiMessages({
 }) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
 	const filePath = path.join(taskDir, GlobalFileNames.apiConversationHistory)
-	await fs.writeFile(filePath, JSON.stringify(messages))
+	await safeWriteJson(filePath, messages)
 }

src/core/task-persistence/taskMessages.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as fs from "fs/promises"
 
@@ -37,5 +38,5 @@ export type SaveTaskMessagesOptions = {
 export async function saveTaskMessages({ messages, taskId, globalStoragePath }: SaveTaskMessagesOptions) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
 	const filePath = path.join(taskDir, GlobalFileNames.uiMessages)
-	await fs.writeFile(filePath, JSON.stringify(messages))
+	await safeWriteJson(filePath, messages)
 }

src/core/webview/__tests__/ClineProvider.spec.ts

@@ -13,6 +13,7 @@ import { experimentDefault } from "../../../shared/experiments"
 import { setTtsEnabled } from "../../../utils/tts"
 import { ContextProxy } from "../../config/ContextProxy"
 import { Task, TaskOptions } from "../../task/Task"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import { ClineProvider } from "../ClineProvider"
 
@@ -43,6 +44,8 @@ vi.mock("axios", () => ({
 	post: vi.fn(),
 }))
 
+vi.mock("../../../utils/safeWriteJson")
+
 vi.mock("@modelcontextprotocol/sdk/types.js", () => ({
 	CallToolResultSchema: {},
 	ListResourcesResultSchema: {},
@@ -1976,11 +1979,8 @@ describe("Project MCP Settings", () => {
  // Check that fs.mkdir was called with the correct path
  expect(mockedFs.mkdir).toHaveBeenCalledWith("/test/workspace/.roo", { recursive: true })
 
- // Check that fs.writeFile was called with default content
- expect(mockedFs.writeFile).toHaveBeenCalledWith(
- "/test/workspace/.roo/mcp.json",
- JSON.stringify({ mcpServers: {} }, null, 2),
- )
+ // Verify file was created with default content
+ expect(safeWriteJson).toHaveBeenCalledWith("/test/workspace/.roo/mcp.json", { mcpServers: {} })
 
  // Check that openFile was called
  expect(openFileSpy).toHaveBeenCalledWith("/test/workspace/.roo/mcp.json")

.roo/rules-code/use-safeWriteJson.md

@@ -0,0 +1,6 @@
+# JSON File Writing Must Be Atomic
+
+- You MUST use `safeWriteJson(filePath: string, data: any): Promise<void>` from `src/utils/safeWriteJson.ts` instead of `JSON.stringify` with file-write operations
+- `safeWriteJson` will create parent directories if necessary, so do not call `mkdir` prior to `safeWriteJson`
+- `safeWriteJson` prevents data corruption via atomic writes with locking and streams the write to minimize memory footprint
+- Test files are exempt from this rule

src/api/providers/fetchers/modelCache.ts

@@ -2,6 +2,7 @@ import * as path from "path"
 import fs from "fs/promises"
 
 import NodeCache from "node-cache"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import { ContextProxy } from "../../../core/config/ContextProxy"
 import { getCacheDirectoryPath } from "../../../utils/storage"
@@ -22,7 +23,7 @@ const memoryCache = new NodeCache({ stdTTL: 5 * 60, checkperiod: 5 * 60 })
 async function writeModels(router: RouterName, data: ModelRecord) {
 	const filename = `${router}_models.json`
 	const cacheDir = await getCacheDirectoryPath(ContextProxy.instance.globalStorageUri.fsPath)
-	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data))
+	await safeWriteJson(path.join(cacheDir, filename), data)
 }
 
 async function readModels(router: RouterName): Promise<ModelRecord | undefined> {

src/api/providers/fetchers/modelEndpointCache.ts

@@ -2,6 +2,7 @@ import * as path from "path"
 import fs from "fs/promises"
 
 import NodeCache from "node-cache"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 import sanitize from "sanitize-filename"
 
 import { ContextProxy } from "../../../core/config/ContextProxy"
@@ -18,7 +19,7 @@ const getCacheKey = (router: RouterName, modelId: string) => sanitize(`${router}
 async function writeModelEndpoints(key: string, data: ModelRecord) {
 	const filename = `${key}_endpoints.json`
 	const cacheDir = await getCacheDirectoryPath(ContextProxy.instance.globalStorageUri.fsPath)
-	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data, null, 2))
+	await safeWriteJson(path.join(cacheDir, filename), data)
 }
 
 async function readModelEndpoints(key: string): Promise<ModelRecord | undefined> {

src/core/config/__tests__/importExport.spec.ts

@@ -12,6 +12,7 @@ import { importSettings, exportSettings } from "../importExport"
 import { ProviderSettingsManager } from "../ProviderSettingsManager"
 import { ContextProxy } from "../ContextProxy"
 import { CustomModesManager } from "../CustomModesManager"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import type { Mock } from "vitest"
 
@@ -43,6 +44,8 @@ vi.mock("os", () => ({
 	homedir: vi.fn(() => "/mock/home"),
 }))
 
+vi.mock("../../../utils/safeWriteJson")
+
 describe("importExport", () => {
 	let mockProviderSettingsManager: ReturnType<typeof vi.mocked<ProviderSettingsManager>>
 	let mockContextProxy: ReturnType<typeof vi.mocked<ContextProxy>>
@@ -384,11 +387,10 @@ describe("importExport", () => {
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
 
- expect(fs.writeFile).toHaveBeenCalledWith(
- "/mock/path/roo-code-settings.json",
- JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
- "utf-8",
- )
+ expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
+ providerProfiles: mockProviderProfiles,
+ globalSettings: mockGlobalSettings,
+ })
  })
 
  it("should include globalSettings when allowedMaxRequests is null", async () => {
@@ -417,11 +419,10 @@ describe("importExport", () => {
  contextProxy: mockContextProxy,
  })
 
- expect(fs.writeFile).toHaveBeenCalledWith(
- "/mock/path/roo-code-settings.json",
- JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
- "utf-8",
- )
+ expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
+ providerProfiles: mockProviderProfiles,
+ globalSettings: mockGlobalSettings,
+ })
  })
 
  it("should handle errors during the export process", async () => {
@@ -436,7 +437,8 @@ describe("importExport", () => {
  })
 
  mockContextProxy.export.mockResolvedValue({ mode: "code" })
- ;(fs.writeFile as Mock).mockRejectedValue(new Error("Write error"))
+ // Simulate an error during the safeWriteJson operation
+ ;(safeWriteJson as Mock).mockRejectedValueOnce(new Error("Safe write error"))
 
  await exportSettings({
  providerSettingsManager: mockProviderSettingsManager,
@@ -447,8 +449,10 @@ describe("importExport", () => {
  expect(mockProviderSettingsManager.export).toHaveBeenCalled()
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
- expect(fs.writeFile).toHaveBeenCalled()
+ expect(safeWriteJson).toHaveBeenCalled() // safeWriteJson is called, but it will throw
  // The error is caught and the function exits silently.
+ // Optionally, ensure no error message was shown if that's part of "silent"
+ // expect(vscode.window.showErrorMessage).not.toHaveBeenCalled();
  })
 
  it("should handle errors during directory creation", async () => {
@@ -474,7 +478,7 @@ describe("importExport", () => {
  expect(mockProviderSettingsManager.export).toHaveBeenCalled()
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalled()
- expect(fs.writeFile).not.toHaveBeenCalled() // Should not be called since mkdir failed.
+ expect(safeWriteJson).not.toHaveBeenCalled() // Should not be called since mkdir failed.
  })
 
  it("should use the correct default save location", async () => {

src/core/config/importExport.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import os from "os"
 import * as path from "path"
 import fs from "fs/promises"
@@ -116,6 +117,6 @@ export const exportSettings = async ({ providerSettingsManager, contextProxy }:
 
  const dirname = path.dirname(uri.fsPath)
  await fs.mkdir(dirname, { recursive: true })
- await fs.writeFile(uri.fsPath, JSON.stringify({ providerProfiles, globalSettings }, null, 2), "utf-8")
+ await safeWriteJson(uri.fsPath, { providerProfiles, globalSettings })
 	} catch (e) {}
 }

src/core/context-tracking/FileContextTracker.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as vscode from "vscode"
 import { getTaskDirectoryPath } from "../../utils/storage"
@@ -130,7 +131,7 @@ export class FileContextTracker {
  const globalStoragePath = this.getContextProxy()!.globalStorageUri.fsPath
  const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
  const filePath = path.join(taskDir, GlobalFileNames.taskMetadata)
- await fs.writeFile(filePath, JSON.stringify(metadata, null, 2))
+ await safeWriteJson(filePath, metadata)
  } catch (error) {
  console.error("Failed to save task metadata:", error)
  }

src/core/task-persistence/apiMessages.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as fs from "fs/promises"
 
@@ -78,5 +79,5 @@ export async function saveApiMessages({
 }) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
 	const filePath = path.join(taskDir, GlobalFileNames.apiConversationHistory)
-	await fs.writeFile(filePath, JSON.stringify(messages))
+	await safeWriteJson(filePath, messages)
 }

src/core/task-persistence/taskMessages.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as fs from "fs/promises"
 
@@ -37,5 +38,5 @@ export type SaveTaskMessagesOptions = {
 export async function saveTaskMessages({ messages, taskId, globalStoragePath }: SaveTaskMessagesOptions) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
 	const filePath = path.join(taskDir, GlobalFileNames.uiMessages)
-	await fs.writeFile(filePath, JSON.stringify(messages))
+	await safeWriteJson(filePath, messages)
 }

src/core/webview/__tests__/ClineProvider.spec.ts

@@ -13,6 +13,7 @@ import { experimentDefault } from "../../../shared/experiments"
 import { setTtsEnabled } from "../../../utils/tts"
 import { ContextProxy } from "../../config/ContextProxy"
 import { Task, TaskOptions } from "../../task/Task"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import { ClineProvider } from "../ClineProvider"
 
@@ -43,6 +44,8 @@ vi.mock("axios", () => ({
 	post: vi.fn(),
 }))
 
+vi.mock("../../../utils/safeWriteJson")
+
 vi.mock("@modelcontextprotocol/sdk/types.js", () => ({
 	CallToolResultSchema: {},
 	ListResourcesResultSchema: {},
@@ -1976,11 +1979,8 @@ describe("Project MCP Settings", () => {
  // Check that fs.mkdir was called with the correct path
  expect(mockedFs.mkdir).toHaveBeenCalledWith("/test/workspace/.roo", { recursive: true })
 
- // Check that fs.writeFile was called with default content
- expect(mockedFs.writeFile).toHaveBeenCalledWith(
- "/test/workspace/.roo/mcp.json",
- JSON.stringify({ mcpServers: {} }, null, 2),
- )
+ // Verify file was created with default content
+ expect(safeWriteJson).toHaveBeenCalledWith("/test/workspace/.roo/mcp.json", { mcpServers: {} })
 
  // Check that openFile was called
  expect(openFileSpy).toHaveBeenCalledWith("/test/workspace/.roo/mcp.json")

.roo/rules-code/use-safeWriteJson.md

@@ -0,0 +1,6 @@
+# JSON File Writing Must Be Atomic
+
+- You MUST use `safeWriteJson(filePath: string, data: any): Promise<void>` from `src/utils/safeWriteJson.ts` instead of `JSON.stringify` with file-write operations
+- `safeWriteJson` will create parent directories if necessary, so do not call `mkdir` prior to `safeWriteJson`
+- `safeWriteJson` prevents data corruption via atomic writes with locking and streams the write to minimize memory footprint
+- Test files are exempt from this rule

src/api/providers/fetchers/modelCache.ts

@@ -2,6 +2,7 @@ import * as path from "path"
 import fs from "fs/promises"
 
 import NodeCache from "node-cache"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import { ContextProxy } from "../../../core/config/ContextProxy"
 import { getCacheDirectoryPath } from "../../../utils/storage"
@@ -22,7 +23,7 @@ const memoryCache = new NodeCache({ stdTTL: 5 * 60, checkperiod: 5 * 60 })
 async function writeModels(router: RouterName, data: ModelRecord) {
 	const filename = `${router}_models.json`
 	const cacheDir = await getCacheDirectoryPath(ContextProxy.instance.globalStorageUri.fsPath)
-	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data))
+	await safeWriteJson(path.join(cacheDir, filename), data)
 }
 
 async function readModels(router: RouterName): Promise<ModelRecord | undefined> {

src/api/providers/fetchers/modelEndpointCache.ts

@@ -2,6 +2,7 @@ import * as path from "path"
 import fs from "fs/promises"
 
 import NodeCache from "node-cache"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 import sanitize from "sanitize-filename"
 
 import { ContextProxy } from "../../../core/config/ContextProxy"
@@ -18,7 +19,7 @@ const getCacheKey = (router: RouterName, modelId: string) => sanitize(`${router}
 async function writeModelEndpoints(key: string, data: ModelRecord) {
 	const filename = `${key}_endpoints.json`
 	const cacheDir = await getCacheDirectoryPath(ContextProxy.instance.globalStorageUri.fsPath)
-	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data, null, 2))
+	await safeWriteJson(path.join(cacheDir, filename), data)
 }
 
 async function readModelEndpoints(key: string): Promise<ModelRecord | undefined> {

src/core/config/__tests__/importExport.spec.ts

@@ -12,6 +12,7 @@ import { importSettings, exportSettings } from "../importExport"
 import { ProviderSettingsManager } from "../ProviderSettingsManager"
 import { ContextProxy } from "../ContextProxy"
 import { CustomModesManager } from "../CustomModesManager"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import type { Mock } from "vitest"
 
@@ -43,6 +44,8 @@ vi.mock("os", () => ({
 	homedir: vi.fn(() => "/mock/home"),
 }))
 
+vi.mock("../../../utils/safeWriteJson")
+
 describe("importExport", () => {
 	let mockProviderSettingsManager: ReturnType<typeof vi.mocked<ProviderSettingsManager>>
 	let mockContextProxy: ReturnType<typeof vi.mocked<ContextProxy>>
@@ -384,11 +387,10 @@ describe("importExport", () => {
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
 
- expect(fs.writeFile).toHaveBeenCalledWith(
- "/mock/path/roo-code-settings.json",
- JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
- "utf-8",
- )
+ expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
+ providerProfiles: mockProviderProfiles,
+ globalSettings: mockGlobalSettings,
+ })
  })
 
  it("should include globalSettings when allowedMaxRequests is null", async () => {
@@ -417,11 +419,10 @@ describe("importExport", () => {
  contextProxy: mockContextProxy,
  })
 
- expect(fs.writeFile).toHaveBeenCalledWith(
- "/mock/path/roo-code-settings.json",
- JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
- "utf-8",
- )
+ expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
+ providerProfiles: mockProviderProfiles,
+ globalSettings: mockGlobalSettings,
+ })
  })
 
  it("should handle errors during the export process", async () => {
@@ -436,7 +437,8 @@ describe("importExport", () => {
  })
 
  mockContextProxy.export.mockResolvedValue({ mode: "code" })
- ;(fs.writeFile as Mock).mockRejectedValue(new Error("Write error"))
+ // Simulate an error during the safeWriteJson operation
+ ;(safeWriteJson as Mock).mockRejectedValueOnce(new Error("Safe write error"))
 
  await exportSettings({
  providerSettingsManager: mockProviderSettingsManager,
@@ -447,8 +449,10 @@ describe("importExport", () => {
  expect(mockProviderSettingsManager.export).toHaveBeenCalled()
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
- expect(fs.writeFile).toHaveBeenCalled()
+ expect(safeWriteJson).toHaveBeenCalled() // safeWriteJson is called, but it will throw
  // The error is caught and the function exits silently.
+ // Optionally, ensure no error message was shown if that's part of "silent"
+ // expect(vscode.window.showErrorMessage).not.toHaveBeenCalled();
  })
 
  it("should handle errors during directory creation", async () => {
@@ -474,7 +478,7 @@ describe("importExport", () => {
  expect(mockProviderSettingsManager.export).toHaveBeenCalled()
  expect(mockContextProxy.export).toHaveBeenCalled()
  expect(fs.mkdir).toHaveBeenCalled()
- expect(fs.writeFile).not.toHaveBeenCalled() // Should not be called since mkdir failed.
+ expect(safeWriteJson).not.toHaveBeenCalled() // Should not be called since mkdir failed.
  })
 
  it("should use the correct default save location", async () => {

src/core/config/importExport.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import os from "os"
 import * as path from "path"
 import fs from "fs/promises"
@@ -116,6 +117,6 @@ export const exportSettings = async ({ providerSettingsManager, contextProxy }:
 
  const dirname = path.dirname(uri.fsPath)
  await fs.mkdir(dirname, { recursive: true })
- await fs.writeFile(uri.fsPath, JSON.stringify({ providerProfiles, globalSettings }, null, 2), "utf-8")
+ await safeWriteJson(uri.fsPath, { providerProfiles, globalSettings })
 	} catch (e) {}
 }

src/core/context-tracking/FileContextTracker.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as vscode from "vscode"
 import { getTaskDirectoryPath } from "../../utils/storage"
@@ -130,7 +131,7 @@ export class FileContextTracker {
  const globalStoragePath = this.getContextProxy()!.globalStorageUri.fsPath
  const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
  const filePath = path.join(taskDir, GlobalFileNames.taskMetadata)
- await fs.writeFile(filePath, JSON.stringify(metadata, null, 2))
+ await safeWriteJson(filePath, metadata)
  } catch (error) {
  console.error("Failed to save task metadata:", error)
  }

src/core/task-persistence/apiMessages.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as fs from "fs/promises"
 
@@ -78,5 +79,5 @@ export async function saveApiMessages({
 }) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
 	const filePath = path.join(taskDir, GlobalFileNames.apiConversationHistory)
-	await fs.writeFile(filePath, JSON.stringify(messages))
+	await safeWriteJson(filePath, messages)
 }

src/core/task-persistence/taskMessages.ts

@@ -1,3 +1,4 @@
+import { safeWriteJson } from "../../utils/safeWriteJson"
 import * as path from "path"
 import * as fs from "fs/promises"
 
@@ -37,5 +38,5 @@ export type SaveTaskMessagesOptions = {
 export async function saveTaskMessages({ messages, taskId, globalStoragePath }: SaveTaskMessagesOptions) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
 	const filePath = path.join(taskDir, GlobalFileNames.uiMessages)
-	await fs.writeFile(filePath, JSON.stringify(messages))
+	await safeWriteJson(filePath, messages)
 }

src/core/webview/__tests__/ClineProvider.spec.ts

@@ -13,6 +13,7 @@ import { experimentDefault } from "../../../shared/experiments"
 import { setTtsEnabled } from "../../../utils/tts"
 import { ContextProxy } from "../../config/ContextProxy"
 import { Task, TaskOptions } from "../../task/Task"
+import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import { ClineProvider } from "../ClineProvider"
 
@@ -43,6 +44,8 @@ vi.mock("axios", () => ({
 	post: vi.fn(),
 }))
 
+vi.mock("../../../utils/safeWriteJson")
+
 vi.mock("@modelcontextprotocol/sdk/types.js", () => ({
 	CallToolResultSchema: {},
 	ListResourcesResultSchema: {},
@@ -1976,11 +1979,8 @@ describe("Project MCP Settings", () => {
  // Check that fs.mkdir was called with the correct path
  expect(mockedFs.mkdir).toHaveBeenCalledWith("/test/workspace/.roo", { recursive: true })
 
- // Check that fs.writeFile was called with default content
- expect(mockedFs.writeFile).toHaveBeenCalledWith(
- "/test/workspace/.roo/mcp.json",
- JSON.stringify({ mcpServers: {} }, null, 2),
- )
+ // Verify file was created with default content
+ expect(safeWriteJson).toHaveBeenCalledWith("/test/workspace/.roo/mcp.json", { mcpServers: {} })
 
  // Check that openFile was called
  expect(openFileSpy).toHaveBeenCalledWith("/test/workspace/.roo/mcp.json")