@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

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(15394, "Send to Terminal")),
+    displayName: ( localize(17156, "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(15395, "Pressing `Enter` in terminal")));
-            pastTenseMessage.appendMarkdown(( localize(15396, "Pressed `Enter` in terminal")));
+            invocationMessage.appendMarkdown(( localize(17157, "Pressing `Enter` in terminal")));
+            pastTenseMessage.appendMarkdown(( localize(17158, "Pressed `Enter` in terminal")));
         } else {
             const displayCommand = buildCommandDisplayText(args.command);
             const safeInlineCode = appendEscapedMarkdownInlineCode(displayCommand);
-            invocationMessage.appendMarkdown(( localize(15397, "Sending {0} to terminal", safeInlineCode)));
-            pastTenseMessage.appendMarkdown(( localize(15398, "Sent {0} to terminal", safeInlineCode)));
+            invocationMessage.appendMarkdown(( localize(17159, "Sending {0} to terminal", safeInlineCode)));
+            pastTenseMessage.appendMarkdown(( localize(17160, "Sent {0} to terminal", safeInlineCode)));
         }
         if (questionText) {
-            const replyPrefix = ` (${( localize(15399, "replying to: "))}`;
+            const replyPrefix = ` (${( localize(17161, "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(15400, "Press `Enter` in terminal {0}", safeTerminalLabel)) : ( localize(
-            15401,
+        const baseMessage = isEmptyInput ? ( localize(17162, "Press `Enter` in terminal {0}", safeTerminalLabel)) : ( localize(
+            17163,
             "Run {0} in terminal {1}",
             appendEscapedMarkdownInlineCode(buildCommandDisplayText(args.command)),
             safeTerminalLabel
         ));
         if (instanceId !== undefined) {
             const focusUri = createCommandUri(FocusTerminalByIdCommandId, instanceId);
-            confirmationMessage.appendMarkdown(`${baseMessage} — [${( localize(15402, "Focus Terminal"))}](${focusUri})`);
+            confirmationMessage.appendMarkdown(`${baseMessage} — [${( localize(17164, "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(15403, "Send to Terminal")),
+            title: ( localize(17165, "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(15404, "Resolving the task"))))
+            message: ( new MarkdownString(( localize(17166, "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(15405, "Task not found: `{0}`", args.task.label))))
+                toolResultMessage: ( new MarkdownString(( localize(17167, "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(15406, "Running task `{0}`", args.task.label))))
+                message: ( new MarkdownString(( localize(17168, "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(
-                        15407,
+                        17169,
                         "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(15408, "Task `{0}` already exists.", task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(15409, "Task `{0}` already exists.", task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(17170, "Task `{0}` already exists.", task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(17171, "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(15410, "Task `{0}` is already running.", task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(15410, "Task `{0}` is already running.", task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(17172, "Task `{0}` is already running.", task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(17172, "Task `{0}` is already running.", task.label)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(15411, "Created task `{0}`", task.label)))),
-            pastTenseMessage: ( new MarkdownString(( localize(15412, "Created task `{0}`", task.label)))),
+            invocationMessage: ( new MarkdownString(( localize(17173, "Created task `{0}`", task.label)))),
+            pastTenseMessage: ( new MarkdownString(( localize(17174, "Created task `{0}`", task.label)))),
             confirmationMessages: {
-                title: ( localize(15413, "Allow task creation and execution?")),
+                title: ( localize(17175, "Allow task creation and execution?")),
                 message: ( new MarkdownString(( localize(
-                    15414,
+                    17176,
                     "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(15415, "Create and run Task")),
+    displayName: ( localize(17177, "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(15416, "Create and run a task in the workspace")),
+    userDescription: ( localize(17178, "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(15417, "Get Task Output")),
+    displayName: ( localize(17179, "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(15418, "Task not found: `{0}`", args.id))))
+                invocationMessage: ( new MarkdownString(( localize(17180, "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(15419, "The task `{0}` is already running.", taskLabel))))
+                invocationMessage: ( new MarkdownString(( localize(17181, "The task `{0}` is already running.", taskLabel))))
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(15420, "Checking output for task `{0}`", taskLabel)))),
-            pastTenseMessage: ( new MarkdownString(( localize(15421, "Checked output for task `{0}`", taskLabel))))
+            invocationMessage: ( new MarkdownString(( localize(17182, "Checking output for task `{0}`", taskLabel)))),
+            pastTenseMessage: ( new MarkdownString(( localize(17183, "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(15418, "Task not found: `{0}`", args.id))))
+                toolResultMessage: ( new MarkdownString(( localize(17180, "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(15422, "Terminal not found for task `{0}`", taskLabel))))
+                toolResultMessage: ( new MarkdownString(( localize(17184, "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(15423, "Task not found: `{0}`", args.id))))
+                toolResultMessage: ( new MarkdownString(( localize(17185, "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(15424, "The task `{0}` is already running.", taskLabel))))
+                toolResultMessage: ( new MarkdownString(( localize(17186, "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(15425, "Task started but no terminal was found for: `{0}`", taskLabel))))
+                    toolResultMessage: ( new MarkdownString(( localize(17187, "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(15425, "Task started but no terminal was found for: `{0}`", taskLabel))))
+                    toolResultMessage: ( new MarkdownString(( localize(17187, "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(15423, "Task not found: `{0}`", args.id))))
+                invocationMessage: ( new MarkdownString(( localize(17185, "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(15426, "The task is already running."))))
+                invocationMessage: ( new MarkdownString(( localize(17188, "The task is already running."))))
             };
         }
         if (await this._isTaskActive(task)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(15427, "`{0}` is already running.", taskLabel)))),
-                pastTenseMessage: ( new MarkdownString(( localize(15428, "`{0}` was already running.", taskLabel)))),
+                invocationMessage: ( new MarkdownString(( localize(17189, "`{0}` is already running.", taskLabel)))),
+                pastTenseMessage: ( new MarkdownString(( localize(17190, "`{0}` was already running.", taskLabel)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(15429, "Running `{0}`", taskLabel)))),
-            pastTenseMessage: ( new MarkdownString(task?.configurationProperties.isBackground ? ( localize(15430, "Started `{0}`", taskLabel)) : ( localize(15431, "Ran `{0}`", taskLabel)))),
+            invocationMessage: ( new MarkdownString(( localize(17191, "Running `{0}`", taskLabel)))),
+            pastTenseMessage: ( new MarkdownString(task?.configurationProperties.isBackground ? ( localize(17192, "Started `{0}`", taskLabel)) : ( localize(17193, "Ran `{0}`", taskLabel)))),
             confirmationMessages: task ? {
-                title: ( localize(15432, "Allow task run?")),
-                message: ( localize(15433, "Allow to run the task `{0}`?", taskLabel))
+                title: ( localize(17194, "Allow task run?")),
+                message: ( localize(17195, "Allow to run the task `{0}`?", taskLabel))
             } : undefined
         };
     }
@@ -210,9 +210,9 @@ const RunTaskToolData = {
     id: TerminalToolId.RunTask,
     toolReferenceName: "runTask",
     legacyToolReferenceFullNames: ["runTasks/runTask"],
-    displayName: ( localize(15434, "Run Task")),
+    displayName: ( localize(17196, "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(15435, "Run tasks in the workspace")),
+    userDescription: ( localize(17197, "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(15436, "Task `{0}` failed with exit code {1}.", taskLabel, result.exitCode));
+        resultSummary = ( localize(17198, "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/browser/treeSitterCommandParser.d.ts

@@ -6,6 +6,10 @@ export declare enum TreeSitterCommandParserLanguage {
     Bash = "bash",
     PowerShell = "powershell"
 }
+export interface IAutoApprovalCommandParseResult {
+    readonly subCommands: string[];
+    readonly hasUnanalyzableSyntax: boolean;
+}
 export declare class TreeSitterCommandParser extends Disposable {
     private readonly _treeSitterLibraryService;
     private readonly _parser;
@@ -13,6 +17,7 @@ export declare class TreeSitterCommandParser extends Disposable {
     private readonly _commandFileWriteParsers;
     constructor(_treeSitterLibraryService: ITreeSitterLibraryService);
     extractSubCommands(languageId: TreeSitterCommandParserLanguage, commandLine: string): Promise<string[]>;
+    extractAutoApprovalSubCommands(languageId: TreeSitterCommandParserLanguage, commandLine: string): Promise<IAutoApprovalCommandParseResult>;
     extractPwshDoubleAmpersandChainOperators(commandLine: string): Promise<QueryCapture[]>;
     /**
      * Extracts executable command invocations from the command line and returns
@@ -34,6 +39,7 @@ export declare class TreeSitterCommandParser extends Disposable {
      */
     getCommandFileWrites(languageId: TreeSitterCommandParserLanguage, commandLine: string): Promise<string[]>;
     private _queryTree;
+    private _queryTreeWithParseStatus;
     /**
      * Converts a command token to the stable keyword used by sandbox allow-list
      * rules by stripping quotes, path segments, and common executable suffixes.
@@ -44,6 +50,7 @@ export declare class TreeSitterCommandParser extends Disposable {
      * leading environment variable assignments such as `NODE_ENV=test npm run build`.
      */
     private _parseCommand;
+    private _getEnvWrappedCommandIndex;
     /**
      * Splits enough shell syntax for sandbox allow-listing: whitespace separates
      * tokens, quotes are removed, and backslash escapes preserve the escaped char.

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

@@ -6,7 +6,8 @@ import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { Disposable, MutableDisposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { win32, posix } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import { ITreeSitterLibraryService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/treeSitter/treeSitterLibraryService.service';
-import { SedFileWriteParser } from './commandParsers/sedFileWriteParser.js';
+import { shouldRequireConfirmationForAutoApproveParse } from '../../../../../platform/terminal/common/autoApprove/autoApproveParseSafety.js';
+import { SedFileWriteParser } from '../../../../../platform/terminal/common/autoApprove/sedFileWriteParser.js';
 
 var TreeSitterCommandParserLanguage;
 (function(TreeSitterCommandParserLanguage) {
@@ -14,6 +15,7 @@ var TreeSitterCommandParserLanguage;
     TreeSitterCommandParserLanguage["PowerShell"] = "powershell";
 })(TreeSitterCommandParserLanguage || (TreeSitterCommandParserLanguage = {}));
 const pwshFlagEqualsRegex = /(^|\s)(-{1,2}[\w-]+)=/g;
+const envOptionsWithValue = ( new Set(["-u", "--unset", "-C", "--chdir", "-a", "--argv0"]));
 function maskPwshFlagEquals(commandLine) {
     return commandLine.replace(pwshFlagEqualsRegex, (_, pre, flag) => `${pre}${flag} `);
 }
@@ -38,6 +40,35 @@ let TreeSitterCommandParser = class TreeSitterCommandParser extends Disposable {
         const captures = await this._queryTree(languageId, commandLine, "(command) @command");
         return ( captures.map(e => e.node.text));
     }
+    async extractAutoApprovalSubCommands(languageId, commandLine) {
+        const masked = languageId === TreeSitterCommandParserLanguage.PowerShell ? maskPwshFlagEquals(commandLine) : commandLine;
+        const querySource = languageId === TreeSitterCommandParserLanguage.PowerShell ? "(command) @command (assignment_expression) @unanalyzable (invokation_expression) @unanalyzable" : "(command) @command (variable_assignment) @unanalyzable (declaration_command) @unanalyzable";
+        const {
+            captures,
+            hasError
+        } = await this._queryTreeWithParseStatus(languageId, masked, querySource);
+        const subCommands = [];
+        let hasUnanalyzableSyntax = false;
+        for (const capture of captures) {
+            if (capture.name === "command") {
+                subCommands.push(
+                    masked === commandLine ? capture.node.text : commandLine.substring(capture.node.startIndex, capture.node.endIndex)
+                );
+            } else if (capture.name === "unanalyzable") {
+                if (capture.node.type !== "variable_assignment" || capture.node.parent?.type !== "command") {
+                    hasUnanalyzableSyntax = true;
+                }
+            }
+        }
+        hasUnanalyzableSyntax ||= shouldRequireConfirmationForAutoApproveParse(
+            languageId === TreeSitterCommandParserLanguage.PowerShell ? "powershell" : "bash",
+            hasError
+        );
+        return {
+            subCommands,
+            hasUnanalyzableSyntax
+        };
+    }
     async extractPwshDoubleAmpersandChainOperators(commandLine) {
         const captures = await this._queryTree(
             TreeSitterCommandParserLanguage.PowerShell,
@@ -94,7 +125,25 @@ let TreeSitterCommandParser = class TreeSitterCommandParser extends Disposable {
             tree,
             query
         } = await this._doQuery(languageId, commandLine, querySource);
-        return query.captures(tree.rootNode);
+        try {
+            return query.captures(tree.rootNode);
+        } finally {
+            query.delete();
+        }
+    }
+    async _queryTreeWithParseStatus(languageId, commandLine, querySource) {
+        const {
+            tree,
+            query
+        } = await this._doQuery(languageId, commandLine, querySource);
+        try {
+            return {
+                captures: query.captures(tree.rootNode),
+                hasError: tree.rootNode.hasError
+            };
+        } finally {
+            query.delete();
+        }
     }
     _normalizeCommandKeyword(token) {
         const unquoted = token.replace(/^['"]|['"]$/g, "");
@@ -111,15 +160,45 @@ let TreeSitterCommandParser = class TreeSitterCommandParser extends Disposable {
         while (commandIndex < tokens.length && this._isVariableAssignment(tokens[commandIndex])) {
             commandIndex++;
         }
-        const keyword = this._normalizeCommandKeyword(tokens[commandIndex] ?? "");
+        let keyword = this._normalizeCommandKeyword(tokens[commandIndex] ?? "");
         if (!keyword) {
             return undefined;
         }
+        if (keyword === "env") {
+            const wrappedCommandIndex = this._getEnvWrappedCommandIndex(tokens, commandIndex + 1);
+            if (wrappedCommandIndex !== undefined) {
+                commandIndex = wrappedCommandIndex;
+                keyword = this._normalizeCommandKeyword(tokens[commandIndex] ?? "");
+                if (!keyword) {
+                    return undefined;
+                }
+            }
+        }
         return {
             keyword,
             args: tokens.slice(commandIndex + 1)
         };
     }
+    _getEnvWrappedCommandIndex(tokens, startIndex) {
+        for (let i = startIndex; i < tokens.length; i++) {
+            const token = tokens[i];
+            if (this._isVariableAssignment(token)) {
+                continue;
+            }
+            if (token === "--") {
+                return i + 1 < tokens.length ? i + 1 : undefined;
+            }
+            if (token === "-" || token.startsWith("-")) {
+                const option = token.includes("=") ? token.substring(0, token.indexOf("=")) : token;
+                if (!token.includes("=") && ( envOptionsWithValue.has(option))) {
+                    i++;
+                }
+                continue;
+            }
+            return i;
+        }
+        return undefined;
+    }
     _splitCommandTokens(commandText) {
         const tokens = [];
         let current = "";

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

@@ -1,14 +1,13 @@
 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";
-/** Setting IDs that affect the engine's sandbox configuration (modern + deprecated). */
+/** Setting IDs that affect the engine's sandbox configuration. */
 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. Legacy boolean sandbox enabled values are normalized to the agent-host
- * `'on' | 'off'` enum. Returns `undefined` when no user value is configured.
+ * Reads a single sandbox-related setting from `IConfigurationService`.
+ * Legacy boolean sandbox enabled values are normalized to the agent-host
+ * `'on' | 'off'` enum.
  */
-export declare function readSandboxSetting<T>(configurationService: IConfigurationService, logService: ILogService, settingId: string): T | undefined;
+export declare function readSandboxSetting<T>(configurationService: IConfigurationService, _logService: ILogService, settingId: string): T | undefined;
 /**
  * Reads the currently-configured sandbox values for forwarding to an agent
  * host. The returned record is keyed by the prefix-free agent-host sandbox

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

@@ -13,48 +13,11 @@ const SANDBOX_SETTING_KEYS = [
     AgentSandboxSettingId.AgentSandboxWindowsFileSystem,
     AgentSandboxSettingId.AgentSandboxWindowsSchemaVersion,
     AgentSandboxSettingId.AgentSandboxAdvancedRuntime,
-    AgentSandboxSettingId.DeprecatedAgentSandboxEnabled,
-    AgentSandboxSettingId.DeprecatedAgentSandboxLinuxFileSystem,
-    AgentSandboxSettingId.DeprecatedAgentSandboxMacFileSystem,
     AgentNetworkDomainSettingId.AllowedNetworkDomains,
     AgentNetworkDomainSettingId.DeniedNetworkDomains,
-    AgentNetworkDomainSettingId.DeprecatedSandboxAllowedNetworkDomains,
-    AgentNetworkDomainSettingId.DeprecatedSandboxDeniedNetworkDomains,
-    AgentNetworkDomainSettingId.DeprecatedOldAllowedNetworkDomains,
-    AgentNetworkDomainSettingId.DeprecatedOldDeniedNetworkDomains
 ];
-const DEPRECATED_SANDBOX_FALLBACKS = {
-    [AgentSandboxSettingId.AgentSandboxEnabled]: [AgentSandboxSettingId.DeprecatedAgentSandboxEnabled],
-    [AgentSandboxSettingId.AgentSandboxLinuxFileSystem]: [AgentSandboxSettingId.DeprecatedAgentSandboxLinuxFileSystem],
-    [AgentSandboxSettingId.AgentSandboxMacFileSystem]: [AgentSandboxSettingId.DeprecatedAgentSandboxMacFileSystem],
-    [AgentNetworkDomainSettingId.AllowedNetworkDomains]: [
-        AgentNetworkDomainSettingId.DeprecatedSandboxAllowedNetworkDomains,
-        AgentNetworkDomainSettingId.DeprecatedOldAllowedNetworkDomains
-    ],
-    [AgentNetworkDomainSettingId.DeniedNetworkDomains]: [
-        AgentNetworkDomainSettingId.DeprecatedSandboxDeniedNetworkDomains,
-        AgentNetworkDomainSettingId.DeprecatedOldDeniedNetworkDomains
-    ]
-};
-function readSandboxSetting(configurationService, logService, settingId) {
-    const modern = configurationService.inspect(settingId);
-    if (modern.userValue !== undefined) {
-        return normalizeSandboxSettingValue(settingId, modern.value);
-    }
-    const deprecatedFallbacks = DEPRECATED_SANDBOX_FALLBACKS[settingId];
-    if (deprecatedFallbacks?.length) {
-        const userConfiguredKeys = ( configurationService.keys()).user;
-        for (const deprecatedId of deprecatedFallbacks) {
-            const deprecated = configurationService.inspect(deprecatedId);
-            if (deprecated.userValue !== undefined && userConfiguredKeys.includes(deprecatedId)) {
-                logService.warn(
-                    `SandboxSettingsReader: Using deprecated setting ${deprecatedId} because ${settingId} is not set. Please update your settings to use ${settingId} instead.`
-                );
-                return normalizeSandboxSettingValue(settingId, deprecated.value);
-            }
-        }
-    }
-    return normalizeSandboxSettingValue(settingId, modern.value);
+function readSandboxSetting(configurationService, _logService, settingId) {
+    return normalizeSandboxSettingValue(settingId, configurationService.inspect(settingId).value);
 }
 function readAgentHostSandboxValues(configurationService, logService) {
     const values = {};
@@ -67,12 +30,12 @@ function readAgentHostSandboxValues(configurationService, logService) {
     return values;
 }
 function normalizeSandboxSettingValue(settingId, value) {
-    if (settingId === AgentSandboxSettingId.AgentSandboxEnabled || settingId === AgentSandboxSettingId.AgentSandboxWindowsEnabled || settingId === AgentSandboxSettingId.DeprecatedAgentSandboxEnabled) {
+    if (settingId === AgentSandboxSettingId.AgentSandboxEnabled || settingId === AgentSandboxSettingId.AgentSandboxWindowsEnabled) {
         if (value === true) {
-            return "on";
+            return 'on';
         }
         if (value === false) {
-            return "off";
+            return 'off';
         }
     }
     return value;

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

@@ -0,0 +1,2 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+export declare function getTerminalOutputDirectory(cacheHome: URI): URI;

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

@@ -0,0 +1,8 @@
+
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+
+function getTerminalOutputDirectory(cacheHome) {
+    return URI.joinPath(cacheHome, 'copilot-terminal-output');
+}
+
+export { getTerminalOutputDirectory };

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

@@ -59,6 +59,7 @@ export declare class TerminalSandboxService extends Disposable implements ITermi
     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;
+    private _quoteShellArgument;
     /**
      * Shows a chat elicitation that keeps the "Install" flow grounded in chat while
      * the user focuses the terminal and types a sudo password.