@codingame/monaco-vscode-xterm-common 30.0.0 → 31.0.0

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalInstance.js

@@ -84,7 +84,7 @@ import { ProcessState, TERMINAL_VIEW_ID, TerminalCommandId, DEFAULT_COMMANDS_TO_
 import { ITerminalProfileResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service';
 import { TERMINAL_BACKGROUND_COLOR } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalColorRegistry';
 import { TerminalContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalContextKey';
-import { getShellIntegrationTimeout, preparePathForShell, getUriLabelForShell, getWorkspaceForTerminal } from '../common/terminalEnvironment.js';
+import { getShellIntegrationTimeout, preparePathForShell, getUriLabelForShell, getWorkspaceForTerminal } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalEnvironment';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/history/common/history.service';
@@ -104,7 +104,7 @@ import { PromptInputState } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { isString, hasKey, isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
-var TerminalInstance_1;
+var TerminalInstance_1, TerminalLabelComputer_1;
 var Constants;
 (function(Constants) {
     Constants[Constants["WaitForContainerThreshold"] = 100] = "WaitForContainerThreshold";
@@ -119,6 +119,11 @@ const shellIntegrationSupportedShellTypes = [
     GeneralShellType.PowerShell,
     GeneralShellType.Python
 ];
+const agentCliTitlePatterns = ( new Map([
+    [GeneralShellType.Claude, /claude\s*code/i],
+    [GeneralShellType.Copilot, /\bcopilot\b/i],
+    [GeneralShellType.Gemini, /\bgemini\b/i]
+]));
 let TerminalInstance = class TerminalInstance extends Disposable {
     static {
         TerminalInstance_1 = this;
@@ -770,13 +775,13 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         }
         xtermConstructor = Promises.withAsyncBody(async resolve => {
             const Terminal = (await import('@xterm/xterm')).Terminal;
-            Terminal.strings.promptLabel = ( localize(13415, "Terminal input"));
+            Terminal.strings.promptLabel = ( localize(13555, "Terminal input"));
             Terminal.strings.tooMuchOutput = keybinding ? ( localize(
-                13416,
+                13556,
                 "Use the accessible buffer {0} to manually review output",
                 keybinding.getLabel()
             )) : ( localize(
-                13417,
+                13557,
                 "Use the Terminal: Focus Accessible Buffer command to manually review output"
             ));
             resolve(Terminal);
@@ -829,7 +834,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                         id: TerminalStatus.Bell,
                         severity: Severity.Warning,
                         icon: Codicon.bell,
-                        tooltip: ( localize(13418, "Bell"))
+                        tooltip: ( localize(13558, "Bell"))
                     }, this._terminalConfigurationService.config.bellDuration);
                 }
                 this._accessibilitySignalService.playSignal(AccessibilitySignal.terminalBell);
@@ -907,7 +912,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         if (!instance.xterm) {
             return;
         }
-        const cmdDetectionType = (instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection ? ( localize(13419, "Rich")) : ( instance.capabilities.has(TerminalCapability.CommandDetection)) ? ( localize(13420, "Basic")) : instance.usedShellIntegrationInjection ? ( localize(13421, "Injection failed to activate")) : ( localize(13422, "No")));
+        const cmdDetectionType = (instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection ? ( localize(13559, "Rich")) : ( instance.capabilities.has(TerminalCapability.CommandDetection)) ? ( localize(13560, "Basic")) : instance.usedShellIntegrationInjection ? ( localize(13561, "Injection failed to activate")) : ( localize(13562, "No")));
         const detailedAdditions = [];
         if (instance.shellType) {
             detailedAdditions.push(`Shell type: \`${instance.shellType}\``);
@@ -932,11 +937,17 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         instance.statusList.add({
             id: TerminalStatus.ShellIntegrationInfo,
             severity: Severity.Info,
-            tooltip: `${( localize(13423, "Shell integration"))}: ${cmdDetectionType}`,
-            detailedTooltip: `${( localize(13423, "Shell integration"))}: ${cmdDetectionType}${detailedAdditionsString}`
+            tooltip: `${( localize(13563, "Shell integration"))}: ${cmdDetectionType}`,
+            detailedTooltip: `${( localize(13563, "Shell integration"))}: ${cmdDetectionType}${detailedAdditionsString}`
         });
     }
-    async runCommand(commandLine, shouldExecute, commandId, forceBracketedPasteMode) {
+    async runCommand(
+        commandLine,
+        shouldExecute,
+        commandId,
+        forceBracketedPasteMode,
+        commandLineForMetadata
+    ) {
         let commandDetection = this.capabilities.get(TerminalCapability.CommandDetection);
         const siInjectionEnabled = this._configurationService.getValue(TerminalSettingId.ShellIntegrationEnabled) === true;
         const timeoutMs = getShellIntegrationTimeout(
@@ -962,8 +973,9 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             store.dispose();
         }
         if (commandId && commandDetection) {
-            this.xterm?.shellIntegration.setNextCommandId(commandLine, commandId);
-            await this._processManager.setNextCommandId(commandLine, commandId);
+            const commandLineToReport = commandLineForMetadata ?? commandLine;
+            this.xterm?.shellIntegration.setNextCommandId(commandLineToReport, commandId);
+            await this._processManager.setNextCommandId(commandLineToReport, commandId);
         }
         if (shouldExecute && (!commandDetection || commandDetection.promptInputModel.value.length > 0)) {
             await this.sendText("\u0003", false);
@@ -1367,7 +1379,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 this._setResolvedShellLaunchConfig(value);
                 break;
             case ProcessPropertyType.ShellType:
-                this.setShellType(value);
+                this._handleShellTypeChange(value);
                 break;
             case ProcessPropertyType.HasChildProcesses:
                 this._onDidChangeHasChildProcesses.fire(value);
@@ -1395,7 +1407,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 id: TerminalStatus.Disconnected,
                 severity: Severity.Error,
                 icon: Codicon.debugDisconnect,
-                tooltip: ( localize(13424, "Lost connection to process"))
+                tooltip: ( localize(13564, "Lost connection to process"))
             });
         }));
         this._register(processManager.onPtyReconnect(() => {
@@ -1413,12 +1425,12 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         const trusted = await this._trust();
         if (!trusted && !this.remoteAuthority && !this._workbenchEnvironmentService.remoteAuthority) {
             this._onProcessExit({
-                message: ( localize(13425, "Cannot launch a terminal process in an untrusted workspace"))
+                message: ( localize(13565, "Cannot launch a terminal process in an untrusted workspace"))
             });
         } else if (this._workspaceContextService.getWorkspace().folders.length === 0 && this._cwd && this._userHome && normalizeDriveLetter(this._cwd) !== normalizeDriveLetter(this._userHome)) {
             this._onProcessExit({
                 message: ( localize(
-                    13426,
+                    13566,
                     "Cannot launch a terminal process in an empty workspace with cwd {0} different from userHome {1}",
                     this._cwd,
                     this._userHome
@@ -1588,10 +1600,10 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             id: TerminalStatus.ShellIntegrationAttentionNeeded,
             severity: Severity.Warning,
             icon: Codicon.warning,
-            tooltip: `${exitMessage} ` + ( localize(13427, "Disabling shell integration in user settings might help.")),
+            tooltip: `${exitMessage} ` + ( localize(13567, "Disabling shell integration in user settings might help.")),
             hoverActions: [{
                 commandId: TerminalCommandId.ShellIntegrationLearnMore,
-                label: ( localize(13428, "Learn more about shell integration")),
+                label: ( localize(13568, "Learn more about shell integration")),
                 run: () => {
                     this._openerService.open(
                         "https://code.visualstudio.com/docs/editor/integrated-terminal#_shell-integration"
@@ -1599,7 +1611,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 }
             }, {
                 commandId: "workbench.action.openSettings",
-                label: ( localize(13429, "Open user settings")),
+                label: ( localize(13569, "Open user settings")),
                 run: () => {
                     this._commandService.executeCommand(
                         "workbench.action.openSettings",
@@ -1677,6 +1689,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             shell.initialText = " ";
         }
         this._shellLaunchConfig = shell;
+        this._agentShellTypeFromSequence = undefined;
         await this._processManager.relaunch(
             this._shellLaunchConfig,
             this._cols || Constants.DefaultCols,
@@ -1707,6 +1720,22 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         if (this.isTitleSetByProcess) {
             this._setTitle(title, TitleEventSource.Sequence);
         }
+        for (const [shellType, pattern] of agentCliTitlePatterns) {
+            if (pattern.test(title)) {
+                this._agentShellTypeFromSequence = shellType;
+                this.setShellType(shellType);
+                break;
+            }
+        }
+    }
+    _handleShellTypeChange(shellType) {
+        if (this._agentShellTypeFromSequence) {
+            if (shellType === GeneralShellType.Node || shellType === undefined) {
+                return;
+            }
+            this._agentShellTypeFromSequence = undefined;
+        }
+        this.setShellType(shellType);
     }
     async _trust() {
         if (this._configurationService.getValue(TerminalSettingId.AllowInUntrustedWorkspace)) {
@@ -1716,7 +1745,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             return true;
         }
         const trustRequest = await this._workspaceTrustRequestService.requestWorkspaceTrust({
-            message: ( localize(13430, "Creating a terminal process requires executing code"))
+            message: ( localize(13570, "Creating a terminal process requires executing code"))
         });
         return trustRequest === true;
     }
@@ -1842,26 +1871,27 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             this._terminalShellTypeContextKey.set(shellType?.toString());
         }
         this._onDidChangeShellType.fire(shellType);
+        this._labelComputer?.refreshLabel(this);
     }
     _setAriaLabel(xterm, terminalId, title) {
         const labelParts = [];
         if (xterm && xterm.textarea) {
             if (title && title.length > 0) {
-                labelParts.push(( localize(13431, "Terminal {0}, {1}", terminalId, title)));
+                labelParts.push(( localize(13571, "Terminal {0}, {1}", terminalId, title)));
             } else {
-                labelParts.push(( localize(13432, "Terminal {0}", terminalId)));
+                labelParts.push(( localize(13572, "Terminal {0}", terminalId)));
             }
             const screenReaderOptimized = this._accessibilityService.isScreenReaderOptimized();
             if (!screenReaderOptimized) {
                 labelParts.push(( localize(
-                    13433,
+                    13573,
                     "Run the command: Toggle Screen Reader Accessibility Mode for an optimized screen reader experience"
                 )));
             }
             const accessibilityHelpKeybinding = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
             if (this._configurationService.getValue(AccessibilityVerbositySettingId.Terminal) && accessibilityHelpKeybinding) {
                 labelParts.push(( localize(
-                    13434,
+                    13574,
                     "Use {0} for terminal accessibility help",
                     accessibilityHelpKeybinding
                 )));
@@ -1915,7 +1945,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     }
     async setFixedDimensions() {
         const cols = await this._quickInputService.input({
-            title: ( localize(13435, "Set Fixed Dimensions: Column")),
+            title: ( localize(13575, "Set Fixed Dimensions: Column")),
             placeHolder: "Enter a number of columns or leave empty for automatic width",
             validateInput: async text => text.length > 0 && !text.match(/^\d+$/) ? {
                 content: "Enter a number or leave empty size automatically",
@@ -1929,7 +1959,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._labelComputer?.refreshLabel(this);
         this._terminalHasFixedWidth.set(!!this._fixedCols);
         const rows = await this._quickInputService.input({
-            title: ( localize(13436, "Set Fixed Dimensions: Row")),
+            title: ( localize(13576, "Set Fixed Dimensions: Row")),
             placeHolder: "Enter a number of rows or leave empty for automatic height",
             validateInput: async text => text.length > 0 && !text.match(/^\d+$/) ? {
                 content: "Enter a number or leave empty size automatically",
@@ -2039,7 +2069,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     _onEnvironmentVariableInfoChanged(info) {
         if (info.requiresAction) {
             this.xterm?.raw.textarea?.setAttribute("aria-label", ( localize(
-                13437,
+                13577,
                 "Terminal {0} environment is stale, run the 'Show Environment Information' command for more information",
                 this._instanceId
             )));
@@ -2195,7 +2225,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         disposables.push(quickPick);
         quickPick.items = items;
         quickPick.matchOnDescription = true;
-        quickPick.placeholder = ( localize(13438, "Select a color for the terminal"));
+        quickPick.placeholder = ( localize(13578, "Select a color for the terminal"));
         quickPick.show();
         const result = await ( new Promise(r => {
             disposables.push(quickPick.onDidHide(() => r(undefined)));
@@ -2391,12 +2421,23 @@ var TerminalLabelType;
     TerminalLabelType["Description"] = "description";
 })(TerminalLabelType || (TerminalLabelType = {}));
 let TerminalLabelComputer = class TerminalLabelComputer extends Disposable {
+    static {
+        TerminalLabelComputer_1 = this;
+    }
     get title() {
         return this._title;
     }
     get description() {
         return this._description;
     }
+    static {
+        this.agentCliShellTypes = ( new Set([
+            GeneralShellType.Claude,
+            GeneralShellType.Codex,
+            GeneralShellType.Copilot,
+            GeneralShellType.Gemini
+        ]));
+    }
     constructor(_fileService, _terminalConfigurationService, _workspaceContextService) {
         super();
         this._fileService = _fileService;
@@ -2408,13 +2449,11 @@ let TerminalLabelComputer = class TerminalLabelComputer extends Disposable {
         this.onDidChangeLabel = this._onDidChangeLabel.event;
     }
     refreshLabel(instance, reset) {
-        const titleTemplate = instance.shellLaunchConfig.titleTemplate ?? this._terminalConfigurationService.config.tabs.title;
+        const tabs = this._terminalConfigurationService.config.tabs;
+        const useAgentCliTitle = tabs.allowAgentCliTitle && ( TerminalLabelComputer_1.agentCliShellTypes.has(instance.shellType));
+        const titleTemplate = instance.shellLaunchConfig.titleTemplate ?? (useAgentCliTitle ? "${sequence}" : tabs.title);
         this._title = this.computeLabel(instance, titleTemplate, TerminalLabelType.Title, reset);
-        this._description = this.computeLabel(
-            instance,
-            this._terminalConfigurationService.config.tabs.description,
-            TerminalLabelType.Description
-        );
+        this._description = this.computeLabel(instance, tabs.description, TerminalLabelType.Description);
         if (this._title !== instance.title || this._description !== instance.description || reset) {
             this._onDidChangeLabel.fire({
                 title: this._title,
@@ -2498,7 +2537,7 @@ let TerminalLabelComputer = class TerminalLabelComputer extends Disposable {
         }
     }
 };
-TerminalLabelComputer = ( __decorate([( __param(0, IFileService)), ( __param(1, ITerminalConfigurationService)), ( __param(2, IWorkspaceContextService))], TerminalLabelComputer));
+TerminalLabelComputer = TerminalLabelComputer_1 = ( __decorate([( __param(0, IFileService)), ( __param(1, ITerminalConfigurationService)), ( __param(2, IWorkspaceContextService))], TerminalLabelComputer));
 function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initialCwd) {
     if (exitCodeOrError === undefined || exitCodeOrError === 0) {
         return {
@@ -2523,24 +2562,24 @@ function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initi
             if (processState === ProcessState.KilledDuringLaunch) {
                 if (commandLine) {
                     message = ( localize(
-                        13439,
+                        13579,
                         "The terminal process \"{0}\" failed to launch (exit code: {1}).",
                         commandLine,
                         code
                     ));
                 } else {
-                    message = ( localize(13440, "The terminal process failed to launch (exit code: {0}).", code));
+                    message = ( localize(13580, "The terminal process failed to launch (exit code: {0}).", code));
                 }
             } else {
                 if (commandLine) {
                     message = ( localize(
-                        13441,
+                        13581,
                         "The terminal process \"{0}\" terminated with exit code: {1}.",
                         commandLine,
                         code
                     ));
                 } else {
-                    message = ( localize(13442, "The terminal process terminated with exit code: {0}.", code));
+                    message = ( localize(13582, "The terminal process terminated with exit code: {0}.", code));
                 }
             }
             break;
@@ -2566,7 +2605,7 @@ function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initi
                     break;
                 }
             }
-            message = ( localize(13443, "The terminal process failed to launch: {0}.", innerMessage));
+            message = ( localize(13583, "The terminal process failed to launch: {0}.", innerMessage));
             break;
         }
     }

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.js

@@ -25,7 +25,7 @@ import { MergedEnvironmentVariableCollection } from '../../../../platform/termin
 import { serializeEnvironmentVariableCollections } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/environmentVariableShared';
 import { ProcessState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal';
 import { ITerminalProfileResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service';
-import { getWorkspaceForTerminal, mergeEnvironments, createVariableResolver, createTerminalEnvironment, getCwd } from '../common/terminalEnvironment.js';
+import { getWorkspaceForTerminal, mergeEnvironments, createVariableResolver, createTerminalEnvironment, getCwd } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalEnvironment';
 import { IConfigurationResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolver.service';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/history/common/history.service';
@@ -202,7 +202,7 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
         } catch (e) {
             this._notificationService.notify({
                 message: ( localize(
-                    13474,
+                    13614,
                     "Could not kill process listening on port {0}, command exited with error {1}",
                     port,
                     e
@@ -538,13 +538,17 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
                     this._onExit(-1);
                 } else {
                     const message = ( localize(
-                        13475,
+                        13615,
                         "Restarting the terminal because the connection to the shell process was lost..."
                     ));
+                    let postRestartMessage = "";
+                    if (this.os === OperatingSystem.Windows && this._dimensions.rows > 0) {
+                        postRestartMessage = "\r\n".repeat(this._dimensions.rows - 1) + `\x1b[H`;
+                    }
                     this._onProcessData.fire({
                         data: formatMessageForTerminal(message, {
                             loudFormatting: true
-                        }),
+                        }) + postRestartMessage,
                         trackCommit: false
                     });
                     await this.relaunch(

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalTabsList.js

@@ -435,7 +435,7 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
                     };
                 }
             },
-            ariaLabel: ( localize(13502, "Type terminal name. Press Enter to confirm or Escape to cancel.")),
+            ariaLabel: ( localize(13642, "Type terminal name. Press Enter to confirm or Escape to cancel.")),
             inputBoxStyles: defaultInputBoxStyles
         }));
         inputBox.element.style.height = "22px";
@@ -566,7 +566,7 @@ let TerminalTabsAccessibilityProvider = class TerminalTabsAccessibilityProvider
         this._terminalGroupService = _terminalGroupService;
     }
     getWidgetAriaLabel() {
-        return localize(13503, "Terminal tabs");
+        return localize(13643, "Terminal tabs");
     }
     getAriaLabel(instance) {
         let ariaLabel = "";
@@ -574,7 +574,7 @@ let TerminalTabsAccessibilityProvider = class TerminalTabsAccessibilityProvider
         if (tab && tab.terminalInstances?.length > 1) {
             const terminalIndex = tab.terminalInstances.indexOf(instance);
             ariaLabel = ( localize(
-                13504,
+                13644,
                 "Terminal {0} {1}, split {2} of {3}",
                 instance.instanceId,
                 instance.title,
@@ -582,7 +582,7 @@ let TerminalTabsAccessibilityProvider = class TerminalTabsAccessibilityProvider
                 tab.terminalInstances.length
             ));
         } else {
-            ariaLabel = ( localize(13505, "Terminal {0} {1}", instance.instanceId, instance.title));
+            ariaLabel = ( localize(13645, "Terminal {0} {1}", instance.instanceId, instance.title));
         }
         return ariaLabel;
     }
@@ -770,7 +770,7 @@ let TabDecorationsProvider = class TabDecorationsProvider extends Disposable {
     constructor(_terminalService) {
         super();
         this._terminalService = _terminalService;
-        this.label = ( localize(13506, "Terminal"));
+        this.label = ( localize(13646, "Terminal"));
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this._register(

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalTooltip.js

@@ -29,7 +29,7 @@ function getInstanceHoverInfo(instance, storageService) {
     }
     actions.push({
         commandId: "toggleDetailedInfo",
-        label: showDetailed ? ( localize(13507, "Hide Details")) : ( localize(13508, "Show Details")),
+        label: showDetailed ? ( localize(13647, "Hide Details")) : ( localize(13648, "Show Details")),
         run() {
             storageService.store(
                 TerminalStorageKeys.TabsShowDetailed,
@@ -51,7 +51,7 @@ function getInstanceHoverInfo(instance, storageService) {
 function getShellProcessTooltip(instance, showDetailed) {
     const lines = [];
     if (instance.processId && instance.processId > 0) {
-        lines.push(( localize(13509, "Process ID ({0}): {1}", "PID", instance.processId)) + "\n");
+        lines.push(( localize(13649, "Process ID ({0}): {1}", "PID", instance.processId)) + "\n");
     }
     if (instance.shellLaunchConfig.executable) {
         let commandLine = "";
@@ -67,7 +67,7 @@ function getShellProcessTooltip(instance, showDetailed) {
         if (args) {
             commandLine += ` ${args}`;
         }
-        lines.push(( localize(13510, "Command line: {0}", commandLine)));
+        lines.push(( localize(13650, "Command line: {0}", commandLine)));
     }
     return lines.length ? `\n\n---\n\n${lines.join("\n")}` : "";
 }

package/vscode/src/vs/workbench/contrib/terminal/common/basePty.d.ts

@@ -0,0 +1,38 @@
+import { Emitter } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import type { IPtyHostProcessReplayEvent, ISerializedCommandDetectionCapability } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities";
+import { ProcessPropertyType, type IProcessDataEvent, type IProcessProperty, type IProcessPropertyMap, type IProcessReadyEvent, type ITerminalChildProcess } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal";
+/**
+ * Responsible for establishing and maintaining a connection with an existing terminal process
+ * created on the local pty host.
+ */
+export declare abstract class BasePty extends Disposable implements Partial<ITerminalChildProcess> {
+    readonly id: number;
+    readonly shouldPersist: boolean;
+    protected readonly _properties: IProcessPropertyMap;
+    protected readonly _lastDimensions: {
+        cols: number;
+        rows: number;
+    };
+    protected _inReplay: boolean;
+    protected readonly _onProcessData: Emitter<string | IProcessDataEvent>;
+    readonly onProcessData: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<string | IProcessDataEvent>;
+    protected readonly _onProcessReplayComplete: Emitter<void>;
+    readonly onProcessReplayComplete: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
+    protected readonly _onProcessReady: Emitter<IProcessReadyEvent>;
+    readonly onProcessReady: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<IProcessReadyEvent>;
+    protected readonly _onDidChangeProperty: Emitter<IProcessProperty<ProcessPropertyType>>;
+    readonly onDidChangeProperty: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<IProcessProperty<ProcessPropertyType>>;
+    protected readonly _onProcessExit: Emitter<number | undefined>;
+    readonly onProcessExit: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<number | undefined>;
+    protected readonly _onRestoreCommands: Emitter<ISerializedCommandDetectionCapability>;
+    readonly onRestoreCommands: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<ISerializedCommandDetectionCapability>;
+    constructor(id: number, shouldPersist: boolean);
+    getInitialCwd(): Promise<string>;
+    getCwd(): Promise<string>;
+    handleData(e: string | IProcessDataEvent): void;
+    handleExit(e: number | undefined): void;
+    handleReady(e: IProcessReadyEvent): void;
+    handleDidChangeProperty({ type, value }: IProcessProperty): void;
+    handleReplay(e: IPtyHostProcessReplayEvent): Promise<void>;
+}

package/vscode/src/vs/workbench/contrib/terminal/common/basePty.js

@@ -0,0 +1,127 @@
+
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { mark } from '@codingame/monaco-vscode-api/vscode/vs/base/common/performance';
+import { isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { ProcessPropertyType } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal';
+
+class BasePty extends Disposable {
+    constructor(id, shouldPersist) {
+        super();
+        this.id = id;
+        this.shouldPersist = shouldPersist;
+        this._properties = {
+            cwd: "",
+            initialCwd: "",
+            fixedDimensions: {
+                cols: undefined,
+                rows: undefined
+            },
+            title: "",
+            shellType: undefined,
+            hasChildProcesses: true,
+            resolvedShellLaunchConfig: {},
+            overrideDimensions: undefined,
+            failedShellIntegrationActivation: false,
+            usedShellIntegrationInjection: undefined,
+            shellIntegrationInjectionFailureReason: undefined
+        };
+        this._lastDimensions = {
+            cols: -1,
+            rows: -1
+        };
+        this._inReplay = false;
+        this._onProcessData = this._register(( new Emitter()));
+        this.onProcessData = this._onProcessData.event;
+        this._onProcessReplayComplete = this._register(( new Emitter()));
+        this.onProcessReplayComplete = this._onProcessReplayComplete.event;
+        this._onProcessReady = this._register(( new Emitter()));
+        this.onProcessReady = this._onProcessReady.event;
+        this._onDidChangeProperty = this._register(( new Emitter()));
+        this.onDidChangeProperty = this._onDidChangeProperty.event;
+        this._onProcessExit = this._register(( new Emitter()));
+        this.onProcessExit = this._onProcessExit.event;
+        this._onRestoreCommands = this._register(( new Emitter()));
+        this.onRestoreCommands = this._onRestoreCommands.event;
+    }
+    async getInitialCwd() {
+        return this._properties.initialCwd;
+    }
+    async getCwd() {
+        return this._properties.cwd || this._properties.initialCwd;
+    }
+    handleData(e) {
+        this._onProcessData.fire(e);
+    }
+    handleExit(e) {
+        this._onProcessExit.fire(e);
+    }
+    handleReady(e) {
+        this._onProcessReady.fire(e);
+    }
+    handleDidChangeProperty(
+        {
+            type,
+            value
+        }
+    ) {
+        switch (type) {
+        case ProcessPropertyType.Cwd:
+            this._properties.cwd = value;
+            break;
+        case ProcessPropertyType.InitialCwd:
+            this._properties.initialCwd = value;
+            break;
+        case ProcessPropertyType.ResolvedShellLaunchConfig:
+            {
+                const cast = value;
+                if (cast.cwd && !isString(cast.cwd)) {
+                    cast.cwd = URI.revive(cast.cwd);
+                }
+                break;
+            }
+        }
+        this._onDidChangeProperty.fire({
+            type,
+            value
+        });
+    }
+    async handleReplay(e) {
+        mark(`code/terminal/willHandleReplay/${this.id}`);
+        try {
+            this._inReplay = true;
+            for (const innerEvent of e.events) {
+                if (innerEvent.cols !== 0 || innerEvent.rows !== 0) {
+                    this._onDidChangeProperty.fire({
+                        type: ProcessPropertyType.OverrideDimensions,
+                        value: {
+                            cols: innerEvent.cols,
+                            rows: innerEvent.rows,
+                            forceExactSize: true
+                        }
+                    });
+                }
+                const e = {
+                    data: innerEvent.data,
+                    trackCommit: true
+                };
+                this._onProcessData.fire(e);
+                await e.writePromise;
+            }
+        } finally {
+            this._inReplay = false;
+        }
+        if (e.commands) {
+            this._onRestoreCommands.fire(e.commands);
+        }
+        this._onDidChangeProperty.fire({
+            type: ProcessPropertyType.OverrideDimensions,
+            value: undefined
+        });
+        mark(`code/terminal/didHandleReplay/${this.id}`);
+        this._onProcessReplayComplete.fire();
+    }
+}
+
+export { BasePty };

package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollColorRegistry.js

@@ -3,7 +3,7 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerColor } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
 
 const terminalStickyScrollBackground = registerColor("terminalStickyScroll.background", null, ( localize(
-    14196,
+    14349,
     "The background color of the sticky scroll overlay in the terminal."
 )));
 const terminalStickyScrollHoverBackground = registerColor("terminalStickyScrollHover.background", {
@@ -12,7 +12,7 @@ const terminalStickyScrollHoverBackground = registerColor("terminalStickyScrollH
     hcDark: "#E48B39",
     hcLight: "#0f4a85"
 }, ( localize(
-    14197,
+    14350,
     "The background color of the sticky scroll overlay in the terminal when hovered."
 )));
 registerColor("terminalStickyScroll.border", {
@@ -20,6 +20,6 @@ registerColor("terminalStickyScroll.border", {
     light: null,
     hcDark: "#6fc3df",
     hcLight: "#0f4a85"
-}, ( localize(14198, "The border of the sticky scroll overlay in the terminal.")));
+}, ( localize(14351, "The border of the sticky scroll overlay in the terminal.")));
 
 export { terminalStickyScrollBackground, terminalStickyScrollHoverBackground };