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

package/vscode/src/vs/sessions/contrib/files/browser/files.contribution.js

@@ -1,26 +1,40 @@
 
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Action2, MenuId, 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 { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { AGENT_HOST_SCHEME } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostUri';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.service';
+import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { Extensions, WindowEnablement, ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
+import { SESSIONS_FILES_VIEW_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/files/common/files';
 import { ViewPaneContainer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { WorkspaceFolderCountContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
-import { SESSIONS_FILES_VIEW_ID, SessionsExplorerView, SESSIONS_FILES_EMPTY_VIEW_ID, SessionsExplorerEmptyView } from './filesView.js';
+import { WorkspaceFolderCountContext, IsSessionsWindowContext, ActiveEditorContext, ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
+import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+import { resolveCommandsContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
+import { FileDownload } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/files/browser/fileImportExport';
+import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { Menus } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/menus';
+import { EmptyFileEditorInput } from '../../editor/browser/emptyFileEditorInput.js';
+import { SessionsExplorerView, SESSIONS_FILES_EMPTY_VIEW_ID, SessionsExplorerEmptyView } from './filesView.js';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
-import { IsPhoneLayoutContext, SessionHasWorkspaceContext, SinglePaneLayoutEnabledContext, IsQuickChatSessionContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
+import { IsPhoneLayoutContext, SessionHasWorkspaceContext, DesktopLayoutContext, IsQuickChatSessionContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
 
 const SESSIONS_FILES_CONTAINER_ID = "workbench.sessions.auxiliaryBar.filesContainer";
-const filesViewIcon = registerIcon("sessions-files-view-icon", Codicon.files, ( localize2(4076, "View icon of the files view in the sessions window.")).value);
+const filesViewIcon = registerIcon("sessions-files-view-icon", Codicon.files, ( localize2(4718, "View icon of the files view in the sessions window.")).value);
 const viewContainerRegistry = ( Registry.as(Extensions.ViewContainersRegistry));
 const filesViewContainer = viewContainerRegistry.registerViewContainer({
     id: SESSIONS_FILES_CONTAINER_ID,
-    title: ( localize2(4077, "Files")),
+    title: ( localize2(4719, "Files")),
     icon: filesViewIcon,
     order: 11,
     ctorDescriptor: ( new SyncDescriptor(ViewPaneContainer, [SESSIONS_FILES_CONTAINER_ID, {
@@ -30,8 +44,8 @@ const filesViewContainer = viewContainerRegistry.registerViewContainer({
     hideIfEmpty: true,
     openCommandActionDescriptor: {
         id: SESSIONS_FILES_CONTAINER_ID,
-        title: ( localize2(4078, "Explorer")),
-        mnemonicTitle: ( localize(4079, "Fil&&es")),
+        title: ( localize2(4720, "Explorer")),
+        mnemonicTitle: ( localize(4721, "Fil&&es")),
         keybindings: {
             primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyE
         },
@@ -49,7 +63,7 @@ class RegisterFilesViewContribution {
         const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
         viewsRegistry.registerViews([{
             id: SESSIONS_FILES_VIEW_ID,
-            name: ( localize2(4077, "Files")),
+            name: ( localize2(4719, "Files")),
             containerIcon: filesViewIcon,
             ctorDescriptor: ( new SyncDescriptor(SessionsExplorerView)),
             canToggleVisibility: false,
@@ -59,12 +73,12 @@ class RegisterFilesViewContribution {
         }], filesViewContainer);
         viewsRegistry.registerViews([{
             id: SESSIONS_FILES_EMPTY_VIEW_ID,
-            name: ( localize2(4077, "Files")),
+            name: ( localize2(4719, "Files")),
             containerIcon: filesViewIcon,
             ctorDescriptor: ( new SyncDescriptor(SessionsExplorerEmptyView)),
             canToggleVisibility: false,
             canMoveView: false,
-            when: ( ContextKeyExpr.and(( IsPhoneLayoutContext.negate()), ( ContextKeyExpr.or(( ContextKeyExpr.and(( WorkspaceFolderCountContext.isEqualTo("0")), SessionHasWorkspaceContext)), ( ContextKeyExpr.and(SinglePaneLayoutEnabledContext, IsQuickChatSessionContext)))))),
+            when: ( ContextKeyExpr.and(( IsPhoneLayoutContext.negate()), ( ContextKeyExpr.or(( ContextKeyExpr.and(( WorkspaceFolderCountContext.isEqualTo("0")), SessionHasWorkspaceContext)), ( ContextKeyExpr.and(DesktopLayoutContext, IsQuickChatSessionContext)))))),
             windowEnablement: WindowEnablement.Sessions
         }], filesViewContainer);
     }
@@ -74,11 +88,61 @@ registerWorkbenchContribution2(
     RegisterFilesViewContribution,
     WorkbenchPhase.BlockStartup
 );
+class DownloadRemoteFileAction extends Action2 {
+    static {
+        this.ID = "sessions.files.action.downloadRemoteFile";
+    }
+    constructor() {
+        const precondition = ( ContextKeyExpr.and(IsSessionsWindowContext, ( ActiveEditorContext.notEqualsTo(EmptyFileEditorInput.EDITOR_ID)), ResourceContextKey.IsFileSystemResource, ( ContextKeyExpr.or(( ResourceContextKey.Scheme.isEqualTo(AGENT_HOST_SCHEME)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeRemote))))));
+        super({
+            id: DownloadRemoteFileAction.ID,
+            title: ( localize2(4722, "Download...")),
+            icon: Codicon.cloudDownload,
+            precondition,
+            menu: [{
+                id: Menus.SessionsEditorTitle,
+                group: "2_download",
+                when: ( ContextKeyExpr.and(precondition, DesktopLayoutContext))
+            }, {
+                id: MenuId.EditorTitle,
+                group: "navigation",
+                when: ( ContextKeyExpr.and(precondition, ( DesktopLayoutContext.negate())))
+            }]
+        });
+    }
+    async run(accessor, ...args) {
+        const editorService = accessor.get(IEditorService);
+        const fileService = accessor.get(IFileService);
+        const notificationService = accessor.get(INotificationService);
+        const instantiationService = accessor.get(IInstantiationService);
+        const context = resolveCommandsContext(
+            args,
+            editorService,
+            accessor.get(IEditorGroupsService),
+            accessor.get(IListService)
+        );
+        const resources = context.groupedEditors.flatMap(group => group.editors).map(editor => EditorResourceAccessor.getCanonicalUri(editor, {
+            supportSideBySide: SideBySideEditor.PRIMARY
+        })).filter(
+            resource => resource !== undefined && (resource.scheme === AGENT_HOST_SCHEME || resource.scheme === Schemas.vscodeRemote)
+        );
+        try {
+            const sources = await Promise.all(resources.map(resource => fileService.resolve(resource)));
+            if (sources.length > 0) {
+                await instantiationService.createInstance(FileDownload).download(sources);
+            }
+        } catch (error) {
+            notificationService.error(error);
+            throw error;
+        }
+    }
+}
+registerAction2(DownloadRemoteFileAction);
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "sessions.files.action.collapseExplorerFolders",
-            title: ( localize2(4080, "Collapse Folders in Explorer")),
+            title: ( localize2(4723, "Collapse Folders in Explorer")),
             icon: Codicon.collapseAll,
             menu: {
                 id: MenuId.ViewTitle,
@@ -97,4 +161,4 @@ registerAction2(class extends Action2 {
     }
 });
 
-export { RegisterFilesViewContribution, SESSIONS_FILES_CONTAINER_ID };
+export { DownloadRemoteFileAction, RegisterFilesViewContribution, SESSIONS_FILES_CONTAINER_ID };

package/vscode/src/vs/sessions/contrib/files/browser/filesView.d.ts

@@ -9,9 +9,10 @@ import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
 import { ExplorerView } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/files/browser/views/explorerView";
-export declare const SESSIONS_FILES_VIEW_ID = "sessions.files.explorer";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 export declare const SESSIONS_FILES_EMPTY_VIEW_ID = "sessions.files.explorer.empty";
 export declare class SessionsExplorerView extends ExplorerView {
+    selectResource(resource: URI | undefined, reveal?: "focusNoScroll" | "force" | boolean, retry?: number): Promise<void>;
     protected get primaryActionGroups(): string[] | undefined;
     protected getLocationBasedColors(): IViewPaneLocationColors;
 }

package/vscode/src/vs/sessions/contrib/files/browser/filesView.js

@@ -13,15 +13,25 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
-import { agentsPanelBackground } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/theme';
+import { agentsPanelBackground } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/agentsColors';
 import { ExplorerView } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/files/browser/views/explorerView';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { NEW_FILE_TAB_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/sessionCommands';
 
 registerCss(filesView, 1);
 const $ = $$1;
-const SESSIONS_FILES_VIEW_ID = "sessions.files.explorer";
 const SESSIONS_FILES_EMPTY_VIEW_ID = "sessions.files.explorer.empty";
 class SessionsExplorerView extends ExplorerView {
+    async selectResource(resource, reveal = this.autoReveal, retry = 0) {
+        if (resource && reveal === "force" && retry === 0) {
+            await this.commandService.executeCommand(NEW_FILE_TAB_COMMAND_ID);
+            if (!this.isBodyVisible()) {
+                await Event.toPromise(Event.filter(this.onDidChangeBodyVisibility, () => this.isBodyVisible()));
+            }
+        }
+        await super.selectResource(resource, reveal, retry);
+    }
     get primaryActionGroups() {
         return ["1_files"];
     }
@@ -68,9 +78,9 @@ let SessionsExplorerEmptyView = class SessionsExplorerEmptyView extends ViewPane
         const bodyContainer = append(container, $(".files-empty-view-body"));
         const welcomeContainer = append(bodyContainer, $(".files-empty-welcome"));
         const welcomeMessage = append(welcomeContainer, $(".files-empty-welcome-message"));
-        welcomeMessage.textContent = ( localize(4081, "Folders and files will appear here."));
+        welcomeMessage.textContent = ( localize(4724, "Folders and files will appear here."));
     }
 };
 SessionsExplorerEmptyView = ( __decorate([( __param(1, IKeybindingService)), ( __param(2, IContextMenuService)), ( __param(3, IConfigurationService)), ( __param(4, IContextKeyService)), ( __param(5, IViewDescriptorService)), ( __param(6, IInstantiationService)), ( __param(7, IOpenerService)), ( __param(8, IThemeService)), ( __param(9, IHoverService))], SessionsExplorerEmptyView));
 
-export { SESSIONS_FILES_EMPTY_VIEW_ID, SESSIONS_FILES_VIEW_ID, SessionsExplorerEmptyView, SessionsExplorerView };
+export { SESSIONS_FILES_EMPTY_VIEW_ID, SessionsExplorerEmptyView, SessionsExplorerView };

package/vscode/src/vs/sessions/contrib/layout/browser/baseSessionLayoutController.d.ts

@@ -1,4 +1,5 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { IReader } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ResourceMap } from "@codingame/monaco-vscode-api/vscode/vs/base/common/map";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
@@ -6,6 +7,7 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 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 { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
@@ -15,15 +17,17 @@ import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IPaneCompositePartService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service";
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
 import { IAgentWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench.service";
+import { ChatLayoutContext } from "@codingame/monaco-vscode-api/vscode/vs/sessions/common/chatLayout";
 import { ISessionChangesService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/sessionChangesService";
 import { IChangesViewService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/common/changesViewService.service";
+import { IActiveSession } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement";
 import { ISessionsManagementService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement.service";
 import { ISessionsService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service";
 import { ISession } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session";
+import { ISessionEditorWorkingSetService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/layout/common/sessionEditorWorkingSet.service";
 /**
  * Per-session view state: auxiliary bar visibility and active view container.
- * Treated as opaque persisted data by the base controller; only the desktop
- * controller interprets it (see `desktopSessionLayoutController.md`).
+ * Retained as opaque persisted data for legacy layout-state migration.
  */
 export interface ISessionViewState {
     readonly auxiliaryBarVisible: boolean;
@@ -36,7 +40,7 @@ export interface ISessionViewState {
  * specified here is enumerated as rules **B1-B6** in
  * [baseSessionLayoutController.md](./baseSessionLayoutController.md).
  *
- * It owns the panel visibility (or, in single-pane, the panel view), editor
+ * It owns the panel visibility (or, in desktop, the panel view), editor
  * working sets, persistence, and the multi-session suppression that every layout
  * needs. Auxiliary bar management is platform-specific and supplied by subclasses
  * through {@link _registerViewStateManagement} (see the desktop / mobile controllers).
@@ -58,10 +62,13 @@ export declare abstract class BaseLayoutController extends Disposable {
     protected readonly _contextKeyService: IContextKeyService;
     protected readonly _instantiationService: IInstantiationService;
     protected readonly _lifecycleService: ILifecycleService;
+    protected readonly _logService: ILogService;
+    private readonly _editorWorkingSetService;
     protected readonly _panelVisibilityBySession: ResourceMap<boolean>;
     protected readonly _panelViewBySession: ResourceMap<string>;
     protected readonly _viewStateBySession: ResourceMap<ISessionViewState>;
     protected readonly _workingSets: ResourceMap<IEditorWorkingSet>;
+    private readonly _legacyReferencedWorkingSetIds;
     /**
      * [B2] Whether the editor part was hidden (e.g. the user closed the Side
      * Panel while keeping editors open) for a session, captured on switch-away so
@@ -69,6 +76,11 @@ export declare abstract class BaseLayoutController extends Disposable {
      */
     protected readonly _editorPartHiddenBySession: ResourceMap<boolean>;
     private readonly _workingSetSequencer;
+    private _pendingEditorWorkingSetRestore;
+    private _settledEditorWorkingSetKey;
+    private readonly _chatLayoutOwnerKeys;
+    private readonly _replacedSessionResources;
+    protected readonly _chatLayoutContext: ChatLayoutContext | undefined;
     protected readonly activeSessionResourceObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<URI | undefined>;
     protected readonly multipleSessionsVisibleObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservableWithChange<boolean, void>;
     /**
@@ -97,8 +109,7 @@ export declare abstract class BaseLayoutController extends Disposable {
     private readonly _useModalConfigObs;
     /**
      * Storage key for this controller's per-session layout state. Overridable so a
-     * sibling controller (e.g. single-pane) persists to a fresh key instead of
-     * sharing the classic desktop state.
+     * presentation-specific controller can persist to its own key.
      */
     protected get _layoutStateStorageKey(): string;
     /**
@@ -106,6 +117,7 @@ export declare abstract class BaseLayoutController extends Disposable {
      * sibling controller has no legacy state to migrate).
      */
     protected get _legacyWorkingSetsStorageKey(): string | undefined;
+    protected get _legacyLayoutStateStorageKey(): string | undefined;
     protected get _isEditorPartVisibilityPerSession(): boolean;
     protected get _isViewStatePerSession(): boolean;
     /**
@@ -116,7 +128,21 @@ export declare abstract class BaseLayoutController extends Disposable {
      * panel's visibility.
      */
     protected get _isPanelVisibilityPerSession(): boolean;
-    constructor(_layoutService: IAgentWorkbenchLayoutService, _sessionManagementService: ISessionsManagementService, _sessionsService: ISessionsService, _viewsService: IViewsService, _paneCompositePartService: IPaneCompositePartService, _storageService: IStorageService, _configurationService: IConfigurationService, _editorService: IEditorService, _editorGroupsService: IEditorGroupsService, _workspaceContextService: IWorkspaceContextService, _sessionChangesService: ISessionChangesService, _changesViewService: IChangesViewService, _viewDescriptorService: IViewDescriptorService, _contextKeyService: IContextKeyService, _instantiationService: IInstantiationService, _lifecycleService: ILifecycleService);
+    protected get _isPanelViewPerSession(): boolean;
+    protected get _isPanelVisibilityPersisted(): boolean;
+    protected get _isLayoutStateVersioned(): boolean;
+    protected get _chatLayoutEnabled(): boolean;
+    protected _chatLayoutActive(reader?: IReader): boolean;
+    protected _chatLayoutSuspended(reader?: IReader): boolean;
+    protected _panelVisibilityKeyFor(session: IActiveSession, reader?: IReader): URI | undefined;
+    protected _defaultPanelVisibility(_key: URI): boolean;
+    constructor(_layoutService: IAgentWorkbenchLayoutService, _sessionManagementService: ISessionsManagementService, _sessionsService: ISessionsService, _viewsService: IViewsService, _paneCompositePartService: IPaneCompositePartService, _storageService: IStorageService, _configurationService: IConfigurationService, _editorService: IEditorService, _editorGroupsService: IEditorGroupsService, _workspaceContextService: IWorkspaceContextService, _sessionChangesService: ISessionChangesService, _changesViewService: IChangesViewService, _viewDescriptorService: IViewDescriptorService, _contextKeyService: IContextKeyService, _instantiationService: IInstantiationService, _lifecycleService: ILifecycleService, _logService: ILogService, _editorWorkingSetService: ISessionEditorWorkingSetService);
+    protected _ownerKeyForChat(sessionResource: URI, chatResource: URI, mainChatResource: URI, reader?: IReader): URI | undefined;
+    protected _ownerKeyFor(session: IActiveSession, reader?: IReader): URI | undefined;
+    private _editorWorkingSetOwnerFor;
+    private _takePendingEditorWorkingSetRestore;
+    private _applyPendingEditorWorkingSetRestore;
+    protected _registerPersistedOwnerKeys(keys: Iterable<URI>): void;
     /**
      * Hook for a layout controller to create and own its auxiliary controllers.
      * The base implementation does nothing.
@@ -133,7 +159,7 @@ export declare abstract class BaseLayoutController extends Disposable {
      * command-palette entry). The command calls the workbench layout service
      * directly; this controller observes the service's toggle lifecycle events.
      */
-    private _registerSidePaneToggleAction;
+    static registerSidePaneToggleAction(): IDisposable;
     /**
      * Hook for subclasses to register platform-specific auxiliary bar
      * view-state management. Runs at the end of the base constructor. The base
@@ -141,6 +167,8 @@ export declare abstract class BaseLayoutController extends Disposable {
      */
     protected _registerViewStateManagement(): void;
     protected _onSessionReplaced(from: ISession, to: ISession): void;
+    private _remapOwnerKeyState;
+    private _forgetPeerChatState;
     /**
      * Whether the auxiliary bar currently has at least one active view container
      * (shown as a tab). Mirrors the workbench's own container-visibility rule
@@ -157,6 +185,8 @@ export declare abstract class BaseLayoutController extends Disposable {
      * state is about to be persisted. The base implementation does nothing.
      */
     protected _captureActiveSessionViewState(_sessionResource: URI): void;
+    protected _onOwnerKeyRemapped(_oldKey: URI, _newKey: URI): void;
+    protected _onOwnerKeysForgotten(_keys: readonly URI[]): void;
     /**
      * Runs a session-switch layout restore with {@link _isRestoringSessionLayout}
      * held until the (possibly async) work settles, so part-visibility changes the
@@ -182,13 +212,13 @@ export declare abstract class BaseLayoutController extends Disposable {
     protected _shouldRevealEditorPartForEmptyWorkingSet(_revealEditorPart: boolean): boolean;
     /**
      * Hook deciding whether {@link _applyWorkingSet} actively hides the editor part
-     * when restoring a session that had it hidden. The base never hides (in the
-     * classic layout the editor part visibility is not a per-session choice); the
-     * single-pane layout restores its docked editor part both ways.
+     * when restoring a session that had it hidden. The base never hides; layouts
+     * may opt into restoring their editor part both ways.
      */
     protected _shouldHideEditorPartOnApply(_editorPartHidden: boolean): boolean;
     /** Hook invoked before a session working set is queued for application. */
     protected _onWillApplyWorkingSet(_workingSet: IEditorWorkingSet | "empty"): void;
+    protected _onActiveSessionSwitched(_previousSession: IActiveSession, _session: IActiveSession | undefined): void;
     /**
      * Reveals the editor part. Editor working sets are restored into the shared
      * editor area on session switch, which requires the editor part to be visible.
@@ -196,6 +226,9 @@ export declare abstract class BaseLayoutController extends Disposable {
     private _revealEditorPartForWorkingSet;
     /** Hides the editor part to restore a session that had its docked editor closed. */
     private _hideEditorPartForWorkingSet;
+    private _applySessionLayoutEntries;
+    private _parseVersionedSessionLayoutEntries;
+    private _collectLegacyReferencedWorkingSetIds;
     private _loadState;
     private _saveState;
     private _syncPanelVisibility;
@@ -208,4 +241,6 @@ export declare abstract class BaseLayoutController extends Disposable {
     private _applyWorkingSet;
     private _saveWorkingSet;
     private _deleteWorkingSet;
+    private _isWorkingSetStillReferenced;
+    private _releaseWorkingSetReference;
 }