Consolidate process data handlers and split by 633;C

Author: Tyriar

src/vs/workbench/contrib/terminal/browser/terminalInstance.ts

@@ -1394,10 +1394,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			}
 		}));
 
-		this._register(processManager.onProcessData(ev => {
-			this._initialDataEvents?.push(ev.data);
-			this._onData.fire(ev.data);
-		}));
 		this._register(processManager.onProcessReplayComplete(() => this._onProcessReplayComplete.fire()));
 		this._register(processManager.onEnvironmentVariableInfoChanged(e => this._onEnvironmentVariableInfoChanged(e)));
 		this._register(processManager.onPtyDisconnect(() => {
@@ -1480,19 +1476,38 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	}
 
 	private _onProcessData(ev: IProcessDataEvent): void {
-		if (ev.trackCommit) {
-			ev.writePromise = new Promise<void>(r => this._writeProcessData(ev, r));
+		// TODO: Move to separate listener
+		this._initialDataEvents?.push(ev.data);
+
+		// Ensure events are split by SI command execute sequence to ensure the output of the
+		// command can be read by extensions. This must be done here as xterm.js does not currently
+		// have a listener for when individual data events are parsed, only `onWriteParsed` which
+		// fires when the write buffer is flushed.
+		const execIndex = ev.data.indexOf('\x1b]633;C\x07');
+		if (execIndex !== -1) {
+			if (ev.trackCommit) {
+				this._writeProcessData(ev.data.substring(0, execIndex + '\x1b]633;C\x07'.length));
+				ev.writePromise = new Promise<void>(r => this._writeProcessData(ev.data.substring(execIndex + '\x1b]633;C\x07'.length), r));
+			} else {
+				this._writeProcessData(ev.data.substring(0, execIndex + '\x1b]633;C\x07'.length));
+				this._writeProcessData(ev.data.substring(execIndex + '\x1b]633;C\x07'.length));
+			}
 		} else {
-			this._writeProcessData(ev);
+			if (ev.trackCommit) {
+				ev.writePromise = new Promise<void>(r => this._writeProcessData(ev.data, r));
+			} else {
+				this._writeProcessData(ev.data);
+			}
 		}
 	}
 
-	private _writeProcessData(ev: IProcessDataEvent, cb?: () => void) {
+	private _writeProcessData(data: string, cb?: () => void) {
 		const messageId = ++this._latestXtermWriteData;
-		this.xterm?.raw.write(ev.data, () => {
+		this.xterm?.raw.write(data, () => {
 			this._latestXtermParseData = messageId;
-			this._processManager.acknowledgeDataEvent(ev.data.length);
+			this._processManager.acknowledgeDataEvent(data.length);
 			cb?.();
+			this._onData.fire(data);
 		});
 	}