mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
## What changed Replace `tui.whimsy` with `[tui.effects]` preferences for `starfield`, `shimmer`, `welcome`, `effort`, `progress`, and `title`. Each defaults to `true` and remains subordinate to the `tui.animations` master switch. Wire the preferences into composer effects, welcome artwork, status and loading text, progress indicators, and terminal-title animations. For example, disable shimmering text while keeping progress animations: ```toml [tui.effects] shimmer = false ``` Keep retired `tui.whimsy` entries loadable but ignore their value. Update the configuration schema to expose the new preferences. ## Testing Add and extend coverage for independent shimmer and progress effects, master-switch precedence, welcome and starfield controls, terminal-title blinking, and strict configuration loading with the retired setting. GitOrigin-RevId: 28b37ba52872133b8954543cabe9ff424147f1c5
152 lines
5.0 KiB
Rust
152 lines
5.0 KiB
Rust
//! Hook run lifecycle handling for `ChatWidget`.
|
|
//!
|
|
//! This module keeps hook timers, compact activity-row progress, and durable
|
|
//! hook completion output together.
|
|
|
|
use super::*;
|
|
|
|
impl ChatWidget {
|
|
/// Drop transient live hook status without flushing it into history.
|
|
pub(super) fn clear_active_hook_cell(&mut self) {
|
|
self.bottom_pane.set_hook_status_message(/*message*/ None);
|
|
if self.active_hook_cell.take().is_some() {
|
|
self.bump_active_cell_revision();
|
|
self.request_pending_usage_output_insertion();
|
|
}
|
|
}
|
|
|
|
pub(super) fn on_hook_started(&mut self, run: codex_app_server_protocol::HookRunSummary) {
|
|
self.flush_answer_stream_with_separator();
|
|
self.flush_completed_hook_output();
|
|
match self.active_hook_cell.as_mut() {
|
|
Some(cell) => {
|
|
cell.start_run(run);
|
|
self.bump_active_cell_revision();
|
|
}
|
|
None => {
|
|
self.active_hook_cell = Some(history_cell::new_active_hook_cell(run));
|
|
self.bump_active_cell_revision();
|
|
}
|
|
}
|
|
self.sync_hook_status_message();
|
|
self.request_redraw();
|
|
}
|
|
|
|
pub(super) fn on_hook_completed(
|
|
&mut self,
|
|
completed: codex_app_server_protocol::HookRunSummary,
|
|
) {
|
|
let completed_existing_run = self
|
|
.active_hook_cell
|
|
.as_mut()
|
|
.map(|cell| cell.complete_run(completed.clone()))
|
|
.unwrap_or(false);
|
|
if completed_existing_run {
|
|
self.bump_active_cell_revision();
|
|
} else {
|
|
match self.active_hook_cell.as_mut() {
|
|
Some(cell) => {
|
|
cell.add_completed_run(completed);
|
|
self.bump_active_cell_revision();
|
|
}
|
|
None => {
|
|
let cell = history_cell::new_completed_hook_cell(completed);
|
|
if !cell.is_empty() {
|
|
self.active_hook_cell = Some(cell);
|
|
self.bump_active_cell_revision();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
self.flush_completed_hook_output();
|
|
self.finish_active_hook_cell_if_idle();
|
|
self.sync_hook_status_message();
|
|
self.request_redraw();
|
|
}
|
|
|
|
pub(super) fn flush_completed_hook_output(&mut self) {
|
|
let Some(completed_cell) = self
|
|
.active_hook_cell
|
|
.as_mut()
|
|
.and_then(HookCell::take_completed_persistent_runs)
|
|
else {
|
|
return;
|
|
};
|
|
let active_cell_is_empty = self
|
|
.active_hook_cell
|
|
.as_ref()
|
|
.is_some_and(HookCell::is_empty);
|
|
if active_cell_is_empty {
|
|
self.active_hook_cell = None;
|
|
}
|
|
self.flush_completed_tool_activity();
|
|
self.bump_active_cell_revision();
|
|
self.app_event_tx
|
|
.send(AppEvent::InsertHistoryCell(Box::new(completed_cell)));
|
|
self.request_pending_usage_output_insertion();
|
|
}
|
|
|
|
pub(super) fn finish_active_hook_cell_if_idle(&mut self) {
|
|
let Some(cell) = self.active_hook_cell.as_ref() else {
|
|
return;
|
|
};
|
|
if cell.is_empty() {
|
|
self.active_hook_cell = None;
|
|
self.bump_active_cell_revision();
|
|
self.request_pending_usage_output_insertion();
|
|
return;
|
|
}
|
|
if cell.should_flush()
|
|
&& let Some(cell) = self.active_hook_cell.take()
|
|
{
|
|
self.bump_active_cell_revision();
|
|
self.app_event_tx
|
|
.send(AppEvent::InsertHistoryCell(Box::new(cell)));
|
|
self.request_pending_usage_output_insertion();
|
|
}
|
|
}
|
|
|
|
pub(super) fn update_due_hook_visibility(&mut self) {
|
|
let Some(cell) = self.active_hook_cell.as_mut() else {
|
|
return;
|
|
};
|
|
let now = Instant::now();
|
|
if cell.advance_time(now) {
|
|
self.bump_active_cell_revision();
|
|
}
|
|
self.finish_active_hook_cell_if_idle();
|
|
self.sync_hook_status_message();
|
|
}
|
|
|
|
fn sync_hook_status_message(&mut self) {
|
|
let status_message = self
|
|
.active_hook_cell
|
|
.as_ref()
|
|
.and_then(HookCell::running_status_summary);
|
|
self.bottom_pane.set_hook_status_message(status_message);
|
|
}
|
|
|
|
pub(super) fn schedule_hook_timer_if_needed(&self) {
|
|
if self.local_settings.tui.animations
|
|
&& self.local_settings.tui.effects.shimmer
|
|
&& self
|
|
.active_hook_cell
|
|
.as_ref()
|
|
.is_some_and(HookCell::has_visible_running_run)
|
|
{
|
|
self.frame_requester
|
|
.schedule_frame_in(Duration::from_millis(50));
|
|
}
|
|
|
|
let Some(deadline) = self
|
|
.active_hook_cell
|
|
.as_ref()
|
|
.and_then(HookCell::next_timer_deadline)
|
|
else {
|
|
return;
|
|
};
|
|
let delay = deadline.saturating_duration_since(Instant::now());
|
|
self.frame_requester.schedule_frame_in(delay);
|
|
}
|
|
}
|