@codingame/monaco-vscode-chat-service-override 26.2.2 → 28.0.0

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.js

@@ -14,6 +14,7 @@ import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+import { ITrustedDomainService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/common/trustedDomainService.service';
 
 let TerminalSandboxService = class TerminalSandboxService extends Disposable {
     constructor(
@@ -21,7 +22,8 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
         _fileService,
         _environmentService,
         _logService,
-        _remoteAgentService
+        _remoteAgentService,
+        _trustedDomainService
     ) {
         super();
         this._configurationService = _configurationService;
@@ -29,10 +31,12 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
         this._environmentService = _environmentService;
         this._logService = _logService;
         this._remoteAgentService = _remoteAgentService;
+        this._trustedDomainService = _trustedDomainService;
         this._srtPathResolved = false;
         this._needsForceUpdateConfigFile = true;
         this._remoteEnvDetails = null;
         this._os = OS;
+        this._defaultWritePaths = ["~/.npm"];
         this._pathJoin = (...segments) => {
             const path = this._os === OperatingSystem.Windows ? win32 : posix;
             return path.join(...segments);
@@ -49,6 +53,9 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
                 }
             })
         );
+        this._register(this._trustedDomainService.onDidChangeTrustedDomains(() => {
+            this.setNeedsForceUpdateConfigFile();
+        }));
     }
     async isEnabled() {
         this._remoteEnvDetails = await this._remoteEnvDetailsPromise;
@@ -68,7 +75,10 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
         if (!this._srtPath) {
             throw ( new Error("Sandbox runtime path not resolved"));
         }
-        const wrappedCommand = `"${this._execPath}" "${this._srtPath}" TMPDIR=${this._tempDir.path} --settings "${this._sandboxConfigPath}" -c "${command}"`;
+        if (!this._rgPath) {
+            throw ( new Error("Ripgrep path not resolved"));
+        }
+        const wrappedCommand = `PATH="$PATH:${dirname(this._rgPath)}" TMPDIR="${this._tempDir.path}" "${this._execPath}" "${this._srtPath}" --settings "${this._sandboxConfigPath}" -c ${this._quoteShellArgument(command)}`;
         if (this._remoteEnvDetails) {
             return `${wrappedCommand}`;
         }
@@ -88,25 +98,19 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
         }
         return this._sandboxConfigPath;
     }
