Merge branch 'main' into refactor/extract-focus-logic

Author: seedlord

.changeset/odd-ligers-press.md

@@ -0,0 +1,5 @@
+---
+"roo-cline": minor
+---
+
+Add Reasoning Effort setting for OpenAI Compatible provider

.eslintrc.json

@@ -15,6 +15,8 @@
 			}
 		],
 		"@typescript-eslint/semi": "off",
+		"no-unused-vars": "off",
+		"@typescript-eslint/no-unused-vars": ["error", { "varsIgnorePattern": "^_", "argsIgnorePattern": "^_" }],
 		"eqeqeq": "warn",
 		"no-throw-literal": "warn",
 		"semi": "off"

.roo/rules-translate/001-general-rules.md

@@ -1,6 +1,6 @@
 # 1. SUPPORTED LANGUAGES AND LOCATION
 
-- Localize all strings into the following locale files: ca, de, en, es, fr, hi, it, ja, ko, pl, pt-BR, tr, vi, zh-CN, zh-TW
+- Localize all strings into the following locale files: ca, de, en, es, fr, hi, it, ja, ko, pl, pt-BR, ru, tr, vi, zh-CN, zh-TW
 - The VSCode extension has two main areas that require localization:
     - Core Extension: src/i18n/locales/ (extension backend)
     - WebView UI: webview-ui/src/i18n/locales/ (user interface)

CHANGELOG.md

@@ -1,5 +1,28 @@
 # Roo Code Changelog
 
+## [3.14.3] - 2025-04-25
+
+- Add Boomerang Orchestrator as a built-in mode
+- Improve home screen UI
+- Make token count estimation more efficient to reduce gray screens
+- Revert change to automatically close files after edit until we figure out how to make it work well with diagnostics
+- Clean up settings data model
+- Omit reasoning params for non-reasoning models
+- Clearer documentation for adding settings (thanks @shariqriazz!)
+- Fix word wrapping in Roo message title (thanks @zhangtony239!)
+- Update default model id for Unbound from claude 3.5 to 3.7 (thanks @pugazhendhi-m!)
+
+## [3.14.2] - 2025-04-24
+
+- Enable prompt caching for Gemini (with some improvements)
+- Allow users to turn prompt caching on / off for Gemini 2.5 on OpenRouter
+- Compress terminal output with backspace characters (thanks @KJ7LNW)
+- Add Russian language (Спасибо @asychin)
+
+## [3.14.1] - 2025-04-24
+
+- Disable Gemini caching while we investigate issues reported by the community.
+
 ## [3.14.0] - 2025-04-23
 
 - Add prompt caching for `gemini-2.5-pro-preview-03-25` in the Gemini provider (Vertex and OpenRouter coming soon!)
@@ -8,7 +31,7 @@
 - Make the list_files tool more efficient and smarter about excluding directories like .git/
 - Fix file drag and drop on Windows and when using SSH tunnels (thanks @NyxJae!)
 - Correctly revert changes and suggest alternative tools when write_to_file fails on a missing line count
-- Allow interpolation of `workspace`, `mode`,  `language`, `shell`, and `operatingSystem` into custom system prompt overrides (thanks @daniel-lxs!)
+- Allow interpolation of `workspace`, `mode`, `language`, `shell`, and `operatingSystem` into custom system prompt overrides (thanks @daniel-lxs!)
 - Fix interpolation bug in the “add to context” code action (thanks @elianiva!)
 - Preserve editor state and prevent tab unpinning during diffs (thanks @seedlord!)
 - Improvements to icon rendering on Linux (thanks @elianiva!)

README.md

@@ -2,31 +2,31 @@
 
 1. Add the setting to schema definitions:
 
-    - Add the item to `globalSettingsSchema` in `schemas/index.ts`
-    - Add the item to `globalSettingsRecord` in `schemas/index.ts`
+    - Add the item to `globalSettingsSchema` in `src/schemas/index.ts`
+    - Add the item to `globalSettingsRecord` in `src/schemas/index.ts`
     - Example: `terminalCommandDelay: z.number().optional(),`
 
 2. Add the setting to type definitions:
 
