@codingame/monaco-vscode-api 37.1.0 → 37.3.0

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

@@ -0,0 +1,218 @@
+
+import { isWindows } from '../../../base/common/platform.js';
+import { EnvironmentVariableMutatorType } from './environmentVariable.js';
+
+const mutatorTypeToLabelMap = ( new Map([
+    [EnvironmentVariableMutatorType.Append, "APPEND"],
+    [EnvironmentVariableMutatorType.Prepend, "PREPEND"],
+    [EnvironmentVariableMutatorType.Replace, "REPLACE"]
+]));
+const PYTHON_ACTIVATION_VARS_PATTERN = /^VSCODE_PYTHON_(PWSH|ZSH|BASH|FISH)_ACTIVATE/;
+const PYTHON_ENV_EXTENSION_ID = "ms-python.vscode-python-envs";
+class MergedEnvironmentVariableCollection {
+    constructor(collections) {
+        this.collections = collections;
+        this.map = ( new Map());
+        this.descriptionMap = ( new Map());
+        collections.forEach((collection, extensionIdentifier) => {
+            this.populateDescriptionMap(collection, extensionIdentifier);
+            const it = collection.map.entries();
+            let next = it.next();
+            while (!next.done) {
+                const mutator = next.value[1];
+                const key = next.value[0];
+                if (this.blockPythonActivationVar(key, extensionIdentifier)) {
+                    next = it.next();
+                    continue;
+                }
+                let entry = this.map.get(key);
+                if (!entry) {
+                    entry = [];
+                    this.map.set(key, entry);
+                }
+                if (entry.length > 0 && entry[0].type === EnvironmentVariableMutatorType.Replace) {
+                    next = it.next();
+                    continue;
+                }
+                const extensionMutator = {
+                    extensionIdentifier,
+                    value: mutator.value,
+                    type: mutator.type,
+                    scope: mutator.scope,
+                    variable: mutator.variable,
+                    options: mutator.options
+                };
+                if (!extensionMutator.scope) {
+                    delete extensionMutator.scope;
+                }
+                entry.unshift(extensionMutator);
+                next = it.next();
+            }
+        });
+    }
+    async applyToProcessEnvironment(env, scope, variableResolver) {
+        let lowerToActualVariableNames;
+        if (isWindows) {
+            lowerToActualVariableNames = {};
+            ( Object.keys(env)).forEach(e => lowerToActualVariableNames[e.toLowerCase()] = e);
+        }
+        for (const [variable, mutators] of this.getVariableMap(scope)) {
+            const actualVariable = isWindows ? lowerToActualVariableNames[variable.toLowerCase()] || variable : variable;
+            for (const mutator of mutators) {
+                const value = variableResolver ? await variableResolver(mutator.value) : mutator.value;
+                if (this.blockPythonActivationVar(mutator.variable, mutator.extensionIdentifier)) {
+                    continue;
+                }
+                if (mutator.options?.applyAtProcessCreation ?? true) {
+                    switch (mutator.type) {
+                    case EnvironmentVariableMutatorType.Append:
+                        env[actualVariable] = (env[actualVariable] || "") + value;
+                        break;
+                    case EnvironmentVariableMutatorType.Prepend:
+                        env[actualVariable] = value + (env[actualVariable] || "");
+                        break;
+                    case EnvironmentVariableMutatorType.Replace:
+                        env[actualVariable] = value;
+                        break;
+                    }
+                }
+                if (mutator.options?.applyAtShellIntegration ?? false) {
+                    const key = `VSCODE_ENV_${mutatorTypeToLabelMap.get(mutator.type)}`;
+                    env[key] = (env[key] ? env[key] + ":" : "") + variable + "=" + this._encodeColons(value);
+                }
+            }
+        }
+    }
+    _encodeColons(value) {
+        return value.replaceAll(":", "\\x3a");
+    }
+    blockPythonActivationVar(variable, extensionIdentifier) {
+        if (PYTHON_ACTIVATION_VARS_PATTERN.test(variable) && PYTHON_ENV_EXTENSION_ID !== extensionIdentifier) {
+            return true;
+        }
+        return false;
+    }
+    diff(other, scope) {
+        const added = ( new Map());
+        const changed = ( new Map());
+        const removed = ( new Map());
+        other.getVariableMap(scope).forEach((otherMutators, variable) => {
+            const currentMutators = this.getVariableMap(scope).get(variable);
+            const result = getMissingMutatorsFromArray(otherMutators, currentMutators);
+            if (result) {
+                added.set(variable, result);
+            }
+        });
+        this.getVariableMap(scope).forEach((currentMutators, variable) => {
+            const otherMutators = other.getVariableMap(scope).get(variable);
+            const result = getMissingMutatorsFromArray(currentMutators, otherMutators);
+            if (result) {
+                removed.set(variable, result);
+            }
+        });
+        this.getVariableMap(scope).forEach((currentMutators, variable) => {
+            const otherMutators = other.getVariableMap(scope).get(variable);
+            const result = getChangedMutatorsFromArray(currentMutators, otherMutators);
+            if (result) {
+                changed.set(variable, result);
+            }
+        });
+        if (added.size === 0 && changed.size === 0 && removed.size === 0) {
+            return undefined;
+        }
+        return {
+            added,
+            changed,
+            removed
+        };
+    }
+    getVariableMap(scope) {
+        const result = ( new Map());
+        for (const mutators of ( this.map.values())) {
+            const filteredMutators = mutators.filter(m => filterScope(m, scope));
+            if (filteredMutators.length > 0) {
+                result.set(filteredMutators[0].variable, filteredMutators);
+            }
+        }
+        return result;
+    }
+    getDescriptionMap(scope) {
+        const result = ( new Map());
+        for (const mutators of ( this.descriptionMap.values())) {
+            const filteredMutators = mutators.filter(m => filterScope(m, scope, true));
+            for (const mutator of filteredMutators) {
+                result.set(mutator.extensionIdentifier, mutator.description);
+            }
+        }
+        return result;
+    }
+    populateDescriptionMap(collection, extensionIdentifier) {
+        if (!collection.descriptionMap) {
+            return;
+        }
+        const it = collection.descriptionMap.entries();
+        let next = it.next();
+        while (!next.done) {
+            const mutator = next.value[1];
+            const key = next.value[0];
+            let entry = this.descriptionMap.get(key);
+            if (!entry) {
+                entry = [];
+                this.descriptionMap.set(key, entry);
+            }
+            const extensionMutator = {
+                extensionIdentifier,
+                scope: mutator.scope,
+                description: mutator.description
+            };
+            if (!extensionMutator.scope) {
+                delete extensionMutator.scope;
+            }
+            entry.push(extensionMutator);
+            next = it.next();
+        }
+    }
+}
+function filterScope(mutator, scope, strictFilter = false) {
+    if (!mutator.scope) {
+        if (strictFilter) {
+            return scope === mutator.scope;
+        }
+        return true;
+    }
+    if (mutator.scope.workspaceFolder && scope?.workspaceFolder && mutator.scope.workspaceFolder.index === scope.workspaceFolder.index) {
+        return true;
+    }
+    return false;
+}
+function getMissingMutatorsFromArray(current, other) {
+    if (!other) {
+        return current;
+    }
+    const otherMutatorExtensions = ( new Set());
+    other.forEach(m => otherMutatorExtensions.add(m.extensionIdentifier));
+    const result = [];
+    current.forEach(mutator => {
+        if (!( otherMutatorExtensions.has(mutator.extensionIdentifier))) {
+            result.push(mutator);
+        }
+    });
+    return result.length === 0 ? undefined : result;
+}
+function getChangedMutatorsFromArray(current, other) {
+    if (!other) {
+        return undefined;
+    }
+    const otherMutatorExtensions = ( new Map());
+    other.forEach(m => otherMutatorExtensions.set(m.extensionIdentifier, m));
+    const result = [];
+    current.forEach(mutator => {
+        const otherMutator = otherMutatorExtensions.get(mutator.extensionIdentifier);
+        if (otherMutator && (mutator.type !== otherMutator.type || mutator.value !== otherMutator.value || mutator.scope?.workspaceFolder?.index !== otherMutator.scope?.workspaceFolder?.index)) {
+            result.push(otherMutator);
+        }
+    });
+    return result.length === 0 ? undefined : result;
+}
+
+export { MergedEnvironmentVariableCollection };

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

