[pull] main from microsoft:main

extensions/copilot/src/extension/chat/vscode-node/chatDebugFileLoggerService.ts

@@ -965,6 +965,9 @@ export class ChatDebugFileLoggerService extends Disposable implements IChatDebug
 						...(span.attributes[CopilotChatAttr.REQUEST_SHAPE] !== undefined
 							? { requestShape: String(span.attributes[CopilotChatAttr.REQUEST_SHAPE]) }
 							: {}),
+						...(span.attributes[CopilotChatAttr.COPILOT_USAGE_NANO_AIU] !== undefined
+							? { copilotUsageNanoAiu: asNumber(span.attributes[CopilotChatAttr.COPILOT_USAGE_NANO_AIU]) }
+							: {}),
 						...(isError && span.status.message ? { error: span.status.message } : {}),
 					},
 				};

extensions/copilot/src/extension/chatInputNotification/vscode-node/chatInputNotification.contribution.ts

@@ -37,6 +37,8 @@ export class ChatInputNotificationContribution extends Disposable {
 	private _notification: vscode.ChatInputNotification | undefined;
 	/** Tracks whether the current notification is the quota-exhausted variant. */
 	private _showingExhausted = false;
+	/** Whether a copilot token was present on the last {@link _update} call. */
+	private _hadCopilotToken = false;
 
 	private readonly _shownQuotaThresholds = new Set<number>();
 	private readonly _shownSessionThresholds = new Set<number>();
@@ -56,6 +58,20 @@ export class ChatInputNotificationContribution extends Disposable {
 	 * to show (or whether to hide).
 	 */
 	private _update(): void {
+		const hasCopilotToken = !!this._authService.copilotToken;
+		const wasSignedIn = this._hadCopilotToken;
+		this._hadCopilotToken = hasCopilotToken;
+
+		// Detect signed-in → signed-out transition: clear thresholds and hide.
+		if (wasSignedIn && !hasCopilotToken) {
+			this._shownQuotaThresholds.clear();
+			this._shownSessionThresholds.clear();
+			this._shownWeeklyThresholds.clear();
+			this._hideNotification();
+			this._showingExhausted = false;
+			return;
+		}
+
 		// Priority 1: Quota exhausted — sticky info notification
 		if (this._chatQuotaService.quotaExhausted) {
 			this._showExhaustedNotification();
@@ -202,20 +218,18 @@ export class ChatInputNotificationContribution extends Disposable {
 		const isFree = !!this._authService.copilotToken?.isFreeUser;
 
 		if (isAnonymous || isFree) {
-			notification.description = vscode.l10n.t("You're getting the most out of Copilot.");
+			notification.description = vscode.l10n.t('Upgrade to continue past the limit.');
 			notification.actions = [
-				{ label: vscode.l10n.t('View Usage'), commandId: 'workbench.action.chat.openCopilotStatus' },
 				{ label: vscode.l10n.t('Upgrade'), commandId: 'workbench.action.chat.upgradePlan' },
 			];
 		} else if (this._chatQuotaService.additionalUsageEnabled) {
-			notification.description = vscode.l10n.t('Your additional budget will keep Copilot going.');
+			notification.description = vscode.l10n.t('Additional budget is covering extra usage.');
 			notification.actions = [
 				{ label: vscode.l10n.t('View Usage'), commandId: 'workbench.action.chat.openCopilotStatus' },
 			];
 		} else {
-			notification.description = vscode.l10n.t('Manage your budget to keep going.');
+			notification.description = vscode.l10n.t('Set additional budget to cover extra usage.');
 			notification.actions = [
-				{ label: vscode.l10n.t('View Usage'), commandId: 'workbench.action.chat.openCopilotStatus' },
 				{ label: vscode.l10n.t('Manage Budget'), commandId: 'workbench.action.chat.manageAdditionalSpend' },
 			];
 		}