Merge branch 'will/edit-delete-overhaul' into will/edit-w-checkpoints

Author: liwilliam2021

.github/workflows/nightly-publish.yml

@@ -1,10 +1,7 @@
 name: Nightly Publish
 
 on:
-  workflow_run:
-    workflows: ["Code QA Roo Code"]
-    types:
-      - completed
+  push:
     branches: [main]
   workflow_dispatch: # Allows manual triggering.
 

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Roo Code Changelog
 
+## [3.23.6] - 2025-07-10
+
+- Grok 4
+
+## [3.23.5] - 2025-07-09
+
+- Fix: use decodeURIComponent in openFile (thanks @vivekfyi!)
+- Fix(embeddings): Translate error messages before sending to UI (thanks @daniel-lxs!)
+- Make account tab visible
+
+## [3.23.4] - 2025-07-09
+
+- Update chat area icons for better discoverability & consistency
+- Fix a bug that allowed `list_files` to return directory results that should be excluded by .gitignore
+- Add an overflow header menu to make the UI a little tidier (thanks @dlab-anton)
+- Fix a bug the issue where null custom modes configuration files cause a 'Cannot read properties of null' error (thanks @daniel-lxs!)
+- Replace native title attributes with StandardTooltip component for consistency (thanks @daniel-lxs!)
+
 ## [3.23.3] - 2025-07-09
 
 - Remove erroneous line from announcement modal
@@ -365,7 +383,7 @@
 - Fix vscode-material-icons in the filer picker
 - Fix global settings export
 - Respect user-configured terminal integration timeout (thanks @KJ7LNW)
-- Contex condensing enhancements (thanks @SannidhyaSah)
+- Context condensing enhancements (thanks @SannidhyaSah)
 
 ## [3.18.1] - 2025-05-22
 
@@ -877,7 +895,7 @@
 
 ## [3.10.1] - 2025-03-20
 
-- Make the suggested responses optional to not break overriden system prompts
+- Make the suggested responses optional to not break overridden system prompts
 
 ## [3.10.0] - 2025-03-20
 

apps/vscode-e2e/src/suite/tools/apply-diff.test.ts

@@ -224,7 +224,7 @@ function validateInput(input) {
 				},
 				text: `Use apply_diff on the file ${testFile.name} to change "Hello World" to "Hello Universe". The file already exists with this content:
 ${testFile.content}\nAssume the file exists and you can modify it directly.`,
-			}) //Temporary meassure since list_files ignores all the files inside a tmp workspace
+			}) //Temporary measure since list_files ignores all the files inside a tmp workspace
 
 			console.log("Task ID:", taskId)
 			console.log("Test filename:", testFile.name)

apps/web-roo-code/src/app/evals/evals.tsx

