@codingame/monaco-vscode-xterm-common 24.3.0 → 25.0.0

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

@@ -100,7 +100,6 @@ import { TerminalResizeDebouncer } from './terminalResizeDebouncer.js';
 import { openContextMenu } from './terminalContextMenu.js';
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { TerminalContribCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/terminalContribExports';
-import { refreshShellIntegrationInfoStatus } from './terminalTooltip.js';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { PromptInputState } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel';
 import { isString, hasKey, isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
@@ -373,7 +372,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             capabilityListeners.get(e.id)?.dispose();
             const refreshInfo = () => {
                 this._labelComputer?.refreshLabel(this);
-                refreshShellIntegrationInfoStatus(this);
+                this._refreshShellIntegrationInfoStatus(this);
             };
             switch (e.id) {
                 case TerminalCapability.CwdDetection: {
@@ -401,7 +400,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 }
             }
         }));
-        this._register(this.onDidChangeShellType(() => refreshShellIntegrationInfoStatus(this)));
+        this._register(this.onDidChangeShellType(() => this._refreshShellIntegrationInfoStatus(this)));
         this._register(this.capabilities.onDidRemoveCapability(e => {
             capabilityListeners.get(e.id)?.dispose();
         }));
@@ -613,13 +612,13 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         }
         xtermConstructor = Promises.withAsyncBody(async (resolve) => {
             const Terminal = (await import('@xterm/xterm').then(module => module.default ?? module)).Terminal;
-            Terminal.strings.promptLabel = ( localize(11547, 'Terminal input'));
+            Terminal.strings.promptLabel = ( localize(11577, 'Terminal input'));
             Terminal.strings.tooMuchOutput = keybinding ? ( localize(
-                11548,
+                11578,
                 'Use the accessible buffer {0} to manually review output',
                 keybinding.getLabel()
             )) : ( localize(
-                11549,
+                11579,
                 'Use the Terminal: Focus Accessible Buffer command to manually review output'
             ));
             resolve(Terminal);
@@ -672,7 +671,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                         id: TerminalStatus.Bell,
                         severity: Severity.Warning,
                         icon: Codicon.bell,
-                        tooltip: ( localize(11550, "Bell"))
+                        tooltip: ( localize(11580, "Bell"))
                     }, this._terminalConfigurationService.config.bellDuration);
                 }
                 this._accessibilitySignalService.playSignal(AccessibilitySignal.terminalBell);
@@ -709,7 +708,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._register(xterm.onDidChangeProgress(() => this._labelComputer?.refreshLabel(this)));
         this._register(Event.runAndSubscribe(xterm.shellIntegration.onDidChangeSeenSequences, () => {
             if (xterm.shellIntegration.seenSequences.size > 0) {
-                refreshShellIntegrationInfoStatus(this);
+                this._refreshShellIntegrationInfoStatus(this);
             }
         }));
         if (!( this.capabilities.has(TerminalCapability.CwdDetection))) {
@@ -735,6 +734,47 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         }
         return xterm;
     }
+    _refreshShellIntegrationInfoStatus(instance) {
+        if (!instance.xterm) {
+            return;
+        }
+        const cmdDetectionType = (instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection
+            ? ( localize(11581, 'Rich'))
+            : ( instance.capabilities.has(TerminalCapability.CommandDetection))
+                ? ( localize(11582, 'Basic'))
+                : instance.usedShellIntegrationInjection
+                    ? ( localize(11583, "Injection failed to activate"))
+                    : ( localize(11584, 'No')));
+        const detailedAdditions = [];
+        if (instance.shellType) {
+            detailedAdditions.push(`Shell type: \`${instance.shellType}\``);
+        }
+        const cwd = instance.cwd;
+        if (cwd) {
+            detailedAdditions.push(`Current working directory: \`${cwd}\``);
+        }
+        const seenSequences = Array.from(instance.xterm.shellIntegration.seenSequences);
+        if (seenSequences.length > 0) {
+            detailedAdditions.push(`Seen sequences: ${( seenSequences.map(e => `\`${e}\``)).join(', ')}`);
+        }
+        const promptType = instance.capabilities.get(TerminalCapability.PromptTypeDetection)?.promptType;
+        if (promptType) {
+            detailedAdditions.push(`Prompt type: \`${promptType}\``);
+        }
+        const combinedString = instance.capabilities.get(TerminalCapability.CommandDetection)?.promptInputModel.getCombinedString();
+        if (combinedString !== undefined) {
+            detailedAdditions.push(`Prompt input: \`\`\`${combinedString}\`\`\``);
+        }
+        const detailedAdditionsString = detailedAdditions.length > 0
+            ? '\n\n' + ( detailedAdditions.map(e => `- ${e}`)).join('\n')
+            : '';
+        instance.statusList.add({
+            id: TerminalStatus.ShellIntegrationInfo,
+            severity: Severity.Info,
+            tooltip: `${( localize(11585, "Shell integration"))}: ${cmdDetectionType}`,
+            detailedTooltip: `${( localize(11585, "Shell integration"))}: ${cmdDetectionType}${detailedAdditionsString}`
+        });
+    }
     async runCommand(commandLine, shouldExecute, commandId) {
         let commandDetection = this.capabilities.get(TerminalCapability.CommandDetection);
         const siInjectionEnabled = this._configurationService.getValue(TerminalSettingId.ShellIntegrationEnabled) === true;
@@ -763,7 +803,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             this.xterm?.shellIntegration.setNextCommandId(commandLine, commandId);
             await this._processManager.setNextCommandId(commandLine, commandId);
         }
