rewrite polling function

src/vs/workbench/contrib/mcp/common/mcpSamplingService.ts

@@ -74,7 +74,7 @@ export class McpSamplingService extends Disposable implements IMcpSamplingServic
 
 		const model = await this._getMatchingModel(opts);
 		// todo@connor4312: nullExtensionDescription.identifier -> undefined with API update
-		const response = await this._languageModelsService.sendChatRequest(model, new ExtensionIdentifier('core'), messages, {}, token);
+		const response = await this._languageModelsService.sendChatRequest(model, new ExtensionIdentifier('Github.copilot-chat'), messages, {}, token);
 
 		let responseText = '';
 

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(': ');
@@ -159,21 +161,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: pollingResult?.inputToolManualAcceptCount ?? 0,
+			inputToolManualRejectCount: pollingResult?.inputToolManualRejectCount ?? 0,
+			inputToolManualChars: pollingResult?.inputToolManualChars ?? 0,
 		});
 	}
 	return results;