@codingame/monaco-vscode-api 6.0.3 → 7.0.1

package/vscode/src/vs/workbench/api/common/extHostLanguageModelTools.js

@@ -0,0 +1,46 @@
+import { toDisposable } from '../../../base/common/lifecycle.js';
+import { MainContext } from './extHost.protocol.js';
+import { LanguageModelToolDescription } from './extHostTypeConverters.js';
+class ExtHostLanguageModelTools {
+    constructor(mainContext) {
+        this._registeredTools = ( new Map());
+        this._allTools = ( new Map());
+        this._proxy = ( mainContext.getProxy(MainContext.MainThreadLanguageModelTools));
+        this._proxy.$getTools().then(tools => {
+            for (const tool of tools) {
+                this._allTools.set(tool.name, tool);
+            }
+        });
+    }
+    async invokeTool(name, parameters, token) {
+        return await this._proxy.$invokeTool(name, parameters, token);
+    }
+    async $acceptToolDelta(delta) {
+        if (delta.added) {
+            this._allTools.set(delta.added.name, delta.added);
+        }
+        if (delta.removed) {
+            this._allTools.delete(delta.removed);
+        }
+    }
+    get tools() {
+        return ( Array.from(( this._allTools.values()))
+            .map(tool => LanguageModelToolDescription.to(tool)));
+    }
+    async $invokeTool(name, parameters, token) {
+        const item = this._registeredTools.get(name);
+        if (!item) {
+            throw ( new Error(`Unknown tool ${name}`));
+        }
+        return await item.tool.invoke(parameters, token);
+    }
+    registerTool(extension, name, tool) {
+        this._registeredTools.set(name, { extension, tool });
+        this._proxy.$registerTool(name);
+        return toDisposable(() => {
+            this._registeredTools.delete(name);
+            this._proxy.$unregisterTool(name);
+        });
+    }
+}
+export { ExtHostLanguageModelTools };

package/vscode/src/vs/workbench/api/common/extHostLanguageModels.js

@@ -1,7 +1,8 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { Barrier, AsyncIterableSource } from '../../../base/common/async.js';
+import { AsyncIterableSource, AsyncIterableObject } from '../../../base/common/async.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
-import { CancellationError } from '../../../base/common/errors.js';
+import { toErrorMessage } from '../../../base/common/errorMessage.js';
+import { transformErrorForSerialization, CancellationError, transformErrorFromSerialization } from '../../../base/common/errors.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
 import { toDisposable } from '../../../base/common/lifecycle.js';
@@ -14,7 +15,7 @@ import { MainContext } from './extHost.protocol.js';
 import { IExtHostAuthentication } from './extHostAuthentication.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { LanguageModelChatMessage } from './extHostTypeConverters.js';
-import { LanguageModelError, LanguageModelChatMessageRole } from './extHostTypes.js';
+import { LanguageModelError, LanguageModelChatMessageRole, LanguageModelFunctionResultPart, LanguageModelTextPart, LanguageModelFunctionUsePart } from './extHostTypes.js';
 import { INTERNAL_AUTH_PROVIDER_PREFIX } from '../../services/authentication/common/authentication.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 var ExtHostLanguageModels_1;
@@ -32,10 +33,21 @@ class LanguageModelResponse {
         this._responseStreams = ( (new Map()));
         this._defaultStream = ( (new AsyncIterableSource()));
         this._isDone = false;
-        this._isStreaming = false;
         const that = this;
         this.apiObject = {
-            text: that._defaultStream.asyncIterable,
+            get stream() {
+                return that._defaultStream.asyncIterable;
+            },
+            get text() {
+                return ( (AsyncIterableObject.map(that._defaultStream.asyncIterable, part => {
+                    if (part instanceof LanguageModelTextPart) {
+                        return part.value;
+                    }
+                    else {
+                        return undefined;
+                    }
+                }))).coalesce();
+            },
         };
     }
     *_streams() {
@@ -52,7 +64,6 @@ class LanguageModelResponse {
         if (this._isDone) {
             return;
         }
-        this._isStreaming = true;
         let res = this._responseStreams.get(fragment.index);
         if (!res) {
             if (this._responseStreams.size === 0) {
@@ -63,10 +74,14 @@ class LanguageModelResponse {
             }
             this._responseStreams.set(fragment.index, res);
         }
-        res.stream.emitOne(fragment.part);
-    }
-    get isStreaming() {
-        return this._isStreaming;
+        let out;
+        if (fragment.part.type === 'text') {
+            out = new LanguageModelTextPart(fragment.part.value);
+        }
+        else {
+            out = new LanguageModelFunctionUsePart(fragment.part.name, fragment.part.parameters);
+        }
+        res.stream.emitOne(out);
     }
     reject(err) {
         this._isDone = true;
@@ -132,19 +147,44 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             responseReceivedListener?.dispose();
         });
     }
