feat: Add folder deletion when custom mode is deleted (#5210)

Author: hannesrudolph

src/core/webview/__tests__/webviewMessageHandler.spec.ts

@@ -14,8 +14,75 @@ const mockGetModels = getModels as Mock<typeof getModels>
 const mockClineProvider = {
 	getState: vi.fn(),
 	postMessageToWebview: vi.fn(),
+	customModesManager: {
+		getCustomModes: vi.fn(),
+		deleteCustomMode: vi.fn(),
+	},
+	context: {
+		extensionPath: "/mock/extension/path",
+		globalStorageUri: { fsPath: "/mock/global/storage" },
+	},
+	contextProxy: {
+		context: {
+			extensionPath: "/mock/extension/path",
+			globalStorageUri: { fsPath: "/mock/global/storage" },
+		},
+		setValue: vi.fn(),
+	},
+	log: vi.fn(),
+	postStateToWebview: vi.fn(),
 } as unknown as ClineProvider
 
+import { t } from "../../../i18n"
+
+vi.mock("vscode", () => ({
+	window: {
+		showInformationMessage: vi.fn(),
+		showErrorMessage: vi.fn(),
+	},
+	workspace: {
+		workspaceFolders: [{ uri: { fsPath: "/mock/workspace" } }],
+	},
+}))
+
+vi.mock("../../../i18n", () => ({
+	t: vi.fn((key: string, args?: Record<string, any>) => {
+		// For the delete confirmation with rules, we need to return the interpolated string
+		if (key === "common:confirmation.delete_custom_mode_with_rules" && args) {
+			return `Are you sure you want to delete this ${args.scope} mode?\n\nThis will also delete the associated rules folder at:\n${args.rulesFolderPath}`
+		}
+		// Return the translated value for "Yes"
+		if (key === "common:answers.yes") {
+			return "Yes"
+		}
+		// Return the translated value for "Cancel"
+		if (key === "common:answers.cancel") {
+			return "Cancel"
+		}
+		return key
+	}),
+}))
+
+vi.mock("fs/promises", () => ({
+	default: {
+		rm: vi.fn().mockResolvedValue(undefined),
+		mkdir: vi.fn().mockResolvedValue(undefined),
+	},
+	rm: vi.fn().mockResolvedValue(undefined),
+	mkdir: vi.fn().mockResolvedValue(undefined),
+}))
+
+import * as vscode from "vscode"
+import fs from "fs/promises"
+import * as fsUtils from "../../../utils/fs"
+import { getWorkspacePath } from "../../../utils/path"
+import { ensureSettingsDirectoryExists } from "../../../utils/globalContext"
+import type { ModeConfig } from "@roo-code/types"
+
+vi.mock("../../../utils/fs")
+vi.mock("../../../utils/path")
+vi.mock("../../../utils/globalContext")
+
 describe("webviewMessageHandler - requestRouterModels", () => {
 	beforeEach(() => {
 		vi.clearAllMocks()
@@ -295,3 +362,108 @@ describe("webviewMessageHandler - requestRouterModels", () => {
 		})
 	})
 })
+
+describe("webviewMessageHandler - deleteCustomMode", () => {
+	beforeEach(() => {
+		vi.clearAllMocks()
+		vi.mocked(getWorkspacePath).mockReturnValue("/mock/workspace")
+		vi.mocked(vscode.window.showErrorMessage).mockResolvedValue(undefined)
+		vi.mocked(ensureSettingsDirectoryExists).mockResolvedValue("/mock/global/storage/.roo")
+	})
+
+	it("should delete a project mode and its rules folder", async () => {
+		const slug = "test-project-mode"
+		const rulesFolderPath = `/mock/workspace/.roo/rules-${slug}`
+
+		vi.mocked(mockClineProvider.customModesManager.getCustomModes).mockResolvedValue([
+			{
+				name: "Test Project Mode",
+				slug,
+				roleDefinition: "Test Role",
+				groups: [],
+				source: "project",
+			} as ModeConfig,
+		])
+		vi.mocked(fsUtils.fileExistsAtPath).mockResolvedValue(true)
+		vi.mocked(mockClineProvider.customModesManager.deleteCustomMode).mockResolvedValue(undefined)
+
+		await webviewMessageHandler(mockClineProvider, { type: "deleteCustomMode", slug })
+
+		// The confirmation dialog is now handled in the webview, so we don't expect showInformationMessage to be called
+		expect(vscode.window.showInformationMessage).not.toHaveBeenCalled()
+		expect(mockClineProvider.customModesManager.deleteCustomMode).toHaveBeenCalledWith(slug)
+		expect(fs.rm).toHaveBeenCalledWith(rulesFolderPath, { recursive: true, force: true })
+	})
+
+	it("should delete a global mode and its rules folder", async () => {
+		const slug = "test-global-mode"
+		const rulesFolderPath = `/Users/hrudolph/.roo/rules-${slug}`
+
+		vi.mocked(mockClineProvider.customModesManager.getCustomModes).mockResolvedValue([
+			{
+				name: "Test Global Mode",
+				slug,
+				roleDefinition: "Test Role",
+				groups: [],
+				source: "global",
+			} as ModeConfig,
+		])
+		vi.mocked(fsUtils.fileExistsAtPath).mockResolvedValue(true)
+		vi.mocked(mockClineProvider.customModesManager.deleteCustomMode).mockResolvedValue(undefined)
+
+		await webviewMessageHandler(mockClineProvider, { type: "deleteCustomMode", slug })
+
+		// The confirmation dialog is now handled in the webview, so we don't expect showInformationMessage to be called
+		expect(vscode.window.showInformationMessage).not.toHaveBeenCalled()
+		expect(mockClineProvider.customModesManager.deleteCustomMode).toHaveBeenCalledWith(slug)
+		expect(fs.rm).toHaveBeenCalledWith(rulesFolderPath, { recursive: true, force: true })
+	})
+
+	it("should only delete the mode when rules folder does not exist", async () => {
+		const slug = "test-mode-no-rules"
+		vi.mocked(mockClineProvider.customModesManager.getCustomModes).mockResolvedValue([
+			{
+				name: "Test Mode No Rules",
+				slug,
+				roleDefinition: "Test Role",
+				groups: [],
+				source: "project",
+			} as ModeConfig,
+		])
+		vi.mocked(fsUtils.fileExistsAtPath).mockResolvedValue(false)
+		vi.mocked(mockClineProvider.customModesManager.deleteCustomMode).mockResolvedValue(undefined)
+
+		await webviewMessageHandler(mockClineProvider, { type: "deleteCustomMode", slug })
+
+		// The confirmation dialog is now handled in the webview, so we don't expect showInformationMessage to be called
+		expect(vscode.window.showInformationMessage).not.toHaveBeenCalled()
+		expect(mockClineProvider.customModesManager.deleteCustomMode).toHaveBeenCalledWith(slug)
+		expect(fs.rm).not.toHaveBeenCalled()
+	})
+
+	it("should handle errors when deleting rules folder", async () => {
+		const slug = "test-mode-error"
+		const rulesFolderPath = `/mock/workspace/.roo/rules-${slug}`
+		const error = new Error("Permission denied")
+
+		vi.mocked(mockClineProvider.customModesManager.getCustomModes).mockResolvedValue([
+			{
+				name: "Test Mode Error",
+				slug,
+				roleDefinition: "Test Role",
+				groups: [],
+				source: "project",
+			} as ModeConfig,
+		])
+		vi.mocked(fsUtils.fileExistsAtPath).mockResolvedValue(true)
+		vi.mocked(mockClineProvider.customModesManager.deleteCustomMode).mockResolvedValue(undefined)
+		vi.mocked(fs.rm).mockRejectedValue(error)
+
+		await webviewMessageHandler(mockClineProvider, { type: "deleteCustomMode", slug })
+
+		expect(mockClineProvider.customModesManager.deleteCustomMode).toHaveBeenCalledWith(slug)
+		expect(fs.rm).toHaveBeenCalledWith(rulesFolderPath, { recursive: true, force: true })
+		// No error response is sent anymore - we just continue with deletion
+		expect(mockClineProvider.postMessageToWebview).not.toHaveBeenCalled()
+	})
+})

src/core/webview/webviewMessageHandler.ts

@@ -34,6 +34,7 @@ import { getVsCodeLmModels } from "../../api/providers/vscode-lm"
 import { openMention } from "../mentions"
 import { TelemetrySetting } from "../../shared/TelemetrySetting"
 import { getWorkspacePath } from "../../utils/path"
+import { ensureSettingsDirectoryExists } from "../../utils/globalContext"
 import { Mode, defaultModeSlug } from "../../shared/modes"
 import { getModels, flushModels } from "../../api/providers/fetchers/modelCache"
 import { GetModelsOptions } from "../../shared/api"
@@ -1485,17 +1486,60 @@ export const webviewMessageHandler = async (
 			break
 		case "deleteCustomMode":
 			if (message.slug) {
-				const answer = await vscode.window.showInformationMessage(
-					t("common:confirmation.delete_custom_mode"),
-					{ modal: true },
-					t("common:answers.yes"),
-				)
+				// Get the mode details to determine source and rules folder path
+				const customModes = await provider.customModesManager.getCustomModes()
+				const modeToDelete = customModes.find((mode) => mode.slug === message.slug)
 
-				if (answer !== t("common:answers.yes")) {
+				if (!modeToDelete) {
+					break
+				}
+
+				// Determine the scope based on source (project or global)
+				const scope = modeToDelete.source || "global"
+
+				// Determine the rules folder path
+				let rulesFolderPath: string
+				if (scope === "project") {
+					const workspacePath = getWorkspacePath()
+					if (workspacePath) {
+						rulesFolderPath = path.join(workspacePath, ".roo", `rules-${message.slug}`)
+					} else {
+						rulesFolderPath = path.join(".roo", `rules-${message.slug}`)
+					}
+				} else {
+					// Global scope - use home directory
+					const homeDir = process.env.HOME || process.env.USERPROFILE || ""
+					rulesFolderPath = path.join(homeDir, ".roo", `rules-${message.slug}`)
+				}
+
+				// Check if the rules folder exists
+				const rulesFolderExists = await fileExistsAtPath(rulesFolderPath)
+
+				// If this is a check request, send back the folder info
+				if (message.checkOnly) {
+					await provider.postMessageToWebview({
+						type: "deleteCustomModeCheck",
+						slug: message.slug,
+						rulesFolderExists,
+						rulesFolderPath: rulesFolderExists ? rulesFolderPath : undefined,
+					})
 					break
 				}
 
+				// Delete the mode
 				await provider.customModesManager.deleteCustomMode(message.slug)
+
+				// Delete the rules folder if it exists
+				if (rulesFolderExists) {
+					try {
+						await fs.rm(rulesFolderPath, { recursive: true, force: true })
+						provider.log(`Deleted rules folder for mode ${message.slug}: ${rulesFolderPath}`)
+					} catch (error) {
+						provider.log(`Failed to delete rules folder for mode ${message.slug}: ${error}`)
+						// Continue with mode deletion even if folder deletion fails
+					}
+				}
+
 				// Switch back to default mode after deletion
 				await updateGlobalState("mode", defaultModeSlug)
 				await provider.postStateToWebview()

src/i18n/locales/ca/common.json

@@ -21,7 +21,7 @@
 	"confirmation": {
 		"reset_state": "Estàs segur que vols restablir tots els estats i emmagatzematge secret a l'extensió? Això no es pot desfer.",
 		"delete_config_profile": "Estàs segur que vols eliminar aquest perfil de configuració?",
-		"delete_custom_mode": "Estàs segur que vols eliminar aquest mode personalitzat?",
+		"delete_custom_mode_with_rules": "Esteu segur que voleu suprimir aquest mode {scope}?\n\nAixò també suprimirà la carpeta de regles associada a:\n{rulesFolderPath}",
 		"delete_message": "Què vols eliminar?",
 		"just_this_message": "Només aquest missatge",
 		"this_and_subsequent": "Aquest i tots els missatges posteriors"
@@ -141,6 +141,10 @@
 			"resetFailed": "Error en restablir els modes personalitzats: {{error}}",
 			"modeNotFound": "Error d'escriptura: Mode no trobat",
 			"noWorkspaceForProject": "No s'ha trobat cap carpeta d'espai de treball per al mode específic del projecte"
+		},
+		"scope": {
+			"project": "projecte",
+			"global": "global"
 		}
 	},
 	"mdm": {
@@ -149,5 +153,14 @@
 			"organization_mismatch": "Has d'estar autenticat amb el compte de Roo Code Cloud de la teva organització.",
 			"verification_failed": "No s'ha pogut verificar l'autenticació de l'organització."
 		}
+	},
+	"prompts": {
+		"deleteMode": {
+			"title": "Suprimeix el mode personalitzat",
+			"description": "Esteu segur que voleu suprimir aquest mode {{scope}}? Això també suprimirà la carpeta de regles associada a: {{rulesFolderPath}}",
+			"descriptionNoRules": "Esteu segur que voleu suprimir aquest mode personalitzat?",
+			"cancel": "Cancel·la",
+			"confirm": "Suprimeix"
+		}
 	}
 }

src/i18n/locales/de/common.json

@@ -17,7 +17,7 @@
 	"confirmation": {
 		"reset_state": "Möchtest du wirklich alle Zustände und geheimen Speicher in der Erweiterung zurücksetzen? Dies kann nicht rückgängig gemacht werden.",
 		"delete_config_profile": "Möchtest du dieses Konfigurationsprofil wirklich löschen?",
-		"delete_custom_mode": "Möchtest du diesen benutzerdefinierten Modus wirklich löschen?",
+		"delete_custom_mode_with_rules": "Bist du sicher, dass du diesen {scope}-Modus löschen möchtest?\n\nDadurch wird auch der zugehörige Regelordner unter folgender Adresse gelöscht:\n{rulesFolderPath}",
 		"delete_message": "Was möchtest du löschen?",
 		"just_this_message": "Nur diese Nachricht",
 		"this_and_subsequent": "Diese und alle nachfolgenden Nachrichten"
@@ -141,6 +141,10 @@
 			"resetFailed": "Fehler beim Zurücksetzen der benutzerdefinierten Modi: {{error}}",
 			"modeNotFound": "Schreibfehler: Modus nicht gefunden",
 			"noWorkspaceForProject": "Kein Arbeitsbereich-Ordner für projektspezifischen Modus gefunden"
+		},
+		"scope": {
+			"project": "projekt",
+			"global": "global"
 		}
 	},
 	"mdm": {
@@ -149,5 +153,14 @@
 			"organization_mismatch": "Du musst mit dem Roo Code Cloud-Konto deiner Organisation authentifiziert sein.",
 			"verification_failed": "Die Organisationsauthentifizierung konnte nicht verifiziert werden."
 		}
