@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/types.d.ts

@@ -42,6 +42,6 @@ export declare enum PollingConsts {
     MinPollingDuration = 500,
     FirstPollingMaxDuration = 20000,// 20 seconds
     ExtendedPollingMaxDuration = 120000,// 2 minutes
-    MaxPollingIntervalDuration = 2000,// 2 seconds
+    MaxPollingIntervalDuration = 10000,// 10 seconds - grows via exponential backoff
     MaxRecursionCount = 5
 }

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/types.js

@@ -16,7 +16,7 @@ var PollingConsts;
     PollingConsts[PollingConsts["MinPollingDuration"] = 500] = "MinPollingDuration";
     PollingConsts[PollingConsts["FirstPollingMaxDuration"] = 20000] = "FirstPollingMaxDuration";
     PollingConsts[PollingConsts["ExtendedPollingMaxDuration"] = 120000] = "ExtendedPollingMaxDuration";
-    PollingConsts[PollingConsts["MaxPollingIntervalDuration"] = 2000] = "MaxPollingIntervalDuration";
+    PollingConsts[PollingConsts["MaxPollingIntervalDuration"] = 10000] = "MaxPollingIntervalDuration";
     PollingConsts[PollingConsts["MaxRecursionCount"] = 5] = "MaxRecursionCount";
 })(PollingConsts || (PollingConsts = {}));
 

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalConfirmationTool.js

@@ -4,51 +4,48 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ToolDataSource, ToolInvocationPresentation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { RunInTerminalTool } from './runInTerminalTool.js';
+import { TerminalToolId } from './toolIds.js';
 
 const ConfirmTerminalCommandToolData = {
-    id: 'vscode_get_terminal_confirmation',
-    displayName: ( localize(12056, 'Confirm Terminal Command')),
+    id: TerminalToolId.ConfirmTerminalCommand,
+    displayName: ( localize(12390, "Confirm Terminal Command")),
     modelDescription: [
-        'This tool allows you to get explicit user confirmation for a terminal command without executing it.',
-        '',
-        'When to use:',
-        '- When you need to verify user approval before executing a command',
-        '- When you want to show command details, auto-approval status, and simplified versions to the user',
-        '- When you need the user to review a potentially risky command',
-        '',
-        'The tool will:',
-        '- Show the command with syntax highlighting',
-        '- Display auto-approval status if enabled',
-        '- Show simplified version of the command if applicable',
-        '- Provide custom actions for creating auto-approval rules',
-        '- Return approval/rejection status',
-        '',
-        'After confirmation, use a tool to actually execute the command.'
-    ].join('\n'),
-    userDescription: ( localize(12057, 'Tool for confirming terminal commands')),
+        "This tool allows you to get explicit user confirmation for a terminal command without executing it.",
+        "",
+        "When to use:",
+        "- When you need to verify user approval before executing a command",
+        "- When you want to show command details, auto-approval status, and simplified versions to the user",
+        "- When you need the user to review a potentially risky command",
+        "",
+        "The tool will:",
+        "- Show the command with syntax highlighting",
+        "- Display auto-approval status if enabled",
+        "- Show simplified version of the command if applicable",
+        "- Provide custom actions for creating auto-approval rules",
+        "- Return approval/rejection status",
+        "",
+        "After confirmation, use a tool to actually execute the command."
+    ].join("\n"),
+    userDescription: ( localize(12391, "Tool for confirming terminal commands")),
     source: ToolDataSource.Internal,
     icon: Codicon.shield,
     inputSchema: {
-        type: 'object',
+        type: "object",
         properties: {
             command: {
-                type: 'string',
-                description: 'The command to confirm with the user.'
+                type: "string",
+                description: "The command to confirm with the user."
             },
             explanation: {
-                type: 'string',
-                description: 'A one-sentence description of what the command does. This will be shown to the user in the confirmation dialog.'
+                type: "string",
+                description: "A one-sentence description of what the command does. This will be shown to the user in the confirmation dialog."
             },
             isBackground: {
-                type: 'boolean',
-                description: 'Whether the command would start a background process. This provides context for the confirmation.'
-            },
+                type: "boolean",
+                description: "Whether the command would start a background process. This provides context for the confirmation."
+            }
         },
-        required: [
-            'command',
-            'explanation',
-            'isBackground',
-        ]
+        required: ["command", "explanation", "isBackground"]
     }
 };
 class ConfirmTerminalCommandTool extends RunInTerminalTool {
@@ -59,9 +56,7 @@ class ConfirmTerminalCommandTool extends RunInTerminalTool {
             if (sessionId) {
                 context.chatSessionId = sessionId;
             }
-        }
-        catch {
-        }
+        } catch {}
         const preparedInvocation = await super.prepareToolInvocation(context, token);
         if (preparedInvocation) {
             preparedInvocation.presentation = ToolInvocationPresentation.HiddenAfterComplete;
@@ -71,9 +66,9 @@ class ConfirmTerminalCommandTool extends RunInTerminalTool {
     async invoke(invocation, countTokens, progress, token) {
         return {
             content: [{
-                    kind: 'text',
-                    value: 'yes'
-                }]
+                kind: "text",
+                value: "yes"
+            }]
         };
     }
 }

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

