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

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

@@ -0,0 +1,98 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { TelemetryTrustedValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetryUtils';
+import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ShellIntegrationQuality } from './toolTerminalCreator.js';
+
+let RunInTerminalToolTelemetry = class RunInTerminalToolTelemetry {
+    constructor(_telemetryService, _configurationService) {
+        this._telemetryService = _telemetryService;
+        this._configurationService = _configurationService;
+    }
+    logPrepare(state) {
+        const subCommandsSanitized = ( state.subCommands.map(e => {
+            const commandName = e.split(" ")[0];
+            let sanitizedCommandName = commandName.toLowerCase();
+            if (!( commandAllowList.has(sanitizedCommandName))) {
+                if (/^(?:[A-Z][a-z0-9]+)+(?:-(?:[A-Z][a-z0-9]+))*$/.test(commandName)) {
+                    sanitizedCommandName = "(unknown:pwsh)";
+                } else if (/^[a-z0-9_\-\.\\\/:;]+$/i.test(commandName)) {
+                    const properties = [];
+                    if (/[a-z]/.test(commandName)) {
+                        properties.push("ascii_lower");
+                    }
+                    if (/[A-Z]/.test(commandName)) {
+                        properties.push("ascii_upper");
+                    }
+                    if (/[0-9]/.test(commandName)) {
+                        properties.push("numeric");
+                    }
+                    const chars = [];
+                    for (const c of [".", "-", "_", "/", "\\", ":", ";"]) {
+                        if (commandName.includes(c)) {
+                            chars.push(c);
+                        }
+                    }
+                    sanitizedCommandName = `(unknown:${properties.join(",")}:${chars.join("")})`;
+                } else if (/[^\x00-\x7F]/.test(commandName)) {
+                    sanitizedCommandName = "(unknown:unicode)";
+                } else {
+                    sanitizedCommandName = "(unknown)";
+                }
+            }
+            return sanitizedCommandName;
+        }));
+        this._telemetryService.publicLog2("toolUse.runInTerminal.prepare", {
+            terminalToolSessionId: state.terminalToolSessionId,
+            subCommands: ( new TelemetryTrustedValue(JSON.stringify(subCommandsSanitized))),
+            autoApproveAllowed: state.autoApproveAllowed,
+            autoApproveResult: state.autoApproveResult,
+            autoApproveReason: state.autoApproveReason,
+            autoApproveDefault: state.autoApproveDefault
+        });
+    }
+    logInvoke(instance, state) {
+        this._telemetryService.publicLog2("toolUse.runInTerminal", {
+            terminalSessionId: instance.sessionId,
+            terminalToolSessionId: state.terminalToolSessionId,
+            result: state.error ?? "success",
+            strategy: state.shellIntegrationQuality === ShellIntegrationQuality.Rich ? 2 : state.shellIntegrationQuality === ShellIntegrationQuality.Basic ? 1 : 0,
+            userEditedCommand: state.didUserEditCommand ? 1 : 0,
+            toolEditedCommand: state.didToolEditCommand ? 1 : 0,
+            isBackground: state.isBackground ? 1 : 0,
+            isNewSession: state.isNewSession ? 1 : 0,
+            isSandbox: state.isSandboxWrapped ? 1 : 0,
+            requestUnsandboxedExecutionReason: state.requestUnsandboxedExecutionReason,
+            outputLineCount: state.outputLineCount,
+            nonZeroExitCode: state.exitCode === undefined ? -1 : state.exitCode === 0 ? 0 : 1,
+            exitCodeValue: state.exitCode ?? -1,
+            timingConnectMs: state.timingConnectMs,
+            timingExecuteMs: state.timingExecuteMs,
+            pollDurationMs: state.pollDurationMs ?? 0,
+            terminalExecutionIdleBeforeTimeout: state.terminalExecutionIdleBeforeTimeout ?? false,
+            inputUserChars: state.inputUserChars,
+            inputUserSigint: state.inputUserSigint,
+            inputToolManualAcceptCount: state.inputToolManualAcceptCount ?? 0,
+            inputToolManualRejectCount: state.inputToolManualRejectCount ?? 0,
+            inputToolManualChars: state.inputToolManualChars ?? 0,
+            inputToolManualShownCount: state.inputToolManualShownCount ?? 0,
+            inputToolFreeFormInputShownCount: state.inputToolFreeFormInputShownCount ?? 0,
+            inputToolFreeFormInputCount: state.inputToolFreeFormInputCount ?? 0,
+            compressOutputEnabled: this._configurationService.getValue(ChatConfiguration.CompressOutputEnabled) === true
+        });
+    }
+};
+RunInTerminalToolTelemetry = ( __decorate([( __param(0, ITelemetryService)), ( __param(1, IConfigurationService))], RunInTerminalToolTelemetry));
+const commandAllowList = ( new Set([
+"!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "~", "{", "}", "<", ">",
+".", "7z", "alias", "assoc", "attrib", "awk", "basename", "bg", "blkid", "bunzip2", "bzip2", "cat", "cd", "certutil", "chkdsk", "chmod", "chown", "cipher", "clear", "cls", "cmp", "column", "comm", "compact", "compress", "copy", "cp", "curl", "cut", "date", "dd", "del", "df", "diff", "dig", "dir", "dirname", "diskpart", "dism", "disown", "du", "echo", "env", "erase", "eval", "expand", "export", "fc", "fdisk", "fg", "file", "find", "findstr", "fmt", "fold", "forfiles", "format", "free", "fsck", "git", "gpupdate", "grep", "groupadd", "groups", "gunzip", "gzip", "hash", "head", "hexdump", "history", "host", "htop", "icacls", "id", "ifconfig", "iostat", "ip", "ipconfig", "iptables", "jobs", "jq", "kill", "killall", "less", "ln", "locate", "ls", "lsblk", "lscpu", "lsof", "man", "mkdir", "mklink", "more", "mount", "move", "mv", "nbtstat", "nc/netcat", "net", "netstat", "nice", "nl", "nohup", "nslookup", "nslookup", "od", "passwd", "paste", "pathping", "pause", "pgrep", "ping", "pkill", "powercfg", "pr", "printenv", "ps", "pwd", "query", "rar", "readlink", "realpath", "reg", "rem", "ren", "rename", "renice", "rev", "rm", "rmdir", "robocopy", "route", "rsync", "sc", "schtasks", "scp", "sed", "seq", "set", "setx", "sfc", "shred", "shuf", "shutdown", "sleep", "sort", "source", "split", "ss", "ssh", "stat", "strings", "su", "subst", "sudo", "systeminfo", "tac", "tail", "tar", "tee", "telnet", "test", "time", "top", "touch", "tr", "traceroute", "tracert", "tree", "true", "truncate", "type", "type", "umask", "umount", "unalias", "uname", "uncompress", "unexpand", "uniq", "unlink", "unrar", "unzip", "uptime", "useradd", "usermod", "vmstat", "vol", "watch", "wc", "wget", "where", "whereis", "which", "who", "whoami", "wmic", "xargs", "xcopy", "xxd", "xz", "yes", "zcat", "zip", "zless", "zmore",
+"bitbucket", "bzr", "cvs", "gh", "git", "glab", "hg", "svn", "fossil", "p4",
+"adb", "ansible", "apk", "apt-get", "apt", "aws", "az", "brew", "bundle", "cargo", "choco", "clang", "cmake", "composer", "conan", "conda", "dnf", "docker-compose", "docker", "dotnet", "emacs", "esbuild", "eslint", "flatpak", "flutter", "fnm", "g++", "gcc", "gcloud", "go", "gradle", "helm", "java", "javac", "jest", "julia", "kotlin", "kubectl", "lua", "make", "mocha", "mvn", "n", "nano", "node", "npm", "nvm", "pacman", "perl", "php", "phpunit", "pip", "pipenv", "pnpm", "pod", "podman", "poetry", "python", "r", "rollup", "ruby", "rustc", "rustup", "snap", "swift", "terraform", "tsc", "tslint", "vagrant", "vcpkg", "vi", "vim", "vite", "vitest", "webpack", "yarn", "yum", "zypper",
+"aider", "amp", "claude", "codex", "copilot", "gemini", "toad", "q",
+"taskkill", "taskkill.exe",
+"add-content", "compare-object", "convertfrom-json", "convertto-json", "copy-item", "format-custom", "format-list", "format-table", "format-wide", "get-childitem", "get-command", "get-content", "get-date", "get-help", "get-location", "get-process", "get-random", "get-service", "invoke-expression", "invoke-restmethod", "invoke-webrequest", "join-path", "measure-command", "measure-object", "move-item", "new-item", "out-file", "remove-item", "restart-computer", "select-object", "select-string", "select-xml", "set-acl", "set-content", "set-itemproperty", "sort-object", "split-path", "start-process", "start-sleep", "stop-process", "test-path", "write-host", "write-output",
+"iex", "irm", "iwr", "rd", "ri", "sp", "spps"]));
+
+export { RunInTerminalToolTelemetry };

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

