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

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

@@ -34,6 +34,8 @@ let SessionRemoteConnection = class SessionRemoteConnection extends Disposable {
         this._logService = _logService;
         this._session = observableValue(this, undefined);
         this._attempt = observableValue(this, undefined);
+        this._connectionAttemptObserved = observableValue(this, false);
+        this._inputReceived = observableValue(this, false);
         this._progressListener = this._register(( new MutableDisposable()));
         this._deadlineSignal = observableSignal(this);
         this._reconnectCountdownSignal = observableSignal(this);
@@ -92,14 +94,30 @@ let SessionRemoteConnection = class SessionRemoteConnection extends Disposable {
         });
         this.bannerContent = derived(this, reader => this._getRemoteConnectionBannerContent(reader));
         this.recoveryContent = derived(this, reader => this._getRemoteHostUnavailableContent(reader));
+        this.isQuiet = derived(this, reader => {
+            if (!this._inputReceived.read(reader)) {
+                return true;
+            }
+            return this._getEffectiveStatus(reader)?.kind === "disconnected" && this._attempt.read(reader) === undefined && !this._connectionAttemptObserved.read(reader) && !this._autoConnectPending.read(reader);
+        });
         this._register(autorun(reader => {
-            if (this._getEffectiveStatus(reader)?.kind === "connected" && this._autoConnected.read(reader) !== undefined) {
-                this._autoConnected.set(undefined, undefined);
+            const session = this._session.read(reader);
+            const status = session?.remoteConnectionStatus?.read(reader);
+            if (status?.kind === "connecting" || status?.kind === "reconnecting") {
+                this._connectionAttemptObserved.set(true, undefined);
+            }
+            if (status?.kind === "connected") {
+                transaction(tx => {
+                    this._autoConnected.set(undefined, tx);
+                    this._connectionAttemptObserved.set(false, tx);
+                    if (this._attempt.read(reader)?.kind === "failed") {
+                        this._attempt.set(undefined, tx);
+                    }
+                });
             }
             if (!this._autoConnectPending.read(reader)) {
                 return;
             }
-            const session = this._session.read(reader);
             this._logService.info(
                 `[SessionRemoteConnection] auto-connect triggered for ${session?.providerId}`
             );
@@ -112,6 +130,8 @@ let SessionRemoteConnection = class SessionRemoteConnection extends Disposable {
         transaction(tx => {
             this._session.set(session, tx);
             this._attempt.set(undefined, tx);
+            this._connectionAttemptObserved.set(false, tx);
+            this._inputReceived.set(false, tx);
             this._autoConnected.set(undefined, tx);
             this._connectAttempted.set(undefined, tx);
         });
@@ -167,6 +187,24 @@ let SessionRemoteConnection = class SessionRemoteConnection extends Disposable {
         }
         void this._runConnect(session, statusBefore, () => provider.connect());
     }
+    connectOnInput() {
+        const session = this._session.get();
+        if (!session || session.isArchived.get()) {
+            return;
+        }
+        const connectionAttemptObserved = this._connectionAttemptObserved.get();
+        transaction(tx => {
+            this._inputReceived.set(true, tx);
+            if (connectionAttemptObserved) {
+                this._connectAttempted.set(session, tx);
+            }
+        });
+        if (connectionAttemptObserved || session.remoteConnectionStatus?.get().kind !== "disconnected" || this._autoConnected.get() === session || this._attempt.get() !== undefined) {
+            return;
+        }
+        this._autoConnected.set(session, undefined);
+        this.connect();
+    }
     async _runConnect(session, statusBefore, connect) {
         try {
             await connect();
@@ -210,19 +248,19 @@ let SessionRemoteConnection = class SessionRemoteConnection extends Disposable {
         if (provider && isAgentHostProvider(provider) && provider.connectionLabels) {
             return provider.connectionLabels;
         }
-        const hostLabel = provider?.label ?? ( localize(3037, "The remote host"));
+        const hostLabel = provider?.label ?? ( localize(3438, "The remote host"));
         return {
-            unavailableTitle: ( localize(3038, "Cannot Connect to {0}", hostLabel)),
-            unavailableDescription: ( localize(3039, "Cannot reach {0}.", hostLabel)),
-            unavailable: ( localize(3039, "Cannot reach {0}.", hostLabel)),
-            connectingTitle: ( localize(3040, "Connecting to {0}", hostLabel)),
-            connectingDescription: ( localize(3041, "Starting {0}.", hostLabel)),
-            connecting: ( localize(3042, "Waiting for agent host connection...")),
-            reconnecting: ( localize(3043, "Reconnecting to {0}...", hostLabel)),
-            reconnectingIn: seconds => ( localize(3044, "Reconnecting to {0} in {1}s", hostLabel, seconds)),
-            incompatibleTitle: ( localize(3045, "Cannot Connect to {0}", hostLabel)),
+            unavailableTitle: ( localize(3439, "Cannot Connect to {0}", hostLabel)),
+            unavailableDescription: ( localize(3440, "Cannot reach {0}.", hostLabel)),
+            unavailable: ( localize(3440, "Cannot reach {0}.", hostLabel)),
+            connectingTitle: ( localize(3441, "Connecting to {0}", hostLabel)),
+            connectingDescription: ( localize(3442, "Starting {0}.", hostLabel)),
+            connecting: ( localize(3443, "Waiting for agent host connection...")),
+            reconnecting: ( localize(3444, "Reconnecting to {0}...", hostLabel)),
+            reconnectingIn: seconds => ( localize(3445, "Reconnecting to {0} in {1}s", hostLabel, seconds)),
+            incompatibleTitle: ( localize(3446, "Cannot Connect to {0}", hostLabel)),
             incompatible: ( localize(
-                3046,
+                3447,
                 "{0} is incompatible with this version of Visual Studio Code.",
                 hostLabel
             ))
@@ -246,7 +284,7 @@ let SessionRemoteConnection = class SessionRemoteConnection extends Disposable {
         }
         const status = this._getEffectiveStatus(reader);
         const provider = this._sessionsProvidersService.getProvider(session.providerId);
-        const hostLabel = provider?.label ?? ( localize(3037, "The remote host"));
+        const hostLabel = provider?.label ?? ( localize(3438, "The remote host"));
         const labels = this._getConnectionLabels(provider);
         if (status?.kind === "connected") {
             return undefined;
@@ -268,10 +306,15 @@ let SessionRemoteConnection = class SessionRemoteConnection extends Disposable {
         const attempt = this._attempt.read(reader);
         const startedFromStoppedHost = autoConnectPending || (attempt?.kind === "active" && attempt.session === session && attempt.statusBefore?.kind === "disconnected" && attempt.statusBefore.reason === SessionRemoteConnectionFailureReason.HostNotRunning);
         if (progressMessage || autoConnectPending || status?.kind === "connecting") {
+            const showConnectionLog = provider && isAgentHostProvider(provider) ? provider.showConnectionLog : undefined;
             return {
                 title: labels.connectingTitle,
                 description: labels.connectingDescription,
                 progress: progressMessage ?? labels.connecting,
+                detail: showConnectionLog ? {
+                    label: ( localize(3448, "Show Log")),
+                    run: () => showConnectionLog().catch(onUnexpectedError)
+                } : undefined,
                 autoConnect: startedFromStoppedHost ? autoConnect : undefined
             };
         }
@@ -280,10 +323,10 @@ let SessionRemoteConnection = class SessionRemoteConnection extends Disposable {
         }
         if (status.reason === SessionRemoteConnectionFailureReason.HostNotRunning) {
             return {
-                title: ( localize(3047, "Unable to Connect to {0}", hostLabel)),
-                description: ( localize(3048, "{0} is not running.", hostLabel)),
+                title: ( localize(3449, "Unable to Connect to {0}", hostLabel)),
+                description: ( localize(3450, "{0} is not running.", hostLabel)),
                 action: provider && isAgentHostProvider(provider) && provider.connect ? {
-                    label: ( localize(3049, "Start {0}", hostLabel)),
+                    label: ( localize(3451, "Start {0}", hostLabel)),
                     run: () => this.connect()
                 } : undefined,
                 autoConnect
@@ -305,7 +348,7 @@ let SessionRemoteConnection = class SessionRemoteConnection extends Disposable {
         }
         const status = this._getEffectiveStatus(reader);
         const provider = this._sessionsProvidersService.getProvider(session.providerId);
-        const hostLabel = provider?.label ?? ( localize(3037, "The remote host"));
+        const hostLabel = provider?.label ?? ( localize(3438, "The remote host"));
         const labels = this._getConnectionLabels(provider);
         const progressMessage = this._getRemoteHostConnectProgress(session, status, labels, reader);
         if (progressMessage || this._autoConnectPending.read(reader) || status?.kind === "connecting") {
@@ -330,7 +373,7 @@ let SessionRemoteConnection = class SessionRemoteConnection extends Disposable {
                 message: seconds === undefined ? labels.reconnecting : labels.reconnectingIn(seconds),
                 ariaLabel: labels.reconnecting,
                 action: seconds !== undefined && provider && isAgentHostProvider(provider) && provider.reconnectNow ? {
-                    label: ( localize(3050, "Try Now")),
+                    label: ( localize(3452, "Try Now")),
                     run: () => provider.reconnectNow?.()
                 } : undefined
             } : undefined;
@@ -338,9 +381,9 @@ let SessionRemoteConnection = class SessionRemoteConnection extends Disposable {
         if (status.reason === SessionRemoteConnectionFailureReason.HostNotRunning) {
             return {
                 icon: Codicon.debugDisconnect,
-                message: ( localize(3048, "{0} is not running.", hostLabel)),
+                message: ( localize(3450, "{0} is not running.", hostLabel)),
                 action: provider && isAgentHostProvider(provider) && provider.connect ? {
-                    label: ( localize(3049, "Start {0}", hostLabel)),
+                    label: ( localize(3451, "Start {0}", hostLabel)),
                     run: () => this.connect()
                 } : undefined
             };
@@ -355,7 +398,7 @@ let SessionRemoteConnection = class SessionRemoteConnection extends Disposable {
         };
     }
     _connectActionLabel(session, reader) {
-        return this._connectAttempted.read(reader) === session ? ( localize(3051, "Retry")) : ( localize(3052, "Connect"));
+        return this._connectAttempted.read(reader) === session ? ( localize(3453, "Retry")) : ( localize(3454, "Connect"));
     }
 };
 SessionRemoteConnection = ( __decorate([( __param(0, ISessionsProvidersService)), ( __param(1, ILogService))], SessionRemoteConnection));

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

@@ -2,14 +2,17 @@ import { ISerializableView, IViewSize } from "@codingame/monaco-vscode-api/vscod
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { IAgentsWindowDraft } from "@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { IActiveSession } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement";
 import { IChat } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session";
-import { IChatViewOptions, ISelectWorkspaceOptions, WorkspaceSelectionResult } from "@codingame/monaco-vscode-api/vscode/vs/sessions/browser/parts/chatView";
+import { IChatViewOptions, ISelectNoWorkspaceOptions, ISelectWorkspaceOptions, WorkspaceSelectionResult } from "@codingame/monaco-vscode-api/vscode/vs/sessions/browser/parts/chatView";
 import { ISessionChangesStatsCache } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionChangesStatsCache.service";
 import { IChatViewFactory } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/chatView/browser/chatViewFactory.service";
+import { ISessionGridView } from "./sessionGridLayout.js";
 /**
  * Options passed to {@link SessionView.openSession}. Extends the chat view
  * options so they can be forwarded to the new-chat views the host creates.
@@ -25,7 +28,7 @@ export interface ISessionViewOptions extends IChatViewOptions {
  * renders the session's chats as a grid of groups. The header content shares the
  * chat's centered, width-capped content band.
  */
-export declare class SessionView extends Disposable implements ISerializableView {
+export declare class SessionView extends Disposable implements ISerializableView, ISessionGridView {
     private readonly _chatViewFactory;
     private readonly themeService;
     private readonly _changesStatsCache;
@@ -41,10 +44,12 @@ export declare class SessionView extends Disposable implements ISerializableView
     private readonly _header;
     private readonly _groupsView;
     private readonly _standaloneView;
+    private _preparationView;
     private readonly _floatingToolbar;
     private readonly _centeredContentContainer;
     private readonly _contentContainer;
     private _lastLayout;
+    private _lastContentLayout;
     private _openSessionDisposables;
     private _currentSession;
     private _hasOpenedSession;
@@ -60,14 +65,21 @@ export declare class SessionView extends Disposable implements ISerializableView
     /** Whether this leaf is visible within the part's internal grid. */
     private _isLeafVisible;
     private readonly _sessionObs;
+    private readonly _isVisibleObs;
+    readonly pickerVisibility: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservableWithChange<import("@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionPickerVisibility").ISessionPickerVisibility, void>;
     constructor(_chatViewFactory: IChatViewFactory, instantiationService: IInstantiationService, contextKeyService: IContextKeyService, themeService: IThemeService, _changesStatsCache: ISessionChangesStatsCache);
     openSession(session: IActiveSession | undefined, options: ISessionViewOptions): void;
     private _showSessionGroups;
+    private get _visibleStandaloneView();
     private _handleContextKeys;
     layout(width: number, height: number, top: number, left: number): void;
+    layoutContainer(width: number, height: number, top: number, left: number): void;
+    layoutContents(): void;
     private _layoutChildren;
     toJSON(): object;
     focus(): void;
+    focusWorkspacePicker(): void;
+    focusHarnessPicker(): void;
     /**
      * Starts an inline rename of the session title in the header. Returns
      * `false` when the header cannot host it (e.g. this view is hidden or the
@@ -75,12 +87,18 @@ export declare class SessionView extends Disposable implements ISerializableView
      * rename affordance.
      */
     startTitleEditing(): boolean;
+    startFocusedChatTitleEditing(): boolean;
+    startChatTitleEditing(chatResource: URI): boolean;
     getFocusedChat(): IChat | undefined;
+    getActiveChat(): IChat | undefined;
+    toggleActiveChatPin(): void;
+    closeChatGroup(chatResource: URI): Promise<boolean>;
     getSession(): IActiveSession | undefined;
     selectWorkspace(folderUri: URI, options?: ISelectWorkspaceOptions): WorkspaceSelectionResult;
-    selectNoWorkspace(): void;
-    /** Opens the given chat in a group beside the active one ("open to the side"). */
-    openChatToSide(resource: URI): Promise<void>;
+    applyDraft(draft: IAgentsWindowDraft, folderUri: URI | undefined, options: ISelectWorkspaceOptions, token: CancellationToken): Promise<WorkspaceSelectionResult>;
+    selectNoWorkspace(options?: ISelectNoWorkspaceOptions): void;
+    /** Opens the given chat beside a reference chat, or the active group ("open to the side"). */
+    openChatToSide(resource: URI, referenceChatResource?: URI): Promise<void>;
     /** Places a freshly created chat (e.g. a side chat) into its own group beside the current one. */
     splitChatToSide(resource: URI): void;
     focusAdjacentChatGroup(direction: "previous" | "next"): void;
@@ -122,4 +140,5 @@ export declare class SessionView extends Disposable implements ISerializableView
     private get _isVisible();
     private _updateVisibility;
     private _applyActiveSessionStyles;
+    dispose(): void;
 }

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

@@ -1,16 +1,17 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import * as sessionView from './media/sessionView.css';
-import { $, size } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $, isAncestorOfActiveElement, size } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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 { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { ChatGroupsView } from './chatGroupsView.js';
-import { SessionHeader, SessionViewFloatingToolbar } from './sessionHeader.js';
+import { SessionHeader } from './sessionHeader.js';
 import { SessionContext } 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 '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
@@ -20,8 +21,11 @@ import { setActiveSessionContextKeys } from '../../services/sessions/common/sess
 import { ISessionChangesStatsCache } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionChangesStatsCache.service';
 import { applySessionViewThemeColors } from './sessionBarStyles.js';
 import { IChatViewFactory } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/chatView/browser/chatViewFactory.service';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { noSessionPickerVisibility, SessionPickerVisibilityContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionPickerVisibility';
+import { disposableObservableValue, observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { SessionViewFloatingToolbar } from './sessionHeaderBar.js';
 
 var SessionView_1;
 registerCss(sessionView, 0);
@@ -53,7 +57,7 @@ let SessionView = class SessionView extends Disposable {
         this.maximumHeight = Number.POSITIVE_INFINITY;
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
-        this._standaloneView = this._register(( new MutableDisposable()));
+        this._standaloneView = this._register(disposableObservableValue(this, undefined));
         this._openSessionDisposables = this._register(( new DisposableStore()));
         this._hasOpenedSession = false;
         this._isGridLayout = false;
@@ -61,8 +65,22 @@ let SessionView = class SessionView extends Disposable {
         this._isPartVisible = true;
         this._isLeafVisible = true;
         this._sessionObs = observableValue(this, undefined);
+        this._isVisibleObs = observableValue(this, true);
+        this.pickerVisibility = derived(
+            this,
+            reader => this._isVisibleObs.read(reader) && !this._sessionObs.read(reader)?.preparationProgress?.read(reader) ? this._standaloneView.read(reader)?.pickerVisibility.read(reader) ?? noSessionPickerVisibility : noSessionPickerVisibility
+        );
+        this.element.setAttribute("role", "region");
+        this._register(autorun(reader => {
+            const session = this._sessionObs.read(reader);
+            this.element.setAttribute("aria-label", session ? ( localize(3455, "Session: {0}", session.title.read(reader))) : ( localize(3456, "New Session")));
+        }));
         const scopedContextKeyService = this._scopedContextKeyService = this._register(contextKeyService.createScoped(this.element));
         this._sessionIsMaximizedKey = SessionIsMaximizedContext.bindTo(scopedContextKeyService);
+        const pickerVisibilityContextKeys = this._register(( new SessionPickerVisibilityContextKeys(scopedContextKeyService)));
+        this._register(autorun(
+            reader => pickerVisibilityContextKeys.set(this.pickerVisibility.read(reader))
+        ));
         this._scopedInstantiationService = this._register(instantiationService.createChild(( new ServiceCollection(
             [IContextKeyService, scopedContextKeyService],
             [ISessionContext, ( new SessionContext(this._sessionObs))]
@@ -100,8 +118,10 @@ let SessionView = class SessionView extends Disposable {
         }));
         this._register(autorun(reader => {
             const session = this._sessionObs.read(reader);
-            const tabsReplaceHeader = this._groupsView.groupCount.read(reader) === 1 && (session?.isCreated.read(reader) ?? false) && (session?.shouldShowChatTabs.read(reader) ?? false);
-            this._header.setVisible(!tabsReplaceHeader);
+            const groupCount = this._groupsView.groupCount.read(reader);
+            const showChatAsSessionView = this._groupsView.showChatAsSessionView.read(reader);
+            const tabsReplaceHeader = groupCount === 1 && (session?.isCreated.read(reader) ?? false) && !showChatAsSessionView && (session?.shouldShowChatTabs.read(reader) ?? false);
+            this._header.setVisible(!tabsReplaceHeader && !(showChatAsSessionView && groupCount > 1));
             this._groupsView.setSingleGroupTabsReplaceHeader(tabsReplaceHeader);
             this.element.classList.toggle("tabs-replace-header", tabsReplaceHeader);
         }));
@@ -110,6 +130,10 @@ let SessionView = class SessionView extends Disposable {
         if (this._hasOpenedSession && this._currentSession === session) {
             return;
         }
+        options = {
+            ...options,
+            hostVisible: this._isVisibleObs
+        };
         this._hasOpenedSession = true;
         this._currentSession = session;
         this._sessionObs.set(session, undefined);
@@ -118,19 +142,56 @@ let SessionView = class SessionView extends Disposable {
         this._header.setSession(session);
         if (session && !session.isCreated.get()) {
             this._groupsView.setSession(undefined, options);
-            let view = this._standaloneView.value;
+            let view = this._standaloneView.get();
             if (!view || view.kind !== "newSession") {
                 view = this._chatViewFactory.createNewChatView(false, options, this._scopedInstantiationService);
-                this._standaloneView.value = view;
+                this._standaloneView.set(view, undefined);
             }
             if (view.element.parentElement !== this._contentContainer) {
                 this._contentContainer.replaceChildren(view.element);
             }
             view.setActive(this._isActive);
             view.setVisible(this._isVisible);
+            let restoreComposerFocus = false;
+            const hasPreparationProgress = derived(reader => !!session.preparationProgress?.read(reader));
             this._openSessionDisposables.add(autorun(reader => {
-                if (session.isCreated.read(reader) && this._currentSession === session) {
+                if (this._currentSession !== session) {
+                    return;
+                }
+                if (session.isCreated.read(reader)) {
+                    const moveFocus = restoreComposerFocus || isAncestorOfActiveElement(view.element);
                     this._showSessionGroups(session, options);
+                    if (moveFocus) {
+                        this._groupsView.focus();
+                    }
+                } else if (session.isNewSessionRequestInProgress?.read(reader) && hasPreparationProgress.read(reader)) {
+                    const moveFocus = isAncestorOfActiveElement(view.element);
+                    view.setVisible(false);
+                    reader.store.add(toDisposable(() => {
+                        restoreComposerFocus = !!this._preparationView && isAncestorOfActiveElement(this._preparationView.element);
+                        this._preparationView = undefined;
+                    }));
+                    const preparationView = reader.store.add(this._chatViewFactory.createChatView(this._scopedInstantiationService));
+                    this._preparationView = preparationView;
+                    preparationView.setChat(session.mainChat.read(reader), session.sessionId, session);
+                    preparationView.setActive(this._isActive);
+                    preparationView.setVisible(this._isVisible);
+                    this._contentContainer.replaceChildren(preparationView.element);
+                    this._layoutChildren();
+                    if (moveFocus) {
+                        preparationView.focus();
+                    }
+                } else {
+                    if (view.element.parentElement !== this._contentContainer) {
+                        this._contentContainer.replaceChildren(view.element);
+                    }
+                    view.setActive(this._isActive);
+                    view.setVisible(this._isVisible);
+                    this._layoutChildren();
+                    if (restoreComposerFocus) {
+                        view.focus();
+                        restoreComposerFocus = false;
+                    }
                 }
             }));
         } else if (session) {
@@ -138,7 +199,7 @@ let SessionView = class SessionView extends Disposable {
         } else {
             this._groupsView.setSession(undefined, options);
             const view = this._chatViewFactory.createNewChatView(false, options, this._scopedInstantiationService);
-            this._standaloneView.value = view;
+            this._standaloneView.set(view, undefined);
             this._contentContainer.replaceChildren(view.element);
             view.setActive(this._isActive);
             view.setVisible(this._isVisible);
@@ -147,24 +208,34 @@ let SessionView = class SessionView extends Disposable {
         this._layoutChildren();
     }
     _showSessionGroups(session, options) {
-        this._standaloneView.clear();
+        this._standaloneView.set(undefined, undefined);
         this._contentContainer.replaceChildren(this._groupsView.element);
         this._groupsView.setSession(session, options);
         this._layoutChildren();
     }
+    get _visibleStandaloneView() {
+        return this._preparationView ?? this._standaloneView.get();
+    }
     _handleContextKeys(session) {
         return autorun(reader => {
             setActiveSessionContextKeys(session, this._scopedContextKeyService, reader, this._changesStatsCache);
         });
     }
     layout(width, height, top, left) {
+        this.layoutContainer(width, height, top, left);
+        this.layoutContents();
+    }
+    layoutContainer(width, height, top, left) {
         size(this.element, width, height);
+        this._centeredContentContainer.style.width = `${width}px`;
         this._lastLayout = {
             width,
             height,
             top,
             left
         };
+    }
+    layoutContents() {
         this._layoutChildren();
     }
     _layoutChildren() {
@@ -178,19 +249,26 @@ let SessionView = class SessionView extends Disposable {
             left
         } = this._lastLayout;
         if (!this._isVisible || width === 0 || height === 0) {
+            this._lastContentLayout = undefined;
             return;
         }
-        this._centeredContentContainer.style.width = `${width}px`;
         const barHeight = this._header.visible ? this._header.height : 0;
-        size(this._centeredContentContainer, width, barHeight);
-        const contentHeight = height - barHeight;
+        const contentHeight = Math.max(0, height - barHeight);
         const contentTop = top + barHeight;
-        const standaloneView = this._standaloneView.value;
-        if (standaloneView) {
-            standaloneView.layout(width, contentHeight, contentTop, left);
-        } else {
-            this._groupsView.layout(width, contentHeight, contentTop, left);
+        const view = this._visibleStandaloneView ?? this._groupsView;
+        const previous = this._lastContentLayout;
+        if (previous?.view === view && previous.width === width && previous.height === contentHeight && previous.top === contentTop && previous.left === left) {
+            return;
         }
+        this._lastContentLayout = {
+            view,
+            width,
+            height: contentHeight,
+            top: contentTop,
+            left
+        };
+        size(this._centeredContentContainer, width, barHeight);
+        view.layout(width, contentHeight, contentTop, left);
     }
     toJSON() {
         return {
@@ -198,28 +276,52 @@ let SessionView = class SessionView extends Disposable {
         };
     }
     focus() {
-        const standaloneView = this._standaloneView.value;
+        const standaloneView = this._visibleStandaloneView;
         standaloneView ? standaloneView.focus() : this._groupsView.focus();
     }
+    focusWorkspacePicker() {
+        this._visibleStandaloneView?.focusWorkspacePicker();
+    }
+    focusHarnessPicker() {
+        this._visibleStandaloneView?.focusHarnessPicker();
+    }
     startTitleEditing() {
         return this._isVisible && this._header.startTitleEditing();
     }
+    startFocusedChatTitleEditing() {
+        return this._isVisible && this._groupsView.startFocusedChatTitleEditing();
+    }
+    startChatTitleEditing(chatResource) {
+        return this._isVisible && this._groupsView.startChatTitleEditing(chatResource);
+    }
     getFocusedChat() {
         return this._groupsView.getFocusedChat();
     }
+    getActiveChat() {
+        return this._groupsView.getActiveChat();
+    }
+    toggleActiveChatPin() {
+        this._groupsView.toggleActiveChatPin();
+    }
+    closeChatGroup(chatResource) {
+        return this._groupsView.closeChatGroup(chatResource);
+    }
     getSession() {
         return this._currentSession;
     }
     selectWorkspace(folderUri, options) {
-        const standaloneView = this._standaloneView.value;
+        const standaloneView = this._visibleStandaloneView;
         return standaloneView ? standaloneView.selectWorkspace(folderUri, options) : this._groupsView.selectWorkspace(folderUri, options);
     }
-    selectNoWorkspace() {
-        const standaloneView = this._standaloneView.value;
-        standaloneView ? standaloneView.selectNoWorkspace() : this._groupsView.selectNoWorkspace();
+    applyDraft(draft, folderUri, options, token) {
+        return this._standaloneView.get()?.applyDraft(draft, folderUri, options, token) ?? Promise.resolve("notReady");
+    }
+    selectNoWorkspace(options) {
+        const standaloneView = this._visibleStandaloneView;
+        standaloneView ? standaloneView.selectNoWorkspace(options) : this._groupsView.selectNoWorkspace(options);
     }
-    openChatToSide(resource) {
-        return this._groupsView.openChatInNewGroup(resource);
+    openChatToSide(resource, referenceChatResource) {
+        return this._groupsView.openChatInNewGroup(resource, referenceChatResource);
     }
     splitChatToSide(resource) {
         this._groupsView.splitChatToSide(resource);
@@ -234,18 +336,18 @@ let SessionView = class SessionView extends Disposable {
         this._groupsView.moveActiveChatToAdjacentGroup(direction);
     }
     prefillInput(text) {
-        const standaloneView = this._standaloneView.value;
+        const standaloneView = this._visibleStandaloneView;
         standaloneView ? standaloneView.prefillInput(text) : this._groupsView.prefillInput(text);
     }
     sendQuery(text) {
-        const standaloneView = this._standaloneView.value;
+        const standaloneView = this._visibleStandaloneView;
         standaloneView ? standaloneView.sendQuery(text) : this._groupsView.sendQuery(text);
     }
     submitInput() {
-        return this._standaloneView.value?.submitInput() ?? this._groupsView.submitInput();
+        return this._visibleStandaloneView?.submitInput() ?? this._groupsView.submitInput();
     }
     attach(uris) {
-        const standaloneView = this._standaloneView.value;
+        const standaloneView = this._visibleStandaloneView;
         standaloneView ? standaloneView.attach(uris) : this._groupsView.attach(uris);
     }
     setMaximized(maximized) {
@@ -258,7 +360,7 @@ let SessionView = class SessionView extends Disposable {
         this._isActive = active;
         this._applyActiveSessionStyles();
         this._groupsView.setSessionActive(active);
-        this._standaloneView.value?.setActive(active);
+        this._visibleStandaloneView?.setActive(active);
     }
     setVisible(visible) {
         if (this._isLeafVisible === visible) {
@@ -284,8 +386,10 @@ let SessionView = class SessionView extends Disposable {
         if (visible === wasVisible) {
             return;
         }
+        this._lastContentLayout = undefined;
+        this._isVisibleObs.set(visible, undefined);
         this._groupsView.setSessionVisible(visible);
-        this._standaloneView.value?.setVisible(visible);
+        this._visibleStandaloneView?.setVisible(visible);
         if (visible) {
             this._layoutChildren();
         }
@@ -294,6 +398,12 @@ let SessionView = class SessionView extends Disposable {
         this.element.classList.toggle("modern-ui-editor-tab-group-active", this._isActive);
         applySessionViewThemeColors(this.element, this.themeService.getColorTheme(), this._isActive);
     }
+    dispose() {
+        this._lastLayout = undefined;
+        this._lastContentLayout = undefined;
+        this._isVisibleObs.set(false, undefined);
+        super.dispose();
+    }
 };
 SessionView = SessionView_1 = ( __decorate([( __param(0, IChatViewFactory)), ( __param(1, IInstantiationService)), ( __param(2, IContextKeyService)), ( __param(3, IThemeService)), ( __param(4, ISessionChangesStatsCache))], SessionView));