@codingame/monaco-vscode-xterm-common 36.2.7 → 37.2.0

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

@@ -13,7 +13,7 @@ import { debounce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/dec
 import { onUnexpectedError, BugIndicatingError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
-import { normalizeDriveLetter, template } from '@codingame/monaco-vscode-api/vscode/vs/base/common/labels';
+import { normalizeDriveLetter, tildify, template } from '@codingame/monaco-vscode-api/vscode/vs/base/common/labels';
 import { Disposable, MutableDisposable, ImmortalReference, DisposableMap, DisposableStore, toDisposable, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { win32, basename, resolve } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
@@ -45,7 +45,7 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
 import { TerminalCapabilityStoreMultiplexer } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/terminalCapabilityStore';
 import { deserializeEnvironmentVariableCollections } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/environmentVariableShared';
-import { PosixShellType, GeneralShellType, TitleEventSource, TerminalSettingId, ShellIntegrationStatus, TerminalExitReason, ProcessPropertyType, TerminalLocation, WindowsShellType } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal';
+import { PosixShellType, GeneralShellType, TitleEventSource, remoteResolverTerminal, TerminalSettingId, ShellIntegrationStatus, TerminalExitReason, ProcessPropertyType, TerminalLocation, WindowsShellType } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal';
 import { ITerminalLogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service';
 import { formatMessageForTerminal } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminalStrings';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
@@ -121,6 +121,7 @@ const shellIntegrationSupportedShellTypes = [
 ];
 const agentCliTitlePatterns = ( new Map([
     [GeneralShellType.Claude, /claude\s*code/i],
+    [GeneralShellType.CommandCode, /command\s*code/i],
     [GeneralShellType.Copilot, /\bcopilot\b/i],
     [GeneralShellType.Gemini, /\bgemini\b/i]
 ]));
@@ -399,6 +400,8 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._targetRef = ( new ImmortalReference(undefined));
         this._onExit = ( new Emitter());
         this.onExit = this._onExit.event;
+        this._onWillDispose = this._register(( new Emitter()));
+        this.onWillDispose = this._onWillDispose.event;
         this._onDisposed = this._register(( new Emitter()));
         this.onDisposed = this._onDisposed.event;
         this._onProcessIdReady = this._register(( new Emitter()));
@@ -450,10 +453,13 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         })));
         this.onLineData = this._onLineData.event;
         this.sessionId = generateUuid();
+        this._isRemoteResolverTerminal = this._shellLaunchConfig[remoteResolverTerminal] === true;
+        delete this._shellLaunchConfig[remoteResolverTerminal];
         this._wrapperElement = createElement("div");
         this._wrapperElement.classList.add("terminal-wrapper");
         this._widgetManager = this._register(instantiationService.createInstance(TerminalWidgetManager));
         this._isExiting = false;
+        this._isDisposing = false;
         this._hadFocusOnExit = false;
         this._isVisible = false;
         this._instanceId = TerminalInstance_1._instanceIdCounter++;
@@ -670,7 +676,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                     contribution.xtermReady?.(xterm);
                 }
             });
