@codingame/monaco-vscode-api 6.0.2 → 7.0.0

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

@@ -1,4 +1,4 @@
-import { isFalsyOrEmpty, isNonEmptyArray, coalesce, asArray } from '../../../base/common/arrays.js';
+import { isFalsyOrEmpty, coalesce, isNonEmptyArray, asArray } from '../../../base/common/arrays.js';
 import { raceCancellationError } from '../../../base/common/async.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { isCancellationError, NotImplementedError } from '../../../base/common/errors.js';
@@ -9,15 +9,15 @@ import { StopWatch } from '../../../base/common/stopwatch.js';
 import { regExpLeadsToEndlessLoop } from '../../../base/common/strings.js';
 import { assertType, isObject } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
-import { Range as Range$2 } from '../../../editor/common/core/range.js';
+import { Range as Range$1 } from '../../../editor/common/core/range.js';
 import { Selection } from '../../../editor/common/core/selection.js';
 import { NewSymbolNameTriggerKind, CompletionItemInsertTextRule, InlineEditTriggerKind, InlineCompletionTriggerKind } from '../../../editor/common/languages.js';
 import { encodeSemanticTokensDto } from '../../../editor/common/services/semanticTokensDto.js';
 import { localizeWithPath } from '../../../nls.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
-import { Position, Hover, Selection as Selection$1, Range as Range$1, CodeActionTriggerKind, Diagnostic, WorkspaceEdit, DocumentSelector, DocumentSymbol as DocumentSymbol$1, SymbolKind, SymbolTag, EvaluatableExpression, InlineValueContext, InlineValue, DocumentHighlight, MultiDocumentHighlight, location, DataTransfer, TextEdit, WorkspaceSymbol, CompletionContext, CompletionItemKind, CompletionItemTag, MarkdownString, SignatureHelp, InlayHintKind, DocumentLink, Color, ColorPresentation, FoldingRange, SelectionRange, CallHierarchyItem, TypeHierarchyItem, DefinitionLink, PartialAcceptInfo } from './extHostTypeConverters.js';
-import { Range, CodeActionKind, NewSymbolNameTriggerKind as NewSymbolNameTriggerKind$1, Disposable, SyntaxTokenType, DocumentSymbol, InternalDataTransferItem, DocumentDropOrPasteEditKind, SemanticTokens, SemanticTokensEdits, SemanticTokensEdit, SnippetString, InlineEditTriggerKind as InlineEditTriggerKind$1, Location, CompletionList, InlineCompletionTriggerKind as InlineCompletionTriggerKind$1 } from './extHostTypes.js';
-import { isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { DocumentSelector, DocumentSymbol as DocumentSymbol$1, SymbolKind, SymbolTag, Range, Position, Hover, EvaluatableExpression, InlineValueContext, InlineValue, DocumentHighlight, MultiDocumentHighlight, location, Selection as Selection$1, CodeActionTriggerKind, Diagnostic, WorkspaceEdit, DataTransfer, TextEdit, WorkspaceSymbol, CompletionContext, CompletionItemKind, CompletionItemTag, MarkdownString, SignatureHelp, InlayHintKind, DocumentLink, Color, ColorPresentation, FoldingRange, SelectionRange, CallHierarchyItem, TypeHierarchyItem, DefinitionLink, PartialAcceptInfo } from './extHostTypeConverters.js';
+import { Disposable, SyntaxTokenType, DocumentSymbol, Range as Range$2, CodeActionKind, InternalDataTransferItem, DocumentDropOrPasteEditKind, NewSymbolNameTriggerKind as NewSymbolNameTriggerKind$1, SemanticTokens, SemanticTokensEdits, SemanticTokensEdit, SnippetString, InlineEditTriggerKind as InlineEditTriggerKind$1, Location, CompletionList, InlineCompletionTriggerKind as InlineCompletionTriggerKind$1 } from './extHostTypes.js';
+import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { Cache } from './cache.js';
 import { MainContext, ISuggestResultDtoField, ISuggestDataDtoField } from './extHost.protocol.js';
 const _moduleId = "vs/workbench/api/common/extHostLanguageFeatures";
@@ -58,8 +58,8 @@ class DocumentSymbolAdapter {
                 tags: info.tags?.map(SymbolTag.from) || [],
                 detail: '',
                 containerName: info.containerName,
-                range: Range$1.from(info.location.range),
-                selectionRange: Range$1.from(info.location.range),
+                range: Range.from(info.location.range),
+                selectionRange: Range.from(info.location.range),
                 children: []
             };
             while (true) {
@@ -69,7 +69,7 @@ class DocumentSymbolAdapter {
                     break;
                 }
                 const parent = parentStack[parentStack.length - 1];
-                if (Range$2.containsRange(parent.range, element.range) && !Range$2.equalsRange(parent.range, element.range)) {
+                if (Range$1.containsRange(parent.range, element.range) && !Range$1.equalsRange(parent.range, element.range)) {
                     parent.children?.push(element);
                     parentStack.push(element);
                     break;
@@ -107,7 +107,7 @@ class CodeLensAdapter {
         for (let i = 0; i < lenses.length; i++) {
             result.lenses.push({
                 cacheId: [cacheId, i],
-                range: Range$1.from(lenses[i].range),
+                range: Range.from(lenses[i].range),
                 command: this._commands.toInternal(lenses[i].command, disposables)
             });
         }
@@ -242,7 +242,7 @@ class HoverAdapter {
             value.range = doc.getWordRangeAtPosition(pos);
         }
         if (!value.range) {
-            value.range = ( (new Range(pos, pos)));
+            value.range = ( (new Range$2(pos, pos)));
         }
         const convertedHover = Hover.from(value);
         const id = this._hoverCounter;
@@ -284,7 +284,7 @@ class InlineValuesAdapter {
     }
     async provideInlineValues(resource, viewPort, context, token) {
         const doc = this._documents.getDocument(resource);
-        const value = await this._provider.provideInlineValues(doc, Range$1.to(viewPort), InlineValueContext.to(context), token);
+        const value = await this._provider.provideInlineValues(doc, Range.to(viewPort), InlineValueContext.to(context), token);
         if (Array.isArray(value)) {
             return (
                  (value.map(iv => InlineValue.from(iv)))
@@ -339,7 +339,7 @@ class LinkedEditingRangeAdapter {
         const value = await this._provider.provideLinkedEditingRanges(doc, pos, token);
         if (value && Array.isArray(value.ranges)) {
             return {
-                ranges: coalesce(( (value.ranges.map(Range$1.from)))),
+                ranges: coalesce(( (value.ranges.map(Range.from)))),
                 wordPattern: value.wordPattern
             };
         }
@@ -380,7 +380,7 @@ class CodeActionAdapter {
         const doc = this._documents.getDocument(resource);
         const ran = Selection.isISelection(rangeOrSelection)
             ? Selection$1.to(rangeOrSelection)
-            : Range$1.to(rangeOrSelection);
+            : Range.to(rangeOrSelection);
         const allDiagnostics = [];
         for (const diagnostic of this._diagnostics.getDiagnostics(resource)) {
             if (ran.intersection(diagnostic.range)) {
@@ -419,10 +419,10 @@ class CodeActionAdapter {
             else {
                 if (codeActionContext.only) {
                     if (!candidate.kind) {
-                        this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value} 'requested but returned code action does not have a 'kind'. Code action will be dropped. Please set 'CodeAction.kind'.`);
+                        this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value}' requested but returned code action does not have a 'kind'. Code action will be dropped. Please set 'CodeAction.kind'.`);
                     }
                     else if (!codeActionContext.only.contains(candidate.kind)) {
-                        this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value} 'requested but returned code action is of kind '${candidate.kind.value}'. Code action will be dropped. Please check 'CodeActionContext.only' to only return requested code actions.`);
+                        this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value}' requested but returned code action is of kind '${candidate.kind.value}'. Code action will be dropped. Please check 'CodeActionContext.only' to only return requested code actions.`);
                     }
                 }
                 const range = candidate.ranges ?? [];
@@ -435,7 +435,7 @@ class CodeActionAdapter {
                     kind: candidate.kind && candidate.kind.value,
                     isPreferred: candidate.isPreferred,
                     isAI: isProposedApiEnabled(this._extension, 'codeActionAI') ? candidate.isAI : false,
-                    ranges: isProposedApiEnabled(this._extension, 'codeActionRanges') ? coalesce(( (range.map(Range$1.from)))) : undefined,
+                    ranges: isProposedApiEnabled(this._extension, 'codeActionRanges') ? coalesce(( (range.map(Range.from)))) : undefined,
                     disabled: candidate.disabled?.reason
                 });
             }
@@ -488,7 +488,7 @@ class DocumentPasteEditProvider {
             return;
         }
         const doc = this._documents.getDocument(resource);
-        const vscodeRanges = ( (ranges.map(range => Range$1.to(range))));
+        const vscodeRanges = ( (ranges.map(range => Range.to(range))));
         const dataTransfer = DataTransfer.toDataTransfer(dataTransferDto, () => {
             throw ( (new NotImplementedError()));
         });
@@ -504,7 +504,7 @@ class DocumentPasteEditProvider {
             return [];
         }
         const doc = this._documents.getDocument(resource);
-        const vscodeRanges = ( (ranges.map(range => Range$1.to(range))));
+        const vscodeRanges = ( (ranges.map(range => Range.to(range))));
         const dataTransfer = DataTransfer.toDataTransfer(dataTransferDto, async (id) => {
             return (await this._proxy.$resolvePasteFileData(this._handle, requestId, id)).buffer;
         });
@@ -569,7 +569,7 @@ class RangeFormattingAdapter {
     }
     async provideDocumentRangeFormattingEdits(resource, range, options, token) {
         const document = this._documents.getDocument(resource);
-        const ran = Range$1.to(range);
+        const ran = Range.to(range);
         const value = await this._provider.provideDocumentRangeFormattingEdits(document, ran, options, token);
         if (Array.isArray(value)) {
             return (
@@ -581,7 +581,7 @@ class RangeFormattingAdapter {
     async provideDocumentRangesFormattingEdits(resource, ranges, options, token) {
         assertType(typeof this._provider.provideDocumentRangesFormattingEdits === 'function', 'INVALID invocation of `provideDocumentRangesFormattingEdits`');
         const document = this._documents.getDocument(resource);
-        const _ranges = ( (ranges.map(Range$1.to)));
+        const _ranges = ( (ranges.map(Range.to)));
         const value = await this._provider.provideDocumentRangesFormattingEdits(document, _ranges, options, token);
         if (Array.isArray(value)) {
             return (
@@ -695,7 +695,7 @@ class RenameAdapter {
             const rangeOrLocation = await this._provider.prepareRename(doc, pos, token);
             let range;
             let text;
-            if (Range.isRange(rangeOrLocation)) {
+            if (Range$2.isRange(rangeOrLocation)) {
                 range = rangeOrLocation;
                 text = doc.getText(rangeOrLocation);
             }
@@ -710,7 +710,7 @@ class RenameAdapter {
                 this._logService.warn('INVALID rename location: position line must be within range start/end lines');
                 return undefined;
             }
-            return { range: Range$1.from(range), text };
+            return { range: Range.from(range), text };
         }
         catch (err) {
             const rejectReason = RenameAdapter._asMessage(err);
@@ -749,7 +749,7 @@ class NewSymbolNamesAdapter {
     }
     async provideNewSymbolNames(resource, range, triggerKind, token) {
         const doc = this._documents.getDocument(resource);
-        const pos = Range$1.to(range);
+        const pos = Range.to(range);
         try {
             const kind = NewSymbolNamesAdapter.languageTriggerKindToVSCodeTriggerKind[triggerKind];
             const value = await this._provider.provideNewSymbolNames(doc, pos, kind, token);
@@ -922,7 +922,7 @@ class DocumentRangeSemanticTokensAdapter {
     }
     async provideDocumentRangeSemanticTokens(resource, range, token) {
         const doc = this._documents.getDocument(resource);
-        const value = await this._provider.provideDocumentRangeSemanticTokens(doc, Range$1.to(range), token);
+        const value = await this._provider.provideDocumentRangeSemanticTokens(doc, Range.to(range), token);
         if (!value) {
             return null;
         }
@@ -952,7 +952,7 @@ class CompletionsAdapter {
     async provideCompletionItems(resource, position, context, token) {
         const doc = this._documents.getDocument(resource);
         const pos = Position.to(position);
-        const replaceRange = doc.getWordRangeAtPosition(pos) || ( (new Range(pos, pos)));
+        const replaceRange = doc.getWordRangeAtPosition(pos) || ( (new Range$2(pos, pos)));
         const insertRange = replaceRange.with({ end: pos });
         const sw = ( (new StopWatch()));
         const itemsOrList = await this._provider.provideCompletionItems(doc, pos, token, CompletionContext.to(context));
@@ -970,7 +970,7 @@ class CompletionsAdapter {
         const result = {
             x: pid,
             [ISuggestResultDtoField.completions]: completions,
-            [ISuggestResultDtoField.defaultRanges]: { replace: Range$1.from(replaceRange), insert: Range$1.from(insertRange) },
+            [ISuggestResultDtoField.defaultRanges]: { replace: Range.from(replaceRange), insert: Range.from(insertRange) },
             [ISuggestResultDtoField.isIncomplete]: list.isIncomplete || undefined,
             [ISuggestResultDtoField.duration]: sw.elapsed()
         };
@@ -1062,13 +1062,13 @@ class CompletionsAdapter {
         else if (item.range) {
             range = item.range;
         }
-        if (Range.isRange(range)) {
-            result[ISuggestDataDtoField.range] = Range$1.from(range);
+        if (Range$2.isRange(range)) {
+            result[ISuggestDataDtoField.range] = Range.from(range);
         }
         else if (range && (!defaultInsertRange?.isEqual(range.inserting) || !defaultReplaceRange?.isEqual(range.replacing))) {
             result[ISuggestDataDtoField.range] = {
-                insert: Range$1.from(range.inserting),
-                replace: Range$1.from(range.replacing)
+                insert: Range.from(range.inserting),
+                replace: Range.from(range.replacing)
             };
         }
         return result;
@@ -1078,6 +1078,9 @@ class InlineCompletionAdapterBase {
     async provideInlineCompletions(resource, position, context, token) {
         return undefined;
     }
+    async provideInlineEdits(resource, range, context, token) {
+        return undefined;
+    }
     disposeCompletions(pid) { }
     handleDidShowCompletionItem(pid, idx, updatedInsertText) { }
     handlePartialAccept(pid, idx, acceptedCharacters, info) { }
@@ -1107,7 +1110,7 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
         const result = await this._provider.provideInlineCompletionItems(doc, pos, {
             selectedCompletionInfo: context.selectedSuggestionInfo
                 ? {
-                    range: Range$1.to(context.selectedSuggestionInfo.range),
+                    range: Range.to(context.selectedSuggestionInfo.range),
                     text: context.selectedSuggestionInfo.text
                 }
                 : undefined,
@@ -1143,7 +1146,70 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
                 return ({
                     insertText: typeof insertText === 'string' ? insertText : { snippet: insertText.value },
                     filterText: item.filterText,
-                    range: item.range ? Range$1.from(item.range) : undefined,
+                    range: item.range ? Range.from(item.range) : undefined,
+                    command,
+                    idx: idx,
+                    completeBracketPairs: this._isAdditionsProposedApiEnabled ? item.completeBracketPairs : false,
+                });
+            }))),
+            commands: ( (commands.map(c => {
+                if (!disposableStore) {
+                    disposableStore = ( (new DisposableStore()));
+                }
+                return this._commands.toInternal(c, disposableStore);
+            }))),
+            suppressSuggestions: false,
+            enableForwardStability,
+        };
+    }
+    async provideInlineEdits(resource, range, context, token) {
+        if (!this._provider.provideInlineEdits) {
+            return undefined;
+        }
+        checkProposedApiEnabled(this._extension, 'inlineCompletionsAdditions');
+        const doc = this._documents.getDocument(resource);
+        const r = Range.to(range);
+        const result = await this._provider.provideInlineEdits(doc, r, {
+            selectedCompletionInfo: context.selectedSuggestionInfo
+                ? {
+                    range: Range.to(context.selectedSuggestionInfo.range),
+                    text: context.selectedSuggestionInfo.text
+                }
+                : undefined,
+            triggerKind: this.languageTriggerKindToVSCodeTriggerKind[context.triggerKind],
+            userPrompt: context.userPrompt,
+        }, token);
+        if (!result) {
+            return undefined;
+        }
+        if (token.isCancellationRequested) {
+            return undefined;
+        }
+        const normalizedResult = Array.isArray(result) ? result : result.items;
+        const commands = this._isAdditionsProposedApiEnabled ? Array.isArray(result) ? [] : result.commands || [] : [];
+        const enableForwardStability = this._isAdditionsProposedApiEnabled && !Array.isArray(result) ? result.enableForwardStability : undefined;
+        let disposableStore = undefined;
+        const pid = this._references.createReferenceId({
+            dispose() {
+                disposableStore?.dispose();
+            },
+            items: normalizedResult
+        });
+        return {
+            pid,
+            items: ( (normalizedResult.map((item, idx) => {
+                let command = undefined;
+                if (item.command) {
+                    if (!disposableStore) {
+                        disposableStore = ( (new DisposableStore()));
+                    }
+                    command = this._commands.toInternal(item.command, disposableStore);
+                }
+                const insertText = item.insertText;
+                return ({
+                    insertText: typeof insertText === 'string' ? insertText : { snippet: insertText.value },
+                    filterText: item.filterText,
+                    range: item.range ? Range.from(item.range) : undefined,
                     command,
                     idx: idx,
                     completeBracketPairs: this._isAdditionsProposedApiEnabled ? item.completeBracketPairs : false,
@@ -1217,7 +1283,7 @@ class InlineEditAdapter {
         const langResult = {
             pid,
             text: result.text,
-            range: Range$1.from(result.range),
+            range: Range.from(result.range),
             accepted: acceptCommand,
             rejected: rejectCommand,
         };
@@ -1306,7 +1372,7 @@ class InlayHintsAdapter {
     }
     async provideInlayHints(resource, ran, token) {
         const doc = this._documents.getDocument(resource);
-        const range = Range$1.to(ran);
+        const range = Range.to(ran);
         const hints = await this._provider.provideInlayHints(doc, range, token);
         if (!Array.isArray(hints) || hints.length === 0) {
             this._logService.trace(`[InlayHints] NO inlay hints from '${this._extension.identifier.value}' for range ${JSON.stringify(ran)}`);
@@ -1471,14 +1537,14 @@ class ColorProviderAdapter {
         const colorInfos = ( (colors.map(ci => {
             return {
                 color: Color.from(ci.color),
-                range: Range$1.from(ci.range)
+                range: Range.from(ci.range)
             };
         })));
         return colorInfos;
     }
     async provideColorPresentations(resource, raw, token) {
         const document = this._documents.getDocument(resource);
-        const range = Range$1.to(raw.range);
+        const range = Range.to(raw.range);
         const color = Color.to(raw.color);
         const value = await this._provider.provideColorPresentations(color, { document, range }, token);
         if (!Array.isArray(value)) {
@@ -1581,7 +1647,7 @@ class CallHierarchyAdapter {
              (calls.map(call => {
                 return {
                     from: this._cacheAndConvertItem(sessionId, call.from),
-                    fromRanges: ( (call.fromRanges.map(r => Range$1.from(r))))
+                    fromRanges: ( (call.fromRanges.map(r => Range.from(r))))
                 };
             }))
         );
@@ -1599,7 +1665,7 @@ class CallHierarchyAdapter {
              (calls.map(call => {
                 return {
                     to: this._cacheAndConvertItem(sessionId, call.to),
-                    fromRanges: ( (call.fromRanges.map(r => Range$1.from(r))))
+                    fromRanges: ( (call.fromRanges.map(r => Range.from(r))))
                 };
             }))
         );
@@ -1750,7 +1816,7 @@ class MappedEditsAdapter {
             return {
                 uri: URI.revive(r.uri),
                 version: r.version,
-                ranges: ( (r.ranges.map((range) => Range$1.to(range)))),
+                ranges: ( (r.ranges.map((range) => Range.to(range)))),
             };
         }))))));
         const ctx = {
@@ -2122,6 +2188,9 @@ class ExtHostLanguageFeatures {
     $provideInlineCompletions(handle, resource, position, context, token) {
         return this._withAdapter(handle, InlineCompletionAdapterBase, adapter => adapter.provideInlineCompletions(URI.revive(resource), position, context, token), undefined, token);
     }
+    $provideInlineEdits(handle, resource, range, context, token) {
+        return this._withAdapter(handle, InlineCompletionAdapterBase, adapter => adapter.provideInlineEdits(URI.revive(resource), range, context, token), undefined, token);
+    }
     $handleInlineCompletionDidShow(handle, pid, idx, updatedInsertText) {
         this._withAdapter(handle, InlineCompletionAdapterBase, async (adapter) => {
             adapter.handleDidShowCompletionItem(pid, idx, updatedInsertText);
@@ -2290,7 +2359,7 @@ class ExtHostLanguageFeatures {
     $resolveDropEdit(handle, id, token) {
         return this._withAdapter(handle, DocumentDropEditAdapter, adapter => adapter.resolveDropEdit(id, token), {}, undefined);
     }
-    $releaseDropEdits(handle, cacheId) {
+    $releaseDocumentOnDropEdits(handle, cacheId) {
         this._withAdapter(handle, DocumentDropEditAdapter, adapter => Promise.resolve(adapter.releaseDropEdits(cacheId)), undefined, undefined);
     }
     registerMappedEditsProvider(extension, selector, provider) {

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) {