@codingame/monaco-vscode-api 5.3.0 → 6.0.1

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

@@ -1,20 +1,22 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { toDisposable } from '../../../base/common/lifecycle.js';
-import { MainContext } from './extHost.protocol.js';
-import { LanguageModelMessage } from './extHostTypeConverters.js';
-import { LanguageModelError } from './extHostTypes.js';
-import { Progress } from '../../../platform/progress/common/progress.js';
-import { ExtensionIdentifierMap, ExtensionIdentifier, ExtensionIdentifierSet } from '../../../platform/extensions/common/extensions.js';
 import { Barrier, AsyncIterableSource } from '../../../base/common/async.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
+import { CancellationError } 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';
 import { localizeWithPath } from '../../../nls.js';
-import { INTERNAL_AUTH_PROVIDER_PREFIX } from '../../services/authentication/common/authentication.js';
-import { CancellationError } from '../../../base/common/errors.js';
+import { ExtensionIdentifierMap, ExtensionIdentifier, ExtensionIdentifierSet } from '../../../platform/extensions/common/extensions.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
-import { IExtHostRpcService } from './extHostRpcService.js';
-import { IExtHostAuthentication } from './extHostAuthentication.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
-import { Iterable } from '../../../base/common/iterator.js';
+import { Progress } from '../../../platform/progress/common/progress.js';
+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 { INTERNAL_AUTH_PROVIDER_PREFIX } from '../../services/authentication/common/authentication.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 var ExtHostLanguageModels_1;
 const _moduleId = "vs/workbench/api/common/extHostLanguageModels";
 const IExtHostLanguageModels = ( (createDecorator('IExtHostLanguageModels')));
@@ -33,7 +35,7 @@ class LanguageModelResponse {
         this._isStreaming = false;
         const that = this;
         this.apiObject = {
-            stream: that._defaultStream.asyncIterable,
+            text: that._defaultStream.asyncIterable,
         };
     }
     *_streams() {
@@ -109,13 +111,17 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
                 accountLabel: typeof metadata.auth === 'object' ? metadata.auth.label : undefined
             };
         }
-        this._proxy.$registerLanguageModelProvider(handle, identifier, {
+        this._proxy.$registerLanguageModelProvider(handle, `${ExtensionIdentifier.toKey(extension.identifier)}/${handle}/${identifier}`, {
             extension: extension.identifier,
-            identifier: identifier,
+            id: identifier,
+            vendor: metadata.vendor ?? ExtensionIdentifier.toKey(extension.identifier),
             name: metadata.name ?? '',
+            family: metadata.family ?? '',
             version: metadata.version,
-            tokens: metadata.tokens,
-            auth
+            maxInputTokens: metadata.maxInputTokens,
+            maxOutputTokens: metadata.maxOutputTokens,
+            auth,
+            targetExtensions: metadata.extensions
         });
         const responseReceivedListener = provider.onDidReceiveLanguageModelResponse2?.(({ extensionId, participant, tokenCount }) => {
             this._proxy.$whenLanguageModelChatRequestMade(identifier, ( (new ExtensionIdentifier(extensionId))), participant, tokenCount);
@@ -138,7 +144,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             }
             this._proxy.$handleProgressChunk(requestId, { index: fragment.index, part: fragment.part });
         })));
-        return data.provider.provideLanguageModelResponse2(( (messages.map(LanguageModelMessage.to))), options, ExtensionIdentifier.toKey(from), progress, token);
+        return data.provider.provideLanguageModelResponse(( (messages.map(LanguageModelChatMessage.to))), options, ExtensionIdentifier.toKey(from), progress, token);
     }
     $provideTokenLength(handle, value, token) {
         const data = this._languageModels.get(handle);
@@ -147,19 +153,15 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         }
         return Promise.resolve(data.provider.provideTokenCount(value, token));
     }
