@codingame/monaco-vscode-api 30.0.1 → 31.0.0

package/vscode/src/vs/workbench/browser/parts/editor/modalEditorPart.js

@@ -4,9 +4,11 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import * as modalEditorPart from './media/modalEditorPart.css';
 import { $, addDisposableListener, EventType, EventHelper, Dimension, append, hide, show, setVisibility, isHTMLElement } from '../../../../base/browser/dom.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { ActionBar, prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { Button } from '../../../../base/browser/ui/button/button.js';
-import { Sash, Orientation } from '../../../../base/browser/ui/sash/sash.js';
+import { Action } from '../../../../base/common/actions.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Sash, Orientation, SashState } from '../../../../base/browser/ui/sash/sash.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
 import { DisposableStore, toDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { ResizableHTMLElement } from '../../../../base/browser/ui/resizable/resizable.js';
@@ -23,7 +25,7 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.se
 import { EditorPart } from './editorPart.js';
 import { GroupActivationReason, GroupsOrder, GroupDirection } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
-import { EditorPartModalContext, EditorPartModalMaximizedContext, EditorPartModalNavigationContext } from '../../../common/contextkeys.js';
+import { EditorPartModalContext, EditorPartModalMaximizedContext, EditorPartModalNavigationContext, EditorPartModalSidebarContext, EditorPartModalSidebarVisibleContext } from '../../../common/contextkeys.js';
 import { Verbosity, EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
 import { ResourceLabel } from '../../labels.js';
 import { IHostService } from '../../../services/host/browser/host.service.js';
@@ -32,7 +34,7 @@ import { IWorkbenchLayoutService } from '../../../services/layout/browser/layout
 import { mainWindow } from '../../../../base/browser/window.js';
 import { localize } from '../../../../nls.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { CLOSE_MODAL_EDITOR_COMMAND_ID, MOVE_MODAL_EDITOR_TO_MAIN_COMMAND_ID, MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID, TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID, NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID, NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID } from './editorCommands.js';
+import { CLOSE_MODAL_EDITOR_COMMAND_ID, MOVE_MODAL_EDITOR_TO_MAIN_COMMAND_ID, MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID, TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID, NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID, NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID, TOGGLE_MODAL_EDITOR_SIDEBAR_COMMAND_ID } from './editorCommands.js';
 
 var ModalEditorPartImpl_1;
 registerCss(modalEditorPart);
@@ -45,7 +47,9 @@ const MODAL_HEADER_HEIGHT = 33;
 const MODAL_SNAP_THRESHOLD = 20;
 const MODAL_MAXIMIZED_PADDING = 16;
 const MODAL_SIDEBAR_MIN_WIDTH = 160;
-const MODAL_SIDEBAR_DEFAULT_WIDTH = 220;
+const MODAL_SIDEBAR_DEFAULT_WIDTH = 260;
+const MODAL_SIDEBAR_PADDING = 8;
+const MODAL_SIDEBAR_BORDER_RIGHT = 1;
 const defaultModalEditorAllowableCommands = ( new Set([
 "workbench.action.quit", "workbench.action.reloadWindow", "workbench.action.toggleFullScreen",
 "workbench.action.gotoSymbol", "workbench.action.gotoLine",
@@ -54,7 +58,7 @@ const defaultModalEditorAllowableCommands = ( new Set([
 "workbench.action.closeActiveEditor", "workbench.action.closeAllEditors", "workbench.action.closeEditorsInGroup", "workbench.action.closeUnmodifiedEditors",
 "workbench.action.openSettings", "workbench.action.openSettings2", "workbench.action.openSettingsJson", "workbench.action.openGlobalSettings", "workbench.action.openApplicationSettingsJson", "workbench.action.openRawDefaultSettings", "workbench.action.openWorkspaceSettings", "workbench.action.openWorkspaceSettingsFile", "workbench.action.openFolderSettings", "workbench.action.openFolderSettingsFile", "workbench.action.openRemoteSettings", "workbench.action.openRemoteSettingsFile", "workbench.action.openAccessibilitySettings", "workbench.action.configureLanguageBasedSettings",
 "workbench.action.openGlobalKeybindings", "workbench.action.openDefaultKeybindingsFile", "workbench.action.openGlobalKeybindingsFile", "workbench.action.openKeyboardLayoutPicker",
-CLOSE_MODAL_EDITOR_COMMAND_ID, MOVE_MODAL_EDITOR_TO_MAIN_COMMAND_ID, MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID, TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID, NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID, NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID]));
+CLOSE_MODAL_EDITOR_COMMAND_ID, MOVE_MODAL_EDITOR_TO_MAIN_COMMAND_ID, MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID, TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID, NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID, NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID, TOGGLE_MODAL_EDITOR_SIDEBAR_COMMAND_ID]));
 const USE_MODAL_EDITOR_SETTING = "workbench.editor.useModal";
 let ModalEditorPart = class ModalEditorPart {
     constructor(
@@ -117,6 +121,17 @@ let ModalEditorPart = class ModalEditorPart {
         });
         shadowElement.appendChild(editorPartContainer);
         const headerElement = editorPartContainer.appendChild($(".modal-editor-header"));
+        const sidebarToggleContainer = append(headerElement, $("div.modal-editor-sidebar-toggle"));
+        if (!options?.sidebar) {
+            hide(sidebarToggleContainer);
+        }
+        const sidebarToggleIcon = options?.sidebar?.sidebarHidden ? Codicon.layoutSidebarLeftOff : Codicon.layoutSidebarLeft;
+        const sidebarToggleAction = disposables.add(( new Action(TOGGLE_MODAL_EDITOR_SIDEBAR_COMMAND_ID, ( localize(3572, "Toggle Sidebar")), ThemeIcon.asClassName(sidebarToggleIcon), true)));
+        const sidebarToggleActionBar = disposables.add(( new ActionBar(sidebarToggleContainer)));
+        sidebarToggleActionBar.push(sidebarToggleAction, {
+            icon: true,
+            label: false
+        });
         const titleElement = append(headerElement, $("div.modal-editor-title.show-file-icons"));
         titleElement.id = titleId;
         titleElement.textContent = "";
@@ -152,7 +167,9 @@ let ModalEditorPart = class ModalEditorPart {
         const actionBarContainer = append(headerElement, $("div.modal-editor-action-container"));
         const sidebarResult = this.createSidebar(editorPartContainer, options?.sidebar, disposables);
         if (sidebarResult) {
-            editorPartContainer.classList.add("has-sidebar");
+            if (sidebarResult.isVisible()) {
+                editorPartContainer.classList.add("has-sidebar");
+            }
             disposables.add(sidebarResult.onDidResize(() => layoutModal()));
         }
         const editorPart = disposables.add(this.instantiationService.createInstance(
@@ -175,6 +192,21 @@ let ModalEditorPart = class ModalEditorPart {
                 hide(navigationContainer);
             }
         }), editorPart.navigation));
+        if (sidebarResult) {
+            disposables.add(Event.runAndSubscribe(sidebarResult.onDidResize, () => {
+                if (sidebarResult.isVisible()) {
+                    editorPart.sidebarWidth = sidebarResult.hasCustomWidth() ? sidebarResult.getWidth() : undefined;
+                }
+            }));
+            disposables.add(editorPart.onDidToggleSidebar(() => {
+                sidebarResult.setVisible(!editorPart.sidebarHidden);
+                sidebarToggleAction.class = ThemeIcon.asClassName(
+                    editorPart.sidebarHidden ? Codicon.layoutSidebarLeftOff : Codicon.layoutSidebarLeft
+                );
+                layoutModal();
+            }));
+        }
+        disposables.add(sidebarToggleActionBar.onDidRun(() => editorPart.toggleSidebar()));
         const modalEditorService = this.editorService.createScoped(editorPart, disposables);
         const scopedInstantiationService = disposables.add(editorPart.scopedInstantiationService.createChild(( new ServiceCollection([IEditorService, modalEditorService]))));
         const editorActionsToolbarContainer = append(actionBarContainer, $("div.modal-editor-editor-actions"));
@@ -407,6 +439,7 @@ let ModalEditorPart = class ModalEditorPart {
             const height = Math.min(targetHeight, MODAL_MAX_DEFAULT_HEIGHT, availableHeight);
             return ( new Dimension(width, height));
         };
+        let isFirstLayout = true;
         const layoutModal = () => {
             if (isResizing) {
                 return;
@@ -432,6 +465,10 @@ let ModalEditorPart = class ModalEditorPart {
                 height = defaultSize.height;
             }
             height = Math.min(height, availableHeight);
+            if (isFirstLayout) {
+                isFirstLayout = false;
+                sidebarResult?.clampWidth(width);
+            }
             resizableElement.maxSize = ( new Dimension(containerDimension.width, availableHeight));
             resizableElement.preferredSize = defaultSize;
             resizableElement.layout(height, width);
@@ -477,9 +514,12 @@ let ModalEditorPart = class ModalEditorPart {
         if (!content) {
             return undefined;
         }
-        let sidebarWidth = MODAL_SIDEBAR_DEFAULT_WIDTH;
+        let sidebarWidth = content.sidebarWidth && content.sidebarWidth > 0 ? content.sidebarWidth : MODAL_SIDEBAR_DEFAULT_WIDTH;
+        let customWidth = content.sidebarWidth !== undefined && content.sidebarWidth > 0;
+        let visible = !content.sidebarHidden;
         const sidebarContainer = append(container, $("div.modal-editor-sidebar.show-file-icons"));
         sidebarContainer.style.width = `${sidebarWidth}px`;
+        setVisibility(visible, sidebarContainer);
         const onDidLayoutEmitter = disposables.add(( new Emitter()));
         const contentDisposable = disposables.add(( new MutableDisposable()));
         contentDisposable.value = content.render(sidebarContainer, onDidLayoutEmitter.event);
@@ -490,6 +530,9 @@ let ModalEditorPart = class ModalEditorPart {
         }, {
             orientation: Orientation.VERTICAL
         })));
+        if (!visible) {
+            sash.state = SashState.Disabled;
+        }
         const onDidResizeEmitter = disposables.add(( new Emitter()));
         let sashStartWidth;
         disposables.add(sash.onDidStart(() => sashStartWidth = sidebarWidth));
@@ -501,6 +544,7 @@ let ModalEditorPart = class ModalEditorPart {
             const delta = e.currentX - e.startX;
             const maxWidth = Math.max(MODAL_SIDEBAR_MIN_WIDTH, container.clientWidth - MODAL_MIN_WIDTH);
             sidebarWidth = Math.min(maxWidth, Math.max(MODAL_SIDEBAR_MIN_WIDTH, sashStartWidth + delta));
+            customWidth = true;
             sidebarContainer.style.width = `${sidebarWidth}px`;
             sash.layout();
             onDidResizeEmitter.fire();
@@ -508,18 +552,42 @@ let ModalEditorPart = class ModalEditorPart {
         disposables.add(sash.onDidReset(() => {
             const maxWidth = Math.max(MODAL_SIDEBAR_MIN_WIDTH, container.clientWidth - MODAL_MIN_WIDTH);
             sidebarWidth = Math.min(maxWidth, MODAL_SIDEBAR_DEFAULT_WIDTH);
+            customWidth = false;
             sidebarContainer.style.width = `${sidebarWidth}px`;
             sash.layout();
             onDidResizeEmitter.fire();
         }));
         return {
             onDidResize: onDidResizeEmitter.event,
-            getWidth: () => sidebarWidth,
+            getWidth: () => visible ? sidebarWidth : 0,
+            hasCustomWidth: () => customWidth,
+            clampWidth: modalWidth => {
+                if (sidebarWidth + MODAL_MIN_WIDTH > modalWidth) {
+                    sidebarWidth = Math.min(
+                        MODAL_SIDEBAR_DEFAULT_WIDTH,
+                        Math.max(MODAL_SIDEBAR_MIN_WIDTH, modalWidth - MODAL_MIN_WIDTH)
+                    );
+                    customWidth = false;
+                    sidebarContainer.style.width = `${sidebarWidth}px`;
+                    sash.layout();
+                    onDidResizeEmitter.fire();
+                }
+            },
+            isVisible: () => visible,
+            setVisible: value => {
+                visible = value;
+                setVisibility(visible, sidebarContainer);
+                container.classList.toggle("has-sidebar", visible);
+                sash.state = visible ? SashState.Enabled : SashState.Disabled;
+                onDidResizeEmitter.fire();
+            },
             layout: height => {
-                onDidLayoutEmitter.fire({
-                    height,
-                    width: sidebarWidth
-                });
+                if (visible) {
+                    onDidLayoutEmitter.fire({
+                        height: height - MODAL_SIDEBAR_PADDING * 2,
+                        width: sidebarWidth - MODAL_SIDEBAR_PADDING * 2 - MODAL_SIDEBAR_BORDER_RIGHT
+                    });
+                }
                 sash.layout();
             },
             updateContent: newContent => {
@@ -553,6 +621,24 @@ let ModalEditorPartImpl = class ModalEditorPartImpl extends EditorPart {
     set position(value) {
         this._position = value;
     }
+    get sidebarWidth() {
+        return this._sidebarWidth;
+    }
+    set sidebarWidth(value) {
+        this._sidebarWidth = value;
+    }
+    get sidebarHidden() {
+        return this._sidebarHidden;
+    }
+    set sidebarHidden(value) {
+        this._sidebarHidden = value;
+    }
+    get hasSidebar() {
+        return this._hasSidebar;
+    }
+    set hasSidebar(value) {
+        this._hasSidebar = value;
+    }
     get navigation() {
         return this._navigation;
     }
@@ -580,12 +666,19 @@ let ModalEditorPartImpl = class ModalEditorPartImpl extends EditorPart {
         this.onDidRequestLayout = this._onDidRequestLayout.event;
         this._onDidChangeNavigation = this._register(( new Emitter()));
         this.onDidChangeNavigation = this._onDidChangeNavigation.event;
+        this._sidebarHidden = false;
+        this._hasSidebar = false;
+        this._onDidToggleSidebar = this._register(( new Emitter()));
+        this.onDidToggleSidebar = this._onDidToggleSidebar.event;
         this.optionsDisposable = this._register(( new MutableDisposable()));
         this.previousMainWindowActiveElement = null;
         this._maximized = options?.maximized ?? false;
         this._size = options?.size;
         this._position = options?.position;
         this._navigation = options?.navigation;
+        this._hasSidebar = !!options?.sidebar;
+        this._sidebarHidden = options?.sidebar?.sidebarHidden ?? false;
+        this._sidebarWidth = options?.sidebar?.sidebarWidth;
         if (this._maximized) {
             this.savedSize = this._size;
             this.savedPosition = this._position;
@@ -636,6 +729,10 @@ let ModalEditorPartImpl = class ModalEditorPartImpl extends EditorPart {
         }
         this._onDidChangeMaximized.fire(this._maximized);
     }
+    toggleSidebar() {
+        this._sidebarHidden = !this._sidebarHidden;
+        this._onDidToggleSidebar.fire();
+    }
     handleHeaderDoubleClick() {
         if (this._maximized) {
             this.savedSize = undefined;
@@ -660,6 +757,13 @@ let ModalEditorPartImpl = class ModalEditorPartImpl extends EditorPart {
         this._register(this.onDidChangeNavigation(
             navigation => hasNavigationContext.set(!!navigation && navigation.total > 1)
         ));
+        const sidebarContext = EditorPartModalSidebarContext.bindTo(this.scopedContextKeyService);
+        sidebarContext.set(this._hasSidebar);
+        const sidebarVisibleContext = EditorPartModalSidebarVisibleContext.bindTo(this.scopedContextKeyService);
+        sidebarVisibleContext.set(this._hasSidebar && !this._sidebarHidden);
+        this._register(
+            this.onDidToggleSidebar(() => sidebarVisibleContext.set(this._hasSidebar && !this._sidebarHidden))
+        );
         super.handleContextKeys();
     }
     removeGroup(group, preserveFocus) {

package/vscode/src/vs/workbench/browser/parts/paneCompositePart.d.ts

@@ -83,7 +83,6 @@ export declare abstract class AbstractPaneCompositePart extends CompositePart<Pa
     protected readonly location: ViewContainerLocation;
     readonly registryId: string;
     private readonly globalActionsMenuId;
-    private readonly globalLeftActionsMenuId;
     private readonly viewDescriptorService;
     protected readonly contextKeyService: IContextKeyService;
     private readonly extensionService;
@@ -100,10 +99,9 @@ export declare abstract class AbstractPaneCompositePart extends CompositePart<Pa
     private compositeBarPosition;
     private emptyPaneMessageElement;
     private globalToolBar;
-    private globalLeftToolBar;
     private blockOpening;
     protected contentDimension: Dimension | undefined;
-    constructor(partId: SINGLE_WINDOW_PARTS, partOptions: ICompositePartOptions, activePaneCompositeSettingsKey: string, activePaneContextKey: IContextKey<string>, paneFocusContextKey: IContextKey<boolean>, nameForTelemetry: string, compositeCSSClass: string, titleForegroundColor: string | undefined, titleBorderColor: string | undefined, location: ViewContainerLocation, registryId: string, globalActionsMenuId: MenuId, globalLeftActionsMenuId: MenuId | undefined, notificationService: INotificationService, storageService: IStorageService, contextMenuService: IContextMenuService, layoutService: IWorkbenchLayoutService, keybindingService: IKeybindingService, hoverService: IHoverService, instantiationService: IInstantiationService, themeService: IThemeService, viewDescriptorService: IViewDescriptorService, contextKeyService: IContextKeyService, extensionService: IExtensionService, menuService: IMenuService);
+    constructor(partId: SINGLE_WINDOW_PARTS, partOptions: ICompositePartOptions, activePaneCompositeSettingsKey: string, activePaneContextKey: IContextKey<string>, paneFocusContextKey: IContextKey<boolean>, nameForTelemetry: string, compositeCSSClass: string, titleForegroundColor: string | undefined, titleBorderColor: string | undefined, location: ViewContainerLocation, registryId: string, globalActionsMenuId: MenuId, notificationService: INotificationService, storageService: IStorageService, contextMenuService: IContextMenuService, layoutService: IWorkbenchLayoutService, keybindingService: IKeybindingService, hoverService: IHoverService, instantiationService: IInstantiationService, themeService: IThemeService, viewDescriptorService: IViewDescriptorService, contextKeyService: IContextKeyService, extensionService: IExtensionService, menuService: IMenuService);
     private registerListeners;
     private onDidOpen;
     private onDidClose;

package/vscode/src/vs/workbench/browser/parts/paneCompositePart.js

@@ -67,7 +67,6 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         location,
         registryId,
         globalActionsMenuId,
-        globalLeftActionsMenuId,
         notificationService,
         storageService,
         contextMenuService,
@@ -106,7 +105,6 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         this.location = location;
         this.registryId = registryId;
         this.globalActionsMenuId = globalActionsMenuId;
-        this.globalLeftActionsMenuId = globalLeftActionsMenuId;
         this.viewDescriptorService = viewDescriptorService;
         this.contextKeyService = contextKeyService;
         this.extensionService = extensionService;
@@ -251,24 +249,6 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         this._register(addDisposableListener(titleArea, EventType$1.Contextmenu, e => {
             this.onTitleAreaContextMenu(( new StandardMouseEvent(getWindow(titleArea), e)));
         }));
-        if (this.globalLeftActionsMenuId) {
-            const globalLeftTitleActionsContainer = titleArea.appendChild($(".global-actions-left"));
-            this.globalLeftToolBar = this._register(this.instantiationService.createInstance(
-                MenuWorkbenchToolBar,
-                globalLeftTitleActionsContainer,
-                this.globalLeftActionsMenuId,
-                {
-                    actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
-                    orientation: ActionsOrientation.HORIZONTAL,
-                    getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
-                    anchorAlignmentProvider: () => this.getTitleAreaDropDownAnchorAlignment(),
-                    hoverDelegate: this.toolbarHoverDelegate,
-                    hiddenItemStrategy: HiddenItemStrategy.NoHide,
-                    highlightToggledItems: false,
-                    telemetrySource: this.nameForTelemetry
-                }
-            ));
-        }
         const globalTitleActionsContainer = titleArea.appendChild($(".global-actions"));
         this.globalToolBar = this._register(this.instantiationService.createInstance(
             MenuWorkbenchToolBar,
@@ -511,8 +491,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         }
         const toolBarWidth = this.toolBar.getItemsWidth() + this.toolBar.getItemsLength() * 4;
         const globalToolBarWidth = this.globalToolBar ? this.globalToolBar.getItemsWidth() + this.globalToolBar.getItemsLength() * 4 : 0;
-        const globalLeftToolBarWidth = this.globalLeftToolBar ? this.globalLeftToolBar.getItemsWidth() + this.globalLeftToolBar.getItemsLength() * 4 : 0;
-        return toolBarWidth + globalToolBarWidth + globalLeftToolBarWidth + 8;
+        return toolBarWidth + globalToolBarWidth + 8;
     }
     onTitleAreaContextMenu(event) {
         if (this.shouldShowCompositeBar() && this.getCompositeBarPosition() === CompositeBarPosition.TITLE) {
@@ -563,6 +542,6 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         return undefined;
     }
 };
-AbstractPaneCompositePart = AbstractPaneCompositePart_1 = ( __decorate([( __param(13, INotificationService)), ( __param(14, IStorageService)), ( __param(15, IContextMenuService)), ( __param(16, IWorkbenchLayoutService)), ( __param(17, IKeybindingService)), ( __param(18, IHoverService)), ( __param(19, IInstantiationService)), ( __param(20, IThemeService)), ( __param(21, IViewDescriptorService)), ( __param(22, IContextKeyService)), ( __param(23, IExtensionService)), ( __param(24, IMenuService))], AbstractPaneCompositePart));
+AbstractPaneCompositePart = AbstractPaneCompositePart_1 = ( __decorate([( __param(12, INotificationService)), ( __param(13, IStorageService)), ( __param(14, IContextMenuService)), ( __param(15, IWorkbenchLayoutService)), ( __param(16, IKeybindingService)), ( __param(17, IHoverService)), ( __param(18, IInstantiationService)), ( __param(19, IThemeService)), ( __param(20, IViewDescriptorService)), ( __param(21, IContextKeyService)), ( __param(22, IExtensionService)), ( __param(23, IMenuService))], AbstractPaneCompositePart));
 
 export { AbstractPaneCompositePart, CompositeBarPosition };

package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js

@@ -85,7 +85,7 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
         super(Parts.PANEL_PART, {
             hasTitle: true,
             trailingSeparator: true
-        }, PanelPart_1.activePanelSettingsKey, ActivePanelContext.bindTo(contextKeyService), PanelFocusContext.bindTo(contextKeyService), "panel", "panel", undefined, PANEL_TITLE_BORDER, ViewContainerLocation.Panel, Extensions.Panels, MenuId.PanelTitle, undefined, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
+        }, PanelPart_1.activePanelSettingsKey, ActivePanelContext.bindTo(contextKeyService), PanelFocusContext.bindTo(contextKeyService), "panel", "panel", undefined, PANEL_TITLE_BORDER, ViewContainerLocation.Panel, Extensions.Panels, MenuId.PanelTitle, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
         this.commandService = commandService;
         this.configurationService = configurationService;
         this.minimumWidth = 300;

package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js

@@ -91,7 +91,7 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
             hasTitle: true,
             trailingSeparator: false,
             borderWidth: () => (this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder)) ? 1 : 0
-        }, SidebarPart_1.activeViewletSettingsKey, ActiveViewletContext.bindTo(contextKeyService), SidebarFocusContext.bindTo(contextKeyService), "sideBar", "viewlet", SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_TITLE_BORDER, ViewContainerLocation.Sidebar, Extensions.Viewlets, MenuId.SidebarTitle, undefined, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
+        }, SidebarPart_1.activeViewletSettingsKey, ActiveViewletContext.bindTo(contextKeyService), SidebarFocusContext.bindTo(contextKeyService), "sideBar", "viewlet", SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_TITLE_BORDER, ViewContainerLocation.Sidebar, Extensions.Viewlets, MenuId.SidebarTitle, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
         this.configurationService = configurationService;
         this.minimumWidth = 170;
         this.maximumWidth = Number.POSITIVE_INFINITY;

package/vscode/src/vs/workbench/browser/web.api.d.ts

@@ -164,6 +164,14 @@ export interface IWorkbenchConstructionOptions {
      * such as creating tunnels and showing candidate ports to forward.
      */
     readonly tunnelProvider?: ITunnelProvider;
+    /**
+     * A provider for discovering and connecting to dev tunnel agent hosts.
+     *
+     * The embedder (e.g. vscode.dev) implements this to handle tunnel listing
+     * and relay WebSocket proxying. If not provided, the sessions workbench
+     * will not be able to discover tunnel-based agent hosts.
+     */
+    readonly tunnelDiscoveryProvider?: ITunnelDiscoveryProvider;
     /**
      * Endpoints to be used for proxying authentication code exchange calls in the browser.
      */
@@ -379,6 +387,67 @@ export interface ITunnelProvider {
      */
     features?: TunnelProviderFeatures;
 }
+/**
+ * Enables the embedder to provide tunnel discovery and connection for agent
+ * host sessions.
+ */
+export interface ITunnelDiscoveryProvider {
+    /**
+     * List dev tunnels that have agent hosts available.
+     *
+     * The embedder is responsible for acquiring and managing authentication
+     * tokens internally.
+     *
+     * @returns An array of discovered tunnels with their metadata.
+     */
+    listTunnels(): Promise<IDiscoveredTunnel[]>;
+    /**
+     * Connect to a tunnel's agent host port and return a message-passing
+     * interface. The embedder handles all connection details including
+     * authentication (e.g. using the Dev Tunnels SDK browser WebSocket
+     * relay + SSH port forwarding).
+     *
+     * The returned {@link ITunnelConnection} carries JSON text messages
+     * for the Agent Host Protocol.
+     *
+     * @param tunnelId The tunnel to connect to.
+     * @param clusterId The cluster region of the tunnel.
+     */
+    connect(tunnelId: string, clusterId: string): Promise<ITunnelConnection>;
+}
+/**
+ * A bidirectional message-passing connection to a tunnel's agent host.
+ * Returned by {@link ITunnelDiscoveryProvider.connect}.
+ */
+export interface ITunnelConnection {
+    /**
+     * Send a text message to the agent host.
+     */
+    send(data: string): void;
+    /**
+     * Fires when a text message is received from the agent host.
+     */
+    readonly onMessage: Event<string>;
+    /**
+     * Fires when the connection is closed.
+     */
+    readonly onClose: Event<void>;
+    /**
+     * Close the connection and release resources.
+     */
+    close(): void;
+}
+/**
+ * A tunnel discovered by {@link ITunnelDiscoveryProvider}.
+ */
+export interface IDiscoveredTunnel {
+    readonly tunnelId: string;
+    readonly clusterId: string;
+    readonly name: string;
+    readonly tags: readonly string[];
+    /** Number of hosts currently accepting connections (0 = offline). */
+    readonly hostConnectionCount: number;
+}
 export interface ITunnelFactory {
     (tunnelOptions: ITunnelOptions, tunnelCreationOptions: TunnelCreationOptions): Promise<ITunnel> | undefined;
 }

package/vscode/src/vs/workbench/common/contextkeys.d.ts

@@ -55,6 +55,8 @@ export declare const EditorPartMaximizedEditorGroupContext: RawContextKey<boolea
 export declare const EditorPartModalContext: RawContextKey<boolean>;
 export declare const EditorPartModalMaximizedContext: RawContextKey<boolean>;
 export declare const EditorPartModalNavigationContext: RawContextKey<boolean>;
+export declare const EditorPartModalSidebarContext: RawContextKey<boolean>;
+export declare const EditorPartModalSidebarVisibleContext: RawContextKey<boolean>;
 export declare const EditorsVisibleContext: RawContextKey<boolean>;
 export declare const InEditorZenModeContext: RawContextKey<boolean>;
 export declare const IsMainEditorCenteredLayoutContext: RawContextKey<boolean>;

package/vscode/src/vs/workbench/common/contextkeys.js

@@ -37,7 +37,7 @@ const TemporaryWorkspaceContext = ( new RawContextKey("temporaryWorkspace", fals
     4084,
     "The scheme of the current workspace is from a temporary file system."
 ))));
-const IsSessionsWindowContext = ( new RawContextKey("isSessionsWindow", false, ( localize(4085, "Whether the current window is a sessions window."))));
+const IsSessionsWindowContext = ( new RawContextKey("isSessionsWindow", false, ( localize(4085, "Whether the current window is a agent sessions window."))));
 const HasWebFileSystemAccess = ( new RawContextKey("hasWebFileSystemAccess", false, true));
 const EmbedderIdentifierContext = ( new RawContextKey("embedderIdentifier", undefined, ( localize(
     4086,
@@ -93,37 +93,39 @@ const EditorPartMaximizedEditorGroupContext = ( new RawContextKey("editorPartMax
 const EditorPartModalContext = ( new RawContextKey("editorPartModal", false, ( localize(4116, "Whether focus is in a modal editor part"))));
 const EditorPartModalMaximizedContext = ( new RawContextKey("editorPartModalMaximized", false, ( localize(4117, "Whether the modal editor part is maximized"))));
 const EditorPartModalNavigationContext = ( new RawContextKey("editorPartModalNavigation", false, ( localize(4118, "Whether the modal editor part has navigation context"))));
-const EditorsVisibleContext = ( new RawContextKey("editorIsOpen", false, ( localize(4119, "Whether an editor is open"))));
-const InEditorZenModeContext = ( new RawContextKey("inZenMode", false, ( localize(4120, "Whether Zen mode is enabled"))));
-const IsMainEditorCenteredLayoutContext = ( new RawContextKey("isCenteredLayout", false, ( localize(4121, "Whether centered layout is enabled for the main editor"))));
-const SplitEditorsVertically = ( new RawContextKey("splitEditorsVertically", false, ( localize(4122, "Whether editors split vertically"))));
-const MainEditorAreaVisibleContext = ( new RawContextKey("mainEditorAreaVisible", true, ( localize(4123, "Whether the editor area in the main window is visible"))));
-const EditorTabsVisibleContext = ( new RawContextKey("editorTabsVisible", true, ( localize(4124, "Whether editor tabs are visible"))));
-const SideBarVisibleContext = ( new RawContextKey("sideBarVisible", false, ( localize(4125, "Whether the sidebar is visible"))));
-const SidebarFocusContext = ( new RawContextKey("sideBarFocus", false, ( localize(4126, "Whether the sidebar has keyboard focus"))));
-const ActiveViewletContext = ( new RawContextKey("activeViewlet", "", ( localize(4127, "The identifier of the active viewlet"))));
-const StatusBarFocused = ( new RawContextKey("statusBarFocused", false, ( localize(4128, "Whether the status bar has keyboard focus"))));
-const TitleBarStyleContext = ( new RawContextKey("titleBarStyle", "custom", ( localize(4129, "Style of the window title bar"))));
-const TitleBarVisibleContext = ( new RawContextKey("titleBarVisible", false, ( localize(4130, "Whether the title bar is visible"))));
-const IsCompactTitleBarContext = ( new RawContextKey("isCompactTitleBar", false, ( localize(4131, "Title bar is in compact mode"))));
-const BannerFocused = ( new RawContextKey("bannerFocused", false, ( localize(4132, "Whether the banner has keyboard focus"))));
-const NotificationFocusedContext = ( new RawContextKey("notificationFocus", true, ( localize(4133, "Whether a notification has keyboard focus"))));
-const NotificationsCenterVisibleContext = ( new RawContextKey("notificationCenterVisible", false, ( localize(4134, "Whether the notifications center is visible"))));
-const NotificationsToastsVisibleContext = ( new RawContextKey("notificationToastsVisible", false, ( localize(4135, "Whether a notification toast is visible"))));
-const ActiveAuxiliaryContext = ( new RawContextKey("activeAuxiliary", "", ( localize(4136, "The identifier of the active auxiliary panel"))));
-const AuxiliaryBarFocusContext = ( new RawContextKey("auxiliaryBarFocus", false, ( localize(4137, "Whether the auxiliary bar has keyboard focus"))));
-const AuxiliaryBarVisibleContext = ( new RawContextKey("auxiliaryBarVisible", false, ( localize(4138, "Whether the auxiliary bar is visible"))));
-const AuxiliaryBarMaximizedContext = ( new RawContextKey("auxiliaryBarMaximized", false, ( localize(4139, "Whether the auxiliary bar is maximized"))));
-const ActivePanelContext = ( new RawContextKey("activePanel", "", ( localize(4140, "The identifier of the active panel"))));
-const PanelFocusContext = ( new RawContextKey("panelFocus", false, ( localize(4141, "Whether the panel has keyboard focus"))));
-const PanelPositionContext = ( new RawContextKey("panelPosition", "bottom", ( localize(4142, "The position of the panel, always 'bottom'"))));
+const EditorPartModalSidebarContext = ( new RawContextKey("editorPartModalSidebar", false, ( localize(4119, "Whether the modal editor part has a sidebar"))));
+const EditorPartModalSidebarVisibleContext = ( new RawContextKey("editorPartModalSidebarVisible", false, ( localize(4120, "Whether the modal editor part sidebar is visible"))));
+const EditorsVisibleContext = ( new RawContextKey("editorIsOpen", false, ( localize(4121, "Whether an editor is open"))));
+const InEditorZenModeContext = ( new RawContextKey("inZenMode", false, ( localize(4122, "Whether Zen mode is enabled"))));
+const IsMainEditorCenteredLayoutContext = ( new RawContextKey("isCenteredLayout", false, ( localize(4123, "Whether centered layout is enabled for the main editor"))));
+const SplitEditorsVertically = ( new RawContextKey("splitEditorsVertically", false, ( localize(4124, "Whether editors split vertically"))));
+const MainEditorAreaVisibleContext = ( new RawContextKey("mainEditorAreaVisible", true, ( localize(4125, "Whether the editor area in the main window is visible"))));
+const EditorTabsVisibleContext = ( new RawContextKey("editorTabsVisible", true, ( localize(4126, "Whether editor tabs are visible"))));
+const SideBarVisibleContext = ( new RawContextKey("sideBarVisible", false, ( localize(4127, "Whether the sidebar is visible"))));
+const SidebarFocusContext = ( new RawContextKey("sideBarFocus", false, ( localize(4128, "Whether the sidebar has keyboard focus"))));
+const ActiveViewletContext = ( new RawContextKey("activeViewlet", "", ( localize(4129, "The identifier of the active viewlet"))));
+const StatusBarFocused = ( new RawContextKey("statusBarFocused", false, ( localize(4130, "Whether the status bar has keyboard focus"))));
+const TitleBarStyleContext = ( new RawContextKey("titleBarStyle", "custom", ( localize(4131, "Style of the window title bar"))));
+const TitleBarVisibleContext = ( new RawContextKey("titleBarVisible", false, ( localize(4132, "Whether the title bar is visible"))));
+const IsCompactTitleBarContext = ( new RawContextKey("isCompactTitleBar", false, ( localize(4133, "Title bar is in compact mode"))));
+const BannerFocused = ( new RawContextKey("bannerFocused", false, ( localize(4134, "Whether the banner has keyboard focus"))));
+const NotificationFocusedContext = ( new RawContextKey("notificationFocus", true, ( localize(4135, "Whether a notification has keyboard focus"))));
+const NotificationsCenterVisibleContext = ( new RawContextKey("notificationCenterVisible", false, ( localize(4136, "Whether the notifications center is visible"))));
+const NotificationsToastsVisibleContext = ( new RawContextKey("notificationToastsVisible", false, ( localize(4137, "Whether a notification toast is visible"))));
+const ActiveAuxiliaryContext = ( new RawContextKey("activeAuxiliary", "", ( localize(4138, "The identifier of the active auxiliary panel"))));
+const AuxiliaryBarFocusContext = ( new RawContextKey("auxiliaryBarFocus", false, ( localize(4139, "Whether the auxiliary bar has keyboard focus"))));
+const AuxiliaryBarVisibleContext = ( new RawContextKey("auxiliaryBarVisible", false, ( localize(4140, "Whether the auxiliary bar is visible"))));
+const AuxiliaryBarMaximizedContext = ( new RawContextKey("auxiliaryBarMaximized", false, ( localize(4141, "Whether the auxiliary bar is maximized"))));
+const ActivePanelContext = ( new RawContextKey("activePanel", "", ( localize(4142, "The identifier of the active panel"))));
+const PanelFocusContext = ( new RawContextKey("panelFocus", false, ( localize(4143, "Whether the panel has keyboard focus"))));
+const PanelPositionContext = ( new RawContextKey("panelPosition", "bottom", ( localize(4144, "The position of the panel, always 'bottom'"))));
 const PanelAlignmentContext = ( new RawContextKey("panelAlignment", "center", ( localize(
-    4143,
+    4145,
     "The alignment of the panel, either 'center', 'left', 'right' or 'justify'"
 ))));
-const PanelVisibleContext = ( new RawContextKey("panelVisible", false, ( localize(4144, "Whether the panel is visible"))));
-const PanelMaximizedContext = ( new RawContextKey("panelMaximized", false, ( localize(4145, "Whether the panel is maximized"))));
-const FocusedViewContext = ( new RawContextKey("focusedView", "", ( localize(4146, "The identifier of the view that has keyboard focus"))));
+const PanelVisibleContext = ( new RawContextKey("panelVisible", false, ( localize(4146, "Whether the panel is visible"))));
+const PanelMaximizedContext = ( new RawContextKey("panelMaximized", false, ( localize(4147, "Whether the panel is maximized"))));
+const FocusedViewContext = ( new RawContextKey("focusedView", "", ( localize(4148, "The identifier of the view that has keyboard focus"))));
 function getVisbileViewContextKey(viewId) {
     return `view.${viewId}.visible`;
 }
@@ -134,55 +136,55 @@ let AbstractResourceContextKey = class AbstractResourceContextKey {
     static {
         this.Scheme = ( new RawContextKey("resourceScheme", undefined, {
             type: "string",
-            description: ( localize(4147, "The scheme of the resource"))
+            description: ( localize(4149, "The scheme of the resource"))
         }));
     }
     static {
         this.Filename = ( new RawContextKey("resourceFilename", undefined, {
             type: "string",
-            description: ( localize(4148, "The file name of the resource"))
+            description: ( localize(4150, "The file name of the resource"))
         }));
     }
     static {
         this.Dirname = ( new RawContextKey("resourceDirname", undefined, {
             type: "string",
-            description: ( localize(4149, "The folder name the resource is contained in"))
+            description: ( localize(4151, "The folder name the resource is contained in"))
         }));
     }
     static {
         this.Path = ( new RawContextKey("resourcePath", undefined, {
             type: "string",
-            description: ( localize(4150, "The full path of the resource"))
+            description: ( localize(4152, "The full path of the resource"))
         }));
     }
     static {
         this.LangId = ( new RawContextKey("resourceLangId", undefined, {
             type: "string",
-            description: ( localize(4151, "The language identifier of the resource"))
+            description: ( localize(4153, "The language identifier of the resource"))
         }));
     }
     static {
         this.Resource = ( new RawContextKey("resource", undefined, {
             type: "URI",
-            description: ( localize(4152, "The full value of the resource including scheme and path"))
+            description: ( localize(4154, "The full value of the resource including scheme and path"))
         }));
     }
     static {
         this.Extension = ( new RawContextKey("resourceExtname", undefined, {
             type: "string",
-            description: ( localize(4153, "The extension name of the resource"))
+            description: ( localize(4155, "The extension name of the resource"))
         }));
     }
     static {
         this.HasResource = ( new RawContextKey("resourceSet", undefined, {
             type: "boolean",
-            description: ( localize(4154, "Whether a resource is present or not"))
+            description: ( localize(4156, "Whether a resource is present or not"))
         }));
     }
     static {
         this.IsFileSystemResource = ( new RawContextKey("isFileSystemResource", undefined, {
             type: "boolean",
-            description: ( localize(4155, "Whether the resource is backed by a file system provider"))
+            description: ( localize(4157, "Whether the resource is backed by a file system provider"))
         }));
     }
     constructor(_contextKeyService, _fileService, _languageService, _modelService) {
@@ -300,4 +302,4 @@ function getAvailableEditorIds(editor, editorResolverService) {
     return [];
 }
 
-export { ActiveAuxiliaryContext, ActiveCompareEditorCanSwapContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanRevertContext, ActiveEditorCanSplitInGroupContext, ActiveEditorCanToggleReadonlyContext, ActiveEditorContext, ActiveEditorDirtyContext, ActiveEditorFirstInGroupContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, ActiveEditorLastInGroupContext, ActiveEditorPinnedContext, ActiveEditorReadonlyContext, ActiveEditorStickyContext, ActivePanelContext, ActiveViewletContext, AuxiliaryBarFocusContext, AuxiliaryBarMaximizedContext, AuxiliaryBarVisibleContext, BannerFocused, DirtyWorkingCopiesContext, EditorGroupEditorsCountContext, EditorPartMaximizedEditorGroupContext, EditorPartModalContext, EditorPartModalMaximizedContext, EditorPartModalNavigationContext, EditorPartMultipleEditorGroupsContext, EditorTabsVisibleContext, EditorsVisibleContext, EmbedderIdentifierContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, FocusedViewContext, HasWebFileSystemAccess, InAutomationContext, InEditorZenModeContext, IsAuxiliaryWindowContext, IsAuxiliaryWindowFocusedContext, IsCompactTitleBarContext, IsMainEditorCenteredLayoutContext, IsMainWindowFullscreenContext, IsSandboxWorkspaceContext, IsSessionsWindowContext, MainEditorAreaVisibleContext, MultipleEditorGroupsContext, MultipleEditorsSelectedInGroupContext, NotificationFocusedContext, NotificationsCenterVisibleContext, NotificationsToastsVisibleContext, OpenFolderWorkspaceSupportContext, PanelAlignmentContext, PanelFocusContext, PanelMaximizedContext, PanelPositionContext, PanelVisibleContext, RemoteNameContext, ResourceContextKey, SelectedEditorsInGroupFileOrUntitledResourceContextKey, SideBarVisibleContext, SideBySideEditorActiveContext, SidebarFocusContext, SplitEditorsVertically, StaticResourceContextKey, StatusBarFocused, TemporaryWorkspaceContext, TextCompareEditorActiveContext, TextCompareEditorVisibleContext, TitleBarStyleContext, TitleBarVisibleContext, TwoEditorsSelectedInGroupContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, applyAvailableEditorIds, getVisbileViewContextKey };
+export { ActiveAuxiliaryContext, ActiveCompareEditorCanSwapContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanRevertContext, ActiveEditorCanSplitInGroupContext, ActiveEditorCanToggleReadonlyContext, ActiveEditorContext, ActiveEditorDirtyContext, ActiveEditorFirstInGroupContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, ActiveEditorLastInGroupContext, ActiveEditorPinnedContext, ActiveEditorReadonlyContext, ActiveEditorStickyContext, ActivePanelContext, ActiveViewletContext, AuxiliaryBarFocusContext, AuxiliaryBarMaximizedContext, AuxiliaryBarVisibleContext, BannerFocused, DirtyWorkingCopiesContext, EditorGroupEditorsCountContext, EditorPartMaximizedEditorGroupContext, EditorPartModalContext, EditorPartModalMaximizedContext, EditorPartModalNavigationContext, EditorPartModalSidebarContext, EditorPartModalSidebarVisibleContext, EditorPartMultipleEditorGroupsContext, EditorTabsVisibleContext, EditorsVisibleContext, EmbedderIdentifierContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, FocusedViewContext, HasWebFileSystemAccess, InAutomationContext, InEditorZenModeContext, IsAuxiliaryWindowContext, IsAuxiliaryWindowFocusedContext, IsCompactTitleBarContext, IsMainEditorCenteredLayoutContext, IsMainWindowFullscreenContext, IsSandboxWorkspaceContext, IsSessionsWindowContext, MainEditorAreaVisibleContext, MultipleEditorGroupsContext, MultipleEditorsSelectedInGroupContext, NotificationFocusedContext, NotificationsCenterVisibleContext, NotificationsToastsVisibleContext, OpenFolderWorkspaceSupportContext, PanelAlignmentContext, PanelFocusContext, PanelMaximizedContext, PanelPositionContext, PanelVisibleContext, RemoteNameContext, ResourceContextKey, SelectedEditorsInGroupFileOrUntitledResourceContextKey, SideBarVisibleContext, SideBySideEditorActiveContext, SidebarFocusContext, SplitEditorsVertically, StaticResourceContextKey, StatusBarFocused, TemporaryWorkspaceContext, TextCompareEditorActiveContext, TextCompareEditorVisibleContext, TitleBarStyleContext, TitleBarVisibleContext, TwoEditorsSelectedInGroupContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, applyAvailableEditorIds, getVisbileViewContextKey };