+    _quoteShellArgument(value) {
+        return `'${value.replace(/'/g, `'\\''`)}'`;
+    }
     async _resolveSrtPath() {
         if (this._srtPathResolved) {
             return;
         }
         this._srtPathResolved = true;
         const remoteEnv = this._remoteEnvDetails || (await this._remoteEnvDetailsPromise);
-        if (!remoteEnv) {
-            this._srtPath = this._pathJoin(
-                this._appRoot,
-                "node_modules",
-                "@anthropic-ai",
-                "sandbox-runtime",
-                "dist",
-                "cli.js"
-            );
-            return;
+        if (remoteEnv) {
+            this._appRoot = remoteEnv.appRoot.path;
+            this._execPath = this._pathJoin(this._appRoot, "node");
         }
-        this._appRoot = remoteEnv.appRoot.path;
-        this._execPath = this._pathJoin(this._appRoot, "node");
         this._srtPath = this._pathJoin(
             this._appRoot,
             "node_modules",
@@ -115,6 +119,7 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
             "dist",
             "cli.js"
         );
+        this._rgPath = this._pathJoin(this._appRoot, "node_modules", "@vscode", "ripgrep", "bin", "rg");
     }
     async _createSandboxConfig() {
         if ((await this.isEnabled()) && !this._tempDir) {
@@ -125,14 +130,21 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
             const linuxFileSystemSetting = this._os === OperatingSystem.Linux ? this._configurationService.getValue(TerminalChatAgentToolsSettingId.TerminalSandboxLinuxFileSystem) ?? {} : {};
             const macFileSystemSetting = this._os === OperatingSystem.Macintosh ? this._configurationService.getValue(TerminalChatAgentToolsSettingId.TerminalSandboxMacFileSystem) ?? {} : {};
             const configFileUri = URI.joinPath(this._tempDir, `vscode-sandbox-settings-${this._sandboxSettingsId}.json`);
+            const defaultAllowWrite = [...this._defaultWritePaths];
+            const linuxAllowWrite = [...( new Set([...(linuxFileSystemSetting.allowWrite ?? []), ...defaultAllowWrite]))];
+            const macAllowWrite = [...( new Set([...(macFileSystemSetting.allowWrite ?? []), ...defaultAllowWrite]))];
+            let allowedDomains = networkSetting.allowedDomains ?? [];
+            if (networkSetting.allowTrustedDomains) {
+                allowedDomains = this._addTrustedDomainsToAllowedDomains(allowedDomains);
+            }
             const sandboxSettings = {
                 network: {
-                    allowedDomains: networkSetting.allowedDomains ?? [],
+                    allowedDomains,
                     deniedDomains: networkSetting.deniedDomains ?? []
                 },
                 filesystem: {
                     denyRead: this._os === OperatingSystem.Macintosh ? macFileSystemSetting.denyRead : linuxFileSystemSetting.denyRead,
-                    allowWrite: this._os === OperatingSystem.Macintosh ? macFileSystemSetting.allowWrite : linuxFileSystemSetting.allowWrite,
+                    allowWrite: this._os === OperatingSystem.Macintosh ? macAllowWrite : linuxAllowWrite,
                     denyWrite: this._os === OperatingSystem.Macintosh ? macFileSystemSetting.denyWrite : linuxFileSystemSetting.denyWrite
                 }
             };
@@ -158,6 +170,9 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
                 const environmentService = this._environmentService;
                 this._tempDir = environmentService.tmpDir;
             }
+            if (this._tempDir) {
+                this._defaultWritePaths.push(this._tempDir.path);
+            }
             if (!this._tempDir) {
                 this._logService.warn(
                     "TerminalSandboxService: Cannot create sandbox settings file because no tmpDir is available in this environment"
@@ -165,7 +180,21 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
             }
         }
     }
+    _addTrustedDomainsToAllowedDomains(allowedDomains) {
+        const allowedDomainsSet = ( new Set(allowedDomains));
+        for (const domain of this._trustedDomainService.trustedDomains) {
+            try {
+                const uri = ( new URL(domain));
+                allowedDomainsSet.add(uri.hostname);
+            } catch {
+                if (domain !== "*") {
+                    allowedDomainsSet.add(domain);
+                }
+            }
+        }
+        return Array.from(allowedDomainsSet);
+    }
 };
-TerminalSandboxService = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IFileService)), ( __param(2, IEnvironmentService)), ( __param(3, ILogService)), ( __param(4, IRemoteAgentService))], TerminalSandboxService));
+TerminalSandboxService = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IFileService)), ( __param(2, IEnvironmentService)), ( __param(3, ILogService)), ( __param(4, IRemoteAgentService)), ( __param(5, ITrustedDomainService))], TerminalSandboxService));
 
 export { TerminalSandboxService };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatCustomizationDiagnosticsAction.d.ts

@@ -1,72 +0,0 @@
-import { PromptsStorage } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
-import { PromptsType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
-import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IWorkspaceFolder } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
-import { IParsedHook } from "../promptSyntax/hookUtils.js";
-/**
- * Information about a file that was loaded or skipped.
- */
-export interface IFileStatusInfo {
-    uri: URI;
-    status: "loaded" | "skipped" | "overwritten";
-    reason?: string;
-    name?: string;
-    storage: PromptsStorage;
-    /** For overwritten files, the name of the file that took precedence */
-    overwrittenBy?: string;
-    /** Extension ID if this file comes from an extension */
-    extensionId?: string;
-    /** If true, hidden from / menu (user-invokable: false) */
-    userInvokable?: boolean;
-    /** If true, won't be auto-loaded by agent (disable-model-invocation: true) */
-    disableModelInvocation?: boolean;
-}
-/**
- * Path information with scan order.
- */
-export interface IPathInfo {
-    uri: URI;
-    exists: boolean;
-    storage: PromptsStorage;
-    /** 1-based scan order (lower = higher priority) */
-    scanOrder: number;
-    /** Original path string for display (e.g., '~/.copilot/agents' or '.github/agents') */
-    displayPath: string;
-    /** Whether this is a default folder (vs custom configured) */
-    isDefault: boolean;
-}
-/**
- * Status information for a specific type of prompt files.
- */
-export interface ITypeStatusInfo {
-    type: PromptsType;
-    paths: IPathInfo[];
-    files: IFileStatusInfo[];
-    enabled: boolean;
-    /** For hooks only: parsed hooks grouped by lifecycle */
-    parsedHooks?: IParsedHook[];
-}
-/**
- * Registers the Diagnostics action for the chat context menu.
- */
-export declare function registerChatCustomizationDiagnosticsAction(): void;
-export interface ISpecialFilesStatus {
-    agentsMd: {
-        enabled: boolean;
-        files: URI[];
-    };
-    copilotInstructions: {
-        enabled: boolean;
-        files: URI[];
-    };
-    claudeMd: {
-        enabled: boolean;
-        files: URI[];
-    };
-}
-/**
- * Formats the status output as a compact markdown string with tree structure.
- * Files are grouped under their parent paths.
- * Special files (AGENTS.md, copilot-instructions.md) are merged into their respective sections.
- */
-export declare function formatStatusOutput(statusInfos: ITypeStatusInfo[], specialFiles: ISpecialFilesStatus, workspaceFolders: readonly IWorkspaceFolder[]): string;