@codingame/monaco-vscode-chat-service-override 33.0.9 → 34.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-api/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { TerminalChatContextKeys, TerminalChatCommandId } from '@codingame/monaco-vscode-xterm-common/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(
-        14404,
+        14593,
         "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(
-        14405,
+        14594,
         "It can be activated using the command: Terminal: Start Chat ({0}), which will focus the input box.",
         startChatKeybinding
     )));
     content.push(makeRequestKeybinding ? ( localize(
-        14406,
+        14595,
         "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(
-        14407,
+        14596,
         "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(
-        14408,
+        14597,
         "The response can be inspected in the accessible view ({0}).",
         openAccessibleViewKeybinding
     )) : ( localize(
-        14409,
+        14598,
         "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(
-        14410,
+        14599,
         "Reach the response from the input box ({0}).",
         focusResponseKeybinding
     )) : ( localize(
-        14411,
+        14600,
         "Reach the response from the input box by tabbing or assigning a keybinding for the command: Focus Terminal Response."
     )));
     content.push(focusInputKeybinding ? ( localize(
-        14412,
+        14601,
         "Reach the input box from the response ({0}).",
         focusInputKeybinding
     )) : ( localize(
-        14413,
+        14602,
         "Reach the response from the input box by shift+tabbing or assigning a keybinding for the command: Focus Terminal Input."
     )));
     content.push(runCommandKeybinding ? ( localize(
-        14414,
+        14603,
         "With focus in the input box or command editor, the Terminal: Run Chat Command ({0}) action.",
         runCommandKeybinding
     )) : ( localize(
-        14415,
+        14604,
         "Run a command by tabbing to the button as the action is currently not triggerable by a keybinding."
     )));
     content.push(insertCommandKeybinding ? ( localize(
-        14416,
+        14605,
         "With focus in the input box command editor, the Terminal: Insert Chat Command ({0}) action.",
         insertCommandKeybinding
     )) : ( localize(
-        14417,
+        14606,
         "Insert a command by tabbing to the button as the action is currently not triggerable by a keybinding."
     )));
     content.push(( localize(
-        14418,
+        14607,
         "Use tab to reach conditional parts like commands, status, message responses and more."
     )));
     content.push(( localize(
-        14419,
+        14608,
         "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-api/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { TerminalChatContextKeys, MENU_TERMINAL_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-xterm-common/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-api/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { TerminalChatContextKeys, TerminalChatCommandId, MENU_TERMINAL_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-xterm-common/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(14420, "Open Inline Chat")),
-    category: ( localize2(14421, "Terminal")),
+    title: ( localize2(14609, "Open Inline Chat")),
+    category: ( localize2(14610, "Terminal")),
     keybinding: {
         primary: KeyMod.CtrlCmd | KeyCode.KeyI,
         when: ( ContextKeyExpr.and(TerminalContextKeys.focusInAny)),
@@ -77,7 +77,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.Close,
-    title: ( localize2(14422, "Close")),
+    title: ( localize2(14611, "Close")),
     category: AbstractInlineChatAction.category,
     keybinding: {
         primary: KeyCode.Escape,
@@ -102,8 +102,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunCommand,
-    title: ( localize2(14423, "Run Chat Command")),
-    shortTitle: ( localize2(14424, "Run")),
+    title: ( localize2(14612, "Run Chat Command")),
+    shortTitle: ( localize2(14613, "Run")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -131,8 +131,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunFirstCommand,
-    title: ( localize2(14425, "Run First Chat Command")),
-    shortTitle: ( localize2(14426, "Run First")),
+    title: ( localize2(14614, "Run First Chat Command")),
+    shortTitle: ( localize2(14615, "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(14427, "Insert Chat Command")),
-    shortTitle: ( localize2(14428, "Insert")),
+    title: ( localize2(14616, "Insert Chat Command")),
+    shortTitle: ( localize2(14617, "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(14429, "Insert First Chat Command")),
-    shortTitle: ( localize2(14430, "Insert First")),
+    title: ( localize2(14618, "Insert First Chat Command")),
+    shortTitle: ( localize2(14619, "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(14431, "Rerun Request")),
+    title: ( localize2(14620, "Rerun Request")),
     f1: false,
     icon: Codicon.refresh,
     category: AbstractInlineChatAction.category,
@@ -260,7 +260,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.ViewInChat,
-    title: ( localize2(14432, "View in Chat")),
+    title: ( localize2(14621, "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(14433, "View Hidden Chat Terminals")),
-            category: ( localize2(14434, "Terminal")),
+            title: ( localize2(14622, "View Hidden Chat Terminals")),
+            category: ( localize2(14623, "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(14435, "Last: {0}", command)).value;
+        const lastCommandLocalized = command => ( localize2(14624, "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(14436, "Select a chat terminal to show and focus")).value;
+        qp.placeholder = ( localize2(14625, "Select a chat terminal to show and focus")).value;
         qp.items = items;
         qp.canSelectMany = false;
-        qp.title = ( localize2(14437, "Chat Terminals")).value;
+        qp.title = ( localize2(14626, "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(14438, "Chat: Focus Most Recent Terminal"))
+        title: ( localize(14627, "Chat: Focus Most Recent Terminal"))
     },
     when: ChatContextKeys.inChatSession
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminalOutput,
-        title: ( localize(14439, "Chat: Focus Most Recent Terminal Output"))
+        title: ( localize(14628, "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-api/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { TerminalChatContextKeys } from '@codingame/monaco-vscode-xterm-common/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

@@ -23,6 +23,8 @@ export declare class TerminalChatService extends Disposable implements ITerminal
     private readonly _chatSessionResourceByTerminalInstance;
     private readonly _terminalInstanceListenersByToolSessionId;
     private readonly _chatSessionListenersByTerminalInstance;
+    private readonly _terminalInstancesByExecutionId;
+    private readonly _terminalInstanceListenersByExecutionId;
     private readonly _ahpCommandSources;
     private readonly _onDidContinueInBackground;
     readonly onDidContinueInBackground: Event<string>;
@@ -54,6 +56,8 @@ export declare class TerminalChatService extends Disposable implements ITerminal
     getTerminalInstanceByToolSessionId(terminalToolSessionId: string | undefined): Promise<ITerminalInstance | undefined>;
     getToolSessionTerminalInstances(hiddenOnly?: boolean): readonly ITerminalInstance[];
     getToolSessionIdForInstance(instance: ITerminalInstance): string | undefined;
+    registerTerminalInstanceWithExecutionId(terminalExecutionId: string, instance: ITerminalInstance): IDisposable;
+    getTerminalInstanceByExecutionId(terminalExecutionId: string): ITerminalInstance | undefined;
     registerTerminalInstanceWithChatSession(chatSessionResource: URI, instance: ITerminalInstance): void;
     getChatSessionResourceForInstance(instance: ITerminalInstance): URI | undefined;
     isBackgroundTerminal(terminalToolSessionId?: string): boolean;

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

@@ -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-api/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { TerminalChatContextKeys } from '@codingame/monaco-vscode-xterm-common/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,8 @@ let TerminalChatService = class TerminalChatService extends Disposable {
         this._chatSessionResourceByTerminalInstance = ( new Map());
         this._terminalInstanceListenersByToolSessionId = this._register(( new DisposableMap()));
         this._chatSessionListenersByTerminalInstance = this._register(( new DisposableMap()));
+        this._terminalInstancesByExecutionId = ( new Map());
+        this._terminalInstanceListenersByExecutionId = this._register(( new DisposableMap()));
         this._ahpCommandSources = ( new Map());
         this._onDidContinueInBackground = this._register(( new Emitter()));
         this.onDidContinueInBackground = this._onDidContinueInBackground.event;
@@ -130,6 +132,24 @@ let TerminalChatService = class TerminalChatService extends Disposable {
     getToolSessionIdForInstance(instance) {
         return this._toolSessionIdByTerminalInstance.get(instance);
     }
+    registerTerminalInstanceWithExecutionId(terminalExecutionId, instance) {
+        this._terminalInstanceListenersByExecutionId.deleteAndDispose(terminalExecutionId);
+        this._terminalInstancesByExecutionId.set(terminalExecutionId, instance);
+        const instanceStore = ( new DisposableStore());
+        const unregister = () => {
+            if (this._terminalInstancesByExecutionId.get(terminalExecutionId) !== instance) {
+                return;
+            }
+            this._terminalInstancesByExecutionId.delete(terminalExecutionId);
+            this._terminalInstanceListenersByExecutionId.deleteAndDispose(terminalExecutionId);
+        };
+        instanceStore.add(instance.onDisposed(unregister));
+        this._terminalInstanceListenersByExecutionId.set(terminalExecutionId, instanceStore);
+        return toDisposable(unregister);
+    }
+    getTerminalInstanceByExecutionId(terminalExecutionId) {
+        return this._terminalInstancesByExecutionId.get(terminalExecutionId);
+    }
     registerTerminalInstanceWithChatSession(chatSessionResource, instance) {
         const existingResource = this._chatSessionResourceByTerminalInstance.get(instance);
         if (existingResource && ( existingResource.toString()) === ( chatSessionResource.toString())) {

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-api/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-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
@@ -198,7 +198,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     }
     _resetPlaceholder() {
         const defaultAgent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Terminal);
-        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(14440, "Ask about commands"));
+        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(14629, "Ask about commands"));
     }
     async reveal() {
         await this._createSession();

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

@@ -0,0 +1,55 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IAgentHostService } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentService.service";
+import { IRemoteAgentHostService } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/remoteAgentHostService.service";
+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 { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+/**
+ * Forwards the workbench user's sandbox setting values into every connected
+ * agent host (local + remote) via `RootConfigChanged` actions, so the
+ * agent-host terminal sandbox engine can mirror the user's preferences.
+ *
+ * The forwarder is deliberately one-directional: it pushes only when
+ *  - a connection comes online (initial push, deferred until the host
+ *    advertises the sandbox schema), or
+ *  - a sandbox-related workbench setting changes.
+ *
+ * It does NOT react to agent-host root-state changes after the initial
+ * push, so concurrent edits coming from the host (or from another client
+ * attached to the same host) do not trigger a push-back loop. Each push
+ * is schema-guarded so older hosts that don't advertise the sandbox keys
+ * are skipped silently.
+ */
+export declare class AgentHostSandboxForwarder extends Disposable implements IWorkbenchContribution {
+    private readonly _localAgentHostService;
+    private readonly _remoteAgentHostService;
+    private readonly _configurationService;
+    private readonly _logService;
+    static readonly ID = "workbench.contrib.agentHostSandboxForwarder";
+    /**
+     * Connections that have already had their initial push attempted
+     * (successfully or via a pending listener waiting for the sandbox
+     * schema). Used to avoid re-scheduling pushes for connections that
+     * are still present across `onDidChangeConnections` events.
+     */
+    private readonly _scheduled;
+    private _desired;
+    constructor(_localAgentHostService: IAgentHostService, _remoteAgentHostService: IRemoteAgentHostService, _configurationService: IConfigurationService, _logService: ILogService);
+    private _syncConnectionListeners;
+    /**
+     * Push immediately if the host is already advertising the sandbox
+     * schema; otherwise subscribe to `rootState.onDidChange` long enough
+     * to catch the schema and push exactly once, then unsubscribe.
+     */
+    private _scheduleInitialPush;
+    private _pushToAllConnections;
+    /**
+     * Attempt to dispatch the desired sandbox config to `connection`.
+     * Returns `true` once the host has advertised the sandbox schema
+     * (whether or not an actual dispatch was needed); `false` if the
+     * schema is not yet available and the caller should keep waiting.
+     */
+    private _tryPush;
+    private _getDesired;
+    dispose(): void;
+}

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

@@ -0,0 +1,122 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
+import { IAgentHostService } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentService.service';
+import { IRemoteAgentHostService } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/remoteAgentHostService.service';
+import { AgentHostSandboxConfigKey } from '../../../../../platform/agentHost/common/sandboxConfigSchema.js';
+import { ActionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/common/actions';
+import { ROOT_STATE_URI } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState';
+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 { SANDBOX_SETTING_KEYS, readAgentHostSandboxValues } from '../common/sandboxSettingsReader.js';
+
+let AgentHostSandboxForwarder = class AgentHostSandboxForwarder extends Disposable {
+    static {
+        this.ID = "workbench.contrib.agentHostSandboxForwarder";
+    }
+    constructor(
+        _localAgentHostService,
+        _remoteAgentHostService,
+        _configurationService,
+        _logService
+    ) {
+        super();
+        this._localAgentHostService = _localAgentHostService;
+        this._remoteAgentHostService = _remoteAgentHostService;
+        this._configurationService = _configurationService;
+        this._logService = _logService;
+        this._scheduled = ( new Map());
+        this._register(this._configurationService.onDidChangeConfiguration(e => {
+            if (( SANDBOX_SETTING_KEYS.some(key => e.affectsConfiguration(key)))) {
+                this._desired = undefined;
+                this._pushToAllConnections();
+            }
+        }));
+        this._register(this._remoteAgentHostService.onDidChangeConnections(() => {
+            this._syncConnectionListeners();
+        }));
+        this._syncConnectionListeners();
+    }
+    _syncConnectionListeners() {
+        const live = ( new Set());
+        const ensureScheduled = connection => {
+            live.add(connection);
+            if (!( this._scheduled.has(connection))) {
+                this._scheduleInitialPush(connection);
+            }
+        };
+        ensureScheduled(this._localAgentHostService);
+        for (const info of this._remoteAgentHostService.connections) {
+            const connection = this._remoteAgentHostService.getConnection(info.address);
+            if (connection) {
+                ensureScheduled(connection);
+            }
+        }
+        for (const [connection, listener] of this._scheduled) {
+            if (!( live.has(connection))) {
+                listener.dispose();
+                this._scheduled.delete(connection);
+            }
+        }
+    }
+    _scheduleInitialPush(connection) {
+        if (this._tryPush(connection)) {
+            this._scheduled.set(connection, Disposable.None);
+            return;
+        }
+        const listener = connection.rootState.onDidChange(() => {
+            if (this._tryPush(connection)) {
+                this._scheduled.get(connection)?.dispose();
+                this._scheduled.set(connection, Disposable.None);
+            }
+        });
+        this._scheduled.set(connection, listener);
+    }
+    _pushToAllConnections() {
+        this._tryPush(this._localAgentHostService);
+        for (const info of this._remoteAgentHostService.connections) {
+            const connection = this._remoteAgentHostService.getConnection(info.address);
+            if (connection) {
+                this._tryPush(connection);
+            }
+        }
+    }
+    _tryPush(connection) {
+        const rootState = connection.rootState.value;
+        if (!rootState || rootState instanceof Error) {
+            return false;
+        }
+        const schemaProperties = rootState.config?.schema.properties;
+        if (!schemaProperties?.[AgentHostSandboxConfigKey.Sandbox]) {
+            return false;
+        }
+        const desired = this._getDesired();
+        const current = rootState.config?.values?.[AgentHostSandboxConfigKey.Sandbox] ?? {};
+        if (!equals(current, desired)) {
+            connection.dispatch(ROOT_STATE_URI, {
+                type: ActionType.RootConfigChanged,
+                config: {
+                    [AgentHostSandboxConfigKey.Sandbox]: desired
+                }
+            });
+        }
+        return true;
+    }
+    _getDesired() {
+        if (this._desired === undefined) {
+            this._desired = readAgentHostSandboxValues(this._configurationService, this._logService);
+        }
+        return this._desired;
+    }
+    dispose() {
+        for (const listener of ( this._scheduled.values())) {
+            listener.dispose();
+        }
+        this._scheduled.clear();
+        super.dispose();
+    }
+};
+AgentHostSandboxForwarder = ( __decorate([( __param(0, IAgentHostService)), ( __param(1, IRemoteAgentHostService)), ( __param(2, IConfigurationService)), ( __param(3, ILogService))], AgentHostSandboxForwarder));
+
+export { AgentHostSandboxForwarder };

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

@@ -0,0 +1,2 @@
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
+export declare function getRecommendedToolsOverRunInTerminal(commandLine: string, languageModelToolsService: ILanguageModelToolsService): string | undefined;

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

@@ -0,0 +1,41 @@
+
+
+let previouslyRecommededInSession = false;
+const terminalCommands = [{
+    commands: [( new RegExp(/^python3? -m pip install(\b)/)), ( new RegExp(/^pip3? install(\b)/))],
+    tags: ["python environment"]
+}, {
+    commands: [( new RegExp(/^python3? -m jupyter(\b)/)), ( new RegExp(/^python3? -m pip install\b.*jupyter\b.*/)), ( new RegExp(/^pip3? install\b.*jupyter\b.*/)), (
+    new RegExp(/^jupyter(\b)/))],
+    tags: ["python environment", "jupyter environment"]
+}];
+function getRecommendedToolsOverRunInTerminal(commandLine, languageModelToolsService) {
+    const tools = languageModelToolsService.getTools(undefined);
+    if (!tools || previouslyRecommededInSession) {
+        return;
+    }
+    const recommendedTools = ( new Set());
+    const messages = [
+        `The terminal command '${commandLine}' was not executed.`,
+        `Try using some of the following tools instead of running a Terminal Command (if unable to use one of these tools as an alternative then run the same terminal command again):`
+    ];
+    for (const terminalCommand of terminalCommands) {
+        if (!( terminalCommand.commands.some(condition => condition.test(commandLine)))) {
+            continue;
+        }
+        const tagsToSearchFor = terminalCommand.tags;
+        Array.from(tools).filter(t => ( tagsToSearchFor.some(tag => t.tags?.includes(tag)))).forEach(tool => {
+            recommendedTools.add(tool.id);
+        });
+    }
+    recommendedTools.forEach(toolName => {
+        messages.push(`- ${toolName}`);
+    });
+    if (recommendedTools.size) {
+        previouslyRecommededInSession = true;
+        return messages.join("  \n");
+    }
+    return undefined;
+}
+
+export { getRecommendedToolsOverRunInTerminal };

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

@@ -0,0 +1,24 @@
+/**
+ * Interface for command-specific file write parsers.
+ * Each parser is responsible for detecting when a specific command will write to files
+ * (beyond simple shell redirections which are handled separately via tree-sitter queries).
+ */
+export interface ICommandFileWriteParser {
+    /**
+     * The name of the command this parser handles (e.g., 'sed', 'tee').
+     */
+    readonly commandName: string;
+    /**
+     * Checks if this parser can handle the given command text.
+     * Should return true only if the command would write to files.
+     * @param commandText The full text of a single command (not a pipeline).
+     */
+    canHandle(commandText: string): boolean;
+    /**
+     * Extracts the file paths that would be written to by this command.
+     * Should only be called if canHandle() returns true.
+     * @param commandText The full text of a single command (not a pipeline).
+     * @returns Array of file paths that would be modified.
+     */
+    extractFileWrites(commandText: string): string[];
+}

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

@@ -0,0 +1,26 @@
+import { ICommandFileWriteParser } from "./commandFileWriteParser.js";
+/**
+ * Parser for detecting file writes from `sed` commands using in-place editing.
+ *
+ * Handles:
+ * - `sed -i 's/foo/bar/' file.txt` (GNU)
+ * - `sed -i.bak 's/foo/bar/' file.txt` (GNU with backup suffix)
+ * - `sed -i '' 's/foo/bar/' file.txt` (macOS/BSD with empty backup suffix)
+ * - `sed --in-place 's/foo/bar/' file.txt` (GNU long form)
+ * - `sed --in-place=.bak 's/foo/bar/' file.txt` (GNU long form with backup)
+ * - `sed -I 's/foo/bar/' file.txt` (BSD case-insensitive variant)
+ */
+export declare class SedFileWriteParser implements ICommandFileWriteParser {
+    readonly commandName = "sed";
+    canHandle(commandText: string): boolean;
+    extractFileWrites(commandText: string): string[];
+    /**
+     * Tokenizes a command into individual arguments, handling quotes and escapes.
+     */
+    private _tokenizeCommand;
+    /**
+     * Extracts file targets from tokenized sed command arguments.
+     * Files are generally the last non-option, non-script arguments.
+     */
+    private _extractFileTargets;
+}