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

package/vscode/src/vs/sessions/contrib/sessions/browser/views/sessionsViewActions.js

@@ -1,19 +1,24 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { status } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
-import { KeyMod, KeyCode, KeyChord } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { KeyCode, KeyMod, KeyChord } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { isWeb, isMobile } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
-import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
+import { hasKey } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
+import { AccessibilitySignal } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
+import { IAccessibilitySignalService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { registerAction2, Action2, MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { IsDevelopmentContext } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkeys';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
@@ -24,16 +29,18 @@ import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/
 import { CLOSE_MOBILE_SIDEBAR_DRAWER_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench';
 import { EditorsVisibleContext, IsSessionsWindowContext, EditorAreaFocusContext, FocusedViewContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { SessionsCategories } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/categories';
-import { ARCHIVE_SESSION_COMMAND_ID, UNARCHIVE_SESSION_COMMAND_ID, RENAME_SESSION_COMMAND_ID, MARK_SESSION_READ_COMMAND_ID, MARK_SESSION_UNREAD_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/sessionCommands';
-import { IsNewChatSessionContext, SessionIsArchivedContext, SessionIsCreatedContext, SessionSupportsRenameContext, SessionSupportsDeleteContext, SessionIsReadContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
-import { SessionsSorting, SessionsGrouping, SessionSectionToolbarMenuId, SessionSectionHasNonCloudRepositoryContext, SessionSectionTypeContext, NEW_SESSION_FOR_WORKSPACE_ACTION_ID, SessionGroupHasVisibleSessionsContext, SessionGroupToolbarMenuId, SessionGroupIsEmptyContext, SessionItemToolbarMenuId, SessionItemContextMenuId, IsSessionPinnedContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessions/browser/views/sessionsList';
-import { SessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session';
+import { SESSIONS_LIST_GROUP_EXTERNAL_SESSIONS_SETTING } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/sessionConfig';
+import { ARCHIVE_SESSION_COMMAND_ID, UNARCHIVE_SESSION_COMMAND_ID, ARCHIVE_CHAT_COMMAND_ID, UNARCHIVE_CHAT_COMMAND_ID, RENAME_SESSION_COMMAND_ID, MARK_SESSION_READ_COMMAND_ID, MARK_SESSION_UNREAD_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/sessionCommands';
+import { IsNewChatSessionContext, IsPhoneLayoutContext, SessionsListPromoteNewChatActionContext, SessionIsArchivedContext, SessionIsCreatedContext, SessionHeaderTargetsChatContext, SessionActiveChatCanArchiveContext, SessionActiveChatIsUntitledContext, SessionSupportsRenameContext, SessionItemIsMultiSelectionContext, SessionSupportsDeleteContext, SessionIsReadContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
+import { SessionsGrouping, SessionSectionToolbarMenuId, SessionSectionTypeContext, SessionsSorting, SessionSectionHasNonCloudRepositoryContext, NEW_SESSION_FOR_WORKSPACE_ACTION_ID, SessionGroupHasVisibleSessionsContext, SessionGroupToolbarMenuId, SessionGroupIsEmptyContext, SessionGroupIsComparisonContext, SessionItemContextMenuId, IsSessionPinnedContext, SessionItemCanImportContext, SessionChatItemCanArchiveContext, SessionChatItemIsArchivedContext, SessionChatItemIsUntitledContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessions/browser/views/sessionsList';
+import { getChatCapabilities, SessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session';
 import { ISessionGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionGroupsService.service';
-import { SessionsViewId, SessionsViewFilterSubMenu, SessionsViewFilterOptionsSubMenu, SessionsViewSortingContext, SessionsViewGroupingContext, IsWorkspaceGroupCappedContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessions/browser/views/sessionsView';
+import { ISessionComparisonService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionComparison.service';
+import { SessionsViewId, SessionsViewGroupingContext, SessionsViewSortingContext, SessionsViewCompactContext, IsWorkspaceGroupCappedContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessions/browser/views/sessionsView';
 import { Menus } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/menus';
 import { ISessionsManagementService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
-import { ChatSessionArchiveActionWording, getChatSessionArchiveActionPresentation, ChatSessionArchiveActionWordingSettingId, getChatSessionArchiveActionWording } from '@codingame/monaco-vscode-api/vscode/vs/platform/chat/common/sessionArchiveActions';
+import { ChatSessionArchiveActionWording, getChatSessionArchiveActionPresentation, SESSIONS_MARK_AS_DONE_CONFETTI_SETTING, ChatSessionArchiveActionWordingSettingId, getChatSessionArchiveActionWording } from '@codingame/monaco-vscode-api/vscode/vs/platform/chat/common/sessionArchiveActions';
 import { AGENT_HOST_ENABLED_CONTEXT_KEY } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostEnablementService';
 import { ISessionsPartService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsPartService.service';
 import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service';
@@ -41,18 +48,82 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monac
 import { registerExternalSessionsFilterMenu } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/externalSessionsFilterMenu';
 import { ICustomViewService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/customView/browser/customViewService.service';
 import { IAutomationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/automations/automationService.service';
-import { ChatAutomationsEnabledContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/automations/automationsEnabled';
 import { AUTOMATIONS_CUSTOM_VIEW_ID } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessions/browser/automationsConstants';
 import { UNIFIED_WORKSPACE_PICKER_SETTING } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/chat/common/constants';
 import { INewSessionComposerService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/chat/browser/newSessionComposerService.service';
 import { WorkspaceSelectionOrigin } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/workspaceSelection';
+import { AccessibleViewType } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView';
+import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
+import { SessionsListNotificationFocused } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessions/browser/views/sessionsListNotification';
 
+AccessibleViewRegistry.register({
+    name: "sessions-list-notification",
+    type: AccessibleViewType.Help,
+    priority: 110,
+    when: SessionsListNotificationFocused,
+    getProvider: accessor => accessor.get(IViewsService).getViewWithId(SessionsViewId)?.archiveNotification?.getAccessibilityHelp()
+});
+async function archiveSessionsWithUndo(
+    sessions,
+    wording,
+    sessionsManagementService,
+    groupsService,
+    viewsService,
+    comparisonService
+) {
+    const archived = [];
+    const candidates = sessions.filter(session => !session.isArchived.get()).map(session => ({
+        session,
+        groupId: groupsService.getGroupOfSession(session.sessionId)
+    }));
+    const comparisonGroups = ( new Map(
+        comparisonService.comparisons.get().filter(comparison => comparison.archivedAt === undefined && ( candidates.some(entry => entry.groupId === comparison.groupId))).map(comparison => [comparison.groupId, comparison.id])
+    ));
+    try {
+        for (const entry of candidates) {
+            await sessionsManagementService.archiveSession(entry.session);
+            archived.push(entry);
+        }
+    } finally {
+        if (archived.length > 0) {
+            const removedComparisonGroups = ( new Map(
+                [...comparisonGroups].filter(([groupId]) => !groupsService.getGroup(groupId))
+            ));
+            const restoredGroupIds = ( new Map());
+            const message = wording === ChatSessionArchiveActionWording.MarkAsDone ? ( localize(6237, "{0} marked done", archived.length)) : ( localize(6238, "{0} archived", archived.length));
+            viewsService.getViewWithId(SessionsViewId)?.archiveNotification?.show(message, async () => {
+                for (const [groupId, comparisonId] of removedComparisonGroups) {
+                    const restoredGroupId = restoredGroupIds.get(groupId);
+                    if (!restoredGroupId || !groupsService.getGroup(restoredGroupId)) {
+                        restoredGroupIds.set(groupId, comparisonService.restoreComparison(comparisonId));
+                    }
+                }
+                while (archived.length > 0) {
+                    const {
+                        session,
+                        groupId
+                    } = archived[0];
+                    const current = sessionsManagementService.getSession(session.resource);
+                    if (current?.isArchived.get()) {
+                        await sessionsManagementService.unarchiveSession(current);
+                        const restoredGroupId = groupId ? restoredGroupIds.get(groupId) ?? groupId : undefined;
+                        if (restoredGroupId && groupsService.getGroup(restoredGroupId) && !groupsService.getGroupOfSession(current.sessionId)) {
+                            groupsService.addToGroup(current.sessionId, restoredGroupId);
+                        }
+                    }
+                    archived.shift();
+                }
+                status(( localize(6239, "Sessions restored.")));
+            });
+        }
+    }
+}
 const CLOSE_SESSION_COMMAND_ID = "sessionsViewPane.closeSession";
 registerAction2(class CloseSessionAction extends Action2 {
     constructor() {
         super({
             id: CLOSE_SESSION_COMMAND_ID,
-            title: ( localize2(4966, "Close Session")),
+            title: ( localize2(6240, "Close Session")),
             f1: true,
             precondition: ( ContextKeyExpr.and(( IsNewChatSessionContext.negate()), ( EditorsVisibleContext.negate()))),
             category: SessionsCategories.Sessions
@@ -64,16 +135,6 @@ registerAction2(class CloseSessionAction extends Action2 {
         sessionsService.openNewSession();
     }
 });
-KeybindingsRegistry.registerKeybindingRule({
-    id: CLOSE_SESSION_COMMAND_ID,
-    weight: KeybindingWeight.SessionsContrib,
-    when: ( ContextKeyExpr.and(( IsNewChatSessionContext.negate()), ( EditorsVisibleContext.negate()))),
-    primary: KeyMod.CtrlCmd | KeyCode.KeyW,
-    win: {
-        primary: KeyMod.CtrlCmd | KeyCode.F4,
-        secondary: [KeyMod.CtrlCmd | KeyCode.KeyW]
-    }
-});
 const OPEN_SESSION_AT_INDEX_COMMAND_ID = "sessionsViewPane.openSessionAtIndex";
 function digitToKeyCode(digit) {
     switch (digit) {
@@ -170,9 +231,9 @@ registerAction2(class NavigatePreviousSessionAction extends Action2 {
         super({
             id: "sessionsViewPane.navigatePreviousSession",
             title: {
-                value: ( localize(4967, "Go to Previous Session")),
+                value: ( localize(6241, "Go to Previous Session")),
                 original: "Go to Previous Session",
-                mnemonicTitle: ( localize(4968, "&&Previous Session"))
+                mnemonicTitle: ( localize(6242, "&&Previous Session"))
             },
             f1: true,
             category: SessionsCategories.Sessions,
@@ -202,9 +263,9 @@ registerAction2(class NavigateNextSessionAction extends Action2 {
         super({
             id: "sessionsViewPane.navigateNextSession",
             title: {
-                value: ( localize(4969, "Go to Next Session")),
+                value: ( localize(6243, "Go to Next Session")),
                 original: "Go to Next Session",
-                mnemonicTitle: ( localize(4970, "&&Next Session"))
+                mnemonicTitle: ( localize(6244, "&&Next Session"))
             },
             f1: true,
             category: SessionsCategories.Sessions,
@@ -230,41 +291,100 @@ registerAction2(class NavigateNextSessionAction extends Action2 {
     }
 });
 MenuRegistry.appendMenuItem(Menus.SidebarSessionsHeader, {
-    submenu: SessionsViewFilterSubMenu,
-    title: ( localize2(4971, "Filter Sessions")),
-    icon: Codicon.settings,
+    submenu: Menus.SessionsViewFilter,
+    title: ( localize2(6245, "Filter Sessions")),
+    icon: Codicon.filter,
     group: "navigation",
     order: 10
 });
 MenuRegistry.appendMenuItem(Menus.SidebarSessionsHeader, {
     command: {
         id: "sessionsViewPane.find",
-        title: ( localize2(4972, "Find Session")),
+        title: ( localize2(6246, "Find Session")),
         icon: Codicon.search
     },
     group: "navigation",
     order: 20
 });
-MenuRegistry.appendMenuItem(SessionsViewFilterSubMenu, {
-    submenu: SessionsViewFilterOptionsSubMenu,
-    title: ( localize2(4973, "Filter")),
-    group: "0_filter",
+MenuRegistry.appendMenuItem(Menus.SessionsViewFilter, {
+    submenu: Menus.SessionsViewOrdering,
+    title: ( localize2(6247, "Ordering")),
+    group: "1_presentation",
     order: 0
 });
+MenuRegistry.appendMenuItem(Menus.SessionsViewFilter, {
+    submenu: Menus.SessionsViewGrouping,
+    title: ( localize2(6248, "Grouping")),
+    group: "1_presentation",
+    order: 1
+});
+MenuRegistry.appendMenuItem(Menus.SessionsViewFilter, {
+    submenu: Menus.SessionsViewShow,
+    title: ( localize2(6249, "Show")),
+    when: ( SessionsViewGroupingContext.isEqualTo(SessionsGrouping.Workspace)),
+    group: "1_presentation",
+    order: 2
+});
+for (const [index, item] of [{
+    submenu: Menus.SessionsViewSource,
+    title: ( localize2(6250, "Created In"))
+}, {
+    submenu: Menus.SessionsViewHarness,
+    title: ( localize2(6251, "Harness"))
+}].entries()) {
+    MenuRegistry.appendMenuItem(Menus.SessionsViewFilter, {
+        ...item,
+        group: "2_filters",
+        order: index + 1
+    });
+}
 registerExternalSessionsFilterMenu(
-    SessionsViewFilterOptionsSubMenu,
+    Menus.SessionsViewFilter,
     Menus.SessionsViewExternalFilter,
-    "2_external"
+    "3_visibility",
+    false,
+    ( localize2(6252, "Created Externally"))
 );
+registerAction2(class ToggleExternalSessionsSectionAction extends Action2 {
+    constructor() {
+        super({
+            id: "sessionsViewPane.toggleExternalSessionsSection",
+            title: ( localize2(6253, "Show in External Section")),
+            toggled: ( ContextKeyExpr.equals(`config.${SESSIONS_LIST_GROUP_EXTERNAL_SESSIONS_SETTING}`, true)),
+            menu: {
+                id: Menus.SessionsViewExternalFilter,
+                group: "2_grouping",
+                order: 0,
+                when: ChatContextKeys.enabled
+            }
+        });
+    }
+    async run(accessor) {
+        const configurationService = accessor.get(IConfigurationService);
+        await configurationService.updateValue(
+            SESSIONS_LIST_GROUP_EXTERNAL_SESSIONS_SETTING,
+            !configurationService.getValue(SESSIONS_LIST_GROUP_EXTERNAL_SESSIONS_SETTING),
+            ConfigurationTarget.USER
+        );
+    }
+});
+MenuRegistry.appendMenuItem(SessionSectionToolbarMenuId, {
+    submenu: Menus.SessionsViewExternalFilter,
+    title: ( localize2(6254, "Configure External Sessions")),
+    icon: Codicon.filter,
+    group: "navigation",
+    order: 0,
+    when: ( ContextKeyExpr.equals(SessionSectionTypeContext.key, "external"))
+});
 registerAction2(class SortByCreatedAction extends Action2 {
     constructor() {
         super({
             id: "sessionsViewPane.sortByCreated",
-            title: ( localize2(4974, "Sort by Created")),
+            title: ( localize2(6255, "Created")),
             category: SessionsCategories.Sessions,
             toggled: ( ContextKeyExpr.equals(SessionsViewSortingContext.key, SessionsSorting.Created)),
             menu: [{
-                id: SessionsViewFilterSubMenu,
+                id: Menus.SessionsViewOrdering,
                 group: "1_sort",
                 order: 0
             }]
@@ -280,11 +400,11 @@ registerAction2(class SortByUpdatedAction extends Action2 {
     constructor() {
         super({
             id: "sessionsViewPane.sortByUpdated",
-            title: ( localize2(4975, "Sort by Updated")),
+            title: ( localize2(6256, "Updated")),
             category: SessionsCategories.Sessions,
             toggled: ( ContextKeyExpr.equals(SessionsViewSortingContext.key, SessionsSorting.Updated)),
             menu: [{
-                id: SessionsViewFilterSubMenu,
+                id: Menus.SessionsViewOrdering,
                 group: "1_sort",
                 order: 1
             }]
@@ -300,13 +420,13 @@ registerAction2(class GroupByWorkspaceAction extends Action2 {
     constructor() {
         super({
             id: "sessionsViewPane.groupByWorkspace",
-            title: ( localize2(4976, "Group by Workspace")),
+            title: ( localize2(6257, "Workspace")),
             category: SessionsCategories.Sessions,
             toggled: ( ContextKeyExpr.equals(SessionsViewGroupingContext.key, SessionsGrouping.Workspace)),
             menu: [{
-                id: SessionsViewFilterSubMenu,
-                group: "2_group",
-                order: 0
+                id: Menus.SessionsViewGrouping,
+                group: "1_group",
+                order: 1
             }]
         });
     }
@@ -320,13 +440,13 @@ registerAction2(class GroupByTimeAction extends Action2 {
     constructor() {
         super({
             id: "sessionsViewPane.groupByTime",
-            title: ( localize2(4977, "Group by Time")),
+            title: ( localize2(6258, "Time")),
             category: SessionsCategories.Sessions,
             toggled: ( ContextKeyExpr.equals(SessionsViewGroupingContext.key, SessionsGrouping.Date)),
             menu: [{
-                id: SessionsViewFilterSubMenu,
-                group: "2_group",
-                order: 1
+                id: Menus.SessionsViewGrouping,
+                group: "1_group",
+                order: 0
             }]
         });
     }
@@ -336,16 +456,37 @@ registerAction2(class GroupByTimeAction extends Action2 {
         view?.setGrouping(SessionsGrouping.Date);
     }
 });
+registerAction2(class ToggleCompactSessionsViewAction extends Action2 {
+    constructor() {
+        super({
+            id: "sessionsViewPane.toggleCompact",
+            title: ( localize2(6259, "Compact View")),
+            category: SessionsCategories.Sessions,
+            toggled: SessionsViewCompactContext,
+            menu: [{
+                id: Menus.SidebarSessionsHeader,
+                group: "view",
+                order: 0,
+                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( IsPhoneLayoutContext.negate())))
+            }]
+        });
+    }
+    run(accessor) {
+        const viewsService = accessor.get(IViewsService);
+        const view = viewsService.getViewWithId(SessionsViewId);
+        view?.toggleCompact();
+    }
+});
 registerAction2(class ShowRecentWorkspaceSessionsAction extends Action2 {
     constructor() {
         super({
             id: "sessionsViewPane.showRecentSessions",
-            title: ( localize2(4978, "Show Recent Sessions")),
+            title: ( localize2(6260, "Recent")),
             category: SessionsCategories.Sessions,
             toggled: IsWorkspaceGroupCappedContext,
             menu: [{
-                id: SessionsViewFilterSubMenu,
-                group: "3_cap",
+                id: Menus.SessionsViewShow,
+                group: "1_show",
                 order: 0,
                 when: ( ContextKeyExpr.equals(SessionsViewGroupingContext.key, SessionsGrouping.Workspace))
             }]
@@ -362,12 +503,12 @@ registerAction2(class ShowAllWorkspaceSessionsAction extends Action2 {
     constructor() {
         super({
             id: "sessionsViewPane.showAllSessions",
-            title: ( localize2(4979, "Show All Sessions")),
+            title: ( localize2(6261, "All")),
             category: SessionsCategories.Sessions,
             toggled: ( IsWorkspaceGroupCappedContext.negate()),
             menu: [{
-                id: SessionsViewFilterSubMenu,
-                group: "3_cap",
+                id: Menus.SessionsViewShow,
+                group: "1_show",
                 order: 1,
                 when: ( ContextKeyExpr.equals(SessionsViewGroupingContext.key, SessionsGrouping.Workspace))
             }]
@@ -384,12 +525,13 @@ registerAction2(class CollapseAllGroupsAction extends Action2 {
     constructor() {
         super({
             id: "sessionsViewPane.collapseAllGroups",
-            title: ( localize2(4980, "Collapse All Groups")),
+            title: ( localize2(6262, "Collapse All Groups")),
             category: SessionsCategories.Sessions,
             menu: [{
-                id: SessionsViewFilterSubMenu,
-                group: "4_collapse",
-                order: 0
+                id: Menus.SidebarSessionsHeader,
+                group: "view",
+                order: 1,
+                when: ChatContextKeys.enabled
             }]
         });
     }
@@ -403,7 +545,7 @@ registerAction2(class RefreshSessionsAction extends Action2 {
     constructor() {
         super({
             id: "sessionsViewPane.refresh",
-            title: ( localize2(4981, "Refresh Sessions")),
+            title: ( localize2(6263, "Refresh Sessions")),
             icon: Codicon.refresh,
             f1: true,
             category: SessionsCategories.Sessions
@@ -419,7 +561,7 @@ registerAction2(class FindSessionAction extends Action2 {
     constructor() {
         super({
             id: "sessionsViewPane.find",
-            title: ( localize2(4972, "Find Session")),
+            title: ( localize2(6246, "Find Session")),
             icon: Codicon.search,
             category: SessionsCategories.Sessions
         });
@@ -434,7 +576,7 @@ registerAction2(class NewSessionForWorkspaceAction extends Action2 {
     constructor() {
         super({
             id: NEW_SESSION_FOR_WORKSPACE_ACTION_ID,
-            title: ( localize2(4982, "New Session")),
+            title: ( localize2(6264, "New Session")),
             icon: Codicon.plus,
             menu: [{
                 id: SessionSectionToolbarMenuId,
@@ -485,7 +627,7 @@ registerAction2(class NewQuickChatAction extends Action2 {
     constructor() {
         super({
             id: NEW_QUICK_CHAT_COMMAND_ID,
-            title: ( localize2(4983, "New Quick Chat")),
+            title: ( localize2(6265, "New Quick Chat")),
             icon: Codicon.add,
             category: SessionsCategories.Sessions,
             f1: true,
@@ -529,36 +671,36 @@ const ConfirmArchiveStorageKey = "sessions.confirmArchive";
 function getArchiveSectionConfirmationMessage(context, wording) {
     if (context.id === "pinned") {
         if (context.sessions.length === 1) {
-            return wording === ChatSessionArchiveActionWording.MarkAsDone ? ( localize(4984, "Are you sure you want to mark 1 pinned session as done?")) : ( localize(4985, "Are you sure you want to archive 1 pinned session?"));
+            return wording === ChatSessionArchiveActionWording.MarkAsDone ? ( localize(6266, "Are you sure you want to mark 1 pinned session as done?")) : ( localize(6267, "Are you sure you want to archive 1 pinned session?"));
         }
         return wording === ChatSessionArchiveActionWording.MarkAsDone ? ( localize(
-            4986,
+            6268,
             "Are you sure you want to mark {0} pinned sessions as done?",
             context.sessions.length
         )) : ( localize(
-            4987,
+            6269,
             "Are you sure you want to archive {0} pinned sessions?",
             context.sessions.length
         ));
     }
     if (context.sessions.length === 1) {
         return wording === ChatSessionArchiveActionWording.MarkAsDone ? ( localize(
-            4988,
+            6270,
             "Are you sure you want to mark 1 session from '{0}' as done?",
             context.label
         )) : ( localize(
-            4989,
+            6271,
             "Are you sure you want to archive 1 session from '{0}'?",
             context.label
         ));
     }
     return wording === ChatSessionArchiveActionWording.MarkAsDone ? ( localize(
-        4990,
+        6272,
         "Are you sure you want to mark {0} sessions from '{1}' as done?",
         context.sessions.length,
         context.label
     )) : ( localize(
-        4991,
+        6273,
         "Are you sure you want to archive {0} sessions from '{1}'?",
         context.sessions.length,
         context.label
@@ -584,17 +726,20 @@ class BaseArchiveSectionAction extends Action2 {
         if (!context || !context.sessions || context.sessions.length === 0) {
             return;
         }
-        const sessionsManagementService = accessor.get(ISessionsManagementService);
         const dialogService = accessor.get(IDialogService);
         const storageService = accessor.get(IStorageService);
+        const sessionsManagementService = accessor.get(ISessionsManagementService);
+        const groupsService = accessor.get(ISessionGroupsService);
+        const viewsService = accessor.get(IViewsService);
+        const comparisonService = accessor.get(ISessionComparisonService);
         const skipConfirmation = storageService.getBoolean(ConfirmArchiveStorageKey, StorageScope.PROFILE, false);
         if (!skipConfirmation) {
             const confirmed = await dialogService.confirm({
                 message: getArchiveSectionConfirmationMessage(context, this.wording),
-                detail: this.wording === ChatSessionArchiveActionWording.MarkAsDone ? ( localize(4992, "You can restore sessions later if needed from the sessions view.")) : ( localize(4993, "You can unarchive sessions later if needed from the sessions view.")),
+                detail: this.wording === ChatSessionArchiveActionWording.MarkAsDone ? ( localize(6274, "You can restore sessions later if needed from the sessions view.")) : ( localize(6275, "You can unarchive sessions later if needed from the sessions view.")),
                 primaryButton: getChatSessionArchiveActionPresentation(this.wording).archiveAll.title.value,
                 checkbox: {
-                    label: ( localize(4994, "Do not ask me again"))
+                    label: ( localize(6276, "Do not ask me again"))
                 }
             });
             if (!confirmed.confirmed) {
@@ -604,9 +749,14 @@ class BaseArchiveSectionAction extends Action2 {
                 storageService.store(ConfirmArchiveStorageKey, true, StorageScope.PROFILE, StorageTarget.USER);
             }
         }
-        for (const session of context.sessions) {
-            await sessionsManagementService.archiveSession(session);
-        }
+        await archiveSessionsWithUndo(
+            context.sessions,
+            this.wording,
+            sessionsManagementService,
+            groupsService,
+            viewsService,
+            comparisonService
+        );
     }
 }
 class ArchiveSectionAction extends BaseArchiveSectionAction {
@@ -622,22 +772,22 @@ class MarkSectionSessionsDoneAction extends BaseArchiveSectionAction {
 function getArchiveGroupConfirmationMessage(context, wording) {
     if (context.sessions.length === 1) {
         return wording === ChatSessionArchiveActionWording.MarkAsDone ? ( localize(
-            4995,
+            6277,
             "Are you sure you want to mark 1 session from '{0}' as done?",
             context.group.name
         )) : ( localize(
-            4996,
+            6278,
             "Are you sure you want to archive 1 session from '{0}'?",
             context.group.name
         ));
     }
     return wording === ChatSessionArchiveActionWording.MarkAsDone ? ( localize(
-        4997,
+        6279,
         "Are you sure you want to mark {0} sessions from '{1}' as done?",
         context.sessions.length,
         context.group.name
     )) : ( localize(
-        4998,
+        6280,
         "Are you sure you want to archive {0} sessions from '{1}'?",
         context.sessions.length,
         context.group.name
@@ -660,20 +810,23 @@ class BaseArchiveSessionsInGroupAction extends Action2 {
         this.wording = wording;
     }
     async run(accessor, context) {
-        if (!context || !context.sessions || context.sessions.length === 0) {
+        if (!context || context.comparison?.launching || !context.sessions || context.sessions.length === 0) {
             return;
         }
-        const sessionsManagementService = accessor.get(ISessionsManagementService);
         const dialogService = accessor.get(IDialogService);
         const storageService = accessor.get(IStorageService);
+        const sessionsManagementService = accessor.get(ISessionsManagementService);
+        const groupsService = accessor.get(ISessionGroupsService);
+        const viewsService = accessor.get(IViewsService);
+        const comparisonService = accessor.get(ISessionComparisonService);
         const skipConfirmation = storageService.getBoolean(ConfirmArchiveStorageKey, StorageScope.PROFILE, false);
         if (!skipConfirmation) {
             const confirmed = await dialogService.confirm({
                 message: getArchiveGroupConfirmationMessage(context, this.wording),
-                detail: this.wording === ChatSessionArchiveActionWording.MarkAsDone ? ( localize(4999, "You can restore sessions later if needed from the sessions view.")) : ( localize(5000, "You can unarchive sessions later if needed from the sessions view.")),
+                detail: this.wording === ChatSessionArchiveActionWording.MarkAsDone ? ( localize(6281, "You can restore sessions later if needed from the sessions view.")) : ( localize(6282, "You can unarchive sessions later if needed from the sessions view.")),
                 primaryButton: getChatSessionArchiveActionPresentation(this.wording).archiveAll.title.value,
                 checkbox: {
-                    label: ( localize(4994, "Do not ask me again"))
+                    label: ( localize(6276, "Do not ask me again"))
                 }
             });
             if (!confirmed.confirmed) {
@@ -683,9 +836,14 @@ class BaseArchiveSessionsInGroupAction extends Action2 {
                 storageService.store(ConfirmArchiveStorageKey, true, StorageScope.PROFILE, StorageTarget.USER);
             }
         }
-        for (const session of context.sessions) {
-            await sessionsManagementService.archiveSession(session);
-        }
+        await archiveSessionsWithUndo(
+            context.sessions,
+            this.wording,
+            sessionsManagementService,
+            groupsService,
+            viewsService,
+            comparisonService
+        );
     }
 }
 class ArchiveSessionsInGroupAction extends BaseArchiveSessionsInGroupAction {
@@ -702,18 +860,18 @@ registerAction2(class DeleteEmptySessionGroupAction extends Action2 {
     constructor() {
         super({
             id: "sessionsView.deleteEmptyGroup",
-            title: ( localize2(5001, "Delete Group")),
+            title: ( localize2(6283, "Delete Group")),
             icon: Codicon.trash,
             menu: [{
                 id: SessionGroupToolbarMenuId,
                 group: "navigation",
                 order: 2,
-                when: SessionGroupIsEmptyContext
+                when: ( ContextKeyExpr.and(SessionGroupIsEmptyContext, ( SessionGroupIsComparisonContext.negate())))
             }]
         });
     }
     run(accessor, context) {
-        if (!context) {
+        if (!context || context.comparison) {
             return;
         }
         const sessionGroupsService = accessor.get(ISessionGroupsService);
@@ -726,17 +884,18 @@ registerAction2(class NewSessionInGroupAction extends Action2 {
     constructor() {
         super({
             id: "sessionsView.newSessionInGroup",
-            title: ( localize2(5002, "New Session")),
+            title: ( localize2(6284, "New Session")),
             icon: Codicon.plus,
             menu: [{
                 id: SessionGroupToolbarMenuId,
                 group: "navigation",
-                order: 1
+                order: 1,
+                when: ( SessionGroupIsComparisonContext.negate())
             }]
         });
     }
     run(accessor, context) {
-        if (!context) {
+        if (!context || context.comparison) {
             return;
         }
         const sessionsService = accessor.get(ISessionsService);
@@ -756,13 +915,13 @@ registerAction2(class PinSessionAction extends Action2 {
     constructor() {
         super({
             id: "sessionsViewPane.pinSession",
-            title: ( localize2(5003, "Pin")),
+            title: ( localize2(6285, "Pin")),
             icon: Codicon.pin,
             menu: [{
-                id: SessionItemToolbarMenuId,
+                id: Menus.SessionItemToolbar,
                 group: "navigation",
-                order: 2,
-                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals(IsSessionPinnedContext.key, false)), ( ContextKeyExpr.equals(SessionIsArchivedContext.key, false))))
+                order: 1,
+                when: ( ContextKeyExpr.and(( SessionsListPromoteNewChatActionContext.negate()), ( ContextKeyExpr.equals(IsSessionPinnedContext.key, false)), ( ContextKeyExpr.equals(SessionIsArchivedContext.key, false))))
             }, {
                 id: SessionItemContextMenuId,
                 group: "0_pin",
@@ -787,13 +946,13 @@ registerAction2(class UnpinSessionAction extends Action2 {
     constructor() {
         super({
             id: "sessionsViewPane.unpinSession",
-            title: ( localize2(5004, "Unpin")),
+            title: ( localize2(6286, "Unpin")),
             icon: Codicon.pinned,
             menu: [{
-                id: SessionItemToolbarMenuId,
+                id: Menus.SessionItemToolbar,
                 group: "navigation",
-                order: 2,
-                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals(IsSessionPinnedContext.key, true)), ( ContextKeyExpr.equals(SessionIsArchivedContext.key, false))))
+                order: 1,
+                when: ( ContextKeyExpr.and(( SessionsListPromoteNewChatActionContext.negate()), ( ContextKeyExpr.equals(IsSessionPinnedContext.key, true)), ( ContextKeyExpr.equals(SessionIsArchivedContext.key, false))))
             }, {
                 id: SessionItemContextMenuId,
                 group: "0_pin",
@@ -837,6 +996,34 @@ KeybindingsRegistry.registerKeybindingRule({
         primary: KeyMod.CtrlCmd | KeyCode.Backspace
     }
 });
+registerAction2(class ImportSessionAction extends Action2 {
+    constructor() {
+        super({
+            id: "sessionsViewPane.importSession",
+            title: ( localize2(6287, "Import")),
+            icon: Codicon.chatImport,
+            precondition: ChatContextKeys.enabled,
+            menu: [Menus.SessionItemToolbar, SessionItemContextMenuId].map(id => ({
+                id,
+                group: id === Menus.SessionItemToolbar ? "navigation" : "1_edit",
+                order: 1.5,
+                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, SessionItemCanImportContext, ( SessionIsArchivedContext.negate())))
+            }))
+        });
+    }
+    async run(accessor, context) {
+        const sessions = getSessionActionTargets(accessor, context).filter(
+            session => session.isExternal?.get() === true && session.capabilities.get().supportsImport && !session.isArchived.get()
+        );
+        const sessionsManagementService = accessor.get(ISessionsManagementService);
+        for (const session of sessions) {
+            await sessionsManagementService.importSession(session);
+        }
+        if (sessions.length > 0) {
+            status(sessions.length === 1 ? ( localize(6288, "Imported {0}.", sessions[0].title.get())) : ( localize(6289, "Imported {0} sessions.", sessions.length)));
+        }
+    }
+});
 class BaseArchiveSessionAction extends Action2 {
     constructor(wording) {
         const action = getChatSessionArchiveActionPresentation(wording).archive;
@@ -845,9 +1032,9 @@ class BaseArchiveSessionAction extends Action2 {
             title: action.title,
             icon: action.icon,
             menu: [{
-                id: SessionItemToolbarMenuId,
+                id: Menus.SessionItemToolbar,
                 group: "navigation",
-                order: 1,
+                order: 2,
                 when: ( ContextKeyExpr.equals(SessionIsArchivedContext.key, false))
             }, {
                 id: Menus.AutomationsHistoryItem,
@@ -863,7 +1050,7 @@ class BaseArchiveSessionAction extends Action2 {
                 id: Menus.SessionBarToolbar,
                 group: "secondary/1_session",
                 order: 30,
-                when: ( ContextKeyExpr.and(SessionIsCreatedContext, ( ContextKeyExpr.equals(SessionIsArchivedContext.key, false))))
+                when: ( ContextKeyExpr.and(SessionIsCreatedContext, ( ContextKeyExpr.equals(SessionIsArchivedContext.key, false)), ( SessionHeaderTargetsChatContext.negate())))
             }]
         });
     }
@@ -871,9 +1058,15 @@ class BaseArchiveSessionAction extends Action2 {
         const targets = context ? (Array.isArray(context) ? context : [context]) : getFocusedSessionListTargets(accessor) ?? [];
         const sessions = targets.filter(session => !session.isArchived.get());
         const sessionsManagementService = accessor.get(ISessionsManagementService);
+        const configurationService = accessor.get(IConfigurationService);
+        const accessibilityService = accessor.get(IAccessibilityService);
+        const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
         for (const session of sessions) {
             await sessionsManagementService.archiveSession(session);
         }
+        if (sessions.length > 0 && configurationService.getValue(SESSIONS_MARK_AS_DONE_CONFETTI_SETTING) && !accessibilityService.isMotionReduced()) {
+            void accessibilitySignalService.playSignal(AccessibilitySignal.confetti);
+        }
     }
 }
 class ArchiveSessionAction extends BaseArchiveSessionAction {
@@ -894,7 +1087,7 @@ class BaseUnarchiveSessionAction extends Action2 {
             title: action.title,
             icon: action.icon,
             menu: [{
-                id: SessionItemToolbarMenuId,
+                id: Menus.SessionItemToolbar,
                 group: "navigation",
                 order: 1,
                 when: ( ContextKeyExpr.equals(SessionIsArchivedContext.key, true))
@@ -937,12 +1130,125 @@ class RestoreArchivedSessionAction extends BaseUnarchiveSessionAction {
         super(ChatSessionArchiveActionWording.MarkAsDone);
     }
 }
+class BaseArchiveChatAction extends Action2 {
+    constructor(wording) {
+        const action = getChatSessionArchiveActionPresentation(wording).archive;
+        const when = ( ContextKeyExpr.and(ChatContextKeys.enabled, SessionChatItemCanArchiveContext, ( SessionChatItemIsArchivedContext.negate())));
+        super({
+            id: ARCHIVE_CHAT_COMMAND_ID,
+            title: action.title,
+            icon: action.icon,
+            menu: [{
+                id: Menus.SessionChatItemContext,
+                group: "1_chat",
+                order: 3,
+                when
+            }, {
+                id: Menus.SessionChatItemToolbar,
+                group: "navigation",
+                order: 1,
+                when: ( ContextKeyExpr.and(when, ( SessionChatItemIsUntitledContext.negate())))
+            }, {
+                id: Menus.SessionBarToolbar,
+                group: "secondary/1_session",
+                order: 30,
+                when: ( ContextKeyExpr.and(
+                    SessionHeaderTargetsChatContext,
+                    SessionActiveChatCanArchiveContext,
+                    ( SessionActiveChatIsUntitledContext.negate())
+                ))
+            }]
+        });
+    }
+    async run(accessor, context, chat) {
+        let target;
+        if (context && chat && hasKey(context, {
+            sessionId: true
+        })) {
+            target = {
+                session: context,
+                chat
+            };
+        } else if (context && hasKey(context, {
+            session: true,
+            chat: true
+        })) {
+            target = context;
+        }
+        if (!target || target.chat.isArchived.get() || !getChatCapabilities(target.chat, target.session, undefined).canArchive) {
+            return;
+        }
+        const sessionsService = accessor.get(ISessionsService);
+        const sessionsManagementService = accessor.get(ISessionsManagementService);
+        await sessionsManagementService.archiveChat(target.session, target.chat);
+        const activeSession = sessionsService.activeSession.get();
+        if (activeSession?.sessionId === target.session.sessionId) {
+            const openChat = activeSession.openChats.get().find(chat => isEqual(chat.resource, target.chat.resource));
+            if (openChat) {
+                await sessionsService.closeChat(activeSession, openChat);
+            }
+        }
+    }
+}
+class ArchiveChatAction extends BaseArchiveChatAction {
+    constructor() {
+        super(ChatSessionArchiveActionWording.Archive);
+    }
+}
+class MarkChatAsDoneAction extends BaseArchiveChatAction {
+    constructor() {
+        super(ChatSessionArchiveActionWording.MarkAsDone);
+    }
+}
+class BaseUnarchiveChatAction extends Action2 {
+    constructor(wording) {
+        const action = getChatSessionArchiveActionPresentation(wording).unarchive;
+        const when = ( ContextKeyExpr.and(
+            ChatContextKeys.enabled,
+            SessionChatItemCanArchiveContext,
+            SessionChatItemIsArchivedContext
+        ));
+        super({
+            id: UNARCHIVE_CHAT_COMMAND_ID,
+            title: action.title,
+            icon: action.icon,
+            menu: [{
+                id: Menus.SessionChatItemContext,
+                group: "1_chat",
+                order: 3,
+                when
+            }, {
+                id: Menus.SessionChatItemToolbar,
+                group: "navigation",
+                order: 1,
+                when: ( ContextKeyExpr.and(when, ( SessionChatItemIsUntitledContext.negate())))
+            }]
+        });
+    }
+    async run(accessor, context) {
+        if (!context || !context.chat.isArchived.get() || !getChatCapabilities(context.chat, context.session, undefined).canArchive) {
+            return;
+        }
+        await accessor.get(ISessionsManagementService).unarchiveChat(context.session, context.chat);
+    }
+}
+class UnarchiveChatAction extends BaseUnarchiveChatAction {
+    constructor() {
+        super(ChatSessionArchiveActionWording.Archive);
+    }
+}
+class RestoreArchivedChatAction extends BaseUnarchiveChatAction {
+    constructor() {
+        super(ChatSessionArchiveActionWording.MarkAsDone);
+    }
+}
 registerAction2(class RenameSessionAction extends Action2 {
     constructor() {
         super({
             id: RENAME_SESSION_COMMAND_ID,
-            title: ( localize2(5005, "Rename...")),
+            title: ( localize2(6290, "Rename...")),
             icon: Codicon.edit,
+            precondition: ( SessionItemIsMultiSelectionContext.negate()),
             keybinding: {
                 primary: KeyCode.F2,
                 weight: KeybindingWeight.SessionsContrib,
@@ -957,18 +1263,25 @@ registerAction2(class RenameSessionAction extends Action2 {
         });
     }
     async run(accessor, context) {
+        const focusedSessions = context ? undefined : getFocusedSessionListTargets(accessor);
         const session = getSessionActionTargets(accessor, context)[0];
         if (!session || !session.capabilities.get().supportsRename) {
             return;
         }
+        if (focusedSessions?.includes(session)) {
+            const view = accessor.get(IViewsService).getViewWithId(SessionsViewId);
+            if (view?.sessionsControl?.beginRenameSession(session)) {
+                return;
+            }
+        }
         const quickInputService = accessor.get(IQuickInputService);
         const sessionsManagementService = accessor.get(ISessionsManagementService);
         const newTitle = await quickInputService.input({
             value: session.title.get(),
-            prompt: ( localize(5006, "New agent session title")),
+            prompt: ( localize(6291, "New agent session title")),
             validateInput: async value => {
                 if (!value.trim()) {
-                    return localize(5007, "Title cannot be empty");
+                    return localize(6292, "Title cannot be empty");
                 }
                 return undefined;
             }
@@ -985,7 +1298,7 @@ registerAction2(class DeleteSessionAction extends Action2 {
     constructor() {
         super({
             id: "sessionsViewPane.deleteSession",
-            title: ( localize2(5008, "Delete...")),
+            title: ( localize2(6293, "Delete...")),
             menu: [{
                 id: SessionItemContextMenuId,
                 group: "1_edit",
@@ -1005,9 +1318,9 @@ registerAction2(class DeleteSessionAction extends Action2 {
         const dialogService = accessor.get(IDialogService);
         const sessionsManagementService = accessor.get(ISessionsManagementService);
         const confirmed = await dialogService.confirm({
-            message: sessions.length === 1 ? ( localize(5009, "Are you sure you want to delete this session?")) : ( localize(5010, "Are you sure you want to delete {0} sessions?", sessions.length)),
-            detail: ( localize(5011, "This action cannot be undone.")),
-            primaryButton: ( localize(5012, "Delete"))
+            message: sessions.length === 1 ? ( localize(6294, "Are you sure you want to delete this session?")) : ( localize(6295, "Are you sure you want to delete {0} sessions?", sessions.length)),
+            detail: ( localize(6296, "This action cannot be undone.")),
+            primaryButton: ( localize(6297, "Delete"))
         });
         if (!confirmed.confirmed) {
             return;
@@ -1015,7 +1328,7 @@ registerAction2(class DeleteSessionAction extends Action2 {
         try {
             await sessionsManagementService.deleteSessions(sessions);
         } catch (err) {
-            dialogService.error(sessions.length === 1 ? ( localize(5013, "Failed to delete the session: {0}", toErrorMessage(err))) : ( localize(5014, "Failed to delete the sessions: {0}", toErrorMessage(err))));
+            dialogService.error(sessions.length === 1 ? ( localize(6298, "Failed to delete the session: {0}", toErrorMessage(err))) : ( localize(6299, "Failed to delete the sessions: {0}", toErrorMessage(err))));
         }
     }
 });
@@ -1023,11 +1336,11 @@ registerAction2(class MarkSessionReadAction extends Action2 {
     constructor() {
         super({
             id: MARK_SESSION_READ_COMMAND_ID,
-            title: ( localize2(5015, "Mark as Read")),
+            title: ( localize2(6300, "Mark as Read")),
             menu: [{
                 id: SessionItemContextMenuId,
-                group: "0_read",
-                order: 0,
+                group: "1_edit",
+                order: 1.5,
                 when: ( ContextKeyExpr.and(( SessionIsReadContext.negate()), ( SessionIsArchivedContext.negate())))
             }, {
                 id: Menus.SessionHeaderContext,
@@ -1043,18 +1356,20 @@ registerAction2(class MarkSessionReadAction extends Action2 {
         }
         const sessions = Array.isArray(context) ? context : [context];
         const sessionsManagementService = accessor.get(ISessionsManagementService);
-        sessionsManagementService.markAllRead(sessions);
+        for (const session of sessions) {
+            sessionsManagementService.markRead(session);
+        }
     }
 });
 registerAction2(class MarkSessionUnreadAction extends Action2 {
     constructor() {
         super({
             id: MARK_SESSION_UNREAD_COMMAND_ID,
-            title: ( localize2(5016, "Mark as Unread")),
+            title: ( localize2(6301, "Mark as Unread")),
             menu: [{
                 id: SessionItemContextMenuId,
-                group: "0_read",
-                order: 0,
+                group: "1_edit",
+                order: 1.5,
                 when: ( ContextKeyExpr.and(SessionIsReadContext, ( SessionIsArchivedContext.negate())))
             }, {
                 id: Menus.SessionHeaderContext,
@@ -1079,11 +1394,11 @@ registerAction2(class OpenSessionToTheSideAction extends Action2 {
     constructor() {
         super({
             id: "sessionsViewPane.openToTheSide",
-            title: ( localize2(5017, "Open to the Side")),
+            title: ( localize2(6302, "Open to the Side")),
             menu: [{
                 id: SessionItemContextMenuId,
-                group: "navigation",
-                order: -1,
+                group: "0_pin",
+                order: 1,
                 when: IsSessionsWindowContext
             }]
         });
@@ -1094,35 +1409,80 @@ registerAction2(class OpenSessionToTheSideAction extends Action2 {
         }
         const sessions = Array.isArray(context) ? context : [context];
         const sessionsService = accessor.get(ISessionsService);
-        const sessionsPartService = accessor.get(ISessionsPartService);
-        for (let i = 0; i < sessions.length - 1; i++) {
-            const session = sessions[i];
-            const visible = sessionsService.visibleSessions.get();
-            const lastVisible = visible[visible.length - 1];
-            if (lastVisible && lastVisible.sessionId !== session.sessionId) {
-                sessionsService.insertAt(session, lastVisible.sessionId, "right");
-            }
-        }
-        const lastRequested = sessions[sessions.length - 1];
-        await sessionsService.openSessionToSide(lastRequested, {
-            source: "sessionsList"
-        });
-        const visibleAfterOpen = sessionsService.visibleSessions.get();
-        const opened = visibleAfterOpen.find(s => s?.sessionId === lastRequested.sessionId);
-        if (opened) {
-            sessionsPartService.focusSession(opened);
+        if (sessions.length === 1) {
+            await sessionsService.openSessionToSide(sessions[0], {
+                source: "sessionsList",
+                forceMainChat: true
+            });
+        } else {
+            const reference = sessionsService.visibleSessions.get().at(-1);
+            await sessionsService.openSessionsAt(sessions, reference?.sessionId, "right", {
+                source: "sessionsList",
+                activate: "last",
+                forceMainChat: true
+            });
         }
     }
 });
+const openInGridWhen = ( ContextKeyExpr.and(IsSessionsWindowContext, ChatContextKeys.enabled, ( IsPhoneLayoutContext.negate())));
+MenuRegistry.appendMenuItem(SessionItemContextMenuId, {
+    submenu: Menus.SessionGridOpen,
+    title: ( localize(6303, "Open in Grid")),
+    group: "0_pin",
+    order: 2,
+    when: openInGridWhen
+});
+for (const item of [{
+    direction: "left",
+    title: ( localize2(6304, "Left of Active Session"))
+}, {
+    direction: "right",
+    title: ( localize2(6305, "Right of Active Session"))
+}, {
+    direction: "up",
+    title: ( localize2(6306, "Above Active Session"))
+}, {
+    direction: "down",
+    title: ( localize2(6307, "Below Active Session"))
+}]) {
+    registerAction2(class extends Action2 {
+        constructor() {
+            super({
+                id: `sessionsViewPane.openInGrid.${item.direction}`,
+                title: item.title,
+                precondition: openInGridWhen,
+                menu: {
+                    id: Menus.SessionGridOpen
+                }
+            });
+        }
+        async run(accessor, context) {
+            if (!context) {
+                return;
+            }
+            const service = accessor.get(ISessionsService);
+            await service.openSessionsAt(
+                Array.isArray(context) ? context : [context],
+                service.activeSession.get()?.sessionId,
+                item.direction,
+                {
+                    source: "sessionsList",
+                    activate: "last"
+                }
+            );
+        }
+    });
+}
 registerAction2(class MarkAllSessionsReadAction extends Action2 {
     constructor() {
         super({
             id: "sessionsViewPane.markAllRead",
-            title: ( localize2(5018, "Mark All as Read")),
+            title: ( localize2(6308, "Mark All as Read")),
             menu: [{
                 id: SessionItemContextMenuId,
                 group: "0_read",
-                order: 1
+                order: 1,
+                when: ( ContextKeyExpr.equals(SessionsViewGroupingContext.key, SessionsGrouping.Date))
             }]
         });
     }
@@ -1172,13 +1532,17 @@ function getSessionsArchiveActionConstructors(wording) {
         MarkSectionSessionsDoneAction,
         MarkAllSessionsInGroupAsDoneAction,
         MarkSessionAsDoneAction,
+        MarkChatAsDoneAction,
         RestoreArchivedSessionAction,
+        RestoreArchivedChatAction,
         RestoreActiveSessionAction
     ] : [
         ArchiveSectionAction,
         ArchiveSessionsInGroupAction,
         ArchiveSessionAction,
+        ArchiveChatAction,
         UnarchiveSessionAction,
+        UnarchiveChatAction,
         UnarchiveActiveSessionAction
     ];
 }
@@ -1215,7 +1579,7 @@ registerAction2(class ManageAutomationsAction extends Action2 {
     constructor() {
         super({
             id: "sessionsView.manageAutomations",
-            title: ( localize2(5019, "Manage Automations")),
+            title: ( localize2(6309, "Manage Automations")),
             menu: []
         });
     }
@@ -1223,31 +1587,12 @@ registerAction2(class ManageAutomationsAction extends Action2 {
         accessor.get(ICustomViewService).showCustomView(AUTOMATIONS_CUSTOM_VIEW_ID);
     }
 });
-registerAction2(class ResetAutomationsNewBadgeAction extends Action2 {
-    constructor() {
-        super({
-            id: "sessions.developer.resetAutomationsNewBadge",
-            title: ( localize2(5020, "Reset Automations New Badge")),
-            category: Categories.Developer,
-            f1: true,
-            precondition: ( ContextKeyExpr.and(
-                IsDevelopmentContext,
-                IsSessionsWindowContext,
-                ChatAutomationsEnabledContext
-            ))
-        });
-    }
-    async run(accessor) {
-        const view = await accessor.get(IViewsService).openView(SessionsViewId, false);
-        await view?.sessionsControl?.resetAutomationsNewBadge();
-    }
-});
 const MARK_ALL_AUTOMATION_RUNS_READ_COMMAND_ID = "sessionsView.markAllAutomationRunsRead";
 registerAction2(class MarkAllAutomationRunsReadAction extends Action2 {
     constructor() {
         super({
             id: MARK_ALL_AUTOMATION_RUNS_READ_COMMAND_ID,
-            title: ( localize2(5021, "Mark All as Read"))
+            title: ( localize2(6310, "Mark All as Read"))
         });
     }
     async run(accessor) {
@@ -1267,4 +1612,4 @@ registerAction2(class MarkAllAutomationRunsReadAction extends Action2 {
     }
 });
 
-export { ArchiveSessionAction };
+export { ArchiveChatAction, ArchiveSessionAction, SessionsArchiveActionsContribution, getSessionsArchiveActionConstructors };