revert(terminal): replace pWaitFor with event-based shell integration wait

Author: edelauna

src/__mocks__/vscode.js

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

src/integrations/terminal/Terminal.ts

@@ -2,6 +2,7 @@ import { existsSync } from "fs"
 import * as path from "path"
 
 import * as vscode from "vscode"
+import pWaitFor from "p-wait-for"
 
 import type { RooTerminalCallbacks, RooTerminalProcessResultPromise } from "./types"
 import { BaseTerminal } from "./BaseTerminal"
@@ -98,30 +99,6 @@ export class Terminal extends BaseTerminal {
 				reject(error)
 			})
 
-			// Wait for shell integration before executing the command. Use the
-			// event-based API rather than polling so we react immediately when
-			// VS Code's injector fires instead of burning CPU on a tight loop.
-			const waitForShellIntegration = (): Promise<void> => {
-				if (this.terminal.shellIntegration !== undefined) {
-					return Promise.resolve()
-				}
-
-				return new Promise<void>((res, rej) => {
-					const timeoutId = setTimeout(() => {
-						disposable.dispose()
-						rej(new Error("timeout"))
-					}, Terminal.getShellIntegrationTimeout())
-
-					const disposable = vscode.window.onDidChangeTerminalShellIntegration(({ terminal }) => {
-						if (terminal === this.terminal) {
-							clearTimeout(timeoutId)
-							disposable.dispose()
-							res()
-						}
-					})
-				})
-			}
-
 			if (Terminal.isActiveShellCmdExe()) {
 				// cmd.exe cannot emit OSC 633;A — skip the timeout entirely and go
 				// straight to the execa fallback (VS Code issue #164646).
@@ -132,7 +109,10 @@ export class Terminal extends BaseTerminal {
 					commandSubmitted: false,
 				})
 			} else {
-				waitForShellIntegration()
+				// Wait for shell integration before executing the command.
+				pWaitFor(() => this.terminal.shellIntegration !== undefined, {
+					timeout: Terminal.getShellIntegrationTimeout(),
+				})
 					.then(() => {
 						// Clean up temporary directory if shell integration is available, zsh did its job:
 						ShellIntegrationManager.zshCleanupTmpDir(this.id)