fix: Resolve merge conflicts for PR #6587 - combine preventTerminalDisruption experiment with existing experiments

Author: roomote

packages/types/src/experiment.ts

@@ -12,6 +12,8 @@ export const experimentIds = [
 	"preventFocusDisruption",
 	"imageGeneration",
 	"runSlashCommand",
+	"preventTerminalDisruption",
+	"assistantMessageParser",
 ] as const
 
 export const experimentIdsSchema = z.enum(experimentIds)
@@ -28,6 +30,8 @@ export const experimentsSchema = z.object({
 	preventFocusDisruption: z.boolean().optional(),
 	imageGeneration: z.boolean().optional(),
 	runSlashCommand: z.boolean().optional(),
+	preventTerminalDisruption: z.boolean().optional(),
+	assistantMessageParser: z.boolean().optional(),
 })
 
 export type Experiments = z.infer<typeof experimentsSchema>

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

@@ -42,6 +42,7 @@ describe("executeCommand", () => {
 			getState: vitest.fn().mockResolvedValue({
 				terminalOutputLineLimit: 500,
 				terminalShellIntegrationDisabled: false,
+				experiments: {},
 			}),
 		}
 
@@ -50,7 +51,7 @@ describe("executeCommand", () => {
 			cwd: "/test/project",
 			taskId: "test-task-123",
 			providerRef: {
-				deref: vitest.fn().mockResolvedValue(mockProvider),
+				deref: vitest.fn().mockReturnValue(mockProvider),
 			},
 			say: vitest.fn().mockResolvedValue(undefined),
 			terminalProcess: undefined,
@@ -451,4 +452,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/__tests__/executeCommandTool.preventTerminalDisruption.integration.spec.ts

@@ -0,0 +1,42 @@
+// Integration test for PREVENT_TERMINAL_DISRUPTION functionality
+// npx vitest run src/core/tools/__tests__/executeCommandTool.preventTerminalDisruption.integration.spec.ts
+
+import { EXPERIMENT_IDS, experiments } from "../../../shared/experiments"
+
+describe("PREVENT_TERMINAL_DISRUPTION integration", () => {
+	it("should have PREVENT_TERMINAL_DISRUPTION experiment defined", () => {
+		expect(EXPERIMENT_IDS.PREVENT_TERMINAL_DISRUPTION).toBe("preventTerminalDisruption")
+	})
+
+	it("should correctly check if PREVENT_TERMINAL_DISRUPTION is enabled", () => {
+		// Test when experiment is disabled (default)
+		const disabledConfig = { preventTerminalDisruption: false }
+		expect(experiments.isEnabled(disabledConfig, EXPERIMENT_IDS.PREVENT_TERMINAL_DISRUPTION)).toBe(false)
+
+		// Test when experiment is enabled
+		const enabledConfig = { preventTerminalDisruption: true }
+		expect(experiments.isEnabled(enabledConfig, EXPERIMENT_IDS.PREVENT_TERMINAL_DISRUPTION)).toBe(true)
+
+		// Test when experiment is not in config (should use default)
+		const emptyConfig = {}
+		expect(experiments.isEnabled(emptyConfig, EXPERIMENT_IDS.PREVENT_TERMINAL_DISRUPTION)).toBe(false)
+	})
+
+	it("should verify the executeCommandTool imports experiments correctly", async () => {
+		// This test verifies that the executeCommandTool module can import and use experiments
+		const executeCommandModule = await import("../executeCommandTool")
+		expect(executeCommandModule).toBeDefined()
+		expect(executeCommandModule.executeCommand).toBeDefined()
+		expect(executeCommandModule.executeCommandTool).toBeDefined()
+	})
+
+	it("should verify Terminal class structure for show method", async () => {
+		// This test verifies the Terminal class has the expected structure
+		const terminalModule = await import("../../../integrations/terminal/Terminal")
+		expect(terminalModule.Terminal).toBeDefined()
+
+		// The Terminal class should have a constructor that accepts a terminal
+		const Terminal = terminalModule.Terminal
+		expect(typeof Terminal).toBe("function")
+	})
+})

src/core/tools/executeCommandTool.ts

@@ -17,6 +17,7 @@ import { TerminalRegistry } from "../../integrations/terminal/TerminalRegistry"
 import { Terminal } from "../../integrations/terminal/Terminal"
 import { Package } from "../../shared/package"
 import { t } from "../../i18n"
+import { EXPERIMENT_IDS, experiments } from "../../shared/experiments"
 
 class ShellIntegrationError extends Error {}
 
@@ -241,7 +242,20 @@ export async function executeCommand(
 	const terminal = await TerminalRegistry.getOrCreateTerminal(workingDir, task.taskId, terminalProvider)
 
 	if (terminal instanceof Terminal) {
-		terminal.terminal.show(true)
+		// 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 provider = task.providerRef.deref()
+		const state = provider ? await provider.getState() : null
+		const preventTerminalDisruption = experiments.isEnabled(
+			state?.experiments ?? {},
+			EXPERIMENT_IDS.PREVENT_TERMINAL_DISRUPTION,
+		)
+
+		// Only show terminal if PREVENT_TERMINAL_DISRUPTION is not enabled
+		if (!preventTerminalDisruption) {
+			terminal.terminal.show(true)
+		}
 
 		// Update the working directory in case the terminal we asked for has
 		// a different working directory so that the model will know where the

src/shared/__tests__/experiments-preventTerminalDisruption.spec.ts

@@ -0,0 +1,30 @@
+import { EXPERIMENT_IDS, experimentConfigsMap, experimentDefault, experiments } from "../experiments"
+
+describe("PREVENT_TERMINAL_DISRUPTION experiment", () => {
+	it("should include PREVENT_TERMINAL_DISRUPTION in EXPERIMENT_IDS", () => {
+		expect(EXPERIMENT_IDS.PREVENT_TERMINAL_DISRUPTION).toBe("preventTerminalDisruption")
+	})
+
+	it("should have PREVENT_TERMINAL_DISRUPTION in experimentConfigsMap", () => {
+		expect(experimentConfigsMap.PREVENT_TERMINAL_DISRUPTION).toBeDefined()
+		expect(experimentConfigsMap.PREVENT_TERMINAL_DISRUPTION.enabled).toBe(false)
+	})
+
+	it("should have PREVENT_TERMINAL_DISRUPTION in experimentDefault", () => {
+		expect(experimentDefault.preventTerminalDisruption).toBe(false)
+	})
+
+	it("should correctly check if PREVENT_TERMINAL_DISRUPTION is enabled", () => {
+		// Test when experiment is disabled (default)
+		const disabledConfig = { preventTerminalDisruption: false }
+		expect(experiments.isEnabled(disabledConfig, EXPERIMENT_IDS.PREVENT_TERMINAL_DISRUPTION)).toBe(false)
+
+		// Test when experiment is enabled
+		const enabledConfig = { preventTerminalDisruption: true }
+		expect(experiments.isEnabled(enabledConfig, EXPERIMENT_IDS.PREVENT_TERMINAL_DISRUPTION)).toBe(true)
+
+		// Test when experiment is not in config (should use default)
+		const emptyConfig = {}
+		expect(experiments.isEnabled(emptyConfig, EXPERIMENT_IDS.PREVENT_TERMINAL_DISRUPTION)).toBe(false)
+	})
+})

src/shared/__tests__/experiments.spec.ts

@@ -31,6 +31,8 @@ describe("experiments", () => {
 				preventFocusDisruption: false,
 				imageGeneration: false,
 				runSlashCommand: false,
+				preventTerminalDisruption: false,
+				assistantMessageParser: false,
 			}
 			expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.POWER_STEERING)).toBe(false)
 		})
@@ -42,6 +44,8 @@ describe("experiments", () => {
 				preventFocusDisruption: false,
 				imageGeneration: false,
 				runSlashCommand: false,
+				preventTerminalDisruption: false,
+				assistantMessageParser: false,
 			}
 			expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.POWER_STEERING)).toBe(true)
 		})
