@codingame/monaco-vscode-api 2.0.3-improve-modularity.1 → 2.1.0-update-vscode-1.86.1

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

@@ -430,6 +430,9 @@ let ExtHostTaskBase = class ExtHostTaskBase {
         return this._onDidTerminateTask.event;
     }
     async $OnDidEndTask(execution) {
+        if (!( this._taskExecutionPromises.has(execution.id))) {
+            return;
+        }
         const _execution = await this.getTaskExecution(execution);
         this._taskExecutionPromises.delete(execution.id);
         this._taskExecutions.delete(execution.id);
@@ -527,29 +530,22 @@ let ExtHostTaskBase = class ExtHostTaskBase {
         if (result) {
             return result;
         }
-        const createdResult = ( new Promise((resolve, reject) => {
-            function resolvePromiseWithCreatedTask(that, execution, taskToCreate) {
-                if (!taskToCreate) {
-                    reject('Unexpected: Task does not exist.');
-                }
-                else {
-                    resolve(( new TaskExecutionImpl(that, execution.id, taskToCreate)));
+        let executionPromise;
+        if (!task) {
+            executionPromise = TaskDTO.to(execution.task, this._workspaceProvider, this._providedCustomExecutions2).then(t => {
+                if (!t) {
+                    throw new ErrorNoTelemetry('Unexpected: Task does not exist.');
                 }
-            }
-            if (task) {
-                resolvePromiseWithCreatedTask(this, execution, task);
-            }
-            else {
-                TaskDTO.to(execution.task, this._workspaceProvider, this._providedCustomExecutions2)
-                    .then(task => resolvePromiseWithCreatedTask(this, execution, task));
-            }
-        }));
-        this._taskExecutionPromises.set(execution.id, createdResult);
-        return createdResult.then(executionCreatedResult => {
-            this._taskExecutions.set(execution.id, executionCreatedResult);
-            return executionCreatedResult;
-        }, rejected => {
-            return Promise.reject(rejected);
+                return ( new TaskExecutionImpl(this, execution.id, t));
+            });
+        }
+        else {
+            executionPromise = Promise.resolve(( new TaskExecutionImpl(this, execution.id, task)));
+        }
+        this._taskExecutionPromises.set(execution.id, executionPromise);
+        return executionPromise.then(taskExecution => {
+            this._taskExecutions.set(execution.id, taskExecution);
+            return taskExecution;
         });
     }
     checkDeprecation(task, handler) {

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

@@ -32,6 +32,7 @@ let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
             "Extension Telemetry{0}",
             this._inLoggingOnlyMode ? ' (Not Sent)' : ''
         )), hidden: true });
+        this._register(this._outputLogger);
         this._register(loggerService.onDidChangeLogLevel(arg => {
             if (isLogLevel(arg)) {
                 this.updateLoggerVisibility();

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

@@ -99,7 +99,7 @@ class ExtHostTerminal {
             isTransient: options.isTransient ?? undefined,
         });
     }
-    async createExtensionTerminal(location, parentTerminal, iconPath, color) {
+    async createExtensionTerminal(location, internalOptions, parentTerminal, iconPath, color) {
         if (typeof this._id !== 'string') {
             throw new Error('Terminal has already been created');
         }
@@ -108,7 +108,7 @@ class ExtHostTerminal {
             isExtensionCustomPtyTerminal: true,
             icon: iconPath,
             color: ThemeColor.isThemeColor(color) ? color.id : undefined,
-            location: this._serializeParentTerminal(location, parentTerminal),
+            location: internalOptions?.location || this._serializeParentTerminal(location, parentTerminal),
             isTransient: true
         });
         if (typeof this._id === 'string') {
@@ -327,7 +327,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     createExtensionTerminal(options, internalOptions) {
         const terminal = ( new ExtHostTerminal(this._proxy, generateUuid(), options, options.name));
         const p = ( new ExtHostPseudoterminal(options.pty));
-        terminal.createExtensionTerminal(options.location, this._serializeParentTerminal(options, internalOptions).resolvedExtHostIdentifier, asTerminalIcon(options.iconPath), asTerminalColor(options.color)).then(id => {
+        terminal.createExtensionTerminal(options.location, internalOptions, this._serializeParentTerminal(options, internalOptions).resolvedExtHostIdentifier, asTerminalIcon(options.iconPath), asTerminalColor(options.color)).then(id => {
             const disposable = this._setupExtHostProcessListeners(id, p);
             this._terminalProcessDisposables[id] = disposable;
         });

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

@@ -9,6 +9,7 @@ import { Disposable, toDisposable, DisposableStore } from '../../../base/common/
 import { deepFreeze } from '../../../base/common/objects.js';
 import { isDefined } from '../../../base/common/types.js';
 import { generateUuid } from '../../../base/common/uuid.js';
+import { ILogService } from '../../../platform/log/common/log.js';
 import { MainContext } from './extHost.protocol.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { toItemFromContext, ExtHostTestItemCollection, TestItemImpl, TestItemRootImpl } from './extHostTestItem.js';
@@ -19,17 +20,17 @@ import { InvalidTestItemError } from '../../contrib/testing/common/testItemColle
 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 extends Disposable {
-    constructor(rpc, commands, editors) {
+    constructor(rpc, logService, commands, editors) {
         super();
         this.editors = editors;
         this.resultsChangedEmitter = this._register(( new Emitter()));
         this.controllers = ( new Map());
-        this.activeProfilesChangedEmitter = this._register(( new Emitter()));
+        this.defaultProfilesChangedEmitter = this._register(( new Emitter()));
         this.onResultsChanged = this.resultsChangedEmitter.event;
         this.results = [];
         this.proxy = ( rpc.getProxy(MainContext.MainThreadTesting));
         this.observer = ( new TestObservers(this.proxy));
-        this.runTracker = ( new TestRunCoordinator(this.proxy));
+        this.runTracker = ( new TestRunCoordinator(this.proxy, logService));
         commands.registerArgumentProcessor({
             processArgument: arg => {
                 switch (arg?.$mid) {
@@ -103,9 +104,8 @@ let ExtHostTesting = class ExtHostTesting extends Disposable {
                 return ( new TestRunProfileImpl(
                     this.proxy,
                     profiles,
-                    extension,
                     activeProfiles,
-                    this.activeProfilesChangedEmitter.event,
+                    this.defaultProfilesChangedEmitter.event,
                     controllerId,
                     profileId,
                     label,
@@ -191,7 +191,7 @@ let ExtHostTesting = class ExtHostTesting extends Disposable {
     $configureRunProfile(controllerId, profileId) {
         this.controllers.get(controllerId)?.profiles.get(profileId)?.configureHandler?.();
     }
-    $setActiveRunProfiles(profiles) {
+    $setDefaultRunProfiles(profiles) {
         const evt = ( new Map());
         for (const [controllerId, profileIds] of Object.entries(profiles)) {
             const ctrl = this.controllers.get(controllerId);
@@ -213,7 +213,7 @@ let ExtHostTesting = class ExtHostTesting extends Disposable {
                 evt.set(controllerId, changes);
             }
         }
-        this.activeProfilesChangedEmitter.fire(evt);
+        this.defaultProfilesChangedEmitter.fire(evt);
     }
     async $refreshTests(controllerId, token) {
         await this.controllers.get(controllerId)?.controller.refreshHandler?.(token);
@@ -234,7 +234,7 @@ let ExtHostTesting = class ExtHostTesting extends Disposable {
         }
     }
     $acceptDiff(diff) {
-        this.observer.applyDiff(( diff.map(TestsDiffOp.deserialize)));
+        this.observer.applyDiff(( diff.map(d => TestsDiffOp.deserialize({ asCanonicalUri: u => u }, d))));
     }
     async $runControllerTests(reqs, token) {
         return Promise.all(( reqs.map(req => this.runControllerTestRequest(req, false, token))));
@@ -298,7 +298,8 @@ let ExtHostTesting = class ExtHostTesting extends Disposable {
     }
 };
 ExtHostTesting = ( __decorate([
-    ( __param(0, IExtHostRpcService))
+    ( __param(0, IExtHostRpcService)),
+    ( __param(1, ILogService))
 ], ExtHostTesting));
 const RUN_CANCEL_DEADLINE = 10000;
 class TestRunTracker extends Disposable {
@@ -308,11 +309,12 @@ class TestRunTracker extends Disposable {
     get id() {
         return this.dto.id;
     }
-    constructor(dto, proxy, extension, parentToken) {
+    constructor(dto, proxy, extension, logService, parentToken) {
         super();
         this.dto = dto;
         this.proxy = proxy;
         this.extension = extension;
+        this.logService = logService;
         this.state = 0 ;
         this.tasks = ( new Map());
         this.sharedTestIds = ( new Set());
@@ -342,7 +344,7 @@ class TestRunTracker extends Disposable {
         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.`);
+                this.logService.warn(`Setting the state of test "${test.id}" is a no-op after the run ends.`);
                 return;
             }
             if (!this.dto.isIncluded(test)) {
@@ -469,8 +471,9 @@ class TestRunCoordinator {
     get trackers() {
         return ( this.tracked.values());
     }
-    constructor(proxy) {
+    constructor(proxy, logService) {
         this.proxy = proxy;
+        this.logService = logService;
         this.tracked = ( new Map());
         this.coverageReports = [];
     }
@@ -519,7 +522,7 @@ class TestRunCoordinator {
         return tracker.createRun(name);
     }
     getTracker(req, dto, extension, token) {
-        const tracker = ( new TestRunTracker(dto, this.proxy, extension, token));
+        const tracker = ( new TestRunTracker(dto, this.proxy, extension, this.logService, token));
         this.tracked.set(req, tracker);
         let coverageReports;
         const coverageListener = tracker.onDidCoverage(({ runId, taskId, coverage }) => {
@@ -717,16 +720,24 @@ class TestObservers {
         this.current?.tests.apply(diff);
     }
     createObserverData() {
-        const tests = ( new MirroredTestCollection());
+        const tests = ( new MirroredTestCollection({ asCanonicalUri: u => u }));
         this.proxy.$subscribeToDiffs();
         return { observers: 0, tests, };
     }
 }
+const updateProfile = (impl, proxy, initial, update) => {
+    if (initial) {
+        Object.assign(initial, update);
+    }
+    else {
+        proxy.$updateTestRunConfig(impl.controllerId, impl.profileId, update);
+    }
+};
 class TestRunProfileImpl {
     #proxy;
-    #extension;
     #activeProfiles;
-    #onDidChangeActiveProfiles;
+    #onDidChangeDefaultProfiles;
+    #initialPublish;
     #profiles;
     get label() {
         return this._label;
@@ -734,7 +745,7 @@ class TestRunProfileImpl {
     set label(label) {
         if (label !== this._label) {
             this._label = label;
-            this.#proxy.$updateTestRunConfig(this.controllerId, this.profileId, { label });
+            updateProfile(this, this.#proxy, this.#initialPublish, { label });
         }
     }
     get supportsContinuousRun() {
@@ -743,16 +754,21 @@ class TestRunProfileImpl {
     set supportsContinuousRun(supports) {
         if (supports !== this._supportsContinuousRun) {
             this._supportsContinuousRun = supports;
-            this.#proxy.$updateTestRunConfig(this.controllerId, this.profileId, { supportsContinuousRun: supports });
+            updateProfile(this, this.#proxy, this.#initialPublish, { supportsContinuousRun: supports });
         }
     }
     get isDefault() {
-        return this._isDefault;
+        return ( this.#activeProfiles.has(this.profileId));
     }
     set isDefault(isDefault) {
-        if (isDefault !== this._isDefault) {
-            this._isDefault = isDefault;
-            this.#proxy.$updateTestRunConfig(this.controllerId, this.profileId, { isDefault });
+        if (isDefault !== this.isDefault) {
+            if (isDefault) {
+                this.#activeProfiles.add(this.profileId);
+            }
+            else {
+                this.#activeProfiles.delete(this.profileId);
+            }
+            updateProfile(this, this.#proxy, this.#initialPublish, { isDefault });
         }
     }
     get tag() {
@@ -761,7 +777,7 @@ class TestRunProfileImpl {
     set tag(tag) {
         if (tag?.id !== this._tag?.id) {
             this._tag = tag;
-            this.#proxy.$updateTestRunConfig(this.controllerId, this.profileId, {
+            updateProfile(this, this.#proxy, this.#initialPublish, {
                 tag: tag ? TestTag.namespace(this.controllerId, tag.id) : null,
             });
         }
@@ -772,39 +788,35 @@ class TestRunProfileImpl {
     set configureHandler(handler) {
         if (handler !== this._configureHandler) {
             this._configureHandler = handler;
-            this.#proxy.$updateTestRunConfig(this.controllerId, this.profileId, { hasConfigurationHandler: !!handler });
+            updateProfile(this, this.#proxy, this.#initialPublish, { hasConfigurationHandler: !!handler });
         }
     }
-    get isSelected() {
-        checkProposedApiEnabled(this.#extension, 'testingActiveProfile');
-        return ( this.#activeProfiles.has(this.profileId));
-    }
-    get onDidChangeSelected() {
-        checkProposedApiEnabled(this.#extension, 'testingActiveProfile');
-        return Event.chain(this.#onDidChangeActiveProfiles, $ => ( $
+    get onDidChangeDefault() {
+        return Event.chain(this.#onDidChangeDefaultProfiles, $ => ( $
             .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) {
+    constructor(proxy, profiles, activeProfiles, onDidChangeActiveProfiles, controllerId, profileId, _label, kind, runHandler, _isDefault = false, _tag = undefined, _supportsContinuousRun = false) {
         this.controllerId = controllerId;
         this.profileId = profileId;
         this._label = _label;
         this.kind = kind;
         this.runHandler = runHandler;
-        this._isDefault = _isDefault;
         this._tag = _tag;
         this._supportsContinuousRun = _supportsContinuousRun;
         this.#proxy = proxy;
         this.#profiles = profiles;
-        this.#extension = extension;
         this.#activeProfiles = activeProfiles;
-        this.#onDidChangeActiveProfiles = onDidChangeActiveProfiles;
+        this.#onDidChangeDefaultProfiles = onDidChangeActiveProfiles;
         profiles.set(profileId, this);
         const groupBitset = profileGroupToBitset[kind];
         if (typeof groupBitset !== 'number') {
             throw new Error(`Unknown TestRunProfile.group ${kind}`);
         }
-        this.#proxy.$publishTestRunProfile({
+        if (_isDefault) {
+            activeProfiles.add(profileId);
+        }
+        this.#initialPublish = {
             profileId: profileId,
             controllerId,
             tag: _tag ? TestTag.namespace(this.controllerId, _tag.id) : null,
@@ -813,6 +825,12 @@ class TestRunProfileImpl {
             isDefault: _isDefault,
             hasConfigurationHandler: false,
             supportsContinuousRun: _supportsContinuousRun,
+        };
+        queueMicrotask(() => {
+            if (this.#initialPublish) {
+                this.#proxy.$publishTestRunProfile(this.#initialPublish);
+                this.#initialPublish = undefined;
+            }
         });
     }
     dispose() {
@@ -820,6 +838,7 @@ class TestRunProfileImpl {
             this.#profiles = undefined;
             this.#proxy.$removeTestProfile(this.controllerId, this.profileId);
         }
+        this.#initialPublish = undefined;
     }
 }
 const profileGroupToBitset = {

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

@@ -129,6 +129,7 @@ class ExtHostTextEditorOptions {
     _accept(source) {
         this._tabSize = source.tabSize;
         this._indentSize = source.indentSize;
+        this._originalIndentSize = source.originalIndentSize;
         this._insertSpaces = source.insertSpaces;
         this._cursorStyle = source.cursorStyle;
         this._lineNumbers = TextEditorLineNumbersStyle.to(source.lineNumbers);
@@ -188,10 +189,11 @@ class ExtHostTextEditorOptions {
             return;
         }
         if (typeof indentSize === 'number') {
-            if (this._indentSize === indentSize) {
+            if (this._originalIndentSize === indentSize) {
                 return;
             }
             this._indentSize = indentSize;
+            this._originalIndentSize = indentSize;
         }
         this._warnOnError('setIndentSize', this._proxy.$trySetOptions(this._id, {
             indentSize: indentSize
@@ -254,8 +256,9 @@ class ExtHostTextEditorOptions {
                 hasUpdate = true;
                 bulkConfigurationUpdate.indentSize = indentSize;
             }
-            else if (typeof indentSize === 'number' && this._indentSize !== indentSize) {
+            else if (typeof indentSize === 'number' && this._originalIndentSize !== indentSize) {
                 this._indentSize = indentSize;
+                this._originalIndentSize = indentSize;
                 hasUpdate = true;
                 bulkConfigurationUpdate.indentSize = indentSize;
             }

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

@@ -1,5 +1,4 @@
 import { coalesce } from '../../../base/common/arrays.js';
-import { onUnexpectedExternalError } from '../../../base/common/errors.js';
 import { Emitter } from '../../../base/common/event.js';
 import { MainContext } from './extHost.protocol.js';
 import { TextEditorDecorationType } from './extHostTextEditor.js';
@@ -8,12 +7,12 @@ import { TextEditorSelectionChangeKind } from './extHostTypes.js';
 class ExtHostEditors {
     constructor(mainContext, _extHostDocumentsAndEditors) {
         this._extHostDocumentsAndEditors = _extHostDocumentsAndEditors;
-        this._onDidChangeTextEditorSelection = ( new Emitter({ onListenerError: onUnexpectedExternalError }));
-        this._onDidChangeTextEditorOptions = ( new Emitter({ onListenerError: onUnexpectedExternalError }));
-        this._onDidChangeTextEditorVisibleRanges = ( new Emitter({ onListenerError: onUnexpectedExternalError }));
-        this._onDidChangeTextEditorViewColumn = ( new Emitter({ onListenerError: onUnexpectedExternalError }));
-        this._onDidChangeActiveTextEditor = ( new Emitter({ onListenerError: onUnexpectedExternalError }));
-        this._onDidChangeVisibleTextEditors = ( new Emitter({ onListenerError: onUnexpectedExternalError }));
+        this._onDidChangeTextEditorSelection = ( new Emitter());
+        this._onDidChangeTextEditorOptions = ( new Emitter());
+        this._onDidChangeTextEditorVisibleRanges = ( new Emitter());
+        this._onDidChangeTextEditorViewColumn = ( new Emitter());
+        this._onDidChangeActiveTextEditor = ( new Emitter());
+        this._onDidChangeVisibleTextEditors = ( new Emitter());
         this.onDidChangeTextEditorSelection = this._onDidChangeTextEditorSelection.event;
         this.onDidChangeTextEditorOptions = this._onDidChangeTextEditorOptions.event;
         this.onDidChangeTextEditorVisibleRanges = this._onDidChangeTextEditorVisibleRanges.event;

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

@@ -557,13 +557,16 @@ class ExtHostTreeView extends Disposable {
             if (cts.token.isCancellationRequested) {
                 return undefined;
             }
-            const items = await Promise.all(( coalesce(elements || []).map(async (element) => {
-                const item = await this.dataProvider.getTreeItem(element);
-                return item && !cts.token.isCancellationRequested ? this.createAndRegisterTreeNode(element, item, parentNode) : null;
+            const coalescedElements = coalesce(elements || []);
+            const treeItems = await Promise.all(( coalesce(coalescedElements).map(element => {
+                return this.dataProvider.getTreeItem(element);
             })));
             if (cts.token.isCancellationRequested) {
                 return undefined;
             }
+            const items = ( treeItems.map(
+                (item, index) => item ? this.createAndRegisterTreeNode(coalescedElements[index], item, parentNode) : null
+            ));
             return coalesce(items);
         }
         finally {

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

@@ -115,7 +115,8 @@ let ExtHostTunnelService = class ExtHostTunnelService extends Disposable {
         };
         const tunnelFeatures = information.tunnelFeatures ? {
             elevation: !!information.tunnelFeatures?.elevation,
-            privacyOptions: information.tunnelFeatures?.privacyOptions
+            privacyOptions: information.tunnelFeatures?.privacyOptions,
+            protocol: information.tunnelFeatures.protocol === undefined ? true : information.tunnelFeatures.protocol,
         } : undefined;
         this._proxy.$setTunnelProvider(tunnelFeatures);
         return Promise.resolve(toDisposable(() => {
@@ -161,7 +162,8 @@ let ExtHostTunnelService = class ExtHostTunnelService extends Disposable {
                 const tunnelFeatures = provider.tunnelFeatures ? {
                     elevation: !!provider.tunnelFeatures?.elevation,
                     public: !!provider.tunnelFeatures?.public,
-                    privacyOptions
+                    privacyOptions,
+                    protocol: true
                 } : undefined;
                 this._proxy.$setTunnelProvider(tunnelFeatures);
             }

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

@@ -9,7 +9,7 @@ import { revive, parse } from '../../../base/common/marshalling.js';
 import { Mimes } from '../../../base/common/mime.js';
 import { cloneAndChange } from '../../../base/common/objects.js';
 import { isString, isEmptyObject, isUndefinedOrNull, isNumber } from '../../../base/common/types.js';
-import { URI } from '../../../base/common/uri.js';
+import { URI, isUriComponents } from '../../../base/common/uri.js';
 import { Range as Range$2 } from '../../../editor/common/core/range.js';
 import { Command, FoldingRangeKind as FoldingRangeKind$2 } from '../../../editor/common/languages.js';
 import { MarkerSeverity } from '../../../platform/markers/common/markers.js';
@@ -19,8 +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, 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, 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, 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, CompletionTriggerKind as CompletionTriggerKind$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, StandardTokenType, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, TestMessage as TestMessage$1, NotebookRendererScript as NotebookRendererScript$1 } from './extHostTypes.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, 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 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, 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, 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, CompletionTriggerKind as CompletionTriggerKind$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, StandardTokenType, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, TestMessage as TestMessage$1, NotebookRendererScript as NotebookRendererScript$1 } from './extHostTypes.js';
 var Selection;
 ( (function(Selection) {
     function to(selection) {
@@ -65,6 +65,13 @@ var Range;
     }
     Range.to = to;
 })(Range || (Range = {})));
+var Location;
+( (function(Location) {
+    function to(location) {
+        return new Location$1(URI.revive(location.uri), Range.to(location.range));
+    }
+    Location.to = to;
+})(Location || (Location = {})));
 var TokenType;
 ( (function(TokenType) {
     function to(type) {
@@ -193,7 +200,7 @@ var DiagnosticRelatedInformation;
     }
     DiagnosticRelatedInformation.from = from;
     function to(value) {
-        return new DiagnosticRelatedInformation$1(new Location(value.resource, Range.to(value)), value.message);
+        return new DiagnosticRelatedInformation$1(new Location$1(value.resource, Range.to(value)), value.message);
     }
     DiagnosticRelatedInformation.to = to;
 })(DiagnosticRelatedInformation || (DiagnosticRelatedInformation = {})));
@@ -784,7 +791,7 @@ var location;
     }
     location.from = from;
     function to(value) {
-        return new Location(URI.revive(value.uri), Range.to(value.range));
+        return new Location$1(URI.revive(value.uri), Range.to(value.range));
     }
     location.to = to;
 })(location || (location = {})));
@@ -1861,7 +1868,7 @@ var TestCoverage;
                 type: 1 ,
                 branches: coverage.branches.length
                     ? ( coverage.branches.map(
-                    b => ({ count: b.executionCount, location: b.location && fromLocation(b.location) })
+                    b => ({ count: b.executionCount, location: b.location && fromLocation(b.location), label: b.label })
                 ))
                     : undefined,
             };
@@ -2102,7 +2109,7 @@ var ChatVariable;
         return {
             level: ChatVariableLevel.to(variable.level),
             kind: variable.kind,
-            value: revive(variable.value),
+            value: isUriComponents(variable.value) ? URI.revive(variable.value) : variable.value,
             description: variable.description
         };
     }
@@ -2163,10 +2170,7 @@ var 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) {
+        if ('markdownContent' in progress) {
             checkProposedApiEnabled(extension, 'chatAgents2Additions');
             return { content: MarkdownString.from(progress.markdownContent), kind: 'markdownContent' };
         }
@@ -2220,14 +2224,72 @@ var ChatResponseProgress;
             return { treeData: progress.treeData, kind: 'treeData' };
         }
         else if ('message' in progress) {
-            return { content: progress.message, kind: 'progressMessage' };
+            return { content: MarkdownString.from(progress.message), kind: 'progressMessage' };
         }
         else {
             return undefined;
         }
     }
     ChatResponseProgress.from = from;
+    function to(progress) {
+        switch (progress.kind) {
+            case 'markdownContent':
+            case 'inlineReference':
+            case 'treeData':
+                return ChatResponseProgress.to(progress);
+            case 'content':
+                return { content: progress.content };
+            case 'usedContext':
+                return { documents: ( progress.documents.map(d => ({ uri: URI.revive(d.uri), version: d.version, ranges: ( d.ranges.map(r => Range.to(r))) }))) };
+            case 'reference':
+                return {
+                    reference: isUriComponents(progress.reference) ?
+                        URI.revive(progress.reference) :
+                        Location.to(progress.reference)
+                };
+            case 'agentDetection':
+                return undefined;
+            case 'progressMessage':
+                return { message: progress.content.value };
+            case 'vulnerability':
+                return { content: progress.content, vulnerabilities: progress.vulnerabilities };
+            default:
+                return undefined;
+        }
+    }
+    ChatResponseProgress.to = to;
+    function toProgressContent(progress) {
+        switch (progress.kind) {
+            case 'markdownContent':
+                return { content: progress.content.value };
+            case 'inlineReference':
+                return {
+                    inlineReference: isUriComponents(progress.inlineReference) ?
+                        URI.revive(progress.inlineReference) :
+                        Location.to(progress.inlineReference),
+                    title: progress.name
+                };
+            case 'treeData':
+                return { treeData: revive(progress.treeData) };
+            default:
+                return undefined;
+        }
+    }
+    ChatResponseProgress.toProgressContent = toProgressContent;
 })(ChatResponseProgress || (ChatResponseProgress = {})));
+var ChatAgentRequest;
+( (function(ChatAgentRequest) {
+    function to(request, slashCommand) {
+        return {
+            prompt: request.message,
+            variables: ChatVariable.objectTo(request.variables),
+            slashCommand,
+            subCommand: request.command,
+            agentId: request.agentId,
+        };
+    }
+    ChatAgentRequest.to = to;
+})(ChatAgentRequest || (ChatAgentRequest = {})));
 var ChatAgentCompletionItem;
 ( (function(ChatAgentCompletionItem) {
     function from(item) {
@@ -2254,4 +2316,4 @@ var TerminalQuickFix;
     }
     TerminalQuickFix.from = from;
 })(TerminalQuickFix || (TerminalQuickFix = {})));
-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 };
+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 };