@codingame/monaco-vscode-chat-service-override 32.0.2 → 33.0.4

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.js

@@ -2,6 +2,6 @@
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 
-const CTX_NOTEBOOK_CHAT_HAS_AGENT = ( new RawContextKey("notebookChatAgentRegistered", false, ( localize(11564, "Whether a chat agent for notebook is registered"))));
+const CTX_NOTEBOOK_CHAT_HAS_AGENT = ( new RawContextKey("notebookChatAgentRegistered", false, ( localize(11691, "Whether a chat agent for notebook is registered"))));
 
 export { CTX_NOTEBOOK_CHAT_HAS_AGENT };

package/vscode/src/vs/workbench/contrib/remoteCodingAgents/browser/remoteCodingAgents.contribution.js

@@ -13,42 +13,42 @@ import { IRemoteCodingAgentsService } from '@codingame/monaco-vscode-api/vscode/
 const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "remoteCodingAgents",
     jsonSchema: {
-        description: ( localize(12646, "Contributes remote coding agent integrations to the chat widget.")),
+        description: ( localize(12776, "Contributes remote coding agent integrations to the chat widget.")),
         type: "array",
         items: {
             type: "object",
             properties: {
                 id: {
-                    description: ( localize(12647, "A unique identifier for this item.")),
+                    description: ( localize(12777, "A unique identifier for this item.")),
                     type: "string"
                 },
                 command: {
                     description: ( localize(
-                        12648,
+                        12778,
                         "Identifier of the command to execute. The command must be declared in the \"commands\" section."
                     )),
                     type: "string"
                 },
                 displayName: {
                     description: ( localize(
-                        12649,
+                        12779,
                         "A user-friendly name for this item which is used for display in menus."
                     )),
                     type: "string"
                 },
                 description: {
-                    description: ( localize(12650, "Description of the remote agent for use in menus and tooltips.")),
+                    description: ( localize(12780, "Description of the remote agent for use in menus and tooltips.")),
                     type: "string"
                 },
                 followUpRegex: {
                     description: ( localize(
-                        12651,
+                        12781,
                         "The last occurrence of pattern in an existing chat conversation is sent to the contributing extension to facilitate follow-up responses."
                     )),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(12652, "Condition which must be true to show this item.")),
+                    description: ( localize(12782, "Condition which must be true to show this item.")),
                     type: "string"
                 }
             },

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibilityHelp.js

@@ -37,68 +37,68 @@ function getAccessibilityHelpText(accessor) {
     const focusResponseKeybinding = keybindingService.lookupKeybinding("chat.action.focus")?.getAriaLabel();
     const focusInputKeybinding = keybindingService.lookupKeybinding("workbench.action.chat.focusInput")?.getAriaLabel();
     content.push(( localize(
-        14274,
+        14404,
         "Inline chat occurs within a terminal. It is useful for suggesting terminal commands. Keep in mind that AI generated code may be incorrect."
     )));
     content.push(( localize(
-        14275,
+        14405,
         "It can be activated using the command: Terminal: Start Chat ({0}), which will focus the input box.",
         startChatKeybinding
     )));
     content.push(makeRequestKeybinding ? ( localize(
-        14276,
+        14406,
         "The input box is where the user can type a request and can make the request ({0}). The widget will be closed and all content will be discarded when the Escape key is pressed and the terminal will regain focus.",
         makeRequestKeybinding
     )) : ( localize(
-        14277,
+        14407,
         "The input box is where the user can type a request and can make the request by tabbing to the Make Request button, which is not currently triggerable via keybindings. The widget will be closed and all content will be discarded when the Escape key is pressed and the terminal will regain focus."
     )));
     content.push(openAccessibleViewKeybinding ? ( localize(
-        14278,
+        14408,
         "The response can be inspected in the accessible view ({0}).",
         openAccessibleViewKeybinding
     )) : ( localize(
-        14279,
+        14409,
         "With the input box focused, inspect the response in the accessible view via the Open Accessible View command, which is currently not triggerable by a keybinding."
     )));
     content.push(focusResponseKeybinding ? ( localize(
-        14280,
+        14410,
         "Reach the response from the input box ({0}).",
         focusResponseKeybinding
     )) : ( localize(
-        14281,
+        14411,
         "Reach the response from the input box by tabbing or assigning a keybinding for the command: Focus Terminal Response."
     )));
     content.push(focusInputKeybinding ? ( localize(
-        14282,
+        14412,
         "Reach the input box from the response ({0}).",
         focusInputKeybinding
     )) : ( localize(
-        14283,
+        14413,
         "Reach the response from the input box by shift+tabbing or assigning a keybinding for the command: Focus Terminal Input."
     )));
     content.push(runCommandKeybinding ? ( localize(
-        14284,
+        14414,
         "With focus in the input box or command editor, the Terminal: Run Chat Command ({0}) action.",
         runCommandKeybinding
     )) : ( localize(
-        14285,
+        14415,
         "Run a command by tabbing to the button as the action is currently not triggerable by a keybinding."
     )));
     content.push(insertCommandKeybinding ? ( localize(
-        14286,
+        14416,
         "With focus in the input box command editor, the Terminal: Insert Chat Command ({0}) action.",
         insertCommandKeybinding
     )) : ( localize(
-        14287,
+        14417,
         "Insert a command by tabbing to the button as the action is currently not triggerable by a keybinding."
     )));
     content.push(( localize(
-        14288,
+        14418,
         "Use tab to reach conditional parts like commands, status, message responses and more."
     )));
     content.push(( localize(
-        14289,
+        14419,
         "Accessibility Signals can be changed via settings with a prefix of signals.chat. By default, if a request takes more than 4 seconds, you will hear a sound indicating that progress is still occurring."
     )));
     return content.join("\n");

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.js

@@ -32,8 +32,8 @@ import { activeChatController } from './terminalChatControllerHolder.js';
 
 registerActiveXtermAction({
     id: TerminalChatCommandId.Start,
-    title: ( localize2(14290, "Open Inline Chat")),
-    category: ( localize2(14291, "Terminal")),
+    title: ( localize2(14420, "Open Inline Chat")),
+    category: ( localize2(14421, "Terminal")),
     keybinding: {
         primary: KeyMod.CtrlCmd | KeyCode.KeyI,
         when: ( ContextKeyExpr.and(TerminalContextKeys.focusInAny)),
@@ -77,7 +77,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.Close,
-    title: ( localize2(14292, "Close")),
+    title: ( localize2(14422, "Close")),
     category: AbstractInlineChatAction.category,
     keybinding: {
         primary: KeyCode.Escape,
@@ -102,8 +102,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunCommand,
-    title: ( localize2(14293, "Run Chat Command")),
-    shortTitle: ( localize2(14294, "Run")),
+    title: ( localize2(14423, "Run Chat Command")),
+    shortTitle: ( localize2(14424, "Run")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -131,8 +131,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunFirstCommand,
-    title: ( localize2(14295, "Run First Chat Command")),
-    shortTitle: ( localize2(14296, "Run First")),
+    title: ( localize2(14425, "Run First Chat Command")),
+    shortTitle: ( localize2(14426, "Run First")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -160,8 +160,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertCommand,
-    title: ( localize2(14297, "Insert Chat Command")),
-    shortTitle: ( localize2(14298, "Insert")),
+    title: ( localize2(14427, "Insert Chat Command")),
+    shortTitle: ( localize2(14428, "Insert")),
     category: AbstractInlineChatAction.category,
     icon: Codicon.insert,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
@@ -190,8 +190,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertFirstCommand,
-    title: ( localize2(14299, "Insert First Chat Command")),
-    shortTitle: ( localize2(14300, "Insert First")),
+    title: ( localize2(14429, "Insert First Chat Command")),
+    shortTitle: ( localize2(14430, "Insert First")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -219,7 +219,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RerunRequest,
-    title: ( localize2(14301, "Rerun Request")),
+    title: ( localize2(14431, "Rerun Request")),
     f1: false,
     icon: Codicon.refresh,
     category: AbstractInlineChatAction.category,
@@ -260,7 +260,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.ViewInChat,
-    title: ( localize2(14302, "View in Chat")),
+    title: ( localize2(14432, "View in Chat")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -286,8 +286,8 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
     constructor() {
         super({
             id: TerminalChatCommandId.ViewHiddenChatTerminals,
-            title: ( localize2(14303, "View Hidden Chat Terminals")),
-            category: ( localize2(14304, "Terminal")),
+            title: ( localize2(14433, "View Hidden Chat Terminals")),
+            category: ( localize2(14434, "Terminal")),
             f1: true,
             precondition: ( ContextKeyExpr.and(TerminalChatContextKeys.hasHiddenChatTerminals, ChatContextKeys.enabled)),
             menu: [{
@@ -329,7 +329,7 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             return;
         }
         const items = [];
-        const lastCommandLocalized = command => ( localize2(14305, "Last: {0}", command)).value;
+        const lastCommandLocalized = command => ( localize2(14435, "Last: {0}", command)).value;
         const MAX_DETAIL_LENGTH = 80;
         const metas = [];
         for (const instance of ( all.values())) {
@@ -381,10 +381,10 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             });
         }
         const qp = quickInputService.createQuickPick();
-        qp.placeholder = ( localize2(14306, "Select a chat terminal to show and focus")).value;
+        qp.placeholder = ( localize2(14436, "Select a chat terminal to show and focus")).value;
         qp.items = items;
         qp.canSelectMany = false;
-        qp.title = ( localize2(14307, "Chat Terminals")).value;
+        qp.title = ( localize2(14437, "Chat Terminals")).value;
         qp.matchOnDescription = true;
         qp.matchOnDetail = true;
         const qpDisposables = ( new DisposableStore());
@@ -442,14 +442,14 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminal,
-        title: ( localize(14308, "Chat: Focus Most Recent Terminal"))
+        title: ( localize(14438, "Chat: Focus Most Recent Terminal"))
     },
     when: ChatContextKeys.inChatSession
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminalOutput,
-        title: ( localize(14309, "Chat: Focus Most Recent Terminal Output"))
+        title: ( localize(14439, "Chat: Focus Most Recent Terminal Output"))
     },
     when: ChatContextKeys.inChatSession
 });

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.js

@@ -198,7 +198,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     }
     _resetPlaceholder() {
         const defaultAgent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Terminal);
-        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(14310, "Ask about commands"));
+        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(14440, "Ask about commands"));
     }
     async reveal() {
         await this._createSession();

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.js

@@ -170,7 +170,7 @@ registerWorkbenchContribution2(
 );
 registerActiveInstanceAction({
     id: TerminalChatAgentToolsCommandId.ChatAddTerminalSelection,
-    title: ( localize(14317, "Add Terminal Selection to Chat")),
+    title: ( localize(14447, "Add Terminal Selection to Chat")),
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, sharedWhenClause.terminalAvailable)),
     menu: [{
         id: MenuId.TerminalInstanceContext,
@@ -191,8 +191,8 @@ registerActiveInstanceAction({
         chatView.attachmentModel.addContext({
             id: `terminal-selection-${Date.now()}`,
             kind: "generic",
-            name: ( localize(14318, "Terminal Selection")),
-            fullName: ( localize(14318, "Terminal Selection")),
+            name: ( localize(14448, "Terminal Selection")),
+            fullName: ( localize(14448, "Terminal Selection")),
             value: selection,
             icon: Codicon.terminal
         });

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

@@ -12,7 +12,7 @@ const GetTerminalLastCommandToolData = {
     id: TerminalToolId.TerminalLastCommand,
     toolReferenceName: "terminalLastCommand",
     legacyToolReferenceFullNames: ["runCommands/terminalLastCommand"],
-    displayName: ( localize(14333, "Get Terminal Last Command")),
+    displayName: ( localize(14463, "Get Terminal Last Command")),
     modelDescription: "Get the last command run in the active terminal.",
     source: ToolDataSource.Internal,
     icon: Codicon.terminal
@@ -24,8 +24,8 @@ let GetTerminalLastCommandTool = class GetTerminalLastCommandTool extends Dispos
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(14334, "Getting last terminal command")),
-            pastTenseMessage: ( localize(14335, "Got last terminal command"))
+            invocationMessage: ( localize(14464, "Getting last terminal command")),
+            pastTenseMessage: ( localize(14465, "Got last terminal command"))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -1,12 +1,23 @@
 import type { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { type CountTokensCallback, type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
+import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 export declare const GetTerminalOutputToolData: IToolData;
 export interface IGetTerminalOutputInputParams {
     id?: string;
 }
 export declare class GetTerminalOutputTool extends Disposable implements IToolImpl {
-    constructor();
+    private readonly _configurationService;
+    private static readonly _maxOutputSnapshots;
+    private readonly _lastOutputSnapshotByExecutionId;
+    constructor(_configurationService: IConfigurationService, terminalService: ITerminalService);
     prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
+    private _formatOutput;
+    private _rememberOutput;
+    private _createOutputSnapshot;
+    private _forgetTerminalInstance;
+    private _hashOutput;
+    dispose(): void;
 }

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

@@ -1,16 +1,22 @@
 
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { StringSHA1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
+import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
 import { RunInTerminalTool } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool';
 import { TerminalToolId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/terminalToolIds';
 
+var GetTerminalOutputTool_1;
 const GetTerminalOutputToolData = {
     id: TerminalToolId.GetTerminalOutput,
     toolReferenceName: "getTerminalOutput",
     legacyToolReferenceFullNames: ["runCommands/getTerminalOutput"],
-    displayName: ( localize(14336, "Get Terminal Output")),
+    displayName: ( localize(14466, "Get Terminal Output")),
     modelDescription: `Get output from an active terminal execution (identified by the \`id\` returned from ${TerminalToolId.RunInTerminal}).`,
     icon: Codicon.terminal,
     source: ToolDataSource.Internal,
@@ -26,14 +32,25 @@ const GetTerminalOutputToolData = {
         required: ["id"]
     }
 };
-class GetTerminalOutputTool extends Disposable {
-    constructor() {
+let GetTerminalOutputTool = class GetTerminalOutputTool extends Disposable {
+    static {
+        GetTerminalOutputTool_1 = this;
+    }
+    static {
+        this._maxOutputSnapshots = 100;
+    }
+    constructor(_configurationService, terminalService) {
         super();
+        this._configurationService = _configurationService;
+        this._lastOutputSnapshotByExecutionId = ( new Map());
+        this._register(
+            terminalService.onDidDisposeInstance(instance => this._forgetTerminalInstance(instance.instanceId))
+        );
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(14337, "Checking terminal output")),
-            pastTenseMessage: ( localize(14338, "Checked terminal output"))
+            invocationMessage: ( localize(14467, "Checking terminal output")),
+            pastTenseMessage: ( localize(14468, "Checked terminal output"))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {
@@ -48,6 +65,7 @@ class GetTerminalOutputTool extends Disposable {
         }
         const execution = RunInTerminalTool.getExecution(args.id);
         if (!execution) {
+            this._lastOutputSnapshotByExecutionId.delete(args.id);
             return {
                 content: [{
                     kind: "text",
@@ -58,10 +76,63 @@ class GetTerminalOutputTool extends Disposable {
         return {
             content: [{
                 kind: "text",
-                value: `Output of terminal ${args.id}:\n${execution.getOutput()}`
+                value: this._formatOutput(args.id, execution.instance.instanceId, execution.getOutput())
             }]
         };
     }
-}
+    _formatOutput(id, terminalInstanceId, output) {
+        if (!this._configurationService.getValue(TerminalChatAgentToolsSettingId.OutputDeltas)) {
+            this._lastOutputSnapshotByExecutionId.clear();
+            return `Output of terminal ${id}:\n${output}`;
+        }
+        const previousOutputSnapshot = this._lastOutputSnapshotByExecutionId.get(id);
+        const currentOutputSnapshot = this._createOutputSnapshot(terminalInstanceId, output);
+        this._rememberOutput(id, currentOutputSnapshot);
+        if (previousOutputSnapshot === undefined) {
+            return `Output of terminal ${id}:\n${output}`;
+        }
+        if (currentOutputSnapshot.length === previousOutputSnapshot.length && currentOutputSnapshot.hash === previousOutputSnapshot.hash) {
+            return `Output of terminal ${id} unchanged since previous poll (${output.length} characters already shown). No new output.`;
+        }
+        if (output.length > previousOutputSnapshot.length && this._hashOutput(output, previousOutputSnapshot.length) === previousOutputSnapshot.hash) {
+            const delta = output.slice(previousOutputSnapshot.length);
+            return `Output of terminal ${id} since previous poll (${delta.length} new characters, ${output.length} total characters):\n${delta}`;
+        }
+        return `Output of terminal ${id} changed since previous poll; returning current output (${output.length} characters):\n${output}`;
+    }
+    _rememberOutput(id, snapshot) {
+        if (!( this._lastOutputSnapshotByExecutionId.has(id)) && this._lastOutputSnapshotByExecutionId.size >= GetTerminalOutputTool_1._maxOutputSnapshots) {
+            const oldestId = ( this._lastOutputSnapshotByExecutionId.keys()).next().value;
+            if (oldestId !== undefined) {
+                this._lastOutputSnapshotByExecutionId.delete(oldestId);
+            }
+        }
+        this._lastOutputSnapshotByExecutionId.set(id, snapshot);
+    }
+    _createOutputSnapshot(terminalInstanceId, output) {
+        return {
+            terminalInstanceId,
+            length: output.length,
+            hash: this._hashOutput(output)
+        };
+    }
+    _forgetTerminalInstance(terminalInstanceId) {
+        for (const [id, snapshot] of this._lastOutputSnapshotByExecutionId) {
+            if (snapshot.terminalInstanceId === terminalInstanceId) {
+                this._lastOutputSnapshotByExecutionId.delete(id);
+            }
+        }
+    }
+    _hashOutput(output, length = output.length) {
+        const sha = ( new StringSHA1());
+        sha.update(length === output.length ? output : output.slice(0, length));
+        return sha.digest();
+    }
+    dispose() {
+        this._lastOutputSnapshotByExecutionId.clear();
+        super.dispose();
+    }
+};
+GetTerminalOutputTool = GetTerminalOutputTool_1 = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, ITerminalService))], GetTerminalOutputTool));
 
 export { GetTerminalOutputTool, GetTerminalOutputToolData };

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

@@ -11,7 +11,7 @@ const GetTerminalSelectionToolData = {
     id: TerminalToolId.TerminalSelection,
     toolReferenceName: "terminalSelection",
     legacyToolReferenceFullNames: ["runCommands/terminalSelection"],
-    displayName: ( localize(14339, "Get Terminal Selection")),
+    displayName: ( localize(14469, "Get Terminal Selection")),
     modelDescription: "Get the current selection in the active terminal.",
     source: ToolDataSource.Internal,
     icon: Codicon.terminal
@@ -23,8 +23,8 @@ let GetTerminalSelectionTool = class GetTerminalSelectionTool extends Disposable
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(14340, "Reading terminal selection")),
-            pastTenseMessage: ( localize(14341, "Read terminal selection"))
+            invocationMessage: ( localize(14470, "Reading terminal selection")),
+            pastTenseMessage: ( localize(14471, "Read terminal selection"))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -9,7 +9,7 @@ import { TerminalToolId } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 const KillTerminalToolData = {
     id: TerminalToolId.KillTerminal,
     toolReferenceName: "killTerminal",
-    displayName: ( localize(14342, "Kill Terminal")),
+    displayName: ( localize(14472, "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} in async mode (legacy: isBackground=true).`,
     icon: Codicon.terminal,
     source: ToolDataSource.Internal,
@@ -28,8 +28,8 @@ const KillTerminalToolData = {
 class KillTerminalTool extends Disposable {
     async prepareToolInvocation(_context, _token) {
         return {
-            invocationMessage: ( localize(14343, "Killing terminal")),
-            pastTenseMessage: ( localize(14344, "Killed terminal"))
+            invocationMessage: ( localize(14473, "Killing terminal")),
+            pastTenseMessage: ( localize(14474, "Killed terminal"))
         };
     }
     async invoke(invocation, _countTokens, _progress, _token) {

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

@@ -7,7 +7,7 @@ import { TerminalToolId } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 
 const ConfirmTerminalCommandToolData = {
     id: TerminalToolId.ConfirmTerminalCommand,
-    displayName: ( localize(14350, "Confirm Terminal Command")),
+    displayName: ( localize(14480, "Confirm Terminal Command")),
     modelDescription: [
         "This tool allows you to get explicit user confirmation for a terminal command without executing it.",
         "",
@@ -25,7 +25,7 @@ const ConfirmTerminalCommandToolData = {
         "",
         "After confirmation, use a tool to actually execute the command."
     ].join("\n"),
-    userDescription: ( localize(14351, "Tool for confirming terminal commands")),
+    userDescription: ( localize(14481, "Tool for confirming terminal commands")),
     source: ToolDataSource.Internal,
     icon: Codicon.shield,
     inputSchema: {

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

@@ -22,7 +22,7 @@ import { TerminalToolId } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 const SendToTerminalToolData = {
     id: TerminalToolId.SendToTerminal,
     toolReferenceName: "sendToTerminal",
-    displayName: ( localize(14405, "Send to Terminal")),
+    displayName: ( localize(14535, "Send to Terminal")),
     modelDescription: `Send input text to an active terminal execution (identified by the \`id\` returned from ${TerminalToolId.RunInTerminal}). The 'command' field may be empty or whitespace to press Enter (useful for interactive prompts). By default, returns the last 20 lines of terminal output captured shortly after sending. Set 'waitForOutput' to true for interactive programs (games, REPLs, etc.) to wait until the terminal becomes idle before returning output — this gives you the program's response to your input.`,
     icon: Codicon.terminal,
     source: ToolDataSource.Internal,
@@ -46,6 +46,9 @@ const SendToTerminalToolData = {
         required: ["id", "command"]
     }
 };
+function isCancelSignal(command) {
+    return /^[\u0003\u0004\u001c]$/.test(command.trim());
+}
 const FocusTerminalByIdCommandId = "workbench.action.terminal.chat.focusTerminalById";
 CommandsRegistry.registerCommand(FocusTerminalByIdCommandId, async (accessor, instanceId) => {
     const terminalService = accessor.get(ITerminalService);
@@ -87,16 +90,16 @@ let SendToTerminalTool = class SendToTerminalTool extends Disposable {
         const pastTenseMessage = ( new MarkdownString());
         const questionText = this._getQuestionContextForTerminal(context.chatSessionResource, args);
         if (isEmptyInput) {
-            invocationMessage.appendMarkdown(( localize(14406, "Pressing `Enter` in terminal")));
-            pastTenseMessage.appendMarkdown(( localize(14407, "Pressed `Enter` in terminal")));
+            invocationMessage.appendMarkdown(( localize(14536, "Pressing `Enter` in terminal")));
+            pastTenseMessage.appendMarkdown(( localize(14537, "Pressed `Enter` in terminal")));
         } else {
             const displayCommand = buildCommandDisplayText(args.command);
             const safeInlineCode = appendEscapedMarkdownInlineCode(displayCommand);
-            invocationMessage.appendMarkdown(( localize(14408, "Sending {0} to terminal", safeInlineCode)));
-            pastTenseMessage.appendMarkdown(( localize(14409, "Sent {0} to terminal", safeInlineCode)));
+            invocationMessage.appendMarkdown(( localize(14538, "Sending {0} to terminal", safeInlineCode)));
+            pastTenseMessage.appendMarkdown(( localize(14539, "Sent {0} to terminal", safeInlineCode)));
         }
         if (questionText) {
-            const replyPrefix = ` (${( localize(14410, "replying to: "))}`;
+            const replyPrefix = ` (${( localize(14540, "replying to: "))}`;
             invocationMessage.appendMarkdown(replyPrefix);
             invocationMessage.appendText(questionText);
             invocationMessage.appendMarkdown(")");
@@ -111,15 +114,15 @@ let SendToTerminalTool = class SendToTerminalTool extends Disposable {
             }
         }));
         const safeTerminalLabel = appendEscapedMarkdownInlineCode(terminalLabel);
-        const baseMessage = isEmptyInput ? ( localize(14411, "Press `Enter` in terminal {0}", safeTerminalLabel)) : ( localize(
-            14412,
+        const baseMessage = isEmptyInput ? ( localize(14541, "Press `Enter` in terminal {0}", safeTerminalLabel)) : ( localize(
+            14542,
             "Run {0} in terminal {1}",
             appendEscapedMarkdownInlineCode(buildCommandDisplayText(args.command)),
             safeTerminalLabel
         ));
         if (instanceId !== undefined) {
             const focusUri = createCommandUri(FocusTerminalByIdCommandId, instanceId);
-            confirmationMessage.appendMarkdown(`${baseMessage} — [${( localize(14413, "Focus Terminal"))}](${focusUri})`);
+            confirmationMessage.appendMarkdown(`${baseMessage} — [${( localize(14543, "Focus Terminal"))}](${focusUri})`);
         } else {
             confirmationMessage.appendMarkdown(baseMessage);
         }
@@ -133,7 +136,7 @@ let SendToTerminalTool = class SendToTerminalTool extends Disposable {
         const isAnsweringQuestion = questionText !== undefined;
         const shouldShowConfirmation = (!isSessionAutoApproved && !isAnsweringQuestion) || context.forceConfirmationReason !== undefined;
         const confirmationMessages = shouldShowConfirmation ? {
-            title: ( localize(14414, "Send to Terminal")),
+            title: ( localize(14544, "Send to Terminal")),
             message: confirmationMessage,
             allowAutoConfirm: undefined
         } : undefined;
@@ -288,10 +291,11 @@ let SendToTerminalTool = class SendToTerminalTool extends Disposable {
                 lastNLines: 20
             });
         }
+        const steering = isCancelSignal(args.command) ? `\n\nNote: The input you sent was a cancel signal (Ctrl-C / Ctrl-D / Ctrl-\\). The previously running command was interrupted, not completed. This is not a signal to end the turn — if you intend to run a recovery or follow-up command, issue it now in this same turn. Call ${TerminalToolId.GetTerminalOutput} first if you need to verify the shell is back at a prompt.` : "";
         return {
             content: [{
                 kind: "text",
-                value: `Successfully sent command to terminal ${args.id}.${recentOutput ? `\n\nTerminal output:\n${recentOutput}` : ""}`
+                value: `Successfully sent command to terminal ${args.id}.${recentOutput ? `\n\nTerminal output:\n${recentOutput}` : ""}${steering}`
             }]
         };
     }