-    async $provideLanguageModelResponse(handle, requestId, from, messages, options, token) {
+    async $startChatRequest(handle, requestId, from, messages, options, token) {
         const data = this._languageModels.get(handle);
         if (!data) {
-            return;
+            throw ( (new Error('Provider not found')));
         }
         const progress = ( (new Progress(async (fragment) => {
             if (token.isCancellationRequested) {
                 this._logService.warn(`[CHAT](${data.extension.value}) CANNOT send progress because the REQUEST IS CANCELLED`);
                 return;
             }
-            this._proxy.$handleProgressChunk(requestId, { index: fragment.index, part: fragment.part });
+            let part;
+            if (fragment.part instanceof LanguageModelFunctionUsePart) {
+                part = { type: 'function_use', name: fragment.part.name, parameters: fragment.part.parameters };
+            }
+            else if (fragment.part instanceof LanguageModelTextPart) {
+                part = { type: 'text', value: fragment.part.value };
+            }
+            if (!part) {
+                this._logService.warn(`[CHAT](${data.extension.value}) UNKNOWN part ${JSON.stringify(fragment)}`);
+                return;
+            }
+            this._proxy.$reportResponsePart(requestId, { index: fragment.index, part });
         })));
-        return data.provider.provideLanguageModelResponse(( (messages.map(LanguageModelChatMessage.to))), options, ExtensionIdentifier.toKey(from), progress, token);
+        let p;
+        if (data.provider.provideLanguageModelResponse2) {
+            p = Promise.resolve(data.provider.provideLanguageModelResponse2(( (messages.map(LanguageModelChatMessage.to))), options, ExtensionIdentifier.toKey(from), progress, token));
+        }
+        else {
+            const progress2 = ( (new Progress(async (fragment) => {
+                progress.report({ index: fragment.index, part: new LanguageModelTextPart(fragment.part) });
+            })));
+            p = Promise.resolve(data.provider.provideLanguageModelResponse(( (messages.map(LanguageModelChatMessage.to))), options?.modelOptions ?? {}, ExtensionIdentifier.toKey(from), progress2, token));
+        }
+        p.then(() => {
+            this._proxy.$reportResponseDone(requestId, undefined);
+        }, err => {
+            this._proxy.$reportResponseDone(requestId, transformErrorForSerialization(err));
+        });
     }
     $provideTokenLength(handle, value, token) {
         const data = this._languageModels.get(handle);
@@ -226,32 +266,25 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
                 throw LanguageModelError.NoPermissions(`Language model '${languageModelId}' cannot be used by '${from.value}'.`);
             }
         }
