@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsActions.js

@@ -1,4 +1,5 @@
 
+import { isAncestorOfActiveElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { AgentSessionSection, isAgentSessionSection, isMarshalledAgentSessionContext, isAgentHostAgentSessionItem, isLocalAgentSessionItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel';
 import { Action2, MenuId, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -8,7 +9,7 @@ import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { ChatContextKeys, ChatContextKeyExprs } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
-import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import { getChatSessionType, LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ACTIVE_GROUP, SIDE_GROUP, AUX_WINDOW_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
@@ -18,16 +19,14 @@ import { Position } from '@codingame/monaco-vscode-api/vscode/vs/workbench/servi
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
-import { ChatEditorInput, showClearEditingSessionConfirmation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
+import { showClearEditingSessionConfirmation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ACTION_ID_NEW_CHAT } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
-import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { AgentSessionsPicker } from './agentSessionsPicker.js';
-import { ActiveEditorContext, IsSessionsWindowContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
+import { IsSessionsWindowContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
@@ -36,13 +35,14 @@ import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/comm
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { IPaneCompositePartService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
+import { getChatSessionArchiveActionPresentation, ChatSessionArchiveActionWording } from '@codingame/monaco-vscode-katex-common/vscode/vs/platform/chat/common/sessionArchiveActions';
 
-const AGENT_SESSIONS_CATEGORY = ( localize2(5538, "Chat Agent Sessions"));
+const AGENT_SESSIONS_CATEGORY = ( localize2(6038, "Chat Agent Sessions"));
 class ToggleShowAgentSessionsAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.toggleShowAgentSessions",
-            title: ( localize2(5539, "Show Sessions")),
+            title: ( localize2(6039, "Show Sessions")),
             toggled: ( ContextKeyExpr.equals(`config.${ChatConfiguration.ChatViewSessionsEnabled}`, true)),
             menu: {
                 id: MenuId.ChatWelcomeContext,
@@ -61,7 +61,7 @@ class ToggleShowAgentSessionsAction extends Action2 {
 const agentSessionsOrientationSubmenu = ( new MenuId("chatAgentSessionsOrientationSubmenu"));
 MenuRegistry.appendMenuItem(MenuId.ChatWelcomeContext, {
     submenu: agentSessionsOrientationSubmenu,
-    title: ( localize2(5540, "Sessions Orientation")),
+    title: ( localize2(6040, "Sessions Orientation")),
     group: "0_sessions",
     order: 1,
     when: ( ChatContextKeys.inChatEditor.negate())
@@ -70,7 +70,7 @@ class SetAgentSessionsOrientationStackedAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.setAgentSessionsOrientationStacked",
-            title: ( localize2(5541, "Stacked")),
+            title: ( localize2(6041, "Stacked")),
             toggled: ( ContextKeyExpr.equals(`config.${ChatConfiguration.ChatViewSessionsOrientation}`, "stacked")),
             precondition: ( ContextKeyExpr.equals(`config.${ChatConfiguration.ChatViewSessionsEnabled}`, true)),
             menu: {
@@ -89,7 +89,7 @@ class SetAgentSessionsOrientationSideBySideAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.setAgentSessionsOrientationSideBySide",
-            title: ( localize2(5542, "Side by Side")),
+            title: ( localize2(6042, "Side by Side")),
             toggled: ( ContextKeyExpr.notEquals(`config.${ChatConfiguration.ChatViewSessionsOrientation}`, "stacked")),
             precondition: ( ContextKeyExpr.equals(`config.${ChatConfiguration.ChatViewSessionsEnabled}`, true)),
             menu: {
@@ -104,41 +104,18 @@ class SetAgentSessionsOrientationSideBySideAction extends Action2 {
         await commandService.executeCommand(ShowAgentSessionsSidebar.ID);
     }
 }
-class PickAgentSessionAction extends Action2 {
-    constructor() {
-        super({
-            id: `workbench.action.chat.history`,
-            title: ( localize2(5543, "Open Agent Session...")),
-            menu: [{
-                id: MenuId.ViewTitle,
-                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("view", ChatViewId)), ( ContextKeyExpr.equals(`config.${ChatConfiguration.ChatViewSessionsEnabled}`, false)))),
-                group: "navigation",
-                order: 2
-            }, {
-                id: MenuId.EditorTitle,
-                when: ( ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID))
-            }],
-            category: AGENT_SESSIONS_CATEGORY,
-            icon: Codicon.history,
-            f1: true,
-            precondition: ChatContextKeys.enabled
-        });
-    }
-    async run(accessor) {
-        const instantiationService = accessor.get(IInstantiationService);
-        const agentSessionsPicker = instantiationService.createInstance(AgentSessionsPicker, undefined, undefined);
-        await agentSessionsPicker.pickAgentSession();
-    }
-}
-class ArchiveAllAgentSessionsAction extends Action2 {
-    constructor() {
+class BaseArchiveAllAgentSessionsAction extends Action2 {
+    constructor(wording) {
+        const action = getChatSessionArchiveActionPresentation(wording).archiveAll;
         super({
             id: "workbench.action.chat.archiveAllAgentSessions",
-            title: ( localize2(5544, "Archive All Workspace Agent Sessions")),
+            title: action.title,
+            icon: action.icon,
             precondition: ChatContextKeys.enabled,
             category: AGENT_SESSIONS_CATEGORY,
             f1: true
         });
+        this.wording = wording;
     }
     async run(accessor) {
         const agentSessionsService = accessor.get(IAgentSessionsService);
@@ -148,13 +125,17 @@ class ArchiveAllAgentSessionsAction extends Action2 {
             return;
         }
         const confirmed = await dialogService.confirm({
-            message: sessionsToArchive.length === 1 ? ( localize(5545, "Are you sure you want to archive 1 agent session?")) : ( localize(
-                5546,
+            message: this.wording === ChatSessionArchiveActionWording.MarkAsDone ? sessionsToArchive.length === 1 ? ( localize(6043, "Are you sure you want to mark 1 agent session as done?")) : ( localize(
+                6044,
+                "Are you sure you want to mark {0} agent sessions as done?",
+                sessionsToArchive.length
+            )) : sessionsToArchive.length === 1 ? ( localize(6045, "Are you sure you want to archive 1 agent session?")) : ( localize(
+                6046,
                 "Are you sure you want to archive {0} agent sessions?",
                 sessionsToArchive.length
             )),
-            detail: ( localize(5547, "You can unarchive sessions later if needed from the sessions view.")),
-            primaryButton: ( localize(5548, "Archive"))
+            detail: this.wording === ChatSessionArchiveActionWording.MarkAsDone ? ( localize(6047, "You can restore sessions later if needed from the sessions view.")) : ( localize(6048, "You can unarchive sessions later if needed from the sessions view.")),
+            primaryButton: getChatSessionArchiveActionPresentation(this.wording).archiveAll.title.value
         });
         if (!confirmed.confirmed) {
             return;
@@ -164,11 +145,21 @@ class ArchiveAllAgentSessionsAction extends Action2 {
         }
     }
 }
+class ArchiveAllAgentSessionsAction extends BaseArchiveAllAgentSessionsAction {
+    constructor() {
+        super(ChatSessionArchiveActionWording.Archive);
+    }
+}
+class MarkAllAgentSessionsDoneAction extends BaseArchiveAllAgentSessionsAction {
+    constructor() {
+        super(ChatSessionArchiveActionWording.MarkAsDone);
+    }
+}
 class MarkAllAgentSessionsReadAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.markAllAgentSessionsRead",
-            title: ( localize2(5549, "Mark All as Read")),
+            title: ( localize2(6049, "Mark All as Read")),
             precondition: ChatContextKeys.enabled,
             category: AGENT_SESSIONS_CATEGORY,
             f1: true,
@@ -192,12 +183,13 @@ class MarkAllAgentSessionsReadAction extends Action2 {
     }
 }
 const ConfirmArchiveStorageKey = "chat.sessions.confirmArchive";
-class ArchiveAgentSessionSectionAction extends Action2 {
-    constructor() {
+class BaseArchiveAgentSessionSectionAction extends Action2 {
+    constructor(wording) {
+        const action = getChatSessionArchiveActionPresentation(wording).archiveAll;
         super({
             id: "agentSessionSection.archive",
-            title: ( localize2(5550, "Archive All")),
-            icon: Codicon.checkAll,
+            title: action.title,
+            icon: action.icon,
             menu: [{
                 id: MenuId.AgentSessionSectionToolbar,
                 group: "navigation",
@@ -210,6 +202,7 @@ class ArchiveAgentSessionSectionAction extends Action2 {
                 when: ( ChatContextKeys.agentSessionSection.notEqualsTo(AgentSessionSection.Archived))
             }]
         });
+        this.wording = wording;
     }
     async run(accessor, context) {
         if (!context || !isAgentSessionSection(context)) {
@@ -220,20 +213,29 @@ class ArchiveAgentSessionSectionAction extends Action2 {
         const skipConfirmation = storageService.getBoolean(ConfirmArchiveStorageKey, StorageScope.PROFILE, false);
         if (!skipConfirmation) {
             const confirmed = await dialogService.confirm({
-                message: context.sessions.length === 1 ? ( localize(
-                    5551,
+                message: this.wording === ChatSessionArchiveActionWording.MarkAsDone ? context.sessions.length === 1 ? ( localize(
+                    6050,
+                    "Are you sure you want to mark 1 agent session from '{0}' as done?",
+                    context.label
+                )) : ( localize(
+                    6051,
+                    "Are you sure you want to mark {0} agent sessions from '{1}' as done?",
+                    context.sessions.length,
+                    context.label
+                )) : context.sessions.length === 1 ? ( localize(
+                    6052,
                     "Are you sure you want to archive 1 agent session from '{0}'?",
                     context.label
                 )) : ( localize(
-                    5552,
+                    6053,
                     "Are you sure you want to archive {0} agent sessions from '{1}'?",
                     context.sessions.length,
                     context.label
                 )),
-                detail: ( localize(5553, "You can unarchive sessions later if needed from the sessions view.")),
-                primaryButton: ( localize(5554, "Archive All")),
+                detail: this.wording === ChatSessionArchiveActionWording.MarkAsDone ? ( localize(6054, "You can restore sessions later if needed from the sessions view.")) : ( localize(6055, "You can unarchive sessions later if needed from the sessions view.")),
+                primaryButton: getChatSessionArchiveActionPresentation(this.wording).archiveAll.title.value,
                 checkbox: {
-                    label: ( localize(5555, "Do not ask me again"))
+                    label: ( localize(6056, "Do not ask me again"))
                 }
             });
             if (!confirmed.confirmed) {
@@ -248,12 +250,23 @@ class ArchiveAgentSessionSectionAction extends Action2 {
         }
     }
 }
-class UnarchiveAgentSessionSectionAction extends Action2 {
+class ArchiveAgentSessionSectionAction extends BaseArchiveAgentSessionSectionAction {
     constructor() {
+        super(ChatSessionArchiveActionWording.Archive);
+    }
+}
+class MarkAgentSessionSectionDoneAction extends BaseArchiveAgentSessionSectionAction {
+    constructor() {
+        super(ChatSessionArchiveActionWording.MarkAsDone);
+    }
+}
+class BaseUnarchiveAgentSessionSectionAction extends Action2 {
+    constructor(wording) {
+        const action = getChatSessionArchiveActionPresentation(wording).unarchiveAll;
         super({
             id: "agentSessionSection.unarchive",
-            title: ( localize2(5556, "Unarchive All")),
-            icon: Codicon.unarchive,
+            title: action.title,
+            icon: action.icon,
             menu: [{
                 id: MenuId.AgentSessionSectionToolbar,
                 group: "navigation",
@@ -266,6 +279,7 @@ class UnarchiveAgentSessionSectionAction extends Action2 {
                 when: ( ChatContextKeys.agentSessionSection.isEqualTo(AgentSessionSection.Archived))
             }]
         });
+        this.wording = wording;
     }
     async run(accessor, context) {
         if (!context || !isAgentSessionSection(context)) {
@@ -277,14 +291,18 @@ class UnarchiveAgentSessionSectionAction extends Action2 {
             const skipConfirmation = storageService.getBoolean(ConfirmArchiveStorageKey, StorageScope.PROFILE, false);
             if (!skipConfirmation) {
                 const confirmed = await dialogService.confirm({
-                    message: ( localize(
-                        5557,
+                    message: this.wording === ChatSessionArchiveActionWording.MarkAsDone ? ( localize(
+                        6057,
+                        "Are you sure you want to restore {0} agent sessions?",
+                        context.sessions.length
+                    )) : ( localize(
+                        6058,
                         "Are you sure you want to unarchive {0} agent sessions?",
                         context.sessions.length
                     )),
-                    primaryButton: ( localize(5558, "Unarchive All")),
+                    primaryButton: getChatSessionArchiveActionPresentation(this.wording).unarchiveAll.title.value,
                     checkbox: {
-                        label: ( localize(5555, "Do not ask me again"))
+                        label: ( localize(6056, "Do not ask me again"))
                     }
                 });
                 if (!confirmed.confirmed) {
@@ -300,11 +318,21 @@ class UnarchiveAgentSessionSectionAction extends Action2 {
         }
     }
 }
+class UnarchiveAgentSessionSectionAction extends BaseUnarchiveAgentSessionSectionAction {
+    constructor() {
+        super(ChatSessionArchiveActionWording.Archive);
+    }
+}
+class RestoreAgentSessionSectionAction extends BaseUnarchiveAgentSessionSectionAction {
+    constructor() {
+        super(ChatSessionArchiveActionWording.MarkAsDone);
+    }
+}
 class MarkAgentSessionSectionReadAction extends Action2 {
     constructor() {
         super({
             id: "agentSessionSection.markRead",
-            title: ( localize2(5559, "Mark All as Read")),
+            title: ( localize2(6059, "Mark All as Read")),
             menu: [{
                 id: MenuId.AgentSessionSectionContext,
                 group: "1_edit",
@@ -326,7 +354,7 @@ class CollapseAllAgentSessionSectionsAction extends Action2 {
     constructor() {
         super({
             id: "agentSessionSection.collapseAll",
-            title: ( localize2(5560, "Collapse All")),
+            title: ( localize2(6060, "Collapse All")),
             menu: [{
                 id: MenuId.AgentSessionSectionContext,
                 group: "2_collapse",
@@ -364,7 +392,7 @@ class MarkAgentSessionUnreadAction extends BaseAgentSessionAction {
     constructor() {
         super({
             id: "agentSession.markUnread",
-            title: ( localize2(5561, "Mark as Unread")),
+            title: ( localize2(6061, "Mark as Unread")),
             menu: {
                 id: MenuId.AgentSessionsContext,
                 group: "0_read",
@@ -384,7 +412,7 @@ class MarkAgentSessionReadAction extends BaseAgentSessionAction {
     constructor() {
         super({
             id: "agentSession.markRead",
-            title: ( localize2(5562, "Mark as Read")),
+            title: ( localize2(6062, "Mark as Read")),
             menu: {
                 id: MenuId.AgentSessionsContext,
                 group: "0_read",
@@ -400,12 +428,13 @@ class MarkAgentSessionReadAction extends BaseAgentSessionAction {
         }
     }
 }
-class ArchiveAgentSessionAction extends BaseAgentSessionAction {
-    constructor() {
+class BaseArchiveAgentSessionAction extends BaseAgentSessionAction {
+    constructor(wording) {
+        const action = getChatSessionArchiveActionPresentation(wording).archive;
         super({
             id: "agentSession.archive",
-            title: ( localize2(5563, "Archive")),
-            icon: Codicon.check,
+            title: action.title,
+            icon: action.icon,
             keybinding: {
                 primary: KeyCode.Delete,
                 mac: {
@@ -426,6 +455,7 @@ class ArchiveAgentSessionAction extends BaseAgentSessionAction {
                 when: ( ChatContextKeys.isArchivedAgentSession.negate())
             }]
         });
+        this.wording = wording;
     }
     async runWithSessions(sessions, accessor) {
         const chatService = accessor.get(IChatService);
@@ -434,8 +464,8 @@ class ArchiveAgentSessionAction extends BaseAgentSessionAction {
             const chatModel = chatService.getSession(session.resource);
             if (chatModel && !(await showClearEditingSessionConfirmation(chatModel, dialogService, {
                 isArchiveAction: true,
-                titleOverride: ( localize(5564, "Archive chat with pending edits?")),
-                messageOverride: ( localize(5565, "You have pending changes in this chat session."))
+                titleOverride: this.wording === ChatSessionArchiveActionWording.MarkAsDone ? ( localize(6063, "Mark chat as done with pending edits?")) : ( localize(6064, "Archive chat with pending edits?")),
+                messageOverride: ( localize(6065, "You have pending changes in this chat session."))
             }))) {
                 return;
             }
@@ -443,12 +473,23 @@ class ArchiveAgentSessionAction extends BaseAgentSessionAction {
         }
     }
 }
-class UnarchiveAgentSessionAction extends BaseAgentSessionAction {
+class ArchiveAgentSessionAction extends BaseArchiveAgentSessionAction {
     constructor() {
+        super(ChatSessionArchiveActionWording.Archive);
+    }
+}
+class MarkAgentSessionDoneAction extends BaseArchiveAgentSessionAction {
+    constructor() {
+        super(ChatSessionArchiveActionWording.MarkAsDone);
+    }
+}
+class BaseUnarchiveAgentSessionAction extends BaseAgentSessionAction {
+    constructor(wording) {
+        const action = getChatSessionArchiveActionPresentation(wording).unarchive;
         super({
             id: "agentSession.unarchive",
-            title: ( localize2(5566, "Unarchive")),
-            icon: Codicon.unarchive,
+            title: action.title,
+            icon: action.icon,
             keybinding: {
                 primary: KeyMod.Shift | KeyCode.Delete,
                 mac: {
@@ -479,11 +520,36 @@ class UnarchiveAgentSessionAction extends BaseAgentSessionAction {
         }
     }
 }
+class UnarchiveAgentSessionAction extends BaseUnarchiveAgentSessionAction {
+    constructor() {
+        super(ChatSessionArchiveActionWording.Archive);
+    }
+}
+class RestoreAgentSessionAction extends BaseUnarchiveAgentSessionAction {
+    constructor() {
+        super(ChatSessionArchiveActionWording.MarkAsDone);
+    }
+}
+function getAgentSessionArchiveActionConstructors(wording) {
+    return wording === ChatSessionArchiveActionWording.MarkAsDone ? [
+        MarkAllAgentSessionsDoneAction,
+        MarkAgentSessionSectionDoneAction,
+        RestoreAgentSessionSectionAction,
+        MarkAgentSessionDoneAction,
+        RestoreAgentSessionAction
+    ] : [
+        ArchiveAllAgentSessionsAction,
+        ArchiveAgentSessionSectionAction,
+        UnarchiveAgentSessionSectionAction,
+        ArchiveAgentSessionAction,
+        UnarchiveAgentSessionAction
+    ];
+}
 class PinAgentSessionAction extends BaseAgentSessionAction {
     constructor() {
         super({
             id: "agentSession.pin",
-            title: ( localize2(5567, "Pin")),
+            title: ( localize2(6066, "Pin")),
             icon: Codicon.pin,
             menu: [{
                 id: MenuId.AgentSessionItemToolbar,
@@ -508,7 +574,7 @@ class UnpinAgentSessionAction extends BaseAgentSessionAction {
     constructor() {
         super({
             id: "agentSession.unpin",
-            title: ( localize2(5568, "Unpin")),
+            title: ( localize2(6067, "Unpin")),
             icon: Codicon.pinned,
             menu: [{
                 id: MenuId.AgentSessionItemToolbar,
@@ -530,45 +596,85 @@ class UnpinAgentSessionAction extends BaseAgentSessionAction {
     }
 }
 const renameSupportedSessionTypes = ( ContextKeyExpr.or(( ChatContextKeys.agentSessionType.isEqualTo(AgentSessionProviders.Local)), ChatContextKeyExprs.isAgentHostSessionItem));
+const renameFocusedChatSessionKeybindingWhen = ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( ChatContextKeys.inQuickChat.negate()), ( IsSessionsWindowContext.negate()), ChatContextKeys.chatSessionSupportsRename));
 class RenameAgentSessionAction extends BaseAgentSessionAction {
     constructor() {
         super({
             id: AGENT_SESSION_RENAME_ACTION_ID,
-            title: ( localize2(5569, "Rename...")),
-            precondition: ( ChatContextKeys.hasMultipleAgentSessionsSelected.negate()),
-            keybinding: {
+            title: ( localize2(6068, "Rename...")),
+            keybinding: [{
                 primary: KeyCode.F2,
                 mac: {
                     primary: KeyCode.Enter
                 },
                 weight: KeybindingWeight.WorkbenchContrib + 1,
-                when: ( ContextKeyExpr.and(ChatContextKeys.agentSessionsViewerFocused, renameSupportedSessionTypes))
-            },
+                when: ( ContextKeyExpr.and(
+                    ChatContextKeys.agentSessionsViewerFocused,
+                    renameSupportedSessionTypes,
+                    ( ChatContextKeys.hasMultipleAgentSessionsSelected.negate())
+                ))
+            }, {
+                primary: KeyCode.F2,
+                weight: KeybindingWeight.WorkbenchContrib + 1,
+                when: renameFocusedChatSessionKeybindingWhen
+            }],
             menu: {
                 id: MenuId.AgentSessionsContext,
                 group: "1_edit",
                 order: 3,
-                when: renameSupportedSessionTypes
+                when: ( ContextKeyExpr.and(renameSupportedSessionTypes, ( ChatContextKeys.hasMultipleAgentSessionsSelected.negate())))
             }
         });
     }
+    async run(accessor, context) {
+        const widget = accessor.get(IChatWidgetService).lastFocusedWidget;
+        const viewModel = widget?.viewModel;
+        if (!context && widget && viewModel && isAncestorOfActiveElement(widget.domNode)) {
+            const sessionType = getChatSessionType(viewModel.sessionResource);
+            const isLocalSession = sessionType === AgentSessionProviders.Local;
+            if (!isLocalSession && !accessor.get(IChatSessionsService).sessionSupportsRename(viewModel.sessionResource)) {
+                return;
+            }
+            await this.renameSession(
+                viewModel.sessionResource,
+                viewModel.model.title,
+                !isLocalSession,
+                accessor
+            );
+            return;
+        }
+        await super.run(accessor, context);
+    }
     async runWithSessions(sessions, accessor) {
         const session = sessions.at(0);
         if (!session) {
             return;
         }
+        await this.renameSession(
+            session.resource,
+            session.label,
+            isAgentHostAgentSessionItem(session),
+            accessor
+        );
+    }
+    async renameSession(sessionResource, currentTitle, isContributedSession, accessor) {
         const quickInputService = accessor.get(IQuickInputService);
-        const chatService = accessor.get(IChatService);
-        const chatSessionsService = accessor.get(IChatSessionsService);
+        const renameTarget = isContributedSession ? {
+            type: "contributed",
+            service: accessor.get(IChatSessionsService)
+        } : {
+            type: "local",
+            service: accessor.get(IChatService)
+        };
         const title = await quickInputService.input({
-            prompt: ( localize(5570, "New agent session title")),
-            value: session.label
+            prompt: ( localize(6069, "New agent session title")),
+            value: currentTitle
         });
         if (title) {
-            if (isAgentHostAgentSessionItem(session)) {
-                await chatSessionsService.renameChatSession(session.resource, title, CancellationToken.None);
+            if (renameTarget.type === "contributed") {
+                await renameTarget.service.renameChatSession(sessionResource, title, CancellationToken.None);
             } else {
-                chatService.setChatSessionTitle(session.resource, title);
+                renameTarget.service.setChatSessionTitle(sessionResource, title);
             }
         }
     }
@@ -577,7 +683,7 @@ class DeleteAgentSessionAction extends BaseAgentSessionAction {
     constructor() {
         super({
             id: AGENT_SESSION_DELETE_ACTION_ID,
-            title: ( localize2(5571, "Delete...")),
+            title: ( localize2(6070, "Delete...")),
             menu: {
                 id: MenuId.AgentSessionsContext,
                 group: "1_edit",
@@ -596,13 +702,13 @@ class DeleteAgentSessionAction extends BaseAgentSessionAction {
         const widgetService = accessor.get(IChatWidgetService);
         const commandService = accessor.get(ICommandService);
         const confirmed = await dialogService.confirm({
-            message: sessions.length === 1 ? ( localize(5572, "Are you sure you want to delete this chat session?")) : ( localize(
-                5573,
+            message: sessions.length === 1 ? ( localize(6071, "Are you sure you want to delete this chat session?")) : ( localize(
+                6072,
                 "Are you sure you want to delete {0} chat sessions?",
                 sessions.length
             )),
-            detail: ( localize(5574, "This action cannot be undone.")),
-            primaryButton: ( localize(5575, "Delete"))
+            detail: ( localize(6073, "This action cannot be undone.")),
+            primaryButton: ( localize(6074, "Delete"))
         });
         if (!confirmed.confirmed) {
             return;
@@ -621,7 +727,7 @@ class DeleteAgentSessionAction extends BaseAgentSessionAction {
                     await chatSessionsService.deleteChatSessionItem(session.resource, CancellationToken.None);
                     await widgetService.getWidgetBySessionResource(session.resource)?.clear();
                 } catch (err) {
-                    dialogService.error(( localize(5576, "Failed to delete chat session: {0}", toErrorMessage(err))));
+                    dialogService.error(( localize(6075, "Failed to delete chat session: {0}", toErrorMessage(err))));
                 }
             }
         }
@@ -634,7 +740,7 @@ class DeleteAllLocalSessionsAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.clearHistory",
-            title: ( localize2(5577, "Delete All Local Workspace Chat Sessions")),
+            title: ( localize2(6076, "Delete All Local Workspace Chat Sessions")),
             precondition: ChatContextKeys.enabled,
             category: AGENT_SESSIONS_CATEGORY,
             f1: true
@@ -650,13 +756,13 @@ class DeleteAllLocalSessionsAction extends Action2 {
             return;
         }
         const confirmed = await dialogService.confirm({
-            message: localSessionsCount === 1 ? ( localize(5578, "Are you sure you want to delete 1 local workspace chat session?")) : ( localize(
-                5579,
+            message: localSessionsCount === 1 ? ( localize(6077, "Are you sure you want to delete 1 local workspace chat session?")) : ( localize(
+                6078,
                 "Are you sure you want to delete {0} local workspace chat sessions?",
                 localSessionsCount
             )),
-            detail: ( localize(5580, "This action cannot be undone.")),
-            primaryButton: ( localize(5581, "Delete All"))
+            detail: ( localize(6079, "This action cannot be undone.")),
+            primaryButton: ( localize(6080, "Delete All"))
         });
         if (!confirmed.confirmed) {
             return;
@@ -685,7 +791,7 @@ class OpenAgentSessionInEditorGroupAction extends BaseOpenAgentSessionAction {
     constructor() {
         super({
             id: OpenAgentSessionInEditorGroupAction.id,
-            title: ( localize2(5582, "Open as Editor")),
+            title: ( localize2(6081, "Open as Editor")),
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyCode.Enter,
                 mac: {
@@ -716,7 +822,7 @@ class OpenAgentSessionInNewEditorGroupAction extends BaseOpenAgentSessionAction
     constructor() {
         super({
             id: OpenAgentSessionInNewEditorGroupAction.id,
-            title: ( localize2(5583, "Open to the Side")),
+            title: ( localize2(6082, "Open to the Side")),
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Enter,
                 mac: {
@@ -747,7 +853,7 @@ class OpenAgentSessionInNewWindowAction extends BaseOpenAgentSessionAction {
     constructor() {
         super({
             id: OpenAgentSessionInNewWindowAction.id,
-            title: ( localize2(5584, "Open in New Window")),
+            title: ( localize2(6083, "Open in New Window")),
             menu: {
                 id: MenuId.AgentSessionsContext,
                 order: 3,
@@ -774,7 +880,7 @@ class RefreshAgentSessionsViewerAction extends Action2 {
     constructor() {
         super({
             id: "agentSessionsViewer.refresh",
-            title: ( localize2(5585, "Refresh Agent Sessions")),
+            title: ( localize2(6084, "Refresh Agent Sessions")),
             icon: Codicon.refresh,
             menu: {
                 id: MenuId.AgentSessionsToolbar,
@@ -796,7 +902,7 @@ class FindAgentSessionInViewerAction extends Action2 {
     constructor() {
         super({
             id: "agentSessionsViewer.find",
-            title: ( localize2(5586, "Find Agent Session")),
+            title: ( localize2(6085, "Find Agent Session")),
             icon: Codicon.search,
             menu: {
                 id: MenuId.AgentSessionsToolbar,
@@ -893,7 +999,7 @@ class ShowAgentSessionsSidebar extends UpdateChatViewWidthAction {
         this.ID = "agentSessions.showAgentSessionsSidebar";
     }
     static {
-        this.TITLE = ( localize2(5587, "Show Agent Sessions Sidebar"));
+        this.TITLE = ( localize2(6086, "Show Agent Sessions Sidebar"));
     }
     constructor() {
         super({
@@ -913,7 +1019,7 @@ class HideAgentSessionsSidebar extends UpdateChatViewWidthAction {
         this.ID = "agentSessions.hideAgentSessionsSidebar";
     }
     static {
-        this.TITLE = ( localize2(5588, "Hide Agent Sessions Sidebar"));
+        this.TITLE = ( localize2(6087, "Hide Agent Sessions Sidebar"));
     }
     constructor() {
         super({
@@ -933,7 +1039,7 @@ class ToggleAgentSessionsSidebar extends Action2 {
         this.ID = "agentSessions.toggleAgentSessionsSidebar";
     }
     static {
-        this.TITLE = ( localize2(5589, "Toggle Agent Sessions Sidebar"));
+        this.TITLE = ( localize2(6088, "Toggle Agent Sessions Sidebar"));
     }
     constructor() {
         super({
@@ -963,7 +1069,7 @@ class FocusAgentSessionsAction extends Action2 {
     constructor() {
         super({
             id: FocusAgentSessionsAction.id,
-            title: ( localize2(5590, "Focus Agent Sessions")),
+            title: ( localize2(6089, "Focus Agent Sessions")),
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.equals(`config.${ChatConfiguration.ChatViewSessionsEnabled}`, true)))),
             category: AGENT_SESSIONS_CATEGORY,
             f1: true
@@ -988,4 +1094,4 @@ class FocusAgentSessionsAction extends Action2 {
     }
 }
 
-export { ArchiveAgentSessionAction, ArchiveAgentSessionSectionAction, ArchiveAllAgentSessionsAction, CollapseAllAgentSessionSectionsAction, DeleteAgentSessionAction, DeleteAllLocalSessionsAction, FindAgentSessionInViewerAction, FocusAgentSessionsAction, HideAgentSessionsSidebar, MarkAgentSessionReadAction, MarkAgentSessionSectionReadAction, MarkAgentSessionUnreadAction, MarkAllAgentSessionsReadAction, OpenAgentSessionInEditorGroupAction, OpenAgentSessionInNewEditorGroupAction, OpenAgentSessionInNewWindowAction, PickAgentSessionAction, PinAgentSessionAction, RefreshAgentSessionsViewerAction, RenameAgentSessionAction, SetAgentSessionsOrientationSideBySideAction, SetAgentSessionsOrientationStackedAction, ShowAgentSessionsSidebar, ToggleAgentSessionsSidebar, ToggleShowAgentSessionsAction, UnarchiveAgentSessionAction, UnarchiveAgentSessionSectionAction, UnpinAgentSessionAction };
+export { ArchiveAgentSessionAction, ArchiveAgentSessionSectionAction, ArchiveAllAgentSessionsAction, CollapseAllAgentSessionSectionsAction, DeleteAgentSessionAction, DeleteAllLocalSessionsAction, FindAgentSessionInViewerAction, FocusAgentSessionsAction, HideAgentSessionsSidebar, MarkAgentSessionDoneAction, MarkAgentSessionReadAction, MarkAgentSessionSectionDoneAction, MarkAgentSessionSectionReadAction, MarkAgentSessionUnreadAction, MarkAllAgentSessionsDoneAction, MarkAllAgentSessionsReadAction, OpenAgentSessionInEditorGroupAction, OpenAgentSessionInNewEditorGroupAction, OpenAgentSessionInNewWindowAction, PinAgentSessionAction, RefreshAgentSessionsViewerAction, RenameAgentSessionAction, RestoreAgentSessionAction, RestoreAgentSessionSectionAction, SetAgentSessionsOrientationSideBySideAction, SetAgentSessionsOrientationStackedAction, ShowAgentSessionsSidebar, ToggleAgentSessionsSidebar, ToggleShowAgentSessionsAction, UnarchiveAgentSessionAction, UnarchiveAgentSessionSectionAction, UnpinAgentSessionAction, getAgentSessionArchiveActionConstructors };