@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/platform/quickinput/common/quickInput.d.ts

@@ -167,10 +167,22 @@ declare enum QuickInputHideReason {
 interface IQuickInputHideEvent {
     reason: QuickInputHideReason;
 }
+/**
+ * A collection of the different types of QuickInput
+ */
+declare const enum QuickInputType {
+    QuickPick = "quickPick",
+    InputBox = "inputBox",
+    QuickWidget = "quickWidget"
+}
 /**
  * Represents a quick input control that allows users to make selections or provide input quickly.
  */
 interface IQuickInput extends IDisposable {
+    /**
+     * The type of the quick input.
+     */
+    readonly type: QuickInputType;
     /**
      * An event that is fired when the quick input is hidden.
      */
@@ -248,6 +260,10 @@ interface IQuickInput extends IDisposable {
     willHide(reason?: QuickInputHideReason): void;
 }
 interface IQuickWidget extends IQuickInput {
+    /**
+     * The type of the quick input.
+     */
+    readonly type: QuickInputType.QuickWidget;
     /**
      * Should be an HTMLElement (TODO: move this entire file into browser)
      * @override
@@ -291,10 +307,55 @@ declare enum ItemActivation {
      */
     LAST = 3
 }
+/**
+ * Represents the focus options for a quick pick.
+ */
+declare enum QuickPickFocus {
+    /**
+     * Focus the first item in the list.
+     */
+    First = 1,
+    /**
+     * Focus the second item in the list.
+     */
+    Second = 2,
+    /**
+     * Focus the last item in the list.
+     */
+    Last = 3,
+    /**
+     * Focus the next item in the list.
+     */
+    Next = 4,
+    /**
+     * Focus the previous item in the list.
+     */
+    Previous = 5,
+    /**
+     * Focus the next page in the list.
+     */
+    NextPage = 6,
+    /**
+     * Focus the previous page in the list.
+     */
+    PreviousPage = 7,
+    /**
+     * Focus the first item under the next separator.
+     */
+    NextSeparator = 8,
+    /**
+     * Focus the first item under the current separator.
+     */
+    PreviousSeparator = 9
+}
 /**
  * Represents a quick pick control that allows the user to select an item from a list of options.
  */
 interface IQuickPick<T extends IQuickPickItem> extends IQuickInput {
+    /**
+     * The type of the quick input.
+     */
+    readonly type: QuickInputType.QuickPick;
     /**
      * The current value of the quick pick input.
      */
@@ -458,6 +519,16 @@ interface IQuickPick<T extends IQuickPickItem> extends IQuickInput {
      * The toggle buttons to be added to the input box.
      */
     toggles: IQuickInputToggle[] | undefined;
+    /**
+     * Focus a particular item in the list. Used internally for keyboard navigation.
+     * @param focus The focus behavior.
+     */
+    focus(focus: QuickPickFocus): void;
+    /**
+     * Programmatically accepts an item. Used internally for keyboard navigation.
+     * @param inBackground Whether you are accepting an item in the background and keeping the picker open.
+     */
+    accept(inBackground?: boolean): void;
 }
 /**
  * Represents a toggle for quick input.
@@ -473,6 +544,10 @@ interface IQuickInputToggle {
  * Represents an input box in a quick input dialog.
  */
 interface IInputBox extends IQuickInput {
+    /**
+     * The type of the quick input.
+     */
+    readonly type: QuickInputType.InputBox;
     /**
      * Value shown in the input box.
      */
@@ -581,4 +656,4 @@ interface IQuickPickItemButtonContext<T extends IQuickPickItem> extends IQuickPi
 type QuickPickInput<T = IQuickPickItem> = T | IQuickPickSeparator;
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
-export { type IInputBox, type IInputOptions, type IKeyMods, type IPickOptions, type IQuickInput, type IQuickInputButton, type IQuickInputHideEvent, type IQuickInputToggle, type IQuickNavigateConfiguration, type IQuickPick, type IQuickPickDidAcceptEvent, type IQuickPickItem, type IQuickPickItemButtonContext, type IQuickPickItemButtonEvent, type IQuickPickItemHighlights, type IQuickPickSeparator, type IQuickPickSeparatorButtonEvent, type IQuickPickWillAcceptEvent, type IQuickWidget, ItemActivation, type Omit, QuickInputHideReason, type QuickPickInput };
+export { type IInputBox, type IInputOptions, type IKeyMods, type IPickOptions, type IQuickInput, type IQuickInputButton, type IQuickInputHideEvent, type IQuickInputToggle, type IQuickNavigateConfiguration, type IQuickPick, type IQuickPickDidAcceptEvent, type IQuickPickItem, type IQuickPickItemButtonContext, type IQuickPickItemButtonEvent, type IQuickPickItemHighlights, type IQuickPickSeparator, type IQuickPickSeparatorButtonEvent, type IQuickPickWillAcceptEvent, type IQuickWidget, ItemActivation, type Omit, QuickInputHideReason, QuickInputType, QuickPickFocus, type QuickPickInput };

package/vscode/src/vs/platform/quickinput/common/quickInput.js

@@ -6,6 +6,12 @@ var QuickInputHideReason;
     QuickInputHideReason[QuickInputHideReason["Gesture"] = 2] = "Gesture";
     QuickInputHideReason[QuickInputHideReason["Other"] = 3] = "Other";
 })(QuickInputHideReason || (QuickInputHideReason = {})));
+var QuickInputType;
+( (function(QuickInputType) {
+    QuickInputType["QuickPick"] = "quickPick";
+    QuickInputType["InputBox"] = "inputBox";
+    QuickInputType["QuickWidget"] = "quickWidget";
+})(QuickInputType || (QuickInputType = {})));
 var ItemActivation;
 ( (function(ItemActivation) {
     ItemActivation[ItemActivation["NONE"] = 0] = "NONE";
@@ -13,6 +19,18 @@ var ItemActivation;
     ItemActivation[ItemActivation["SECOND"] = 2] = "SECOND";
     ItemActivation[ItemActivation["LAST"] = 3] = "LAST";
 })(ItemActivation || (ItemActivation = {})));
+var QuickPickFocus;
+( (function(QuickPickFocus) {
+    QuickPickFocus[QuickPickFocus["First"] = 1] = "First";
+    QuickPickFocus[QuickPickFocus["Second"] = 2] = "Second";
+    QuickPickFocus[QuickPickFocus["Last"] = 3] = "Last";
+    QuickPickFocus[QuickPickFocus["Next"] = 4] = "Next";
+    QuickPickFocus[QuickPickFocus["Previous"] = 5] = "Previous";
+    QuickPickFocus[QuickPickFocus["NextPage"] = 6] = "NextPage";
+    QuickPickFocus[QuickPickFocus["PreviousPage"] = 7] = "PreviousPage";
+    QuickPickFocus[QuickPickFocus["NextSeparator"] = 8] = "NextSeparator";
+    QuickPickFocus[QuickPickFocus["PreviousSeparator"] = 9] = "PreviousSeparator";
+})(QuickPickFocus || (QuickPickFocus = {})));
 class QuickPickItemScorerAccessor {
     constructor(options) {
         this.options = options;
@@ -37,4 +55,4 @@ class QuickPickItemScorerAccessor {
     }
 }
 const quickPickItemScorerAccessor = ( new QuickPickItemScorerAccessor());
-export { ItemActivation, NO_KEY_MODS, QuickInputHideReason, QuickPickItemScorerAccessor, quickPickItemScorerAccessor };
+export { ItemActivation, NO_KEY_MODS, QuickInputHideReason, QuickInputType, QuickPickFocus, QuickPickItemScorerAccessor, quickPickItemScorerAccessor };

package/vscode/src/vs/platform/quickinput/common/quickInput.service.d.ts

@@ -2,7 +2,7 @@ import { ServiceIdentifier } from '../../instantiation/common/instantiation.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Event } from '../../../base/common/event.js';
 import { IQuickAccessController } from './quickAccess.js';
-import { IQuickInputButton, IQuickPickItem, QuickPickInput, IPickOptions, Omit, IInputOptions, IQuickPick, IInputBox, IQuickWidget, IQuickNavigateConfiguration, IKeyMods } from './quickInput.js';
+import { IQuickInputButton, IQuickPickItem, QuickPickInput, IPickOptions, Omit, IInputOptions, IQuickPick, IInputBox, IQuickWidget, IQuickNavigateConfiguration, IKeyMods, IQuickInput } from './quickInput.js';
 
 declare const IQuickInputService: ServiceIdentifier<IQuickInputService>;
 interface IQuickInputService {
@@ -77,6 +77,10 @@ interface IQuickInputService {
     * Cancels quick input and closes it.
     */
     cancel(): Promise<void>;
+    /**
+    * The current quick pick that is visible. Undefined if none is open.
+    */
+    currentQuickInput: IQuickInput | undefined;
 }
 
 export { IQuickInputService };

package/vscode/src/vs/platform/remote/common/remoteAgentConnection.js

@@ -8,16 +8,22 @@ import { RemoteAuthorities } from '../../../base/common/network.js';
 import { mark } from '../../../base/common/performance.js';
 import { StopWatch } from '../../../base/common/stopwatch.js';
 import { generateUuid } from '../../../base/common/uuid.js';
-import { Client, PersistentProtocol } from '../../../base/parts/ipc/common/ipc.net.js';
+import { SocketCloseEventType, Client, PersistentProtocol } from '../../../base/parts/ipc/common/ipc.net.js';
 import { RemoteAuthorityResolverError } from './remoteAuthorityResolver.js';
 const RECONNECT_TIMEOUT = 30 * 1000 ;
+var ConnectionType;
+( (function(ConnectionType) {
+    ConnectionType[ConnectionType["Management"] = 1] = "Management";
+    ConnectionType[ConnectionType["ExtensionHost"] = 2] = "ExtensionHost";
+    ConnectionType[ConnectionType["Tunnel"] = 3] = "Tunnel";
+})(ConnectionType || (ConnectionType = {})));
 function connectionTypeToString(connectionType) {
     switch (connectionType) {
-        case 1 :
+        case ConnectionType.Management:
             return 'Management';
-        case 2 :
+        case ConnectionType.ExtensionHost:
             return 'ExtensionHost';
-        case 3 :
+        case ConnectionType.Tunnel:
             return 'Tunnel';
     }
 }
@@ -240,11 +246,11 @@ async function connectToRemoteExtensionHostAgentAndReadOneMessage(options, conne
     return result.promise;
 }
 async function doConnectRemoteAgentManagement(options, timeoutCancellationToken) {
-    const { protocol } = await connectToRemoteExtensionHostAgentAndReadOneMessage(options, 1 , undefined, timeoutCancellationToken);
+    const { protocol } = await connectToRemoteExtensionHostAgentAndReadOneMessage(options, ConnectionType.Management, undefined, timeoutCancellationToken);
     return { protocol };
 }
 async function doConnectRemoteAgentExtensionHost(options, startArguments, timeoutCancellationToken) {
-    const { protocol, firstMessage } = await connectToRemoteExtensionHostAgentAndReadOneMessage(options, 2 , startArguments, timeoutCancellationToken);
+    const { protocol, firstMessage } = await connectToRemoteExtensionHostAgentAndReadOneMessage(options, ConnectionType.ExtensionHost, startArguments, timeoutCancellationToken);
     const debugPort = firstMessage && firstMessage.debugPort;
     return { protocol, debugPort };
 }
@@ -320,11 +326,19 @@ function sleep(seconds) {
         }));
     });
 }