-            this._register(this.onDisposed(() => {
+            this._register(this.onWillDispose(() => {
                 contribution.dispose();
                 this._contributions.delete(desc.id);
             }));
@@ -753,7 +759,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             return undefined;
         }
         const computedStyle = getWindow(this.xterm.raw.element).getComputedStyle(this.xterm.raw.element);
-        const horizontalPadding = parseInt(computedStyle.paddingLeft) + parseInt(computedStyle.paddingRight) + 14 ;
+        const horizontalPadding = parseInt(computedStyle.paddingLeft) + parseInt(computedStyle.paddingRight) + this.xterm.scrollbarWidth ;
         const verticalPadding = parseInt(computedStyle.paddingTop) + parseInt(computedStyle.paddingBottom);
         TerminalInstance_1._lastKnownCanvasDimensions = new Dimension(
             Math.min(Constants.MaxCanvasWidth, width - horizontalPadding),
@@ -774,13 +780,13 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         }
         xtermConstructor = Promises.withAsyncBody(async resolve => {
             const Terminal = (await import('@xterm/xterm')).Terminal;
-            Terminal.strings.promptLabel = ( localize(14832, "Terminal input"));
+            Terminal.strings.promptLabel = ( localize(16896, "Terminal input"));
             Terminal.strings.tooMuchOutput = keybinding ? ( localize(
-                14833,
+                16897,
                 "Use the accessible buffer {0} to manually review output",
                 keybinding.getLabel()
             )) : ( localize(
-                14834,
+                16898,
                 "Use the Terminal: Focus Accessible Buffer command to manually review output"
             ));
             resolve(Terminal);
@@ -842,7 +848,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                         id: TerminalStatus.Bell,
                         severity: Severity.Warning,
                         icon: Codicon.bell,
-                        tooltip: ( localize(14835, "Bell"))
+                        tooltip: ( localize(16899, "Bell"))
                     }, this._terminalConfigurationService.config.bellDuration);
                 }
                 this._accessibilitySignalService.playSignal(AccessibilitySignal.terminalBell);
@@ -920,7 +926,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         if (!instance.xterm) {
             return;
         }
-        const cmdDetectionType = (instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection ? ( localize(14836, "Rich")) : ( instance.capabilities.has(TerminalCapability.CommandDetection)) ? ( localize(14837, "Basic")) : instance.usedShellIntegrationInjection ? ( localize(14838, "Injection failed to activate")) : ( localize(14839, "No")));
+        const cmdDetectionType = (instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection ? ( localize(16900, "Rich")) : ( instance.capabilities.has(TerminalCapability.CommandDetection)) ? ( localize(16901, "Basic")) : instance.usedShellIntegrationInjection ? ( localize(16902, "Injection failed to activate")) : ( localize(16903, "No")));
         const detailedAdditions = [];
         if (instance.shellType) {
             detailedAdditions.push(`Shell type: \`${instance.shellType}\``);
@@ -945,8 +951,8 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         instance.statusList.add({
             id: TerminalStatus.ShellIntegrationInfo,
             severity: Severity.Info,
-            tooltip: `${( localize(14840, "Shell integration"))}: ${cmdDetectionType}`,
-            detailedTooltip: `${( localize(14840, "Shell integration"))}: ${cmdDetectionType}${detailedAdditionsString}`
+            tooltip: `${( localize(16904, "Shell integration"))}: ${cmdDetectionType}`,
+            detailedTooltip: `${( localize(16904, "Shell integration"))}: ${cmdDetectionType}${detailedAdditionsString}`
         });
     }
     async runCommand(
@@ -967,16 +973,21 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         if (!commandDetection || commandDetection.promptInputModel.state !== PromptInputState.Input) {
             const store = ( new DisposableStore());
             await Promise.race([( new Promise(r => {
-                store.add(this.capabilities.onDidAddCommandDetectionCapability(e => {
-                    commandDetection = e;
-                    if (commandDetection.promptInputModel.state === PromptInputState.Input) {
+                const waitForPromptInput = capability => {
+                    commandDetection = capability;
+                    if (capability.promptInputModel.state === PromptInputState.Input) {
                         r();
                     } else {
-                        store.add(commandDetection.promptInputModel.onDidStartInput(() => {
+                        store.add(capability.promptInputModel.onDidStartInput(() => {
                             r();
                         }));
                     }
-                }));
+                };
+                if (commandDetection) {
+                    waitForPromptInput(commandDetection);
+                } else {
+                    store.add(this.capabilities.onDidAddCommandDetectionCapability(waitForPromptInput));
+                }
             })), timeout(timeoutMs)]);
             store.dispose();
         }
@@ -1174,6 +1185,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             return;
         }
         this._logService.trace(`terminalInstance#dispose (instanceId: ${this.instanceId})`);
+        this._isDisposing = true;
         dispose(this._widgetManager);
         if (this.xterm?.raw.element) {
             this._hadFocusOnExit = this.hasFocus;
@@ -1185,6 +1197,17 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             this._horizontalScrollbar.dispose();
             this._horizontalScrollbar = undefined;
         }
+        this._onWillDispose.fire(this);
+        try {
+            this.xterm?.dispose();
+        } catch (err) {
+            this._logService.error("Exception occurred during xterm disposal", err);
+        }
+        if (isFirefox) {
+            this.resetFocusContextKey();
+            this._terminalHasTextContextKey.reset();
+            this._onDidBlur.fire(this);
+        }
         if (this._pressAnyKeyToCloseListener) {
             this._pressAnyKeyToCloseListener.dispose();
             this._pressAnyKeyToCloseListener = undefined;
@@ -1197,16 +1220,6 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._processManager.dispose();
         this._onProcessExit(undefined);
         this._onDisposed.fire(this);
-        try {
-            this.xterm?.dispose();
-        } catch (err) {
-            this._logService.error("Exception occurred during xterm disposal", err);
-        }
-        if (isFirefox) {
-            this.resetFocusContextKey();
-            this._terminalHasTextContextKey.reset();
-            this._onDidBlur.fire(this);
-        }
         super.dispose();
     }
     async detachProcessAndDispose(reason) {
@@ -1417,7 +1430,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 id: TerminalStatus.Disconnected,
                 severity: Severity.Error,
                 icon: Codicon.debugDisconnect,
-                tooltip: ( localize(14841, "Lost connection to process"))
+                tooltip: ( localize(16905, "Lost connection to process"))
             });
         }));
         this._register(processManager.onPtyReconnect(() => {
@@ -1432,21 +1445,23 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         if (this.isDisposed) {
             return;
         }
-        const trusted = await this._trust();
+        const trusted = this._isRemoteResolverTerminal || (await this._trust());
         const isRemoteTerminal = !!this.remoteAuthority;
         if (!trusted && !(isRemoteTerminal && this._workbenchEnvironmentService.remoteAuthority)) {
             this._onProcessExit({
-                message: ( localize(14842, "Cannot launch a terminal process in an untrusted workspace"))
+                message: ( localize(16906, "Cannot launch a terminal process in an untrusted workspace"))
             });
+            return;
         } else if (this._workspaceContextService.getWorkspace().folders.length === 0 && this._cwd && this._userHome && normalizeDriveLetter(this._cwd) !== normalizeDriveLetter(this._userHome)) {
             this._onProcessExit({
                 message: ( localize(
-                    14843,
+                    16907,
                     "Cannot launch a terminal process in an empty workspace with cwd {0} different from userHome {1}",
                     this._cwd,
                     this._userHome
                 ))
             });
+            return;
         }
         if (this._container && this._cols === 0 && this._rows === 0) {
             this._initDimensions();
@@ -1614,10 +1629,10 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             id: TerminalStatus.ShellIntegrationAttentionNeeded,
             severity: Severity.Warning,
             icon: Codicon.warning,
-            tooltip: `${exitMessage} ` + ( localize(14844, "Disabling shell integration in user settings might help.")),
+            tooltip: `${exitMessage} ` + ( localize(16908, "Disabling shell integration in user settings might help.")),
             hoverActions: [{
                 commandId: TerminalCommandId.ShellIntegrationLearnMore,
-                label: ( localize(14845, "Learn more about shell integration")),
+                label: ( localize(16909, "Learn more about shell integration")),
                 run: () => {
                     this._openerService.open(
                         "https://code.visualstudio.com/docs/terminal/shell-integration?referrer=in-product"
@@ -1625,7 +1640,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 }
             }, {
                 commandId: "workbench.action.openSettings",
-                label: ( localize(14846, "Open user settings")),
+                label: ( localize(16910, "Open user settings")),
                 run: () => {
                     this._commandService.executeCommand(
                         "workbench.action.openSettings",
@@ -1759,7 +1774,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             return true;
         }
         const trustRequest = await this._workspaceTrustRequestService.requestWorkspaceTrust({
-            message: ( localize(14847, "Creating a terminal process requires executing code"))
+            message: ( localize(16911, "Creating a terminal process requires executing code"))
         });
         return trustRequest === true;
     }
@@ -1817,7 +1832,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         }
     }
     async _resize(immediate) {
-        if (!this.xterm || !this._resizeDebouncer) {
+        if (!this.xterm || !this._resizeDebouncer || this.isDisposed || this._isDisposing) {
             return;
         }
         let cols = this.cols;
@@ -1887,21 +1902,21 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         const labelParts = [];
         if (xterm && xterm.textarea) {
             if (title && title.length > 0) {
-                labelParts.push(( localize(14848, "Terminal {0}, {1}", terminalId, title)));
+                labelParts.push(( localize(16912, "Terminal {0}, {1}", terminalId, title)));
             } else {
-                labelParts.push(( localize(14849, "Terminal {0}", terminalId)));
+                labelParts.push(( localize(16913, "Terminal {0}", terminalId)));
             }
             const screenReaderOptimized = this._accessibilityService.isScreenReaderOptimized();
             if (!screenReaderOptimized) {
                 labelParts.push(( localize(
-                    14850,
+                    16914,
                     "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(
-                    14851,
+                    16915,
                     "Use {0} for terminal accessibility help",
                     accessibilityHelpKeybinding
                 )));
@@ -1955,7 +1970,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     }
     async setFixedDimensions() {
         const cols = await this._quickInputService.input({
-            title: ( localize(14852, "Set Fixed Dimensions: Column")),
+            title: ( localize(16916, "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",
@@ -1969,7 +1984,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._labelComputer?.refreshLabel(this);
         this._terminalHasFixedWidth.set(!!this._fixedCols);
         const rows = await this._quickInputService.input({
-            title: ( localize(14853, "Set Fixed Dimensions: Row")),
+            title: ( localize(16917, "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",
@@ -2079,7 +2094,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     _onEnvironmentVariableInfoChanged(info) {
         if (info.requiresAction) {
             this.xterm?.raw.textarea?.setAttribute("aria-label", ( localize(
-                14854,
+                16918,
                 "Terminal {0} environment is stale, run the 'Show Environment Information' command for more information",
                 this._instanceId
             )));
@@ -2241,7 +2256,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         disposables.push(quickPick);
         quickPick.items = items;
         quickPick.matchOnDescription = true;
-        quickPick.placeholder = ( localize(14855, "Select a color for the terminal"));
+        quickPick.placeholder = ( localize(16919, "Select a color for the terminal"));
         quickPick.show();
         const result = await ( new Promise(r => {
             disposables.push(quickPick.onDidHide(() => r(undefined)));
@@ -2450,6 +2465,7 @@ let TerminalLabelComputer = class TerminalLabelComputer extends Disposable {
         this.agentCliShellTypes = ( new Set([
             GeneralShellType.Claude,
             GeneralShellType.Codex,
+            GeneralShellType.CommandCode,
             GeneralShellType.Copilot,
             GeneralShellType.Gemini
         ]));
@@ -2482,8 +2498,14 @@ let TerminalLabelComputer = class TerminalLabelComputer extends Disposable {
         const commandDetection = instance.capabilities.get(TerminalCapability.CommandDetection);
         const promptInputModel = commandDetection?.promptInputModel;
         const nonTaskSpinner = type === "Task" ? "" : " $(loading~spin)";
+        let cwd = instance.cwd || instance.initialCwd || "";
+        const os = instance.os ?? OS;
+        cwd = tildify(cwd, instance.userHome || "", os);
+        if (os !== OperatingSystem.Windows && cwd && instance.userHome && cwd === instance.userHome) {
+            cwd = "~";
+        }
         const templateProperties = {
-            cwd: instance.cwd || instance.initialCwd || "",
+            cwd,
             cwdFolder: "",
             workspaceFolderName: instance.workspaceFolder?.name,
             workspaceFolder: instance.workspaceFolder ? basename(instance.workspaceFolder.uri.fsPath) : undefined,
@@ -2578,24 +2600,24 @@ function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initi
             if (processState === ProcessState.KilledDuringLaunch) {
                 if (commandLine) {
                     message = ( localize(
-                        14856,
+                        16920,
                         "The terminal process \"{0}\" failed to launch (exit code: {1}).",
                         commandLine,
                         code
                     ));
                 } else {
-                    message = ( localize(14857, "The terminal process failed to launch (exit code: {0}).", code));
+                    message = ( localize(16921, "The terminal process failed to launch (exit code: {0}).", code));
                 }
             } else {
                 if (commandLine) {
                     message = ( localize(
-                        14858,
+                        16922,
                         "The terminal process \"{0}\" terminated with exit code: {1}.",
                         commandLine,
                         code
                     ));
                 } else {
-                    message = ( localize(14859, "The terminal process terminated with exit code: {0}.", code));
+                    message = ( localize(16923, "The terminal process terminated with exit code: {0}.", code));
                 }
             }
             break;
@@ -2621,7 +2643,7 @@ function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initi
                     break;
                 }
             }
-            message = ( localize(14860, "The terminal process failed to launch: {0}.", innerMessage));
+            message = ( localize(16924, "The terminal process failed to launch: {0}.", innerMessage));
             break;
         }
     }

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.d.ts

@@ -71,6 +71,7 @@ export declare class TerminalProcessManager extends Disposable implements ITermi
     private _preLaunchInputQueue;
     private _initialCwd;
     private _extEnvironmentVariableCollection;
+    private readonly _environmentVariableCollectionListener;
     private _ackDataBufferer;
     private _hasWrittenData;
     private _hasChildProcesses;

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Disposable, dispose, toDisposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, MutableDisposable, dispose, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { OS, OperatingSystem, isWindows, isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -126,6 +126,7 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
         this._process = null;
         this._processType = ProcessType.Process;
         this._preLaunchInputQueue = [];
+        this._environmentVariableCollectionListener = this._register(( new MutableDisposable()));
         this._hasWrittenData = false;
         this._hasChildProcesses = false;
         this._ptyListenersAttached = false;
@@ -183,9 +184,9 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
         }
         if (environmentVariableCollections) {
             this._extEnvironmentVariableCollection = ( new MergedEnvironmentVariableCollection(environmentVariableCollections));
-            this._register(this._environmentVariableService.onDidChangeCollections(
+            this._environmentVariableCollectionListener.value = this._environmentVariableService.onDidChangeCollections(
                 newCollection => this._onEnvironmentVariableCollectionChange(newCollection)
-            ));
+            );
             this.environmentVariableInfo = this._instantiationService.createInstance(
                 EnvironmentVariableInfoChangesActive,
                 this._extEnvironmentVariableCollection
@@ -202,7 +203,7 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
         } catch (e) {
             this._notificationService.notify({
                 message: ( localize(
-                    14891,
+                    16956,
                     "Could not kill process listening on port {0}, command exited with error {1}",
                     port,
                     e
@@ -454,11 +455,12 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
             baseEnv
         );
         this._logService.debug(`Terminal environment created with ${( Object.keys(env)).length} variables: ${( Object.keys(env)).sort().join(", ")}`);
+        this._environmentVariableCollectionListener.clear();
         if (!this._isDisposed && shouldUseEnvironmentVariableCollection(shellLaunchConfig)) {
             this._extEnvironmentVariableCollection = this._environmentVariableService.mergedCollection;
-            this._register(this._environmentVariableService.onDidChangeCollections(
+            this._environmentVariableCollectionListener.value = this._environmentVariableService.onDidChangeCollections(
                 newCollection => this._onEnvironmentVariableCollectionChange(newCollection)
-            ));
+            );
             await this._extEnvironmentVariableCollection.applyToProcessEnvironment(env, {
                 workspaceFolder
             }, variableResolver);
@@ -538,7 +540,7 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
                     this._onExit(-1);
                 } else {
                     const message = ( localize(
-                        14892,
+                        16957,
                         "Restarting the terminal because the connection to the shell process was lost..."
                     ));
                     let postRestartMessage = "";

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

@@ -435,7 +435,7 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
                     };
                 }
             },
-            ariaLabel: ( localize(14919, "Type terminal name. Press Enter to confirm or Escape to cancel.")),
+            ariaLabel: ( localize(16984, "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(14920, "Terminal tabs");
+        return localize(16985, "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(
-                14921,
+                16986,
                 "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(14922, "Terminal {0} {1}", instance.instanceId, instance.title));
+            ariaLabel = ( localize(16987, "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(14923, "Terminal"));
+        this.label = ( localize(16988, "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(14924, "Hide Details")) : ( localize(14925, "Show Details")),
+        label: showDetailed ? ( localize(16989, "Hide Details")) : ( localize(16990, "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(14926, "Process ID ({0}): {1}", "PID", instance.processId)) + "\n");
+        lines.push(( localize(16991, "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(14927, "Command line: {0}", commandLine)));
+        lines.push(( localize(16992, "Command line: {0}", commandLine)));
     }
     return lines.length ? `\n\n---\n\n${lines.join("\n")}` : "";
 }

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(
-    15677,
+    17739,
     "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(
-    15678,
+    17740,
     "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(15679, "The border of the sticky scroll overlay in the terminal.")));
+}, ( localize(17741, "The border of the sticky scroll overlay in the terminal.")));
 
 export { terminalStickyScrollBackground, terminalStickyScrollHoverBackground };

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

@@ -305,19 +305,19 @@ let TerminalStickyScrollOverlay = class TerminalStickyScrollOverlay extends Disp
         this._element = $(".terminal-sticky-scroll", undefined, hoverOverlay);
         this._xterm.raw.element.parentElement.append(this._element);
         this._register(toDisposable(() => this._element?.remove()));
-        let hoverTitle = ( localize(15680, "Navigate to Command"));
+        let hoverTitle = ( localize(17742, "Navigate to Command"));
         const scrollToPreviousCommandKeybinding = this._keybindingService.lookupKeybinding(TerminalCommandId.ScrollToPreviousCommand);
         if (scrollToPreviousCommandKeybinding) {
             const label = scrollToPreviousCommandKeybinding.getLabel();
             if (label) {
-                hoverTitle += "\n" + ( localize(15681, "{0} ({1})", terminalStrings.scrollToPreviousCommand.value, label));
+                hoverTitle += "\n" + ( localize(17743, "{0} ({1})", terminalStrings.scrollToPreviousCommand.value, label));
             }
         }
         const scrollToNextCommandKeybinding = this._keybindingService.lookupKeybinding(TerminalCommandId.ScrollToNextCommand);
         if (scrollToNextCommandKeybinding) {
             const label = scrollToNextCommandKeybinding.getLabel();
             if (label) {
-                hoverTitle += "\n" + ( localize(15681, "{0} ({1})", terminalStrings.scrollToNextCommand.value, label));
+                hoverTitle += "\n" + ( localize(17743, "{0} ({1})", terminalStrings.scrollToNextCommand.value, label));
             }
         }
         hoverOverlay.title = hoverTitle;

package/vscode/src/vs/platform/agentHost/common/state/protocol/common/notifications.d.ts

@@ -1,51 +0,0 @@
-import type { URI } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/common/state";
-/**
- * Reason why authentication is required.
- *
- * @category Protocol Notifications
- */
-export declare enum AuthRequiredReason {
-    /** The client has not yet authenticated for the resource */
-    Required = "required",
-    /** A previously valid token has expired or been revoked */
-    Expired = "expired"
-}
-/**
- * Sent by the server when a protected resource requires (re-)authentication.
- *
- * This notification MAY be associated with any channel — for example, an
- * agent advertised on the root channel, or a per-session resource. The
- * `channel` field identifies the subscription the auth requirement belongs
- * to; the `resource` field carries the OAuth-protected resource identifier
- * (per RFC 9728).
- *
- * Clients should obtain a fresh token and push it via the `authenticate`
- * command.
- *
- * @category Protocol Notifications
- * @method auth/required
- * @direction Server → Client
- * @messageType Notification
- * @version 1
- * @see {@link /specification/authentication | Authentication}
- * @example
- * ```json
- * {
- *   "jsonrpc": "2.0",
- *   "method": "auth/required",
- *   "params": {
- *     "channel": "ahp-root://",
- *     "resource": "https://api.github.com",
- *     "reason": "expired"
- *   }
- * }
- * ```
- */
-export interface AuthRequiredParams {
-    /** Channel URI this notification belongs to */
-    channel: URI;
-    /** The protected resource identifier that requires authentication */
-    resource: string;
-    /** Why authentication is required */
-    reason?: AuthRequiredReason;
-}

package/vscode/src/vs/platform/agentHost/common/state/protocol/common/notifications.js

@@ -1,9 +0,0 @@
-
-
-var AuthRequiredReason;
-(function (AuthRequiredReason) {
-    AuthRequiredReason["Required"] = "required";
-    AuthRequiredReason["Expired"] = "expired";
-})(AuthRequiredReason || (AuthRequiredReason = {}));
-
-export { AuthRequiredReason };