@codingame/monaco-vscode-chat-service-override 34.1.2 → 35.0.0

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

@@ -24,6 +24,6 @@ export declare class SandboxOutputAnalyzer extends Disposable implements IOutput
 export declare function outputLooksSandboxBlocked(output: string): boolean;
 /**
  * Checks whether output clearly suggests a network failure. This is used only
- * to prevent automatic unsandboxing; retry selection is left to the model.
+ * to select automatic allow-network retries and prevent automatic unsandboxing.
  */
 export declare function outputLooksSandboxNetworkBlocked(output: string): boolean;

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

@@ -42,6 +42,7 @@ let SandboxOutputAnalyzer = class SandboxOutputAnalyzer extends Disposable {
         const networkRecovery = retryWithAllowNetworkRequests ? "- If you determine from the output that the failure was caused by blocked network access, immediately retry the command with requestAllowNetwork=true and provide requestAllowNetworkReason. This keeps the command sandboxed with unrestricted network access and automatically shows a confirmation prompt to the user.\n- If it is not a network restriction, or the command still fails after retrying with requestAllowNetwork=true, immediately retry the command with requestUnsandboxedExecution=true and provide requestUnsandboxedExecutionReason. Do NOT ask the user - setting this flag automatically shows a confirmation prompt to the user." : "- Sandboxed execution with unrestricted network access is disabled by chat.agent.sandbox.retryWithAllowNetworkRequests. Do not set requestAllowNetwork=true.\n- If the command cannot be made to work by updating sandbox rules, immediately retry it with requestUnsandboxedExecution=true and provide requestUnsandboxedExecutionReason. Do NOT ask the user - setting this flag automatically shows a confirmation prompt to the user.";
         return `${prefix}
 - If it would be reasonable to extend the sandbox rules, work with the user to update allowWrite for file system access problems in ${fileSystemSetting}, or to add required domains to ${AgentNetworkDomainSettingId.AllowedNetworkDomains}.
+- If the output contains 'No such file or directory', treat it as a sandbox access error and immediately retry the command with requestUnsandboxedExecution=true and provide requestUnsandboxedExecutionReason.
 ${networkRecovery}
 
 Here is the output of the command:\n`;
@@ -53,11 +54,11 @@ Here is the output of the command:\n`;
 SandboxOutputAnalyzer = ( __decorate([( __param(0, ITerminalSandboxService)), ( __param(1, IConfigurationService))], SandboxOutputAnalyzer));
 function outputLooksSandboxBlocked(output) {
     const normalized = output.replace(/\n/g, " ");
-    return /Operation not permitted|Permission denied|Read-only file system|sandbox-exec|bwrap|sandbox_violation/i.test(normalized);
+    return /Operation not permitted|Permission denied|Read-only file system|sandbox-exec|bwrap|sandbox_violation|No such file or directory/i.test(normalized);
 }
 function outputLooksSandboxNetworkBlocked(output) {
     const normalized = output.replace(/\n/g, " ");
-    return /Could not resolve host|Temporary failure in name resolution|Name or service not known|EAI_AGAIN|ENETUNREACH|Network is unreachable|network (?:access )?(?:blocked|disabled)|(?:connect|socket).*(?:Operation not permitted|Permission denied)|(?:Operation not permitted|Permission denied).*(?:connect|socket)/i.test(normalized);
+    return /Could not resolve host|Temporary failure in name resolution|Name or service not known|EAI_AGAIN|ENETUNREACH|Network is unreachable|Received HTTP code 403 from proxy after CONNECT|network (?:access )?(?:blocked|disabled)|(?:connect|socket).*(?:Operation not permitted|Permission denied)|(?:Operation not permitted|Permission denied).*(?:connect|socket)/i.test(normalized);
 }
 
 export { SandboxOutputAnalyzer, outputLooksSandboxBlocked, outputLooksSandboxNetworkBlocked };

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

@@ -22,7 +22,7 @@ import { TerminalToolId } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 const SendToTerminalToolData = {
     id: TerminalToolId.SendToTerminal,
     toolReferenceName: "sendToTerminal",
-    displayName: ( localize(14734, "Send to Terminal")),
+    displayName: ( localize(15394, "Send to Terminal")),
     modelDescription: `Send input text to an active terminal execution (identified by the \`id\` returned from ${TerminalToolId.RunInTerminal}). The 'command' field may be empty or whitespace to press Enter (useful for interactive prompts). By default, returns the last 20 lines of terminal output captured shortly after sending. Set 'waitForOutput' to true for interactive programs (games, REPLs, etc.) to wait until the terminal becomes idle before returning output — this gives you the program's response to your input.`,
     icon: Codicon.terminal,
     source: ToolDataSource.Internal,
@@ -90,16 +90,16 @@ let SendToTerminalTool = class SendToTerminalTool extends Disposable {
         const pastTenseMessage = ( new MarkdownString());
         const questionText = this._getQuestionContextForTerminal(context.chatSessionResource, args);
         if (isEmptyInput) {
-            invocationMessage.appendMarkdown(( localize(14735, "Pressing `Enter` in terminal")));
-            pastTenseMessage.appendMarkdown(( localize(14736, "Pressed `Enter` in terminal")));
+            invocationMessage.appendMarkdown(( localize(15395, "Pressing `Enter` in terminal")));
+            pastTenseMessage.appendMarkdown(( localize(15396, "Pressed `Enter` in terminal")));
         } else {
             const displayCommand = buildCommandDisplayText(args.command);
             const safeInlineCode = appendEscapedMarkdownInlineCode(displayCommand);
-            invocationMessage.appendMarkdown(( localize(14737, "Sending {0} to terminal", safeInlineCode)));
-            pastTenseMessage.appendMarkdown(( localize(14738, "Sent {0} to terminal", safeInlineCode)));
+            invocationMessage.appendMarkdown(( localize(15397, "Sending {0} to terminal", safeInlineCode)));
+            pastTenseMessage.appendMarkdown(( localize(15398, "Sent {0} to terminal", safeInlineCode)));
         }
         if (questionText) {
-            const replyPrefix = ` (${( localize(14739, "replying to: "))}`;
+            const replyPrefix = ` (${( localize(15399, "replying to: "))}`;
             invocationMessage.appendMarkdown(replyPrefix);
             invocationMessage.appendText(questionText);
             invocationMessage.appendMarkdown(")");
@@ -114,15 +114,15 @@ let SendToTerminalTool = class SendToTerminalTool extends Disposable {
             }
         }));
         const safeTerminalLabel = appendEscapedMarkdownInlineCode(terminalLabel);
-        const baseMessage = isEmptyInput ? ( localize(14740, "Press `Enter` in terminal {0}", safeTerminalLabel)) : ( localize(
-            14741,
+        const baseMessage = isEmptyInput ? ( localize(15400, "Press `Enter` in terminal {0}", safeTerminalLabel)) : ( localize(
+            15401,
             "Run {0} in terminal {1}",
             appendEscapedMarkdownInlineCode(buildCommandDisplayText(args.command)),
             safeTerminalLabel
         ));
         if (instanceId !== undefined) {
             const focusUri = createCommandUri(FocusTerminalByIdCommandId, instanceId);
-            confirmationMessage.appendMarkdown(`${baseMessage} — [${( localize(14742, "Focus Terminal"))}](${focusUri})`);
+            confirmationMessage.appendMarkdown(`${baseMessage} — [${( localize(15402, "Focus Terminal"))}](${focusUri})`);
         } else {
             confirmationMessage.appendMarkdown(baseMessage);
         }
@@ -136,7 +136,7 @@ let SendToTerminalTool = class SendToTerminalTool extends Disposable {
         const isAnsweringQuestion = questionText !== undefined;
         const shouldShowConfirmation = (!isSessionAutoApproved && !isAnsweringQuestion) || context.forceConfirmationReason !== undefined;
         const confirmationMessages = shouldShowConfirmation ? {
-            title: ( localize(14743, "Send to Terminal")),
+            title: ( localize(15403, "Send to Terminal")),
             message: confirmationMessage,
             allowAutoConfirm: undefined
         } : undefined;

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

@@ -79,7 +79,7 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
             });
         }
         _progress.report({
-            message: ( new MarkdownString(( localize(14744, "Resolving the task"))))
+            message: ( new MarkdownString(( localize(15404, "Resolving the task"))))
         });
         let task;
         const start = Date.now();
@@ -96,7 +96,7 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
                     kind: "text",
                     value: `Task not found: ${args.task.label}`
                 }],
