@codingame/monaco-vscode-api 2.2.2 → 3.0.0

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

@@ -2,7 +2,7 @@ import { Schemas } from '../../../base/common/network.js';
 import { URI } from '../../../base/common/uri.js';
 import { NotebookCellOutput, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutputItem } from './extHostTypeConverters.js';
 import { NotebookRange } from './extHostTypes.js';
-import { isTextStreamMime, compressOutputItemStreams, NotebookCellsChangeType } from '../../contrib/notebook/common/notebookCommon.js';
+import { isTextStreamMime, compressOutputItemStreams, NotebookCellsChangeType, CellUri } from '../../contrib/notebook/common/notebookCommon.js';
 class RawContentChangeEvent {
     constructor(start, deletedCount, deletedItems, items) {
         this.start = start;
@@ -19,15 +19,14 @@ class RawContentChangeEvent {
     }
 }
 class ExtHostCell {
-    static asModelAddData(notebook, cell) {
+    static asModelAddData(cell) {
         return {
             EOL: cell.eol,
             lines: cell.source,
             languageId: cell.language,
             uri: cell.uri,
             isDirty: false,
-            versionId: 1,
-            notebook
+            versionId: 1
         };
     }
     constructor(notebook, _extHostDocument, _cellData) {
@@ -292,7 +291,7 @@ class ExtHostNotebookDocument {
             const newCells = ( cellDtos.map(cell => {
                 const extCell = ( new ExtHostCell(this, this._textDocumentsAndEditors, cell));
                 if (!initialization) {
-                    addedCellDocuments.push(ExtHostCell.asModelAddData(this.apiNotebook, cell));
+                    addedCellDocuments.push(ExtHostCell.asModelAddData(cell));
                 }
                 return extCell;
             }));
@@ -358,6 +357,16 @@ class ExtHostNotebookDocument {
         return this._cells[index];
     }
     getCell(cellHandle) {
+        if (URI.isUri(cellHandle)) {
+            const data = CellUri.parse(cellHandle);
+            if (!data) {
+                return undefined;
+            }
+            if (( data.notebook.toString()) !== ( this.uri.toString())) {
+                return undefined;
+            }
+            cellHandle = data.handle;
+        }
         return this._cells.find(cell => cell.handle === cellHandle);
     }
     getCellIndex(cell) {

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

@@ -60,7 +60,24 @@ let ExtHostNotebookKernels = class ExtHostNotebookKernels {
             ],
             ApiCommandResult.Void
         ));
+        const requestKernelVariablesApiCommand = ( new ApiCommand(
+            'vscode.executeNotebookVariableProvider',
+            '_executeNotebookVariableProvider',
+            'Execute notebook variable provider',
+            [ApiCommandArgument.Uri],
+            ( new ApiCommandResult('A promise that resolves to an array of variables', (value, apiArgs) => {
+                return ( value.map(variable => {
+                    return {
+                        name: variable.name,
+                        value: variable.value,
+                        type: variable.type,
+                        editable: false
+                    };
+                }));
+            }))
+        ));
         this._commands.registerApiCommand(selectKernelApiCommand);
+        this._commands.registerApiCommand(requestKernelVariablesApiCommand);
     }
     createNotebookController(extension, id, viewType, label, handler, preloads) {
         for (const data of ( this._kernelData.values())) {
@@ -373,7 +390,8 @@ let ExtHostNotebookKernels = class ExtHostNotebookKernels {
                 value: result.variable.value,
                 type: result.variable.type,
                 hasNamedChildren: result.hasNamedChildren,
-                indexedChildrenCount: result.indexedChildrenCount
+                indexedChildrenCount: result.indexedChildrenCount,
+                extensionId: obj.extensionId.value,
             };
             this.variableStore[variable.id] = result.variable;
             this._proxy.$receiveVariable(requestId, variable);

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

@@ -8,7 +8,7 @@ class ExtHostSpeech {
         this.sessions = ( new Map());
         this.proxy = ( mainContext.getProxy(MainContext.MainThreadSpeech));
     }
-    async $createSpeechToTextSession(handle, session) {
+    async $createSpeechToTextSession(handle, session, language) {
         const provider = this.providers.get(handle);
         if (!provider) {
             return;
@@ -16,7 +16,7 @@ class ExtHostSpeech {
         const disposables = ( new DisposableStore());
         const cts = ( new CancellationTokenSource());
         this.sessions.set(session, cts);
-        const speechToTextSession = disposables.add(provider.provideSpeechToTextSession(cts.token));
+        const speechToTextSession = disposables.add(provider.provideSpeechToTextSession(cts.token, language ? { language } : undefined));
         disposables.add(speechToTextSession.onDidChange(e => {
             if (cts.token.isCancellationRequested) {
                 return;

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

@@ -8,6 +8,7 @@ import marked from 'vscode-marked';
 import { parse, revive } from '../../../base/common/marshalling.js';
 import { Mimes } from '../../../base/common/mime.js';
 import { cloneAndChange } from '../../../base/common/objects.js';
+import { basename } from '../../../base/common/resources.js';
 import { isString, isNumber, isUndefinedOrNull, isEmptyObject } from '../../../base/common/types.js';
 import { URI, isUriComponents } from '../../../base/common/uri.js';
 import { Range as Range$2 } from '../../../editor/common/core/range.js';
@@ -20,7 +21,7 @@ import { TestId } from '../../contrib/testing/common/testId.js';
 import { namespaceTestTag, denamespaceTestTag } from '../../contrib/testing/common/testTypes.js';
 import { SIDE_GROUP, ACTIVE_GROUP } from '../../services/editor/common/editorService.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.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, 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, 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, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, TestTag as TestTag$1, TypeHierarchyItem as TypeHierarchyItem$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, Hover as Hover$1, DocumentHighlight as DocumentHighlight$1, InlayHintLabelPart as InlayHintLabelPart$1, FoldingRangeKind as FoldingRangeKind$1, NotebookCellData as NotebookCellData$1, DiagnosticTag as DiagnosticTag$1, SymbolTag as SymbolTag$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, EndOfLine as EndOfLine$1, RelativePattern, NotebookRange as NotebookRange$1, NotebookCellKind as NotebookCellKind$1, DataTransfer as DataTransfer$1, StandardTokenType, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, TestMessage as TestMessage$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, ChatMessage as ChatMessage$1, InteractiveEditorResponseFeedbackKind as InteractiveEditorResponseFeedbackKind$1, DocumentSymbol as DocumentSymbol$1, EvaluatableExpression as EvaluatableExpression$1, MultiDocumentHighlight as MultiDocumentHighlight$1, SelectionRange as SelectionRange$1, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, NotebookRendererScript as NotebookRendererScript$1, CodeActionTriggerKind as CodeActionTriggerKind$1, ChatMessageRole as ChatMessageRole$1, ChatVariableLevel as ChatVariableLevel$1, DecorationRangeBehavior as DecorationRangeBehavior$1, CompletionTriggerKind as CompletionTriggerKind$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, 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, 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, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, TestTag as TestTag$1, TypeHierarchyItem as TypeHierarchyItem$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, Hover as Hover$1, DocumentHighlight as DocumentHighlight$1, InlayHintLabelPart as InlayHintLabelPart$1, FoldingRangeKind as FoldingRangeKind$1, NotebookCellData as NotebookCellData$1, DiagnosticTag as DiagnosticTag$1, SymbolTag as SymbolTag$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, EndOfLine as EndOfLine$1, RelativePattern, NotebookRange as NotebookRange$1, NotebookCellKind as NotebookCellKind$1, DataTransfer as DataTransfer$1, StandardTokenType, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, TestMessage as TestMessage$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, LanguageModelAssistantMessage, LanguageModelUserMessage, LanguageModelSystemMessage, InteractiveEditorResponseFeedbackKind as InteractiveEditorResponseFeedbackKind$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseFileTreePart, DocumentSymbol as DocumentSymbol$1, EvaluatableExpression as EvaluatableExpression$1, MultiDocumentHighlight as MultiDocumentHighlight$1, SelectionRange as SelectionRange$1, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, NotebookRendererScript as NotebookRendererScript$1, CodeActionTriggerKind as CodeActionTriggerKind$1, ChatVariableLevel as ChatVariableLevel$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, DecorationRangeBehavior as DecorationRangeBehavior$1, CompletionTriggerKind as CompletionTriggerKind$1 } from './extHostTypes.js';
 var Selection;
 ( (function(Selection) {
     function to(selection) {
@@ -67,6 +68,13 @@ var Range;
 })(Range || (Range = {})));
 var Location;
 ( (function(Location) {
+    function from(location) {
+        return {
+            uri: location.uri,
+            range: Range.from(location.range)
+        };
+    }
+    Location.from = from;
     function to(location) {
         return new Location$1(URI.revive(location.uri), Range.to(location.range));
     }
@@ -1282,6 +1290,8 @@ var TextEditorLineNumbersStyle;
                 return 0 ;
             case TextEditorLineNumbersStyle$1.Relative:
                 return 2 ;
+            case TextEditorLineNumbersStyle$1.Interval:
+                return 3 ;
             case TextEditorLineNumbersStyle$1.On:
             default:
                 return 1 ;
@@ -1294,6 +1304,8 @@ var TextEditorLineNumbersStyle;
                 return TextEditorLineNumbersStyle$1.Off;
             case 2 :
                 return TextEditorLineNumbersStyle$1.Relative;
+            case 3 :
+                return TextEditorLineNumbersStyle$1.Interval;
             case 1 :
             default:
                 return TextEditorLineNumbersStyle$1.On;
@@ -1863,12 +1875,12 @@ var TestCoverage;
     function fromDetailed(coverage) {
         if ('branches' in coverage) {
             return {
-                count: coverage.executionCount,
+                count: coverage.executed,
                 location: fromLocation(coverage.location),
                 type: 1 ,
                 branches: coverage.branches.length
                     ? ( coverage.branches.map(
-                    b => ({ count: b.executionCount, location: b.location && fromLocation(b.location), label: b.label })
+                    b => ({ count: b.executed, location: b.location && fromLocation(b.location), label: b.label })
                 ))
                     : undefined,
             };
@@ -1877,7 +1889,7 @@ var TestCoverage;
             return {
                 type: 0 ,
                 name: coverage.name,
-                count: coverage.executionCount,
+                count: coverage.executed,
                 location: fromLocation(coverage.location),
             };
         }
@@ -1888,7 +1900,7 @@ var TestCoverage;
             uri: coverage.uri,
             statement: fromCoveredCount(coverage.statementCoverage),
             branch: coverage.branchCoverage && fromCoveredCount(coverage.branchCoverage),
-            function: coverage.functionCoverage && fromCoveredCount(coverage.functionCoverage),
+            declaration: coverage.declarationCoverage && fromCoveredCount(coverage.declarationCoverage),
             details: coverage.detailedCoverage?.map(fromDetailed),
         };
     }
@@ -2022,25 +2034,32 @@ var DataTransfer;
     }
     DataTransfer.from = from;
 })(DataTransfer || (DataTransfer = {})));
-var ChatReplyFollowup;
-( (function(ChatReplyFollowup) {
-    function from(followup) {
+var ChatFollowup;
+( (function(ChatFollowup) {
+    function from(followup, request) {
         return {
             kind: 'reply',
-            message: followup.message,
-            title: followup.title,
-            tooltip: followup.tooltip,
+            agentId: followup.participant ?? request?.agentId ?? '',
+            subCommand: followup.command ?? request?.command,
+            message: followup.prompt,
+            title: followup.label
         };
     }
-    ChatReplyFollowup.from = from;
-})(ChatReplyFollowup || (ChatReplyFollowup = {})));
-var ChatFollowup;
-( (function(ChatFollowup) {
+    ChatFollowup.from = from;
+    function to(followup) {
+        return {
+            prompt: followup.message,
+            label: followup.title,
+            participant: followup.agentId,
+            command: followup.subCommand,
+        };
+    }
+    ChatFollowup.to = to;
+})(ChatFollowup || (ChatFollowup = {})));
+var ChatInlineFollowup;
+( (function(ChatInlineFollowup) {
     function from(followup) {
-        if (typeof followup === 'string') {
-            return { title: followup, message: followup, kind: 'reply' };
-        }
-        else if ('commandId' in followup) {
+        if ('commandId' in followup) {
             return {
                 kind: 'command',
                 title: followup.title ?? '',
@@ -2050,51 +2069,42 @@ var ChatFollowup;
             };
         }
         else {
-            return ChatReplyFollowup.from(followup);
+            return {
+                kind: 'reply',
+                message: followup.message,
+                title: followup.title,
+                tooltip: followup.tooltip,
+            };
         }
     }
-    ChatFollowup.from = from;
-})(ChatFollowup || (ChatFollowup = {})));
-var ChatMessage;
-( (function(ChatMessage) {
+    ChatInlineFollowup.from = from;
+})(ChatInlineFollowup || (ChatInlineFollowup = {})));
+var LanguageModelMessage;
+( (function(LanguageModelMessage) {
     function to(message) {
-        const res = new ChatMessage$1(ChatMessageRole.to(message.role), message.content);
-        res.name = message.name;
-        return res;
+        switch (message.role) {
+            case 0 : return new LanguageModelSystemMessage(message.content);
+            case 1 : return new LanguageModelUserMessage(message.content);
+            case 2 : return new LanguageModelAssistantMessage(message.content);
+        }
     }
-    ChatMessage.to = to;
+    LanguageModelMessage.to = to;
     function from(message) {
-        return {
-            role: ChatMessageRole.from(message.role),
-            content: message.content,
-            name: message.name
-        };
-    }
-    ChatMessage.from = from;
-})(ChatMessage || (ChatMessage = {})));
-var ChatMessageRole;
-( (function(ChatMessageRole) {
-    function to(role) {
-        switch (role) {
-            case 0 : return ChatMessageRole$1.System;
-            case 1 : return ChatMessageRole$1.User;
-            case 2 : return ChatMessageRole$1.Assistant;
-            case 3 : return ChatMessageRole$1.Function;
-        }
-    }
-    ChatMessageRole.to = to;
-    function from(role) {
-        switch (role) {
-            case ChatMessageRole$1.System: return 0 ;
-            case ChatMessageRole$1.Assistant: return 2 ;
-            case ChatMessageRole$1.Function: return 3 ;
-            case ChatMessageRole$1.User:
-            default:
-                return 1 ;
+        if (message instanceof LanguageModelSystemMessage) {
+            return { role: 0 , content: message.content };
+        }
+        else if (message instanceof LanguageModelUserMessage) {
+            return { role: 1 , content: message.content };
+        }
+        else if (message instanceof LanguageModelAssistantMessage) {
+            return { role: 2 , content: message.content };
+        }
+        else {
+            throw new Error('Invalid LanguageModelMessage');
         }
     }
-    ChatMessageRole.from = from;
-})(ChatMessageRole || (ChatMessageRole = {})));
+    LanguageModelMessage.from = from;
+})(LanguageModelMessage || (LanguageModelMessage = {})));
 var ChatVariable;
 ( (function(ChatVariable) {
     function objectTo(variableObject) {
@@ -2167,22 +2177,185 @@ var InteractiveEditorResponseFeedbackKind;
 })(
     InteractiveEditorResponseFeedbackKind || (InteractiveEditorResponseFeedbackKind = {})
 ));
+var ChatResponseMarkdownPart;
+( (function(ChatResponseMarkdownPart) {
+    function to(part) {
+        return {
+            kind: 'markdownContent',
+            content: MarkdownString.from(part.value)
+        };
+    }
+    ChatResponseMarkdownPart.to = to;
+    function from(part) {
+        return new ChatResponseMarkdownPart$1(MarkdownString.to(part.content));
+    }
+    ChatResponseMarkdownPart.from = from;
+})(ChatResponseMarkdownPart || (ChatResponseMarkdownPart = {})));
+var ChatResponseFilesPart;
+( (function(ChatResponseFilesPart) {
+    function to(part) {
+        const { value, baseUri } = part;
+        function convert(items, baseUri) {
+            return ( items.map(item => {
+                const myUri = URI.joinPath(baseUri, item.name);
+                return {
+                    label: item.name,
+                    uri: myUri,
+                    children: item.children && convert(item.children, myUri)
+                };
+            }));
+        }
+        return {
+            kind: 'treeData',
+            treeData: {
+                label: basename(baseUri),
+                uri: baseUri,
+                children: convert(value, baseUri)
+            }
+        };
+    }
+    ChatResponseFilesPart.to = to;
+    function from(part) {
+        const treeData = revive(part.treeData);
+        function convert(items) {
+            return ( items.map(item => {
+                return {
+                    name: item.label,
+                    children: item.children && convert(item.children)
+                };
+            }));
+        }
+        const baseUri = treeData.uri;
+        const items = treeData.children ? convert(treeData.children) : [];
+        return new ChatResponseFileTreePart(items, baseUri);
+    }
+    ChatResponseFilesPart.from = from;
+})(ChatResponseFilesPart || (ChatResponseFilesPart = {})));
+var ChatResponseAnchorPart;
+( (function(ChatResponseAnchorPart) {
+    function to(part) {
+        return {
+            kind: 'inlineReference',
+            name: part.title,
+            inlineReference: !URI.isUri(part.value) ? Location.from(part.value) : part.value
+        };
+    }
+    ChatResponseAnchorPart.to = to;
+    function from(part) {
+        const value = revive(part);
+        return new ChatResponseAnchorPart$1(URI.isUri(value.inlineReference) ? value.inlineReference : Location.to(value.inlineReference), part.name);
+    }
+    ChatResponseAnchorPart.from = from;
+})(ChatResponseAnchorPart || (ChatResponseAnchorPart = {})));
+var ChatResponseProgressPart;
+( (function(ChatResponseProgressPart) {
+    function to(part) {
+        return {
+            kind: 'progressMessage',
+            content: MarkdownString.from(part.value)
+        };
+    }
+    ChatResponseProgressPart.to = to;
+    function from(part) {
+        return new ChatResponseProgressPart$1(part.content.value);
+    }
+    ChatResponseProgressPart.from = from;
+})(ChatResponseProgressPart || (ChatResponseProgressPart = {})));
+var ChatResponseCommandButtonPart;
+( (function(ChatResponseCommandButtonPart) {
+    function to(part, commandsConverter, commandDisposables) {
+        const command = commandsConverter.toInternal(part.value, commandDisposables) ?? { command: part.value.command, title: part.value.title };
+        return {
+            kind: 'command',
+            command
+        };
+    }
+    ChatResponseCommandButtonPart.to = to;
+    function from(part, commandsConverter) {
+        return new ChatResponseCommandButtonPart$1(commandsConverter.fromInternal(part.command) ?? { command: part.command.id, title: part.command.title });
+    }
+    ChatResponseCommandButtonPart.from = from;
+})(ChatResponseCommandButtonPart || (ChatResponseCommandButtonPart = {})));
+var ChatResponseReferencePart;
+( (function(ChatResponseReferencePart) {
+    function to(part) {
+        return {
+            kind: 'reference',
+            reference: !URI.isUri(part.value) ? Location.from(part.value) : part.value
+        };
+    }
+    ChatResponseReferencePart.to = to;
+    function from(part) {
+        const value = revive(part);
+        return new ChatResponseReferencePart$1(URI.isUri(value.reference) ? value.reference : Location.to(value.reference));
+    }
+    ChatResponseReferencePart.from = from;
+})(ChatResponseReferencePart || (ChatResponseReferencePart = {})));
+var ChatResponsePart;
+( (function(ChatResponsePart) {
+    function to(part) {
+        if (part instanceof ChatResponseMarkdownPart$1) {
+            return ChatResponseMarkdownPart.to(part);
+        }
+        else if (part instanceof ChatResponseAnchorPart$1) {
+            return ChatResponseAnchorPart.to(part);
+        }
+        else if (part instanceof ChatResponseReferencePart$1) {
+            return ChatResponseReferencePart.to(part);
+        }
+        else if (part instanceof ChatResponseProgressPart$1) {
+            return ChatResponseProgressPart.to(part);
+        }
+        else if (part instanceof ChatResponseFileTreePart) {
+            return ChatResponseFilesPart.to(part);
+        }
+        return {
+            kind: 'content',
+            content: ''
+        };
+    }
+    ChatResponsePart.to = to;
+    function from(part, commandsConverter) {
+        switch (part.kind) {
+            case 'reference': return ChatResponseReferencePart.from(part);
+            case 'markdownContent':
+            case 'inlineReference':
+            case 'progressMessage':
+            case 'treeData':
+            case 'command':
+                return fromContent(part, commandsConverter);
+        }
+        return undefined;
+    }
+    ChatResponsePart.from = from;
+    function fromContent(part, commandsConverter) {
+        switch (part.kind) {
+            case 'markdownContent': return ChatResponseMarkdownPart.from(part);
+            case 'inlineReference': return ChatResponseAnchorPart.from(part);
+            case 'progressMessage': return undefined;
+            case 'treeData': return ChatResponseFilesPart.from(part);
+            case 'command': return ChatResponseCommandButtonPart.from(part, commandsConverter);
+        }
+        return undefined;
+    }
+    ChatResponsePart.fromContent = fromContent;
+})(ChatResponsePart || (ChatResponsePart = {})));
 var ChatResponseProgress;
 ( (function(ChatResponseProgress) {
     function from(extension, progress) {
         if ('markdownContent' in progress) {
-            checkProposedApiEnabled(extension, 'chatAgents2Additions');
+            checkProposedApiEnabled(extension, 'chatParticipantAdditions');
             return { content: MarkdownString.from(progress.markdownContent), kind: 'markdownContent' };
         }
         else if ('content' in progress) {
             if ('vulnerabilities' in progress && progress.vulnerabilities) {
-                checkProposedApiEnabled(extension, 'chatAgents2Additions');
+                checkProposedApiEnabled(extension, 'chatParticipantAdditions');
                 return { content: progress.content, vulnerabilities: progress.vulnerabilities, kind: 'vulnerability' };
             }
             if (typeof progress.content === 'string') {
                 return { content: progress.content, kind: 'content' };
             }
-            checkProposedApiEnabled(extension, 'chatAgents2Additions');
+            checkProposedApiEnabled(extension, 'chatParticipantAdditions');
             return { content: MarkdownString.from(progress.content), kind: 'markdownContent' };
         }
         else if ('documents' in progress) {
@@ -2216,12 +2389,9 @@ var ChatResponseProgress;
                 kind: 'inlineReference'
             };
         }
-        else if ('agentName' in progress) {
-            checkProposedApiEnabled(extension, 'chatAgents2Additions');
-            return { agentName: progress.agentName, command: progress.command, kind: 'agentDetection' };
-        }
-        else if ('treeData' in progress) {
-            return { treeData: progress.treeData, kind: 'treeData' };
+        else if ('participant' in progress) {
+            checkProposedApiEnabled(extension, 'chatParticipantAdditions');
+            return { agentName: progress.participant, command: progress.command, kind: 'agentDetection' };
         }
         else if ('message' in progress) {
             return { content: MarkdownString.from(progress.message), kind: 'progressMessage' };
@@ -2258,7 +2428,7 @@ var ChatResponseProgress;
         }
     }
     ChatResponseProgress.to = to;
-    function toProgressContent(progress) {
+    function toProgressContent(progress, commandsConverter) {
         switch (progress.kind) {
             case 'markdownContent':
                 return { content: progress.content.value };
@@ -2269,8 +2439,10 @@ var ChatResponseProgress;
                         Location.to(progress.inlineReference),
                     title: progress.name
                 };
-            case 'treeData':
-                return { treeData: revive(progress.treeData) };
+            case 'command':
+                return {
+                    command: commandsConverter.fromInternal(progress.command) ?? { command: progress.command.id, title: progress.command.title },
+                };
             default:
                 return undefined;
         }
@@ -2279,17 +2451,26 @@ var ChatResponseProgress;
 })(ChatResponseProgress || (ChatResponseProgress = {})));
 var ChatAgentRequest;
 ( (function(ChatAgentRequest) {
-    function to(request, slashCommand) {
+    function to(request) {
         return {
             prompt: request.message,
-            variables: ChatVariable.objectTo(request.variables),
-            slashCommand,
-            subCommand: request.command,
-            agentId: request.agentId,
+            command: request.command,
+            variables: ( request.variables.variables.map(ChatAgentResolvedVariable.to))
         };
     }
     ChatAgentRequest.to = to;
 })(ChatAgentRequest || (ChatAgentRequest = {})));
+var ChatAgentResolvedVariable;
+( (function(ChatAgentResolvedVariable) {
+    function to(request) {
+        return {
+            name: request.name,
+            range: [request.range.start, request.range.endExclusive],
+            values: ( request.values.map(ChatVariable.to))
+        };
+    }
+    ChatAgentResolvedVariable.to = to;
+})(ChatAgentResolvedVariable || (ChatAgentResolvedVariable = {})));
 var ChatAgentCompletionItem;
 ( (function(ChatAgentCompletionItem) {
     function from(item) {
@@ -2303,6 +2484,37 @@ var ChatAgentCompletionItem;
     }
     ChatAgentCompletionItem.from = from;
 })(ChatAgentCompletionItem || (ChatAgentCompletionItem = {})));
+var ChatAgentResult;
+( (function(ChatAgentResult) {
+    function to(result) {
+        return {
+            errorDetails: result.errorDetails,
+            metadata: result.metadata,
+        };
+    }
+    ChatAgentResult.to = to;
+})(ChatAgentResult || (ChatAgentResult = {})));
+var ChatAgentUserActionEvent;
+( (function(ChatAgentUserActionEvent) {
+    function to(result, event, commandsConverter) {
+        if (event.action.kind === 'vote') {
+            return;
+        }
+        const ehResult = ChatAgentResult.to(result);
+        if (event.action.kind === 'command') {
+            const commandAction = { kind: 'command', commandButton: ChatResponseProgress.toProgressContent(event.action.commandButton, commandsConverter) };
+            return { action: commandAction, result: ehResult };
+        }
+        else if (event.action.kind === 'followUp') {
+            const followupAction = { kind: 'followUp', followup: ChatFollowup.to(event.action.followup) };
+            return { action: followupAction, result: ehResult };
+        }
+        else {
+            return { action: event.action, result: ehResult };
+        }
+    }
+    ChatAgentUserActionEvent.to = to;
+})(ChatAgentUserActionEvent || (ChatAgentUserActionEvent = {})));
 var TerminalQuickFix;
 ( (function(TerminalQuickFix) {
     function from(quickFix, converter, disposables) {
@@ -2316,4 +2528,18 @@ var TerminalQuickFix;
     }
     TerminalQuickFix.from = from;
 })(TerminalQuickFix || (TerminalQuickFix = {})));
-export { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatFollowup, ChatMessage, ChatMessageRole, ChatReplyFollowup, ChatResponseProgress, ChatVariable, ChatVariableLevel, CodeActionTriggerKind, Color, ColorPresentation, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, InlayHint, InlayHintKind, InlayHintLabelPart, InlineValue, InlineValueContext, InteractiveEditorResponseFeedbackKind, LanguageSelector, Location, MappedEditsContext, MarkdownString, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionState, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, 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 };
+var DebugTreeItem;
+( (function(DebugTreeItem) {
+    function from(item, id) {
+        return {
+            id,
+            label: item.label,
+            description: item.description,
+            canEdit: item.canEdit,
+            collapsibleState: ((item.collapsibleState || 0) ),
+            contextValue: item.contextValue,
+        };
+    }
+    DebugTreeItem.from = from;
+})(DebugTreeItem || (DebugTreeItem = {})));
+export { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResolvedVariable, ChatAgentResult, ChatAgentUserActionEvent, ChatFollowup, ChatInlineFollowup, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatResponseFilesPart, ChatResponseMarkdownPart, ChatResponsePart, ChatResponseProgress, ChatResponseProgressPart, ChatResponseReferencePart, ChatVariable, ChatVariableLevel, 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, InteractiveEditorResponseFeedbackKind, LanguageModelMessage, LanguageSelector, Location, MappedEditsContext, MarkdownString, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionState, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, 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 };