SannidhyaSah
diff --git a/‎PRIVACY.md‎
Lines changed: 2 additions & 1 deletion b/‎PRIVACY.md‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎packages/cloud/src/index.ts‎
Lines changed: 1 addition & 0 deletions b/‎packages/cloud/src/index.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎packages/telemetry/src/TelemetryService.ts‎
Lines changed: 41 additions & 0 deletions b/‎packages/telemetry/src/TelemetryService.ts‎
Lines changed: 41 additions & 0 deletions
diff --git a/‎packages/types/src/experiment.ts‎
Lines changed: 7 additions & 1 deletion b/‎packages/types/src/experiment.ts‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎packages/types/src/telemetry.ts‎
Lines changed: 5 additions & 0 deletions b/‎packages/types/src/telemetry.ts‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎packages/types/src/vscode.ts‎
Lines changed: 1 addition & 0 deletions b/‎packages/types/src/vscode.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/__mocks__/vscode.js‎
Lines changed: 1 addition & 0 deletions b/‎src/__mocks__/vscode.js‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/activate/registerCommands.ts‎
Lines changed: 5 additions & 0 deletions b/‎src/activate/registerCommands.ts‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎src/core/config/CustomModesManager.ts‎
Lines changed: 75 additions & 45 deletions b/‎src/core/config/CustomModesManager.ts‎
Lines changed: 75 additions & 45 deletions
@@ -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)**
 
 
@@ -1 +1,2 @@
 export * from "./CloudService"
+export * from "./Config"
@@ -152,6 +152,47 @@ export class TelemetryService {
 		this.captureEvent(TelemetryEventName.CONSECUTIVE_MISTAKE_ERROR, { taskId })
 	}
 
