@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

package/vscode/src/vs/workbench/services/agentHost/browser/editorRemoteAgentHostServiceClient.js

@@ -3,25 +3,39 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-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 { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { isAgentHostEnabled, AgentHostEnabledSettingId, AgentHostIpcChannels } from '../../../../platform/agentHost/common/agentService.js';
+import { AgentHostIpcChannels } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentService';
+import { IAgentHostEnablementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostEnablementService.service';
 import { AgentHostIpcChannelTransport } from '../../../../platform/agentHost/browser/agentHostIpcChannelTransport.js';
-import { RemoteAgentHostProtocolClient } from '../../../../platform/agentHost/browser/remoteAgentHostProtocolClient.js';
+import { AgentHostClientConnectionKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostTelemetry';
+import { AgentHostProtocolClient, AgentHostClientState } from '../../../../platform/agentHost/browser/agentHostProtocolClient.js';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
+import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { agentsWindowAgentHostClientInfo, editorWindowAgentHostClientInfo } from '../../../../platform/agentHost/common/agentHostClientInfo.js';
+import { identityAgentHostResourceUriMapper, agentHostAuthority, fromAgentHostUri } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostUri';
+import { IAgentHostFileSystemService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/agentHost/common/agentHostFileSystemService.service';
+import { EditorRemoteAgentHostTransport } from '../common/editorRemoteAgentHostTransport.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
 
 const REMOTE_NOT_SUPPORTED = op => ( new Error(`${op} is not supported when the agent host runs on a remote.`));
 const LOG_PREFIX = "[AgentHost:remote]";
 let EditorRemoteAgentHostServiceClient = class EditorRemoteAgentHostServiceClient extends Disposable {
+    get resourceUris() {
+        return this._protocolClient?.resourceUris ?? identityAgentHostResourceUriMapper;
+    }
     constructor(
-        remoteAgentService,
-        configurationService,
+        _remoteAgentService,
+        agentHostEnablementService,
         instantiationService,
-        _logService
+        _logService,
+        environmentService,
+        agentHostFileSystemService
     ) {
         super();
+        this._remoteAgentService = _remoteAgentService;
         this._logService = _logService;
         this._onAgentHostExit = this._register(( new Emitter()));
         this.onAgentHostExit = this._onAgentHostExit.event;
@@ -38,34 +52,45 @@ let EditorRemoteAgentHostServiceClient = class EditorRemoteAgentHostServiceClien
             onDidApplyAction: Event.None
         };
         this._connectStarted = false;
-        const enabled = isAgentHostEnabled(configurationService);
-        const connection = remoteAgentService.getConnection();
+        const connection = this._remoteAgentService.getConnection();
         this._logService.info(
-            `${LOG_PREFIX} Initializing (enabled=${enabled}, remoteAuthority=${connection?.remoteAuthority ?? "none"})`
+            `${LOG_PREFIX} Initializing (remoteAuthority=${connection?.remoteAuthority ?? "none"})`
         );
-        if (!enabled) {
-            this._logService.info(
-                `${LOG_PREFIX} Disabled via "${AgentHostEnabledSettingId}" or web runtime. Not connecting.`
-            );
-            this.setAuthenticationPending(false);
-            return;
-        }
         if (!connection) {
             this._logService.warn(`${LOG_PREFIX} No remote agent connection available. Not connecting.`);
             this.setAuthenticationPending(false);
             return;
         }
-        const channel = connection.getChannel(AgentHostIpcChannels.RemoteProxy);
-        const transport = ( new AgentHostIpcChannelTransport(channel));
+        const createTransport = () => ( new EditorRemoteAgentHostTransport(( new AgentHostIpcChannelTransport(
+            connection.getChannel(AgentHostIpcChannels.RemoteProxy),
+            undefined,
+            AgentHostClientConnectionKind.RemoteExtensionHost
+        )), connection.remoteAuthority));
         const address = `vscode-remote://${connection.remoteAuthority}`;
+        const clientInfo = environmentService.isSessionsWindow ? agentsWindowAgentHostClientInfo : editorWindowAgentHostClientInfo;
         this._protocolClient = this._register(
-            instantiationService.createInstance(RemoteAgentHostProtocolClient, address, transport, undefined)
+            instantiationService.createInstance(AgentHostProtocolClient, address, createTransport, {
+                clientInfo
+            })
+        );
+        this._register(
+            agentHostFileSystemService.registerAuthority(agentHostAuthority(address), this._protocolClient)
         );
         this._register(this._protocolClient.onDidClose(() => {
             this._logService.info(`${LOG_PREFIX} Protocol client closed`);
             this._onAgentHostExit.fire(0);
         }));
-        this._connect().catch(err => this._logService.warn(`${LOG_PREFIX} Connect failed`, err));
+        this._register(this._protocolClient.onDidChangeConnectionState(state => {
+            if (state === AgentHostClientState.Connected) {
+                this._logService.info(`${LOG_PREFIX} Connected; clientId=${this._protocolClient?.clientId}`);
+                this._onAgentHostStart.fire();
+            }
+        }));
+        this._register(autorun(reader => {
+            if (agentHostEnablementService.enabled.read(reader)) {
+                this.startAgentHost();
+            }
+        }));
     }
     async _connect() {
         if (this._connectStarted || !this._protocolClient) {
@@ -73,9 +98,8 @@ let EditorRemoteAgentHostServiceClient = class EditorRemoteAgentHostServiceClien
         }
         this._connectStarted = true;
         this._logService.info(`${LOG_PREFIX} Connecting to remote agent host...`);
+        await this._remoteAgentService.getRawEnvironment();
         await this._protocolClient.connect();
-        this._logService.info(`${LOG_PREFIX} Connected; clientId=${this._protocolClient.clientId}`);
-        this._onAgentHostStart.fire();
     }
     _requireClient() {
         if (!this._protocolClient) {
@@ -92,6 +116,9 @@ let EditorRemoteAgentHostServiceClient = class EditorRemoteAgentHostServiceClien
         }
         this._authenticationPending.set(pending, undefined);
     }
+    startAgentHost() {
+        this._connect().catch(err => this._logService.warn(`${LOG_PREFIX} Connect failed`, err));
+    }
     async restartAgentHost() {}
     async startWebSocketServer() {
         throw REMOTE_NOT_SUPPORTED("startWebSocketServer");
@@ -102,6 +129,9 @@ let EditorRemoteAgentHostServiceClient = class EditorRemoteAgentHostServiceClien
     get clientId() {
         return this._protocolClient?.clientId ?? "";
     }
+    get initializeResult() {
+        return this._protocolClient?.initializeResult ?? constObservable(undefined);
+    }
     get rootState() {
         return this._protocolClient?.rootState ?? this._noopRootState;
     }
@@ -132,8 +162,31 @@ let EditorRemoteAgentHostServiceClient = class EditorRemoteAgentHostServiceClien
     authenticate(params) {
         return this._requireClient().authenticate(params);
     }
-    listSessions() {
-        return this._requireClient().listSessions();
+    getNetworkDiagnosticsInfo() {
+        return this._requireClient().getNetworkDiagnosticsInfo();
+    }
+    getManagedSettingsDiagnostics() {
+        return this._requireClient().getManagedSettingsDiagnostics();
+    }
+    diagnosticsFetch(url) {
+        return this._requireClient().diagnosticsFetch(url);
+    }
+    getSessionStateFile(session, chat) {
+        return this._requireClient().getSessionStateFile(session, chat);
+    }
+    collectDebugLogs(session, kind, chat) {
+        return this._requireClient().collectDebugLogs(session, kind, chat);
+    }
+    readDebugLogsChunk(resource, position) {
+        return this._requireClient().readDebugLogsChunk(resource, position);
+    }
+    async listSessions() {
+        const sessions = await this._requireClient().listSessions();
+        return ( sessions.map(session => ({
+            ...session,
+            workingDirectory: session.workingDirectory ? fromAgentHostUri(session.workingDirectory) : undefined,
+            workingDirectories: session.workingDirectories?.map(fromAgentHostUri)
+        })));
     }
     createSession(config) {
         return this._requireClient().createSession(config);
@@ -147,6 +200,15 @@ let EditorRemoteAgentHostServiceClient = class EditorRemoteAgentHostServiceClien
     completions(params) {
         return this._requireClient().completions(params);
     }
+    listAutomationTriggerDefinitions(params) {
+        return this._requireClient().listAutomationTriggerDefinitions(params);
+    }
+    runAutomation(params) {
+        return this._requireClient().runAutomation(params);
+    }
+    fetchAutomationRuns(params) {
+        return this._requireClient().fetchAutomationRuns(params);
+    }
     getCompletionTriggerCharacters() {
         return this._requireClient().getCompletionTriggerCharacters();
     }
@@ -174,8 +236,8 @@ let EditorRemoteAgentHostServiceClient = class EditorRemoteAgentHostServiceClien
     resourceList(uri) {
         return this._requireClient().resourceList(uri);
     }
-    resourceRead(uri) {
-        return this._requireClient().resourceRead(uri);
+    resourceRead(uri, encoding) {
+        return this._requireClient().resourceRead(uri, encoding);
     }
     resourceWrite(params) {
         return this._requireClient().resourceWrite(params);
@@ -202,6 +264,6 @@ let EditorRemoteAgentHostServiceClient = class EditorRemoteAgentHostServiceClien
         return this._requireClient().watchResource(params);
     }
 };
-EditorRemoteAgentHostServiceClient = ( __decorate([( __param(0, IRemoteAgentService)), ( __param(1, IConfigurationService)), ( __param(2, IInstantiationService)), ( __param(3, ILogService))], EditorRemoteAgentHostServiceClient));
+EditorRemoteAgentHostServiceClient = ( __decorate([( __param(0, IRemoteAgentService)), ( __param(1, IAgentHostEnablementService)), ( __param(2, IInstantiationService)), ( __param(3, ILogService)), ( __param(4, IWorkbenchEnvironmentService)), ( __param(5, IAgentHostFileSystemService))], EditorRemoteAgentHostServiceClient));
 
 export { EditorRemoteAgentHostServiceClient };

package/vscode/src/vs/workbench/services/agentHost/browser/webAgentHostEnablementService.d.ts

@@ -0,0 +1,8 @@
+import { AgentHostEnablementService } from "../../../../platform/agentHost/browser/agentHostEnablementService.js";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
+import { IManagedSettingsService } from "@codingame/monaco-vscode-api/vscode/vs/platform/policy/common/copilotManagedSettings.service";
+export declare class WebAgentHostEnablementService extends AgentHostEnablementService {
+    constructor(configurationService: IConfigurationService, contextKeyService: IContextKeyService, environmentService: IWorkbenchEnvironmentService, managedSettingsService: IManagedSettingsService);
+}

package/vscode/src/vs/workbench/services/agentHost/browser/webAgentHostEnablementService.js

@@ -0,0 +1,28 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { AgentHostEnablementService } from '../../../../platform/agentHost/browser/agentHostEnablementService.js';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { IManagedSettingsService } from '@codingame/monaco-vscode-api/vscode/vs/platform/policy/common/copilotManagedSettings.service';
+
+let WebAgentHostEnablementService = class WebAgentHostEnablementService extends AgentHostEnablementService {
+    constructor(
+        configurationService,
+        contextKeyService,
+        environmentService,
+        managedSettingsService
+    ) {
+        super(
+            !!environmentService.remoteAuthority,
+            configurationService,
+            contextKeyService,
+            managedSettingsService
+        );
+    }
+};
+WebAgentHostEnablementService = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IContextKeyService)), ( __param(2, IWorkbenchEnvironmentService)), ( __param(3, IManagedSettingsService))], WebAgentHostEnablementService));
+
+export { WebAgentHostEnablementService };

package/vscode/src/vs/workbench/services/agentHost/common/agentHostFileSystemService.js

@@ -1,9 +1,10 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { AgentHostFileSystemProvider } from '../../../../platform/agentHost/common/agentHostFileSystemProvider.js';
 import { SYNCED_CUSTOMIZATION_SCHEME } from '../../../../platform/agentHost/common/agentHostFileSystemService.js';
-import { AGENT_HOST_SCHEME, AGENT_HOST_LABEL_FORMATTER } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostUri';
+import { AGENT_HOST_SCHEME, AGENT_HOST_LABEL_FORMATTER, agentHostLabelFormatter, LOCAL_AGENT_HOST_AUTHORITY } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostUri';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { InMemoryFileSystemProvider } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/inMemoryFilesystemProvider';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
@@ -18,6 +19,9 @@ let AgentHostFileSystemService = class AgentHostFileSystemService extends Dispos
         this._fsProvider = this._register(( new AgentHostFileSystemProvider()));
         this._register(_fileService.registerProvider(AGENT_HOST_SCHEME, this._fsProvider));
         this._register(labelService.registerFormatter(AGENT_HOST_LABEL_FORMATTER));
+        this._register(
+            labelService.registerFormatter(agentHostLabelFormatter(LOCAL_AGENT_HOST_AUTHORITY, OS))
+        );
     }
     registerAuthority(authority, connection) {
         return this._fsProvider.registerAuthority(authority, connection);

package/vscode/src/vs/workbench/services/agentHost/common/agentHostResourceService.d.ts

@@ -2,7 +2,7 @@ import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
-import { AgentHostPermissionMode, IPendingResourceRequest, IResourceListResult, IResourceReadResult } from "../../../../platform/agentHost/common/agentHostResourceService.js";
+import { AgentHostPermissionMode, AgentHostResourceIdentity, IPendingResourceRequest, IResourceListResult, IResourceReadResult } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostResourceService";
 import { IAgentHostResourceService } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostResourceService.service";
 import { ResourceCopyParams, ResourceDeleteParams, ResourceMkdirParams, ResourceMoveParams, ResourceRequestParams, ResourceResolveParams, ResourceResolveResult, ResourceWriteParams } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/commands";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
@@ -22,13 +22,12 @@ import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log
  *   "localhost:3000": {
  *     "file:///Users/me/.gitconfig": "r",
  *     "file:///Users/me/.agentConfig": "rw"
- *   },
- *   "local": { ... }
+ *   }
  * }
  * ```
  *
- * - Keys are addresses normalized via {@link normalizeRemoteAgentHostAddress},
- *   with the in-process local agent host keyed under `'local'`.
+ * - Keys are remote addresses normalized via
+ *   {@link normalizeRemoteAgentHostAddress}.
  * - Values are URI strings → `r` | `rw`. Descendant URIs are covered by a
  *   parent grant.
  */
@@ -42,20 +41,20 @@ export declare class AgentHostResourceService extends Disposable implements IAge
     private readonly _pending;
     readonly allPending: IObservable<readonly IPendingResourceRequest[]>;
     constructor(_configurationService: IConfigurationService, _fileService: IFileService, _textModelService: ITextModelService, _logService: ILogService);
-    list(address: string, uri: URI): Promise<IResourceListResult>;
-    read(address: string, uri: URI): Promise<IResourceReadResult>;
-    write(address: string, params: ResourceWriteParams): Promise<void>;
-    del(address: string, params: ResourceDeleteParams): Promise<void>;
-    move(address: string, params: ResourceMoveParams): Promise<void>;
-    copy(address: string, params: ResourceCopyParams): Promise<void>;
-    resolve(address: string, params: ResourceResolveParams): Promise<ResourceResolveResult>;
-    mkdir(address: string, params: ResourceMkdirParams): Promise<void>;
-    check(address: string, uri: URI, mode: AgentHostPermissionMode): Promise<boolean>;
-    request(address: string, params: ResourceRequestParams): Promise<void>;
+    list(identity: AgentHostResourceIdentity, uri: URI): Promise<IResourceListResult>;
+    read(identity: AgentHostResourceIdentity, uri: URI): Promise<IResourceReadResult>;
+    write(identity: AgentHostResourceIdentity, params: ResourceWriteParams): Promise<void>;
+    del(identity: AgentHostResourceIdentity, params: ResourceDeleteParams): Promise<void>;
+    move(identity: AgentHostResourceIdentity, params: ResourceMoveParams): Promise<void>;
+    copy(identity: AgentHostResourceIdentity, params: ResourceCopyParams): Promise<void>;
+    resolve(identity: AgentHostResourceIdentity, params: ResourceResolveParams): Promise<ResourceResolveResult>;
+    mkdir(identity: AgentHostResourceIdentity, params: ResourceMkdirParams): Promise<void>;
+    check(identity: AgentHostResourceIdentity, uri: URI, mode: AgentHostPermissionMode): Promise<boolean>;
+    request(identity: AgentHostResourceIdentity, params: ResourceRequestParams): Promise<void>;
     pendingFor(address: string): IObservable<readonly IPendingResourceRequest[]>;
     findPending(id: string): IPendingResourceRequest | undefined;
-    grantImplicitRead(address: string, uri: URI): IDisposable;
-    connectionClosed(address: string): void;
+    grantImplicitRead(identity: AgentHostResourceIdentity, uri: URI): IDisposable;
+    connectionClosed(identity: AgentHostResourceIdentity): void;
     private _gate;
     private _readVirtual;
     /**
@@ -76,10 +75,11 @@ export declare class AgentHostResourceService extends Disposable implements IAge
      * segments and following symlinks so the policy check sees the same
      * path the OS will actually open. For URIs that don't exist (e.g. a
      * `resourceWrite` for a new file), realpath the deepest existing
-     * ancestor and re-append the leaf.
+     * ancestor and re-append the missing suffix.
      */
     private _canonicalize;
     private _isCovered;
+    private _getGrantedChildren;
     private _enqueue;
     private _resolve;
     private _dropPending;