@codingame/monaco-vscode-chat-service-override 33.0.9 → 34.0.1

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

@@ -0,0 +1,29 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { ITerminalSandboxService } from "../../common/terminalSandboxService.js";
+import type { IOutputAnalyzer, IOutputAnalyzerOptions } from "./outputAnalyzer.js";
+export declare class SandboxOutputAnalyzer extends Disposable implements IOutputAnalyzer {
+    private readonly _sandboxService;
+    private readonly _configurationService;
+    constructor(_sandboxService: ITerminalSandboxService, _configurationService: IConfigurationService);
+    analyze(options: IOutputAnalyzerOptions): Promise<string | undefined>;
+    /**
+     * Checks whether the command output contains strings that typically indicate
+     * the sandbox blocked the operation. Used when exit code is unavailable.
+     *
+     * The output may contain newlines inserted by terminal wrapping, so we
+     * strip them before testing.
+     */
+    private _outputLooksSandboxBlocked;
+}
+/**
+ * Checks whether the command output contains strings that typically indicate
+ * the sandbox blocked the operation. The output may contain newlines inserted
+ * by terminal wrapping, so we strip them before testing.
+ */
+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.
+ */
+export declare function outputLooksSandboxNetworkBlocked(output: string): boolean;

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

@@ -0,0 +1,63 @@
+
+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 { OperatingSystem } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import '../../common/terminalSandboxService.js';
+import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+import { AgentNetworkDomainSettingId } from '../../../../../../platform/networkFilter/common/settings.js';
+import { AgentSandboxSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/sandbox/common/settings';
+import { ITerminalSandboxService } from '@codingame/monaco-vscode-api/vscode/vs/platform/sandbox/common/terminalSandboxService.service';
+
+let SandboxOutputAnalyzer = class SandboxOutputAnalyzer extends Disposable {
+    constructor(_sandboxService, _configurationService) {
+        super();
+        this._sandboxService = _sandboxService;
+        this._configurationService = _configurationService;
+    }
+    async analyze(options) {
+        if (!options.isSandboxWrapped) {
+            return undefined;
+        }
+        const knownFailure = options.exitCode !== undefined && options.exitCode !== 0;
+        const suspectedFailure = !knownFailure && options.exitCode === undefined && this._outputLooksSandboxBlocked(options.exitResult);
+        if (!knownFailure && !suspectedFailure) {
+            return undefined;
+        }
+        const os = await this._sandboxService.getOS();
+        let fileSystemSetting;
+        switch (os) {
+        case OperatingSystem.Linux:
+            fileSystemSetting = TerminalChatAgentToolsSettingId.AgentSandboxLinuxFileSystem;
+            break;
+        case OperatingSystem.Windows:
+            fileSystemSetting = TerminalChatAgentToolsSettingId.AgentSandboxWindowsFileSystem;
+            break;
+        default:
+            fileSystemSetting = TerminalChatAgentToolsSettingId.AgentSandboxMacFileSystem;
+            break;
+        }
+        const prefix = knownFailure ? "Command failed while running in sandboxed mode. If the command failed due to sandboxing:" : "Command ran in sandboxed mode and may have been blocked by the sandbox. If the command failed due to sandboxing:";
+        const retryWithAllowNetworkRequests = this._configurationService.getValue(AgentSandboxSettingId.AgentSandboxRetryWithAllowNetworkRequests) === true;
+        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}.
+${networkRecovery}
+
+Here is the output of the command:\n`;
+    }
+    _outputLooksSandboxBlocked(output) {
+        return outputLooksSandboxBlocked(output);
+    }
+};
+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);
+}
+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);
+}
+
+export { SandboxOutputAnalyzer, outputLooksSandboxBlocked, outputLooksSandboxNetworkBlocked };

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

@@ -13,16 +13,16 @@ import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { ITerminalService, ITerminalChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
-import { getOutput } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/outputHelpers';
-import { buildCommandDisplayText, isMultilineCommand, normalizeCommandForExecution } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalHelpers';
-import { RunInTerminalTool } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool';
-import { isSessionAutoApproveLevel } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/terminalToolAutoApprove';
+import { getOutput } from '../outputHelpers.js';
+import { buildCommandDisplayText, isMultilineCommand, normalizeCommandForExecution } from '../runInTerminalHelpers.js';
+import { RunInTerminalTool } from './runInTerminalTool.js';
+import { isSessionAutoApproveLevel } from './terminalToolAutoApprove.js';
 import { TerminalToolId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/terminalToolIds';
 
 const SendToTerminalToolData = {
     id: TerminalToolId.SendToTerminal,
     toolReferenceName: "sendToTerminal",
-    displayName: ( localize(14535, "Send to Terminal")),
+    displayName: ( localize(14734, "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(14536, "Pressing `Enter` in terminal")));
-            pastTenseMessage.appendMarkdown(( localize(14537, "Pressed `Enter` in terminal")));
+            invocationMessage.appendMarkdown(( localize(14735, "Pressing `Enter` in terminal")));
+            pastTenseMessage.appendMarkdown(( localize(14736, "Pressed `Enter` in terminal")));
         } else {
             const displayCommand = buildCommandDisplayText(args.command);
             const safeInlineCode = appendEscapedMarkdownInlineCode(displayCommand);
-            invocationMessage.appendMarkdown(( localize(14538, "Sending {0} to terminal", safeInlineCode)));
-            pastTenseMessage.appendMarkdown(( localize(14539, "Sent {0} to terminal", safeInlineCode)));
+            invocationMessage.appendMarkdown(( localize(14737, "Sending {0} to terminal", safeInlineCode)));
+            pastTenseMessage.appendMarkdown(( localize(14738, "Sent {0} to terminal", safeInlineCode)));
         }
         if (questionText) {
-            const replyPrefix = ` (${( localize(14540, "replying to: "))}`;
+            const replyPrefix = ` (${( localize(14739, "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(14541, "Press `Enter` in terminal {0}", safeTerminalLabel)) : ( localize(
-            14542,
+        const baseMessage = isEmptyInput ? ( localize(14740, "Press `Enter` in terminal {0}", safeTerminalLabel)) : ( localize(
+            14741,
             "Run {0} in terminal {1}",
             appendEscapedMarkdownInlineCode(buildCommandDisplayText(args.command)),
             safeTerminalLabel
         ));
         if (instanceId !== undefined) {
             const focusUri = createCommandUri(FocusTerminalByIdCommandId, instanceId);
-            confirmationMessage.appendMarkdown(`${baseMessage} — [${( localize(14543, "Focus Terminal"))}](${focusUri})`);
+            confirmationMessage.appendMarkdown(`${baseMessage} — [${( localize(14742, "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(14544, "Send to Terminal")),
+            title: ( localize(14743, "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(14545, "Resolving the task"))))
+            message: ( new MarkdownString(( localize(14744, "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(14546, "Task not found: `{0}`", args.task.label))))
+                toolResultMessage: ( new MarkdownString(( localize(14745, "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(14547, "Running task `{0}`", args.task.label))))
+                message: ( new MarkdownString(( localize(14746, "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(
-                        14548,
+                        14747,
                         "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(14549, "Task `{0}` already exists.", task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(14550, "Task `{0}` already exists.", task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(14748, "Task `{0}` already exists.", task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(14749, "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(14551, "Task `{0}` is already running.", task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(14551, "Task `{0}` is already running.", task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(14750, "Task `{0}` is already running.", task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(14750, "Task `{0}` is already running.", task.label)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(14552, "Created task `{0}`", task.label)))),
-            pastTenseMessage: ( new MarkdownString(( localize(14553, "Created task `{0}`", task.label)))),
+            invocationMessage: ( new MarkdownString(( localize(14751, "Created task `{0}`", task.label)))),
+            pastTenseMessage: ( new MarkdownString(( localize(14752, "Created task `{0}`", task.label)))),
             confirmationMessages: {
-                title: ( localize(14554, "Allow task creation and execution?")),
+                title: ( localize(14753, "Allow task creation and execution?")),
                 message: ( new MarkdownString(( localize(
-                    14555,
+                    14754,
                     "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(14556, "Create and run Task")),
+    displayName: ( localize(14755, "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(14557, "Create and run a task in the workspace")),
+    userDescription: ( localize(14756, "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(14558, "Get Task Output")),
+    displayName: ( localize(14757, "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(14559, "Task not found: `{0}`", args.id))))
+                invocationMessage: ( new MarkdownString(( localize(14758, "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(14560, "The task `{0}` is already running.", taskLabel))))
+                invocationMessage: ( new MarkdownString(( localize(14759, "The task `{0}` is already running.", taskLabel))))
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(14561, "Checking output for task `{0}`", taskLabel)))),
-            pastTenseMessage: ( new MarkdownString(( localize(14562, "Checked output for task `{0}`", taskLabel))))
+            invocationMessage: ( new MarkdownString(( localize(14760, "Checking output for task `{0}`", taskLabel)))),
+            pastTenseMessage: ( new MarkdownString(( localize(14761, "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(14559, "Task not found: `{0}`", args.id))))
+                toolResultMessage: ( new MarkdownString(( localize(14758, "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(14563, "Terminal not found for task `{0}`", taskLabel))))
+                toolResultMessage: ( new MarkdownString(( localize(14762, "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(14564, "Task not found: `{0}`", args.id))))
+                toolResultMessage: ( new MarkdownString(( localize(14763, "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(14565, "The task `{0}` is already running.", taskLabel))))
+                toolResultMessage: ( new MarkdownString(( localize(14764, "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(14566, "Task started but no terminal was found for: `{0}`", taskLabel))))
+                    toolResultMessage: ( new MarkdownString(( localize(14765, "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(14566, "Task started but no terminal was found for: `{0}`", taskLabel))))
+                    toolResultMessage: ( new MarkdownString(( localize(14765, "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(14564, "Task not found: `{0}`", args.id))))
+                invocationMessage: ( new MarkdownString(( localize(14763, "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(14567, "The task is already running."))))
+                invocationMessage: ( new MarkdownString(( localize(14766, "The task is already running."))))
             };
         }
         if (await this._isTaskActive(task)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(14568, "`{0}` is already running.", taskLabel)))),
-                pastTenseMessage: ( new MarkdownString(( localize(14569, "`{0}` was already running.", taskLabel)))),
+                invocationMessage: ( new MarkdownString(( localize(14767, "`{0}` is already running.", taskLabel)))),
+                pastTenseMessage: ( new MarkdownString(( localize(14768, "`{0}` was already running.", taskLabel)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(14570, "Running `{0}`", taskLabel)))),
-            pastTenseMessage: ( new MarkdownString(task?.configurationProperties.isBackground ? ( localize(14571, "Started `{0}`", taskLabel)) : ( localize(14572, "Ran `{0}`", taskLabel)))),
+            invocationMessage: ( new MarkdownString(( localize(14769, "Running `{0}`", taskLabel)))),
+            pastTenseMessage: ( new MarkdownString(task?.configurationProperties.isBackground ? ( localize(14770, "Started `{0}`", taskLabel)) : ( localize(14771, "Ran `{0}`", taskLabel)))),
             confirmationMessages: task ? {
-                title: ( localize(14573, "Allow task run?")),
-                message: ( localize(14574, "Allow to run the task `{0}`?", taskLabel))
+                title: ( localize(14772, "Allow task run?")),
+                message: ( localize(14773, "Allow to run the task `{0}`?", taskLabel))
             } : undefined
         };
     }
@@ -210,9 +210,9 @@ const RunTaskToolData = {
     id: TerminalToolId.RunTask,
     toolReferenceName: "runTask",
     legacyToolReferenceFullNames: ["runTasks/runTask"],
-    displayName: ( localize(14575, "Run Task")),
+    displayName: ( localize(14774, "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(14576, "Run tasks in the workspace")),
+    userDescription: ( localize(14775, "Run tasks in the workspace")),
     icon: Codicon.tools,
     source: ToolDataSource.Internal,
     inputSchema: {

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

@@ -2,7 +2,7 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { Location } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { Range } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
 import { ITaskSummary } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService";
-import { OutputMonitorState } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/types";
+import { OutputMonitorState } from "../monitoring/types.js";
 import { MarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 export declare function toolResultDetailsFromResponse(terminalResults: {
     output: string;

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

@@ -1,6 +1,6 @@
 
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { OutputMonitorState } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/types';
+import { OutputMonitorState } from '../monitoring/types.js';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 
 function toolResultDetailsFromResponse(terminalResults) {
@@ -26,7 +26,7 @@ function toolResultMessageFromResponse(
 ) {
     let resultSummary = "";
     if (result?.exitCode) {
-        resultSummary = ( localize(14577, "Task `{0}` failed with exit code {1}.", taskLabel, result.exitCode));
+        resultSummary = ( localize(14776, "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/tools/terminalCommandArtifactCollector.d.ts

@@ -0,0 +1,17 @@
+import { IChatTerminalToolInvocationData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
+import { ITerminalLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service";
+export declare class TerminalCommandArtifactCollector {
+    private readonly _logService;
+    constructor(_logService: ITerminalLogService);
+    capture(toolSpecificData: IChatTerminalToolInvocationData, instance: ITerminalInstance, commandId: string | undefined): Promise<void>;
+    private _captureCommandOutput;
+    /**
+     * Captures output from a partial/current command that hasn't finished yet.
+     * This is used when the command is cancelled mid-execution.
+     */
+    private _capturePartialCommandOutput;
+    private _applyTheme;
+    private _createTerminalCommandUri;
+    private _tryGetCommand;
+}

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

@@ -0,0 +1,118 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { getCommandOutputSnapshot } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminal/browser/chatTerminalCommandMirror';
+import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
+import { ITerminalLogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service';
+
+let TerminalCommandArtifactCollector = class TerminalCommandArtifactCollector {
+    constructor(_logService) {
+        this._logService = _logService;
+    }
+    async capture(toolSpecificData, instance, commandId) {
+        if (commandId) {
+            try {
+                toolSpecificData.terminalCommandUri = this._createTerminalCommandUri(instance, commandId);
+            } catch (error) {
+                this._logService.warn(
+                    `RunInTerminalTool: Failed to create terminal command URI for ${commandId}`,
+                    error
+                );
+            }
+            const command = await this._tryGetCommand(instance, commandId);
+            if (command) {
+                toolSpecificData.terminalCommandState = {
+                    exitCode: command.exitCode,
+                    timestamp: command.timestamp,
+                    duration: command.duration
+                };
+                const snapshot = await this._captureCommandOutput(instance, command);
+                if (snapshot) {
+                    toolSpecificData.terminalCommandOutput = snapshot;
+                }
+                this._applyTheme(toolSpecificData, instance);
+                return;
+            }
+            const partialSnapshot = await this._capturePartialCommandOutput(instance, commandId);
+            if (partialSnapshot) {
+                toolSpecificData.terminalCommandOutput = partialSnapshot;
+                this._logService.debug(`RunInTerminalTool: Captured partial command output for ${commandId}`);
+            }
+        }
+        this._applyTheme(toolSpecificData, instance);
+    }
+    async _captureCommandOutput(instance, command) {
+        try {
+            await instance.xtermReadyPromise;
+        } catch {
+            return undefined;
+        }
+        const xterm = instance.xterm;
+        if (!xterm) {
+            return undefined;
+        }
+        return getCommandOutputSnapshot(xterm, command, (reason, error) => {
+            const suffix = reason === "fallback" ? " (fallback)" : "";
+            this._logService.debug(`RunInTerminalTool: Failed to snapshot command output${suffix}`, error);
+        });
+    }
+    async _capturePartialCommandOutput(instance, commandId) {
+        try {
+            await instance.xtermReadyPromise;
+        } catch {
+            return undefined;
+        }
+        const xterm = instance.xterm;
+        if (!xterm) {
+            return undefined;
+        }
+        const commandDetection = instance.capabilities.get(TerminalCapability.CommandDetection);
+        const currentCommand = commandDetection?.currentCommand;
+        if (currentCommand && currentCommand.id === commandId) {
+            const executedMarker = currentCommand.commandExecutedMarker;
+            if (executedMarker && !executedMarker.isDisposed) {
+                try {
+                    const raw = xterm.raw;
+                    const buffer = raw.buffer.active;
+                    const endLine = buffer.baseY + buffer.cursorY;
+                    const startLine = executedMarker.line;
+                    const lineCount = Math.max(endLine - startLine, 0);
+                    if (lineCount > 0) {
+                        const text = await xterm.getRangeAsVT(executedMarker, undefined, true);
+                        if (text) {
+                            return {
+                                text,
+                                lineCount
+                            };
+                        }
+                    }
+                } catch (error) {
+                    this._logService.debug(`RunInTerminalTool: Failed to capture partial command output`, error);
+                }
+            }
+        }
+        return undefined;
+    }
+    _applyTheme(toolSpecificData, instance) {
+        const theme = instance.xterm?.getXtermTheme();
+        if (theme) {
+            toolSpecificData.terminalTheme = {
+                background: theme.background,
+                foreground: theme.foreground
+            };
+        }
+    }
+    _createTerminalCommandUri(instance, commandId) {
+        const params = ( new URLSearchParams(instance.resource.query));
+        params.set("command", commandId);
+        return instance.resource.with({
+            query: ( params.toString())
+        });
+    }
+    async _tryGetCommand(instance, commandId) {
+        const commandDetection = instance.capabilities.get(TerminalCapability.CommandDetection);
+        return commandDetection?.commands.find(c => c.id === commandId);
+    }
+};
+TerminalCommandArtifactCollector = ( __decorate([( __param(0, ITerminalLogService))], TerminalCommandArtifactCollector));
+
+export { TerminalCommandArtifactCollector };

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

@@ -0,0 +1,22 @@
+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 { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+/**
+ * Returns true if the chat session's permission level (Autopilot/Bypass Approvals)
+ * auto-approves all tool calls, unless enterprise policy restricts it.
+ * Checks both the request-stamped level and the live picker level.
+ */
+export declare function isSessionAutoApproveLevel(chatSessionResource: URI, configurationService: IConfigurationService, chatWidgetService: IChatWidgetService, chatService: IChatService): boolean;
+/**
+ * Checks whether a terminal tool is eligible for auto-approval based on user configuration.
+ * @param toolReferenceName The tool's reference name (e.g. 'runInTerminal', 'sendToTerminal').
+ * @param legacyToolReferenceFullNames Legacy names to check for backward compatibility.
+ */
+export declare function isToolEligibleForTerminalAutoApproval(toolReferenceName: string, configurationService: IConfigurationService, legacyToolReferenceFullNames?: string[]): boolean;
+/**
+ * Determines whether terminal auto-approve rules are allowed to take effect.
+ * This checks the setting enablement, the opt-in warning acceptance, and the per-tool eligibility.
+ */
+export declare function isTerminalAutoApproveAllowed(toolReferenceName: string, configurationService: IConfigurationService, storageService: IStorageService, legacyToolReferenceFullNames?: string[]): boolean;

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

@@ -0,0 +1,44 @@
+
+import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { TerminalToolConfirmationStorageKeys } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart';
+import { ChatConfiguration, isAutoApproveLevel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+
+function isSessionAutoApproveLevel(chatSessionResource, configurationService, chatWidgetService, chatService) {
+    const inspected = configurationService.inspect(ChatConfiguration.GlobalAutoApprove);
+    if (inspected.policyValue === false) {
+        return false;
+    }
+    const widget = chatWidgetService.getWidgetBySessionResource(chatSessionResource)
+        ?? chatWidgetService.lastFocusedWidget;
+    if (widget && isAutoApproveLevel(widget.input.currentModeInfo.permissionLevel)) {
+        return true;
+    }
+    const model = chatService.getSession(chatSessionResource);
+    const request = model?.getRequests().at(-1);
+    return isAutoApproveLevel(request?.modeInfo?.permissionLevel);
+}
+function isToolEligibleForTerminalAutoApproval(toolReferenceName, configurationService, legacyToolReferenceFullNames) {
+    const config = configurationService.getValue(ChatConfiguration.EligibleForAutoApproval);
+    if (config && typeof config === 'object') {
+        if (Object.prototype.hasOwnProperty.call(config, toolReferenceName)) {
+            return config[toolReferenceName];
+        }
+        if (legacyToolReferenceFullNames) {
+            for (const legacyName of legacyToolReferenceFullNames) {
+                if (Object.prototype.hasOwnProperty.call(config, legacyName)) {
+                    return config[legacyName];
+                }
+            }
+        }
+    }
+    return true;
+}
+function isTerminalAutoApproveAllowed(toolReferenceName, configurationService, storageService, legacyToolReferenceFullNames) {
+    const isEligible = isToolEligibleForTerminalAutoApproval(toolReferenceName, configurationService, legacyToolReferenceFullNames);
+    const isAutoApproveEnabled = configurationService.getValue(TerminalChatAgentToolsSettingId.EnableAutoApprove) === true;
+    const isAutoApproveWarningAccepted = storageService.getBoolean(TerminalToolConfirmationStorageKeys.TerminalAutoApproveWarningAccepted, StorageScope.APPLICATION, false);
+    return isEligible && isAutoApproveEnabled && isAutoApproveWarningAccepted;
+}
+
+export { isSessionAutoApproveLevel, isTerminalAutoApproveAllowed, isToolEligibleForTerminalAutoApproval };