@codingame/monaco-vscode-workbench-service-override 37.6.1 → 38.0.0

package/vscode/src/vs/sessions/contrib/accountMenu/browser/account.contribution.js

@@ -8,7 +8,7 @@ import * as chatStatus from '@codingame/monaco-vscode-api/vscode/vs/workbench/co
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { MutableDisposable, toDisposable, DisposableStore, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
@@ -26,6 +26,7 @@ import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/
 import { ActionBar, ActionsOrientation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { BaseActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { Action, Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
+import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
@@ -33,6 +34,7 @@ import { registerUpdateTitleBarMenuPlacement } from '@codingame/monaco-vscode-ap
 import { ChatEntitlement, getQuotaUsage, QuotaUsageKind, getQuotaReset, getChatPlanName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { ChatStatusDashboard } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatStatus/chatStatusDashboard';
+import { getCodexRateLimits, getCodexRateLimitLabel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatStatus/codexStatusDashboard';
 import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { getAccountTitleBarState, resolveAccountInfo, getAccountTitleBarBadgeKey, getAccountProfileImageUrl } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/accountTitleBarState';
@@ -44,13 +46,10 @@ import { IAuthenticationUsageService } from '@codingame/monaco-vscode-api/vscode
 import { ACCOUNTS_AVATAR_SETTING } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication';
 import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import { shouldShowCodexAccount, hasSignedInCodexChatGPTAccount, createCodexAccountMenuActions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/agentHost/browser/codexAccountService';
+import { shouldShowCodexAccount, hasSignedInCodexChatGPTAccount, createCodexAccountMenuActions, getCodexAccountPlanName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/agentHost/browser/codexAccountService';
 import { ICodexAccountService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/agentHost/browser/codexAccountService.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { MANAGE_CHAT_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement';
-import { AICustomizationManagementCommands, AICustomizationManagementSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
-import { SessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { safeIntl, fromNow } from '@codingame/monaco-vscode-api/vscode/vs/base/common/date';
 import { language } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { AgentHostCodexAgentEnabledSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentService';
@@ -59,6 +58,7 @@ import { CHAT_SETUP_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/wor
 import { AGENTIC_SIGN_IN_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/sessionCommands';
 import { SessionsChatPetAchievementBadges } from './chatPetAchievementBadges.js';
 import { CHAT_PET_OPEN_ACHIEVEMENTS_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatPetAchievements';
+import { CHAT_PET_CHANGE_COLOR_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatPetColors';
 import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/runOnChange';
 
 registerCss(sidebarActionButton, 0);
@@ -74,6 +74,11 @@ const accountDateFormatter = safeIntl.DateTimeFormat(language, {
     month: "short",
     day: "numeric"
 });
+const accountFullDateFormatter = safeIntl.DateTimeFormat(language, {
+    month: "short",
+    day: "numeric",
+    year: "numeric"
+});
 const accountTimeFormatter = safeIntl.DateTimeFormat(language, {
     hour: "numeric",
     minute: "numeric"
@@ -81,6 +86,21 @@ const accountTimeFormatter = safeIntl.DateTimeFormat(language, {
 function shouldShowAccountPanelSummary(state, hasCopilotDashboard, isAccountLoading) {
     return !hasCopilotDashboard && !isAccountLoading && !(state.source === "copilot" && state.kind === "prominent");
 }
+function getChatGPTRateLimitResetHover(rateLimit) {
+    if (!rateLimit.resetsAt) {
+        return undefined;
+    }
+    const resetDate = ( new Date(rateLimit.resetsAt * 1000));
+    if (rateLimit.windowDurationMins !== undefined && rateLimit.windowDurationMins < 24 * 60) {
+        return localize(3570, "Resets at {0}", accountTimeFormatter.value.format(resetDate));
+    }
+    return localize(
+        3571,
+        "Resets on {0} at {1}",
+        accountFullDateFormatter.value.format(resetDate),
+        accountTimeFormatter.value.format(resetDate)
+    );
+}
 registerUpdateTitleBarMenuPlacement(Menus.TitleBarLeftLayout, {
     group: "navigation",
     order: 2,
@@ -90,7 +110,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: AGENTIC_SIGN_IN_COMMAND_ID,
-            title: ( localize2(3193, "Sign in to use GitHub Copilot")),
+            title: ( localize2(3572, "Sign in with GitHub")),
             icon: Codicon.signIn,
             menu: {
                 id: AccountMenu,
@@ -108,7 +128,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.agenticSignOut",
-            title: ( localize2(3194, "Sign Out")),
+            title: ( localize2(3573, "Sign Out")),
             icon: Codicon.signOut,
             menu: {
                 id: AccountMenu,
@@ -134,9 +154,9 @@ registerAction2(class extends Action2 {
             confirmed
         } = await dialogService.confirm({
             type: Severity.Info,
-            message: ( localize(3195, "Sign out of the Agents window?")),
-            detail: ( localize(3196, "This will sign out '{0}' from the Agents window.", accountLabel)),
-            primaryButton: ( localize(3197, "&&Sign Out"))
+            message: ( localize(3574, "Sign out of the Agents window?")),
+            detail: ( localize(3575, "This will sign out '{0}' from the Agents window.", accountLabel)),
+            primaryButton: ( localize(3576, "&&Sign Out"))
         });
         if (!confirmed) {
             return;
@@ -153,7 +173,7 @@ registerAction2(class extends Action2 {
 MenuRegistry.appendMenuItem(AccountMenu, {
     command: {
         id: "workbench.action.openSettings",
-        title: ( localize(3198, "Settings")),
+        title: ( localize(3577, "Settings")),
         icon: Codicon.settingsGear
     },
     when: ( IsPhoneLayoutContext.negate()),
@@ -251,7 +271,7 @@ let TitleBarAccountWidget = class TitleBarAccountWidget extends BaseActionViewIt
         container.setAttribute("role", "button");
         container.tabIndex = 0;
         this.avatarElement = append(container, $("img.sessions-account-titlebar-widget-avatar", {
-            alt: ( localize(3199, "Account profile image")),
+            alt: ( localize(3578, "Account profile image")),
             draggable: "false"
         }));
         this.avatarElement.decoding = "async";
@@ -332,16 +352,16 @@ let TitleBarAccountWidget = class TitleBarAccountWidget extends BaseActionViewIt
     }
     getAvatarAltText(hasLoadedAvatar) {
         if (hasLoadedAvatar && this.accountProviderId === "github" && this.accountName) {
-            return localize(3200, "GitHub profile image for {0}", this.accountName);
+            return localize(3579, "GitHub profile image for {0}", this.accountName);
         }
-        return localize(3199, "Account profile image");
+        return localize(3578, "Account profile image");
     }
     getCodexAvatarAltText() {
         return this.codexAccountService.account.email ? ( localize(
-            3201,
+            3580,
             "ChatGPT profile image for {0}",
             this.codexAccountService.account.email
-        )) : ( localize(3202, "ChatGPT profile image"));
+        )) : ( localize(3581, "ChatGPT profile image"));
     }
     renderCodexPanelAvatar() {
         if (!this.codexPanelAvatarElement || !this.codexPanelIconElement) {
@@ -516,14 +536,14 @@ let TitleBarAccountWidget = class TitleBarAccountWidget extends BaseActionViewIt
         fillInActionBarActions(menu.getActions(), rawActions);
         menu.dispose();
         const codexAccount = this.codexAccountService.account;
-        const codexAccountVisible = shouldShowCodexAccount(this.configurationService, true);
+        const codexAccountVisible = !this.isAccountLoading && shouldShowCodexAccount(this.configurationService, true);
         const partitioned = this.partitionMenuActions(rawActions);
         const identities = append(panel, $(".sessions-account-titlebar-panel-identities"));
         if (this.accountName || this.isAccountLoading) {
             const copilotAccount = append(
                 identities,
                 $("section.sessions-account-titlebar-panel-provider-account", {
-                    "aria-label": ( localize(3203, "Copilot account"))
+                    "aria-label": ( localize(3582, "Copilot account"))
                 })
             );
             const copilotIdentity = append(copilotAccount, $(".sessions-account-titlebar-panel-provider-identity"));
@@ -553,17 +573,16 @@ let TitleBarAccountWidget = class TitleBarAccountWidget extends BaseActionViewIt
                 this.hoverService.hideHover(true);
                 this.clickPanelDisposable.clear();
             }));
-            copilotActionBar.push(panelStore.add(( new Action("copilot.manageModels", ( localize(3204, "Manage Copilot Models")), ThemeIcon.asClassName(Codicon.copilot), true, () => this.commandService.executeCommand(MANAGE_CHAT_COMMAND_ID, "@provider:\"Copilot\"")))), {
-                icon: true,
-                label: false
-            });
-            copilotActionBar.push(panelStore.add(( new Action("copilot.openAgentCustomizations", ( localize(3205, "Agent Customizations for Copilot")), ThemeIcon.asClassName(Codicon.settingsGear), true, () => this.commandService.executeCommand(AICustomizationManagementCommands.OpenEditor, {
-                sessionType: SessionType.AgentHostCopilot,
-                section: AICustomizationManagementSection.Agents
-            })))), {
+            copilotActionBar.push(panelStore.add(( new Action("copilot.manageModels", ( localize(3583, "Manage Copilot Models")), ThemeIcon.asClassName(Codicon.copilot), true, () => this.commandService.executeCommand(MANAGE_CHAT_COMMAND_ID, "@provider:\"Copilot\"")))), {
                 icon: true,
                 label: false
             });
+            for (const action of partitioned.personalize) {
+                copilotActionBar.push(action, {
+                    icon: true,
+                    label: false
+                });
+            }
             if (partitioned.signOut) {
                 copilotActionBar.push(partitioned.signOut, {
                     icon: true,
@@ -575,7 +594,7 @@ let TitleBarAccountWidget = class TitleBarAccountWidget extends BaseActionViewIt
             const copilotAccount = append(
                 identities,
                 $("section.sessions-account-titlebar-panel-provider-account.signed-out", {
-                    "aria-label": ( localize(3203, "Copilot account"))
+                    "aria-label": ( localize(3582, "Copilot account"))
                 })
             );
             const copilotIdentity = append(copilotAccount, $(".sessions-account-titlebar-panel-provider-identity"));
@@ -601,7 +620,7 @@ let TitleBarAccountWidget = class TitleBarAccountWidget extends BaseActionViewIt
             const accountSection = append(
                 identities,
                 $("section.sessions-account-titlebar-panel-provider-account", {
-                    "aria-label": ( localize(3206, "ChatGPT account"))
+                    "aria-label": ( localize(3584, "ChatGPT account"))
                 })
             );
             const accountIdentity = append(accountSection, $(".sessions-account-titlebar-panel-provider-identity"));
@@ -630,36 +649,35 @@ let TitleBarAccountWidget = class TitleBarAccountWidget extends BaseActionViewIt
                 }
             }));
             const accountName = append(accountIdentity, $(".sessions-account-titlebar-panel-provider-name"));
-            accountName.textContent = codexAccount.email ?? ( localize(3207, "ChatGPT"));
+            accountName.textContent = codexAccount.email ?? ( localize(3585, "ChatGPT"));
             const accountActions = append(accountIdentity, $(".sessions-account-titlebar-panel-provider-actions"));
             const accountActionBar = panelStore.add(( new ActionBar(accountActions)));
             panelStore.add(accountActionBar.onWillRun(() => {
                 this.hoverService.hideHover(true);
                 this.clickPanelDisposable.clear();
             }));
-            accountActionBar.push(panelStore.add(( new Action("codex.manageChatGPTModels", ( localize(3208, "Manage ChatGPT Models")), ThemeIcon.asClassName(Codicon.openai), true, () => this.commandService.executeCommand(MANAGE_CHAT_COMMAND_ID, "@provider:\"ChatGPT\"")))), {
+            accountActionBar.push(panelStore.add(( new Action("codex.manageChatGPTModels", ( localize(3586, "Manage ChatGPT Models")), ThemeIcon.asClassName(Codicon.openai), true, () => this.commandService.executeCommand(MANAGE_CHAT_COMMAND_ID, "@provider:\"ChatGPT\"")))), {
                 icon: true,
                 label: false
             });
-            accountActionBar.push(panelStore.add(( new Action("codex.openAgentCustomizations", ( localize(3209, "Agent Customizations for Codex")), ThemeIcon.asClassName(Codicon.settingsGear), true, () => this.commandService.executeCommand(AICustomizationManagementCommands.OpenEditor, {
-                sessionType: SessionType.AgentHostCodex,
-                section: AICustomizationManagementSection.HarnessSettings
-            })))), {
-                icon: true,
-                label: false
-            });
-            accountActionBar.push(panelStore.add(( new Action("codex.signOutOfChatGPT", ( localize(3210, "Sign Out")), ThemeIcon.asClassName(Codicon.signOut), true, () => this.codexAccountService.signOut()))), {
+            for (const action of partitioned.personalize) {
+                accountActionBar.push(action, {
+                    icon: true,
+                    label: false
+                });
+            }
+            accountActionBar.push(panelStore.add(( new Action("codex.signOutOfChatGPT", ( localize(3587, "Sign Out")), ThemeIcon.asClassName(Codicon.signOut), true, () => this.codexAccountService.signOut()))), {
                 icon: true,
                 label: false
             });
-            this.appendChatGPTUsage(accountSection);
+            this.appendChatGPTUsage(accountSection, panelStore);
         } else {
             const codexAccountActions = createCodexAccountMenuActions(this.codexAccountService, codexAccountVisible);
             if (codexAccountActions.length) {
                 const accountSection = append(
                     identities,
                     $("section.sessions-account-titlebar-panel-provider-account.signed-out", {
-                        "aria-label": ( localize(3206, "ChatGPT account"))
+                        "aria-label": ( localize(3584, "ChatGPT account"))
                     })
                 );
                 const accountIdentity = append(accountSection, $(".sessions-account-titlebar-panel-provider-identity"));
@@ -684,16 +702,20 @@ let TitleBarAccountWidget = class TitleBarAccountWidget extends BaseActionViewIt
                 }
             }
         }
-        panelStore.add(
-            this.instantiationService.createInstance(SessionsChatPetAchievementBadges, panel, () => {
-                this.hoverService.hideHover(true);
-                this.clickPanelDisposable.clear();
-                void this.commandService.executeCommand(CHAT_PET_OPEN_ACHIEVEMENTS_COMMAND_ID);
-            })
-        );
+        if (!this.chatEntitlementService.sentiment.hidden) {
+            panelStore.add(
+                this.instantiationService.createInstance(SessionsChatPetAchievementBadges, panel, tab => {
+                    this.hoverService.hideHover(true);
+                    this.clickPanelDisposable.clear();
+                    void this.commandService.executeCommand(
+                        tab === "color" ? CHAT_PET_CHANGE_COLOR_COMMAND_ID : CHAT_PET_OPEN_ACHIEVEMENTS_COMMAND_ID
+                    );
+                })
+            );
+        }
         if (this.shouldShowCopilotDashboardHover()) {
             const footer = append(panel, $("section.sessions-account-titlebar-panel-footer", {
-                "aria-label": ( localize(3211, "Account status"))
+                "aria-label": ( localize(3588, "Account status"))
             }));
             append(footer, this.createCopilotHoverContent({
                 compactQuotaLayout: true
@@ -766,12 +788,12 @@ let TitleBarAccountWidget = class TitleBarAccountWidget extends BaseActionViewIt
         if (quotaUsage.kind === QuotaUsageKind.CreditsUsed) {
             const creditsFormatted = formatter.value.format(quotaUsage.creditsUsed);
             append(planRow, $("span.sessions-account-titlebar-panel-provider-usage-value", {
-                "aria-label": ( localize(3212, "{0} credits used", creditsFormatted))
+                "aria-label": ( localize(3589, "{0} credits used", creditsFormatted))
             }, creditsFormatted));
         } else {
             const usedPercentage = Math.floor(quotaUsage.usedPercentage);
-            const percentageLabel = ( localize(3213, "{0}%", usedPercentage));
-            const percentageAriaLabel = ( localize(3214, "{0}% credits used", usedPercentage));
+            const percentageLabel = ( localize(3590, "{0}%", usedPercentage));
+            const percentageAriaLabel = ( localize(3591, "{0}% credits used", usedPercentage));
             const {
                 used,
                 total
@@ -786,13 +808,13 @@ let TitleBarAccountWidget = class TitleBarAccountWidget extends BaseActionViewIt
             usageValue.setAttribute("aria-label", percentageAriaLabel);
             if (used !== undefined && total !== undefined) {
                 const creditsValue = ( localize(
-                    3215,
+                    3592,
                     "{0} / {1}",
                     formatter.value.format(used),
                     formatter.value.format(total)
                 ));
                 const creditsAriaLabel = ( localize(
-                    3216,
+                    3593,
                     "{0} / {1} credits used",
                     formatter.value.format(used),
                     formatter.value.format(total)
@@ -825,52 +847,53 @@ let TitleBarAccountWidget = class TitleBarAccountWidget extends BaseActionViewIt
         append(detailRow, $(
             "span.sessions-account-titlebar-panel-provider-usage-label",
             undefined,
-            ( localize(3217, "Credits used"))
+            ( localize(3594, "Credits used"))
         ));
     }
-    appendChatGPTUsage(accountSection) {
+    appendChatGPTUsage(accountSection, panelStore) {
         const account = this.codexAccountService.account;
         const usage = append(accountSection, $(".sessions-account-titlebar-panel-provider-usage"));
         const planRow = append(usage, $(".sessions-account-titlebar-panel-provider-metric-row.primary"));
         append(planRow, $(
             "span.sessions-account-titlebar-panel-provider-plan",
             undefined,
-            account.planType ? ( localize(
-                3218,
-                "ChatGPT {0}",
-                account.planType.charAt(0).toUpperCase() + account.planType.slice(1)
-            )) : ( localize(3219, "ChatGPT subscription"))
+            getCodexAccountPlanName(account)
         ));
-        if (!account.rateLimit) {
-            return;
-        }
         const percentageFormatter = safeIntl.NumberFormat(language, {
             maximumFractionDigits: 0
         });
-        const usedPercentage = percentageFormatter.value.format(account.rateLimit.usedPercent);
-        append(planRow, $("span.sessions-account-titlebar-panel-provider-usage-value", {
-            "aria-label": ( localize(3220, "{0}% used", usedPercentage))
-        }, ( localize(3221, "{0}%", usedPercentage))));
-        const detailRow = append(usage, $(".sessions-account-titlebar-panel-provider-metric-row.secondary"));
-        if (account.rateLimit.resetsAt) {
+        for (const rateLimit of getCodexRateLimits(account)) {
+            const limitLabel = getCodexRateLimitLabel(rateLimit.windowDurationMins);
+            const usedPercentage = percentageFormatter.value.format(rateLimit.usedPercent);
+            const detailRow = append(usage, $(".sessions-account-titlebar-panel-provider-metric-row.secondary"));
+            const description = rateLimit.resetsAt ? ( localize(
+                3595,
+                "{0} resets {1}",
+                limitLabel,
+                fromNow(rateLimit.resetsAt * 1000, false, true)
+            )) : limitLabel;
             append(detailRow, $(
                 "span.sessions-account-titlebar-panel-provider-reset",
                 undefined,
-                ( localize(
-                3222,
-                "{0} resets {1}",
-                this.getChatGPTLimitLabel(account.rateLimit.windowDurationMins),
-                fromNow(account.rateLimit.resetsAt * 1000, false, true)
-            ))
+                description
             ));
-        } else {
-            detailRow.classList.add("without-reset");
+            append(
+                detailRow,
+                $("span.sessions-account-titlebar-panel-provider-usage-value", {
+                    "aria-label": ( localize(3596, "{0}: {1}% used", limitLabel, usedPercentage))
+                }, ( localize(3597, "{0}% used", usedPercentage)))
+            );
+            const resetHover = getChatGPTRateLimitResetHover(rateLimit);
+            if (resetHover) {
+                detailRow.tabIndex = 0;
+                detailRow.setAttribute("aria-label", ( localize(3598, "{0}, {1}% used. {2}", description, usedPercentage, resetHover)));
+                panelStore.add(this.hoverService.setupDelayedHover(detailRow, {
+                    content: resetHover
+                }, {
+                    setupKeyboardEvents: true
+                }));
+            }
         }
-        append(detailRow, $(
-            "span.sessions-account-titlebar-panel-provider-usage-label",
-            undefined,
-            ( localize(3223, "Limit used"))
-        ));
     }
     getCopilotResetLabel(quota) {
         const reset = getQuotaReset(quota, this.chatEntitlementService.quotas);
@@ -878,22 +901,11 @@ let TitleBarAccountWidget = class TitleBarAccountWidget extends BaseActionViewIt
             return undefined;
         }
         return reset.hasTime ? ( localize(
-            3224,
+            3599,
             "Resets {0} at {1}",
             accountDateFormatter.value.format(reset.date),
             accountTimeFormatter.value.format(reset.date)
-        )) : ( localize(3225, "Resets {0}", accountDateFormatter.value.format(reset.date)));
-    }
-    getChatGPTLimitLabel(windowDurationMins) {
-        if (windowDurationMins !== undefined) {
-            if (Math.abs(windowDurationMins - 7 * 24 * 60) <= 60) {
-                return localize(3226, "Weekly limit");
-            }
-            if (Math.abs(windowDurationMins - 24 * 60) <= 60) {
-                return localize(3227, "Daily limit");
-            }
-        }
-        return localize(3228, "Usage limit");
+        )) : ( localize(3600, "Resets {0}", accountDateFormatter.value.format(reset.date)));
     }
     partitionMenuActions(rawActions) {
         let signIn;
@@ -946,9 +958,9 @@ let TitleBarAccountWidget = class TitleBarAccountWidget extends BaseActionViewIt
             return this.accountName;
         }
         if (this.isAccountLoading) {
-            return localize(3229, "Loading Account...");
+            return localize(3601, "Loading Account...");
         }
-        return localize(3230, "Account");
+        return localize(3602, "Account");
     }
     getCopilotPlanLabel() {
         switch (this.chatEntitlementService.entitlement) {
@@ -989,13 +1001,19 @@ let TitleBarAccountWidget = class TitleBarAccountWidget extends BaseActionViewIt
 };
 TitleBarAccountWidget = ( __decorate([( __param(2, IDefaultAccountService)), ( __param(3, IAuthenticationService)), ( __param(4, IMenuService)), ( __param(5, IContextKeyService)), ( __param(6, IHoverService)), ( __param(7, IInstantiationService)), ( __param(8, IChatEntitlementService)), ( __param(9, ICodexAccountService)), ( __param(10, IConfigurationService)), ( __param(11, ICommandService))], TitleBarAccountWidget));
 function hasCodexAccountPanelContentChanged(previous, current) {
-    return previous.status !== current.status || previous.email !== current.email || previous.planType !== current.planType || previous.requiresOpenaiAuth !== current.requiresOpenaiAuth || previous.authUrl !== current.authUrl || previous.authUrlNonce !== current.authUrlNonce || previous.rateLimit?.usedPercent !== current.rateLimit?.usedPercent || previous.rateLimit?.windowDurationMins !== current.rateLimit?.windowDurationMins || previous.rateLimit?.resetsAt !== current.rateLimit?.resetsAt;
+    const previousRateLimits = getCodexRateLimits(previous);
+    const currentRateLimits = getCodexRateLimits(current);
+    return previous.status !== current.status || previous.email !== current.email || previous.planType !== current.planType || previous.requiresOpenaiAuth !== current.requiresOpenaiAuth || previous.authUrl !== current.authUrl || previous.authUrlNonce !== current.authUrlNonce || !equals(
+        previousRateLimits,
+        currentRateLimits,
+        (a, b) => a.usedPercent === b.usedPercent && a.windowDurationMins === b.windowDurationMins && a.resetsAt === b.resetsAt
+    );
 }
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SessionsTitleBarAccountWidgetAction,
-            title: ( localize2(3231, "Agents Account and Status")),
+            title: ( localize2(3603, "Agents Account and Status")),
             menu: {
                 id: Menus.TitleBarRightLayout,
                 group: "navigation",
@@ -1049,4 +1067,4 @@ let ChatDashboardServiceImpl = class ChatDashboardServiceImpl {
 };
 ChatDashboardServiceImpl = ( __decorate([( __param(0, IInstantiationService))], ChatDashboardServiceImpl));
 
-export { ChatDashboardServiceImpl, shouldShowAccountPanelSummary };
+export { AccountWidgetContribution, ChatDashboardServiceImpl, TitleBarAccountWidget, getChatGPTRateLimitResetHover, shouldShowAccountPanelSummary };

package/vscode/src/vs/sessions/contrib/accountMenu/browser/chatPetAchievementBadges.d.ts

@@ -4,20 +4,21 @@ import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { ChatPetAchievementId, IChatPetAchievement } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatPetAchievements";
 import { IChatPetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatPetService.service";
+import { ChatPetCustomizationTab } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/browser/chatPetAchievementsEditorInput";
 export interface ISessionsChatPetAchievementBadge {
     readonly achievement: IChatPetAchievement;
     readonly unlocked: boolean;
 }
 export declare function getSessionsChatPetAchievementBadges(enabled: boolean, unlockedAchievements: readonly ChatPetAchievementId[]): readonly ISessionsChatPetAchievementBadge[] | undefined;
 export declare class SessionsChatPetAchievementBadges extends Disposable {
-    private readonly onOpenAchievements;
+    private readonly onOpenCustomization;
     private readonly chatPetService;
     private readonly themeService;
     private readonly hoverService;
     private readonly logService;
     readonly element: HTMLElement;
     private readonly renderDisposables;
-    constructor(parent: HTMLElement, onOpenAchievements: () => void, chatPetService: IChatPetService, themeService: IThemeService, hoverService: IHoverService, logService: ILogService);
+    constructor(parent: HTMLElement, onOpenCustomization: (tab: ChatPetCustomizationTab) => void, chatPetService: IChatPetService, themeService: IThemeService, hoverService: IHoverService, logService: ILogService);
     private render;
     private createUnlockedBadgeButton;
 }