fix(terminal): update unit tests for read()-in-TerminalRegistry architecture

Author: edelauna

src/__mocks__/vscode.js

@@ -81,6 +81,7 @@ export const window = {
 		sendText: () => {},
 	}),
 	onDidCloseTerminal: () => mockDisposable,
+	onDidChangeTerminalShellIntegration: () => mockDisposable,
 	createTextEditorDecorationType: () => ({ dispose: () => {} }),
 }
 

src/integrations/terminal/Terminal.ts

@@ -158,15 +158,16 @@ export class Terminal extends BaseTerminal {
 		}
 
 		return new Promise<void>((resolve, reject) => {
+			const ref = { disposable: null as vscode.Disposable | null }
 			const timer = setTimeout(() => {
-				disposable.dispose()
+				ref.disposable?.dispose()
 				reject(new Error(`Shell integration did not activate within ${timeoutMs / 1000}s`))
 			}, timeoutMs)
 
-			const disposable = vscode.window.onDidChangeTerminalShellIntegration((e) => {
+			ref.disposable = vscode.window.onDidChangeTerminalShellIntegration((e) => {
 				if (e.terminal === this.terminal) {
 					clearTimeout(timer)
-					disposable.dispose()
+					ref.disposable?.dispose()
 					resolve()
 				}
 			})

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

@@ -118,7 +118,9 @@ describe("TerminalProcess", () => {
 			// onDidEndTerminalShellExecution is a separate global VSCode event, not
 			// something coupled to the stream iterator being pulled again -- emit it
 			// independently of stream consumption, matching real-world timing.
-			terminalProcess.emit("shell_execution_complete", { exitCode: 0 })
+			// Use setTimeout(0) so it fires after microtask-based stream processing
+			// (async generator iterations) has consumed all chunks including the D marker.
+			setTimeout(() => terminalProcess.emit("shell_execution_complete", { exitCode: 0 }), 0)
 
 			await runPromise
 
@@ -363,10 +365,12 @@ describe("TerminalProcess", () => {
 			terminalProcess.once("no_shell_integration", noShellIntegrationSpy)
 
 			const runPromise = terminalProcess.run("test command")
+			// stream_available is now emitted by TerminalRegistry (onDidStartTerminalShellExecution).
+			// Simulate that here so run() can proceed to consume the stream.
+			terminalProcess.emit("stream_available", mockStream)
 			await runPromise
 			await eventPromises
 
-			expect(mockExecution.read).toHaveBeenCalledTimes(1)
 			expect(completedOutput).toBe("")
 			expect(noShellIntegrationSpy).not.toHaveBeenCalled()
 		})
@@ -396,10 +400,12 @@ describe("TerminalProcess", () => {
 			terminalProcess.once("no_shell_integration", noShellIntegrationSpy)
 
 			const runPromise = terminalProcess.run("test command")
+			// stream_available is now emitted by TerminalRegistry (onDidStartTerminalShellExecution).
+			// Simulate that here so run() can proceed to consume the stream.
+			terminalProcess.emit("stream_available", mockStream)
 			await runPromise
 			await eventPromises
 
-			expect(mockExecution.read).toHaveBeenCalledTimes(1)
 			expect(completedOutput).toBe("some output without marker\n")
 			expect(noShellIntegrationSpy).not.toHaveBeenCalled()
 		})
@@ -437,7 +443,9 @@ describe("TerminalProcess", () => {
 			// onDidEndTerminalShellExecution is a separate global VSCode event, not
 			// something coupled to the stream iterator being pulled again -- emit it
 			// independently of stream consumption, matching real-world timing.
-			terminalProcess.emit("shell_execution_complete", { exitCode: 0 })
+			// Use setTimeout(0) so it fires after microtask-based stream processing
+			// has consumed all chunks including the D marker.
+			setTimeout(() => terminalProcess.emit("shell_execution_complete", { exitCode: 0 }), 0)
 
 			await runPromise
 

src/integrations/terminal/__tests__/TerminalProcessExec.bash.spec.ts

@@ -228,18 +228,21 @@ async function testTerminalCommand(
 			})
 		}
 
-		// Wait for some output to be processed
-		await new Promise<void>((resolve) => {
-			terminalProcess.once("line", () => resolve())
-		})
-
-		// Then trigger the end event, referencing the SAME execution object as above.
+		// Trigger the end event after microtask-based stream consumption completes.
+		// The stream yields chunks as microtasks (async generator); setTimeout(0)
+		// fires after all pending microtasks, so the D marker will be consumed and
+		// the loop will have broken on sawEndMarker before this fires. Firing before
+		// that (e.g. after the first 'line' event) would cause DONE_SENTINEL to win
+		// the Promise.race and skip unconsumed chunks.
 		if (eventHandlers.endTerminalShellExecution) {
-			eventHandlers.endTerminalShellExecution({
-				terminal: mockTerminal,
-				execution: mockExecution,
-				exitCode: exitCode,
-			})
+			const _exitCode = exitCode
+			setTimeout(() => {
+				eventHandlers.endTerminalShellExecution({
+					terminal: mockTerminal,
+					execution: mockExecution,
+					exitCode: _exitCode,
+				})
+			}, 0)
 		}
 
 		// Store exit details for return