-        if (!commandDetection || commandDetection.promptInputModel.value.length > 0) {
+        if (shouldExecute && (!commandDetection || commandDetection.promptInputModel.value.length > 0)) {
             await this.sendText('\x03', false);
             await timeout(100);
         }
@@ -802,12 +842,13 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 'A container element needs to be set with `attachToElement` and be part of the DOM before calling `_open`'
             ));
         }
-        const xtermElement = createElement('div');
-        this._wrapperElement.appendChild(xtermElement);
+        const xtermHost = createElement('div');
+        xtermHost.classList.add('terminal-xterm-host');
+        this._wrapperElement.appendChild(xtermHost);
         this._container.appendChild(this._wrapperElement);
         const xterm = this.xterm;
         this._wrapperElement.xterm = xterm.raw;
-        const screenElement = xterm.attachToElement(xtermElement);
+        const screenElement = xterm.attachToElement(xtermHost);
         for (const contribution of ( this._contributions.values())) {
             if (!this.xterm) {
                 this._xtermReadyPromise.then(xterm => {
@@ -857,12 +898,12 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                     this._hasHadInput &&
                     !TERMINAL_CREATION_COMMANDS.includes(resolveResult.commandId)) {
                     this._notificationService.prompt(Severity.Info, ( localize(
-                        11551,
+                        11586,
                         "Some keybindings don't go to the terminal by default and are handled by {0} instead.",
                         this._productService.nameLong
                     )), [
                         {
-                            label: ( localize(11552, "Configure Terminal Settings")),
+                            label: ( localize(11587, "Configure Terminal Settings")),
                             run: () => {
                                 this._preferencesService.openSettings({ jsonEditor: false, query: `@id:${TerminalSettingId.CommandsToSkipShell},${TerminalSettingId.SendKeybindingsToShell},${TerminalSettingId.AllowChords}` });
                             }
@@ -1180,7 +1221,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 id: TerminalStatus.Disconnected,
                 severity: Severity.Error,
                 icon: Codicon.debugDisconnect,
-                tooltip: ( localize(11553, "Lost connection to process"))
+                tooltip: ( localize(11588, "Lost connection to process"))
             });
         }));
         this._register(processManager.onPtyReconnect(() => {
@@ -1197,12 +1238,12 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         }
         const trusted = await this._trust();
         if (!trusted && !this.remoteAuthority && !this._workbenchEnvironmentService.remoteAuthority) {
-            this._onProcessExit({ message: ( localize(11554, "Cannot launch a terminal process in an untrusted workspace")) });
+            this._onProcessExit({ message: ( localize(11589, "Cannot launch a terminal process in an untrusted workspace")) });
         }
         else if (this._workspaceContextService.getWorkspace().folders.length === 0 && this._cwd && this._userHome && this._cwd !== this._userHome) {
             this._onProcessExit({
                 message: ( localize(
-                    11555,
+                    11590,
                     "Cannot launch a terminal process in an untrusted workspace with cwd {0} and userHome {1}",
                     this._cwd,
                     this._userHome
@@ -1346,16 +1387,16 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             id: TerminalStatus.ShellIntegrationAttentionNeeded,
             severity: Severity.Warning,
             icon: Codicon.warning,
-            tooltip: `${exitMessage} ` + ( localize(11556, 'Disabling shell integration in user settings might help.')),
+            tooltip: `${exitMessage} ` + ( localize(11591, 'Disabling shell integration in user settings might help.')),
             hoverActions: [{
                     commandId: TerminalCommandId.ShellIntegrationLearnMore,
-                    label: ( localize(11557, "Learn more about shell integration")),
+                    label: ( localize(11592, "Learn more about shell integration")),
                     run: () => {
                         this._openerService.open('https://code.visualstudio.com/docs/editor/integrated-terminal#_shell-integration');
                     }
                 }, {
                     commandId: 'workbench.action.openSettings',
-                    label: ( localize(11558, "Open user settings")),
+                    label: ( localize(11593, "Open user settings")),
                     run: () => {
                         this._commandService.executeCommand('workbench.action.openSettings', 'terminal.integrated.shellIntegration.enabled');
                     }
@@ -1457,7 +1498,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     }
     async _trust() {
         return (await this._workspaceTrustRequestService.requestWorkspaceTrust({
-            message: ( localize(11559, "Creating a terminal process requires executing code"))
+            message: ( localize(11594, "Creating a terminal process requires executing code"))
         })) === true;
     }
     async _updateProcessCwd() {
@@ -1574,22 +1615,22 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         const labelParts = [];
         if (xterm && xterm.textarea) {
             if (title && title.length > 0) {
-                labelParts.push(( localize(11560, "Terminal {0}, {1}", terminalId, title)));
+                labelParts.push(( localize(11595, "Terminal {0}, {1}", terminalId, title)));
             }
             else {
-                labelParts.push(( localize(11561, "Terminal {0}", terminalId)));
+                labelParts.push(( localize(11596, "Terminal {0}", terminalId)));
             }
             const screenReaderOptimized = this._accessibilityService.isScreenReaderOptimized();
             if (!screenReaderOptimized) {
                 labelParts.push(( localize(
-                    11562,
+                    11597,
                     "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(
-                    11563,
+                    11598,
                     "Use {0} for terminal accessibility help",
                     accessibilityHelpKeybinding
                 )));
@@ -1647,7 +1688,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     }
     async setFixedDimensions() {
         const cols = await this._quickInputService.input({
-            title: ( localize(11564, "Set Fixed Dimensions: Column")),
+            title: ( localize(11599, "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', severity: Severity.Error } : undefined
         });
@@ -1658,7 +1699,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._labelComputer?.refreshLabel(this);
         this._terminalHasFixedWidth.set(!!this._fixedCols);
         const rows = await this._quickInputService.input({
-            title: ( localize(11565, "Set Fixed Dimensions: Row")),
+            title: ( localize(11600, "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', severity: Severity.Error } : undefined
         });
@@ -1763,7 +1804,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     _onEnvironmentVariableInfoChanged(info) {
         if (info.requiresAction) {
             this.xterm?.raw.textarea?.setAttribute('aria-label', ( localize(
-                11566,
+                11601,
                 "Terminal {0} environment is stale, run the 'Show Environment Information' command for more information",
                 this._instanceId
             )));
@@ -1896,7 +1937,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         disposables.push(quickPick);
         quickPick.items = items;
         quickPick.matchOnDescription = true;
-        quickPick.placeholder = ( localize(11567, 'Select a color for the terminal'));
+        quickPick.placeholder = ( localize(11602, 'Select a color for the terminal'));
         quickPick.show();
         const result = await ( new Promise(r => {
             disposables.push(quickPick.onDidHide(() => r(undefined)));
@@ -1957,6 +1998,9 @@ let TerminalInstance = class TerminalInstance extends Disposable {
 TerminalInstance.__decorator = ( __decorate([
     debounce(50)
 ], TerminalInstance.prototype, "_fireMaximumDimensionsChanged", null));
+TerminalInstance.__decorator = ( __decorate([
+    debounce(500)
+], TerminalInstance.prototype, "_refreshShellIntegrationInfoStatus", null));
 TerminalInstance.__decorator = ( __decorate([
     debounce(1000)
 ], TerminalInstance.prototype, "relaunch", null));
@@ -2217,27 +2261,27 @@ function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initi
             if (processState === ProcessState.KilledDuringLaunch) {
                 if (commandLine) {
                     message = ( localize(
-                        11568,
+                        11603,
                         "The terminal process \"{0}\" failed to launch (exit code: {1}).",
                         commandLine,
                         code
                     ));
                 }
                 else {
-                    message = ( localize(11569, "The terminal process failed to launch (exit code: {0}).", code));
+                    message = ( localize(11604, "The terminal process failed to launch (exit code: {0}).", code));
                 }
             }
             else {
                 if (commandLine) {
                     message = ( localize(
-                        11570,
+                        11605,
                         "The terminal process \"{0}\" terminated with exit code: {1}.",
                         commandLine,
                         code
                     ));
                 }
                 else {
-                    message = ( localize(11571, "The terminal process terminated with exit code: {0}.", code));
+                    message = ( localize(11606, "The terminal process terminated with exit code: {0}.", code));
                 }
             }
             break;
@@ -2262,7 +2306,7 @@ function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initi
                         break;
                 }
             }
-            message = ( localize(11572, "The terminal process failed to launch: {0}.", innerMessage));
+            message = ( localize(11607, "The terminal process failed to launch: {0}.", innerMessage));
             break;
         }
     }
@@ -2298,7 +2342,8 @@ function guessShellTypeFromExecutable(os, executable) {
         [GeneralShellType.Node, /^node$/],
         [GeneralShellType.NuShell, /^nu$/],
         [GeneralShellType.PowerShell, /^pwsh(-preview)?|powershell$/],
-        [GeneralShellType.Python, /^py(?:thon)?$/]
+        [GeneralShellType.Python, /^py(?:thon)?$/],
+        [GeneralShellType.Xonsh, /^xonsh/]
     ]));
     for (const [shellType, pattern] of generalShellTypeMap) {
         if (exeBasename.match(pattern)) {

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

@@ -153,7 +153,7 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
         }
         catch (e) {
             this._notificationService.notify({ message: ( localize(
-                11603,
+                11638,
                 'Could not kill process listening on port {0}, command exited with error {1}',
                 port,
                 e
@@ -431,7 +431,7 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
                 }
                 else {
                     const message = ( localize(
-                        11604,
+                        11639,
                         "Restarting the terminal because the connection to the shell process was lost..."
                     ));
                     this._onProcessData.fire({ data: formatMessageForTerminal(message, { loudFormatting: true }), trackCommit: false });

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

@@ -32,9 +32,14 @@ export declare class TerminalTabList extends WorkbenchList<ITerminalInstance> {
     private _decorationsProvider;
     private _terminalTabsSingleSelectedContextKey;
     private _isSplitContextKey;
+    private _hasText;
+    get hasText(): boolean;
+    private _hasActionBar;
+    get hasActionBar(): boolean;
     constructor(container: HTMLElement, contextKeyService: IContextKeyService, listService: IListService, _configurationService: IConfigurationService, _terminalService: ITerminalService, _terminalGroupService: ITerminalGroupService, _terminalEditingService: ITerminalEditingService, instantiationService: IInstantiationService, decorationsService: IDecorationsService, _themeService: IThemeService, _storageService: IStorageService, lifecycleService: ILifecycleService, _hoverService: IHoverService);
     private _getFocusMode;
     refresh(cancelEditing?: boolean): void;
     focusHover(): void;
     private _updateContextKey;
+    layout(height?: number, width?: number): void;
 }

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

@@ -64,11 +64,13 @@ var TerminalTabsListSizes;
     TerminalTabsListSizes[TerminalTabsListSizes["MaximumWidth"] = 500] = "MaximumWidth";
 })(TerminalTabsListSizes || (TerminalTabsListSizes = {}));
 let TerminalTabList = class TerminalTabList extends WorkbenchList {
+    get hasText() { return this._hasText; }
+    get hasActionBar() { return this._hasActionBar; }
     constructor(container, contextKeyService, listService, _configurationService, _terminalService, _terminalGroupService, _terminalEditingService, instantiationService, decorationsService, _themeService, _storageService, lifecycleService, _hoverService) {
         super('TerminalTabsList', container, {
             getHeight: () => TerminalTabsListSizes.TabHeight,
             getTemplateId: () => 'terminal.tabs'
-        }, [instantiationService.createInstance(TerminalTabsRenderer, container, instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER), () => this.getSelectedElements())], {
+        }, [instantiationService.createInstance(TerminalTabsRenderer, container, instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER), () => this.getSelectedElements(), () => this.hasText, () => this.hasActionBar)], {
             horizontalScrolling: false,
             supportDynamicHeights: false,
             selectionNavigation: true,
@@ -89,6 +91,8 @@ let TerminalTabList = class TerminalTabList extends WorkbenchList {
         this._themeService = _themeService;
         this._storageService = _storageService;
         this._hoverService = _hoverService;
+        this._hasText = true;
+        this._hasActionBar = true;
         const instanceDisposables = [
             this._terminalGroupService.onDidChangeInstances(() => this.refresh()),
             this._terminalGroupService.onDidChangeGroups(() => this.refresh()),
@@ -201,6 +205,17 @@ let TerminalTabList = class TerminalTabList extends WorkbenchList {
         const instance = this.getFocusedElements();
         this._isSplitContextKey.set(instance.length > 0 && this._terminalGroupService.instanceIsSplit(instance[0]));
     }
+    layout(height, width) {
+        super.layout(height, width);
+        const actualWidth = width ?? this.getHTMLElement().clientWidth;
+        const newHasText = actualWidth >= TerminalTabsListSizes.MidpointViewWidth;
+        const newHasActionBar = actualWidth > TerminalTabsListSizes.ActionbarMinimumWidth;
+        if (this._hasText !== newHasText || this._hasActionBar !== newHasActionBar) {
+            this._hasText = newHasText;
+            this._hasActionBar = newHasActionBar;
+            this.refresh();
+        }
+    }
 };
 TerminalTabList = ( __decorate([
     ( __param(1, IContextKeyService)),
@@ -217,10 +232,11 @@ TerminalTabList = ( __decorate([
     ( __param(12, IHoverService))
 ], TerminalTabList));
 let TerminalTabsRenderer = class TerminalTabsRenderer {
-    constructor(_container, _labels, _getSelection, _instantiationService, _terminalConfigurationService, _terminalService, _terminalGroupService, _terminalEditingService, _hoverService, _keybindingService, _listService, _storageService, _themeService, _contextViewService, _commandService) {
-        this._container = _container;
+    constructor(_container, _labels, _getSelection, _getHasText, _getHasActionBar, _instantiationService, _terminalConfigurationService, _terminalService, _terminalGroupService, _terminalEditingService, _hoverService, _keybindingService, _listService, _storageService, _themeService, _contextViewService, _commandService) {
         this._labels = _labels;
         this._getSelection = _getSelection;
+        this._getHasText = _getHasText;
+        this._getHasActionBar = _getHasActionBar;
         this._instantiationService = _instantiationService;
         this._terminalConfigurationService = _terminalConfigurationService;
         this._terminalService = _terminalService;
@@ -234,7 +250,6 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
         this._contextViewService = _contextViewService;
         this._commandService = _commandService;
         this.templateId = 'terminal.tabs';
-        this._cachedContainerWidth = -1;
     }
     renderTemplate(container) {
         const element = append(container, $('.terminal-tabs-entry'));
@@ -277,21 +292,9 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
             templateDisposables
         };
     }
-    shouldHideText() {
-        return this._container ? this.getContainerWidthCachedForTask() < TerminalTabsListSizes.MidpointViewWidth : false;
-    }
-    shouldHideActionBar() {
-        return this._container ? this.getContainerWidthCachedForTask() <= TerminalTabsListSizes.ActionbarMinimumWidth : false;
-    }
-    getContainerWidthCachedForTask() {
-        if (this._cachedContainerWidth === -1) {
-            this._cachedContainerWidth = this._container.clientWidth;
-            queueMicrotask(() => this._cachedContainerWidth = -1);
-        }
-        return this._cachedContainerWidth;
-    }
     renderElement(instance, index, template) {
-        const hasText = !this.shouldHideText();
+        const hasText = this._getHasText();
+        const hasActionBar = this._getHasActionBar();
         const group = this._terminalGroupService.getGroupForInstance(instance);
         if (!group) {
             throw ( new Error(`Could not find group for instance "${instance.instanceId}"`));
@@ -314,7 +317,6 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
         const hoverInfo = getInstanceHoverInfo(instance, this._storageService);
         template.context.hoverActions = hoverInfo.actions;
         const iconId = this._instantiationService.invokeFunction(getIconId, instance);
-        const hasActionbar = !this.shouldHideActionBar();
         let label = '';
         if (!hasText) {
             const primaryStatus = instance.statusList.primary;
@@ -332,7 +334,7 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
                 label += `$(${iconId}) ${instance.title}`;
             }
         }
-        if (!hasActionbar) {
+        if (!hasActionBar) {
             template.actionBar.clear();
         }
         template.elementDisposables.add(addDisposableListener(template.element, EventType.AUXCLICK, e => {
@@ -388,7 +390,7 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
                     };
                 }
             },
-            ariaLabel: ( localize(11629, "Type terminal name. Press Enter to confirm or Escape to cancel.")),
+            ariaLabel: ( localize(11664, "Type terminal name. Press Enter to confirm or Escape to cancel.")),
             inputBoxStyles: defaultInputBoxStyles
         }));
         inputBox.element.style.height = '22px';
@@ -508,25 +510,25 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
     }
 };
 TerminalTabsRenderer = ( __decorate([
-    ( __param(3, IInstantiationService)),
-    ( __param(4, ITerminalConfigurationService)),
-    ( __param(5, ITerminalService)),
-    ( __param(6, ITerminalGroupService)),
-    ( __param(7, ITerminalEditingService)),
-    ( __param(8, IHoverService)),
-    ( __param(9, IKeybindingService)),
-    ( __param(10, IListService)),
-    ( __param(11, IStorageService)),
-    ( __param(12, IThemeService)),
-    ( __param(13, IContextViewService)),
-    ( __param(14, ICommandService))
+    ( __param(5, IInstantiationService)),
+    ( __param(6, ITerminalConfigurationService)),
+    ( __param(7, ITerminalService)),
+    ( __param(8, ITerminalGroupService)),
+    ( __param(9, ITerminalEditingService)),
+    ( __param(10, IHoverService)),
+    ( __param(11, IKeybindingService)),
+    ( __param(12, IListService)),
+    ( __param(13, IStorageService)),
+    ( __param(14, IThemeService)),
+    ( __param(15, IContextViewService)),
+    ( __param(16, ICommandService))
 ], TerminalTabsRenderer));
 let TerminalTabsAccessibilityProvider = class TerminalTabsAccessibilityProvider {
     constructor(_terminalGroupService) {
         this._terminalGroupService = _terminalGroupService;
     }
     getWidgetAriaLabel() {
-        return localize(11630, "Terminal tabs");
+        return localize(11665, "Terminal tabs");
     }
     getAriaLabel(instance) {
         let ariaLabel = '';
@@ -534,7 +536,7 @@ let TerminalTabsAccessibilityProvider = class TerminalTabsAccessibilityProvider
         if (tab && tab.terminalInstances?.length > 1) {
             const terminalIndex = tab.terminalInstances.indexOf(instance);
             ariaLabel = ( localize(
-                11631,
+                11666,
                 "Terminal {0} {1}, split {2} of {3}",
                 instance.instanceId,
                 instance.title,
@@ -543,7 +545,7 @@ let TerminalTabsAccessibilityProvider = class TerminalTabsAccessibilityProvider
             ));
         }
         else {
-            ariaLabel = ( localize(11632, "Terminal {0} {1}", instance.instanceId, instance.title));
+            ariaLabel = ( localize(11667, "Terminal {0} {1}", instance.instanceId, instance.title));
         }
         return ariaLabel;
     }
@@ -720,7 +722,7 @@ let TabDecorationsProvider = class TabDecorationsProvider extends Disposable {
     constructor(_terminalService) {
         super();
         this._terminalService = _terminalService;
-        this.label = ( localize(11633, "Terminal"));
+        this.label = ( localize(11668, "Terminal"));
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this._register(this._terminalService.onAnyInstancePrimaryStatusChange(e => this._onDidChange.fire([e.resource])));

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

@@ -1,10 +1,9 @@
-import { ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
-import { MarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 import type { IHoverAction } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover";
+import { MarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 import { type IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
 export declare function getInstanceHoverInfo(instance: ITerminalInstance, storageService: IStorageService): {
     content: MarkdownString;
     actions: IHoverAction[];
 };
 export declare function getShellProcessTooltip(instance: ITerminalInstance, showDetailed: boolean): string;
-export declare function refreshShellIntegrationInfoStatus(instance: ITerminalInstance): void;

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

@@ -1,13 +1,10 @@
 
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { asArray } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
-import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
-import { TerminalStatus } from './terminalStatusList.js';
-import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
+import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { TerminalStorageKeys } from '../common/terminalStorageKeys.js';
-import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 
 function getInstanceHoverInfo(instance, storageService) {
     const showDetailed = parseInt(storageService.get(TerminalStorageKeys.TabsShowDetailed, StorageScope.APPLICATION) ?? '0');
@@ -31,7 +28,7 @@ function getInstanceHoverInfo(instance, storageService) {
     }
     actions.push({
         commandId: 'toggleDetailedInfo',
-        label: showDetailed ? ( localize(11634, 'Hide Details')) : ( localize(11635, 'Show Details')),
+        label: showDetailed ? ( localize(11669, 'Hide Details')) : ( localize(11670, 'Show Details')),
         run() {
             storageService.store(TerminalStorageKeys.TabsShowDetailed, (showDetailed + 1) % 2, StorageScope.APPLICATION, StorageTarget.USER);
         },
@@ -46,7 +43,7 @@ function getInstanceHoverInfo(instance, storageService) {
 function getShellProcessTooltip(instance, showDetailed) {
     const lines = [];
     if (instance.processId && instance.processId > 0) {
-        lines.push(( localize(11636, "Process ID ({0}): {1}", 'PID', instance.processId)) + '\n');
+        lines.push(( localize(11671, "Process ID ({0}): {1}", 'PID', instance.processId)) + '\n');
     }
     if (instance.shellLaunchConfig.executable) {
         let commandLine = '';
@@ -63,50 +60,9 @@ function getShellProcessTooltip(instance, showDetailed) {
         if (args) {
             commandLine += ` ${args}`;
         }
-        lines.push(( localize(11637, 'Command line: {0}', commandLine)));
+        lines.push(( localize(11672, 'Command line: {0}', commandLine)));
     }
     return lines.length ? `\n\n---\n\n${lines.join('\n')}` : '';
 }
-function refreshShellIntegrationInfoStatus(instance) {
-    if (!instance.xterm) {
-        return;
-    }
-    const cmdDetectionType = (instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection
-        ? ( localize(11638, 'Rich'))
-        : ( instance.capabilities.has(TerminalCapability.CommandDetection))
-            ? ( localize(11639, 'Basic'))
-            : instance.usedShellIntegrationInjection
-                ? ( localize(11640, "Injection failed to activate"))
-                : ( localize(11641, 'No')));
-    const detailedAdditions = [];
-    if (instance.shellType) {
-        detailedAdditions.push(`Shell type: \`${instance.shellType}\``);
-    }
-    const cwd = instance.cwd;
-    if (cwd) {
-        detailedAdditions.push(`Current working directory: \`${cwd}\``);
-    }
-    const seenSequences = Array.from(instance.xterm.shellIntegration.seenSequences);
-    if (seenSequences.length > 0) {
-        detailedAdditions.push(`Seen sequences: ${( seenSequences.map(e => `\`${e}\``)).join(', ')}`);
-    }
-    const promptType = instance.capabilities.get(TerminalCapability.PromptTypeDetection)?.promptType;
-    if (promptType) {
-        detailedAdditions.push(`Prompt type: \`${promptType}\``);
-    }
-    const combinedString = instance.capabilities.get(TerminalCapability.CommandDetection)?.promptInputModel.getCombinedString();
-    if (combinedString !== undefined) {
-        detailedAdditions.push(`Prompt input: \`\`\`${combinedString}\`\`\``);
-    }
-    const detailedAdditionsString = detailedAdditions.length > 0
-        ? '\n\n' + ( detailedAdditions.map(e => `- ${e}`)).join('\n')
-        : '';
-    instance.statusList.add({
-        id: TerminalStatus.ShellIntegrationInfo,
-        severity: Severity.Info,
-        tooltip: `${( localize(11642, "Shell integration"))}: ${cmdDetectionType}`,
-        detailedTooltip: `${( localize(11642, "Shell integration"))}: ${cmdDetectionType}${detailedAdditionsString}`
-    });
-}
 
-export { getInstanceHoverInfo, getShellProcessTooltip, refreshShellIntegrationInfoStatus };
+export { getInstanceHoverInfo, getShellProcessTooltip };