@@ -1,4 +1,4 @@
-import { IEnvironmentVariableCollectionDescription, IEnvironmentVariableCollection, IEnvironmentVariableMutator, ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection, ISerializableEnvironmentVariableCollections } from "@codingame/monaco-vscode-xterm-common/vscode/vs/platform/terminal/common/environmentVariable";
+import { IEnvironmentVariableCollectionDescription, IEnvironmentVariableCollection, IEnvironmentVariableMutator, ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection, ISerializableEnvironmentVariableCollections } from "./environmentVariable.js";
 export declare function serializeEnvironmentVariableCollection(collection: ReadonlyMap<string, IEnvironmentVariableMutator>): ISerializableEnvironmentVariableCollection;
 export declare function serializeEnvironmentDescriptionMap(descriptionMap: ReadonlyMap<string, IEnvironmentVariableCollectionDescription> | undefined): ISerializableEnvironmentDescriptionMap;
 export declare function deserializeEnvironmentVariableCollection(serializedCollection: ISerializableEnvironmentVariableCollection): Map<string, IEnvironmentVariableMutator>;

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

@@ -13,21 +13,21 @@ function deserializeEnvironmentDescriptionMap(serializableEnvironmentDescription
     return ( new Map(serializableEnvironmentDescription ?? []));
 }
 function serializeEnvironmentVariableCollections(collections) {
-    return ( Array.from(collections.entries()).map(e => {
+    return Array.from(collections.entries()).map(e => {
         return [
             e[0],
             serializeEnvironmentVariableCollection(e[1].map),
             serializeEnvironmentDescriptionMap(e[1].descriptionMap)
         ];
-    }));
+    });
 }
 function deserializeEnvironmentVariableCollections(serializedCollection) {
-    return ( new Map(( serializedCollection.map(e => {
+    return ( new Map(serializedCollection.map(e => {
         return [e[0], {
             map: deserializeEnvironmentVariableCollection(e[1]),
             descriptionMap: deserializeEnvironmentDescriptionMap(e[2])
         }];
-    }))));
+    })));
 }
 
 export { deserializeEnvironmentDescriptionMap, deserializeEnvironmentVariableCollection, deserializeEnvironmentVariableCollections, serializeEnvironmentDescriptionMap, serializeEnvironmentVariableCollection, serializeEnvironmentVariableCollections };

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