+var PersistentConnectionEventType;
+( (function(PersistentConnectionEventType) {
+    PersistentConnectionEventType[PersistentConnectionEventType["ConnectionLost"] = 0] = "ConnectionLost";
+    PersistentConnectionEventType[PersistentConnectionEventType["ReconnectionWait"] = 1] = "ReconnectionWait";
+    PersistentConnectionEventType[PersistentConnectionEventType["ReconnectionRunning"] = 2] = "ReconnectionRunning";
+    PersistentConnectionEventType[PersistentConnectionEventType["ReconnectionPermanentFailure"] = 3] = "ReconnectionPermanentFailure";
+    PersistentConnectionEventType[PersistentConnectionEventType["ConnectionGain"] = 4] = "ConnectionGain";
+})(PersistentConnectionEventType || (PersistentConnectionEventType = {})));
 class ConnectionLostEvent {
     constructor(reconnectionToken, millisSinceLastIncomingData) {
         this.reconnectionToken = reconnectionToken;
         this.millisSinceLastIncomingData = millisSinceLastIncomingData;
-        this.type = 0 ;
+        this.type = PersistentConnectionEventType.ConnectionLost;
     }
 }
 class ReconnectionWaitEvent {
@@ -333,7 +347,7 @@ class ReconnectionWaitEvent {
         this.millisSinceLastIncomingData = millisSinceLastIncomingData;
         this.durationSeconds = durationSeconds;
         this.cancellableTimer = cancellableTimer;
-        this.type = 1 ;
+        this.type = PersistentConnectionEventType.ReconnectionWait;
     }
     skipWait() {
         this.cancellableTimer.cancel();
@@ -344,7 +358,7 @@ class ReconnectionRunningEvent {
         this.reconnectionToken = reconnectionToken;
         this.millisSinceLastIncomingData = millisSinceLastIncomingData;
         this.attempt = attempt;
-        this.type = 2 ;
+        this.type = PersistentConnectionEventType.ReconnectionRunning;
     }
 }
 class ConnectionGainEvent {
@@ -352,7 +366,7 @@ class ConnectionGainEvent {
         this.reconnectionToken = reconnectionToken;
         this.millisSinceLastIncomingData = millisSinceLastIncomingData;
         this.attempt = attempt;
-        this.type = 4 ;
+        this.type = PersistentConnectionEventType.ConnectionGain;
     }
 }
 class ReconnectionPermanentFailureEvent {
@@ -361,7 +375,7 @@ class ReconnectionPermanentFailureEvent {
         this.millisSinceLastIncomingData = millisSinceLastIncomingData;
         this.attempt = attempt;
         this.handled = handled;
-        this.type = 3 ;
+        this.type = PersistentConnectionEventType.ReconnectionPermanentFailure;
     }
 }
 class PersistentConnection extends Disposable {
@@ -404,7 +418,7 @@ class PersistentConnection extends Disposable {
             if (!e) {
                 this._options.logService.info(`${logPrefix} received socket close event.`);
             }
-            else if (e.type === 0 ) {
+            else if (e.type === SocketCloseEventType.NodeSocketCloseEvent) {
                 this._options.logService.info(`${logPrefix} received socket close event (hadError: ${e.hadError}).`);
                 if (e.error) {
                     this._options.logService.error(e.error);
@@ -557,7 +571,7 @@ class PersistentConnection extends Disposable {
 }
 class ManagementPersistentConnection extends PersistentConnection {
     constructor(options, remoteAuthority, clientId, reconnectionToken, protocol) {
-        super(1 , options, reconnectionToken, protocol,  true);
+        super(ConnectionType.Management, options, reconnectionToken, protocol,  true);
         this.client = this._register(( new Client(protocol, {
             remoteAuthority: remoteAuthority,
             clientId: clientId
@@ -569,7 +583,7 @@ class ManagementPersistentConnection extends PersistentConnection {
 }
 class ExtensionHostPersistentConnection extends PersistentConnection {
     constructor(options, startArguments, reconnectionToken, protocol, debugPort) {
-        super(2 , options, reconnectionToken, protocol,  false);
+        super(ConnectionType.ExtensionHost, options, reconnectionToken, protocol,  false);
         this._startArguments = startArguments;
         this.debugPort = debugPort;
     }
@@ -614,4 +628,4 @@ function connectLogPrefix(options, connectionType) {
 function logElapsed(startTime) {
     return `${Date.now() - startTime} ms`;
 }
-export { ConnectionGainEvent, ConnectionLostEvent, ExtensionHostPersistentConnection, ManagementPersistentConnection, PersistentConnection, ReconnectionPermanentFailureEvent, ReconnectionRunningEvent, ReconnectionWaitEvent, connectRemoteAgentExtensionHost, connectRemoteAgentManagement };
+export { ConnectionGainEvent, ConnectionLostEvent, ConnectionType, ExtensionHostPersistentConnection, ManagementPersistentConnection, PersistentConnection, PersistentConnectionEventType, ReconnectionPermanentFailureEvent, ReconnectionRunningEvent, ReconnectionWaitEvent, connectRemoteAgentExtensionHost, connectRemoteAgentManagement };

package/vscode/src/vs/platform/remote/common/remoteAuthorityResolver.js

@@ -1,8 +1,13 @@
 import { ErrorNoTelemetry } from '../../../base/common/errors.js';
+var RemoteConnectionType;
+( (function(RemoteConnectionType) {
+    RemoteConnectionType[RemoteConnectionType["WebSocket"] = 0] = "WebSocket";
+    RemoteConnectionType[RemoteConnectionType["Managed"] = 1] = "Managed";
+})(RemoteConnectionType || (RemoteConnectionType = {})));
 class ManagedRemoteConnection {
     constructor(id) {
         this.id = id;
-        this.type = 1 ;
+        this.type = RemoteConnectionType.Managed;
     }
     toString() {
         return `Managed(${this.id})`;
@@ -12,7 +17,7 @@ class WebSocketRemoteConnection {
     constructor(host, port) {
         this.host = host;
         this.port = port;
-        this.type = 0 ;
+        this.type = RemoteConnectionType.WebSocket;
     }
     toString() {
         return `WebSocket(${this.host}:${this.port})`;
@@ -60,4 +65,4 @@ function getRemoteAuthorityPrefix(remoteAuthority) {
     }
     return remoteAuthority.substring(0, plusIndex);
 }
-export { ManagedRemoteConnection, RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode, WebSocketRemoteConnection, getRemoteAuthorityPrefix };
+export { ManagedRemoteConnection, RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode, RemoteConnectionType, WebSocketRemoteConnection, getRemoteAuthorityPrefix };

package/vscode/src/vs/platform/request/common/request.js

@@ -2,7 +2,7 @@ import { streamToBuffer } from '../../../base/common/buffer.js';
 import { getErrorMessage } from '../../../base/common/errors.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { localizeWithPath } from '../../../nls.js';
-import { Extensions } from '../../configuration/common/configurationRegistry.js';
+import { Extensions, ConfigurationScope } from '../../configuration/common/configurationRegistry.js';
 import { CONTEXT_LOG_LEVEL, LogLevelToString, LogLevel } from '../../log/common/log.js';
 import { Registry } from '../../registry/common/platform.js';
 const _moduleId = "vs/platform/request/common/request";
@@ -183,5 +183,5 @@ function registerProxyConfigurations(scope) {
     };
     configurationRegistry.updateConfigurations({ add: [proxyConfiguration], remove: oldProxyConfiguration ? [oldProxyConfiguration] : [] });
 }
-registerProxyConfigurations(1 );
+registerProxyConfigurations(ConfigurationScope.APPLICATION);
 export { AbstractRequestService, asJson, asText, asTextOrError, hasNoContent, isSuccess };

package/vscode/src/vs/platform/storage/common/storage.js

@@ -86,13 +86,13 @@ class AbstractStorageService extends Disposable {
         const { key, external } = event;
         if (key === TARGET_KEY) {
             switch (scope) {
-                case -1 :
+                case StorageScope.APPLICATION:
                     this._applicationKeyTargets = undefined;
                     break;
-                case 0 :
+                case StorageScope.PROFILE:
                     this._profileKeyTargets = undefined;
                     break;
-                case 1 :
+                case StorageScope.WORKSPACE:
                     this._workspaceKeyTargets = undefined;
                     break;
             }
@@ -179,27 +179,27 @@ class AbstractStorageService extends Disposable {
     }
     get workspaceKeyTargets() {
         if (!this._workspaceKeyTargets) {
-            this._workspaceKeyTargets = this.loadKeyTargets(1 );
+            this._workspaceKeyTargets = this.loadKeyTargets(StorageScope.WORKSPACE);
         }
         return this._workspaceKeyTargets;
     }
     get profileKeyTargets() {
         if (!this._profileKeyTargets) {
-            this._profileKeyTargets = this.loadKeyTargets(0 );
+            this._profileKeyTargets = this.loadKeyTargets(StorageScope.PROFILE);
         }
         return this._profileKeyTargets;
     }
     get applicationKeyTargets() {
         if (!this._applicationKeyTargets) {
-            this._applicationKeyTargets = this.loadKeyTargets(-1 );
+            this._applicationKeyTargets = this.loadKeyTargets(StorageScope.APPLICATION);
         }
         return this._applicationKeyTargets;
     }
     getKeyTargets(scope) {
         switch (scope) {
-            case -1 :
+            case StorageScope.APPLICATION:
                 return this.applicationKeyTargets;
-            case 0 :
+            case StorageScope.PROFILE:
                 return this.profileKeyTargets;
             default:
                 return this.workspaceKeyTargets;
@@ -214,9 +214,9 @@ class AbstractStorageService extends Disposable {
     }
     async flush(reason = WillSaveStateReason.NONE) {
         this._onWillSaveState.fire({ reason });
-        const applicationStorage = this.getStorage(-1 );
-        const profileStorage = this.getStorage(0 );
-        const workspaceStorage = this.getStorage(1 );
+        const applicationStorage = this.getStorage(StorageScope.APPLICATION);
+        const profileStorage = this.getStorage(StorageScope.PROFILE);
+        const workspaceStorage = this.getStorage(StorageScope.WORKSPACE);
         switch (reason) {
             case WillSaveStateReason.NONE:
                 await Promises.settled([
@@ -235,10 +235,10 @@ class AbstractStorageService extends Disposable {
         }
     }
     async log() {
-        const applicationItems = this.getStorage(-1 )?.items ?? ( new Map());
-        const profileItems = this.getStorage(0 )?.items ?? ( new Map());
-        const workspaceItems = this.getStorage(1 )?.items ?? ( new Map());
-        return logStorage(applicationItems, profileItems, workspaceItems, this.getLogDetails(-1 ) ?? '', this.getLogDetails(0 ) ?? '', this.getLogDetails(1 ) ?? '');
+        const applicationItems = this.getStorage(StorageScope.APPLICATION)?.items ?? ( new Map());
+        const profileItems = this.getStorage(StorageScope.PROFILE)?.items ?? ( new Map());
+        const workspaceItems = this.getStorage(StorageScope.WORKSPACE)?.items ?? ( new Map());
+        return logStorage(applicationItems, profileItems, workspaceItems, this.getLogDetails(StorageScope.APPLICATION) ?? '', this.getLogDetails(StorageScope.PROFILE) ?? '', this.getLogDetails(StorageScope.WORKSPACE) ?? '');
     }
     async optimize(scope) {
         await this.flush();
@@ -287,15 +287,15 @@ class InMemoryStorageService extends AbstractStorageService {
         this.applicationStorage = this._register(( new Storage(( new InMemoryStorageDatabase()), { hint: StorageHint.STORAGE_IN_MEMORY })));
         this.profileStorage = this._register(( new Storage(( new InMemoryStorageDatabase()), { hint: StorageHint.STORAGE_IN_MEMORY })));
         this.workspaceStorage = this._register(( new Storage(( new InMemoryStorageDatabase()), { hint: StorageHint.STORAGE_IN_MEMORY })));
-        this._register(this.workspaceStorage.onDidChangeStorage(e => this.emitDidChangeValue(1 , e)));
-        this._register(this.profileStorage.onDidChangeStorage(e => this.emitDidChangeValue(0 , e)));
-        this._register(this.applicationStorage.onDidChangeStorage(e => this.emitDidChangeValue(-1 , e)));
+        this._register(this.workspaceStorage.onDidChangeStorage(e => this.emitDidChangeValue(StorageScope.WORKSPACE, e)));
+        this._register(this.profileStorage.onDidChangeStorage(e => this.emitDidChangeValue(StorageScope.PROFILE, e)));
+        this._register(this.applicationStorage.onDidChangeStorage(e => this.emitDidChangeValue(StorageScope.APPLICATION, e)));
     }
     getStorage(scope) {
         switch (scope) {
-            case -1 :
+            case StorageScope.APPLICATION:
                 return this.applicationStorage;
-            case 0 :
+            case StorageScope.PROFILE:
                 return this.profileStorage;
             default:
                 return this.workspaceStorage;
@@ -303,9 +303,9 @@ class InMemoryStorageService extends AbstractStorageService {
     }
     getLogDetails(scope) {
         switch (scope) {
-            case -1 :
+            case StorageScope.APPLICATION:
                 return 'inMemory (application)';
-            case 0 :
+            case StorageScope.PROFILE:
                 return 'inMemory (profile)';
             default:
                 return 'inMemory (workspace)';

package/vscode/src/vs/platform/telemetry/common/telemetry.js

@@ -2,4 +2,18 @@ const firstSessionDateStorageKey = 'telemetry.firstSessionDate';
 const TELEMETRY_SETTING_ID = 'telemetry.telemetryLevel';
 const TELEMETRY_CRASH_REPORTER_SETTING_ID = 'telemetry.enableCrashReporter';
 const TELEMETRY_OLD_SETTING_ID = 'telemetry.enableTelemetry';
-export { TELEMETRY_CRASH_REPORTER_SETTING_ID, TELEMETRY_OLD_SETTING_ID, TELEMETRY_SETTING_ID, firstSessionDateStorageKey };
+var TelemetryLevel;
+( (function(TelemetryLevel) {
+    TelemetryLevel[TelemetryLevel["NONE"] = 0] = "NONE";
+    TelemetryLevel[TelemetryLevel["CRASH"] = 1] = "CRASH";
+    TelemetryLevel[TelemetryLevel["ERROR"] = 2] = "ERROR";
+    TelemetryLevel[TelemetryLevel["USAGE"] = 3] = "USAGE";
+})(TelemetryLevel || (TelemetryLevel = {})));
+var TelemetryConfiguration;
+( (function(TelemetryConfiguration) {
+    TelemetryConfiguration["OFF"] = "off";
+    TelemetryConfiguration["CRASH"] = "crash";
+    TelemetryConfiguration["ERROR"] = "error";
+    TelemetryConfiguration["ON"] = "all";
+})(TelemetryConfiguration || (TelemetryConfiguration = {})));
+export { TELEMETRY_CRASH_REPORTER_SETTING_ID, TELEMETRY_OLD_SETTING_ID, TELEMETRY_SETTING_ID, TelemetryConfiguration, TelemetryLevel, firstSessionDateStorageKey };

package/vscode/src/vs/platform/telemetry/common/telemetry.service.d.ts

@@ -9,6 +9,7 @@ interface ITelemetryService {
     readonly sessionId: string;
     readonly machineId: string;
     readonly sqmId: string;
+    readonly devDeviceId: string;
     readonly firstSessionDate: string;
     readonly msftInternal?: boolean;
     /**

package/vscode/src/vs/platform/telemetry/common/telemetryUtils.js

@@ -2,7 +2,7 @@ import { cloneAndChange } from '../../../base/common/objects.js';
 import { getRemoteName } from '../../remote/common/remoteHosts.js';
 import '../../../base/common/platform.js';
 import '../../../base/common/process.js';
-import { TELEMETRY_SETTING_ID, TELEMETRY_CRASH_REPORTER_SETTING_ID, TELEMETRY_OLD_SETTING_ID } from './telemetry.js';
+import { TELEMETRY_SETTING_ID, TELEMETRY_CRASH_REPORTER_SETTING_ID, TELEMETRY_OLD_SETTING_ID, TelemetryLevel, TelemetryConfiguration } from './telemetry.js';
 class TelemetryTrustedValue {
     constructor(value) {
         this.value = value;
@@ -43,17 +43,17 @@ function getTelemetryLevel(configurationService) {
     const crashReporterConfig = configurationService.getValue(TELEMETRY_CRASH_REPORTER_SETTING_ID);
     const oldConfig = configurationService.getValue(TELEMETRY_OLD_SETTING_ID);
     if (oldConfig === false || crashReporterConfig === false) {
-        return 0 ;
-    }
-    switch (newConfig ?? "all" ) {
-        case "all" :
-            return 3 ;
-        case "error" :
-            return 2 ;
-        case "crash" :
-            return 1 ;
-        case "off" :
-            return 0 ;
+        return TelemetryLevel.NONE;
+    }
+    switch (newConfig ?? TelemetryConfiguration.ON) {
+        case TelemetryConfiguration.ON:
+            return TelemetryLevel.USAGE;
+        case TelemetryConfiguration.ERROR:
+            return TelemetryLevel.ERROR;
+        case TelemetryConfiguration.CRASH:
+            return TelemetryLevel.CRASH;
+        case TelemetryConfiguration.OFF:
+            return TelemetryLevel.NONE;
     }
 }
 const telemetryAllowedAuthorities = ( new Set(

package/vscode/src/vs/platform/terminal/common/capabilities/capabilities.d.ts

@@ -154,6 +154,7 @@ interface ICommandDetectionCapability {
     readonly onCommandInvalidated: Event<ITerminalCommand[]>;
     readonly onCurrentCommandInvalidated: Event<ICommandInvalidationRequest>;
     setContinuationPrompt(value: string): void;
+    setPromptTerminator(value: string, lastPromptLine: string): void;
     setCwd(value: string): void;
     setIsWindowsPty(value: boolean): void;
     setIsCommandStorageDisabled(): void;

package/vscode/src/vs/platform/terminal/common/capabilities/capabilities.js

@@ -0,0 +1,14 @@
+var TerminalCapability;
+( (function(TerminalCapability) {
+    TerminalCapability[TerminalCapability["CwdDetection"] = 0] = "CwdDetection";
+    TerminalCapability[TerminalCapability["NaiveCwdDetection"] = 1] = "NaiveCwdDetection";
+    TerminalCapability[TerminalCapability["CommandDetection"] = 2] = "CommandDetection";
+    TerminalCapability[TerminalCapability["PartialCommandDetection"] = 3] = "PartialCommandDetection";
+    TerminalCapability[TerminalCapability["BufferMarkDetection"] = 4] = "BufferMarkDetection";
+})(TerminalCapability || (TerminalCapability = {})));
+var CommandInvalidationReason;
+( (function(CommandInvalidationReason) {
+    CommandInvalidationReason["Windows"] = "windows";
+    CommandInvalidationReason["NoProblemsReported"] = "noProblemsReported";
+})(CommandInvalidationReason || (CommandInvalidationReason = {})));
+export { CommandInvalidationReason, TerminalCapability };