@codingame/monaco-vscode-workbench-service-override 20.5.0 → 21.0.1

package/index.js

@@ -25,8 +25,8 @@ import { getWorkbenchContainer } from '@codingame/monaco-vscode-api/workbench';
 import { onLayout, onRenderWorkbench } from '@codingame/monaco-vscode-api/lifecycle';
 export { EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from '@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common/service-override/tools/views';
 export { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
-export { ViewPaneContainer } from '@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
-export { ConfirmResult } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/platform/dialogs/common/dialogs';
+export { ViewPaneContainer } from '@codingame/monaco-vscode-71c8dbff-4c98-552f-aef0-e72b00fdcfc0-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+export { ConfirmResult } from '@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/platform/dialogs/common/dialogs';
 export { RegisteredEditorPriority } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService';
 export { AbstractResourceEditorInput } from '@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common/vscode/vs/workbench/common/editor/textResourceEditorInput';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workbench-service-override",
-  "version": "20.5.0",
+  "version": "21.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - workbench service-override",
   "keywords": [],
@@ -15,25 +15,24 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "20.5.0",
-    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "20.5.0",
-    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "20.5.0",
-    "@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common": "20.5.0",
-    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "20.5.0",
-    "@codingame/monaco-vscode-85886bdb-61c5-52f1-8eb7-d1d32f6f8cbd-common": "20.5.0",
-    "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "20.5.0",
-    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "20.5.0",
-    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "20.5.0",
-    "@codingame/monaco-vscode-api": "20.5.0",
-    "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common": "20.5.0",
-    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "20.5.0",
-    "@codingame/monaco-vscode-f6f55824-df83-5ffc-ac26-50fd4df4fe0e-common": "20.5.0",
-    "@codingame/monaco-vscode-keybindings-service-override": "20.5.0",
-    "@codingame/monaco-vscode-quickaccess-service-override": "20.5.0",
-    "@codingame/monaco-vscode-view-banner-service-override": "20.5.0",
-    "@codingame/monaco-vscode-view-common-service-override": "20.5.0",
-    "@codingame/monaco-vscode-view-status-bar-service-override": "20.5.0",
-    "@codingame/monaco-vscode-view-title-bar-service-override": "20.5.0"
+    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "21.0.1",
+    "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common": "21.0.1",
+    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "21.0.1",
+    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "21.0.1",
+    "@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common": "21.0.1",
+    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "21.0.1",
+    "@codingame/monaco-vscode-71c8dbff-4c98-552f-aef0-e72b00fdcfc0-common": "21.0.1",
+    "@codingame/monaco-vscode-85886bdb-61c5-52f1-8eb7-d1d32f6f8cbd-common": "21.0.1",
+    "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "21.0.1",
+    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "21.0.1",
+    "@codingame/monaco-vscode-api": "21.0.1",
+    "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common": "21.0.1",
+    "@codingame/monaco-vscode-keybindings-service-override": "21.0.1",
+    "@codingame/monaco-vscode-quickaccess-service-override": "21.0.1",
+    "@codingame/monaco-vscode-view-banner-service-override": "21.0.1",
+    "@codingame/monaco-vscode-view-common-service-override": "21.0.1",
+    "@codingame/monaco-vscode-view-status-bar-service-override": "21.0.1",
+    "@codingame/monaco-vscode-view-title-bar-service-override": "21.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/service-override/tools/views.d.ts

@@ -2,17 +2,17 @@ import { type IViewContainerDescriptor, type IViewContainersRegistry, type IView
 import type { BrandedService, ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { type IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { Dimension } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/dom";
-import { ViewPaneContainer } from "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
+import { ViewPaneContainer } from "@codingame/monaco-vscode-71c8dbff-4c98-552f-aef0-e72b00fdcfc0-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { Codicon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/codicons";
 import { type EditorInputFactoryObject, type RegisteredEditorInfo, type RegisteredEditorOptions, RegisteredEditorPriority } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService";
 import { EditorInput, type IEditorCloseHandler } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput";
 import { EditorInputCapabilities, type IEditorOpenContext, type IEditorSerializer, Verbosity } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import type { IEditorOptions, IResourceEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor";
-import { EditorPane } from "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/parts/editor/editorPane";
+import { EditorPane } from "@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/browser/parts/editor/editorPane";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { DomScrollableElement } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/scrollbar/scrollableElement";
-import { ConfirmResult } from "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/platform/dialogs/common/dialogs";
+import { ConfirmResult } from "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/platform/dialogs/common/dialogs";
 import { AbstractResourceEditorInput } from "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common/vscode/vs/workbench/common/editor/resourceEditorInput";
 import { AbstractTextResourceEditorInput } from "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common/vscode/vs/workbench/common/editor/textResourceEditorInput";
 import { Parts, Position } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService";

package/vscode/src/vs/workbench/browser/layout.js

@@ -1,6 +1,6 @@
 
 import { Disposable, toDisposable, DisposableStore, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Dimension, getActiveDocument, getWindows, getClientArea, getWindow, createElement, addDisposableListener, EventType, isActiveDocument, getActiveElement, getActiveWindow, isAncestorUsingFlowTo, position, size, computeScreenAwareSize, getWindowId } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { onDidChangeFullscreen, isFullscreen, isWCOEnabled } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/browser';
 import { isWindows, isLinux, isWeb, isIOS, isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
@@ -8,7 +8,7 @@ import { pathsToEditors, isResourceEditorInput, EditorInputCapabilities } from '
 import { SidebarPart } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
 import { PanelPart } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/workbench/browser/parts/panel/panelPart';
 import { LayoutSettings, Parts, EditorActionsLocation, ActivityBarPosition, shouldShowCustomTitleBar, Position, isHorizontal, ZenModeSettings, isMultiWindowPart, partOpensMaximizedFromString, PartOpensMaximizedOptions, positionToString, positionFromString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
-import { isTemporaryWorkspace, WorkbenchState } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
+import { WorkbenchState, isTemporaryWorkspace } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
@@ -17,7 +17,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ITitleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/title/browser/titleService.service';
 import { StartupKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
-import { MenuSettings, TitleBarSetting, DEFAULT_WINDOW_SIZE, CustomTitleBarVisibility, hasNativeTitlebar, getMenuBarVisibility, useWindowControlsOverlay, hasNativeMenu } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
+import { MenuSettings, TitleBarSetting, DEFAULT_EMPTY_WINDOW_SIZE, DEFAULT_WORKSPACE_WINDOW_SIZE, CustomTitleBarVisibility, hasNativeTitlebar, getMenuBarVisibility, useWindowControlsOverlay, hasNativeMenu } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -48,9 +48,6 @@ import { AuxiliaryBarPart } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IAuxiliaryWindowService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service';
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
-import { StartupExperimentGroup } from '@codingame/monaco-vscode-f6f55824-df83-5ffc-ac26-50fd4df4fe0e-common/vscode/vs/workbench/services/coreExperimentation/common/coreExperimentationService';
-import { ICoreExperimentationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/coreExperimentation/common/coreExperimentationService.service';
-import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { setContainerElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
 import { Orientation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/sash/sash';
 import '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/base/browser/ui/grid/gridview';
@@ -81,7 +78,8 @@ const TITLE_BAR_SETTINGS = [
     TitleBarSetting.TITLE_BAR_STYLE,
     TitleBarSetting.CUSTOM_TITLE_BAR_VISIBILITY,
 ];
-const DEFAULT_WINDOW_DIMENSIONS = ( new Dimension(DEFAULT_WINDOW_SIZE.width, DEFAULT_WINDOW_SIZE.height));
+const DEFAULT_EMPTY_WINDOW_DIMENSIONS = ( new Dimension(DEFAULT_EMPTY_WINDOW_SIZE.width, DEFAULT_EMPTY_WINDOW_SIZE.height));
+const DEFAULT_WORKSPACE_WINDOW_DIMENSIONS = ( new Dimension(DEFAULT_WORKSPACE_WINDOW_SIZE.width, DEFAULT_WORKSPACE_WINDOW_SIZE.height));
 class Layout extends Disposable {
     get activeContainer() { return this.getContainerFromDocument(getActiveDocument()); }
     get containers() {
@@ -203,7 +201,7 @@ class Layout extends Disposable {
         this.statusBarService = accessor.get(IStatusbarService);
         accessor.get(IBannerService);
         this.registerLayoutListeners();
-        this.initLayoutState(accessor.get(ILifecycleService), accessor.get(IFileService), accessor.get(ICoreExperimentationService));
+        this.initLayoutState(accessor.get(ILifecycleService), accessor.get(IFileService));
     }
     registerLayoutListeners() {
         const showEditorIfHidden = () => {
@@ -392,16 +390,9 @@ class Layout extends Disposable {
             this.layout();
         }
     }
-    initLayoutState(lifecycleService, fileService, coreExperimentationService) {
-        this._mainContainerDimension = getClientArea(this.parent, DEFAULT_WINDOW_DIMENSIONS);
-        this.stateModel = ( new LayoutStateModel(
-            this.storageService,
-            this.configurationService,
-            this.contextService,
-            coreExperimentationService,
-            this.environmentService,
-            this.viewDescriptorService
-        ));
+    initLayoutState(lifecycleService, fileService) {
+        this._mainContainerDimension = getClientArea(this.parent, this.contextService.getWorkbenchState() === WorkbenchState.EMPTY ? DEFAULT_EMPTY_WINDOW_DIMENSIONS : DEFAULT_WORKSPACE_WINDOW_DIMENSIONS);
+        this.stateModel = ( new LayoutStateModel(this.storageService, this.configurationService, this.contextService));
         this.stateModel.load({
             mainContainerDimension: this._mainContainerDimension,
             resetLayout: Boolean(this.layoutOptions?.resetLayout)
@@ -1095,7 +1086,7 @@ class Layout extends Disposable {
                 this.handleContainerDidLayout(this.mainContainer, this._mainContainerDimension);
             }));
         }
-        this._register(this.storageService.onWillSaveState(e => {
+        this._register(this.storageService.onWillSaveState(() => {
             const sideBarSize = this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN)
                 ? this.workbenchGrid.getViewCachedVisibleSize(this.sideBarPartView)
                 : this.workbenchGrid.getViewSize(this.sideBarPartView).width;
@@ -1112,13 +1103,16 @@ class Layout extends Disposable {
             this.stateModel.setInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE, auxiliaryBarSize);
             this.stateModel.save(true, true);
         }));
+        this._register(Event.any(this.paneCompositeService.onDidPaneCompositeOpen, this.paneCompositeService.onDidPaneCompositeClose)(() => {
+            this.stateModel.setInitializationValue(LayoutStateKeys.AUXILIARYBAR_EMPTY, this.paneCompositeService.getPaneCompositeIds(ViewContainerLocation.AuxiliaryBar).length === 0);
+        }));
     }
     layout() {
         if (!this.disposed) {
             this._mainContainerDimension = getClientArea(this.state.runtime.mainWindowFullscreen ?
                 mainWindow.document.body :
                 this.parent,
-            DEFAULT_WINDOW_DIMENSIONS
+            this.contextService.getWorkbenchState() === WorkbenchState.EMPTY ? DEFAULT_EMPTY_WINDOW_DIMENSIONS : DEFAULT_WORKSPACE_WINDOW_DIMENSIONS
             );
             this.logService.trace(`Layout#layout, height: ${this._mainContainerDimension.height}, width: ${this._mainContainerDimension.width}`);
             position(this.mainContainer, 0, 0, 0, 0, 'relative');
@@ -1806,7 +1800,7 @@ class Layout extends Disposable {
     createGridDescriptor() {
         const { width, height } = this._mainContainerDimension;
         const sideBarSize = this.stateModel.getInitializationValue(LayoutStateKeys.SIDEBAR_SIZE);
-        const auxiliaryBarPartSize = this.stateModel.getInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE);
+        const auxiliaryBarSize = this.stateModel.getInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE);
         const panelSize = this.stateModel.getInitializationValue(LayoutStateKeys.PANEL_SIZE);
         const titleBarHeight = this.titleBarPartView.minimumHeight;
         const bannerHeight = this.bannerPartView.minimumHeight;
@@ -1842,7 +1836,7 @@ class Layout extends Disposable {
         const auxiliaryBarNode = {
             type: 'leaf',
             data: { type: Parts.AUXILIARYBAR_PART },
-            size: auxiliaryBarPartSize,
+            size: auxiliaryBarSize,
             visible: this.isVisible(Parts.AUXILIARYBAR_PART)
         };
         const editorNode = {
@@ -1985,6 +1979,7 @@ const LayoutStateKeys = {
             auxiliaryBarVisible: false
         }
     )),
+    AUXILIARYBAR_EMPTY: ( new InitializationStateKey('auxiliaryBar.empty', StorageScope.PROFILE, StorageTarget.MACHINE, false)),
     SIDEBAR_POSITON: ( new RuntimeStateKey(
         'sideBar.position',
         StorageScope.WORKSPACE,
@@ -2033,14 +2028,11 @@ var LegacyWorkbenchLayoutSettings;
 })(LegacyWorkbenchLayoutSettings || (LegacyWorkbenchLayoutSettings = {}));
 class LayoutStateModel extends Disposable {
     static { this.STORAGE_PREFIX = 'workbench.'; }
-    constructor(storageService, configurationService, contextService, coreExperimentationService, environmentService, viewDescriptorService) {
+    constructor(storageService, configurationService, contextService) {
         super();
         this.storageService = storageService;
         this.configurationService = configurationService;
         this.contextService = contextService;
-        this.coreExperimentationService = coreExperimentationService;
-        this.environmentService = environmentService;
-        this.viewDescriptorService = viewDescriptorService;
         this._onDidChangeState = this._register(( new Emitter()));
         this.onDidChangeState = this._onDidChangeState.event;
         this.stateCache = ( new Map());
@@ -2098,28 +2090,21 @@ class LayoutStateModel extends Disposable {
         LayoutStateKeys.AUXILIARYBAR_SIZE.defaultValue = Math.min(300, mainContainerDimension.width / 4);
         LayoutStateKeys.AUXILIARYBAR_HIDDEN.defaultValue = (() => {
             const configuration = this.configurationService.inspect(WorkbenchLayoutSettings.AUXILIARYBAR_DEFAULT_VISIBILITY);
-            if (configuration.defaultValue !== 'hidden' && !isConfigured(configuration)) {
-                if (isWeb && !this.environmentService.remoteAuthority) {
-                    return true;
-                }
-                const context = this.storageService.getObject('chat.setupContext', StorageScope.PROFILE);
-                if (context && ((context.installed && context.disabled) || (!context.installed && context.hidden))) {
-                    return true;
-                }
-                const location = this.viewDescriptorService.getViewLocationById('workbench.panel.chat.view.copilot');
-                if (location === ViewContainerLocation.Sidebar || location === ViewContainerLocation.Panel) {
-                    return true;
-                }
+            if (configuration.defaultValue !== 'hidden' && !isConfigured(configuration) && this.stateCache.get(LayoutStateKeys.AUXILIARYBAR_EMPTY.name)) {
+                return true;
             }
-            switch (this.configurationService.getValue(WorkbenchLayoutSettings.AUXILIARYBAR_DEFAULT_VISIBILITY)) {
-                case 'maximized':
-                case 'visible':
-                    return false;
+            if (this.isNew[StorageScope.APPLICATION] &&
+                configuration.value !== 'hidden') {
+                return false;
+            }
+            switch (configuration.value) {
+                case 'hidden':
+                    return true;
                 case 'visibleInWorkspace':
                 case 'maximizedInWorkspace':
                     return workbenchState === WorkbenchState.EMPTY;
                 default:
-                    return true;
+                    return false;
             }
         })();
         LayoutStateKeys.PANEL_SIZE.defaultValue = (this.stateCache.get(LayoutStateKeys.PANEL_POSITION.name) ?? isHorizontal(LayoutStateKeys.PANEL_POSITION.defaultValue)) ? mainContainerDimension.height / 3 : mainContainerDimension.width / 4;
@@ -2148,30 +2133,7 @@ class LayoutStateModel extends Disposable {
         }));
     }
     applyOverrides(configuration) {
-        const experiment = ( new Lazy(() => {
-            try {
-                return this.coreExperimentationService.getExperiment();
-            }
-            catch (error) {
-                return undefined;
-            }
-        }));
-        if (this.storageService.isNew(StorageScope.APPLICATION) &&
-            this.contextService.getWorkbenchState() === WorkbenchState.EMPTY &&
-            (experiment.value?.experimentGroup === StartupExperimentGroup.MaximizedChat ||
-                experiment.value?.experimentGroup === StartupExperimentGroup.SplitEmptyEditorChat ||
-                experiment.value?.experimentGroup === StartupExperimentGroup.SplitWelcomeChat)) {
-            if (experiment.value.experimentGroup === StartupExperimentGroup.MaximizedChat) {
-                this.applyAuxiliaryBarMaximizedOverride();
-            }
-            else if (experiment.value.experimentGroup === StartupExperimentGroup.SplitEmptyEditorChat ||
-                experiment.value.experimentGroup === StartupExperimentGroup.SplitWelcomeChat) {
-                const mainContainerDimension = configuration.mainContainerDimension;
-                this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN, false);
-                this.setInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE, Math.ceil(mainContainerDimension.width / ((1.618 * 1.618) )));
-            }
-        }
-        else if (this.isNew[StorageScope.WORKSPACE]) {
+        if (this.isNew[StorageScope.WORKSPACE]) {
             const defaultAuxiliaryBarVisibility = this.configurationService.getValue(WorkbenchLayoutSettings.AUXILIARYBAR_DEFAULT_VISIBILITY);
             if (defaultAuxiliaryBarVisibility === 'maximized' ||
                 (defaultAuxiliaryBarVisibility === 'maximizedInWorkspace' && this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY)) {
@@ -2183,6 +2145,10 @@ class LayoutStateModel extends Disposable {
             !this.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED)) {
             this.setRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN, false);
         }
+        if (this.isNew[StorageScope.WORKSPACE] && configuration.mainContainerDimension.width <= DEFAULT_WORKSPACE_WINDOW_DIMENSIONS.width) {
+            this.setInitializationValue(LayoutStateKeys.SIDEBAR_SIZE, Math.min(300, configuration.mainContainerDimension.width / 4));
+            this.setInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE, Math.min(300, configuration.mainContainerDimension.width / 4));
+        }
     }
     applyAuxiliaryBarMaximizedOverride() {
         this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_VISIBILITY, {

package/vscode/src/vs/workbench/browser/parts/notifications/notificationAccessibleView.js

@@ -55,7 +55,7 @@ class NotificationAccessibleView {
                 if (!notification || !message) {
                     return;
                 }
-                return withSeverityPrefix(notification.source ? ( localize(3424, '{0} Source: {1}', message, notification.source)) : message, notification.severity);
+                return withSeverityPrefix(notification.source ? ( localize(3434, '{0} Source: {1}', message, notification.source)) : message, notification.severity);
             }
             const content = getContentForNotification();
             if (!content) {
@@ -118,7 +118,7 @@ function getActionsFromNotification(notification, accessibilitySignalService) {
     }
     if (actions) {
         actions.push({
-            id: 'clearNotification', label: ( localize(3425, "Clear Notification")), tooltip: ( localize(3425, "Clear Notification")), run: () => {
+            id: 'clearNotification', label: ( localize(3435, "Clear Notification")), tooltip: ( localize(3435, "Clear Notification")), run: () => {
                 notification.close();
                 accessibilitySignalService.playSignal(AccessibilitySignal.clear);
             }, enabled: true, class: ThemeIcon.asClassName(Codicon.clearAll)