Ben/active-ocelot (microsoft#235494) (microsoft#235496)

* chat - make quota reset date explicitly `undefined` if neede

* chat - tweak status quota indication

* chat - tweak status indicator further

Author: bpasero

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

@@ -36,9 +36,9 @@ export interface IChatQuotasService {
 }
 
 export interface IChatQuotas {
-	readonly chatQuotaExceeded: boolean;
-	readonly completionsQuotaExceeded: boolean;
-	readonly quotaResetDate: Date;
+	chatQuotaExceeded: boolean;
+	completionsQuotaExceeded: boolean;
+	quotaResetDate: Date | undefined;
 }
 
 export const OPEN_CHAT_QUOTA_EXCEEDED_DIALOG = 'workbench.action.chat.openQuotaExceededDialog';
@@ -50,7 +50,7 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 	private readonly _onDidChangeQuotas = this._register(new Emitter<void>());
 	readonly onDidChangeQuotas: Event<void> = this._onDidChangeQuotas.event;
 
-	private _quotas = { chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: new Date(0) };
+	private _quotas: IChatQuotas = { chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined };
 	get quotas(): IChatQuotas { return this._quotas; }
 
 	private readonly chatQuotaExceededContextKey = ChatContextKeys.chatQuotaExceeded.bindTo(this.contextKeyService);
@@ -227,7 +227,7 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 
 	clearQuotas(): void {
 		if (this.quotas.chatQuotaExceeded || this.quotas.completionsQuotaExceeded) {
-			this.acceptQuotas({ chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: new Date(0) });
+			this.acceptQuotas({ chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined });
 		}
 	}
 
@@ -241,6 +241,8 @@ export class ChatQuotasStatusBarEntry extends Disposable implements IWorkbenchCo
 
 	static readonly ID = 'chat.quotasStatusBarEntry';
 
+	private static readonly COPILOT_STATUS_ID = 'GitHub.copilot.status'; // TODO@bpasero unify into 1 core indicator
+
 	private readonly _entry = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
 
 	constructor(
@@ -254,19 +256,39 @@ export class ChatQuotasStatusBarEntry extends Disposable implements IWorkbenchCo
 
 	private updateStatusbarEntry(): void {
 		const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatQuotasService.quotas;
+
+		// Some quota exceeded, show indicator
 		if (chatQuotaExceeded || completionsQuotaExceeded) {
-			// Some quota exceeded, show indicator
+			let text: string;
+			if (chatQuotaExceeded && !completionsQuotaExceeded) {
+				text = localize('chatQuotaExceededStatus', "Chat limit reached");
+			} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
+				text = localize('completionsQuotaExceededStatus', "Completions limit reached");
+			} else {
+				text = localize('chatAndCompletionsQuotaExceededStatus', "Copilot limit reached");
+			}
+
+			const isCopilotStatusVisible = this.statusbarService.isEntryVisible(ChatQuotasStatusBarEntry.COPILOT_STATUS_ID);
+			if (!isCopilotStatusVisible) {
+				text = `$(copilot-warning) ${text}`;
+			}
+
 			this._entry.value = this.statusbarService.addEntry({
-				name: localize('indicator', "Copilot Quota Indicator"),
-				text: localize('limitReached', "Copilot Limit Reached"),
-				ariaLabel: localize('copilotQuotaExceeded', "Copilot Limit Reached"),
+				name: localize('indicator', "Copilot Limit Indicator"),
+				text,
+				ariaLabel: text,
 				command: OPEN_CHAT_QUOTA_EXCEEDED_DIALOG,
-				kind: 'prominent',
 				showInAllWindows: true,
-				tooltip: quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded }),
-			}, ChatQuotasStatusBarEntry.ID, StatusbarAlignment.RIGHT, { id: 'GitHub.copilot.status', alignment: StatusbarAlignment.RIGHT }); // TODO@bpasero unify into 1 core indicator
-		} else {
-			// No quota exceeded, remove indicator
+				tooltip: quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded })
+			}, ChatQuotasStatusBarEntry.ID, StatusbarAlignment.RIGHT, {
+				id: ChatQuotasStatusBarEntry.COPILOT_STATUS_ID,
+				alignment: StatusbarAlignment.RIGHT,
+				compact: isCopilotStatusVisible
+			});
+		}
+
+		// No quota exceeded, remove indicator
+		else {
 			this._entry.clear();
 		}
 	}

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

@@ -512,7 +512,7 @@ class ChatSetupRequests extends Disposable {
 			this.chatQuotasService.acceptQuotas({
 				chatQuotaExceeded: typeof state.quotas.chat === 'number' ? state.quotas.chat <= 0 : false,
 				completionsQuotaExceeded: typeof state.quotas.completions === 'number' ? state.quotas.completions <= 0 : false,
-				quotaResetDate: state.quotas.resetDate ? new Date(state.quotas.resetDate) : new Date(0)
+				quotaResetDate: state.quotas.resetDate ? new Date(state.quotas.resetDate) : undefined
 			});
 		}
 	}