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

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

@@ -32,8 +32,8 @@ import { activeChatController } from './terminalChatControllerHolder.js';
 
 registerActiveXtermAction({
     id: TerminalChatCommandId.Start,
-    title: ( localize2(13771, "Open Inline Chat")),
-    category: ( localize2(13772, "Terminal")),
+    title: ( localize2(13835, "Open Inline Chat")),
+    category: ( localize2(13836, "Terminal")),
     keybinding: {
         primary: KeyMod.CtrlCmd | KeyCode.KeyI,
         when: ( ContextKeyExpr.and(TerminalContextKeys.focusInAny)),
@@ -77,7 +77,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.Close,
-    title: ( localize2(13773, "Close")),
+    title: ( localize2(13837, "Close")),
     category: AbstractInlineChatAction.category,
     keybinding: {
         primary: KeyCode.Escape,
@@ -102,8 +102,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunCommand,
-    title: ( localize2(13774, "Run Chat Command")),
-    shortTitle: ( localize2(13775, "Run")),
+    title: ( localize2(13838, "Run Chat Command")),
+    shortTitle: ( localize2(13839, "Run")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -131,8 +131,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunFirstCommand,
-    title: ( localize2(13776, "Run First Chat Command")),
-    shortTitle: ( localize2(13777, "Run First")),
+    title: ( localize2(13840, "Run First Chat Command")),
+    shortTitle: ( localize2(13841, "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(13778, "Insert Chat Command")),
-    shortTitle: ( localize2(13779, "Insert")),
+    title: ( localize2(13842, "Insert Chat Command")),
+    shortTitle: ( localize2(13843, "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(13780, "Insert First Chat Command")),
-    shortTitle: ( localize2(13781, "Insert First")),
+    title: ( localize2(13844, "Insert First Chat Command")),
+    shortTitle: ( localize2(13845, "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(13782, "Rerun Request")),
+    title: ( localize2(13846, "Rerun Request")),
     f1: false,
     icon: Codicon.refresh,
     category: AbstractInlineChatAction.category,
@@ -260,7 +260,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.ViewInChat,
-    title: ( localize2(13783, "View in Chat")),
+    title: ( localize2(13847, "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(13784, "View Hidden Chat Terminals")),
-            category: ( localize2(13785, "Terminal")),
+            title: ( localize2(13848, "View Hidden Chat Terminals")),
+            category: ( localize2(13849, "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(13786, "Last: {0}", command)).value;
+        const lastCommandLocalized = command => ( localize2(13850, "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(13787, "Select a chat terminal to show and focus")).value;
+        qp.placeholder = ( localize2(13851, "Select a chat terminal to show and focus")).value;
         qp.items = items;
         qp.canSelectMany = false;
-        qp.title = ( localize2(13788, "Chat Terminals")).value;
+        qp.title = ( localize2(13852, "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(13789, "Chat: Focus Most Recent Terminal"))
+        title: ( localize(13853, "Chat: Focus Most Recent Terminal"))
     },
     when: ChatContextKeys.inChatSession
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminalOutput,
-        title: ( localize(13790, "Chat: Focus Most Recent Terminal Output"))
+        title: ( localize(13854, "Chat: Focus Most Recent Terminal Output"))
     },
     when: ChatContextKeys.inChatSession
 });

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

@@ -49,7 +49,7 @@ let TerminalChatService = class TerminalChatService extends Disposable {
         this._hasHiddenToolTerminalContext = TerminalChatContextKeys.hasHiddenChatTerminals.bindTo(this._contextKeyService);
         this._restoreFromStorage();
         this._register(this._chatService.onDidDisposeSession(e => {
-            for (const resource of e.sessionResource) {
+            for (const resource of e.sessionResources) {
                 this._sessionAutoApproveRules.delete(resource);
                 this._sessionAutoApprovalEnabled.delete(resource);
             }
@@ -73,7 +73,7 @@ let TerminalChatService = class TerminalChatService extends Disposable {
             this._updateHasToolTerminalContextKeys();
         }));
         this._register(this._chatService.onDidDisposeSession(e => {
-            for (const resource of e.sessionResource) {
+            for (const resource of e.sessionResources) {
                 if (LocalChatSessionUri.parseLocalSessionId(resource) === terminalToolSessionId) {
                     this._terminalInstancesByToolSessionId.delete(terminalToolSessionId);
                     this._toolSessionIdByTerminalInstance.delete(instance);

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

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

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

@@ -9,6 +9,7 @@ import { ITerminalLogService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { trackIdleOnPrompt, waitForIdle } from './executeStrategy.js';
 import { createAltBufferPromise, setupRecreatingStartMarker, stripCommandEchoAndPrompt } from './strategyHelpers.js';
 import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+import { isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 
 let BasicExecuteStrategy = class BasicExecuteStrategy extends Disposable {
     constructor(
@@ -85,7 +86,8 @@ let BasicExecuteStrategy = class BasicExecuteStrategy extends Disposable {
             }
             this._log(`Executing command line \`${commandLine}\``);
             markerRecreation.dispose();
-            this._instance.sendText(commandLine, true);
+            const forceBracketedPasteMode = isMacintosh;
+            this._instance.sendText(commandLine, true, forceBracketedPasteMode);
             this._log("Waiting for done event");
             const onDoneResult = await Promise.race([onDone, alternateBufferPromise.then(() => ({
                 type: "alternateBuffer"

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

@@ -8,6 +8,7 @@ import { ITerminalLogService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { waitForIdle, waitForIdleWithPromptHeuristics } from './executeStrategy.js';
 import { createAltBufferPromise, setupRecreatingStartMarker, stripCommandEchoAndPrompt } from './strategyHelpers.js';
 import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+import { isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 
 let NoneExecuteStrategy = class NoneExecuteStrategy extends Disposable {
     constructor(_instance, _hasReceivedUserInput, _configurationService, _logService) {
@@ -54,7 +55,8 @@ let NoneExecuteStrategy = class NoneExecuteStrategy extends Disposable {
             this._log(`Executing command line \`${commandLine}\``);
             markerRecreation.dispose();
             const startLine = this._startMarker.value?.line;
-            this._instance.sendText(commandLine, true);
+            const forceBracketedPasteMode = isMacintosh;
+            this._instance.sendText(commandLine, true, forceBracketedPasteMode);
             if (startLine !== undefined) {
                 this._log("Waiting for cursor to move past start line");
                 const cursorMovedPromise = ( new Promise(resolve => {
@@ -70,7 +72,7 @@ let NoneExecuteStrategy = class NoneExecuteStrategy extends Disposable {
                     check();
                 }));
                 const cursorMoveTimeout = ( new Promise(resolve => {
-                    const handle = setTimeout(() => resolve("timeout"), 5000);
+                    const handle = setTimeout(() => resolve("timeout"), 1000);
                     store.add({
                         dispose: () => clearTimeout(handle)
                     });

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

@@ -5,7 +5,7 @@ import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/comm
 import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { isCI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { isMacintosh, isCI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { ITerminalLogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service';
 import { trackIdleOnPrompt } from './executeStrategy.js';
 import { createAltBufferPromise, setupRecreatingStartMarker, stripCommandEchoAndPrompt } from './strategyHelpers.js';
@@ -63,7 +63,8 @@ let RichExecuteStrategy = class RichExecuteStrategy extends Disposable {
             );
             this._log(`Executing command line \`${commandLine}\``);
             markerRecreation.dispose();
-            this._instance.runCommand(commandLine, true, commandId);
+            const forceBracketedPasteMode = isMacintosh;
+            this._instance.runCommand(commandLine, true, commandId, forceBracketedPasteMode);
             this._log("Waiting for done event");
             const onDoneResult = await Promise.race([onDone, alternateBufferPromise.then(() => ({
                 type: "alternateBuffer"

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

@@ -155,7 +155,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
         const firstSubcommandFirstWord = unapprovedSubCommands.length > 0 ? unapprovedSubCommands[0].split(" ")[0] : "";
         if (firstSubcommandFirstWord !== commandLine && !( commandsWithSubcommands.has(commandLine)) && !( commandsWithSubSubCommands.has(commandLine))) {
             actions.push({
-                label: ( localize(13792, "Allow Exact Command Line in this Session")),
+                label: ( localize(13856, "Allow Exact Command Line in this Session")),
                 data: {
                     type: "newRule",
                     rule: {
@@ -169,7 +169,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
                 }
             });
             actions.push({
-                label: ( localize(13793, "Allow Exact Command Line in this Workspace")),
+                label: ( localize(13857, "Allow Exact Command Line in this Workspace")),
                 data: {
                     type: "newRule",
                     rule: {
@@ -183,7 +183,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
                 }
             });
             actions.push({
-                label: ( localize(13794, "Always Allow Exact Command Line")),
+                label: ( localize(13858, "Always Allow Exact Command Line")),
                 data: {
                     type: "newRule",
                     rule: {
@@ -202,15 +202,15 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
         actions.push(( new Separator()));
     }
     actions.push({
-        label: ( localize(13795, "Allow All Commands in this Session")),
-        tooltip: ( localize(13796, "Allow this tool to run in this session without confirmation.")),
+        label: ( localize(13859, "Allow All Commands in this Session")),
+        tooltip: ( localize(13860, "Allow this tool to run in this session without confirmation.")),
         data: {
             type: "sessionApproval"
         }
     });
     actions.push(( new Separator()));
     actions.push({
-        label: ( localize(13797, "Configure Auto Approve...")),
+        label: ( localize(13861, "Configure Auto Approve...")),
         data: {
             type: "configure"
         }

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

@@ -19,6 +19,7 @@ export declare class RunInTerminalToolTelemetry {
         error: string | undefined;
         isBackground: boolean;
         isNewSession: boolean;
+        isSandboxWrapped: boolean;
         shellIntegrationQuality: ShellIntegrationQuality;
         outputLineCount: number;
         timingConnectMs: number;

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

@@ -60,6 +60,7 @@ let RunInTerminalToolTelemetry = class RunInTerminalToolTelemetry {
             toolEditedCommand: state.didToolEditCommand ? 1 : 0,
             isBackground: state.isBackground ? 1 : 0,
             isNewSession: state.isNewSession ? 1 : 0,
+            isSandbox: state.isSandboxWrapped ? 1 : 0,
             outputLineCount: state.outputLineCount,
             nonZeroExitCode: state.exitCode === undefined ? -1 : state.exitCode === 0 ? 0 : 1,
             timingConnectMs: state.timingConnectMs,

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

@@ -3,16 +3,14 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { type IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
-import { ITrustedDomainService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/common/trustedDomainService.service";
 export declare class ChatAgentToolsContribution extends Disposable implements IWorkbenchContribution {
     private readonly _instantiationService;
     private readonly _toolsService;
     private readonly _configurationService;
-    private readonly _trustedDomainService;
     static readonly ID = "terminal.chatAgentTools";
     private readonly _runInTerminalToolRegistration;
     private _runInTerminalToolRegistrationVersion;
-    constructor(_instantiationService: IInstantiationService, _toolsService: ILanguageModelToolsService, _configurationService: IConfigurationService, _trustedDomainService: ITrustedDomainService);
+    constructor(_instantiationService: IInstantiationService, _toolsService: ILanguageModelToolsService, _configurationService: IConfigurationService);
     private _runInTerminalTool;
     private _registerRunInTerminalTool;
 }

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

@@ -2,9 +2,9 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 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';
@@ -29,8 +29,8 @@ import { CreateAndRunTaskTool, CreateAndRunTaskToolData } from './tools/task/cre
 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 { ITrustedDomainService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/common/trustedDomainService.service';
 import '../common/terminalSandboxService.js';
+import { isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 
 let ShellIntegrationTimeoutMigrationContribution = class ShellIntegrationTimeoutMigrationContribution extends Disposable {
     static {
@@ -38,13 +38,21 @@ let ShellIntegrationTimeoutMigrationContribution = class ShellIntegrationTimeout
     }
     constructor(configurationService) {
         super();
-        const deprecatedSettingValue = configurationService.getValue(TerminalChatAgentToolsSettingId.ShellIntegrationTimeout);
-        if (!isNumber(deprecatedSettingValue)) {
-            return;
+        const deprecated = configurationService.inspect(TerminalChatAgentToolsSettingId.ShellIntegrationTimeout);
+        const target = configurationService.inspect(TerminalSettingId.ShellIntegrationTimeout);
+        if (deprecated.userValue !== undefined && target.userValue === undefined && isNumber(deprecated.userValue)) {
+            configurationService.updateValue(
+                TerminalSettingId.ShellIntegrationTimeout,
+                deprecated.userValue,
+                ConfigurationTarget.USER
+            );
         }
-        const newSettingValue = configurationService.getValue(TerminalSettingId.ShellIntegrationTimeout);
-        if (!isNumber(newSettingValue)) {
-            configurationService.updateValue(TerminalSettingId.ShellIntegrationTimeout, deprecatedSettingValue);
+        if (deprecated.workspaceValue !== undefined && target.workspaceValue === undefined && isNumber(deprecated.workspaceValue)) {
+            configurationService.updateValue(
+                TerminalSettingId.ShellIntegrationTimeout,
+                deprecated.workspaceValue,
+                ConfigurationTarget.WORKSPACE
+            );
         }
     }
 };
@@ -76,17 +84,11 @@ let ChatAgentToolsContribution = class ChatAgentToolsContribution extends Dispos
     static {
         this.ID = "terminal.chatAgentTools";
     }
-    constructor(
-        _instantiationService,
-        _toolsService,
-        _configurationService,
-        _trustedDomainService
-    ) {
+    constructor(_instantiationService, _toolsService, _configurationService) {
         super();
         this._instantiationService = _instantiationService;
         this._toolsService = _toolsService;
         this._configurationService = _configurationService;
-        this._trustedDomainService = _trustedDomainService;
         this._runInTerminalToolRegistration = this._register(( new MutableDisposable()));
         this._runInTerminalToolRegistrationVersion = 0;
         const confirmTerminalCommandTool = _instantiationService.createInstance(ConfirmTerminalCommandTool);
@@ -125,13 +127,14 @@ 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.TerminalSandboxEnabled) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains)) {
+            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
+            )) {
                 this._registerRunInTerminalTool();
             }
         }));
-        this._register(this._trustedDomainService.onDidChangeTrustedDomains(() => {
-            this._registerRunInTerminalTool();
-        }));
     }
     _registerRunInTerminalTool() {
         const version = ++this._runInTerminalToolRegistrationVersion;
@@ -153,7 +156,7 @@ let ChatAgentToolsContribution = class ChatAgentToolsContribution extends Dispos
         });
     }
 };
-ChatAgentToolsContribution = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, ILanguageModelToolsService)), ( __param(2, IConfigurationService)), ( __param(3, ITrustedDomainService))], ChatAgentToolsContribution));
+ChatAgentToolsContribution = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, ILanguageModelToolsService)), ( __param(2, IConfigurationService))], ChatAgentToolsContribution));
 registerWorkbenchContribution2(
     ChatAgentToolsContribution.ID,
     ChatAgentToolsContribution,
@@ -161,7 +164,7 @@ registerWorkbenchContribution2(
 );
 registerActiveInstanceAction({
     id: TerminalChatAgentToolsCommandId.ChatAddTerminalSelection,
-    title: ( localize(13798, "Add Terminal Selection to Chat")),
+    title: ( localize(13862, "Add Terminal Selection to Chat")),
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, sharedWhenClause.terminalAvailable)),
     menu: [{
         id: MenuId.TerminalInstanceContext,
@@ -182,8 +185,8 @@ registerActiveInstanceAction({
         chatView.attachmentModel.addContext({
             id: `terminal-selection-${Date.now()}`,
             kind: "generic",
-            name: ( localize(13799, "Terminal Selection")),
-            fullName: ( localize(13799, "Terminal Selection")),
+            name: ( localize(13863, "Terminal Selection")),
+            fullName: ( localize(13863, "Terminal Selection")),
             value: selection,
             icon: Codicon.terminal
         });

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

@@ -11,7 +11,7 @@ import { timeout, raceCancellationError } from '@codingame/monaco-vscode-api/vsc
 const AwaitTerminalToolData = {
     id: TerminalToolId.AwaitTerminal,
     toolReferenceName: "awaitTerminal",
-    displayName: ( localize(13800, "Await Terminal")),
+    displayName: ( localize(13864, "Await Terminal")),
     modelDescription: "Wait for a background terminal command to complete. Returns the output, exit code, or timeout status.",
     icon: Codicon.terminal,
     source: ToolDataSource.Internal,
@@ -33,8 +33,8 @@ const AwaitTerminalToolData = {
 class AwaitTerminalTool extends Disposable {
     async prepareToolInvocation(_context, _token) {
         return {
-            invocationMessage: ( localize(13801, "Awaiting terminal completion")),
-            pastTenseMessage: ( localize(13802, "Awaited terminal completion"))
+            invocationMessage: ( localize(13865, "Awaiting terminal completion")),
+            pastTenseMessage: ( localize(13866, "Awaited terminal completion"))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/autoApprove/npmScriptAutoApprover.js

@@ -154,7 +154,7 @@ let NpmScriptAutoApprover = class NpmScriptAutoApprover extends Disposable {
             isAutoApproved: true,
             scriptName,
             autoApproveInfo: ( new MarkdownString(( localize(
-                13803,
+                13867,
                 "Auto approved as {0} is defined in package.json",
                 `\`${scriptName}\``
             ))))

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

@@ -56,7 +56,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                 isAutoApproved: true,
                 isAutoApproveAllowed: true,
                 disclaimers: [],
-                autoApproveInfo: ( new MarkdownString(`${( localize(13804, "Auto approved for this session"))} ([${( localize(13805, "Disable"))}](${( disableUri.toString())}))`, mdTrustSettings))
+                autoApproveInfo: ( new MarkdownString(`${( localize(13868, "Auto approved for this session"))} ([${( localize(13869, "Disable"))}](${( disableUri.toString())}))`, mdTrustSettings))
             };
         }
         const trimmedCommandLine = options.commandLine.trimStart();
@@ -158,7 +158,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
         const subCommandsLowerFirstWordOnly = ( subCommands.map(command => command.split(" ")[0].toLowerCase()));
         if (!isAutoApproved && (( subCommandsLowerFirstWordOnly.some(command => promptInjectionWarningCommandsLower.includes(command))) || (isPowerShell(options.shell, options.os) && ( subCommandsLowerFirstWordOnly.some(command => promptInjectionWarningCommandsLowerPwshOnly.includes(command)))))) {
             disclaimers.push(( localize(
-                13806,
+                13870,
                 "Web content may contain malicious code or attempt prompt injection attacks."
             )));
         }
@@ -199,10 +199,10 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
             return ( asArray(result).filter(e => isAutoApproveRule(e.rule)).map(e => {
                 const escapedSourceText = e.rule.sourceText.replaceAll("$", "\\$");
                 if (e.rule.sourceTarget === "session") {
-                    return localize(13807, "{0} (session)", `\`${escapedSourceText}\``);
+                    return localize(13871, "{0} (session)", `\`${escapedSourceText}\``);
                 }
                 const settingsUri = createCommandUri(TerminalChatCommandId.OpenTerminalSettingsLink, e.rule.sourceTarget);
-                const tooltip = ( localize(13808, "View rule in settings"));
+                const tooltip = ( localize(13872, "View rule in settings"));
                 let label = escapedSourceText;
                 switch (e.rule?.sourceTarget) {
                 case ConfigurationTarget.DEFAULT:
@@ -233,9 +233,9 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
         if (isGlobalAutoApproved) {
             const settingsUri = createCommandUri(TerminalChatCommandId.OpenTerminalSettingsLink, "global");
             return (new MarkdownString(`${( localize(
-                13809,
+                13873,
                 "Auto approved by setting {0}",
-                `[\`${ChatConfiguration.GlobalAutoApprove}\`](${( settingsUri.toString())} "${( localize(13810, "View settings"))}")`
+                `[\`${ChatConfiguration.GlobalAutoApprove}\`](${( settingsUri.toString())} "${( localize(13874, "View settings"))}")`
             ))}`, mdTrustSettings));
         }
         if (isAutoApproved) {
@@ -244,7 +244,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                 {
                     if (isAutoApproveRule(commandLineResult.rule)) {
                         return (new MarkdownString(
-                            localize(13811, "Auto approved by rule {0}", formatRuleLinks(commandLineResult)),
+                            localize(13875, "Auto approved by rule {0}", formatRuleLinks(commandLineResult)),
                             mdTrustSettings
                         ));
                     }
@@ -259,12 +259,12 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                     const uniqueRules = dedupeRules(subCommandResults);
                     if (uniqueRules.length === 1) {
                         return (new MarkdownString(
-                            localize(13811, "Auto approved by rule {0}", formatRuleLinks(uniqueRules)),
+                            localize(13875, "Auto approved by rule {0}", formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     } else if (uniqueRules.length > 1) {
                         return (new MarkdownString(
-                            localize(13812, "Auto approved by rules {0}", formatRuleLinks(uniqueRules)),
+                            localize(13876, "Auto approved by rules {0}", formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     }
@@ -277,7 +277,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                 {
                     if (commandLineResult.rule) {
                         return (new MarkdownString(localize(
-                            13813,
+                            13877,
                             "Auto approval denied by rule {0}",
                             formatRuleLinks(commandLineResult)
                         ), mdTrustSettings));
@@ -289,12 +289,12 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                     const uniqueRules = dedupeRules(subCommandResults.filter(e => e.result === "denied"));
                     if (uniqueRules.length === 1) {
                         return (new MarkdownString(
-                            localize(13813, "Auto approval denied by rule {0}", formatRuleLinks(uniqueRules)),
+                            localize(13877, "Auto approval denied by rule {0}", formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     } else if (uniqueRules.length > 1) {
                         return (new MarkdownString(
-                            localize(13814, "Auto approval denied by rules {0}", formatRuleLinks(uniqueRules)),
+                            localize(13878, "Auto approval denied by rules {0}", formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     }

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

@@ -149,12 +149,12 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
             )).join(", ");
             if (!isAutoApproveAllowed) {
                 disclaimers.push(( localize(
-                    13815,
+                    13879,
                     "File write operations detected that cannot be auto approved: {0}",
                     fileWritesList
                 )));
             } else {
-                disclaimers.push(( localize(13816, "File write operations detected: {0}", fileWritesList)));
+                disclaimers.push(( localize(13880, "File write operations detected: {0}", fileWritesList)));
             }
         }
         return {

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

@@ -1,6 +1,7 @@
 
 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 { TerminalSandboxPrerequisiteCheck } from '../../../common/terminalSandboxService.js';
 import { ITerminalSandboxService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.service';
 
 let CommandLineSandboxRewriter = class CommandLineSandboxRewriter extends Disposable {
@@ -9,17 +10,11 @@ let CommandLineSandboxRewriter = class CommandLineSandboxRewriter extends Dispos
         this._sandboxService = _sandboxService;
     }
     async rewrite(options) {
-        if (options.requestUnsandboxedExecution) {
+        const sandboxPrereqs = await this._sandboxService.checkForSandboxingPrereqs();
+        if (!sandboxPrereqs.enabled || sandboxPrereqs.failedCheck === TerminalSandboxPrerequisiteCheck.Config) {
             return undefined;
         }
-        if (!(await this._sandboxService.isEnabled())) {
-            return undefined;
-        }
-        const sandboxConfigPath = await this._sandboxService.getSandboxConfigPath();
-        if (!sandboxConfigPath) {
-            return undefined;
-        }
-        const wrappedCommand = this._sandboxService.wrapCommand(options.commandLine);
+        const wrappedCommand = this._sandboxService.wrapCommand(options.commandLine, options.requestUnsandboxedExecution);
         return {
             rewritten: wrappedCommand,
             reasoning: "Wrapped command for sandbox execution",

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

@@ -12,7 +12,7 @@ const GetTerminalLastCommandToolData = {
     id: TerminalToolId.TerminalLastCommand,
     toolReferenceName: "terminalLastCommand",
     legacyToolReferenceFullNames: ["runCommands/terminalLastCommand"],
-    displayName: ( localize(13817, "Get Terminal Last Command")),
+    displayName: ( localize(13881, "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(13818, "Getting last terminal command")),
-            pastTenseMessage: ( localize(13819, "Got last terminal command"))
+            invocationMessage: ( localize(13882, "Getting last terminal command")),
+            pastTenseMessage: ( localize(13883, "Got last terminal command"))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {