done

Author: liwilliam2021

packages/types/src/experiment.ts

@@ -6,7 +6,12 @@ import type { Keys, Equals, AssertEqual } from "./type-fu.js"
  * ExperimentId
  */
 
-export const experimentIds = ["powerSteering", "multiFileApplyDiff", "preventFocusDisruption"] as const
+export const experimentIds = [
+	"powerSteering",
+	"multiFileApplyDiff",
+	"preventFocusDisruption",
+	"preventTerminalDisruption",
+] as const
 
 export const experimentIdsSchema = z.enum(experimentIds)
 
@@ -20,6 +25,7 @@ export const experimentsSchema = z.object({
 	powerSteering: z.boolean().optional(),
 	multiFileApplyDiff: z.boolean().optional(),
 	preventFocusDisruption: z.boolean().optional(),
+	preventTerminalDisruption: z.boolean().optional(),
 })
 
 export type Experiments = z.infer<typeof experimentsSchema>

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,17 @@ export async function executeCommand(
 	const terminal = await TerminalRegistry.getOrCreateTerminal(workingDir, !!customCwd, task.taskId, terminalProvider)
 
 	if (terminal instanceof Terminal) {
-		terminal.terminal.show(true)
+		// Check if PREVENT_TERMINAL_DISRUPTION is enabled
+		const state = await task.providerRef.deref()?.getState()
+		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/experiments.ts

@@ -4,6 +4,7 @@ export const EXPERIMENT_IDS = {
 	MULTI_FILE_APPLY_DIFF: "multiFileApplyDiff",
 	POWER_STEERING: "powerSteering",
 	PREVENT_FOCUS_DISRUPTION: "preventFocusDisruption",
+	PREVENT_TERMINAL_DISRUPTION: "preventTerminalDisruption",
 } as const satisfies Record<string, ExperimentId>
 
 type _AssertExperimentIds = AssertEqual<Equals<ExperimentId, Values<typeof EXPERIMENT_IDS>>>
@@ -18,6 +19,7 @@ export const experimentConfigsMap: Record<ExperimentKey, ExperimentConfig> = {
 	MULTI_FILE_APPLY_DIFF: { enabled: false },
 	POWER_STEERING: { enabled: false },
 	PREVENT_FOCUS_DISRUPTION: { enabled: false },
+	PREVENT_TERMINAL_DISRUPTION: { enabled: false },
 }
 
 export const experimentDefault = Object.fromEntries(

webview-ui/src/i18n/locales/ca/settings.json

@@ -685,6 +685,10 @@
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "Background editing",
 			"description": "Prevent editor focus disruption when enabled. File edits happen in the background without opening diff views or stealing focus. You can continue working uninterrupted while Roo makes changes. Files can be opened without focus to capture diagnostics or kept closed entirely."
+		},
+		"PREVENT_TERMINAL_DISRUPTION": {
+			"name": "Background terminal execution",
+			"description": "Prevent terminal focus disruption when enabled. Commands execute in the background without automatically switching to output terminals. You can continue working in your current terminal while Roo runs commands, maintaining your terminal context and manually controlling when to view command outputs."
 		}
 	},
 	"promptCaching": {