@codingame/monaco-vscode-chat-service-override 34.1.3 → 35.0.1

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

@@ -42,12 +42,12 @@ registerAction2(class extends NotebookAction {
         super({
             id: "notebook.cell.chat.start",
             title: {
-                value: "$(sparkle) " + ( localize(11861, "Generate")),
+                value: "$(sparkle) " + ( localize(12492, "Generate")),
                 original: "$(sparkle) Generate"
             },
-            tooltip: ( localize(11862, "Start Chat to Generate Code")),
+            tooltip: ( localize(12493, "Start Chat to Generate Code")),
             metadata: {
-                description: ( localize(11862, "Start Chat to Generate Code")),
+                description: ( localize(12493, "Start Chat to Generate Code")),
                 args: [{
                     name: "args",
                     schema: {
@@ -128,10 +128,10 @@ registerAction2(class extends NotebookAction {
         super({
             id: "notebook.cell.chat.startAtTop",
             title: {
-                value: "$(sparkle) " + ( localize(11861, "Generate")),
+                value: "$(sparkle) " + ( localize(12492, "Generate")),
                 original: "$(sparkle) Generate"
             },
-            tooltip: ( localize(11862, "Start Chat to Generate Code")),
+            tooltip: ( localize(12493, "Start Chat to Generate Code")),
             f1: false,
             menu: [{
                 id: MenuId.NotebookCellListTop,
@@ -149,8 +149,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
         id: "notebook.cell.chat.start",
         icon: Codicon.sparkle,
-        title: ( localize(11863, "Generate")),
-        tooltip: ( localize(11864, "Start Chat to Generate Code"))
+        title: ( localize(12494, "Generate")),
+        tooltip: ( localize(12495, "Start Chat to Generate Code"))
     },
     order: -10,
     group: "navigation/add",
@@ -160,9 +160,9 @@ class AcceptChangesAndRun extends EditorAction2 {
     constructor() {
         super({
             id: "notebook.inlineChat.acceptChangesAndRun",
-            title: ( localize2(11865, "Accept and Run")),
-            shortTitle: ( localize(11866, "Accept & Run")),
-            tooltip: ( localize(11867, "Accept the changes and run the cell")),
+            title: ( localize2(12496, "Accept and Run")),
+            shortTitle: ( localize(12497, "Accept & Run")),
+            tooltip: ( localize(12498, "Accept the changes and run the cell")),
             icon: Codicon.check,
             f1: true,
             precondition: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), CTX_INLINE_CHAT_VISIBLE)),

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

@@ -91,7 +91,7 @@ let NotebookChatContribution = class NotebookChatContribution extends Disposable
                 result.suggestions.push({
                     label: `${chatVariableLeader}${NotebookKernelVariableKey}`,
                     insertText: `${chatVariableLeader}${NotebookKernelVariableKey}:`,
-                    detail: ( localize(11868, "Pick a variable from the kernel")),
+                    detail: ( localize(12499, "Pick a variable from the kernel")),
                     range,
                     kind: CompletionItemKind.Text,
                     command: {
@@ -198,7 +198,7 @@ class SelectAndInsertKernelVariableAction extends Action2 {
                 detail: variable.type
             });
         }
-        const placeHolder = quickPickItems.length > 0 ? ( localize(11869, "Select a kernel variable")) : ( localize(11870, "No kernel variables found"));
+        const placeHolder = quickPickItems.length > 0 ? ( localize(12500, "Select a kernel variable")) : ( localize(12501, "No kernel variables found"));
         const pickedVariable = await quickInputService.pick(quickPickItems, {
             placeHolder
         });
@@ -248,7 +248,7 @@ let KernelVariableContextPicker = class KernelVariableContextPicker {
         this.editorService = editorService;
         this.notebookKernelService = notebookKernelService;
         this.type = "pickerPick";
-        this.label = ( localize(11871, "Kernel Variable..."));
+        this.label = ( localize(12502, "Kernel Variable..."));
         this.icon = Codicon.serverEnvironment;
     }
     isEnabled(widget) {
@@ -287,7 +287,7 @@ let KernelVariableContextPicker = class KernelVariableContextPicker {
             return result;
         })();
         return {
-            placeholder: ( localize(11872, "Select a kernel variable")),
+            placeholder: ( localize(12503, "Select a kernel variable")),
             picks
         };
     }
@@ -297,7 +297,7 @@ registerAction2(class AddCellOutputToChatAction extends Action2 {
     constructor() {
         super({
             id: "notebook.cellOutput.addToChat",
-            title: ( localize(11873, "Add Cell Output to Chat")),
+            title: ( localize(12504, "Add Cell Output to Chat")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_HAS_OUTPUTS, ContextKeyExpr.in(

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(11874, "Whether a chat agent for notebook is registered"))));
+const CTX_NOTEBOOK_CHAT_HAS_AGENT = ( new RawContextKey("notebookChatAgentRegistered", false, ( localize(12505, "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(12964, "Contributes remote coding agent integrations to the chat widget.")),
+        description: ( localize(13608, "Contributes remote coding agent integrations to the chat widget.")),
         type: "array",
         items: {
             type: "object",
             properties: {
                 id: {
-                    description: ( localize(12965, "A unique identifier for this item.")),
+                    description: ( localize(13609, "A unique identifier for this item.")),
                     type: "string"
                 },
                 command: {
                     description: ( localize(
-                        12966,
+                        13610,
                         "Identifier of the command to execute. The command must be declared in the \"commands\" section."
                     )),
                     type: "string"
                 },
                 displayName: {
                     description: ( localize(
-                        12967,
+                        13611,
                         "A user-friendly name for this item which is used for display in menus."
                     )),
                     type: "string"
                 },
                 description: {
-                    description: ( localize(12968, "Description of the remote agent for use in menus and tooltips.")),
+                    description: ( localize(13612, "Description of the remote agent for use in menus and tooltips.")),
                     type: "string"
                 },
                 followUpRegex: {
                     description: ( localize(
-                        12969,
+                        13613,
                         "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(12970, "Condition which must be true to show this item.")),
+                    description: ( localize(13614, "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(
-        14593,
+        15237,
         "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(
-        14594,
+        15238,
         "It can be activated using the command: Terminal: Start Chat ({0}), which will focus the input box.",
         startChatKeybinding
     )));
     content.push(makeRequestKeybinding ? ( localize(
-        14595,
+        15239,
         "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(
-        14596,
+        15240,
         "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(
-        14597,
+        15241,
         "The response can be inspected in the accessible view ({0}).",
         openAccessibleViewKeybinding
     )) : ( localize(
-        14598,
+        15242,
         "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(
-        14599,
+        15243,
         "Reach the response from the input box ({0}).",
         focusResponseKeybinding
     )) : ( localize(
-        14600,
+        15244,
         "Reach the response from the input box by tabbing or assigning a keybinding for the command: Focus Terminal Response."
     )));
     content.push(focusInputKeybinding ? ( localize(
-        14601,
+        15245,
         "Reach the input box from the response ({0}).",
         focusInputKeybinding
     )) : ( localize(
-        14602,
+        15246,
         "Reach the response from the input box by shift+tabbing or assigning a keybinding for the command: Focus Terminal Input."
     )));
     content.push(runCommandKeybinding ? ( localize(
-        14603,
+        15247,
         "With focus in the input box or command editor, the Terminal: Run Chat Command ({0}) action.",
         runCommandKeybinding
     )) : ( localize(
-        14604,
+        15248,
         "Run a command by tabbing to the button as the action is currently not triggerable by a keybinding."
     )));
     content.push(insertCommandKeybinding ? ( localize(
-        14605,
+        15249,
         "With focus in the input box command editor, the Terminal: Insert Chat Command ({0}) action.",
         insertCommandKeybinding
     )) : ( localize(
-        14606,
+        15250,
         "Insert a command by tabbing to the button as the action is currently not triggerable by a keybinding."
     )));
     content.push(( localize(
-        14607,
+        15251,
         "Use tab to reach conditional parts like commands, status, message responses and more."
     )));
     content.push(( localize(
-        14608,
+        15252,
         "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

@@ -24,6 +24,7 @@ import { TerminalChatController } from './terminalChatController.js';
 import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
 import { isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
+import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
@@ -32,8 +33,8 @@ import { activeChatController } from './terminalChatControllerHolder.js';
 
 registerActiveXtermAction({
     id: TerminalChatCommandId.Start,
-    title: ( localize2(14609, "Open Inline Chat")),
-    category: ( localize2(14610, "Terminal")),
+    title: ( localize2(15253, "Open Inline Chat")),
+    category: ( localize2(15254, "Terminal")),
     keybinding: {
         primary: KeyMod.CtrlCmd | KeyCode.KeyI,
         when: ( ContextKeyExpr.and(TerminalContextKeys.focusInAny)),
@@ -77,7 +78,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.Close,
-    title: ( localize2(14611, "Close")),
+    title: ( localize2(15255, "Close")),
     category: AbstractInlineChatAction.category,
     keybinding: {
         primary: KeyCode.Escape,
@@ -102,8 +103,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunCommand,
-    title: ( localize2(14612, "Run Chat Command")),
-    shortTitle: ( localize2(14613, "Run")),
+    title: ( localize2(15256, "Run Chat Command")),
+    shortTitle: ( localize2(15257, "Run")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -131,8 +132,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunFirstCommand,
-    title: ( localize2(14614, "Run First Chat Command")),
-    shortTitle: ( localize2(14615, "Run First")),
+    title: ( localize2(15258, "Run First Chat Command")),
+    shortTitle: ( localize2(15259, "Run First")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -160,8 +161,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertCommand,
-    title: ( localize2(14616, "Insert Chat Command")),
-    shortTitle: ( localize2(14617, "Insert")),
+    title: ( localize2(15260, "Insert Chat Command")),
+    shortTitle: ( localize2(15261, "Insert")),
     category: AbstractInlineChatAction.category,
     icon: Codicon.insert,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
@@ -190,8 +191,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertFirstCommand,
-    title: ( localize2(14618, "Insert First Chat Command")),
-    shortTitle: ( localize2(14619, "Insert First")),
+    title: ( localize2(15262, "Insert First Chat Command")),
+    shortTitle: ( localize2(15263, "Insert First")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -219,7 +220,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RerunRequest,
-    title: ( localize2(14620, "Rerun Request")),
+    title: ( localize2(15264, "Rerun Request")),
     f1: false,
     icon: Codicon.refresh,
     category: AbstractInlineChatAction.category,
@@ -260,7 +261,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.ViewInChat,
-    title: ( localize2(14621, "View in Chat")),
+    title: ( localize2(15265, "View in Chat")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -286,8 +287,8 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
     constructor() {
         super({
             id: TerminalChatCommandId.ViewHiddenChatTerminals,
-            title: ( localize2(14622, "View Hidden Chat Terminals")),
-            category: ( localize2(14623, "Terminal")),
+            title: ( localize2(15266, "View Hidden Chat Terminals")),
+            category: ( localize2(15267, "Terminal")),
             f1: true,
             precondition: ( ContextKeyExpr.and(TerminalChatContextKeys.hasHiddenChatTerminals, ChatContextKeys.enabled)),
             menu: [{
@@ -307,6 +308,7 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
         const quickInputService = accessor.get(IQuickInputService);
         const instantiationService = accessor.get(IInstantiationService);
         const chatService = accessor.get(IChatService);
+        const telemetryService = accessor.get(ITelemetryService);
         const visible = ( new Set([...groupService.instances, ...editorService.instances]));
         const toolInstances = terminalChatService.getToolSessionTerminalInstances();
         if (toolInstances.length === 0) {
@@ -321,15 +323,19 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
         if (all.size === 0) {
             return;
         }
+        telemetryService.publicLog2("terminal.chatViewHiddenTerminals", {
+            hiddenCount: all.size
+        });
         if (all.size === 1) {
             const instance = Array.from(( all.values()))[0];
             terminalService.setActiveInstance(instance);
             await terminalService.revealTerminal(instance);
             await terminalService.focusInstance(instance);
+            this._logRevealHiddenTerminal(telemetryService, "single");
             return;
         }
         const items = [];
-        const lastCommandLocalized = command => ( localize2(14624, "Last: {0}", command)).value;
+        const lastCommandLocalized = command => ( localize2(15268, "Last: {0}", command)).value;
         const MAX_DETAIL_LENGTH = 80;
         const metas = [];
         for (const instance of ( all.values())) {
@@ -381,10 +387,10 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             });
         }
         const qp = quickInputService.createQuickPick();
-        qp.placeholder = ( localize2(14625, "Select a chat terminal to show and focus")).value;
+        qp.placeholder = ( localize2(15269, "Select a chat terminal to show and focus")).value;
         qp.items = items;
         qp.canSelectMany = false;
-        qp.title = ( localize2(14626, "Chat Terminals")).value;
+        qp.title = ( localize2(15270, "Chat Terminals")).value;
         qp.matchOnDescription = true;
         qp.matchOnDetail = true;
         const qpDisposables = ( new DisposableStore());
@@ -398,6 +404,7 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
                     await terminalService.revealTerminal(instance);
                     qp.hide();
                     await terminalService.focusInstance(instance);
+                    this._logRevealHiddenTerminal(telemetryService, "quickPick");
                 } else {
                     qp.hide();
                 }
@@ -411,6 +418,11 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
         }));
         qp.show();
     }
+    _logRevealHiddenTerminal(telemetryService, via) {
+        telemetryService.publicLog2("terminal.chatRevealHiddenTerminal", {
+            via
+        });
+    }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: TerminalChatCommandId.FocusMostRecentChatTerminal,
@@ -442,14 +454,14 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminal,
-        title: ( localize(14627, "Chat: Focus Most Recent Terminal"))
+        title: ( localize(15271, "Chat: Focus Most Recent Terminal"))
     },
     when: ChatContextKeys.inChatSession
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminalOutput,
-        title: ( localize(14628, "Chat: Focus Most Recent Terminal Output"))
+        title: ( localize(15272, "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(14629, "Ask about commands"));
+        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(15273, "Ask about commands"));
     }
     async reveal() {
         await this._createSession();

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

@@ -1,6 +1,5 @@
 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 { IAgentHostConnectionsService } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostConnectionsService.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";
@@ -21,8 +20,7 @@ import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/w
  * are skipped silently.
  */
 export declare class AgentHostSandboxForwarder extends Disposable implements IWorkbenchContribution {
-    private readonly _localAgentHostService;
-    private readonly _remoteAgentHostService;
+    private readonly _connectionsService;
     private readonly _configurationService;
     private readonly _logService;
     static readonly ID = "workbench.contrib.agentHostSandboxForwarder";
@@ -34,7 +32,7 @@ export declare class AgentHostSandboxForwarder extends Disposable implements IWo
      */
     private readonly _scheduled;
     private _desired;
-    constructor(_localAgentHostService: IAgentHostService, _remoteAgentHostService: IRemoteAgentHostService, _configurationService: IConfigurationService, _logService: ILogService);
+    constructor(_connectionsService: IAgentHostConnectionsService, _configurationService: IConfigurationService, _logService: ILogService);
     private _syncConnectionListeners;
     /**
      * Push immediately if the host is already advertising the sandbox
@@ -51,5 +49,25 @@ export declare class AgentHostSandboxForwarder extends Disposable implements IWo
      */
     private _tryPush;
     private _getDesired;
+    /**
+     * Compute the sandbox config to forward to the Agent Host.
+     *
+     *  - When the Agent Host's own terminal sandbox engine is enabled
+     *    (`chat.agentHost.customTerminalTool.enabled === true`), forward the
+     *    user's full `chat.agent.sandbox.*` policy verbatim. The engine reads
+     *    those values directly.
+     *
+     *  - Otherwise (the SDK runs the shell tool), gate on
+     *    `chat.agentHost.sdkSandbox.enabled`:
+     *      - `'off'` (the default) — forward an empty object so any
+     *        previously-pushed values are cleared and the SDK runs commands
+     *        unsandboxed.
+     *      - `'on'` / `'allowNetwork'` — forward the user's policy but
+     *        override both `enabled` and `enabled.windows` with the SDK
+     *        sandbox value. The SDK sandbox mode is independent of the
+     *        engine sandbox mode, so the user can run the SDK sandboxed
+     *        even when the engine sandbox is off.
+     */
+    private _computeDesired;
     dispose(): void;
 }

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

@@ -2,55 +2,50 @@
 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 { AgentHostCustomTerminalToolEnabledSettingId, AgentHostSdkSandboxEnabledSettingId } from '../../../../../platform/agentHost/common/agentService.js';
+import { IAgentHostConnectionsService } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostConnectionsService.service';
+import { AgentHostSandboxConfigKey, AgentHostSandboxKey } from '../../../../../platform/agentHost/common/sandboxConfigSchema.js';
+import { AgentSandboxEnabledValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/sandbox/common/settings';
 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';
 
+const HOST_POLICY_SETTING_KEYS = [
+    AgentHostCustomTerminalToolEnabledSettingId,
+    AgentHostSdkSandboxEnabledSettingId
+];
 let AgentHostSandboxForwarder = class AgentHostSandboxForwarder extends Disposable {
     static {
         this.ID = "workbench.contrib.agentHostSandboxForwarder";
     }
-    constructor(
-        _localAgentHostService,
-        _remoteAgentHostService,
-        _configurationService,
-        _logService
-    ) {
+    constructor(_connectionsService, _configurationService, _logService) {
         super();
-        this._localAgentHostService = _localAgentHostService;
-        this._remoteAgentHostService = _remoteAgentHostService;
+        this._connectionsService = _connectionsService;
         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)))) {
+            if (( SANDBOX_SETTING_KEYS.some(key => e.affectsConfiguration(key))) || ( HOST_POLICY_SETTING_KEYS.some(key => e.affectsConfiguration(key)))) {
                 this._desired = undefined;
                 this._pushToAllConnections();
             }
         }));
-        this._register(this._remoteAgentHostService.onDidChangeConnections(() => {
+        this._register(this._connectionsService.onDidChangeConnections(() => {
             this._syncConnectionListeners();
         }));
         this._syncConnectionListeners();
     }
     _syncConnectionListeners() {
         const live = ( new Set());
-        const ensureScheduled = connection => {
-            live.add(connection);
-            if (!( this._scheduled.has(connection))) {
-                this._scheduleInitialPush(connection);
+        for (const info of this._connectionsService.connections) {
+            if (!info.connection) {
+                continue;
             }
-        };
-        ensureScheduled(this._localAgentHostService);
-        for (const info of this._remoteAgentHostService.connections) {
-            const connection = this._remoteAgentHostService.getConnection(info.address);
-            if (connection) {
-                ensureScheduled(connection);
+            live.add(info.connection);
+            if (!( this._scheduled.has(info.connection))) {
+                this._scheduleInitialPush(info.connection);
             }
         }
         for (const [connection, listener] of this._scheduled) {
@@ -74,11 +69,9 @@ let AgentHostSandboxForwarder = class AgentHostSandboxForwarder extends Disposab
         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);
+        for (const info of this._connectionsService.connections) {
+            if (info.connection) {
+                this._tryPush(info.connection);
             }
         }
     }
@@ -105,10 +98,24 @@ let AgentHostSandboxForwarder = class AgentHostSandboxForwarder extends Disposab
     }
     _getDesired() {
         if (this._desired === undefined) {
-            this._desired = readAgentHostSandboxValues(this._configurationService, this._logService);
+            this._desired = this._computeDesired();
         }
         return this._desired;
     }
+    _computeDesired() {
+        const customTerminalToolEnabled = this._configurationService.getValue(AgentHostCustomTerminalToolEnabledSettingId) === true;
+        const values = readAgentHostSandboxValues(this._configurationService, this._logService);
+        if (customTerminalToolEnabled) {
+            return values;
+        }
+        const sdkSandbox = this._configurationService.getValue(AgentHostSdkSandboxEnabledSettingId) ?? AgentSandboxEnabledValue.Off;
+        if (sdkSandbox !== AgentSandboxEnabledValue.On && sdkSandbox !== AgentSandboxEnabledValue.AllowNetwork) {
+            return {};
+        }
+        values[AgentHostSandboxKey.Enabled] = sdkSandbox;
+        values[AgentHostSandboxKey.WindowsEnabled] = sdkSandbox;
+        return values;
+    }
     dispose() {
         for (const listener of ( this._scheduled.values())) {
             listener.dispose();
@@ -117,6 +124,6 @@ let AgentHostSandboxForwarder = class AgentHostSandboxForwarder extends Disposab
         super.dispose();
     }
 };
-AgentHostSandboxForwarder = ( __decorate([( __param(0, IAgentHostService)), ( __param(1, IRemoteAgentHostService)), ( __param(2, IConfigurationService)), ( __param(3, ILogService))], AgentHostSandboxForwarder));
+AgentHostSandboxForwarder = ( __decorate([( __param(0, IAgentHostConnectionsService)), ( __param(1, IConfigurationService)), ( __param(2, ILogService))], AgentHostSandboxForwarder));
 
 export { AgentHostSandboxForwarder };

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

@@ -194,11 +194,18 @@ let BasicExecuteStrategy = class BasicExecuteStrategy extends Disposable {
             }
             if (output === undefined) {
                 try {
+                    const startMarkerDisposed = this._startMarker.value?.line === -1;
                     output = xterm.getContentsAsText(this._startMarker.value, endMarker);
                     this._log("Fetched output via markers");
                     if (output !== undefined) {
                         output = stripCommandEchoAndPrompt(output, commandLine, this._log.bind(this));
                     }
+                    if (startMarkerDisposed) {
+                        this._log(
+                            "Start marker was disposed (output exceeded scrollback), output may be truncated from the beginning"
+                        );
+                        additionalInformationLines.push("Output exceeded terminal scrollback; beginning of output was lost");
+                    }
                 } catch {
                     this._log("Failed to fetch output via markers");
                     additionalInformationLines.push("Failed to retrieve command output");

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

@@ -113,11 +113,18 @@ let NoneExecuteStrategy = class NoneExecuteStrategy extends Disposable {
             let output;
             const additionalInformationLines = [];
             try {
+                const startMarkerDisposed = this._startMarker.value?.line === -1;
                 output = xterm.getContentsAsText(this._startMarker.value, endMarker);
                 this._log("Fetched output via markers");
                 if (output !== undefined) {
                     output = stripCommandEchoAndPrompt(output, commandLine, this._log.bind(this));
                 }
+                if (startMarkerDisposed) {
+                    this._log(
+                        "Start marker was disposed (output exceeded scrollback), output may be truncated from the beginning"
+                    );
+                    additionalInformationLines.push("Output exceeded terminal scrollback; beginning of output was lost");
+                }
             } catch {
                 this._log("Failed to fetch output via markers");
                 additionalInformationLines.push("Failed to retrieve command output");