@@ -4,7 +4,7 @@ import { URI, UriComponents } from "../../../base/common/uri.js";
 import { IPtyHostProcessReplayEvent, ISerializedCommandDetectionCapability, ITerminalCapabilityStore, type ITerminalCommand } from "./capabilities/capabilities.js";
 import { IProcessDetails } from "./terminalProcess.js";
 import { ThemeIcon } from "../../../base/common/themables.js";
-import { ISerializableEnvironmentVariableCollections } from "@codingame/monaco-vscode-xterm-common/vscode/vs/platform/terminal/common/environmentVariable";
+import { ISerializableEnvironmentVariableCollections } from "./environmentVariable.js";
 import { IWorkspaceFolder } from "../../workspace/common/workspace.js";
 import type * as performance from "../../../base/common/performance.js";
 import type { IAction } from "../../../base/common/actions.js";

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

@@ -1,6 +1,6 @@
-import { Event } from "../../../base/common/event.js";
 import * as performance from "../../../base/common/performance.js";
 import { IProcessEnvironment, OperatingSystem } from "../../../base/common/platform.js";
+import { Event } from "../../../sessions/sessions.web.main.internal.js";
 import { ILogService } from "../../log/common/log.service.js";
 import { IPtyHostProcessReplayEvent } from "./capabilities/capabilities.js";
 import { IProcessDataEvent, IProcessReadyEvent, IProcessProperty, IShellLaunchConfig, ITerminalProcessOptions, IPtyHostLatencyMeasurement, ITerminalLaunchError, ITerminalLaunchResult, TitleEventSource, TerminalIcon, ITerminalsLayoutInfo, ISerializedTerminalState, ProcessPropertyType, IProcessPropertyMap, type IPtyHostService } from "./terminal.js";

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

