fix: address PR review comments

- Fix duplicate state variable declaration
- Add null check for provider.deref()
- Fix Italian translation typo
- Add test cases for PREVENT_TERMINAL_DISRUPTION behavior
- Keep existing comment explaining the feature

Author: liwilliam2021

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

@@ -472,4 +472,126 @@ describe("executeCommand", () => {
 			expect(mockTerminalInstance.getCurrentWorkingDirectory).toHaveBeenCalled()
 		})
 	})
+
+	describe("PREVENT_TERMINAL_DISRUPTION experiment", () => {
+		it("should not call terminal.show() when PREVENT_TERMINAL_DISRUPTION is enabled", async () => {
+			// Setup: Enable PREVENT_TERMINAL_DISRUPTION experiment
+			mockProvider.getState.mockResolvedValue({
+				terminalOutputLineLimit: 500,
+				terminalShellIntegrationDisabled: false,
+				experiments: { preventTerminalDisruption: true },
+			})
+
+			// Create a mock Terminal instance
+			const vscodeTerminal = new Terminal(1, undefined, "/test/project")
+			const mockVSCodeTerminal = vscodeTerminal as any
+			mockVSCodeTerminal.terminal = {
+				show: vitest.fn(),
+			}
+			mockVSCodeTerminal.getCurrentWorkingDirectory = vitest.fn().mockReturnValue("/test/project")
+			mockVSCodeTerminal.runCommand = vitest
+				.fn()
+				.mockImplementation((command: string, callbacks: RooTerminalCallbacks) => {
+					setTimeout(() => {
+						callbacks.onCompleted("Command output", mockProcess)
+						callbacks.onShellExecutionComplete({ exitCode: 0 }, mockProcess)
+					}, 0)
+					return mockProcess
+				})
+			;(TerminalRegistry.getOrCreateTerminal as any).mockResolvedValue(mockVSCodeTerminal)
+
+			const options: ExecuteCommandOptions = {
+				executionId: "test-123",
+				command: "echo test",
+				terminalShellIntegrationDisabled: false,
+				terminalOutputLineLimit: 500,
+			}
+
+			// Execute
+			await executeCommand(mockTask, options)
+
+			// Verify terminal.show() was NOT called
+			expect(mockVSCodeTerminal.terminal.show).not.toHaveBeenCalled()
+		})
+
+		it("should call terminal.show() when PREVENT_TERMINAL_DISRUPTION is disabled", async () => {
+			// Setup: Disable PREVENT_TERMINAL_DISRUPTION experiment
+			mockProvider.getState.mockResolvedValue({
+				terminalOutputLineLimit: 500,
+				terminalShellIntegrationDisabled: false,
+				experiments: { preventTerminalDisruption: false },
+			})
+
+			// Create a mock Terminal instance
+			const vscodeTerminal = new Terminal(1, undefined, "/test/project")
+			const mockVSCodeTerminal = vscodeTerminal as any
+			mockVSCodeTerminal.terminal = {
+				show: vitest.fn(),
+			}
+			mockVSCodeTerminal.getCurrentWorkingDirectory = vitest.fn().mockReturnValue("/test/project")
+			mockVSCodeTerminal.runCommand = vitest
+				.fn()
+				.mockImplementation((command: string, callbacks: RooTerminalCallbacks) => {
+					setTimeout(() => {
+						callbacks.onCompleted("Command output", mockProcess)
+						callbacks.onShellExecutionComplete({ exitCode: 0 }, mockProcess)
+					}, 0)
+					return mockProcess
+				})
+			;(TerminalRegistry.getOrCreateTerminal as any).mockResolvedValue(mockVSCodeTerminal)
+
+			const options: ExecuteCommandOptions = {
+				executionId: "test-123",
+				command: "echo test",
+				terminalShellIntegrationDisabled: false,
+				terminalOutputLineLimit: 500,
+			}
+
+			// Execute
+			await executeCommand(mockTask, options)
+
+			// Verify terminal.show() was called
+			expect(mockVSCodeTerminal.terminal.show).toHaveBeenCalledWith(true)
+		})
+
+		it("should call terminal.show() when PREVENT_TERMINAL_DISRUPTION is not present in experiments", async () => {
+			// Setup: No PREVENT_TERMINAL_DISRUPTION in experiments
+			mockProvider.getState.mockResolvedValue({
+				terminalOutputLineLimit: 500,
+				terminalShellIntegrationDisabled: false,
+				experiments: {},
+			})
+
+			// Create a mock Terminal instance
+			const vscodeTerminal = new Terminal(1, undefined, "/test/project")
+			const mockVSCodeTerminal = vscodeTerminal as any
+			mockVSCodeTerminal.terminal = {
+				show: vitest.fn(),
+			}
+			mockVSCodeTerminal.getCurrentWorkingDirectory = vitest.fn().mockReturnValue("/test/project")
+			mockVSCodeTerminal.runCommand = vitest
+				.fn()
+				.mockImplementation((command: string, callbacks: RooTerminalCallbacks) => {
+					setTimeout(() => {
+						callbacks.onCompleted("Command output", mockProcess)
+						callbacks.onShellExecutionComplete({ exitCode: 0 }, mockProcess)
+					}, 0)
+					return mockProcess
+				})
+			;(TerminalRegistry.getOrCreateTerminal as any).mockResolvedValue(mockVSCodeTerminal)
+
+			const options: ExecuteCommandOptions = {
+				executionId: "test-123",
+				command: "echo test",
+				terminalShellIntegrationDisabled: false,
+				terminalOutputLineLimit: 500,
+			}
+
+			// Execute
+			await executeCommand(mockTask, options)
+
+			// Verify terminal.show() was called
+			expect(mockVSCodeTerminal.terminal.show).toHaveBeenCalledWith(true)
+		})
+	})
 })

src/core/tools/executeCommandTool.ts

@@ -245,8 +245,8 @@ export async function executeCommand(
 		// Check if PREVENT_TERMINAL_DISRUPTION is enabled
 		// This experimental feature allows commands to run in the background without
 		// automatically switching focus to the terminal output, improving workflow continuity
-		const state = await task.providerRef.deref()?.getState()
-		const state = await task.providerRef.deref()?.getState()
+		const provider = task.providerRef.deref()
+		const state = provider ? await provider.getState() : null
 		const preventTerminalDisruption = experiments.isEnabled(
 			state?.experiments ?? {},
 			EXPERIMENT_IDS.PREVENT_TERMINAL_DISRUPTION,