@codingame/monaco-vscode-api 1.81.8-next.2 → 1.82.0-next.0

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

@@ -99,8 +99,8 @@ function setupTerminalMenus() {
             id: MenuId.TerminalInstanceContext,
             item: {
                 command: {
-                    id: "workbench.action.terminal.kill" ,
-                    title: terminalStrings.kill.value
+                    id: "workbench.action.terminal.killViewOrEditor" ,
+                    title: terminalStrings.kill.value,
                 },
                 group: "4_kill"
             }
@@ -148,17 +148,6 @@ function setupTerminalMenus() {
                 group: "3_clear" ,
             }
         },
-        {
-            id: MenuId.TerminalInstanceContext,
-            item: {
-                command: {
-                    id: "workbench.action.terminal.showTabs" ,
-                    title: ( localize('workbench.action.terminal.showsTabs', "Show Tabs"))
-                },
-                when: ContextKeyExpr.not(`config.${"terminal.integrated.tabs.enabled" }`),
-                group: "5_config"
-            }
-        },
         {
             id: MenuId.TerminalInstanceContext,
             item: {
@@ -524,89 +513,12 @@ function setupTerminalMenus() {
             }
         },
     ]);
-    MenuRegistry.appendMenuItems([
-        {
-            id: MenuId.TerminalInlineTabContext,
-            item: {
-                command: {
-                    id: "workbench.action.terminal.split" ,
-                    title: terminalStrings.split.value
-                },
-                group: "1_create" ,
-                order: 1
-            }
-        },
-        {
-            id: MenuId.TerminalInlineTabContext,
-            item: {
-                command: {
-                    id: "workbench.action.terminal.moveToEditor" ,
-                    title: terminalStrings.moveToEditor.value
-                },
-                group: "1_create" ,
-                order: 2
-            }
-        },
-        {
-            id: MenuId.TerminalInlineTabContext,
-            item: {
-                command: {
-                    id: "workbench.action.terminal.changeIconPanel" ,
-                    title: terminalStrings.changeIcon.value
-                },
-                group: "2_edit"
-            }
-        },
-        {
-            id: MenuId.TerminalInlineTabContext,
-            item: {
-                command: {
-                    id: "workbench.action.terminal.changeColorPanel" ,
-                    title: terminalStrings.changeColor.value
-                },
-                group: "2_edit"
-            }
-        },
-        {
-            id: MenuId.TerminalInlineTabContext,
-            item: {
-                command: {
-                    id: "workbench.action.terminal.renamePanel" ,
-                    title: terminalStrings.rename.value
-                },
-                group: "2_edit"
-            }
-        },
-        {
-            id: MenuId.TerminalInlineTabContext,
-            item: {
-                command: {
-                    id: "workbench.action.terminal.sizeToContentWidthInstance" ,
-                    title: ( localize(
-                        'workbench.action.terminal.sizeToContentWidthInstance',
-                        "Toggle Size to Content Width"
-                    ))
-                },
-                group: "2_edit"
-            }
-        },
-        {
-            id: MenuId.TerminalInlineTabContext,
-            item: {
-                command: {
-                    id: "workbench.action.terminal.kill" ,
-                    title: terminalStrings.kill.value
-                },
-                group: "4_kill"
-            }
-        }
-    ]);
     MenuRegistry.appendMenuItems([
         {
             id: MenuId.TerminalTabContext,
             item: {
                 command: {
-                    id: "workbench.action.terminal.splitInstance" ,
+                    id: "workbench.action.terminal.splitActiveTab" ,
                     title: terminalStrings.split.value,
                 },
                 group: "1_create" ,
@@ -617,7 +529,7 @@ function setupTerminalMenus() {
             id: MenuId.TerminalTabContext,
             item: {
                 command: {
-                    id: "workbench.action.terminal.moveToEditorInstance" ,
+                    id: "workbench.action.terminal.moveToEditorActiveTab" ,
                     title: terminalStrings.moveToEditor.value
                 },
                 group: "1_create" ,
@@ -628,7 +540,7 @@ function setupTerminalMenus() {
             id: MenuId.TerminalTabContext,
             item: {
                 command: {
-                    id: "workbench.action.terminal.renameInstance" ,
+                    id: "workbench.action.terminal.renameActiveTab" ,
                     title: ( localize('workbench.action.terminal.renameInstance', "Rename..."))
                 },
                 group: "2_edit"
@@ -638,7 +550,7 @@ function setupTerminalMenus() {
             id: MenuId.TerminalTabContext,
             item: {
                 command: {
-                    id: "workbench.action.terminal.changeIconInstance" ,
+                    id: "workbench.action.terminal.changeIconActiveTab" ,
                     title: ( localize('workbench.action.terminal.changeIcon', "Change Icon..."))
                 },
                 group: "2_edit"
@@ -648,7 +560,7 @@ function setupTerminalMenus() {
             id: MenuId.TerminalTabContext,
             item: {
                 command: {
-                    id: "workbench.action.terminal.changeColorInstance" ,
+                    id: "workbench.action.terminal.changeColorActiveTab" ,
                     title: ( localize('workbench.action.terminal.changeColor', "Change Color..."))
                 },
                 group: "2_edit"
@@ -658,7 +570,7 @@ function setupTerminalMenus() {
             id: MenuId.TerminalTabContext,
             item: {
                 command: {
-                    id: "workbench.action.terminal.sizeToContentWidthInstance" ,
+                    id: "workbench.action.terminal.sizeToContentWidthActiveTab" ,
                     title: ( localize(
                         'workbench.action.terminal.sizeToContentWidthInstance',
                         "Toggle Size to Content Width"
@@ -670,33 +582,33 @@ function setupTerminalMenus() {
         {
             id: MenuId.TerminalTabContext,
             item: {
-                group: "5_config" ,
                 command: {
-                    id: "workbench.action.terminal.joinInstance" ,
+                    id: "workbench.action.terminal.joinActiveTab" ,
                     title: ( localize('workbench.action.terminal.joinInstance', "Join Terminals"))
                 },
-                when: ( TerminalContextKeys.tabsSingularSelection.toNegated())
+                when: ( TerminalContextKeys.tabsSingularSelection.toNegated()),
+                group: "5_config"
             }
         },
         {
             id: MenuId.TerminalTabContext,
             item: {
-                group: "5_config" ,
                 command: {
-                    id: "workbench.action.terminal.unsplitInstance" ,
+                    id: "workbench.action.terminal.unsplitActiveTab" ,
                     title: terminalStrings.unsplit.value
                 },
                 when: ( ContextKeyExpr.and(
                     TerminalContextKeys.tabsSingularSelection,
                     TerminalContextKeys.splitTerminal
-                ))
+                )),
+                group: "5_config"
             }
         },
         {
             id: MenuId.TerminalTabContext,
             item: {
                 command: {
-                    id: "workbench.action.terminal.killInstance" ,
+                    id: "workbench.action.terminal.killActiveTab" ,
                     title: terminalStrings.kill.value
                 },
                 group: "4_kill" ,

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

@@ -1,6 +1,5 @@
 import { __decorate } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { OS } from 'monaco-editor/esm/vs/base/common/platform.js';
 import * as path from 'monaco-editor/esm/vs/base/common/path.js';
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
@@ -217,7 +216,7 @@ class BaseTerminalProfileResolverService {
             }
         }
         const activeWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot(options.remoteAuthority ? Schemas.vscodeRemote : Schemas.file);
-        const lastActiveWorkspace = activeWorkspaceRootUri ? withNullAsUndefined(this._workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri)) : undefined;
+        const lastActiveWorkspace = activeWorkspaceRootUri ? this._workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri) ?? undefined : undefined;
         profile.path = await this._resolveVariables(profile.path, env, lastActiveWorkspace);
         if (profile.args) {
             if (typeof profile.args === 'string') {

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

@@ -3,8 +3,8 @@ import { equals } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { AutoOpenBarrier } from 'monaco-editor/esm/vs/base/common/async.js';
 import { throttle } from 'monaco-editor/esm/vs/base/common/decorators.js';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { isWeb, OS, isWindows, isMacintosh } from 'monaco-editor/esm/vs/base/common/platform.js';
+import { Disposable, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { isWeb, isWindows, isMacintosh, OS } from 'monaco-editor/esm/vs/base/common/platform.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { registerTerminalDefaultProfileConfiguration } from '../../../../platform/terminal/common/terminalPlatformConfiguration.js';
@@ -16,9 +16,9 @@ import { ITerminalContributionService } from '../common/terminalExtensionPoints.
 import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
-let TerminalProfileService = class TerminalProfileService {
+let TerminalProfileService = class TerminalProfileService extends Disposable {
     get onDidChangeAvailableProfiles() { return this._onDidChangeAvailableProfiles.event; }
-    get profilesReady() { return this._profilesReadyBarrier.wait().then(() => { }); }
+    get profilesReady() { return this._profilesReadyPromise; }
     get availableProfiles() {
         if (!this._platformConfigJustRefreshed) {
             this.refreshAvailableProfiles();
@@ -29,6 +29,7 @@ let TerminalProfileService = class TerminalProfileService {
         return this._contributedProfiles || [];
     }
     constructor(_contextKeyService, _configurationService, _terminalContributionService, _extensionService, _remoteAgentService, _environmentService, _terminalInstanceService) {
+        super();
         this._contextKeyService = _contextKeyService;
         this._configurationService = _configurationService;
         this._terminalContributionService = _terminalContributionService;
@@ -39,11 +40,15 @@ let TerminalProfileService = class TerminalProfileService {
         this._contributedProfiles = [];
         this._platformConfigJustRefreshed = false;
         this._profileProviders = ( new Map());
-        this._onDidChangeAvailableProfiles = ( new Emitter());
+        this._onDidChangeAvailableProfiles = this._register(( new Emitter()));
         this._extensionService.onDidChangeExtensions(() => this.refreshAvailableProfiles());
         this._webExtensionContributedProfileContextKey = TerminalContextKeys.webExtensionContributedProfile.bindTo(this._contextKeyService);
         this._updateWebContextKey();
-        this._profilesReadyBarrier = ( new AutoOpenBarrier(20000));
+        this._profilesReadyPromise = this._remoteAgentService.getEnvironment()
+            .then(() => {
+            this._profilesReadyBarrier = ( new AutoOpenBarrier(20000));
+            return this._profilesReadyBarrier.wait().then(() => { });
+        });
         this.refreshAvailableProfiles();
         this._setupConfigListener();
     }

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

@@ -12,11 +12,13 @@ import { terminalStrings } from '../common/terminalStrings.js';
 import { TerminalLocation } from '../../../../platform/terminal/common/terminal.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+var TerminalQuickAccessProvider_1;
 let terminalPicks = [];
 let TerminalQuickAccessProvider = class TerminalQuickAccessProvider extends PickerQuickAccessProvider {
+    static { TerminalQuickAccessProvider_1 = this; }
     static { this.PREFIX = 'term '; }
     constructor(_editorService, _terminalService, _terminalEditorService, _terminalGroupService, _commandService, _themeService, _instantiationService) {
-        super(TerminalQuickAccessProvider.PREFIX, { canAcceptInBackground: true });
+        super(TerminalQuickAccessProvider_1.PREFIX, { canAcceptInBackground: true });
         this._editorService = _editorService;
         this._terminalService = _terminalService;
         this._terminalEditorService = _terminalEditorService;
@@ -132,7 +134,7 @@ let TerminalQuickAccessProvider = class TerminalQuickAccessProvider extends Pick
         return undefined;
     }
 };
-TerminalQuickAccessProvider = ( __decorate([
+TerminalQuickAccessProvider = TerminalQuickAccessProvider_1 = ( __decorate([
     ( __param(0, IEditorService)),
     ( __param(1, ITerminalEditorService)),
     ( __param(2, ITerminalEditorService)),

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

@@ -17,6 +17,7 @@ import { fromNow } from '../../../../base/common/date.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { showWithPinnedItems } from '../../../../platform/quickinput/browser/quickPickPin.js';
 import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
+var TerminalOutputProvider_1;
 async function showRunRecentQuickPick(accessor, instance, terminalInRunCommandPicker, type, filterMode, value) {
     if (!instance.xterm) {
         return;
@@ -247,10 +248,11 @@ async function showRunRecentQuickPick(accessor, instance, terminalInRunCommandPi
     }));
 }
 let TerminalOutputProvider = class TerminalOutputProvider {
+    static { TerminalOutputProvider_1 = this; }
     static { this.scheme = 'TERMINAL_OUTPUT'; }
     constructor(textModelResolverService, _modelService) {
         this._modelService = _modelService;
-        textModelResolverService.registerTextModelContentProvider(TerminalOutputProvider.scheme, this);
+        textModelResolverService.registerTextModelContentProvider(TerminalOutputProvider_1.scheme, this);
     }
     async provideTextContent(resource) {
         const existing = this._modelService.getModel(resource);
@@ -260,7 +262,7 @@ let TerminalOutputProvider = class TerminalOutputProvider {
         return this._modelService.createModel(resource.fragment, null, resource, false);
     }
 };
-TerminalOutputProvider = ( __decorate([
+TerminalOutputProvider = TerminalOutputProvider_1 = ( __decorate([
     ( __param(0, ITextModelService)),
     ( __param(1, IModelService))
 ], TerminalOutputProvider));

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

@@ -2,8 +2,8 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { DeferredPromise, timeout } from 'monaco-editor/esm/vs/base/common/async.js';
 import { debounce } from 'monaco-editor/esm/vs/base/common/decorators.js';
-import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { dispose, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Emitter, Event, DynamicListEventMultiplexer } from 'monaco-editor/esm/vs/base/common/event.js';
+import { Disposable, dispose, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import { isWeb, isMacintosh } from 'monaco-editor/esm/vs/base/common/platform.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
@@ -35,7 +35,7 @@ import { TERMINAL_VIEW_ID, ITerminalProfileService } from '../common/terminal.js
 import { TerminalContextKeys } from '../common/terminalContextKey.js';
 import { columnToEditorGroup } from '../../../services/editor/common/editorGroupColumn.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
-import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { SIDE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
 import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
@@ -47,8 +47,10 @@ import { TerminalCapabilityStore } from '../../../../platform/terminal/common/ca
 import { ITimerService } from '../../../services/timer/browser/timerService.js';
 import { mark } from 'monaco-editor/esm/vs/base/common/performance.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { DeatachedTerminal } from './detachedTerminal.js';
+import { createInstanceCapabilityEventMultiplexer } from './terminalEvents.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
-let TerminalService = class TerminalService {
+let TerminalService = class TerminalService extends Disposable {
     get isProcessSupportRegistered() { return !!this._processSupportContextKey.get(); }
     get connectionState() { return this._connectionState; }
     get whenConnected() { return this._whenConnected.p; }
@@ -94,6 +96,7 @@ let TerminalService = class TerminalService {
     get onDidRegisterProcessSupport() { return this._onDidRegisterProcessSupport.event; }
     get onDidChangeConnectionState() { return this._onDidChangeConnectionState.event; }
     constructor(_contextKeyService, _lifecycleService, _logService, _dialogService, _instantiationService, _remoteAgentService, _viewsService, _configurationService, _environmentService, _terminalEditorService, _terminalGroupService, _terminalInstanceService, _editorGroupsService, _terminalProfileService, _extensionService, _notificationService, _workspaceContextService, _commandService, _keybindingService, _timerService) {
+        super();
         this._contextKeyService = _contextKeyService;
         this._lifecycleService = _lifecycleService;
         this._logService = _logService;
@@ -123,28 +126,28 @@ let TerminalService = class TerminalService {
         this._whenConnected = ( new DeferredPromise());
         this._restoredGroupCount = 0;
         this._reconnectedTerminals = ( new Map());
-        this._onDidChangeActiveGroup = ( new Emitter());
-        this._onDidCreateInstance = ( new Emitter());
-        this._onDidDisposeInstance = ( new Emitter());
-        this._onDidFocusInstance = ( new Emitter());
-        this._onDidReceiveProcessId = ( new Emitter());
-        this._onDidRequestStartExtensionTerminal = ( new Emitter());
-        this._onDidChangeInstanceDimensions = ( new Emitter());
-        this._onDidMaxiumumDimensionsChange = ( new Emitter());
-        this._onDidChangeInstanceCapability = ( new Emitter());
-        this._onDidChangeInstances = ( new Emitter());
-        this._onDidChangeInstanceTitle = ( new Emitter());
-        this._onDidChangeInstanceIcon = ( new Emitter());
-        this._onDidChangeInstanceColor = ( new Emitter());
-        this._onDidChangeActiveInstance = ( new Emitter());
-        this._onDidChangeInstancePrimaryStatus = ( new Emitter());
-        this._onDidInputInstanceData = ( new Emitter());
-        this._onDidChangeSelection = ( new Emitter());
-        this._onDidDisposeGroup = ( new Emitter());
-        this._onDidChangeGroups = ( new Emitter());
-        this._onDidRegisterProcessSupport = ( new Emitter());
-        this._onDidChangeConnectionState = ( new Emitter());
-        this._configHelper = this._instantiationService.createInstance(TerminalConfigHelper);
+        this._onDidChangeActiveGroup = this._register(( new Emitter()));
+        this._onDidCreateInstance = this._register(( new Emitter()));
+        this._onDidDisposeInstance = this._register(( new Emitter()));
+        this._onDidFocusInstance = this._register(( new Emitter()));
+        this._onDidReceiveProcessId = this._register(( new Emitter()));
+        this._onDidRequestStartExtensionTerminal = this._register(( new Emitter()));
+        this._onDidChangeInstanceDimensions = this._register(( new Emitter()));
+        this._onDidMaxiumumDimensionsChange = this._register(( new Emitter()));
+        this._onDidChangeInstanceCapability = this._register(( new Emitter()));
+        this._onDidChangeInstances = this._register(( new Emitter()));
+        this._onDidChangeInstanceTitle = this._register(( new Emitter()));
+        this._onDidChangeInstanceIcon = this._register(( new Emitter()));
+        this._onDidChangeInstanceColor = this._register(( new Emitter()));
+        this._onDidChangeActiveInstance = this._register(( new Emitter()));
+        this._onDidChangeInstancePrimaryStatus = this._register(( new Emitter()));
+        this._onDidInputInstanceData = this._register(( new Emitter()));
+        this._onDidChangeSelection = this._register(( new Emitter()));
+        this._onDidDisposeGroup = this._register(( new Emitter()));
+        this._onDidChangeGroups = this._register(( new Emitter()));
+        this._onDidRegisterProcessSupport = this._register(( new Emitter()));
+        this._onDidChangeConnectionState = this._register(( new Emitter()));
+        this._configHelper = this._register(this._instantiationService.createInstance(TerminalConfigHelper));
         this.onDidCreateInstance(() => this._terminalProfileService.refreshAvailableProfiles());
         this._forwardInstanceHostEvents(this._terminalGroupService);
         this._forwardInstanceHostEvents(this._terminalEditorService);
@@ -850,15 +853,18 @@ let TerminalService = class TerminalService {
         }
         return this._createTerminal(shellLaunchConfig, location, options);
     }
-    async createDetachedXterm(options) {
+    async createDetachedTerminal(options) {
         const ctor = await TerminalInstance.getXtermConstructor(this._keybindingService, this._contextKeyService);
-        const instance = this._instantiationService.createInstance(XtermTerminal, ctor, this._configHelper, options.cols, options.rows, options.colorProvider, options.capabilities || ( new TerminalCapabilityStore()), '', undefined, false);
+        const xterm = this._instantiationService.createInstance(XtermTerminal, ctor, this._configHelper, options.cols, options.rows, options.colorProvider, options.capabilities || ( new TerminalCapabilityStore()), '', undefined, false);
         if (options.readonly) {
-            instance.raw.attachCustomKeyEventHandler(() => false);
+            xterm.raw.attachCustomKeyEventHandler(() => false);
         }
-        this._detachedXterms.add(instance);
-        instance.onDidDispose(() => this._detachedXterms.delete(instance));
-        return instance;
+        this._detachedXterms.add(xterm);
+        const l = xterm.onDidDispose(() => {
+            this._detachedXterms.delete(xterm);
+            l.dispose();
+        });
+        return ( new DeatachedTerminal(xterm, options, this._instantiationService));
     }
     async _resolveCwd(shellLaunchConfig, splitActiveTerminal, options) {
         const cwd = shellLaunchConfig.cwd;
@@ -1005,6 +1011,17 @@ let TerminalService = class TerminalService {
     setEditingTerminal(instance) {
         this._editingTerminal = instance;
     }
+    onInstanceEvent(getEvent) {
+        return ( new DynamicListEventMultiplexer(
+            this.instances,
+            this.onDidCreateInstance,
+            this.onDidDisposeInstance,
+            getEvent
+        ));
+    }
+    onInstanceCapabilityEvent(capabilityId, getEvent) {
+        return createInstanceCapabilityEventMultiplexer(this.instances, this.onDidCreateInstance, this.onDidDisposeInstance, capabilityId, getEvent);
+    }
 };
 TerminalService.__decorator = ( __decorate([
     debounce(500)

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

@@ -22,4 +22,4 @@ interface ITerminalStatusList {
     toggle(status: ITerminalStatus, value: boolean): void;
 }
 
-export { ITerminalStatusList };
+export type { ITerminalStatusList };

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

@@ -315,6 +315,9 @@ let TerminalTabbedView = class TerminalTabbedView extends Disposable {
             }
             if (!this._cancelContextMenu) {
                 const emptyList = this._tabList.getFocus().length === 0;
+                if (!emptyList) {
+                    this._terminalGroupService.lastAccessedMenu = 'tab-list';
+                }
                 openContextMenu(event, this._parentElement, emptyList ? this._tabsListEmptyMenu : this._tabsListMenu, this._contextMenuService, emptyList ? this._getTabActions() : undefined);
             }
             event.preventDefault();

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

@@ -137,8 +137,8 @@ let TerminalTabList = class TerminalTabList extends WorkbenchList {
             }
         });
         if (!this._decorationsProvider) {
-            this._decorationsProvider = instantiationService.createInstance(TabDecorationsProvider);
-            decorationsService.registerDecorationsProvider(this._decorationsProvider);
+            this._decorationsProvider = this.disposables.add(instantiationService.createInstance(TabDecorationsProvider));
+            this.disposables.add(decorationsService.registerDecorationsProvider(this._decorationsProvider));
         }
         this.refresh();
     }
@@ -402,7 +402,7 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
     fillActionBar(instance, template) {
         const actions = [
             ( new Action(
-                "workbench.action.terminal.splitInstance" ,
+                "workbench.action.terminal.splitActiveTab" ,
                 terminalStrings.split.short,
                 ThemeIcon.asClassName(Codicon.splitHorizontal),
                 true,
@@ -413,7 +413,7 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
                 }
             )),
             ( new Action(
-                "workbench.action.terminal.killInstance" ,
+                "workbench.action.terminal.killActiveTab" ,
                 terminalStrings.kill.short,
                 ThemeIcon.asClassName(Codicon.trashcan),
                 true,
@@ -642,15 +642,14 @@ TerminalTabsDragAndDrop = ( __decorate([
     ( __param(0, ITerminalService)),
     ( __param(1, ITerminalGroupService))
 ], TerminalTabsDragAndDrop));
-let TabDecorationsProvider = class TabDecorationsProvider {
+let TabDecorationsProvider = class TabDecorationsProvider extends Disposable {
     constructor(_terminalService) {
+        super();
         this._terminalService = _terminalService;
         this.label = ( localize('label', "Terminal"));
-        this._onDidChange = ( new Emitter());
-        this._terminalService.onDidChangeInstancePrimaryStatus(e => this._onDidChange.fire([e.resource]));
-    }
-    get onDidChange() {
-        return this._onDidChange.event;
+        this._onDidChange = this._register(( new Emitter()));
+        this.onDidChange = this._onDidChange.event;
+        this._register(this._terminalService.onDidChangeInstancePrimaryStatus(e => this._onDidChange.fire([e.resource])));
     }
     provideDecorations(resource) {
         if (resource.scheme !== Schemas.vscodeTerminal) {
@@ -670,9 +669,6 @@ let TabDecorationsProvider = class TabDecorationsProvider {
             tooltip: primaryStatus.tooltip
         };
     }
-    dispose() {
-        this.dispose();
-    }
 };
 TabDecorationsProvider = ( __decorate([
     ( __param(0, ITerminalService))

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

@@ -31,7 +31,6 @@ import { toDisposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycl
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { ColorScheme } from 'monaco-editor/esm/vs/platform/theme/common/theme.js';
 import { getColorClass, getUriClasses } from './terminalIcon.js';
-import { withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { getTerminalActionBarArgs } from './terminalMenus.js';
 import { TerminalContextKeys } from '../common/terminalContextKey.js';
 import { getInstanceHoverInfo } from './terminalTooltip.js';
@@ -57,6 +56,7 @@ let TerminalViewPane = class TerminalViewPane extends ViewPane {
         this._themeService = _themeService;
         this._accessibilityService = _accessibilityService;
         this._isWelcomeShowing = false;
+        this._isInitialized = false;
         this._register(this._terminalService.onDidRegisterProcessSupport(() => {
             this._onDidChangeViewWelcomeState.fire();
         }));
@@ -72,7 +72,7 @@ let TerminalViewPane = class TerminalViewPane extends ViewPane {
             }
         }));
         this._dropdownMenu = this._register(this._menuService.createMenu(MenuId.TerminalNewDropdownContext, this._contextKeyService));
-        this._singleTabMenu = this._register(this._menuService.createMenu(MenuId.TerminalInlineTabContext, this._contextKeyService));
+        this._singleTabMenu = this._register(this._menuService.createMenu(MenuId.TerminalTabContext, this._contextKeyService));
         this._register(this._terminalProfileService.onDidChangeAvailableProfiles(profiles => this._updateTabActionBar(profiles)));
         this._viewShowing = TerminalContextKeys.viewShowing.bindTo(this._contextKeyService);
         this._register(this.onDidChangeBodyVisibility(e => {
@@ -86,7 +86,7 @@ let TerminalViewPane = class TerminalViewPane extends ViewPane {
             }
         }));
         this._register(this._terminalService.onDidCreateInstance((i) => {
-            i.capabilities.onDidAddCapability(c => {
+            i.capabilities.onDidAddCapabilityType(c => {
                 if (c === 2  && this._gutterDecorationsEnabled()) {
                     this._parentDomElement?.classList.add('shell-integration');
                 }
@@ -102,13 +102,36 @@ let TerminalViewPane = class TerminalViewPane extends ViewPane {
     }
     _initializeTerminal(checkRestoredTerminals) {
         if (this.isBodyVisible() && this._terminalService.isProcessSupportRegistered && this._terminalService.connectionState === 1 ) {
+            const wasInitialized = this._isInitialized;
+            this._isInitialized = true;
+            let hideOnStartup = 'never';
+            if (!wasInitialized) {
+                hideOnStartup = this._configurationService.getValue("terminal.integrated.hideOnStartup" );
+                if (hideOnStartup === 'always') {
+                    this._terminalGroupService.hidePanel();
+                }
+            }
             let shouldCreate = this._terminalGroupService.groups.length === 0;
             if (checkRestoredTerminals) {
                 shouldCreate &&= this._terminalService.restoredGroupCount === 0;
             }
-            if (shouldCreate) {
-                this._terminalService.createTerminal({ location: TerminalLocation.Panel });
+            if (!shouldCreate) {
+                return;
+            }
+            if (!wasInitialized) {
+                switch (hideOnStartup) {
+                    case 'never':
+                        this._terminalService.createTerminal({ location: TerminalLocation.Panel });
+                        break;
+                    case 'whenEmpty':
+                        if (this._terminalService.restoredGroupCount === 0) {
+                            this._terminalGroupService.hidePanel();
+                        }
+                        break;
+                }
+                return;
             }
+            this._terminalService.createTerminal({ location: TerminalLocation.Panel });
         }
     }
     renderBody(container) {
@@ -241,7 +264,7 @@ let TerminalViewPane = class TerminalViewPane extends ViewPane {
         return defaultProfileName;
     }
     _getKeybindingLabel(action) {
-        return withNullAsUndefined(this._keybindingService.lookupKeybinding(action.id)?.getLabel());
+        return this._keybindingService.lookupKeybinding(action.id)?.getLabel() ?? undefined;
     }
     _updateTabActionBar(profiles) {
         const actions = getTerminalActionBarArgs(TerminalLocation.Panel, profiles, this._getDefaultProfileName(), this._terminalProfileService.contributedProfiles, this._terminalService, this._dropdownMenu);
@@ -356,6 +379,7 @@ let SingleTerminalTabActionViewItem = class SingleTerminalTabActionViewItem exte
         this._register(toDisposable(() => dispose(this._elementDisposables)));
     }
     async onClick(event) {
+        this._terminalGroupService.lastAccessedMenu = 'inline-tab';
         if (event.altKey && this._menuItemAction.alt) {
             this._commandService.executeCommand(this._menuItemAction.alt.id, { target: TerminalLocation.Panel });
         }

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.js

@@ -51,8 +51,8 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         }));
         this._register(this._themeService.onDidColorThemeChange(() => this._refreshStyles(true)));
         this._updateDecorationVisibility();
-        this._register(this._capabilities.onDidAddCapability(c => this._createCapabilityDisposables(c)));
-        this._register(this._capabilities.onDidRemoveCapability(c => this._removeCapabilityDisposables(c)));
+        this._register(this._capabilities.onDidAddCapabilityType(c => this._createCapabilityDisposables(c)));
+        this._register(this._capabilities.onDidRemoveCapabilityType(c => this._removeCapabilityDisposables(c)));
         this._register(lifecycleService.onWillShutdown(() => this._disposeAllDecorations()));
         this._terminalDecorationHoverService = instantiationService.createInstance(TerminalDecorationHoverManager);
     }

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/suggestAddon.js

@@ -36,9 +36,9 @@ let SuggestAddon = class SuggestAddon extends Disposable {
         this._enableWidget = true;
         this._cursorIndexStart = 0;
         this._cursorIndexDelta = 0;
-        this._onBell = ( new Emitter());
+        this._onBell = this._register(( new Emitter()));
         this.onBell = this._onBell.event;
-        this._onAcceptedCompletion = ( new Emitter());
+        this._onAcceptedCompletion = this._register(( new Emitter()));
         this.onAcceptedCompletion = this._onAcceptedCompletion.event;
         this._cachedBashAliases = ( new Set());
         this._cachedBashBuiltins = ( new Set());