@codingame/monaco-vscode-extensions-service-override 11.1.2 → 12.0.1

package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localize } from 'vscode/vscode/vs/nls';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -6,17 +7,19 @@ import { INTERNAL_AUTH_PROVIDER_PREFIX } from 'vscode/vscode/vs/workbench/servic
 import { IAuthenticationService, IAuthenticationExtensionsService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
-import Severity$1 from 'vscode/vscode/vs/base/common/severity';
+import Severity from 'vscode/vscode/vs/base/common/severity';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { ActivationKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { IAuthenticationAccessService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service';
 import { IAuthenticationUsageService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationUsageService.service';
-import { getAuthenticationProviderActivationEvent } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationService';
+import { getAuthenticationProviderActivationEvent } from '@codingame/monaco-vscode-3607c442-ae7a-594b-b840-038378c24fef-common/vscode/vs/workbench/services/authentication/browser/authenticationService';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { CancellationError } from 'vscode/vscode/vs/base/common/errors';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 
 class MainThreadAuthenticationProvider extends Disposable {
     constructor(_proxy, id, label, supportsMultipleAccounts, notificationService, onDidChangeSessionsEmitter) {
@@ -36,11 +39,11 @@ class MainThreadAuthenticationProvider extends Disposable {
     }
     async removeSession(sessionId) {
         await this._proxy.$removeSession(this.id, sessionId);
-        this.notificationService.info(( localize(4558, "Successfully signed out.")));
+        this.notificationService.info(( localize(2244, "Successfully signed out.")));
     }
 }
 let MainThreadAuthentication = class MainThreadAuthentication extends Disposable {
-    constructor(extHostContext, authenticationService, authenticationExtensionsService, authenticationAccessService, authenticationUsageService, dialogService, notificationService, extensionService, telemetryService, openerService) {
+    constructor(extHostContext, authenticationService, authenticationExtensionsService, authenticationAccessService, authenticationUsageService, dialogService, notificationService, extensionService, telemetryService, openerService, logService) {
         super();
         this.authenticationService = authenticationService;
         this.authenticationExtensionsService = authenticationExtensionsService;
@@ -51,8 +54,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         this.extensionService = extensionService;
         this.telemetryService = telemetryService;
         this.openerService = openerService;
-        this._registrations = this._register(( (new DisposableMap())));
-        this._proxy = ( (extHostContext.getProxy(ExtHostContext.ExtHostAuthentication)));
+        this.logService = logService;
+        this._registrations = this._register(( new DisposableMap()));
+        this._sentProviderUsageEvents = ( new Set());
+        this._sentClientIdUsageEvents = ( new Set());
+        this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostAuthentication));
         this._register(this.authenticationService.onDidChangeSessions(e => {
             this._proxy.$onDidChangeAuthenticationSessions(e.providerId, e.label);
         }));
@@ -62,16 +68,20 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }));
     }
     async $registerAuthenticationProvider(id, label, supportsMultipleAccounts) {
-        const emitter = ( (new Emitter()));
+        if (!this.authenticationService.declaredProviders.find(p => p.id === id)) {
+            this.logService.warn(`Authentication provider ${id} was not declared in the Extension Manifest.`);
+            this.telemetryService.publicLog2('authentication.providerNotDeclared', { id });
+        }
+        const emitter = ( new Emitter());
         this._registrations.set(id, emitter);
-        const provider = ( (new MainThreadAuthenticationProvider(
+        const provider = ( new MainThreadAuthenticationProvider(
             this._proxy,
             id,
             label,
             supportsMultipleAccounts,
             this.notificationService,
             emitter
-        )));
+        ));
         this.authenticationService.registerAuthenticationProvider(id, provider);
     }
     $unregisterAuthenticationProvider(id) {
@@ -80,7 +90,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async $ensureProvider(id) {
         if (!this.authenticationService.isAuthenticationProviderRegistered(id)) {
-            return await this.extensionService.activateByEvent(getAuthenticationProviderActivationEvent(id), 1 );
+            return await this.extensionService.activateByEvent(getAuthenticationProviderActivationEvent(id), ActivationKind.Immediate);
         }
     }
     $sendDidChangeSessions(providerId, event) {
@@ -96,7 +106,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         let message;
         if (provider.id.startsWith(INTERNAL_AUTH_PROVIDER_PREFIX)) {
             message = ( localize(
-                4559,
+                2245,
                 "The extension '{0}' wants to access the language models provided by {1}.",
                 extensionName,
                 provider.label
@@ -105,13 +115,13 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         else {
             message = recreatingSession
                 ? ( localize(
-                4560,
+                2246,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             ))
                 : ( localize(
-                4561,
+                2247,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
@@ -119,7 +129,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }
         const buttons = [
             {
-                label: ( localize(4562, "&&Allow")),
+                label: ( localize(2248, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -127,7 +137,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         ];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(4563, "Learn more")),
+                label: ( localize(2249, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), { allowCommands: true });
@@ -136,7 +146,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             });
         }
         const { result } = await this.dialogService.prompt({
-            type: Severity$1.Info,
+            type: Severity.Info,
             message,
             buttons,
             detail: options?.detail,
@@ -146,28 +156,28 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(4564, "Incorrect account detected")),
+            message: ( localize(2250, "Incorrect account detected")),
             detail: ( localize(
-                4565,
+                2251,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
             )),
-            type: Severity$1.Warning,
+            type: Severity.Warning,
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(4566, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(2252, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(4567, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(2253, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],
         });
         if (!result.result) {
-            throw ( (new CancellationError()));
+            throw ( new CancellationError());
         }
         return result.result === chosenAccountLabel;
     }
@@ -175,19 +185,19 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const sessions = await this.authenticationService.getSessions(providerId, scopes, options.account, true);
         const provider = this.authenticationService.getProvider(providerId);
         if (options.forceNewSession && options.createIfNone) {
-            throw ( (new Error(
+            throw ( new Error(
                 'Invalid combination of options. Please remove one of the following: forceNewSession, createIfNone'
-            )));
+            ));
         }
         if (options.forceNewSession && options.silent) {
-            throw ( (new Error(
+            throw ( new Error(
                 'Invalid combination of options. Please remove one of the following: forceNewSession, silent'
-            )));
+            ));
         }
         if (options.createIfNone && options.silent) {
-            throw ( (new Error(
+            throw ( new Error(
                 'Invalid combination of options. Please remove one of the following: createIfNone, silent'
-            )));
+            ));
         }
         if (options.clearSessionPreference) {
             this._removeAccountPreference(extensionId, providerId, scopes);
@@ -212,7 +222,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             const recreatingSession = !!(options.forceNewSession && sessions.length);
             const isAllowed = await this.loginPrompt(provider, extensionName, recreatingSession, uiOptions);
             if (!isAllowed) {
-                throw ( (new Error('User did not consent to login.')));
+                throw ( new Error('User did not consent to login.'));
             }
             let session;
             if (sessions?.length && !options.forceNewSession) {
@@ -246,6 +256,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return undefined;
     }
     async $getSession(providerId, scopes, extensionId, extensionName, options) {
+        this.sendClientIdUsageTelemetry(extensionId, providerId, scopes);
         const session = await this.doGetSession(providerId, scopes, extensionId, extensionName, options);
         if (session) {
             this.sendProviderUsageTelemetry(extensionId, providerId);
@@ -257,7 +268,23 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const accounts = await this.authenticationService.getAccounts(providerId);
         return accounts;
     }
+    sendClientIdUsageTelemetry(extensionId, providerId, scopes) {
+        const containsVSCodeClientIdScope = ( scopes.some(scope => scope.startsWith('VSCODE_CLIENT_ID:')));
+        const key = `${extensionId}|${providerId}|${containsVSCodeClientIdScope}`;
+        if (( this._sentClientIdUsageEvents.has(key))) {
+            return;
+        }
+        this._sentClientIdUsageEvents.add(key);
+        if (containsVSCodeClientIdScope) {
+            this.telemetryService.publicLog2('authentication.clientIdUsage', { extensionId });
+        }
+    }
     sendProviderUsageTelemetry(extensionId, providerId) {
+        const key = `${extensionId}|${providerId}`;
+        if (( this._sentProviderUsageEvents.has(key))) {
+            return;
+        }
+        this._sentProviderUsageEvents.add(key);
         this.telemetryService.publicLog2('authentication.providerUsage', { providerId, extensionId });
     }
     _getAccountPreference(extensionId, providerId, scopes, sessions) {
@@ -290,15 +317,16 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
 };
 MainThreadAuthentication = __decorate([
     extHostNamedCustomer(MainContext.MainThreadAuthentication),
-    ( (__param(1, IAuthenticationService))),
-    ( (__param(2, IAuthenticationExtensionsService))),
-    ( (__param(3, IAuthenticationAccessService))),
-    ( (__param(4, IAuthenticationUsageService))),
-    ( (__param(5, IDialogService))),
-    ( (__param(6, INotificationService))),
-    ( (__param(7, IExtensionService))),
-    ( (__param(8, ITelemetryService))),
-    ( (__param(9, IOpenerService)))
+    ( __param(1, IAuthenticationService)),
+    ( __param(2, IAuthenticationExtensionsService)),
+    ( __param(3, IAuthenticationAccessService)),
+    ( __param(4, IAuthenticationUsageService)),
+    ( __param(5, IDialogService)),
+    ( __param(6, INotificationService)),
+    ( __param(7, IExtensionService)),
+    ( __param(8, ITelemetryService)),
+    ( __param(9, IOpenerService)),
+    ( __param(10, ILogService))
 ], MainThreadAuthentication);
 
 export { MainThreadAuthentication, MainThreadAuthenticationProvider };

package/vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.d.ts

@@ -0,0 +1,18 @@
+import { VSBuffer } from "vscode/vscode/vs/base/common/buffer";
+import { IBulkEditService } from "vscode/vscode/vs/editor/browser/services/bulkEditService";
+import { WorkspaceEdit } from "vscode/vscode/vs/editor/common/languages";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IUriIdentityService } from "vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { IWorkspaceEditDto, MainThreadBulkEditsShape } from "vscode/vscode/vs/workbench/api/common/extHost.protocol";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { SerializableObjectWithBuffers } from "vscode/vscode/vs/workbench/services/extensions/common/proxyIdentifier";
+export declare class MainThreadBulkEdits implements MainThreadBulkEditsShape {
+    private readonly _bulkEditService;
+    private readonly _logService;
+    private readonly _uriIdentService;
+    constructor(_extHostContext: IExtHostContext, _bulkEditService: IBulkEditService, _logService: ILogService, _uriIdentService: IUriIdentityService);
+    dispose(): void;
+    $tryApplyWorkspaceEdit(dto: SerializableObjectWithBuffers<IWorkspaceEditDto>, undoRedoGroupId?: number, isRefactoring?: boolean): Promise<boolean>;
+}
+export declare function reviveWorkspaceEditDto(data: IWorkspaceEditDto, uriIdentityService: IUriIdentityService, resolveDataTransferFile?: (id: string) => Promise<VSBuffer>): WorkspaceEdit;
+export declare function reviveWorkspaceEditDto(data: IWorkspaceEditDto | undefined, uriIdentityService: IUriIdentityService, resolveDataTransferFile?: (id: string) => Promise<VSBuffer>): WorkspaceEdit | undefined;

package/vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js

@@ -1,11 +1,13 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { decodeBase64 } from 'vscode/vscode/vs/base/common/buffer';
 import { revive } from 'vscode/vscode/vs/base/common/marshalling';
 import { IBulkEditService, ResourceTextEdit, ResourceFileEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { ResourceNotebookCellEdit } from 'vscode/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
+import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
+import { CellEditType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
 let MainThreadBulkEdits = class MainThreadBulkEdits {
@@ -61,7 +63,7 @@ function reviveWorkspaceEditDto(data, uriIdentityService, resolveDataTransferFil
         if (ResourceNotebookCellEdit.is(edit)) {
             edit.resource = uriIdentityService.asCanonicalUri(edit.resource);
             const cellEdit = edit.cellEdit;
-            if (cellEdit.editType === 1 ) {
+            if (cellEdit.editType === CellEditType.Replace) {
                 edit.cellEdit = {
                     ...cellEdit,
                     cells: ( cellEdit.cells.map(cell => ({

package/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.d.ts

@@ -0,0 +1 @@
+export {};

package/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { isString } from 'vscode/vscode/vs/base/common/types';
@@ -46,14 +47,14 @@ CommandsRegistry.registerCommand('_remoteCLI.manageExtensions', async function (
             lines.push(message);
         }
     })();
-    const childInstantiationService = instantiationService.createChild(( (new ServiceCollection([IExtensionManagementService, remoteExtensionManagementService]))));
+    const childInstantiationService = instantiationService.createChild(( new ServiceCollection([IExtensionManagementService, remoteExtensionManagementService])));
     try {
         const cliService = childInstantiationService.createInstance(RemoteExtensionManagementCLI, logger);
         if (args.list) {
             await cliService.listExtensions(!!args.list.showVersions, args.list.category, undefined);
         }
         else {
-            const revive = (inputs) => ( (inputs.map(input => isString(input) ? input : URI.revive(input))));
+            const revive = (inputs) => ( inputs.map(input => isString(input) ? input : URI.revive(input)));
             if (Array.isArray(args.install) && args.install.length) {
                 try {
                     await cliService.installExtensions(revive(args.install), [], { isMachineScoped: true }, !!args.force);
@@ -91,7 +92,7 @@ let RemoteExtensionManagementCLI = class RemoteExtensionManagementCLI extends Ex
         if (!this._extensionManifestPropertiesService.canExecuteOnWorkspace(manifest)
             && !(isWeb && this._extensionManifestPropertiesService.canExecuteOnWeb(manifest))) {
             this.logger.info(( localize(
-                4509,
+                2254,
                 "Cannot install the '{0}' extension because it is declared to not run in this setup.",
                 getExtensionId(manifest.publisher, manifest.name)
             )));
@@ -100,10 +101,10 @@ let RemoteExtensionManagementCLI = class RemoteExtensionManagementCLI extends Ex
         return true;
     }
 };
-RemoteExtensionManagementCLI = ( (__decorate([
-    ( (__param(1, IExtensionManagementService))),
-    ( (__param(2, IExtensionGalleryService))),
-    ( (__param(3, ILabelService))),
-    ( (__param(4, IWorkbenchEnvironmentService))),
-    ( (__param(5, IExtensionManifestPropertiesService)))
-], RemoteExtensionManagementCLI)));
+RemoteExtensionManagementCLI = ( __decorate([
+    ( __param(1, IExtensionManagementService)),
+    ( __param(2, IExtensionGalleryService)),
+    ( __param(3, ILabelService)),
+    ( __param(4, IWorkbenchEnvironmentService)),
+    ( __param(5, IExtensionManifestPropertiesService))
+], RemoteExtensionManagementCLI));

package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.d.ts

@@ -0,0 +1,65 @@
+import { DeferredPromise } from "vscode/vscode/vs/base/common/async";
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { IMarkdownString } from "vscode/vscode/vs/base/common/htmlContent";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { UriComponents } from "vscode/vscode/vs/base/common/uri";
+import { ILanguageFeaturesService } from "vscode/vscode/vs/editor/common/services/languageFeatures";
+import { ExtensionIdentifier } from "vscode/vscode/vs/platform/extensions/common/extensions";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IChatWidgetService } from "vscode/vscode/vs/workbench/contrib/chat/browser/chat.service";
+import { IChatAgentService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
+import { IChatRelatedFileProviderMetadata } from "vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IChatEditingService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
+import { IChatContentInlineReference, IChatContentReference, IChatTask, IChatWarningMessage } from "vscode/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IChatService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IExtensionService } from "vscode/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { Dto } from "vscode/vscode/vs/workbench/services/extensions/common/proxyIdentifier";
+import { IChatProgressDto, IDynamicChatAgentProps, IExtensionChatAgentMetadata, MainThreadChatAgentsShape2 } from "vscode/vscode/vs/workbench/api/common/extHost.protocol";
+export declare class MainThreadChatTask implements IChatTask {
+    content: IMarkdownString;
+    readonly kind = "progressTask";
+    readonly deferred: DeferredPromise<string | void>;
+    private readonly _onDidAddProgress;
+    get onDidAddProgress(): Event<IChatWarningMessage | IChatContentReference>;
+    readonly progress: (IChatWarningMessage | IChatContentReference)[];
+    constructor(content: IMarkdownString);
+    task(): Promise<string | void>;
+    isSettled(): boolean;
+    complete(v: string | void): void;
+    add(progress: IChatWarningMessage | IChatContentReference): void;
+}
+export declare class MainThreadChatAgents2 extends Disposable implements MainThreadChatAgentsShape2 {
+    private readonly _chatAgentService;
+    private readonly _chatService;
+    private readonly _chatEditingService;
+    private readonly _languageFeaturesService;
+    private readonly _chatWidgetService;
+    private readonly _instantiationService;
+    private readonly _logService;
+    private readonly _extensionService;
+    private readonly _agents;
+    private readonly _agentCompletionProviders;
+    private readonly _agentIdsToCompletionProviders;
+    private readonly _chatParticipantDetectionProviders;
+    private readonly _chatRelatedFilesProviders;
+    private readonly _pendingProgress;
+    private readonly _proxy;
+    private _responsePartHandlePool;
+    private readonly _activeTasks;
+    private readonly _unresolvedAnchors;
+    constructor(extHostContext: IExtHostContext, _chatAgentService: IChatAgentService, _chatService: IChatService, _chatEditingService: IChatEditingService, _languageFeaturesService: ILanguageFeaturesService, _chatWidgetService: IChatWidgetService, _instantiationService: IInstantiationService, _logService: ILogService, _extensionService: IExtensionService);
+    $unregisterAgent(handle: number): void;
+    $transferActiveChatSession(toWorkspace: UriComponents): void;
+    $registerAgent(handle: number, extension: ExtensionIdentifier, id: string, metadata: IExtensionChatAgentMetadata, dynamicProps: IDynamicChatAgentProps | undefined): Promise<void>;
+    $updateAgent(handle: number, metadataUpdate: IExtensionChatAgentMetadata): Promise<void>;
+    $handleProgressChunk(requestId: string, progress: IChatProgressDto, responsePartHandle?: number): Promise<number | void>;
+    $handleAnchorResolve(requestId: string, handle: string, resolveAnchor: Dto<IChatContentInlineReference> | undefined): void;
+    $registerAgentCompletionsProvider(handle: number, id: string, triggerCharacters: string[]): void;
+    $unregisterAgentCompletionsProvider(handle: number, id: string): void;
+    $registerChatParticipantDetectionProvider(handle: number): void;
+    $unregisterChatParticipantDetectionProvider(handle: number): void;
+    $registerRelatedFilesProvider(handle: number, metadata: IChatRelatedFileProviderMetadata): void;
+    $unregisterRelatedFilesProvider(handle: number): void;
+}

package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { DeferredPromise } from 'vscode/vscode/vs/base/common/async';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -8,21 +9,23 @@ import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { getWordAtText } from 'vscode/vscode/vs/editor/common/core/wordHelper';
+import { CompletionItemKind } from 'vscode/vscode/vs/editor/common/languages';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatInputPart } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
+import { ChatInputPart } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ChatRequestAgentPart } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
+import { IChatEditingService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
+import { ChatRequestAgentPart } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestParser } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { addDynamicVariableActionId } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant';
+import { addDynamicVariableActionId } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant';
 
 class MainThreadChatTask {
     get onDidAddProgress() { return this._onDidAddProgress.event; }
@@ -48,10 +51,11 @@ class MainThreadChatTask {
     }
 }
 let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
-    constructor(extHostContext, _chatAgentService, _chatService, _languageFeaturesService, _chatWidgetService, _instantiationService, _logService, _extensionService) {
+    constructor(extHostContext, _chatAgentService, _chatService, _chatEditingService, _languageFeaturesService, _chatWidgetService, _instantiationService, _logService, _extensionService) {
         super();
         this._chatAgentService = _chatAgentService;
         this._chatService = _chatService;
+        this._chatEditingService = _chatEditingService;
         this._languageFeaturesService = _languageFeaturesService;
         this._chatWidgetService = _chatWidgetService;
         this._instantiationService = _instantiationService;
@@ -61,6 +65,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         this._agentCompletionProviders = this._register(( new DisposableMap()));
         this._agentIdsToCompletionProviders = this._register(( new DisposableMap()));
         this._chatParticipantDetectionProviders = this._register(( new DisposableMap()));
+        this._chatRelatedFilesProviders = this._register(( new DisposableMap()));
         this._pendingProgress = ( new Map());
         this._responsePartHandlePool = 0;
         this._activeTasks = ( new Map());
@@ -98,7 +103,8 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         const inputValue = widget?.inputEditor.getValue() ?? '';
         this._chatService.transferChatSession({ sessionId, inputValue }, URI.revive(toWorkspace));
     }
-    $registerAgent(handle, extension, id, metadata, dynamicProps) {
+    async $registerAgent(handle, extension, id, metadata, dynamicProps) {
+        await this._extensionService.whenInstalledExtensionsRegistered();
         const staticAgentRegistration = this._chatAgentService.getAgent(id, true);
         if (!staticAgentRegistration && !dynamicProps) {
             if (this._chatAgentService.getAgentsByName(id).length) {
@@ -162,7 +168,8 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
             hasFollowups: metadata.hasFollowups
         });
     }
-    $updateAgent(handle, metadataUpdate) {
+    async $updateAgent(handle, metadataUpdate) {
+        await this._extensionService.whenInstalledExtensionsRegistered();
         const data = this._agents.get(handle);
         if (!data) {
             this._logService.error(`MainThreadChatAgents2#$updateAgent: No agent with handle ${handle} registered`);
@@ -262,7 +269,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                         label: v.label,
                         range,
                         insertText: insertText + ' ',
-                        kind: 18 ,
+                        kind: CompletionItemKind.Text,
                         detail: v.detail,
                         documentation: v.documentation,
                         command: { id: addDynamicVariableActionId, title: '', arguments: [{ id: v.id, widget, range: rangeAfterInsert, variableData: revive(v.value), command: v.command }] }
@@ -288,16 +295,28 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
     $unregisterChatParticipantDetectionProvider(handle) {
         this._chatParticipantDetectionProviders.deleteAndDispose(handle);
     }
+    $registerRelatedFilesProvider(handle, metadata) {
+        this._chatRelatedFilesProviders.set(handle, this._chatEditingService.registerRelatedFilesProvider(handle, {
+            description: metadata.description,
+            provideRelatedFiles: async (request, token) => {
+                return (await this._proxy.$provideRelatedFiles(handle, request, token))?.map((v) => ({ uri: ( URI.from(v.uri)), description: v.description })) ?? [];
+            }
+        }));
+    }
+    $unregisterRelatedFilesProvider(handle) {
+        this._chatRelatedFilesProviders.deleteAndDispose(handle);
+    }
 };
 MainThreadChatAgents2 = __decorate([
     extHostNamedCustomer(MainContext.MainThreadChatAgents2),
     ( __param(1, IChatAgentService)),
     ( __param(2, IChatService)),
-    ( __param(3, ILanguageFeaturesService)),
-    ( __param(4, IChatWidgetService)),
-    ( __param(5, IInstantiationService)),
-    ( __param(6, ILogService)),
-    ( __param(7, IExtensionService))
+    ( __param(3, IChatEditingService)),
+    ( __param(4, ILanguageFeaturesService)),
+    ( __param(5, IChatWidgetService)),
+    ( __param(6, IInstantiationService)),
+    ( __param(7, ILogService)),
+    ( __param(8, IExtensionService))
 ], MainThreadChatAgents2);
 function computeCompletionRanges(model, position, reg) {
     const varWord = getWordAtText(position.column, reg, model.getLineContent(position.lineNumber), 0);

package/vscode/src/vs/workbench/api/browser/mainThreadChatCodeMapper.d.ts

@@ -0,0 +1,15 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { ICodeMapperService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { ICodeMapperProgressDto, MainThreadCodeMapperShape } from "vscode/vscode/vs/workbench/api/common/extHost.protocol";
+export declare class MainThreadChatCodemapper extends Disposable implements MainThreadCodeMapperShape {
+    private readonly codeMapperService;
+    private providers;
+    private readonly _proxy;
+    private static _requestHandlePool;
+    private _responseMap;
+    constructor(extHostContext: IExtHostContext, codeMapperService: ICodeMapperService);
+    $registerCodeMapperProvider(handle: number): void;
+    $unregisterCodeMapperProvider(handle: number): void;
+    $handleProgress(requestId: string, data: ICodeMapperProgressDto): Promise<void>;
+}

package/vscode/src/vs/workbench/api/browser/mainThreadChatCodeMapper.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ICodeMapperService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service';

package/vscode/src/vs/workbench/api/browser/mainThreadChatVariables.d.ts

@@ -0,0 +1,15 @@
+import { IChatVariableResolverProgressDto, MainThreadChatVariablesShape } from "vscode/vscode/vs/workbench/api/common/extHost.protocol";
+import { IChatVariableData } from "vscode/vscode/vs/workbench/contrib/chat/common/chatVariables";
+import { IChatVariablesService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatVariables.service";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+export declare class MainThreadChatVariables implements MainThreadChatVariablesShape {
+    private readonly _chatVariablesService;
+    private readonly _proxy;
+    private readonly _variables;
+    private readonly _pendingProgress;
+    constructor(extHostContext: IExtHostContext, _chatVariablesService: IChatVariablesService);
+    dispose(): void;
+    $registerVariable(handle: number, data: IChatVariableData): void;
+    $handleProgressChunk(requestId: string, progress: IChatVariableResolverProgressDto): Promise<number | void>;
+    $unregisterVariable(handle: number): void;
+}

package/vscode/src/vs/workbench/api/browser/mainThreadChatVariables.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { revive } from 'vscode/vscode/vs/base/common/marshalling';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';

package/vscode/src/vs/workbench/api/browser/mainThreadClipboard.d.ts

@@ -0,0 +1,9 @@
+import { MainThreadClipboardShape } from "vscode/vscode/vs/workbench/api/common/extHost.protocol";
+import { IClipboardService } from "vscode/vscode/vs/platform/clipboard/common/clipboardService.service";
+export declare class MainThreadClipboard implements MainThreadClipboardShape {
+    private readonly _clipboardService;
+    constructor(_context: any, _clipboardService: IClipboardService);
+    dispose(): void;
+    $readText(): Promise<string>;
+    $writeText(value: string): Promise<void>;
+}

package/vscode/src/vs/workbench/api/browser/mainThreadClipboard.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';