@codingame/monaco-vscode-chat-service-override 20.4.1 → 21.0.0

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

@@ -4,15 +4,19 @@ function getOutput(instance, startMarker) {
     if (!instance.xterm || !instance.xterm.raw) {
         return '';
     }
-    const lines = [];
-    for (let y = Math.min(0, 0); y < instance.xterm.raw.buffer.active.length; y++) {
-        const line = instance.xterm.raw.buffer.active.getLine(y);
-        if (!line) {
-            continue;
-        }
-        lines.push(line.translateToString(true));
+    const buffer = instance.xterm.raw.buffer.active;
+    const startLine = Math.max(startMarker?.line ?? 0, 0);
+    const endLine = buffer.length;
+    const lines = ( new Array(endLine - startLine));
+    for (let y = startLine; y < endLine; y++) {
+        const line = buffer.getLine(y);
+        lines[y - startLine] = line ? line.translateToString(true) : '';
     }
-    return lines.join('\n');
+    let output = lines.join('\n');
+    if (output.length > 16000) {
+        output = output.slice(-16e3);
+    }
+    return output;
 }
 
 export { getOutput };

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

@@ -1,3 +1,9 @@
 import { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
+import type { ToolConfirmationAction } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import type { ICommandApprovalResultWithReason } from "./commandLineAutoApprover.js";
 export declare function isPowerShell(envShell: string, os: OperatingSystem): boolean;
 export declare function sanitizeTerminalOutput(output: string): string;
+export declare function generateAutoApproveActions(commandLine: string, subCommands: string[], autoApproveResult: {
+    subCommandResults: ICommandApprovalResultWithReason[];
+    commandLineResult: ICommandApprovalResultWithReason;
+}): ToolConfirmationAction[];

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

@@ -1,7 +1,10 @@
 
+import { Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
+import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { win32, posix } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import { OperatingSystem } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 
 function isPowerShell(envShell, os) {
     if (os === OperatingSystem.Windows) {
@@ -9,5 +12,86 @@ function isPowerShell(envShell, os) {
     }
     return /^(?:powershell|pwsh)(?:-preview)?$/.test(posix.basename(envShell));
 }
+function generateAutoApproveActions(commandLine, subCommands, autoApproveResult) {
+    const actions = [];
+    const canCreateAutoApproval = ( autoApproveResult.subCommandResults.some(e => e.result !== 'denied')) || autoApproveResult.commandLineResult.result === 'denied';
+    if (canCreateAutoApproval) {
+        const unapprovedSubCommands = subCommands.filter((_, index) => {
+            return autoApproveResult.subCommandResults[index].result !== 'approved';
+        });
+        const commandsWithSubcommands = ( new Set(
+            ['git', 'npm', 'yarn', 'docker', 'kubectl', 'cargo', 'dotnet', 'mvn', 'gradle']
+        ));
+        const commandsWithSubSubCommands = ( new Set(['npm run', 'yarn run']));
+        const subCommandsToSuggest = Array.from(( new Set(coalesce(( unapprovedSubCommands.map(command => {
+            const parts = command.trim().split(/\s+/);
+            const baseCommand = parts[0].toLowerCase();
+            const baseSubCommand = parts.length > 1 ? `${parts[0]} ${parts[1]}`.toLowerCase() : '';
+            if (( commandsWithSubSubCommands.has(baseSubCommand))) {
+                if (parts.length >= 3 && !parts[2].startsWith('-')) {
+                    return `${parts[0]} ${parts[1]} ${parts[2]}`;
+                }
+                return undefined;
+            }
+            else if (( commandsWithSubcommands.has(baseCommand))) {
+                if (parts.length >= 2 && !parts[1].startsWith('-')) {
+                    return `${parts[0]} ${parts[1]}`;
+                }
+                return undefined;
+            }
+            else {
+                return parts[0];
+            }
+        }))))));
+        if (subCommandsToSuggest.length > 0) {
+            let subCommandLabel;
+            if (subCommandsToSuggest.length === 1) {
+                subCommandLabel = ( localize(11426, 'Always Allow Command: {0}', subCommandsToSuggest[0]));
+            }
+            else {
+                const commandSeparated = subCommandsToSuggest.join(', ');
+                subCommandLabel = ( localize(11427, 'Always Allow Commands: {0}', commandSeparated));
+            }
+            actions.push({
+                label: subCommandLabel,
+                data: {
+                    type: 'newRule',
+                    rule: ( subCommandsToSuggest.map(key => ({
+                        key,
+                        value: true
+                    })))
+                }
+            });
+        }
+        const firstSubcommandFirstWord = unapprovedSubCommands.length > 0 ? unapprovedSubCommands[0].split(' ')[0] : '';
+        if (firstSubcommandFirstWord !== commandLine &&
+            !( commandsWithSubcommands.has(commandLine)) &&
+            !( commandsWithSubSubCommands.has(commandLine))) {
+            actions.push({
+                label: ( localize(11428, 'Always Allow Exact Command Line')),
+                data: {
+                    type: 'newRule',
+                    rule: {
+                        key: commandLine,
+                        value: {
+                            approve: true,
+                            matchCommandLine: true
+                        }
+                    }
+                }
+            });
+        }
+    }
+    if (actions.length > 0) {
+        actions.push(( new Separator()));
+    }
+    actions.push({
+        label: ( localize(11429, 'Configure Auto Approve...')),
+        data: {
+            type: 'configure'
+        }
+    });
+    return actions;
+}
 
-export { isPowerShell };
+export { generateAutoApproveActions, isPowerShell };

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

@@ -0,0 +1,35 @@
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
+import type { ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
+import { ShellIntegrationQuality } from "./toolTerminalCreator.js";
+export declare class RunInTerminalToolTelemetry {
+    private readonly _telemetryService;
+    constructor(_telemetryService: ITelemetryService);
+    logPrepare(state: {
+        terminalToolSessionId: string | undefined;
+        subCommands: string[];
+        autoApproveAllowed: "allowed" | "needsOptIn" | "off";
+        autoApproveResult: "approved" | "denied" | "manual";
+        autoApproveReason: "subCommand" | "commandLine" | undefined;
+        autoApproveDefault: boolean | undefined;
+    }): void;
+    logInvoke(instance: ITerminalInstance, state: {
+        terminalToolSessionId: string | undefined;
+        didUserEditCommand: boolean;
+        didToolEditCommand: boolean;
+        error: string | undefined;
+        isBackground: boolean;
+        isNewSession: boolean;
+        shellIntegrationQuality: ShellIntegrationQuality;
+        outputLineCount: number;
+        timingConnectMs: number;
+        timingExecuteMs: number;
+        pollDurationMs: number | undefined;
+        terminalExecutionIdleBeforeTimeout: boolean | undefined;
+        exitCode: number | undefined;
+        inputUserChars: number;
+        inputUserSigint: boolean;
+        inputToolManualAcceptCount: number | undefined;
+        inputToolManualRejectCount: number | undefined;
+        inputToolManualChars: number | undefined;
+    }): void;
+}

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

@@ -0,0 +1,448 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+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 { ShellIntegrationQuality } from './toolTerminalCreator.js';
+
+let RunInTerminalToolTelemetry = class RunInTerminalToolTelemetry {
+    constructor(_telemetryService) {
+        this._telemetryService = _telemetryService;
+    }
+    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,
+            outputLineCount: state.outputLineCount,
+            nonZeroExitCode: state.exitCode === undefined ? -1 : state.exitCode === 0 ? 0 : 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,
+        });
+    }
+};
+RunInTerminalToolTelemetry = ( __decorate([
+    ( __param(0, ITelemetryService))
+], 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',
+    '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/subCommands.d.ts

@@ -1,3 +1,2 @@
 import type { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
 export declare function splitCommandLineIntoSubCommands(commandLine: string, envShell: string, envOS: OperatingSystem): string[];
-export declare function extractInlineSubCommands(commandLine: string, envShell: string, envOS: OperatingSystem): Set<string>;