Merge pull request microsoft#258225 from microsoft/tyriar/canceled

Differentiate unexpected exceptions from canceled errors

Author: Tyriar

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

@@ -320,7 +320,12 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 
 				const execution = new BackgroundTerminalExecution(toolTerminal.instance, xterm, command);
 				RunInTerminalTool._backgroundExecutions.set(termId, execution);
+
 				outputAndIdle = await pollForOutputAndIdle(execution, false, token, this._languageModelsService);
+				if (token.isCancellationRequested) {
+					throw new CancellationError();
+				}
+
 				if (!outputAndIdle.terminalExecutionIdleBeforeTimeout) {
 					outputAndIdle = await racePollingOrPrompt(
 						() => pollForOutputAndIdle(execution, true, token, this._languageModelsService),
@@ -330,6 +335,9 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 						this._languageModelsService,
 						execution
 					);
+					if (token.isCancellationRequested) {
+						throw new CancellationError();
+					}
 				}
 
 				let resultText = (
@@ -351,11 +359,11 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 					}]
 				};
 			} catch (e) {
-				error = 'threw';
 				if (termId) {
 					RunInTerminalTool._backgroundExecutions.get(termId)?.dispose();
 					RunInTerminalTool._backgroundExecutions.delete(termId);
 				}
+				error = e instanceof CancellationError ? 'canceled' : 'unexpectedException';
 				throw e;
 			} finally {
 				store.dispose();
@@ -402,6 +410,10 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 				}
 				this._logService.debug(`RunInTerminalTool: Using \`${strategy.type}\` execute strategy for command \`${command}\``);
 				const executeResult = await strategy.execute(command, token);
+				if (token.isCancellationRequested) {
+					throw new CancellationError();
+				}
+
 				this._logService.debug(`RunInTerminalTool: Finished \`${strategy.type}\` execute strategy with exitCode \`${executeResult.exitCode}\`, result.length \`${executeResult.output?.length}\`, error \`${executeResult.error}\``);
 				outputLineCount = executeResult.output === undefined ? 0 : count(executeResult.output.trim(), '\n') + 1;
 				exitCode = executeResult.exitCode;
@@ -419,7 +431,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 			} catch (e) {
 				this._logService.debug(`RunInTerminalTool: Threw exception`);
 				toolTerminal.instance.dispose();
-				error = 'threw';
+				error = e instanceof CancellationError ? 'canceled' : 'unexpectedException';
 				throw e;
 			} finally {
 				store.dispose();