Merge branch 'main' into rate-limit-profile-specificv3

Author: olweraltuve

scripts/find-missing-translations.js

@@ -141,10 +141,17 @@ function checkAreaTranslations(area) {
 	}
 
 	// Load file contents
-	const englishFileContents = englishFiles.map((file) => ({
-		name: file,
-		content: JSON.parse(fs.readFileSync(path.join(englishDir, file), "utf8")),
-	}))
+	let englishFileContents
+
+	try {
+		englishFileContents = englishFiles.map((file) => ({
+			name: file,
+			content: JSON.parse(fs.readFileSync(path.join(englishDir, file), "utf8")),
+		}))
+	} catch (e) {
+		console.error(`Error: File '${englishDir}' is not a valid JSON file`)
+		process.exit(1)
+	}
 
 	console.log(
 		`Checking ${englishFileContents.length} translation file(s): ${englishFileContents.map((f) => f.name).join(", ")}`,
@@ -167,7 +174,14 @@ function checkAreaTranslations(area) {
 			}
 
 			// Load the locale file
-			const localeContent = JSON.parse(fs.readFileSync(localeFilePath, "utf8"))
+			let localeContent
+
+			try {
+				localeContent = JSON.parse(fs.readFileSync(localeFilePath, "utf8"))
+			} catch (e) {
+				console.error(`Error: File '${localeFilePath}' is not a valid JSON file`)
+				process.exit(1)
+			}
 
 			// Find all keys in the English file
 			const englishKeys = findKeys(englishContent)

src/core/webview/ClineProvider.ts

@@ -41,7 +41,7 @@ import { BrowserSession } from "../../services/browser/BrowserSession"
 import { discoverChromeInstances } from "../../services/browser/browserDiscovery"
 import { fileExistsAtPath } from "../../utils/fs"
 import { playSound, setSoundEnabled, setSoundVolume } from "../../utils/sound"
-import { playTts, setTtsEnabled, setTtsSpeed } from "../../utils/tts"
+import { playTts, setTtsEnabled, setTtsSpeed, stopTts } from "../../utils/tts"
 import { singleCompletionHandler } from "../../utils/single-completion-handler"
 import { searchCommits } from "../../utils/git"
 import { getDiffStrategy } from "../diff/DiffStrategy"
@@ -1183,28 +1183,6 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 						}
 						break
 					}
-					case "openProjectMcpSettings": {
-						if (!vscode.workspace.workspaceFolders?.length) {
-							vscode.window.showErrorMessage(t("common:errors.no_workspace"))
-							return
-						}
-
-						const workspaceFolder = vscode.workspace.workspaceFolders[0]
-						const rooDir = path.join(workspaceFolder.uri.fsPath, ".roo")
-						const mcpPath = path.join(rooDir, "mcp.json")
-
-						try {
-							await fs.mkdir(rooDir, { recursive: true })
-							const exists = await fileExistsAtPath(mcpPath)
-							if (!exists) {
-								await fs.writeFile(mcpPath, JSON.stringify({ mcpServers: {} }, null, 2))
-							}
-							await openFile(mcpPath)
-						} catch (error) {
-							vscode.window.showErrorMessage(t("common:errors.create_mcp_json", { error }))
-						}
-						break
-					}
 					case "openCustomModesSettings": {
 						const customModesFilePath = await this.customModesManager.getCustomModesFilePath()
 						if (customModesFilePath) {
@@ -1303,9 +1281,15 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 						break
 					case "playTts":
 						if (message.text) {
-							playTts(message.text)
+							playTts(message.text, {
+								onStart: () => this.postMessageToWebview({ type: "ttsStart", text: message.text }),
+								onStop: () => this.postMessageToWebview({ type: "ttsStop", text: message.text }),
+							})
 						}
 						break
+					case "stopTts":
+						stopTts()
+						break
 					case "diffEnabled":
 						const diffEnabled = message.bool ?? true
 						await this.updateGlobalState("diffEnabled", diffEnabled)

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

@@ -2055,130 +2055,6 @@ describe("ClineProvider", () => {
 	})
 })
 