-    - Add the item to `exports/types.ts`
-    - Add the item to `exports/roo-code.d.ts`
-    - Add the setting to `shared/ExtensionMessage.ts`
-    - Add the setting to the WebviewMessage type in `shared/WebviewMessage.ts`
+    - Add the item to `src/exports/types.ts`
+    - Add the item to `src/exports/roo-code.d.ts`
+    - Add the setting to `src/shared/ExtensionMessage.ts`
+    - Add the setting to the WebviewMessage type in `src/shared/WebviewMessage.ts`
     - Example: `terminalCommandDelay?: number | undefined`
 
 3. Add test coverage:
-    - Add the setting to mockState in ClineProvider.test.ts
+    - Add the setting to mockState in src/core/webview/**tests**/ClineProvider.test.ts
     - Add test cases for setting persistence and state updates
     - Ensure all tests pass before submitting changes
 
 ## For Checkbox Settings
 
-1. Add the message type to WebviewMessage.ts:
+1. Add the message type to src/shared/WebviewMessage.ts:
 
     - Add the setting name to the WebviewMessage type's type union
     - Example: `| "multisearchDiffEnabled"`
 
-2. Add the setting to ExtensionStateContext.tsx:
+2. Add the setting to webview-ui/src/context/ExtensionStateContext.tsx:
 
     - Add the setting to the ExtensionStateContextType interface
     - Add the setter function to the interface
@@ -40,7 +40,7 @@
         }
         ```
 
-3. Add the setting to ClineProvider.ts:
+3. Add the setting to src/core/webview/ClineProvider.ts:
 
     - Add the setting name to the GlobalStateKey type union
     - Add the setting to the Promise.all array in getState
@@ -56,7 +56,7 @@
           break
         ```
 
-4. Add the checkbox UI to SettingsView.tsx:
+4. Add the checkbox UI to webview-ui/src/components/settings/SettingsView.tsx:
 
     - Import the setting and its setter from ExtensionStateContext
     - Add the VSCodeCheckbox component with the setting's state and onChange handler
@@ -71,7 +71,7 @@
         </VSCodeCheckbox>
         ```
 
-5. Add the setting to handleSubmit in SettingsView.tsx:
+5. Add the setting to handleSubmit in webview-ui/src/components/settings/SettingsView.tsx:
 
     - Add a vscode.postMessage call to send the setting's value when clicking Save
     - This step is critical for persistence - without it, the setting will not be saved when the user clicks Save
@@ -103,12 +103,12 @@
 
 ## For Select/Dropdown Settings
 
-1. Add the message type to WebviewMessage.ts:
+1. Add the message type to src/shared/WebviewMessage.ts:
 
     - Add the setting name to the WebviewMessage type's type union
     - Example: `| "preferredLanguage"`
 
-2. Add the setting to ExtensionStateContext.tsx:
+2. Add the setting to webview-ui/src/context/ExtensionStateContext.tsx:
 
     - Add the setting to the ExtensionStateContextType interface
     - Add the setter function to the interface
@@ -122,7 +122,7 @@
         }
         ```
 
-3. Add the setting to ClineProvider.ts:
+3. Add the setting to src/core/webview/ClineProvider.ts:
 
     - Add the setting name to the GlobalStateKey type union
     - Add the setting to the Promise.all array in getState
@@ -139,7 +139,7 @@
           break
         ```
 
-4. Add the select UI to SettingsView.tsx:
+4. Add the select UI to webview-ui/src/components/settings/SettingsView.tsx:
 
     - Import the setting and its setter from ExtensionStateContext
     - Add the select element with appropriate styling to match VSCode's theme
@@ -164,7 +164,7 @@
         </select>
         ```
 
