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

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

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

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

@@ -0,0 +1,33 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { ITerminalLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service";
+import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
+/**
+ * Writes large terminal output to temp files so the model can read the full
+ * output using file-reading tools. Tracks created files for cleanup on dispose.
+ *
+ * Mirrors copilot-agent-runtime's largeOutputHandler.ts pattern:
+ * - Output exceeding MAX_OUTPUT_LENGTH is written to a temp file
+ * - A truncated preview (head + tail) is returned with the file path
+ * - Files are cleaned up when sessions end or this writer is disposed
+ */
+export declare class LargeOutputFileWriter extends Disposable {
+    private readonly _fileService;
+    private readonly _logService;
+    private readonly _environmentService;
+    private readonly _tempFiles;
+    constructor(_fileService: IFileService, _logService: ITerminalLogService, _environmentService: IEnvironmentService);
+    /**
+     * If the output exceeds MAX_OUTPUT_LENGTH, writes it to a temp file and
+     * returns a truncated message with the file path. Otherwise returns the
+     * output unchanged.
+     */
+    processOutput(output: string): Promise<string>;
+    private _writeToTempFile;
+    private _prettyPrintIfJson;
+    /**
+     * Cleans up all tracked temp files. Called on session end.
+     */
+    cleanup(): void;
+    dispose(): void;
+}

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

@@ -0,0 +1,71 @@
+
+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 { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { ITerminalLogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service';
+import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
+import { MAX_OUTPUT_LENGTH, truncateLargeOutput } from './outputHelpers.js';
+
+let LargeOutputFileWriter = class LargeOutputFileWriter extends Disposable {
+    constructor(_fileService, _logService, _environmentService) {
+        super();
+        this._fileService = _fileService;
+        this._logService = _logService;
+        this._environmentService = _environmentService;
+        this._tempFiles = ( new Set());
+    }
+    async processOutput(output) {
+        if (output.length <= MAX_OUTPUT_LENGTH) {
+            return output;
+        }
+        const filePath = await this._writeToTempFile(output);
+        if (!filePath) {
+            return truncateLargeOutput(output);
+        }
+        return truncateLargeOutput(output, filePath);
+    }
+    async _writeToTempFile(output) {
+        try {
+            const fileName = `copilot-terminal-output-${generateUuid()}.txt`;
+            const dirUri = URI.joinPath(this._environmentService.cacheHome, "copilot-terminal-output");
+            const fileUri = URI.joinPath(dirUri, fileName);
+            const fileContent = this._prettyPrintIfJson(output);
+            await this._fileService.writeFile(fileUri, VSBuffer.fromString(fileContent));
+            this._tempFiles.add(fileUri);
+            this._logService.debug(
+                `LargeOutputFileWriter: wrote ${Math.ceil(output.length / 1024)}KB to ${fileUri.fsPath}`
+            );
+            return fileUri.fsPath;
+        } catch (e) {
+            this._logService.debug(`LargeOutputFileWriter: failed to write temp file: ${e}`);
+            return undefined;
+        }
+    }
+    _prettyPrintIfJson(output) {
+        const trimmed = output.trim();
+        if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) {
+            return output;
+        }
+        try {
+            return JSON.stringify(JSON.parse(trimmed), null, 2);
+        } catch {
+            return output;
+        }
+    }
+    cleanup() {
+        for (const fileUri of this._tempFiles) {
+            this._fileService.del(fileUri).catch(() => {});
+        }
+        this._tempFiles.clear();
+    }
+    dispose() {
+        this.cleanup();
+        super.dispose();
+    }
+};
+LargeOutputFileWriter = ( __decorate([( __param(0, IFileService)), ( __param(1, ITerminalLogService)), ( __param(2, IEnvironmentService))], LargeOutputFileWriter));
+
+export { LargeOutputFileWriter };

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

@@ -1,7 +1,26 @@
 import { ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
 import type { IMarker as IXtermMarker } from "@xterm/xterm";
+export declare const MAX_OUTPUT_LENGTH = 20000;
 export interface IGetOutputOptions {
     /** When set, only return the last N non-empty lines from the bottom of the buffer. */
     lastNLines?: number;
 }
+/**
+ * Truncates output that exceeds the max length, keeping a preview from the
+ * beginning and the tail of the output with guidance for the model.
+ * If a filePath is provided, includes it in the message so the model can
+ * read the full output using file-reading tools.
+ */
+export declare function truncateLargeOutput(output: string, filePath?: string): string;
+/**
+ * Extracts raw output text from the terminal buffer without any truncation or formatting.
+ */
+export declare function getRawOutput(instance: ITerminalInstance, startMarker?: IXtermMarker, options?: IGetOutputOptions): string;
+/**
+ * Gets output from the terminal buffer without truncation or formatting.
+ *
+ * NOTE: This function does NOT truncate output. Callers that return output
+ * to the model should use {@link LargeOutputFileWriter.processOutput} to
+ * handle large output (writes to file + truncates inline).
+ */
 export declare function getOutput(instance: ITerminalInstance, startMarker?: IXtermMarker, options?: IGetOutputOptions): string;

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

@@ -1,8 +1,28 @@
 
-import { truncateOutputKeepingTail } from './runInTerminalHelpers.js';
 
-const MAX_OUTPUT_LENGTH = 60000;
-function getOutput(instance, startMarker, options) {
+const MAX_OUTPUT_LENGTH = 20000;
+const PREVIEW_CHARS = 500;
+function truncateLargeOutput(output, filePath) {
+    const totalLength = output.length;
+    const previewEnd = Math.min(PREVIEW_CHARS, totalLength);
+    const preview = output.slice(0, previewEnd);
+    const sizeKB = Math.ceil(totalLength / 1024);
+    let header;
+    if (filePath) {
+        header = `[Output too large (${sizeKB}KB). Full output saved to: ${filePath}]\n[Use readFile or grep to examine the full output.]\n\n`;
+    }
+    else {
+        header = `[Output too large (${sizeKB}KB). Showing preview and tail.]\n\n`;
+    }
+    const separator = '\n\n[... middle of output truncated ...]\n\n';
+    const availableForTail = MAX_OUTPUT_LENGTH - header.length - preview.length - separator.length;
+    if (availableForTail <= 0) {
+        return (header + preview).slice(0, MAX_OUTPUT_LENGTH);
+    }
+    const tail = output.slice(-availableForTail);
+    return header + preview + separator + tail;
+}
+function getRawOutput(instance, startMarker, options) {
     if (!instance.xterm || !instance.xterm.raw) {
         return '';
     }
@@ -29,15 +49,15 @@ function getOutput(instance, startMarker, options) {
     if (currentLine) {
         lines.push(currentLine);
     }
+    const output = lines.join('\n');
     if (options?.lastNLines !== undefined) {
-        const nonEmpty = lines.filter(l => l.trim().length > 0);
+        const nonEmpty = output.split('\n').filter(line => line.trim().length > 0);
         return nonEmpty.slice(-options.lastNLines).join('\n');
     }
-    let output = lines.join('\n');
-    if (output.length > MAX_OUTPUT_LENGTH) {
-        output = truncateOutputKeepingTail(output, MAX_OUTPUT_LENGTH);
-    }
     return output;
 }
+function getOutput(instance, startMarker, options) {
+    return getRawOutput(instance, startMarker, options);
+}
 
-export { getOutput };
+export { MAX_OUTPUT_LENGTH, getOutput, getRawOutput, truncateLargeOutput };

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

@@ -34,19 +34,6 @@ function isFish(envShell, os) {
     }
     return /^fish$/.test(posix.basename(envShell));
 }
-const TRUNCATION_MESSAGE = "\n\n[... PREVIOUS OUTPUT TRUNCATED ...]\n\n";
-function truncateOutputKeepingTail(output, maxLength) {
-    if (output.length <= maxLength) {
-        return output;
-    }
-    const truncationMessageLength = TRUNCATION_MESSAGE.length;
-    if (truncationMessageLength >= maxLength) {
-        return TRUNCATION_MESSAGE.slice(TRUNCATION_MESSAGE.length - maxLength);
-    }
-    const availableLength = maxLength - truncationMessageLength;
-    const endPortion = output.slice(-availableLength);
-    return TRUNCATION_MESSAGE + endPortion;
-}
 function normalizeTerminalCommandForDisplay(commandLine) {
     return commandLine.replace(/\\(["'\/])/g, "$1");
 }
@@ -166,7 +153,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
         const firstSubcommandFirstWord = unapprovedSubCommands.length > 0 ? unapprovedSubCommands[0].split(" ")[0] : "";
         if (firstSubcommandFirstWord !== commandLine && !( commandsWithSubcommands.has(commandLine)) && !( commandsWithSubSubCommands.has(commandLine))) {
             actions.push({
-                label: ( localize(14630, "Allow Exact Command Line in this Session")),
+                label: ( localize(15274, "Allow Exact Command Line in this Session")),
                 data: {
                     type: "newRule",
                     rule: {
@@ -180,7 +167,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
                 }
             });
             actions.push({
-                label: ( localize(14631, "Allow Exact Command Line in this Workspace")),
+                label: ( localize(15275, "Allow Exact Command Line in this Workspace")),
                 data: {
                     type: "newRule",
                     rule: {
@@ -194,7 +181,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
                 }
             });
             actions.push({
-                label: ( localize(14632, "Always Allow Exact Command Line")),
+                label: ( localize(15276, "Always Allow Exact Command Line")),
                 data: {
                     type: "newRule",
                     rule: {
@@ -213,15 +200,15 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
         actions.push(( new Separator()));
     }
     actions.push({
-        label: ( localize(14633, "Allow All Commands in this Session")),
-        tooltip: ( localize(14634, "Allow this tool to run in this session without confirmation.")),
+        label: ( localize(15277, "Allow All Commands in this Session")),
+        tooltip: ( localize(15278, "Allow this tool to run in this session without confirmation.")),
         data: {
             type: "sessionApproval"
         }
     });
     actions.push(( new Separator()));
     actions.push({
-        label: ( localize(14635, "Configure Auto Approve...")),
+        label: ( localize(15279, "Configure Auto Approve...")),
         data: {
             type: "configure"
         }
@@ -257,4 +244,4 @@ function extractCdPrefix(commandLine, shell, os) {
     return undefined;
 }
 
-export { TRUNCATION_MESSAGE, buildCommandDisplayText, dedupeRules, extractCdPrefix, generateAutoApproveActions, isBash, isFish, isMultilineCommand, isPowerShell, isWindowsPowerShell, isZsh, normalizeCommandForExecution, normalizeTerminalCommandForDisplay, truncateOutputKeepingTail };
+export { buildCommandDisplayText, dedupeRules, extractCdPrefix, generateAutoApproveActions, isBash, isFish, isMultilineCommand, isPowerShell, isWindowsPowerShell, isZsh, normalizeCommandForExecution, normalizeTerminalCommandForDisplay };

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

@@ -139,7 +139,7 @@ let ChatAgentToolsContribution = class ChatAgentToolsContribution extends Dispos
         this._register(_toolsService.executeToolSet.addTool(CreateAndRunTaskToolData));
         this._register(_toolsService.readToolSet.addTool(GetTaskOutputToolData));
         this._register(this._configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(AgentSandboxSettingId.AgentSandboxEnabled) || e.affectsConfiguration(AgentSandboxSettingId.AgentSandboxWindowsEnabled) || e.affectsConfiguration(AgentSandboxSettingId.DeprecatedAgentSandboxEnabled) || e.affectsConfiguration(AgentSandboxSettingId.AgentSandboxAllowUnsandboxedCommands) || e.affectsConfiguration(AgentNetworkDomainSettingId.AllowedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeniedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedOldAllowedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedOldDeniedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedSandboxAllowedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedSandboxDeniedNetworkDomains) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.AgentSandboxLinuxFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.DeprecatedAgentSandboxLinuxFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.AgentSandboxMacFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.DeprecatedAgentSandboxMacFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.AgentSandboxWindowsFileSystem)) {
+            if (e.affectsConfiguration(AgentSandboxSettingId.AgentSandboxEnabled) || e.affectsConfiguration(AgentSandboxSettingId.AgentSandboxWindowsEnabled) || e.affectsConfiguration(AgentSandboxSettingId.AgentSandboxAllowNetwork) || e.affectsConfiguration(AgentSandboxSettingId.DeprecatedAgentSandboxEnabled) || e.affectsConfiguration(AgentSandboxSettingId.AgentSandboxAllowUnsandboxedCommands) || e.affectsConfiguration(AgentNetworkDomainSettingId.AllowedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeniedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedOldAllowedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedOldDeniedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedSandboxAllowedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedSandboxDeniedNetworkDomains) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.AgentSandboxLinuxFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.DeprecatedAgentSandboxLinuxFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.AgentSandboxMacFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.DeprecatedAgentSandboxMacFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.AgentSandboxWindowsFileSystem)) {
                 this._registerRunInTerminalTool();
             }
         }));
@@ -177,7 +177,7 @@ registerWorkbenchContribution2(
 );
 registerActiveInstanceAction({
     id: TerminalChatAgentToolsCommandId.ChatAddTerminalSelection,
-    title: ( localize(14636, "Add Terminal Selection to Chat")),
+    title: ( localize(15280, "Add Terminal Selection to Chat")),
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, sharedWhenClause.terminalAvailable)),
     menu: [{
         id: MenuId.TerminalInstanceContext,
@@ -198,8 +198,8 @@ registerActiveInstanceAction({
         chatView.attachmentModel.addContext({
             id: `terminal-selection-${Date.now()}`,
             kind: "generic",
-            name: ( localize(14637, "Terminal Selection")),
-            fullName: ( localize(14637, "Terminal Selection")),
+            name: ( localize(15281, "Terminal Selection")),
+            fullName: ( localize(15281, "Terminal Selection")),
             value: selection,
             icon: Codicon.terminal
         });

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

@@ -123,7 +123,8 @@ let ToolTerminalCreator = class ToolTerminalCreator {
             COPILOT_AGENT: "1",
             GIT_PAGER: "cat",
             GIT_MERGE_AUTOEDIT: "no",
-            GIT_EDITOR: ":"
+            GIT_EDITOR: ":",
+            DEBIAN_FRONTEND: "noninteractive"
         };
         const preventShellHistory = this._configurationService.getValue(TerminalChatAgentToolsSettingId.PreventShellHistory) === true;
         if (preventShellHistory) {

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

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

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

@@ -56,7 +56,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                 isAutoApproved: true,
                 isAutoApproveAllowed: true,
                 disclaimers: [],
-                autoApproveInfo: ( new MarkdownString(`${( localize(14639, "Auto approved for this session"))} ([${( localize(14640, "Disable"))}](${( disableUri.toString())}))`, mdTrustSettings))
+                autoApproveInfo: ( new MarkdownString(`${( localize(15283, "Auto approved for this session"))} ([${( localize(15284, "Disable"))}](${( disableUri.toString())}))`, mdTrustSettings))
             };
         }
         const trimmedCommandLine = options.commandLine.trimStart();
@@ -158,7 +158,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
         const subCommandsLowerFirstWordOnly = ( subCommands.map(command => command.split(" ")[0].toLowerCase()));
         if (!isAutoApproved && (( subCommandsLowerFirstWordOnly.some(command => promptInjectionWarningCommandsLower.includes(command))) || (isPowerShell(options.shell, options.os) && ( subCommandsLowerFirstWordOnly.some(command => promptInjectionWarningCommandsLowerPwshOnly.includes(command)))))) {
             disclaimers.push(( localize(
-                14641,
+                15285,
                 "Web content may contain malicious code or attempt prompt injection attacks."
             )));
         }
@@ -199,10 +199,10 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
             return ( asArray(result).filter(e => isAutoApproveRule(e.rule)).map(e => {
                 const escapedSourceText = e.rule.sourceText.replaceAll("$", "\\$");
                 if (e.rule.sourceTarget === "session") {
-                    return localize(14642, "{0} (session)", `\`${escapedSourceText}\``);
+                    return localize(15286, "{0} (session)", `\`${escapedSourceText}\``);
                 }
                 const settingsUri = createCommandUri(TerminalChatCommandId.OpenTerminalSettingsLink, e.rule.sourceTarget);
-                const tooltip = ( localize(14643, "View rule in settings"));
+                const tooltip = ( localize(15287, "View rule in settings"));
                 let label = escapedSourceText;
                 switch (e.rule?.sourceTarget) {
                 case ConfigurationTarget.DEFAULT:
@@ -233,9 +233,9 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
         if (isGlobalAutoApproved) {
             const settingsUri = createCommandUri(TerminalChatCommandId.OpenTerminalSettingsLink, "global");
             return (new MarkdownString(`${( localize(
-                14644,
+                15288,
                 "Auto approved by setting {0}",
-                `[\`${ChatConfiguration.GlobalAutoApprove}\`](${( settingsUri.toString())} "${( localize(14645, "View settings"))}")`
+                `[\`${ChatConfiguration.GlobalAutoApprove}\`](${( settingsUri.toString())} "${( localize(15289, "View settings"))}")`
             ))}`, mdTrustSettings));
         }
         if (isAutoApproved) {
@@ -244,7 +244,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                 {
                     if (isAutoApproveRule(commandLineResult.rule)) {
                         return (new MarkdownString(
-                            localize(14646, "Auto approved by rule {0}", formatRuleLinks(commandLineResult)),
+                            localize(15290, "Auto approved by rule {0}", formatRuleLinks(commandLineResult)),
                             mdTrustSettings
                         ));
                     }
@@ -259,12 +259,12 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                     const uniqueRules = dedupeRules(subCommandResults);
                     if (uniqueRules.length === 1) {
                         return (new MarkdownString(
-                            localize(14646, "Auto approved by rule {0}", formatRuleLinks(uniqueRules)),
+                            localize(15290, "Auto approved by rule {0}", formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     } else if (uniqueRules.length > 1) {
                         return (new MarkdownString(
-                            localize(14647, "Auto approved by rules {0}", formatRuleLinks(uniqueRules)),
+                            localize(15291, "Auto approved by rules {0}", formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     }
@@ -277,7 +277,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                 {
                     if (commandLineResult.rule) {
                         return (new MarkdownString(localize(
-                            14648,
+                            15292,
                             "Auto approval denied by rule {0}",
                             formatRuleLinks(commandLineResult)
                         ), mdTrustSettings));
@@ -289,12 +289,12 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                     const uniqueRules = dedupeRules(subCommandResults.filter(e => e.result === "denied"));
                     if (uniqueRules.length === 1) {
                         return (new MarkdownString(
-                            localize(14648, "Auto approval denied by rule {0}", formatRuleLinks(uniqueRules)),
+                            localize(15292, "Auto approval denied by rule {0}", formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     } else if (uniqueRules.length > 1) {
                         return (new MarkdownString(
-                            localize(14649, "Auto approval denied by rules {0}", formatRuleLinks(uniqueRules)),
+                            localize(15293, "Auto approval denied by rules {0}", formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     }

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

@@ -3,6 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { win32, posix } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
+import { normalizePath, extUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
@@ -74,10 +75,11 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
         return fileWrites;
     }
     _stripSurroundingQuotes(text) {
-        if ((text.startsWith("\"") && text.endsWith("\"")) || (text.startsWith("'") && text.endsWith("'"))) {
-            return text.slice(1, -1);
+        let result = text;
+        while ((result.startsWith("\"") && result.endsWith("\"")) || (result.startsWith("'") && result.endsWith("'"))) {
+            result = result.slice(1, -1);
         }
-        return text;
+        return result;
     }
     _mapNullDevice(options, rawFileWrite) {
         if (options.treeSitterLanguage === TreeSitterCommandParserLanguage.PowerShell) {
@@ -113,17 +115,17 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
                                     break;
                                 }
                             }
-                            const fileUri = URI.isUri(fileWrite) ? fileWrite : URI.file(fileWrite);
+                            const fileUri = normalizePath(URI.isUri(fileWrite) ? fileWrite : URI.file(fileWrite));
                             if (fileUri.fsPath.match(/[$\(\){}`~%]/)) {
                                 isAutoApproveAllowed = false;
                                 this._log(
-                                    "File write blocked due to likely containing a variable, sub-command, or tilde expansion",
+                                    "File write blocked due to likely containing a variable, sub-command, or tilde/environment-variable expansion",
                                     ( fileUri.toString())
                                 );
                                 break;
                             }
                             const isInsideWorkspace = ( workspaceFolders.some(
-                                folder => folder.uri.scheme === fileUri.scheme && (fileUri.path.startsWith(folder.uri.path + "/") || fileUri.path === folder.uri.path)
+                                folder => folder.uri.scheme === fileUri.scheme && extUri.isEqualOrParent(fileUri, folder.uri)
                             ));
                             if (!isInsideWorkspace) {
                                 if (options.hasSessionAutoApproval && this._isInTempDirectory(fileUri.path, options.os)) {
@@ -152,12 +154,12 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
             )).join(", ");
             if (!isAutoApproveAllowed) {
                 disclaimers.push(( localize(
-                    14650,
+                    15294,
                     "File write operations detected that cannot be auto approved: {0}",
                     fileWritesList
                 )));
             } else {
-                disclaimers.push(( localize(14651, "File write operations detected: {0}", fileWritesList)));
+                disclaimers.push(( localize(15295, "File write operations detected: {0}", fileWritesList)));
             }
         }
         return {

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

@@ -12,7 +12,7 @@ const GetTerminalLastCommandToolData = {
     id: TerminalToolId.TerminalLastCommand,
     toolReferenceName: "terminalLastCommand",
     legacyToolReferenceFullNames: ["runCommands/terminalLastCommand"],
-    displayName: ( localize(14652, "Get Terminal Last Command")),
+    displayName: ( localize(15296, "Get Terminal Last Command")),
     modelDescription: "Get the last command run in the active terminal.",
     source: ToolDataSource.Internal,
     icon: Codicon.terminal
@@ -24,8 +24,8 @@ let GetTerminalLastCommandTool = class GetTerminalLastCommandTool extends Dispos
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(14653, "Getting last terminal command")),
-            pastTenseMessage: ( localize(14654, "Got last terminal command"))
+            invocationMessage: ( localize(15297, "Getting last terminal command")),
+            pastTenseMessage: ( localize(15298, "Got last terminal command"))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -16,8 +16,8 @@ const GetTerminalOutputToolData = {
     id: TerminalToolId.GetTerminalOutput,
     toolReferenceName: "getTerminalOutput",
     legacyToolReferenceFullNames: ["runCommands/getTerminalOutput"],
-    displayName: ( localize(14655, "Get Terminal Output")),
-    modelDescription: `Get output from an active terminal execution (identified by the \`id\` returned from ${TerminalToolId.RunInTerminal}). Use this to inspect output from a terminal started in async mode or a sync command that timed out and moved to the background. If a background command has not yet completed, you will be automatically notified when it finishes — do NOT poll; end your turn and wait.`,
+    displayName: ( localize(15299, "Get Terminal Output")),
+    modelDescription: `Get output from a terminal execution that was moved to background (identified by the \`id\` returned from ${TerminalToolId.RunInTerminal}). Use this ONLY when the ${TerminalToolId.RunInTerminal} result explicitly says the command was moved to background, timed out, or needs input. Do NOT call this after a sync command that completed normally — sync commands return full output inline. If a background command has not yet completed, you will be automatically notified when it finishes — do NOT poll; end your turn and wait.`,
     icon: Codicon.terminal,
     source: ToolDataSource.Internal,
     inputSchema: {
@@ -52,8 +52,8 @@ let GetTerminalOutputTool = class GetTerminalOutputTool extends Disposable {
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(14656, "Checking terminal output")),
-            pastTenseMessage: ( localize(14657, "Checked terminal output"))
+            invocationMessage: ( localize(15300, "Checking terminal output")),
+            pastTenseMessage: ( localize(15301, "Checked terminal output"))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -11,7 +11,7 @@ const GetTerminalSelectionToolData = {
     id: TerminalToolId.TerminalSelection,
     toolReferenceName: "terminalSelection",
     legacyToolReferenceFullNames: ["runCommands/terminalSelection"],
-    displayName: ( localize(14658, "Get Terminal Selection")),
+    displayName: ( localize(15302, "Get Terminal Selection")),
     modelDescription: "Get the current selection in the active terminal.",
     source: ToolDataSource.Internal,
     icon: Codicon.terminal
@@ -23,8 +23,8 @@ let GetTerminalSelectionTool = class GetTerminalSelectionTool extends Disposable
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(14659, "Reading terminal selection")),
-            pastTenseMessage: ( localize(14660, "Read terminal selection"))
+            invocationMessage: ( localize(15303, "Reading terminal selection")),
+            pastTenseMessage: ( localize(15304, "Read terminal selection"))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -9,7 +9,7 @@ import { TerminalToolId } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 const KillTerminalToolData = {
     id: TerminalToolId.KillTerminal,
     toolReferenceName: "killTerminal",
-    displayName: ( localize(14661, "Kill Terminal")),
+    displayName: ( localize(15305, "Kill Terminal")),
     modelDescription: `Kill a terminal by its ID. Use this to clean up terminals that are no longer needed (e.g., after stopping a server or when a long-running task completes). The terminal ID is returned by ${TerminalToolId.RunInTerminal} in async mode (legacy: isBackground=true).`,
     icon: Codicon.terminal,
     source: ToolDataSource.Internal,
@@ -28,8 +28,8 @@ const KillTerminalToolData = {
 class KillTerminalTool extends Disposable {
     async prepareToolInvocation(_context, _token) {
         return {
-            invocationMessage: ( localize(14662, "Killing terminal")),
-            pastTenseMessage: ( localize(14663, "Killed terminal"))
+            invocationMessage: ( localize(15306, "Killing terminal")),
+            pastTenseMessage: ( localize(15307, "Killed terminal"))
         };
     }
     async invoke(invocation, _countTokens, _progress, _token) {

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

@@ -500,9 +500,9 @@ function detectsNonInteractiveHelpPattern(cursorLine) {
     ].some(e => e.test(cursorLine)));
 }
 const taskFinishMessages = [(
-localize(14664, "Terminal will be reused by tasks, press any key to close it.")), ( localize(14665, "Terminal will be reused by tasks, press any key to close it.")), (
-localize(14666, "Press any key to close the terminal.")), ( localize(14667, "Press any key to close the terminal.")), (
-localize(14668, "The terminal will be reused by tasks. Press any key to close."))];
+localize(15308, "Terminal will be reused by tasks, press any key to close it.")), ( localize(15309, "Terminal will be reused by tasks, press any key to close it.")), (
+localize(15310, "Press any key to close the terminal.")), ( localize(15311, "Press any key to close the terminal.")), (
+localize(15312, "The terminal will be reused by tasks. Press any key to close."))];
 const normalizedTaskFinishMessages = ( taskFinishMessages.map(msg => msg.replace(/[\s.,:;!?"'`()[\]{}<>\-_/\\]+/g, "").toLowerCase()));
 function detectsVSCodeTaskFinishMessage(cursorLine) {
     const compact = cursorLine.replace(/[\s.,:;!?"'`()[\]{}<>\-_/\\]+/g, "").toLowerCase();