+	},
+	"prompts": {
+		"deleteMode": {
+			"title": "Benutzerdefinierten Modus löschen",
+			"description": "Bist du sicher, dass du diesen {{scope}}-Modus löschen möchtest? Dadurch wird auch der zugehörige Regelordner unter {{rulesFolderPath}} gelöscht",
+			"descriptionNoRules": "Bist du sicher, dass du diesen benutzerdefinierten Modus löschen möchtest?",
+			"cancel": "Abbrechen",
+			"confirm": "Löschen"
+		}
 	}
 }

src/i18n/locales/en/common.json

@@ -17,7 +17,7 @@
 	"confirmation": {
 		"reset_state": "Are you sure you want to reset all state and secret storage in the extension? This cannot be undone.",
 		"delete_config_profile": "Are you sure you want to delete this configuration profile?",
-		"delete_custom_mode": "Are you sure you want to delete this custom mode?",
+		"delete_custom_mode_with_rules": "Are you sure you want to delete this {scope} mode?\n\nThis will also delete the associated rules folder at:\n{rulesFolderPath}",
 		"delete_message": "What would you like to delete?",
 		"just_this_message": "Just this message",
 		"this_and_subsequent": "This and all subsequent messages"
@@ -130,6 +130,10 @@
 			"resetFailed": "Failed to reset custom modes: {{error}}",
 			"modeNotFound": "Write error: Mode not found",
 			"noWorkspaceForProject": "No workspace folder found for project-specific mode"
+		},
+		"scope": {
+			"project": "project",
+			"global": "global"
 		}
 	},
 	"mdm": {
@@ -138,5 +142,14 @@
 			"organization_mismatch": "You must be authenticated with your organization's Roo Code Cloud account.",
 			"verification_failed": "Unable to verify organization authentication."
 		}