-describe("Project MCP Settings", () => {
-	let provider: ClineProvider
-	let mockContext: vscode.ExtensionContext
-	let mockOutputChannel: vscode.OutputChannel
-	let mockWebviewView: vscode.WebviewView
-	let mockPostMessage: jest.Mock
-
-	beforeEach(() => {
-		jest.clearAllMocks()
-
-		mockContext = {
-			extensionPath: "/test/path",
-			extensionUri: {} as vscode.Uri,
-			globalState: {
-				get: jest.fn(),
-				update: jest.fn(),
-				keys: jest.fn().mockReturnValue([]),
-			},
-			secrets: {
-				get: jest.fn(),
-				store: jest.fn(),
-				delete: jest.fn(),
-			},
-			subscriptions: [],
-			extension: {
-				packageJSON: { version: "1.0.0" },
-			},
-			globalStorageUri: {
-				fsPath: "/test/storage/path",
-			},
-		} as unknown as vscode.ExtensionContext
-
-		mockOutputChannel = {
-			appendLine: jest.fn(),
-			clear: jest.fn(),
-			dispose: jest.fn(),
-		} as unknown as vscode.OutputChannel
-
-		mockPostMessage = jest.fn()
-		mockWebviewView = {
-			webview: {
-				postMessage: mockPostMessage,
-				html: "",
-				options: {},
-				onDidReceiveMessage: jest.fn(),
-				asWebviewUri: jest.fn(),
-			},
-			visible: true,
-			onDidDispose: jest.fn(),
-			onDidChangeVisibility: jest.fn(),
-		} as unknown as vscode.WebviewView
-
-		provider = new ClineProvider(mockContext, mockOutputChannel)
-	})
-
-	test("handles openProjectMcpSettings message", async () => {
-		await provider.resolveWebviewView(mockWebviewView)
-		const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as jest.Mock).mock.calls[0][0]
-
-		// Mock workspace folders
-		;(vscode.workspace as any).workspaceFolders = [{ uri: { fsPath: "/test/workspace" } }]
-
-		// Mock fs functions
-		const fs = require("fs/promises")
-		fs.mkdir.mockResolvedValue(undefined)
-		fs.writeFile.mockResolvedValue(undefined)
-
-		// Trigger openProjectMcpSettings
-		await messageHandler({
-			type: "openProjectMcpSettings",
-		})
-
-		// Verify directory was created
-		expect(fs.mkdir).toHaveBeenCalledWith(
-			expect.stringContaining(".roo"),
-			expect.objectContaining({ recursive: true }),
-		)
-
-		// Verify file was created with default content
-		expect(fs.writeFile).toHaveBeenCalledWith(
-			expect.stringContaining("mcp.json"),
-			JSON.stringify({ mcpServers: {} }, null, 2),
-		)
-	})
-
-	test("handles openProjectMcpSettings when workspace is not open", async () => {
-		await provider.resolveWebviewView(mockWebviewView)
-		const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as jest.Mock).mock.calls[0][0]
-
-		// Mock no workspace folders
-		;(vscode.workspace as any).workspaceFolders = []
-
-		// Trigger openProjectMcpSettings
-		await messageHandler({
-			type: "openProjectMcpSettings",
-		})
-
-		// Verify error message was shown
-		expect(vscode.window.showErrorMessage).toHaveBeenCalledWith("Please open a project folder first")
-	})
-
-	test("handles openProjectMcpSettings file creation error", async () => {
-		await provider.resolveWebviewView(mockWebviewView)
-		const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as jest.Mock).mock.calls[0][0]
-
-		// Mock workspace folders
-		;(vscode.workspace as any).workspaceFolders = [{ uri: { fsPath: "/test/workspace" } }]
-
-		// Mock fs functions to fail
-		const fs = require("fs/promises")
-		fs.mkdir.mockRejectedValue(new Error("Failed to create directory"))
-
-		// Trigger openProjectMcpSettings
-		await messageHandler({
-			type: "openProjectMcpSettings",
-		})
-
-		// Verify error message was shown
-		expect(vscode.window.showErrorMessage).toHaveBeenCalledWith(
-			expect.stringContaining("Failed to create or open .roo/mcp.json"),
-		)
-	})
-})
-
 describe("ContextProxy integration", () => {
 	let provider: ClineProvider
 	let mockContext: vscode.ExtensionContext