Skip to content

[codex] Fix usage-limit reset copy and state#28793

Merged
jayp-oai merged 1 commit into
mainfrom
codex/usage-limit-reset-copy
Jun 22, 2026
Merged

[codex] Fix usage-limit reset copy and state#28793
jayp-oai merged 1 commit into
mainfrom
codex/usage-limit-reset-copy

Conversation

@jayp-oai

@jayp-oai jayp-oai commented Jun 17, 2026

Copy link
Copy Markdown
Collaborator

Why

The reset flow introduced in #28154 still describes earned reset credits as "rate-limit resets" and uses generic reset-scope copy. It can also retain a stale available-credit count after redemption or an account change, leaving the reset action enabled after the last credit is used.

This follow-up updates terminology only within that reset feature. Existing rate-limit wording elsewhere in the CLI and TUI is unchanged.

What changed

  • Rename reset-specific /usage menu items, startup hints, and reset dialogs to "usage limit reset."
  • Describe monthly resets for Free, Go, and accounts that report a monthly usage window; otherwise describe the current 5-hour and weekly limits.
  • Recheck a cached zero balance when /usage is reopened, and refresh the balance after redemption so the final reset immediately disables the action.
  • Correlate async refresh results before updating snapshots and clear account-derived reset state, warnings, prompts, and status surfaces when the account changes.

Validation

  • just test -p codex-tui chatwidget::tests::usage — 29 passed.
  • just test -p codex-tui chatwidget::tests::status_command_tests — 7 passed.
  • Account-boundary prompt and plan-mode prompt regression tests passed.
  • cargo insta pending-snapshots from codex-rs/tui — no pending snapshots.\
image view for monthly image

@jayp-oai jayp-oai force-pushed the codex/usage-limit-reset-copy branch from 9ddb959 to 42f0a6f Compare June 17, 2026 21:34
@jayp-oai jayp-oai changed the title [codex] Use usage-limit copy for reset UI [codex] Fix usage-limit reset copy and state Jun 17, 2026
@jayp-oai jayp-oai marked this pull request as ready for review June 17, 2026 21:39
@jayp-oai jayp-oai force-pushed the codex/usage-limit-reset-copy branch from 42f0a6f to f3b209e Compare June 17, 2026 22:18

@fcoury-oai fcoury-oai left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works, code looks good. Approved 👍

@jayp-oai jayp-oai force-pushed the codex/usage-limit-reset-copy branch from f3b209e to bae7cca Compare June 22, 2026 17:36
@jayp-oai jayp-oai force-pushed the codex/usage-limit-reset-copy branch from bae7cca to b785628 Compare June 22, 2026 18:26
@jayp-oai jayp-oai enabled auto-merge (squash) June 22, 2026 18:38
@jayp-oai jayp-oai merged commit 5c0fbf3 into main Jun 22, 2026
45 of 47 checks passed
@jayp-oai jayp-oai deleted the codex/usage-limit-reset-copy branch June 22, 2026 18:45
@github-actions github-actions Bot locked and limited conversation to collaborators Jun 22, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants