@codingame/monaco-vscode-chat-service-override 24.3.0 → 25.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/{chatViewPane.js → widgetHosts/viewPane/chatViewPane.js}

@@ -2,7 +2,7 @@
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import * as chatViewPane from './media/chatViewPane.css';
-import { $, append, setVisibility, getWindow, addDisposableListener, EventType, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $, append, addDisposableListener, EventType, setVisibility, getWindow, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { StandardMouseEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/mouseEvent';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
@@ -44,38 +44,34 @@ import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/wo
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.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 { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatParticipantContribTypes';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
-import { LocalChatSessionUri, getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { LocalChatSessionUri, getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { ChatConfiguration, ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { showCloseActiveChatNotification } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatCloseNotification';
-import { AgentSessionsControl } from './agentSessions/agentSessionsControl.js';
-import { AgentSessionsListDelegate } from './agentSessions/agentSessionsViewer.js';
-import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { AgentSessionsControl } from '../../agentSessions/agentSessionsControl.js';
+import { AgentSessionsListDelegate } from '../../agentSessions/agentSessionsViewer.js';
+import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget';
 import { ChatViewWelcomeController } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController';
-import { Position } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
+import { Position, LayoutSettings } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { AgentSessionsViewerOrientation, AgentSessionsViewerPosition } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import { Link } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/browser/link';
 import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
 import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { AgentSessionsFilter } from './agentSessions/agentSessionsFilter.js';
+import { AgentSessionsFilter } from '../../agentSessions/agentSessionsFilter.js';
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
+import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var ChatViewPane_1;
 registerCss(chatViewPane);
 let ChatViewPane = class ChatViewPane extends ViewPane {
     static { ChatViewPane_1 = this; }
-    static { this.SESSIONS_LIMIT = 3; }
-    static { this.SESSIONS_SIDEBAR_WIDTH = 300; }
-    static { this.SESSIONS_SIDEBAR_VIEW_MIN_WIDTH = 300  + this.SESSIONS_SIDEBAR_WIDTH; }
-    get widget() { return this._widget; }
     constructor(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService, storageService, chatService, chatAgentService, logService, layoutService, chatSessionsService, telemetryService, lifecycleService, progressService, agentSessionsService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
         this.storageService = storageService;
@@ -87,25 +83,38 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.telemetryService = telemetryService;
         this.progressService = progressService;
         this.agentSessionsService = agentSessionsService;
+        this.lastDimensionsPerOrientation = ( new Map());
+        this.modelRef = this._register(( new MutableDisposable()));
         this.sessionsCount = 0;
         this.sessionsViewerLimited = true;
         this.sessionsViewerOrientation = AgentSessionsViewerOrientation.Stacked;
-        this.sessionsViewerPosition = AgentSessionsViewerPosition.Right;
-        this.modelRef = this._register(( new MutableDisposable()));
+        this.sessionsViewerOrientationConfiguration = 'sideBySide';
         this.memento = ( new Memento(`interactive-session-view-${CHAT_PROVIDER_ID}`, this.storageService));
         this.viewState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
         if (lifecycleService.startupKind !== StartupKind.ReloadedWindow &&
             this.configurationService.getValue(ChatConfiguration.RestoreLastPanelSession) === false) {
             this.viewState.sessionId = undefined;
         }
+        this.sessionsViewerLimited = this.viewState.sessionsViewerLimited ?? true;
         this.chatViewLocationContext = ChatContextKeys.panelLocation.bindTo(contextKeyService);
         this.sessionsViewerLimitedContext = ChatContextKeys.agentSessionsViewerLimited.bindTo(contextKeyService);
         this.sessionsViewerOrientationContext = ChatContextKeys.agentSessionsViewerOrientation.bindTo(contextKeyService);
         this.sessionsViewerPositionContext = ChatContextKeys.agentSessionsViewerPosition.bindTo(contextKeyService);
+        this.sessionsViewerVisibilityContext = ChatContextKeys.agentSessionsViewerVisible.bindTo(contextKeyService);
         this.updateContextKeys(false);
         this.registerListeners();
     }
     updateContextKeys(fromEvent) {
+        const { position, location } = this.getViewPositionAndLocation();
+        this.sessionsViewerLimitedContext.set(this.sessionsViewerLimited);
+        this.chatViewLocationContext.set(location ?? ViewContainerLocation.AuxiliaryBar);
+        this.sessionsViewerOrientationContext.set(this.sessionsViewerOrientation);
+        this.sessionsViewerPositionContext.set(position === Position.RIGHT ? AgentSessionsViewerPosition.Right : AgentSessionsViewerPosition.Left);
+        if (fromEvent && this.lastDimensions) {
+            this.layoutBody(this.lastDimensions.height, this.lastDimensions.width);
+        }
+    }
+    getViewPositionAndLocation() {
         const viewLocation = this.viewDescriptorService.getViewLocationById(this.id);
         const sideBarPosition = this.layoutService.getSideBarPosition();
         const panelPosition = this.layoutService.getPanelPosition();
@@ -121,44 +130,49 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                 sideSessionsOnRightPosition = sideBarPosition === Position.LEFT;
                 break;
         }
-        this.sessionsViewerPosition = sideSessionsOnRightPosition ? AgentSessionsViewerPosition.Right : AgentSessionsViewerPosition.Left;
-        this.sessionsViewerLimitedContext.set(this.sessionsViewerLimited);
-        this.chatViewLocationContext.set(viewLocation ?? ViewContainerLocation.AuxiliaryBar);
-        this.sessionsViewerOrientationContext.set(this.sessionsViewerOrientation);
-        this.sessionsViewerPositionContext.set(this.sessionsViewerPosition);
-        if (fromEvent && this.lastDimensions) {
-            this.layoutBody(this.lastDimensions.height, this.lastDimensions.width);
-        }
+        return {
+            position: sideSessionsOnRightPosition ? Position.RIGHT : Position.LEFT,
+            location: viewLocation ?? ViewContainerLocation.AuxiliaryBar
+        };
     }
     updateViewPaneClasses(fromEvent) {
         const welcomeEnabled = this.configurationService.getValue(ChatConfiguration.ChatViewWelcomeEnabled) !== false;
         this.viewPaneContainer?.classList.toggle('chat-view-welcome-enabled', welcomeEnabled);
+        const activityBarLocationDefault = this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION) === 'default';
+        this.viewPaneContainer?.classList.toggle('activity-bar-location-default', activityBarLocationDefault);
+        this.viewPaneContainer?.classList.toggle('activity-bar-location-other', !activityBarLocationDefault);
+        const { position, location } = this.getViewPositionAndLocation();
+        this.viewPaneContainer?.classList.toggle('chat-view-location-auxiliarybar', location === ViewContainerLocation.AuxiliaryBar);
+        this.viewPaneContainer?.classList.toggle('chat-view-location-sidebar', location === ViewContainerLocation.Sidebar);
+        this.viewPaneContainer?.classList.toggle('chat-view-location-panel', location === ViewContainerLocation.Panel);
+        this.viewPaneContainer?.classList.toggle('chat-view-position-left', position === Position.LEFT);
+        this.viewPaneContainer?.classList.toggle('chat-view-position-right', position === Position.RIGHT);
         if (fromEvent && this.lastDimensions) {
             this.layoutBody(this.lastDimensions.height, this.lastDimensions.width);
         }
     }
     registerListeners() {
         this._register(this.chatAgentService.onDidChangeAgents(() => this.onDidChangeAgents()));
-        this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('workbench.sideBar.location'))(() => this.updateContextKeys(true)));
-        this._register(this.layoutService.onDidChangePanelPosition(() => this.updateContextKeys(true)));
-        this._register(Event.filter(this.viewDescriptorService.onDidChangeContainerLocation, e => e.viewContainer === this.viewDescriptorService.getViewContainerByViewId(this.id))(() => this.updateContextKeys(true)));
-        this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(ChatConfiguration.ChatViewWelcomeEnabled))(() => this.updateViewPaneClasses(true)));
+        this._register(Event.any(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('workbench.sideBar.location')), this.layoutService.onDidChangePanelPosition, Event.filter(this.viewDescriptorService.onDidChangeContainerLocation, e => e.viewContainer === this.viewDescriptorService.getViewContainerByViewId(this.id)))(() => {
+            this.updateContextKeys(false);
+            this.updateViewPaneClasses(true );
+        }));
+        this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => {
+            return e.affectsConfiguration(ChatConfiguration.ChatViewWelcomeEnabled) || e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION);
+        })(() => this.updateViewPaneClasses(true)));
     }
     onDidChangeAgents() {
         if (this.chatAgentService.getDefaultAgent(ChatAgentLocation.Chat)) {
             if (!this._widget?.viewModel && !this.restoringSession) {
-                const info = this.getTransferredOrPersistedSessionInfo();
+                const sessionResource = this.getTransferredOrPersistedSessionInfo();
                 this.restoringSession =
-                    (info.sessionId ? this.chatService.getOrRestoreSession(LocalChatSessionUri.forSession(info.sessionId)) : Promise.resolve(undefined)).then(async (modelRef) => {
+                    (sessionResource ? this.chatService.getOrRestoreSession(sessionResource) : Promise.resolve(undefined)).then(async (modelRef) => {
                         if (!this._widget) {
                             return;
                         }
                         const wasVisible = this._widget.visible;
                         try {
                             this._widget.setVisible(false);
-                            if (info.inputState && modelRef) {
-                                modelRef.object.inputModel.setState(info.inputState);
-                            }
                             await this.showModel(modelRef);
                         }
                         finally {
@@ -171,58 +185,10 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this._onDidChangeViewWelcomeState.fire();
     }
     getTransferredOrPersistedSessionInfo() {
-        if (this.chatService.transferredSessionData?.location === ChatAgentLocation.Chat) {
-            const sessionId = this.chatService.transferredSessionData.sessionId;
-            return {
-                sessionId,
-                inputState: this.chatService.transferredSessionData.inputState,
-            };
-        }
-        return { sessionId: this.viewState.sessionId };
-    }
-    getActionsContext() {
-        return this._widget?.viewModel ? {
-            sessionResource: this._widget.viewModel.sessionResource,
-            $mid: MarshalledId.ChatViewContext
-        } : undefined;
-    }
-    async showModel(modelRef, startNewSession = true) {
-        if (this.modelRef.value?.object.requestInProgress.get()) {
-            const closingSessionResource = this.modelRef.value.object.sessionResource;
-            this.instantiationService.invokeFunction(showCloseActiveChatNotification, closingSessionResource);
-        }
-        const oldModelResource = this.modelRef.value?.object.sessionResource;
-        this.modelRef.value = undefined;
-        let ref;
-        if (startNewSession) {
-            ref = modelRef ?? (this.chatService.transferredSessionData?.sessionId && this.chatService.transferredSessionData?.location === ChatAgentLocation.Chat
-                ? await this.chatService.getOrRestoreSession(LocalChatSessionUri.forSession(this.chatService.transferredSessionData.sessionId))
-                : this.chatService.startSession(ChatAgentLocation.Chat));
-            if (!ref) {
-                throw ( new Error('Could not start chat session'));
-            }
-        }
-        this.modelRef.value = ref;
-        const model = ref?.object;
-        if (model) {
-            await this.updateWidgetLockState(model.sessionResource);
-            this.viewState.sessionId = model.sessionId;
-        }
-        this._widget.setModel(model);
-        this.titleControl?.update(model);
-        this.updateActions();
-        if (oldModelResource) {
-            this.agentSessionsService.model.getSession(oldModelResource)?.setRead(true);
+        if (this.chatService.transferredSessionResource) {
+            return this.chatService.transferredSessionResource;
         }
-        return model;
-    }
-    shouldShowWelcome() {
-        const noPersistedSessions = !this.chatService.hasSessions();
-        const hasCoreAgent = ( this.chatAgentService.getAgents().some(agent => agent.isCore && agent.locations.includes(ChatAgentLocation.Chat)));
-        const hasDefaultAgent = this.chatAgentService.getDefaultAgent(ChatAgentLocation.Chat) !== undefined;
-        const shouldShow = !hasCoreAgent && (!hasDefaultAgent || !this._widget?.viewModel && noPersistedSessions);
-        this.logService.trace(`ChatViewPane#shouldShowWelcome() = ${shouldShow}: hasCoreAgent=${hasCoreAgent} hasDefaultAgent=${hasDefaultAgent} || noViewModel=${!this._widget?.viewModel} && noPersistedSessions=${noPersistedSessions}`);
-        return !!shouldShow;
+        return this.viewState.sessionId ? LocalChatSessionUri.forSession(this.viewState.sessionId) : undefined;
     }
     renderBody(parent) {
         super.renderBody(parent);
@@ -241,12 +207,19 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.registerControlsListeners(sessionsControl, chatWidget, welcomeController);
         this.updateSessionsControlVisibility();
     }
+    static { this.SESSIONS_LIMIT = 3; }
+    static { this.SESSIONS_SIDEBAR_WIDTH = 300; }
+    static { this.SESSIONS_SIDEBAR_VIEW_MIN_WIDTH = 300  + this.SESSIONS_SIDEBAR_WIDTH; }
     createSessionsControl(parent) {
         const that = this;
         const sessionsContainer = this.sessionsContainer = parent.appendChild($('.agent-sessions-container'));
         const sessionsTitleContainer = this.sessionsTitleContainer = append(sessionsContainer, $('.agent-sessions-title-container'));
         const sessionsTitle = this.sessionsTitle = append(sessionsTitleContainer, $('span.agent-sessions-title'));
-        sessionsTitle.textContent = this.sessionsViewerLimited ? ( localize(5646, "Recent Sessions")) : ( localize(5647, "All Sessions"));
+        this.updateSessionsControlTitle();
+        this._register(addDisposableListener(sessionsTitle, EventType.CLICK, () => {
+            this.sessionsControl?.scrollToTop();
+            this.sessionsControl?.focus();
+        }));
         const sessionsToolbarContainer = append(sessionsTitleContainer, $('.agent-sessions-toolbar'));
         const sessionsToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, sessionsToolbarContainer, MenuId.AgentSessionsToolbar, {
             menuOptions: { shouldForwardArgs: true }
@@ -256,6 +229,9 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             limitResults: () => {
                 return that.sessionsViewerLimited ? ChatViewPane_1.SESSIONS_LIMIT : undefined;
             },
+            groupResults: () => {
+                return !that.sessionsViewerLimited;
+            },
             overrideExclude(session) {
                 if (that.sessionsViewerLimited) {
                     if (session.isArchived()) {
@@ -267,46 +243,96 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             },
             notifyResults(count) {
                 that.notifySessionsControlCountChanged(count);
-            }
+            },
         }));
         this._register(Event.runAndSubscribe(sessionsFilter.onDidChange, () => {
             sessionsToolbarContainer.classList.toggle('filtered', !sessionsFilter.isDefault());
         }));
         this.sessionsControlContainer = append(sessionsContainer, $('.agent-sessions-control-container'));
         const sessionsControl = this.sessionsControl = this._register(this.instantiationService.createInstance(AgentSessionsControl, this.sessionsControlContainer, {
-            allowOpenSessionsInPanel: true,
-            filter: sessionsFilter
+            filter: sessionsFilter,
+            overrideStyles: this.getLocationBasedColors().listOverrideStyles,
+            getHoverPosition: () => {
+                const { position } = this.getViewPositionAndLocation();
+                return position === Position.RIGHT ? HoverPosition.LEFT : HoverPosition.RIGHT;
+            },
+            trackActiveEditorSession: () => {
+                return !this._widget || this._widget.isEmpty();
+            },
+            overrideCompare(sessionA, sessionB) {
+                if (that.sessionsViewerLimited) {
+                    const aIsUnread = !sessionA.isRead();
+                    const bIsUnread = !sessionB.isRead();
+                    if (aIsUnread && !bIsUnread) {
+                        return -1;
+                    }
+                    if (!aIsUnread && bIsUnread) {
+                        return 1;
+                    }
+                }
+                return undefined;
+            }
         }));
         this._register(this.onDidChangeBodyVisibility(visible => sessionsControl.setVisible(visible)));
         sessionsToolbar.context = sessionsControl;
         this.sessionsLinkContainer = append(sessionsContainer, $('.agent-sessions-link-container'));
         this.sessionsLink = this._register(this.instantiationService.createInstance(Link, this.sessionsLinkContainer, {
-            label: this.sessionsViewerLimited ? ( localize(5648, "Show All Sessions")) : ( localize(5649, "Show Recent Sessions")),
+            label: this.sessionsViewerLimited ? ( localize(5874, "Show More")) : ( localize(5875, "Show Less")),
             href: '',
         }, {
             opener: () => {
                 this.sessionsViewerLimited = !this.sessionsViewerLimited;
-                this.notifySessionsControlLimitedChanged(true);
+                this.viewState.sessionsViewerLimited = this.sessionsViewerLimited;
+                this.notifySessionsControlLimitedChanged(true , true );
                 sessionsControl.focus();
             }
         }));
+        this._register(Event.runAndSubscribe(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(ChatConfiguration.ChatViewSessionsOrientation)), e => {
+            const newSessionsViewerOrientationConfiguration = this.configurationService.getValue(ChatConfiguration.ChatViewSessionsOrientation);
+            this.doUpdateConfiguredSessionsViewerOrientation(newSessionsViewerOrientationConfiguration, { updateConfiguration: false, layout: !!e });
+        }));
         return sessionsControl;
     }
-    notifySessionsControlLimitedChanged(triggerLayout) {
-        this.sessionsViewerLimitedContext.set(this.sessionsViewerLimited);
-        if (this.sessionsTitle) {
-            this.sessionsTitle.textContent = this.sessionsViewerLimited ? ( localize(5646, "Recent Sessions")) : ( localize(5647, "All Sessions"));
+    getSessionsViewerOrientation() {
+        return this.sessionsViewerOrientation;
+    }
+    updateConfiguredSessionsViewerOrientation(orientation) {
+        return this.doUpdateConfiguredSessionsViewerOrientation(orientation, { updateConfiguration: true, layout: true });
+    }
+    doUpdateConfiguredSessionsViewerOrientation(orientation, options) {
+        const oldSessionsViewerOrientationConfiguration = this.sessionsViewerOrientationConfiguration;
+        let validatedOrientation;
+        if (orientation === 'stacked' || orientation === 'sideBySide') {
+            validatedOrientation = orientation;
+        }
+        else {
+            validatedOrientation = 'sideBySide';
+        }
+        this.sessionsViewerOrientationConfiguration = validatedOrientation;
+        if (oldSessionsViewerOrientationConfiguration === this.sessionsViewerOrientationConfiguration) {
+            return;
+        }
+        if (options.updateConfiguration) {
+            this.configurationService.updateValue(ChatConfiguration.ChatViewSessionsOrientation, validatedOrientation);
         }
+        if (options.layout && this.lastDimensions) {
+            this.layoutBody(this.lastDimensions.height, this.lastDimensions.width);
+        }
+    }
+    notifySessionsControlLimitedChanged(triggerLayout, triggerUpdate) {
+        this.sessionsViewerLimitedContext.set(this.sessionsViewerLimited);
+        this.updateSessionsControlTitle();
         if (this.sessionsLink) {
             this.sessionsLink.link = {
-                label: this.sessionsViewerLimited ? ( localize(5648, "Show All Sessions")) : ( localize(5649, "Show Recent Sessions")),
+                label: this.sessionsViewerLimited ? ( localize(5874, "Show More")) : ( localize(5875, "Show Less")),
                 href: ''
             };
         }
-        this.sessionsControl?.update();
+        const updatePromise = triggerUpdate ? this.sessionsControl?.update() : undefined;
         if (triggerLayout && this.lastDimensions) {
             this.layoutBody(this.lastDimensions.height, this.lastDimensions.width);
         }
+        return updatePromise ?? Promise.resolve();
     }
     notifySessionsControlCountChanged(newSessionsCount) {
         const countChanged = typeof newSessionsCount === 'number' && newSessionsCount !== this.sessionsCount;
@@ -318,6 +344,12 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             }
         }
     }
+    updateSessionsControlTitle() {
+        if (!this.sessionsTitle) {
+            return;
+        }
+        this.sessionsTitle.textContent = this.sessionsViewerLimited ? ( localize(5876, "Recent Sessions")) : ( localize(5877, "Sessions"));
+    }
     updateSessionsControlVisibility() {
         if (!this.sessionsContainer || !this.viewPaneContainer) {
             return { changed: false, visible: false };
@@ -334,17 +366,25 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                         (this.sessionsCount > 0 || !this.sessionsViewerLimited);
             }
             else {
-                newSessionsContainerVisible = !!this.lastDimensions && this.lastDimensions.width >= ChatViewPane_1.SESSIONS_SIDEBAR_VIEW_MIN_WIDTH;
+                newSessionsContainerVisible =
+                    !this.welcomeController?.isShowingWelcome.get() &&
+                        !!this.lastDimensions && this.lastDimensions.width >= ChatViewPane_1.SESSIONS_SIDEBAR_VIEW_MIN_WIDTH;
             }
         }
         this.viewPaneContainer.classList.toggle('has-sessions-control', newSessionsContainerVisible);
         const sessionsContainerVisible = this.sessionsContainer.style.display !== 'none';
         setVisibility(newSessionsContainerVisible, this.sessionsContainer);
+        this.sessionsViewerVisibilityContext.set(newSessionsContainerVisible);
         return {
             changed: sessionsContainerVisible !== newSessionsContainerVisible,
             visible: newSessionsContainerVisible
         };
     }
+    getFocusedSessions() {
+        return this.sessionsControl?.getFocus() ?? [];
+    }
+    static { this.MIN_CHAT_WIDGET_HEIGHT = 120; }
+    get widget() { return this._widget; }
     createChatControl(parent) {
         const chatControlsContainer = append(parent, $('.chat-controls-container'));
         const locationBasedColors = this.getLocationBasedColors();
@@ -383,7 +423,6 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
     }
     createChatTitleControl(parent) {
         this.titleControl = this._register(this.instantiationService.createInstance(ChatViewTitleControl, parent, {
-            updateTitle: title => this.updateTitle(title),
             focusChat: () => this._widget.focusInput()
         }));
         this._register(this.titleControl.onDidChangeHeight(() => {
@@ -399,9 +438,13 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             }
             this.notifySessionsControlCountChanged();
         }));
-        this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(ChatConfiguration.ChatViewSessionsOrientation))(() => {
-            if (this.lastDimensions) {
-                this.layoutBody(this.lastDimensions.height, this.lastDimensions.width);
+        this._register(chatWidget.onDidChangeViewModel(() => {
+            if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked) {
+                return;
+            }
+            const sessionResource = chatWidget.viewModel?.sessionResource;
+            if (sessionResource) {
+                sessionsControl.reveal(sessionResource);
             }
         }));
     }
@@ -416,13 +459,61 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         }));
     }
     async applyModel() {
-        const info = this.getTransferredOrPersistedSessionInfo();
-        const modelRef = info.sessionId ? await this.chatService.getOrRestoreSession(LocalChatSessionUri.forSession(info.sessionId)) : undefined;
-        if (modelRef && info.inputState) {
-            modelRef.object.inputModel.setState(info.inputState);
-        }
+        const sessionResource = this.getTransferredOrPersistedSessionInfo();
+        const modelRef = sessionResource ? await this.chatService.getOrRestoreSession(sessionResource) : undefined;
         await this.showModel(modelRef);
     }
+    async showModel(modelRef, startNewSession = true) {
+        const oldModelResource = this.modelRef.value?.object.sessionResource;
+        this.modelRef.value = undefined;
+        let ref;
+        if (startNewSession) {
+            ref = modelRef ?? (this.chatService.transferredSessionResource
+                ? await this.chatService.getOrRestoreSession(this.chatService.transferredSessionResource)
+                : this.chatService.startSession(ChatAgentLocation.Chat));
+            if (!ref) {
+                throw ( new Error('Could not start chat session'));
+            }
+        }
+        this.modelRef.value = ref;
+        const model = ref?.object;
+        if (model) {
+            await this.updateWidgetLockState(model.sessionResource);
+            this.viewState.sessionId = model.sessionId;
+        }
+        this._widget.setModel(model);
+        this.titleControl?.update(model);
+        this.updateActions();
+        if (oldModelResource) {
+            this.agentSessionsService.model.getSession(oldModelResource)?.setRead(true);
+        }
+        return model;
+    }
+    async updateWidgetLockState(sessionResource) {
+        const sessionType = getChatSessionType(sessionResource);
+        if (sessionType === localChatSessionType) {
+            this._widget.unlockFromCodingAgent();
+            return;
+        }
+        let canResolve = false;
+        try {
+            canResolve = await this.chatSessionsService.canResolveChatSession(sessionResource);
+        }
+        catch (error) {
+            this.logService.warn(`Failed to resolve chat session '${( sessionResource.toString())}' for locking`, error);
+        }
+        if (!canResolve) {
+            this._widget.unlockFromCodingAgent();
+            return;
+        }
+        const contribution = this.chatSessionsService.getChatSessionContribution(sessionType);
+        if (contribution) {
+            this._widget.lockToCodingAgent(contribution.name, contribution.displayName, contribution.type);
+        }
+        else {
+            this._widget.unlockFromCodingAgent();
+        }
+    }
     async clear() {
         this.updateViewState();
         await this.showModel(undefined);
@@ -444,13 +535,20 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             return this.showModel(newModelRef);
         });
     }
-    focusInput() {
-        this._widget.focusInput();
-    }
     focus() {
         super.focus();
+        this.focusInput();
+    }
+    focusInput() {
         this._widget.focusInput();
     }
+    focusSessions() {
+        if (this.sessionsContainer?.style.display === 'none') {
+            return false;
+        }
+        this.sessionsControl?.focus();
+        return true;
+    }
     layoutBody(height, width) {
         super.layoutBody(height, width);
         this.lastDimensions = { height, width };
@@ -461,6 +559,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         remainingWidth -= widthReduction;
         remainingHeight -= this.titleControl?.getHeight() ?? 0;
         this._widget.layout(remainingHeight, remainingWidth);
+        this.lastDimensionsPerOrientation.set(this.sessionsViewerOrientation, { height, width });
     }
     layoutSessionsControl(height, width) {
         let heightReduction = 0;
@@ -468,10 +567,9 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         if (!this.sessionsContainer || !this.sessionsControlContainer || !this.sessionsControl || !this.viewPaneContainer || !this.sessionsTitleContainer || !this.sessionsLinkContainer || !this.sessionsTitle || !this.sessionsLink) {
             return { heightReduction, widthReduction };
         }
-        const configuredSessionsViewerOrientation = this.configurationService.getValue(ChatConfiguration.ChatViewSessionsOrientation);
         const oldSessionsViewerOrientation = this.sessionsViewerOrientation;
         let newSessionsViewerOrientation;
-        switch (configuredSessionsViewerOrientation) {
+        switch (this.sessionsViewerOrientationConfiguration) {
             case 'stacked':
                 newSessionsViewerOrientation = AgentSessionsViewerOrientation.Stacked;
                 break;
@@ -480,24 +578,47 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         }
         this.sessionsViewerOrientation = newSessionsViewerOrientation;
         if (newSessionsViewerOrientation === AgentSessionsViewerOrientation.SideBySide) {
-            this.viewPaneContainer.classList.add('sessions-control-orientation-sidebyside');
-            this.viewPaneContainer.classList.toggle('sessions-control-position-left', this.sessionsViewerPosition === AgentSessionsViewerPosition.Left);
+            this.viewPaneContainer.classList.toggle('sessions-control-orientation-sidebyside', true);
+            this.viewPaneContainer.classList.toggle('sessions-control-orientation-stacked', false);
             this.sessionsViewerOrientationContext.set(AgentSessionsViewerOrientation.SideBySide);
         }
         else {
-            this.viewPaneContainer.classList.remove('sessions-control-orientation-sidebyside');
-            this.viewPaneContainer.classList.remove('sessions-control-position-left');
+            this.viewPaneContainer.classList.toggle('sessions-control-orientation-sidebyside', false);
+            this.viewPaneContainer.classList.toggle('sessions-control-orientation-stacked', true);
             this.sessionsViewerOrientationContext.set(AgentSessionsViewerOrientation.Stacked);
         }
         if (oldSessionsViewerOrientation !== this.sessionsViewerOrientation) {
             const oldSessionsViewerLimited = this.sessionsViewerLimited;
-            this.sessionsViewerLimited = this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked;
+            if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.SideBySide) {
+                this.sessionsViewerLimited = false;
+            }
+            else {
+                this.sessionsViewerLimited = this.viewState.sessionsViewerLimited ?? true;
+            }
+            let updatePromise;
             if (oldSessionsViewerLimited !== this.sessionsViewerLimited) {
-                this.notifySessionsControlLimitedChanged(false );
+                updatePromise = this.notifySessionsControlLimitedChanged(false , true );
+            }
+            else {
+                updatePromise = this.sessionsControl?.update();
+            }
+            if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.SideBySide) {
+                updatePromise.then(() => {
+                    const sessionResource = this._widget?.viewModel?.sessionResource;
+                    if (sessionResource) {
+                        this.sessionsControl?.reveal(sessionResource);
+                    }
+                });
             }
         }
-        this.updateSessionsControlVisibility();
-        const availableSessionsHeight = height - this.sessionsTitleContainer.offsetHeight - this.sessionsLinkContainer.offsetHeight;
+        const { visible: sessionsContainerVisible } = this.updateSessionsControlVisibility();
+        if (!sessionsContainerVisible) {
+            return { heightReduction: 0, widthReduction: 0 };
+        }
+        let availableSessionsHeight = height - this.sessionsTitleContainer.offsetHeight - this.sessionsLinkContainer.offsetHeight;
+        if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked) {
+            availableSessionsHeight -= ChatViewPane_1.MIN_CHAT_WIDGET_HEIGHT;
+        }
         if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.SideBySide) {
             this.sessionsControlContainer.style.height = `${availableSessionsHeight}px`;
             this.sessionsControlContainer.style.width = `${ChatViewPane_1.SESSIONS_SIDEBAR_WIDTH}px`;
@@ -511,7 +632,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                 sessionsHeight = this.sessionsCount * AgentSessionsListDelegate.ITEM_HEIGHT;
             }
             else {
-                sessionsHeight = ((ChatViewPane_1.SESSIONS_LIMIT + 2) ) * AgentSessionsListDelegate.ITEM_HEIGHT;
+                sessionsHeight = ((ChatViewPane_1.SESSIONS_LIMIT * 2) ) * AgentSessionsListDelegate.ITEM_HEIGHT;
             }
             sessionsHeight = Math.min(availableSessionsHeight, sessionsHeight);
             this.sessionsControlContainer.style.height = `${sessionsHeight}px`;
@@ -522,6 +643,9 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         }
         return { heightReduction, widthReduction };
     }
+    getLastDimensions(orientation) {
+        return this.lastDimensionsPerOrientation.get(orientation);
+    }
     saveState() {
         if (this._widget?.viewModel) {
             this._widget.saveState();
@@ -538,39 +662,19 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             }
         }
     }
-    async updateWidgetLockState(sessionResource) {
-        const sessionType = getChatSessionType(sessionResource);
-        if (sessionType === localChatSessionType) {
-            this._widget.unlockFromCodingAgent();
-            return;
-        }
-        let canResolve = false;
-        try {
-            canResolve = await this.chatSessionsService.canResolveChatSession(sessionResource);
-        }
-        catch (error) {
-            this.logService.warn(`Failed to resolve chat session '${( sessionResource.toString())}' for locking`, error);
-        }
-        if (!canResolve) {
-            this._widget.unlockFromCodingAgent();
-            return;
-        }
-        const contribution = this.chatSessionsService.getChatSessionContribution(sessionType);
-        if (contribution) {
-            this._widget.lockToCodingAgent(contribution.name, contribution.displayName, contribution.type);
-        }
-        else {
-            this._widget.unlockFromCodingAgent();
-        }
+    shouldShowWelcome() {
+        const noPersistedSessions = !this.chatService.hasSessions();
+        const hasCoreAgent = ( this.chatAgentService.getAgents().some(agent => agent.isCore && agent.locations.includes(ChatAgentLocation.Chat)));
+        const hasDefaultAgent = this.chatAgentService.getDefaultAgent(ChatAgentLocation.Chat) !== undefined;
+        const shouldShow = !hasCoreAgent && (!hasDefaultAgent || !this._widget?.viewModel && noPersistedSessions);
+        this.logService.trace(`ChatViewPane#shouldShowWelcome() = ${shouldShow}: hasCoreAgent=${hasCoreAgent} hasDefaultAgent=${hasDefaultAgent} || noViewModel=${!this._widget?.viewModel} && noPersistedSessions=${noPersistedSessions}`);
+        return !!shouldShow;
     }
-    get singleViewPaneContainerTitle() {
-        if (this.titleControl) {
-            const titleControlTitle = this.titleControl.getSingleViewPaneContainerTitle();
-            if (titleControlTitle) {
-                return titleControlTitle;
-            }
-        }
-        return super.singleViewPaneContainerTitle;
+    getActionsContext() {
+        return this._widget?.viewModel ? {
+            sessionResource: this._widget.viewModel.sessionResource,
+            $mid: MarshalledId.ChatViewContext
+        } : undefined;
     }
 };
 ChatViewPane = ChatViewPane_1 = ( __decorate([