-                toolResultMessage: ( new MarkdownString(( localize(14745, "Task not found: `{0}`", args.task.label))))
+                toolResultMessage: ( new MarkdownString(( localize(15405, "Task not found: `{0}`", args.task.label))))
             };
         }
         const preRunMarkersStore = ( new DisposableStore());
@@ -113,7 +113,7 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
                 }
             }
             _progress.report({
-                message: ( new MarkdownString(( localize(14746, "Running task `{0}`", args.task.label))))
+                message: ( new MarkdownString(( localize(15406, "Running task `{0}`", args.task.label))))
             });
             const raceResult = await Promise.race([
                 this._tasksService.run(task, undefined, TaskRunSource.ChatAgent),
@@ -131,7 +131,7 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
                         value: `Task started but no terminal was found for: ${args.task.label}`
                     }],
                     toolResultMessage: ( new MarkdownString(( localize(
-                        14747,
+                        15407,
                         "Task started but no terminal was found for: `{0}`",
                         args.task.label
                     ))))
@@ -201,26 +201,26 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
         const allTasks = await this._tasksService.tasks();
         if (allTasks?.find(t => t._label === task.label)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(14748, "Task `{0}` already exists.", task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(14749, "Task `{0}` already exists.", task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(15408, "Task `{0}` already exists.", task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(15409, "Task `{0}` already exists.", task.label)))),
                 confirmationMessages: undefined
             };
         }
         const activeTasks = await this._tasksService.getActiveTasks();
         if (activeTasks.find(t => t._label === task.label)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(14750, "Task `{0}` is already running.", task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(14750, "Task `{0}` is already running.", task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(15410, "Task `{0}` is already running.", task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(15410, "Task `{0}` is already running.", task.label)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(14751, "Created task `{0}`", task.label)))),
-            pastTenseMessage: ( new MarkdownString(( localize(14752, "Created task `{0}`", task.label)))),
+            invocationMessage: ( new MarkdownString(( localize(15411, "Created task `{0}`", task.label)))),
+            pastTenseMessage: ( new MarkdownString(( localize(15412, "Created task `{0}`", task.label)))),
             confirmationMessages: {
-                title: ( localize(14753, "Allow task creation and execution?")),
+                title: ( localize(15413, "Allow task creation and execution?")),
                 message: ( new MarkdownString(( localize(
-                    14754,
+                    15414,
                     "A task `{0}` with command `{1}`{2} will be created.",
                     task.label,
                     task.command,
@@ -235,9 +235,9 @@ const CreateAndRunTaskToolData = {
     id: TerminalToolId.CreateAndRunTask,
     toolReferenceName: "createAndRunTask",
     legacyToolReferenceFullNames: ["runTasks/createAndRunTask"],
-    displayName: ( localize(14755, "Create and run Task")),
+    displayName: ( localize(15415, "Create and run Task")),
     modelDescription: "Creates and runs a build, run, or custom task for the workspace by generating or adding to a tasks.json file based on the project structure (such as package.json or README.md). If the user asks to build, run, launch and they have no tasks.json file, use this tool. If they ask to create or add a task, use this tool.",
-    userDescription: ( localize(14756, "Create and run a task in the workspace")),
+    userDescription: ( localize(15416, "Create and run a task in the workspace")),
     source: ToolDataSource.Internal,
     inputSchema: {
         "type": "object",

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

@@ -17,7 +17,7 @@ const GetTaskOutputToolData = {
     id: TerminalToolId.GetTaskOutput,
     toolReferenceName: "getTaskOutput",
     legacyToolReferenceFullNames: ["runTasks/getTaskOutput"],
-    displayName: ( localize(14757, "Get Task Output")),
+    displayName: ( localize(15417, "Get Task Output")),
     modelDescription: "Get the output of a task",
     source: ToolDataSource.Internal,
     inputSchema: {
@@ -63,19 +63,19 @@ let GetTaskOutputTool = class GetTaskOutputTool extends Disposable {
         );
         if (!task) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(14758, "Task not found: `{0}`", args.id))))
+                invocationMessage: ( new MarkdownString(( localize(15418, "Task not found: `{0}`", args.id))))
             };
         }
         const taskLabel = task._label;
         const activeTasks = await this._tasksService.getActiveTasks();
         if (activeTasks.includes(task)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(14759, "The task `{0}` is already running.", taskLabel))))
+                invocationMessage: ( new MarkdownString(( localize(15419, "The task `{0}` is already running.", taskLabel))))
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(14760, "Checking output for task `{0}`", taskLabel)))),
-            pastTenseMessage: ( new MarkdownString(( localize(14761, "Checked output for task `{0}`", taskLabel))))
+            invocationMessage: ( new MarkdownString(( localize(15420, "Checking output for task `{0}`", taskLabel)))),
+            pastTenseMessage: ( new MarkdownString(( localize(15421, "Checked output for task `{0}`", taskLabel))))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {
@@ -95,7 +95,7 @@ let GetTaskOutputTool = class GetTaskOutputTool extends Disposable {
                     kind: "text",
                     value: `Task not found: ${args.id}`
                 }],
