@codingame/monaco-vscode-chat-service-override 37.2.0 → 37.3.1

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

@@ -43,7 +43,7 @@ let AgentHostConnectionsService = class AgentHostConnectionsService extends Disp
         const result = [{
             authority: AMBIENT_AGENT_HOST_AUTHORITY,
             address: undefined,
-            name: ( localize(1846, "Local")),
+            name: ( localize(1847, "Local")),
             isAmbient: true,
             connection: this._agentHostService
         }];
@@ -101,7 +101,10 @@ let AgentHostConnectionsService = class AgentHostConnectionsService extends Disp
             return provider ? this._createSessionIdentity(AMBIENT_AGENT_HOST_AUTHORITY, provider, rawSessionId) : undefined;
         }
         if (isRemoteAgentHostSessionType(scheme)) {
-            const authorities = ( new Set([...( this.connections.filter(c => !c.isAmbient).map(c => c.authority)), ...( this._sessionResolutionPolicies.keys())]));
+            const authorities = ( new Set([
+                ...this.connections.filter(c => !c.isAmbient).map(c => c.authority),
+                ...( this._sessionResolutionPolicies.keys())
+            ]));
             const authority = findRemoteAgentHostSessionTypeAuthority(scheme, authorities);
             if (authority) {
                 const provider = scheme.substring(remoteAgentHostSessionTypeAuthorityPrefix(authority).length);

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

@@ -7,7 +7,7 @@ import { ChatAIDisabledSettingId } from '@codingame/monaco-vscode-api/vscode/vs/
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { observableConfigValue, bindContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { COPILOT_SANDBOX_ENABLED_KEY, COPILOT_SANDBOX_ALLOW_BYPASS_KEY } from '@codingame/monaco-vscode-api/vscode/vs/platform/policy/common/copilotManagedSettings';
-import { AGENT_HOST_ENABLED_CONTEXT_KEY } from '@codingame/monaco-vscode-katex-common/vscode/vs/platform/agentHost/common/agentHostEnablementService';
+import { AGENT_HOST_ENABLED_CONTEXT_KEY } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostEnablementService';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 

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

@@ -1,6 +1,6 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import type { IChannel } from "@codingame/monaco-vscode-api/vscode/vs/base/parts/ipc/common/ipc";
-import { AhpJsonlLogger } from "../common/ahpJsonlLogger.js";
+import { AhpJsonlLogger } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/ahpJsonlLogger";
 import { AgentHostClientConnectionKind } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostTelemetry";
 import type { AhpServerNotification, JsonRpcResponse, ProtocolMessage } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionProtocol";
 import type { IClientTransport } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionTransport";

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

@@ -1,9 +1,9 @@
 
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { getAhpLogByteLength } from '../common/ahpJsonlLogger.js';
+import { getAhpLogByteLength } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/ahpJsonlLogger';
 import { AgentHostClientConnectionKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostTelemetry';
-import { MALFORMED_FRAMES_LOG_CAP, MALFORMED_FRAMES_FORCE_CLOSE_THRESHOLD } from '../common/transportConstants.js';
+import { MALFORMED_FRAMES_LOG_CAP, MALFORMED_FRAMES_FORCE_CLOSE_THRESHOLD } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/transportConstants';
 
 const REDACTED_TOKEN = "<redacted>";
 class AgentHostIpcChannelTransport extends Disposable {

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

@@ -16,11 +16,11 @@ import { AgentHostAhpJsonlLoggingSettingId } from '@codingame/monaco-vscode-api/
 import { RemoteAgentHostEntryType, RemoteAgentHostsSettingId, isRawRemoteAgentHostEntry, isLegacySshRawEntry, WEBSOCKET_ENTRY_TYPE_CONFIG, RemoteAgentHostsEnabledSettingId, RemoteAgentHostAutoConnectSettingId, getEntryTypeConfig, RemoteAgentHostConnectionStatus } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/remoteAgentHostService';
 import { hasExhaustedReconnectAttempts, computeReconnectDelay } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/reconnectPolicy';
 import { NonReconnectableTransportError, AgentHostTransportFailureReason } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionTransport';
-import { AgentHostProtocolClient, InitialAuthenticationError } from './agentHostProtocolClient.js';
+import { AgentHostProtocolClient, InitialAuthenticationError } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/browser/agentHostProtocolClient';
 import { WebSocketClientTransport } from './webSocketClientTransport.js';
 import { normalizeRemoteAgentHostAddress, agentHostAuthority, AGENT_HOST_LABEL_FORMATTER, AGENT_HOST_SCHEME } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostUri';
-import { PROTOCOL_VERSION } from '../common/state/protocol/version/registry.js';
-import { editorWindowAgentHostClientInfo } from '../common/agentHostClientInfo.js';
+import { PROTOCOL_VERSION } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/version/registry';
+import { editorWindowAgentHostClientInfo, agentsWindowAgentHostClientInfo } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostClientInfo';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -47,7 +47,10 @@ class WebSocketConnectionFactory extends Disposable {
         this._clientInfo = _clientInfo;
         this.kind = RemoteAgentHostEntryType.WebSocket;
         this._rawEntries = observableConfigValue(RemoteAgentHostsSettingId, [], this._configurationService);
-        this.entries = derived(this, reader => ( this._rawEntries.read(reader).filter(isRawRemoteAgentHostEntry).filter(entry => !isLegacySshRawEntry(entry)).map(entry => WEBSOCKET_ENTRY_TYPE_CONFIG.fromRaw(entry))));
+        this.entries = derived(
+            this,
+            reader => this._rawEntries.read(reader).filter(isRawRemoteAgentHostEntry).filter(entry => !isLegacySshRawEntry(entry)).map(entry => WEBSOCKET_ENTRY_TYPE_CONFIG.fromRaw(entry))
+        );
     }
     createConnection(entry, _options) {
         if (entry.connection.type !== RemoteAgentHostEntryType.WebSocket) {
@@ -170,7 +173,7 @@ let RemoteAgentHostService = class RemoteAgentHostService extends Disposable {
         return result;
     }
     get configuredEntries() {
-        return ( this._configuredEntries.get().map(entry => this._normalizeEntry(entry)));
+        return this._configuredEntries.get().map(entry => this._normalizeEntry(entry));
     }
     registerConnectionFactory(factory) {
         if (( this._connectionFactories.has(factory.kind))) {
@@ -359,13 +362,13 @@ let RemoteAgentHostService = class RemoteAgentHostService extends Disposable {
             return;
         }
         const configuredEntries = this._configuredEntries.get();
-        const entriesWithAddress = ( configuredEntries.map(entry => ({
+        const entriesWithAddress = configuredEntries.map(entry => ({
             entry,
             address: this._entryAddress(entry)
-        })));
-        const desired = ( new Set(( entriesWithAddress.map(e => e.address))));
+        }));
+        const desired = ( new Set(entriesWithAddress.map(e => e.address)));
         this._logService.info(
-            `[RemoteAgentHost] Reconciling: desired=[${[...desired].join(", ")}], current=[${( [...( this._entries.keys())].map(a => `${a}(${this._entries.get(a).connected ? "connected" : "pending"})`)).join(", ")}]`
+            `[RemoteAgentHost] Reconciling: desired=[${[...desired].join(", ")}], current=[${[...( this._entries.keys())].map(a => `${a}(${this._entries.get(a).connected ? "connected" : "pending"})`).join(", ")}]`
         );
         let namesChanged = false;
         const oldNames = ( new Map(this._names));
@@ -666,7 +669,7 @@ let RemoteAgentHostService = class RemoteAgentHostService extends Disposable {
     _upsertEntry(entries, entry) {
         const address = this._entryAddress(entry);
         const existingIndex = entries.findIndex(candidate => this._entryAddress(candidate) === address);
-        return existingIndex === -1 ? [...entries, entry] : ( entries.map((candidate, index) => index === existingIndex ? entry : candidate));
+        return existingIndex === -1 ? [...entries, entry] : entries.map((candidate, index) => index === existingIndex ? entry : candidate);
     }
     _getOrCreateConnectionWait(address) {
         let wait = this._pendingConnectionWaits.get(address);
@@ -744,5 +747,26 @@ let RemoteAgentHostService = class RemoteAgentHostService extends Disposable {
     }
 };
 RemoteAgentHostService = RemoteAgentHostService_1 = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IInstantiationService)), ( __param(2, ILogService)), ( __param(3, ILabelService)), ( __param(4, IEnvironmentService))], RemoteAgentHostService));
+let AgentsWindowRemoteAgentHostService = class AgentsWindowRemoteAgentHostService extends RemoteAgentHostService {
+    get clientInfo() {
+        return agentsWindowAgentHostClientInfo;
+    }
+    constructor(
+        configurationService,
+        instantiationService,
+        logService,
+        labelService,
+        environmentService
+    ) {
+        super(
+            configurationService,
+            instantiationService,
+            logService,
+            labelService,
+            environmentService
+        );
+    }
+};
+AgentsWindowRemoteAgentHostService = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IInstantiationService)), ( __param(2, ILogService)), ( __param(3, ILabelService)), ( __param(4, IEnvironmentService))], AgentsWindowRemoteAgentHostService));
 
