Merge pull request #249521 from microsoft/ben/flexible-rhinoceros

Copilot `1.100` recovery fixes

Author: bpasero

src/vs/platform/actionWidget/browser/actionWidgetDropdown.ts

@@ -48,7 +48,7 @@ export class ActionWidgetDropdown extends BaseDropdown {
 	}
 
 	override show(): void {
-		const actionBarActions = this._options.actionBarActions ?? this._options.actionBarActionProvider?.getActions() ?? [];
+		let actionBarActions = this._options.actionBarActions ?? this._options.actionBarActionProvider?.getActions() ?? [];
 		const actions = this._options.actions ?? this._options.actionProvider?.getActions() ?? [];
 		const actionWidgetItems: IActionListItem<IActionWidgetDropdownAction>[] = [];
 
@@ -105,10 +105,11 @@ export class ActionWidgetDropdown extends BaseDropdown {
 
 		const previouslyFocusedElement = getActiveElement();
 
+
 		const actionWidgetDelegate: IActionListDelegate<IActionWidgetDropdownAction> = {
 			onSelect: (action, preview) => {
-				action.run();
 				this.actionWidgetService.hide();
+				action.run();
 			},
 			onHide: () => {
 				if (isHTMLElement(previouslyFocusedElement)) {
@@ -117,6 +118,14 @@ export class ActionWidgetDropdown extends BaseDropdown {
 			}
 		};
 
+		actionBarActions = actionBarActions.map(action => ({
+			...action,
+			run: async (...args: any[]) => {
+				this.actionWidgetService.hide();
+				return action.run(...args);
+			}
+		}));
+
 		this.actionWidgetService.show<IActionWidgetDropdownAction>(
 			this._options.label ?? '',
 			false,

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

@@ -324,9 +324,9 @@ class ChatStatusDashboard extends Disposable {
 				run: () => this.runCommandAndClose(() => this.openerService.open(URI.parse(defaultChat.manageSettingsUrl))),
 			}));
 
-			const completionsQuotaIndicator = completionsQuota ? this.createQuotaIndicator(this.element, disposables, completionsQuota, localize('completionsLabel', "Code completions"), false) : undefined;
-			const chatQuotaIndicator = chatQuota ? this.createQuotaIndicator(this.element, disposables, chatQuota, localize('chatsLabel', "Chat messages"), false) : undefined;
-			const premiumChatQuotaIndicator = premiumChatQuota ? this.createQuotaIndicator(this.element, disposables, premiumChatQuota, localize('premiumChatsLabel', "Premium requests"), true) : undefined;
+			const completionsQuotaIndicator = completionsQuota && (completionsQuota.total > 0 || completionsQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, completionsQuota, localize('completionsLabel', "Code completions"), false) : undefined;
+			const chatQuotaIndicator = chatQuota && (chatQuota.total > 0 || chatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, chatQuota, localize('chatsLabel', "Chat messages"), false) : undefined;
+			const premiumChatQuotaIndicator = premiumChatQuota && (premiumChatQuota.total > 0 || premiumChatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, premiumChatQuota, localize('premiumChatsLabel', "Premium requests"), true) : undefined;
 
 			if (resetDate) {
 				this.element.appendChild($('div.description', undefined, localize('limitQuota', "Allowance resets {0}.", this.dateFormatter.value.format(new Date(resetDate)))));

src/vs/workbench/contrib/chat/browser/modelPicker/modePickerActionItem.ts

@@ -72,6 +72,9 @@ export class ModePickerActionItem extends ActionWidgetDropdownActionViewItem {
 	}
 
 	protected override renderLabel(element: HTMLElement): IDisposable | null {
+		if (!this.element) {
+			return null;
+		}
 		this.setAriaLabelAttributes(element);
 		const state = modeToString(this.delegate.getMode());
 		dom.reset(element, dom.$('span.chat-model-label', undefined, state), ...renderLabelWithIcons(`$(chevron-down)`));

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

@@ -627,7 +627,7 @@ export class ChatEntitlementRequests extends Disposable {
 		if (response.monthly_quotas?.chat && typeof response.limited_user_quotas?.chat === 'number') {
 			quotas.chat = {
 				total: response.monthly_quotas.chat,
-				percentRemaining: (response.limited_user_quotas.chat / response.monthly_quotas.chat) * 100,
+				percentRemaining: Math.min(100, Math.max(0, (response.limited_user_quotas.chat / response.monthly_quotas.chat) * 100)),
 				overageEnabled: false,
 				overageCount: 0,
 				unlimited: false
@@ -637,7 +637,7 @@ export class ChatEntitlementRequests extends Disposable {
 		if (response.monthly_quotas?.completions && typeof response.limited_user_quotas?.completions === 'number') {
 			quotas.completions = {
 				total: response.monthly_quotas.completions,
-				percentRemaining: (response.limited_user_quotas.completions / response.monthly_quotas.completions) * 100,
+				percentRemaining: Math.min(100, Math.max(0, (response.limited_user_quotas.completions / response.monthly_quotas.completions) * 100)),
 				overageEnabled: false,
 				overageCount: 0,
 				unlimited: false
@@ -653,7 +653,7 @@ export class ChatEntitlementRequests extends Disposable {
 				}
 				const quotaSnapshot: IQuotaSnapshot = {
 					total: rawQuotaSnapshot.entitlement,
-					percentRemaining: rawQuotaSnapshot.percent_remaining,
+					percentRemaining: Math.min(100, Math.max(0, rawQuotaSnapshot.percent_remaining)),
 					overageEnabled: rawQuotaSnapshot.overage_permitted,
 					overageCount: rawQuotaSnapshot.overage_count,
 					unlimited: rawQuotaSnapshot.unlimited