i18n and error ux

Author: navedmerchant

src/core/tools/ExecuteCommandTool.ts

@@ -51,6 +51,22 @@ interface ExecuteCommandParams {
 	timeout?: number | null
 }
 
+export function formatDcgBlockedMessage(reason?: string, ruleId?: string): string {
+	if (reason && ruleId) {
+		return t("tools:executeCommand.destructiveCommandGuard.blockedWithReasonAndRule", { reason, ruleId })
+	}
+
+	if (reason) {
+		return t("tools:executeCommand.destructiveCommandGuard.blockedWithReason", { reason })
+	}
+
+	if (ruleId) {
+		return t("tools:executeCommand.destructiveCommandGuard.blockedWithRule", { ruleId })
+	}
+
+	return t("tools:executeCommand.destructiveCommandGuard.blocked")
+}
+
 export function resolveAgentTimeoutMs(timeoutSeconds: number | null | undefined): number {
 	const requestedAgentTimeout = typeof timeoutSeconds === "number" && timeoutSeconds > 0 ? timeoutSeconds * 1000 : 0
 
@@ -123,10 +139,7 @@ export class ExecuteCommandTool extends BaseTool<"execute_command"> {
 				const dcgResult = await runDcg(binaryPath, canonicalCommand, workingDirectory)
 				dcgBlocked = dcgResult.decision === "deny"
 				if (dcgResult.decision === "deny") {
-					await task.say(
-						"text",
-						`Destructive Command Guard blocked this command${dcgResult.reason ? `: ${dcgResult.reason}` : "."}${dcgResult.ruleId ? ` (Rule: ${dcgResult.ruleId})` : ""}`,
-					)
+					await task.say("error", formatDcgBlockedMessage(dcgResult.reason, dcgResult.ruleId))
 				}
 			}
 

src/core/tools/__tests__/executeCommandTool.spec.ts

@@ -44,6 +44,14 @@ vitest.mock("../../../integrations/terminal/TerminalRegistry", () => ({
 vitest.mock("../../task/Task")
 vitest.mock("../../prompts/responses")
 
+const mockRunDcg = vitest.fn()
+const mockGetDcgBinaryPath = vitest.fn()
+
+vitest.mock("../../../services/destructive-command-guard", () => ({
+	runDcg: mockRunDcg,
+	getDcgBinaryPath: mockGetDcgBinaryPath,
+}))
+
 // Import the module
 import * as executeCommandModule from "../ExecuteCommandTool"
 const { executeCommandTool } = executeCommandModule
@@ -94,6 +102,8 @@ describe("executeCommandTool", () => {
 		mockAskApproval = vitest.fn().mockResolvedValue(true)
 		mockHandleError = vitest.fn().mockResolvedValue(undefined)
 		mockPushToolResult = vitest.fn()
+		mockRunDcg.mockResolvedValue({ decision: "allow" })
+		mockGetDcgBinaryPath.mockReturnValue("/test/storage/dcg")
 
 		// Setup vscode config mock
 		const mockConfig = {
@@ -197,6 +207,46 @@ describe("executeCommandTool", () => {
 	})
 
 	describe("Error handling", () => {
+		it.each([
+			[undefined, undefined, "executeCommand.destructiveCommandGuard.blocked"],
+			["matches a destructive pattern", undefined, "executeCommand.destructiveCommandGuard.blockedWithReason"],
+			[undefined, "recursive-delete", "executeCommand.destructiveCommandGuard.blockedWithRule"],
+			[
+				"matches a destructive pattern",
+				"recursive-delete",
+				"executeCommand.destructiveCommandGuard.blockedWithReasonAndRule",
+			],
+		])("selects the localized DCG block message for reason %s and rule %s", (reason, ruleId, expected) => {
+			expect(executeCommandModule.formatDcgBlockedMessage(reason, ruleId)).toBe(expected)
+		})
+
+		it("shows a DCG block message as an error before requesting explicit approval", async () => {
+			const provider = await mockCline.providerRef.deref()
+			provider.context = { globalStorageUri: { fsPath: "/test/storage" } }
+			provider.getState.mockResolvedValue({
+				destructiveCommandGuardEnabled: true,
+				terminalShellIntegrationDisabled: true,
+			})
+			mockRunDcg.mockResolvedValue({
+				decision: "deny",
+				reason: "matches a destructive pattern",
+				ruleId: "recursive-delete",
+			})
+			mockAskApproval.mockResolvedValue(false)
+
+			await executeCommandTool.handle(mockCline as unknown as Task, mockToolUse, {
+				askApproval: mockAskApproval as unknown as AskApproval,
+				handleError: mockHandleError as unknown as HandleError,
+				pushToolResult: mockPushToolResult as unknown as PushToolResult,
+			})
+
+			expect(mockCline.say).toHaveBeenCalledWith(
+				"error",
+				"executeCommand.destructiveCommandGuard.blockedWithReasonAndRule",
+			)
+			expect(mockAskApproval).toHaveBeenCalledWith("command", "echo test", undefined, true)
+		})
+
 		it("should handle missing command parameter", async () => {
 			// Setup
 			mockToolUse.params.command = undefined

src/core/webview/webviewMessageHandler.ts

@@ -684,7 +684,9 @@ export const webviewMessageHandler = async (
 					} catch (error) {
 						message.updatedSettings.destructiveCommandGuardEnabled = false
 						vscode.window.showErrorMessage(
-							`Unable to enable Destructive Command Guard: ${error instanceof Error ? error.message : String(error)}`,
+							t("common:errors.destructive_command_guard_enable_failed", {
+								error: error instanceof Error ? error.message : String(error),
+							}),
 						)
 					}
 				}

src/i18n/locales/ca/common.json

@@ -72,6 +72,7 @@
 		"url_fetch_failed": "Failed to fetch URL content: {{error}}",
 		"url_fetch_error_with_url": "Error fetching content for {{url}}: {{error}}",
 		"command_timeout": "Command execution timed out after {{seconds}} seconds",
+		"destructive_command_guard_enable_failed": "Unable to enable Destructive Command Guard: {{error}}",
 		"share_task_failed": "Failed to share task. Please try again.",
 		"share_no_active_task": "No active task to share",
 		"share_auth_required": "Authentication required. Please sign in to share tasks.",

src/i18n/locales/ca/tools.json

@@ -11,6 +11,14 @@
 	"codebaseSearch": {
 		"approval": "Searching for '{{query}}' in codebase..."
 	},
+	"executeCommand": {
+		"destructiveCommandGuard": {
+			"blocked": "Destructive Command Guard blocked this command.",
+			"blockedWithReason": "Destructive Command Guard blocked this command. Message from DCG: {{reason}}",
+			"blockedWithRule": "Destructive Command Guard blocked this command. (Rule: {{ruleId}})",
+			"blockedWithReasonAndRule": "Destructive Command Guard blocked this command. Message from DCG: {{reason}} (Rule: {{ruleId}})"
+		}
+	},
 	"newTask": {
 		"errors": {
 			"policy_restriction": "Failed to create new task due to policy restrictions."