[pull] main from microsoft:main

src/vs/code/electron-main/app.ts

@@ -916,6 +916,7 @@ export class CodeApplication extends Disposable {
 			// Ensure sessions window is open to receive the URL
 			const windows = await windowsMainService.openSessionsWindow({ context: OpenContext.LINK, contextWindowId: undefined });
 			const window = windows.at(0);
+			window?.focus();
 			await window?.ready();
 
 			// Return false to let subsequent handlers (e.g., URLHandlerChannelClient) forward the URL

src/vs/sessions/contrib/sessions/browser/media/sessionsTitleBarWidget.css

@@ -11,7 +11,7 @@
 	flex-wrap: nowrap;
 	align-items: center;
 	justify-content: flex-start;
-	padding: 0 16px;
+	padding-left: 16px;
 	height: 22px;
 	border-radius: 4px;
 	-webkit-app-region: no-drag;

src/vs/sessions/contrib/sessions/browser/media/sessionsViewPane.css

@@ -96,3 +96,44 @@
 		overflow: hidden;
 	}
 }
+
+/* Sessions-app-specific overrides for the agent sessions viewer.
+ * These styles only apply within the agent-sessions-workbench context. */
+
+.agent-sessions-workbench {
+
+	/*
+	 * Show-more / show-less: content always rendered, list row height
+	 * controls visibility (1px = clipped, 26px = visible).
+	 * Height animation is driven by JS (requestAnimationFrame) since
+	 * the virtualized list uses absolute positioning.
+	 */
+	.agent-session-show-more {
+		justify-content: center;
+		align-items: center;
+		padding: 0 6px;
+		font-size: 11px;
+		color: var(--vscode-descriptionForeground);
+		min-height: 26px;
+
+		.agent-session-show-more-label {
+			padding: 0 6px;
+			flex-shrink: 0;
+			white-space: nowrap;
+		}
+
+		/* Lines on both sides of the text as flex items */
+		&::before,
+		&::after {
+			content: '';
+			flex: 1;
+			height: 1px;
+			background: var(--vscode-widget-border, var(--vscode-contrastBorder));
+		}
+	}
+
+	/* Brighter text on direct hover */
+	.monaco-list-row:hover .agent-session-show-more:hover {
+		color: var(--vscode-foreground);
+	}
+}

src/vs/sessions/contrib/sessions/browser/sessions.contribution.ts

@@ -14,13 +14,18 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../../work
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { SessionsTitleBarContribution } from './sessionsTitleBarWidget.js';
 import { AgenticSessionsViewPane, SessionsViewId } from './sessionsViewPane.js';
-import { SessionsManagementService, ISessionsManagementService } from './sessionsManagementService.js';
+import { SessionsManagementService, ISessionsManagementService, IsNewChatSessionContext } from './sessionsManagementService.js';
 import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { AgentSessionSection, IAgentSessionSection, isAgentSessionSection } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsModel.js';
 import { ChatContextKeys } from '../../../../workbench/contrib/chat/common/actions/chatContextKeys.js';
+import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
 import { IViewsService } from '../../../../workbench/services/views/common/viewsService.js';
+import { IsAuxiliaryWindowContext } from '../../../../workbench/common/contextkeys.js';
+import { SessionsWelcomeVisibleContext } from '../../../common/contextkeys.js';
 import { NewChatViewPane, SessionsViewId as NewChatViewId } from '../../chat/browser/newChatViewPane.js';
+import { Menus } from '../../../browser/menus.js';
 
 const agentSessionsViewIcon = registerIcon('chat-sessions-icon', Codicon.commentDiscussionSparkle, localize('agentSessionsViewIcon', 'Icon for Agent Sessions View'));
 const AGENT_SESSIONS_VIEW_TITLE = localize2('agentSessions.view.label', "Sessions");
@@ -55,6 +60,43 @@ registerWorkbenchContribution2(SessionsTitleBarContribution.ID, SessionsTitleBar
 
 registerSingleton(ISessionsManagementService, SessionsManagementService, InstantiationType.Delayed);
 
+registerAction2(class MarkSessionAsDoneAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'agentSession.markAsDone',
+			title: localize2('markAsDone', "Mark as Done"),
+			icon: Codicon.check,
+			menu: [{
+				id: Menus.CommandCenter,
+				order: 102,
+				when: ContextKeyExpr.and(
+					IsAuxiliaryWindowContext.negate(),
+					SessionsWelcomeVisibleContext.negate(),
+					IsNewChatSessionContext.negate()
+				)
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const sessionsManagementService = accessor.get(ISessionsManagementService);
+		const agentSessionsService = accessor.get(IAgentSessionsService);
+
+		const activeSession = sessionsManagementService.getActiveSession();
+		if (!activeSession || activeSession.isUntitled) {
+			return;
+		}
+
+		const agentSession = agentSessionsService.getSession(activeSession.resource);
+		if (!agentSession || agentSession.isArchived()) {
+			return;
+		}
+
+		agentSession.setArchived(true);
+	}
+});
+
 registerAction2(class NewSessionForRepositoryAction extends Action2 {
 
 	constructor() {

src/vs/sessions/contrib/sessions/browser/sessionsViewPane.ts

@@ -169,6 +169,10 @@ export class AgenticSessionsViewPane extends ViewPane {
 			disableHover: true,
 			enableApprovalRow: true,
 			repositoryGroupLimit: AgentSessionsDataSource.REPOSITORY_GROUP_LIMIT,
+			hideSectionCount: true,
+			hideSessionBadge: true,
+			useStatusOnlyIcons: true,
+			compactShowMore: true,
 			getHoverPosition: () => this.getSessionHoverPosition(),
 			trackActiveEditorSession: () => true,
 			collapseOlderSections: () => true,