-5. Add the setting to handleSubmit in SettingsView.tsx:
+5. Add the setting to handleSubmit in webview-ui/src/components/settings/SettingsView.tsx:
     - Add a vscode.postMessage call to send the setting's value when clicking Done
     - Example:
         ```typescript
@@ -191,21 +191,21 @@ To add a new configuration item to the system, the following changes are necessa
 
 2.  **Schema Definition**
 
-    - Add the item to globalSettingsSchema in schemas/index.ts
-    - Add the item to globalSettingsRecord in schemas/index.ts
+    - Add the item to globalSettingsSchema in src/schemas/index.ts
+    - Add the item to globalSettingsRecord in src/schemas/index.ts
 
 3.  **Type Definitions**
 
-    - Add the item to exports/types.ts
-    - Add the item to exports/roo-code.d.ts
-    - Add the item to shared/ExtensionMessage.ts
-    - Add the item to shared/WebviewMessage.ts
+    - Add the item to src/exports/types.ts
+    - Add the item to src/exports/roo-code.d.ts
+    - Add the item to src/shared/ExtensionMessage.ts
+    - Add the item to src/shared/WebviewMessage.ts
 
 4.  **UI Component**
 
     - Create or update a component in webview-ui/src/components/settings/
     - Add appropriate slider/input controls with min/max/step values
-    - Ensure the props are passed correctly to the component in SettingsView.tsx
+    - Ensure the props are passed correctly to the component in webview-ui/src/components/settings/SettingsView.tsx
     - Update the component's props interface to include the new settings
 
 5.  **Translations**
@@ -218,14 +218,14 @@ To add a new configuration item to the system, the following changes are necessa
 6.  **State Management**
 
     - Add the item to the destructuring in SettingsView.tsx
-    - Add the item to the handleSubmit function in SettingsView.tsx
-    - Add the item to getStateToPostToWebview in ClineProvider.ts
-    - Add the item to getState in ClineProvider.ts with appropriate default values
-    - Add the item to the initialization in resolveWebviewView in ClineProvider.ts
+    - Add the item to the handleSubmit function in webview-ui/src/components/settings/SettingsView.tsx
+    - Add the item to getStateToPostToWebview in src/core/webview/ClineProvider.ts
+    - Add the item to getState in src/core/webview/ClineProvider.ts with appropriate default values
+    - Add the item to the initialization in resolveWebviewView in src/core/webview/ClineProvider.ts
 
 7.  **Message Handling**
 
-    - Add a case for the item in webviewMessageHandler.ts
+    - Add a case for the item in src/core/webview/webviewMessageHandler.ts
 
 8.  **Implementation-Specific Logic**
 
@@ -310,11 +310,11 @@ To add a new configuration item to the system, the following changes are necessa
         1. **Complete Chain of Persistence**:
 
             - Verify that the setting is added to all required locations:
-                - globalSettingsSchema and globalSettingsRecord in schemas/index.ts
-                - Initial state in ExtensionStateContextProvider
-                - getState method in ClineProvider.ts
-                - getStateToPostToWebview method in ClineProvider.ts
-                - resolveWebviewView method in ClineProvider.ts (if feature-specific)
+                - globalSettingsSchema and globalSettingsRecord in src/schemas/index.ts
+            - Initial state in ExtensionStateContextProvider
+            - getState method in src/core/webview/ClineProvider.ts
+            - getStateToPostToWebview method in src/core/webview/ClineProvider.ts
+            - resolveWebviewView method in src/core/webview/ClineProvider.ts (if feature-specific)
             - A break in any part of this chain can prevent persistence
 
         2. **Default Values Consistency**:
@@ -324,12 +324,12 @@ To add a new configuration item to the system, the following changes are necessa
 
         3. **Message Handling**:
 
-            - Confirm the webviewMessageHandler.ts has a case for the setting
+            - Confirm the src/core/webview/webviewMessageHandler.ts has a case for the setting
             - Verify the message type matches what's sent from the UI
 
         4. **UI Integration**:
 
-            - Check that the setting is included in the handleSubmit function in SettingsView.tsx
+            - Check that the setting is included in the handleSubmit function in webview-ui/src/components/settings/SettingsView.tsx
             - Ensure the UI component correctly updates the state
 
         5. **Type Definitions**:
@@ -354,7 +354,7 @@ Settings persistence requires a complete chain of state management across multip
     - Example:
 
         ```typescript
