Merge pull request microsoft#256878 from microsoft/osortega/chat-session-contribution-fixes

Couple of fixes for the chat session contribution

Author: osortega

src/vs/workbench/api/common/extHostChatSessions.ts

@@ -26,7 +26,7 @@ export class ExtHostChatSessions extends Disposable implements IExtHostChatSessi
 	private readonly _proxy: Proxied<MainThreadChatSessionsShape>;
 	private readonly _statusProviders = new Map<number, { provider: vscode.ChatSessionsProvider; disposable: DisposableStore }>();
 	private _nextHandle = 0;
-	private _sessionMap: Map<string, vscode.ChatSessionContent & Record<string, unknown>> = new Map();
+	private _sessionMap: Map<string, vscode.ChatSessionContent> = new Map();
 
 	constructor(
 		commands: ExtHostCommands,
@@ -78,17 +78,22 @@ export class ExtHostChatSessions extends Disposable implements IExtHostChatSessi
 			return [];
 		}
 
-		const session = await entry.provider.provideChatSessions(token);
-		for (const sessionContent of session) {
+		const sessions = await entry.provider.provideChatSessions(token);
+		const response: vscode.ChatSessionContent[] = [];
+		for (const sessionContent of sessions) {
 			if (sessionContent.uri) {
 				this._sessionMap.set(
 					this.uriToId(sessionContent.uri),
-					sessionContent as vscode.ChatSessionContent & Record<string, unknown>
+					sessionContent
 				);
+				response.push({
+					uri: sessionContent.uri,
+					label: sessionContent.label,
+					iconPath: sessionContent.iconPath
+				});
 			}
 		}
-
-		return session;
+		return response;
 	}
 
 	private uriToId(uri: URI): string {

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

@@ -576,7 +576,9 @@ export function registerChatActions() {
 								const menuActions = getContextMenuActions(actions, 'navigation');
 								ckey.reset();
 
-								const buttons = menuActions.primary.map(action => ({
+								// Use primary actions if available, otherwise fall back to secondary actions
+								const actionsToUse = menuActions.primary.length > 0 ? menuActions.primary : menuActions.secondary;
+								const buttons = actionsToUse.map(action => ({
 									id: action.id,
 									tooltip: action.tooltip,
 									iconClass: action.class || ThemeIcon.asClassName(Codicon.symbolClass),