fix(terminal): avoid replaying commands after shell integration failure

Author: edelauna

src/core/webview/__tests__/webviewMessageHandler.spec.ts

@@ -876,6 +876,10 @@ describe("webviewMessageHandler - terminalProfile", () => {
 		vi.clearAllMocks()
 	})
 
+	afterEach(() => {
+		vi.restoreAllMocks()
+	})
+
 	it("bridges a saved terminalProfile from updateSettings into the process-wide terminal state", async () => {
 		const setTerminalProfileSpy = vi.spyOn(Terminal, "setTerminalProfile").mockImplementation(() => {})
 
@@ -885,8 +889,6 @@ describe("webviewMessageHandler - terminalProfile", () => {
 		})
 
 		expect(setTerminalProfileSpy).toHaveBeenCalledWith("Git Bash")
-
-		setTerminalProfileSpy.mockRestore()
 	})
 
 	it("clears the terminal profile when updateSettings sends undefined", async () => {
@@ -898,8 +900,6 @@ describe("webviewMessageHandler - terminalProfile", () => {
 		})
 
 		expect(setTerminalProfileSpy).toHaveBeenCalledWith(undefined)
-
-		setTerminalProfileSpy.mockRestore()
 	})
 })
 

src/integrations/terminal/TerminalProcess.ts

@@ -229,30 +229,21 @@ export class TerminalProcess extends BaseTerminalProcess {
 		} else {
 			const inspectPreOutput = inspect(preOutput, { colors: false, breakLength: Infinity })
 
-			// Empty stream (preOutput === '') is a first-run race: VS Code fires
-			// onDidStartTerminalShellExecution before the shell is fully initialized on
-			// a freshly-created terminal. The command was never submitted, so this is
-			// retryable (commandSubmitted: false triggers the execa fallback).
-			//
-			// Non-empty preOutput means the stream had data but ]633;C never arrived —
-			// a genuine shell integration failure after submission (not retryable).
-			const commandSubmitted = preOutput !== ""
-
-			const errorMsg = commandSubmitted
-				? "VSCE output start escape sequence (]633;C or ]133;C) not received, but the stream has started. Upstream VSCE Bug?"
-				: "VSCE shell integration stream completed with no output on first command (shell startup race). Command was not submitted."
+			// executeCommand() has already been called, so an empty stream cannot prove
+			// the command was never submitted. Treat the status as submitted/unknown to
+			// avoid replaying a potentially side-effecting command through Execa.
+			const errorMsg =
+				"VSCE output start escape sequence (]633;C or ]133;C) not received after command submission. Command execution status is unknown."
 
 			console.error(`[Terminal Process] ${errorMsg} preOutput: ${inspectPreOutput}`)
 
-			this.emit("no_shell_integration", { message: errorMsg, commandSubmitted })
+			this.emit("no_shell_integration", { message: errorMsg, commandSubmitted: true })
 
 			this.emit(
 				"completed",
-				commandSubmitted
-					? "<VSCE shell integration markers not found: terminal output and command execution status is unknown>\n" +
-							`<preOutput>${inspectPreOutput}</preOutput>\n` +
-							"AI MODEL: You MUST notify the user with the information above so they can open a bug report."
-					: "<shell integration stream was empty on first execution: command was not submitted>",
+				"<VSCE shell integration markers not found: terminal output and command execution status is unknown>\n" +
+					`<preOutput>${inspectPreOutput}</preOutput>\n` +
+					"AI MODEL: You MUST notify the user with the information above so they can open a bug report.",
 			)
 
 			this.continue()

src/integrations/terminal/__tests__/TerminalProcess.spec.ts

@@ -140,7 +140,7 @@ describe("TerminalProcess", () => {
 			consoleWarnSpy.mockRestore()
 		})
 
-		it("emits no_shell_integration with commandSubmitted=false when stream is empty (first-run startup race)", async () => {
+		it("emits no_shell_integration with commandSubmitted=true when stream is empty after submission", async () => {
 			const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {})
 
 			let details: { message: string; commandSubmitted: boolean } | undefined
@@ -173,7 +173,7 @@ describe("TerminalProcess", () => {
 			await runPromise
 			await eventPromises
 
-			expect(details?.commandSubmitted).toBe(false)
+			expect(details?.commandSubmitted).toBe(true)
 			consoleErrorSpy.mockRestore()
 		})
 

src/integrations/terminal/__tests__/TerminalProfile.spec.ts

@@ -120,6 +120,7 @@ describe("Terminal VS Code terminal profile (#277)", () => {
 				linux: {
 					zsh: { path: "/bin/zsh" },
 					PowerShell: { source: "PowerShell" },
+					disabled: null,
 					bash: { path: "/bin/bash" },
 					missing: { path: "/missing/bash" },
 				},