@codingame/monaco-vscode-api 1.83.16 → 1.85.0-next.1

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

@@ -1,12 +1,11 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { mapFindFirst } from 'monaco-editor/esm/vs/base/common/arraysFind.js';
 import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
 import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
 import { CancellationToken, CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
 import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import { createSingleCallFunction } from 'monaco-editor/esm/vs/base/common/functional.js';
 import { hash } from 'monaco-editor/esm/vs/base/common/hash.js';
-import { toDisposable, DisposableStore, Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Disposable, toDisposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { deepFreeze } from 'monaco-editor/esm/vs/base/common/objects.js';
 import { isDefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { generateUuid } from 'monaco-editor/esm/vs/base/common/uuid.js';
@@ -17,13 +16,15 @@ import { TestMessage, TestResults, TestTag, location, TestItem, TestCoverage, Ra
 import { TestRunProfileKind, TestRunRequest } from './extHostTypes.js';
 import { TestId } from '../../contrib/testing/common/testId.js';
 import { InvalidTestItemError } from '../../contrib/testing/common/testItemCollection.js';
-import { TestsDiffOp, isStartControllerTests, AbstractIncrementalTestCollection } from '../../contrib/testing/common/testTypes.js';
+import { TestsDiffOp, isStartControllerTests, KEEP_N_LAST_COVERAGE_REPORTS, AbstractIncrementalTestCollection } from '../../contrib/testing/common/testTypes.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
-let ExtHostTesting = class ExtHostTesting {
+let ExtHostTesting = class ExtHostTesting extends Disposable {
     constructor(rpc, commands, editors) {
+        super();
         this.editors = editors;
-        this.resultsChangedEmitter = ( new Emitter());
+        this.resultsChangedEmitter = this._register(( new Emitter()));
         this.controllers = ( new Map());
+        this.activeProfilesChangedEmitter = this._register(( new Emitter()));
         this.onResultsChanged = this.resultsChangedEmitter.event;
         this.results = [];
         this.proxy = ( rpc.getProxy(MainContext.MainThreadTesting));
@@ -72,6 +73,7 @@ let ExtHostTesting = class ExtHostTesting {
         const collection = disposable.add(( new ExtHostTestItemCollection(controllerId, label, this.editors)));
         collection.root.label = label;
         const profiles = ( new Map());
+        const activeProfiles = ( new Set());
         const proxy = this.proxy;
         const controller = {
             items: collection.root.children,
@@ -101,6 +103,9 @@ let ExtHostTesting = class ExtHostTesting {
                 return ( new TestRunProfileImpl(
                     this.proxy,
                     profiles,
+                    extension,
+                    activeProfiles,
+                    this.activeProfilesChangedEmitter.event,
                     controllerId,
                     profileId,
                     label,
@@ -138,7 +143,7 @@ let ExtHostTesting = class ExtHostTesting {
         };
         proxy.$registerTestController(controllerId, label, !!refreshHandler);
         disposable.add(toDisposable(() => proxy.$unregisterTestController(controllerId)));
-        const info = { controller, collection, profiles: profiles, extension };
+        const info = { controller, collection, profiles, extension, activeProfiles };
         this.controllers.set(controllerId, info);
         disposable.add(toDisposable(() => this.controllers.delete(controllerId)));
         disposable.add(collection.onDidGenerateDiff(diff => proxy.$publishDiff(controllerId, ( diff.map(TestsDiffOp.serialize)))));
@@ -173,17 +178,43 @@ let ExtHostTesting = class ExtHostTesting {
         }
         return Promise.resolve();
     }
-    $provideFileCoverage(runId, taskId, token) {
-        const coverage = mapFindFirst(this.runTracker.trackers, t => t.id === runId ? t.getCoverage(taskId) : undefined);
-        return coverage?.provideFileCoverage(token) ?? Promise.resolve([]);
+    async $provideFileCoverage(runId, taskId, token) {
+        const coverage = this.runTracker.getCoverageReport(runId, taskId);
+        const fileCoverage = await coverage?.provideFileCoverage(token);
+        return fileCoverage ?? [];
     }
-    $resolveFileCoverage(runId, taskId, fileIndex, token) {
-        const coverage = mapFindFirst(this.runTracker.trackers, t => t.id === runId ? t.getCoverage(taskId) : undefined);
-        return coverage?.resolveFileCoverage(fileIndex, token) ?? Promise.resolve([]);
+    async $resolveFileCoverage(runId, taskId, fileIndex, token) {
+        const coverage = this.runTracker.getCoverageReport(runId, taskId);
+        const details = await coverage?.resolveFileCoverage(fileIndex, token);
+        return details ?? [];
     }
     $configureRunProfile(controllerId, profileId) {
         this.controllers.get(controllerId)?.profiles.get(profileId)?.configureHandler?.();
     }
+    $setActiveRunProfiles(profiles) {
+        const evt = ( new Map());
+        for (const [controllerId, profileIds] of Object.entries(profiles)) {
+            const ctrl = this.controllers.get(controllerId);
+            if (!ctrl) {
+                continue;
+            }
+            const changes = ( new Map());
+            const added = profileIds.filter(id => !( ctrl.activeProfiles.has(id)));
+            const removed = [...ctrl.activeProfiles].filter(id => !profileIds.includes(id));
+            for (const id of added) {
+                changes.set(id, true);
+                ctrl.activeProfiles.add(id);
+            }
+            for (const id of removed) {
+                changes.set(id, false);
+                ctrl.activeProfiles.delete(id);
+            }
+            if (changes.size) {
+                evt.set(controllerId, changes);
+            }
+        }
+        this.activeProfilesChangedEmitter.fire(evt);
+    }
     async $refreshTests(controllerId, token) {
         await this.controllers.get(controllerId)?.controller.refreshHandler?.(token);
     }
@@ -286,6 +317,8 @@ class TestRunTracker extends Disposable {
         this.tasks = ( new Map());
         this.sharedTestIds = ( new Set());
         this.endEmitter = this._register(( new Emitter()));
+        this.coverageEmitter = this._register(( new Emitter()));
+        this.onDidCoverage = this.coverageEmitter.event;
         this.onEnd = this.endEmitter.event;
         this.cts = this._register(( new CancellationTokenSource(parentToken)));
         const forciblyEnd = this._register(( new RunOnceScheduler(() => this.forciblyEndTasks(), RUN_CANCEL_DEADLINE)));
@@ -300,14 +333,13 @@ class TestRunTracker extends Disposable {
             this.forciblyEndTasks();
         }
     }
-    getCoverage(taskId) {
-        return this.tasks.get(taskId)?.coverage;
-    }
     createRun(name) {
         const runId = this.dto.id;
         const ctrlId = this.dto.controllerId;
         const taskId = generateUuid();
-        const coverage = ( new TestRunCoverageBearer(this.proxy, runId, taskId));
+        const extension = this.extension;
+        const coverageEmitter = this.coverageEmitter;
+        let coverage;
         const guardTestMutation = (fn) => (test, ...args) => {
             if (ended) {
                 console.warn(`Setting the state of test "${test.id}" is a no-op after the run ends.`);
@@ -323,9 +355,6 @@ class TestRunTracker extends Disposable {
             const converted = messages instanceof Array
                 ? ( messages.map(TestMessage.from))
                 : [TestMessage.from(messages)];
-            if (( converted.some(c => c.contextValue !== undefined))) {
-                checkProposedApiEnabled(this.extension, 'testMessageContextValue');
-            }
             if (test.uri && test.range) {
                 const defaultLocation = { range: Range.from(test.range), uri: test.uri };
                 for (const message of converted) {
@@ -340,10 +369,12 @@ class TestRunTracker extends Disposable {
             token: this.cts.token,
             name,
             get coverageProvider() {
-                return coverage.coverageProvider;
+                return coverage?.provider;
             },
             set coverageProvider(provider) {
-                coverage.coverageProvider = provider;
+                checkProposedApiEnabled(extension, 'testCoverage');
+                coverage = provider && ( new TestRunCoverageBearer(provider));
+                coverageEmitter.fire({ taskId, runId, coverage });
             },
             enqueued: guardTestMutation(test => {
                 this.proxy.$updateTestStateInRun(runId, taskId, ( TestId.fromExtHostTestItem(test, ctrlId).toString()), 1 );
@@ -391,7 +422,7 @@ class TestRunTracker extends Disposable {
                 }
             }
         };
-        this.tasks.set(taskId, { run, coverage });
+        this.tasks.set(taskId, { run });
         this.proxy.$startedTestRunTask(runId, { id: taskId, name, running: true });
         return run;
     }
@@ -441,6 +472,12 @@ class TestRunCoordinator {
     constructor(proxy) {
         this.proxy = proxy;
         this.tracked = ( new Map());
+        this.coverageReports = [];
+    }
+    getCoverageReport(runId, taskId) {
+        return this.coverageReports
+            .find(r => r.runId === runId)
+            ?.coverage.get(taskId);
     }
     prepareForMainThreadTestRun(req, dto, extension, token) {
         return this.getTracker(req, dto, extension, token);
@@ -484,7 +521,22 @@ class TestRunCoordinator {
     getTracker(req, dto, extension, token) {
         const tracker = ( new TestRunTracker(dto, this.proxy, extension, token));
         this.tracked.set(req, tracker);
-        Event.once(tracker.onEnd)(() => this.tracked.delete(req));
+        let coverageReports;
+        const coverageListener = tracker.onDidCoverage(({ runId, taskId, coverage }) => {
+            if (!coverageReports) {
+                coverageReports = { runId, coverage: ( new Map()) };
+                this.coverageReports.unshift(coverageReports);
+                if (this.coverageReports.length > KEEP_N_LAST_COVERAGE_REPORTS) {
+                    this.coverageReports.pop();
+                }
+            }
+            coverageReports.coverage.set(taskId, coverage);
+            this.proxy.$signalCoverageAvailable(runId, taskId, !!coverage);
+        });
+        Event.once(tracker.onEnd)(() => {
+            this.tracked.delete(req);
+            coverageListener.dispose();
+        });
         return tracker;
     }
 }
@@ -535,30 +587,12 @@ class TestRunDto {
     }
 }
 class TestRunCoverageBearer {
-    set coverageProvider(provider) {
-        if (this._coverageProvider) {
-            throw new Error('The TestCoverageProvider cannot be replaced after being provided');
-        }
-        if (!provider) {
-            return;
-        }
-        this._coverageProvider = provider;
-        this.proxy.$signalCoverageAvailable(this.runId, this.taskId);
-    }
-    get coverageProvider() {
-        return this._coverageProvider;
-    }
-    constructor(proxy, runId, taskId) {
-        this.proxy = proxy;
-        this.runId = runId;
-        this.taskId = taskId;
+    constructor(provider) {
+        this.provider = provider;
     }
     async provideFileCoverage(token) {
-        if (!this._coverageProvider) {
-            return [];
-        }
         if (!this.fileCoverage) {
-            this.fileCoverage = (async () => this._coverageProvider.provideFileCoverage(token))();
+            this.fileCoverage = (async () => this.provider.provideFileCoverage(token))();
         }
         try {
             const coverage = await this.fileCoverage;
@@ -572,11 +606,11 @@ class TestRunCoverageBearer {
     async resolveFileCoverage(index, token) {
         const fileCoverage = await this.fileCoverage;
         let file = fileCoverage?.[index];
-        if (!this._coverageProvider || !fileCoverage || !file) {
+        if (!this.provider || !fileCoverage || !file) {
             return [];
         }
         if (!file.detailedCoverage) {
-            file = fileCoverage[index] = (await this._coverageProvider.resolveFileCoverage?.(file, token)) ?? file;
+            file = fileCoverage[index] = (await this.provider.resolveFileCoverage?.(file, token)) ?? file;
         }
         return file.detailedCoverage?.map(TestCoverage.fromDetailed) ?? [];
     }
@@ -690,6 +724,9 @@ class TestObservers {
 }
 class TestRunProfileImpl {
     #proxy;
+    #extension;
+    #activeProfiles;
+    #onDidChangeActiveProfiles;
     #profiles;
     get label() {
         return this._label;
@@ -738,7 +775,17 @@ class TestRunProfileImpl {
             this.#proxy.$updateTestRunConfig(this.controllerId, this.profileId, { hasConfigurationHandler: !!handler });
         }
     }
-    constructor(proxy, profiles, controllerId, profileId, _label, kind, runHandler, _isDefault = false, _tag = undefined, _supportsContinuousRun = false) {
+    get isSelected() {
+        checkProposedApiEnabled(this.#extension, 'testingActiveProfile');
+        return ( this.#activeProfiles.has(this.profileId));
+    }
+    get onDidChangeSelected() {
+        checkProposedApiEnabled(this.#extension, 'testingActiveProfile');
+        return Event.chain(this.#onDidChangeActiveProfiles, $ => ( $
+            .map(ev => ev.get(this.controllerId)?.get(this.profileId)))
+            .filter(isDefined));
+    }
+    constructor(proxy, profiles, extension, activeProfiles, onDidChangeActiveProfiles, controllerId, profileId, _label, kind, runHandler, _isDefault = false, _tag = undefined, _supportsContinuousRun = false) {
         this.controllerId = controllerId;
         this.profileId = profileId;
         this._label = _label;
@@ -749,6 +796,9 @@ class TestRunProfileImpl {
         this._supportsContinuousRun = _supportsContinuousRun;
         this.#proxy = proxy;
         this.#profiles = profiles;
+        this.#extension = extension;
+        this.#activeProfiles = activeProfiles;
+        this.#onDidChangeActiveProfiles = onDidChangeActiveProfiles;
         profiles.set(profileId, this);
         const groupBitset = profileGroupToBitset[kind];
         if (typeof groupBitset !== 'number') {

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

@@ -5,7 +5,7 @@ import { createSingleCallFunction } from 'monaco-editor/esm/vs/base/common/funct
 import * as htmlContent from 'monaco-editor/esm/vs/base/common/htmlContent.js';
 import { ResourceSet, ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
 import { marked } from 'monaco-editor/esm/vs/base/common/marked/marked.js';
-import { parse } from 'monaco-editor/esm/vs/base/common/marshalling.js';
+import { revive, parse } from 'monaco-editor/esm/vs/base/common/marshalling.js';
 import { Mimes } from 'monaco-editor/esm/vs/base/common/mime.js';
 import { cloneAndChange } from 'monaco-editor/esm/vs/base/common/objects.js';
 import { isString, isNumber, isEmptyObject, isUndefinedOrNull } from 'monaco-editor/esm/vs/base/common/types.js';
@@ -19,7 +19,8 @@ import { CellKind, NotebookCellExecutionState as NotebookCellExecutionState$1 }
 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 { Position as Position$1, Selection as Selection$1, Range as Range$1, Diagnostic as Diagnostic$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, TextEdit as TextEdit$1, WorkspaceEdit as WorkspaceEdit$1, SnippetTextEdit, SnippetString, SymbolKind as SymbolKind$1, SymbolInformation, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, Location, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, CompletionItemKind as CompletionItemKind$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, ChatMessage as ChatMessage$1, InteractiveEditorResponseFeedbackKind as InteractiveEditorResponseFeedbackKind$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, SymbolTag as SymbolTag$1, DocumentSymbol as DocumentSymbol$1, Hover as Hover$1, EvaluatableExpression as EvaluatableExpression$1, DocumentHighlight as DocumentHighlight$1, CompletionItemTag as CompletionItemTag$1, CompletionItem as CompletionItem$1, InlayHintLabelPart as InlayHintLabelPart$1, SelectionRange as SelectionRange$1, EndOfLine as EndOfLine$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, DataTransfer as DataTransfer$1, ChatMessageRole as ChatMessageRole$1, ChatVariableLevel as ChatVariableLevel$1, DiagnosticTag as DiagnosticTag$1, DecorationRangeBehavior as DecorationRangeBehavior$1, NotebookCellKind as NotebookCellKind$1, StandardTokenType, CompletionTriggerKind as CompletionTriggerKind$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, TestMessage as TestMessage$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, 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, TextEdit as TextEdit$1, WorkspaceEdit as WorkspaceEdit$1, SnippetTextEdit, SnippetString, SymbolKind as SymbolKind$1, SymbolInformation, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, Location, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$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, ChatMessage as ChatMessage$1, InteractiveEditorResponseFeedbackKind as InteractiveEditorResponseFeedbackKind$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, SymbolTag as SymbolTag$1, DocumentSymbol as DocumentSymbol$1, Hover as Hover$1, EvaluatableExpression as EvaluatableExpression$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, CompletionItem as CompletionItem$1, InlayHintLabelPart as InlayHintLabelPart$1, SelectionRange as SelectionRange$1, EndOfLine as EndOfLine$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, DataTransfer as DataTransfer$1, ChatMessageRole as ChatMessageRole$1, ChatVariableLevel as ChatVariableLevel$1, DiagnosticTag as DiagnosticTag$1, DecorationRangeBehavior as DecorationRangeBehavior$1, NotebookCellKind as NotebookCellKind$1, StandardTokenType, CompletionTriggerKind as CompletionTriggerKind$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, TestMessage as TestMessage$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, NotebookRendererScript as NotebookRendererScript$1 } from './extHostTypes.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 var Selection;
 ( (function(Selection) {
     function to(selection) {
@@ -926,6 +927,20 @@ var DocumentHighlight;
     }
     DocumentHighlight.to = to;
 })(DocumentHighlight || (DocumentHighlight = {})));
+var MultiDocumentHighlight;
+( (function(MultiDocumentHighlight) {
+    function from(multiDocumentHighlight) {
+        return {
+            uri: multiDocumentHighlight.uri,
+            highlights: ( multiDocumentHighlight.highlights.map(DocumentHighlight.from))
+        };
+    }
+    MultiDocumentHighlight.from = from;
+    function to(multiDocumentHighlight) {
+        return new MultiDocumentHighlight$1(URI.revive(multiDocumentHighlight.uri), ( multiDocumentHighlight.highlights.map(DocumentHighlight.to)));
+    }
+    MultiDocumentHighlight.to = to;
+})(MultiDocumentHighlight || (MultiDocumentHighlight = {})));
 var CompletionTriggerKind;
 ( (function(CompletionTriggerKind) {
     function to(kind) {
@@ -1833,7 +1848,7 @@ var TestResults;
 var TestCoverage;
 ( (function(TestCoverage) {
     function fromCoveredCount(count) {
-        return { covered: count.covered, total: count.covered };
+        return { covered: count.covered, total: count.total };
     }
     function fromLocation(location) {
         return 'line' in location ? Position.from(location) : Range.from(location);
@@ -1854,6 +1869,7 @@ var TestCoverage;
         else {
             return {
                 type: 0 ,
+                name: coverage.name,
                 count: coverage.executionCount,
                 location: fromLocation(coverage.location),
             };
@@ -2001,20 +2017,10 @@ var DataTransfer;
 })(DataTransfer || (DataTransfer = {})));
 var ChatReplyFollowup;
 ( (function(ChatReplyFollowup) {
-    function to(followup) {
-        return {
-            message: followup.message,
-            metadata: followup.metadata,
-            title: followup.title,
-            tooltip: followup.tooltip,
-        };
-    }
-    ChatReplyFollowup.to = to;
     function from(followup) {
         return {
             kind: 'reply',
             message: followup.message,
-            metadata: followup.metadata,
             title: followup.title,
             tooltip: followup.tooltip,
         };
@@ -2084,10 +2090,19 @@ var ChatMessageRole;
 })(ChatMessageRole || (ChatMessageRole = {})));
 var ChatVariable;
 ( (function(ChatVariable) {
+    function objectTo(variableObject) {
+        const result = {};
+        for (const key of ( Object.keys(variableObject))) {
+            result[key] = ( variableObject[key].map(ChatVariable.to));
+        }
+        return result;
+    }
+    ChatVariable.objectTo = objectTo;
     function to(variable) {
         return {
             level: ChatVariableLevel.to(variable.level),
-            value: variable.value,
+            kind: variable.kind,
+            value: revive(variable.value),
             description: variable.description
         };
     }
@@ -2095,6 +2110,7 @@ var ChatVariable;
     function from(variable) {
         return {
             level: ChatVariableLevel.from(variable.level),
+            kind: variable.kind,
             value: variable.value,
             description: variable.description
         };
@@ -2136,17 +2152,100 @@ var InteractiveEditorResponseFeedbackKind;
                 return InteractiveEditorResponseFeedbackKind$1.Undone;
             case 3 :
                 return InteractiveEditorResponseFeedbackKind$1.Accepted;
+            case 4 :
+                return InteractiveEditorResponseFeedbackKind$1.Bug;
         }
     }
     InteractiveEditorResponseFeedbackKind.to = to;
 })(
     InteractiveEditorResponseFeedbackKind || (InteractiveEditorResponseFeedbackKind = {})
 ));
+var ChatResponseProgress;
+( (function(ChatResponseProgress) {
+    function from(extension, progress) {
+        if ('placeholder' in progress && 'resolvedContent' in progress) {
+            return { content: progress.placeholder, kind: 'asyncContent' };
+        }
+        else if ('markdownContent' in progress) {
+            checkProposedApiEnabled(extension, 'chatAgents2Additions');
+            return { content: MarkdownString.from(progress.markdownContent), kind: 'markdownContent' };
+        }
+        else if ('content' in progress) {
+            if ('vulnerabilities' in progress && progress.vulnerabilities) {
+                checkProposedApiEnabled(extension, 'chatAgents2Additions');
+                return { content: progress.content, vulnerabilities: progress.vulnerabilities, kind: 'vulnerability' };
+            }
+            if (typeof progress.content === 'string') {
+                return { content: progress.content, kind: 'content' };
+            }
+            checkProposedApiEnabled(extension, 'chatAgents2Additions');
+            return { content: MarkdownString.from(progress.content), kind: 'markdownContent' };
+        }
+        else if ('documents' in progress) {
+            return {
+                documents: ( progress.documents.map(d => ({
+                    uri: d.uri,
+                    version: d.version,
+                    ranges: ( d.ranges.map(r => Range.from(r)))
+                }))),
+                kind: 'usedContext'
+            };
+        }
+        else if ('reference' in progress) {
+            return {
+                reference: 'uri' in progress.reference ?
+                    {
+                        uri: progress.reference.uri,
+                        range: Range.from(progress.reference.range)
+                    } : progress.reference,
+                kind: 'reference'
+            };
+        }
+        else if ('inlineReference' in progress) {
+            return {
+                inlineReference: 'uri' in progress.inlineReference ?
+                    {
+                        uri: progress.inlineReference.uri,
+                        range: Range.from(progress.inlineReference.range)
+                    } : progress.inlineReference,
+                name: progress.title,
+                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 ('message' in progress) {
+            return { content: progress.message, kind: 'progressMessage' };
+        }
+        else {
+            return undefined;
+        }
+    }
+    ChatResponseProgress.from = from;
+})(ChatResponseProgress || (ChatResponseProgress = {})));
+var ChatAgentCompletionItem;
+( (function(ChatAgentCompletionItem) {
+    function from(item) {
+        return {
+            label: item.label,
+            values: ( item.values.map(ChatVariable.from)),
+            insertText: item.insertText,
+            detail: item.detail,
+            documentation: item.documentation,
+        };
+    }
+    ChatAgentCompletionItem.from = from;
+})(ChatAgentCompletionItem || (ChatAgentCompletionItem = {})));
 var TerminalQuickFix;
 ( (function(TerminalQuickFix) {
     function from(quickFix, converter, disposables) {
         if ('terminalCommand' in quickFix) {
-            return { terminalCommand: quickFix.terminalCommand };
+            return { terminalCommand: quickFix.terminalCommand, shouldExecute: quickFix.shouldExecute };
         }
         if ('uri' in quickFix) {
             return { uri: quickFix.uri };
@@ -2155,4 +2254,4 @@ var TerminalQuickFix;
     }
     TerminalQuickFix.from = from;
 })(TerminalQuickFix || (TerminalQuickFix = {})));
-export { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatFollowup, ChatMessage, ChatMessageRole, ChatReplyFollowup, 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, MappedEditsContext, MarkdownString, 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 };
+export { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, 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, 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 };