Merge main and update marketplace

Author: mrubens

PRIVACY.md

@@ -1,6 +1,6 @@
 # Roo Code Privacy Policy
 
-**Last Updated: March 7th, 2025**
+**Last Updated: June 10th, 2025**
 
 Roo Code respects your privacy and is committed to transparency about how we handle your data. Below is a simple breakdown of where key pieces of data go—and, importantly, where they don’t.
 
@@ -11,6 +11,7 @@ Roo Code respects your privacy and is committed to transparency about how we han
 - **Prompts & AI Requests**: When you use AI-powered features, your prompts and relevant project context are sent to your chosen AI model provider (e.g., OpenAI, Anthropic, OpenRouter) to generate responses. We do not store or process this data. These AI providers have their own privacy policies and may store data per their terms of service.
 - **API Keys & Credentials**: If you enter an API key (e.g., to connect an AI model), it is stored locally on your device and never sent to us or any third party, except the provider you have chosen.
 - **Telemetry (Usage Data)**: We only collect feature usage and error data if you explicitly opt-in. This telemetry is powered by PostHog and helps us understand feature usage to improve Roo Code. This includes your VS Code machine ID and feature usage patterns and exception reports. We do **not** collect personally identifiable information, your code, or AI prompts.
+- **Marketplace Requests**: When you browse or search the Marketplace for Model Configuration Profiles (MCPs) or Custom Modes, Roo Code makes a secure API call to Roo Code’s backend servers to retrieve listing information. These requests send only the query parameters (e.g., extension version, search term) necessary to fulfill the request and do not include your code, prompts, or personally identifiable information.
 
 ### **How We Use Your Data (If Collected)**
 

packages/cloud/src/index.ts

@@ -1 +1,2 @@
 export * from "./CloudService"
+export * from "./Config"

packages/evals/README.md

@@ -68,7 +68,6 @@ To stop an evals run early you can simply stop the "controller" container using
 
 <img width="1302" alt="Screenshot 2025-06-06 at 9 00 41 AM" src="https://github.com/user-attachments/assets/a9d4725b-730c-441a-ba24-ac99f9599ced" />
 
-
 ## Advanced Usage / Debugging
 
 The evals system runs VS Code headlessly in Docker containers for consistent, reproducible environments. While this design ensures reliability, it can make debugging more challenging. For debugging purposes, you can run the system locally on macOS, though this approach is less reliable due to hardware and environment variability.

packages/types/src/experiment.ts

@@ -6,7 +6,12 @@ import type { Keys, Equals, AssertEqual } from "./type-fu.js"
  * ExperimentId
  */
 
-export const experimentIds = ["powerSteering", "concurrentFileReads", "disableCompletionCommand"] as const
+export const experimentIds = [
+	"powerSteering",
+	"marketplace",
+	"concurrentFileReads",
+	"disableCompletionCommand",
+] as const
 
 export const experimentIdsSchema = z.enum(experimentIds)
 
@@ -18,6 +23,7 @@ export type ExperimentId = z.infer<typeof experimentIdsSchema>
 
 export const experimentsSchema = z.object({
 	powerSteering: z.boolean(),
+	marketplace: z.boolean(),
 	concurrentFileReads: z.boolean(),
 	disableCompletionCommand: z.boolean(),
 })

packages/types/src/vscode.ts

