@codingame/monaco-vscode-workbench-service-override 37.6.1 → 38.0.1

package/vscode/src/vs/sessions/contrib/sessions/browser/sessionsActions.js

@@ -1,16 +1,20 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { raceCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { fromNow } from '@codingame/monaco-vscode-api/vscode/vs/base/common/date';
-import { onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { onUnexpectedError, isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { KeyMod, KeyCode, KeyChord } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
-import { DisposableStore, toDisposable, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { DisposableStore, toDisposable, Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { hasKey } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { registerAction2, Action2, MenuId, MenuItemAction, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { registerAction2, Action2, MenuRegistry, MenuId, MenuItemAction } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IActionViewItemService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/actionViewItemService.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { isConfigured } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
@@ -30,15 +34,14 @@ import { Parts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { getQuickNavigateHandler, inQuickPickContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/quickaccess';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { Menus } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/menus';
 import { SessionsCategories } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/categories';
-import { SessionsPickerVisibleContext, SessionsWelcomeVisibleContext, CanGoBackContext, CanGoForwardContext, SessionsFocusContext, SessionFocusedChatIsRenameTargetContext, SessionIsCreatedContext, SessionSupportsMultipleChatsContext, IsQuickChatSessionContext, SessionIsArchivedContext, SessionHasMultipleOpenChatsContext, SessionActiveChatIsClosableContext, SessionActiveChatIsDeletableContext, SessionsHasClosedItemContext, SessionsEditorScopeContext, SessionChatsPickerVisibleContext, SessionHasMultipleCommittedChatsContext, SessionsTitleBarNewSessionEnabledContext, SessionIdContext, SessionHasSideChatsContext, SessionIsStickyContext, SessionProviderIdContext, SessionSupportsRenameContext, MultipleSessionsVisibleContext, SessionIsMaximizedContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
+import { SessionsPickerVisibleContext, SessionsWelcomeVisibleContext, CanGoBackContext, CanGoForwardContext, SessionsFocusContext, SessionHeaderShowsChatContext, SessionFocusedChatIsRenameTargetContext, SessionIsCreatedContext, SessionIsArchivedContext, SessionsListPromoteNewChatActionContext, SessionSupportsMultipleChatsContext, IsQuickChatSessionContext, SessionItemIsMultiSelectionContext, SessionHasMultipleOpenChatsContext, SessionActiveChatIsClosableContext, SessionHeaderTargetsChatContext, SessionActiveChatIsDeletableContext, SessionActiveChatIsUntitledContext, SessionsHasClosedItemContext, SessionsEditorScopeContext, SessionChatsPickerVisibleContext, SessionHasMultipleCommittedChatsContext, SessionsTitleBarNewSessionEnabledContext, SessionIdContext, SessionActiveChatHasSideChatsContext, SessionActiveChatResourceContext, SessionIsStickyContext, SessionHeaderActiveChatIsPinnedContext, SessionProviderIdContext, SessionSupportsRenameContext, MultipleSessionsVisibleContext, SessionToolbarShowsSessionContext, IsNewChatSessionContext, IsPhoneLayoutContext, SessionIsMaximizedContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
 import { ANY_AGENT_HOST_PROVIDER_RE } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/agentHostSessionsProvider';
-import { FOCUS_ACTIVE_SESSION_COMMAND_ID, FOCUS_PREVIOUS_CHAT_GROUP_COMMAND_ID, FOCUS_NEXT_CHAT_GROUP_COMMAND_ID, SPLIT_CHAT_GROUP_RIGHT_COMMAND_ID, SPLIT_CHAT_GROUP_DOWN_COMMAND_ID, MOVE_CHAT_TO_PREVIOUS_GROUP_COMMAND_ID, MOVE_CHAT_TO_NEXT_GROUP_COMMAND_ID, RENAME_CHAT_COMMAND_ID, CLOSE_CHAT_COMMAND_ID, RENAME_SESSION_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/sessionCommands';
+import { FOCUS_ACTIVE_SESSION_COMMAND_ID, FOCUS_PREVIOUS_CHAT_GROUP_COMMAND_ID, FOCUS_NEXT_CHAT_GROUP_COMMAND_ID, SPLIT_CHAT_GROUP_RIGHT_COMMAND_ID, SPLIT_CHAT_GROUP_DOWN_COMMAND_ID, MOVE_CHAT_TO_PREVIOUS_GROUP_COMMAND_ID, MOVE_CHAT_TO_NEXT_GROUP_COMMAND_ID, RENAME_CHAT_COMMAND_ID, CLOSE_CHAT_COMMAND_ID, TOGGLE_PIN_SESSION_COMMAND_ID, TOGGLE_PIN_CHAT_COMMAND_ID, RENAME_SESSION_COMMAND_ID, CLOSE_SESSION_COMMAND_ID, ARRANGE_SESSIONS_COMMAND_ID, SESSION_GRID_FOCUS_COMMANDS } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/sessionCommands';
 import { ISessionsManagementService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement.service';
 import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service';
-import { getUntitledSessionTitle, getGitHubPullRequestRefs, SessionStatus, getChatCapabilities, ChatOriginKind } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session';
+import { getUntitledSessionTitle, getGitHubPullRequestRefs, SessionStatus, getChatCapabilities, ChatOriginKind, isSideChatOf } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session';
 import { ISessionsPartService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsPartService.service';
 import { ISessionsListModelService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsListModelService.service';
 import { EventHelper, isMouseEvent, $, reset, append, ModifierKeyEmitter } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
@@ -65,21 +68,25 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/sear
 import { defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { markOnboardingTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/onboarding/browser/spotlight/onboardingTarget';
 import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service';
-import { agentsNewSessionButtonBorder, agentsNewSessionButtonHoverBackground, agentsNewSessionButtonForeground, agentsNewSessionButtonBackground } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/theme';
+import { registerViewNavigationCommand } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/actions/navigationActions';
+import { agentsNewSessionButtonBorder, agentsNewSessionButtonHoverBackground, agentsNewSessionButtonForeground, agentsNewSessionButtonBackground } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/agentsColors';
 import { logSessionsInteraction } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/sessionsTelemetry';
 import { NEW_SESSION_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/chat/common/constants';
 import { groupSessionsForPicker } from './sessionsPicker.js';
-import { SESSION_CONVERSATION_SIDE_CHATS_GROUP, getSessionConversationActionId, isSessionConversationSideChat } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/sessionConversationGroups';
-import { SessionsListFocusedChatItemContext, SessionChatItemCanRenameContext, SessionChatItemIsUntitledContext, SessionChatItemCanDeleteContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessions/browser/views/sessionsList';
+import { SESSION_CONVERSATION_SIDE_CHATS_GROUP, getSessionConversationActionId } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/sessionConversationGroups';
+import { SessionChatItemCanRenameContext, SessionChatItemIsUntitledContext, SessionsListFocusedChatItemContext, SessionChatItemCanDeleteContext, SessionItemInExternalSectionContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessions/browser/views/sessionsList';
 import { SessionsViewId } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessions/browser/views/sessionsView';
 import * as newSessionActionViewItem from './media/newSessionActionViewItem.css';
 import { INewSessionComposerService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/chat/browser/newSessionComposerService.service';
+import { SESSIONS_CHAT_TABS_SETTING, SessionsChatTabsMode } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/sessionConfig';
+import { Direction } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/grid';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { getHighestPriorityPullRequestIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/chatPullRequest';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
-var NewSessionActionViewItemContribution_1;
+var NewSessionActionViewItemContribution_1, SessionListActionsExperimentContribution_1;
 registerCss(newSessionActionViewItem, 1);
 const NEW_SESSION_BUTTON_STYLE_SETTING = "sessions.newSessionButton.style";
 const NEW_SESSION_BUTTON_STYLE_TREATMENT = "agentSessionsNewSessionButtonStyle";
@@ -88,7 +95,7 @@ registerAction2(class ShowSessionsPickerAction extends Action2 {
     constructor() {
         super({
             id: SHOW_SESSIONS_PICKER_COMMAND_ID,
-            title: ( localize2(4652, "Show Sessions Picker")),
+            title: ( localize2(5797, "Show Sessions Picker")),
             f1: true,
             category: SessionsCategories.Sessions,
             keybinding: {
@@ -141,7 +148,7 @@ registerAction2(class ShowSessionsPickerAction extends Action2 {
         const picker = quickInputService.createQuickPick({
             useSeparators: true
         });
-        picker.placeholder = ( localize(4653, "Search sessions by name or folder"));
+        picker.placeholder = ( localize(5798, "Search sessions by name or folder"));
         picker.canAcceptInBackground = true;
         picker.matchOnDetail = true;
         const disposables = ( new DisposableStore());
@@ -159,7 +166,7 @@ registerAction2(class ShowSessionsPickerAction extends Action2 {
             const sessionGroups = groupSessionsForPicker(recent, other, reader);
             const items = [{
                 id: "newSession",
-                label: `$(add) ${( localize(4654, "New Session"))}`,
+                label: `$(add) ${( localize(5799, "New Session"))}`,
                 session: undefined
             }];
             let firstSessionItem;
@@ -177,10 +184,10 @@ registerAction2(class ShowSessionsPickerAction extends Action2 {
                     items.push(item);
                 }
             };
-            appendSessions(( localize(4655, "needs input")), sessionGroups.needsInput);
-            appendSessions(( localize(4656, "unread")), sessionGroups.unread);
-            appendSessions(( localize(4657, "recently opened")), sessionGroups.recent);
-            appendSessions(( localize(4658, "other sessions")), sessionGroups.other);
+            appendSessions(( localize(5800, "needs attention")), sessionGroups.needsInput);
+            appendSessions(( localize(5801, "unread")), sessionGroups.unread);
+            appendSessions(( localize(5802, "recently opened")), sessionGroups.recent);
+            appendSessions(( localize(5803, "other sessions")), sessionGroups.other);
             const activeItemId = picker.activeItems[0]?.id;
             picker.items = items;
             const activeItem = activeItemId ? items.find(item => item.type !== "separator" && item.id === activeItemId) : firstSessionItem;
@@ -199,7 +206,11 @@ registerAction2(class ShowSessionsPickerAction extends Action2 {
                 return;
             }
             if (toSide && activeSessionId !== undefined && selected.session.sessionId !== activeSessionId) {
-                sessionsService.insertAt(selected.session, activeSessionId, "right", !inBackground);
+                void sessionsService.openSessionsAt([selected.session], activeSessionId, "right", {
+                    preserveFocus: inBackground,
+                    activate: inBackground ? false : "first",
+                    source: "sessionsList"
+                }).catch(onUnexpectedError);
             } else {
                 sessionsService.openSession(selected.session.resource, {
                     preserveFocus: inBackground,
@@ -248,15 +259,15 @@ registerAction2(class GoBackAction extends Action2 {
         super({
             id: "sessions.goBack",
             title: {
-                ...( localize2(4659, "Go Back")),
-                mnemonicTitle: ( localize(4660, "&&Back"))
+                ...( localize2(5804, "Go Back")),
+                mnemonicTitle: ( localize(5805, "&&Back"))
             },
             f1: true,
             icon: Codicon.arrowLeft,
-            tooltip: ( localize(4661, "Go Back One Session")),
+            tooltip: ( localize(5806, "Go Back One Session")),
             category: SessionsCategories.Sessions,
             precondition: CanGoBackContext,
-            keybinding: {
+            keybinding: [{
                 weight: KeybindingWeight.SessionsContrib,
                 win: {
                     primary: KeyMod.Alt | KeyCode.LeftArrow,
@@ -268,10 +279,20 @@ registerAction2(class GoBackAction extends Action2 {
                 },
                 linux: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Minus,
-                    secondary: [KeyCode.BrowserBack, KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Tab]
+                    secondary: [
+                        KeyMod.Alt | KeyCode.LeftArrow,
+                        KeyCode.BrowserBack,
+                        KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Tab
+                    ]
                 },
                 when: ( ContextKeyExpr.and(IsSessionsWindowContext, ( EditorAreaFocusContext.toNegated())))
-            },
+            }, {
+                weight: KeybindingWeight.SessionsContrib,
+                mac: {
+                    primary: KeyMod.Alt | KeyCode.LeftArrow
+                },
+                when: ( ContextKeyExpr.and(IsSessionsWindowContext, ( EditorAreaFocusContext.toNegated()), ( InputFocusedContext.negate()), ( EditorContextKeys.textInputFocus.negate())))
+            }],
             menu: [{
                 id: Menus.TitleBarCenterLeft,
                 group: "navigation",
@@ -293,15 +314,15 @@ registerAction2(class GoForwardAction extends Action2 {
         super({
             id: "sessions.goForward",
             title: {
-                ...( localize2(4662, "Go Forward")),
-                mnemonicTitle: ( localize(4663, "&&Forward"))
+                ...( localize2(5807, "Go Forward")),
+                mnemonicTitle: ( localize(5808, "&&Forward"))
             },
             f1: true,
             icon: Codicon.arrowRight,
-            tooltip: ( localize(4664, "Go Forward One Session")),
+            tooltip: ( localize(5809, "Go Forward One Session")),
             category: SessionsCategories.Sessions,
             precondition: CanGoForwardContext,
-            keybinding: {
+            keybinding: [{
                 weight: KeybindingWeight.SessionsContrib,
                 win: {
                     primary: KeyMod.Alt | KeyCode.RightArrow,
@@ -313,10 +334,20 @@ registerAction2(class GoForwardAction extends Action2 {
                 },
                 linux: {
                     primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Minus,
-                    secondary: [KeyCode.BrowserForward, KeyMod.CtrlCmd | KeyCode.Tab]
+                    secondary: [
+                        KeyMod.Alt | KeyCode.RightArrow,
+                        KeyCode.BrowserForward,
+                        KeyMod.CtrlCmd | KeyCode.Tab
+                    ]
                 },
                 when: ( ContextKeyExpr.and(IsSessionsWindowContext, ( EditorAreaFocusContext.toNegated())))
-            },
+            }, {
+                weight: KeybindingWeight.SessionsContrib,
+                mac: {
+                    primary: KeyMod.Alt | KeyCode.RightArrow
+                },
+                when: ( ContextKeyExpr.and(IsSessionsWindowContext, ( EditorAreaFocusContext.toNegated()), ( InputFocusedContext.negate()), ( EditorContextKeys.textInputFocus.negate())))
+            }],
             menu: [{
                 id: Menus.TitleBarCenterLeft,
                 group: "navigation",
@@ -337,7 +368,7 @@ registerAction2(class FocusActiveSessionAction extends Action2 {
     constructor() {
         super({
             id: FOCUS_ACTIVE_SESSION_COMMAND_ID,
-            title: ( localize2(4665, "Focus Active Session")),
+            title: ( localize2(5810, "Focus Active Session")),
             f1: true,
             category: SessionsCategories.Sessions,
             keybinding: {
@@ -372,7 +403,7 @@ registerAction2(class FocusPreviousChatGroupAction extends Action2 {
     constructor() {
         super({
             id: FOCUS_PREVIOUS_CHAT_GROUP_COMMAND_ID,
-            title: ( localize2(4666, "Focus Previous Chat Group")),
+            title: ( localize2(5811, "Focus Previous Chat Group")),
             f1: true,
             category: SessionsCategories.Sessions,
             keybinding: {
@@ -390,7 +421,7 @@ registerAction2(class FocusNextChatGroupAction extends Action2 {
     constructor() {
         super({
             id: FOCUS_NEXT_CHAT_GROUP_COMMAND_ID,
-            title: ( localize2(4667, "Focus Next Chat Group")),
+            title: ( localize2(5812, "Focus Next Chat Group")),
             f1: true,
             category: SessionsCategories.Sessions,
             keybinding: {
@@ -408,7 +439,7 @@ registerAction2(class SplitChatGroupRightAction extends Action2 {
     constructor() {
         super({
             id: SPLIT_CHAT_GROUP_RIGHT_COMMAND_ID,
-            title: ( localize2(4668, "Split Chat Group Right")),
+            title: ( localize2(5813, "Split Chat Group Right")),
             f1: true,
             category: SessionsCategories.Sessions
         });
@@ -421,7 +452,7 @@ registerAction2(class SplitChatGroupDownAction extends Action2 {
     constructor() {
         super({
             id: SPLIT_CHAT_GROUP_DOWN_COMMAND_ID,
-            title: ( localize2(4669, "Split Chat Group Down")),
+            title: ( localize2(5814, "Split Chat Group Down")),
             f1: true,
             category: SessionsCategories.Sessions
         });
@@ -434,7 +465,7 @@ registerAction2(class MoveChatToPreviousGroupAction extends Action2 {
     constructor() {
         super({
             id: MOVE_CHAT_TO_PREVIOUS_GROUP_COMMAND_ID,
-            title: ( localize2(4670, "Move Chat to Previous Group")),
+            title: ( localize2(5815, "Move Chat to Previous Group")),
             f1: true,
             category: SessionsCategories.Sessions
         });
@@ -447,7 +478,7 @@ registerAction2(class MoveChatToNextGroupAction extends Action2 {
     constructor() {
         super({
             id: MOVE_CHAT_TO_NEXT_GROUP_COMMAND_ID,
-            title: ( localize2(4671, "Move Chat to Next Group")),
+            title: ( localize2(5816, "Move Chat to Next Group")),
             f1: true,
             category: SessionsCategories.Sessions
         });
@@ -463,7 +494,7 @@ for (let index = 0; index < 9; index++) {
         constructor() {
             super({
                 id: `sessions.focusSessionInGrid${position}`,
-                title: isLast ? ( localize2(4672, "Focus Last Session in Grid")) : ( localize2(4673, "Focus Session {0} in Grid", position)),
+                title: isLast ? ( localize2(5817, "Focus Last Session in Grid")) : ( localize2(5818, "Focus Session {0} in Grid", position)),
                 f1: true,
                 category: SessionsCategories.Sessions,
                 keybinding: {
@@ -491,7 +522,7 @@ registerAction2(class CloseAllSessionsAction extends Action2 {
     constructor() {
         super({
             id: "sessions.closeAllSessions",
-            title: ( localize2(4674, "Close All Sessions")),
+            title: ( localize2(5819, "Close All Sessions")),
             f1: true,
             category: SessionsCategories.Sessions,
             precondition: IsSessionsWindowContext,
@@ -543,11 +574,11 @@ async function renameChatWithQuickInput(accessor, context) {
     if (!initialChat || extUri.isEqual(resource, session.mainChat.get().resource) || initialChat.status.get() === SessionStatus.Untitled || !getChatCapabilities(initialChat, session, undefined).canRename) {
         return;
     }
-    const initialTitle = initialChat.title.get().trim() || ( localize(4675, "Untitled Chat"));
+    const initialTitle = initialChat.title.get().trim() || ( localize(5820, "Untitled Chat"));
     const newTitle = await quickInputService.input({
         value: initialTitle,
-        prompt: ( localize(4676, "New chat title")),
-        validateInput: async value => value.trim() ? undefined : ( localize(4677, "Title cannot be empty"))
+        prompt: ( localize(5821, "New chat title")),
+        validateInput: async value => value.trim() ? undefined : ( localize(5822, "Title cannot be empty"))
     });
     const trimmedTitle = newTitle?.trim();
     if (!trimmedTitle || trimmedTitle === initialTitle) {
@@ -563,49 +594,74 @@ registerAction2(class RenameChatAction extends Action2 {
     constructor() {
         super({
             id: RENAME_CHAT_COMMAND_ID,
-            title: ( localize2(4678, "Rename...")),
+            title: ( localize2(5823, "Rename...")),
             f1: false,
             category: SessionsCategories.Sessions,
             keybinding: {
                 primary: KeyCode.F2,
                 weight: CHAT_TAB_KEYBINDING_WEIGHT,
-                when: ( ContextKeyExpr.and(IsSessionsWindowContext, ( ContextKeyExpr.or(( ContextKeyExpr.and(ChatContextKeys.inChatSession, SessionFocusedChatIsRenameTargetContext)), ( ContextKeyExpr.and(( FocusedViewContext.isEqualTo(SessionsViewId)), WorkbenchListFocusContextKey, SessionsListFocusedChatItemContext))))))
-            }
-        });
-    }
-    async run(accessor, context) {
-        const target = getChatRenameContext(accessor, context);
-        if (target) {
-            await renameChatWithQuickInput(accessor, target);
-        }
-    }
-});
-registerAction2(class RenameSessionListChatAction extends Action2 {
-    constructor() {
-        super({
-            id: "sessions.list.renameChat",
-            title: ( localize2(4679, "Rename...")),
-            f1: false,
-            menu: {
+                when: ( ContextKeyExpr.and(IsSessionsWindowContext, ( ContextKeyExpr.or(SessionFocusedChatIsRenameTargetContext, ( ContextKeyExpr.and(( FocusedViewContext.isEqualTo(SessionsViewId)), WorkbenchListFocusContextKey, SessionsListFocusedChatItemContext))))))
+            },
+            menu: [{
                 id: Menus.SessionChatItemContext,
                 group: "1_chat",
                 order: 1,
                 when: ( ContextKeyExpr.and(SessionChatItemCanRenameContext, ( SessionChatItemIsUntitledContext.negate())))
-            }
+            }, {
+                id: Menus.SessionHeaderContext,
+                group: "2_edit",
+                order: 1,
+                when: ( ContextKeyExpr.and(SessionHeaderShowsChatContext, SessionFocusedChatIsRenameTargetContext))
+            }, {
+                id: Menus.SessionBarToolbar,
+                group: "secondary/1_session",
+                order: 20,
+                when: ( ContextKeyExpr.and(
+                    SessionIsCreatedContext,
+                    SessionHeaderShowsChatContext,
+                    SessionFocusedChatIsRenameTargetContext,
+                    ( SessionIsArchivedContext.negate())
+                ))
+            }]
         });
     }
-    async run(accessor, context) {
-        if (!context) {
+    async run(accessor, context, chat) {
+        let renameContext;
+        if (context && hasKey(context, {
+            session: true
+        })) {
+            renameContext = context;
+        } else if (context && chat) {
+            renameContext = {
+                session: context,
+                chat,
+                inline: true
+            };
+        }
+        if (!renameContext) {
+            const sessionsList = getSessionsList(accessor);
+            const focusedChat = sessionsList?.getFocusedChatItem();
+            if (focusedChat && sessionsList?.beginRenameChat(focusedChat)) {
+                return;
+            }
+        }
+        if (renameContext?.inline && accessor.get(ISessionsPartService).getSessionView(renameContext.session.sessionId)?.startChatTitleEditing(renameContext.chat.resource)) {
             return;
         }
-        await renameChatWithQuickInput(accessor, context);
+        if (!renameContext && accessor.get(ISessionsPartService).getFocusedSessionView()?.startFocusedChatTitleEditing?.()) {
+            return;
+        }
+        const target = getChatRenameContext(accessor, renameContext);
+        if (target) {
+            await renameChatWithQuickInput(accessor, target);
+        }
     }
 });
 registerAction2(class OpenSessionListChatToSideAction extends Action2 {
     constructor() {
         super({
             id: "sessions.list.openChatToSide",
-            title: ( localize2(4680, "Open to the Side")),
+            title: ( localize2(5824, "Open to the Side")),
             f1: false,
             menu: {
                 id: Menus.SessionChatItemContext,
@@ -629,21 +685,33 @@ registerAction2(class DeleteSessionListChatAction extends Action2 {
     constructor() {
         super({
             id: "sessions.list.deleteChat",
-            title: ( localize2(4681, "Delete...")),
+            title: ( localize2(5825, "Delete...")),
+            icon: Codicon.trash,
             f1: false,
-            menu: {
+            menu: [{
                 id: Menus.SessionChatItemContext,
                 group: "2_delete",
                 order: 1,
                 when: SessionChatItemCanDeleteContext
-            }
+            }, {
+                id: Menus.SessionChatItemToolbar,
+                group: "navigation",
+                order: 1,
+                when: ( ContextKeyExpr.and(SessionChatItemCanDeleteContext, SessionChatItemIsUntitledContext))
+            }]
         });
     }
     async run(accessor, context) {
         if (!context || !getChatCapabilities(context.chat, context.session, undefined).canDelete) {
             return;
         }
-        await accessor.get(ISessionsManagementService).deleteChat(context.session, context.chat.resource);
+        await accessor.get(ISessionsManagementService).deleteChat(
+            context.session,
+            context.chat.resource,
+            context.chat.status.get() === SessionStatus.Untitled ? {
+                skipConfirmation: true
+            } : undefined
+        );
     }
 });
 const ADD_CHAT_TO_SESSION_ACTION_ID = "sessions.chatCompositeBar.addChat";
@@ -651,33 +719,30 @@ registerAction2(class AddChatToSessionAction extends Action2 {
     constructor() {
         super({
             id: ADD_CHAT_TO_SESSION_ACTION_ID,
-            title: ( localize2(4682, "New Chat in This Session")),
+            title: ( localize2(5826, "New Nested Session")),
             icon: Codicon.add,
+            precondition: ( SessionItemIsMultiSelectionContext.negate()),
             keybinding: {
                 weight: CHAT_TAB_KEYBINDING_WEIGHT,
                 when: ( ContextKeyExpr.and(IsSessionsWindowContext, ( EditorAreaFocusContext.toNegated()), SessionIsCreatedContext, SessionSupportsMultipleChatsContext, ( IsQuickChatSessionContext.negate()), ( SessionIsArchivedContext.negate()))),
                 primary: KeyMod.CtrlCmd | KeyCode.KeyT
             },
             menu: [{
-                id: Menus.SessionBarToolbar,
-                group: "secondary/3_newChat",
-                order: 10,
+                id: Menus.SessionItemToolbar,
+                group: "navigation",
+                order: 1,
                 when: ( ContextKeyExpr.and(
-                    SessionIsCreatedContext,
+                    SessionsListPromoteNewChatActionContext,
                     SessionSupportsMultipleChatsContext,
                     ( IsQuickChatSessionContext.negate()),
-                    ( SessionIsArchivedContext.negate())
+                    ( SessionIsArchivedContext.negate()),
+                    ( SessionItemInExternalSectionContext.negate())
                 ))
             }, {
                 id: Menus.SessionItemContextMenu,
                 group: "1_newChat",
                 order: 0,
-                when: ( ContextKeyExpr.and(
-                    SessionIsCreatedContext,
-                    SessionSupportsMultipleChatsContext,
-                    ( IsQuickChatSessionContext.negate()),
-                    ( SessionIsArchivedContext.negate())
-                ))
+                when: ( ContextKeyExpr.and(SessionSupportsMultipleChatsContext, ( IsQuickChatSessionContext.negate()), ( SessionIsArchivedContext.negate()), ( SessionItemInExternalSectionContext.negate())))
             }]
         });
     }
@@ -720,7 +785,7 @@ registerAction2(class NavigateNextChatAction extends Action2 {
     constructor() {
         super({
             id: "sessions.chatCompositeBar.navigateNextChat",
-            title: ( localize2(4683, "Go to Next Chat")),
+            title: ( localize2(5827, "Go to Next Chat")),
             f1: true,
             category: SessionsCategories.Sessions,
             precondition: SessionHasMultipleOpenChatsContext,
@@ -739,7 +804,7 @@ registerAction2(class NavigatePreviousChatAction extends Action2 {
     constructor() {
         super({
             id: "sessions.chatCompositeBar.navigatePreviousChat",
-            title: ( localize2(4684, "Go to Previous Chat")),
+            title: ( localize2(5828, "Go to Previous Chat")),
             f1: true,
             category: SessionsCategories.Sessions,
             precondition: SessionHasMultipleOpenChatsContext,
@@ -758,8 +823,8 @@ registerAction2(class CloseChatAction extends Action2 {
     constructor() {
         super({
             id: CLOSE_CHAT_COMMAND_ID,
-            title: ( localize2(4685, "Close Chat")),
-            icon: Codicon.close,
+            title: ( localize2(5829, "Close")),
+            icon: Codicon.closeSmall,
             f1: false,
             category: SessionsCategories.Sessions,
             keybinding: {
@@ -771,39 +836,68 @@ registerAction2(class CloseChatAction extends Action2 {
                     secondary: [KeyMod.CtrlCmd | KeyCode.KeyW]
                 }
             },
-            menu: {
+            menu: [{
                 id: Menus.SessionChatTab,
                 group: "navigation",
                 order: 10
-            }
+            }, {
+                id: Menus.SessionBarToolbar,
+                when: ( ContextKeyExpr.and(SessionHeaderShowsChatContext, SessionActiveChatIsClosableContext)),
+                group: "secondary/4_pin",
+                order: 30
+            }, {
+                id: Menus.SessionHeaderContext,
+                when: ( ContextKeyExpr.and(SessionHeaderShowsChatContext, SessionActiveChatIsClosableContext)),
+                group: "1_view",
+                order: 2
+            }]
         });
     }
-    async run(accessor, context) {
+    async run(accessor, session, chat) {
         const sessionsService = accessor.get(ISessionsService);
         const sessionsManagementService = accessor.get(ISessionsManagementService);
         const extUri = accessor.get(IUriIdentityService).extUri;
-        const session = context?.session ?? sessionsService.activeSession.get();
+        session ??= sessionsService.activeSession.get();
         if (!session) {
             return;
         }
-        const chat = context?.chat ?? session.activeChat.get();
-        if (!chat || extUri.isEqual(chat.resource, session.mainChat.get().resource)) {
+        const sessionView = accessor.get(ISessionsPartService).getSessionView(session.sessionId);
+        chat ??= sessionView?.getActiveChat() ?? session.activeChat.get();
+        if (!chat) {
+            return;
+        }
+        if (extUri.isEqual(chat.resource, session.mainChat.get().resource)) {
+            await sessionView?.closeChatGroup(chat.resource);
             return;
         }
         if (chat.status.get() === SessionStatus.Untitled) {
-            await sessionsManagementService.deleteChat(session, chat.resource, {
+            if (await sessionsManagementService.deleteChat(session, chat.resource, {
                 skipConfirmation: true
-            });
+            })) {
+                await sessionView?.closeChatGroup(chat.resource);
+            }
         } else {
+            await sessionView?.closeChatGroup(chat.resource);
             await sessionsService.closeChat(session, chat);
         }
     }
 });
+MenuRegistry.appendMenuItem(Menus.SessionBarToolbar, {
+    command: {
+        id: CLOSE_CHAT_COMMAND_ID,
+        title: ( localize(5830, "Close")),
+        tooltip: ( localize(5831, "Close Chat Group")),
+        icon: Codicon.closeCompact
+    },
+    when: ( ContextKeyExpr.and(SessionHeaderShowsChatContext, SessionActiveChatIsClosableContext)),
+    group: "navigation",
+    order: 30
+});
 registerAction2(class CloseAllChatsAction extends Action2 {
     constructor() {
         super({
             id: "sessions.chatCompositeBar.closeAllChats",
-            title: ( localize2(4686, "Close All Chats")),
+            title: ( localize2(5832, "Close All Chats")),
             f1: true,
             category: SessionsCategories.Sessions,
             precondition: SessionHasMultipleOpenChatsContext,
@@ -842,7 +936,8 @@ registerAction2(class DeleteChatAction extends Action2 {
     constructor() {
         super({
             id: "sessions.chatCompositeBar.deleteChat",
-            title: ( localize2(4687, "Delete Chat")),
+            title: ( localize2(5833, "Delete Chat")),
+            icon: Codicon.trash,
             f1: true,
             category: SessionsCategories.Sessions,
             keybinding: {
@@ -853,28 +948,49 @@ registerAction2(class DeleteChatAction extends Action2 {
                     primary: KeyMod.CtrlCmd | KeyCode.Backspace,
                     secondary: [KeyCode.Delete]
                 }
-            }
+            },
+            menu: [{
+                id: Menus.SessionBarToolbar,
+                group: "secondary/1_session",
+                order: 30,
+                when: ( ContextKeyExpr.and(
+                    SessionHeaderTargetsChatContext,
+                    SessionActiveChatIsDeletableContext,
+                    SessionActiveChatIsUntitledContext
+                ))
+            }, {
+                id: Menus.SessionHeaderContext,
+                group: "2_edit",
+                order: 2,
+                when: ( ContextKeyExpr.and(
+                    SessionHeaderTargetsChatContext,
+                    SessionActiveChatIsDeletableContext,
+                    SessionActiveChatIsUntitledContext
+                ))
+            }]
         });
     }
-    async run(accessor) {
+    async run(accessor, session, chat) {
         const sessionsService = accessor.get(ISessionsService);
         const sessionsManagementService = accessor.get(ISessionsManagementService);
-        const session = sessionsService.activeSession.get();
+        session ??= sessionsService.activeSession.get();
         if (!session) {
             return;
         }
-        const chat = session.activeChat.get();
+        chat ??= session.activeChat.get();
         if (!chat || !getChatCapabilities(chat, session, undefined).canDelete) {
             return;
         }
-        await sessionsManagementService.deleteChat(session, chat.resource);
+        await sessionsManagementService.deleteChat(session, chat.resource, chat.status.get() === SessionStatus.Untitled ? {
+            skipConfirmation: true
+        } : undefined);
     }
 });
 registerAction2(class ReopenLastClosedChatAction extends Action2 {
     constructor() {
         super({
             id: "sessions.chatCompositeBar.reopenLastClosedChat",
-            title: ( localize2(4688, "Reopen Last Closed Chat")),
+            title: ( localize2(5834, "Reopen Last Closed Chat")),
             f1: true,
             category: SessionsCategories.Sessions,
             precondition: SessionSupportsMultipleChatsContext
@@ -899,7 +1015,7 @@ registerAction2(class ReopenLastClosedItemAction extends Action2 {
     constructor() {
         super({
             id: "sessions.reopenLastClosedItem",
-            title: ( localize2(4689, "Reopen Closed Chat or Session")),
+            title: ( localize2(5835, "Reopen Closed Chat or Session")),
             category: SessionsCategories.Sessions,
             keybinding: {
                 weight: CHAT_TAB_KEYBINDING_WEIGHT,
@@ -933,12 +1049,17 @@ function openChatsPicker(accessor, mru) {
         return;
     }
     const extUri = accessor.get(IUriIdentityService).extUri;
-    const toItem = chat => ({
-        label: chat.title.get()?.trim() || ( localize(4675, "Untitled Chat")),
-        description: fromNow(chat.updatedAt.get(), true, true),
-        iconClass: ThemeIcon.asClassName(Codicon.commentDiscussion),
-        chat
-    });
+    const toItem = chat => {
+        const updatedAt = chat.updatedAt.get();
+        return {
+            label: chat.title.get()?.trim() || ( localize(5820, "Untitled Chat")),
+            ...(updatedAt ? {
+                description: fromNow(updatedAt, true, true)
+            } : {}),
+            iconClass: ThemeIcon.asClassName(Codicon.commentDiscussion),
+            chat
+        };
+    };
     const openItems = (mru ? session.visibleChatTabs.get() : session.visibleChatTabs.get().filter(chat => chat.status.get() !== SessionStatus.Untitled)).map(toItem);
     const closedItems = mru ? [] : session.closedChats.get().filter(
         chat => chat.status.get() !== SessionStatus.Untitled && chat.origin?.kind !== ChatOriginKind.Tool
@@ -949,10 +1070,10 @@ function openChatsPicker(accessor, mru) {
     }
     const displayItems = closedItems.length === 0 ? openItems : [{
         type: "separator",
-        label: ( localize(4690, "Open"))
+        label: ( localize(5836, "Open"))
     }, ...openItems, {
         type: "separator",
-        label: ( localize(4691, "Closed"))
+        label: ( localize(5837, "Closed"))
     }, ...closedItems];
     const activeChat = session.activeChat.get();
     const activeIndex = Math.max(
@@ -972,7 +1093,7 @@ function openChatsPicker(accessor, mru) {
             keybindings: keybindingService.lookupKeybindings(CHATS_PICKER_QUICK_NAVIGATE_NEXT_ID)
         };
     } else {
-        picker.placeholder = ( localize(4692, "Search chats by name"));
+        picker.placeholder = ( localize(5838, "Search chats by name"));
         picker.matchOnDescription = true;
     }
     const pickerVisibleContext = SessionChatsPickerVisibleContext.bindTo(contextKeyService);
@@ -993,7 +1114,7 @@ registerAction2(class ShowChatsPickerAction extends Action2 {
     constructor() {
         super({
             id: SHOW_CHATS_PICKER_COMMAND_ID,
-            title: ( localize2(4693, "Go to Chat in Session")),
+            title: ( localize2(5839, "Go to Chat in Session")),
             f1: true,
             category: SessionsCategories.Sessions,
             precondition: SessionHasMultipleCommittedChatsContext,
@@ -1012,7 +1133,7 @@ registerAction2(class QuickSwitchNextChatAction extends Action2 {
     constructor() {
         super({
             id: QUICK_SWITCH_NEXT_CHAT_ID,
-            title: ( localize2(4694, "Quick Switch to Next Chat")),
+            title: ( localize2(5840, "Quick Switch to Next Chat")),
             f1: false,
             category: SessionsCategories.Sessions,
             precondition: SessionHasMultipleOpenChatsContext,
@@ -1036,7 +1157,7 @@ registerAction2(class QuickSwitchPreviousChatAction extends Action2 {
     constructor() {
         super({
             id: QUICK_SWITCH_PREVIOUS_CHAT_ID,
-            title: ( localize2(4695, "Quick Switch to Previous Chat")),
+            title: ( localize2(5841, "Quick Switch to Previous Chat")),
             f1: false,
             category: SessionsCategories.Sessions,
             precondition: SessionHasMultipleOpenChatsContext,
@@ -1112,7 +1233,12 @@ let CompactButtonActionViewItem = class CompactButtonActionViewItem extends Base
         this.configureButton(button);
         const onboardingTargetId = this.onboardingTargetId;
         if (onboardingTargetId) {
-            this._register(markOnboardingTarget(button.element, onboardingTargetId));
+            this._register(markOnboardingTarget(button.element, onboardingTargetId, {
+                onDidActivate: Event.map(
+                    Event.filter(button.onDidClick, () => this.action.enabled),
+                    () => undefined
+                )
+            }));
         }
         this._register(button.onDidClick(e => {
             EventHelper.stop(e, true);
@@ -1195,7 +1321,7 @@ let NewSessionActionViewItem = class NewSessionActionViewItem extends CompactBut
         return NEW_SESSION_ACTION_ID;
     }
     get label() {
-        return localize(4696, "New");
+        return localize(5842, "New");
     }
     get onboardingTargetId() {
         return "sessions.newSession.button";
@@ -1214,10 +1340,10 @@ let NewSessionActionViewItem = class NewSessionActionViewItem extends CompactBut
         }));
     }
     getHoverContent(keybindingLabel) {
-        return keybindingLabel ? ( localize(4697, "New Session ({0})", keybindingLabel)) : ( localize(4698, "New Session"));
+        return keybindingLabel ? ( localize(5843, "New Session ({0})", keybindingLabel)) : ( localize(5844, "New Session"));
     }
     getAriaLabel(keybindingAriaLabel) {
-        return keybindingAriaLabel ? ( localize(4699, "New Session ({0})", keybindingAriaLabel)) : ( localize(4700, "New Session"));
+        return keybindingAriaLabel ? ( localize(5845, "New Session ({0})", keybindingAriaLabel)) : ( localize(5846, "New Session"));
     }
     onRun() {
         logSessionsInteraction(this.telemetryService, "newSession", this.telemetrySource);
@@ -1327,6 +1453,54 @@ let NewSessionActionViewItemContribution = class NewSessionActionViewItemContrib
     }
 };
 NewSessionActionViewItemContribution = NewSessionActionViewItemContribution_1 = ( __decorate([( __param(0, IActionViewItemService)), ( __param(1, IContextKeyService)), ( __param(2, IWorkbenchAssignmentService)), ( __param(3, IEnvironmentService)), ( __param(4, IProductService)), ( __param(5, IConfigurationService)), ( __param(6, ILogService))], NewSessionActionViewItemContribution));
+let SessionListActionsExperimentContribution = class SessionListActionsExperimentContribution extends Disposable {
+    static {
+        SessionListActionsExperimentContribution_1 = this;
+    }
+    static {
+        this.ID = "workbench.contrib.sessions.sessionListActionsExperiment";
+    }
+    static {
+        this.PROMOTE_NEW_CHAT_ACTION_TREATMENT = "sessions.promoteNewChatAction";
+    }
+    constructor(contextKeyService, assignmentService, logService) {
+        super();
+        this.assignmentService = assignmentService;
+        this.logService = logService;
+        this.treatmentCancellation = this._register(( new MutableDisposable()));
+        this.promoteNewChatActionContext = SessionsListPromoteNewChatActionContext.bindTo(contextKeyService);
+        this._register(
+            this.assignmentService.onDidRefetchAssignments(() => this.updateTreatment())
+        );
+        this.updateTreatment();
+    }
+    updateTreatment() {
+        const cancellation = ( new CancellationTokenSource());
+        this.treatmentCancellation.value = toDisposable(() => {
+            cancellation.cancel();
+            cancellation.dispose();
+        });
+        void this.resolveTreatment(cancellation.token);
+    }
+    async resolveTreatment(token) {
+        let enabled = false;
+        try {
+            enabled = (await raceCancellationError(this.assignmentService.getTreatment(
+                SessionListActionsExperimentContribution_1.PROMOTE_NEW_CHAT_ACTION_TREATMENT
+            ), token)) ?? false;
+        } catch (error) {
+            if (isCancellationError(error)) {
+                return;
+            }
+            this.logService.warn(
+                "[SessionListActionsExperimentContribution] Failed to resolve the promoted New Chat action treatment; using the default session row action.",
+                error
+            );
+        }
+        this.promoteNewChatActionContext.set(enabled);
+    }
+};
+SessionListActionsExperimentContribution = SessionListActionsExperimentContribution_1 = ( __decorate([( __param(0, IContextKeyService)), ( __param(1, IWorkbenchAssignmentService)), ( __param(2, ILogService))], SessionListActionsExperimentContribution));
 let SessionConversationActionsContribution = class SessionConversationActionsContribution extends Disposable {
     static {
         this.ID = "workbench.contrib.sessions.conversationActions";
@@ -1348,11 +1522,11 @@ let SessionConversationActionsContribution = class SessionConversationActionsCon
         const that = this;
         const extUri = this._uriIdentityService.extUri;
         const scopedToSession = ( ContextKeyExpr.equals(SessionIdContext.key, session.sessionId));
-        const conversationsVisible = ( ContextKeyExpr.and(scopedToSession, SessionIsCreatedContext, ( SessionIsArchivedContext.negate()), SessionHasSideChatsContext));
+        const conversationsVisible = ( ContextKeyExpr.and(scopedToSession, SessionIsCreatedContext, ( SessionIsArchivedContext.negate()), SessionActiveChatHasSideChatsContext));
         const allChats = session.chats.read(reader);
-        const registerOpen = (chat, order) => {
+        const registerOpen = (chat, parentChat, order) => {
             const chatResource = chat.resource;
-            const title = chat.title.read(reader) || ( localize(4675, "Untitled Chat"));
+            const title = chat.title.read(reader) || ( localize(5820, "Untitled Chat"));
             store.add(registerAction2(class extends Action2 {
                 constructor() {
                     super({
@@ -1362,7 +1536,7 @@ let SessionConversationActionsContribution = class SessionConversationActionsCon
                             id: Menus.SessionConversations,
                             group: SESSION_CONVERSATION_SIDE_CHATS_GROUP,
                             order,
-                            when: conversationsVisible
+                            when: ( ContextKeyExpr.and(conversationsVisible, ( ContextKeyExpr.equals(SessionActiveChatResourceContext.key, ( parentChat.resource.toString())))))
                         }
                     });
                 }
@@ -1387,8 +1561,9 @@ let SessionConversationActionsContribution = class SessionConversationActionsCon
             if (chat.status.read(reader) === SessionStatus.Untitled) {
                 return;
             }
-            if (isSessionConversationSideChat(chat)) {
-                registerOpen(chat, index);
+            const parentChat = allChats.find(candidate => isSideChatOf(chat, candidate.resource));
+            if (parentChat) {
+                registerOpen(chat, parentChat, index);
             }
         });
         return store;
@@ -1397,33 +1572,74 @@ let SessionConversationActionsContribution = class SessionConversationActionsCon
 SessionConversationActionsContribution = ( __decorate([( __param(0, ISessionsService)), ( __param(1, IUriIdentityService))], SessionConversationActionsContribution));
 MenuRegistry.appendMenuItem(Menus.SessionBarToolbar, {
     submenu: Menus.SessionConversations,
-    title: ( localize2(4701, "Side Chats")),
+    title: ( localize2(5847, "Side Chats")),
     icon: Codicon.commentDiscussion,
     group: "secondary/2_chats",
     order: 10,
-    when: ( ContextKeyExpr.and(SessionIsCreatedContext, ( SessionIsArchivedContext.negate()), SessionHasSideChatsContext))
+    when: ( ContextKeyExpr.and(SessionIsCreatedContext, ( SessionIsArchivedContext.negate()), SessionActiveChatHasSideChatsContext))
+});
+MenuRegistry.appendMenuItem(Menus.SessionBarToolbar, {
+    submenu: Menus.SessionChatTabs,
+    title: ( localize2(5848, "Show Chat Tabs")),
+    group: "secondary/3_tabs",
+    order: 10,
+    when: ( ContextKeyExpr.and(SessionIsCreatedContext, SessionSupportsMultipleChatsContext))
+});
+registerAction2(class ShowMultipleChatTabsAction extends Action2 {
+    constructor() {
+        super({
+            id: "sessions.action.showMultipleChatTabs",
+            title: ( localize2(5849, "Multiple")),
+            toggled: ( ContextKeyExpr.equals(`config.${SESSIONS_CHAT_TABS_SETTING}`, SessionsChatTabsMode.Multiple)),
+            menu: {
+                id: Menus.SessionChatTabs,
+                group: "1_presentation",
+                order: 10
+            }
+        });
+    }
+    run(accessor) {
+        return accessor.get(IConfigurationService).updateValue(SESSIONS_CHAT_TABS_SETTING, SessionsChatTabsMode.Multiple);
+    }
+});
+registerAction2(class ShowSingleChatAction extends Action2 {
+    constructor() {
+        super({
+            id: "sessions.action.showSingleChat",
+            title: ( localize2(5850, "Single")),
+            toggled: ( ContextKeyExpr.equals(`config.${SESSIONS_CHAT_TABS_SETTING}`, SessionsChatTabsMode.Single)),
+            menu: {
+                id: Menus.SessionChatTabs,
+                group: "1_presentation",
+                order: 20
+            }
+        });
+    }
+    run(accessor) {
+        return accessor.get(IConfigurationService).updateValue(SESSIONS_CHAT_TABS_SETTING, SessionsChatTabsMode.Single);
+    }
 });
 registerAction2(class TogglePinSessionAction extends Action2 {
     constructor() {
         super({
-            id: "sessions.chatCompositeBar.togglePin",
-            title: ( localize2(4702, "Pin")),
+            id: TOGGLE_PIN_SESSION_COMMAND_ID,
+            title: ( localize2(5851, "Pin")),
             icon: Codicon.pin,
             toggled: {
                 condition: SessionIsStickyContext,
                 icon: Codicon.pinned,
-                title: ( localize(4703, "Unpin"))
+                title: ( localize(5852, "Unpin"))
             },
             menu: [{
                 id: Menus.SessionBarToolbar,
                 group: "navigation",
                 order: 10,
-                when: ( ContextKeyExpr.and(SessionIsCreatedContext, SessionIsStickyContext, ( SessionIsArchivedContext.negate())))
+                when: ( ContextKeyExpr.and(SessionIsCreatedContext, SessionIsStickyContext, ( SessionIsArchivedContext.negate()), ( SessionHeaderShowsChatContext.negate())))
             }, {
                 id: Menus.SessionBarToolbar,
                 group: "secondary/4_pin",
                 order: 10,
-                when: ( ContextKeyExpr.and(SessionIsCreatedContext, ( SessionIsArchivedContext.negate())))
+                when: ( ContextKeyExpr.and(SessionIsCreatedContext, ( SessionIsArchivedContext.negate()), ( SessionHeaderShowsChatContext.negate())))
             }]
         });
     }
@@ -1436,37 +1652,89 @@ registerAction2(class TogglePinSessionAction extends Action2 {
 });
 MenuRegistry.appendMenuItem(Menus.SessionHeaderContext, {
     command: {
-        id: "sessions.chatCompositeBar.togglePin",
-        title: ( localize(4704, "Pin")),
+        id: TOGGLE_PIN_SESSION_COMMAND_ID,
+        title: ( localize(5853, "Pin")),
         toggled: {
             condition: SessionIsStickyContext,
-            title: ( localize(4705, "Unpin"))
+            title: ( localize(5854, "Unpin"))
         }
     },
     group: "1_view",
     order: 1,
-    when: SessionIsCreatedContext
+    when: ( ContextKeyExpr.and(SessionIsCreatedContext, ( SessionHeaderShowsChatContext.negate())))
+});
+registerAction2(class TogglePinChatAction extends Action2 {
+    constructor() {
+        super({
+            id: TOGGLE_PIN_CHAT_COMMAND_ID,
+            title: ( localize2(5855, "Pin")),
+            icon: Codicon.pin,
+            toggled: {
+                condition: SessionHeaderActiveChatIsPinnedContext,
+                icon: Codicon.pinned,
+                title: ( localize(5856, "Unpin"))
+            },
+            menu: [{
+                id: Menus.SessionBarToolbar,
+                group: "navigation",
+                order: 10,
+                when: ( ContextKeyExpr.and(
+                    SessionIsCreatedContext,
+                    SessionHeaderShowsChatContext,
+                    SessionHeaderActiveChatIsPinnedContext,
+                    ( SessionIsArchivedContext.negate())
+                ))
+            }, {
+                id: Menus.SessionBarToolbar,
+                group: "secondary/4_pin",
+                order: 10,
+                when: ( ContextKeyExpr.and(SessionIsCreatedContext, SessionHeaderShowsChatContext, ( SessionIsArchivedContext.negate())))
+            }, {
+                id: Menus.SessionHeaderContext,
+                group: "1_view",
+                order: 1,
+                when: ( ContextKeyExpr.and(SessionIsCreatedContext, SessionHeaderShowsChatContext))
+            }]
+        });
+    }
+    run(accessor, session) {
+        session ??= accessor.get(ISessionsService).activeSession.get();
+        if (session) {
+            accessor.get(ISessionsPartService).getSessionView(session.sessionId)?.toggleActiveChatPin();
+        }
+    }
 });
 registerAction2(class RenameSessionHeaderAction extends Action2 {
     constructor() {
         super({
             id: "sessions.sessionHeader.rename",
-            title: ( localize2(4706, "Rename...")),
+            title: ( localize2(5857, "Rename...")),
             icon: Codicon.edit,
+            keybinding: {
+                primary: KeyCode.F2,
+                weight: KeybindingWeight.SessionsContrib + 1,
+                when: ( ContextKeyExpr.and(
+                    IsSessionsWindowContext,
+                    SessionsFocusContext,
+                    SessionSupportsRenameContext,
+                    ( SessionFocusedChatIsRenameTargetContext.negate())
+                ))
+            },
             menu: [{
                 id: Menus.SessionHeaderContext,
                 group: "2_edit",
                 order: 1,
-                when: ( ContextKeyExpr.regex(SessionProviderIdContext.key, ANY_AGENT_HOST_PROVIDER_RE))
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.regex(SessionProviderIdContext.key, ANY_AGENT_HOST_PROVIDER_RE)), ( SessionHeaderShowsChatContext.negate())))
             }, {
                 id: Menus.SessionBarToolbar,
                 group: "secondary/1_session",
                 order: 20,
-                when: ( ContextKeyExpr.and(SessionIsCreatedContext, SessionSupportsRenameContext, ( SessionIsArchivedContext.negate())))
+                when: ( ContextKeyExpr.and(SessionIsCreatedContext, SessionSupportsRenameContext, ( SessionHeaderShowsChatContext.negate()), ( SessionIsArchivedContext.negate())))
             }]
         });
     }
     async run(accessor, session) {
+        session ??= accessor.get(ISessionsService).activeSession.get();
         if (!session) {
             return;
         }
@@ -1479,17 +1747,32 @@ registerAction2(class RenameSessionHeaderAction extends Action2 {
 registerAction2(class CloseSessionAction extends Action2 {
     constructor() {
         super({
-            id: "sessions.chatCompositeBar.close",
-            title: ( localize2(4707, "Close")),
-            icon: Codicon.close,
+            id: CLOSE_SESSION_COMMAND_ID,
+            title: ( localize2(5858, "Close")),
+            tooltip: ( localize2(5859, "Close Session")),
+            icon: Codicon.closeCompact,
+            keybinding: {
+                weight: KeybindingWeight.SessionsContrib,
+                when: ( ContextKeyExpr.and(( IsNewChatSessionContext.negate()), IsSessionsWindowContext, SessionsFocusContext, ( EditorAreaFocusContext.negate()))),
+                primary: KeyMod.CtrlCmd | KeyCode.KeyW,
+                win: {
+                    primary: KeyMod.CtrlCmd | KeyCode.F4,
+                    secondary: [KeyMod.CtrlCmd | KeyCode.KeyW]
+                }
+            },
             menu: [{
                 id: Menus.SessionBarToolbar,
-                when: ( ContextKeyExpr.or(SessionIsCreatedContext, MultipleSessionsVisibleContext)),
+                when: ( ContextKeyExpr.and(MultipleSessionsVisibleContext, SessionToolbarShowsSessionContext)),
+                group: "navigation",
+                order: 30
+            }, {
+                id: Menus.SessionBarToolbar,
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.or(SessionIsCreatedContext, MultipleSessionsVisibleContext)), ( SessionHeaderShowsChatContext.negate()))),
                 group: "secondary/4_pin",
                 order: 30
             }, {
                 id: Menus.SessionHeaderContext,
-                when: ( ContextKeyExpr.or(SessionIsCreatedContext, MultipleSessionsVisibleContext)),
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.or(SessionIsCreatedContext, MultipleSessionsVisibleContext)), ( SessionHeaderShowsChatContext.negate()))),
                 group: "1_view",
                 order: 2
             }]
@@ -1498,39 +1781,160 @@ registerAction2(class CloseSessionAction extends Action2 {
     async run(accessor, session) {
         const sessionsService = accessor.get(ISessionsService);
         const sessionsPartService = accessor.get(ISessionsPartService);
+        session ??= sessionsService.activeSession.get();
+        const sessionView = session && sessionsPartService.getSessionView(session.sessionId);
+        const activeChat = sessionView?.getActiveChat();
+        if (session && sessionView && activeChat && accessor.get(IUriIdentityService).extUri.isEqual(activeChat.resource, session.mainChat.get().resource) && (await sessionView.closeChatGroup(activeChat.resource))) {
+            return;
+        }
         sessionsService.closeSession(session);
         sessionsPartService.focusSession(sessionsService.activeSession.get());
     }
 });
+const sessionGridWhen = ( ContextKeyExpr.and(IsSessionsWindowContext, ChatContextKeys.enabled, ( IsPhoneLayoutContext.negate()), MultipleSessionsVisibleContext));
+MenuRegistry.appendMenuItem(Menus.SessionHeaderContext, {
+    submenu: Menus.SessionGridLayout,
+    title: ( localize(5860, "Session Layout")),
+    group: "1_view",
+    order: 3,
+    when: sessionGridWhen
+});
+MenuRegistry.appendMenuItem(Menus.SessionBarToolbar, {
+    submenu: Menus.SessionGridLayout,
+    title: ( localize(5860, "Session Layout")),
+    group: "secondary/4_pin",
+    order: 30,
+    when: sessionGridWhen
+});
+registerAction2(class ArrangeSessionsAction extends Action2 {
+    constructor() {
+        super({
+            id: ARRANGE_SESSIONS_COMMAND_ID,
+            title: ( localize2(5861, "Arrange Sessions in a Balanced Grid")),
+            category: SessionsCategories.Sessions,
+            f1: true,
+            precondition: sessionGridWhen,
+            menu: {
+                id: Menus.SessionGridLayout,
+                group: "0_arrange",
+                order: 0
+            }
+        });
+    }
+    run(accessor) {
+        accessor.get(ISessionsService).arrangeSessions();
+    }
+});
+const sessionGridActions = [{
+    direction: Direction.Left,
+    key: KeyCode.LeftArrow,
+    focus: SESSION_GRID_FOCUS_COMMANDS.left,
+    focusTitle: ( localize2(5862, "Focus Session to the Left")),
+    move: "sessions.moveSessionLeft",
+    moveTitle: ( localize2(5863, "Move Session Left")),
+    resize: "sessions.narrowSession",
+    resizeTitle: ( localize2(5864, "Decrease Session Width"))
+}, {
+    direction: Direction.Right,
+    key: KeyCode.RightArrow,
+    focus: SESSION_GRID_FOCUS_COMMANDS.right,
+    focusTitle: ( localize2(5865, "Focus Session to the Right")),
+    move: "sessions.moveSessionRight",
+    moveTitle: ( localize2(5866, "Move Session Right")),
+    resize: "sessions.widenSession",
+    resizeTitle: ( localize2(5867, "Increase Session Width"))
+}, {
+    direction: Direction.Up,
+    key: KeyCode.UpArrow,
+    focus: SESSION_GRID_FOCUS_COMMANDS.up,
+    focusTitle: ( localize2(5868, "Focus Session Above")),
+    move: "sessions.moveSessionUp",
+    moveTitle: ( localize2(5869, "Move Session Above")),
+    resize: "sessions.shortenSession",
+    resizeTitle: ( localize2(5870, "Decrease Session Height"))
+}, {
+    direction: Direction.Down,
+    key: KeyCode.DownArrow,
+    focus: SESSION_GRID_FOCUS_COMMANDS.down,
+    focusTitle: ( localize2(5871, "Focus Session Below")),
+    move: "sessions.moveSessionDown",
+    moveTitle: ( localize2(5872, "Move Session Below")),
+    resize: "sessions.heightenSession",
+    resizeTitle: ( localize2(5873, "Increase Session Height"))
+}];
+const sessionGridNavigationWhen = ( ContextKeyExpr.and(sessionGridWhen, SessionsFocusContext));
+for (const item of sessionGridActions) {
+    registerViewNavigationCommand(item.direction, item.focus, sessionGridNavigationWhen);
+}
+for (const item of sessionGridActions) {
+    for (const operation of ["focus", "move", "resize"]) {
+        registerAction2(class extends Action2 {
+            constructor() {
+                super({
+                    id: item[operation],
+                    title: operation === "focus" ? item.focusTitle : operation === "move" ? item.moveTitle : item.resizeTitle,
+                    category: SessionsCategories.Sessions,
+                    f1: true,
+                    precondition: sessionGridWhen,
+                    menu: {
+                        id: Menus.SessionGridLayout,
+                        group: operation === "focus" ? "1_focus" : operation === "move" ? "2_move" : "3_size",
+                        order: item.direction
+                    },
+                    keybinding: operation === "focus" ? {
+                        primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | item.key),
+                        weight: KeybindingWeight.SessionsContrib,
+                        when: SessionsFocusContext
+                    } : undefined
+                });
+            }
+            run(accessor, session) {
+                const service = accessor.get(ISessionsService);
+                session ??= service.activeSession.get();
+                if (operation === "focus") {
+                    service.focusSessionInDirection(session, item.direction);
+                } else if (operation === "move") {
+                    service.moveSessionInDirection(session, item.direction);
+                } else {
+                    service.resizeSession(session, item.direction);
+                }
+            }
+        });
+    }
+}
 registerAction2(class ToggleMaximizeSessionViewAction extends Action2 {
     constructor() {
         super({
             id: "sessions.chatCompositeBar.toggleMaximize",
-            title: ( localize2(4708, "Maximize")),
+            title: ( localize2(5874, "Maximize")),
+            category: SessionsCategories.Sessions,
+            precondition: sessionGridWhen,
+            f1: true,
             icon: Codicon.screenFull,
             toggled: {
                 condition: SessionIsMaximizedContext,
                 icon: Codicon.screenNormal,
-                title: ( localize(4709, "Restore"))
+                title: ( localize(5875, "Restore"))
             },
             menu: {
                 id: Menus.SessionBarToolbar,
-                when: MultipleSessionsVisibleContext,
+                when: sessionGridWhen,
                 group: "secondary/4_pin",
                 order: 20
             }
         });
     }
     async run(accessor, session) {
-        accessor.get(ISessionsPartService).toggleMaximizeSession(session);
+        session ??= accessor.get(ISessionsService).activeSession.get();
         accessor.get(ISessionsService).setActive(session);
+        accessor.get(ISessionsPartService).toggleMaximizeSession(session);
     }
 });
 registerAction2(class CloseEditorAreaAction extends Action2 {
     constructor() {
         super({
             id: "sessions.closeEditorArea",
-            title: ( localize2(4710, "Close Editor Area")),
+            title: ( localize2(5876, "Close Editor Area")),
             icon: Codicon.close,
             category: SessionsCategories.Sessions,
             menu: {
@@ -1547,4 +1951,4 @@ registerAction2(class CloseEditorAreaAction extends Action2 {
     }
 });
 
-export { CompactButtonActionViewItem, NEW_SESSION_BUTTON_STYLE_SETTING, NEW_SESSION_BUTTON_STYLE_TREATMENT, NewSessionActionViewItem, NewSessionActionViewItemContribution, SHOW_CHATS_PICKER_COMMAND_ID, SHOW_SESSIONS_PICKER_COMMAND_ID, SessionConversationActionsContribution };
+export { CompactButtonActionViewItem, NEW_SESSION_BUTTON_STYLE_SETTING, NEW_SESSION_BUTTON_STYLE_TREATMENT, NewSessionActionViewItem, NewSessionActionViewItemContribution, SHOW_CHATS_PICKER_COMMAND_ID, SHOW_SESSIONS_PICKER_COMMAND_ID, SessionConversationActionsContribution, SessionListActionsExperimentContribution };