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

package/vscode/src/vs/platform/agentHost/browser/remoteAgentHostProtocolClient.js

@@ -11,7 +11,7 @@ import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { toFileSystemProviderErrorCode, FileSystemProviderErrorCode } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { AgentSession } from '../common/agentService.js';
+import { AgentHostCodexAgentEnabledSettingId, AgentSession } from '../common/agentService.js';
 import { createRemoteWatchHandle } from '../common/agentHostFileSystemProvider.js';
 import { AgentSubscriptionManager } from '../common/state/agentSubscription.js';
 import { agentHostAuthority, fromAgentHostUri, toAgentHostUri } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostUri';
@@ -31,8 +31,9 @@ import { encodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common
 import { LoadEstimator } from '@codingame/monaco-vscode-api/vscode/vs/base/parts/ipc/common/ipc.net';
 import { TELEMETRY_SETTING_ID, TELEMETRY_OLD_SETTING_ID, TELEMETRY_CRASH_REPORTER_SETTING_ID } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry';
 import { getTelemetryLevel } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetryUtils';
-import { SESSION_SYNC_ENABLED_SETTING_ID, AgentHostTelemetryLevelConfigKey, telemetryLevelToAgentHostConfigValue, AgentHostSessionSyncEnabledConfigKey } from '../common/agentHostSchema.js';
+import { SESSION_SYNC_ENABLED_SETTING_ID, TERMINAL_AUTO_APPROVE_ENABLED_SETTING_ID, GLOBAL_AUTO_APPROVE_SETTING_ID, AUTO_REPLY_SETTING_ID, TERMINAL_AUTO_APPROVE_SETTING_ID, TERMINAL_IGNORE_DEFAULT_AUTO_APPROVE_RULES_SETTING_ID, AgentHostTelemetryLevelConfigKey, telemetryLevelToAgentHostConfigValue, AgentHostSessionSyncEnabledConfigKey, AgentHostTerminalAutoApproveEnabledConfigKey, AgentHostGlobalAutoApproveEnabledConfigKey, AgentHostAutoReplyEnabledConfigKey, AgentHostCodexEnabledConfigKey, AgentHostTerminalAutoApproveRulesConfigKey, getAgentHostTerminalAutoApproveRulesConfig } from '../common/agentHostSchema.js';
 import { dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { isFileResourceRead } from '../common/resourceReadLogging.js';
 import { SessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-session/state';
 
 const AHP_CLIENT_CONNECTION_CLOSED = -32e3;
@@ -98,6 +99,8 @@ let RemoteAgentHostProtocolClient = class RemoteAgentHostProtocolClient extends
         this.onDidAction = this._onDidAction.event;
         this._onDidNotification = this._register(( new Emitter()));
         this.onDidNotification = this._onDidNotification.event;
+        this._onMcpNotification = this._register(( new Emitter()));
+        this.onMcpNotification = this._onMcpNotification.event;
         this._onDidReceiveOtlpLogs = this._register(( new Emitter()));
         this.onDidReceiveOtlpLogs = this._onDidReceiveOtlpLogs.event;
         this._onDidClose = this._register(( new Emitter()));
@@ -146,6 +149,36 @@ let RemoteAgentHostProtocolClient = class RemoteAgentHostProtocolClient extends
                 }
                 this._updateSessionSyncEnabled();
             }
+            if (e.affectsConfiguration(TERMINAL_AUTO_APPROVE_ENABLED_SETTING_ID)) {
+                if (this._state.kind !== AgentHostClientState.Connected) {
+                    return;
+                }
+                this._updateTerminalAutoApproveEnabled();
+            }
+            if (e.affectsConfiguration(GLOBAL_AUTO_APPROVE_SETTING_ID)) {
+                if (this._state.kind !== AgentHostClientState.Connected) {
+                    return;
+                }
+                this._updateGlobalAutoApproveEnabled();
+            }
+            if (e.affectsConfiguration(AUTO_REPLY_SETTING_ID)) {
+                if (this._state.kind !== AgentHostClientState.Connected) {
+                    return;
+                }
+                this._updateAutoReplyEnabled();
+            }
+            if (e.affectsConfiguration(TERMINAL_AUTO_APPROVE_SETTING_ID) || e.affectsConfiguration(TERMINAL_IGNORE_DEFAULT_AUTO_APPROVE_RULES_SETTING_ID)) {
+                if (this._state.kind !== AgentHostClientState.Connected) {
+                    return;
+                }
+                this._updateTerminalAutoApproveRules();
+            }
+            if (e.affectsConfiguration(AgentHostCodexAgentEnabledSettingId)) {
+                if (this._state.kind !== AgentHostClientState.Connected) {
+                    return;
+                }
+                this._updateCodexEnabled();
+            }
         }));
         this._resetLivenessTimers();
     }