@@ -33,6 +33,7 @@ export const commandIds = [
 	"promptsButtonClicked",
 	"mcpButtonClicked",
 	"historyButtonClicked",
+	"marketplaceButtonClicked",
 	"popoutButtonClicked",
 	"accountButtonClicked",
 	"settingsButtonClicked",

src/activate/registerCommands.ts

@@ -146,6 +146,11 @@ const getCommandsMap = ({ context, outputChannel, provider }: RegisterCommandOpt
 
 		visibleProvider.postMessageToWebview({ type: "action", action: "historyButtonClicked" })
 	},
+	marketplaceButtonClicked: () => {
+		const visibleProvider = getVisibleProviderOrLog(outputChannel)
+		if (!visibleProvider) return
+		visibleProvider.postMessageToWebview({ type: "action", action: "marketplaceButtonClicked" })
+	},
 	showHumanRelayDialog: (params: { requestId: string; promptText: string }) => {
 		const panel = getPanel()
 

src/core/config/CustomModesManager.ts

@@ -10,6 +10,7 @@ import { fileExistsAtPath } from "../../utils/fs"
 import { arePathsEqual, getWorkspacePath } from "../../utils/path"
 import { logger } from "../../utils/logging"
 import { GlobalFileNames } from "../../shared/globalFileNames"
+import { ensureSettingsDirectoryExists } from "../../utils/globalContext"
 
 const ROOMODES_FILENAME = ".roomodes"
 
@@ -27,7 +28,12 @@ export class CustomModesManager {
 		private readonly onUpdate: () => Promise<void>,
 	) {
 		// TODO: We really shouldn't have async methods in the constructor.
-		this.watchCustomModesFiles()
+		// Defer the file watching setup to avoid issues in test environments
+		process.nextTick(() => {
+			this.watchCustomModesFiles().catch((error) => {
+				console.error("[CustomModesManager] Failed to setup file watchers:", error)
+			})
+		})
 	}
 
 	private async queueWrite(operation: () => Promise<void>): Promise<void> {
@@ -117,7 +123,7 @@ export class CustomModesManager {
 	}
 
 	public async getCustomModesFilePath(): Promise<string> {
-		const settingsDir = await this.ensureSettingsDirectoryExists()
+		const settingsDir = await ensureSettingsDirectoryExists(this.context)
 		const filePath = path.join(settingsDir, GlobalFileNames.customModes)
 		const fileExists = await fileExistsAtPath(filePath)
 
@@ -132,61 +138,84 @@ export class CustomModesManager {
 		const settingsPath = await this.getCustomModesFilePath()
 
 		// Watch settings file
-		this.disposables.push(
-			vscode.workspace.onDidSaveTextDocument(async (document) => {
-				if (arePathsEqual(document.uri.fsPath, settingsPath)) {
-					const content = await fs.readFile(settingsPath, "utf-8")
-
-					const errorMessage =
-						"Invalid custom modes format. Please ensure your settings follow the correct YAML format."
+		const settingsWatcher = vscode.workspace.createFileSystemWatcher(settingsPath)
 
-					let config: any
+		const handleSettingsChange = async () => {
+			try {
+				const content = await fs.readFile(settingsPath, "utf-8")
 
-					try {
-						config = yaml.parse(content)
-					} catch (error) {
-						console.error(error)
-						vscode.window.showErrorMessage(errorMessage)
-						return
-					}
+				const errorMessage =
+					"Invalid custom modes format. Please ensure your settings follow the correct YAML format."
 
-					const result = customModesSettingsSchema.safeParse(config)
+				let config: any
 
-					if (!result.success) {
-						vscode.window.showErrorMessage(errorMessage)
-						return
-					}
+				try {
+					config = yaml.parse(content)
+				} catch (error) {
+					console.error(error)
+					vscode.window.showErrorMessage(errorMessage)
+					return
+				}
 
-					// Get modes from .roomodes if it exists (takes precedence)
-					const roomodesPath = await this.getWorkspaceRoomodes()
-					const roomodesModes = roomodesPath ? await this.loadModesFromFile(roomodesPath) : []
+				const result = customModesSettingsSchema.safeParse(config)
 
-					// Merge modes from both sources (.roomodes takes precedence)
-					const mergedModes = await this.mergeCustomModes(roomodesModes, result.data.customModes)
-					await this.context.globalState.update("customModes", mergedModes)
-					this.clearCache()
-					await this.onUpdate()
+				if (!result.success) {
+					vscode.window.showErrorMessage(errorMessage)
+					return
 				}
-			}),
-		)
+
+				// Get modes from .roomodes if it exists (takes precedence)
+				const roomodesPath = await this.getWorkspaceRoomodes()
+				const roomodesModes = roomodesPath ? await this.loadModesFromFile(roomodesPath) : []
+
+				// Merge modes from both sources (.roomodes takes precedence)
+				const mergedModes = await this.mergeCustomModes(roomodesModes, result.data.customModes)
+				await this.context.globalState.update("customModes", mergedModes)
+				this.clearCache()
+				await this.onUpdate()
+			} catch (error) {
+				console.error(`[CustomModesManager] Error handling settings file change:`, error)
+			}
+		}
+
+		this.disposables.push(settingsWatcher.onDidChange(handleSettingsChange))
+		this.disposables.push(settingsWatcher.onDidCreate(handleSettingsChange))
+		this.disposables.push(settingsWatcher)
 
 		// Watch .roomodes file if it exists
 		const roomodesPath = await this.getWorkspaceRoomodes()
 
 		if (roomodesPath) {
-			this.disposables.push(
-				vscode.workspace.onDidSaveTextDocument(async (document) => {
-					if (arePathsEqual(document.uri.fsPath, roomodesPath)) {
-						const settingsModes = await this.loadModesFromFile(settingsPath)
-						const roomodesModes = await this.loadModesFromFile(roomodesPath)
-						// .roomodes takes precedence
-						const mergedModes = await this.mergeCustomModes(roomodesModes, settingsModes)
-						await this.context.globalState.update("customModes", mergedModes)
-						this.clearCache()
-						await this.onUpdate()
-					}
-				}),
-			)
+			const roomodesWatcher = vscode.workspace.createFileSystemWatcher(roomodesPath)
+
+			const handleRoomodesChange = async () => {
+				try {
+					const settingsModes = await this.loadModesFromFile(settingsPath)
+					const roomodesModes = await this.loadModesFromFile(roomodesPath)
+					// .roomodes takes precedence
+					const mergedModes = await this.mergeCustomModes(roomodesModes, settingsModes)
+					await this.context.globalState.update("customModes", mergedModes)
+					this.clearCache()
+					await this.onUpdate()
+				} catch (error) {
+					console.error(`[CustomModesManager] Error handling .roomodes file change:`, error)
+				}
+			}
+
+			roomodesWatcher.onDidChange(handleRoomodesChange)
+			roomodesWatcher.onDidCreate(handleRoomodesChange)
+			roomodesWatcher.onDidDelete(async () => {
+				// When .roomodes is deleted, refresh with only settings modes
+				try {
+					const settingsModes = await this.loadModesFromFile(settingsPath)
+					await this.context.globalState.update("customModes", settingsModes)
+					this.clearCache()
+					await this.onUpdate()
+				} catch (error) {
+					console.error(`[CustomModesManager] Error handling .roomodes file deletion:`, error)
+				}
+			})
+			this.disposables.push(roomodesWatcher)
 		}
 	}
 
@@ -309,7 +338,7 @@ export class CustomModesManager {
 		await fs.writeFile(filePath, yaml.stringify(settings), "utf-8")
 	}
 
-	private async refreshMergedState(): Promise<void> {
+	public async refreshMergedState(): Promise<void> {
 		const settingsPath = await this.getCustomModesFilePath()
 		const roomodesPath = await this.getWorkspaceRoomodes()
 
@@ -362,12 +391,6 @@ export class CustomModesManager {
 		}
 	}
 
-	private async ensureSettingsDirectoryExists(): Promise<string> {
-		const settingsDir = path.join(this.context.globalStorageUri.fsPath, "settings")
-		await fs.mkdir(settingsDir, { recursive: true })
-		return settingsDir
-	}
-
 	public async resetCustomModes(): Promise<void> {
 		try {
 			const filePath = await this.getCustomModesFilePath()