@codingame/monaco-vscode-api 22.1.9 → 23.0.0

package/vscode/src/vs/platform/quickinput/browser/tree/quickInputTreeSorter.js

@@ -0,0 +1,43 @@
+
+import { Disposable } from '../../../../base/common/lifecycle.js';
+
+class QuickInputTreeSorter extends Disposable {
+    constructor() {
+        super(...arguments);
+        this._sortByLabel = true;
+    }
+    get sortByLabel() {
+        return this._sortByLabel;
+    }
+    set sortByLabel(value) {
+        this._sortByLabel = value;
+    }
+    compare(a, b) {
+        if (!this._sortByLabel) {
+            return 0;
+        }
+        if (a.label < b.label) {
+            return -1;
+        }
+        else if (a.label > b.label) {
+            return 1;
+        }
+        if (a.description && b.description) {
+            if (a.description < b.description) {
+                return -1;
+            }
+            else if (a.description > b.description) {
+                return 1;
+            }
+        }
+        else if (a.description) {
+            return -1;
+        }
+        else if (b.description) {
+            return 1;
+        }
+        return 0;
+    }
+}
+
+export { QuickInputTreeSorter };

package/vscode/src/vs/platform/quickinput/browser/tree/quickTree.d.ts

@@ -10,12 +10,15 @@ export declare class QuickTree<T extends IQuickTreeItem> extends QuickInput impl
     private readonly _placeholder;
     private readonly _matchOnDescription;
     private readonly _matchOnLabel;
+    private readonly _sortByLabel;
     private readonly _activeItems;
     private readonly _itemTree;
     readonly onDidChangeValue: Event<string>;
     readonly onDidChangeActive: Event<readonly T[]>;
     private readonly _onDidChangeCheckedLeafItems;
-    onDidChangeCheckedLeafItems: Event<T[]>;
+    readonly onDidChangeCheckedLeafItems: Event<T[]>;
+    private readonly _onDidChangeCheckboxState;
+    readonly onDidChangeCheckboxState: Event<T>;
     readonly onDidAccept: Event<void>;
     constructor(ui: QuickInputUI);
     get value(): string;
@@ -28,6 +31,8 @@ export declare class QuickTree<T extends IQuickTreeItem> extends QuickInput impl
     set matchOnDescription(matchOnDescription: boolean);
     get matchOnLabel(): boolean;
     set matchOnLabel(matchOnLabel: boolean);
+    get sortByLabel(): boolean;
+    set sortByLabel(sortByLabel: boolean);
     get activeItems(): readonly T[];
     set activeItems(activeItems: readonly T[]);
     get itemTree(): ReadonlyArray<Readonly<T>>;
@@ -35,7 +40,7 @@ export declare class QuickTree<T extends IQuickTreeItem> extends QuickInput impl
     get checkedLeafItems(): readonly T[];
     setItemTree(itemTree: T[]): void;
     getParent(element: T): T | undefined;
-    setCheckboxState(element: T, checked: boolean | "partial"): void;
+    setCheckboxState(element: T, checked: boolean | "mixed"): void;
     expand(element: T): void;
     collapse(element: T): void;
     isCollapsed(element: T): boolean;

package/vscode/src/vs/platform/quickinput/browser/tree/quickTree.js

@@ -1,6 +1,7 @@
 
 import { Event, Emitter } from '../../../../base/common/event.js';
 import '../../../../base/common/observableInternal/index.js';
+import { setTimeout0 } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
 import { QuickInputType } from '../../common/quickInput.js';
 import { QuickInput } from '../quickInput.js';