@@ -1,8 +1,10 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ResourceMap } from "@codingame/monaco-vscode-api/vscode/vs/base/common/map";
 import { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IInstantiationService, type ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITerminalProfile } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal";
 import { ITerminalLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service";
@@ -10,9 +12,11 @@ import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/work
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
+import { type ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
 import { ITerminalChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { ITerminalProfileResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service";
+import type { ITerminalExecuteStrategyResult } from "../executeStrategy/executeStrategy.js";
 import { type IToolTerminal } from "../toolTerminalCreator.js";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IHistoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/history/common/history.service";
@@ -21,13 +25,34 @@ export declare function createRunInTerminalToolData(accessor: ServicesAccessor):
 export interface IRunInTerminalInputParams {
     command: string;
     explanation: string;
+    goal: string;
     isBackground: boolean;
+    timeout?: number;
+}
+/**
+ * Interface for accessing a running terminal execution.
+ * Used by tools that need to await or interact with background terminal commands.
+ */
+export interface IActiveTerminalExecution {
+    /**
+     * Promise that resolves when the terminal command completes.
+     */
+    readonly completionPromise: Promise<ITerminalExecuteStrategyResult>;
+    /**
+     * The terminal instance associated with this execution.
+     */
+    readonly instance: ITerminalInstance;
+    /**
+     * Gets the current output from the terminal.
+     */
+    getOutput(): string;
 }
 export declare class RunInTerminalTool extends Disposable implements IToolImpl {
     protected readonly _chatService: IChatService;
     private readonly _configurationService;
     private readonly _historyService;
     private readonly _instantiationService;
+    private readonly _labelService;
     private readonly _languageModelToolsService;
     private readonly _remoteAgentService;
     private readonly _storageService;
@@ -43,16 +68,31 @@ export declare class RunInTerminalTool extends Disposable implements IToolImpl {
     protected readonly _profileFetcher: TerminalProfileFetcher;
     private readonly _commandLineRewriters;
     private readonly _commandLineAnalyzers;
-    protected readonly _sessionTerminalAssociations: Map<string, IToolTerminal>;
+    private readonly _commandLinePresenters;
+    protected readonly _sessionTerminalAssociations: ResourceMap<IToolTerminal>;
     protected readonly _osBackend: Promise<OperatingSystem>;
-    private static readonly _backgroundExecutions;
+    private static readonly _activeExecutions;
     static getBackgroundOutput(id: string): string;
-    constructor(_chatService: IChatService, _configurationService: IConfigurationService, _historyService: IHistoryService, _instantiationService: IInstantiationService, _languageModelToolsService: ILanguageModelToolsService, _remoteAgentService: IRemoteAgentService, _storageService: IStorageService, _terminalChatService: ITerminalChatService, _logService: ITerminalLogService, _terminalService: ITerminalService, _workspaceContextService: IWorkspaceContextService, _chatWidgetService: IChatWidgetService);
+    /**
+     * Gets an active terminal execution by ID. Returns undefined if not found.
+     * Can be used to await the completion of a background terminal command.
+     */
+    static getExecution(id: string): IActiveTerminalExecution | undefined;
+    /**
+     * Removes an active terminal execution by ID and disposes it.
+     * @returns true if the execution was found and removed, false otherwise.
+     */
+    static removeExecution(id: string): boolean;
+    constructor(_chatService: IChatService, _configurationService: IConfigurationService, _historyService: IHistoryService, _instantiationService: IInstantiationService, _labelService: ILabelService, _languageModelToolsService: ILanguageModelToolsService, _remoteAgentService: IRemoteAgentService, _storageService: IStorageService, _terminalChatService: ITerminalChatService, _logService: ITerminalLogService, _terminalService: ITerminalService, _workspaceContextService: IWorkspaceContextService, _chatWidgetService: IChatWidgetService);
     prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
     private _handleTerminalVisibility;
-    private _initBackgroundTerminal;
-    private _initForegroundTerminal;
+    /**
+     * Initializes a terminal for command execution. For foreground mode, reuses existing cached
+     * terminal from the session. For background mode, always creates a new terminal to allow
+     * parallel execution.
+     */
+    private _initTerminal;
     private _registerInputListener;
     private _restoreTerminalAssociations;
     private _setupProcessIdAssociation;