Skip to content

Commit 7954469

Browse files
authored
delete buffer output polling (microsoft#262941)
1 parent 5431221 commit 7954469

File tree

5 files changed

+5
-478
lines changed

5 files changed

+5
-478
lines changed

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

Lines changed: 0 additions & 294 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { IToolInvocationContext, ToolProgress } from '../../../chat/common/langu
1616
import { ConfiguringTask, ITaskDependency, Task } from '../../../tasks/common/tasks.js';
1717
import { ITaskService } from '../../../tasks/common/taskService.js';
1818
import { ITerminalInstance } from '../../../terminal/browser/terminal.js';
19-
import { getOutput } from './bufferOutputPolling.js';
19+
import { getOutput } from './outputHelpers.js';
2020
import { OutputMonitor } from './tools/monitoring/outputMonitor.js';
2121
import { IExecution, IPollingResult, OutputMonitorState } from './tools/monitoring/types.js';
2222

@@ -152,7 +152,7 @@ export async function collectTerminalResults(
152152
for (const instance of terminals) {
153153
progress.report({ message: new MarkdownString(`Checking output for \`${instance.shellLaunchConfig.name ?? 'unknown'}\``) });
154154
const execution = {
155-
getOutput: () => getOutput(instance.xterm?.raw) ?? '',
155+
getOutput: () => getOutput(instance) ?? '',
156156
isActive,
157157
task,
158158
instance,

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ import { IChatService } from '../../../../../chat/common/chatService.js';
1616
import { ILanguageModelsService, ChatMessageRole } from '../../../../../chat/common/languageModels.js';
1717
import { IToolInvocationContext } from '../../../../../chat/common/languageModelToolsService.js';
1818
import { ITaskService } from '../../../../../tasks/common/taskService.js';
19-
import { PollingConsts } from '../../bufferOutputPolling.js';
20-
import { IPollingResult, OutputMonitorState, IExecution, IRacePollingOrPromptResult, IConfirmationPrompt } from './types.js';
19+
import { IPollingResult, OutputMonitorState, IExecution, IRacePollingOrPromptResult, IConfirmationPrompt, PollingConsts } from './types.js';
2120
import { getTextResponseFromStream } from './utils.js';
2221
import { IChatWidgetService } from '../../../../../chat/browser/chat.js';
2322
import { ChatAgentLocation } from '../../../../../chat/common/constants.js';

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import type { XtermTerminal } from '../../../../terminal/browser/xterm/xtermTerm
3030
import { ITerminalProfileResolverService } from '../../../../terminal/common/terminal.js';
3131
import { TerminalChatAgentToolsSettingId } from '../../common/terminalChatAgentToolsConfiguration.js';
3232
import { getRecommendedToolsOverRunInTerminal } from '../alternativeRecommendation.js';
33-
import { getOutput } from '../bufferOutputPolling.js';
3433
import { CommandLineAutoApprover, type IAutoApproveRule, type ICommandApprovalResult } from '../commandLineAutoApprover.js';
3534
import { CommandSimplifier } from '../commandSimplifier.js';
3635
import { BasicExecuteStrategy } from '../executeStrategy/basicExecuteStrategy.js';
@@ -45,6 +44,7 @@ import { ShellIntegrationQuality, ToolTerminalCreator, type IToolTerminal } from
4544
import { Event } from '../../../../../../base/common/event.js';
4645
import { TerminalToolConfirmationStorageKeys } from '../../../../chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.js';
4746
import { IPollingResult, OutputMonitorState } from './monitoring/types.js';
47+
import { getOutput } from '../outputHelpers.js';
4848

4949
const enum TerminalToolStorageKeysInternal {
5050
TerminalSession = 'chat.terminalSessions'
@@ -820,6 +820,6 @@ class BackgroundTerminalExecution extends Disposable {
820820
this.instance.runCommand(this._commandLine, true);
821821
}
822822
getOutput(): string {
823-
return getOutput(this._xterm?.raw, this._startMarker);
823+
return getOutput(this.instance, this._startMarker);
824824
}
825825
}

0 commit comments

Comments
 (0)