feat: harden destructive command guard integration

Author: navedmerchant

packages/types/src/__tests__/message.test.ts

@@ -2,6 +2,7 @@
 
 import {
 	clineAsks,
+	clineMessageSchema,
 	getCompletionCheckpoint,
 	isIdleAsk,
 	isInteractiveAsk,
@@ -21,6 +22,20 @@ describe("ask messages", () => {
 	})
 })
 
+describe("clineMessageSchema autoApprovalDecision", () => {
+	it.each(["approve", "deny"] as const)("accepts %s", (autoApprovalDecision) => {
+		expect(clineMessageSchema.safeParse({ ts: 1, type: "ask", ask: "command", autoApprovalDecision }).success).toBe(
+			true,
+		)
+	})
+
+	it("rejects invalid decisions", () => {
+		expect(
+			clineMessageSchema.safeParse({ ts: 1, type: "ask", ask: "command", autoApprovalDecision: "ask" }).success,
+		).toBe(false)
+	})
+})
+
 describe("getCompletionCheckpoint", () => {
 	it("returns the first checkpoint after the latest user prompt before completion", () => {
 		const messages: ClineMessage[] = [

packages/types/src/global-settings.ts

@@ -46,6 +46,8 @@ export const DEFAULT_AUTO_CLOSE_ZOO_OPENED_NEW_FILES = false
  */
 export const DEFAULT_DIFF_FUZZY_THRESHOLD = 1.0
 
+export const DEFAULT_DESTRUCTIVE_COMMAND_GUARD_ENABLED = false
+
 /**
  * Terminal output preview size options for persisted command output.
  *

src/core/auto-approval/__tests__/dcg.spec.ts

@@ -37,6 +37,12 @@ describe("Destructive Command Guard auto-approval precedence", () => {
 		})
 	})
 
+	it("does not auto-approve via DCG when execute auto-approval is off", async () => {
+		const state = { ...baseState, alwaysAllowExecute: false }
+
+		expect(await checkAutoApproval({ state, ask: "command", text: "echo safe" })).toEqual({ decision: "ask" })
+	})
+
 	it("keeps ordinary allowlist auto-approval when DCG is disabled", async () => {
 		const state = { ...baseState, destructiveCommandGuardEnabled: false }
 

src/core/tools/ExecuteCommandTool.ts

@@ -135,11 +135,13 @@ export class ExecuteCommandTool extends BaseTool<"execute_command"> {
 			const providerState = await provider?.getState()
 			let dcgBlocked = false
 			if (providerState?.destructiveCommandGuardEnabled === true) {
-				const { getDcgBinaryPath, runDcg } = await import("../../services/destructive-command-guard")
-				const binaryPath = provider ? getDcgBinaryPath(provider.context.globalStorageUri.fsPath) : undefined
-				if (!binaryPath) {
-					throw new Error("Destructive Command Guard is enabled but is not available for this platform")
+				const { ensureDcgInstalled, runDcg } = await import("../../services/destructive-command-guard")
+				if (!provider) {
+					throw new Error(t("common:errors.destructiveCommandGuard.unavailable"))
 				}
+				// Resolve through the managed installer on use so an extension update
+				// automatically installs the newly pinned and verified DCG version.
+				const binaryPath = await ensureDcgInstalled(provider.context.globalStorageUri.fsPath)
 				const workingDirectory = customCwd
 					? path.isAbsolute(customCwd)
 						? customCwd

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

@@ -46,11 +46,11 @@ vitest.mock("../../task/Task")
 vitest.mock("../../prompts/responses")
 
 const mockRunDcg = vitest.fn()
-const mockGetDcgBinaryPath = vitest.fn()
+const mockEnsureDcgInstalled = vitest.fn()
 
 vitest.mock("../../../services/destructive-command-guard", () => ({
 	runDcg: mockRunDcg,
-	getDcgBinaryPath: mockGetDcgBinaryPath,
+	ensureDcgInstalled: mockEnsureDcgInstalled,
 }))
 
 // Import the module
@@ -105,7 +105,7 @@ describe("executeCommandTool", () => {
 		mockHandleError = vitest.fn().mockResolvedValue(undefined)
 		mockPushToolResult = vitest.fn()
 		mockRunDcg.mockResolvedValue({ decision: "allow" })
-		mockGetDcgBinaryPath.mockReturnValue("/test/storage/dcg")
+		mockEnsureDcgInstalled.mockResolvedValue("/test/storage/dcg")
 
 		// Setup vscode config mock
 		const mockConfig = {
@@ -249,6 +249,65 @@ describe("executeCommandTool", () => {
 			expect(mockAskApproval).toHaveBeenCalledWith("command", "echo test", undefined, true)
 		})
 
+		it("requests normal approval when DCG allows the command", async () => {
+			const provider = await mockCline.providerRef.deref()
+			provider.context = { globalStorageUri: { fsPath: "/test/storage" } }
+			provider.getState.mockResolvedValue({
+				destructiveCommandGuardEnabled: true,
+				terminalShellIntegrationDisabled: true,
+			})
+			mockRunDcg.mockResolvedValue({ decision: "allow" })
+
+			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(mockAskApproval).toHaveBeenCalledWith("command", "echo test")
+		})
+
+		it("installs or updates DCG before evaluating an enabled command", async () => {
+			const provider = await mockCline.providerRef.deref()
+			provider.context = { globalStorageUri: { fsPath: "/test/storage" } }
+			provider.getState.mockResolvedValue({
+				destructiveCommandGuardEnabled: true,
+				terminalShellIntegrationDisabled: true,
+			})
+			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(mockEnsureDcgInstalled).toHaveBeenCalledWith("/test/storage")
+			expect(mockRunDcg).toHaveBeenCalledWith("/test/storage/dcg", "echo test", "/test/workspace")
+		})
+
+		it("fails closed when the DCG install or update fails", async () => {
+			const provider = await mockCline.providerRef.deref()
+			provider.context = { globalStorageUri: { fsPath: "/test/storage" } }
+			provider.getState.mockResolvedValue({
+				destructiveCommandGuardEnabled: true,
+				terminalShellIntegrationDisabled: true,
+			})
+			mockEnsureDcgInstalled.mockRejectedValue(new Error("download failed"))
+
+			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(mockHandleError).toHaveBeenCalledWith(
+				"executing command",
+				expect.objectContaining({ message: "download failed" }),
+			)
+			expect(mockRunDcg).not.toHaveBeenCalled()
+			expect(mockAskApproval).not.toHaveBeenCalled()
+			expect(executeCommandModule.executeCommandInTerminal).not.toHaveBeenCalled()
+		})
+
 		it("should handle missing command parameter", async () => {
 			// Setup
 			mockToolUse.params.command = undefined

src/core/webview/ClineProvider.ts

@@ -42,6 +42,7 @@ import {
 	openRouterDefaultModelId,
 	DEFAULT_WRITE_DELAY_MS,
 	DEFAULT_DIFF_FUZZY_THRESHOLD,
+	DEFAULT_DESTRUCTIVE_COMMAND_GUARD_ENABLED,
 	DEFAULT_AUTO_CLOSE_ZOO_OPENED_FILES,
 	DEFAULT_AUTO_CLOSE_ZOO_OPENED_FILES_AFTER_USER_EDITED,
 	DEFAULT_AUTO_CLOSE_ZOO_OPENED_NEW_FILES,
@@ -2460,7 +2461,7 @@ export class ClineProvider
 			alwaysAllowWriteOutsideWorkspace: alwaysAllowWriteOutsideWorkspace ?? false,
 			alwaysAllowWriteProtected: alwaysAllowWriteProtected ?? false,
 			alwaysAllowExecute: alwaysAllowExecute ?? false,
-			destructiveCommandGuardEnabled: destructiveCommandGuardEnabled ?? false,
+			destructiveCommandGuardEnabled: destructiveCommandGuardEnabled ?? DEFAULT_DESTRUCTIVE_COMMAND_GUARD_ENABLED,
 			alwaysAllowMcp: alwaysAllowMcp ?? false,
 			alwaysAllowModeSwitch: alwaysAllowModeSwitch ?? false,
 			alwaysAllowSubtasks: alwaysAllowSubtasks ?? false,
@@ -2693,7 +2694,8 @@ export class ClineProvider
 			alwaysAllowWriteOutsideWorkspace: stateValues.alwaysAllowWriteOutsideWorkspace ?? false,
 			alwaysAllowWriteProtected: stateValues.alwaysAllowWriteProtected ?? false,
 			alwaysAllowExecute: stateValues.alwaysAllowExecute ?? false,
-			destructiveCommandGuardEnabled: stateValues.destructiveCommandGuardEnabled ?? false,
+			destructiveCommandGuardEnabled:
+				stateValues.destructiveCommandGuardEnabled ?? DEFAULT_DESTRUCTIVE_COMMAND_GUARD_ENABLED,
 			alwaysAllowMcp: stateValues.alwaysAllowMcp ?? false,
 			alwaysAllowModeSwitch: stateValues.alwaysAllowModeSwitch ?? false,
 			alwaysAllowSubtasks: stateValues.alwaysAllowSubtasks ?? false,

src/i18n/locales/ca/common.json

@@ -72,6 +72,9 @@
 		"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",
+		"destructiveCommandGuard": {
+			"unavailable": "Destructive Command Guard is enabled but is not available for this platform"
+		},
 		"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",