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

package/common.js

@@ -1,6 +1,7 @@
 
 import getServiceOverride$2 from '@codingame/monaco-vscode-quickaccess-service-override';
 import getServiceOverride$1 from '@codingame/monaco-vscode-keybindings-service-override';
+import { disableWorkbenchHooks } 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-api/service-override/tools/views';
 export { AbstractResourceEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/textResourceEditorInput';
@@ -14,6 +15,7 @@ export { SplitView } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/u
 export { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 export { ViewPaneContainer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 
+disableWorkbenchHooks();
 function getServiceOverride() {
     return {
         ...getServiceOverride$2({

package/index.js

@@ -3,11 +3,12 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { setFullscreen } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/browser';
 import { detectFullscreen } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
-import { setUnexpectedErrorHandler, onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { setUnexpectedErrorHandler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 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 { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { createUnexpectedErrorHandler } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log';
 import { BrowserWindow } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/window';
 import { Workbench } from './vscode/src/vs/workbench/browser/workbench.js';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
@@ -25,6 +26,8 @@ import getServiceOverride$5 from './common.js';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/titlebar/menubar.contribution';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/workbench.zenMode.contribution';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution';
+import { LifecyclePhase } 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';
 export { AbstractResourceEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/textResourceEditorInput';
 export { ConfirmResult } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs';
@@ -45,21 +48,17 @@ let CustomWorkbench = class CustomWorkbench extends Workbench {
         this.mainContainer.classList.add('monaco-workbench-part');
     }
     registerErrorHandler(logService) {
-        setUnexpectedErrorHandler((error) => this.handleUnexpectedError(error, logService));
+        setUnexpectedErrorHandler(createUnexpectedErrorHandler(logService));
     }
     createNotificationsHandlers() {
     }
     initServices() {
+        this.instantiationService.invokeFunction((accessor) => {
+            const lifecycleService = accessor.get(ILifecycleService);
+            lifecycleService.phase = LifecyclePhase.Ready;
+        });
         return this.instantiationService;
     }
-    restore(accessor) {
-        try {
-            this.restoreParts(accessor);
-        }
-        catch (error) {
-            onUnexpectedError(error);
-        }
-    }
 };
 CustomWorkbench = __decorate([
     __param(1, ILogService),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workbench-service-override",
-  "version": "37.6.0",
+  "version": "38.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - workbench service-override",
   "keywords": [],
@@ -15,15 +15,15 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "37.6.0",
-    "@codingame/monaco-vscode-environment-service-override": "37.6.0",
-    "@codingame/monaco-vscode-katex-common": "37.6.0",
-    "@codingame/monaco-vscode-keybindings-service-override": "37.6.0",
-    "@codingame/monaco-vscode-quickaccess-service-override": "37.6.0",
-    "@codingame/monaco-vscode-view-banner-service-override": "37.6.0",
-    "@codingame/monaco-vscode-view-common-service-override": "37.6.0",
-    "@codingame/monaco-vscode-view-status-bar-service-override": "37.6.0",
-    "@codingame/monaco-vscode-view-title-bar-service-override": "37.6.0"
+    "@codingame/monaco-vscode-api": "38.0.0",
+    "@codingame/monaco-vscode-environment-service-override": "38.0.0",
+    "@codingame/monaco-vscode-katex-common": "38.0.0",
+    "@codingame/monaco-vscode-keybindings-service-override": "38.0.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "38.0.0",
+    "@codingame/monaco-vscode-view-banner-service-override": "38.0.0",
+    "@codingame/monaco-vscode-view-common-service-override": "38.0.0",
+    "@codingame/monaco-vscode-view-status-bar-service-override": "38.0.0",
+    "@codingame/monaco-vscode-view-title-bar-service-override": "38.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/session.js

@@ -1,18 +1,18 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { setFullscreen } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/browser';
-import { detectFullscreen } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { getClientArea, detectFullscreen } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
-import { setUnexpectedErrorHandler, onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { setUnexpectedErrorHandler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { RemoteAgentHostLocationPreferenceService } from './vscode/src/vs/platform/agentHost/browser/remoteAgentHostLocationPreferenceService.js';
 import { IAgentHostByokLmHandler } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostByokLm.service';
-import { ICloudSandboxAgentHostService, ICloudSandboxApiService } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/cloudSandboxAgentHost.service';
 import { IRemoteAgentHostLocationPreferenceService } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/remoteAgentHostLocationPreference.service';
 import { ITunnelAgentHostService } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/tunnelAgentHost.service';
 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 { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { createUnexpectedErrorHandler } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log';
 import { IChatDashboardService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/chatDashboardService.service';
 import { CustomViewGridParts } from './vscode/src/vs/sessions/browser/parts/customViewGridParts.js';
 import { MobileVisualViewport } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/parts/mobile/mobileVisualViewport';
@@ -20,8 +20,10 @@ import { IMobileVisualViewport } from '@codingame/monaco-vscode-api/vscode/vs/se
 import { SessionsParts } from './vscode/src/vs/sessions/browser/parts/sessionsParts.js';
 import { SessionsSetUpService } from './vscode/src/vs/sessions/browser/sessionsSetUpService.js';
 import { ISessionsSetUpService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/sessionsSetUpService.service';
-import { Workbench } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench';
-import { SinglePaneWorkbench } from './vscode/src/vs/sessions/browser/singlePaneWorkbench.js';
+import { AgentWorkbenchLayout } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench';
+import { DesktopWorkbench } from './vscode/src/vs/sessions/browser/desktopWorkbench.js';
+import { MobileWorkbench } from './vscode/src/vs/sessions/browser/mobileWorkbench.js';
+import { getSessionsWorkbenchLayout } from './vscode/src/vs/sessions/browser/workbenchFactory.js';
 import { IDevContainerAgentHostService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/devContainerAgentHostService.service';
 import { ChatDashboardServiceImpl } from './vscode/src/vs/sessions/contrib/accountMenu/browser/account.contribution.js';
 import { IAgentFeedbackService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/agentFeedback/browser/agentFeedbackService.service';
@@ -30,9 +32,7 @@ import { AquariumService } from './vscode/src/vs/sessions/contrib/aquarium/brows
 import { IAquariumService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/aquarium/browser/aquariumOverlay.service';
 import { AutomationDialogService } from './vscode/src/vs/sessions/contrib/automations/browser/automationDialogService.js';
 import { AutomationRunner } from './vscode/src/vs/sessions/contrib/automations/browser/automationRunner.js';
-import { BrowserAutomationStorageService } from './vscode/src/vs/sessions/contrib/automations/browser/automationStorageService.js';
 import { ProviderAutomationService } from './vscode/src/vs/sessions/contrib/automations/browser/providerAutomationService.js';
-import { IAutomationStorageService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/automations/common/automationStorageService.service';
 import { SessionChangesService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/sessionChangesService';
 import { ISessionChangesService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/common/sessionChangesService.service';
 import { ChatViewFactory } from '@codingame/monaco-vscode-katex-common/vscode/vs/sessions/contrib/chat/browser/chatView';
@@ -59,14 +59,20 @@ import { GitHubService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/c
 import { IGitHubService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/github/browser/githubService.service';
 import { PullRequestIconCache } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/github/browser/pullRequestIconCache';
 import { IPullRequestIconCache } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/github/browser/pullRequestIconCache.service';
-import { CloudSandboxAgentHostService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/providers/remoteAgentHost/browser/cloudSandboxAgentHostService';
-import { CloudSandboxApiService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/providers/remoteAgentHost/browser/cloudSandboxApiService';
-import { CloudSandboxTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/providers/remoteAgentHost/browser/cloudSandboxTelemetry';
-import { ICloudSandboxTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/providers/remoteAgentHost/browser/cloudSandboxTelemetry.service';
+import { SessionEditorWorkingSetService } from './vscode/src/vs/sessions/contrib/layout/common/sessionEditorWorkingSet.js';
+import { ISessionEditorWorkingSetService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/layout/common/sessionEditorWorkingSet.service';
+import { IConnectionDiagnosticsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/providers/remoteAgentHost/browser/connectionDiagnostics.service';
+import { ConnectionDiagnosticsService } from './vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/connectionDiagnosticsService.js';
 import { DevContainerAgentHostService } from './vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/devContainerAgentHostService.js';
-import { RemoteAgentHostConnectionCustomizationService } from './vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/remoteAgentHostConnectionCustomization.js';
-import { IRemoteAgentHostConnectionCustomizationService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/providers/remoteAgentHost/browser/remoteAgentHostConnectionCustomization.service';
 import { BrowserTunnelAgentHostServiceSelector } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/providers/remoteAgentHost/browser/webTunnelAgentHostService.contribution';
+import { RemoteSessionChatService } from './vscode/src/vs/sessions/contrib/remoteSessions/browser/remoteSessionChatService.js';
+import { IRemoteSessionChatService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/remoteSessions/browser/remoteSessionChatService.service';
+import { RemoteSessionService } from './vscode/src/vs/sessions/contrib/remoteSessions/browser/remoteSessionService.js';
+import { IRemoteSessionService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/remoteSessions/common/remoteSessions.service';
+import { SessionComparisonViewService } from './vscode/src/vs/sessions/contrib/sessionComparison/browser/sessionComparisonViewService.js';
+import { ISessionComparisonViewService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessionComparison/browser/sessionComparisonViewService.service';
+import { SessionWorktreeCleanupService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessionInputBanners/browser/sessionWorktreeCleanupService';
+import { ISessionWorktreeCleanupService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessionInputBanners/browser/sessionWorktreeCleanupService.service';
 import { AgentHostFilterService } from './vscode/src/vs/sessions/services/agentHostFilter/browser/agentHostFilterService.js';
 import { IAgentHostFilterService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/agentHostFilter/common/agentHostFilter.service';
 import { SessionsChatBackgroundService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/chatBackground/browser/chatBackgroundService';
@@ -75,6 +81,7 @@ import { IChatViewFactory } from '@codingame/monaco-vscode-api/vscode/vs/session
 import { ICustomViewGridPartService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/customView/browser/customViewGridPartService.service';
 import { CustomViewService } from './vscode/src/vs/sessions/services/customView/browser/customViewService.js';
 import { ICustomViewService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/customView/browser/customViewService.service';
+import { SessionComparisonService } from './vscode/src/vs/sessions/services/sessions/browser/sessionComparisonService.js';
 import { ActiveSessionContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionContext';
 import { ISessionContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionContext.service';
 import { SessionGroupsService } from './vscode/src/vs/sessions/services/sessions/browser/sessionGroupsService.js';
@@ -97,6 +104,7 @@ import { SessionsWindowUsageService } from './vscode/src/vs/sessions/services/se
 import { ISessionsWindowUsageService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsWindowUsageService.service';
 import { SessionChangesStatsCache } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionChangesStatsCache';
 import { ISessionChangesStatsCache } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionChangesStatsCache.service';
+import { ISessionComparisonService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionComparison.service';
 import { ISessionsManagementService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement.service';
 import { SessionsWorkspaceFolderLabelService } from './vscode/src/vs/sessions/services/workspaceFolderLabel/browser/workspaceFolderLabelService.js';
 import { BrowserWindow } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/window';
@@ -121,7 +129,7 @@ import { EditorParts } from './vscode/src/vs/sessions/browser/parts/editorParts.
 import getServiceOverride$3 from '@codingame/monaco-vscode-environment-service-override';
 export { agentHostUri } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostFileSystemProvider';
 export { agentHostAuthority } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostUri';
-import { DOCK_DETAIL_PANEL_SETTING } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/sessionConfig';
+import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import './vscode/src/vs/sessions/browser/parts/menubar.contribution.js';
 import './vscode/src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationTreeView.contribution.js';
 import './vscode/src/vs/sessions/contrib/aquarium/browser/aquarium.contribution.js';
@@ -142,6 +150,9 @@ import './vscode/src/vs/sessions/contrib/onboardingTours/browser/newSessionViewV
 import './vscode/src/vs/sessions/contrib/onboardingTours/browser/newSessionViewV3TourContribution.js';
 import './vscode/src/vs/sessions/contrib/onboardingTours/browser/newSessionViewTourContribution.js';
 import './vscode/src/vs/sessions/contrib/policyBlocked/browser/policyBlocked.contribution.js';
+import './vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/connectionDiagnostics.contribution.js';
+import './vscode/src/vs/sessions/contrib/remoteSessions/browser/remoteSessions.contribution.js';
+import './vscode/src/vs/sessions/contrib/sessionComparison/browser/sessionComparison.contribution.js';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/browser/search.common.contribution';
 import './vscode/src/vs/sessions/contrib/search/browser/search.contribution.js';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/browser/searchQuickAccess.contribution';
@@ -153,7 +164,7 @@ import './vscode/src/vs/sessions/contrib/workspace/browser/workspace.contributio
 import './vscode/src/vs/sessions/browser/layoutActions.js';
 import './vscode/src/vs/sessions/contrib/codeReview/browser/codeReview.contributions.js';
 import './vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentHostForkActions.js';
-import './vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentHostSessionConfigPicker.js';
+import '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/providers/agentHost/browser/agentHostSessionConfigPicker';
 import './vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentMergeActions.js';
 import './vscode/src/vs/sessions/contrib/providers/agentHost/browser/exportDebugLogsAction.js';
 import './vscode/src/vs/sessions/contrib/providers/agentHost/browser/mobile/mobileChatInputConfigPicker.js';
@@ -161,7 +172,7 @@ import './vscode/src/vs/sessions/contrib/terminal/browser/sessionsTerminalContri
 import './vscode/src/vs/sessions/contrib/applyCommitsToParentRepo/browser/applyChangesToParentRepo.js';
 import './vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentHostSessionBranchActions.js';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/sidebar/sidebarActions';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { observableFromPromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utils';
 export { AbstractResourceEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/textResourceEditorInput';
@@ -178,46 +189,36 @@ export { ViewPaneContainer } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 
 function createCustomWorkbench(BaseWorkbench) {
     let CustomWorkbench = class CustomWorkbench extends BaseWorkbench {
-        constructor(options, logService, _instantiationService, _configurationService) {
+        constructor(options, logService, _instantiationService) {
             super(getWorkbenchContainer(), options, new ServiceCollection(), logService);
             this._instantiationService = _instantiationService;
             this.mainContainer.classList.add('monaco-workbench-part');
         }
         registerErrorHandler(logService) {
-            setUnexpectedErrorHandler((error) => this.handleUnexpectedError(error, logService));
+            setUnexpectedErrorHandler(createUnexpectedErrorHandler(logService));
         }
         createNotificationsHandlers() {
             this.registerNotificationRowHeight();
         }
         initServices() {
-            return this._instantiationService;
-        }
-        restore(accessor) {
-            try {
-                this.restoreParts(accessor);
-            }
-            catch (error) {
-                onUnexpectedError(error);
-            }
-            void this.sessionsService.restoreVisibleSessions().catch((e) => {
-                this.logService.error('[Workbench] restoreVisibleSessions failed', e);
+            this._instantiationService.invokeFunction((accessor) => {
+                const lifecycleService = accessor.get(ILifecycleService);
+                lifecycleService.phase = LifecyclePhase.Ready;
             });
+            return this._instantiationService;
         }
     };
     CustomWorkbench = __decorate([
         __param(1, ILogService),
-        __param(2, IInstantiationService),
-        __param(3, IConfigurationService)
+        __param(2, IInstantiationService)
     ], CustomWorkbench);
     return CustomWorkbench;
 }
-const CustomSinglePaneWorkbench = createCustomWorkbench(SinglePaneWorkbench);
-const CustomWorkbench = new Proxy(createCustomWorkbench(Workbench), {
+const CustomMobileWorkbench = createCustomWorkbench(MobileWorkbench);
+const CustomWorkbench = new Proxy(createCustomWorkbench(DesktopWorkbench), {
     construct(target, args) {
-        const configurationService = args[3];
-        const WorkbenchClass = configurationService.getValue(DOCK_DETAIL_PANEL_SETTING)
-            ? CustomSinglePaneWorkbench
-            : target;
+        const layout = getSessionsWorkbenchLayout(getClientArea(mainWindow.document.body).width);
+        const WorkbenchClass = layout === AgentWorkbenchLayout.Mobile ? CustomMobileWorkbench : target;
         return Reflect.construct(WorkbenchClass, args);
     }
 });
@@ -250,7 +251,6 @@ function getServiceOverride(options, _webviewIframeAlternateDomains) {
         [IChatDashboardService.toString()]: new SyncDescriptor(ChatDashboardServiceImpl, [], true),
         [IAgentFeedbackService.toString()]: new SyncDescriptor(NullAgentFeedbackService, [], true),
         [IAquariumService.toString()]: new SyncDescriptor(AquariumService, [], true),
-        [IAutomationStorageService.toString()]: new SyncDescriptor(BrowserAutomationStorageService, [], true),
         [IAutomationService.toString()]: new SyncDescriptor(ProviderAutomationService, [initialProvidersSettled], true),
         [IAutomationRunner.toString()]: new SyncDescriptor(AutomationRunner, [], true),
         [IAutomationDialogService.toString()]: new SyncDescriptor(AutomationDialogService, [], true),
@@ -270,14 +270,17 @@ function getServiceOverride(options, _webviewIframeAlternateDomains) {
         [IDiffEditorOptionsService.toString()]: new SyncDescriptor(DiffEditorOptionsService, [], true),
         [IGitHubService.toString()]: new SyncDescriptor(GitHubService, [], true),
         [IPullRequestIconCache.toString()]: new SyncDescriptor(PullRequestIconCache, [], true),
-        [ICloudSandboxTelemetryService.toString()]: new SyncDescriptor(CloudSandboxTelemetryService, [], true),
-        [ICloudSandboxApiService.toString()]: new SyncDescriptor(CloudSandboxApiService, [], true),
-        [ICloudSandboxAgentHostService.toString()]: new SyncDescriptor(CloudSandboxAgentHostService, [], true),
+        [ISessionEditorWorkingSetService.toString()]: new SyncDescriptor(SessionEditorWorkingSetService, [], true),
+        [IConnectionDiagnosticsService.toString()]: new SyncDescriptor(ConnectionDiagnosticsService, [], true),
         [IDevContainerAgentHostService.toString()]: new SyncDescriptor(DevContainerAgentHostService, [], true),
-        [IRemoteAgentHostConnectionCustomizationService.toString()]: new SyncDescriptor(RemoteAgentHostConnectionCustomizationService, [], true),
         [ITunnelAgentHostService.toString()]: new SyncDescriptor(BrowserTunnelAgentHostServiceSelector, [], true),
+        [IRemoteSessionService.toString()]: new SyncDescriptor(RemoteSessionService, [], true),
+        [IRemoteSessionChatService.toString()]: new SyncDescriptor(RemoteSessionChatService, [], true),
+        [ISessionComparisonViewService.toString()]: new SyncDescriptor(SessionComparisonViewService, [], true),
+        [ISessionWorktreeCleanupService.toString()]: new SyncDescriptor(SessionWorktreeCleanupService, [], true),
         [IAgentHostFilterService.toString()]: new SyncDescriptor(AgentHostFilterService, [], true),
         [ICustomViewService.toString()]: new SyncDescriptor(CustomViewService, [], true),
+        [ISessionComparisonService.toString()]: new SyncDescriptor(SessionComparisonService, [], true),
         [ISessionContext.toString()]: new SyncDescriptor(ActiveSessionContext, [], true),
         [ISessionGroupsService.toString()]: new SyncDescriptor(SessionGroupsService, [], true),
         [ISessionOpenTelemetryService.toString()]: new SyncDescriptor(SessionOpenTelemetryService, [], true),

package/vscode/src/vs/platform/agentHost/common/sessionComparisonPrompts.d.ts

@@ -0,0 +1 @@
+export declare function createSessionComparisonJudgePrompt(comparisonId: string): string;

package/vscode/src/vs/platform/agentHost/common/sessionComparisonPrompts.js

@@ -0,0 +1,12 @@
+
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+
+function createSessionComparisonJudgePrompt(comparisonId) {
+    return localize(
+        2509,
+        "Judge implementation comparison `{0}`.\n\n1. Call `#readAttemptComparison` exactly once with this comparison ID.\n2. Review every attempt's code changes and validation evidence. Use `get_session_context` with the exact manifest target to identify validation that the attempt already completed. Terminal commands start in the Judge worktree, not an attempt worktree, so explicitly `cd` to the exact `worktree.workingDirectory` from the manifest in every command that inspects or validates an attempt.\n3. Do not rerun a validation category when the attempt report contains a clear result. Run only missing targeted tests, build, lint, or diagnostics needed to make a reliable recommendation. If required dependencies or build artifacts are unavailable, record that validation as unavailable; do not install or build dependencies, and do not substitute a different validation category.\n4. For each validation category, record one consistent `state` and `source` evidence pair. Known `passed` or `failed` results must use `attemptReport` or `judgeRun`; use `unavailable` only with `notRun` or `unknown`, and use `notApplicable` for both fields when the category genuinely does not apply.\n5. Keep `explanation` to one sentence. Fill `rationale` with exactly four concise points in this order: `comparison`, `validation`, `codeQuality`, and `solution`. Each point must cite concrete evidence, contain no line breaks, and stay within the tool schema length limit. For every other attempt, record its strongest reusable points in `notableDifferences`.\n6. Do not modify, merge, apply, or delete any attempt.\n7. Call `#completeAttemptComparison` with the recommendation and supporting evidence. Refer to attempts only by the `attemptNumber` values returned by `#readAttemptComparison`; do not copy participant or session UUIDs. If it rejects invalid input, correct the reported fields and retry; do not submit again after success.\n8. After the tool returns, identify the winner as `Attempt N (agent, model, effort)` and use the same rationale order, followed by the strongest reusable points from every other attempt.",
+        comparisonId
+    );
+}
+
+export { createSessionComparisonJudgePrompt };

package/vscode/src/vs/sessions/browser/{singlePaneWorkbench.d.ts → desktopWorkbench.d.ts}

@@ -1,6 +1,6 @@
 import { ISerializableView, ISerializedNode, IViewSize } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/grid";
 import { IEditorWillOpenEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
-import { Workbench } from "@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench";
+import { AgentWorkbenchLayout, Workbench } from "@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench";
 /**
  * Remembers the editor width captured around visibility transitions.
  */
@@ -9,19 +9,19 @@ export declare class DockedEditorSizeMemento {
     dockedEditorSizeBeforeHide: IViewSize | undefined;
 }
 /**
- * Single-pane workbench: the auxiliary bar is docked inside the editor part (below
+ * Desktop workbench: the auxiliary bar is docked inside the editor part (below
  * a shared tab bar) rather than being its own grid column. The editor part
- * ({@link SinglePaneMainEditorPart}) owns the auxiliary bar and its docked
+ * ({@link DesktopMainEditorPart}) owns the auxiliary bar and its docked
  * controller; this workbench owns the docked width, the reveal-sync, and the
  * docked size bookkeeping.
  */
-export declare class SinglePaneWorkbench extends Workbench {
+export declare class DesktopWorkbench extends Workbench {
+    get agentWorkbenchLayout(): AgentWorkbenchLayout;
     /** Node width past the detail width at which editor content counts as visible. */
     private static readonly _EDITOR_CONTENT_VISIBLE_THRESHOLD;
     private _dockedAuxiliaryBarWidth;
     private _syncingEditorVisibility;
     private readonly _memento;
-    get isSinglePaneLayoutEnabled(): boolean;
     isEditorPaneVisible(): boolean;
     toggleSecondarySideBar(): void;
     isSecondarySideBarVisible(): boolean;
@@ -62,6 +62,7 @@ export declare class SinglePaneWorkbench extends Workbench {
     protected _onGridDidChange(): void;
     protected _onEditorNodeResized(nodeWidth: number): void;
     private _syncEditorVisibility;
+    private _runWithEditorVisibilitySyncSuspended;
     protected _runWithEditorResizeSyncSuspended(fn: () => void): void;
     protected _applyEditorVisibility(hidden: boolean): void;
     protected _onWillHideAuxiliaryBar(hidden: boolean): void;

package/vscode/src/vs/sessions/browser/{singlePaneWorkbench.js → desktopWorkbench.js}

@@ -6,10 +6,10 @@ import { Parts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services
 import { DockedEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/dockedEditorInput';
 import { DockedAuxiliaryBarController } from './dockedAuxiliaryBarController.js';
 import { EDITOR_PART_MINIMUM_WIDTH } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/parts/editorPartSizing';
-import { Workbench } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench';
+import { Workbench, AgentWorkbenchLayout } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench';
 
 class DockedEditorSizeMemento {}
-class SinglePaneWorkbench extends Workbench {
+class DesktopWorkbench extends Workbench {
     constructor() {
         super(...arguments);
         this._dockedAuxiliaryBarWidth = DockedAuxiliaryBarController.DEFAULT_WIDTH;
@@ -20,18 +20,18 @@ class SinglePaneWorkbench extends Workbench {
             auxiliaryBar: false
         };
     }
+    get agentWorkbenchLayout() {
+        return AgentWorkbenchLayout.Desktop;
+    }
     static {
         this._EDITOR_CONTENT_VISIBLE_THRESHOLD = 4;
     }
-    get isSinglePaneLayoutEnabled() {
-        return true;
-    }
     isEditorPaneVisible() {
         return this.workbenchGrid ? this.workbenchGrid.isViewVisible(this.editorPartView) : super.isEditorPaneVisible();
     }
     toggleSecondarySideBar() {
         const visible = this.toggleSidePane();
-        alert(visible ? ( localize(3071, "Side pane shown")) : ( localize(3072, "Side pane hidden")));
+        alert(visible ? ( localize(3349, "Side pane shown")) : ( localize(3350, "Side pane hidden")));
     }
     isSecondarySideBarVisible() {
         return this.isSidePaneVisible();
@@ -51,15 +51,12 @@ class SinglePaneWorkbench extends Workbench {
     setDockedAuxiliaryBarWidth(width) {
         this._dockedAuxiliaryBarWidth = width;
         if (this.workbenchGrid && this.partVisibility.auxiliaryBar && !this.partVisibility.editor) {
-            this._syncingEditorVisibility = true;
-            try {
+            this._runWithEditorVisibilitySyncSuspended(() => {
                 this.workbenchGrid.resizeView(this.editorPartView, {
                     width: this._dockedAuxiliaryBarWidth,
                     height: this.workbenchGrid.getViewSize(this.editorPartView).height
                 });
-            } finally {
-                this._syncingEditorVisibility = false;
-            }
+            });
         }
         this._layoutDockedAuxBar();
     }
@@ -182,6 +179,9 @@ class SinglePaneWorkbench extends Workbench {
         this._layoutDockedAuxBar();
     }
     _onGridDidChange() {
+        if (this._syncingEditorVisibility) {
+            return;
+        }
         const nodeWidth = this.workbenchGrid.getViewSize(this.editorPartView).width;
         this._syncEditorVisibility(nodeWidth);
     }
@@ -195,10 +195,9 @@ class SinglePaneWorkbench extends Workbench {
         if (this._isEditorPartAutoVisibilitySuppressed) {
             return;
         }
-        this._syncingEditorVisibility = true;
-        try {
+        this._runWithEditorVisibilitySyncSuspended(() => {
             const effectiveAuxiliaryBarWidth = DockedAuxiliaryBarController.getEffectiveWidth(this._dockedAuxiliaryBarWidth, nodeWidth);
-            const editorContentVisible = nodeWidth > effectiveAuxiliaryBarWidth + SinglePaneWorkbench._EDITOR_CONTENT_VISIBLE_THRESHOLD;
+            const editorContentVisible = nodeWidth > effectiveAuxiliaryBarWidth + DesktopWorkbench._EDITOR_CONTENT_VISIBLE_THRESHOLD;
             if (this.partVisibility.editor && !editorContentVisible && this.partVisibility.auxiliaryBar) {
                 this.partVisibility.editor = false;
                 this._setMainEditorAreaHidden(true);
@@ -208,18 +207,20 @@ class SinglePaneWorkbench extends Workbench {
                 this._savePartVisibility();
                 return;
             }
-        } finally {
-            this._syncingEditorVisibility = false;
-        }
+        });
     }
-    _runWithEditorResizeSyncSuspended(fn) {
+    _runWithEditorVisibilitySyncSuspended(fn) {
+        const wasSyncingEditorVisibility = this._syncingEditorVisibility;
         this._syncingEditorVisibility = true;
         try {
             fn();
         } finally {
-            this._syncingEditorVisibility = false;
+            this._syncingEditorVisibility = wasSyncingEditorVisibility;
         }
     }
+    _runWithEditorResizeSyncSuspended(fn) {
+        this._runWithEditorVisibilitySyncSuspended(fn);
+    }
     _applyEditorVisibility(hidden) {
         if (hidden) {
             const contentWidth = this._persistedEditorWidth(this.workbenchGrid.getViewSize(this.editorPartView).width);
@@ -296,15 +297,12 @@ class SinglePaneWorkbench extends Workbench {
         if (this.workbenchGrid) {
             this.workbenchGrid.setViewVisible(this.editorPartView, this._editorNodeShouldBeVisible());
             if (!hidden && !this.partVisibility.editor) {
-                this._syncingEditorVisibility = true;
-                try {
+                this._runWithEditorVisibilitySyncSuspended(() => {
                     this.workbenchGrid.resizeView(this.editorPartView, {
                         width: this._dockedAuxiliaryBarWidth,
                         height: this.workbenchGrid.getViewSize(this.editorPartView).height
                     });
-                } finally {
-                    this._syncingEditorVisibility = false;
-                }
+                });
             }
         }
         this._layoutDockedAuxBar();
@@ -317,4 +315,4 @@ class SinglePaneWorkbench extends Workbench {
     _handleAllEditorsClosed() {}
 }
 
-export { DockedEditorSizeMemento, SinglePaneWorkbench };
+export { DesktopWorkbench, DockedEditorSizeMemento };

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

@@ -18,10 +18,10 @@ export interface IDockedAuxiliaryBarHost {
     getTabsHeight(): number;
 }
 /**
- * Owns the single-pane "docked detail panel" behaviour: reparenting the auxiliary
+ * Owns the desktop "docked detail panel" behaviour: reparenting the auxiliary
  * bar into the editor part as an absolutely-positioned overlay on the right (below
  * the editor tab strip), sizing it, insetting the editor content, and the draggable
- * resize sash. Created by the workbench only in single-pane mode; the standard
+ * resize sash. Created by the workbench only in desktop mode; the standard
  * layout never constructs it.
  */
 export declare class DockedAuxiliaryBarController extends Disposable {
@@ -30,6 +30,7 @@ export declare class DockedAuxiliaryBarController extends Disposable {
     private readonly host;
     static readonly MIN_WIDTH = 220;
     static readonly EDITOR_MIN_WIDTH = 300;
+    static readonly EDITOR_PREFERRED_WIDTH = 1000;
     static readonly DEFAULT_WIDTH = 300;
     static readonly COLLAPSE_WIDTH = 4;
     static readonly NO_EDITOR_MIN_WIDTH: number;
@@ -37,6 +38,7 @@ export declare class DockedAuxiliaryBarController extends Disposable {
     private _sash;
     private _sashStartWidth;
     private _sashCollapsed;
+    private _layoutState;
     constructor(editorPartContainer: HTMLElement, auxiliaryBarPart: Part, host: IDockedAuxiliaryBarHost);
     /**
      * Position the auxiliary bar inside the editor part's right region so the editor
@@ -45,6 +47,7 @@ export declare class DockedAuxiliaryBarController extends Disposable {
     layout(): void;
     /** Returns the detail width that fits beside the editor content. */
     static getEffectiveWidth(hostWidth: number, editorWidth: number): number;
+    private _getLayoutWidth;
     private _ensureSash;
     private _getTop;
 }