@@ -208,6 +241,11 @@ let RemoteAgentHostProtocolClient = class RemoteAgentHostProtocolClient extends
         this._initializeResult = result;
         this._updateTelemetryLevel();
         this._updateSessionSyncEnabled();
+        this._updateTerminalAutoApproveEnabled();
+        this._updateGlobalAutoApproveEnabled();
+        this._updateAutoReplyEnabled();
+        this._updateTerminalAutoApproveRules();
+        this._updateCodexEnabled();
         this._transitionTo({
             kind: AgentHostClientState.Connected
         });
@@ -378,7 +416,7 @@ let RemoteAgentHostProtocolClient = class RemoteAgentHostProtocolClient extends
                 jsonrpc: "2.0",
                 method: "dispatchAction",
                 params: {
-                    channel: entry.sessionUri,
+                    channel: entry.channel,
                     clientSeq: entry.clientSeq,
                     action: entry.action
                 }
@@ -405,6 +443,9 @@ let RemoteAgentHostProtocolClient = class RemoteAgentHostProtocolClient extends
     getSubscriptionUnmanaged(_kind, resource) {
         return this._subscriptionManager.getSubscriptionUnmanaged(resource);
     }
+    getInflightSessionCreate(resource) {
+        return this._subscriptionManager.getInflightSessionCreate(resource);
+    }
     getActiveSubscriptions() {
         return this._subscriptionManager.getActiveSubscriptions();
     }
@@ -439,7 +480,7 @@ let RemoteAgentHostProtocolClient = class RemoteAgentHostProtocolClient extends
             action
         });
     }