@@ -28,23 +28,23 @@ const terminalIconSchema = {
 };
 const terminalProfileBaseProperties = {
     args: {
-        description: ( localize(2491, "An optional set of arguments to run the shell executable with.")),
+        description: ( localize(2509, "An optional set of arguments to run the shell executable with.")),
         type: "array",
         items: {
             type: "string"
         }
     },
     icon: {
-        description: ( localize(2492, "A codicon ID to associate with the terminal icon.")),
+        description: ( localize(2510, "A codicon ID to associate with the terminal icon.")),
         ...terminalIconSchema
     },
     color: {
-        description: ( localize(2493, "A theme color ID to associate with the terminal icon.")),
+        description: ( localize(2511, "A theme color ID to associate with the terminal icon.")),
         ...terminalColorSchema
     },
     env: {
         markdownDescription: ( localize(
-            2494,
+            2512,
             "An object with environment variables that will be added to the terminal profile process. Set to `null` to delete environment variables from the base environment."
         )),
         type: "object",
@@ -60,7 +60,7 @@ const terminalProfileSchema = {
     properties: {
         path: {
             description: ( localize(
-                2495,
+                2513,
                 "A single path to a shell executable or an array of paths that will be used as fallbacks when one fails."
             )),
             type: ["string", "array"],
@@ -70,7 +70,7 @@ const terminalProfileSchema = {
         },
         overrideName: {
             description: ( localize(
-                2496,
+                2514,
                 "Whether or not to replace the dynamic terminal title that detects what program is running with the static profile name."
             )),
             type: "boolean"
@@ -83,7 +83,7 @@ const terminalAutomationProfileSchema = {
     required: ["path"],
     properties: {
         path: {
-            description: ( localize(2497, "A path to a shell executable.")),
+            description: ( localize(2515, "A path to a shell executable.")),
             type: ["string"],
             items: {
                 type: "string"
@@ -95,7 +95,7 @@ const terminalAutomationProfileSchema = {
 function createTerminalProfileMarkdownDescription(platform) {
     const key = platform === Platform.Linux ? "linux" : platform === Platform.Mac ? "osx" : "windows";
     return localize(
-        2498,
+        2516,
         "A set of terminal profile customizations for {0} which allows adding, removing or changing how terminals are launched. Profiles are made up of a mandatory path, optional arguments and other presentation options.\n\nTo override an existing profile use its profile name as the key, for example:\n\n{1}\n\n{2}Read more about configuring profiles{3}.",
         PlatformToString(platform),
         "```json\n\"terminal.integrated.profile." + key + "\": {\n  \"bash\": null\n}\n```",
@@ -106,13 +106,13 @@ function createTerminalProfileMarkdownDescription(platform) {
 const terminalPlatformConfiguration = {
     id: "terminal",
     order: 100,
-    title: ( localize(2499, "Integrated Terminal")),
+    title: ( localize(2517, "Integrated Terminal")),
     type: "object",
     properties: {
         [TerminalSettingId.AutomationProfileLinux]: {
             restricted: true,
             markdownDescription: ( localize(
-                2500,
+                2518,
                 "The terminal profile to use on Linux for automation-related terminal usage like tasks and debug."
             )),
             type: ["object", "null"],
@@ -130,7 +130,7 @@ const terminalPlatformConfiguration = {
         [TerminalSettingId.AutomationProfileMacOs]: {
             restricted: true,
             markdownDescription: ( localize(
-                2501,
+                2519,
                 "The terminal profile to use on macOS for automation-related terminal usage like tasks and debug."
             )),
             type: ["object", "null"],
@@ -148,7 +148,7 @@ const terminalPlatformConfiguration = {
         [TerminalSettingId.AutomationProfileWindows]: {
             restricted: true,
             markdownDescription: ( localize(
-                2502,
+                2520,
                 "The terminal profile to use for automation-related terminal usage like tasks and debug. This setting will currently be ignored if {0} (now deprecated) is set.",
                 "`terminal.integrated.automationShell.windows`"
             )),
@@ -167,7 +167,7 @@ const terminalPlatformConfiguration = {
         [TerminalSettingId.AgentHostProfileLinux]: {
             restricted: true,
             markdownDescription: ( localize(
-                2503,
+                2521,
                 "The terminal profile to use on Linux for agent host terminals, including shells launched by AI agent tools. Accepts either a profile name from {0} or an inline profile object. When unset, falls back to {1}. Currently applies to the local agent host. Only the executable `path` is honored today; `args` and `env` from the profile are ignored. Remote agent hosts need remote-side shell configuration because local resolved paths may be invalid on the remote.",
                 "`#terminal.integrated.profiles.linux#`",
                 "`#terminal.integrated.defaultProfile.linux#`"
@@ -189,7 +189,7 @@ const terminalPlatformConfiguration = {
         [TerminalSettingId.AgentHostProfileMacOs]: {
             restricted: true,
             markdownDescription: ( localize(
-                2504,
+                2522,
                 "The terminal profile to use on macOS for agent host terminals, including shells launched by AI agent tools. Accepts either a profile name from {0} or an inline profile object. When unset, falls back to {1}. Currently applies to the local agent host. Only the executable `path` is honored today; `args` and `env` from the profile are ignored. Remote agent hosts need remote-side shell configuration because local resolved paths may be invalid on the remote.",
                 "`#terminal.integrated.profiles.osx#`",
                 "`#terminal.integrated.defaultProfile.osx#`"
@@ -211,7 +211,7 @@ const terminalPlatformConfiguration = {
         [TerminalSettingId.AgentHostProfileWindows]: {
             restricted: true,
             markdownDescription: ( localize(
-                2505,
+                2523,
                 "The terminal profile to use on Windows for agent host terminals, including shells launched by AI agent tools. Accepts either a profile name from {0} or an inline profile object. When unset, falls back to {1}. Currently applies to the local agent host. Only the executable `path` is honored today; `args` and `env` from the profile are ignored. Remote agent hosts need remote-side shell configuration because local resolved paths may be invalid on the remote.",
                 "`#terminal.integrated.profiles.windows#`",
                 "`#terminal.integrated.defaultProfile.windows#`"
@@ -256,7 +256,7 @@ const terminalPlatformConfiguration = {
                     properties: {
                         source: {
                             description: ( localize(
-                                2506,
+                                2524,
                                 "A profile source that will auto detect the paths to the shell. Note that non-standard executable locations are not supported and must be created manually in a new profile."
                             )),
                             enum: ["PowerShell", "Git Bash"]
@@ -268,15 +268,15 @@ const terminalPlatformConfiguration = {
                     required: ["extensionIdentifier", "id", "title"],
                     properties: {
                         extensionIdentifier: {
-                            description: ( localize(2507, "The extension that contributed this profile.")),
+                            description: ( localize(2525, "The extension that contributed this profile.")),
                             type: "string"
                         },
                         id: {
-                            description: ( localize(2508, "The id of the extension terminal")),
+                            description: ( localize(2526, "The id of the extension terminal")),
                             type: "string"
                         },
                         title: {
-                            description: ( localize(2509, "The name of the extension terminal")),
+                            description: ( localize(2527, "The name of the extension terminal")),
                             type: "string"
                         },
                         ...terminalProfileBaseProperties
@@ -319,15 +319,15 @@ const terminalPlatformConfiguration = {
                     required: ["extensionIdentifier", "id", "title"],
                     properties: {
                         extensionIdentifier: {
-                            description: ( localize(2510, "The extension that contributed this profile.")),
+                            description: ( localize(2528, "The extension that contributed this profile.")),
                             type: "string"
                         },
                         id: {
-                            description: ( localize(2511, "The id of the extension terminal")),
+                            description: ( localize(2529, "The id of the extension terminal")),
                             type: "string"
                         },
                         title: {
-                            description: ( localize(2512, "The name of the extension terminal")),
+                            description: ( localize(2530, "The name of the extension terminal")),
                             type: "string"
                         },
                         ...terminalProfileBaseProperties
@@ -367,15 +367,15 @@ const terminalPlatformConfiguration = {
                     required: ["extensionIdentifier", "id", "title"],
                     properties: {
                         extensionIdentifier: {
-                            description: ( localize(2513, "The extension that contributed this profile.")),
+                            description: ( localize(2531, "The extension that contributed this profile.")),
                             type: "string"
                         },
                         id: {
-                            description: ( localize(2514, "The id of the extension terminal")),
+                            description: ( localize(2532, "The id of the extension terminal")),
                             type: "string"
                         },
                         title: {
-                            description: ( localize(2515, "The name of the extension terminal")),
+                            description: ( localize(2533, "The name of the extension terminal")),
                             type: "string"
                         },
                         ...terminalProfileBaseProperties
@@ -387,7 +387,7 @@ const terminalPlatformConfiguration = {
         },
         [TerminalSettingId.UseWslProfiles]: {
             description: ( localize(
-                2516,
+                2534,
                 "Controls whether or not WSL distros are shown in the terminal dropdown"
             )),
             type: "boolean",
@@ -396,7 +396,7 @@ const terminalPlatformConfiguration = {
         [TerminalSettingId.InheritEnv]: {
             scope: ConfigurationScope.APPLICATION,
             description: ( localize(
-                2517,
+                2535,
                 "Whether new shells should inherit their environment from VS Code, which may source a login shell to ensure $PATH and other development variables are initialized. This has no effect on Windows."
             )),
             type: "boolean",
@@ -405,7 +405,7 @@ const terminalPlatformConfiguration = {
         [TerminalSettingId.PersistentSessionScrollback]: {
             scope: ConfigurationScope.APPLICATION,
             markdownDescription: ( localize(
-                2518,
+                2536,
                 "Controls the maximum amount of lines that will be restored when reconnecting to a persistent terminal session. Increasing this will restore more lines of scrollback at the cost of more memory and increase the time it takes to connect to terminals on start up. This setting requires a restart to take effect and should be set to a value less than or equal to `#terminal.integrated.scrollback#`."
             )),
             type: "number",
@@ -413,13 +413,13 @@ const terminalPlatformConfiguration = {
         },
         [TerminalSettingId.ShowLinkHover]: {
             scope: ConfigurationScope.APPLICATION,
-            description: ( localize(2519, "Whether to show hovers for links in the terminal output.")),
+            description: ( localize(2537, "Whether to show hovers for links in the terminal output.")),
             type: "boolean",
             default: true
         },
         [TerminalSettingId.IgnoreProcessNames]: {
             markdownDescription: ( localize(
-                2520,
+                2538,
                 "A set of process names to ignore when using the {0} setting.",
                 "`#terminal.integrated.confirmOnKill#`"
             )),
@@ -449,12 +449,12 @@ function registerTerminalDefaultProfileConfiguration(detectedProfiles, extension
     defaultProfilesConfiguration = {
         id: "terminal",
         order: 100,
-        title: ( localize(2499, "Integrated Terminal")),
+        title: ( localize(2517, "Integrated Terminal")),
         type: "object",
         properties: {
             [TerminalSettingId.DefaultProfileLinux]: {
                 restricted: true,
-                markdownDescription: ( localize(2521, "The default terminal profile on Linux.")),
+                markdownDescription: ( localize(2539, "The default terminal profile on Linux.")),
                 type: ["string", "null"],
                 default: null,
                 enum: detectedProfiles?.os === OperatingSystem.Linux ? profileEnum?.values : undefined,
@@ -462,7 +462,7 @@ function registerTerminalDefaultProfileConfiguration(detectedProfiles, extension
             },
             [TerminalSettingId.DefaultProfileMacOs]: {
                 restricted: true,
-                markdownDescription: ( localize(2522, "The default terminal profile on macOS.")),
+                markdownDescription: ( localize(2540, "The default terminal profile on macOS.")),
                 type: ["string", "null"],
                 default: null,
                 enum: detectedProfiles?.os === OperatingSystem.Macintosh ? profileEnum?.values : undefined,
@@ -470,7 +470,7 @@ function registerTerminalDefaultProfileConfiguration(detectedProfiles, extension
             },
             [TerminalSettingId.DefaultProfileWindows]: {
                 restricted: true,
-                markdownDescription: ( localize(2523, "The default terminal profile on Windows.")),
+                markdownDescription: ( localize(2541, "The default terminal profile on Windows.")),
                 type: ["string", "null"],
                 default: null,
                 enum: detectedProfiles?.os === OperatingSystem.Windows ? profileEnum?.values : undefined,

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

@@ -1,5 +1,5 @@
 import { UriComponents } from "../../../base/common/uri.js";
-import { ISerializableEnvironmentVariableCollection, ISerializableEnvironmentVariableCollections } from "@codingame/monaco-vscode-xterm-common/vscode/vs/platform/terminal/common/environmentVariable";
+import { ISerializableEnvironmentVariableCollection, ISerializableEnvironmentVariableCollections } from "./environmentVariable.js";
 import { IFixedTerminalDimensions, IRawTerminalTabLayoutInfo, IReconnectionProperties, ITerminalEnvironment, ITerminalTabAction, ITerminalTabLayoutInfoById, TerminalIcon, TerminalType, TitleEventSource, WaitOnExitValue } from "./terminal.js";
 export interface ISingleTerminalConfiguration<T> {
     userValue: T | undefined;

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

@@ -8,25 +8,25 @@ import { isString, isObject } from '../../../base/common/types.js';
 function createProfileSchemaEnums(detectedProfiles, extensionProfiles) {
     const result = [{
         name: null,
-        description: ( localize(2524, "Automatically detect the default"))
+        description: ( localize(2542, "Automatically detect the default"))
     }];
-    result.push(...( detectedProfiles.map(e => {
+    result.push(...detectedProfiles.map(e => {
         return {
             name: e.profileName,
             description: createProfileDescription(e)
         };
-    })));
+    }));
     if (extensionProfiles) {
-        result.push(...( extensionProfiles.map(extensionProfile => {
+        result.push(...extensionProfiles.map(extensionProfile => {
             return {
                 name: extensionProfile.title,
                 description: createExtensionProfileDescription(extensionProfile)
             };
-        })));
+        }));
     }
     return {
-        values: ( result.map(e => e.name)),
-        markdownDescriptions: ( result.map(e => e.description))
+        values: result.map(e => e.name),
+        markdownDescriptions: result.map(e => e.description)
     };
 }
 function createProfileDescription(profile) {

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

@@ -0,0 +1,14 @@
+import { IPtyHostProcessReplayEvent } from "./capabilities/capabilities.js";
+import { ReplayEntry } from "./terminalProcess.js";
+export interface IRemoteTerminalProcessReplayEvent {
+    events: ReplayEntry[];
+}
+export declare class TerminalRecorder {
+    private _entries;
+    private _totalDataLength;
+    constructor(cols: number, rows: number);
+    handleResize(cols: number, rows: number): void;
+    handleData(data: string): void;
+    generateReplayEventSync(): IPtyHostProcessReplayEvent;
+    generateReplayEvent(): Promise<IPtyHostProcessReplayEvent>;
+}

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

@@ -0,0 +1,73 @@
+
+
+var Constants;
+(function (Constants) {
+    Constants[Constants["MaxRecorderDataSize"] = 10485760] = "MaxRecorderDataSize";
+})(Constants || (Constants = {}));
+class TerminalRecorder {
+    constructor(cols, rows) {
+        this._totalDataLength = 0;
+        this._entries = [{ cols, rows, data: [] }];
+    }
+    handleResize(cols, rows) {
+        if (this._entries.length > 0) {
+            const lastEntry = this._entries[this._entries.length - 1];
+            if (lastEntry.data.length === 0) {
+                this._entries.pop();
+            }
+        }
+        if (this._entries.length > 0) {
+            const lastEntry = this._entries[this._entries.length - 1];
+            if (lastEntry.cols === cols && lastEntry.rows === rows) {
+                return;
+            }
+            if (lastEntry.cols === 0 && lastEntry.rows === 0) {
+                lastEntry.cols = cols;
+                lastEntry.rows = rows;
+                return;
+            }
+        }
+        this._entries.push({ cols, rows, data: [] });
+    }
+    handleData(data) {
+        const lastEntry = this._entries[this._entries.length - 1];
+        lastEntry.data.push(data);
+        this._totalDataLength += data.length;
+        while (this._totalDataLength > Constants.MaxRecorderDataSize) {
+            const firstEntry = this._entries[0];
+            const remainingToDelete = this._totalDataLength - Constants.MaxRecorderDataSize;
+            if (remainingToDelete >= firstEntry.data[0].length) {
+                this._totalDataLength -= firstEntry.data[0].length;
+                firstEntry.data.shift();
+                if (firstEntry.data.length === 0) {
+                    this._entries.shift();
+                }
+            }
+            else {
+                firstEntry.data[0] = firstEntry.data[0].substr(remainingToDelete);
+                this._totalDataLength -= remainingToDelete;
+            }
+        }
+    }
+    generateReplayEventSync() {
+        this._entries.forEach((entry) => {
+            if (entry.data.length > 0) {
+                entry.data = [entry.data.join('')];
+            }
+        });
+        return {
+            events: this._entries.map(entry => ({ cols: entry.cols, rows: entry.rows, data: entry.data[0] ?? '' })),
+            commands: {
+                isWindowsPty: false,
+                hasRichCommandDetection: false,
+                commands: [],
+                promptInputModel: undefined,
+            }
+        };
+    }
+    async generateReplayEvent() {
+        return this.generateReplayEventSync();
+    }
+}
+
+export { TerminalRecorder };