-        // In schemas/index.ts
+        // In src/schemas/index.ts
         export const globalSettingsSchema = z.object({
         	// Existing settings...
         	commandRiskLevel: z.enum(["readOnly", "reversibleChanges", "complexChanges"]).optional(),
@@ -389,12 +389,12 @@ Settings persistence requires a complete chain of state management across multip
 
 3. **Message Handler (State Saving)**:
 
-    - Must use correct message type in `webviewMessageHandler.ts`
+    - Must use correct message type in `src/core/webview/webviewMessageHandler.ts`
     - Must use `updateGlobalState` with properly typed values
     - Must call `postStateToWebview` after updates
     - Example:
         ```typescript
-        // In webviewMessageHandler.ts
+        // In src/core/webview/webviewMessageHandler.ts
         case "commandRiskLevel":
           await updateGlobalState(
             "commandRiskLevel",
@@ -413,7 +413,7 @@ Settings persistence requires a complete chain of state management across multip
     - Example:
 
         ```typescript
-        // In ClineProvider.ts getStateToPostToWebview
+        // In src/core/webview/ClineProvider.ts getStateToPostToWebview
         const {
         	// Other state properties...
         	commandRiskLevel,

cline_docs/settings.md

@@ -24,15 +24,6 @@ export async function run() {
 		apiProvider: "openrouter" as const,
 		openRouterApiKey: process.env.OPENROUTER_API_KEY!,
 		openRouterModelId: "google/gemini-2.0-flash-001",
-		openRouterModelInfo: {
-			maxTokens: 8192,
-			contextWindow: 1000000,
-			supportsImages: true,
-			supportsPromptCache: false,
-			inputPrice: 0.1,
-			outputPrice: 0.4,
-			thinking: false,
-		},
 	})
 
 	await vscode.commands.executeCommand("roo-cline.SidebarProvider.focus")

e2e/src/suite/index.ts

@@ -17,18 +17,17 @@ suite("Roo Code Subtasks", () => {
 			}
 		})
 
-		await api.setConfiguration({
-			mode: "ask",
-			alwaysAllowModeSwitch: true,
-			alwaysAllowSubtasks: true,
-			autoApprovalEnabled: true,
-			enableCheckpoints: false,
-		})
-
 		const childPrompt = "You are a calculator. Respond only with numbers. What is the square root of 9?"
 
 		// Start a parent task that will create a subtask.
 		const parentTaskId = await api.startNewTask({
+			configuration: {
+				mode: "ask",
+				alwaysAllowModeSwitch: true,
+				alwaysAllowSubtasks: true,
+				autoApprovalEnabled: true,
+				enableCheckpoints: false,
+			},
 			text:
 				"You are the parent task. " +
 				`Create a subtask by using the new_task tool with the message '${childPrompt}'.` +

e2e/src/suite/subtasks.test.ts

@@ -1,5 +1,3 @@
-import * as vscode from "vscode"
-
 import type { RooCodeAPI } from "../../../src/exports/roo-code"
 
 type WaitForOptions = {

e2e/src/suite/utils.ts

@@ -29,36 +29,30 @@ const copyWasmFiles = {
 	name: "copy-wasm-files",
 	setup(build) {
 		build.onEnd(() => {
-			// tree sitter
-			const sourceDir = path.join(__dirname, "node_modules", "web-tree-sitter")
-			const targetDir = path.join(__dirname, "dist")
+			const nodeModulesDir = path.join(__dirname, "node_modules")
+			const distDir = path.join(__dirname, "dist")
 
-			// Copy tree-sitter.wasm
-			fs.copyFileSync(path.join(sourceDir, "tree-sitter.wasm"), path.join(targetDir, "tree-sitter.wasm"))
+			// tiktoken
+			fs.copyFileSync(
+				path.join(nodeModulesDir, "tiktoken", "tiktoken_bg.wasm"),
+				path.join(distDir, "tiktoken_bg.wasm"),
+			)
 
 			// Copy language-specific WASM files
 			const languageWasmDir = path.join(__dirname, "node_modules", "tree-sitter-wasms", "out")
-			const languages = [
-				"typescript",
-				"tsx",
-				"python",
-				"rust",
-				"javascript",
-				"go",
-				"cpp",
-				"c",
-				"c_sharp",
-				"ruby",
-				"java",
-				"php",
-				"swift",
-				"kotlin",
-			]
-
-			languages.forEach((lang) => {
-				const filename = `tree-sitter-${lang}.wasm`
-				fs.copyFileSync(path.join(languageWasmDir, filename), path.join(targetDir, filename))
-			})
+
+			// Dynamically read all WASM files from the directory instead of using a hardcoded list
+			if (fs.existsSync(languageWasmDir)) {
+				const wasmFiles = fs.readdirSync(languageWasmDir).filter((file) => file.endsWith(".wasm"))
+
+				console.log(`Copying ${wasmFiles.length} tree-sitter WASM files to dist directory`)
+
+				wasmFiles.forEach((filename) => {
+					fs.copyFileSync(path.join(languageWasmDir, filename), path.join(distDir, filename))
+				})
+			} else {
+				console.warn(`Tree-sitter WASM directory not found: ${languageWasmDir}`)
+			}
 		})
 	},
 }