From 1b7793e10f25cfba8d2d19d9a761fbc98b4a04db Mon Sep 17 00:00:00 2001
From: Jack Zhuang <50353452+hotlong@users.noreply.github.com>
Date: Wed, 2 Sep 2026 21:56:43 +0800
Subject: [PATCH 1/2] fix(app-shell): AiUsageIndicator recognizes resetKind
 'weekly' + resetsAt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The free plan's AI quota moved to a rolling 7-day window (cloud PR #1852),
which added `resetKind: 'weekly'` to the usage endpoint. AiUsageIndicator
only knew 'daily'/'monthly' and fell through to no reset copy for a weekly
meter. It now renders "Resets in N days" (or N hours inside the final day),
derived from the endpoint's `resetsAt` — never guessed client-side — with
new @object-ui/i18n keys (base + _one/_other plural family, all ten packs).
An unrecognized resetKind still fails soft: no crash, no reset line.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
---
 .../7371-ai-usage-indicator-weekly-reset.md   | 24 +++++++
 packages/app-shell/src/hooks/useAiUsage.ts    |  9 ++-
 .../app-shell/src/layout/AiUsageIndicator.tsx | 35 ++++++++--
 .../__tests__/AiUsageIndicator.test.tsx       | 65 ++++++++++++++++++-
 packages/i18n/src/locales/ar.ts               |  6 ++
 packages/i18n/src/locales/de.ts               |  6 ++
 packages/i18n/src/locales/en.ts               | 11 ++++
 packages/i18n/src/locales/es.ts               |  6 ++
 packages/i18n/src/locales/fr.ts               |  6 ++
 packages/i18n/src/locales/ja.ts               |  6 ++
 packages/i18n/src/locales/ko.ts               |  6 ++
 packages/i18n/src/locales/pt.ts               |  6 ++
 packages/i18n/src/locales/ru.ts               |  6 ++
 packages/i18n/src/locales/zh.ts               |  6 ++
 14 files changed, 190 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/7371-ai-usage-indicator-weekly-reset.md