+	},
+	"prompts": {
+		"deleteMode": {
+			"title": "Delete Custom Mode",
+			"description": "Are you sure you want to delete this {{scope}} mode? This will also delete the associated rules folder at: {{rulesFolderPath}}",
+			"descriptionNoRules": "Are you sure you want to delete this custom mode?",
+			"cancel": "Cancel",
+			"confirm": "Delete"
+		}
 	}
 }

src/i18n/locales/es/common.json

@@ -17,7 +17,7 @@
 	"confirmation": {
 		"reset_state": "¿Estás seguro de que deseas restablecer todo el estado y el almacenamiento secreto en la extensión? Esta acción no se puede deshacer.",
 		"delete_config_profile": "¿Estás seguro de que deseas eliminar este perfil de configuración?",
-		"delete_custom_mode": "¿Estás seguro de que deseas eliminar este modo personalizado?",
+		"delete_custom_mode_with_rules": "¿Estás seguro de que quieres eliminar este modo {scope}?\n\nEsto también eliminará la carpeta de reglas asociada en:\n{rulesFolderPath}",
 		"delete_message": "¿Qué deseas eliminar?",
 		"just_this_message": "Solo este mensaje",
 		"this_and_subsequent": "Este y todos los mensajes posteriores"
@@ -141,6 +141,10 @@
 			"resetFailed": "Error al restablecer modos personalizados: {{error}}",
 			"modeNotFound": "Error de escritura: Modo no encontrado",
 			"noWorkspaceForProject": "No se encontró carpeta de espacio de trabajo para modo específico del proyecto"
+		},
+		"scope": {
+			"project": "proyecto",
+			"global": "global"
 		}
 	},
 	"mdm": {
@@ -149,5 +153,14 @@
 			"organization_mismatch": "Debes estar autenticado con la cuenta de Roo Code Cloud de tu organización.",
 			"verification_failed": "No se pudo verificar la autenticación de la organización."
 		}
+	},
+	"prompts": {
+		"deleteMode": {
+			"title": "Eliminar modo personalizado",
+			"description": "¿Estás seguro de que quieres eliminar este modo {{scope}}? Esto también eliminará la carpeta de reglas asociada en: {{rulesFolderPath}}",
+			"descriptionNoRules": "¿Estás seguro de que quieres eliminar este modo personalizado?",
+			"cancel": "Cancelar",
+			"confirm": "Eliminar"
+		}
 	}
 }