Fixes

Author: osortega

src/vs/workbench/contrib/chat/browser/actions/chatActions.ts

@@ -580,7 +580,7 @@ export function registerChatActions() {
 
 								const ckey = contextKeyService.createKey('chatSessionType', session.providerType);
 								const actions = menuService.getMenuActions(MenuId.ChatSessionsMenu, contextKeyService);
-								const menuActions = getContextMenuActions(actions, 'navigation');
+								const menuActions = getContextMenuActions(actions, 'inline');
 								ckey.reset();
 
 								// Use primary actions if available, otherwise fall back to secondary actions

src/vs/workbench/contrib/chat/browser/chatSessions.ts

@@ -20,9 +20,9 @@ import { IContextKeyService, ContextKeyExpr } from '../../../../platform/context
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
-import { IMenuService } from '../../../../platform/actions/common/actions.js';
+import { IMenuService, MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
 import { getActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
-import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
 import { ViewPane, IViewPaneOptions } from '../../../browser/parts/views/viewPane.js';
 import { Extensions, IViewContainersRegistry, IViewDescriptorService, ViewContainerLocation, IViewsRegistry, IViewDescriptor } from '../../../common/views.js';
@@ -37,7 +37,6 @@ import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { FuzzyScore } from '../../../../base/common/filters.js';
 import { ResourceLabels, IResourceLabel } from '../../../browser/labels.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
 import { append, $, getActiveWindow, clearNode } from '../../../../base/browser/dom.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IEditorGroupsService, IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
@@ -49,7 +48,6 @@ import { EditorInput } from '../../../common/editor/editorInput.js';
 import { ChatEditorInput } from './chatEditorInput.js';
 import { IChatWidgetService, IChatWidget } from './chat.js';
 import { ChatAgentLocation, ChatConfiguration } from '../common/constants.js';
-import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
@@ -62,15 +60,11 @@ export const VIEWLET_ID = 'workbench.view.chat.sessions';
 
 // Helper function to create context overlay for session items
 function getSessionItemContextOverlay(session: IChatSessionItem, provider?: IChatSessionItemProvider): [string, any][] {
-	const overlay: [string, any][] = [
-		[ChatContextKeys.sessionId.key, session.id],
-		[ChatContextKeys.sessionLabel.key, session.label],
-	];
-	
+	const overlay: [string, any][] = [];
 	if (provider) {
 		overlay.push([ChatContextKeys.sessionType.key, provider.chatSessionType]);
 	}
-	
+
 	return overlay;
 }
 
@@ -636,7 +630,8 @@ class SessionsRenderer extends Disposable implements ITreeRenderer<IChatSessionI
 	renderTemplate(container: HTMLElement): ISessionTemplateData {
 		const element = append(container, $('.chat-session-item'));
 		const resourceLabel = this.labels.create(element, { supportHighlights: true });
-		const actionBar = new ActionBar(container);
+		const actionsContainer = append(resourceLabel.element, $('.actions'));
+		const actionBar = new ActionBar(actionsContainer);
 		const elementDisposable = new DisposableStore();
 
 		return {
@@ -650,7 +645,7 @@ class SessionsRenderer extends Disposable implements ITreeRenderer<IChatSessionI
 	renderElement(element: ITreeNode<IChatSessionItem, FuzzyScore>, index: number, templateData: ISessionTemplateData): void {
 		const session = element.element;
 		const sessionWithProvider = session as IChatSessionItem & { provider: IChatSessionItemProvider };
-		
+
 		// Clear previous element disposables
 		templateData.elementDisposable.clear();
 
@@ -691,7 +686,7 @@ class SessionsRenderer extends Disposable implements ITreeRenderer<IChatSessionI
 
 		// Create context overlay for this specific session item
 		const contextOverlay = getSessionItemContextOverlay(session, sessionWithProvider.provider);
-		
+
 		const contextKeyService = this.contextKeyService.createOverlay(contextOverlay);
 
 		// Create menu for this session item
@@ -703,12 +698,15 @@ class SessionsRenderer extends Disposable implements ITreeRenderer<IChatSessionI
 		const setupActionBar = () => {
 			templateData.actionBar.clear();
 
+			const actions = menu.getActions({ arg: session, shouldForwardArgs: true });
+
 			const { primary } = getActionBarActions(
-				menu.getActions({ arg: session, shouldForwardArgs: true }), 
-				'inline'
+				actions,
+				'inline',
 			);
+
 			templateData.actionBar.push(primary, { icon: true, label: false });
-			
+
 			// Set context for the action bar
 			templateData.actionBar.context = session;
 		};

src/vs/workbench/contrib/chat/browser/media/chatSessions.css

@@ -40,3 +40,15 @@
 .chat-sessions-message .no-sessions-message .codicon {
 	opacity: 0.7;
 }
+
+/* Hide action bar actions by default */
+.chat-sessions-tree .chat-session-item .actions .action-label {
+	display: none;
+}
+
+/* Show action bar actions on hover and focus */
+.chat-sessions-tree .chat-session-item:hover .actions .action-label,
+.chat-sessions-tree .monaco-list-row.focused .chat-session-item .actions .action-label,
+.chat-sessions-tree .monaco-list-row.selected .chat-session-item .actions .action-label {
+	display: block;
+}

src/vs/workbench/contrib/chat/common/chatContextKeys.ts

@@ -100,8 +100,6 @@ export namespace ChatContextKeys {
 
 	export const panelLocation = new RawContextKey<ViewContainerLocation>('chatPanelLocation', undefined, { type: 'number', description: localize('chatPanelLocation', "The location of the chat panel.") });
 
-	export const sessionId = new RawContextKey<string>('chatSessionId', '', { type: 'string', description: localize('chatSessionId', "The ID of the current chat session item.") });
-	export const sessionLabel = new RawContextKey<string>('chatSessionLabel', '', { type: 'string', description: localize('chatSessionLabel', "The label of the current chat session item.") });
 	export const sessionType = new RawContextKey<string>('chatSessionType', '', { type: 'string', description: localize('chatSessionType', "The type of the current chat session item.") });
 }