mirror of
https://github.com/openai/codex.git
synced 2026-11-18 23:02:23 +00:00
feat(tui): reland token activity command (#27925)
## Why [#25345](https://github.com/openai/codex/pull/25345) was approved, green, and squash-merged into its stacked base branch, `fcoury/tokenmaxxing-api`. Four minutes later, that base branch was force-pushed back to an API-only rebased head while preparing [#25344](https://github.com/openai/codex/pull/25344) for `main`. As a result, the squash commit from #25345 was orphaned and the TUI command never reached `main` or a release. This PR relands the orphaned TUI change from [`411410b8`](https://github.com/openai/codex/commit/411410b85c2d8eb050d441f17396c5c4048d866f) on current `main`. ## What changed - Add `/usage`, `/usage daily`, `/usage weekly`, and `/usage cumulative` for account token activity. - Fetch account usage asynchronously through the existing `account/usage/read` app-server RPC. - Render daily, weekly, and cumulative activity with theme-aware terminal palettes and bounded transient cards. - Preserve transcript ordering while assistant streams, history consolidations, active cells, and hooks complete. - Hide `/usage` from completion when backend auth is unavailable while keeping typed-command guidance. - Carry current-main behavior forward for cwd-aware Markdown parsing, Windows Terminal color detection, and personal access token auth. - Clear pending usage cards on thread rollback and delay completed cards until live hook output is committed. - Add focused regression and snapshot coverage for loading, auth errors, invalid views, rollback, hook ordering, layout, and charts. ## Prior review The original implementation was approved by Eric Traut in #25345 after testing multiple themes and light/dark terminals. This PR preserves that reviewed implementation while adapting it to current `main` and adding regression coverage for newer rollback and hook lifecycle behavior. ## Validation - `just test -p codex-tui token_activity palette renderable usage_command` — 37 passed. - Focused rollback, hook-ordering, and error snapshot tests — 4 passed. - `just fix -p codex-tui` — passed. - `UV_CACHE_DIR=/private/tmp/codex-uv-cache just fmt` — passed. - `cargo insta pending-snapshots` — no pending snapshots. - `just test -p codex-tui` — 2,870 passed; two unrelated guardian feature-flag tests failed because their expected `OverrideTurnContext` event was absent: - `update_feature_flags_disabling_guardian_clears_manual_review_policy_without_history` - `update_feature_flags_disabling_guardian_clears_review_policy_and_restores_default` - `just argument-comment-lint` could not complete because the local Bazel LLVM `compiler-rt` repository is missing `include/sanitizer/*.h`. The touched Rust diff was manually inspected and no missing opaque-literal argument comments were found.
This commit is contained in:
1 parent
9e07892253
commit
c884536d84
42 files changed
+2296
-57
No files matched your search
+10
-2
@@ -143,6 +143,7 @@ use codex_model_provider_info::ModelProviderInfo;
|
||||
use codex_models_manager::model_presets::HIDE_GPT_5_1_CODEX_MAX_MIGRATION_PROMPT_CONFIG;
|
||||
use codex_models_manager::model_presets::HIDE_GPT5_1_MIGRATION_PROMPT_CONFIG;
|
||||
use codex_otel::SessionTelemetry;
|
||||
use codex_otel::TelemetryAuthMode;
|
||||
use codex_protocol::ThreadId;
|
||||
use codex_protocol::config_types::Personality;
|
||||
#[cfg(target_os = "windows")]
|
||||
@@ -734,6 +735,7 @@ impl App {
|
||||
initial_user_message,
|
||||
enhanced_keys_supported: self.enhanced_keys_supported,
|
||||
has_chatgpt_account: self.chat_widget.has_chatgpt_account(),
|
||||
has_codex_backend_auth: self.chat_widget.has_codex_backend_auth(),
|
||||
model_catalog: self.model_catalog.clone(),
|
||||
feedback: self.feedback.clone(),
|
||||
is_first_run: false,
|
||||
@@ -822,6 +824,7 @@ impl App {
|
||||
let feedback_audience = bootstrap.feedback_audience;
|
||||
let auth_mode = bootstrap.auth_mode;
|
||||
let has_chatgpt_account = bootstrap.has_chatgpt_account;
|
||||
let has_codex_backend_auth = matches!(auth_mode, Some(TelemetryAuthMode::Chatgpt));
|
||||
let requires_openai_auth = bootstrap.requires_openai_auth;
|
||||
let status_account_display = bootstrap.status_account_display.clone();
|
||||
let initial_plan_type = bootstrap.plan_type;
|
||||
@@ -890,6 +893,7 @@ impl App {
|
||||
),
|
||||
enhanced_keys_supported,
|
||||
has_chatgpt_account,
|
||||
has_codex_backend_auth,
|
||||
model_catalog: model_catalog.clone(),
|
||||
feedback: feedback.clone(),
|
||||
is_first_run,
|
||||
@@ -925,6 +929,7 @@ impl App {
|
||||
),
|
||||
enhanced_keys_supported,
|
||||
has_chatgpt_account,
|
||||
has_codex_backend_auth,
|
||||
model_catalog: model_catalog.clone(),
|
||||
feedback: feedback.clone(),
|
||||
is_first_run,
|
||||
@@ -963,6 +968,7 @@ impl App {
|
||||
),
|
||||
enhanced_keys_supported,
|
||||
has_chatgpt_account,
|
||||
has_codex_backend_auth,
|
||||
model_catalog: model_catalog.clone(),
|
||||
feedback: feedback.clone(),
|
||||
is_first_run,
|
||||
@@ -1243,7 +1249,9 @@ See the Codex keymap documentation for supported actions and examples."
|
||||
event: TuiEvent,
|
||||
) -> Result<AppRunControl> {
|
||||
let terminal_resize_reflow_enabled = self.terminal_resize_reflow_enabled();
|
||||
if terminal_resize_reflow_enabled && matches!(event, TuiEvent::Draw | TuiEvent::Resize) {
|
||||
if self.should_handle_draw_pre_render()
|
||||
&& matches!(event, TuiEvent::Draw | TuiEvent::Resize)
|
||||
{
|
||||
self.handle_draw_pre_render(tui)?;
|
||||
} else if matches!(event, TuiEvent::Draw | TuiEvent::Resize) {
|
||||
let size = tui.terminal.size()?;
|
||||
@@ -1322,7 +1330,7 @@ See the Codex keymap documentation for supported actions and examples."
|
||||
self.disable_ambient_pet_before_shutdown(tui)?;
|
||||
self.chat_widget.show_shutdown_in_progress();
|
||||
let terminal_resize_reflow_enabled = self.terminal_resize_reflow_enabled();
|
||||
if terminal_resize_reflow_enabled {
|
||||
if self.should_handle_draw_pre_render() {
|
||||
self.handle_draw_pre_render(tui)?;
|
||||
}
|
||||
self.chat_widget.pre_draw_tick();
|
||||
|
||||
Reference in new issue
Block a user