-    $updateLanguageModels(data) {
-        const added = [];
-        const removed = [];
+    $acceptChatModelMetadata(data) {
         if (data.added) {
-            for (const metadata of data.added) {
-                this._allLanguageModelData.set(metadata.identifier, metadata);
-                added.push(metadata.identifier);
+            for (const { identifier, metadata } of data.added) {
+                this._allLanguageModelData.set(identifier, { metadata, apiObjects: ( (new ExtensionIdentifierMap())) });
             }
         }
         if (data.removed) {
             for (const id of data.removed) {
                 this._allLanguageModelData.delete(id);
-                removed.push(id);
                 for (const [key, value] of this._pendingRequest) {
                     if (value.languageModelId === id) {
                         value.res.reject(( (new CancellationError())));
@@ -168,48 +170,64 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
                 }
             }
         }
-        this._onDidChangeProviders.fire(( (Object.freeze({
-            added: ( (Object.freeze(added))),
-            removed: ( (Object.freeze(removed)))
-        }))));
-        data.added?.forEach(this._fakeAuthPopulate, this);
-    }
-    getLanguageModelIds() {
-        return Array.from(( (this._allLanguageModelData.keys())));
+        data.added?.forEach(added => this._fakeAuthPopulate(added.metadata));
+        this._onDidChangeProviders.fire(undefined);
     }
-    $updateModelAccesslist(data) {
-        const updated = ( (new Array()));
-        for (const { from, to, enabled } of data) {
-            const set = this._modelAccessList.get(from) ?? ( (new ExtensionIdentifierSet()));
-            const oldValue = ( (set.has(to)));
-            if (oldValue !== enabled) {
-                if (enabled) {
-                    set.add(to);
-                }
-                else {
-                    set.delete(to);
-                }
-                this._modelAccessList.set(from, set);
-                const newItem = { from, to };
-                updated.push(newItem);
-                this._onDidChangeModelAccess.fire(newItem);
+    async selectLanguageModels(extension, selector) {
+        const models = await this._proxy.$selectChatModels({ ...selector, extension: extension.identifier });
+        const result = [];
+        const that = this;
+        for (const identifier of models) {
+            const data = this._allLanguageModelData.get(identifier);
+            if (!data) {
+                continue;
+            }
+            if (this._isUsingAuth(extension.identifier, data.metadata)) {
+                await this._fakeAuthPopulate(data.metadata);
+            }
+            let apiObject = data.apiObjects.get(extension.identifier);
+            if (!apiObject) {
+                apiObject = {
+                    id: identifier,
+                    vendor: data.metadata.vendor,
+                    family: data.metadata.family,
+                    version: data.metadata.version,
+                    name: data.metadata.name,
+                    maxInputTokens: data.metadata.maxInputTokens,
+                    countTokens(text, token) {
+                        if (!( (that._allLanguageModelData.has(identifier)))) {
+                            throw LanguageModelError.NotFound(identifier);
+                        }
+                        return that._computeTokenLength(identifier, text, token ?? CancellationToken.None);
+                    },
+                    sendRequest(messages, options, token) {
+                        if (!( (that._allLanguageModelData.has(identifier)))) {
+                            throw LanguageModelError.NotFound(identifier);
+                        }
+                        return that._sendChatRequest(extension, identifier, messages, options ?? {}, token ?? CancellationToken.None);
+                    }
+                };
+                data.apiObjects.set(extension.identifier, apiObject);
             }
+            result.push(apiObject);
         }
+        return result;
     }
-    async sendChatRequest(extension, languageModelId, messages, options, token) {
+    async _sendChatRequest(extension, languageModelId, messages, options, token) {
+        const internalMessages = this._convertMessages(extension, messages);
         const from = extension.identifier;
-        const metadata = await this._proxy.$prepareChatAccess(from, languageModelId, options.justification);
+        const metadata = this._allLanguageModelData.get(languageModelId)?.metadata;
         if (!metadata || !( (this._allLanguageModelData.has(languageModelId)))) {
             throw LanguageModelError.NotFound(`Language model '${languageModelId}' is unknown.`);
         }
         if (this._isUsingAuth(from, metadata)) {
-            const success = await this._getAuthAccess(extension, { identifier: metadata.extension, displayName: metadata.auth.providerLabel }, options.justification, options.silent);
+            const success = await this._getAuthAccess(extension, { identifier: metadata.extension, displayName: metadata.auth.providerLabel }, options.justification, false);
             if (!success || !this._modelAccessList.get(from)?.has(metadata.extension)) {
                 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, ( (messages.map(LanguageModelMessage.from))), options.modelOptions ?? {}, token);
+        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 });
@@ -228,14 +246,23 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         });
         await barrier.wait();
         if (error) {
-            throw ( (new LanguageModelError(
-                `Language model '${languageModelId}' errored, check cause for more details`,
-                'Unknown',
-                error
-            )));
+            if (error.name === LanguageModelError.name) {
+                throw error;
+            }
+            throw new LanguageModelError(`Language model '${languageModelId}' errored, check cause for more details`, 'Unknown', error);
         }
         return res.apiObject;
     }
+    _convertMessages(extension, messages) {
+        const internalMessages = [];
+        for (const message of messages) {
+            if (message.role === LanguageModelChatMessageRole.System) {
+                checkProposedApiEnabled(extension, 'languageModelSystem');
+            }
+            internalMessages.push(LanguageModelChatMessage.from(message));
+        }
+        return internalMessages;
+    }
     async $handleResponseFragment(requestId, chunk) {
         const data = this._pendingRequest.get(requestId);
         if (data) {
@@ -254,19 +281,8 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         }
         try {
             const detail = justification
-                ? ( localizeWithPath(
-                _moduleId,
-                0,
-                "To allow access to the language models provided by {0}. Justification:\n\n{1}",
-                to.displayName,
-                justification
-            ))
-                : ( localizeWithPath(
-                _moduleId,
-                1,
-                "To allow access to the language models provided by {0}",
-                to.displayName
-            ));
+                ? ( localizeWithPath(_moduleId, 0, "Justification: {1}", to.displayName, justification))
+                : undefined;
             await this._extHostAuthentication.getSession(from, providerId, [], { forceNewSession: { detail } });
             this.$updateModelAccesslist([{ from: from.identifier, to: to.identifier, enabled: true }]);
             return true;
@@ -280,6 +296,9 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             && !ExtensionIdentifier.equals(toMetadata.extension, from);
     }
     async _fakeAuthPopulate(metadata) {
+        if (!metadata.auth) {
+            return;
+        }
         for (const from of this._languageAccessInformationExtensions) {
             try {
                 await this._getAuthAccess(from, { identifier: metadata.extension, displayName: '' }, undefined, true);
@@ -290,7 +309,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             }
         }
     }
-    async computeTokenLength(languageModelId, value, token) {
+    async _computeTokenLength(languageModelId, value, token) {
         const data = this._allLanguageModelData.get(languageModelId);
         if (!data) {
             throw LanguageModelError.NotFound(`Language model '${languageModelId}' is unknown.`);
@@ -299,19 +318,26 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         if (local) {
             return local.provider.provideTokenCount(value, token);
         }
-        return this._proxy.$countTokens(data.identifier, (typeof value === 'string' ? value : LanguageModelMessage.from(value)), token);
+        return this._proxy.$countTokens(languageModelId, (typeof value === 'string' ? value : LanguageModelChatMessage.from(value)), token);
     }
-    getLanguageModelInfo(languageModelId) {
-        const data = this._allLanguageModelData.get(languageModelId);
-        if (!data) {
-            return undefined;
+    $updateModelAccesslist(data) {
+        const updated = ( (new Array()));
+        for (const { from, to, enabled } of data) {
+            const set = this._modelAccessList.get(from) ?? ( (new ExtensionIdentifierSet()));
+            const oldValue = ( (set.has(to)));
+            if (oldValue !== enabled) {
+                if (enabled) {
+                    set.add(to);
+                }
+                else {
+                    set.delete(to);
+                }
+                this._modelAccessList.set(from, set);
+                const newItem = { from, to };
+                updated.push(newItem);
+                this._onDidChangeModelAccess.fire(newItem);
+            }
         }
-        return {
-            id: data.identifier,
-            name: data.name,
-            version: data.version,
-            tokens: data.tokens,
-        };
     }
     createLanguageModelAccessInformation(from) {
         this._languageAccessInformationExtensions.add(from);
@@ -322,12 +348,20 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             get onDidChange() {
                 return Event.any(_onDidChangeAccess, _onDidAddRemove);
             },
-            canSendRequest(languageModelId) {
-                const data = that._allLanguageModelData.get(languageModelId);
-                if (!data) {
+            canSendRequest(chat) {
+                let metadata;
+                out: for (const [_, value] of that._allLanguageModelData) {
+                    for (const candidate of ( (value.apiObjects.values()))) {
+                        if (candidate === chat) {
+                            metadata = value.metadata;
+                            break out;
+                        }
+                    }
+                }
+                if (!metadata) {
                     return undefined;
                 }
-                if (!that._isUsingAuth(from.identifier, data)) {
+                if (!that._isUsingAuth(from.identifier, metadata)) {
                     return true;
                 }
                 const list = that._modelAccessList.get(from.identifier);
@@ -335,7 +369,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
                     return undefined;
                 }
                 return (
-                     (list.has(data.extension))
+                     (list.has(metadata.extension))
                 );
             }
         };

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

@@ -3,10 +3,11 @@ import { VSBuffer } from '../../../base/common/buffer.js';
 import { Emitter } from '../../../base/common/event.js';
 import { toDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import { ResourceMap, ResourceSet } from '../../../base/common/map.js';
+import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { isFalsyOrWhitespace } from '../../../base/common/strings.js';
 import { assertIsDefined } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
-import { FileOperationError, FileType, FilePermission, etag, ETAG_DISABLED } from '../../../platform/files/common/files.js';
+import { FileOperationError, FileOperationResult, FileType, FilePermission, etag, ETAG_DISABLED } from '../../../platform/files/common/files.js';
 import { Cache } from './cache.js';
 import { MainContext } from './extHost.protocol.js';
 import { ApiCommandArgument, ApiCommand, ApiCommandResult } from './extHostCommands.js';
@@ -17,6 +18,7 @@ import { ExtHostNotebookDocument, ExtHostCell } from './extHostNotebookDocument.
 import { ExtHostNotebookEditor } from './extHostNotebookEditor.js';
 import { filter } from '../../../base/common/objects.js';
 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';
@@ -29,11 +31,12 @@ class ExtHostNotebookController {
     get visibleNotebookEditors() {
         return ( this._visibleNotebookEditors.map(editor => editor.apiEditor));
     }
-    constructor(mainContext, commands, _textDocumentsAndEditors, _textDocuments, _extHostFileSystem, _extHostSearch) {
+    constructor(mainContext, commands, _textDocumentsAndEditors, _textDocuments, _extHostFileSystem, _extHostSearch, _logService) {
         this._textDocumentsAndEditors = _textDocumentsAndEditors;
         this._textDocuments = _textDocuments;
         this._extHostFileSystem = _extHostFileSystem;
         this._extHostSearch = _extHostSearch;
+        this._logService = _logService;
         this._notebookStatusBarItemProviders = ( new Map());
         this._documents = ( new ResourceMap());
         this._editors = ( new Map());
@@ -55,7 +58,7 @@ class ExtHostNotebookController {
         this._commandsConverter = commands.converter;
         commands.registerArgumentProcessor({
             processArgument: (arg) => {
-                if (arg && arg.$mid === 13 ) {
+                if (arg && arg.$mid === MarshalledId.NotebookCellActionContext) {
                     const notebookUri = arg.notebookEditor?.notebookUri;
                     const cellHandle = arg.cell.handle;
                     const data = this._documents.get(notebookUri);
@@ -64,7 +67,7 @@ class ExtHostNotebookController {
                         return cell.apiCell;
                     }
                 }
-                if (arg && arg.$mid === 14 ) {
+                if (arg && arg.$mid === MarshalledId.NotebookActionContext) {
                     const notebookUri = arg.uri;
                     const data = this._documents.get(notebookUri);
                     if (data) {
@@ -240,6 +243,7 @@ class ExtHostNotebookController {
     async $saveNotebook(handle, uriComponents, versionId, options, token) {
         const uri = URI.revive(uriComponents);
         const serializer = this._notebookSerializer.get(handle);
+        this.trace(`enter saveNotebook(versionId: ${versionId}, ${( uri.toString())})`);
         if (!serializer) {
             throw ( new Error('NO serializer found'));
         }
@@ -256,9 +260,8 @@ class ExtHostNotebookController {
                 0,
                 "Unable to modify read-only file '{0}'",
                 this._resourceForError(uri)
-            ), 6 );
+            ), FileOperationResult.FILE_PERMISSION_DENIED);
         }
-        await this._validateWriteFile(uri, options);
         const data = {
             metadata: filter(document.apiNotebook.metadata, key => !(serializer.options?.transientDocumentMetadata ?? {})[key]),
             cells: [],
@@ -268,8 +271,17 @@ class ExtHostNotebookController {
             cellData.metadata = filter(cell.metadata, key => !(serializer.options?.transientCellMetadata ?? {})[key]);
             data.cells.push(cellData);
         }
+        await this._validateWriteFile(uri, options);
+        if (token.isCancellationRequested) {
+            throw ( new Error('canceled'));
+        }
         const bytes = await serializer.serializer.serializeNotebook(data, token);
+        if (token.isCancellationRequested) {
+            throw ( new Error('canceled'));
+        }
+        this.trace(`serialized versionId: ${versionId} ${( uri.toString())}`);
         await this._extHostFileSystem.value.writeFile(uri, bytes);
+        this.trace(`Finished write versionId: ${versionId} ${( uri.toString())}`);
         const providerExtUri = this._extHostFileSystem.getFileSystemProviderExtUri(uri.scheme);
         const stat = await this._extHostFileSystem.value.stat(uri);
         const fileStats = {
@@ -285,6 +297,7 @@ class ExtHostNotebookController {
             etag: etag({ mtime: stat.mtime, size: stat.size }),
             children: undefined
         };
+        this.trace(`exit saveNotebook(versionId: ${versionId}, ${( uri.toString())})`);
         return fileStats;
     }
     async $searchInNotebooks(handle, textQuery, viewTypeFileTargets, otherViewTypeFileTargets, token) {
@@ -304,7 +317,7 @@ class ExtHostNotebookController {
                     includePattern: textQuery.includePattern,
                     excludePattern: textQuery.excludePattern,
                     maxResults: textQuery.maxResults,
-                    type: 1 ,
+                    type: QueryType.File,
                     filePattern
                 };
                 return this._extHostSearch.doInternalFileSearchWithCustomCallback(query, token, (data) => {
@@ -419,7 +432,7 @@ class ExtHostNotebookController {
         if (typeof options?.mtime === 'number' && typeof options.etag === 'string' && options.etag !== ETAG_DISABLED &&
             typeof stat.mtime === 'number' && typeof stat.size === 'number' &&
             options.mtime < stat.mtime && options.etag !== etag({ mtime: options.mtime , size: stat.size })) {
-            throw new FileOperationError(localizeWithPath(_moduleId, 1, "File Modified Since"), 3 , options);
+            throw new FileOperationError(localizeWithPath(_moduleId, 1, "File Modified Since"), FileOperationResult.FILE_MODIFIED_SINCE, options);
         }
         return;
     }
@@ -549,5 +562,8 @@ class ExtHostNotebookController {
         extHostCommands.registerApiCommand(commandDataToNotebook);
         extHostCommands.registerApiCommand(commandNotebookToData);
     }
+    trace(msg) {
+        this._logService.trace(`[Extension Host Notebook] ${msg}`);
+    }
 }
 export { ExtHostNotebookController };

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

@@ -359,6 +359,7 @@ let ExtHostNotebookKernels = class ExtHostNotebookKernels {
         }
         if (obj.controller.interruptHandler) {
             const items = this._activeNotebookExecutions.get(document.uri);
+            this._activeNotebookExecutions.delete(document.uri);
             if (handles.length && Array.isArray(items) && items.length) {
                 items.forEach(d => d.dispose());
             }