rewrite polling function

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

@@ -94,14 +94,14 @@ export class RunInTerminalToolTelemetry {
 		outputLineCount: number;
 		timingConnectMs: number;
 		timingExecuteMs: number;
-		pollDurationMs?: number;
-		terminalExecutionIdleBeforeTimeout?: boolean;
+		pollDurationMs: number | undefined;
+		terminalExecutionIdleBeforeTimeout: boolean | undefined;
 		exitCode: number | undefined;
 		inputUserChars: number;
 		inputUserSigint: boolean;
-		inputToolManualAcceptCount?: number;
-		inputToolManualRejectCount?: number;
-		inputToolManualChars?: number;
+		inputToolManualAcceptCount: number | undefined;
+		inputToolManualRejectCount: number | undefined;
+		inputToolManualChars: number | undefined;
 	}) {
 		type TelemetryEvent = {
 			terminalSessionId: string;

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

@@ -19,6 +19,8 @@ import { ITerminalInstance } from '../../../terminal/browser/terminal.js';
 import { getOutput } from './outputHelpers.js';
 import { OutputMonitor } from './tools/monitoring/outputMonitor.js';
 import { IExecution, IPollingResult, OutputMonitorState } from './tools/monitoring/types.js';
+import { Event } from '../../../../../base/common/event.js';
+
 
 export function getTaskDefinition(id: string) {
 	const idx = id.indexOf(': ');
@@ -144,7 +146,25 @@ export async function resolveDependencyTasks(parentTask: Task, workspaceFolder:
  * Collects output, polling duration, and idle status for all terminals.
  */
 export async function collectTerminalResults(
-	terminals: ITerminalInstance[], task: Task, instantiationService: IInstantiationService, invocationContext: IToolInvocationContext, progress: ToolProgress, token: CancellationToken, disposableStore: DisposableStore, isActive?: () => Promise<boolean>, dependencyTasks?: Task[]): Promise<Array<{ name: string; output: string; resources?: ILinkLocation[]; pollDurationMs: number; state: OutputMonitorState; inputToolManualAcceptCount: number; inputToolManualRejectCount: number; inputToolManualChars: number }>> {
+	terminals: ITerminalInstance[],
+	task: Task,
+	instantiationService: IInstantiationService,
+	invocationContext: IToolInvocationContext,
+	progress: ToolProgress,
+	token: CancellationToken,
+	disposableStore: DisposableStore,
+	isActive?: () => Promise<boolean>,
+	dependencyTasks?: Task[]
+): Promise<Array<{
+	name: string;
+	output: string;
+	resources?: ILinkLocation[];
+	pollDurationMs: number;
+	state: OutputMonitorState;
+	inputToolManualAcceptCount: number;
+	inputToolManualRejectCount: number;
+	inputToolManualChars: number;
+}>> {
 	const results: Array<{ state: OutputMonitorState; name: string; output: string; resources?: ILinkLocation[]; pollDurationMs: number; inputToolManualAcceptCount: number; inputToolManualRejectCount: number; inputToolManualChars: number }> = [];
 	if (token.isCancellationRequested) {
 		return results;
@@ -159,21 +179,18 @@ export async function collectTerminalResults(
 			dependencyTasks,
 			sessionId: invocationContext.sessionId
 		};
-		const outputMonitor = disposableStore.add(instantiationService.createInstance(OutputMonitor, execution, taskProblemPollFn));
-		const outputAndIdle = await outputMonitor.startMonitoring(
-			task._label,
-			invocationContext,
-			token
-		);
+		const outputMonitor = disposableStore.add(instantiationService.createInstance(OutputMonitor, execution, taskProblemPollFn, invocationContext, token, task._label));
+		await Event.toPromise(outputMonitor.onDidFinishCommand);
+		const pollingResult = outputMonitor.pollingResult;
 		results.push({
 			name: instance.shellLaunchConfig.name ?? 'unknown',
-			output: outputAndIdle?.output ?? '',
-			pollDurationMs: outputAndIdle?.pollDurationMs ?? 0,
-			resources: outputAndIdle?.resources,
-			state: outputAndIdle?.state,
-			inputToolManualAcceptCount: outputAndIdle?.inputToolManualAcceptCount ?? 0,
-			inputToolManualRejectCount: outputAndIdle?.inputToolManualRejectCount ?? 0,
-			inputToolManualChars: outputAndIdle?.inputToolManualChars ?? 0,
+			output: pollingResult?.output ?? '',
+			pollDurationMs: pollingResult?.pollDurationMs ?? 0,
+			resources: pollingResult?.resources,
+			state: pollingResult?.state || OutputMonitorState.Idle,
+			inputToolManualAcceptCount: outputMonitor.outputMonitorTelemetryCounters.inputToolManualAcceptCount ?? 0,
+			inputToolManualRejectCount: outputMonitor.outputMonitorTelemetryCounters.inputToolManualRejectCount ?? 0,
+			inputToolManualChars: outputMonitor.outputMonitorTelemetryCounters.inputToolManualChars ?? 0,
 		});
 	}
 	return results;
@@ -208,18 +225,12 @@ export async function taskProblemPollFn(execution: IExecution, token: Cancellati
 				return {
 					state: OutputMonitorState.Idle,
 					output: 'The task succeeded with no problems.',
-					inputToolManualAcceptCount: 0,
-					inputToolManualRejectCount: 0,
-					inputToolManualChars: 0,
 				};
 			}
 			return {
 				state: OutputMonitorState.Idle,
 				output: problemList.join('\n'),
 				resources: resultResources,
-				inputToolManualAcceptCount: 0,
-				inputToolManualRejectCount: 0,
-				inputToolManualChars: 0,
 			};
 		}
 	}