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

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

@@ -2,8 +2,10 @@ import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
+import { IAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { LayoutPriority } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/splitview/splitview";
-import { SerializableGrid } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/grid";
+import { Direction, ISerializedGrid } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/grid";
 import { Part } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/part";
 import { IActiveSession } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement";
 import { SessionView } from "./sessionView.js";
@@ -11,10 +13,14 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { IProgressIndicator } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress";
 import { IAgentWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench.service";
 import { ISessionsChatBackgroundService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/chatBackground/browser/chatBackgroundService.service";
+import { ISessionGridSlot, SessionGridRequest } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsPartService";
+import { SessionGridLayout } from "./sessionGridLayout.js";
 export declare class SessionsPart extends Part {
     private readonly agentWorkbenchLayoutService;
     private readonly instantiationService;
     private readonly chatBackgroundService;
+    private readonly accessibilityService;
+    private readonly telemetryService;
     readonly minimumWidth: number;
     readonly maximumWidth: number;
     readonly minimumHeight: number;
@@ -23,22 +29,18 @@ export declare class SessionsPart extends Part {
     /** Border width on the card (1px each side) */
     static readonly BORDER_WIDTH = 1;
     /** Internal grid that hosts the part's session views. */
-    protected _gridWidget: SerializableGrid<SessionView> | undefined;
+    protected _gridWidget: SessionGridLayout | undefined;
+    private _gridRequest;
+    private readonly _onDidInteractWithGrid;
+    readonly onDidInteractWithGrid: Event<void>;
     /** Lazily-created progress bar shown at the top of the content area. */
     private _progressBar;
     private _progressIndicator;
-    /**
-     * Session views mounted in the grid, in display order (left-to-right). Slots
-     * are reused across reconciliations: only the slot count changes with the
-     * number of visible sessions; each slot is rebound to its session by position
-     * via {@link SessionView.openSession}. There is always at least one slot — a
-     * new-session placeholder (`boundSessionId === undefined`) when no sessions
-     * are visible.
-     */
+    /** Stable model slots in depth-first grid order, including the empty composer. */
     private readonly _slots;
     private readonly _onDidFocusSession;
     /** Fired when a session view in the grid receives keyboard focus. */
-    readonly onDidFocusSession: Event<string>;
+    readonly onDidFocusSession: Event<string | undefined>;
     protected _lastLayout: {
         readonly width: number;
         readonly height: number;
@@ -47,6 +49,8 @@ export declare class SessionsPart extends Part {
     } | undefined;
     private readonly _multipleSessionsVisibleKey;
     private readonly _sessionsFocusKey;
+    private readonly _pickerVisibilityContextKeys;
+    private readonly _activeViewPickerVisibility;
     /**
      * Whether the part itself is visible in the workbench grid. Starts `true`
      * because the workbench grid only calls {@link setVisible} on change.
@@ -57,17 +61,12 @@ export declare class SessionsPart extends Part {
     private get _sessionViewsVisible();
     get preferredHeight(): number | undefined;
     readonly priority = LayoutPriority.High;
-    constructor(themeService: IThemeService, storageService: IStorageService, agentWorkbenchLayoutService: IAgentWorkbenchLayoutService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, chatBackgroundService: ISessionsChatBackgroundService);
+    constructor(themeService: IThemeService, storageService: IStorageService, agentWorkbenchLayoutService: IAgentWorkbenchLayoutService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, chatBackgroundService: ISessionsChatBackgroundService, accessibilityService: IAccessibilityService, telemetryService: ITelemetryService);
     create(parent: HTMLElement): void;
     protected createContentArea(parent: HTMLElement): HTMLElement;
+    private activateCodicon;
     private _findTargetView;
-    /**
-     * Reconcile the grid with the desired set of visible sessions. Reuses the
-     * existing {@link SessionView} slots, growing or shrinking the pool only when
-     * the number of visible sessions changes, and rebinds each slot to its
-     * session by position via {@link SessionView.openSession}.
-     */
-    updateVisibleSessions(visible: readonly (IActiveSession | undefined)[], active: IActiveSession | undefined): void;
+    updateVisibleSessions(visible: readonly (IActiveSession | undefined)[], active: IActiveSession | undefined, gridSlots?: readonly ISessionGridSlot[], request?: SessionGridRequest): void;
     private _updateContextKeys;
     /**
      * Pushes the grid's current maximized state into each {@link SessionView} so
@@ -84,6 +83,13 @@ export declare class SessionsPart extends Part {
      * the call was a no-op.
      */
     toggleMaximizeSession(sessionId: string | undefined): boolean | undefined;
+    getGridLayout(): ISerializedGrid | undefined;
+    getNeighborSession(sessionId: string | undefined, direction: Direction): IActiveSession | null | undefined;
+    getSessionPlacement(sessionId: string): {
+        sessionId: string | undefined;
+        direction: Direction;
+    } | undefined;
+    resizeSession(sessionId: string | undefined, direction: Direction, amount: number): void;
     /**
      * Returns the {@link SessionView} currently hosting the given session id, or
      * the placeholder (new-session) view when `sessionId` is `undefined`. Returns

package/vscode/src/vs/sessions/browser/parts/sessionsPart.js

@@ -2,20 +2,25 @@
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import * as sessionsPart from './media/sessionsPart.css';
+import { triggerConfettiAnimation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/animations/animations';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { agentsPanelBorder } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/theme';
+import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
+import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { agentsPanelBorder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/agentsColors';
 import { Parts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
 import { assertReturnsDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { LayoutPriority } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/splitview/splitview';
-import { SerializableGrid, Sizing, Direction } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/grid';
+import { Direction } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/grid';
 import { Part } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/part';
 import { ActiveSessionsContext, SessionsFocusContext, MultipleSessionsVisibleContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
-import { $, trackFocus, isAncestor, isAncestorOfActiveElement, addDisposableListener, EventType, addDisposableGenericMouseDownListener } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $, trackFocus, addDisposableListener, EventType, isHTMLElement, isAncestor, isAncestorOfActiveElement, addDisposableGenericMouseDownListener } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { SessionView } from './sessionView.js';
-import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Color } from '@codingame/monaco-vscode-api/vscode/vs/base/common/color';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
@@ -34,9 +39,14 @@ import { ProgressBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser
 import { defaultProgressBarStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { AbstractProgressScope, ScopedProgressIndicator } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/progress/browser/progressIndicator';
 import { IAgentWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench.service';
-import { applyAgentsPartCardStyles, getAgentsPartCardContentSize } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/parts/agentsPartCard';
+import { applyAgentsPartCardStyles, getAgentsPartCardContentSize, getSessionsPartCardMarginRight } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/parts/agentsPartCard';
+import { isPhoneLayout } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/parts/mobile/mobileLayout';
 import { SessionsChatBackgroundRenderer } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/chatBackground/browser/chatBackgroundRenderer';
 import { ISessionsChatBackgroundService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/chatBackground/browser/chatBackgroundService.service';
+import { SessionPickerVisibilityContextKeys, noSessionPickerVisibility } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionPickerVisibility';
+import { SessionGridLayout } from './sessionGridLayout.js';
+import { AGENTS_FLOATING_PANEL_GAP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/agentsSizes';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 registerCss(sessionsPart, 0);
 let SessionsPart = class SessionsPart extends Part {
@@ -58,7 +68,9 @@ let SessionsPart = class SessionsPart extends Part {
         agentWorkbenchLayoutService,
         contextKeyService,
         instantiationService,
-        chatBackgroundService
+        chatBackgroundService,
+        accessibilityService,
+        telemetryService
     ) {
         super(Parts.SESSIONS_PART, {
             hasTitle: false,
@@ -67,19 +79,25 @@ let SessionsPart = class SessionsPart extends Part {
         this.agentWorkbenchLayoutService = agentWorkbenchLayoutService;
         this.instantiationService = instantiationService;
         this.chatBackgroundService = chatBackgroundService;
+        this.accessibilityService = accessibilityService;
+        this.telemetryService = telemetryService;
         this.minimumWidth = 300;
         this.maximumWidth = Number.POSITIVE_INFINITY;
         this.minimumHeight = 0;
         this.maximumHeight = Number.POSITIVE_INFINITY;
+        this._onDidInteractWithGrid = this._register(( new Emitter()));
+        this.onDidInteractWithGrid = this._onDidInteractWithGrid.event;
         this._slots = [];
         this._onDidFocusSession = this._register(( new Emitter()));
         this.onDidFocusSession = this._onDidFocusSession.event;
+        this._activeViewPickerVisibility = this._register(( new MutableDisposable()));
         this._isPartVisible = true;
         this._contentVisible = true;
         this.priority = LayoutPriority.High;
         ActiveSessionsContext.bindTo(contextKeyService);
         this._sessionsFocusKey = SessionsFocusContext.bindTo(contextKeyService);
         this._multipleSessionsVisibleKey = MultipleSessionsVisibleContext.bindTo(contextKeyService);
+        this._pickerVisibilityContextKeys = this._register(( new SessionPickerVisibilityContextKeys(contextKeyService)));
     }
     create(parent) {
         this.element = parent;
@@ -87,7 +105,10 @@ let SessionsPart = class SessionsPart extends Part {
         super.create(parent);
     }
     createContentArea(parent) {
-        const backgroundRenderer = this._register(( new SessionsChatBackgroundRenderer(parent)));
+        const backgroundRenderer = this._register(( new SessionsChatBackgroundRenderer(parent, true)));
+        this._register(
+            backgroundRenderer.onDidActivateCodicon(element => this.activateCodicon(element))
+        );
         const updateBackground = () => backgroundRenderer.setBackground(this.chatBackgroundService.getBackground());
         this._register(this.chatBackgroundService.onDidChangeBackground(updateBackground));
         updateBackground();
@@ -98,16 +119,24 @@ let SessionsPart = class SessionsPart extends Part {
         this._register(focusTracker.onDidBlur(() => this._sessionsFocusKey.set(false)));
         this._progressBar = this._register(( new ProgressBar(contentArea, defaultProgressBarStyles)));
         this._progressBar.hide();
-        const placeholder = this._createSlot();
-        this._gridWidget = this._register(( new SerializableGrid(placeholder.view, {
-            styles: {
-                separatorBorder: this._gridSeparatorBorder
-            }
-        })));
+        const placeholder = this._createSlot("initial");
+        this._gridWidget = this._register(( new SessionGridLayout()));
+        this._gridWidget.style({
+            separatorBorder: this._gridSeparatorBorder
+        });
+        this._gridWidget.reconcile([{
+            id: placeholder.id,
+            view: placeholder.view
+        }], placeholder.id);
         this._slots.push(placeholder);
         contentArea.appendChild(this._gridWidget.element);
+        this._register(this._gridWidget.onDidChangeMaximized(() => this._updateMaximizedState()));
         this._register(
-            this._gridWidget.onDidChangeViewMaximized(() => this._updateMaximizedState())
+            addDisposableListener(this._gridWidget.element, EventType.POINTER_DOWN, event => {
+                if (isHTMLElement(event.target) && event.target.closest(".monaco-sash")) {
+                    this._onDidInteractWithGrid.fire();
+                }
+            })
         );
         const dropDelegate = {
             findTargetView: child => this._findTargetView(child)
@@ -117,6 +146,13 @@ let SessionsPart = class SessionsPart extends Part {
         );
         return contentArea;
     }
+    activateCodicon(element) {
+        if (!this.accessibilityService.isMotionReduced()) {
+            triggerConfettiAnimation(element);
+        }
+        this.accessibilityService.status(( localize(3457, "Confetti!")));
+        this.telemetryService.publicLog2("vscodeAgents.codiconBackground/confetti", {});
+    }
     _findTargetView(child) {
         for (const slot of this._slots) {
             if (slot.boundSessionId === undefined) {
@@ -131,41 +167,62 @@ let SessionsPart = class SessionsPart extends Part {
         }
         return undefined;
     }
-    updateVisibleSessions(visible, active) {
+    updateVisibleSessions(visible, active, gridSlots, request) {
         if (!this._gridWidget) {
             return;
         }
-        const desiredCount = Math.max(visible.length, 1);
-        while (this._slots.length < desiredCount) {
-            const slot = this._createSlot();
-            const reference = this._slots[this._slots.length - 1].view;
-            this._gridWidget.addView(slot.view, Sizing.Distribute, reference, Direction.Right);
-            this._slots.push(slot);
-        }
-        while (this._slots.length > desiredCount) {
-            const slot = this._slots.pop();
-            this._gridWidget.removeView(slot.view, Sizing.Distribute);
-            slot.disposables.dispose();
-        }
-        for (let i = 0; i < this._slots.length; i++) {
-            const slot = this._slots[i];
-            const session = visible[i];
+        this._activeViewPickerVisibility.clear();
+        const sessions = visible.length ? visible : [undefined];
+        const oldSlots = ( new Map(this._slots.map(slot => [slot.id, slot])));
+        const next = sessions.map((session, index) => {
+            const id = gridSlots?.[index].id ?? session?.sessionId ?? "initial";
+            const slot = oldSlots.get(id) ?? this._createSlot(id);
+            oldSlots.delete(id);
             slot.boundSessionId = session?.sessionId;
+            slot.session = session;
             slot.view.openSession(session, {});
-        }
+            return slot;
+        });
+        this._slots.splice(0, this._slots.length, ...next);
         const activeId = active?.sessionId;
+        const activeSlot = this._slots.find(slot => slot.boundSessionId === activeId) ?? (this._slots.length === 1 ? this._slots[0] : undefined);
         for (const slot of this._slots) {
-            const isActive = (slot.boundSessionId !== undefined && slot.boundSessionId === activeId) || this._slots.length === 1;
+            const isActive = slot === activeSlot;
             slot.view.element.classList.toggle("is-active", isActive);
             slot.view.setActive(isActive);
         }
-        if (this._gridWidget.hasMaximizedView()) {
-            const maximizedSlot = this._slots.find(s => this._gridWidget.isViewMaximized(s.view));
-            if (maximizedSlot && maximizedSlot.boundSessionId !== activeId) {
-                this._gridWidget.exitMaximizedView();
+        this._gridWidget.reconcile(next.map((slot, index) => ({
+            id: slot.id,
+            view: slot.view,
+            placement: gridSlots?.[index].placement
+        })), activeSlot?.id ?? next[0].id);
+        for (const slot of ( oldSlots.values())) {
+            slot.disposables.dispose();
+        }
+        if (request && request !== this._gridRequest) {
+            this._gridRequest = request;
+            if (request.type === "arrange") {
+                this._gridWidget.arrange();
+            } else {
+                this._gridWidget.restore(request.grid);
             }
         }
+        this._updateMaximizedState();
+        if (this._lastLayout) {
+            const {
+                width,
+                height,
+                top,
+                left
+            } = this._lastLayout;
+            this.layout(width, height, top, left);
+        }
         this._updateContextKeys(visible);
+        this._activeViewPickerVisibility.value = autorun(reader => {
+            this._pickerVisibilityContextKeys.set(
+                activeSlot?.view.pickerVisibility.read(reader) ?? noSessionPickerVisibility
+            );
+        });
     }
     _updateContextKeys(visible) {
         this._multipleSessionsVisibleKey.set(visible.length > 1);
@@ -175,7 +232,7 @@ let SessionsPart = class SessionsPart extends Part {
             return;
         }
         for (const slot of this._slots) {
-            slot.view.setMaximized(this._gridWidget.isViewMaximized(slot.view));
+            slot.view.setMaximized(this._gridWidget.maximized === slot.id);
         }
     }
     toggleMaximizeSession(sessionId) {
@@ -186,16 +243,50 @@ let SessionsPart = class SessionsPart extends Part {
         if (!slot) {
             return undefined;
         }
-        if (this._gridWidget.isViewMaximized(slot.view)) {
-            this._gridWidget.exitMaximizedView();
-            return false;
-        } else if (this._slots.filter(s => s.boundSessionId !== undefined).length >= 2) {
-            this._gridWidget.maximizeView(slot.view);
+        const maximized = this._gridWidget.toggleMaximized(slot.id);
+        if (maximized !== undefined) {
+            this._onDidInteractWithGrid.fire();
             slot.view.focus();
-            return true;
+        }
+        return maximized;
+    }
+    getGridLayout() {
+        return this._gridWidget?.serialize();
+    }
+    getNeighborSession(sessionId, direction) {
+        const slot = this._slots.find(slot => slot.boundSessionId === sessionId);
+        const neighbor = slot && this._gridWidget?.neighbor(slot.id, direction);
+        const target = this._slots.find(slot => slot.id === neighbor);
+        return target ? target.session ?? null : undefined;
+    }
+    getSessionPlacement(sessionId) {
+        const slot = this._slots.find(slot => slot.boundSessionId === sessionId);
+        if (slot) {
+            const placement = this._gridWidget?.placement(slot.id);
+            const reference = this._slots.find(slot => slot.id === placement?.reference);
+            if (reference && placement) {
+                return {
+                    sessionId: reference.boundSessionId,
+                    direction: placement.direction
+                };
+            }
         }
         return undefined;
     }
+    resizeSession(sessionId, direction, amount) {
+        const slot = this._slots.find(slot => slot.boundSessionId === sessionId);
+        const size = slot && this._gridWidget?.getSize(slot.id);
+        if (slot && size) {
+            this._onDidInteractWithGrid.fire();
+            const horizontal = direction === Direction.Left || direction === Direction.Right;
+            const delta = direction === Direction.Left || direction === Direction.Up ? -amount : amount;
+            this._gridWidget?.resize(
+                slot.id,
+                size.width + (horizontal ? delta : 0),
+                size.height + (horizontal ? 0 : delta)
+            );
+        }
+    }
     getSessionView(sessionId) {
         return this._slots.find(s => s.boundSessionId === sessionId)?.view;
     }
@@ -216,7 +307,7 @@ let SessionsPart = class SessionsPart extends Part {
         }
         const containerRect = this._gridWidget.element.getBoundingClientRect();
         const viewRect = view.element.getBoundingClientRect();
-        const isFullyVisible = viewRect.left >= containerRect.left - 1 && viewRect.right <= containerRect.right + 1;
+        const isFullyVisible = viewRect.left >= containerRect.left - 1 && viewRect.right <= containerRect.right + 1 && viewRect.top >= containerRect.top - 1 && viewRect.bottom <= containerRect.bottom + 1;
         if (!isFullyVisible) {
             view.element.scrollIntoView({
                 block: "nearest",
@@ -242,36 +333,32 @@ let SessionsPart = class SessionsPart extends Part {
         }
         return this._progressIndicator;
     }
-    _createSlot() {
+    _createSlot(id) {
         const disposables = ( new DisposableStore());
         const view = disposables.add(this.instantiationService.createInstance(SessionView));
         view.setPartVisible(this._sessionViewsVisible);
         const slot = {
+            id,
             view,
             disposables,
             boundSessionId: undefined
         };
         const fireFocus = () => {
-            if (slot.boundSessionId !== undefined) {
-                this._restoreSessionOnActivation(view);
-                this._onDidFocusSession.fire(slot.boundSessionId);
-            }
+            this._restoreSessionOnActivation(slot);
+            this._onDidFocusSession.fire(slot.boundSessionId);
         };
         disposables.add(addDisposableListener(view.element, EventType.FOCUS_IN, fireFocus, true));
         disposables.add(addDisposableGenericMouseDownListener(view.element, fireFocus, true));
         return slot;
     }
-    _restoreSessionOnActivation(view) {
+    _restoreSessionOnActivation(slot) {
         if (!this._gridWidget) {
             return;
         }
-        const viewSize = this._gridWidget.getViewSize(view);
-        if (viewSize.width === view.minimumWidth) {
-            this._gridWidget.expandView(view);
-        }
+        this._gridWidget.expand(slot.id);
     }
     get _gridSeparatorBorder() {
-        return this.theme.getColor(agentsPanelBorder) || this.theme.getColor(contrastBorder) || Color.transparent;
+        return this.theme.getColor(contrastBorder) || this.theme.getColor(agentsPanelBorder)?.transparent(0.5) || Color.transparent;
     }
     updateStyles() {
         super.updateStyles();
@@ -311,14 +398,26 @@ let SessionsPart = class SessionsPart extends Part {
             top,
             left
         };
-        const cardSize = getAgentsPartCardContentSize(width, height, this.agentWorkbenchLayoutService.isEditorPaneVisible());
+        const phoneLayout = isPhoneLayout(this.layoutService);
+        const compactLayout = this.layoutService.isModernUICompact();
+        const cardSize = getAgentsPartCardContentSize(
+            width,
+            height,
+            this.agentWorkbenchLayoutService.isEditorPaneVisible(),
+            this.layoutService.isVisible(Parts.SIDEBAR_PART),
+            phoneLayout,
+            compactLayout,
+            getSessionsPartCardMarginRight(this.layoutService.mainContainer)
+        );
         const {
             contentSize
         } = this.layoutContents(cardSize.width, cardSize.height);
-        this._gridWidget?.layout(contentSize.width, contentSize.height, top, left);
+        const gridGap = phoneLayout || compactLayout ? 0 : AGENTS_FLOATING_PANEL_GAP;
+        this._gridWidget?.layout(contentSize.width, contentSize.height, top, left, phoneLayout, gridGap);
         super.layout(width, height, top, left);
     }
     dispose() {
+        this._activeViewPickerVisibility.clear();
         for (const slot of this._slots) {
             slot.disposables.dispose();
         }
@@ -331,6 +430,6 @@ let SessionsPart = class SessionsPart extends Part {
         };
     }
 };
-SessionsPart = ( __decorate([( __param(0, IThemeService)), ( __param(1, IStorageService)), ( __param(2, IAgentWorkbenchLayoutService)), ( __param(3, IContextKeyService)), ( __param(4, IInstantiationService)), ( __param(5, ISessionsChatBackgroundService))], SessionsPart));
+SessionsPart = ( __decorate([( __param(0, IThemeService)), ( __param(1, IStorageService)), ( __param(2, IAgentWorkbenchLayoutService)), ( __param(3, IContextKeyService)), ( __param(4, IInstantiationService)), ( __param(5, ISessionsChatBackgroundService)), ( __param(6, IAccessibilityService)), ( __param(7, ITelemetryService))], SessionsPart));
 
 export { SessionsPart };

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

@@ -4,8 +4,9 @@ import { SessionView } from "./sessionView.js";
 import { IActiveSession } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement";
 import { IProgressIndicator } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import { IToggleMaximizeSessionEvent } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsPartService";
+import { ISessionGridSlot, IToggleMaximizeSessionEvent, SessionGridRequest } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsPartService";
 import { ISessionsPartService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsPartService.service";
+import { Direction } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/grid";
 /**
  * Owns the lifecycle of the {@link SessionsPart}. Selects the mobile vs. desktop
  * variant based on viewport width at construction time. Registered as an eager
@@ -21,9 +22,17 @@ export declare class SessionsParts extends Disposable implements ISessionsPartSe
     private readonly _mainPart;
     private readonly _onDidToggleMaximizeSession;
     readonly onDidToggleMaximizeSession: Event<IToggleMaximizeSessionEvent>;
-    get onDidFocusSession(): Event<string>;
+    get onDidFocusSession(): Event<string | undefined>;
     constructor(instantiationService: IInstantiationService);
-    updateVisibleSessions(visible: readonly (IActiveSession | undefined)[], active: IActiveSession | undefined): void;
+    updateVisibleSessions(visible: readonly (IActiveSession | undefined)[], active: IActiveSession | undefined, slots?: readonly ISessionGridSlot[], request?: SessionGridRequest): void;
+    getGridLayout(): import("@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/grid").ISerializedGrid | undefined;
+    getNeighborSession(sessionId: string | undefined, direction: Direction): IActiveSession | null | undefined;
+    getSessionPlacement(sessionId: string): {
+        sessionId: string | undefined;
+        direction: Direction;
+    } | undefined;
+    resizeSession(sessionId: string | undefined, direction: Direction, amount: number): void;
+    get onDidInteractWithGrid(): Event<void>;
     setContentVisible(visible: boolean): void;
     toggleMaximizeSession(session: IActiveSession | undefined): void;
     focusSession(session: IActiveSession | undefined): void;

package/vscode/src/vs/sessions/browser/parts/sessionsParts.js

@@ -25,8 +25,23 @@ let SessionsParts = class SessionsParts extends Disposable {
             instantiationService.createInstance(isPhoneLayout ? MobileSessionsPart : SessionsPart)
         );
     }
-    updateVisibleSessions(visible, active) {
-        this._mainPart.updateVisibleSessions(visible, active);
+    updateVisibleSessions(visible, active, slots, request) {
+        this._mainPart.updateVisibleSessions(visible, active, slots, request);
+    }
+    getGridLayout() {
+        return this._mainPart.getGridLayout();
+    }
+    getNeighborSession(sessionId, direction) {
+        return this._mainPart.getNeighborSession(sessionId, direction);
+    }
+    getSessionPlacement(sessionId) {
+        return this._mainPart.getSessionPlacement(sessionId);
+    }
+    resizeSession(sessionId, direction, amount) {
+        this._mainPart.resizeSession(sessionId, direction, amount);
+    }
+    get onDidInteractWithGrid() {
+        return this._mainPart.onDidInteractWithGrid;
     }
     setContentVisible(visible) {
         this._mainPart.setContentVisible(visible);

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

@@ -1,6 +1,6 @@
 import { IReader } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
-import { ISession } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session";
+import { IActiveSession } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement";
 export interface ISessionWorkspaceDisplayInfo {
     readonly label: string;
     readonly icon: ThemeIcon;
@@ -8,5 +8,8 @@ export interface ISessionWorkspaceDisplayInfo {
     readonly branch: string | undefined;
     readonly worktreePending: boolean;
 }
-/** Returns the workspace presentation shared by the command center and Files pill. */
-export declare function getSessionWorkspaceDisplayInfo(session: ISession | undefined, reader: IReader): ISessionWorkspaceDisplayInfo | undefined;
+/**
+ * Returns the workspace presentation shared by the command center and Files
+ * pill, for the active chat's workspace, which may differ from the session's.
+ */
+export declare function getSessionWorkspaceDisplayInfo(session: IActiveSession | undefined, reader: IReader): ISessionWorkspaceDisplayInfo | undefined;

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

@@ -3,7 +3,7 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { getSessionWorkspaceKind, SessionWorkspaceKind } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session';
 
 function getSessionWorkspaceDisplayInfo(session, reader) {
-    const workspace = session?.workspace.read(reader);
+    const workspace = session?.activeChat.read(reader).workspace.read(reader);
     if (!workspace?.label) {
         return undefined;
     }
@@ -11,7 +11,7 @@ function getSessionWorkspaceDisplayInfo(session, reader) {
     const kind = getSessionWorkspaceKind(workspace, worktreePending);
     const icon = workspace.typeIcon ?? (kind === SessionWorkspaceKind.Virtual ? Codicon.cloudCompact : kind === SessionWorkspaceKind.Folder ? Codicon.folderCompact : Codicon.worktreeCompact);
     const folder = workspace.folders[0];
-    const branch = worktreePending ? undefined : folder?.gitRepository?.branchName?.trim() || undefined;
+    const branch = kind === SessionWorkspaceKind.Worktree && !worktreePending ? folder?.gitRepository?.branchName?.trim() || undefined : undefined;
     const workingDirectoryPath = worktreePending ? undefined : folder?.workingDirectory.fsPath;
     return { label: workspace.label, icon, workingDirectoryPath, branch, worktreePending };
 }