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

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

@@ -0,0 +1,58 @@
+
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { RunInTerminalTool } from './runInTerminalTool.js';
+import { TerminalToolId } from './toolIds.js';
+
+const KillTerminalToolData = {
+    id: TerminalToolId.KillTerminal,
+    toolReferenceName: "killTerminal",
+    displayName: ( localize(12376, "Kill Terminal")),
+    modelDescription: `Kill a terminal by its ID. Use this to clean up terminals that are no longer needed (e.g., after stopping a server or when a long-running task completes). The terminal ID is returned by ${TerminalToolId.RunInTerminal} when isBackground=true.`,
+    icon: Codicon.terminal,
+    source: ToolDataSource.Internal,
+    inputSchema: {
+        type: "object",
+        properties: {
+            id: {
+                type: "string",
+                description: `The ID of the background terminal to kill (returned by ${TerminalToolId.RunInTerminal} when isBackground=true).`
+            }
+        },
+        required: ["id"]
+    }
+};
+class KillTerminalTool extends Disposable {
+    async prepareToolInvocation(_context, _token) {
+        return {
+            invocationMessage: ( localize(12377, "Killing terminal")),
+            pastTenseMessage: ( localize(12378, "Killed terminal"))
+        };
+    }
+    async invoke(invocation, _countTokens, _progress, _token) {
+        const args = invocation.parameters;
+        const execution = RunInTerminalTool.getExecution(args.id);
+        if (!execution) {
+            return {
+                content: [{
+                    kind: "text",
+                    value: `Error: No active terminal execution found with ID ${args.id}. The terminal may have already been killed or the ID is invalid.`
+                }]
+            };
+        }
+        const finalOutput = execution.getOutput();
+        execution.instance.dispose();
+        RunInTerminalTool.removeExecution(args.id);
+        const outputSummary = finalOutput ? `Final output before termination:\n${finalOutput}` : "No output was captured.";
+        return {
+            content: [{
+                kind: "text",
+                value: `Successfully killed background terminal ${args.id}. ${outputSummary}`
+            }]
+        };
+    }
+}
+
+export { KillTerminalTool, KillTerminalToolData };

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

@@ -8,8 +8,8 @@ import { IToolInvocationContext } from "@codingame/monaco-vscode-api/vscode/vs/w
 import { ITaskService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service";
 import { IExecution, IPollingResult, OutputMonitorState } from "./types.js";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
+import { ITerminalLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service";
 export interface IOutputMonitor extends Disposable {
     readonly pollingResult: IPollingResult & {
         pollDurationMs: number;
@@ -46,11 +46,17 @@ export declare class OutputMonitor extends Disposable implements IOutputMonitor
     get pollingResult(): IPollingResult & {
         pollDurationMs: number;
     } | undefined;
+    /**
+     * Flag to track if user has inputted since idle was detected.
+     * This is used to skip showing prompts if the user already provided input.
+     */
+    private _userInputtedSinceIdleDetected;
+    private readonly _userInputListener;
     private readonly _outputMonitorTelemetryCounters;
     get outputMonitorTelemetryCounters(): Readonly<IOutputMonitorTelemetryCounters>;
     private readonly _onDidFinishCommand;
     readonly onDidFinishCommand: Event<void>;
-    constructor(_execution: IExecution, _pollFn: ((execution: IExecution, token: CancellationToken, taskService: ITaskService) => Promise<IPollingResult | undefined>) | undefined, invocationContext: IToolInvocationContext | undefined, token: CancellationToken, command: string, _languageModelsService: ILanguageModelsService, _taskService: ITaskService, _chatService: IChatService, _chatWidgetService: IChatWidgetService, _configurationService: IConfigurationService, _logService: ILogService, _terminalService: ITerminalService);
+    constructor(_execution: IExecution, _pollFn: ((execution: IExecution, token: CancellationToken, taskService: ITaskService) => Promise<IPollingResult | undefined>) | undefined, invocationContext: IToolInvocationContext | undefined, token: CancellationToken, command: string, _languageModelsService: ILanguageModelsService, _taskService: ITaskService, _chatService: IChatService, _chatWidgetService: IChatWidgetService, _configurationService: IConfigurationService, _logService: ITerminalLogService, _terminalService: ITerminalService);
     private _startMonitoring;
     private _handleIdleState;
     private _handleTimeoutState;
@@ -60,7 +66,15 @@ export declare class OutputMonitor extends Disposable implements IOutputMonitor
      *  - timeout window elapses.
      */
     private _waitForIdle;
-    private _promptForMorePolling;
+    /**
+     * Sets up a listener for user input that triggers immediately when idle is detected.
+     * This ensures we catch any input that happens between idle detection and prompt creation.
+     */
+    private _setupIdleInputListener;
+    /**
+     * Cleans up the idle input listener and resets the flag.
+     */
+    private _cleanupIdleInputListener;
     private _assessOutputForErrors;
     private _determineUserInputOptions;
     private _selectAndHandleOption;
@@ -72,3 +86,17 @@ export declare class OutputMonitor extends Disposable implements IOutputMonitor
 }
 export declare function detectsInputRequiredPattern(cursorLine: string): boolean;
 export declare function detectsNonInteractiveHelpPattern(cursorLine: string): boolean;
+/**
+ * Detects VS Code's specific task completion messages like:
+ * - "Press any key to close the terminal."
+ * - "Terminal will be reused by tasks, press any key to close it."
+ * These appear when a task finishes and should be ignored if the task is done.
+ * Note: These messages may be prefixed with " * " by VS Code and may have line wrapping
+ * that can split words across lines (e.g., "t\no" instead of "to").
+ */
+export declare function detectsVSCodeTaskFinishMessage(cursorLine: string): boolean;
+/**
+ * Detects generic "press any key" prompts from scripts (not VS Code task messages).
+ * These should prompt the user to interact with the terminal.
+ */
+export declare function detectsGenericPressAnyKeyPattern(cursorLine: string): boolean;