Skip to content

Fix status usage ratio #4584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 2, 2025
Merged

Fix status usage ratio #4584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab6b998
Add the word "used"
dedrisian-oai Oct 1, 2025
8f26cbd
Hide "Token usage" line for chatgpt users
dedrisian-oai Oct 2, 2025
57e29f8
Fix tests
dedrisian-oai Oct 2, 2025
971034b
Show token usage for non ChatGPT accounts
dedrisian-oai Oct 2, 2025
a218f16
Fix tests
dedrisian-oai Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions codex-rs/tui/src/status/card.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ impl StatusHistoryCell {
Span::from(format!("{percent}% left")),
Span::from(" (").dim(),
Span::from(used_fmt).dim(),
Span::from(" / ").dim(),
Span::from(" used / ").dim(),
Span::from(window_fmt).dim(),
Span::from(")").dim(),
])
Expand Down Expand Up @@ -302,7 +302,10 @@ impl HistoryCell for StatusHistoryCell {
}

lines.push(Line::from(Vec::<Span<'static>>::new()));
lines.push(formatter.line("Token usage", self.token_usage_spans()));
// Hide token usage only for ChatGPT subscribers
if !matches!(self.account, Some(StatusAccountDisplay::ChatGpt { .. })) {
lines.push(formatter.line("Token usage", self.token_usage_spans()));
}

if let Some(spans) = self.context_window_spans() {
lines.push(formatter.line("Context window", spans));
Expand Down
2 changes: 1 addition & 1 deletion ...rc/status/snapshots/codex_tui__status__tests__status_snapshot_includes_monthly_limit.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ expression: sanitized
│ Agents.md: <none> │
│ │
│ Token usage: 1.2K total (800 input + 400 output) │
│ Context window: 100% left (1.2K / 272K) │
│ Context window: 100% left (1.2K used / 272K) │
│ Monthly limit: [██░░░░░░░░░░░░░░░░░░] 12% used (resets 07:08 on 7 May) │
╰────────────────────────────────────────────────────────────────────────────╯
2 changes: 1 addition & 1 deletion ...tatus/snapshots/codex_tui__status__tests__status_snapshot_includes_reasoning_details.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ expression: sanitized
│ Agents.md: <none> │
│ │
│ Token usage: 1.9K total (1K input + 900 output) │
│ Context window: 100% left (2.1K / 272K) │
│ Context window: 100% left (2.1K used / 272K) │
│ 5h limit: [███████████████░░░░░] 72% used (resets 03:14) │
│ Weekly limit: [█████████░░░░░░░░░░░] 45% used (resets 03:24) │
╰─────────────────────────────────────────────────────────────────────╯
2 changes: 1 addition & 1 deletion ...tatus/snapshots/codex_tui__status__tests__status_snapshot_shows_empty_limits_message.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ expression: sanitized
│ Agents.md: <none> │
│ │
│ Token usage: 750 total (500 input + 250 output) │
│ Context window: 100% left (750 / 272K) │
│ Context window: 100% left (750 used / 272K) │
│ Limits: data not available yet │
╰─────────────────────────────────────────────────────────────────╯
2 changes: 1 addition & 1 deletion ...tus/snapshots/codex_tui__status__tests__status_snapshot_shows_missing_limits_message.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ expression: sanitized
│ Agents.md: <none> │
│ │
│ Token usage: 750 total (500 input + 250 output) │
│ Context window: 100% left (750 / 272K) │
│ Context window: 100% left (750 used / 272K) │
│ Limits: send a message to load usage data │
╰─────────────────────────────────────────────────────────────────╯
2 changes: 1 addition & 1 deletion ...tus/snapshots/codex_tui__status__tests__status_snapshot_truncates_in_narrow_terminal.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ expression: sanitized
│ Agents.md: <none> │
│ │
│ Token usage: 1.9K total (1K input + │
│ Context window: 100% left (2.1K / 272K) │
│ Context window: 100% left (2.1K used / │
│ 5h limit: [███████████████░░░░░] │
│ (resets 03:14) │
╰────────────────────────────────────────────╯
2 changes: 1 addition & 1 deletion codex-rs/tui/src/status/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ fn status_context_window_uses_last_usage() {
.expect("context line");

assert!(
context_line.contains("13.7K / 272K"),
context_line.contains("13.7K used / 272K"),
"expected context line to reflect last usage tokens, got: {context_line}"
);
assert!(
Expand Down
Loading