fix(vscode-terminal): address Greptile review feedback

- Call `iterator.return?.()` in the `finally` block so the async
  iterator is signalled to clean up on early exit (previously handled
  implicitly by the `for await` loop this replaced).
- Capture `exitCode` from `onDidEndTerminalShellExecution` when the
  stream never yields its own `]633;D` marker (e.g. parse-rejected
  commands), so downstream can distinguish parse errors from normal
  completions.

Made-with: Cursor

src/hosts/vscode/terminal/VscodeTerminalProcess.ts

@@ -66,26 +66,57 @@ export class VscodeTerminalProcess extends EventEmitter<TerminalProcessEvents> i
 			let didOutputNonCommand = false
 			let didEmitEmptyLine = false
 
-			for await (let data of stream) {
-				// Parse shell integration completion markers when present.
-				// Sequence format: ]633;D;<exitCode>
-				const completionMatches = [...data.matchAll(/\]633;D(?:;(-?\d+))?/g)]
-				const latestCompletionMatch = completionMatches[completionMatches.length - 1]
-				if (latestCompletionMatch?.[1] !== undefined) {
-					const parsedExitCode = Number.parseInt(latestCompletionMatch[1], 10)
-					if (Number.isInteger(parsedExitCode)) {
-						this.exitCode = parsedExitCode
+			// Fallback end signal: if the shell rejects a command at parse time, the stream
+			// yields nothing and never closes. VS Code still fires end-of-execution for the
+			// terminal's shell integration, so race the stream against that event and exit
+			// the loop if it fires. The event's `execution` property is not reference-equal
+			// to the one returned by executeCommand(); match on `shellIntegration` instead.
+			const END_SENTINEL: unique symbol = Symbol("end-of-execution")
+			let resolveEndOfExecution: () => void = () => {}
+			const endOfExecutionPromise = new Promise<typeof END_SENTINEL>((resolve) => {
+				resolveEndOfExecution = () => resolve(END_SENTINEL)
+			})
+			const endOfExecutionDisposable = (vscode.window as any).onDidEndTerminalShellExecution?.((e: any) => {
+				if (e?.shellIntegration === terminal.shellIntegration) {
+					// Capture exit code from the event when the stream never yields its own ]633;D marker
+					// (e.g. parse-rejected commands). Available on VS Code 1.93+.
+					if (this.exitCode === undefined && typeof e?.exitCode === "number") {
+						this.exitCode = e.exitCode
 					}
+					resolveEndOfExecution()
 				}
+			})
 
-				// 1. Process chunk and remove artifacts
-				if (isFirstChunk) {
-					/*
+			const iterator = stream[Symbol.asyncIterator]()
+			try {
+				while (true) {
+					const next = await Promise.race([iterator.next(), endOfExecutionPromise])
+					if (next === END_SENTINEL) {
+						break
+					}
+					if (next.done) {
+						break
+					}
+					let data = next.value
+					// Parse shell integration completion markers when present.
+					// Sequence format: ]633;D;<exitCode>
+					const completionMatches = [...data.matchAll(/\]633;D(?:;(-?\d+))?/g)]
+					const latestCompletionMatch = completionMatches[completionMatches.length - 1]
+					if (latestCompletionMatch?.[1] !== undefined) {
+						const parsedExitCode = Number.parseInt(latestCompletionMatch[1], 10)
+						if (Number.isInteger(parsedExitCode)) {
+							this.exitCode = parsedExitCode
+						}
+					}
+
+					// 1. Process chunk and remove artifacts
+					if (isFirstChunk) {
+						/*
 					The first chunk we get from this stream needs to be processed to be more human readable, ie remove vscode's custom escape sequences and identifiers, removing duplicate first char bug, etc.
 					*/
 
-					// bug where sometimes the command output makes its way into vscode shell integration metadata
-					/*
+						// bug where sometimes the command output makes its way into vscode shell integration metadata
+						/*
 					]633 is a custom sequence number used by VSCode shell integration:
 					- OSC 633 ; A ST - Mark prompt start
 					- OSC 633 ; B ST - Mark prompt end
@@ -93,119 +124,125 @@ export class VscodeTerminalProcess extends EventEmitter<TerminalProcessEvents> i
 					- OSC 633 ; D [; <exitcode>] ST - Mark execution finished with optional exit code
 					- OSC 633 ; E ; <commandline> [; <nonce>] ST - Explicitly set command line with optional nonce
 					*/
-					// if you print this data you might see something like "eecho hello worldo hello world;5ba85d14-e92a-40c4-b2fd-71525581eeb0]633;C" but this is actually just a bunch of escape sequences, ignore up to the first ;C
-					/* ddateb15026-6a64-40db-b21f-2a621a9830f0]633;CTue Sep 17 06:37:04 EDT 2024 % ]633;D;0]633;P;Cwd=/Users/saoud/Repositories/test */
-					// Gets output between ]633;C (command start) and ]633;D (command end)
-					const outputBetweenSequences = this.removeLastLineArtifacts(
-						data.match(/\]633;C([\s\S]*?)\]633;D/)?.[1] || "",
-					).trim()
+						// if you print this data you might see something like "eecho hello worldo hello world;5ba85d14-e92a-40c4-b2fd-71525581eeb0]633;C" but this is actually just a bunch of escape sequences, ignore up to the first ;C
+						/* ddateb15026-6a64-40db-b21f-2a621a9830f0]633;CTue Sep 17 06:37:04 EDT 2024 % ]633;D;0]633;P;Cwd=/Users/saoud/Repositories/test */
+						// Gets output between ]633;C (command start) and ]633;D (command end)
+						const outputBetweenSequences = this.removeLastLineArtifacts(
+							data.match(/\]633;C([\s\S]*?)\]633;D/)?.[1] || "",
+						).trim()
 