-                toolResultMessage: ( new MarkdownString(( localize(14758, "Task not found: `{0}`", args.id))))
+                toolResultMessage: ( new MarkdownString(( localize(15418, "Task not found: `{0}`", args.id))))
             };
         }
         const dependencyTasks = await resolveDependencyTasks(task, args.workspaceFolder, this._configurationService, this._tasksService);
@@ -110,7 +110,7 @@ let GetTaskOutputTool = class GetTaskOutputTool extends Disposable {
                     kind: "text",
                     value: `Terminal not found for task ${taskLabel}`
                 }],
-                toolResultMessage: ( new MarkdownString(( localize(14762, "Terminal not found for task `{0}`", taskLabel))))
+                toolResultMessage: ( new MarkdownString(( localize(15422, "Terminal not found for task `{0}`", taskLabel))))
             };
         }
         const startMarkersByTerminalInstanceId = task.configurationProperties.isBackground ? ( new Map()) : undefined;

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

@@ -56,7 +56,7 @@ let RunTaskTool = class RunTaskTool {
                     kind: "text",
                     value: `Task not found: ${args.id}`
                 }],
-                toolResultMessage: ( new MarkdownString(( localize(14763, "Task not found: `{0}`", args.id))))
+                toolResultMessage: ( new MarkdownString(( localize(15423, "Task not found: `{0}`", args.id))))
             };
         }
         const taskLabel = task._label;