diff --git a/.changeset/7371-ai-usage-indicator-weekly-reset.md b/.changeset/7371-ai-usage-indicator-weekly-reset.md
new file mode 100644
index 0000000000..37fa3b379a
--- /dev/null
+++ b/.changeset/7371-ai-usage-indicator-weekly-reset.md
@@ -0,0 +1,24 @@
+---
+'@object-ui/app-shell': patch
+'@object-ui/i18n': patch
+---
+
+Fix `AiUsageIndicator` to recognize the free plan's new `resetKind: 'weekly'` and its
+`resetsAt` (objectui#7371, consumer of cloud PR #1852's rolling 7-day AI quota window).
+
+Before this change a `weekly` meter fell through to the component's unrecognized-kind
+path and rendered no reset line at all — not a crash, but silently wrong information
+next to a live progress ring. The indicator now shows "Resets in N days" (or "Resets in
+N hours" once inside the final day, e.g. `console.ai.usage.resetsWeeklyHours`), computed
+from the endpoint's `resetsAt`, in both languages via `@object-ui/i18n`
+(`console.ai.usage.resetsWeeklyDays` / `resetsWeeklyHours`, real i18next plural families
+with a base key so every locale pack resolves correctly, all ten packs translated). D5 is
+preserved — no token count is ever rendered, only the days/hours until reset.
+
+Contract-first: `resetsAt` is read verbatim from the endpoint, never re-derived or
+guessed client-side. A `weekly` meter with `resetsAt: null` (nothing counted yet in the
+window) and any `resetKind` this build does not recognize both render no reset line —
+fail-soft, not a crash or stale copy.
+
+`AiUsageResetKind` (`packages/app-shell/src/hooks/useAiUsage.ts`) gains the `'weekly'`
+member; `resetsAt` was already `string | null` and needed no shape change.
diff --git a/packages/app-shell/src/hooks/useAiUsage.ts b/packages/app-shell/src/hooks/useAiUsage.ts
index 4e349107bf..f2cc6b90b5 100644
--- a/packages/app-shell/src/hooks/useAiUsage.ts
+++ b/packages/app-shell/src/hooks/useAiUsage.ts
@@ -22,7 +22,7 @@
 import * as React from 'react';
 import { AI_USAGE_REFRESH_EVENT } from '@object-ui/plugin-chatbot';
 
-export type AiUsageResetKind = 'daily' | 'monthly';
+export type AiUsageResetKind = 'daily' | 'weekly' | 'monthly';
 export type AiUsagePlanType = 'free' | 'paid';
 
 /** One meter's D5-safe usage signal (mirrors the cloud endpoint). */
@@ -33,7 +33,12 @@ export interface AiMeterUsage {
   /** No finite cap (usage-based) — the UI would draw spend, not a ring. */
   unmetered: boolean;
   resetKind: AiUsageResetKind;
-  /** Best-effort reset instant (ISO); null when unknown (e.g. monthly cycle anchor). */
+  /**
+   * Best-effort reset instant (ISO); null when unknown. Weekly (the free
+   * plan's rolling 7-day window, cloud PR #1852): null while nothing is
+   * counted yet — never guessed client-side (objectui#7371). Monthly: null,
+   * the billing-cycle anchor is not known at this layer.
+   */
   resetsAt: string | null;
   /** Free-tier upgrade CTA applies. */
   upgrade: boolean;
diff --git a/packages/app-shell/src/layout/AiUsageIndicator.tsx b/packages/app-shell/src/layout/AiUsageIndicator.tsx
index 9ee8b1d2f0..4a70e3aa05 100644
--- a/packages/app-shell/src/layout/AiUsageIndicator.tsx
+++ b/packages/app-shell/src/layout/AiUsageIndicator.tsx
@@ -25,6 +25,9 @@ import { cloudConsoleUrl } from '../console/marketplace/marketplaceApi.js';
 /** Fraction at/above which a meter is "running low" (amber + CTA). */
 export const NEAR_FULL = 0.8;
 
+const ONE_HOUR_MS = 60 * 60 * 1000;
+const ONE_DAY_MS = 24 * ONE_HOUR_MS;
+
 type Tone = 'ok' | 'low' | 'full';
 
 function toneFor(fraction: number): Tone {
@@ -122,10 +125,31 @@ export function AiUsageIndicator({ apiBase, enabled = true, className }: AiUsage
     return t('console.ai.usage.statusOk', { defaultValue: 'Plenty left' });
   };
 
-  const resetLabel = (meter: AiMeterUsage): string =>
-    meter.resetKind === 'daily'
-      ? t('console.ai.usage.resetsDaily', { defaultValue: 'Resets tonight' })
-      : t('console.ai.usage.resetsMonthly', { defaultValue: 'Resets next cycle' });
+  // `resetKind: 'weekly'` (the free plan's rolling 7-day window, cloud PR #1852):
+  // "N days" (or "N hours" inside the final day), derived from `resetsAt`.
+  // Contract-first (objectui#7371) — `resetsAt` is the ONE source of the reset
+  // instant; never re-derive or guess it client-side.
+  const weeklyResetLabel = (resetsAt: string): string => {
+    const diffMs = new Date(resetsAt).getTime() - Date.now();
+    if (diffMs <= ONE_DAY_MS) {
+      const hours = Math.max(1, Math.ceil(diffMs / ONE_HOUR_MS));
+      return t('console.ai.usage.resetsWeeklyHours', { count: hours, defaultValue: 'Resets in {{count}} hours' });
+    }
+    const days = Math.ceil(diffMs / ONE_DAY_MS);
+    return t('console.ai.usage.resetsWeeklyDays', { count: days, defaultValue: 'Resets in {{count}} days' });
+  };
+
+  // `null` = render nothing for this line — an unrecognized `resetKind` (a
+  // future backend value this build doesn't know yet) fails soft instead of
+  // crashing or showing stale/wrong copy, and a `weekly` meter with no
+  // `resetsAt` yet (nothing counted) is never guessed at (objectui#7371).
+  const resetLabel = (meter: AiMeterUsage): string | null => {
+    if (meter.resetKind === 'daily') return t('console.ai.usage.resetsDaily', { defaultValue: 'Resets tonight' });
+    if (meter.resetKind === 'monthly')
+      return t('console.ai.usage.resetsMonthly', { defaultValue: 'Resets next cycle' });
+    if (meter.resetKind === 'weekly') return meter.resetsAt ? weeklyResetLabel(meter.resetsAt) : null;
+    return null;
+  };
 
   // Worst meter drives the trigger accent + the inline "running low" hint.
   const worst = meters.reduce((a, b) => (b.fraction > a.fraction ? b : a));
@@ -170,6 +194,7 @@ export function AiUsageIndicator({ apiBase, enabled = true, className }: AiUsage
             // No upstream cloud named by the runtime ⇒ no control plane to
             // send anyone to, so no CTA (objectui#7253).
             const showCta = tone !== 'ok' && (meter.upgrade || meter.topUp) && !!cloudConsoleUrl();
+            const reset = resetLabel(meter);
             return (
               <li key={key} className="flex items-start gap-2.5">
                 <MeterRing fraction={fraction} tone={tone} size={22} />
@@ -189,7 +214,7 @@ export function AiUsageIndicator({ apiBase, enabled = true, className }: AiUsage
                       {statusLabel(tone)}
                     </span>
                   </div>
-                  <div className="text-xs text-muted-foreground">{resetLabel(meter)}</div>
+                  {reset ? <div className="text-xs text-muted-foreground">{reset}</div> : null}
                   {showCta ? (
                     <Button
                       variant="link"
diff --git a/packages/app-shell/src/layout/__tests__/AiUsageIndicator.test.tsx b/packages/app-shell/src/layout/__tests__/AiUsageIndicator.test.tsx
index 9268a4993d..a2f0f8c4c8 100644
--- a/packages/app-shell/src/layout/__tests__/AiUsageIndicator.test.tsx
+++ b/packages/app-shell/src/layout/__tests__/AiUsageIndicator.test.tsx
@@ -13,7 +13,13 @@ import type { AiUsageResponse, AiMeterUsage } from '../../hooks/useAiUsage';
 
 vi.mock('@object-ui/i18n', () => ({
   useObjectTranslation: () => ({
-    t: (key: string, options?: Record<string, unknown>) => String(options?.defaultValue ?? key),
+    // Interpolates `{{name}}` from the options object (mirrors real i18next
+    // closely enough for count-driven copy like `resetsWeeklyDays`) — a plain
+    // `String(options?.defaultValue ?? key)` would leave `{{count}}` literal.
+    t: (key: string, options?: Record<string, unknown>) =>
+      String(options?.defaultValue ?? key).replace(/\{\{(\w+)\}\}/g, (_m, name: string) =>
+        String(options?.[name] ?? ''),
+      ),
   }),
 }));
 const openMock = vi.fn();
@@ -92,4 +98,61 @@ describe('AiUsageIndicator', () => {
     fireEvent.click(cta);
     expect(openMock).toHaveBeenCalledWith('https://cloud.example', '_blank', 'noopener,noreferrer');
   });
+
+  // objectui#7371 — the free plan's `resetKind: 'weekly'` (cloud PR #1852).
+  describe('resetKind: weekly', () => {
+    const ONE_HOUR_MS = 60 * 60 * 1000;
+    const ONE_DAY_MS = 24 * ONE_HOUR_MS;
+
+    it('shows "N days" when resetsAt is more than a day out', () => {
+      const resetsAt = new Date(Date.now() + 3 * ONE_DAY_MS).toISOString();
+      setUsage({
+        meters: {
+          build: meter({ resetKind: 'weekly', resetsAt }),
+          dataChat: meter({ fraction: null }),
+        },
+      });
+      render(<AiUsageIndicator apiBase="/api/v1/ai" />);
+      fireEvent.click(screen.getByTestId('ai-usage-indicator'));
+      expect(screen.getByText('Resets in 3 days')).toBeInTheDocument();
+    });
+
+    it('switches to hours when resetsAt is within a day (D5: never a token count)', () => {
+      const resetsAt = new Date(Date.now() + 5 * ONE_HOUR_MS).toISOString();
+      setUsage({
+        meters: {
+          build: meter({ resetKind: 'weekly', resetsAt }),
+          dataChat: meter({ fraction: null }),
+        },
+      });
+      render(<AiUsageIndicator apiBase="/api/v1/ai" />);
+      fireEvent.click(screen.getByTestId('ai-usage-indicator'));
+      expect(screen.getByText('Resets in 5 hours')).toBeInTheDocument();
+    });
+
+    it('shows no reset line when weekly has no resetsAt yet — contract-first, never guessed client-side', () => {
+      setUsage({
+        meters: {
+          build: meter({ resetKind: 'weekly', resetsAt: null }),
+          dataChat: meter({ fraction: null }),
+        },
+      });
+      render(<AiUsageIndicator apiBase="/api/v1/ai" />);
+      fireEvent.click(screen.getByTestId('ai-usage-indicator'));
+      expect(screen.queryByText(/Resets/)).not.toBeInTheDocument();
+    });
+
+    it('falls back to no reset line (not a crash or stale copy) on an unrecognized resetKind', () => {
+      setUsage({
+        meters: {
+          // Cast past the union: a future backend value this build doesn't know yet.
+          build: meter({ resetKind: 'quarterly' as unknown as AiMeterUsage['resetKind'] }),
+          dataChat: meter({ fraction: null }),
+        },
+      });
+      expect(() => render(<AiUsageIndicator apiBase="/api/v1/ai" />)).not.toThrow();
+      fireEvent.click(screen.getByTestId('ai-usage-indicator'));
+      expect(screen.queryByText(/Resets/)).not.toBeInTheDocument();
+    });
+  });
 });
diff --git a/packages/i18n/src/locales/ar.ts b/packages/i18n/src/locales/ar.ts
index ad8796a7a3..59396a2a38 100644
--- a/packages/i18n/src/locales/ar.ts
+++ b/packages/i18n/src/locales/ar.ts
@@ -1499,6 +1499,12 @@ const ar = {
         statusFull: "تم بلوغ الحد",
         resetsDaily: "تُعاد التهيئة الليلة",
         resetsMonthly: "تُعاد التهيئة في الدورة القادمة",
+        resetsWeeklyDays: "{{count}} يوم(أيام) حتى إعادة التعيين",
+        resetsWeeklyDays_one: "{{count}} يوم حتى إعادة التعيين",
+        resetsWeeklyDays_other: "{{count}} أيام حتى إعادة التعيين",
+        resetsWeeklyHours: "{{count}} ساعة(ساعات) حتى إعادة التعيين",
+        resetsWeeklyHours_one: "{{count}} ساعة حتى إعادة التعيين",
+        resetsWeeklyHours_other: "{{count}} ساعات حتى إعادة التعيين",
         ctaUpgrade: "قم بالترقية للمتابعة",
         ctaTopUp: "أضف أرصدة للمتابعة",
         ariaLabel: "استخدام الذكاء الاصطناعي: {{status}}",
diff --git a/packages/i18n/src/locales/de.ts b/packages/i18n/src/locales/de.ts
index 429a2377cc..bdb05ae7e3 100644
--- a/packages/i18n/src/locales/de.ts
+++ b/packages/i18n/src/locales/de.ts
@@ -1492,6 +1492,12 @@ const de = {
         statusFull: "Limit erreicht",
         resetsDaily: "Wird heute Nacht zurückgesetzt",
         resetsMonthly: "Wird im nächsten Zyklus zurückgesetzt",
+        resetsWeeklyDays: "Wird in {{count}} Tagen zurückgesetzt",
+        resetsWeeklyDays_one: "Wird in {{count}} Tag zurückgesetzt",
+        resetsWeeklyDays_other: "Wird in {{count}} Tagen zurückgesetzt",
+        resetsWeeklyHours: "Wird in {{count}} Stunden zurückgesetzt",
+        resetsWeeklyHours_one: "Wird in {{count}} Stunde zurückgesetzt",
+        resetsWeeklyHours_other: "Wird in {{count}} Stunden zurückgesetzt",
         ctaUpgrade: "Upgraden, um weiterzumachen",
         ctaTopUp: "Credits hinzufügen, um fortzufahren",
         ariaLabel: "KI-Nutzung: {{status}}",
diff --git a/packages/i18n/src/locales/en.ts b/packages/i18n/src/locales/en.ts
index c68255010d..9c71376678 100644
--- a/packages/i18n/src/locales/en.ts
+++ b/packages/i18n/src/locales/en.ts
@@ -1805,6 +1805,17 @@ const en = {
         statusFull: 'Limit reached',
         resetsDaily: 'Resets tonight',
         resetsMonthly: 'Resets next cycle',
+        // `resetKind: 'weekly'` (free plan's rolling 7-day window, cloud PR
+        // #1852): "N days" (or "N hours" inside the final day). A REAL
+        // i18next plural family — see the `unsavedCount` note above — so the
+        // BASE key carries no suffix and must stay in every pack's lookup
+        // chain (`all-locales-key-parity.test.ts`'s base-key rule).
+        resetsWeeklyDays: 'Resets in {{count}} days',
+        resetsWeeklyDays_one: 'Resets in {{count}} day',
+        resetsWeeklyDays_other: 'Resets in {{count}} days',
+        resetsWeeklyHours: 'Resets in {{count}} hours',
+        resetsWeeklyHours_one: 'Resets in {{count}} hour',
+        resetsWeeklyHours_other: 'Resets in {{count}} hours',
         ctaUpgrade: 'Upgrade to keep going',
         ctaTopUp: 'Add credits to continue',
         ariaLabel: 'AI usage: {{status}}',
diff --git a/packages/i18n/src/locales/es.ts b/packages/i18n/src/locales/es.ts
index aa33b1b2ca..2970bf80d3 100644
--- a/packages/i18n/src/locales/es.ts
+++ b/packages/i18n/src/locales/es.ts
@@ -1496,6 +1496,12 @@ const es = {
         statusFull: "Límite alcanzado",
         resetsDaily: "Se restablece esta noche",
         resetsMonthly: "Se restablece en el próximo ciclo",
+        resetsWeeklyDays: "Se restablece en {{count}} días",
+        resetsWeeklyDays_one: "Se restablece en {{count}} día",
+        resetsWeeklyDays_other: "Se restablece en {{count}} días",
+        resetsWeeklyHours: "Se restablece en {{count}} horas",
+        resetsWeeklyHours_one: "Se restablece en {{count}} hora",
+        resetsWeeklyHours_other: "Se restablece en {{count}} horas",
         ctaUpgrade: "Mejore el plan para continuar",
         ctaTopUp: "Añada créditos para continuar",
         ariaLabel: "Uso de IA: {{status}}",
diff --git a/packages/i18n/src/locales/fr.ts b/packages/i18n/src/locales/fr.ts
index 746f9069f6..5078a8b133 100644
--- a/packages/i18n/src/locales/fr.ts
+++ b/packages/i18n/src/locales/fr.ts
@@ -1494,6 +1494,12 @@ const fr = {
         statusFull: "Limite atteinte",
         resetsDaily: "Réinitialisation ce soir",
         resetsMonthly: "Réinitialisation au prochain cycle",
+        resetsWeeklyDays: "Réinitialisation dans {{count}} jours",
+        resetsWeeklyDays_one: "Réinitialisation dans {{count}} jour",
+        resetsWeeklyDays_other: "Réinitialisation dans {{count}} jours",
+        resetsWeeklyHours: "Réinitialisation dans {{count}} heures",
+        resetsWeeklyHours_one: "Réinitialisation dans {{count}} heure",
+        resetsWeeklyHours_other: "Réinitialisation dans {{count}} heures",
         ctaUpgrade: "Passer à l'offre supérieure pour continuer",
         ctaTopUp: "Ajouter des crédits pour continuer",
         ariaLabel: "Utilisation de l'IA : {{status}}",
diff --git a/packages/i18n/src/locales/ja.ts b/packages/i18n/src/locales/ja.ts
index 947edd8fa6..a99d6be8a7 100644
--- a/packages/i18n/src/locales/ja.ts
+++ b/packages/i18n/src/locales/ja.ts
@@ -1494,6 +1494,12 @@ const ja = {
         statusFull: "上限に達しました",
         resetsDaily: "今夜リセットされます",
         resetsMonthly: "次のサイクルでリセットされます",
+        resetsWeeklyDays: "{{count}}日後にリセットされます",
+        resetsWeeklyDays_one: "{{count}}日後にリセットされます",
+        resetsWeeklyDays_other: "{{count}}日後にリセットされます",
+        resetsWeeklyHours: "{{count}}時間後にリセットされます",
+        resetsWeeklyHours_one: "{{count}}時間後にリセットされます",
+        resetsWeeklyHours_other: "{{count}}時間後にリセットされます",
         ctaUpgrade: "アップグレードして続行",
         ctaTopUp: "クレジットを追加して続行",
         ariaLabel: "AI 使用状況: {{status}}",
diff --git a/packages/i18n/src/locales/ko.ts b/packages/i18n/src/locales/ko.ts
index 5a9cd363a0..66073cf4b0 100644
--- a/packages/i18n/src/locales/ko.ts
+++ b/packages/i18n/src/locales/ko.ts
@@ -1492,6 +1492,12 @@ const ko = {
         statusFull: "한도에 도달했습니다",
         resetsDaily: "오늘 밤 초기화됩니다",
         resetsMonthly: "다음 주기에 초기화됩니다",
+        resetsWeeklyDays: "{{count}}일 후 초기화됩니다",
+        resetsWeeklyDays_one: "{{count}}일 후 초기화됩니다",
+        resetsWeeklyDays_other: "{{count}}일 후 초기화됩니다",
+        resetsWeeklyHours: "{{count}}시간 후 초기화됩니다",
+        resetsWeeklyHours_one: "{{count}}시간 후 초기화됩니다",
+        resetsWeeklyHours_other: "{{count}}시간 후 초기화됩니다",
         ctaUpgrade: "업그레이드하고 계속하기",
         ctaTopUp: "크레딧을 추가하고 계속하기",
         ariaLabel: "AI 사용량: {{status}}",
diff --git a/packages/i18n/src/locales/pt.ts b/packages/i18n/src/locales/pt.ts
index f6774ba163..5ead6c97b1 100644
--- a/packages/i18n/src/locales/pt.ts
+++ b/packages/i18n/src/locales/pt.ts
@@ -1491,6 +1491,12 @@ const pt = {
         statusFull: "Limite atingido",
         resetsDaily: "Redefine hoje à noite",
         resetsMonthly: "Redefine no próximo ciclo",
+        resetsWeeklyDays: "Redefine em {{count}} dias",
+        resetsWeeklyDays_one: "Redefine em {{count}} dia",
+        resetsWeeklyDays_other: "Redefine em {{count}} dias",
+        resetsWeeklyHours: "Redefine em {{count}} horas",
+        resetsWeeklyHours_one: "Redefine em {{count}} hora",
+        resetsWeeklyHours_other: "Redefine em {{count}} horas",
         ctaUpgrade: "Faça upgrade para continuar",
         ctaTopUp: "Adicione créditos para continuar",
         ariaLabel: "Uso de IA: {{status}}",
diff --git a/packages/i18n/src/locales/ru.ts b/packages/i18n/src/locales/ru.ts
index 4b7bd9da36..8f74f0c407 100644
--- a/packages/i18n/src/locales/ru.ts
+++ b/packages/i18n/src/locales/ru.ts
@@ -1504,6 +1504,12 @@ const ru = {
         statusFull: "Лимит исчерпан",
         resetsDaily: "Сбросится сегодня ночью",
         resetsMonthly: "Сбросится в следующем цикле",
+        resetsWeeklyDays: "Сброс через {{count}} дней",
+        resetsWeeklyDays_one: "Сброс через {{count}} день",
+        resetsWeeklyDays_other: "Сброс через {{count}} дней",
+        resetsWeeklyHours: "Сброс через {{count}} часов",
+        resetsWeeklyHours_one: "Сброс через {{count}} час",
+        resetsWeeklyHours_other: "Сброс через {{count}} часов",
         ctaUpgrade: "Повысьте тариф, чтобы продолжить",
         ctaTopUp: "Добавьте кредиты, чтобы продолжить",
         ariaLabel: "Использование ИИ: {{status}}",
diff --git a/packages/i18n/src/locales/zh.ts b/packages/i18n/src/locales/zh.ts
index 4afc7a9ed1..4e74c36dad 100644
--- a/packages/i18n/src/locales/zh.ts
+++ b/packages/i18n/src/locales/zh.ts
@@ -1652,6 +1652,12 @@ const zh = {
         statusFull: '额度已用完',
         resetsDaily: '今晚重置',
         resetsMonthly: '下个周期重置',
+        resetsWeeklyDays: '{{count}} 天后重置',
+        resetsWeeklyDays_one: '{{count}} 天后重置',
+        resetsWeeklyDays_other: '{{count}} 天后重置',
+        resetsWeeklyHours: '{{count}} 小时后重置',
+        resetsWeeklyHours_one: '{{count}} 小时后重置',
+        resetsWeeklyHours_other: '{{count}} 小时后重置',
         ctaUpgrade: '升级以继续使用',
         ctaTopUp: '购买额度包以继续',
         ariaLabel: 'AI 用量：{{status}}',

From 3003f23090f2b44aad4f2dceb7bc069c8c73ae49 Mon Sep 17 00:00:00 2001
From: Jack Zhuang <50353452+hotlong@users.noreply.github.com>
Date: Wed, 2 Sep 2026 22:15:02 +0800
Subject: [PATCH 2/2] fix(app-shell): move Date.now() out of AiUsageIndicator's
 render body

CI lint caught `react-hooks/purity` (error): `weeklyResetLabel` called
`Date.now()` directly during render. The "now" read now lives in a
`useState<number | null>(null)` populated by a mount effect (refreshed every
60s while the popover's host stays mounted); the render body only reads that
state and does pure day/hour math from it. `now === null` (the one frame
before the effect fires) renders no reset line, same as any other
not-yet-known input on this component.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
---
 .../app-shell/src/layout/AiUsageIndicator.tsx | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/packages/app-shell/src/layout/AiUsageIndicator.tsx b/packages/app-shell/src/layout/AiUsageIndicator.tsx
index 4a70e3aa05..1ae66824d9 100644
--- a/packages/app-shell/src/layout/AiUsageIndicator.tsx
+++ b/packages/app-shell/src/layout/AiUsageIndicator.tsx
@@ -99,6 +99,20 @@ export function AiUsageIndicator({ apiBase, enabled = true, className }: AiUsage
   const { t } = useObjectTranslation();
   const { usage } = useAiUsage({ apiBase, enabled });
 
+  // "Now", read OUTSIDE render (react-hooks/purity forbids `Date.now()` in the
+  // render body — it is non-deterministic and the compiler assumes render can
+  // re-run any number of times). `null` until the mount effect measures it —
+  // the render body itself never calls `Date.now()`, only reads this state —
+  // then refreshed periodically so a long-open popover's "N days/hours" stays
+  // roughly current; the countdown is day/hour-grained, so a minute of drift
+  // is invisible.
+  const [now, setNow] = React.useState<number | null>(null);
+  React.useEffect(() => {
+    setNow(Date.now());
+    const id = setInterval(() => setNow(Date.now()), 60_000);
+    return () => clearInterval(id);
+  }, []);
+
   const meters = React.useMemo<RenderableMeter[]>(() => {
     if (!usage) return [];
     const out: RenderableMeter[] = [];
@@ -126,11 +140,12 @@ export function AiUsageIndicator({ apiBase, enabled = true, className }: AiUsage
   };
 
   // `resetKind: 'weekly'` (the free plan's rolling 7-day window, cloud PR #1852):
-  // "N days" (or "N hours" inside the final day), derived from `resetsAt`.
+  // "N days" (or "N hours" inside the final day), derived from `resetsAt` and
+  // the `now` state above — PURE given those two inputs, no clock read here.
   // Contract-first (objectui#7371) — `resetsAt` is the ONE source of the reset
   // instant; never re-derive or guess it client-side.
-  const weeklyResetLabel = (resetsAt: string): string => {
-    const diffMs = new Date(resetsAt).getTime() - Date.now();
+  const weeklyResetLabel = (resetsAt: string, nowMs: number): string => {
+    const diffMs = new Date(resetsAt).getTime() - nowMs;
     if (diffMs <= ONE_DAY_MS) {
       const hours = Math.max(1, Math.ceil(diffMs / ONE_HOUR_MS));
       return t('console.ai.usage.resetsWeeklyHours', { count: hours, defaultValue: 'Resets in {{count}} hours' });
@@ -141,13 +156,16 @@ export function AiUsageIndicator({ apiBase, enabled = true, className }: AiUsage
 
   // `null` = render nothing for this line — an unrecognized `resetKind` (a
   // future backend value this build doesn't know yet) fails soft instead of
-  // crashing or showing stale/wrong copy, and a `weekly` meter with no
-  // `resetsAt` yet (nothing counted) is never guessed at (objectui#7371).
+  // crashing or showing stale/wrong copy, a `weekly` meter with no `resetsAt`
+  // yet (nothing counted) is never guessed at (objectui#7371), and `now` not
+  // yet measured (the one frame before the mount effect above runs) is the
+  // same "nothing to show yet" as any other missing input.
   const resetLabel = (meter: AiMeterUsage): string | null => {
     if (meter.resetKind === 'daily') return t('console.ai.usage.resetsDaily', { defaultValue: 'Resets tonight' });
     if (meter.resetKind === 'monthly')
       return t('console.ai.usage.resetsMonthly', { defaultValue: 'Resets next cycle' });
-    if (meter.resetKind === 'weekly') return meter.resetsAt ? weeklyResetLabel(meter.resetsAt) : null;
+    if (meter.resetKind === 'weekly')
+      return meter.resetsAt && now !== null ? weeklyResetLabel(meter.resetsAt, now) : null;
     return null;
   };