@codingame/monaco-vscode-extensions-service-override 4.5.2 → 5.0.0

package/extensions.js

@@ -110,7 +110,6 @@ import './vscode/src/vs/workbench/api/browser/mainThreadNotebookRenderers.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadInteractive.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadInlineChat.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadChat.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadTask.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadLabelService.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js';
@@ -122,7 +121,6 @@ import './vscode/src/vs/workbench/api/browser/mainThreadShare.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadProfileContentHandlers.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadIssueReporter.js';
 
 let EsmWebWorkerExtensionHost = class EsmWebWorkerExtensionHost extends WebWorkerExtensionHost {
     constructor(workerConfig, runningLocation, startup, _initDataProvider, _telemetryService, _contextService, _labelService, _logService, _loggerService, _environmentService, _userDataProfilesService, _productService, _layoutService, _storageService) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "4.5.2",
+  "version": "5.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.5.2",
-    "@codingame/monaco-vscode-files-service-override": "4.5.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@5.0.0",
+    "@codingame/monaco-vscode-files-service-override": "5.0.0"
   }
 }

package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.js

@@ -92,7 +92,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     addInstallExtensionInfo(id, version, true);
                 }
             }
-            const installed = await this.extensionManagementService.getInstalled(1 , installOptions.profileLocation);
+            const installed = await this.extensionManagementService.getInstalled(undefined, installOptions.profileLocation);
             if (installVSIXInfos.length) {
                 await Promise.all(( (installVSIXInfos.map(async ({ vsix, installOptions }) => {
                     try {
@@ -145,7 +145,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 if (areSameExtensions(oldVersion.identifier, newVersion.identifier) && semverExports.gt(newVersion.version, oldVersion.manifest.version)) {
                     extensionsToUpdate.push({
                         extension: newVersion,
-                        options: { operation: 3 , installPreReleaseVersion: oldVersion.isPreReleaseVersion }
+                        options: { operation: 3 , installPreReleaseVersion: oldVersion.preRelease, profileLocation }
                     });
                 }
             }

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

@@ -16,7 +16,7 @@ let MainThreadBulkEdits = class MainThreadBulkEdits {
     }
     dispose() { }
     $tryApplyWorkspaceEdit(dto, undoRedoGroupId, isRefactoring) {
-        const edits = reviveWorkspaceEditDto(dto, this._uriIdentService);
+        const edits = reviveWorkspaceEditDto(dto.value, this._uriIdentService);
         return this._bulkEditService.apply(edits, { undoRedoGroupId, respectAutoSaveConfig: isRefactoring }).then((res) => res.isApplied, err => {
             this._logService.warn(`IGNORING workspace edit: ${err}`);
             return false;
@@ -60,6 +60,24 @@ function reviveWorkspaceEditDto(data, uriIdentityService, resolveDataTransferFil
         }
         if (ResourceNotebookCellEdit.is(edit)) {
             edit.resource = uriIdentityService.asCanonicalUri(edit.resource);
+            const cellEdit = edit.cellEdit;
+            if (cellEdit.editType === 1 ) {
+                edit.cellEdit = {
+                    ...cellEdit,
+                    cells: ( cellEdit.cells.map(cell => ({
+                        ...cell,
+                        outputs: ( cell.outputs.map(output => ({
+                            ...output,
+                            outputs: ( output.items.map(item => {
+                                return {
+                                    mime: item.mime,
+                                    data: item.valueBytes
+                                };
+                            }))
+                        })))
+                    })))
+                };
+            }
         }
     }
     return data;

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

@@ -2,10 +2,13 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { revive } from 'vscode/vscode/vs/base/common/marshalling';
 import { escapeRegExpCharacters } from 'vscode/vscode/vs/base/common/strings';
+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 { 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 { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatInputPart } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
@@ -16,15 +19,18 @@ import { ChatRequestAgentPart } from 'vscode/vscode/vs/workbench/contrib/chat/co
 import { ChatRequestParser } from 'vscode/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';
 
 let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
-    constructor(extHostContext, _chatAgentService, _chatService, _languageFeaturesService, _chatWidgetService, _instantiationService) {
+    constructor(extHostContext, _chatAgentService, _chatService, _languageFeaturesService, _chatWidgetService, _instantiationService, _logService, _extensionService) {
         super();
         this._chatAgentService = _chatAgentService;
         this._chatService = _chatService;
         this._languageFeaturesService = _languageFeaturesService;
         this._chatWidgetService = _chatWidgetService;
         this._instantiationService = _instantiationService;
+        this._logService = _logService;
+        this._extensionService = _extensionService;
         this._agents = this._register(( new DisposableMap()));
         this._agentCompletionProviders = this._register(( new DisposableMap()));
         this._pendingProgress = ( new Map());
@@ -51,6 +57,16 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
     $unregisterAgent(handle) {
         this._agents.deleteAndDispose(handle);
     }
+    $transferActiveChatSession(toWorkspace) {
+        const widget = this._chatWidgetService.lastFocusedWidget;
+        const sessionId = widget?.viewModel?.model.sessionId;
+        if (!sessionId) {
+            this._logService.error(`MainThreadChat#$transferActiveChatSession: No active chat session found`);
+            return;
+        }
+        const inputValue = widget?.inputEditor.getValue() ?? '';
+        this._chatService.transferChatSession({ sessionId, inputValue }, URI.revive(toWorkspace));
+    }
     $registerAgent(handle, extension, id, metadata, dynamicProps) {
         const staticAgentRegistration = this._chatAgentService.getAgent(id);
         if (!staticAgentRegistration && !dynamicProps) {
@@ -77,20 +93,24 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                 }
                 return this._proxy.$provideFollowups(request, handle, result, { history }, token);
             },
-            provideWelcomeMessage: (token) => {
-                return this._proxy.$provideWelcomeMessage(handle, token);
+            provideWelcomeMessage: (location, token) => {
+                return this._proxy.$provideWelcomeMessage(handle, location, token);
             },
-            provideSampleQuestions: (token) => {
-                return this._proxy.$provideSampleQuestions(handle, token);
+            provideSampleQuestions: (location, token) => {
+                return this._proxy.$provideSampleQuestions(handle, location, token);
             }
         };
         let disposable;
         if (!staticAgentRegistration && dynamicProps) {
+            const extensionDescription = this._extensionService.extensions.find(e => ExtensionIdentifier.equals(e.identifier, extension));
             disposable = this._chatAgentService.registerDynamicAgent({
                 id,
                 name: dynamicProps.name,
                 description: dynamicProps.description,
                 extensionId: extension,
+                extensionDisplayName: extensionDescription?.displayName ?? extension.value,
+                extensionPublisherId: extensionDescription?.publisher ?? '',
+                extensionPublisherDisplayName: extensionDescription?.publisherDisplayName,
                 metadata: revive(metadata),
                 slashCommands: [],
                 locations: [ChatAgentLocation.Panel]
@@ -159,7 +179,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                         kind: 18 ,
                         detail: v.detail,
                         documentation: v.documentation,
-                        command: { id: AddDynamicVariableAction.ID, title: '', arguments: [{ widget, range: rangeAfterInsert, variableData: revive(v.values) }] }
+                        command: { id: AddDynamicVariableAction.ID, title: '', arguments: [{ widget, range: rangeAfterInsert, variableData: revive(v.values), command: v.command }] }
                     };
                 }));
                 return {
@@ -178,7 +198,9 @@ MainThreadChatAgents2 = __decorate([
     ( __param(2, IChatService)),
     ( __param(3, ILanguageFeaturesService)),
     ( __param(4, IChatWidgetService)),
-    ( __param(5, IInstantiationService))
+    ( __param(5, IInstantiationService)),
+    ( __param(6, ILogService)),
+    ( __param(7, 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/mainThreadDebugService.js

@@ -322,7 +322,7 @@ let MainThreadDebugService = class MainThreadDebugService {
         this.getDebugAdapter(handle).acceptMessage(convertToVSCPaths(message, false));
     }
     $acceptDAError(handle, name, message, stack) {
-        this.getDebugAdapter(handle).fireError(handle, ( new Error(`${name}: ${message}\n${stack}`)));
+        this._debugAdapters.get(handle)?.fireError(handle, ( new Error(`${name}: ${message}\n${stack}`)));
     }
     $acceptDAExit(handle, code, signal) {
         this.getDebugAdapter(handle).fireExit(handle, code, signal);

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

@@ -1,29 +1,30 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+import { DisposableStore, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
+import { isEqual } from 'vscode/vscode/vs/base/common/resources';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
 import { DiffEditorInput } from 'vscode/vscode/vs/workbench/common/editor/diffEditorInput';
-import { editorGroupToColumn, columnToEditorGroup } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupColumn';
-import { preferredSideBySideGroupDirection } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { isGroupEditorMoveEvent } from 'vscode/vscode/vs/workbench/common/editor/editorGroupModel';
+import { SideBySideEditorInput } from 'vscode/vscode/vs/workbench/common/editor/sideBySideEditorInput';
 import { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
-import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { CustomEditorInput } from 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
-import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { WebviewInput } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
-import { TerminalEditorInput } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
-import { SideBySideEditorInput } from 'vscode/vscode/vs/workbench/common/editor/sideBySideEditorInput';
-import { isEqual } from 'vscode/vscode/vs/base/common/resources';
-import { isGroupEditorMoveEvent } from 'vscode/vscode/vs/workbench/common/editor/editorGroupModel';
 import { InteractiveEditorInput } from 'vscode/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput';
 import { MergeEditorInput } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { MultiDiffEditorInput } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { TerminalEditorInput } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
+import { WebviewInput } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { editorGroupToColumn, columnToEditorGroup } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { preferredSideBySideGroupDirection } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
+import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
 let MainThreadEditorTabs = class MainThreadEditorTabs {
     constructor(extHostContext, _editorGroupsService, _configurationService, _logService, editorService) {
@@ -34,6 +35,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
         this._tabGroupModel = [];
         this._groupLookup = ( new Map());
         this._tabInfoLookup = ( new Map());
+        this._multiDiffEditorInputListeners = ( new DisposableMap());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostEditorTabs));
         this._dispoables.add(editorService.onDidEditorsChange((event) => {
             try {
@@ -44,6 +46,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
                 this._createTabsModel();
             }
         }));
+        this._dispoables.add(this._multiDiffEditorInputListeners);
         this._dispoables.add(this._editorGroupsService.onDidAddGroup(() => this._createTabsModel()));
         this._dispoables.add(this._editorGroupsService.onDidRemoveGroup(() => this._createTabsModel()));
         this._editorGroupsService.whenReady.then(() => this._createTabsModel());
@@ -150,12 +153,11 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
         if (editor instanceof ChatEditorInput) {
             return {
                 kind: 10 ,
-                providerId: editor.providerId ?? 'unknown',
             };
         }
         if (editor instanceof MultiDiffEditorInput) {
             const diffEditors = [];
-            for (const resource of (editor?.initialResources ?? [])) {
+            for (const resource of (editor?.resources.get() ?? [])) {
                 if (resource.original && resource.modified) {
                     diffEditors.push({
                         kind: 2 ,
@@ -220,7 +222,23 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
         }
         const tabObject = this._buildTabObject(group, editorInput, editorIndex);
         tabs.splice(editorIndex, 0, tabObject);
-        this._tabInfoLookup.set(this._generateTabId(editorInput, groupId), { group, editorInput, tab: tabObject });
+        const tabId = this._generateTabId(editorInput, groupId);
+        this._tabInfoLookup.set(tabId, { group, editorInput, tab: tabObject });
+        if (editorInput instanceof MultiDiffEditorInput) {
+            this._multiDiffEditorInputListeners.set(editorInput, Event.fromObservableLight(editorInput.resources)(() => {
+                const tabInfo = this._tabInfoLookup.get(tabId);
+                if (!tabInfo) {
+                    return;
+                }
+                tabInfo.tab = this._buildTabObject(group, editorInput, editorIndex);
+                this._proxy.$acceptTabOperation({
+                    groupId,
+                    index: editorIndex,
+                    tabDto: tabInfo.tab,
+                    kind: 2
+                });
+            }));
+        }
         this._proxy.$acceptTabOperation({
             groupId,
             index: editorIndex,
@@ -240,6 +258,9 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
             return;
         }
         this._tabInfoLookup.delete(removedTab[0]?.id ?? '');
+        if (removedTab[0]?.input instanceof MultiDiffEditorInput) {
+            this._multiDiffEditorInputListeners.deleteAndDispose(removedTab[0]?.input);
+        }
         this._proxy.$acceptTabOperation({
             groupId,
             index: editorIndex,
@@ -334,6 +355,9 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
         });
     }
     _createTabsModel() {
+        if (this._editorGroupsService.groups.length === 0) {
+            return;
+        }
         this._tabGroupModel = [];
         this._groupLookup.clear();
         this._tabInfoLookup.clear();

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

@@ -1,8 +1,11 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { isFalsyOrEmpty } from 'vscode/vscode/vs/base/common/arrays';
 import { VSDataTransfer, createStringDataTransferItem } from 'vscode/vscode/vs/base/common/dataTransfer';
 import { CancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { HierarchicalKind } from 'vscode/vscode/vs/base/common/hierarchicalKind';
 import { Disposable, DisposableMap, combinedDisposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { revive } from 'vscode/vscode/vs/base/common/marshalling';
 import { mixin } from 'vscode/vscode/vs/base/common/objects';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -19,9 +22,6 @@ import { WorkspaceSymbolProviderRegistry } from 'vscode/vscode/vs/workbench/cont
 import { TypeHierarchyProviderRegistry } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
-import { isFalsyOrEmpty } from 'vscode/vscode/vs/base/common/arrays';
-import { HierarchicalKind } from 'vscode/vscode/vs/base/common/hierarchicalKind';
 
 var MainThreadLanguageFeatures_1;
 let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThreadLanguageFeatures extends Disposable {
@@ -202,8 +202,15 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
     }
     $registerHoverProvider(handle, selector) {
         this._registrations.set(handle, this._languageFeaturesService.hoverProvider.register(selector, {
-            provideHover: (model, position, token) => {
-                return this._proxy.$provideHover(handle, model.uri, position, token);
+            provideHover: async (model, position, token, context) => {
+                const serializedContext = {
+                    verbosityRequest: context?.verbosityRequest ? {
+                        action: context.verbosityRequest.action,
+                        previousHover: { id: context.verbosityRequest.previousHover.id }
+                    } : undefined,
+                };
+                const hover = await this._proxy.$provideHover(handle, model.uri, position, serializedContext, token);
+                return hover;
             }
         }));
     }
@@ -394,8 +401,9 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
     }
     $registerNewSymbolNamesProvider(handle, selector) {
         this._registrations.set(handle, this._languageFeaturesService.newSymbolNamesProvider.register(selector, {
-            provideNewSymbolNames: (model, range, token) => {
-                return this._proxy.$provideNewSymbolNames(handle, model.uri, range, token);
+            supportsAutomaticNewSymbolNamesTriggerKind: this._proxy.$supportsAutomaticNewSymbolNamesTriggerKind(handle),
+            provideNewSymbolNames: (model, range, triggerKind, token) => {
+                return this._proxy.$provideNewSymbolNames(handle, model.uri, range, triggerKind, token);
             }
         }));
     }
@@ -800,7 +808,7 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
     $registerDocumentOnDropEditProvider(handle, selector, metadata) {
         const provider = ( new MainThreadDocumentOnDropEditProvider(handle, this._proxy, metadata, this._uriIdentService));
         this._documentOnDropEditProviders.set(handle, provider);
-        this._registrations.set(handle, combinedDisposable(this._languageFeaturesService.documentOnDropEditProvider.register(selector, provider), toDisposable(() => this._documentOnDropEditProviders.delete(handle))));
+        this._registrations.set(handle, combinedDisposable(this._languageFeaturesService.documentDropEditProvider.register(selector, provider), toDisposable(() => this._documentOnDropEditProviders.delete(handle))));
     }
     async $resolveDocumentOnDropFileData(handle, requestId, dataId) {
         const provider = this._documentOnDropEditProviders.get(handle);
@@ -905,8 +913,17 @@ let MainThreadDocumentOnDropEditProvider = class MainThreadDocumentOnDropEditPro
         this._uriIdentService = _uriIdentService;
         this.dataTransfers = ( new DataTransferFileCache());
         this.dropMimeTypes = metadata?.dropMimeTypes ?? ['*/*'];
+        if (metadata?.supportsResolve) {
+            this.resolveDocumentDropEdit = async (edit, token) => {
+                const resolved = await this._proxy.$resolvePasteEdit(this._handle, edit._cacheId, token);
+                if (resolved.additionalEdit) {
+                    edit.additionalEdit = reviveWorkspaceEditDto(resolved.additionalEdit, this._uriIdentService);
+                }
+                return edit;
+            };
+        }
     }
-    async provideDocumentOnDropEdits(model, position, dataTransfer, token) {
+    async provideDocumentDropEdits(model, position, dataTransfer, token) {
         const request = this.dataTransfers.add(dataTransfer);
         try {
             const dataTransferDto = await DataTransfer.from(dataTransfer);

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

@@ -5,22 +5,20 @@ import { DisposableStore, DisposableMap, Disposable, toDisposable } from 'vscode
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
-import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+import { ILanguageModelStatsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelStats.service';
 import { ILanguageModelsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { IAuthenticationAccessService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service';
 import { INTERNAL_AUTH_PROVIDER_PREFIX } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication';
 import { IAuthenticationService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication.service';
-import { Extensions } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
-import { IExtensionFeaturesManagementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 
 const _moduleId = "vs/workbench/api/browser/mainThreadLanguageModels";
 let MainThreadLanguageModels = class MainThreadLanguageModels {
-    constructor(extHostContext, _chatProviderService, _extensionFeaturesManagementService, _logService, _authenticationService, _authenticationAccessService, _extensionService) {
+    constructor(extHostContext, _chatProviderService, _languageModelStatsService, _logService, _authenticationService, _authenticationAccessService, _extensionService) {
         this._chatProviderService = _chatProviderService;
-        this._extensionFeaturesManagementService = _extensionFeaturesManagementService;
+        this._languageModelStatsService = _languageModelStatsService;
         this._logService = _logService;
         this._authenticationService = _authenticationService;
         this._authenticationAccessService = _authenticationAccessService;
@@ -49,18 +47,14 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
                 finally {
                     this._pendingProgress.delete(requestId);
                 }
-            }
+            },
+            provideTokenCount: (str, token) => {
+                return this._proxy.$provideTokenLength(handle, str, token);
+            },
         }));
         if (metadata.auth) {
             dipsosables.add(this._registerAuthenticationProvider(metadata.extension, metadata.auth));
         }
-        dipsosables.add(( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
-            id: `lm-${identifier}`,
-            label: ( localizeWithPath(_moduleId, 0, "Language Model ({0})", `${identifier}`)),
-            access: {
-                canToggle: false,
-            },
-        }));
         this._providerRegistrations.set(handle, dipsosables);
     }
     async $handleProgressChunk(requestId, chunk) {
@@ -69,6 +63,9 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
     $unregisterProvider(handle) {
         this._providerRegistrations.deleteAndDispose(handle);
     }
+    $whenLanguageModelChatRequestMade(identifier, extensionId, participant, tokenCount) {
+        this._languageModelStatsService.update(identifier, extensionId, participant, tokenCount);
+    }
     async $prepareChatAccess(extension, providerId, justification) {
         const activate = this._extensionService.activateByEvent(`onLanguageModelAccess:${providerId}`);
         const metadata = this._chatProviderService.lookupLanguageModel(providerId);
@@ -82,7 +79,6 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         return this._chatProviderService.lookupLanguageModel(providerId);
     }
     async $fetchResponse(extension, providerId, requestId, messages, options, token) {
-        await this._extensionFeaturesManagementService.getAccess(extension, `lm-${providerId}`);
         this._logService.debug('[CHAT] extension request STARTED', extension.value, requestId);
         const task = this._chatProviderService.makeLanguageModelChatRequest(providerId, extension, messages, options, ( (new Progress(value => {
             this._proxy.$handleResponseFragment(requestId, value);
@@ -95,12 +91,15 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         });
         return task;
     }
+    $countTokens(provider, value, token) {
+        return this._chatProviderService.computeTokenLength(provider, value, token);
+    }
     _registerAuthenticationProvider(extension, auth) {
         const authProviderId = INTERNAL_AUTH_PROVIDER_PREFIX + extension.value;
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localizeWithPath(_moduleId, 1, 'Language Models'));
+        const accountLabel = auth.accountLabel ?? ( localizeWithPath(_moduleId, 0, 'Language Models'));
         const disposables = ( (new DisposableStore()));
         this._authenticationService.registerAuthenticationProvider(authProviderId, ( (new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel))));
         disposables.add(toDisposable(() => {
@@ -127,7 +126,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
 MainThreadLanguageModels = __decorate([
     extHostNamedCustomer(MainContext.MainThreadLanguageModels),
     ( (__param(1, ILanguageModelsService))),
-    ( (__param(2, IExtensionFeaturesManagementService))),
+    ( (__param(2, ILanguageModelStatsService))),
     ( (__param(3, ILogService))),
     ( (__param(4, IAuthenticationService))),
     ( (__param(5, IAuthenticationAccessService))),

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

@@ -4,6 +4,7 @@ import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 import { isString } from 'vscode/vscode/vs/base/common/types';
 import { platform } from 'vscode/vscode/vs/base/common/platform';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { TaskDefinition, PresentationOptions, RunOptions, CommandOptions, RuntimeType, TaskSourceKind, CustomTask, ContributedTask, ConfiguringTask } from 'vscode/vscode/vs/workbench/contrib/tasks/common/tasks';
 import { ITaskService } from 'vscode/vscode/vs/workbench/contrib/tasks/common/taskService.service';
@@ -429,14 +430,15 @@ var TaskFilterDTO;
     }
     TaskFilterDTO.to = to;
 })(TaskFilterDTO || (TaskFilterDTO = {}))));
-let MainThreadTask = class MainThreadTask {
+let MainThreadTask = class MainThreadTask extends Disposable {
     constructor(extHostContext, _taskService, _workspaceContextServer, _configurationResolverService) {
+        super();
         this._taskService = _taskService;
         this._workspaceContextServer = _workspaceContextServer;
         this._configurationResolverService = _configurationResolverService;
         this._proxy = ( (extHostContext.getProxy(ExtHostContext.ExtHostTask)));
         this._providers = ( (new Map()));
-        this._taskService.onDidStateChange(async (event) => {
+        this._register(this._taskService.onDidStateChange(async (event) => {
             if (event.kind === "changed" ) {
                 return;
             }
@@ -462,13 +464,14 @@ let MainThreadTask = class MainThreadTask {
             else if (event.kind === "end" ) {
                 this._proxy.$OnDidEndTask(TaskExecutionDTO.from(task.getTaskExecution()));
             }
-        });
+        }));
     }
     dispose() {
         for (const value of ( (this._providers.values()))) {
             value.disposable.dispose();
         }
         this._providers.clear();
+        super.dispose();
     }
     $createTaskId(taskDTO) {
         return (

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

@@ -1,21 +1,29 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Event } from 'vscode/vscode/vs/base/common/event';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { ITerminalService } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { TerminalShellExecutionCommandLineConfidence } from 'vscode/vscode/vs/workbench/api/common/extHostTypes';
 
 let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegration extends Disposable {
     constructor(extHostContext, _terminalService, workbenchEnvironmentService) {
         super();
         this._terminalService = _terminalService;
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostTerminalShellIntegration));
-        const onDidAddCommandDetection = this._terminalService.createOnInstanceEvent(instance => {
+        const instanceDataListeners = ( new Map());
+        this._register(toDisposable(() => {
+            for (const listener of ( instanceDataListeners.values())) {
+                listener.dispose();
+            }
+        }));
+        const onDidAddCommandDetection = this._store.add(this._terminalService.createOnInstanceEvent(instance => {
             return ( Event.map(Event.filter(instance.capabilities.onDidAddCapabilityType, e => {
                 return e === 2 ;
-            }, this._store), () => instance));
-        });
+            }), () => instance));
+        })).event;
         this._store.add(onDidAddCommandDetection(e => this._proxy.$shellIntegrationChange(e.instanceId)));
         const commandDetectionStartEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(2 , e => e.onCommandExecuted));
         let currentCommand;
@@ -24,28 +32,48 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
                 return;
             }
             currentCommand = e.data;
-            this._proxy.$shellExecutionStart(e.instance.instanceId, e.data.command, e.data.cwd);
+            const instanceId = e.instance.instanceId;
+            this._proxy.$shellExecutionStart(instanceId, e.data.command, convertToExtHostCommandLineConfidence(e.data), e.data.isTrusted, this._convertCwdToUri(e.data.cwd));
+            instanceDataListeners.get(instanceId)?.dispose();
+            instanceDataListeners.set(instanceId, Event.accumulate(e.instance.onData, 50, this._store)(events => this._proxy.$shellExecutionData(instanceId, events.join())));
         }));
         const commandDetectionEndEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(2 , e => e.onCommandFinished));
         this._store.add(commandDetectionEndEvent.event(e => {
             currentCommand = undefined;
-            this._proxy.$shellExecutionEnd(e.instance.instanceId, e.data.command, e.data.exitCode);
+            const instanceId = e.instance.instanceId;
+            instanceDataListeners.get(instanceId)?.dispose();
+            setTimeout(() => {
+                this._proxy.$shellExecutionEnd(instanceId, e.data.command, convertToExtHostCommandLineConfidence(e.data), e.data.isTrusted, e.data.exitCode);
+            });
         }));
         const cwdChangeEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(0 , e => e.onDidChangeCwd));
-        this._store.add(cwdChangeEvent.event(e => this._proxy.$cwdChange(e.instance.instanceId, e.data)));
+        this._store.add(cwdChangeEvent.event(e => {
+            this._proxy.$cwdChange(e.instance.instanceId, this._convertCwdToUri(e.data));
+        }));
         this._store.add(this._terminalService.onDidDisposeInstance(e => this._proxy.$closeTerminal(e.instanceId)));
-        if (!workbenchEnvironmentService.remoteAuthority) {
-            this._store.add(this._terminalService.onAnyInstanceData(e => this._proxy.$shellExecutionData(e.instance.instanceId, e.data)));
-        }
     }
     $executeCommand(terminalId, commandLine) {
         this._terminalService.getInstanceFromId(terminalId)?.runCommand(commandLine, true);
     }
+    _convertCwdToUri(cwd) {
+        return cwd ? URI.file(cwd) : undefined;
+    }
 };
 MainThreadTerminalShellIntegration = __decorate([
     extHostNamedCustomer(MainContext.MainThreadTerminalShellIntegration),
     ( __param(1, ITerminalService)),
     ( __param(2, IWorkbenchEnvironmentService))
 ], MainThreadTerminalShellIntegration);
+function convertToExtHostCommandLineConfidence(command) {
+    switch (command.commandLineConfidence) {
+        case 'high':
+            return TerminalShellExecutionCommandLineConfidence.High;
+        case 'medium':
+            return TerminalShellExecutionCommandLineConfidence.Medium;
+        case 'low':
+        default:
+            return TerminalShellExecutionCommandLineConfidence.Low;
+    }
+}
 
 export { MainThreadTerminalShellIntegration };

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

@@ -6,6 +6,7 @@ import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/base/common/arrays';
 import { WellDefinedPrefixTree } from 'vscode/vscode/vs/base/common/prefixTree';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';

package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js

@@ -9,6 +9,7 @@ import { mark } from 'vscode/vscode/vs/base/common/performance';
 import { isCI } from 'vscode/vscode/vs/base/common/platform';
 import { isEqualOrParent } from 'vscode/vscode/vs/base/common/resources';
 import { StopWatch } from 'vscode/vscode/vs/base/common/stopwatch';
+import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
@@ -641,7 +642,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._onDidChangeResponsiveChange.fire({
                 extensionHostKind: processManager.kind,
                 isResponsive: responsiveState === 0 ,
-                getInspectPort: (tryEnableInspector) => {
+                getInspectListener: (tryEnableInspector) => {
                     return processManager.getInspectPort(tryEnableInspector);
                 }
             });
@@ -840,7 +841,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
     }
     async getInspectPorts(extensionHostKind, tryEnableInspector) {
         const result = await Promise.all(( (this._getExtensionHostManagers(extensionHostKind).map(extHost => extHost.getInspectPort(tryEnableInspector)))));
-        return result.filter(element => Boolean(element));
+        return result.filter(isDefined);
     }
     async setRemoteEnvironment(env) {
         await ( (this._extensionHostManagers

package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js

@@ -266,7 +266,7 @@ let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager e
                 return port;
             }
         }
-        return 0;
+        return undefined;
     }
     async resolveAuthority(remoteAuthority, resolveAttempt) {
         const sw = StopWatch.create(false);

package/vscode/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.js

@@ -105,10 +105,7 @@ let LazyCreateExtensionHostManager = class LazyCreateExtensionHostManager extend
     }
     async getInspectPort(tryEnableInspector) {
         await this._startCalled.wait();
-        if (this._actual) {
-            return this._actual.getInspectPort(tryEnableInspector);
-        }
-        return 0;
+        return this._actual?.getInspectPort(tryEnableInspector);
     }
     async resolveAuthority(remoteAuthority, resolveAttempt) {
         await this._startCalled.wait();

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

@@ -1,70 +0,0 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
-import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { IChatContributionService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContributionService.service';
-import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-
-let MainThreadChat = class MainThreadChat extends Disposable {
-    constructor(extHostContext, _chatService, _chatWidgetService, chatContribService) {
-        super();
-        this._chatService = _chatService;
-        this._chatWidgetService = _chatWidgetService;
-        this.chatContribService = chatContribService;
-        this._providerRegistrations = this._register(( new DisposableMap()));
-        this._stateEmitters = ( new Map());
-        this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostChat));
-    }
-    $transferChatSession(sessionId, toWorkspace) {
-        const sessionIdStr = this._chatService.getSessionId(sessionId);
-        if (!sessionIdStr) {
-            throw ( new Error(`Failed to transfer session. Unknown session provider ID: ${sessionId}`));
-        }
-        const widget = this._chatWidgetService.getWidgetBySessionId(sessionIdStr);
-        const inputValue = widget?.inputEditor.getValue() ?? '';
-        this._chatService.transferChatSession({ sessionId: sessionIdStr, inputValue: inputValue }, URI.revive(toWorkspace));
-    }
-    async $registerChatProvider(handle, id) {
-        const registration = this.chatContribService.registeredProviders.find(staticProvider => staticProvider.id === id);
-        if (!registration) {
-            throw ( new Error(`Provider ${id} must be declared in the package.json.`));
-        }
-        const unreg = this._chatService.registerProvider({
-            id,
-            prepareSession: async (token) => {
-                const session = await this._proxy.$prepareChat(handle, token);
-                if (!session) {
-                    return undefined;
-                }
-                const emitter = ( new Emitter());
-                this._stateEmitters.set(session.id, emitter);
-                return {
-                    id: session.id,
-                    dispose: () => {
-                        emitter.dispose();
-                        this._stateEmitters.delete(session.id);
-                        this._proxy.$releaseSession(session.id);
-                    }
-                };
-            },
-        });
-        this._providerRegistrations.set(handle, unreg);
-    }
-    async $acceptChatState(sessionId, state) {
-        this._stateEmitters.get(sessionId)?.fire(state);
-    }
-    async $unregisterChatProvider(handle) {
-        this._providerRegistrations.deleteAndDispose(handle);
-    }
-};
-MainThreadChat = __decorate([
-    extHostNamedCustomer(MainContext.MainThreadChat),
-    ( __param(1, IChatService)),
-    ( __param(2, IChatWidgetService)),
-    ( __param(3, IChatContributionService))
-], MainThreadChat);
-
-export { MainThreadChat };

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

@@ -1,50 +0,0 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
-import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { IWorkbenchIssueService } from 'vscode/vscode/vs/workbench/services/issue/common/issue.service';
-
-let MainThreadIssueReporter = class MainThreadIssueReporter extends Disposable {
-    constructor(context, _issueService) {
-        super();
-        this._issueService = _issueService;
-        this._registrationsUri = this._register(( new DisposableMap()));
-        this._registrationsData = this._register(( new DisposableMap()));
-        this._proxy = ( context.getProxy(ExtHostContext.ExtHostIssueReporter));
-    }
-    $registerIssueUriRequestHandler(extensionId) {
-        const handler = {
-            provideIssueUrl: async (token) => {
-                const parts = await this._proxy.$getIssueReporterUri(extensionId, token);
-                return ( URI.from(parts));
-            }
-        };
-        this._registrationsUri.set(extensionId, this._issueService.registerIssueUriRequestHandler(extensionId, handler));
-    }
-    $unregisterIssueUriRequestHandler(extensionId) {
-        this._registrationsUri.deleteAndDispose(extensionId);
-    }
-    $registerIssueDataProvider(extensionId) {
-        const provider = {
-            provideIssueExtensionData: async (token) => {
-                const parts = await this._proxy.$getIssueReporterData(extensionId, token);
-                return parts;
-            },
-            provideIssueExtensionTemplate: async (token) => {
-                const parts = await this._proxy.$getIssueReporterTemplate(extensionId, token);
-                return parts;
-            }
-        };
-        this._registrationsData.set(extensionId, this._issueService.registerIssueDataProvider(extensionId, provider));
-    }
-    $unregisterIssueDataProvider(extensionId) {
-        this._registrationsData.deleteAndDispose(extensionId);
-    }
-};
-MainThreadIssueReporter = __decorate([
-    extHostNamedCustomer(MainContext.MainThreadIssueReporter),
-    ( __param(1, IWorkbenchIssueService))
-], MainThreadIssueReporter);
-
-export { MainThreadIssueReporter };