@@ -8,7 +8,7 @@ import { IToolInvocationContext, ToolProgress } from "@codingame/monaco-vscode-a
 import { Task } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/tasks";
 import { ITaskService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service";
 import { ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
-import { IExecution, IPollingResult, OutputMonitorState } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/types";
+import { IExecution, IPollingResult, OutputMonitorState } from "./tools/monitoring/types.js";
 import type { IMarker as IXtermMarker } from "@xterm/xterm";
 export declare function getTaskDefinition(id: string): {
     taskLabel: string;

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

@@ -3,9 +3,9 @@ import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/asyn
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
-import { getOutput } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/outputHelpers';
-import { OutputMonitor } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor';
-import { OutputMonitorState } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/types';
+import { getOutput } from './outputHelpers.js';
+import { OutputMonitor } from './tools/monitoring/outputMonitor.js';
+import { OutputMonitorState } from './tools/monitoring/types.js';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 

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

@@ -20,20 +20,22 @@ import { TerminalContextMenuGroup } from '@codingame/monaco-vscode-api/vscode/vs
 import { TerminalContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalContextKey';
 import { TerminalChatAgentToolsCommandId } from '../common/terminal.chatAgentTools.js';
 import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
-import { AgentNetworkDomainSettingId } from '@codingame/monaco-vscode-katex-common/vscode/vs/platform/networkFilter/common/settings';
+import { AgentNetworkDomainSettingId } from '../../../../../platform/networkFilter/common/settings.js';
+import { AgentHostSandboxForwarder } from './agentHostSandboxForwarder.js';
 import { GetTerminalLastCommandTool, GetTerminalLastCommandToolData } from './tools/getTerminalLastCommandTool.js';
 import { KillTerminalTool, KillTerminalToolData } from './tools/killTerminalTool.js';
 import { GetTerminalOutputTool, GetTerminalOutputToolData } from './tools/getTerminalOutputTool.js';
 import { SendToTerminalTool, SendToTerminalToolData } from './tools/sendToTerminalTool.js';
 import { GetTerminalSelectionTool, GetTerminalSelectionToolData } from './tools/getTerminalSelectionTool.js';
 import { ConfirmTerminalCommandTool, ConfirmTerminalCommandToolData } from './tools/runInTerminalConfirmationTool.js';
-import { createRunInTerminalToolData, RunInTerminalTool } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool';
+import { createRunInTerminalToolData, RunInTerminalTool } from './tools/runInTerminalTool.js';
 import { CreateAndRunTaskTool, CreateAndRunTaskToolData } from './tools/task/createAndRunTaskTool.js';
 import { GetTaskOutputTool, GetTaskOutputToolData } from './tools/task/getTaskOutputTool.js';
 import { RunTaskTool, RunTaskToolData } from './tools/task/runTaskTool.js';
 import { registerTerminalCompressors } from './tools/terminalOutputCompressor.js';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
+import '../common/terminalSandboxService.js';
 import { isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 
 let ShellIntegrationTimeoutMigrationContribution = class ShellIntegrationTimeoutMigrationContribution extends Disposable {
@@ -137,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.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)) {
+            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)) {
                 this._registerRunInTerminalTool();
             }
         }));
