sessions: single-pane layout as a sibling controller with composed strategies (#324657)
* sessions: fix base-controller single-pane leak via Template Method hooks (R1)
Move the single-pane branches out of BaseLayoutController into
SinglePaneDesktopSessionLayoutController via three protected hooks
(_suppressEditorVisibilityDuringRestore, _shouldRevealEditorPartOnApply,
_shouldRevealEditorPartForEmptyWorkingSet). The base controller no longer
reads isSinglePaneLayoutEnabled.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* sessions: segregate docked-editor layout concerns into IDockedEditorLayout (R3)
Extract handleDockedEditorPartLayout and isEditorRevealedExplicitly into a
focused IDockedEditorLayout interface that IAgentWorkbenchLayoutService extends,
keeping the cross-cutting isSinglePaneLayoutEnabled and
suppressEditorPartAutoVisibility on the main contract. Fix stale typo comment.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* sessions: extract side-pane presentation Strategy from workbench (R2/R4)
Replace the 26 scattered _dockDetailPanel branches in workbench.ts with an
ISidePaneLayoutStrategy (GridSidePaneStrategy + DockedSidePaneStrategy),
selected once at initLayout. DockedSidePaneStrategy owns the docked width,
the DockedAuxiliaryBarController lifecycle, the reveal-sync, and a
DockedEditorSizeMemento for the docked size bookkeeping (R4). Workbench
implements ISidePaneLayoutHost and delegates geometry, grid-descriptor,
visibility-mutator, and reveal-sync work to the strategy. Behaviour is
unchanged in both layouts; the only remaining _dockDetailPanel reference is
the strategy selection point.
Rewrites workbench.test.ts to drive the real strategy through a host harness.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* sessions: replace side-pane Strategy with Workbench subclass (R5)
Convert the composition-based ISidePaneLayoutStrategy into inheritance,
matching the layout-controller Template Method pattern. The base Workbench
now carries the classic (grid) layout as protected _-prefixed hooks;
SinglePaneWorkbench overrides them for the docked detail-panel layout and
owns the docked width, DockedAuxiliaryBarController, reveal-sync, and
DockedEditorSizeMemento. A createSessionsWorkbench factory picks the subclass
from the setting at construction; web.main.ts and sessions.main.ts use it.
Removes sidePaneLayoutStrategy.ts and the ISidePaneLayoutHost callback
interface. No behaviour change in either layout.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* sessions: single-pane editor part owns the auxiliary bar (R6)
Make editor + auxiliary bar a single unit in the single-pane (new) layout by
having the editor part create and own the auxiliary bar instead of the
workbench/pane-composite service:
- New SinglePaneMainEditorPart extends MainEditorPart; lazily creates the
SinglePaneAuxiliaryBarPart via a getter and owns the DockedAuxiliaryBarController
(created in create(), calling setContentRightInset directly).
- EditorParts.createMainEditorPart() returns SinglePaneMainEditorPart when the
shared shouldUseSinglePaneLayout(config) predicate is true.
- AgenticPaneCompositePartService retrieves the same aux bar instance from the
editor part in single-pane; classic/mobile create it as before.
- SinglePaneWorkbench drops DockedAuxiliaryBarController ownership; keeps the
docked width (exposed via getDockedAuxiliaryBarWidth/setDockedAuxiliaryBarWidth
on IDockedEditorLayout) and reveal-sync, delegating layout to the editor part.
- workbenchFactory, EditorParts, and the pane-composite service all select via
the single shouldUseSinglePaneLayout predicate so the workbench, editor part,
and aux bar are always chosen together (fixes a phone-viewport + setting-on
mismatch that would pair SinglePaneWorkbench with a plain MainEditorPart).
Classic (default) and mobile layouts are unchanged.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* sessions: make isSinglePaneLayoutEnabled class-based, not a config read
Address review feedback: since the workbench subclass is selected at construction
(Workbench vs SinglePaneWorkbench), isSinglePaneLayoutEnabled is now a class-level
constant — false in the base, overridden to true in SinglePaneWorkbench — instead
of reading DOCK_DETAIL_PANEL_SETTING at runtime. Removes the _configurationServiceForLayout
field. This also aligns the flag with the phone-aware workbench selection, so it no
longer reports single-pane on a phone viewport where the classic workbench is used.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* sessions: single-pane editor-group header menus, docked aux bar, and header styling
- Make the full-width Changes header a group-level editor concept: the editor
part configures header menu ids via IEditorGroupViewOptions.headerMenuIds and
the editor opts in via IEditorPane.getHeaderActions(); EditorGroupView renders
the menus (no concrete menu points leak into core).
- Docked aux bar: top border connecting to the sash, and hide editor/aux when
their sash collapses them.
- Changes pill and file-diff open reveal the editor explicitly
(revealEditorPartExplicitly), and close the Files tab when a real file opens.
- Header styling: re-scope diff-stats/picker CSS via marker classes, restore
inter-action spacing, and shrink the right toolbar buttons to 24px.
- Fix setHeaderContent wiping freshly-rendered content on re-render; tie per-group
header listeners to group removal.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* sessions: reparent single-pane layout to a sibling controller with composed strategies
Make `SinglePaneLayoutController` a sibling of the classic desktop
`LayoutController` (both extend `BaseLayoutController`) instead of extending it,
so the desktop controller can be deprecated/deleted without affecting
single-pane. Its behaviour is composed from focused strategy objects under
`contrib/layout/browser/singlePane/`:
- Detail (aux bar) ownership split in two — `SinglePaneDetailVisibilityStrategy`
owns per-session shown/hidden memory (D1-D4); `SinglePaneDetailPanelStrategy`
owns container selection (Changes/Files), maximize, browser-hide, and the
nothing-to-show hide. Removed the overlapping `EmptyAuxCleanup` (D10) strategy
and desktop's redundant saved-container machinery.
- `SinglePaneManagedTabsStrategy` + `SinglePaneEditorAreaCollapseStrategy` share a
`SinglePaneDockedTabsCoordinator`; plus `SinglePaneResponsiveSidebarStrategy`
(Toggle Details), `SinglePaneNewSessionRulesStrategy` (R1), and
`SinglePaneQuickChatEditorHideStrategy`.
- Strategies coordinate through the controller via `ISinglePaneLayoutContext`.
- Fresh per-session storage keys (`sessions.singlePane.*`) so single-pane never
shares state with the classic controller.
Fix a chain of new-session-submit / Detail-only bugs (all verified in-app):
- New-session submit no longer reveals the docked editor or hides the just-opened
detail. `onDidReplaceSession` fires before the controller's later-registered
listener, so submit is detected intrinsically from the reactive transition
(`!previousIsCreated && isCreated`); D3c leaves the detail as-is when a session
has no saved state; the empty-editor-group hide is skipped during a layout
restore.
- Detail-only sessions no longer flicker the editor open on switch or reload: the
editor-part grid view (which hosts the docked aux bar) no longer maps its
visibility to `setEditorHidden`, the width-based reveal-sync bails while
editor-part auto-visibility is suppressed, and the persisted editor width uses
the node's real visibility so a reload restores the collapsed node width.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Fix component fixture screenshot CI
Add the missing workbench layout service mock needed by the changes view fixtures and update blocks-ci screenshot hashes to the expected CI output.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* sessions: fix cramped Changes actions bar in the single-pane editor header
The `ChangesActionsBar` marker (`.changes-actions-bar`) only carried a height
rule in the single-pane editor-group header; the classic
`.session-changes-editor-header-right` normalization does not reach that header,
so the primary split-button and the trailing secondary icon actions rendered
cramped together with no spacing or button chrome.
Add the container flex/gap layout and the secondary icon-button chrome (padding,
corner radius, secondary background/border + hover) keyed off `.changes-actions-bar`,
using design tokens, so it applies in the single-pane editor-group header while
staying idempotent for the classic internal changes-editor header (whose element
also carries `.session-changes-editor-header-right` with the same values).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* sessions: match classic Changes actions bar chrome in single-pane editor header
The single-pane editor-group header renders the Changes actions bar
(`.changes-actions-bar`) inside `.editor-group-header-secondary`, where the
high-specificity `editorgroupview.css` rules stretched the primary split-button
but gave the trailing secondary icon actions (Mark as Done, Run Code Review) no
inter-button gap and no button chrome, so they rendered flat and cramped against
the dropdown chevron.
Add, at matching specificity in `editorgroupview.css`, the container flex/gap and
the secondary icon-button chrome (padding, corner radius, secondary
background/border + hover) mirroring the classic `.chat-editing-session-actions`
actions bar. Drop the equivalent low-specificity rules from
`sessionChangesEditor.css`, which lost the cascade to the editor-group-header
selectors.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* sessions: fix single-pane Changes actions bar and move its styles out of core
In the single-pane editor-group header the Changes actions bar renders as a
toolbar action item inside a `.monaco-action-bar`, where the generic rule
`.monaco-action-bar .action-item .codicon { width: 16px; height: 16px }` clamped
every codicon — including the button elements themselves (which carry the
`codicon` class), squashing the secondary icon buttons and detaching the
split-button chevron.
- Un-clamp the codicons and lay out the bar (primary split-button grows, trailing
secondary icons stay natural size) scoped to `.monaco-action-bar
.action-item.changes-actions-bar`, so the classic internal changes-editor header
and the aux-bar Changes view are left untouched.
- Move all `.changes-actions-bar`-specific rules OUT of core
`editorgroupview.css` into the contributing component's
`sessionChangesEditor.css`; core keeps only the generic header/toolbar layout.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* sessions: draw the single-pane header divider under the editor header/tab bar
Move the single-pane detail-panel separator from the auxiliary bar's top border
to a bottom divider on the editor header (spanning the editor content and docked
detail), so the line runs the full header width. When the active editor has no
header toolbars (e.g. Files), the divider is drawn under the tab bar instead so a
separator is always present below the header row.
The docked auxiliary bar is absolutely positioned over the right of the editor
part with a solid background, so it would overlay the divider. Rather than fight
it with z-index, start the aux bar one divider-thickness below the header/tab bar
(new `DockedAuxiliaryBarController.DIVIDER` offset applied to the aux top/height
and the resize sash), so its background sits just beneath the line.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* sessions: update docked aux geometry tests for the header-divider offset
The docked auxiliary bar now starts one divider-thickness below the header/tab
bar (`DockedAuxiliaryBarController.DIVIDER`), so its top and height shift by 1px
(top 34->35, height 566->565). Update the two workbench geometry snapshot tests
to the new expected values. Fixes the CI unit-test failures on the PR.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Sandeep Somavarapu · github.com-microsoft-vscode · e656eb8d · 2026-07-07