Merge pull request #300591 from microsoft/copilot/sub-pr-300560-another-one

Compact agent status: fix review feedback

Author: eli-w-king

src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionActions.ts

@@ -132,9 +132,14 @@ export class ToggleAgentStatusAction extends Action2 {
 
 	run(accessor: ServicesAccessor): void {
 		const configService = accessor.get(IConfigurationService);
-		const mode = getAgentControlMode(configService.getValue(ChatConfiguration.AgentStatusEnabled));
-		// Toggle between 'compact' (default) and 'hidden'
-		configService.updateValue(ChatConfiguration.AgentStatusEnabled, mode === 'hidden' ? 'compact' : 'hidden');
+		const rawValue = configService.getValue(ChatConfiguration.AgentStatusEnabled);
+		const mode = getAgentControlMode(rawValue);
+		if (mode === 'hidden') {
+			// Restore to previous non-hidden mode; if the raw value was 'badge', restore 'badge', otherwise use 'compact'
+			configService.updateValue(ChatConfiguration.AgentStatusEnabled, rawValue === 'badge' ? 'badge' : 'compact');
+		} else {
+			configService.updateValue(ChatConfiguration.AgentStatusEnabled, 'hidden');
+		}
 	}
 }
 

src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.ts

@@ -847,9 +847,9 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 		// Only show status indicators if chat.viewSessions.enabled is true
 		const viewSessionsEnabled = this.configurationService.getValue<boolean>(ChatConfiguration.ChatViewSessionsEnabled) !== false;
 
-		// When both unified agents bar and agent status are enabled, show status indicators
-		// before the sparkle button: [active, unread, sparkle] (populating inward)
-		// Otherwise, keep original order: [sparkle, unread, active]
+		// When compact mode is active, show status indicators before the sparkle button:
+		// [needs-input, active, unread, sparkle] (populating inward)
+		// Otherwise, keep original order: [sparkle, unread, active, needs-input]
 		const agentControlModeForBadge = getAgentControlMode(this.configurationService.getValue(ChatConfiguration.AgentStatusEnabled));
 		const reverseOrder = agentControlModeForBadge === 'compact';
 
@@ -902,7 +902,11 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 
 		// Needs-input section - shows sessions requiring user attention (approval/confirmation/input)
 		if (viewSessionsEnabled && hasAttentionNeeded) {
+			const { isFilteredToInProgress } = this._getCurrentFilterState();
 			needsInputSection = $('span.agent-status-badge-section.active.needs-input');
+			if (isFilteredToInProgress) {
+				needsInputSection.classList.add('filtered');
+			}
 			needsInputSection.setAttribute('role', 'button');
 			needsInputSection.tabIndex = 0;
 			const needsInputIcon = $('span.agent-status-icon');

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

@@ -236,7 +236,7 @@ configurationRegistry.registerConfiguration({
 				nls.localize('chat.agentsControl.badge', "Shows the agent status as a badge next to the command center."),
 				nls.localize('chat.agentsControl.compact', "Replaces the command center search box with a compact agent status indicator and unified chat widget."),
 			],
-			markdownDescription: nls.localize('chat.agentsControl.enabled', "Controls whether the 'Agent Status' indicator is shown in the title bar command center. Enabling this setting will automatically enable {0}. The unread/in-progress session indicators require {1} to be enabled.", '`#window.commandCenter#`', '`#chat.viewSessions.enabled#`'),
+			markdownDescription: nls.localize('chat.agentsControl.enabled', "Controls how the 'Agent Status' indicator appears in the title bar command center. When set to `hidden`, the indicator is not shown. Other values show the indicator and automatically enable {0}. The unread and in-progress session indicators require {1} to be enabled.", '`#window.commandCenter#`', '`#chat.viewSessions.enabled#`'),
 			default: 'compact',
 			tags: ['experimental']
 		},

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

@@ -25,7 +25,7 @@ export function getAgentControlMode(value: unknown): AgentControlMode {
 	if (value === 'compact') {
 		return 'compact';
 	}
-	// New installs get the string default 'compact' from the setting definition
+	// Fallback to the configuration schema default 'compact' for any other or missing value
 	return 'compact';
 }