@@ -203,7 +203,7 @@ export function Evals({
 						</ScatterChart>
 					</ChartContainer>
 					<div className="py-4 text-xs opacity-50">
-						(Note: Very expensive models are exluded from the scatter plot.)
+						(Note: Very expensive models are excluded from the scatter plot.)
 					</div>
 				</TableCaption>
 			</Table>

packages/evals/README.md

@@ -29,7 +29,7 @@ Start the evals service:
 docker compose -f packages/evals/docker-compose.yml --profile server --profile runner up --build --scale runner=0
 ```
 
-The initial build process can take a minute or two. Upon success you should see ouput indicating that a web service is running on [localhost:3000](http://localhost:3000/):
+The initial build process can take a minute or two. Upon success you should see output indicating that a web service is running on [localhost:3000](http://localhost:3000/):
 <img width="1182" alt="Screenshot 2025-06-05 at 12 05 38 PM" src="https://github.com/user-attachments/assets/34f25a59-1362-458c-aafa-25e13cdb2a7a" />
 
 Additionally, you'll find in Docker Desktop that database and redis services are running:

packages/types/src/global-settings.ts

@@ -110,10 +110,6 @@ export const globalSettingsSchema = z.object({
 	hasOpenedModeSelector: z.boolean().optional(),
 	lastModeExportPath: z.string().optional(),
 	lastModeImportPath: z.string().optional(),
-
-	// Message modification confirmation preferences
-	skipEditMessageConfirmation: z.boolean().optional(),
-	skipDeleteMessageConfirmation: z.boolean().optional(),
 })
 
 export type GlobalSettings = z.infer<typeof globalSettingsSchema>

packages/types/src/providers/vertex.ts

@@ -277,9 +277,35 @@ export const vertexModels = {
 
 export const VERTEX_REGIONS = [
 	{ value: "global", label: "global" },
-	{ value: "us-east5", label: "us-east5" },
 	{ value: "us-central1", label: "us-central1" },
+	{ value: "us-east1", label: "us-east1" },
+	{ value: "us-east4", label: "us-east4" },
+	{ value: "us-east5", label: "us-east5" },
+	{ value: "us-west1", label: "us-west1" },
+	{ value: "us-west2", label: "us-west2" },
+	{ value: "us-west3", label: "us-west3" },
+	{ value: "us-west4", label: "us-west4" },
+	{ value: "northamerica-northeast1", label: "northamerica-northeast1" },
+	{ value: "northamerica-northeast2", label: "northamerica-northeast2" },
+	{ value: "southamerica-east1", label: "southamerica-east1" },
 	{ value: "europe-west1", label: "europe-west1" },
+	{ value: "europe-west2", label: "europe-west2" },
+	{ value: "europe-west3", label: "europe-west3" },
 	{ value: "europe-west4", label: "europe-west4" },
+	{ value: "europe-west6", label: "europe-west6" },
+	{ value: "europe-central2", label: "europe-central2" },
+	{ value: "asia-east1", label: "asia-east1" },
+	{ value: "asia-east2", label: "asia-east2" },
+	{ value: "asia-northeast1", label: "asia-northeast1" },
+	{ value: "asia-northeast2", label: "asia-northeast2" },
+	{ value: "asia-northeast3", label: "asia-northeast3" },
+	{ value: "asia-south1", label: "asia-south1" },
+	{ value: "asia-south2", label: "asia-south2" },
 	{ value: "asia-southeast1", label: "asia-southeast1" },
+	{ value: "asia-southeast2", label: "asia-southeast2" },
+	{ value: "australia-southeast1", label: "australia-southeast1" },
+	{ value: "australia-southeast2", label: "australia-southeast2" },
+	{ value: "me-west1", label: "me-west1" },
+	{ value: "me-central1", label: "me-central1" },
+	{ value: "africa-south1", label: "africa-south1" },
 ]

packages/types/src/providers/xai.ts

@@ -3,26 +3,19 @@ import type { ModelInfo } from "../model.js"
 // https://docs.x.ai/docs/api-reference
 export type XAIModelId = keyof typeof xaiModels
 
-export const xaiDefaultModelId: XAIModelId = "grok-3"
+export const xaiDefaultModelId: XAIModelId = "grok-4"
 
 export const xaiModels = {
-	"grok-2-1212": {
-		maxTokens: 8192,
-		contextWindow: 131072,
-		supportsImages: false,
-		supportsPromptCache: false,
-		inputPrice: 2.0,
-		outputPrice: 10.0,
-		description: "xAI's Grok-2 model (version 1212) with 128K context window",
-	},
-	"grok-2-vision-1212": {
+	"grok-4": {
 		maxTokens: 8192,
-		contextWindow: 32768,
+		contextWindow: 256000,
 		supportsImages: true,
-		supportsPromptCache: false,
-		inputPrice: 2.0,
-		outputPrice: 10.0,
-		description: "xAI's Grok-2 Vision model (version 1212) with image support and 32K context window",
+		supportsPromptCache: true,
+		inputPrice: 3.0,
+		outputPrice: 15.0,
+		cacheWritesPrice: 0.75,
+		cacheReadsPrice: 0.75,
+		description: "xAI's Grok-4 model with 256K context window",
 	},
 	"grok-3": {
 		maxTokens: 8192,
@@ -70,4 +63,22 @@ export const xaiModels = {
 		description: "xAI's Grok-3 mini fast model with 128K context window",
 		supportsReasoningEffort: true,
 	},
+	"grok-2-1212": {
+		maxTokens: 8192,
+		contextWindow: 131072,
+		supportsImages: false,
+		supportsPromptCache: false,
+		inputPrice: 2.0,
+		outputPrice: 10.0,
+		description: "xAI's Grok-2 model (version 1212) with 128K context window",
+	},
+	"grok-2-vision-1212": {
+		maxTokens: 8192,
+		contextWindow: 32768,
+		supportsImages: true,
+		supportsPromptCache: false,
+		inputPrice: 2.0,
+		outputPrice: 10.0,
+		description: "xAI's Grok-2 Vision model (version 1212) with image support and 32K context window",
+	},
 } as const satisfies Record<string, ModelInfo>

src/activate/registerCommands.ts

@@ -14,6 +14,7 @@ import { registerHumanRelayCallback, unregisterHumanRelayCallback, handleHumanRe
 import { handleNewTask } from "./handleTask"
 import { CodeIndexManager } from "../services/code-index/manager"
 import { importSettingsWithFeedback } from "../core/config/importExport"
+import { MdmService } from "../services/mdm/MdmService"
 import { t } from "../i18n"
 
 /**
@@ -226,7 +227,17 @@ export const openClineInNewTab = async ({ context, outputChannel }: Omit<Registe
 	// https://github.com/microsoft/vscode-extension-samples/blob/main/webview-sample/src/extension.ts
 	const contextProxy = await ContextProxy.getInstance(context)
 	const codeIndexManager = CodeIndexManager.getInstance(context)
-	const tabProvider = new ClineProvider(context, outputChannel, "editor", contextProxy, codeIndexManager)
+
+	// Get the existing MDM service instance to ensure consistent policy enforcement
+	let mdmService: MdmService | undefined
+	try {
+		mdmService = MdmService.getInstance()
+	} catch (error) {
+		// MDM service not initialized, which is fine - extension can work without it
+		mdmService = undefined
+	}
+
+	const tabProvider = new ClineProvider(context, outputChannel, "editor", contextProxy, codeIndexManager, mdmService)
 	const lastCol = Math.max(...vscode.window.visibleTextEditors.map((editor) => editor.viewColumn || 0))
 
 	// Check if there are any visible text editors, otherwise open a new group

src/core/config/CustomModesManager.ts

@@ -148,7 +148,9 @@ export class CustomModesManager {
 		cleanedContent = this.cleanInvisibleCharacters(cleanedContent)
 
 		try {
-			return yaml.parse(cleanedContent)
+			const parsed = yaml.parse(cleanedContent)
+			// Ensure we never return null or undefined
+			return parsed ?? {}
 		} catch (yamlError) {
 			// For .roomodes files, try JSON as fallback
 			if (filePath.endsWith(ROOMODES_FILENAME)) {
@@ -180,6 +182,12 @@ export class CustomModesManager {
 		try {
 			const content = await fs.readFile(filePath, "utf-8")
 			const settings = this.parseYamlSafely(content, filePath)
+
+			// Ensure settings has customModes property
+			if (!settings || typeof settings !== "object" || !settings.customModes) {
+				return []
+			}
+
 			const result = customModesSettingsSchema.safeParse(settings)
 
 			if (!result.success) {
@@ -458,7 +466,15 @@ export class CustomModesManager {
 			settings = { customModes: [] }
 		}
 
-		settings.customModes = operation(settings.customModes || [])
+		// Ensure settings is an object and has customModes property
+		if (!settings || typeof settings !== "object") {
+			settings = { customModes: [] }
+		}
+		if (!settings.customModes) {
+			settings.customModes = []
+		}
+
+		settings.customModes = operation(settings.customModes)
 		await fs.writeFile(filePath, yaml.stringify(settings, { lineWidth: 0 }), "utf-8")
 	}