@codingame/monaco-vscode-api 8.0.3 → 9.0.0

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

@@ -8,6 +8,8 @@ import { IURITransformerService } from './extHostUriTransformerService.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { URI } from '../../../base/common/uri.js';
 import { TextSearchManager } from '../../services/search/common/textSearchManager.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { OldTextSearchProviderConverter, OldAITextSearchProviderConverter, OldFileSearchProviderConverter } from '../../services/search/common/searchExtConversionTypes.js';
 const IExtHostSearch = ( createDecorator('IExtHostSearch'));
 let ExtHostSearch = class ExtHostSearch {
     constructor(extHostRpc, _uriTransformer, _logService) {
@@ -27,6 +29,20 @@ let ExtHostSearch = class ExtHostSearch {
     _transformScheme(scheme) {
         return this._uriTransformer.transformOutgoingScheme(scheme);
     }
+    registerTextSearchProviderOld(scheme, provider) {
+        if (( this._textSearchUsedSchemes.has(scheme))) {
+            throw ( new Error(`a text search provider for the scheme '${scheme}' is already registered`));
+        }
+        this._textSearchUsedSchemes.add(scheme);
+        const handle = this._handlePool++;
+        this._textSearchProvider.set(handle, ( new OldTextSearchProviderConverter(provider)));
+        this._proxy.$registerTextSearchProvider(handle, this._transformScheme(scheme));
+        return toDisposable(() => {
+            this._textSearchUsedSchemes.delete(scheme);
+            this._textSearchProvider.delete(handle);
+            this._proxy.$unregisterProvider(handle);
+        });
+    }
     registerTextSearchProvider(scheme, provider) {
         if (( this._textSearchUsedSchemes.has(scheme))) {
             throw ( new Error(`a text search provider for the scheme '${scheme}' is already registered`));
@@ -41,6 +57,22 @@ let ExtHostSearch = class ExtHostSearch {
             this._proxy.$unregisterProvider(handle);
         });
     }
+    registerAITextSearchProviderOld(scheme, provider) {
+        if (( this._aiTextSearchUsedSchemes.has(scheme))) {
+            throw ( new Error(
+                `an AI text search provider for the scheme '${scheme}'is already registered`
+            ));
+        }
+        this._aiTextSearchUsedSchemes.add(scheme);
+        const handle = this._handlePool++;
+        this._aiTextSearchProvider.set(handle, ( new OldAITextSearchProviderConverter(provider)));
+        this._proxy.$registerAITextSearchProvider(handle, this._transformScheme(scheme));
+        return toDisposable(() => {
+            this._aiTextSearchUsedSchemes.delete(scheme);
+            this._aiTextSearchProvider.delete(handle);
+            this._proxy.$unregisterProvider(handle);
+        });
+    }
     registerAITextSearchProvider(scheme, provider) {
         if (( this._aiTextSearchUsedSchemes.has(scheme))) {
             throw ( new Error(
@@ -57,6 +89,20 @@ let ExtHostSearch = class ExtHostSearch {
             this._proxy.$unregisterProvider(handle);
         });
     }
+    registerFileSearchProviderOld(scheme, provider) {
+        if (( this._fileSearchUsedSchemes.has(scheme))) {
+            throw ( new Error(`a file search provider for the scheme '${scheme}' is already registered`));
+        }
+        this._fileSearchUsedSchemes.add(scheme);
+        const handle = this._handlePool++;
+        this._fileSearchProvider.set(handle, ( new OldFileSearchProviderConverter(provider)));
+        this._proxy.$registerFileSearchProvider(handle, this._transformScheme(scheme));
+        return toDisposable(() => {
+            this._fileSearchUsedSchemes.delete(scheme);
+            this._fileSearchProvider.delete(handle);
+            this._proxy.$unregisterProvider(handle);
+        });
+    }
     registerFileSearchProvider(scheme, provider) {
         if (( this._fileSearchUsedSchemes.has(scheme))) {
             throw ( new Error(`a file search provider for the scheme '${scheme}' is already registered`));
@@ -80,7 +126,7 @@ let ExtHostSearch = class ExtHostSearch {
             }, token);
         }
         else {
-            throw ( new Error('3 unknown provider: ' + handle));
+            throw ( new Error('unknown provider: ' + handle));
         }
     }
     async doInternalFileSearchWithCustomCallback(query, token, handleFileMatch) {
@@ -137,9 +183,6 @@ function reviveQuery(rawQuery) {
     };
 }
 function reviveFolderQuery(rawFolderQuery) {
-    return {
-        ...rawFolderQuery,
-        folder: URI.revive(rawFolderQuery.folder)
-    };
+    return revive(rawFolderQuery);
 }
 export { ExtHostSearch, IExtHostSearch, reviveQuery };

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

@@ -168,7 +168,7 @@ class ExtHostStatusBarEntry {
             }
             else {
                 name = ( localize(
-                    4821,
+                    4889,
                     "{0} (Extension)",
                     this._extension.displayName || this._extension.name
                 ));
@@ -191,7 +191,7 @@ class StatusBarMessage {
     constructor(statusBar) {
         this._messages = [];
         this._item = statusBar.createStatusBarEntry(undefined, 'status.extensionMessage', StatusBarAlignment.Left, Number.MIN_VALUE);
-        this._item.name = ( localize(4822, "Extension Status"));
+        this._item.name = ( localize(4890, "Extension Status"));
     }
     dispose() {
         this._messages.length = 0;

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

@@ -18,6 +18,7 @@ import { ILogService } from '../../../platform/log/common/log.service.js';
 import { IExtHostApiDeprecationService } from './extHostApiDeprecationService.js';
 import '../../contrib/tasks/common/tasks.js';
 import { NotSupportedError, ErrorNoTelemetry } from '../../../base/common/errors.js';
+import { asArray } from '../../../base/common/arrays.js';
 var TaskDefinitionDTO;
 ( (function(TaskDefinitionDTO) {
     function from(value) {
@@ -255,7 +256,7 @@ var TaskDTO;
             isBackground: value.isBackground,
             group: TaskGroupDTO.from(value.group),
             presentationOptions: TaskPresentationOptionsDTO.from(value.presentationOptions),
-            problemMatchers: value.problemMatchers,
+            problemMatchers: asArray(value.problemMatchers),
             hasDefinedMatchers: value.hasDefinedMatchers,
             runOptions: value.runOptions ? value.runOptions : { reevaluateOnRerun: true },
             detail: value.detail

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

@@ -29,7 +29,7 @@ let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
         this.extHostTelemetryLogFile = URI.revive(this.initData.environment.extensionTelemetryLogResource);
         this._inLoggingOnlyMode = this.initData.environment.isExtensionTelemetryLoggingOnly;
         this._outputLogger = loggerService.createLogger(this.extHostTelemetryLogFile, { id: extensionTelemetryLogChannelId, name: ( localize(
-            576,
+            954,
             "Extension Telemetry{0}",
             this._inLoggingOnlyMode ? ' (Not Sent)' : ''
         )), hidden: true });

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

@@ -468,7 +468,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     async $startExtensionTerminal(id, initialDimensions) {
         const terminal = this.getTerminalById(id);
         if (!terminal) {
-            return { message: ( localize(573, "Could not find the terminal with id {0} on the extension host", id)) };
+            return { message: ( localize(951, "Could not find the terminal with id {0} on the extension host", id)) };
         }
         if (!terminal.isOpen) {
             await ( (new Promise(r => {

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

@@ -299,6 +299,10 @@ let ExtHostTesting = class ExtHostTesting extends Disposable {
         this.results = ( Object.freeze(( results
             .map(r => {
             const o = TestResults.to(r);
+            const taskWithCoverage = r.tasks.findIndex(t => t.hasCoverage);
+            if (taskWithCoverage !== -1) {
+                o.getDetailedCoverage = (uri, token = CancellationToken.None) => this.proxy.$getCoverageDetails(r.id, taskWithCoverage, uri, token).then(r => ( r.map(TestCoverage.to)));
+            }
             testResultInternalIDs.set(o, r.id);
             return o;
         }))
@@ -368,12 +372,12 @@ let ExtHostTesting = class ExtHostTesting extends Disposable {
         }
         return this.commands.executeCommand(command.command, ...(command.arguments || []));
     }
-    $cancelExtensionTestRun(runId) {
+    $cancelExtensionTestRun(runId, taskId) {
         if (runId === undefined) {
             this.runTracker.cancelAllRuns();
         }
         else {
-            this.runTracker.cancelRunById(runId);
+            this.runTracker.cancelRunById(runId, taskId);
         }
     }
     getMetadataForRun(run) {
@@ -475,8 +479,11 @@ class TestRunTracker extends Disposable {
         }
         return undefined;
     }
-    cancel() {
-        if (this.state === TestRunTrackerState.Running) {
+    cancel(taskId) {
+        if (taskId) {
+            this.tasks.get(taskId)?.cts.cancel();
+        }
+        else if (this.state === TestRunTrackerState.Running) {
             this.cts.cancel();
             this.state = TestRunTrackerState.Cancelling;
         }
@@ -533,9 +540,10 @@ class TestRunTracker extends Disposable {
             this.proxy.$appendTestMessagesInRun(runId, taskId, ( TestId.fromExtHostTestItem(test, ctrlId).toString()), converted);
         };
         let ended = false;
+        const cts = this._register(( new CancellationTokenSource(this.cts.token)));
         const run = {
             isPersisted: this.dto.isPersisted,
-            token: this.cts.token,
+            token: cts.token,
             name,
             onDidDispose: this.onDidDispose,
             addCoverage: (coverage) => {
@@ -595,8 +603,13 @@ class TestRunTracker extends Disposable {
             }
         };
         this.running++;
-        this.tasks.set(taskId, { run });
-        this.proxy.$startedTestRunTask(runId, { id: taskId, ctrlId: this.dto.controllerId, name, running: true });
+        this.tasks.set(taskId, { run, cts });
+        this.proxy.$startedTestRunTask(runId, {
+            id: taskId,
+            ctrlId: this.dto.controllerId,
+            name: name || this.extension.displayName || this.extension.identifier.value,
+            running: true,
+        });
         return run;
     }
     forciblyEndTasks() {
@@ -664,8 +677,8 @@ class TestRunCoordinator {
     prepareForMainThreadTestRun(extension, req, dto, profile, token) {
         return this.getTracker(req, dto, profile, extension, token);
     }
-    cancelRunById(runId) {
-        this.trackedById.get(runId)?.cancel();
+    cancelRunById(runId, taskId) {
+        this.trackedById.get(runId)?.cancel(taskId);
     }
     cancelAllRuns() {
         for (const tracker of ( this.tracked.values())) {

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

@@ -657,7 +657,7 @@ class ExtHostTreeView extends Disposable {
         const node = this.createTreeNode(element, extTreeItem, parentNode);
         if (extTreeItem.id && ( this.elements.has(node.item.handle))) {
             throw ( new Error(
-                localize(4823, 'Element with id {0} is already registered', extTreeItem.id)
+                localize(4891, 'Element with id {0} is already registered', extTreeItem.id)
             ));
         }
         this.addNodeToCache(element, node);

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

@@ -146,12 +146,12 @@ let ExtHostTunnelService = class ExtHostTunnelService extends Disposable {
                     privacyOptions = [
                         {
                             id: 'private',
-                            label: ( localize(574, "Private")),
+                            label: ( localize(952, "Private")),
                             themeIcon: 'lock'
                         },
                         {
                             id: 'public',
-                            label: ( localize(575, "Public")),
+                            label: ( localize(953, "Public")),
                             themeIcon: 'eye'
                         }
                     ];

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

@@ -4,7 +4,7 @@ import { UriList } from '../../../base/common/dataTransfer.js';
 import { createSingleCallFunction } from '../../../base/common/functional.js';
 import { parseHrefAndDimensions, isMarkdownString } from '../../../base/common/htmlContent.js';
 import { ResourceSet, ResourceMap } from '../../../base/common/map.js';
-import marked_1 from '../../../../../../external/vscode-marked/lib/marked.esm.js';
+import { marked } from 'marked';
 import { revive, parse } from '../../../base/common/marshalling.js';
 import { Mimes } from '../../../base/common/mime.js';
 import { cloneAndChange } from '../../../base/common/objects.js';
@@ -29,7 +29,7 @@ import { CellEditType, CellStatusbarAlignment, CellKind, NotebookCellExecutionSt
 import { TestId } from '../../contrib/testing/common/testId.js';
 import { namespaceTestTag, denamespaceTestTag, TestMessageType, DetailType } from '../../contrib/testing/common/testTypes.js';
 import { SIDE_GROUP, ACTIVE_GROUP } from '../../services/editor/common/editorService.js';
-import { Position as Position$1, Selection as Selection$1, Range as Range$1, Diagnostic as Diagnostic$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, WorkspaceEdit as WorkspaceEdit$1, FileEditType, SnippetTextEdit, SnippetString, TextEdit as TextEdit$1, SymbolKind as SymbolKind$1, SymbolInformation, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, Location as Location$1, VerboseHover, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, CompletionItem as CompletionItem$1, InlayHint as InlayHint$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, NotebookRange as NotebookRange$1, NotebookCellData as NotebookCellData$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, TestTag as TestTag$1, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatLocation as ChatLocation$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, SymbolTag as SymbolTag$1, DocumentSymbol as DocumentSymbol$1, EvaluatableExpression as EvaluatableExpression$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$2, InlayHintLabelPart as InlayHintLabelPart$1, SelectionRange as SelectionRange$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, DataTransfer as DataTransfer$1, LanguageModelFunctionResultPart, LanguageModelChatMessage as LanguageModelChatMessage$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseFileTreePart, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseDetectedParticipantPart as ChatResponseDetectedParticipantPart$1, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, DiagnosticTag as DiagnosticTag$1, DecorationRangeBehavior as DecorationRangeBehavior$1, EndOfLine as EndOfLine$1, NotebookCellKind as NotebookCellKind$1, LanguageModelChatMessageRole as LanguageModelChatMessageRole$1, CompletionTriggerKind as CompletionTriggerKind$1, TestMessage as TestMessage$1, validateTestCoverageCount, FileCoverage, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, PartialAcceptTriggerKind as PartialAcceptTriggerKind$1, StandardTokenType as StandardTokenType$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, NotebookRendererScript as NotebookRendererScript$1 } from './extHostTypes.js';
+import { Position as Position$1, Selection as Selection$1, Range as Range$1, Diagnostic as Diagnostic$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, WorkspaceEdit as WorkspaceEdit$1, FileEditType, SnippetTextEdit, SnippetString, TextEdit as TextEdit$1, SymbolKind as SymbolKind$1, SymbolInformation, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, Location as Location$1, VerboseHover, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, CompletionItem as CompletionItem$1, InlayHint as InlayHint$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, NotebookRange as NotebookRange$1, NotebookCellData as NotebookCellData$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, TestTag as TestTag$1, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatLocation as ChatLocation$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, SymbolTag as SymbolTag$1, DocumentSymbol as DocumentSymbol$1, EvaluatableExpression as EvaluatableExpression$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$2, InlayHintLabelPart as InlayHintLabelPart$1, SelectionRange as SelectionRange$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, DataTransfer as DataTransfer$1, LanguageModelToolResultPart, LanguageModelToolCallPart, LanguageModelChatMessage as LanguageModelChatMessage$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseDetectedParticipantPart as ChatResponseDetectedParticipantPart$1, ChatResponseFileTreePart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseMovePart as ChatResponseMovePart$1, DiagnosticTag as DiagnosticTag$1, DecorationRangeBehavior as DecorationRangeBehavior$1, EndOfLine as EndOfLine$1, NotebookCellKind as NotebookCellKind$1, LanguageModelChatMessageRole as LanguageModelChatMessageRole$1, CompletionTriggerKind as CompletionTriggerKind$1, TestMessage as TestMessage$1, StatementCoverage, BranchCoverage, DeclarationCoverage, validateTestCoverageCount, FileCoverage, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, PartialAcceptTriggerKind as PartialAcceptTriggerKind$1, StandardTokenType as StandardTokenType$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, NotebookRendererScript as NotebookRendererScript$1 } from './extHostTypes.js';
 var Selection;
 ( (function(Selection) {
     function to(selection) {
@@ -309,7 +309,7 @@ var MarkdownString;
         }
         const resUris = Object.create(null);
         res.uris = resUris;
-        const collectUri = (href) => {
+        const collectUri = ({ href }) => {
             try {
                 let uri = ( URI.parse(href, true));
                 uri = uri.with({ query: _uriMassage(uri.query, resUris) });
@@ -319,10 +319,16 @@ var MarkdownString;
             }
             return '';
         };
-        const renderer = new marked_1.Renderer();
-        renderer.link = collectUri;
-        renderer.image = href => typeof href === 'string' ? collectUri(parseHrefAndDimensions(href).href) : '';
-        marked_1(res.value, { renderer });
+        marked.walkTokens(marked.lexer(res.value), token => {
+            if (token.type === 'link') {
+                collectUri({ href: token.href });
+            }
+            else if (token.type === 'image') {
+                if (typeof token.href === 'string') {
+                    collectUri(parseHrefAndDimensions(token.href));
+                }
+            }
+        });
         return res;
     }
     MarkdownString.from = from;
@@ -1764,7 +1770,7 @@ var TestMessage;
             stackTrace: message.stackTrace?.map(s => ({
                 label: s.label,
                 position: s.position && Position.from(s.position),
-                uri: s.file && URI.revive(s.file).toJSON(),
+                uri: s.uri && URI.revive(s.uri).toJSON(),
             })),
         };
     }
@@ -1901,6 +1907,31 @@ var TestCoverage;
     function fromLocation(location) {
         return 'line' in location ? Position.from(location) : Range.from(location);
     }
+    function toLocation(location) {
+        if (!location) {
+            return undefined;
+        }
+        return 'endLineNumber' in location ? Range.to(location) : Position.to(location);
+    }
+    function to(serialized) {
+        if (serialized.type === DetailType.Statement) {
+            const branches = [];
+            if (serialized.branches) {
+                for (const branch of serialized.branches) {
+                    branches.push({
+                        executed: branch.count,
+                        location: toLocation(branch.location),
+                        label: branch.label
+                    });
+                }
+            }
+            return new StatementCoverage(serialized.count, toLocation(serialized.location), serialized.branches?.map(b => new BranchCoverage(b.count, toLocation(b.location), b.label)));
+        }
+        else {
+            return new DeclarationCoverage(serialized.name, serialized.count, toLocation(serialized.location));
+        }
+    }
+    TestCoverage.to = to;
     function fromDetails(coverage) {
         if (typeof coverage.executed === 'number' && coverage.executed < 0) {
             throw ( new Error(`Invalid coverage count ${coverage.executed}`));
@@ -2116,40 +2147,54 @@ var LanguageModelChatMessageRole;
 var LanguageModelChatMessage;
 ( (function(LanguageModelChatMessage) {
     function to(message) {
-        let content = '';
-        let content2;
-        if (message.content.type === 'text') {
-            content = message.content.value;
-        }
-        else {
-            content2 = new LanguageModelFunctionResultPart(message.content.name, message.content.value, message.content.isError);
-        }
+        const content2 = ( message.content.map(c => {
+            if (c.type === 'text') {
+                return c.value;
+            }
+            else if (c.type === 'tool_result') {
+                return new LanguageModelToolResultPart(c.toolCallId, c.value, c.isError);
+            }
+            else {
+                return new LanguageModelToolCallPart(c.name, c.toolCallId, c.parameters);
+            }
+        }));
+        const content = content2.find(c => typeof c === 'string') ?? '';
         const role = LanguageModelChatMessageRole.to(message.role);
         const result = new LanguageModelChatMessage$1(role, content, message.name);
-        if (content2 !== undefined) {
-            result.content2 = content2;
-        }
+        result.content2 = content2;
         return result;
     }
     LanguageModelChatMessage.to = to;
     function from(message) {
         const role = LanguageModelChatMessageRole.from(message.role);
         const name = message.name;
-        let content;
-        if (message.content2 instanceof LanguageModelFunctionResultPart) {
-            content = {
-                type: 'function_result',
-                name: message.content2.name,
-                value: message.content2.content,
-                isError: message.content2.isError
-            };
-        }
-        else {
-            content = {
-                type: 'text',
-                value: message.content
-            };
-        }
+        const content = ( message.content2.map((c) => {
+            if (c instanceof LanguageModelToolResultPart) {
+                return {
+                    type: 'tool_result',
+                    toolCallId: c.toolCallId,
+                    value: c.content,
+                    isError: c.isError
+                };
+            }
+            else if (c instanceof LanguageModelToolCallPart) {
+                return {
+                    type: 'tool_use',
+                    toolCallId: c.toolCallId,
+                    name: c.name,
+                    parameters: c.parameters
+                };
+            }
+            else {
+                if (typeof c !== 'string') {
+                    throw ( new Error('Unexpected chat message content type'));
+                }
+                return {
+                    type: 'text',
+                    value: c
+                };
+            }
+        }));
         return {
             role,
             name,
@@ -2304,6 +2349,21 @@ var ChatResponseWarningPart;
     }
     ChatResponseWarningPart.to = to;
 })(ChatResponseWarningPart || (ChatResponseWarningPart = {})));
+var ChatResponseMovePart;
+( (function(ChatResponseMovePart) {
+    function from(part) {
+        return {
+            kind: 'move',
+            uri: part.uri,
+            range: Range.from(part.range),
+        };
+    }
+    ChatResponseMovePart.from = from;
+    function to(part) {
+        return new ChatResponseMovePart$1(URI.revive(part.uri), Range.to(part.range));
+    }
+    ChatResponseMovePart.to = to;
+})(ChatResponseMovePart || (ChatResponseMovePart = {})));
 var ChatTask;
 ( (function(ChatTask) {
     function from(part) {
@@ -2361,7 +2421,7 @@ var ChatResponseReferencePart;
             : URI.isUri(part.iconPath) ? { light: URI.revive(part.iconPath) }
                 : (part.iconPath && 'light' in part.iconPath && 'dark' in part.iconPath && URI.isUri(part.iconPath.light) && URI.isUri(part.iconPath.dark) ? { light: URI.revive(part.iconPath.light), dark: URI.revive(part.iconPath.dark) }
                     : undefined);
-        if ('variableName' in part.value) {
+        if (typeof part.value === 'object' && 'variableName' in part.value) {
             return {
                 kind: 'reference',
                 reference: {
@@ -2376,7 +2436,7 @@ var ChatResponseReferencePart;
         }
         return {
             kind: 'reference',
-            reference: URI.isUri(part.value) ?
+            reference: URI.isUri(part.value) || typeof part.value === 'string' ?
                 part.value :
                 Location.from(part.value),
             iconPath,
@@ -2389,7 +2449,7 @@ var ChatResponseReferencePart;
         const mapValue = (value) => URI.isUri(value) ?
             value :
             Location.to(value);
-        return new ChatResponseReferencePart$1('variableName' in value.reference ? {
+        return new ChatResponseReferencePart$1(typeof value.reference === 'string' ? value.reference : 'variableName' in value.reference ? {
             variableName: value.reference.variableName,
             value: value.reference.value && mapValue(value.reference.value)
         } :
@@ -2448,6 +2508,9 @@ var ChatResponsePart;
         else if (part instanceof ChatResponseCodeCitationPart$1) {
             return ChatResponseCodeCitationPart.from(part);
         }
+        else if (part instanceof ChatResponseMovePart$1) {
+            return ChatResponseMovePart.from(part);
+        }
         return {
             kind: 'markdownContent',
             content: MarkdownString.from('')
@@ -2482,19 +2545,20 @@ var ChatResponsePart;
 var ChatAgentRequest;
 ( (function(ChatAgentRequest) {
     function to(request, location2) {
-        const requestedTools = ( request.variables.variables.filter(v => v.isTool).map(tool => tool.id));
-        const variablesWithoutTools = request.variables.variables.filter(v => !v.isTool);
+        const toolReferences = request.variables.variables.filter(v => v.isTool);
+        const variableReferences = request.variables.variables.filter(v => !v.isTool);
         return {
             prompt: request.message,
             command: request.command,
             attempt: request.attempt ?? 0,
             enableCommandDetection: request.enableCommandDetection ?? true,
-            references: ( variablesWithoutTools.map(ChatAgentValueReference.to)),
+            isParticipantDetected: request.isParticipantDetected ?? false,
+            references: ( variableReferences.map(ChatPromptReference.to)),
+            toolReferences: ( toolReferences.map(ChatLanguageModelToolReference.to)),
             location: ChatLocation.to(request.location),
             acceptedConfirmationData: request.acceptedConfirmationData,
             rejectedConfirmationData: request.rejectedConfirmationData,
             location2,
-            requestedTools
         };
     }
     ChatAgentRequest.to = to;
@@ -2520,8 +2584,8 @@ var ChatLocation;
     }
     ChatLocation.from = from;
 })(ChatLocation || (ChatLocation = {})));
-var ChatAgentValueReference;
-( (function(ChatAgentValueReference) {
+var ChatPromptReference;
+( (function(ChatPromptReference) {
     function to(variable) {
         const value = variable.value;
         if (!value) {
@@ -2537,8 +2601,22 @@ var ChatAgentValueReference;
             modelDescription: variable.modelDescription
         };
     }
-    ChatAgentValueReference.to = to;
-})(ChatAgentValueReference || (ChatAgentValueReference = {})));
+    ChatPromptReference.to = to;
+})(ChatPromptReference || (ChatPromptReference = {})));
+var ChatLanguageModelToolReference;
+( (function(ChatLanguageModelToolReference) {
+    function to(variable) {
+        const value = variable.value;
+        if (value) {
+            throw ( new Error('Invalid tool reference'));
+        }
+        return {
+            id: variable.id,
+            range: variable.range && [variable.range.start, variable.range.endExclusive],
+        };
+    }
+    ChatLanguageModelToolReference.to = to;
+})(ChatLanguageModelToolReference || (ChatLanguageModelToolReference = {})));
 var ChatAgentCompletionItem;
 ( (function(ChatAgentCompletionItem) {
     function from(item, commandsConverter, disposables) {
@@ -2562,6 +2640,7 @@ var ChatAgentResult;
         return {
             errorDetails: result.errorDetails,
             metadata: result.metadata,
+            nextQuestion: result.nextQuestion,
         };
     }
     ChatAgentResult.to = to;
@@ -2594,6 +2673,25 @@ var ChatAgentUserActionEvent;
     }
     ChatAgentUserActionEvent.to = to;
 })(ChatAgentUserActionEvent || (ChatAgentUserActionEvent = {})));
+var LanguageModelToolResult;
+( (function(LanguageModelToolResult) {
+    function from(result) {
+        return {
+            ...result,
+            string: ( result.toString()),
+        };
+    }
+    LanguageModelToolResult.from = from;
+    function to(result) {
+        const copy = {
+            ...result,
+            toString: () => result.string,
+        };
+        delete copy.string;
+        return copy;
+    }
+    LanguageModelToolResult.to = to;
+})(LanguageModelToolResult || (LanguageModelToolResult = {})));
 var TerminalQuickFix;
 ( (function(TerminalQuickFix) {
     function from(quickFix, converter, disposables) {
@@ -2650,11 +2748,12 @@ var LanguageModelToolDescription;
 ( (function(LanguageModelToolDescription) {
     function to(item) {
         return {
-            name: item.name,
-            description: item.description,
+            id: item.id,
+            modelDescription: item.modelDescription,
             parametersSchema: item.parametersSchema,
+            displayName: item.displayName,
         };
     }
     LanguageModelToolDescription.to = to;
 })(LanguageModelToolDescription || (LanguageModelToolDescription = {})));
-export { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatAgentValueReference, ChatFollowup, ChatLocation, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseDetectedParticipantPart, ChatResponseFilesPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponsePart, ChatResponseProgressPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatTask, ChatTaskResult, CodeActionTriggerKind, Color, ColorPresentation, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DebugTreeItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, InlayHint, InlayHintKind, InlayHintLabelPart, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessageRole, LanguageModelToolDescription, LanguageSelector, Location, MappedEditsContext, MarkdownString, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionState, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, PartialAcceptInfo, PartialAcceptTriggerKind, Position, ProgressLocation, Range, Selection, SelectionRange, SignatureHelp, SignatureInformation, SymbolKind, SymbolTag, TerminalQuickFix, TestCoverage, TestItem, TestMessage, TestResults, TestTag, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorOpenOptions, ThemableDecorationAttachmentRenderOptions, ThemableDecorationRenderOptions, TokenType, TypeHierarchyItem, ViewBadge, ViewColumn, WorkspaceEdit, WorkspaceSymbol, fromRangeOrRangeWithMessage, isDecorationOptionsArr, location, pathOrURIToURI };
+export { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatFollowup, ChatLanguageModelToolReference, ChatLocation, ChatPromptReference, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseDetectedParticipantPart, ChatResponseFilesPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponsePart, ChatResponseProgressPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatTask, ChatTaskResult, CodeActionTriggerKind, Color, ColorPresentation, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DebugTreeItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, InlayHint, InlayHintKind, InlayHintLabelPart, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessageRole, LanguageModelToolDescription, LanguageModelToolResult, LanguageSelector, Location, MappedEditsContext, MarkdownString, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionState, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, PartialAcceptInfo, PartialAcceptTriggerKind, Position, ProgressLocation, Range, Selection, SelectionRange, SignatureHelp, SignatureInformation, SymbolKind, SymbolTag, TerminalQuickFix, TestCoverage, TestItem, TestMessage, TestResults, TestTag, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorOpenOptions, ThemableDecorationAttachmentRenderOptions, ThemableDecorationRenderOptions, TokenType, TypeHierarchyItem, ViewBadge, ViewColumn, WorkspaceEdit, WorkspaceSymbol, fromRangeOrRangeWithMessage, isDecorationOptionsArr, location, pathOrURIToURI };