The best way to control Claude Code, Codex and more from any computer or phone
fix(web,mobile): usage-limit recovery banner updates copy after reset passes (#39889)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Charles Bine committed
Nov 20, 2026 at 18:12 UTC
8d37736cddce74e7cc7ff965b26b1d3ea1fbcd7d
25 files changed
+230
-83
apps/mobile/src/features/threads/UsageLimitRecoveryCard.test.tsx
+12
@@ -68,6 +68,8 @@ describe("UsageLimitRecoveryCard", () => {
68
["Manage usage", "Resume at reset", "Snooze until reset"],
69
],
70
])("shows one ChatGPT notice for %s (%s, reset %s)", (code, errorClass, resetAt, actions) => {
71
+ using _timers = { [Symbol.dispose]: () => vi.useRealTimers() };
72
+ vi.useFakeTimers({ now: 0 });
73
const container = document.createElement("div");
74
const root = createRoot(container);
75
using _root = { [Symbol.dispose]: () => act(() => root.unmount()) };
@@ -150,9 +152,19 @@ describe("UsageLimitRecoveryCard", () => {
152
(button) => button.textContent === "Snooze until reset",
153
);
154
expect(snooze()?.disabled).toBe(false);
155
+ expect(container.textContent).toContain("Usage limit reached. Resets ");
156
+ expect([...container.querySelectorAll("button")].map((button) => button.textContent)).toEqual([
157
+ "Resume at reset",
158
+ "Snooze until reset",
159
+ ]);
160
161
act(() => vi.advanceTimersByTime(30 * DAY_MS));
162
163
expect(snooze()?.disabled).toBe(true);
164
+ expect(container.textContent).toContain("Usage limit reached. Reset ");
165
+ expect([...container.querySelectorAll("button")].map((button) => button.textContent)).toEqual([
166
+ "Resume now",
167
+ "Snooze until reset",
168
+ ]);
169
});
170
});
apps/mobile/src/features/threads/UsageLimitRecoveryCard.tsx
+21
-8
@@ -51,6 +51,7 @@ export function UsageLimitRecoveryCard({
51
Date.parse(thread.snoozedUntil) > Date.parse(resetAt)
52
? thread.snoozedUntil
53
: resetAt;
54
+ const displayPassed = useDeadlinePassed(displayAt === null ? null : Date.parse(displayAt));
55
const [copied, setCopied] = useState(false);
56
const [actionPending, setActionPending] = useState(false);
57
const code = thread.runtime?.lastErrorCode;
@@ -64,21 +65,25 @@ export function UsageLimitRecoveryCard({
65
!runId
66
)
67
return null;
67
- const resetDate = displayAt
68
- ? new Date(displayAt).toLocaleString(undefined, {
68
+ const resumes = canSchedule && scheduled;
69
+ const resumesUpcoming = resumes && !displayPassed;
70
+ const shownAt = resumesUpcoming ? displayAt : resetAt;
71
+ const resetDate = shownAt
72
+ ? new Date(shownAt).toLocaleString(undefined, {
73
month: "short",
74
day: "numeric",
75
hour: "numeric",
76
minute: "2-digit",
77
})
78
: null;
75
- const resumes = canSchedule && scheduled;
79
const resetText =
80
resetDate === null
81
? null
79
- : resumes
82
+ : resumesUpcoming
83
? gt("Resumes {date}.", { date: resetDate })
81
- : gt("Resets {date}.", { date: resetDate });
84
+ : resetPassed
85
+ ? gt("Reset {date}.", { date: resetDate })
86
+ : gt("Resets {date}.", { date: resetDate });
87
const snoozed =
88
limitRecoveryOwnsSnooze({
89
runId,
@@ -171,9 +176,11 @@ export function UsageLimitRecoveryCard({
176
: chatGptLimit
177
? (resetText ?? gt("Review your usage settings in ChatGPT."))
178
: resetDate !== null
174
- ? resumes
179
+ ? resumesUpcoming
180
? gt("Usage limit reached. Resumes {date}.", { date: resetDate })
176
- : gt("Usage limit reached. Resets {date}.", { date: resetDate })
181
+ : resetPassed
182
+ ? gt("Usage limit reached. Reset {date}.", { date: resetDate })
183
+ : gt("Usage limit reached. Resets {date}.", { date: resetDate })
184
: gt(
185
"Usage limit reached. The provider did not report a reset time. Retry manually when your limit is available.",
186
)}
@@ -192,7 +199,13 @@ export function UsageLimitRecoveryCard({
199
{canSchedule ? (
200
<>
201
<RecoveryAction
195
- label={scheduled ? gt("Cancel auto-resume") : gt("Resume at reset")}
202
+ label={
203
+ scheduled
204
+ ? gt("Cancel auto-resume")
205
+ : resetPassed
206
+ ? gt("Resume now")
207
+ : gt("Resume at reset")
208
+ }
209
disabled={pending}
210
onPress={() => void toggle("resume")}
211
/>
apps/mobile/src/i18n/translations/de.json
+3
@@ -4672,6 +4672,7 @@
4672
"815190b32ad959c9": "Sein Thread ist noch nicht verfügbar",
4673
"2a61b633ec5035a5": "Noch keine Agenten",
4674
"fe32057bfc66015e": "Wird am {date} fortgesetzt.",
4675
+ "7792e72ddecb6733": "Wurde am {date} zurückgesetzt.",
4676
"1ff565598548c159": "Wird am {date} zurückgesetzt.",
4677
"babea77bd5527a74": "Der Zeitpunkt der Zurücksetzung ist vorbei. Versuche den Thread manuell erneut.",
4678
"21159303dd4c3a69": "Wiederherstellung nach Limit konnte nicht geändert werden.",
@@ -4683,9 +4684,11 @@
4684
"6b927e12047d36ed": "Du hast das Limit deines Workspaces für die Nutzung deines ChatGPT-Abos in anderen Apps erreicht. Kopiere eine Anfrage, um deinen Workspace-Admin um höhere Nutzungslimits zu bitten.",
4685
"3c842d1f3db7c6b3": "Prüfe deine Nutzungseinstellungen in ChatGPT.",
4686
"7c4d4a4481a7051d": "Nutzungslimit erreicht. Wird am {date} fortgesetzt.",
4687
+ "80f1a012bba078e1": "Nutzungslimit erreicht. Wurde am {date} zurückgesetzt.",
4688
"e4fa62fc48f25391": "Nutzungslimit erreicht. Wird am {date} zurückgesetzt.",
4689
"2e3243344196188b": "Nutzungslimit erreicht. Der Anbieter hat keinen Zeitpunkt für die Zurücksetzung gemeldet. Versuch es manuell erneut, wenn dein Limit verfügbar ist.",
4690
"0233fffeb2b0c531": "Automatisches Fortsetzen abbrechen",
4691
+ "df86826bcb3eb1c3": "Jetzt fortsetzen",
4692
"f89ef34bbf5911ee": "Bei Zurücksetzung fortsetzen",
4693
"51a1a709a4972f7e": "Bis zur Zurücksetzung zurückstellen",
4694
"e2dd1df33d37f171": "ChatGPT-Nutzungslimit erreicht",
apps/mobile/src/i18n/translations/en.json
+3
@@ -4673,6 +4673,7 @@
4673
"815190b32ad959c9": "Its thread is not available yet",
4674
"2a61b633ec5035a5": "No agents yet",
4675
"fe32057bfc66015e": "Resumes {date}.",
4676
+ "7792e72ddecb6733": "Reset {date}.",
4677
"1ff565598548c159": "Resets {date}.",
4678
"babea77bd5527a74": "The reset time has passed. Retry the thread manually.",
4679
"21159303dd4c3a69": "Could not change limit recovery.",
@@ -4684,9 +4685,11 @@
4685
"6b927e12047d36ed": "You've reached your workspace's limit for using your ChatGPT plan in other apps. Copy a request to ask your workspace admin for increased usage limits.",
4686
"3c842d1f3db7c6b3": "Review your usage settings in ChatGPT.",
4687
"7c4d4a4481a7051d": "Usage limit reached. Resumes {date}.",
4688
+ "80f1a012bba078e1": "Usage limit reached. Reset {date}.",
4689
"e4fa62fc48f25391": "Usage limit reached. Resets {date}.",
4690
"2e3243344196188b": "Usage limit reached. The provider did not report a reset time. Retry manually when your limit is available.",
4691
"0233fffeb2b0c531": "Cancel auto-resume",
4692
+ "df86826bcb3eb1c3": "Resume now",
4693
"f89ef34bbf5911ee": "Resume at reset",
4694
"51a1a709a4972f7e": "Snooze until reset",
4695
"e2dd1df33d37f171": "ChatGPT usage limit reached",
apps/mobile/src/i18n/translations/es.json
+3
@@ -4665,6 +4665,7 @@
4665
"815190b32ad959c9": "Su hilo aún no está disponible",
4666
"2a61b633ec5035a5": "Aún no hay agentes",
4667
"fe32057bfc66015e": "Se reanuda {date}.",
4668
+ "7792e72ddecb6733": "Se restableció {date}.",
4669
"1ff565598548c159": "Se restablece {date}.",
4670
"babea77bd5527a74": "La hora de restablecimiento ya pasó. Vuelve a intentar el hilo manualmente.",
4671
"21159303dd4c3a69": "No se pudo cambiar la recuperación tras el límite.",
@@ -4676,9 +4677,11 @@
4677
"6b927e12047d36ed": "Has alcanzado el límite de tu espacio de trabajo para usar tu plan de ChatGPT en otras apps. Copia una solicitud para pedir al administrador de tu espacio de trabajo más límite de uso.",
4678
"3c842d1f3db7c6b3": "Revisa tus ajustes de uso en ChatGPT.",
4679
"7c4d4a4481a7051d": "Se alcanzó el límite de uso. Se reanuda {date}.",
4680
+ "80f1a012bba078e1": "Se alcanzó el límite de uso. Se restableció {date}.",
4681
"e4fa62fc48f25391": "Se alcanzó el límite de uso. Se restablece {date}.",
4682
"2e3243344196188b": "Se alcanzó el límite de uso. El proveedor no indicó cuándo se restablece. Vuelve a intentarlo manualmente cuando tu límite esté disponible.",
4683
"0233fffeb2b0c531": "Cancelar reanudación automática",
4684
+ "df86826bcb3eb1c3": "Reanudar ahora",
4685
"f89ef34bbf5911ee": "Reanudar al restablecerse",
4686
"51a1a709a4972f7e": "Posponer hasta que se restablezca",
4687
"e2dd1df33d37f171": "Se alcanzó el límite de uso de ChatGPT",
apps/mobile/src/i18n/translations/fr.json
+3
@@ -4666,6 +4666,7 @@
4666
"815190b32ad959c9": "Son fil n’est pas encore disponible",
4667
"2a61b633ec5035a5": "Pas encore d’agent",
4668
"fe32057bfc66015e": "Reprise le {date}.",
4669
+ "7792e72ddecb6733": "Réinitialisé le {date}.",
4670
"1ff565598548c159": "Réinitialisation le {date}.",
4671
"babea77bd5527a74": "L’heure de réinitialisation est passée. Relancez le fil manuellement.",
4672
"21159303dd4c3a69": "Impossible de modifier la récupération après limite.",
@@ -4677,9 +4678,11 @@
4678
"6b927e12047d36ed": "Vous avez atteint la limite de votre espace de travail pour l’utilisation de votre forfait ChatGPT dans d’autres apps. Copiez une demande pour solliciter une hausse des limites d’utilisation auprès de l’administrateur de votre espace de travail.",
4679
"3c842d1f3db7c6b3": "Vérifiez vos paramètres d’utilisation dans ChatGPT.",
4680
"7c4d4a4481a7051d": "Limite d’utilisation atteinte. Reprise le {date}.",
4681
+ "80f1a012bba078e1": "Limite d’utilisation atteinte. Réinitialisé le {date}.",
4682
"e4fa62fc48f25391": "Limite d’utilisation atteinte. Réinitialisation le {date}.",
4683
"2e3243344196188b": "Limite d’utilisation atteinte. Le fournisseur n’a pas indiqué d’heure de réinitialisation. Réessayez manuellement quand votre limite sera disponible.",
4684
"0233fffeb2b0c531": "Annuler la reprise automatique",
4685
+ "df86826bcb3eb1c3": "Reprendre maintenant",
4686
"f89ef34bbf5911ee": "Reprendre à la réinitialisation",
4687
"51a1a709a4972f7e": "Reporter jusqu’à la réinitialisation",
4688
"e2dd1df33d37f171": "Limite d’utilisation ChatGPT atteinte",
apps/mobile/src/i18n/translations/ja.json
+3
@@ -4647,6 +4647,7 @@
4647
"815190b32ad959c9": "スレッドはまだ利用できません",
4648
"2a61b633ec5035a5": "エージェントはまだいません",
4649
"fe32057bfc66015e": "{date} に再開します。",
4650
+ "7792e72ddecb6733": "{date} にリセットされました。",
4651
"1ff565598548c159": "{date} にリセットされます。",
4652
"babea77bd5527a74": "リセット時刻を過ぎました。スレッドを手動で再試行してください。",
4653
"21159303dd4c3a69": "上限からの回復方法を変更できませんでした。",
@@ -4658,9 +4659,11 @@
4659
"6b927e12047d36ed": "ChatGPT プランを他のアプリで使用する際の、ワークスペースの上限に達しました。リクエストをコピーして、ワークスペースの管理者に使用量の上限の引き上げを依頼してください。",
4660
"3c842d1f3db7c6b3": "ChatGPT で使用量の設定を確認してください。",
4661
"7c4d4a4481a7051d": "使用量の上限に達しました。{date} に再開します。",
4662
+ "80f1a012bba078e1": "使用量の上限に達しました。{date} にリセットされました。",
4663
"e4fa62fc48f25391": "使用量の上限に達しました。{date} にリセットされます。",
4664
"2e3243344196188b": "使用量の上限に達しました。プロバイダーからリセット時刻が報告されていません。上限が回復したら手動で再試行してください。",
4665
"0233fffeb2b0c531": "自動再開をキャンセル",
4666
+ "df86826bcb3eb1c3": "今すぐ再開",
4667
"f89ef34bbf5911ee": "リセット時に再開",
4668
"51a1a709a4972f7e": "リセットまでスヌーズ",
4669
"e2dd1df33d37f171": "ChatGPT の使用量の上限に達しました",
apps/mobile/src/i18n/translations/ko.json
+3
@@ -4652,6 +4652,7 @@
4652
"815190b32ad959c9": "아직 스레드를 사용할 수 없습니다",
4653
"2a61b633ec5035a5": "아직 에이전트 없음",
4654
"fe32057bfc66015e": "{date}에 재개됩니다.",
4655
+ "7792e72ddecb6733": "{date}에 초기화되었습니다.",
4656
"1ff565598548c159": "{date}에 초기화됩니다.",
4657
"babea77bd5527a74": "초기화 시간이 지났습니다. 스레드를 직접 다시 시도하세요.",
4658
"21159303dd4c3a69": "한도 복구 설정을 변경할 수 없습니다.",
@@ -4663,9 +4664,11 @@
4664
"6b927e12047d36ed": "다른 앱에서 ChatGPT 요금제를 사용할 수 있는 작업 공간 한도에 도달했습니다. 요청을 복사하여 작업 공간 관리자에게 사용량 한도 상향을 요청하세요.",
4665
"3c842d1f3db7c6b3": "ChatGPT에서 사용량 설정을 확인하세요.",
4666
"7c4d4a4481a7051d": "사용량 한도에 도달했습니다. {date}에 재개됩니다.",
4667
+ "80f1a012bba078e1": "사용량 한도에 도달했습니다. {date}에 초기화되었습니다.",
4668
"e4fa62fc48f25391": "사용량 한도에 도달했습니다. {date}에 초기화됩니다.",
4669
"2e3243344196188b": "사용량 한도에 도달했습니다. 제공자가 초기화 시간을 보고하지 않았습니다. 한도를 다시 사용할 수 있게 되면 직접 다시 시도하세요.",
4670
"0233fffeb2b0c531": "자동 재개 취소",
4671
+ "df86826bcb3eb1c3": "지금 재개",
4672
"f89ef34bbf5911ee": "초기화 시 재개",
4673
"51a1a709a4972f7e": "초기화될 때까지 다시 알림",
4674
"e2dd1df33d37f171": "ChatGPT 사용량 한도에 도달함",
apps/mobile/src/i18n/translations/pt-BR.json
+3
@@ -4666,6 +4666,7 @@
4666
"815190b32ad959c9": "A thread dele ainda não está disponível",
4667
"2a61b633ec5035a5": "Nenhum agente ainda",
4668
"fe32057bfc66015e": "Retoma {date}.",
4669
+ "7792e72ddecb6733": "Redefinido em {date}.",
4670
"1ff565598548c159": "Redefine {date}.",
4671
"babea77bd5527a74": "O horário de renovação já passou. Tente a thread novamente manualmente.",
4672
"21159303dd4c3a69": "Não foi possível alterar a recuperação de limite.",
@@ -4677,9 +4678,11 @@
4678
"6b927e12047d36ed": "Você atingiu o limite do seu workspace para usar o plano do ChatGPT em outros apps. Copie um pedido para solicitar ao administrador do workspace limites de uso maiores.",
4679
"3c842d1f3db7c6b3": "Revise suas configurações de uso no ChatGPT.",
4680
"7c4d4a4481a7051d": "Limite de uso atingido. Retoma {date}.",
4681
+ "80f1a012bba078e1": "Limite de uso atingido. Redefinido em {date}.",
4682
"e4fa62fc48f25391": "Limite de uso atingido. Redefine {date}.",
4683
"2e3243344196188b": "Limite de uso atingido. O provedor não informou um horário de redefinição. Tente novamente manualmente quando seu limite estiver disponível.",
4684
"0233fffeb2b0c531": "Cancelar a retomada automática",
4685
+ "df86826bcb3eb1c3": "Retomar agora",
4686
"f89ef34bbf5911ee": "Retomar na renovação",
4687
"51a1a709a4972f7e": "Adiar até a renovação",
4688
"e2dd1df33d37f171": "Limite de uso do ChatGPT atingido",
apps/mobile/src/i18n/translations/ru.json
+3
@@ -4744,6 +4744,7 @@
4744
"815190b32ad959c9": "Его тред пока недоступен",
4745
"2a61b633ec5035a5": "Агентов пока нет",
4746
"fe32057bfc66015e": "Возобновится {date}.",
4747
+ "7792e72ddecb6733": "Сброшен {date}.",
4748
"1ff565598548c159": "Сброс {date}.",
4749
"babea77bd5527a74": "Время сброса прошло. Повторите тред вручную.",
4750
"21159303dd4c3a69": "Не удалось изменить восстановление после лимита.",
@@ -4755,9 +4756,11 @@
4756
"6b927e12047d36ed": "Вы достигли лимита рабочего пространства на использование тарифа ChatGPT в других приложениях. Скопируйте запрос, чтобы попросить администратора увеличить лимиты.",
4757
"3c842d1f3db7c6b3": "Проверьте настройки использования в ChatGPT.",
4758
"7c4d4a4481a7051d": "Достигнут лимит использования. Возобновится {date}.",
4759
+ "80f1a012bba078e1": "Достигнут лимит использования. Сброшен {date}.",
4760
"e4fa62fc48f25391": "Достигнут лимит использования. Сброс {date}.",
4761
"2e3243344196188b": "Достигнут лимит использования. Провайдер не сообщил время сброса. Повторите вручную, когда лимит станет доступен.",
4762
"0233fffeb2b0c531": "Отменить автовозобновление",
4763
+ "df86826bcb3eb1c3": "Возобновить сейчас",
4764
"f89ef34bbf5911ee": "Возобновить после сброса",
4765
"51a1a709a4972f7e": "Отложить до сброса",
4766
"e2dd1df33d37f171": "Достигнут лимит использования ChatGPT",
apps/mobile/src/i18n/translations/sv.json
+3
@@ -4672,6 +4672,7 @@
4672
"815190b32ad959c9": "Dess tråd är inte tillgänglig än",
4673
"2a61b633ec5035a5": "Inga agenter än",
4674
"fe32057bfc66015e": "Återupptas {date}.",
4675
+ "7792e72ddecb6733": "Återställdes {date}.",
4676
"1ff565598548c159": "Återställs {date}.",
4677
"babea77bd5527a74": "Återställningstiden har passerat. Försök med tråden igen manuellt.",
4678
"21159303dd4c3a69": "Kunde inte ändra återhämtning efter gräns.",
@@ -4683,9 +4684,11 @@
4684
"6b927e12047d36ed": "Du har nått arbetsytans gräns för att använda ditt ChatGPT-abonnemang i andra appar. Kopiera en begäran och be administratören för din arbetsyta om högre användningsgränser.",
4685
"3c842d1f3db7c6b3": "Granska dina användningsinställningar i ChatGPT.",
4686
"7c4d4a4481a7051d": "Användningsgränsen har nåtts. Återupptas {date}.",
4687
+ "80f1a012bba078e1": "Användningsgränsen har nåtts. Återställdes {date}.",
4688
"e4fa62fc48f25391": "Användningsgränsen har nåtts. Återställs {date}.",
4689
"2e3243344196188b": "Användningsgränsen har nåtts. Leverantören rapporterade ingen återställningstid. Försök igen manuellt när din gräns är tillgänglig.",
4690
"0233fffeb2b0c531": "Avbryt automatisk återupptagning",
4691
+ "df86826bcb3eb1c3": "Återuppta nu",
4692
"f89ef34bbf5911ee": "Återuppta vid återställning",
4693
"51a1a709a4972f7e": "Snooza till återställning",
4694
"e2dd1df33d37f171": "Användningsgränsen för ChatGPT har nåtts",
apps/mobile/src/i18n/translations/zh.json
+3
@@ -4655,6 +4655,7 @@
4655
"815190b32ad959c9": "其会话尚不可用",
4656
"2a61b633ec5035a5": "还没有智能体",
4657
"fe32057bfc66015e": "{date} 继续。",
4658
+ "7792e72ddecb6733": "已于 {date} 重置。",
4659
"1ff565598548c159": "{date} 重置。",
4660
"babea77bd5527a74": "重置时间已过,请手动重试这个会话。",
4661
"21159303dd4c3a69": "无法更改限制恢复设置。",
@@ -4666,9 +4667,11 @@
4667
"6b927e12047d36ed": "你已达到工作区允许在其他应用中使用 ChatGPT 套餐的上限。复制一份申请,请工作区管理员提高用量限制。",
4668
"3c842d1f3db7c6b3": "在 ChatGPT 中查看你的用量设置。",
4669
"7c4d4a4481a7051d": "已达到用量限制。{date} 继续。",
4670
+ "80f1a012bba078e1": "已达到用量限制。已于 {date} 重置。",
4671
"e4fa62fc48f25391": "已达到用量限制。{date} 重置。",
4672
"2e3243344196188b": "已达到用量限制。提供方未报告重置时间。请在额度可用时手动重试。",
4673
"0233fffeb2b0c531": "取消自动继续",
4674
+ "df86826bcb3eb1c3": "立即继续",
4675
"f89ef34bbf5911ee": "重置后自动继续",
4676
"51a1a709a4972f7e": "暂缓到重置时",
4677
"e2dd1df33d37f171": "已达到 ChatGPT 用量上限",
apps/web/src/components/ChatView.tsx
+22
-23
@@ -40,7 +40,7 @@ import { useComposerResume } from "./chat/useComposerResume";
40
import { ThreadFind, ThreadFindCanvas } from "./chat/ThreadFindProvider";
41
import { closeThreadFind, openThreadFind, useThreadFindOpen } from "./chat/threadFindStore";
42
import { THREAD_FIND_BAR_RESERVED_HEIGHT } from "./chat/ThreadFindBar";
43
-import { usageLimitRecoveryBannerItem } from "./chat/UsageLimitRecoveryBanner";
43
+import { useUsageLimitRecoveryBannerItem } from "./chat/UsageLimitRecoveryBanner";
44
import {
45
isThreadEnvironmentLocked,
46
resolveDraftHeroState,
@@ -2636,30 +2636,29 @@ export default function ChatView(props: ChatViewProps) {
2636
);
2637
return item ? [item] : [];
2638
});
2639
- const limitRecoveryBanner =
2639
+ const limitRecoveryBanner = useUsageLimitRecoveryBannerItem(
2640
limitRecoveryRun !== null && activeThreadShell !== null
2641
- ? usageLimitRecoveryBannerItem(
2642
- {
2643
- runId: limitRecoveryRun.runId,
2644
- errorCode: serverRuntime?.lastErrorCode ?? null,
2645
- resetAt: serverRuntime?.usageLimitResetAt ?? null,
2646
- stoppedAt: limitRecoveryRun.completedAt ?? activeThreadShell.updatedAt,
2647
- settled: activeThreadShell.settledOverride === "settled",
2648
- requestPending: pendingApprovals.length > 0 || pendingUserInputs.length > 0,
2649
- recovery: activeThreadShell.limitRecovery ?? null,
2650
- snoozedUntil: activeThreadShell.snoozedUntil,
2651
- timestampFormat,
2652
- onChange: async (limitRecovery) => {
2653
- const result = await updateThreadMetadata({
2654
- environmentId,
2655
- input: { threadId: activeThreadShell.id, limitRecovery },
2656
- });
2657
- if (result._tag === "Failure") throw squashAtomCommandFailure(result);
2658
- },
2641
+ ? {
2642
+ runId: limitRecoveryRun.runId,
2643
+ errorCode: serverRuntime?.lastErrorCode ?? null,
2644
+ resetAt: serverRuntime?.usageLimitResetAt ?? null,
2645
+ stoppedAt: limitRecoveryRun.completedAt ?? activeThreadShell.updatedAt,
2646
+ settled: activeThreadShell.settledOverride === "settled",
2647
+ requestPending: pendingApprovals.length > 0 || pendingUserInputs.length > 0,
2648
+ recovery: activeThreadShell.limitRecovery ?? null,
2649
+ snoozedUntil: activeThreadShell.snoozedUntil,
2650
+ timestampFormat,
2651
+ onChange: async (limitRecovery) => {
2652
+ const result = await updateThreadMetadata({
2653
+ environmentId,
2654
+ input: { threadId: activeThreadShell.id, limitRecovery },
2655
+ });
2656
+ if (result._tag === "Failure") throw squashAtomCommandFailure(result);
2657
},
2660
- messages,
2661
- )
2662
- : null;
2658
+ }
2659
+ : null,
2660
+ messages,
2661
+ );
2662
const composerBannerItems = (() => {
2663
const fallbackSelection = draftFallback?.selection;
2664
const defaultSelection =
apps/web/src/components/chat/UsageLimitRecoveryBanner.test.tsx
+53
-6
@@ -6,7 +6,7 @@ import { usageLimitRecoveryBannerItem } from "./UsageLimitRecoveryBanner";
6
7
const stoppedAt = new Date(2026, 9, 20, 12, 0);
8
9
-function bannerDescription(resetAt: Date, timestampFormat: TimestampFormat) {
9
+function bannerItem(resetAt: Date, timestampFormat: TimestampFormat = "24-hour") {
10
return usageLimitRecoveryBannerItem({
11
runId: RunId.make("run-1"),
12
errorCode: null,
@@ -18,7 +18,7 @@ function bannerDescription(resetAt: Date, timestampFormat: TimestampFormat) {
18
recovery: null,
19
timestampFormat,
20
onChange: async () => {},
21
- }).description;
21
+ });
22
}
23
24
describe("usageLimitRecoveryBannerItem", () => {
@@ -27,13 +27,60 @@ describe("usageLimitRecoveryBannerItem", () => {
27
["24-hour", "Resets 17:30"],
28
] as const)("formats a same-day reset with the %s setting", (timestampFormat, expected) => {
29
using _now = vi.spyOn(Date, "now").mockReturnValue(stoppedAt.getTime());
30
- expect(bannerDescription(new Date(2026, 9, 20, 17, 30), timestampFormat)).toBe(expected);
30
+ expect(bannerItem(new Date(2026, 9, 20, 17, 30), timestampFormat).description).toBe(expected);
31
});
32
33
it("names the day when the reset is tomorrow", () => {
34
using _now = vi.spyOn(Date, "now").mockReturnValue(stoppedAt.getTime());
35
- expect(bannerDescription(new Date(2026, 9, 21, 17, 30), "24-hour")).toBe(
36
- "Resets tomorrow at 17:30",
37
- );
35
+ expect(bannerItem(new Date(2026, 9, 21, 17, 30)).description).toBe("Resets tomorrow at 17:30");
36
+ });
37
+
38
+ it("uses past-tense copy after the reset time has passed", () => {
39
+ const resetAt = new Date(2026, 9, 20, 15, 0);
40
+ {
41
+ using _before = vi
42
+ .spyOn(Date, "now")
43
+ .mockReturnValue(new Date(2026, 9, 20, 14, 57).getTime());
44
+ expect(bannerItem(resetAt).description).toBe("Resets 15:00");
45
+ }
46
+ {
47
+ using _after = vi.spyOn(Date, "now").mockReturnValue(new Date(2026, 9, 20, 15, 14).getTime());
48
+ expect(bannerItem(resetAt).description).toBe("Reset 15:00");
49
+ }
50
+ });
51
+
52
+ it("keeps Resumes copy until a later snooze wake time, then falls back to Reset", () => {
53
+ const resetAt = new Date(2026, 9, 20, 15, 0);
54
+ const snoozedUntil = new Date(2026, 9, 20, 16, 0);
55
+ const runId = RunId.make("run-1");
56
+ const makeScheduled = () =>
57
+ usageLimitRecoveryBannerItem({
58
+ runId,
59
+ errorCode: null,
60
+ resetAt: resetAt.toISOString(),
61
+ stoppedAt: stoppedAt.toISOString(),
62
+ settled: false,
63
+ requestPending: false,
64
+ snoozedUntil: snoozedUntil.toISOString(),
65
+ recovery: {
66
+ runId,
67
+ resetAt: resetAt.toISOString(),
68
+ autoResume: true,
69
+ },
70
+ timestampFormat: "24-hour",
71
+ onChange: async () => {},
72
+ });
73
+ {
74
+ using _between = vi
75
+ .spyOn(Date, "now")
76
+ .mockReturnValue(new Date(2026, 9, 20, 15, 14).getTime());
77
+ expect(makeScheduled().description).toBe("Resumes 16:00");
78
+ }
79
+ {
80
+ using _afterSnooze = vi
81
+ .spyOn(Date, "now")
82
+ .mockReturnValue(new Date(2026, 9, 20, 16, 5).getTime());
83
+ expect(makeScheduled().description).toBe("Reset 15:00");
84
+ }
85
});
86
});
apps/web/src/components/chat/UsageLimitRecoveryBanner.tsx
+72
-46
@@ -34,63 +34,83 @@ type RecoveryProps = {
34
snoozedUntil: string | null;
35
recovery: OrchestrationV2LimitRecovery | null;
36
timestampFormat: TimestampFormat;
37
+ resetPassed?: boolean;
38
+ displayPassed?: boolean;
39
onChange: (recovery: OrchestrationV2LimitRecoveryUpdate) => Promise<void>;
40
};
41
42
+function parseEpochMs(isoDate: string | null): number | null {
43
+ if (isoDate === null) return null;
44
+ const parsed = Date.parse(isoDate);
45
+ return Number.isFinite(parsed) ? parsed : null;
46
+}
47
+
48
+function limitRecoveryScheduleState(
49
+ props: Pick<
50
+ RecoveryProps,
51
+ "runId" | "resetAt" | "stoppedAt" | "settled" | "requestPending" | "recovery" | "snoozedUntil"
52
+ >,
53
+) {
54
+ // The server refuses recovery changes while a request is pending.
55
+ const canSchedule =
56
+ !props.settled &&
57
+ !props.requestPending &&
58
+ props.resetAt !== null &&
59
+ Date.parse(props.resetAt) > Date.parse(props.stoppedAt);
60
+ const resumes =
61
+ canSchedule &&
62
+ props.recovery?.runId === props.runId &&
63
+ props.recovery.resetAt === props.resetAt &&
64
+ props.recovery.autoResume;
65
+ const displayAt =
66
+ resumes &&
67
+ props.resetAt &&
68
+ props.snoozedUntil &&
69
+ Date.parse(props.snoozedUntil) > Date.parse(props.resetAt)
70
+ ? props.snoozedUntil
71
+ : props.resetAt;
72
+ return { canSchedule, resumes, displayAt };
73
+}
74
+
75
+export function useUsageLimitRecoveryBannerItem(
76
+ props: RecoveryProps | null,
77
+ resolve: MessageResolver = m,
78
+): ComposerBannerStackItem | null {
79
+ const displayAt = props === null ? null : limitRecoveryScheduleState(props).displayAt;
80
+ const resetPassed = useDeadlinePassed(props === null ? null : parseEpochMs(props.resetAt));
81
+ const displayPassed = useDeadlinePassed(parseEpochMs(displayAt));
82
+ if (props === null) return null;
83
+ return usageLimitRecoveryBannerItem({ ...props, resetPassed, displayPassed }, resolve);
84
+}
85
+
86
export function usageLimitRecoveryBannerItem(
87
props: RecoveryProps,
88
resolve: MessageResolver = m,
89
): ComposerBannerStackItem {
44
- const {
45
- runId,
46
- errorCode,
47
- resetAt,
48
- stoppedAt,
49
- settled,
50
- requestPending,
51
- recovery,
52
- snoozedUntil,
53
- timestampFormat,
54
- } = props;
55
- // The server refuses recovery changes while a request is pending.
56
- const canSchedule =
57
- !settled && !requestPending && resetAt !== null && Date.parse(resetAt) > Date.parse(stoppedAt);
58
- const resumes =
59
- canSchedule && recovery?.runId === runId && recovery.resetAt === resetAt && recovery.autoResume;
90
+ const { runId, errorCode, resetAt, timestampFormat } = props;
91
+ const { canSchedule, resumes, displayAt } = limitRecoveryScheduleState(props);
92
+ const resetAtMs = parseEpochMs(resetAt);
93
+ const displayAtMs = parseEpochMs(displayAt);
94
+ const resetPassed = props.resetPassed ?? (resetAtMs !== null && resetAtMs <= Date.now());
95
+ const displayPassed = props.displayPassed ?? (displayAtMs !== null && displayAtMs <= Date.now());
96
const workspaceLimit = errorCode === CHATGPT_WORKSPACE_USAGE_LIMIT_CODE;
97
const chatGptLimit = workspaceLimit || errorCode === CHATGPT_USAGE_LIMIT_CODE;
98
const recoveryActions = canSchedule ? (
99
<RecoveryActions key={`${runId}:${resetAt}`} {...props} />
100
) : null;
65
- const displayAt =
66
- resumes && resetAt && snoozedUntil && Date.parse(snoozedUntil) > Date.parse(resetAt)
67
- ? snoozedUntil
68
- : resetAt;
69
- const resetDescription = displayAt
70
- ? resumes
71
- ? resolve(
72
- msg("Resumes {time}", {
73
- time: formatUpcomingTimestamp(
74
- displayAt,
75
- timestampFormat,
76
- undefined,
77
- undefined,
78
- resolve,
79
- ),
80
- }),
81
- )
82
- : resolve(
83
- msg("Resets {time}", {
84
- time: formatUpcomingTimestamp(
85
- displayAt,
86
- timestampFormat,
87
- undefined,
88
- undefined,
89
- resolve,
90
- ),
91
- }),
92
- )
93
- : resolve(msg("Reset time unavailable; retry manually"));
101
+ const resumesUpcoming = resumes && !displayPassed;
102
+ const shownAt = resumesUpcoming ? displayAt : resetAt;
103
+ const formattedTime = shownAt
104
+ ? formatUpcomingTimestamp(shownAt, timestampFormat, undefined, undefined, resolve)
105
+ : null;
106
+ const resetDescription =
107
+ formattedTime !== null
108
+ ? resumesUpcoming
109
+ ? resolve(msg("Resumes {time}", { time: formattedTime }))
110
+ : resetPassed
111
+ ? resolve(msg("Reset {time}", { time: formattedTime }))
112
+ : resolve(msg("Resets {time}", { time: formattedTime }))
113
+ : resolve(msg("Reset time unavailable; retry manually"));
114
if (!chatGptLimit) {
115
return {
116
id: `usage-limit-recovery:${runId}`,
@@ -175,7 +195,13 @@ function RecoveryActions({ runId, resetAt, recovery, snoozedUntil, onChange }: R
195
return (
196
<span className="flex flex-wrap items-center gap-x-3 gap-y-1 px-1">
197
<InlineButton touchTarget="padded" disabled={pending} onClick={() => void toggle("resume")}>
178
- {pending ? gt("Saving...") : scheduled ? gt("Cancel auto-resume") : gt("Resume at reset")}
198
+ {pending
199
+ ? gt("Saving...")
200
+ : scheduled
201
+ ? gt("Cancel auto-resume")
202
+ : resetPassed
203
+ ? gt("Resume now")
204
+ : gt("Resume at reset")}
205
</InlineButton>
206
<InlineButton
207
touchTarget="padded"
apps/web/src/i18n/translations/de.json
+2
@@ -4484,6 +4484,7 @@
4484
],
4485
"275a97b4af3c6482": "Befehl für ein Terminal kopieren",
4486
"2b07985d23563374": "Wird {time} fortgesetzt",
4487
+ "a4b4e5eb6d313af9": "Wurde {time} zurückgesetzt",
4488
"c0c3aa756405c1df": "Wird {time} zurückgesetzt",
4489
"a7bfaa71c8b3030b": "Zeitpunkt der Zurücksetzung nicht verfügbar; manuell erneut versuchen",
4490
"77a70e5c3fd83ed8": "ChatGPT-Nutzungslimit erreicht",
@@ -4491,6 +4492,7 @@
4492
"babea77bd5527a74": "Der Zeitpunkt der Zurücksetzung ist vorbei. Versuche den Thread manuell erneut.",
4493
"cca055677065c161": "Automatisches Fortsetzen konnte nicht geändert werden",
4494
"0233fffeb2b0c531": "Automatisches Fortsetzen abbrechen",
4495
+ "df86826bcb3eb1c3": "Jetzt fortsetzen",
4496
"f89ef34bbf5911ee": "Bei Zurücksetzung fortsetzen",
4497
"b3fb8cf724de33c2": "Jetzt wecken",
4498
"51a1a709a4972f7e": "Bis zur Zurücksetzung zurückstellen",
apps/web/src/i18n/translations/en.json
+2
@@ -4483,6 +4483,7 @@
4483
],
4484
"275a97b4af3c6482": "Copy command, for a terminal",
4485
"2b07985d23563374": "Resumes {time}",
4486
+ "a4b4e5eb6d313af9": "Reset {time}",
4487
"c0c3aa756405c1df": "Resets {time}",
4488
"a7bfaa71c8b3030b": "Reset time unavailable; retry manually",
4489
"77a70e5c3fd83ed8": "ChatGPT usage limit reached",
@@ -4490,6 +4491,7 @@
4491
"babea77bd5527a74": "The reset time has passed. Retry the thread manually.",
4492
"cca055677065c161": "Could not change auto-resume",
4493
"0233fffeb2b0c531": "Cancel auto-resume",
4494
+ "df86826bcb3eb1c3": "Resume now",
4495
"f89ef34bbf5911ee": "Resume at reset",
4496
"b3fb8cf724de33c2": "Wake now",
4497
"51a1a709a4972f7e": "Snooze until reset",
apps/web/src/i18n/translations/es.json
+2
@@ -4481,6 +4481,7 @@
4481
],
4482
"275a97b4af3c6482": "Copiar comando, para una terminal",
4483
"2b07985d23563374": "Se reanuda {time}",
4484
+ "a4b4e5eb6d313af9": "Se restableció {time}",
4485
"c0c3aa756405c1df": "Se restablece {time}",
4486
"a7bfaa71c8b3030b": "Hora de restablecimiento no disponible; vuelve a intentarlo manualmente",
4487
"77a70e5c3fd83ed8": "Se alcanzó el límite de uso de ChatGPT",
@@ -4488,6 +4489,7 @@
4489
"babea77bd5527a74": "La hora de restablecimiento ya pasó. Vuelve a intentar el hilo manualmente.",
4490
"cca055677065c161": "No se pudo cambiar la reanudación automática",
4491
"0233fffeb2b0c531": "Cancelar reanudación automática",
4492
+ "df86826bcb3eb1c3": "Reanudar ahora",
4493
"f89ef34bbf5911ee": "Reanudar al restablecerse",
4494
"b3fb8cf724de33c2": "Reactivar ahora",
4495
"51a1a709a4972f7e": "Posponer hasta que se restablezca",
apps/web/src/i18n/translations/fr.json
+2
@@ -4482,6 +4482,7 @@
4482
],
4483
"275a97b4af3c6482": "Copier la commande, pour un terminal",
4484
"2b07985d23563374": "Reprise {time}",
4485
+ "a4b4e5eb6d313af9": "Réinitialisé {time}",
4486
"c0c3aa756405c1df": "Réinitialisation {time}",
4487
"a7bfaa71c8b3030b": "Heure de réinitialisation indisponible ; réessayez manuellement",
4488
"77a70e5c3fd83ed8": "Limite d’utilisation ChatGPT atteinte",
@@ -4489,6 +4490,7 @@
4490
"babea77bd5527a74": "L’heure de réinitialisation est passée. Relancez le fil manuellement.",
4491
"cca055677065c161": "Impossible de modifier la reprise automatique",
4492
"0233fffeb2b0c531": "Annuler la reprise automatique",
4493
+ "df86826bcb3eb1c3": "Reprendre maintenant",
4494
"f89ef34bbf5911ee": "Reprendre à la réinitialisation",
4495
"b3fb8cf724de33c2": "Réveiller maintenant",
4496
"51a1a709a4972f7e": "Reporter jusqu’à la réinitialisation",
apps/web/src/i18n/translations/ja.json
+2
@@ -4472,6 +4472,7 @@
4472
],
4473
"275a97b4af3c6482": "ターミナル用のコマンドをコピー",
4474
"2b07985d23563374": "{time} に再開",
4475
+ "a4b4e5eb6d313af9": "{time} にリセット済み",
4476
"c0c3aa756405c1df": "{time} にリセット",
4477
"a7bfaa71c8b3030b": "リセット時刻が不明です。手動で再試行してください",
4478
"77a70e5c3fd83ed8": "ChatGPT の使用量の上限に達しました",
@@ -4479,6 +4480,7 @@
4480
"babea77bd5527a74": "リセット時刻を過ぎました。スレッドを手動で再試行してください。",
4481
"cca055677065c161": "自動再開を変更できませんでした",
4482
"0233fffeb2b0c531": "自動再開をキャンセル",
4483
+ "df86826bcb3eb1c3": "今すぐ再開",
4484
"f89ef34bbf5911ee": "リセット時に再開",
4485
"b3fb8cf724de33c2": "今すぐ再開",
4486
"51a1a709a4972f7e": "リセットまでスヌーズ",
apps/web/src/i18n/translations/ko.json
+2
@@ -4469,6 +4469,7 @@
4469
],
4470
"275a97b4af3c6482": "터미널용 명령 복사",
4471
"2b07985d23563374": "{time}에 재개",
4472
+ "a4b4e5eb6d313af9": "{time}에 초기화됨",
4473
"c0c3aa756405c1df": "{time}에 초기화",
4474
"a7bfaa71c8b3030b": "초기화 시간을 알 수 없습니다. 직접 다시 시도하세요",
4475
"77a70e5c3fd83ed8": "ChatGPT 사용량 한도에 도달함",
@@ -4476,6 +4477,7 @@
4477
"babea77bd5527a74": "초기화 시간이 지났습니다. 스레드를 직접 다시 시도하세요.",
4478
"cca055677065c161": "자동 재개를 변경할 수 없습니다",
4479
"0233fffeb2b0c531": "자동 재개 취소",
4480
+ "df86826bcb3eb1c3": "지금 재개",
4481
"f89ef34bbf5911ee": "초기화 시 재개",
4482
"b3fb8cf724de33c2": "지금 깨우기",
4483
"51a1a709a4972f7e": "초기화될 때까지 다시 알림",
apps/web/src/i18n/translations/pt-BR.json
+2
@@ -4481,6 +4481,7 @@
4481
],
4482
"275a97b4af3c6482": "Copiar comando para um terminal",
4483
"2b07985d23563374": "Retoma {time}",
4484
+ "a4b4e5eb6d313af9": "Renovado {time}",
4485
"c0c3aa756405c1df": "Renova {time}",
4486
"a7bfaa71c8b3030b": "Horário de renovação indisponível; tente novamente manualmente",
4487
"77a70e5c3fd83ed8": "Limite de uso do ChatGPT atingido",
@@ -4488,6 +4489,7 @@
4489
"babea77bd5527a74": "O horário de renovação já passou. Tente a thread novamente manualmente.",
4490
"cca055677065c161": "Não foi possível alterar a retomada automática",
4491
"0233fffeb2b0c531": "Cancelar a retomada automática",
4492
+ "df86826bcb3eb1c3": "Retomar agora",
4493
"f89ef34bbf5911ee": "Retomar na renovação",
4494
"b3fb8cf724de33c2": "Despertar agora",
4495
"51a1a709a4972f7e": "Adiar até a renovação",
apps/web/src/i18n/translations/ru.json
+2
@@ -4481,6 +4481,7 @@
4481
],
4482
"275a97b4af3c6482": "Копировать команду для терминала",
4483
"2b07985d23563374": "Возобновится {time}",
4484
+ "a4b4e5eb6d313af9": "Сброшен {time}",
4485
"c0c3aa756405c1df": "Сброс {time}",
4486
"a7bfaa71c8b3030b": "Время сброса неизвестно; повторите вручную",
4487
"77a70e5c3fd83ed8": "Достигнут лимит использования ChatGPT",
@@ -4488,6 +4489,7 @@
4489
"babea77bd5527a74": "Время сброса прошло. Повторите тред вручную.",
4490
"cca055677065c161": "Не удалось изменить автовозобновление",
4491
"0233fffeb2b0c531": "Отменить автовозобновление",
4492
+ "df86826bcb3eb1c3": "Возобновить сейчас",
4493
"f89ef34bbf5911ee": "Возобновить после сброса",
4494
"b3fb8cf724de33c2": "Разбудить сейчас",
4495
"51a1a709a4972f7e": "Отложить до сброса",
apps/web/src/i18n/translations/sv.json
+2
@@ -4482,6 +4482,7 @@
4482
],
4483
"275a97b4af3c6482": "Kopiera kommando, för en terminal",
4484
"2b07985d23563374": "Återupptas {time}",
4485
+ "a4b4e5eb6d313af9": "Återställdes {time}",
4486
"c0c3aa756405c1df": "Återställs {time}",
4487
"a7bfaa71c8b3030b": "Återställningstiden är inte tillgänglig; försök igen manuellt",
4488
"77a70e5c3fd83ed8": "Användningsgränsen för ChatGPT har nåtts",
@@ -4489,6 +4490,7 @@
4490
"babea77bd5527a74": "Återställningstiden har passerat. Försök med tråden igen manuellt.",
4491
"cca055677065c161": "Kunde inte ändra automatisk återupptagning",
4492
"0233fffeb2b0c531": "Avbryt automatisk återupptagning",
4493
+ "df86826bcb3eb1c3": "Återuppta nu",
4494
"f89ef34bbf5911ee": "Återuppta vid återställning",
4495
"b3fb8cf724de33c2": "Väck nu",
4496
"51a1a709a4972f7e": "Snooza till återställning",
apps/web/src/i18n/translations/zh.json
+2
@@ -4488,6 +4488,7 @@
4488
],
4489
"275a97b4af3c6482": "复制命令,在终端中运行",
4490
"2b07985d23563374": "{time} 自动继续",
4491
+ "a4b4e5eb6d313af9": "已于 {time} 重置",
4492
"c0c3aa756405c1df": "{time} 重置",
4493
"a7bfaa71c8b3030b": "重置时间未知,请手动重试",
4494
"77a70e5c3fd83ed8": "已达到 ChatGPT 用量上限",
@@ -4495,6 +4496,7 @@
4496
"babea77bd5527a74": "重置时间已过,请手动重试这个会话。",
4497
"cca055677065c161": "无法修改自动继续",
4498
"0233fffeb2b0c531": "取消自动继续",
4499
+ "df86826bcb3eb1c3": "立即继续",
4500
"f89ef34bbf5911ee": "重置后自动继续",
4501
"b3fb8cf724de33c2": "立即唤醒",
4502
"51a1a709a4972f7e": "暂缓到重置时",