@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

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

@@ -12,31 +12,114 @@ import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs
 import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
 
 const npmRunPatterns = [
-    /^(?<command>npm)\s+(?:run(?:-script)?)\s+(?<scriptName>[^\s&|;]+)/i,
-    /^(?<command>npm)\s+(?<scriptName>test|start|stop|restart)\b/i,
-    /^(?<command>yarn)\s+(?:run\s+)?(?<scriptName>[^\s&|;]+)/i,
-    /^(?<command>pnpm)\s+(?:run\s+)?(?<scriptName>[^\s&|;]+)/i,
-];
+/^(?<command>npm)\s+(?:run(?:-script)?)\s+(?<scriptName>[^\s&|;]+)/i,
+/^(?<command>npm)\s+(?<scriptName>test|start|stop|restart)\b/i,
+/^(?<command>yarn)\s+(?:run\s+)?(?<scriptName>[^\s&|;]+)/i,
+/^(?<command>pnpm)\s+(?:run\s+)?(?<scriptName>[^\s&|;]+)/i];
 const yarnBuiltinCommands = ( new Set([
-    'add', 'audit', 'autoclean', 'bin', 'cache', 'check', 'config',
-    'create', 'dedupe', 'dlx', 'exec', 'explain', 'generate-lock-entry',
-    'global', 'help', 'import', 'info', 'init', 'install', 'licenses',
-    'link', 'list', 'login', 'logout', 'node', 'outdated', 'owner',
-    'pack', 'patch', 'patch-commit', 'plugin', 'policies', 'publish',
-    'rebuild', 'remove', 'run', 'search', 'set', 'stage', 'tag', 'team',
-    'unlink', 'unplug', 'up', 'upgrade', 'upgrade-interactive',
-    'version', 'versions', 'why', 'workspace', 'workspaces',
+    "add",
+    "audit",
+    "autoclean",
+    "bin",
+    "cache",
+    "check",
+    "config",
+    "create",
+    "dedupe",
+    "dlx",
+    "exec",
+    "explain",
+    "generate-lock-entry",
+    "global",
+    "help",
+    "import",
+    "info",
+    "init",
+    "install",
+    "licenses",
+    "link",
+    "list",
+    "login",
+    "logout",
+    "node",
+    "outdated",
+    "owner",
+    "pack",
+    "patch",
+    "patch-commit",
+    "plugin",
+    "policies",
+    "publish",
+    "rebuild",
+    "remove",
+    "run",
+    "search",
+    "set",
+    "stage",
+    "tag",
+    "team",
+    "unlink",
+    "unplug",
+    "up",
+    "upgrade",
+    "upgrade-interactive",
+    "version",
+    "versions",
+    "why",
+    "workspace",
+    "workspaces"
 ]));
 const pnpmBuiltinCommands = ( new Set([
-    'add', 'audit', 'bin', 'config', 'dedupe', 'deploy', 'dlx', 'doctor',
-    'env', 'exec', 'fetch', 'import', 'init', 'install', 'install-test',
-    'licenses', 'link', 'list', 'ln', 'ls', 'outdated', 'pack', 'patch',
-    'patch-commit', 'patch-remove', 'prune', 'publish', 'rb', 'rebuild',
-    'remove', 'rm', 'root', 'run', 'server', 'setup', 'store',
-    'un', 'uninstall', 'unlink', 'up', 'update', 'why',
+    "add",
+    "audit",
+    "bin",
+    "config",
+    "dedupe",
+    "deploy",
+    "dlx",
+    "doctor",
+    "env",
+    "exec",
+    "fetch",
+    "import",
+    "init",
+    "install",
+    "install-test",
+    "licenses",
+    "link",
+    "list",
+    "ln",
+    "ls",
+    "outdated",
+    "pack",
+    "patch",
+    "patch-commit",
+    "patch-remove",
+    "prune",
+    "publish",
+    "rb",
+    "rebuild",
+    "remove",
+    "rm",
+    "root",
+    "run",
+    "server",
+    "setup",
+    "store",
+    "un",
+    "uninstall",
+    "unlink",
+    "up",
+    "update",
+    "why"
 ]));
 let NpmScriptAutoApprover = class NpmScriptAutoApprover extends Disposable {
-    constructor(_configurationService, _fileService, _uriIdentityService, _workspaceContextService) {
+    constructor(
+        _configurationService,
+        _fileService,
+        _uriIdentityService,
+        _workspaceContextService
+    ) {
         super();
         this._configurationService = _configurationService;
         this._fileService = _fileService;
@@ -46,27 +129,35 @@ let NpmScriptAutoApprover = class NpmScriptAutoApprover extends Disposable {
     async isCommandAutoApproved(command, cwd) {
         const isNpmScriptAutoApproveEnabled = this._configurationService.getValue(TerminalChatAgentToolsSettingId.AutoApproveWorkspaceNpmScripts) === true;
         if (!isNpmScriptAutoApproveEnabled) {
-            return { isAutoApproved: false };
+            return {
+                isAutoApproved: false
+            };
         }
         const scriptName = this._extractScriptName(command);
         if (!scriptName) {
-            return { isAutoApproved: false };
+            return {
+                isAutoApproved: false
+            };
         }
         const packageJsonScripts = await this._getPackageJsonScripts(cwd);
         if (!packageJsonScripts) {
-            return { isAutoApproved: false };
+            return {
+                isAutoApproved: false
+            };
         }
         if (!( packageJsonScripts.scripts.has(scriptName))) {
-            return { isAutoApproved: false };
+            return {
+                isAutoApproved: false
+            };
         }
         return {
             isAutoApproved: true,
             scriptName,
             autoApproveInfo: ( new MarkdownString(( localize(
-                12022,
-                'Auto approved as {0} is defined in package.json',
+                12353,
+                "Auto approved as {0} is defined in package.json",
                 `\`${scriptName}\``
-            )))),
+            ))))
         };
     }
     _extractScriptName(command) {
@@ -74,11 +165,14 @@ let NpmScriptAutoApprover = class NpmScriptAutoApprover extends Disposable {
         for (const pattern of npmRunPatterns) {
             const match = trimmedCommand.match(pattern);
             if (match?.groups?.scriptName) {
-                const { command: pkgManager, scriptName } = match.groups;
-                if (pkgManager.toLowerCase() === 'yarn' && ( yarnBuiltinCommands.has(scriptName.toLowerCase()))) {
+                const {
+                    command: pkgManager,
+                    scriptName
+                } = match.groups;
+                if (pkgManager.toLowerCase() === "yarn" && ( yarnBuiltinCommands.has(scriptName.toLowerCase()))) {
                     continue;
                 }
-                if (pkgManager.toLowerCase() === 'pnpm' && ( pnpmBuiltinCommands.has(scriptName.toLowerCase()))) {
+                if (pkgManager.toLowerCase() === "pnpm" && ( pnpmBuiltinCommands.has(scriptName.toLowerCase()))) {
                     continue;
                 }
                 return scriptName;
@@ -88,18 +182,19 @@ let NpmScriptAutoApprover = class NpmScriptAutoApprover extends Disposable {
     }
     _isWithinWorkspace(uri) {
         const workspaceFolders = this._workspaceContextService.getWorkspace().folders;
-        return ( workspaceFolders.some(
-            (folder) => this._uriIdentityService.extUri.isEqualOrParent(uri, folder.uri)
-        ));
+        return ( workspaceFolders.some(folder => this._uriIdentityService.extUri.isEqualOrParent(uri, folder.uri)));
     }
     async _getPackageJsonScripts(cwd) {
         if (!cwd || !this._isWithinWorkspace(cwd)) {
             return undefined;
         }
-        const packageJsonUri = URI.joinPath(cwd, 'package.json');
+        const packageJsonUri = URI.joinPath(cwd, "package.json");
         const scripts = await this._readPackageJsonScripts(packageJsonUri);
         if (scripts) {
-            return { uri: packageJsonUri, scripts };
+            return {
+                uri: packageJsonUri,
+                scripts
+            };
         }
         return undefined;
     }
@@ -112,8 +207,7 @@ let NpmScriptAutoApprover = class NpmScriptAutoApprover extends Disposable {
             const content = await this._fileService.readFile(packageJsonUri);
             const text = ( content.value.toString());
             return this._parsePackageJsonScripts(text);
-        }
-        catch {
+        } catch {
             return undefined;
         }
     }
@@ -122,8 +216,7 @@ let NpmScriptAutoApprover = class NpmScriptAutoApprover extends Disposable {
         let inScripts = false;
         let level = 0;
         const visitor = {
-            onError() {
-            },
+            onError() {},
             onObjectBegin() {
                 level++;
             },
@@ -134,23 +227,17 @@ let NpmScriptAutoApprover = class NpmScriptAutoApprover extends Disposable {
                 level--;
             },
             onObjectProperty(property) {
-                if (level === 1 && property === 'scripts') {
+                if (level === 1 && property === "scripts") {
                     inScripts = true;
-                }
-                else if (inScripts && level === 2) {
+                } else if (inScripts && level === 2) {
                     scripts.add(property);
                 }
-            },
+            }
         };
         visit(content, visitor);
         return scripts.size > 0 ? scripts : undefined;
     }
 };
-NpmScriptAutoApprover = ( __decorate([
-    ( __param(0, IConfigurationService)),
-    ( __param(1, IFileService)),
-    ( __param(2, IUriIdentityService)),
-    ( __param(3, IWorkspaceContextService))
-], NpmScriptAutoApprover));
+NpmScriptAutoApprover = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IFileService)), ( __param(2, IUriIdentityService)), ( __param(3, IWorkspaceContextService))], NpmScriptAutoApprover));
 
 export { NpmScriptAutoApprover };

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

@@ -29,7 +29,7 @@ export interface ICommandLineAnalyzerOptions {
     os: OperatingSystem;
     treeSitterLanguage: TreeSitterCommandParserLanguage;
     terminalToolSessionId: string;
-    chatSessionId: string | undefined;
+    chatSessionResource: URI | undefined;
 }
 export interface ICommandLineAnalyzerResult {
     /**
@@ -47,4 +47,5 @@ export interface ICommandLineAnalyzerResult {
     readonly disclaimers?: readonly (string | IMarkdownString)[];
     readonly autoApproveInfo?: IMarkdownString;
     readonly customActions?: ToolConfirmationAction[];
+    readonly forceAutoApproval?: boolean;
 }