-        const requestId = (Math.random() * 1e6) | 0;
-        const requestPromise = this._proxy.$fetchResponse(from, languageModelId, requestId, internalMessages, options.modelOptions ?? {}, token);
-        const barrier = ( (new Barrier()));
-        const res = ( (new LanguageModelResponse()));
-        this._pendingRequest.set(requestId, { languageModelId, res });
-        let error;
-        requestPromise.catch(err => {
-            if (barrier.isOpen()) {
-                res.reject(err);
+        try {
+            const requestId = (Math.random() * 1e6) | 0;
+            const res = ( (new LanguageModelResponse()));
+            this._pendingRequest.set(requestId, { languageModelId, res });
+            try {
+                await this._proxy.$tryStartChatRequest(from, languageModelId, requestId, internalMessages, options, token);
             }
-            else {
-                error = err;
+            catch (error) {
+                this._pendingRequest.delete(requestId);
+                throw error;
             }
-        }).finally(() => {
-            this._pendingRequest.delete(requestId);
-            res.resolve();
-            barrier.open();
-        });
-        await barrier.wait();
-        if (error) {
+            return res.apiObject;
+        }
+        catch (error) {
             if (error.name === LanguageModelError.name) {
                 throw error;
             }
-            throw new LanguageModelError(`Language model '${languageModelId}' errored, check cause for more details`, 'Unknown', error);
+            throw new LanguageModelError(`Language model '${languageModelId}' errored: ${toErrorMessage(error)}`, 'Unknown', error);
         }
-        return res.apiObject;
     }
     _convertMessages(extension, messages) {
         const internalMessages = [];
@@ -259,16 +292,32 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             if (message.role === LanguageModelChatMessageRole.System) {
                 checkProposedApiEnabled(extension, 'languageModelSystem');
             }
+            if (message.content2 instanceof LanguageModelFunctionResultPart) {
+                checkProposedApiEnabled(extension, 'lmTools');
+            }
             internalMessages.push(LanguageModelChatMessage.from(message));
         }
         return internalMessages;
     }
-    async $handleResponseFragment(requestId, chunk) {
+    async $acceptResponsePart(requestId, chunk) {
         const data = this._pendingRequest.get(requestId);
         if (data) {
             data.res.handleFragment(chunk);
         }
     }
+    async $acceptResponseDone(requestId, error) {
+        const data = this._pendingRequest.get(requestId);
+        if (!data) {
+            return;
+        }
+        this._pendingRequest.delete(requestId);
+        if (error) {
+            data.res.reject(transformErrorFromSerialization(error));
+        }
+        else {
+            data.res.resolve();
+        }
+    }
     async _getAuthAccess(from, to, justification, silent) {
         const providerId = INTERNAL_AUTH_PROVIDER_PREFIX + to.identifier.value;
         const session = await this._extHostAuthentication.getSession(from, providerId, [], { silent: true });

package/vscode/src/vs/workbench/api/common/extHostNotebook.js

@@ -21,7 +21,7 @@ import { Schemas } from '../../../base/common/network.js';
 import { QueryType } from '../../services/search/common/search.js';
 import { CellSearchModel } from '../../contrib/search/common/cellSearchModel.js';
 import { genericCellMatchesToTextSearchMatches } from '../../contrib/search/common/searchNotebookHelpers.js';
-import { globMatchesResource } from '../../services/editor/common/editorResolverService.js';
+import { RegisteredEditorPriority, globMatchesResource } from '../../services/editor/common/editorResolverService.js';
 const _moduleId = "vs/workbench/api/common/extHostNotebook";
 class ExtHostNotebookController {
     static { this._notebookStatusBarItemProviderHandlePool = 0; }
@@ -120,7 +120,7 @@ class ExtHostNotebookController {
             providerDisplayName: extension.displayName || extension.name,
             displayName: registration.displayName,
             filenamePattern: viewOptionsFilenamePattern,
-            exclusive: registration.exclusive || false
+            priority: registration.exclusive ? RegisteredEditorPriority.exclusive : undefined
         };
     }
     registerNotebookCellStatusBarItemProvider(extension, notebookType, provider) {

package/vscode/src/vs/workbench/api/common/extHostSCM.js

@@ -3,9 +3,9 @@ import { URI } from '../../../base/common/uri.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { debounce } from '../../../base/common/decorators.js';
 import { DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
-import { asPromise, Sequencer } from '../../../base/common/async.js';
+import { asPromise } from '../../../base/common/async.js';
 import { MainContext } from './extHost.protocol.js';
-import { sortedDiff, equals } from '../../../base/common/arrays.js';
+import { equals, sortedDiff } from '../../../base/common/arrays.js';
 import { comparePaths } from '../../../base/common/comparers.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { ExtensionIdentifierMap } from '../../../platform/extensions/common/extensions.js';
@@ -42,21 +42,26 @@ function getIconResource(decorations) {
         return undefined;
     }
 }
-function getHistoryItemIconDto(historyItem) {
-    if (!historyItem.icon) {
+function getHistoryItemIconDto(icon) {
+    if (!icon) {
         return undefined;
     }
-    else if (URI.isUri(historyItem.icon)) {
-        return historyItem.icon;
+    else if (URI.isUri(icon)) {
+        return icon;
     }
-    else if (ThemeIcon.isThemeIcon(historyItem.icon)) {
-        return historyItem.icon;
+    else if (ThemeIcon.isThemeIcon(icon)) {
+        return icon;
     }
     else {
-        const icon = historyItem.icon;
-        return { light: icon.light, dark: icon.dark };
+        const iconDto = icon;
+        return { light: iconDto.light, dark: iconDto.dark };
     }
 }
+function toSCMHistoryItemDto(historyItem) {
+    const icon = getHistoryItemIconDto(historyItem.icon);
+    const labels = historyItem.labels?.map(l => ({ title: l.title, icon: getHistoryItemIconDto(l.icon) }));
+    return { ...historyItem, icon, labels };
+}
 function compareResourceThemableDecorations(a, b) {
     if (!a.iconPath && !b.iconPath) {
         return 0;
@@ -223,7 +228,7 @@ class ExtHostSCMInputBox {
     }
     set value(value) {
         value = value ?? '';
-        this._sequencer.queue(async () => this.#proxy.$setInputBoxValue(this._sourceControlHandle, value));
+        this.#proxy.$setInputBoxValue(this._sourceControlHandle, value);
         this.updateValue(value);
     }
     get onDidChange() {
@@ -233,7 +238,7 @@ class ExtHostSCMInputBox {
         return this._placeholder;
     }
     set placeholder(placeholder) {
-        this._sequencer.queue(async () => this.#proxy.$setInputBoxPlaceholder(this._sourceControlHandle, placeholder));
+        this.#proxy.$setInputBoxPlaceholder(this._sourceControlHandle, placeholder);
         this._placeholder = placeholder;
     }
     get validateInput() {
@@ -248,7 +253,7 @@ class ExtHostSCMInputBox {
             ));
         }
         this._validateInput = fn;
-        this._sequencer.queue(async () => this.#proxy.$setValidationProviderIsEnabled(this._sourceControlHandle, !!fn));
+        this.#proxy.$setValidationProviderIsEnabled(this._sourceControlHandle, !!fn);
     }
     get enabled() {
         return this._enabled;
@@ -259,7 +264,7 @@ class ExtHostSCMInputBox {
             return;
         }
         this._enabled = enabled;
-        this._sequencer.queue(async () => this.#proxy.$setInputBoxEnablement(this._sourceControlHandle, enabled));
+        this.#proxy.$setInputBoxEnablement(this._sourceControlHandle, enabled);
     }
     get visible() {
         return this._visible;
@@ -270,15 +275,14 @@ class ExtHostSCMInputBox {
             return;
         }
         this._visible = visible;
-        this._sequencer.queue(async () => this.#proxy.$setInputBoxVisibility(this._sourceControlHandle, visible));
+        this.#proxy.$setInputBoxVisibility(this._sourceControlHandle, visible);
     }
     get document() {
         checkProposedApiEnabled(this._extension, 'scmTextDocument');
         return this.#extHostDocuments.getDocument(this._documentUri);
     }
-    constructor(_extension, _extHostDocuments, proxy, _sequencer, _sourceControlHandle, _documentUri) {
+    constructor(_extension, _extHostDocuments, proxy, _sourceControlHandle, _documentUri) {
         this._extension = _extension;
-        this._sequencer = _sequencer;
         this._sourceControlHandle = _sourceControlHandle;
         this._documentUri = _documentUri;
         this._value = '';
@@ -291,7 +295,7 @@ class ExtHostSCMInputBox {
     }
     showValidationMessage(message, type) {
         checkProposedApiEnabled(this._extension, 'scmValidation');
-        this._sequencer.queue(async () => this.#proxy.$showValidationMessage(this._sourceControlHandle, message, type));
+        this.#proxy.$showValidationMessage(this._sourceControlHandle, message, type);
     }
     $onInputBoxValueChange(value) {
         this.updateValue(value);
@@ -308,12 +312,12 @@ class ExtHostSourceControlResourceGroup {
     get label() { return this._label; }
     set label(label) {
         this._label = label;
-        this._sequencer.queue(async () => this._proxy.$updateGroupLabel(this._sourceControlHandle, this.handle, label));
+        this._proxy.$updateGroupLabel(this._sourceControlHandle, this.handle, label);
     }
     get hideWhenEmpty() { return this._hideWhenEmpty; }
     set hideWhenEmpty(hideWhenEmpty) {
         this._hideWhenEmpty = hideWhenEmpty;
-        this._sequencer.queue(async () => this._proxy.$updateGroup(this._sourceControlHandle, this.handle, this.features));
+        this._proxy.$updateGroup(this._sourceControlHandle, this.handle, this.features);
     }
     get features() {
         return {
@@ -325,10 +329,9 @@ class ExtHostSourceControlResourceGroup {
         this._resourceStates = [...resources];
         this._onDidUpdateResourceStates.fire();
     }
-    constructor(_proxy, _commands, _sequencer, _sourceControlHandle, _id, _label, multiDiffEditorEnableViewChanges, _extension) {
+    constructor(_proxy, _commands, _sourceControlHandle, _id, _label, multiDiffEditorEnableViewChanges, _extension) {
         this._proxy = _proxy;
         this._commands = _commands;
-        this._sequencer = _sequencer;
         this._sourceControlHandle = _sourceControlHandle;
         this._id = _id;
         this._label = _label;
@@ -436,7 +439,7 @@ class ExtHostSourceControl {
             return;
         }
         this._count = count;
-        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { count }));
+        this.#proxy.$updateSourceControl(this.handle, { count });
     }
     get quickDiffProvider() {
         return this._quickDiffProvider;
@@ -447,7 +450,7 @@ class ExtHostSourceControl {
         if (isProposedApiEnabled(this._extension, 'quickDiffProvider')) {
             quickDiffLabel = quickDiffProvider?.label;
         }
-        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { hasQuickDiffProvider: !!quickDiffProvider, quickDiffLabel }));
+        this.#proxy.$updateSourceControl(this.handle, { hasQuickDiffProvider: !!quickDiffProvider, quickDiffLabel });
     }
     get historyProvider() {
         checkProposedApiEnabled(this._extension, 'scmHistoryProvider');
@@ -457,11 +460,11 @@ class ExtHostSourceControl {
         checkProposedApiEnabled(this._extension, 'scmHistoryProvider');
         this._historyProvider = historyProvider;
         this._historyProviderDisposable.value = ( new DisposableStore());
-        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { hasHistoryProvider: !!historyProvider }));
+        this.#proxy.$updateSourceControl(this.handle, { hasHistoryProvider: !!historyProvider });
         if (historyProvider) {
             this._historyProviderDisposable.value.add(historyProvider.onDidChangeCurrentHistoryItemGroup(() => {
                 this._historyProviderCurrentHistoryItemGroup = historyProvider?.currentHistoryItemGroup;
-                this._sequencer.queue(async () => this.#proxy.$onDidChangeHistoryProviderCurrentHistoryItemGroup(this.handle, this._historyProviderCurrentHistoryItemGroup));
+                this.#proxy.$onDidChangeHistoryProviderCurrentHistoryItemGroup(this.handle, this._historyProviderCurrentHistoryItemGroup);
             }));
         }
     }
@@ -473,7 +476,7 @@ class ExtHostSourceControl {
             return;
         }
         this._commitTemplate = commitTemplate;
-        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { commitTemplate }));
+        this.#proxy.$updateSourceControl(this.handle, { commitTemplate });
     }
     get acceptInputCommand() {
         return this._acceptInputCommand;
@@ -482,7 +485,7 @@ class ExtHostSourceControl {
         this._acceptInputDisposables.value = ( new DisposableStore());
         this._acceptInputCommand = acceptInputCommand;
         const internal = this._commands.converter.toInternal(acceptInputCommand, this._acceptInputDisposables.value);
-        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { acceptInputCommand: internal }));
+        this.#proxy.$updateSourceControl(this.handle, { acceptInputCommand: internal });
     }
     get actionButton() {
         checkProposedApiEnabled(this._extension, 'scmActionButton');
@@ -503,13 +506,15 @@ class ExtHostSourceControl {
                 description: actionButton.description,
                 enabled: actionButton.enabled
             } : undefined;
-        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { actionButton: internal ?? null }));
+        this.#proxy.$updateSourceControl(this.handle, { actionButton: internal ?? null });
     }
     get statusBarCommands() {
         return this._statusBarCommands;
     }
     set statusBarCommands(statusBarCommands) {
+        this.logService.trace('ExtHostSourceControl#statusBarCommands', ( (statusBarCommands ?? []).map(c => c.command)).join(', '));
         if (this._statusBarCommands && statusBarCommands && commandListEquals(this._statusBarCommands, statusBarCommands)) {
+            this.logService.trace('ExtHostSourceControl#statusBarCommands are equal');
             return;
         }
         this._statusBarDisposables.value = ( new DisposableStore());
@@ -517,18 +522,18 @@ class ExtHostSourceControl {
         const internal = ( (statusBarCommands || []).map(
             c => this._commands.converter.toInternal(c, this._statusBarDisposables.value)
         ));
-        this._sequencer.queue(async () => this.#proxy.$updateSourceControl(this.handle, { statusBarCommands: internal }));
+        this.#proxy.$updateSourceControl(this.handle, { statusBarCommands: internal });
     }
     get selected() {
         return this._selected;
     }
-    constructor(_extension, _extHostDocuments, proxy, _commands, _id, _label, _rootUri) {
+    constructor(_extension, _extHostDocuments, proxy, _commands, logService, _id, _label, _rootUri) {
         this._extension = _extension;
         this._commands = _commands;
+        this.logService = logService;
         this._id = _id;
         this._label = _label;
         this._rootUri = _rootUri;
-        this._sequencer = ( new Sequencer());
         this._groups = ( new Map());
         this._count = undefined;
         this._quickDiffProvider = undefined;
@@ -551,22 +556,20 @@ class ExtHostSourceControl {
             path: `${_id}/scm${this.handle}/input`,
             query: _rootUri ? `rootUri=${encodeURIComponent(( _rootUri.toString()))}` : undefined
         }));
-        this._sequencer.queue(() => this.#proxy.$registerSourceControl(this.handle, _id, _label, _rootUri, inputBoxDocumentUri));
         this._inputBox = ( new ExtHostSCMInputBox(
             _extension,
             _extHostDocuments,
             this.#proxy,
-            this._sequencer,
             this.handle,
             inputBoxDocumentUri
         ));
+        this.#proxy.$registerSourceControl(this.handle, _id, _label, _rootUri, inputBoxDocumentUri);
     }
     createResourceGroup(id, label, options) {
         const multiDiffEditorEnableViewChanges = isProposedApiEnabled(this._extension, 'scmMultiDiffEditor') && options?.multiDiffEditorEnableViewChanges === true;
         const group = ( new ExtHostSourceControlResourceGroup(
             this.#proxy,
             this._commands,
-            this._sequencer,
             this.handle,
             id,
             label,
@@ -591,7 +594,7 @@ class ExtHostSourceControl {
                 this.updatedResourceGroups.delete(group);
                 updateListener.dispose();
                 this._groups.delete(group.handle);
-                this._sequencer.queue(async () => this.#proxy.$unregisterGroup(this.handle, group.handle));
+                this.#proxy.$unregisterGroup(this.handle, group.handle);
             });
             groups.push([group.handle, group.id, group.label, group.features, group.multiDiffEditorEnableViewChanges]);
             const snapshot = group._takeResourceStateSnapshot();
@@ -600,7 +603,7 @@ class ExtHostSourceControl {
             }
             this._groups.set(group.handle, group);
         }
-        this._sequencer.queue(async () => this.#proxy.$registerGroups(this.handle, groups, splices));
+        this.#proxy.$registerGroups(this.handle, groups, splices);
         this.createdResourceGroups.clear();
     }
     eventuallyUpdateResourceStates() {
@@ -613,7 +616,7 @@ class ExtHostSourceControl {
             splices.push([group.handle, snapshot]);
         });
         if (splices.length > 0) {
-            this._sequencer.queue(async () => this.#proxy.$spliceResourceStates(this.handle, splices));
+            this.#proxy.$spliceResourceStates(this.handle, splices);
         }
         this.updatedResourceGroups.clear();
     }
@@ -629,7 +632,7 @@ class ExtHostSourceControl {
         this._actionButtonDisposables.dispose();
         this._statusBarDisposables.dispose();
         this._groups.forEach(group => group.dispose());
-        this._sequencer.queue(async () => this.#proxy.$unregisterSourceControl(this.handle));
+        this.#proxy.$unregisterSourceControl(this.handle);
     }
 }
 ExtHostSourceControl.__decorator = ( __decorate([
@@ -693,6 +696,7 @@ let ExtHostSCM = class ExtHostSCM {
             this._extHostDocuments,
             this._proxy,
             this._commands,
+            this.logService,
             id,
             label,
             rootUri
@@ -778,7 +782,12 @@ let ExtHostSCM = class ExtHostSCM {
     async $provideHistoryItems(sourceControlHandle, historyItemGroupId, options, token) {
         const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
         const historyItems = await historyProvider?.provideHistoryItems(historyItemGroupId, options, token);
-        return historyItems?.map(item => ({ ...item, icon: getHistoryItemIconDto(item) })) ?? undefined;
+        return historyItems?.map(item => toSCMHistoryItemDto(item)) ?? undefined;
+    }
+    async $provideHistoryItems2(sourceControlHandle, options, token) {
+        const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
+        const historyItems = await historyProvider?.provideHistoryItems2(options, token);
+        return historyItems?.map(item => toSCMHistoryItemDto(item)) ?? undefined;
     }
     async $provideHistoryItemSummary(sourceControlHandle, historyItemId, historyItemParentId, token) {
         const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
@@ -786,7 +795,7 @@ let ExtHostSCM = class ExtHostSCM {
             return undefined;
         }
         const historyItem = await historyProvider.provideHistoryItemSummary(historyItemId, historyItemParentId, token);
-        return historyItem ? { ...historyItem, icon: getHistoryItemIconDto(historyItem) } : undefined;
+        return historyItem ? toSCMHistoryItemDto(historyItem) : undefined;
     }
     async $provideHistoryItemChanges(sourceControlHandle, historyItemId, historyItemParentId, token) {
         const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;

package/vscode/src/vs/workbench/api/common/extHostSearch.js

@@ -93,7 +93,7 @@ let ExtHostSearch = class ExtHostSearch {
     $provideTextSearchResults(handle, session, rawQuery, token) {
         const provider = this._textSearchProvider.get(handle);
         if (!provider || !provider.provideTextSearchResults) {
-            throw ( new Error(`2 Unknown provider ${handle}`));
+            throw ( new Error(`Unknown Text Search Provider ${handle}`));
         }
         const query = reviveQuery(rawQuery);
         const engine = this.createTextSearchManager(query, provider);
@@ -102,7 +102,7 @@ let ExtHostSearch = class ExtHostSearch {
     $provideAITextSearchResults(handle, session, rawQuery, token) {
         const provider = this._aiTextSearchProvider.get(handle);
         if (!provider || !provider.provideAITextSearchResults) {
-            throw ( new Error(`1 Unknown provider ${handle}`));
+            throw ( new Error(`Unknown AI Text Search Provider ${handle}`));
         }
         const query = reviveQuery(rawQuery);
         const engine = this.createAITextSearchManager(query, provider);

package/vscode/src/vs/workbench/api/common/extHostSecrets.js

@@ -1,17 +1,20 @@
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
-import { Emitter } from '../../../base/common/event.js';
+import { Event } from '../../../base/common/event.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
 class ExtensionSecrets {
     #secretState;
     constructor(extensionDescription, secretState) {
-        this._onDidChange = ( new Emitter());
-        this.onDidChange = this._onDidChange.event;
+        this.disposables = ( new DisposableStore());
         this._id = ExtensionIdentifier.toKey(extensionDescription.identifier);
         this.#secretState = secretState;
-        this.#secretState.onDidChangePassword(e => {
-            if (e.extensionId === this._id) {
-                this._onDidChange.fire({ key: e.key });
-            }
-        });
+        this.onDidChange = ( Event.map(
+            Event.filter(this.#secretState.onDidChangePassword, e => e.extensionId === this._id),
+            e => ({ key: e.key }),
+            this.disposables
+        ));
+    }
+    dispose() {
+        this.disposables.dispose();
     }
     get(key) {
         return this.#secretState.get(this._id, key);