+	/**
+	 * Captures a marketplace item installation event
+	 * @param itemId The unique identifier of the marketplace item
+	 * @param itemType The type of item (mode or mcp)
+	 * @param itemName The human-readable name of the item
+	 * @param target The installation target (project or global)
+	 * @param properties Additional properties like hasParameters, installationMethod
+	 */
+	public captureMarketplaceItemInstalled(
+		itemId: string,
+		itemType: string,
+		itemName: string,
+		target: string,
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		properties?: Record<string, any>,
+	): void {
+		this.captureEvent(TelemetryEventName.MARKETPLACE_ITEM_INSTALLED, {
+			itemId,
+			itemType,
+			itemName,
+			target,
+			... (properties || {}),
+		})
+	}
+
+	/**
+	 * Captures a marketplace item removal event
+	 * @param itemId The unique identifier of the marketplace item
+	 * @param itemType The type of item (mode or mcp)
+	 * @param itemName The human-readable name of the item
+	 * @param target The removal target (project or global)
+	 */
+	public captureMarketplaceItemRemoved(itemId: string, itemType: string, itemName: string, target: string): void {
+		this.captureEvent(TelemetryEventName.MARKETPLACE_ITEM_REMOVED, {
+			itemId,
+			itemType,
+			itemName,
+			target,
+		})
+	}
+
 	/**
 	 * Captures a title button click event
 	 * @param button The button that was clicked
 
@@ -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(),
 })
 
@@ -41,6 +41,9 @@ export enum TelemetryEventName {
 
 	AUTHENTICATION_INITIATED = "Authentication Initiated",
 
+	MARKETPLACE_ITEM_INSTALLED = "Marketplace Item Installed",
+	MARKETPLACE_ITEM_REMOVED = "Marketplace Item Removed",
+
 	SCHEMA_VALIDATION_ERROR = "Schema Validation Error",
 	DIFF_APPLICATION_ERROR = "Diff Application Error",
 	SHELL_INTEGRATION_ERROR = "Shell Integration Error",
@@ -106,6 +109,8 @@ export const rooCodeTelemetryEventSchema = z.discriminatedUnion("type", [
 			TelemetryEventName.PROMPT_ENHANCED,
 			TelemetryEventName.TITLE_BUTTON_CLICKED,
 			TelemetryEventName.AUTHENTICATION_INITIATED,
+			TelemetryEventName.MARKETPLACE_ITEM_INSTALLED,
+			TelemetryEventName.MARKETPLACE_ITEM_REMOVED,
 			TelemetryEventName.SCHEMA_VALIDATION_ERROR,
 			TelemetryEventName.DIFF_APPLICATION_ERROR,
 			TelemetryEventName.SHELL_INTEGRATION_ERROR,
 
@@ -33,6 +33,7 @@ export const commandIds = [
 	"promptsButtonClicked",
 	"mcpButtonClicked",
 	"historyButtonClicked",
+	"marketplaceButtonClicked",
 	"popoutButtonClicked",
 	"accountButtonClicked",
 	"settingsButtonClicked",
 
@@ -27,6 +27,7 @@ const vscode = {
 		onDidSaveTextDocument: jest.fn(),
 		createFileSystemWatcher: jest.fn().mockReturnValue({
 			onDidCreate: jest.fn().mockReturnValue({ dispose: jest.fn() }),
+			onDidChange: jest.fn().mockReturnValue({ dispose: jest.fn() }),
 			onDidDelete: jest.fn().mockReturnValue({ dispose: jest.fn() }),
 			dispose: jest.fn(),
 		}),
 
@@ -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()
 
 
@@ -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"
 
@@ -26,8 +27,9 @@ export class CustomModesManager {
 		private readonly context: vscode.ExtensionContext,
 		private readonly onUpdate: () => Promise<void>,
 	) {
-		// TODO: We really shouldn't have async methods in the constructor.
-		this.watchCustomModesFiles()
+		this.watchCustomModesFiles().catch((error) => {
+			console.error("[CustomModesManager] Failed to setup file watchers:", error)
+		})
 	}
 
 	private async queueWrite(operation: () => Promise<void>): Promise<void> {
@@ -117,7 +119,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)
 
@@ -129,64 +131,98 @@ export class CustomModesManager {
 	}
 
 	private async watchCustomModesFiles(): Promise<void> {
+		// Skip if test environment is detected
+		if (process.env.NODE_ENV === "test" || process.env.JEST_WORKER_ID !== undefined) {
+			return
+		}
+
 		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 settingsWatcher = vscode.workspace.createFileSystemWatcher(settingsPath)
 
-					const errorMessage =
-						"Invalid custom modes format. Please ensure your settings follow the correct YAML format."
+		const handleSettingsChange = async () => {
+			try {
+				// Ensure that the settings file exists (especially important for delete events)
+				await this.getCustomModesFilePath()
+				const content = await fs.readFile(settingsPath, "utf-8")
 
-					let config: any
+				const errorMessage =
+					"Invalid custom modes format. Please ensure your settings follow the correct YAML format."
 
-					try {
-						config = yaml.parse(content)
-					} catch (error) {
-						console.error(error)
-						vscode.window.showErrorMessage(errorMessage)
-						return
-					}
+				let config: any
 
-					const result = customModesSettingsSchema.safeParse(config)
+				try {
+					config = yaml.parse(content)
+				} catch (error) {
+					console.error(error)
+					vscode.window.showErrorMessage(errorMessage)
+					return
+				}
 
-					if (!result.success) {
-						vscode.window.showErrorMessage(errorMessage)
-						return
-					}
+				const result = customModesSettingsSchema.safeParse(config)
+
+				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) : []
+				// 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)
+				// 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.onDidDelete(handleSettingsChange))
+		this.disposables.push(settingsWatcher)
+
+		// Watch .roomodes file - watch the path even if it doesn't exist yet
+		const workspaceFolders = vscode.workspace.workspaceFolders
+		if (workspaceFolders && workspaceFolders.length > 0) {
+			const workspaceRoot = getWorkspacePath()
+			const roomodesPath = path.join(workspaceRoot, ROOMODES_FILENAME)
+			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)
 				}
-			}),
-		)
-
-		// Watch .roomodes file if it exists
-		const roomodesPath = await this.getWorkspaceRoomodes()
+			}
 
-		if (roomodesPath) {
+			this.disposables.push(roomodesWatcher.onDidChange(handleRoomodesChange))
+			this.disposables.push(roomodesWatcher.onDidCreate(handleRoomodesChange))
 			this.disposables.push(
-				vscode.workspace.onDidSaveTextDocument(async (document) => {
-					if (arePathsEqual(document.uri.fsPath, roomodesPath)) {
+				roomodesWatcher.onDidDelete(async () => {
+					// When .roomodes is deleted, refresh with only settings modes
+					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)
+						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)
 		}
 	}
 
@@ -362,12 +398,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()
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`export * from "./CloudService"`
	`2`	`+export * from "./Config"`