Skip to content
This repository was archived by the owner on May 15, 2026. It is now read-only.

Revert "fix: use safeWriteJson for all JSON file writes"#4471

Merged
mrubens merged 1 commit into from
Jun 9, 2025
Merged

Revert "fix: use safeWriteJson for all JSON file writes" #4471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions .roo/rules-code/use-safeWriteJson.md
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/api/providers/fetchers/modelCache.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ 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"
Expand All@@ -20,7 +19,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 safeWriteJson(path.join(cacheDir, filename), data)
await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data))
}

async function readModels(router: RouterName): Promise<ModelRecord | undefined> {
Expand Down
3 changes: 1 addition & 2 deletions src/api/providers/fetchers/modelEndpointCache.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ 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"
Expand All@@ -19,7 +18,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 safeWriteJson(path.join(cacheDir, filename), data)
await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data, null, 2))
}

async function readModelEndpoints(key: string): Promise<ModelRecord | undefined> {
Expand Down
28 changes: 12 additions & 16 deletions src/core/config/__tests__/importExport.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import { importSettings, exportSettings } from "../importExport"
import { ProviderSettingsManager } from "../ProviderSettingsManager"
import { ContextProxy } from "../ContextProxy"
import { CustomModesManager } from "../CustomModesManager"
import { safeWriteJson } from "../../../utils/safeWriteJson"

jest.mock("vscode", () => ({
window: {
Expand All@@ -34,8 +33,6 @@ jest.mock("os", () => ({
homedir: jest.fn(() => "/mock/home"),
}))

jest.mock("../../../utils/safeWriteJson")

describe("importExport", () => {
let mockProviderSettingsManager: jest.Mocked<ProviderSettingsManager>
let mockContextProxy: jest.Mocked<ContextProxy>
Expand DownExpand Up@@ -375,10 +372,11 @@ describe("importExport", () => {
expect(mockContextProxy.export).toHaveBeenCalled()
expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })

expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
providerProfiles: mockProviderProfiles,
globalSettings: mockGlobalSettings,
})
expect(fs.writeFile).toHaveBeenCalledWith(
"/mock/path/roo-code-settings.json",
JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
"utf-8",
)
})

it("should include globalSettings when allowedMaxRequests is null", async () => {
Expand DownExpand Up@@ -407,10 +405,11 @@ describe("importExport", () => {
contextProxy: mockContextProxy,
})

expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
providerProfiles: mockProviderProfiles,
globalSettings: mockGlobalSettings,
})
expect(fs.writeFile).toHaveBeenCalledWith(
"/mock/path/roo-code-settings.json",
JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
"utf-8",
)
})

it("should handle errors during the export process", async () => {
Expand All@@ -425,8 +424,7 @@ describe("importExport", () => {
})

mockContextProxy.export.mockResolvedValue({ mode: "code" })
// Simulate an error during the safeWriteJson operation
;(safeWriteJson as jest.Mock).mockRejectedValueOnce(new Error("Safe write error"))
;(fs.writeFile as jest.Mock).mockRejectedValue(new Error("Write error"))

await exportSettings({
providerSettingsManager: mockProviderSettingsManager,
Expand All@@ -437,10 +435,8 @@ describe("importExport", () => {
expect(mockProviderSettingsManager.export).toHaveBeenCalled()
expect(mockContextProxy.export).toHaveBeenCalled()
expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
expect(safeWriteJson).toHaveBeenCalled() // safeWriteJson is called, but it will throw
expect(fs.writeFile).toHaveBeenCalled()
// 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 () => {
Expand Down
3 changes: 1 addition & 2 deletions src/core/config/importExport.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import os from "os"
import * as path from "path"
import fs from "fs/promises"
Expand DownExpand Up@@ -117,6 +116,6 @@ export const exportSettings = async ({ providerSettingsManager, contextProxy }:

const dirname = path.dirname(uri.fsPath)
await fs.mkdir(dirname, { recursive: true })
await safeWriteJson(uri.fsPath, { providerProfiles, globalSettings })
await fs.writeFile(uri.fsPath, JSON.stringify({ providerProfiles, globalSettings }, null, 2), "utf-8")
} catch (e) {}
}
3 changes: 1 addition & 2 deletions src/core/context-tracking/FileContextTracker.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as vscode from "vscode"
import { getTaskDirectoryPath } from "../../utils/storage"
Expand DownExpand Up@@ -131,7 +130,7 @@ export class FileContextTracker {
const globalStoragePath = this.getContextProxy()!.globalStorageUri.fsPath
const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
const filePath = path.join(taskDir, GlobalFileNames.taskMetadata)
await safeWriteJson(filePath, metadata)
await fs.writeFile(filePath, JSON.stringify(metadata, null, 2))
} catch (error) {
console.error("Failed to save task metadata:", error)
}
Expand Down
3 changes: 1 addition & 2 deletions src/core/task-persistence/apiMessages.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as fs from "fs/promises"

Expand DownExpand Up@@ -47,5 +46,5 @@ export async function saveApiMessages({
}) {
const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
const filePath = path.join(taskDir, GlobalFileNames.apiConversationHistory)
await safeWriteJson(filePath, messages)
await fs.writeFile(filePath, JSON.stringify(messages))
}
3 changes: 1 addition & 2 deletions src/core/task-persistence/taskMessages.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as fs from "fs/promises"

Expand DownExpand Up@@ -38,5 +37,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 safeWriteJson(filePath, messages)
await fs.writeFile(filePath, JSON.stringify(messages))
}
8 changes: 4 additions & 4 deletions src/core/webview/__tests__/ClineProvider.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ 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"

Expand DownExpand Up@@ -42,8 +41,6 @@ jest.mock("axios", () => ({
post: jest.fn(),
}))

jest.mock("../../../utils/safeWriteJson")

jest.mock(
"@modelcontextprotocol/sdk/types.js",
() => ({
Expand DownExpand Up@@ -2004,7 +2001,10 @@ describe("Project MCP Settings", () => {
)

// Verify file was created with default content
expect(safeWriteJson).toHaveBeenCalledWith(expect.stringContaining("mcp.json"), { mcpServers: {} })
expect(fs.writeFile).toHaveBeenCalledWith(
expect.stringContaining("mcp.json"),
JSON.stringify({ mcpServers: {} }, null, 2),
)
})

test("handles openProjectMcpSettings when workspace is not open", async () => {
Expand Down
3 changes: 1 addition & 2 deletions src/core/webview/webviewMessageHandler.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import fs from "fs/promises"
import pWaitFor from "p-wait-for"
Expand DownExpand Up@@ -500,7 +499,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
const exists = await fileExistsAtPath(mcpPath)

if (!exists) {
await safeWriteJson(mcpPath, { mcpServers: {} })
await fs.writeFile(mcpPath, JSON.stringify({ mcpServers: {} }, null, 2))
}

await openFile(mcpPath)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Revert "fix: use safeWriteJson for all JSON file writes" by mrubens · Pull Request #4471 · RooCodeInc/Roo-Code · GitHub
Skip to content

This repository was archived by the owner on May 15, 2026. It is now read-only.

Revert "fix: use safeWriteJson for all JSON file writes"#4471
 Merged

mrubens
merged 1 commit into

from

Jun 9, 2025
 Merged


Revert "fix: use safeWriteJson for all JSON file writes"
#4471
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


5 changes: 0 additions & 5 deletions
.roo/rules-code/use-safeWriteJson.md

View file


Open in desktop


This file was deleted.


66 changes: 0 additions & 66 deletions
pnpm-lock.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


3 changes: 1 addition & 2 deletions
src/api/providers/fetchers/modelCache.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ 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"
Expand All@@ -20,7 +19,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 safeWriteJson(path.join(cacheDir, filename), data)
	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data))
}

async function readModels(router: RouterName): Promise<ModelRecord | undefined> {
Expand Down

3 changes: 1 addition & 2 deletions
src/api/providers/fetchers/modelEndpointCache.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ 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"
Expand All@@ -19,7 +18,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 safeWriteJson(path.join(cacheDir, filename), data)
	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data, null, 2))
}

async function readModelEndpoints(key: string): Promise<ModelRecord | undefined> {
Expand Down

28 changes: 12 additions & 16 deletions
src/core/config/__tests__/importExport.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import { importSettings, exportSettings } from "../importExport"
import { ProviderSettingsManager } from "../ProviderSettingsManager"
import { ContextProxy } from "../ContextProxy"
import { CustomModesManager } from "../CustomModesManager"
import { safeWriteJson } from "../../../utils/safeWriteJson"

jest.mock("vscode", () => ({
	window: {
Expand All@@ -34,8 +33,6 @@ jest.mock("os", () => ({
	homedir: jest.fn(() => "/mock/home"),
}))

jest.mock("../../../utils/safeWriteJson")

describe("importExport", () => {
	let mockProviderSettingsManager: jest.Mocked<ProviderSettingsManager>
	let mockContextProxy: jest.Mocked<ContextProxy>
Expand DownExpand Up@@ -375,10 +372,11 @@ describe("importExport", () => {
 expect(mockContextProxy.export).toHaveBeenCalled()
 expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })

 expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
 providerProfiles: mockProviderProfiles,
 globalSettings: mockGlobalSettings,
 })
 expect(fs.writeFile).toHaveBeenCalledWith(
 "/mock/path/roo-code-settings.json",
 JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
 "utf-8",
 )
 })

 it("should include globalSettings when allowedMaxRequests is null", async () => {
Expand DownExpand Up@@ -407,10 +405,11 @@ describe("importExport", () => {
 contextProxy: mockContextProxy,
 })

 expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
 providerProfiles: mockProviderProfiles,
 globalSettings: mockGlobalSettings,
 })
 expect(fs.writeFile).toHaveBeenCalledWith(
 "/mock/path/roo-code-settings.json",
 JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
 "utf-8",
 )
 })

 it("should handle errors during the export process", async () => {
Expand All@@ -425,8 +424,7 @@ describe("importExport", () => {
 })

 mockContextProxy.export.mockResolvedValue({ mode: "code" })
 // Simulate an error during the safeWriteJson operation
 ;(safeWriteJson as jest.Mock).mockRejectedValueOnce(new Error("Safe write error"))
 ;(fs.writeFile as jest.Mock).mockRejectedValue(new Error("Write error"))

 await exportSettings({
 providerSettingsManager: mockProviderSettingsManager,
Expand All@@ -437,10 +435,8 @@ describe("importExport", () => {
 expect(mockProviderSettingsManager.export).toHaveBeenCalled()
 expect(mockContextProxy.export).toHaveBeenCalled()
 expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
 expect(safeWriteJson).toHaveBeenCalled() // safeWriteJson is called, but it will throw
 expect(fs.writeFile).toHaveBeenCalled()
 // 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 () => {
Expand Down

3 changes: 1 addition & 2 deletions
src/core/config/importExport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import os from "os"
import * as path from "path"
import fs from "fs/promises"
Expand DownExpand Up@@ -117,6 +116,6 @@ export const exportSettings = async ({ providerSettingsManager, contextProxy }:

 const dirname = path.dirname(uri.fsPath)
 await fs.mkdir(dirname, { recursive: true })
 await safeWriteJson(uri.fsPath, { providerProfiles, globalSettings })
 await fs.writeFile(uri.fsPath, JSON.stringify({ providerProfiles, globalSettings }, null, 2), "utf-8")
	} catch (e) {}
}

3 changes: 1 addition & 2 deletions
src/core/context-tracking/FileContextTracker.ts

View file


Open in desktop

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

3 changes: 1 addition & 2 deletions
src/core/task-persistence/apiMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as fs from "fs/promises"

Expand DownExpand Up@@ -47,5 +46,5 @@ export async function saveApiMessages({
}) {
	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
	const filePath = path.join(taskDir, GlobalFileNames.apiConversationHistory)
	await safeWriteJson(filePath, messages)
	await fs.writeFile(filePath, JSON.stringify(messages))
}

3 changes: 1 addition & 2 deletions
src/core/task-persistence/taskMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as fs from "fs/promises"

Expand DownExpand Up@@ -38,5 +37,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 safeWriteJson(filePath, messages)
	await fs.writeFile(filePath, JSON.stringify(messages))
}

8 changes: 4 additions & 4 deletions
src/core/webview/__tests__/ClineProvider.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ 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"

Expand DownExpand Up@@ -42,8 +41,6 @@ jest.mock("axios", () => ({
	post: jest.fn(),
}))

jest.mock("../../../utils/safeWriteJson")

jest.mock(
	"@modelcontextprotocol/sdk/types.js",
	() => ({
Expand DownExpand Up@@ -2004,7 +2001,10 @@ describe("Project MCP Settings", () => {
 )

 // Verify file was created with default content
 expect(safeWriteJson).toHaveBeenCalledWith(expect.stringContaining("mcp.json"), { mcpServers: {} })
 expect(fs.writeFile).toHaveBeenCalledWith(
 expect.stringContaining("mcp.json"),
 JSON.stringify({ mcpServers: {} }, null, 2),
 )
	})

	test("handles openProjectMcpSettings when workspace is not open", async () => {
Expand Down

3 changes: 1 addition & 2 deletions
src/core/webview/webviewMessageHandler.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import fs from "fs/promises"
import pWaitFor from "p-wait-for"
Expand DownExpand Up@@ -500,7 +499,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 const exists = await fileExistsAtPath(mcpPath)

 if (!exists) {
 await safeWriteJson(mcpPath, { mcpServers: {} })
 await fs.writeFile(mcpPath, JSON.stringify({ mcpServers: {} }, null, 2))
 }

 await openFile(mcpPath)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Revert "fix: use safeWriteJson for all JSON file writes" by mrubens · Pull Request #4471 · RooCodeInc/Roo-Code · GitHub
Skip to content

This repository was archived by the owner on May 15, 2026. It is now read-only.

Revert "fix: use safeWriteJson for all JSON file writes"#4471
 Merged

mrubens
merged 1 commit into

from

Jun 9, 2025
 Merged


Revert "fix: use safeWriteJson for all JSON file writes"
#4471
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


5 changes: 0 additions & 5 deletions
.roo/rules-code/use-safeWriteJson.md

View file


Open in desktop


This file was deleted.


66 changes: 0 additions & 66 deletions
pnpm-lock.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


3 changes: 1 addition & 2 deletions
src/api/providers/fetchers/modelCache.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ 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"
Expand All@@ -20,7 +19,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 safeWriteJson(path.join(cacheDir, filename), data)
	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data))
}

async function readModels(router: RouterName): Promise<ModelRecord | undefined> {
Expand Down

3 changes: 1 addition & 2 deletions
src/api/providers/fetchers/modelEndpointCache.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ 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"
Expand All@@ -19,7 +18,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 safeWriteJson(path.join(cacheDir, filename), data)
	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data, null, 2))
}

async function readModelEndpoints(key: string): Promise<ModelRecord | undefined> {
Expand Down

28 changes: 12 additions & 16 deletions
src/core/config/__tests__/importExport.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import { importSettings, exportSettings } from "../importExport"
import { ProviderSettingsManager } from "../ProviderSettingsManager"
import { ContextProxy } from "../ContextProxy"
import { CustomModesManager } from "../CustomModesManager"
import { safeWriteJson } from "../../../utils/safeWriteJson"

jest.mock("vscode", () => ({
	window: {
Expand All@@ -34,8 +33,6 @@ jest.mock("os", () => ({
	homedir: jest.fn(() => "/mock/home"),
}))

jest.mock("../../../utils/safeWriteJson")

describe("importExport", () => {
	let mockProviderSettingsManager: jest.Mocked<ProviderSettingsManager>
	let mockContextProxy: jest.Mocked<ContextProxy>
Expand DownExpand Up@@ -375,10 +372,11 @@ describe("importExport", () => {
 expect(mockContextProxy.export).toHaveBeenCalled()
 expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })

 expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
 providerProfiles: mockProviderProfiles,
 globalSettings: mockGlobalSettings,
 })
 expect(fs.writeFile).toHaveBeenCalledWith(
 "/mock/path/roo-code-settings.json",
 JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
 "utf-8",
 )
 })

 it("should include globalSettings when allowedMaxRequests is null", async () => {
Expand DownExpand Up@@ -407,10 +405,11 @@ describe("importExport", () => {
 contextProxy: mockContextProxy,
 })

 expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
 providerProfiles: mockProviderProfiles,
 globalSettings: mockGlobalSettings,
 })
 expect(fs.writeFile).toHaveBeenCalledWith(
 "/mock/path/roo-code-settings.json",
 JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
 "utf-8",
 )
 })

 it("should handle errors during the export process", async () => {
Expand All@@ -425,8 +424,7 @@ describe("importExport", () => {
 })

 mockContextProxy.export.mockResolvedValue({ mode: "code" })
 // Simulate an error during the safeWriteJson operation
 ;(safeWriteJson as jest.Mock).mockRejectedValueOnce(new Error("Safe write error"))
 ;(fs.writeFile as jest.Mock).mockRejectedValue(new Error("Write error"))

 await exportSettings({
 providerSettingsManager: mockProviderSettingsManager,
Expand All@@ -437,10 +435,8 @@ describe("importExport", () => {
 expect(mockProviderSettingsManager.export).toHaveBeenCalled()
 expect(mockContextProxy.export).toHaveBeenCalled()
 expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
 expect(safeWriteJson).toHaveBeenCalled() // safeWriteJson is called, but it will throw
 expect(fs.writeFile).toHaveBeenCalled()
 // 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 () => {
Expand Down

3 changes: 1 addition & 2 deletions
src/core/config/importExport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import os from "os"
import * as path from "path"
import fs from "fs/promises"
Expand DownExpand Up@@ -117,6 +116,6 @@ export const exportSettings = async ({ providerSettingsManager, contextProxy }:

 const dirname = path.dirname(uri.fsPath)
 await fs.mkdir(dirname, { recursive: true })
 await safeWriteJson(uri.fsPath, { providerProfiles, globalSettings })
 await fs.writeFile(uri.fsPath, JSON.stringify({ providerProfiles, globalSettings }, null, 2), "utf-8")
	} catch (e) {}
}

3 changes: 1 addition & 2 deletions
src/core/context-tracking/FileContextTracker.ts

View file


Open in desktop

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

3 changes: 1 addition & 2 deletions
src/core/task-persistence/apiMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as fs from "fs/promises"

Expand DownExpand Up@@ -47,5 +46,5 @@ export async function saveApiMessages({
}) {
	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
	const filePath = path.join(taskDir, GlobalFileNames.apiConversationHistory)
	await safeWriteJson(filePath, messages)
	await fs.writeFile(filePath, JSON.stringify(messages))
}

3 changes: 1 addition & 2 deletions
src/core/task-persistence/taskMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as fs from "fs/promises"

Expand DownExpand Up@@ -38,5 +37,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 safeWriteJson(filePath, messages)
	await fs.writeFile(filePath, JSON.stringify(messages))
}

8 changes: 4 additions & 4 deletions
src/core/webview/__tests__/ClineProvider.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ 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"

Expand DownExpand Up@@ -42,8 +41,6 @@ jest.mock("axios", () => ({
	post: jest.fn(),
}))

jest.mock("../../../utils/safeWriteJson")

jest.mock(
	"@modelcontextprotocol/sdk/types.js",
	() => ({
Expand DownExpand Up@@ -2004,7 +2001,10 @@ describe("Project MCP Settings", () => {
 )

 // Verify file was created with default content
 expect(safeWriteJson).toHaveBeenCalledWith(expect.stringContaining("mcp.json"), { mcpServers: {} })
 expect(fs.writeFile).toHaveBeenCalledWith(
 expect.stringContaining("mcp.json"),
 JSON.stringify({ mcpServers: {} }, null, 2),
 )
	})

	test("handles openProjectMcpSettings when workspace is not open", async () => {
Expand Down

3 changes: 1 addition & 2 deletions
src/core/webview/webviewMessageHandler.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import fs from "fs/promises"
import pWaitFor from "p-wait-for"
Expand DownExpand Up@@ -500,7 +499,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 const exists = await fileExistsAtPath(mcpPath)

 if (!exists) {
 await safeWriteJson(mcpPath, { mcpServers: {} })
 await fs.writeFile(mcpPath, JSON.stringify({ mcpServers: {} }, null, 2))
 }

 await openFile(mcpPath)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Revert "fix: use safeWriteJson for all JSON file writes" by mrubens · Pull Request #4471 · RooCodeInc/Roo-Code · GitHub
Skip to content

This repository was archived by the owner on May 15, 2026. It is now read-only.

Revert "fix: use safeWriteJson for all JSON file writes"#4471
 Merged

mrubens
merged 1 commit into

from

Jun 9, 2025
 Merged


Revert "fix: use safeWriteJson for all JSON file writes"
#4471
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


5 changes: 0 additions & 5 deletions
.roo/rules-code/use-safeWriteJson.md

View file


Open in desktop


This file was deleted.


66 changes: 0 additions & 66 deletions
pnpm-lock.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


3 changes: 1 addition & 2 deletions
src/api/providers/fetchers/modelCache.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ 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"
Expand All@@ -20,7 +19,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 safeWriteJson(path.join(cacheDir, filename), data)
	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data))
}

async function readModels(router: RouterName): Promise<ModelRecord | undefined> {
Expand Down

3 changes: 1 addition & 2 deletions
src/api/providers/fetchers/modelEndpointCache.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ 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"
Expand All@@ -19,7 +18,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 safeWriteJson(path.join(cacheDir, filename), data)
	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data, null, 2))
}

async function readModelEndpoints(key: string): Promise<ModelRecord | undefined> {
Expand Down

28 changes: 12 additions & 16 deletions
src/core/config/__tests__/importExport.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import { importSettings, exportSettings } from "../importExport"
import { ProviderSettingsManager } from "../ProviderSettingsManager"
import { ContextProxy } from "../ContextProxy"
import { CustomModesManager } from "../CustomModesManager"
import { safeWriteJson } from "../../../utils/safeWriteJson"

jest.mock("vscode", () => ({
	window: {
Expand All@@ -34,8 +33,6 @@ jest.mock("os", () => ({
	homedir: jest.fn(() => "/mock/home"),
}))

jest.mock("../../../utils/safeWriteJson")

describe("importExport", () => {
	let mockProviderSettingsManager: jest.Mocked<ProviderSettingsManager>
	let mockContextProxy: jest.Mocked<ContextProxy>
Expand DownExpand Up@@ -375,10 +372,11 @@ describe("importExport", () => {
 expect(mockContextProxy.export).toHaveBeenCalled()
 expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })

 expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
 providerProfiles: mockProviderProfiles,
 globalSettings: mockGlobalSettings,
 })
 expect(fs.writeFile).toHaveBeenCalledWith(
 "/mock/path/roo-code-settings.json",
 JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
 "utf-8",
 )
 })

 it("should include globalSettings when allowedMaxRequests is null", async () => {
Expand DownExpand Up@@ -407,10 +405,11 @@ describe("importExport", () => {
 contextProxy: mockContextProxy,
 })

 expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
 providerProfiles: mockProviderProfiles,
 globalSettings: mockGlobalSettings,
 })
 expect(fs.writeFile).toHaveBeenCalledWith(
 "/mock/path/roo-code-settings.json",
 JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
 "utf-8",
 )
 })

 it("should handle errors during the export process", async () => {
Expand All@@ -425,8 +424,7 @@ describe("importExport", () => {
 })

 mockContextProxy.export.mockResolvedValue({ mode: "code" })
 // Simulate an error during the safeWriteJson operation
 ;(safeWriteJson as jest.Mock).mockRejectedValueOnce(new Error("Safe write error"))
 ;(fs.writeFile as jest.Mock).mockRejectedValue(new Error("Write error"))

 await exportSettings({
 providerSettingsManager: mockProviderSettingsManager,
Expand All@@ -437,10 +435,8 @@ describe("importExport", () => {
 expect(mockProviderSettingsManager.export).toHaveBeenCalled()
 expect(mockContextProxy.export).toHaveBeenCalled()
 expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
 expect(safeWriteJson).toHaveBeenCalled() // safeWriteJson is called, but it will throw
 expect(fs.writeFile).toHaveBeenCalled()
 // 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 () => {
Expand Down

3 changes: 1 addition & 2 deletions
src/core/config/importExport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import os from "os"
import * as path from "path"
import fs from "fs/promises"
Expand DownExpand Up@@ -117,6 +116,6 @@ export const exportSettings = async ({ providerSettingsManager, contextProxy }:

 const dirname = path.dirname(uri.fsPath)
 await fs.mkdir(dirname, { recursive: true })
 await safeWriteJson(uri.fsPath, { providerProfiles, globalSettings })
 await fs.writeFile(uri.fsPath, JSON.stringify({ providerProfiles, globalSettings }, null, 2), "utf-8")
	} catch (e) {}
}

3 changes: 1 addition & 2 deletions
src/core/context-tracking/FileContextTracker.ts

View file


Open in desktop

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

3 changes: 1 addition & 2 deletions
src/core/task-persistence/apiMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as fs from "fs/promises"

Expand DownExpand Up@@ -47,5 +46,5 @@ export async function saveApiMessages({
}) {
	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
	const filePath = path.join(taskDir, GlobalFileNames.apiConversationHistory)
	await safeWriteJson(filePath, messages)
	await fs.writeFile(filePath, JSON.stringify(messages))
}

3 changes: 1 addition & 2 deletions
src/core/task-persistence/taskMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as fs from "fs/promises"

Expand DownExpand Up@@ -38,5 +37,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 safeWriteJson(filePath, messages)
	await fs.writeFile(filePath, JSON.stringify(messages))
}

8 changes: 4 additions & 4 deletions
src/core/webview/__tests__/ClineProvider.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ 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"

Expand DownExpand Up@@ -42,8 +41,6 @@ jest.mock("axios", () => ({
	post: jest.fn(),
}))

jest.mock("../../../utils/safeWriteJson")

jest.mock(
	"@modelcontextprotocol/sdk/types.js",
	() => ({
Expand DownExpand Up@@ -2004,7 +2001,10 @@ describe("Project MCP Settings", () => {
 )

 // Verify file was created with default content
 expect(safeWriteJson).toHaveBeenCalledWith(expect.stringContaining("mcp.json"), { mcpServers: {} })
 expect(fs.writeFile).toHaveBeenCalledWith(
 expect.stringContaining("mcp.json"),
 JSON.stringify({ mcpServers: {} }, null, 2),
 )
	})

	test("handles openProjectMcpSettings when workspace is not open", async () => {
Expand Down

3 changes: 1 addition & 2 deletions
src/core/webview/webviewMessageHandler.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import fs from "fs/promises"
import pWaitFor from "p-wait-for"
Expand DownExpand Up@@ -500,7 +499,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 const exists = await fileExistsAtPath(mcpPath)

 if (!exists) {
 await safeWriteJson(mcpPath, { mcpServers: {} })
 await fs.writeFile(mcpPath, JSON.stringify({ mcpServers: {} }, null, 2))
 }

 await openFile(mcpPath)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Revert "fix: use safeWriteJson for all JSON file writes" by mrubens · Pull Request #4471 · RooCodeInc/Roo-Code · GitHub
Skip to content

This repository was archived by the owner on May 15, 2026. It is now read-only.

Revert "fix: use safeWriteJson for all JSON file writes"#4471
 Merged

mrubens
merged 1 commit into

from

Jun 9, 2025
 Merged


Revert "fix: use safeWriteJson for all JSON file writes"
#4471
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


5 changes: 0 additions & 5 deletions
.roo/rules-code/use-safeWriteJson.md

View file


Open in desktop


This file was deleted.


66 changes: 0 additions & 66 deletions
pnpm-lock.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


3 changes: 1 addition & 2 deletions
src/api/providers/fetchers/modelCache.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ 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"
Expand All@@ -20,7 +19,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 safeWriteJson(path.join(cacheDir, filename), data)
	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data))
}

async function readModels(router: RouterName): Promise<ModelRecord | undefined> {
Expand Down

3 changes: 1 addition & 2 deletions
src/api/providers/fetchers/modelEndpointCache.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ 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"
Expand All@@ -19,7 +18,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 safeWriteJson(path.join(cacheDir, filename), data)
	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data, null, 2))
}

async function readModelEndpoints(key: string): Promise<ModelRecord | undefined> {
Expand Down

28 changes: 12 additions & 16 deletions
src/core/config/__tests__/importExport.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import { importSettings, exportSettings } from "../importExport"
import { ProviderSettingsManager } from "../ProviderSettingsManager"
import { ContextProxy } from "../ContextProxy"
import { CustomModesManager } from "../CustomModesManager"
import { safeWriteJson } from "../../../utils/safeWriteJson"

jest.mock("vscode", () => ({
	window: {
Expand All@@ -34,8 +33,6 @@ jest.mock("os", () => ({
	homedir: jest.fn(() => "/mock/home"),
}))

jest.mock("../../../utils/safeWriteJson")

describe("importExport", () => {
	let mockProviderSettingsManager: jest.Mocked<ProviderSettingsManager>
	let mockContextProxy: jest.Mocked<ContextProxy>
Expand DownExpand Up@@ -375,10 +372,11 @@ describe("importExport", () => {
 expect(mockContextProxy.export).toHaveBeenCalled()
 expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })

 expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
 providerProfiles: mockProviderProfiles,
 globalSettings: mockGlobalSettings,
 })
 expect(fs.writeFile).toHaveBeenCalledWith(
 "/mock/path/roo-code-settings.json",
 JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
 "utf-8",
 )
 })

 it("should include globalSettings when allowedMaxRequests is null", async () => {
Expand DownExpand Up@@ -407,10 +405,11 @@ describe("importExport", () => {
 contextProxy: mockContextProxy,
 })

 expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
 providerProfiles: mockProviderProfiles,
 globalSettings: mockGlobalSettings,
 })
 expect(fs.writeFile).toHaveBeenCalledWith(
 "/mock/path/roo-code-settings.json",
 JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
 "utf-8",
 )
 })

 it("should handle errors during the export process", async () => {
Expand All@@ -425,8 +424,7 @@ describe("importExport", () => {
 })

 mockContextProxy.export.mockResolvedValue({ mode: "code" })
 // Simulate an error during the safeWriteJson operation
 ;(safeWriteJson as jest.Mock).mockRejectedValueOnce(new Error("Safe write error"))
 ;(fs.writeFile as jest.Mock).mockRejectedValue(new Error("Write error"))

 await exportSettings({
 providerSettingsManager: mockProviderSettingsManager,
Expand All@@ -437,10 +435,8 @@ describe("importExport", () => {
 expect(mockProviderSettingsManager.export).toHaveBeenCalled()
 expect(mockContextProxy.export).toHaveBeenCalled()
 expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
 expect(safeWriteJson).toHaveBeenCalled() // safeWriteJson is called, but it will throw
 expect(fs.writeFile).toHaveBeenCalled()
 // 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 () => {
Expand Down

3 changes: 1 addition & 2 deletions
src/core/config/importExport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import os from "os"
import * as path from "path"
import fs from "fs/promises"
Expand DownExpand Up@@ -117,6 +116,6 @@ export const exportSettings = async ({ providerSettingsManager, contextProxy }:

 const dirname = path.dirname(uri.fsPath)
 await fs.mkdir(dirname, { recursive: true })
 await safeWriteJson(uri.fsPath, { providerProfiles, globalSettings })
 await fs.writeFile(uri.fsPath, JSON.stringify({ providerProfiles, globalSettings }, null, 2), "utf-8")
	} catch (e) {}
}

3 changes: 1 addition & 2 deletions
src/core/context-tracking/FileContextTracker.ts

View file


Open in desktop

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

3 changes: 1 addition & 2 deletions
src/core/task-persistence/apiMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as fs from "fs/promises"

Expand DownExpand Up@@ -47,5 +46,5 @@ export async function saveApiMessages({
}) {
	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
	const filePath = path.join(taskDir, GlobalFileNames.apiConversationHistory)
	await safeWriteJson(filePath, messages)
	await fs.writeFile(filePath, JSON.stringify(messages))
}

3 changes: 1 addition & 2 deletions
src/core/task-persistence/taskMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as fs from "fs/promises"

Expand DownExpand Up@@ -38,5 +37,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 safeWriteJson(filePath, messages)
	await fs.writeFile(filePath, JSON.stringify(messages))
}

8 changes: 4 additions & 4 deletions
src/core/webview/__tests__/ClineProvider.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ 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"

Expand DownExpand Up@@ -42,8 +41,6 @@ jest.mock("axios", () => ({
	post: jest.fn(),
}))

jest.mock("../../../utils/safeWriteJson")

jest.mock(
	"@modelcontextprotocol/sdk/types.js",
	() => ({
Expand DownExpand Up@@ -2004,7 +2001,10 @@ describe("Project MCP Settings", () => {
 )

 // Verify file was created with default content
 expect(safeWriteJson).toHaveBeenCalledWith(expect.stringContaining("mcp.json"), { mcpServers: {} })
 expect(fs.writeFile).toHaveBeenCalledWith(
 expect.stringContaining("mcp.json"),
 JSON.stringify({ mcpServers: {} }, null, 2),
 )
	})

	test("handles openProjectMcpSettings when workspace is not open", async () => {
Expand Down

3 changes: 1 addition & 2 deletions
src/core/webview/webviewMessageHandler.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import fs from "fs/promises"
import pWaitFor from "p-wait-for"
Expand DownExpand Up@@ -500,7 +499,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 const exists = await fileExistsAtPath(mcpPath)

 if (!exists) {
 await safeWriteJson(mcpPath, { mcpServers: {} })
 await fs.writeFile(mcpPath, JSON.stringify({ mcpServers: {} }, null, 2))
 }

 await openFile(mcpPath)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Revert "fix: use safeWriteJson for all JSON file writes" by mrubens · Pull Request #4471 · RooCodeInc/Roo-Code · GitHub
Skip to content

This repository was archived by the owner on May 15, 2026. It is now read-only.

Revert "fix: use safeWriteJson for all JSON file writes"#4471
 Merged

mrubens
merged 1 commit into

from

Jun 9, 2025
 Merged


Revert "fix: use safeWriteJson for all JSON file writes"
#4471
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


5 changes: 0 additions & 5 deletions
.roo/rules-code/use-safeWriteJson.md

View file


Open in desktop


This file was deleted.


66 changes: 0 additions & 66 deletions
pnpm-lock.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


3 changes: 1 addition & 2 deletions
src/api/providers/fetchers/modelCache.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ 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"
Expand All@@ -20,7 +19,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 safeWriteJson(path.join(cacheDir, filename), data)
	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data))
}

async function readModels(router: RouterName): Promise<ModelRecord | undefined> {
Expand Down

3 changes: 1 addition & 2 deletions
src/api/providers/fetchers/modelEndpointCache.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ 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"
Expand All@@ -19,7 +18,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 safeWriteJson(path.join(cacheDir, filename), data)
	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data, null, 2))
}

async function readModelEndpoints(key: string): Promise<ModelRecord | undefined> {
Expand Down

28 changes: 12 additions & 16 deletions
src/core/config/__tests__/importExport.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import { importSettings, exportSettings } from "../importExport"
import { ProviderSettingsManager } from "../ProviderSettingsManager"
import { ContextProxy } from "../ContextProxy"
import { CustomModesManager } from "../CustomModesManager"
import { safeWriteJson } from "../../../utils/safeWriteJson"

jest.mock("vscode", () => ({
	window: {
Expand All@@ -34,8 +33,6 @@ jest.mock("os", () => ({
	homedir: jest.fn(() => "/mock/home"),
}))

jest.mock("../../../utils/safeWriteJson")

describe("importExport", () => {
	let mockProviderSettingsManager: jest.Mocked<ProviderSettingsManager>
	let mockContextProxy: jest.Mocked<ContextProxy>
Expand DownExpand Up@@ -375,10 +372,11 @@ describe("importExport", () => {
 expect(mockContextProxy.export).toHaveBeenCalled()
 expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })

 expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
 providerProfiles: mockProviderProfiles,
 globalSettings: mockGlobalSettings,
 })
 expect(fs.writeFile).toHaveBeenCalledWith(
 "/mock/path/roo-code-settings.json",
 JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
 "utf-8",
 )
 })

 it("should include globalSettings when allowedMaxRequests is null", async () => {
Expand DownExpand Up@@ -407,10 +405,11 @@ describe("importExport", () => {
 contextProxy: mockContextProxy,
 })

 expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
 providerProfiles: mockProviderProfiles,
 globalSettings: mockGlobalSettings,
 })
 expect(fs.writeFile).toHaveBeenCalledWith(
 "/mock/path/roo-code-settings.json",
 JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
 "utf-8",
 )
 })

 it("should handle errors during the export process", async () => {
Expand All@@ -425,8 +424,7 @@ describe("importExport", () => {
 })

 mockContextProxy.export.mockResolvedValue({ mode: "code" })
 // Simulate an error during the safeWriteJson operation
 ;(safeWriteJson as jest.Mock).mockRejectedValueOnce(new Error("Safe write error"))
 ;(fs.writeFile as jest.Mock).mockRejectedValue(new Error("Write error"))

 await exportSettings({
 providerSettingsManager: mockProviderSettingsManager,
Expand All@@ -437,10 +435,8 @@ describe("importExport", () => {
 expect(mockProviderSettingsManager.export).toHaveBeenCalled()
 expect(mockContextProxy.export).toHaveBeenCalled()
 expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
 expect(safeWriteJson).toHaveBeenCalled() // safeWriteJson is called, but it will throw
 expect(fs.writeFile).toHaveBeenCalled()
 // 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 () => {
Expand Down

3 changes: 1 addition & 2 deletions
src/core/config/importExport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import os from "os"
import * as path from "path"
import fs from "fs/promises"
Expand DownExpand Up@@ -117,6 +116,6 @@ export const exportSettings = async ({ providerSettingsManager, contextProxy }:

 const dirname = path.dirname(uri.fsPath)
 await fs.mkdir(dirname, { recursive: true })
 await safeWriteJson(uri.fsPath, { providerProfiles, globalSettings })
 await fs.writeFile(uri.fsPath, JSON.stringify({ providerProfiles, globalSettings }, null, 2), "utf-8")
	} catch (e) {}
}

3 changes: 1 addition & 2 deletions
src/core/context-tracking/FileContextTracker.ts

View file


Open in desktop

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

3 changes: 1 addition & 2 deletions
src/core/task-persistence/apiMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as fs from "fs/promises"

Expand DownExpand Up@@ -47,5 +46,5 @@ export async function saveApiMessages({
}) {
	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
	const filePath = path.join(taskDir, GlobalFileNames.apiConversationHistory)
	await safeWriteJson(filePath, messages)
	await fs.writeFile(filePath, JSON.stringify(messages))
}

3 changes: 1 addition & 2 deletions
src/core/task-persistence/taskMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as fs from "fs/promises"

Expand DownExpand Up@@ -38,5 +37,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 safeWriteJson(filePath, messages)
	await fs.writeFile(filePath, JSON.stringify(messages))
}

8 changes: 4 additions & 4 deletions
src/core/webview/__tests__/ClineProvider.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ 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"

Expand DownExpand Up@@ -42,8 +41,6 @@ jest.mock("axios", () => ({
	post: jest.fn(),
}))

jest.mock("../../../utils/safeWriteJson")

jest.mock(
	"@modelcontextprotocol/sdk/types.js",
	() => ({
Expand DownExpand Up@@ -2004,7 +2001,10 @@ describe("Project MCP Settings", () => {
 )

 // Verify file was created with default content
 expect(safeWriteJson).toHaveBeenCalledWith(expect.stringContaining("mcp.json"), { mcpServers: {} })
 expect(fs.writeFile).toHaveBeenCalledWith(
 expect.stringContaining("mcp.json"),
 JSON.stringify({ mcpServers: {} }, null, 2),
 )
	})

	test("handles openProjectMcpSettings when workspace is not open", async () => {
Expand Down

3 changes: 1 addition & 2 deletions
src/core/webview/webviewMessageHandler.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import fs from "fs/promises"
import pWaitFor from "p-wait-for"
Expand DownExpand Up@@ -500,7 +499,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 const exists = await fileExistsAtPath(mcpPath)

 if (!exists) {
 await safeWriteJson(mcpPath, { mcpServers: {} })
 await fs.writeFile(mcpPath, JSON.stringify({ mcpServers: {} }, null, 2))
 }

 await openFile(mcpPath)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Revert "fix: use safeWriteJson for all JSON file writes" by mrubens · Pull Request #4471 · RooCodeInc/Roo-Code · GitHub
Skip to content

This repository was archived by the owner on May 15, 2026. It is now read-only.

Revert "fix: use safeWriteJson for all JSON file writes"#4471
 Merged

mrubens
merged 1 commit into

from

Jun 9, 2025
 Merged


Revert "fix: use safeWriteJson for all JSON file writes"
#4471
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


5 changes: 0 additions & 5 deletions
.roo/rules-code/use-safeWriteJson.md

View file


Open in desktop


This file was deleted.


66 changes: 0 additions & 66 deletions
pnpm-lock.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


3 changes: 1 addition & 2 deletions
src/api/providers/fetchers/modelCache.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ 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"
Expand All@@ -20,7 +19,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 safeWriteJson(path.join(cacheDir, filename), data)
	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data))
}

async function readModels(router: RouterName): Promise<ModelRecord | undefined> {
Expand Down

3 changes: 1 addition & 2 deletions
src/api/providers/fetchers/modelEndpointCache.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ 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"
Expand All@@ -19,7 +18,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 safeWriteJson(path.join(cacheDir, filename), data)
	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data, null, 2))
}

async function readModelEndpoints(key: string): Promise<ModelRecord | undefined> {
Expand Down

28 changes: 12 additions & 16 deletions
src/core/config/__tests__/importExport.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import { importSettings, exportSettings } from "../importExport"
import { ProviderSettingsManager } from "../ProviderSettingsManager"
import { ContextProxy } from "../ContextProxy"
import { CustomModesManager } from "../CustomModesManager"
import { safeWriteJson } from "../../../utils/safeWriteJson"

jest.mock("vscode", () => ({
	window: {
Expand All@@ -34,8 +33,6 @@ jest.mock("os", () => ({
	homedir: jest.fn(() => "/mock/home"),
}))

jest.mock("../../../utils/safeWriteJson")

describe("importExport", () => {
	let mockProviderSettingsManager: jest.Mocked<ProviderSettingsManager>
	let mockContextProxy: jest.Mocked<ContextProxy>
Expand DownExpand Up@@ -375,10 +372,11 @@ describe("importExport", () => {
 expect(mockContextProxy.export).toHaveBeenCalled()
 expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })

 expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
 providerProfiles: mockProviderProfiles,
 globalSettings: mockGlobalSettings,
 })
 expect(fs.writeFile).toHaveBeenCalledWith(
 "/mock/path/roo-code-settings.json",
 JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
 "utf-8",
 )
 })

 it("should include globalSettings when allowedMaxRequests is null", async () => {
Expand DownExpand Up@@ -407,10 +405,11 @@ describe("importExport", () => {
 contextProxy: mockContextProxy,
 })

 expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
 providerProfiles: mockProviderProfiles,
 globalSettings: mockGlobalSettings,
 })
 expect(fs.writeFile).toHaveBeenCalledWith(
 "/mock/path/roo-code-settings.json",
 JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
 "utf-8",
 )
 })

 it("should handle errors during the export process", async () => {
Expand All@@ -425,8 +424,7 @@ describe("importExport", () => {
 })

 mockContextProxy.export.mockResolvedValue({ mode: "code" })
 // Simulate an error during the safeWriteJson operation
 ;(safeWriteJson as jest.Mock).mockRejectedValueOnce(new Error("Safe write error"))
 ;(fs.writeFile as jest.Mock).mockRejectedValue(new Error("Write error"))

 await exportSettings({
 providerSettingsManager: mockProviderSettingsManager,
Expand All@@ -437,10 +435,8 @@ describe("importExport", () => {
 expect(mockProviderSettingsManager.export).toHaveBeenCalled()
 expect(mockContextProxy.export).toHaveBeenCalled()
 expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
 expect(safeWriteJson).toHaveBeenCalled() // safeWriteJson is called, but it will throw
 expect(fs.writeFile).toHaveBeenCalled()
 // 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 () => {
Expand Down

3 changes: 1 addition & 2 deletions
src/core/config/importExport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import os from "os"
import * as path from "path"
import fs from "fs/promises"
Expand DownExpand Up@@ -117,6 +116,6 @@ export const exportSettings = async ({ providerSettingsManager, contextProxy }:

 const dirname = path.dirname(uri.fsPath)
 await fs.mkdir(dirname, { recursive: true })
 await safeWriteJson(uri.fsPath, { providerProfiles, globalSettings })
 await fs.writeFile(uri.fsPath, JSON.stringify({ providerProfiles, globalSettings }, null, 2), "utf-8")
	} catch (e) {}
}

3 changes: 1 addition & 2 deletions
src/core/context-tracking/FileContextTracker.ts

View file


Open in desktop

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

3 changes: 1 addition & 2 deletions
src/core/task-persistence/apiMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as fs from "fs/promises"

Expand DownExpand Up@@ -47,5 +46,5 @@ export async function saveApiMessages({
}) {
	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
	const filePath = path.join(taskDir, GlobalFileNames.apiConversationHistory)
	await safeWriteJson(filePath, messages)
	await fs.writeFile(filePath, JSON.stringify(messages))
}

3 changes: 1 addition & 2 deletions
src/core/task-persistence/taskMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as fs from "fs/promises"

Expand DownExpand Up@@ -38,5 +37,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 safeWriteJson(filePath, messages)
	await fs.writeFile(filePath, JSON.stringify(messages))
}

8 changes: 4 additions & 4 deletions
src/core/webview/__tests__/ClineProvider.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ 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"

Expand DownExpand Up@@ -42,8 +41,6 @@ jest.mock("axios", () => ({
	post: jest.fn(),
}))

jest.mock("../../../utils/safeWriteJson")

jest.mock(
	"@modelcontextprotocol/sdk/types.js",
	() => ({
Expand DownExpand Up@@ -2004,7 +2001,10 @@ describe("Project MCP Settings", () => {
 )

 // Verify file was created with default content
 expect(safeWriteJson).toHaveBeenCalledWith(expect.stringContaining("mcp.json"), { mcpServers: {} })
 expect(fs.writeFile).toHaveBeenCalledWith(
 expect.stringContaining("mcp.json"),
 JSON.stringify({ mcpServers: {} }, null, 2),
 )
	})

	test("handles openProjectMcpSettings when workspace is not open", async () => {
Expand Down

3 changes: 1 addition & 2 deletions
src/core/webview/webviewMessageHandler.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import fs from "fs/promises"
import pWaitFor from "p-wait-for"
Expand DownExpand Up@@ -500,7 +499,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 const exists = await fileExistsAtPath(mcpPath)

 if (!exists) {
 await safeWriteJson(mcpPath, { mcpServers: {} })
 await fs.writeFile(mcpPath, JSON.stringify({ mcpServers: {} }, null, 2))
 }

 await openFile(mcpPath)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Revert "fix: use safeWriteJson for all JSON file writes" by mrubens · Pull Request #4471 · RooCodeInc/Roo-Code · GitHub
Skip to content

This repository was archived by the owner on May 15, 2026. It is now read-only.

Revert "fix: use safeWriteJson for all JSON file writes"#4471
 Merged

mrubens
merged 1 commit into

from

Jun 9, 2025
 Merged


Revert "fix: use safeWriteJson for all JSON file writes"
#4471
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


5 changes: 0 additions & 5 deletions
.roo/rules-code/use-safeWriteJson.md

View file


Open in desktop


This file was deleted.


66 changes: 0 additions & 66 deletions
pnpm-lock.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


3 changes: 1 addition & 2 deletions
src/api/providers/fetchers/modelCache.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ 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"
Expand All@@ -20,7 +19,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 safeWriteJson(path.join(cacheDir, filename), data)
	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data))
}

async function readModels(router: RouterName): Promise<ModelRecord | undefined> {
Expand Down

3 changes: 1 addition & 2 deletions
src/api/providers/fetchers/modelEndpointCache.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ 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"
Expand All@@ -19,7 +18,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 safeWriteJson(path.join(cacheDir, filename), data)
	await fs.writeFile(path.join(cacheDir, filename), JSON.stringify(data, null, 2))
}

async function readModelEndpoints(key: string): Promise<ModelRecord | undefined> {
Expand Down

28 changes: 12 additions & 16 deletions
src/core/config/__tests__/importExport.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import { importSettings, exportSettings } from "../importExport"
import { ProviderSettingsManager } from "../ProviderSettingsManager"
import { ContextProxy } from "../ContextProxy"
import { CustomModesManager } from "../CustomModesManager"
import { safeWriteJson } from "../../../utils/safeWriteJson"

jest.mock("vscode", () => ({
	window: {
Expand All@@ -34,8 +33,6 @@ jest.mock("os", () => ({
	homedir: jest.fn(() => "/mock/home"),
}))

jest.mock("../../../utils/safeWriteJson")

describe("importExport", () => {
	let mockProviderSettingsManager: jest.Mocked<ProviderSettingsManager>
	let mockContextProxy: jest.Mocked<ContextProxy>
Expand DownExpand Up@@ -375,10 +372,11 @@ describe("importExport", () => {
 expect(mockContextProxy.export).toHaveBeenCalled()
 expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })

 expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
 providerProfiles: mockProviderProfiles,
 globalSettings: mockGlobalSettings,
 })
 expect(fs.writeFile).toHaveBeenCalledWith(
 "/mock/path/roo-code-settings.json",
 JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
 "utf-8",
 )
 })

 it("should include globalSettings when allowedMaxRequests is null", async () => {
Expand DownExpand Up@@ -407,10 +405,11 @@ describe("importExport", () => {
 contextProxy: mockContextProxy,
 })

 expect(safeWriteJson).toHaveBeenCalledWith("/mock/path/roo-code-settings.json", {
 providerProfiles: mockProviderProfiles,
 globalSettings: mockGlobalSettings,
 })
 expect(fs.writeFile).toHaveBeenCalledWith(
 "/mock/path/roo-code-settings.json",
 JSON.stringify({ providerProfiles: mockProviderProfiles, globalSettings: mockGlobalSettings }, null, 2),
 "utf-8",
 )
 })

 it("should handle errors during the export process", async () => {
Expand All@@ -425,8 +424,7 @@ describe("importExport", () => {
 })

 mockContextProxy.export.mockResolvedValue({ mode: "code" })
 // Simulate an error during the safeWriteJson operation
 ;(safeWriteJson as jest.Mock).mockRejectedValueOnce(new Error("Safe write error"))
 ;(fs.writeFile as jest.Mock).mockRejectedValue(new Error("Write error"))

 await exportSettings({
 providerSettingsManager: mockProviderSettingsManager,
Expand All@@ -437,10 +435,8 @@ describe("importExport", () => {
 expect(mockProviderSettingsManager.export).toHaveBeenCalled()
 expect(mockContextProxy.export).toHaveBeenCalled()
 expect(fs.mkdir).toHaveBeenCalledWith("/mock/path", { recursive: true })
 expect(safeWriteJson).toHaveBeenCalled() // safeWriteJson is called, but it will throw
 expect(fs.writeFile).toHaveBeenCalled()
 // 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 () => {
Expand Down

3 changes: 1 addition & 2 deletions
src/core/config/importExport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import os from "os"
import * as path from "path"
import fs from "fs/promises"
Expand DownExpand Up@@ -117,6 +116,6 @@ export const exportSettings = async ({ providerSettingsManager, contextProxy }:

 const dirname = path.dirname(uri.fsPath)
 await fs.mkdir(dirname, { recursive: true })
 await safeWriteJson(uri.fsPath, { providerProfiles, globalSettings })
 await fs.writeFile(uri.fsPath, JSON.stringify({ providerProfiles, globalSettings }, null, 2), "utf-8")
	} catch (e) {}
}

3 changes: 1 addition & 2 deletions
src/core/context-tracking/FileContextTracker.ts

View file


Open in desktop

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

3 changes: 1 addition & 2 deletions
src/core/task-persistence/apiMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as fs from "fs/promises"

Expand DownExpand Up@@ -47,5 +46,5 @@ export async function saveApiMessages({
}) {
	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
	const filePath = path.join(taskDir, GlobalFileNames.apiConversationHistory)
	await safeWriteJson(filePath, messages)
	await fs.writeFile(filePath, JSON.stringify(messages))
}

3 changes: 1 addition & 2 deletions
src/core/task-persistence/taskMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import * as fs from "fs/promises"

Expand DownExpand Up@@ -38,5 +37,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 safeWriteJson(filePath, messages)
	await fs.writeFile(filePath, JSON.stringify(messages))
}

8 changes: 4 additions & 4 deletions
src/core/webview/__tests__/ClineProvider.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ 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"

Expand DownExpand Up@@ -42,8 +41,6 @@ jest.mock("axios", () => ({
	post: jest.fn(),
}))

jest.mock("../../../utils/safeWriteJson")

jest.mock(
	"@modelcontextprotocol/sdk/types.js",
	() => ({
Expand DownExpand Up@@ -2004,7 +2001,10 @@ describe("Project MCP Settings", () => {
 )

 // Verify file was created with default content
 expect(safeWriteJson).toHaveBeenCalledWith(expect.stringContaining("mcp.json"), { mcpServers: {} })
 expect(fs.writeFile).toHaveBeenCalledWith(
 expect.stringContaining("mcp.json"),
 JSON.stringify({ mcpServers: {} }, null, 2),
 )
	})

	test("handles openProjectMcpSettings when workspace is not open", async () => {
Expand Down

3 changes: 1 addition & 2 deletions
src/core/webview/webviewMessageHandler.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { safeWriteJson } from "../../utils/safeWriteJson"
import * as path from "path"
import fs from "fs/promises"
import pWaitFor from "p-wait-for"
Expand DownExpand Up@@ -500,7 +499,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 const exists = await fileExistsAtPath(mcpPath)

 if (!exists) {
 await safeWriteJson(mcpPath, { mcpServers: {} })
 await fs.writeFile(mcpPath, JSON.stringify({ mcpServers: {} }, null, 2))
 }

 await openFile(mcpPath)
Expand Down
Loading