@@ -67,7 +67,7 @@ let RunTaskTool = class RunTaskTool {
                     kind: "text",
                     value: `The task ${taskLabel} is already running.`
                 }],
-                toolResultMessage: ( new MarkdownString(( localize(14764, "The task `{0}` is already running.", taskLabel))))
+                toolResultMessage: ( new MarkdownString(( localize(15424, "The task `{0}` is already running.", taskLabel))))
             };
         }
         const dependencyTasks = await resolveDependencyTasks(task, args.workspaceFolder, this._configurationService, this._tasksService);
@@ -93,7 +93,7 @@ let RunTaskTool = class RunTaskTool {
                         kind: "text",
                         value: `Task started but no terminal was found for: ${taskLabel}`
                     }],
-                    toolResultMessage: ( new MarkdownString(( localize(14765, "Task started but no terminal was found for: `{0}`", taskLabel))))
+                    toolResultMessage: ( new MarkdownString(( localize(15425, "Task started but no terminal was found for: `{0}`", taskLabel))))
                 };
             }
             const terminals = this._terminalService.instances.filter(t => ( resources.some(r => r.path === t.resource.path && r.scheme === t.resource.scheme)));
@@ -103,7 +103,7 @@ let RunTaskTool = class RunTaskTool {
                         kind: "text",
                         value: `Task started but no terminal was found for: ${taskLabel}`
                     }],
-                    toolResultMessage: ( new MarkdownString(( localize(14765, "Task started but no terminal was found for: `{0}`", taskLabel))))
+                    toolResultMessage: ( new MarkdownString(( localize(15425, "Task started but no terminal was found for: `{0}`", taskLabel))))
                 };
             }
             const store = ( new DisposableStore());
@@ -178,29 +178,29 @@ let RunTaskTool = class RunTaskTool {
         );
         if (!task) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(14763, "Task not found: `{0}`", args.id))))
+                invocationMessage: ( new MarkdownString(( localize(15423, "Task not found: `{0}`", args.id))))
             };
         }
         const taskLabel = task._label;
         const activeTasks = await this._tasksService.getActiveTasks();
         if (task && activeTasks.includes(task)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(14766, "The task is already running."))))
+                invocationMessage: ( new MarkdownString(( localize(15426, "The task is already running."))))
             };
         }
         if (await this._isTaskActive(task)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(14767, "`{0}` is already running.", taskLabel)))),
-                pastTenseMessage: ( new MarkdownString(( localize(14768, "`{0}` was already running.", taskLabel)))),
+                invocationMessage: ( new MarkdownString(( localize(15427, "`{0}` is already running.", taskLabel)))),
+                pastTenseMessage: ( new MarkdownString(( localize(15428, "`{0}` was already running.", taskLabel)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(14769, "Running `{0}`", taskLabel)))),
-            pastTenseMessage: ( new MarkdownString(task?.configurationProperties.isBackground ? ( localize(14770, "Started `{0}`", taskLabel)) : ( localize(14771, "Ran `{0}`", taskLabel)))),
+            invocationMessage: ( new MarkdownString(( localize(15429, "Running `{0}`", taskLabel)))),
+            pastTenseMessage: ( new MarkdownString(task?.configurationProperties.isBackground ? ( localize(15430, "Started `{0}`", taskLabel)) : ( localize(15431, "Ran `{0}`", taskLabel)))),
             confirmationMessages: task ? {
-                title: ( localize(14772, "Allow task run?")),
-                message: ( localize(14773, "Allow to run the task `{0}`?", taskLabel))
+                title: ( localize(15432, "Allow task run?")),
+                message: ( localize(15433, "Allow to run the task `{0}`?", taskLabel))
             } : undefined
         };
     }
