@codingame/monaco-vscode-workbench-service-override 37.6.1 → 38.0.0

package/vscode/src/vs/sessions/browser/dockedAuxiliaryBarController.js

@@ -10,6 +10,9 @@ class DockedAuxiliaryBarController extends Disposable {
     static {
         this.EDITOR_MIN_WIDTH = 300;
     }
+    static {
+        this.EDITOR_PREFERRED_WIDTH = 1000;
+    }
     static {
         this.DEFAULT_WIDTH = 300;
     }
@@ -39,6 +42,7 @@ class DockedAuxiliaryBarController extends Disposable {
             this._docked = true;
         }
         if (!this.host.isEditorAreaVisible() || !this.host.isAuxiliaryBarVisible()) {
+            this._layoutState = undefined;
             auxiliaryBarContainer.style.display = "none";
             this.host.setEditorContentRightInset(0);
             if (this._sash) {
@@ -48,7 +52,10 @@ class DockedAuxiliaryBarController extends Disposable {
         }
         const editorRect = this.editorPartContainer.getBoundingClientRect();
         const editorContentHidden = !this.host.isEditorVisible();
-        const auxWidth = editorContentHidden ? editorRect.width : DockedAuxiliaryBarController.getEffectiveWidth(this.host.getWidth(), editorRect.width);
+        const auxWidth = editorContentHidden ? editorRect.width : this._getLayoutWidth(this.host.getWidth(), editorRect.width);
+        if (editorContentHidden) {
+            this._layoutState = undefined;
+        }
         const top = this._getTop();
         const height = Math.max(0, editorRect.height - top);
         auxiliaryBarContainer.style.display = "";
@@ -70,6 +77,37 @@ class DockedAuxiliaryBarController extends Disposable {
             Math.max(DockedAuxiliaryBarController.MIN_WIDTH, Math.min(hostWidth, maxWidth))
         );
     }
+    _getLayoutWidth(requestedWidth, editorWidth) {
+        const constrainedWidth = DockedAuxiliaryBarController.getEffectiveWidth(requestedWidth, editorWidth);
+        const previous = this._layoutState;
+        let auxiliaryBarWidth = constrainedWidth;
+        if (previous?.requestedWidth === requestedWidth) {
+            if (editorWidth > previous.editorWidth) {
+                const editorGrowth = editorWidth - previous.editorWidth;
+                const previousEditorContentWidth = previous.editorWidth - previous.auxiliaryBarWidth;
+                const editorGrowthBeforeAuxiliaryBar = Math.max(
+                    0,
+                    DockedAuxiliaryBarController.EDITOR_PREFERRED_WIDTH - previousEditorContentWidth
+                );
+                auxiliaryBarWidth = Math.min(
+                    constrainedWidth,
+                    previous.auxiliaryBarWidth + Math.max(0, editorGrowth - editorGrowthBeforeAuxiliaryBar)
+                );
+            } else {
+                auxiliaryBarWidth = Math.min(previous.auxiliaryBarWidth, constrainedWidth);
+            }
+            auxiliaryBarWidth = Math.max(
+                Math.min(editorWidth, DockedAuxiliaryBarController.MIN_WIDTH),
+                auxiliaryBarWidth
+            );
+        }
+        this._layoutState = {
+            requestedWidth,
+            editorWidth,
+            auxiliaryBarWidth
+        };
+        return auxiliaryBarWidth;
+    }
     _ensureSash() {
         if (this._sash) {
             return;
@@ -78,7 +116,7 @@ class DockedAuxiliaryBarController extends Disposable {
         const layoutProvider = {
             getVerticalSashLeft: () => {
                 const width = editorPartContainer.clientWidth;
-                const auxWidth = this.host.isEditorVisible() ? DockedAuxiliaryBarController.getEffectiveWidth(this.host.getWidth(), width) : width;
+                const auxWidth = this.host.isEditorVisible() ? this._layoutState?.auxiliaryBarWidth ?? DockedAuxiliaryBarController.getEffectiveWidth(this.host.getWidth(), width) : width;
                 return Math.max(0, width - auxWidth);
             },
             getVerticalSashTop: () => this._getTop(),
@@ -89,7 +127,7 @@ class DockedAuxiliaryBarController extends Disposable {
         })));
         this._sash = sash;
         this._register(sash.onDidStart(() => {
-            this._sashStartWidth = this.host.getWidth();
+            this._sashStartWidth = this._layoutState?.auxiliaryBarWidth ?? this.host.getWidth();
             this._sashCollapsed = false;
         }));
         this._register(sash.onDidChange(e => {

package/vscode/src/vs/sessions/browser/layoutActions.js

@@ -4,25 +4,35 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
-import { Action2, registerAction2, MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { MenuId, MenuRegistry, Action2, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { Menus } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/menus';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility';
 import { TogglePanelAction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/panel/panelActions';
-import { IsAuxiliaryWindowContext, SideBarVisibleContext, PanelVisibleContext, IsSessionsWindowContext, IsTopRightEditorGroupContext, AuxiliaryBarVisibleContext, IsWindowAlwaysOnTopContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
+import { LayoutDensityMenu } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/actions/layoutDensityActions';
+import { IsAuxiliaryWindowContext, SideBarVisibleContext, PanelVisibleContext, IsWindowAlwaysOnTopContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { Parts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { SessionsWelcomeVisibleContext, IsPhoneLayoutContext, CustomViewVisibleContext, SinglePaneLayoutEnabledContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
+import { IsPhoneLayoutContext, SessionsWelcomeVisibleContext, CustomViewVisibleContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
 
-const panelCloseIcon = registerIcon("agent-panel-close", Codicon.close, ( localize(2952, "Icon to close the panel.")));
+for (const menu of [Menus.TitleBarContext, MenuId.MenubarViewMenu]) {
+    MenuRegistry.appendMenuItem(menu, {
+        title: ( localize(3351, "Layout Density")),
+        submenu: LayoutDensityMenu,
+        group: "2_configuration",
+        order: 8,
+        when: ( IsPhoneLayoutContext.negate())
+    });
+}
+const panelCloseIcon = registerIcon("agent-panel-close", Codicon.close, ( localize(3352, "Icon to close the panel.")));
 const sidebarToggleClosedIcon = registerIcon(
     "agent-sidebar-toggle-closed",
     Codicon.layoutSidebarLeftOff,
-    ( localize(2953, "Icon for the sessions sidebar when closed."))
+    ( localize(3353, "Icon for the sessions sidebar when closed."))
 );
-const sidebarToggleOpenIcon = registerIcon("agent-sidebar-toggle-open", Codicon.layoutSidebarLeft, ( localize(2954, "Icon for the sessions sidebar when open.")));
+const sidebarToggleOpenIcon = registerIcon("agent-sidebar-toggle-open", Codicon.layoutSidebarLeft, ( localize(3354, "Icon for the sessions sidebar when open.")));
 class ToggleSidebarVisibilityAction extends Action2 {
     static {
         this.ID = "workbench.action.agentToggleSidebarVisibility";
@@ -30,14 +40,14 @@ class ToggleSidebarVisibilityAction extends Action2 {
     constructor() {
         super({
             id: ToggleSidebarVisibilityAction.ID,
-            title: ( localize2(2955, "Toggle Side Bar")),
+            title: ( localize2(3355, "Toggle Side Bar")),
             icon: sidebarToggleClosedIcon,
             toggled: {
                 condition: SideBarVisibleContext,
                 icon: sidebarToggleOpenIcon
             },
             metadata: {
-                description: ( localize(2956, "Open/Show and Close/Hide Sidebar"))
+                description: ( localize(3356, "Open/Show and Close/Hide Sidebar"))
             },
             category: Categories.View,
             f1: true,
@@ -57,7 +67,7 @@ class ToggleSidebarVisibilityAction extends Action2 {
         const layoutService = accessor.get(IWorkbenchLayoutService);
         const isCurrentlyVisible = layoutService.isVisible(Parts.SIDEBAR_PART);
         layoutService.setPartHidden(isCurrentlyVisible, Parts.SIDEBAR_PART);
-        const alertMessage = isCurrentlyVisible ? ( localize(2957, "Primary Side Bar hidden")) : ( localize(2958, "Primary Side Bar shown"));
+        const alertMessage = isCurrentlyVisible ? ( localize(3357, "Primary Side Bar hidden")) : ( localize(3358, "Primary Side Bar shown"));
         alert(alertMessage);
     }
 }
@@ -65,8 +75,8 @@ registerAction2(ToggleSidebarVisibilityAction);
 MenuRegistry.appendMenuItem(Menus.TitleBarAccessibility, {
     command: {
         id: "editor.action.toggleScreenReaderAccessibilityMode",
-        title: ( localize(2959, "Screen Reader Optimized")),
-        tooltip: ( localize(2960, "Disable Screen Reader Optimized Mode"))
+        title: ( localize(3359, "Screen Reader Optimized")),
+        tooltip: ( localize(3360, "Disable Screen Reader Optimized Mode"))
     },
     group: "navigation",
     order: 0,
@@ -76,7 +86,7 @@ const titleBarPanelWhen = ( ContextKeyExpr.and(( IsAuxiliaryWindowContext.toNega
 MenuRegistry.appendMenuItem(Menus.TitleBarSessionMenu, {
     command: {
         id: TogglePanelAction.ID,
-        title: ( localize(2961, "Show Panel")),
+        title: ( localize(3361, "Show Panel")),
         icon: Codicon.layoutPanelOff,
         precondition: ( CustomViewVisibleContext.negate())
     },
@@ -87,7 +97,7 @@ MenuRegistry.appendMenuItem(Menus.TitleBarSessionMenu, {
 MenuRegistry.appendMenuItem(Menus.TitleBarSessionMenu, {
     command: {
         id: TogglePanelAction.ID,
-        title: ( localize(2962, "Hide Panel")),
+        title: ( localize(3362, "Hide Panel")),
         icon: Codicon.layoutPanel,
         precondition: ( CustomViewVisibleContext.negate())
     },
@@ -95,36 +105,10 @@ MenuRegistry.appendMenuItem(Menus.TitleBarSessionMenu, {
     order: 10,
     when: ( ContextKeyExpr.and(titleBarPanelWhen, PanelVisibleContext))
 });
-const editorTitleAuxiliaryBarWhen = ( ContextKeyExpr.and(IsSessionsWindowContext, ( IsAuxiliaryWindowContext.toNegated()), ( CustomViewVisibleContext.negate()), IsTopRightEditorGroupContext));
-const isSinglePaneDetailPanelDisabled = ( SinglePaneLayoutEnabledContext.negate());
-MenuRegistry.appendMenuItem(MenuId.EditorTitleLayout, {
-    command: {
-        id: "workbench.action.toggleAuxiliaryBar",
-        title: ( localize(2963, "Hide Secondary Side Bar")),
-        icon: Codicon.rightPanelHide
-    },
-    group: "navigation",
-    order: 99.5,
-    when: ( ContextKeyExpr.and(
-        editorTitleAuxiliaryBarWhen,
-        AuxiliaryBarVisibleContext,
-        isSinglePaneDetailPanelDisabled
-    ))
-});
-MenuRegistry.appendMenuItem(MenuId.EditorTitleLayout, {
-    command: {
-        id: "workbench.action.toggleAuxiliaryBar",
-        title: ( localize(2964, "Show Secondary Side Bar")),
-        icon: Codicon.rightPanelShow
-    },
-    group: "navigation",
-    order: 99.5,
-    when: ( ContextKeyExpr.and(editorTitleAuxiliaryBarWhen, ( AuxiliaryBarVisibleContext.toNegated()), isSinglePaneDetailPanelDisabled))
-});
 MenuRegistry.appendMenuItem(Menus.PanelTitle, {
     command: {
         id: "workbench.action.closePanel",
-        title: ( localize(2965, "Hide Panel")),
+        title: ( localize(3363, "Hide Panel")),
         icon: panelCloseIcon
     },
     group: "navigation",
@@ -133,7 +117,7 @@ MenuRegistry.appendMenuItem(Menus.PanelTitle, {
 MenuRegistry.appendMenuItem(Menus.TitleBarRightLayout, {
     command: {
         id: "workbench.action.toggleWindowAlwaysOnTop",
-        title: ( localize(2966, "Toggle Always on Top")),
+        title: ( localize(3364, "Toggle Always on Top")),
         icon: Codicon.pin,
         toggled: {
             condition: IsWindowAlwaysOnTopContext,

package/vscode/src/vs/sessions/browser/mobileWorkbench.d.ts

@@ -0,0 +1,4 @@
+import { AgentWorkbenchLayout, Workbench } from "@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench";
+export declare class MobileWorkbench extends Workbench {
+    get agentWorkbenchLayout(): AgentWorkbenchLayout;
+}

package/vscode/src/vs/sessions/browser/mobileWorkbench.js

@@ -0,0 +1,10 @@
+
+import { Workbench, AgentWorkbenchLayout } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench';
+
+class MobileWorkbench extends Workbench {
+    get agentWorkbenchLayout() {
+        return AgentWorkbenchLayout.Mobile;
+    }
+}
+
+export { MobileWorkbench };

package/vscode/src/vs/sessions/browser/parts/chatCompositeBar.d.ts

@@ -13,6 +13,8 @@ import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/h
 import { ISessionsProvidersService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsProvidersService.service";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
+import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 /**
  * The data + callbacks a {@link ChatCompositeBar} needs to render the tabs of a
  * single chat group. Supplied by the owning {@link ChatGroupView} so the bar
@@ -61,10 +63,14 @@ export declare class ChatCompositeBar extends Disposable {
     private readonly _sessionsProvidersService;
     private readonly _commandService;
     private readonly _editorGroupsService;
+    private readonly _keybindingService;
+    private readonly _configurationService;
     private readonly _container;
     private readonly _tabsRow;
     private readonly _tabsContainer;
     private readonly _tabsScrollbar;
+    private readonly _connectedTabOverflowEdge;
+    private _connectedTab;
     private readonly _sessionActionsContainer;
     private readonly _sessionToolbar;
     private readonly _tabs;
@@ -83,7 +89,7 @@ export declare class ChatCompositeBar extends Disposable {
     get element(): HTMLElement;
     get visible(): boolean;
     get height(): number;
-    constructor(resizeObserverCtor: typeof ResizeObserver | undefined, _themeService: IThemeService, _sessionsManagementService: ISessionsManagementService, _contextMenuService: IContextMenuService, _contextViewService: IContextViewService, _hoverService: IHoverService, _instantiationService: IInstantiationService, _sessionsProvidersService: ISessionsProvidersService, _commandService: ICommandService, _editorGroupsService: IEditorGroupsService);
+    constructor(resizeObserverCtor: typeof ResizeObserver | undefined, _themeService: IThemeService, _sessionsManagementService: ISessionsManagementService, _contextMenuService: IContextMenuService, _contextViewService: IContextViewService, _hoverService: IHoverService, _instantiationService: IInstantiationService, _sessionsProvidersService: ISessionsProvidersService, _commandService: ICommandService, _editorGroupsService: IEditorGroupsService, _keybindingService: IKeybindingService, _configurationService: IConfigurationService);
     /**
      * Tells the bar which chat group to render. The bar will display the chats
      * of the given group and track its active chat. Pass `undefined` to clear.
@@ -92,6 +98,7 @@ export declare class ChatCompositeBar extends Disposable {
     setAriaLabel(label: string): void;
     private _rebuildTabs;
     private _updateScrollDimensions;
+    private _updateConnectedTabClipping;
     private _createTab;
     private _isInTabInput;
     /**
@@ -102,10 +109,8 @@ export declare class ChatCompositeBar extends Disposable {
      * state for the chat — the caller then offers no chat-reference payload.
      */
     private _backendChatResource;
-    /**
-     * Start an inline rename for the given tab. Enter commits via
-     * {@link ISessionsManagementService.renameChat}; Escape or blur cancels.
-     */
+    startFocusedTabEditing(): boolean;
+    startTabEditing(chatResource: URI): boolean;
     private _startTabEditing;
     private _cancelTabEditing;
     private _endTabEditing;