-    async createSession(config) {
+    createSession(config) {
         const provider = config?.provider;
         if (!provider) {
             throw ( new Error("Cannot create remote agent host session without a provider."));
@@ -448,15 +489,15 @@ let RemoteAgentHostProtocolClient = class RemoteAgentHostProtocolClient extends
         if (config?.activeClient?.customizations) {
             this._grantImplicitReadsForCustomizations(config.activeClient.customizations);
         }
-        await this._sendRequest("createSession", {
+        const promise = this._sendRequest("createSession", {
             channel: ( session.toString()),
             provider,
-            model: config?.model,
             workingDirectory: config?.workingDirectory ? ( fromAgentHostUri(config.workingDirectory).toString()) : undefined,
             config: config?.config,
             activeClient: config?.activeClient
-        });
-        return session;
+        }).then(() => session);
+        this._subscriptionManager.trackSessionCreate(session, promise);
+        return promise;
     }
     async resolveSessionConfig(params) {
         return this._sendRequest("resolveSessionConfig", {
@@ -504,6 +545,23 @@ let RemoteAgentHostProtocolClient = class RemoteAgentHostProtocolClient extends
             channel: ( session.toString())
         });
     }
+    async createChat(session, chat, options) {
+        await this._sendRequest("createChat", {
+            channel: ( session.toString()),
+            chat: ( chat.toString()),
+            ...(options?.fork ? {
+                source: {
+                    chat: ( options.fork.source.toString()),
+                    turnId: options.fork.turnId
+                }
+            } : {})
+        });
+    }
+    async disposeChat(chat) {
+        await this._sendRequest("disposeChat", {
+            channel: ( chat.toString())
+        });
+    }
     async createTerminal(params) {
         await this._sendRequest("createTerminal", params);
     }
@@ -515,14 +573,20 @@ let RemoteAgentHostProtocolClient = class RemoteAgentHostProtocolClient extends
     async invokeChangesetOperation(params) {
         return await this._sendRequest("invokeChangesetOperation", params);
     }
+    async handleMcpRequest(channel, method, params) {
+        return await this._dispatchRequest(method, {
+            ...(params ?? {}),
+            channel
+        });
+    }
     async listSessions() {
         const result = await this._sendRequest("listSessions", {
             channel: ROOT_STATE_URI
         });
         return ( result.items.map(s => ({
             session: ( URI.parse(s.resource)),
-            startTime: s.createdAt,
-            modifiedTime: s.modifiedAt,
+            startTime: Date.parse(s.createdAt),
+            modifiedTime: Date.parse(s.modifiedAt),
             ...(s.project ? {
                 project: {
                     uri: this._toLocalProjectUri(( URI.parse(s.project.uri))),
@@ -535,14 +599,14 @@ let RemoteAgentHostProtocolClient = class RemoteAgentHostProtocolClient extends
             workingDirectory: typeof s.workingDirectory === "string" ? toAgentHostUri(( URI.parse(s.workingDirectory)), this._connectionAuthority) : undefined,
             isRead: !!(s.status & SessionStatus.IsRead),
             isArchived: !!(s.status & SessionStatus.IsArchived),
-            changesets: s.changesets
+            changes: s.changes
         })));
     }
     _toLocalProjectUri(uri) {
         return uri.scheme === Schemas.file ? toAgentHostUri(uri, this._connectionAuthority) : uri;
     }
     _grantImplicitReadsForOutgoingAction(action) {
-        if (action.type === ActionType.SessionActiveClientChanged && action.activeClient?.customizations) {
+        if (action.type === ActionType.SessionActiveClientSet && action.activeClient.customizations) {
             this._grantImplicitReadsForCustomizations(action.activeClient.customizations);
         }
     }
@@ -622,7 +686,9 @@ let RemoteAgentHostProtocolClient = class RemoteAgentHostProtocolClient extends
                 if (hasKey(msg, {
                     error: true
                 })) {
-                    this._logService.warn(`[RemoteAgentHostProtocol] Request ${msg.id} failed:`, msg.error);
+                    if (this._shouldLogFailedRequest(pending, msg.error)) {
+                        this._logService.warn(`[RemoteAgentHostProtocol] Request ${msg.id} failed:`, msg.error);
+                    }
                     pending.deferred.error(this._toProtocolError(msg.error));
                 } else {
                     pending.deferred.complete(msg.result);
@@ -644,6 +710,7 @@ let RemoteAgentHostProtocolClient = class RemoteAgentHostProtocolClient extends
             case "root/sessionAdded":
             case "root/sessionRemoved":
             case "root/sessionSummaryChanged":
+            case "root/progress":
             case "auth/required":
                 {
                     this._logService.trace(`[RemoteAgentHostProtocol] Notification: ${msg.method}`);
@@ -660,8 +727,23 @@ let RemoteAgentHostProtocolClient = class RemoteAgentHostProtocolClient extends
             case "otlp/exportMetrics":
                 break;
             default:
-                this._logService.trace(`[RemoteAgentHostProtocol] Unhandled method: ${msg.method}`);
-                break;
+                {
+                    const rawChannel = msg.params && typeof msg.params === "object" ? msg.params.channel : undefined;
+                    if (typeof rawChannel === "string" && rawChannel.toLowerCase().startsWith("mcp:/")) {
+                        const {
+                            channel: _channel,
+                            ...rest
+                        } = msg.params;
+                        this._onMcpNotification.fire({
+                            channel: rawChannel,
+                            method: msg.method,
+                            params: rest
+                        });
+                        break;
+                    }
+                    this._logService.trace(`[RemoteAgentHostProtocol] Unhandled method: ${msg.method}`);
+                    break;
+                }
             }
         } else {
             this._logService.warn(`[RemoteAgentHostProtocol] Unrecognized message:`, JSON.stringify(msg));
@@ -894,6 +976,50 @@ let RemoteAgentHostProtocolClient = class RemoteAgentHostProtocolClient extends
             }
         }, this._clientId, 0);
     }
+    _updateTerminalAutoApproveEnabled() {
+        const enabled = this._configurationService.getValue(TERMINAL_AUTO_APPROVE_ENABLED_SETTING_ID) !== false;
+        this.dispatchAction(ROOT_STATE_URI, {
+            type: ActionType.RootConfigChanged,
+            config: {
+                [AgentHostTerminalAutoApproveEnabledConfigKey]: enabled
+            }
+        }, this._clientId, 0);
+    }
+    _updateGlobalAutoApproveEnabled() {
+        const enabled = this._configurationService.getValue(GLOBAL_AUTO_APPROVE_SETTING_ID) === true;
+        this.dispatchAction(ROOT_STATE_URI, {
+            type: ActionType.RootConfigChanged,
+            config: {
+                [AgentHostGlobalAutoApproveEnabledConfigKey]: enabled
+            }
+        }, this._clientId, 0);
+    }
+    _updateAutoReplyEnabled() {
+        const enabled = this._configurationService.getValue(AUTO_REPLY_SETTING_ID) === true;
+        this.dispatchAction(ROOT_STATE_URI, {
+            type: ActionType.RootConfigChanged,
+            config: {
+                [AgentHostAutoReplyEnabledConfigKey]: enabled
+            }
+        }, this._clientId, 0);
+    }
+    _updateCodexEnabled() {
+        const enabled = this._configurationService.getValue(AgentHostCodexAgentEnabledSettingId) === true;
+        this.dispatchAction(ROOT_STATE_URI, {
+            type: ActionType.RootConfigChanged,
+            config: {
+                [AgentHostCodexEnabledConfigKey]: enabled
+            }
+        }, this._clientId, 0);
+    }
+    _updateTerminalAutoApproveRules() {
+        this.dispatchAction(ROOT_STATE_URI, {
+            type: ActionType.RootConfigChanged,
+            config: {
+                [AgentHostTerminalAutoApproveRulesConfigKey]: getAgentHostTerminalAutoApproveRulesConfig(this._configurationService)
+            }
+        }, this._clientId, 0);
+    }
     async _dispatchRequest(method, params, options = {}) {
         while (!options.bypassReconnectGate && this._state.kind === AgentHostClientState.Reconnecting) {
             const current = this._state;
@@ -911,6 +1037,7 @@ let RemoteAgentHostProtocolClient = class RemoteAgentHostProtocolClient extends
         const deferred = ( new DeferredPromise());
         this._pendingRequests.set(id, {
             deferred,
+            suppressNotFoundWarning: isFileResourceRead(method, params),
             sentAt: Date.now()
         });
         const request = {
@@ -922,6 +1049,12 @@ let RemoteAgentHostProtocolClient = class RemoteAgentHostProtocolClient extends
         this._transport.send(request);
         return deferred.p;
     }
+    _shouldLogFailedRequest(request, error) {
+        if (error.code === AhpErrorCodes.NotFound && request.suppressNotFoundWarning) {
+            return false;
+        }
+        return true;
+    }
     _toProtocolError(error) {
         return ( new ProtocolError(error.code, error.message, error.data));
     }

package/vscode/src/vs/platform/agentHost/browser/remoteAgentHostServiceImpl.d.ts

@@ -56,6 +56,7 @@ export declare class RemoteAgentHostService extends Disposable implements IRemot
     get connections(): readonly IRemoteAgentHostConnectionInfo[];
     get configuredEntries(): readonly IRemoteAgentHostEntry[];
     getConnection(address: string): IAgentConnection | undefined;
+    getConnectionByAuthority(authority: string): IAgentConnection | undefined;
     getEntryByAddress(address: string): IRemoteAgentHostEntry | undefined;
     triggerServerUpgrade(address: string, method: string): Promise<IVscodeUpgradeResult>;
     reconnect(address: string): void;

package/vscode/src/vs/platform/agentHost/browser/remoteAgentHostServiceImpl.js

@@ -15,7 +15,7 @@ import { AgentHostAhpJsonlLoggingSettingId } from '../common/agentService.js';
 import { RemoteAgentHostsSettingId, RemoteAgentHostsEnabledSettingId, RemoteAgentHostEntryType, getEntryAddress, RemoteAgentHostConnectionStatus, entryToRawEntry, rawEntryToEntry } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/remoteAgentHostService';
 import { RemoteAgentHostProtocolClient, AgentHostClientState } from './remoteAgentHostProtocolClient.js';
 import { WebSocketClientTransport } from './webSocketClientTransport.js';
-import { normalizeRemoteAgentHostAddress, AGENT_HOST_LABEL_FORMATTER, agentHostAuthority, AGENT_HOST_SCHEME } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostUri';
+import { normalizeRemoteAgentHostAddress, agentHostAuthority, AGENT_HOST_LABEL_FORMATTER, AGENT_HOST_SCHEME } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostUri';
 import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { PROTOCOL_VERSION } from '../common/state/protocol/version/registry.js';
 
@@ -119,6 +119,14 @@ let RemoteAgentHostService = class RemoteAgentHostService extends Disposable {
         const entry = this._entries.get(normalized);
         return entry?.connected ? entry.client : undefined;
     }
+    getConnectionByAuthority(authority) {
+        for (const [address, entry] of this._entries) {
+            if (entry.connected && agentHostAuthority(address) === authority) {
+                return entry.client;
+            }
+        }
+        return undefined;
+    }
     getEntryByAddress(address) {
         const normalized = normalizeRemoteAgentHostAddress(address);
         const registered = this._registeredEntries.get(normalized);

package/vscode/src/vs/platform/agentHost/common/agentHost.config.contribution.js

@@ -9,14 +9,68 @@ import { AgentHostEnabledSettingId } from './agentService.js';
 const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     id: "chatAgentHost",
-    title: ( localize(1822, "Chat Agent Host")),
+    title: ( localize(1827, "Chat Agent Host")),
     type: "object",
     properties: {
         [AgentHostEnabledSettingId]: {
             type: "boolean",
-            description: ( localize(1823, "When enabled, some agents run in a separate agent host process.")),
+            description: ( localize(1828, "When enabled, some agents run in a separate agent host process.")),
             default: !isWeb && product.quality !== "stable",
-            tags: ["experimental", "advanced"]
+            tags: ["experimental", "advanced"],
+            experiment: {
+                mode: "startup"
+            }
+        },
+        "chat.agents.copilotCli.hideExtensionHost": {
+            type: "boolean",
+            markdownDescription: ( localize(
+                1829,
+                "When enabled, hides the Extension Host Copilot CLI entry from the Agents window picker. Requires `#{0}#`.",
+                AgentHostEnabledSettingId
+            )),
+            default: false,
+            tags: ["experimental"],
+            experiment: {
+                mode: "startup"
+            }
+        },
+        "chat.editor.defaultProvider": {
+            type: "string",
+            enum: ["local", "copilotEh", "copilotAh"],
+            enumDescriptions: [( localize(1830, "Use the built-in VS Code local chat harness")), ( localize(1831, "Use the Extension Host Copilot CLI")), ( localize(1832, "Use the Agent Host Copilot CLI"))],
+            description: ( localize(
+                1833,
+                "Controls which provider is used as the default for new editor chat sessions."
+            )),
+            default: "local",
+            tags: ["experimental"],
+            experiment: {
+                mode: "startup"
+            }
+        },
+        "chat.editor.localAgent.enabled": {
+            type: "boolean",
+            description: ( localize(
+                1834,
+                "When enabled, shows the VS Code local chat harness in the chat picker."
+            )),
+            default: true,
+            tags: ["experimental"],
+            experiment: {
+                mode: "startup"
+            }
+        },
+        "chat.editor.copilotCli.hideExtensionHost": {
+            type: "boolean",
+            description: ( localize(
+                1835,
+                "When enabled, hides the Extension Host Copilot CLI entry from the editor window chat picker."
+            )),
+            default: false,
+            tags: ["experimental"],
+            experiment: {
+                mode: "startup"
+            }
         }
     }
 });

package/vscode/src/vs/platform/agentHost/common/agentHostFileSystemProvider.d.ts

@@ -1,8 +1,9 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { FileType, IFileChange, IFileDeleteOptions, IFileOverwriteOptions, IFileSystemProvider, IFileWriteOptions, IStat, IWatchOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files";
+import { FileType, IFileChange, IFileDeleteOptions, IFileOverwriteOptions, IFileSystemProvider, IFileSystemProviderWithFileRealpathCapability, IFileWriteOptions, IStat, IWatchOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files";
 import { type CreateResourceWatchParams, type ResourceCopyParams, type ResourceCopyResult, type ResourceDeleteParams, type ResourceDeleteResult, type ResourceListResult, type ResourceMkdirParams, type ResourceMkdirResult, type ResourceMoveParams, type ResourceMoveResult, type ResourceReadResult, type ResourceRequestParams, type ResourceRequestResult, type ResourceResolveParams, type ResourceResolveResult, type ResourceWriteParams, type ResourceWriteResult } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/commands";
+import { type ActionEnvelope } from "./state/sessionActions.js";
 /**
  * Interface for performing resource operations on a remote endpoint.
  *
@@ -64,18 +65,7 @@ export declare function createRemoteWatchHandle(primitives: {
     }>;
     subscribe(channel: URI): Promise<unknown>;
     unsubscribe(channel: URI): void;
-    onDidAction: Event<{
-        channel: string;
-        action: {
-            type: string;
-            changes?: {
-                items: readonly {
-                    uri: string;
-                    type: string;
-                }[];
-            };
-        };
-    }>;
+    onDidAction: Event<ActionEnvelope>;
 }, params: CreateResourceWatchParams): Promise<IRemoteWatchHandle>;
 /**
  * Build a {@link AGENT_HOST_SCHEME} URI for a given connection authority
@@ -96,7 +86,7 @@ export declare function agentHostRemotePath(uri: URI): string;
  *
  * Individual connections are identified by the URI's authority component.
  */
-export declare abstract class AHPFileSystemProvider extends Disposable implements IFileSystemProvider {
+export declare abstract class AHPFileSystemProvider extends Disposable implements IFileSystemProvider, IFileSystemProviderWithFileRealpathCapability {
     private readonly _connectionGraceMs;
     readonly capabilities: number;
     private readonly _onDidChangeCapabilities;
@@ -153,6 +143,7 @@ export declare abstract class AHPFileSystemProvider extends Disposable implement
     protected abstract _encodeUri(resource: URI, authority: string): URI;
     watch(resource: URI, opts: IWatchOptions): IDisposable;
     stat(resource: URI): Promise<IStat>;
+    realpath(resource: URI): Promise<string>;
     readdir(resource: URI): Promise<[
         string,
         FileType
@@ -184,6 +175,11 @@ export declare abstract class AHPFileSystemProvider extends Disposable implement
      * via {@link requestResourceAccess}.
      */
     private _mapError;
+    /**
+     * Resolve a decoded resource over {@link connection}. Shared by
+     * {@link stat} and {@link realpath}.
+     */
+    private _resolve;
     private _listDirectory;
 }
 /**

package/vscode/src/vs/platform/agentHost/common/agentHostFileSystemProvider.js

@@ -11,6 +11,8 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/p
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-changeset/commands';
 import { AhpErrorCodes } from './state/protocol/common/errors.js';
 import { ProtocolError } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionProtocol';
+import { ActionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/common/actions';
+import '@codingame/monaco-vscode-xterm-common/vscode/vs/platform/agentHost/common/state/protocol/common/notifications';
 import { ROOT_STATE_URI } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState';
 
 async function createRemoteWatchHandle(primitives, params) {
@@ -21,7 +23,7 @@ async function createRemoteWatchHandle(primitives, params) {
     await primitives.subscribe(channelUri);
     const onDidChangeEmitter = ( new Emitter());
     const listener = primitives.onDidAction(envelope => {
-        if (envelope.channel !== channel || envelope.action.type !== "resourceWatch/changed") {
+        if (envelope.channel !== channel || envelope.action.type !== ActionType.ResourceWatchChanged) {
             return;
         }
         const items = envelope.action.changes?.items ?? [];
@@ -56,7 +58,7 @@ class AHPFileSystemProvider extends Disposable {
     constructor(_connectionGraceMs = AHPFileSystemProvider._DEFAULT_CONNECTION_GRACE_MS) {
         super();
         this._connectionGraceMs = _connectionGraceMs;
-        this.capabilities = FileSystemProviderCapabilities.PathCaseSensitive | FileSystemProviderCapabilities.FileReadWrite | FileSystemProviderCapabilities.FileFolderCopy;
+        this.capabilities = FileSystemProviderCapabilities.PathCaseSensitive | FileSystemProviderCapabilities.FileReadWrite | FileSystemProviderCapabilities.FileFolderCopy | FileSystemProviderCapabilities.FileRealpath;
         this._onDidChangeCapabilities = this._register(( new Emitter()));
         this.onDidChangeCapabilities = this._onDidChangeCapabilities.event;
         this._onDidChangeFile = this._register(( new Emitter()));
@@ -228,21 +230,34 @@ class AHPFileSystemProvider extends Disposable {
         }
         const connection = await this._getConnection(resource.authority);
         try {
-            const resolved = await connection.resourceResolve({
-                channel: ROOT_STATE_URI,
-                uri: ( decoded.toString())
-            });
+            const resolved = await this._resolve(connection, decoded);
             return {
                 type: resolved.type === "directory" ? FileType.Directory : resolved.type === "symlink" ? FileType.SymbolicLink : FileType.File,
                 mtime: resolved.mtime ? Date.parse(resolved.mtime) : 0,
                 ctime: resolved.ctime ? Date.parse(resolved.ctime) : 0,
-                size: resolved.size ?? 0,
-                permissions: FilePermission.Readonly
+                size: resolved.size ?? 0
             };
         } catch (err) {
             throw this._mapError(err, FileSystemProviderErrorCode.FileNotFound);
         }
     }
+    async realpath(resource) {
+        const path = resource.path;
+        if (path === "/" || path === "") {
+            return path;
+        }
+        const decoded = this._decodeUri(resource);
+        if (decoded.scheme === "session-db" || decoded.scheme === "git-blob" || decoded.path === "/" || decoded.path === "") {
+            return path;
+        }
+        const connection = await this._getConnection(resource.authority);
+        try {
+            const resolved = await this._resolve(connection, decoded);
+            return this._encodeUri(( URI.parse(resolved.uri)), resource.authority).path;
+        } catch (err) {
+            throw this._mapError(err, FileSystemProviderErrorCode.FileNotFound);
+        }
+    }
     async readdir(resource) {
         const entries = await this._listDirectory(resource.authority, resource);
         return ( entries.map(e => [e.name, e.type === "directory" ? FileType.Directory : FileType.File]));
@@ -392,6 +407,12 @@ class AHPFileSystemProvider extends Disposable {
         }
         return createFileSystemProviderError(err instanceof Error ? err.message : String(err), defaultCode);
     }
+    _resolve(connection, decoded) {
+        return connection.resourceResolve({
+            channel: ROOT_STATE_URI,
+            uri: ( decoded.toString())
+        });
+    }
     async _listDirectory(authority, resource) {
         const connection = await this._getConnection(authority);
         try {