Merge pull request microsoft#257844 from microsoft/tyriar/257822__share

Share logic between fg/bg terminals

Author: Tyriar

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalTool.ts

@@ -274,40 +274,35 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		}
 
 		let error: string | undefined;
+		const isNewSession = !args.isBackground && !this._sessionTerminalAssociations.has(chatSessionId);
 
 		const timingStart = Date.now();
 		const termId = generateUuid();
 
-		if (args.isBackground) {
-			const store = new DisposableStore();
-			let outputAndIdle: { terminalExecutionIdleBeforeTimeout: boolean; output: string; pollDurationMs?: number; modelOutputEvalResponse?: string } | undefined = undefined;
+		const store = new DisposableStore();
 
-			this._logService.debug(`RunInTerminalTool: Creating background terminal with ID=${termId}`);
-			const toolTerminal = await this._instantiationService.createInstance(ToolTerminalCreator).createTerminal(token);
-			this._sessionTerminalAssociations.set(chatSessionId, toolTerminal);
-			if (token.isCancellationRequested) {
-				toolTerminal.instance.dispose();
-				throw new CancellationError();
-			}
-			await this._setupTerminalAssociation(toolTerminal, chatSessionId, termId, args.isBackground);
+		this._logService.debug(`RunInTerminalTool: Creating ${args.isBackground ? 'background' : 'foreground'} terminal. termId=${termId}, chatSessionId=${chatSessionId}`);
+		const toolTerminal = await (args.isBackground ? this._initBackgroundTerminal : this._initForegroundTerminal)(chatSessionId, termId, token);
 
-			this._terminalService.setActiveInstance(toolTerminal.instance);
-			const timingConnectMs = Date.now() - timingStart;
+		this._terminalService.setActiveInstance(toolTerminal.instance);
+		const timingConnectMs = Date.now() - timingStart;
 
-			const xterm = await toolTerminal.instance.xtermReadyPromise;
-			if (!xterm) {
-				throw new Error('Instance was disposed before xterm.js was ready');
-			}
+		const xterm = await toolTerminal.instance.xtermReadyPromise;
+		if (!xterm) {
+			throw new Error('Instance was disposed before xterm.js was ready');
+		}
 
-			let inputUserChars = 0;
-			let inputUserSigint = false;
-			store.add(xterm.raw.onData(data => {
-				if (!telemetryIgnoredSequences.includes(data)) {
-					inputUserChars += data.length;
-				}
-				inputUserSigint ||= data === '\x03';
-			}));
+		let inputUserChars = 0;
+		let inputUserSigint = false;
+		store.add(xterm.raw.onData(data => {
+			if (!telemetryIgnoredSequences.includes(data)) {
+				inputUserChars += data.length;
+			}
+			inputUserSigint ||= data === '\x03';
+		}));
 
+		if (args.isBackground) {
+			let outputAndIdle: { terminalExecutionIdleBeforeTimeout: boolean; output: string; pollDurationMs?: number; modelOutputEvalResponse?: string } | undefined = undefined;
 			try {
 				this._logService.debug(`RunInTerminalTool: Starting background execution \`${command}\``);
 
@@ -372,40 +367,6 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 				});
 			}
 		} else {
-			const store = new DisposableStore();
-			let toolTerminal: IToolTerminal | undefined = this._sessionTerminalAssociations.get(chatSessionId);
-			const isNewSession = !toolTerminal;
-			if (toolTerminal) {
-				this._logService.debug(`RunInTerminalTool: Using existing terminal with session ID \`${chatSessionId}\``);
-			} else {
-				this._logService.debug(`RunInTerminalTool: Creating terminal with session ID \`${chatSessionId}\``);
-				toolTerminal = await this._instantiationService.createInstance(ToolTerminalCreator).createTerminal(token);
-				this._sessionTerminalAssociations.set(chatSessionId, toolTerminal);
-				if (token.isCancellationRequested) {
-					toolTerminal.instance.dispose();
-					throw new CancellationError();
-				}
-				await this._setupTerminalAssociation(toolTerminal, chatSessionId, termId, args.isBackground);
-			}
-
-			this._terminalService.setActiveInstance(toolTerminal.instance);
-
-			const timingConnectMs = Date.now() - timingStart;
-
-			const xterm = await toolTerminal.instance.xtermReadyPromise;
-			if (!xterm) {
-				throw new Error('Instance was disposed before xterm.js was ready');
-			}
-
-			let inputUserChars = 0;
-			let inputUserSigint = false;
-			store.add(xterm.raw.onData(data => {
-				if (!telemetryIgnoredSequences.includes(data)) {
-					inputUserChars += data.length;
-				}
-				inputUserSigint ||= data === '\x03';
-			}));
-
 			let terminalResult = '';
 
 			let outputLineCount = -1;
@@ -484,6 +445,34 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		}
 	}
 
+	private async _initBackgroundTerminal(chatSessionId: string, termId: string, token: CancellationToken): Promise<IToolTerminal> {
+		this._logService.debug(`RunInTerminalTool: Creating background terminal with ID=${termId}`);
+		const toolTerminal = await this._instantiationService.createInstance(ToolTerminalCreator).createTerminal(token);
+		this._sessionTerminalAssociations.set(chatSessionId, toolTerminal);
+		if (token.isCancellationRequested) {
+			toolTerminal.instance.dispose();
+			throw new CancellationError();
+		}
+		await this._setupTerminalAssociation(toolTerminal, chatSessionId, termId, true);
+		return toolTerminal;
+	}
+
+	private async _initForegroundTerminal(chatSessionId: string, termId: string, token: CancellationToken): Promise<IToolTerminal> {
+		const cachedTerminal = this._sessionTerminalAssociations.get(chatSessionId);
+		if (cachedTerminal) {
+			this._logService.debug(`RunInTerminalTool: Using cached foreground terminal with session ID \`${chatSessionId}\``);
+			return cachedTerminal;
+		}
+		const toolTerminal = await this._instantiationService.createInstance(ToolTerminalCreator).createTerminal(token);
+		this._sessionTerminalAssociations.set(chatSessionId, toolTerminal);
+		if (token.isCancellationRequested) {
+			toolTerminal.instance.dispose();
+			throw new CancellationError();
+		}
+		await this._setupTerminalAssociation(toolTerminal, chatSessionId, termId, false);
+		return toolTerminal;
+	}
+
 	protected async _rewriteCommandIfNeeded(args: IRunInTerminalInputParams, instance: Pick<ITerminalInstance, 'getCwdResource'> | undefined, shell: string): Promise<string> {
 		const commandLine = args.command;
 		const os = await this._osBackend;