-export { RemoteAgentHostService };
+export { AgentsWindowRemoteAgentHostService, RemoteAgentHostService };

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

@@ -1,6 +1,6 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IAhpJsonlLoggerOptions } from "../common/ahpJsonlLogger.js";
+import { IAhpJsonlLoggerOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/ahpJsonlLogger";
 import { AgentHostClientConnectionKind } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostTelemetry";
 import type { AhpServerNotification, JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, ProtocolMessage } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionProtocol";
 import type { IClientTransport } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionTransport";

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

@@ -4,9 +4,9 @@ import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { connectionTokenQueryName } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { AhpJsonlLogger, getAhpLogByteLength } from '../common/ahpJsonlLogger.js';
+import { AhpJsonlLogger, getAhpLogByteLength } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/ahpJsonlLogger';
 import { AgentHostClientConnectionKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostTelemetry';
-import { MALFORMED_FRAMES_LOG_CAP, MALFORMED_FRAMES_FORCE_CLOSE_THRESHOLD } from '../common/transportConstants.js';
+import { MALFORMED_FRAMES_LOG_CAP, MALFORMED_FRAMES_FORCE_CLOSE_THRESHOLD } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/transportConstants';
 
 let WebSocketClientTransport = class WebSocketClientTransport extends Disposable {
     get isOpen() {

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

@@ -2,14 +2,14 @@
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { createSchema, schemaProperty } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostSchema';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-root/state';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-session/state';
+import { CustomizationType } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-session/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-chat/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-terminal/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-changeset/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-resource-watch/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-automation/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-automation-run/state';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState';
+import { customizationId } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState';
 
 var AgentHostConfigKey;
 (function(AgentHostConfigKey) {
@@ -21,30 +21,30 @@ var AgentHostConfigKey;
 })(AgentHostConfigKey || (AgentHostConfigKey = {}));
 const SESSION_CUSTOMIZATION_DISCOVERY_MODES = ["scan", "discover"];
 const DEFAULT_SESSION_CUSTOMIZATION_DISCOVERY_MODE = "discover";
-createSchema({
+const agentHostCustomizationConfigSchema = createSchema({
     [AgentHostConfigKey.Customizations]: schemaProperty({
         type: "array",
-        title: ( localize(1852, "Plugins")),
+        title: ( localize(1853, "Plugins")),
         description: ( localize(
-            1853,
+            1854,
             "Plugins configured on this agent host and available to remote sessions."
         )),
         default: [],
         items: {
             type: "object",
-            title: ( localize(1854, "Plugin")),
+            title: ( localize(1855, "Plugin")),
             properties: {
                 uri: {
                     type: "string",
-                    title: ( localize(1855, "Plugin URI"))
+                    title: ( localize(1856, "Plugin URI"))
                 },
                 displayName: {
                     type: "string",
-                    title: ( localize(1856, "Name"))
+                    title: ( localize(1857, "Name"))
                 },
                 description: {
                     type: "string",
-                    title: ( localize(1857, "Description"))
+                    title: ( localize(1858, "Description"))
                 }
             },
             required: ["uri", "displayName"]
@@ -52,17 +52,17 @@ createSchema({
     }),
     [AgentHostConfigKey.DefaultShell]: schemaProperty({
         type: "string",
-        title: ( localize(1858, "Default Shell")),
+        title: ( localize(1859, "Default Shell")),
         description: ( localize(
-            1859,
+            1860,
             "Absolute path to the shell executable used by host-managed terminals. Normally pushed by the connected VS Code client from `terminal.integrated.agentHostProfile.<os>` (falling back to `terminal.integrated.defaultProfile.<os>`); when unset, the agent host falls back to the system shell. Only the path is supported; `args` and `env` from the workbench profile are not piped through yet. The workbench only pushes this for the local agent host — remote agent host operators should set this directly in the remote machine's `agent-host-config.json`."
         ))
     }),
     [AgentHostConfigKey.AllowSignedOutWhenUsable]: schemaProperty({
         type: "boolean",
-        title: ( localize(1860, "Allow Signed-Out Agent Host")),
+        title: ( localize(1861, "Allow Signed-Out Agent Host")),
         description: ( localize(
-            1861,
+            1862,
             "Experimental. When enabled, Agent Host sessions remain available while signed out as long as the selected agent has a usable model and authentication (for example Codex with ChatGPT authentication or Claude in native mode with your own Anthropic credentials). When disabled (the default), GitHub sign-in is required."
         )),
         default: false
@@ -70,21 +70,37 @@ createSchema({
     [AgentHostConfigKey.SessionCustomizationDiscoveryMode]: schemaProperty({
         type: "string",
         enum: [...SESSION_CUSTOMIZATION_DISCOVERY_MODES],
-        title: ( localize(1862, "Session Customization Discovery Mode")),
+        title: ( localize(1863, "Session Customization Discovery Mode")),
         description: ( localize(
-            1863,
+            1864,
             "Controls whether session-scoped customizations are populated from local file scanning or from Copilot SDK discovery."
         )),
         default: DEFAULT_SESSION_CUSTOMIZATION_DISCOVERY_MODE
     }),
     [AgentHostConfigKey.GithubEnterpriseUri]: schemaProperty({
         type: "string",
-        title: ( localize(1864, "GitHub Enterprise URI")),
+        title: ( localize(1865, "GitHub Enterprise URI")),
         description: ( localize(
-            1865,
+            1866,
             "Optional base URI of a GitHub Enterprise instance (for example \"https://ghe.example.com\" for GitHub Enterprise Server, or \"https://tenant.ghe.com\" for GitHub Enterprise Cloud). When set, the agent host authenticates and makes GitHub API calls against this instance instead of github.com. Normally pushed by the connected VS Code client from the `github-enterprise.uri` setting; remote agent host operators can set it directly in the remote `agent-host-config.json`."
         ))
     })
 });
+const defaultAgentHostCustomizationConfigValues = {
+    [AgentHostConfigKey.Customizations]: []
+};
+function getAgentHostConfiguredCustomizations(values) {
+    const raw = values?.[AgentHostConfigKey.Customizations];
+    const entries = agentHostCustomizationConfigSchema.validate(AgentHostConfigKey.Customizations, raw) ? raw : defaultAgentHostCustomizationConfigValues[AgentHostConfigKey.Customizations];
+    return entries.map(toContainerCustomization);
+}
+function toContainerCustomization(entry) {
+    return {
+        type: CustomizationType.Plugin,
+        id: customizationId(entry.uri),
+        uri: entry.uri,
+        name: entry.displayName
+    };
+}
 
-export { AgentHostConfigKey, DEFAULT_SESSION_CUSTOMIZATION_DISCOVERY_MODE, SESSION_CUSTOMIZATION_DISCOVERY_MODES };
+export { AgentHostConfigKey, DEFAULT_SESSION_CUSTOMIZATION_DISCOVERY_MODE, SESSION_CUSTOMIZATION_DISCOVERY_MODES, agentHostCustomizationConfigSchema, defaultAgentHostCustomizationConfigValues, getAgentHostConfiguredCustomizations, toContainerCustomization };

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

@@ -1,4 +1,4 @@
-export type { IRemoteFilesystemConnection } from "./agentHostFileSystemProvider.js";
+export type { IRemoteFilesystemConnection } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostFileSystemProvider";
 /**
  * Scheme used for the in-memory plugin filesystem backing synced customizations.
  *

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

@@ -8,7 +8,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import './agentHostFileSystemProvider.js';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostFileSystemProvider';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';