@@ -168,9 +170,14 @@ registerWorkbenchContribution2(
     ChatAgentToolsContribution,
     WorkbenchPhase.AfterRestored
 );
+registerWorkbenchContribution2(
+    AgentHostSandboxForwarder.ID,
+    AgentHostSandboxForwarder,
+    WorkbenchPhase.AfterRestored
+);
 registerActiveInstanceAction({
     id: TerminalChatAgentToolsCommandId.ChatAddTerminalSelection,
-    title: ( localize(14447, "Add Terminal Selection to Chat")),
+    title: ( localize(14636, "Add Terminal Selection to Chat")),
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, sharedWhenClause.terminalAvailable)),
     menu: [{
         id: MenuId.TerminalInstanceContext,
@@ -191,8 +198,8 @@ registerActiveInstanceAction({
         chatView.attachmentModel.addContext({
             id: `terminal-selection-${Date.now()}`,
             kind: "generic",
-            name: ( localize(14448, "Terminal Selection")),
-            fullName: ( localize(14448, "Terminal Selection")),
+            name: ( localize(14637, "Terminal Selection")),
+            fullName: ( localize(14637, "Terminal Selection")),
             value: selection,
             icon: Codicon.terminal
         });

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

@@ -0,0 +1,42 @@
+import type { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
+import { IAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { ITerminalProfile } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal";
+import { ITerminalLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service";
+import { type ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
+import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
+export declare enum ShellIntegrationQuality {
+    None = "none",
+    Basic = "basic",
+    Rich = "rich"
+}
+export interface IToolTerminal {
+    instance: ITerminalInstance;
+    shellIntegrationQuality: ShellIntegrationQuality;
+    receivedUserInput?: boolean;
+    isBackground?: boolean;
+}
+export declare class ToolTerminalCreator {
+    private readonly _accessibilityService;
+    private readonly _configurationService;
+    private readonly _logService;
+    private readonly _terminalService;
+    /**
+     * The shell preference cached for the lifetime of the window. This allows skipping previous
+     * shell approaches that failed in previous runs to save time.
+     */
+    private static _lastSuccessfulShell;
+    constructor(_accessibilityService: IAccessibilityService, _configurationService: IConfigurationService, _logService: ITerminalLogService, _terminalService: ITerminalService);
+    createTerminal(shellOrProfile: string | ITerminalProfile, os: OperatingSystem, token: CancellationToken): Promise<IToolTerminal>;
+    /**
+     * Synchronously update shell integration quality based on the terminal instance's current
+     * capabilities. This is a defensive change to avoid no shell integration being sticky
+     * https://github.com/microsoft/vscode/issues/260880
+     *
+     * Only upgrade quality just in case.
+     */
+    refreshShellIntegrationQuality(toolTerminal: IToolTerminal): void;
+    private _createCopilotTerminal;
+    private _waitForShellIntegration;
+}

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

@@ -0,0 +1,226 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { raceTimeout, DeferredPromise, disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { DisposableStore, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { isNumber, isObject, hasKey, isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
+import { PromptInputState } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel';
+import { TerminalSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal';
+import { ITerminalLogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service';
+import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
+import { getShellIntegrationTimeout } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminal/common/terminalEnvironment';
+import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+import { isBash, isZsh, isFish, isPowerShell } from './runInTerminalHelpers.js';
+
+var ToolTerminalCreator_1;
+var ShellLaunchType;
+(function(ShellLaunchType) {
+    ShellLaunchType[ShellLaunchType["Unknown"] = 0] = "Unknown";
+    ShellLaunchType[ShellLaunchType["Default"] = 1] = "Default";
+    ShellLaunchType[ShellLaunchType["Fallback"] = 2] = "Fallback";
+})(ShellLaunchType || (ShellLaunchType = {}));
+var ShellIntegrationQuality;
+(function(ShellIntegrationQuality) {
+    ShellIntegrationQuality["None"] = "none";
+    ShellIntegrationQuality["Basic"] = "basic";
+    ShellIntegrationQuality["Rich"] = "rich";
+})(ShellIntegrationQuality || (ShellIntegrationQuality = {}));
+let ToolTerminalCreator = class ToolTerminalCreator {
+    static {
+        ToolTerminalCreator_1 = this;
+    }
+    static {
+        this._lastSuccessfulShell = ShellLaunchType.Unknown;
+    }
+    constructor(
+        _accessibilityService,
+        _configurationService,
+        _logService,
+        _terminalService
+    ) {
+        this._accessibilityService = _accessibilityService;
+        this._configurationService = _configurationService;
+        this._logService = _logService;
+        this._terminalService = _terminalService;
+    }
+    async createTerminal(shellOrProfile, os, token) {
+        const instance = await this._createCopilotTerminal(shellOrProfile, os);
+        const toolTerminal = {
+            instance,
+            shellIntegrationQuality: ShellIntegrationQuality.None
+        };
+        let processReadyTimestamp = 0;
+        const initResult = await Promise.any([
+            instance.processReady.then(() => processReadyTimestamp = Date.now()),
+            Event.toPromise(instance.onExit)
+        ]);
+        if (!isNumber(initResult) && isObject(initResult) && hasKey(initResult, {
+            message: true
+        })) {
+            throw ( new Error(initResult.message));
+        }
+        const siInjectionEnabled = this._configurationService.getValue(TerminalSettingId.ShellIntegrationEnabled) === true;
+        const waitTime = getShellIntegrationTimeout(
+            this._configurationService,
+            siInjectionEnabled,
+            instance.hasRemoteAuthority,
+            processReadyTimestamp
+        );
+        if (ToolTerminalCreator_1._lastSuccessfulShell !== ShellLaunchType.Fallback || siInjectionEnabled) {
+            this._logService.info(
+                `ToolTerminalCreator#createTerminal: Waiting ${waitTime}ms for shell integration`
+            );
+            const shellIntegrationQuality = await this._waitForShellIntegration(instance, waitTime);
+            if (token.isCancellationRequested) {
+                instance.dispose();
+                throw ( new CancellationError());
+            }
+            if (shellIntegrationQuality === ShellIntegrationQuality.Rich) {
+                const commandDetection = instance.capabilities.get(TerminalCapability.CommandDetection);
+                if (commandDetection?.promptInputModel.state === PromptInputState.Unknown) {
+                    this._logService.info(
+                        `ToolTerminalCreator#createTerminal: Waiting up to 2s for PromptInputModel state to change`
+                    );
+                    const didStart = await raceTimeout(Event.toPromise(commandDetection.onCommandStarted), 2000);
+                    if (!didStart) {
+                        this._logService.info(
+                            `ToolTerminalCreator#createTerminal: PromptInputModel state did not change within timeout`
+                        );
+                    }
+                }
+            }
+            if (shellIntegrationQuality !== ShellIntegrationQuality.None) {
+                ToolTerminalCreator_1._lastSuccessfulShell = ShellLaunchType.Default;
+                toolTerminal.shellIntegrationQuality = shellIntegrationQuality;
+                return toolTerminal;
+            }
+        } else {
+            this._logService.info(
+                `ToolTerminalCreator#createTerminal: Skipping wait for shell integration - last successful launch type ${ToolTerminalCreator_1._lastSuccessfulShell}`
+            );
+        }
+        ToolTerminalCreator_1._lastSuccessfulShell = ShellLaunchType.Fallback;
+        return toolTerminal;
+    }
+    refreshShellIntegrationQuality(toolTerminal) {
+        const commandDetection = toolTerminal.instance.capabilities.get(TerminalCapability.CommandDetection);
+        if (commandDetection) {
+            if (toolTerminal.shellIntegrationQuality === ShellIntegrationQuality.None || toolTerminal.shellIntegrationQuality === ShellIntegrationQuality.Basic) {
+                toolTerminal.shellIntegrationQuality = commandDetection.hasRichCommandDetection ? ShellIntegrationQuality.Rich : ShellIntegrationQuality.Basic;
+            }
+        }
+    }
+    _createCopilotTerminal(shellOrProfile, os) {
+        const shellPath = isString(shellOrProfile) ? shellOrProfile : shellOrProfile.path;
+        const env = {
+            AI_AGENT: "github_copilot_vscode_agent",
+            COPILOT_AGENT: "1",
+            GIT_PAGER: "cat",
+            GIT_MERGE_AUTOEDIT: "no",
+            GIT_EDITOR: ":"
+        };
+        const preventShellHistory = this._configurationService.getValue(TerminalChatAgentToolsSettingId.PreventShellHistory) === true;
+        if (preventShellHistory) {
+            if (isBash(shellPath, os) || isZsh(shellPath, os) || isFish(shellPath, os) || isPowerShell(shellPath, os)) {
+                env["VSCODE_PREVENT_SHELL_HISTORY"] = "1";
+            }
+        }
+        if (isZsh(shellPath, os)) {
+            env["VSCODE_AGENT_ZSH_FIXUPS"] = "1";
+        }
+        const config = {
+            icon: ThemeIcon.fromId(Codicon.chatSparkle.id),
+            hideFromUser: true,
+            forcePersist: true,
+            env
+        };
+        if (isString(shellOrProfile)) {
+            config.executable = shellOrProfile;
+        } else {
+            config.executable = shellOrProfile.path;
+            config.args = shellOrProfile.args;
+            config.icon = shellOrProfile.icon ?? config.icon;
+            config.color = shellOrProfile.color;
+            config.env = {
+                ...config.env,
+                ...shellOrProfile.env
+            };
+        }
+        return this._terminalService.createTerminal({
+            config
+        });
+    }
+    _waitForShellIntegration(instance, timeoutMs) {
+        const store = ( new DisposableStore());
+        const result = ( new DeferredPromise());
+        const isScreenReaderOptimized = this._accessibilityService.isScreenReaderOptimized();
+        const effectiveTimeoutMs = timeoutMs > 0 && isScreenReaderOptimized ? timeoutMs + 3000 : timeoutMs;
+        this._logService.info(
+            `ToolTerminalCreator#_waitForShellIntegration: base ${timeoutMs}ms, effective ${effectiveTimeoutMs}ms, screenReaderOptimized=${isScreenReaderOptimized}`
+        );
+        const siNoneTimer = store.add(( new MutableDisposable()));
+        siNoneTimer.value = disposableTimeout(() => {
+            this._logService.info(
+                `ToolTerminalCreator#_waitForShellIntegration: Timed out ${effectiveTimeoutMs}ms, using no SI`
+            );
+            result.complete(ShellIntegrationQuality.None);
+        }, effectiveTimeoutMs);
+        if (instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection) {
+            siNoneTimer.clear();
+            this._logService.info(
+                `ToolTerminalCreator#_waitForShellIntegration: Rich SI available immediately`
+            );
+            result.complete(ShellIntegrationQuality.Rich);
+        } else {
+            const onSetRichCommandDetection = store.add(
+                this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CommandDetection, e => e.onSetRichCommandDetection)
+            );
+            store.add(onSetRichCommandDetection.event(e => {
+                if (e.instance !== instance) {
+                    return;
+                }
+                siNoneTimer.clear();
+                this._logService.info(
+                    `ToolTerminalCreator#_waitForShellIntegration: Rich SI available eventually`
+                );
+                result.complete(ShellIntegrationQuality.Rich);
+            }));
+            const commandDetection = instance.capabilities.get(TerminalCapability.CommandDetection);
+            if (commandDetection) {
+                siNoneTimer.clear();
+                store.add(disposableTimeout(() => {
+                    this._logService.info(
+                        `ToolTerminalCreator#_waitForShellIntegration: Timed out 200ms, using basic SI`
+                    );
+                    result.complete(ShellIntegrationQuality.Basic);
+                }, 200));
+            } else {
+                store.add(instance.capabilities.onDidAddCommandDetectionCapability(e => {
+                    siNoneTimer.clear();
+                    store.add(disposableTimeout(() => {
+                        this._logService.info(
+                            `ToolTerminalCreator#_waitForShellIntegration: Timed out 200ms, using basic SI (via listener)`
+                        );
+                        result.complete(ShellIntegrationQuality.Basic);
+                    }, 200));
+                }));
+            }
+        }
+        result.p.finally(() => {
+            this._logService.info(
+                `ToolTerminalCreator#_waitForShellIntegration: Promise complete, disposing store`
+            );
+            store.dispose();
+        });
+        return result.p;
+    }
+};
+ToolTerminalCreator = ToolTerminalCreator_1 = ( __decorate([( __param(0, IAccessibilityService)), ( __param(1, IConfigurationService)), ( __param(2, ITerminalLogService)), ( __param(3, ITerminalService))], ToolTerminalCreator));
+
+export { ShellIntegrationQuality, ToolTerminalCreator };

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/autoApprove/commandLineAutoApprover.d.ts

@@ -0,0 +1,31 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import type { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
+import type { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ITerminalChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
+import type { IAutoApproveRule, INpmScriptAutoApproveRule } from "../commandLineAnalyzer.js";
+export interface ICommandApprovalResultWithReason {
+    result: ICommandApprovalResult;
+    reason: string;
+    rule?: IAutoApproveRule | INpmScriptAutoApproveRule;
+}
+export type ICommandApprovalResult = "approved" | "denied" | "noMatch";
+export declare class CommandLineAutoApprover extends Disposable {
+    private readonly _configurationService;
+    private readonly _terminalChatService;
+    private _denyListRules;
+    private _allowListRules;
+    private _allowListCommandLineRules;
+    private _denyListCommandLineRules;
+    private readonly _npmScriptAutoApprover;
+    constructor(_configurationService: IConfigurationService, instantiationService: IInstantiationService, _terminalChatService: ITerminalChatService);
+    updateConfiguration(): void;
+    isCommandAutoApproved(command: string, shell: string, os: OperatingSystem, cwd: URI | undefined, chatSessionResource?: URI): Promise<ICommandApprovalResultWithReason>;
+    isCommandLineAutoApproved(commandLine: string, chatSessionResource?: URI): ICommandApprovalResultWithReason;
+    private _getSessionRules;
+    private _commandMatchesRule;
+    private _mapAutoApproveConfigToRules;
+    private _convertAutoApproveEntryToRegex;
+    private _doConvertAutoApproveEntryToRegex;
+}