@@ -210,9 +210,9 @@ const RunTaskToolData = {
     id: TerminalToolId.RunTask,
     toolReferenceName: "runTask",
     legacyToolReferenceFullNames: ["runTasks/runTask"],
-    displayName: ( localize(14774, "Run Task")),
+    displayName: ( localize(15434, "Run Task")),
     modelDescription: `Runs a VS Code task.\n\n- If you see that an appropriate task exists for building or running code, prefer to use this tool to run the task instead of using the ${TerminalToolId.RunInTerminal} tool.\n- Make sure that any appropriate build or watch task is running before trying to run tests or execute code.\n- If the user asks to run a task, use this tool to do so.`,
-    userDescription: ( localize(14775, "Run tasks in the workspace")),
+    userDescription: ( localize(15435, "Run tasks in the workspace")),
     icon: Codicon.tools,
     source: ToolDataSource.Internal,
     inputSchema: {

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

@@ -26,7 +26,7 @@ function toolResultMessageFromResponse(
 ) {
     let resultSummary = "";
     if (result?.exitCode) {
-        resultSummary = ( localize(14776, "Task `{0}` failed with exit code {1}.", taskLabel, result.exitCode));
+        resultSummary = ( localize(15436, "Task `{0}` failed with exit code {1}.", taskLabel, result.exitCode));
     } else {
         resultSummary += `\`${taskLabel}\` task `;
         const problemCount = toolResultDetails.length;

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/sandboxSettingsReader.d.ts

@@ -5,9 +5,8 @@ export declare const SANDBOX_SETTING_KEYS: readonly string[];
 /**
  * Reads a single sandbox-related setting from `IConfigurationService`,
  * preferring the modern key and falling back to its deprecated peers in
- * order. Boolean values for `chat.agent.sandbox.enabled` (legacy) are
- * normalized to the modern `'on' | 'off'` enum. Returns `undefined` when
- * no user value is configured.
+ * order. Legacy boolean sandbox enabled values are normalized to the agent-host
+ * `'on' | 'off'` enum. Returns `undefined` when no user value is configured.
  */
 export declare function readSandboxSetting<T>(configurationService: IConfigurationService, logService: ILogService, settingId: string): T | undefined;
 /**

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/sandboxSettingsReader.js

@@ -1,13 +1,13 @@
 
 import { AgentNetworkDomainSettingId } from '../../../../../platform/networkFilter/common/settings.js';
-import { AgentSandboxSettingId, AgentSandboxEnabledValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/sandbox/common/settings';
+import { AgentSandboxSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/sandbox/common/settings';
 import { sandboxSettingIdToAgentHostKey } from '../../../../../platform/agentHost/common/sandboxConfigSchema.js';
 
 const SANDBOX_SETTING_KEYS = [
     AgentSandboxSettingId.AgentSandboxEnabled,
     AgentSandboxSettingId.AgentSandboxWindowsEnabled,
+    AgentSandboxSettingId.AgentSandboxAllowNetwork,
     AgentSandboxSettingId.AgentSandboxAllowUnsandboxedCommands,
-    AgentSandboxSettingId.AgentSandboxAutoApproveUnsandboxedCommands,
     AgentSandboxSettingId.AgentSandboxLinuxFileSystem,
     AgentSandboxSettingId.AgentSandboxMacFileSystem,
     AgentSandboxSettingId.AgentSandboxWindowsFileSystem,
@@ -67,12 +67,12 @@ function readAgentHostSandboxValues(configurationService, logService) {
     return values;
 }
 function normalizeSandboxSettingValue(settingId, value) {
-    if (settingId === AgentSandboxSettingId.AgentSandboxEnabled || settingId === AgentSandboxSettingId.DeprecatedAgentSandboxEnabled) {
+    if (settingId === AgentSandboxSettingId.AgentSandboxEnabled || settingId === AgentSandboxSettingId.AgentSandboxWindowsEnabled || settingId === AgentSandboxSettingId.DeprecatedAgentSandboxEnabled) {
         if (value === true) {
-            return AgentSandboxEnabledValue.On;
+            return "on";
         }
         if (value === false) {
-            return AgentSandboxEnabledValue.Off;
+            return "off";
         }
     }
     return value;

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.d.ts

@@ -9,13 +9,14 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { ISandboxHelperService } from "@codingame/monaco-vscode-api/vscode/vs/platform/sandbox/common/sandboxHelperService.service";
-import { ISandboxDependencyInstallTerminal, TerminalSandboxPrerequisiteCheck, type ISandboxDependencyInstallOptions, type ISandboxDependencyInstallResult, type ITerminalSandboxCommand, type ITerminalSandboxPrecheckInputs, type ITerminalSandboxPrerequisiteCheckResult, type ITerminalSandboxResolvedNetworkDomains, type ITerminalSandboxWrapResult } from "../../../../../platform/sandbox/common/terminalSandboxService.js";
+import { ISandboxDependencyInstallTerminal, TerminalSandboxPreCheckRemediation, TerminalSandboxPrerequisiteCheck, type ISandboxDependencyInstallOptions, type ISandboxDependencyInstallResult, type ITerminalSandboxCommand, type ITerminalSandboxFileAccessCheckResult, type ITerminalSandboxPrecheckInputs, type ITerminalSandboxPrerequisiteCheckResult, type ITerminalSandboxResolvedNetworkDomains, type ITerminalSandboxWrapResult, type TerminalSandboxFileAccessPermission } from "../../../../../platform/sandbox/common/terminalSandboxService.js";
 import { ITerminalSandboxService } from "@codingame/monaco-vscode-api/vscode/vs/platform/sandbox/common/terminalSandboxService.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
-export { ITerminalSandboxService, TerminalSandboxPrerequisiteCheck, ISandboxDependencyInstallOptions, ISandboxDependencyInstallResult, ISandboxDependencyInstallTerminal, ITerminalSandboxCommand, ITerminalSandboxPrecheckInputs, ITerminalSandboxPrerequisiteCheckResult, ITerminalSandboxResolvedNetworkDomains, ITerminalSandboxWrapResult };
+export { ITerminalSandboxService, TerminalSandboxPrerequisiteCheck, TerminalSandboxPreCheckRemediation };
+export type { ISandboxDependencyInstallOptions, ISandboxDependencyInstallResult, ISandboxDependencyInstallTerminal, ITerminalSandboxCommand, ITerminalSandboxPrecheckInputs, ITerminalSandboxPrerequisiteCheckResult, ITerminalSandboxResolvedNetworkDomains, ITerminalSandboxWrapResult, TerminalSandboxFileAccessPermission };
 export declare class TerminalSandboxService extends Disposable implements ITerminalSandboxService {
     private readonly _configurationService;
     private readonly _environmentService;
@@ -35,6 +36,7 @@ export declare class TerminalSandboxService extends Disposable implements ITermi
     isSandboxAllowNetworkEnabled(precheckInputs?: ITerminalSandboxPrecheckInputs): Promise<boolean>;
     getOS(): Promise<OperatingSystem>;
     wrapCommand(command: string, requestUnsandboxedExecution?: boolean, shell?: string, cwd?: URI, commandDetails?: readonly ITerminalSandboxCommand[], requestAllowNetwork?: boolean): Promise<ITerminalSandboxWrapResult>;
+    checkFileAccess(permission: TerminalSandboxFileAccessPermission, paths: readonly string[], precheckInputs?: ITerminalSandboxPrecheckInputs): Promise<ITerminalSandboxFileAccessCheckResult>;
     checkForSandboxingPrereqs(forceRefresh?: boolean, precheckInputs?: ITerminalSandboxPrecheckInputs): Promise<ITerminalSandboxPrerequisiteCheckResult>;
     getSandboxConfigPath(forceRefresh?: boolean, precheckInputs?: ITerminalSandboxPrecheckInputs): Promise<string | undefined>;
     getTempDir(): URI | undefined;
@@ -55,6 +57,8 @@ export declare class TerminalSandboxService extends Disposable implements ITermi
     private _resolveWindowsMxcEnvironment;
     private _resolveWindowsMxcSandboxPayload;
     installMissingSandboxDependencies(missingDependencies: string[], sessionResource: URI | undefined, token: CancellationToken, options: ISandboxDependencyInstallOptions): Promise<ISandboxDependencyInstallResult>;
+    runSandboxRemediation(remediation: TerminalSandboxPreCheckRemediation, sessionResource: URI | undefined, token: CancellationToken, options: ISandboxDependencyInstallOptions): Promise<ISandboxDependencyInstallResult>;
+    private _runSandboxPrerequisiteCommand;
     /**
      * Shows a chat elicitation that keeps the "Install" flow grounded in chat while
      * the user focuses the terminal and types a sudo password.

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.js

@@ -20,6 +20,7 @@ import { SANDBOX_HELPER_CHANNEL_NAME, SandboxHelperChannelClient } from '../../.
 import { ISandboxHelperService } from '@codingame/monaco-vscode-api/vscode/vs/platform/sandbox/common/sandboxHelperService.service';
 import { TerminalSandboxEngine } from '../../../../../platform/sandbox/common/terminalSandboxEngine.js';
 import { SANDBOX_SETTING_KEYS, readSandboxSetting } from './sandboxSettingsReader.js';
+import { TerminalSandboxPreCheckRemediation } from '../../../../../platform/sandbox/common/terminalSandboxService.js';
 export { TerminalSandboxPrerequisiteCheck } from '../../../../../platform/sandbox/common/terminalSandboxService.js';
 import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
@@ -89,7 +90,7 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
             }
             e.join(this._engine.cleanupTempDir(), {
                 id: "join.deleteFilesInSandboxTempDir",
-                label: ( localize(14859, "Delete Files in Sandbox Temp Dir")),
+                label: ( localize(15518, "Delete Files in Sandbox Temp Dir")),
                 order: WillShutdownJoinerOrder.Default
             });
         }));
@@ -120,6 +121,9 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
             requestAllowNetwork
         );
     }
+    checkFileAccess(permission, paths, precheckInputs) {
+        return this._engine.checkFileAccess(permission, paths, precheckInputs);
+    }
     checkForSandboxingPrereqs(forceRefresh = false, precheckInputs) {
         return this._engine.checkForSandboxingPrereqs(forceRefresh, precheckInputs);
     }
@@ -265,7 +269,20 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
     }
     async installMissingSandboxDependencies(missingDependencies, sessionResource, token, options) {
         const depsList = missingDependencies.join(" ");
-        const installCommand = `sudo apt install -y ${depsList}`;
+        return this._runSandboxPrerequisiteCommand(`sudo apt install -y ${depsList}`, sessionResource, token, options);
+    }
+    async runSandboxRemediation(remediation, sessionResource, token, options) {
+        let command;
+        switch (remediation) {
+        case TerminalSandboxPreCheckRemediation.DisableUnprivilagedusernamespaceRestriction:
+            command = "sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0";
+            break;
+        default:
+            throw ( new Error("Unsupported sandbox remediation"));
+        }
+        return this._runSandboxPrerequisiteCommand(command, sessionResource, token, options);
+    }
+    async _runSandboxPrerequisiteCommand(command, sessionResource, token, options) {
         const instance = await options.createTerminal();
         let installCommandSent = false;
         const completionPromise = ( new Promise(resolve => {
@@ -306,7 +323,7 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
             }, token);
             store.add(passwordPrompt);
         }));
-        await instance.sendText(installCommand, true);
+        await instance.sendText(command, true);
         installCommandSent = true;
         return {
             exitCode: await completionPromise
@@ -321,10 +338,10 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
         if (!request) {
             return ( new DisposableStore());
         }
-        const part = ( new ChatElicitationRequestPart(( localize(14860, "The terminal is awaiting input.")), ( new MarkdownString(( localize(
-            14861,
-            "Installing missing sandbox dependencies may prompt for your sudo password. Select Focus Terminal to type it in the terminal."
-        )))), "", ( localize(14862, "Focus Terminal")), undefined, async () => {
+        const part = ( new ChatElicitationRequestPart(( localize(15519, "The terminal is awaiting input.")), ( new MarkdownString(( localize(
+            15520,
+            "Applying sandbox prerequisites may prompt for your sudo password. Select Focus Terminal to type it in the terminal."
+        )))), "", ( localize(15521, "Focus Terminal")), undefined, async () => {
             await promptContext.focusTerminal();
             return ElicitationState.Pending;
         }));
@@ -346,4 +363,4 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
 };
 TerminalSandboxService = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IFileService)), ( __param(2, IEnvironmentService)), ( __param(3, ILogService)), ( __param(4, IRemoteAgentService)), ( __param(5, IWorkspaceContextService)), ( __param(6, IProductService)), ( __param(7, ILifecycleService)), ( __param(8, ISandboxHelperService)), ( __param(9, IChatService)), ( __param(10, IInstantiationService))], TerminalSandboxService));
 
-export { TerminalSandboxService };
+export { TerminalSandboxPreCheckRemediation, TerminalSandboxService };

package/vscode/src/vs/workbench/services/agentHost/browser/editorRemoteAgentHostServiceClient.d.ts

@@ -5,12 +5,12 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { IAgentCreateSessionConfig, IAgentHostInspectInfo, IAgentHostSocketInfo, IAgentResolveSessionConfigParams, IAgentSessionConfigCompletionsParams, IAgentSessionMetadata, AuthenticateParams, AuthenticateResult } from "../../../../platform/agentHost/common/agentService.js";
+import { IAgentCreateChatOptions, IAgentCreateSessionConfig, IAgentHostInspectInfo, IAgentHostSocketInfo, IAgentResolveSessionConfigParams, IAgentSessionConfigCompletionsParams, IAgentSessionMetadata, AuthenticateParams, AuthenticateResult, IMcpNotification } from "../../../../platform/agentHost/common/agentService.js";
 import { IAgentHostService } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentService.service";
 import type { IActiveSubscriptionInfo, IAgentSubscription } from "../../../../platform/agentHost/common/state/agentSubscription.js";
 import type { CompletionsParams, CompletionsResult, CreateTerminalParams, ResolveSessionConfigResult, SessionConfigCompletionsResult } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/commands";
 import type { InvokeChangesetOperationParams, InvokeChangesetOperationResult } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-changeset/commands";
-import type { ActionEnvelope, INotification, IRootConfigChangedAction, SessionAction, TerminalAction } from "../../../../platform/agentHost/common/state/sessionActions.js";
+import type { ActionEnvelope, INotification, IRootConfigChangedAction, SessionAction, TerminalAction, ClientAnnotationsAction } from "../../../../platform/agentHost/common/state/sessionActions.js";
 import type { IRemoteWatchHandle } from "../../../../platform/agentHost/common/agentHostFileSystemProvider.js";
 import type { CreateResourceWatchParams, CreateResourceWatchResult, ResourceCopyParams, ResourceCopyResult, ResourceDeleteParams, ResourceDeleteResult, ResourceListResult, ResourceMkdirParams, ResourceMkdirResult, ResourceMoveParams, ResourceMoveResult, ResourceReadResult, ResourceResolveParams, ResourceResolveResult, ResourceWriteParams, ResourceWriteResult } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionProtocol";
 import { ComponentToState, RootState, StateComponents } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState";
@@ -47,10 +47,12 @@ export declare class EditorRemoteAgentHostServiceClient extends Disposable imple
     get rootState(): IAgentSubscription<RootState>;
     get onDidNotification(): Event<INotification>;
     get onDidAction(): Event<ActionEnvelope>;
+    get onMcpNotification(): Event<IMcpNotification>;
     getSubscription<T extends StateComponents>(kind: T, resource: URI, owner: string): IReference<IAgentSubscription<ComponentToState[T]>>;
     getSubscriptionUnmanaged<T extends StateComponents>(kind: T, resource: URI): IAgentSubscription<ComponentToState[T]> | undefined;
+    getInflightSessionCreate(resource: URI): Promise<unknown> | undefined;
     getActiveSubscriptions(): readonly IActiveSubscriptionInfo[];
-    dispatch(channel: string, action: SessionAction | TerminalAction | IRootConfigChangedAction): void;
+    dispatch(channel: string, action: SessionAction | TerminalAction | ClientAnnotationsAction | IRootConfigChangedAction): void;
     authenticate(params: AuthenticateParams): Promise<AuthenticateResult>;
     listSessions(): Promise<IAgentSessionMetadata[]>;
     createSession(config?: IAgentCreateSessionConfig): Promise<URI>;
@@ -59,9 +61,12 @@ export declare class EditorRemoteAgentHostServiceClient extends Disposable imple
     completions(params: CompletionsParams): Promise<CompletionsResult>;
     getCompletionTriggerCharacters(): Promise<readonly string[]>;
     disposeSession(session: URI): Promise<void>;
+    createChat(session: URI, chat: URI, options?: IAgentCreateChatOptions): Promise<void>;
+    disposeChat(chat: URI): Promise<void>;
     createTerminal(params: CreateTerminalParams): Promise<void>;
     disposeTerminal(terminal: URI): Promise<void>;
     invokeChangesetOperation(params: InvokeChangesetOperationParams): Promise<InvokeChangesetOperationResult>;
+    handleMcpRequest(channel: string, method: string, params: Record<string, unknown> | undefined): Promise<unknown>;
     resourceList(uri: URI): Promise<ResourceListResult>;
     resourceRead(uri: URI): Promise<ResourceReadResult>;
     resourceWrite(params: ResourceWriteParams): Promise<ResourceWriteResult>;

package/vscode/src/vs/workbench/services/agentHost/browser/editorRemoteAgentHostServiceClient.js

@@ -111,12 +111,18 @@ let EditorRemoteAgentHostServiceClient = class EditorRemoteAgentHostServiceClien
     get onDidAction() {
         return this._protocolClient?.onDidAction ?? Event.None;
     }
+    get onMcpNotification() {
+        return this._protocolClient?.onMcpNotification ?? Event.None;
+    }
     getSubscription(kind, resource, owner) {
         return this._requireClient().getSubscription(kind, resource, owner);
     }
     getSubscriptionUnmanaged(kind, resource) {
         return this._protocolClient?.getSubscriptionUnmanaged(kind, resource);
     }
+    getInflightSessionCreate(resource) {
+        return this._protocolClient?.getInflightSessionCreate(resource);
+    }
     getActiveSubscriptions() {
         return this._protocolClient?.getActiveSubscriptions() ?? [];
     }
@@ -147,6 +153,12 @@ let EditorRemoteAgentHostServiceClient = class EditorRemoteAgentHostServiceClien
     disposeSession(session) {
         return this._requireClient().disposeSession(session);
     }
+    createChat(session, chat, options) {
+        return this._requireClient().createChat(session, chat, options);
+    }
+    disposeChat(chat) {
+        return this._requireClient().disposeChat(chat);
+    }
     createTerminal(params) {
         return this._requireClient().createTerminal(params);
     }
@@ -156,6 +168,9 @@ let EditorRemoteAgentHostServiceClient = class EditorRemoteAgentHostServiceClien
     invokeChangesetOperation(params) {
         return this._requireClient().invokeChangesetOperation(params);
     }
+    handleMcpRequest(channel, method, params) {
+        return this._requireClient().handleMcpRequest(channel, method, params);
+    }
     resourceList(uri) {
         return this._requireClient().resourceList(uri);
     }

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelContentProviders.d.ts

@@ -1,20 +0,0 @@
-import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
-import { ITextModelContentProvider } from "@codingame/monaco-vscode-model-service-override/vscode/vs/editor/common/services/resolverService";
-import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service";
-export declare class ChatEditingTextModelContentProvider implements ITextModelContentProvider {
-    private readonly _chatEditingService;
-    private readonly _modelService;
-    static readonly scheme = "chat-editing-text-model";
-    static getFileURI(chatSessionResource: URI, documentId: string, path: string): URI;
-    constructor(_chatEditingService: IChatEditingService, _modelService: IModelService);
-    provideTextContent(resource: URI): Promise<ITextModel | null>;
-}
-export declare class ChatEditingSnapshotTextModelContentProvider implements ITextModelContentProvider {
-    private readonly _chatEditingService;
-    private readonly _modelService;
-    static getSnapshotFileURI(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined, path: string, scheme?: string): URI;
-    constructor(_chatEditingService: IChatEditingService, _modelService: IModelService);
-    provideTextContent(resource: URI): Promise<ITextModel | null>;
-}