@codingame/monaco-vscode-chat-service-override 30.0.0 → 31.0.0

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

@@ -4,7 +4,7 @@ import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
-import { TerminalChatContextKeys, TerminalChatCommandId } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { TerminalChatContextKeys, TerminalChatCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 import { TerminalChatController } from './terminalChatController.js';
 
 class TerminalChatAccessibilityHelp {
@@ -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(
-        13819,
+        13960,
         "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(
-        13820,
+        13961,
         "It can be activated using the command: Terminal: Start Chat ({0}), which will focus the input box.",
         startChatKeybinding
     )));
     content.push(makeRequestKeybinding ? ( localize(
-        13821,
+        13962,
         "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(
-        13822,
+        13963,
         "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(
-        13823,
+        13964,
         "The response can be inspected in the accessible view ({0}).",
         openAccessibleViewKeybinding
     )) : ( localize(
-        13824,
+        13965,
         "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(
-        13825,
+        13966,
         "Reach the response from the input box ({0}).",
         focusResponseKeybinding
     )) : ( localize(
-        13826,
+        13967,
         "Reach the response from the input box by tabbing or assigning a keybinding for the command: Focus Terminal Response."
     )));
     content.push(focusInputKeybinding ? ( localize(
-        13827,
+        13968,
         "Reach the input box from the response ({0}).",
         focusInputKeybinding
     )) : ( localize(
-        13828,
+        13969,
         "Reach the response from the input box by shift+tabbing or assigning a keybinding for the command: Focus Terminal Input."
     )));
     content.push(runCommandKeybinding ? ( localize(
-        13829,
+        13970,
         "With focus in the input box or command editor, the Terminal: Run Chat Command ({0}) action.",
         runCommandKeybinding
     )) : ( localize(
-        13830,
+        13971,
         "Run a command by tabbing to the button as the action is currently not triggerable by a keybinding."
     )));
     content.push(insertCommandKeybinding ? ( localize(
-        13831,
+        13972,
         "With focus in the input box command editor, the Terminal: Insert Chat Command ({0}) action.",
         insertCommandKeybinding
     )) : ( localize(
-        13832,
+        13973,
         "Insert a command by tabbing to the button as the action is currently not triggerable by a keybinding."
     )));
     content.push(( localize(
-        13833,
+        13974,
         "Use tab to reach conditional parts like commands, status, message responses and more."
     )));
     content.push(( localize(
-        13834,
+        13975,
         "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/terminalChatAccessibleView.js

@@ -5,7 +5,7 @@ import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 import { TerminalChatController } from './terminalChatController.js';
 import { MenuItemAction } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
-import { TerminalChatContextKeys, MENU_TERMINAL_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { TerminalChatContextKeys, MENU_TERMINAL_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 import { activeChatController } from './terminalChatControllerHolder.js';
 
 class TerminalInlineChatAccessibleView {

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

@@ -16,7 +16,7 @@ import { ITerminalService, ITerminalGroupService, ITerminalEditorService, ITermi
 import { registerActiveXtermAction } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminal/browser/terminalActions';
 import { TerminalContextMenuGroup } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalMenus';
 import { TerminalContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalContextKey';
-import { TerminalChatContextKeys, TerminalChatCommandId, MENU_TERMINAL_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { TerminalChatContextKeys, TerminalChatCommandId, MENU_TERMINAL_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { getIconId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalIcon';
@@ -32,8 +32,8 @@ import { activeChatController } from './terminalChatControllerHolder.js';
 
 registerActiveXtermAction({
     id: TerminalChatCommandId.Start,
-    title: ( localize2(13835, "Open Inline Chat")),
-    category: ( localize2(13836, "Terminal")),
+    title: ( localize2(13976, "Open Inline Chat")),
+    category: ( localize2(13977, "Terminal")),
     keybinding: {
         primary: KeyMod.CtrlCmd | KeyCode.KeyI,
         when: ( ContextKeyExpr.and(TerminalContextKeys.focusInAny)),
@@ -77,7 +77,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.Close,
-    title: ( localize2(13837, "Close")),
+    title: ( localize2(13978, "Close")),
     category: AbstractInlineChatAction.category,
     keybinding: {
         primary: KeyCode.Escape,
@@ -102,8 +102,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunCommand,
-    title: ( localize2(13838, "Run Chat Command")),
-    shortTitle: ( localize2(13839, "Run")),
+    title: ( localize2(13979, "Run Chat Command")),
+    shortTitle: ( localize2(13980, "Run")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -131,8 +131,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunFirstCommand,
-    title: ( localize2(13840, "Run First Chat Command")),
-    shortTitle: ( localize2(13841, "Run First")),
+    title: ( localize2(13981, "Run First Chat Command")),
+    shortTitle: ( localize2(13982, "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(13842, "Insert Chat Command")),
-    shortTitle: ( localize2(13843, "Insert")),
+    title: ( localize2(13983, "Insert Chat Command")),
+    shortTitle: ( localize2(13984, "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(13844, "Insert First Chat Command")),
-    shortTitle: ( localize2(13845, "Insert First")),
+    title: ( localize2(13985, "Insert First Chat Command")),
+    shortTitle: ( localize2(13986, "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(13846, "Rerun Request")),
+    title: ( localize2(13987, "Rerun Request")),
     f1: false,
     icon: Codicon.refresh,
     category: AbstractInlineChatAction.category,
@@ -260,7 +260,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.ViewInChat,
-    title: ( localize2(13847, "View in Chat")),
+    title: ( localize2(13988, "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(13848, "View Hidden Chat Terminals")),
-            category: ( localize2(13849, "Terminal")),
+            title: ( localize2(13989, "View Hidden Chat Terminals")),
+            category: ( localize2(13990, "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(13850, "Last: {0}", command)).value;
+        const lastCommandLocalized = command => ( localize2(13991, "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(13851, "Select a chat terminal to show and focus")).value;
+        qp.placeholder = ( localize2(13992, "Select a chat terminal to show and focus")).value;
         qp.items = items;
         qp.canSelectMany = false;
-        qp.title = ( localize2(13852, "Chat Terminals")).value;
+        qp.title = ( localize2(13993, "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(13853, "Chat: Focus Most Recent Terminal"))
+        title: ( localize(13994, "Chat: Focus Most Recent Terminal"))
     },
     when: ChatContextKeys.inChatSession
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminalOutput,
-        title: ( localize(13854, "Chat: Focus Most Recent Terminal Output"))
+        title: ( localize(13995, "Chat: Focus Most Recent Terminal Output"))
     },
     when: ChatContextKeys.inChatSession
 });

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

@@ -5,7 +5,7 @@ import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { TerminalChatContextKeys } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { TerminalChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 
 let TerminalChatEnabler = class TerminalChatEnabler {
     static {

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatService.d.ts

@@ -2,7 +2,7 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { IChatTerminalToolProgressPart, ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
+import { IAhpTerminalCommandSource, IChatTerminalToolProgressPart, 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 { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
@@ -23,6 +23,7 @@ export declare class TerminalChatService extends Disposable implements ITerminal
     private readonly _chatSessionResourceByTerminalInstance;
     private readonly _terminalInstanceListenersByToolSessionId;
     private readonly _chatSessionListenersByTerminalInstance;
+    private readonly _ahpCommandSources;
     private readonly _onDidContinueInBackground;
     readonly onDidContinueInBackground: Event<string>;
     private readonly _onDidRegisterTerminalInstanceForToolSession;
@@ -78,4 +79,6 @@ export declare class TerminalChatService extends Disposable implements ITerminal
         matchCommandLine?: boolean;
     }>>;
     continueInBackground(terminalToolSessionId: string): void;
+    registerAhpCommandSource(terminalToolSessionId: string, source: IAhpTerminalCommandSource): IDisposable;
+    getAhpCommandSource(terminalToolSessionId: string): IAhpTerminalCommandSource | undefined;
 }

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Disposable, DisposableMap, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableMap, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 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';
@@ -9,7 +9,7 @@ import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
-import { TerminalChatContextKeys } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { TerminalChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { isNumber, isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 
@@ -37,6 +37,7 @@ let TerminalChatService = class TerminalChatService extends Disposable {
         this._chatSessionResourceByTerminalInstance = ( new Map());
         this._terminalInstanceListenersByToolSessionId = this._register(( new DisposableMap()));
         this._chatSessionListenersByTerminalInstance = this._register(( new DisposableMap()));
+        this._ahpCommandSources = ( new Map());
         this._onDidContinueInBackground = this._register(( new Emitter()));
         this.onDidContinueInBackground = this._onDidContinueInBackground.event;
         this._onDidRegisterTerminalInstanceForToolSession = this._register(( new Emitter()));
@@ -54,6 +55,9 @@ let TerminalChatService = class TerminalChatService extends Disposable {
                 this._sessionAutoApprovalEnabled.delete(resource);
             }
         }));
+        this._register(
+            this._terminalService.onDidChangeInstances(() => this._updateHasToolTerminalContextKeys())
+        );
     }
     registerTerminalInstanceWithToolSession(terminalToolSessionId, instance) {
         if (!terminalToolSessionId) {
@@ -62,17 +66,26 @@ let TerminalChatService = class TerminalChatService extends Disposable {
             );
             return;
         }
+        const existingToolSessionId = this._toolSessionIdByTerminalInstance.get(instance);
+        if (existingToolSessionId === terminalToolSessionId) {
+            return;
+        }
+        if (existingToolSessionId !== undefined) {
+            this._terminalInstanceListenersByToolSessionId.deleteAndDispose(existingToolSessionId);
+            this._terminalInstancesByToolSessionId.delete(existingToolSessionId);
+        }
         this._terminalInstancesByToolSessionId.set(terminalToolSessionId, instance);
         this._toolSessionIdByTerminalInstance.set(instance, terminalToolSessionId);
         this._onDidRegisterTerminalInstanceForToolSession.fire(instance);
-        this._terminalInstanceListenersByToolSessionId.set(terminalToolSessionId, instance.onDisposed(() => {
+        const instanceStore = ( new DisposableStore());
+        instanceStore.add(instance.onDisposed(() => {
             this._terminalInstancesByToolSessionId.delete(terminalToolSessionId);
             this._toolSessionIdByTerminalInstance.delete(instance);
             this._terminalInstanceListenersByToolSessionId.deleteAndDispose(terminalToolSessionId);
             this._persistToStorage();
             this._updateHasToolTerminalContextKeys();
         }));
-        this._register(this._chatService.onDidDisposeSession(e => {
+        instanceStore.add(this._chatService.onDidDisposeSession(e => {
             for (const resource of e.sessionResources) {
                 if (LocalChatSessionUri.parseLocalSessionId(resource) === terminalToolSessionId) {
                     this._terminalInstancesByToolSessionId.delete(terminalToolSessionId);
@@ -84,9 +97,7 @@ let TerminalChatService = class TerminalChatService extends Disposable {
                 }
             }
         }));
-        this._register(
-            this._terminalService.onDidChangeInstances(() => this._updateHasToolTerminalContextKeys())
-        );
+        this._terminalInstanceListenersByToolSessionId.set(terminalToolSessionId, instanceStore);
         if (isNumber(instance.shellLaunchConfig?.attachPersistentProcess?.id) || isNumber(instance.persistentProcessId)) {
             this._persistToStorage();
         }
@@ -287,6 +298,17 @@ let TerminalChatService = class TerminalChatService extends Disposable {
     continueInBackground(terminalToolSessionId) {
         this._onDidContinueInBackground.fire(terminalToolSessionId);
     }
+    registerAhpCommandSource(terminalToolSessionId, source) {
+        this._ahpCommandSources.set(terminalToolSessionId, source);
+        return toDisposable(() => {
+            if (this._ahpCommandSources.get(terminalToolSessionId) === source) {
+                this._ahpCommandSources.delete(terminalToolSessionId);
+            }
+        });
+    }
+    getAhpCommandSource(terminalToolSessionId) {
+        return this._ahpCommandSources.get(terminalToolSessionId);
+    }
 };
 TerminalChatService = ( __decorate([( __param(0, ILogService)), ( __param(1, ITerminalService)), ( __param(2, IStorageService)), ( __param(3, IContextKeyService)), ( __param(4, IChatService))], TerminalChatService));
 

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

@@ -24,7 +24,7 @@ import { InlineChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/v
 import { MENU_INLINE_CHAT_WIDGET_SECONDARY } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { TerminalStickyScrollContribution } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution';
 import * as terminalChatWidget from './media/terminalChatWidget.css';
-import { TerminalChatContextKeys, MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR, TerminalChatCommandId, MENU_TERMINAL_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { TerminalChatContextKeys, MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR, TerminalChatCommandId, MENU_TERMINAL_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -187,7 +187,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     }
     _resetPlaceholder() {
         const defaultAgent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Terminal);
-        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(13855, "Ask about commands"));
+        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(13996, "Ask about commands"));
     }
     async reveal() {
         await this._createSession();

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

@@ -8,7 +8,7 @@ import { IToolInvocationContext, ToolProgress } from "@codingame/monaco-vscode-a
 import { Task } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/tasks";
 import { ITaskService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service";
 import { ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
-import { IExecution, IPollingResult, OutputMonitorState } from "./tools/monitoring/types.js";
+import { IExecution, IPollingResult, OutputMonitorState } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/types";
 import type { IMarker as IXtermMarker } from "@xterm/xterm";
 export declare function getTaskDefinition(id: string): {
     taskLabel: string;

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

@@ -3,9 +3,9 @@ import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/asyn
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
-import { getOutput } from './outputHelpers.js';
-import { OutputMonitor } from './tools/monitoring/outputMonitor.js';
-import { OutputMonitorState } from './tools/monitoring/types.js';
+import { getOutput } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/outputHelpers';
+import { OutputMonitor } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor';
+import { OutputMonitorState } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/types';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 

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

@@ -8,6 +8,7 @@ import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { AgentSandboxSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/sandbox/common/settings';
 import { TerminalSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
@@ -18,18 +19,19 @@ import { TerminalContextMenuGroup } from '@codingame/monaco-vscode-api/vscode/vs
 import { TerminalContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalContextKey';
 import { TerminalChatAgentToolsCommandId } from '../common/terminal.chatAgentTools.js';
 import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
-import { AwaitTerminalTool, AwaitTerminalToolData } from './tools/awaitTerminalTool.js';
+import { AgentNetworkDomainSettingId } from '@codingame/monaco-vscode-katex-common/vscode/vs/platform/networkFilter/common/settings';
 import { GetTerminalLastCommandTool, GetTerminalLastCommandToolData } from './tools/getTerminalLastCommandTool.js';
 import { KillTerminalTool, KillTerminalToolData } from './tools/killTerminalTool.js';
 import { GetTerminalOutputTool, GetTerminalOutputToolData } from './tools/getTerminalOutputTool.js';
+import { SendToTerminalTool, SendToTerminalToolData } from './tools/sendToTerminalTool.js';
 import { GetTerminalSelectionTool, GetTerminalSelectionToolData } from './tools/getTerminalSelectionTool.js';
 import { ConfirmTerminalCommandTool, ConfirmTerminalCommandToolData } from './tools/runInTerminalConfirmationTool.js';
-import { createRunInTerminalToolData, RunInTerminalTool } from './tools/runInTerminalTool.js';
+import { createRunInTerminalToolData, RunInTerminalTool } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool';
 import { CreateAndRunTaskTool, CreateAndRunTaskToolData } from './tools/task/createAndRunTaskTool.js';
 import { GetTaskOutputTool, GetTaskOutputToolData } from './tools/task/getTaskOutputTool.js';
 import { RunTaskTool, RunTaskToolData } from './tools/task/runTaskTool.js';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import '../common/terminalSandboxService.js';
+import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService';
 import { isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 
 let ShellIntegrationTimeoutMigrationContribution = class ShellIntegrationTimeoutMigrationContribution extends Disposable {
@@ -100,12 +102,12 @@ let ChatAgentToolsContribution = class ChatAgentToolsContribution extends Dispos
             _toolsService.registerTool(GetTerminalOutputToolData, getTerminalOutputTool)
         );
         this._register(_toolsService.executeToolSet.addTool(GetTerminalOutputToolData));
-        const awaitTerminalTool = _instantiationService.createInstance(AwaitTerminalTool);
-        this._register(_toolsService.registerTool(AwaitTerminalToolData, awaitTerminalTool));
-        this._register(_toolsService.executeToolSet.addTool(AwaitTerminalToolData));
         const killTerminalTool = _instantiationService.createInstance(KillTerminalTool);
         this._register(_toolsService.registerTool(KillTerminalToolData, killTerminalTool));
         this._register(_toolsService.executeToolSet.addTool(KillTerminalToolData));
+        const sendToTerminalTool = _instantiationService.createInstance(SendToTerminalTool);
+        this._register(_toolsService.registerTool(SendToTerminalToolData, sendToTerminalTool));
+        this._register(_toolsService.executeToolSet.addTool(SendToTerminalToolData));
         this._registerRunInTerminalTool();
         const getTerminalSelectionTool = _instantiationService.createInstance(GetTerminalSelectionTool);
         this._register(
@@ -127,11 +129,7 @@ let ChatAgentToolsContribution = class ChatAgentToolsContribution extends Dispos
         this._register(_toolsService.executeToolSet.addTool(CreateAndRunTaskToolData));
         this._register(_toolsService.readToolSet.addTool(GetTaskOutputToolData));
         this._register(this._configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(TerminalChatAgentToolsSettingId.AgentSandboxEnabled) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.AgentSandboxNetworkAllowedDomains) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.AgentSandboxNetworkDeniedDomains) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.DeprecatedTerminalSandboxEnabled) || e.affectsConfiguration(
-                TerminalChatAgentToolsSettingId.DeprecatedTerminalSandboxNetworkAllowedDomains
-            ) || e.affectsConfiguration(
-                TerminalChatAgentToolsSettingId.DeprecatedTerminalSandboxNetworkDeniedDomains
-            )) {
+            if (e.affectsConfiguration(AgentSandboxSettingId.AgentSandboxEnabled) || e.affectsConfiguration(AgentSandboxSettingId.DeprecatedAgentSandboxEnabled) || e.affectsConfiguration(AgentNetworkDomainSettingId.AllowedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeniedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedOldAllowedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedOldDeniedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedSandboxAllowedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedSandboxDeniedNetworkDomains) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.AgentSandboxLinuxFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.DeprecatedAgentSandboxLinuxFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.AgentSandboxMacFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.DeprecatedAgentSandboxMacFileSystem)) {
                 this._registerRunInTerminalTool();
             }
         }));
@@ -164,7 +162,7 @@ registerWorkbenchContribution2(
 );
 registerActiveInstanceAction({
     id: TerminalChatAgentToolsCommandId.ChatAddTerminalSelection,
-    title: ( localize(13862, "Add Terminal Selection to Chat")),
+    title: ( localize(14003, "Add Terminal Selection to Chat")),
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, sharedWhenClause.terminalAvailable)),
     menu: [{
         id: MenuId.TerminalInstanceContext,
@@ -185,8 +183,8 @@ registerActiveInstanceAction({
         chatView.attachmentModel.addContext({
             id: `terminal-selection-${Date.now()}`,
             kind: "generic",
-            name: ( localize(13863, "Terminal Selection")),
-            fullName: ( localize(13863, "Terminal Selection")),
+            name: ( localize(14004, "Terminal Selection")),
+            fullName: ( localize(14004, "Terminal Selection")),
             value: selection,
             icon: Codicon.terminal
         });

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

@@ -6,13 +6,13 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
 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 { TerminalToolId } from './toolIds.js';
+import { TerminalToolId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/terminalToolIds';
 
 const GetTerminalLastCommandToolData = {
     id: TerminalToolId.TerminalLastCommand,
     toolReferenceName: "terminalLastCommand",
     legacyToolReferenceFullNames: ["runCommands/terminalLastCommand"],
-    displayName: ( localize(13881, "Get Terminal Last Command")),
+    displayName: ( localize(14019, "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(13882, "Getting last terminal command")),
-            pastTenseMessage: ( localize(13883, "Got last terminal command"))
+            invocationMessage: ( localize(14020, "Getting last terminal command")),
+            pastTenseMessage: ( localize(14021, "Got last terminal command"))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -1,11 +1,15 @@
 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 { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.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";
 export declare const GetTerminalOutputToolData: IToolData;
 export interface IGetTerminalOutputInputParams {
-    id: string;
+    id?: string;
+    terminalId?: number;
 }
 export declare class GetTerminalOutputTool extends Disposable implements IToolImpl {
+    private readonly _terminalService;
+    constructor(_terminalService: ITerminalService);
     prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
 }