-					// Once we've retrieved any potential output between sequences, we can remove everything up to end of the last sequence
-					// https://code.visualstudio.com/docs/terminal/shell-integration#_vs-code-custom-sequences-osc-633-st
-					const vscodeSequenceRegex = /\x1b\]633;.[^\x07]*\x07/g
-					const lastMatch = [...data.matchAll(vscodeSequenceRegex)].pop()
-					if (lastMatch && lastMatch.index !== undefined) {
-						data = data.slice(lastMatch.index + lastMatch[0].length)
+						// Once we've retrieved any potential output between sequences, we can remove everything up to end of the last sequence
+						// https://code.visualstudio.com/docs/terminal/shell-integration#_vs-code-custom-sequences-osc-633-st
+						const vscodeSequenceRegex = /\x1b\]633;.[^\x07]*\x07/g
+						const lastMatch = [...data.matchAll(vscodeSequenceRegex)].pop()
+						if (lastMatch && lastMatch.index !== undefined) {
+							data = data.slice(lastMatch.index + lastMatch[0].length)
+						}
+						// Place output back after removing vscode sequences
+						if (outputBetweenSequences) {
+							data = outputBetweenSequences + "\n" + data
+						}
+						// remove ansi
+						data = stripAnsi(data)
+						// Split data by newlines
+						const lines = data ? data.split("\n") : []
+						// Remove non-human readable characters from the first line
+						if (lines.length > 0) {
+							lines[0] = lines[0].replace(/[^\x20-\x7E]/g, "")
+						}
+						// Check for duplicated first character that might be a terminal artifact
+						// But skip this check for known syntax characters like {, [, ", etc.
+						if (
+							lines.length > 0 &&
+							lines[0].length >= 2 &&
+							lines[0][0] === lines[0][1] &&
+							!["[", "{", '"', "'", "<", "("].includes(lines[0][0])
+						) {
+							lines[0] = lines[0].slice(1)
+						}
+						// Only remove specific terminal artifacts from line beginnings while preserving JSON syntax
+						if (lines.length > 0) {
+							// This regex only removes common terminal artifacts (%, $, >, #) and invisible control chars
+							// but preserves important syntax chars like {, [, ", etc.
+							lines[0] = lines[0].replace(/^[\x00-\x1F%$>#\s]*/, "")
+						}
+						if (lines.length > 1) {
+							lines[1] = lines[1].replace(/^[\x00-\x1F%$>#\s]*/, "")
+						}
+						// Join lines back
+						data = lines.join("\n")
+						isFirstChunk = false
+					} else {
+						data = stripAnsi(data)
 					}
-					// Place output back after removing vscode sequences
-					if (outputBetweenSequences) {
-						data = outputBetweenSequences + "\n" + data
-					}
-					// remove ansi
-					data = stripAnsi(data)
-					// Split data by newlines
-					const lines = data ? data.split("\n") : []
-					// Remove non-human readable characters from the first line
-					if (lines.length > 0) {
-						lines[0] = lines[0].replace(/[^\x20-\x7E]/g, "")
-					}
-					// Check for duplicated first character that might be a terminal artifact
-					// But skip this check for known syntax characters like {, [, ", etc.
-					if (
-						lines.length > 0 &&
-						lines[0].length >= 2 &&
-						lines[0][0] === lines[0][1] &&
-						!["[", "{", '"', "'", "<", "("].includes(lines[0][0])
-					) {
-						lines[0] = lines[0].slice(1)
-					}
-					// Only remove specific terminal artifacts from line beginnings while preserving JSON syntax
-					if (lines.length > 0) {
-						// This regex only removes common terminal artifacts (%, $, >, #) and invisible control chars
-						// but preserves important syntax chars like {, [, ", etc.
-						lines[0] = lines[0].replace(/^[\x00-\x1F%$>#\s]*/, "")
-					}
-					if (lines.length > 1) {
-						lines[1] = lines[1].replace(/^[\x00-\x1F%$>#\s]*/, "")
-					}
-					// Join lines back
-					data = lines.join("\n")
-					isFirstChunk = false
-				} else {
-					data = stripAnsi(data)
-				}
 
-				// Ctrl+C detection: if user presses Ctrl+C, treat as command terminated
-				if (data.includes("^C") || data.includes("\u0003")) {
+					// Ctrl+C detection: if user presses Ctrl+C, treat as command terminated
+					if (data.includes("^C") || data.includes("\u0003")) {
+						if (this.hotTimer) {
+							clearTimeout(this.hotTimer)
+						}
+						this.isHot = false
+						break
+					}
+
+					// first few chunks could be the command being echoed back, so we must ignore
+					// note this means that 'echo' commands won't work
+					if (!didOutputNonCommand) {
+						const lines = data.split("\n")
+						for (let i = 0; i < lines.length; i++) {
+							if (command.includes(lines[i].trim())) {
+								lines.splice(i, 1)
+								i-- // Adjust index after removal
+							} else {
+								didOutputNonCommand = true
+								break
+							}
+						}
+						data = lines.join("\n")
+					}
+
+					// 2. Set isHot depending on the command
+					// Set to hot to stall API requests until terminal is cool again
+					this.isHot = true
 					if (this.hotTimer) {
 						clearTimeout(this.hotTimer)
 					}
-					this.isHot = false
-					break
-				}
+					// these markers indicate the command is some kind of local dev server recompiling the app, which we want to wait for output of before sending request to cline
+					const isCompiling = isCompilingOutput(data)
+					this.hotTimer = setTimeout(
+						() => {
+							this.isHot = false
+						},
+						isCompiling ? PROCESS_HOT_TIMEOUT_COMPILING : PROCESS_HOT_TIMEOUT_NORMAL,
+					)
 
-				// first few chunks could be the command being echoed back, so we must ignore
-				// note this means that 'echo' commands won't work
-				if (!didOutputNonCommand) {
-					const lines = data.split("\n")
-					for (let i = 0; i < lines.length; i++) {
-						if (command.includes(lines[i].trim())) {
-							lines.splice(i, 1)
-							i-- // Adjust index after removal
-						} else {
-							didOutputNonCommand = true
-							break
-						}
+					// For non-immediately returning commands we want to show loading spinner right away but this wouldn't happen until it emits a line break, so as soon as we get any output we emit "" to let webview know to show spinner
+					// This is only done for the sake of unblocking the UI, in case there may be some time before the command emits a full line
+					if (!didEmitEmptyLine && !this.fullOutput && data) {
+						this.emit("line", "") // empty line to indicate start of command output stream
+						didEmitEmptyLine = true
 					}
-					data = lines.join("\n")
-				}
 
-				// 2. Set isHot depending on the command
-				// Set to hot to stall API requests until terminal is cool again
-				this.isHot = true
-				if (this.hotTimer) {
-					clearTimeout(this.hotTimer)
-				}
-				// these markers indicate the command is some kind of local dev server recompiling the app, which we want to wait for output of before sending request to cline
-				const isCompiling = isCompilingOutput(data)
-				this.hotTimer = setTimeout(
-					() => {
-						this.isHot = false
-					},
-					isCompiling ? PROCESS_HOT_TIMEOUT_COMPILING : PROCESS_HOT_TIMEOUT_NORMAL,
-				)
+					this.fullOutput += data
 
-				// For non-immediately returning commands we want to show loading spinner right away but this wouldn't happen until it emits a line break, so as soon as we get any output we emit "" to let webview know to show spinner
-				// This is only done for the sake of unblocking the UI, in case there may be some time before the command emits a full line
-				if (!didEmitEmptyLine && !this.fullOutput && data) {
-					this.emit("line", "") // empty line to indicate start of command output stream
-					didEmitEmptyLine = true
-				}
+					// Cap fullOutput at MAX_FULL_OUTPUT_SIZE to prevent memory exhaustion
+					if (this.fullOutput.length > MAX_FULL_OUTPUT_SIZE) {
+						// Keep last half of max size
+						this.fullOutput = this.fullOutput.slice(-MAX_FULL_OUTPUT_SIZE / 2)
+						// Reset lastRetrievedIndex since we truncated the beginning
+						this.lastRetrievedIndex = 0
+					}
 
-				this.fullOutput += data
-
-				// Cap fullOutput at MAX_FULL_OUTPUT_SIZE to prevent memory exhaustion
-				if (this.fullOutput.length > MAX_FULL_OUTPUT_SIZE) {
-					// Keep last half of max size
-					this.fullOutput = this.fullOutput.slice(-MAX_FULL_OUTPUT_SIZE / 2)
-					// Reset lastRetrievedIndex since we truncated the beginning
-					this.lastRetrievedIndex = 0
-				}
-
-				if (this.isListening) {
-					this.emitIfEol(data)
-					this.lastRetrievedIndex = this.fullOutput.length - this.buffer.length
+					if (this.isListening) {
+						this.emitIfEol(data)
+						this.lastRetrievedIndex = this.fullOutput.length - this.buffer.length
+					}
 				}
+			} finally {
+				endOfExecutionDisposable?.dispose?.()
+				// Signal the async iterator to clean up on early exit. `for await` does this
+				// automatically on `break`; we're using a manual while loop so call it explicitly.
+				await iterator.return?.()
 			}
 
 			this.emitRemainingBufferIfListening()