@@ -53,6 +57,8 @@ describe("experiments", () => {
 				preventFocusDisruption: false,
 				imageGeneration: false,
 				runSlashCommand: false,
+				preventTerminalDisruption: false,
+				assistantMessageParser: false,
 			}
 			expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.POWER_STEERING)).toBe(false)
 		})

src/shared/experiments.ts

@@ -6,6 +6,8 @@ export const EXPERIMENT_IDS = {
 	PREVENT_FOCUS_DISRUPTION: "preventFocusDisruption",
 	IMAGE_GENERATION: "imageGeneration",
 	RUN_SLASH_COMMAND: "runSlashCommand",
+	PREVENT_TERMINAL_DISRUPTION: "preventTerminalDisruption",
+	ASSISTANT_MESSAGE_PARSER: "assistantMessageParser",
 } as const satisfies Record<string, ExperimentId>
 
 type _AssertExperimentIds = AssertEqual<Equals<ExperimentId, Values<typeof EXPERIMENT_IDS>>>
@@ -22,6 +24,8 @@ export const experimentConfigsMap: Record<ExperimentKey, ExperimentConfig> = {
 	PREVENT_FOCUS_DISRUPTION: { enabled: false },
 	IMAGE_GENERATION: { enabled: false },
 	RUN_SLASH_COMMAND: { enabled: false },
+	PREVENT_TERMINAL_DISRUPTION: { enabled: false },
+	ASSISTANT_MESSAGE_PARSER: { enabled: false },
 }
 
 export const experimentDefault = Object.fromEntries(

webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx

@@ -235,6 +235,8 @@ describe("mergeExtensionState", () => {
 				newTaskRequireTodos: false,
 				imageGeneration: false,
 				runSlashCommand: false,
+				preventTerminalDisruption: false,
+				assistantMessageParser: false,
 			} as Record<ExperimentId, boolean>,
 		}
 
@@ -255,6 +257,8 @@ describe("mergeExtensionState", () => {
 			newTaskRequireTodos: false,
 			imageGeneration: false,
 			runSlashCommand: false,
+			preventTerminalDisruption: false,
+			assistantMessageParser: false,
 		})
 	})
 })