@@ -9,7 +10,7 @@ import { observableValue } from '../../../../base/common/observableInternal/obse
 import { autorun } from '../../../../base/common/observableInternal/reactions/autorun.js';
 
 class QuickTree extends QuickInput {
-    static { this.DEFAULT_ARIA_LABEL = ( localize(2014, "Type to narrow down results.")); }
+    static { this.DEFAULT_ARIA_LABEL = ( localize(2023, "Type to narrow down results.")); }
     constructor(ui) {
         super(ui);
         this.type = QuickInputType.QuickTree;
@@ -18,15 +19,19 @@ class QuickTree extends QuickInput {
         this._placeholder = observableValue('placeholder', undefined);
         this._matchOnDescription = observableValue('matchOnDescription', false);
         this._matchOnLabel = observableValue('matchOnLabel', true);
+        this._sortByLabel = observableValue('sortByLabel', true);
         this._activeItems = observableValue('activeItems', []);
         this._itemTree = observableValue('itemTree', []);
         this.onDidChangeValue = Event.fromObservable(this._value, this._store);
         this.onDidChangeActive = Event.fromObservable(this._activeItems, this._store);
-        this._onDidChangeCheckedLeafItems = ( new Emitter());
+        this._onDidChangeCheckedLeafItems = this._register(( new Emitter()));
         this.onDidChangeCheckedLeafItems = this._onDidChangeCheckedLeafItems.event;
+        this._onDidChangeCheckboxState = this._register(( new Emitter()));
+        this.onDidChangeCheckboxState = this._onDidChangeCheckboxState.event;
         this.onDidAccept = ui.onDidAccept;
         this._registerAutoruns();
         this._register(ui.tree.onDidChangeCheckedLeafItems(e => this._onDidChangeCheckedLeafItems.fire(e)));
+        this._register(ui.tree.onDidChangeCheckboxState(e => this._onDidChangeCheckboxState.fire(e.item)));
         this._register(ui.tree.tree.onDidChangeFocus(e => {
             this._activeItems.set(ui.tree.getActiveItems(), undefined);
         }));
@@ -41,6 +46,8 @@ class QuickTree extends QuickInput {
     set matchOnDescription(matchOnDescription) { this._matchOnDescription.set(matchOnDescription, undefined); }
     get matchOnLabel() { return this._matchOnLabel.get(); }
     set matchOnLabel(matchOnLabel) { this._matchOnLabel.set(matchOnLabel, undefined); }
+    get sortByLabel() { return this._sortByLabel.get(); }
+    set sortByLabel(sortByLabel) { this._sortByLabel.set(sortByLabel, undefined); }
     get activeItems() { return this._activeItems.get(); }
     set activeItems(activeItems) { this._activeItems.set(activeItems, undefined); }
     get itemTree() { return this._itemTree.get(); }
@@ -105,7 +112,7 @@ class QuickTree extends QuickInput {
             }));
         }
         super.show();
-        this.ui.count.setCount(this.ui.tree.getCheckedLeafItems().length);
+        setTimeout0(() => this.ui.count.setCount(this.ui.tree.getCheckedLeafItems().length));
         const checkAllState = getParentNodeState([...this.ui.tree.tree.getNode().children]);
         if (this.ui.checkAll.checked !== checkAllState) {
             this.ui.checkAll.checked = checkAllState;
@@ -165,6 +172,10 @@ class QuickTree extends QuickInput {
             const matchOnDescription = this._matchOnDescription.read(reader);
             this.ui.tree.updateFilterOptions({ matchOnLabel, matchOnDescription });
         });
+        this.registerVisibleAutorun((reader) => {
+            const sortByLabel = this._sortByLabel.read(reader);
+            this.ui.tree.sortByLabel = sortByLabel;
+        });
         this.registerVisibleAutorun((reader) => {
             const itemTree = this._itemTree.read(reader);
             this.ui.tree.setTreeData(itemTree);

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

@@ -1,6 +1,6 @@
 import { Event } from "../../../base/common/event.js";
 import { IMatch } from "../../../base/common/filters.js";
-import { IItemAccessor } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/base/common/fuzzyScorer";
+import { IItemAccessor } from "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/base/common/fuzzyScorer";
 import { ResolvedKeybinding } from "../../../base/common/keybindings.js";
 import { IDisposable } from "../../../base/common/lifecycle.js";
 import Severity from "../../../base/common/severity.js";
@@ -30,11 +30,19 @@ export interface IQuickItem {
      * Whether the item is displayed with a strikethrough.
      */
     strikethrough?: boolean;
+    /**
+     * Icon classes to be passed on as `IIconLabelValueOptions`
+     * to the underlying `IconLabel` widget.
+     */
     iconClasses?: readonly string[];
     iconPath?: {
         dark: URI;
         light?: URI;
     };
+    /**
+     * Icon class to be assigned to the quick item container
+     * directly.
+     */
     iconClass?: string;
     highlights?: IQuickItemHighlights;
     buttons?: readonly IQuickInputButton[];
@@ -112,6 +120,10 @@ export interface IPickOptions<T extends IQuickPickItem> {
      * an optional string to show as placeholder in the input box to guide the user what she picks on
      */
     placeHolder?: string;
+    /**
+     * the text to display underneath the input box
+     */
+    prompt?: string;
     /**
      * an optional flag to include the description when filtering the picks
      */
@@ -290,6 +302,10 @@ export interface IQuickInput extends IDisposable {
      * Indicates whether the quick input should be hidden when it loses focus.
      */
     ignoreFocusOut: boolean;
+    /**
+     * The toggle buttons to be added to the input box.
+     */
+    toggles: IQuickInputToggle[] | undefined;
     /**
      * Shows the quick input.
      */
@@ -428,6 +444,10 @@ export interface IQuickPick<T extends IQuickPickItem, O extends {
      * The placeholder text for the quick pick input.
      */
     placeholder: string | undefined;
+    /**
+     * Text shown below the quick pick input.
+     */
+    prompt: string | undefined;
     /**
      * An event that is fired when the value of the quick pick input changes.
      */
@@ -575,10 +595,6 @@ export interface IQuickPick<T extends IQuickPickItem, O extends {
      * Whether to hide the "Check All" checkbox.
      */
     hideCheckAll: boolean;
-    /**
-     * 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.
@@ -598,7 +614,7 @@ export interface IQuickInputToggle {
      * Event that is fired when the toggle value changes.
      * The boolean value indicates whether the change was triggered via keyboard.
      */
-    onChange: Event<boolean>;
+    readonly onChange: Event<boolean>;
 }
 /**
  * Represents an input box in a quick input dialog.
@@ -661,7 +677,12 @@ export declare enum QuickInputButtonLocation {
     /**
      * To the right of the input box.
      */
-    Inline = 2
+    Inline = 2,
+    /**
+     * At the far end inside the input box.
+     * Used by the public API to create toggles.
+     */
+    Input = 3
 }
 /**
  * Represents a button in the quick input UI.
@@ -784,6 +805,10 @@ export interface IQuickTree<T extends IQuickTreeItem> extends IQuickInput {
      * Whether to match on the label of the items.
      */
     matchOnLabel: boolean;
+    /**
+     * Whether to sort the items by label. Defaults to true.
+     */
+    sortByLabel: boolean;
     /**
      * The currently active items.
      */
@@ -818,6 +843,10 @@ export interface IQuickTree<T extends IQuickTreeItem> extends IQuickInput {
      * An event that is fired when the selected items change.
      */
     readonly onDidChangeCheckedLeafItems: Event<ReadonlyArray<T>>;
+    /**
+     * An event that is fired when the checkbox state of an item changes.
+     */
+    readonly onDidChangeCheckboxState: Event<T>;
     /**
      * An event that is fired when an item button is triggered.
      */
@@ -832,7 +861,7 @@ export interface IQuickTree<T extends IQuickTreeItem> extends IQuickInput {
      * @param element The item to update.
      * @param checked The new checkbox state.
      */
-    setCheckboxState(element: T, checked: boolean | "partial"): void;
+    setCheckboxState(element: T, checked: boolean | "mixed"): void;
     /**
      * Expands an item.
      * @param element The item to expand.
@@ -869,12 +898,12 @@ export interface IQuickTree<T extends IQuickTreeItem> extends IQuickInput {
  */
 export interface IQuickTreeItem extends IQuickItem {
     /**
-     * The checked state of the item. Can be true, false, or 'partial' for tri-state.
+     * The checked state of the item. Can be true, false, or 'mixed' for tri-state.
      * When canSelectMany is false, this is ignored and the item is treated as a single selection.
      * When canSelectMany is true, this indicates the checkbox state of the item.
      * If undefined, the item is unchecked by default.
      */
-    checked?: boolean | "partial";
+    checked?: boolean | "mixed";
     /**
      * The collapsible state of the tree item. Defaults to 'Expanded' if children are present.
      */
@@ -901,7 +930,7 @@ export interface IQuickTreeCheckboxEvent<T extends IQuickTreeItem> {
     /**
      * The new checked state.
      */
-    checked: boolean | "partial";
+    checked: boolean | "mixed";
 }
 /**
  * Represents an event that occurs when a button associated with a quick tree item is clicked.

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

@@ -38,6 +38,7 @@ var QuickInputButtonLocation;
 (function (QuickInputButtonLocation) {
     QuickInputButtonLocation[QuickInputButtonLocation["Title"] = 1] = "Title";
     QuickInputButtonLocation[QuickInputButtonLocation["Inline"] = 2] = "Inline";
+    QuickInputButtonLocation[QuickInputButtonLocation["Input"] = 3] = "Input";
 })(QuickInputButtonLocation || (QuickInputButtonLocation = {}));
 class QuickPickItemScorerAccessor {
     constructor(options) {

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

@@ -96,6 +96,7 @@ const USER_LOCAL_AND_REMOTE_SETTINGS = [
     'http.proxyAuthorization',
     'http.proxySupport',
     'http.systemCertificates',
+    'http.systemCertificatesNode',
     'http.experimental.systemCertificatesV2',
     'http.fetchAdditionalSupport',
     'http.experimental.networkInterfaceCheckInterval',
@@ -115,7 +116,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
         {
             id: 'http',
             order: 15,
-            title: ( localize(2015, "HTTP")),
+            title: ( localize(2024, "HTTP")),
             type: 'object',
             scope: ConfigurationScope.MACHINE,
             properties: {
@@ -123,7 +124,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'boolean',
                     default: useHostProxyDefault,
                     markdownDescription: ( localize(
-                        2016,
+                        2025,
                         "Controls whether in the remote extension host the local proxy configuration should be used. This setting only applies as a remote setting during [remote development](https://aka.ms/vscode-remote)."
                     )),
                     restricted: true
@@ -133,7 +134,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
         {
             id: 'http',
             order: 15,
-            title: ( localize(2015, "HTTP")),
+            title: ( localize(2024, "HTTP")),
             type: 'object',
             scope: ConfigurationScope.APPLICATION,
             properties: {
@@ -141,7 +142,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'boolean',
                     default: false,
                     description: ( localize(
-                        2017,
+                        2026,
                         "Controls whether use of Electron's fetch implementation instead of Node.js' should be enabled. All local extensions will get Electron's fetch implementation for the global fetch API."
                     )),
                     restricted: true
@@ -151,7 +152,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
         {
             id: 'http',
             order: 15,
-            title: ( localize(2015, "HTTP")),
+            title: ( localize(2024, "HTTP")),
             type: 'object',
             scope: useHostProxy ? ConfigurationScope.APPLICATION : ConfigurationScope.MACHINE,
             properties: {
@@ -159,7 +160,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'string',
                     pattern: '^(https?|socks|socks4a?|socks5h?)://([^:]*(:[^@]*)?@)?([^:]+|\\[[:0-9a-fA-F]+\\])(:\\d+)?/?$|^$',
                     markdownDescription: ( localize(
-                        2018,
+                        2027,
                         "The proxy setting to use. If not set, will be inherited from the `http_proxy` and `https_proxy` environment variables. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),
@@ -169,7 +170,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'boolean',
                     default: true,
                     markdownDescription: ( localize(
-                        2019,
+                        2028,
                         "Controls whether the proxy server certificate should be verified against the list of supplied CAs. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),
@@ -178,7 +179,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                 'http.proxyKerberosServicePrincipal': {
                     type: 'string',
                     markdownDescription: ( localize(
-                        2020,
+                        2029,
                         "Overrides the principal service name for Kerberos authentication with the HTTP proxy. A default based on the proxy hostname is used when this is not set. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),
@@ -188,7 +189,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'array',
                     items: { type: 'string' },
                     markdownDescription: ( localize(
-                        2021,
+                        2030,
                         "Specifies domain names for which proxy settings should be ignored for HTTP/HTTPS requests. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),
@@ -198,7 +199,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: ['null', 'string'],
                     default: null,
                     markdownDescription: ( localize(
-                        2022,
+                        2031,
                         "The value to send as the `Proxy-Authorization` header for every network request. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),
@@ -208,17 +209,17 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'string',
                     enum: ['off', 'on', 'fallback', 'override'],
                     enumDescriptions: [
-                        ( localize(2023, "Disable proxy support for extensions.")),
-                        ( localize(2024, "Enable proxy support for extensions.")),
+                        ( localize(2032, "Disable proxy support for extensions.")),
+                        ( localize(2033, "Enable proxy support for extensions.")),
                         ( localize(
-                        2025,
+                        2034,
                         "Enable proxy support for extensions, fall back to request options, when no proxy found."
                     )),
-                        ( localize(2026, "Enable proxy support for extensions, override request options.")),
+                        ( localize(2035, "Enable proxy support for extensions, override request options.")),
                     ],
                     default: 'override',
                     markdownDescription: ( localize(
-                        2027,
+                        2036,
                         "Use the proxy support for extensions. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),
@@ -228,18 +229,32 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'boolean',
                     default: true,
                     markdownDescription: ( localize(
-                        2028,
+                        2037,
                         "Controls whether CA certificates should be loaded from the OS. On Windows and macOS, a reload of the window is required after turning this off. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),
                     restricted: true
                 },
+                'http.systemCertificatesNode': {
+                    type: 'boolean',
+                    tags: ['experimental'],
+                    default: true,
+                    markdownDescription: ( localize(
+                        2038,
+                        "Controls whether system certificates should be loaded using Node.js built-in support. Reload the window after changing this setting. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
+                        '`#http.useLocalProxyConfiguration#`'
+                    )),
+                    restricted: true,
+                    experiment: {
+                        mode: 'auto'
+                    }
+                },
                 'http.experimental.systemCertificatesV2': {
                     type: 'boolean',
                     tags: ['experimental'],
                     default: false,
                     markdownDescription: ( localize(
-                        2029,
+                        2039,
                         "Controls whether experimental loading of CA certificates from the OS should be enabled. This uses a more general approach than the default implementation. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),
@@ -249,7 +264,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     type: 'boolean',
                     default: true,
                     markdownDescription: ( localize(
-                        2030,
+                        2040,
                         "Controls whether Node.js' fetch implementation should be extended with additional support. Currently proxy support ({1}) and system certificates ({2}) are added when the corresponding settings are enabled. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`',
                         '`#http.proxySupport#`',
@@ -263,7 +278,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
                     minimum: -1,
                     tags: ['experimental'],
                     markdownDescription: ( localize(
-                        2031,
+                        2041,
                         "Controls the interval in seconds for checking network interface changes to invalidate the proxy cache. Set to -1 to disable. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.",
                         '`#http.useLocalProxyConfiguration#`'
                     )),

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

@@ -3,5 +3,5 @@ import { ISecretStorageProvider } from "@codingame/monaco-vscode-secret-storage-
 export declare const ISecretStorageService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<ISecretStorageService>;
 export interface ISecretStorageService extends ISecretStorageProvider {
     readonly _serviceBrand: undefined;
-    onDidChangeSecret: Event<string>;
+    readonly onDidChangeSecret: Event<string>;
 }

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

@@ -36,7 +36,7 @@ class NullEndpointTelemetryService {
     }
 }
 const telemetryLogId = 'telemetry';
-const TelemetryLogGroup = { id: telemetryLogId, name: ( localize(2052, "Telemetry")) };
+const TelemetryLogGroup = { id: telemetryLogId, name: ( localize(2062, "Telemetry")) };
 function supportsTelemetry(productService, environmentService) {
     if (!environmentService.isBuilt && !environmentService.disableTelemetry) {
         return true;

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

@@ -1,7 +1,7 @@
 import { Event } from "../../../base/common/event.js";
 import { IProcessEnvironment, OperatingSystem } from "../../../base/common/platform.js";
 import { URI, UriComponents } from "../../../base/common/uri.js";
-import { IPtyHostProcessReplayEvent, ISerializedCommandDetectionCapability, ITerminalCapabilityStore, type ITerminalCommand } from "@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
+import { IPtyHostProcessReplayEvent, ISerializedCommandDetectionCapability, ITerminalCapabilityStore, type ITerminalCommand } from "@codingame/monaco-vscode-10af0e5d-64cb-56de-b584-29ab4a355d15-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
 import { IProcessDetails } from "./terminalProcess.js";
 import { ThemeIcon } from "../../../base/common/themables.js";
 import { ISerializableEnvironmentVariableCollections } from "@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/platform/terminal/common/environmentVariable";
@@ -9,6 +9,7 @@ import { IWorkspaceFolder } from "../../workspace/common/workspace.js";
 import type * as performance from "../../../base/common/performance.js";
 import type { IAction } from "../../../base/common/actions.js";
 import type { IDisposable } from "../../../base/common/lifecycle.js";
+import type { SingleOrMany } from "../../../base/common/types.js";
 import { IPtyService } from "./terminal.service.js";
 export declare enum TerminalSettingPrefix {
     AutomationProfile = "terminal.integrated.automationProfile.",
@@ -78,7 +79,6 @@ export declare enum TerminalSettingId {
     EnvMacOs = "terminal.integrated.env.osx",
     EnvLinux = "terminal.integrated.env.linux",
     EnvWindows = "terminal.integrated.env.windows",
-    EnvironmentChangesIndicator = "terminal.integrated.environmentChangesIndicator",
     EnvironmentChangesRelaunch = "terminal.integrated.environmentChangesRelaunch",
     ShowExitAlert = "terminal.integrated.showExitAlert",
     SplitCwd = "terminal.integrated.splitCwd",
@@ -101,6 +101,8 @@ export declare enum TerminalSettingId {
     ShellIntegrationEnabled = "terminal.integrated.shellIntegration.enabled",
     ShellIntegrationShowWelcome = "terminal.integrated.shellIntegration.showWelcome",
     ShellIntegrationDecorationsEnabled = "terminal.integrated.shellIntegration.decorationsEnabled",
+    ShellIntegrationTimeout = "terminal.integrated.shellIntegration.timeout",
+    ShellIntegrationQuickFixEnabled = "terminal.integrated.shellIntegration.quickFixEnabled",
     ShellIntegrationEnvironmentReporting = "terminal.integrated.shellIntegration.environmentReporting",
     EnableImages = "terminal.integrated.enableImages",
     SmoothScrolling = "terminal.integrated.smoothScrolling",
@@ -151,6 +153,7 @@ export interface IRawTerminalTabLayoutInfo<T> {
 export type ITerminalTabLayoutInfoById = IRawTerminalTabLayoutInfo<number>;
 export interface IRawTerminalsLayoutInfo<T> {
     tabs: IRawTerminalTabLayoutInfo<T>[];
+    background: T[] | null;
 }
 export interface IPtyHostAttachTarget {
     id: number;
@@ -444,6 +447,11 @@ export interface IShellLaunchConfig {
      * as normal. The hidden terminals will not be restored when the workspace is next opened.
      */
     hideFromUser?: boolean;
+    /**
+     * Whether to force the terminal to persist across sessions regardless of the other
+     * launch config, like `hideFromUser`.
+     */
+    forcePersist?: boolean;
     /**
      * Whether this terminal is not a terminal that the user directly created and uses, but rather
      * a terminal used to drive some VS Code feature.
@@ -598,12 +606,12 @@ export interface ITerminalChildProcess {
      * Whether the process should be persisted across reloads.
      */
     shouldPersist: boolean;
-    onProcessData: Event<IProcessDataEvent | string>;
-    onProcessReady: Event<IProcessReadyEvent>;
-    onProcessReplayComplete?: Event<void>;
-    onDidChangeProperty: Event<IProcessProperty<any>>;
-    onProcessExit: Event<number | undefined>;
-    onRestoreCommands?: Event<ISerializedCommandDetectionCapability>;
+    readonly onProcessData: Event<IProcessDataEvent | string>;
+    readonly onProcessReady: Event<IProcessReadyEvent>;
+    readonly onProcessReplayComplete?: Event<void>;
+    readonly onDidChangeProperty: Event<IProcessProperty<any>>;
+    readonly onProcessExit: Event<number | undefined>;
+    readonly onRestoreCommands?: Event<ISerializedCommandDetectionCapability>;
     /**
      * Starts the process.
      *
@@ -642,6 +650,11 @@ export interface ITerminalChildProcess {
      * @param charCount The number of characters being acknowledged.
      */
     acknowledgeDataEvent(charCount: number): void;
+    /**
+     * Pre-assigns the command identifier that should be associated with the next command detected by
+     * shell integration. This keeps the pty host and renderer command stores aligned.
+     */
+    setNextCommandId(commandLine: string, commandId: string): Promise<void>;
     /**
      * Sets the unicode version for the process, this drives the size of some characters in the
      * xterm-headless instance.
@@ -728,7 +741,7 @@ export interface ITerminalProfile {
      * cleaner to display this profile in the UI using only `basename(path)`.
      */
     isFromPath?: boolean;
-    args?: string | string[] | undefined;
+    args?: SingleOrMany<string> | undefined;
     env?: ITerminalEnvironment;
     overrideName?: boolean;
     color?: string;
@@ -748,7 +761,7 @@ export declare enum ProfileSource {
     Pwsh = "PowerShell"
 }
 export interface IBaseUnresolvedTerminalProfile {
-    args?: string | string[] | undefined;
+    args?: SingleOrMany<string> | undefined;
     isAutoDetected?: boolean;
     overrideName?: boolean;
     icon?: string | ThemeIcon | URI | {
@@ -759,13 +772,12 @@ export interface IBaseUnresolvedTerminalProfile {
     env?: ITerminalEnvironment;
     requiresPath?: string | ITerminalUnsafePath;
 }
-type OneOrN<T> = T | T[];
 export interface ITerminalUnsafePath {
     path: string;
     isUnsafe: true;
 }
 export interface ITerminalExecutable extends IBaseUnresolvedTerminalProfile {
-    path: OneOrN<string | ITerminalUnsafePath>;
+    path: SingleOrMany<string | ITerminalUnsafePath>;
 }
 export interface ITerminalProfileSource extends IBaseUnresolvedTerminalProfile {
     source: ProfileSource;
@@ -790,12 +802,17 @@ export interface IShellIntegration {
     readonly onDidChangeStatus: Event<ShellIntegrationStatus>;
     readonly onDidChangeSeenSequences: Event<ReadonlySet<string>>;
     deserialize(serialized: ISerializedCommandDetectionCapability): void;
+    setNextCommandId(command: string, commandId: string): void;
 }
 export interface IDecorationAddon {
     registerMenuItems(command: ITerminalCommand, items: IAction[]): IDisposable;
 }
+export interface ITerminalCompletionProviderContribution {
+    description?: string;
+}
 export interface ITerminalContributions {
     profiles?: ITerminalProfileContribution[];
+    completionProviders?: ITerminalCompletionProviderContribution[];
 }
 export declare enum ShellIntegrationStatus {
     /** No shell integration sequences have been encountered. */
@@ -908,18 +925,18 @@ export interface ITerminalBackend extends ITerminalBackendPtyServiceContribution
      * Fired when the ptyHost process becomes non-responsive, this should disable stdin for all
      * terminals using this pty host connection and mark them as disconnected.
      */
-    onPtyHostUnresponsive: Event<void>;
+    readonly onPtyHostUnresponsive: Event<void>;
     /**
      * Fired when the ptyHost process becomes responsive after being non-responsive. Allowing
      * previously disconnected terminals to reconnect.
      */
-    onPtyHostResponsive: Event<void>;
+    readonly onPtyHostResponsive: Event<void>;
     /**
      * Fired when the ptyHost has been restarted, this is used as a signal for listening terminals
      * that its pty has been lost and will remain disconnected.
      */
-    onPtyHostRestart: Event<void>;
-    onDidRequestDetach: Event<{
+    readonly onPtyHostRestart: Event<void>;
+    readonly onDidRequestDetach: Event<{
         requestId: number;
         workspaceId: string;
         instanceId: number;
@@ -972,4 +989,3 @@ export interface ITerminalBackendRegistry {
      */
     getTerminalBackend(remoteAuthority?: string): ITerminalBackend | undefined;
 }
-export {};