fix: address DCG integration feedback

Author: navedmerchant

src/core/tools/ExecuteCommandTool.ts

@@ -132,13 +132,9 @@ export class ExecuteCommandTool extends BaseTool<"execute_command"> {
 			}
 
 			const provider = await task.providerRef.deref()
-			const providerState = await provider?.getState()
 			let dcgBlocked = false
-			if (providerState?.destructiveCommandGuardEnabled === true) {
+			if (provider?.contextProxy.getValue("destructiveCommandGuardEnabled") === true) {
 				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)
@@ -169,6 +165,7 @@ export class ExecuteCommandTool extends BaseTool<"execute_command"> {
 			}
 
 			const executionId = task.lastMessageTs?.toString() ?? Date.now().toString()
+			const providerState = await provider?.getState()
 			const { terminalShellIntegrationDisabled = true } = providerState ?? {}
 
 			// Get command execution timeout from VSCode configuration (in seconds)

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

@@ -89,6 +89,9 @@ describe("executeCommandTool", () => {
 			supersedePendingAsk: vitest.fn(),
 			providerRef: {
 				deref: vitest.fn().mockResolvedValue({
+					contextProxy: {
+						getValue: vitest.fn().mockReturnValue(false),
+					},
 					getState: vitest.fn().mockResolvedValue({
 						terminalOutputLineLimit: 500,
 						terminalOutputCharacterLimit: 100000,
@@ -225,6 +228,7 @@ describe("executeCommandTool", () => {
 		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.contextProxy.getValue.mockReturnValue(true)
 			provider.getState.mockResolvedValue({
 				destructiveCommandGuardEnabled: true,
 				terminalShellIntegrationDisabled: true,
@@ -252,6 +256,7 @@ describe("executeCommandTool", () => {
 		it("requests normal approval when DCG allows the command", async () => {
 			const provider = await mockCline.providerRef.deref()
 			provider.context = { globalStorageUri: { fsPath: "/test/storage" } }
+			provider.contextProxy.getValue.mockReturnValue(true)
 			provider.getState.mockResolvedValue({
 				destructiveCommandGuardEnabled: true,
 				terminalShellIntegrationDisabled: true,
@@ -265,11 +270,13 @@ describe("executeCommandTool", () => {
 			})
 
 			expect(mockAskApproval).toHaveBeenCalledWith("command", "echo test")
+			expect(mockPushToolResult).toHaveBeenCalled()
 		})
 
 		it("installs or updates DCG before evaluating an enabled command", async () => {
 			const provider = await mockCline.providerRef.deref()
 			provider.context = { globalStorageUri: { fsPath: "/test/storage" } }
+			provider.contextProxy.getValue.mockReturnValue(true)
 			provider.getState.mockResolvedValue({
 				destructiveCommandGuardEnabled: true,
 				terminalShellIntegrationDisabled: true,
@@ -287,6 +294,7 @@ describe("executeCommandTool", () => {
 		it("fails closed when the DCG install or update fails", async () => {
 			const provider = await mockCline.providerRef.deref()
 			provider.context = { globalStorageUri: { fsPath: "/test/storage" } }
+			provider.contextProxy.getValue.mockReturnValue(true)
 			provider.getState.mockResolvedValue({
 				destructiveCommandGuardEnabled: true,
 				terminalShellIntegrationDisabled: true,
@@ -311,6 +319,7 @@ describe("executeCommandTool", () => {
 		it("fails closed when DCG is unavailable for the current platform", async () => {
 			const provider = await mockCline.providerRef.deref()
 			provider.context = { globalStorageUri: { fsPath: "/test/storage" } }
+			provider.contextProxy.getValue.mockReturnValue(true)
 			provider.getState.mockResolvedValue({
 				destructiveCommandGuardEnabled: true,
 				terminalShellIntegrationDisabled: true,

webview-ui/src/components/chat/__tests__/ChatRow.command-denied.spec.tsx

@@ -67,4 +67,11 @@ describe("ChatRow - denied commands", () => {
 		expect(screen.queryByText("chat:commandExecution.denied")).not.toBeInTheDocument()
 		expect(screen.getByTestId("command-execution")).toHaveAttribute("data-denied", "false")
 	})
+
+	it("does not show a denied status while a command awaits a decision", () => {
+		renderCommand()
+
+		expect(screen.queryByText("chat:commandExecution.denied")).not.toBeInTheDocument()
+		expect(screen.getByTestId("command-execution")).toHaveAttribute("data-denied", "false")
+	})
 })