mirror of
https://github.com/openai/codex.git
synced 2026-05-17 09:43:19 +00:00
## Summary `ChatWidget` has been carrying several independent domains in one large state bag: transcript bookkeeping, turn lifecycle, queued input, status surfaces, connectors, review mode, and protocol dispatch. That makes otherwise-local changes hard to reason about because unrelated fields and side effects live beside each other in `chatwidget.rs`. This is the first cleanup PR in a larger decomposition effort. It does not try to make `chatwidget.rs` small in one sweep; instead, it establishes focused state boundaries that later handler, popup, rendering, and effect-synchronization extractions can build on. This PR keeps `ChatWidget` as the composition layer while moving focused state into smaller `codex-tui` modules. The widget still owns effects that touch the bottom pane, app events, command submission, redraw scheduling, and terminal-title updates. ## Changes - Add focused state modules under `codex-rs/tui/src/chatwidget/` for input queues, turn lifecycle, transcript bookkeeping, status state, connectors, review mode, and app-server protocol dispatch. - Update `ChatWidget` to hold grouped state structs and route input/lifecycle/status operations through those focused helpers. - Move app-server notification dispatch into `chatwidget/protocol.rs` while leaving feature handlers and side effects on `ChatWidget`. - Replace the large manual `ChatWidget` test literal with the normal constructor plus narrow test overrides, so future state moves do not require every field to be restated in test setup. - Update existing tests to access the new grouped state or narrower helpers without changing snapshot behavior. ## Longer-term direction Follow-up PRs can continue shrinking `chatwidget.rs` by moving behavior, not just state, into focused modules: - Extract input/submission flow, turn/stream handling, and tool-cell lifecycles into domain modules that call the new state reducers. - Move popup/settings builders and rendering helpers out of the main widget file so `ChatWidget` stays focused on composition. - Reduce direct `BottomPane` mutation by applying domain-specific sync outputs at clearer boundaries.
155 lines
5.7 KiB
Rust
155 lines
5.7 KiB
Rust
//! Queued user input and pending-steer state for `ChatWidget`.
|
|
//!
|
|
//! This module keeps the mutable input queues together so `ChatWidget` can
|
|
//! apply UI/protocol effects around a focused reducer-style state bag.
|
|
|
|
use std::collections::VecDeque;
|
|
|
|
use super::PendingSteer;
|
|
use super::QueuedUserMessage;
|
|
use super::UserMessage;
|
|
use super::UserMessageHistoryRecord;
|
|
use super::user_message_preview_text;
|
|
|
|
#[derive(Debug, Default, PartialEq, Eq)]
|
|
pub(super) struct PendingInputPreview {
|
|
pub(super) queued_messages: Vec<String>,
|
|
pub(super) pending_steers: Vec<String>,
|
|
pub(super) rejected_steers: Vec<String>,
|
|
}
|
|
|
|
#[derive(Debug, Default)]
|
|
pub(super) struct InputQueueState {
|
|
/// User inputs queued while a turn is in progress.
|
|
pub(super) queued_user_messages: VecDeque<QueuedUserMessage>,
|
|
/// History records for queued user messages. Slash commands such as `/goal`
|
|
/// can render history that differs from the text submitted to core, so this
|
|
/// stays in lockstep with `queued_user_messages`, with missing entries
|
|
/// treated as user-message text.
|
|
pub(super) queued_user_message_history_records: VecDeque<UserMessageHistoryRecord>,
|
|
/// A user turn has been submitted to core, but `TurnStarted` has not arrived yet.
|
|
pub(super) user_turn_pending_start: bool,
|
|
/// User messages that tried to steer a non-regular turn and must be retried first.
|
|
pub(super) rejected_steers_queue: VecDeque<UserMessage>,
|
|
/// History records for rejected steers. Slash commands such as `/goal` can
|
|
/// render history that differs from the text submitted to core, so this stays
|
|
/// in lockstep with `rejected_steers_queue`, with missing entries treated as
|
|
/// user-message text.
|
|
pub(super) rejected_steer_history_records: VecDeque<UserMessageHistoryRecord>,
|
|
/// Steers already submitted to core but not yet committed into history.
|
|
pub(super) pending_steers: VecDeque<PendingSteer>,
|
|
/// When set, the next interrupt should resubmit all pending steers as one
|
|
/// fresh user turn instead of restoring them into the composer.
|
|
pub(super) submit_pending_steers_after_interrupt: bool,
|
|
pub(super) suppress_queue_autosend: bool,
|
|
}
|
|
|
|
impl InputQueueState {
|
|
pub(super) fn has_queued_follow_up_messages(&self) -> bool {
|
|
!self.rejected_steers_queue.is_empty() || !self.queued_user_messages.is_empty()
|
|
}
|
|
|
|
pub(super) fn clear(&mut self) {
|
|
self.queued_user_messages.clear();
|
|
self.queued_user_message_history_records.clear();
|
|
self.user_turn_pending_start = false;
|
|
self.rejected_steers_queue.clear();
|
|
self.rejected_steer_history_records.clear();
|
|
self.pending_steers.clear();
|
|
self.submit_pending_steers_after_interrupt = false;
|
|
}
|
|
|
|
pub(super) fn preview(&self) -> PendingInputPreview {
|
|
let queued_messages = self
|
|
.queued_user_messages
|
|
.iter()
|
|
.enumerate()
|
|
.map(|(idx, message)| {
|
|
user_message_preview_text(
|
|
message,
|
|
self.queued_user_message_history_records.get(idx),
|
|
)
|
|
})
|
|
.collect();
|
|
let pending_steers = self
|
|
.pending_steers
|
|
.iter()
|
|
.map(|steer| {
|
|
user_message_preview_text(&steer.user_message, Some(&steer.history_record))
|
|
})
|
|
.collect();
|
|
let rejected_steers = self
|
|
.rejected_steers_queue
|
|
.iter()
|
|
.enumerate()
|
|
.map(|(idx, message)| {
|
|
user_message_preview_text(message, self.rejected_steer_history_records.get(idx))
|
|
})
|
|
.collect();
|
|
|
|
PendingInputPreview {
|
|
queued_messages,
|
|
pending_steers,
|
|
rejected_steers,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use pretty_assertions::assert_eq;
|
|
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn preview_keeps_queue_categories_separate() {
|
|
let mut state = InputQueueState::default();
|
|
state
|
|
.queued_user_messages
|
|
.push_back(UserMessage::from("queued").into());
|
|
state
|
|
.rejected_steers_queue
|
|
.push_back(UserMessage::from("rejected"));
|
|
state.pending_steers.push_back(PendingSteer {
|
|
user_message: UserMessage::from("pending"),
|
|
history_record: UserMessageHistoryRecord::UserMessageText,
|
|
compare_key: crate::chatwidget::user_messages::PendingSteerCompareKey {
|
|
message: "pending".to_string(),
|
|
image_count: 0,
|
|
},
|
|
});
|
|
|
|
assert_eq!(
|
|
state.preview(),
|
|
PendingInputPreview {
|
|
queued_messages: vec!["queued".to_string()],
|
|
pending_steers: vec!["pending".to_string()],
|
|
rejected_steers: vec!["rejected".to_string()],
|
|
}
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn clear_resets_all_input_queues() {
|
|
let mut state = InputQueueState::default();
|
|
state
|
|
.queued_user_messages
|
|
.push_back(UserMessage::from("queued").into());
|
|
state
|
|
.rejected_steers_queue
|
|
.push_back(UserMessage::from("rejected"));
|
|
state.user_turn_pending_start = true;
|
|
state.submit_pending_steers_after_interrupt = true;
|
|
|
|
state.clear();
|
|
|
|
assert!(state.queued_user_messages.is_empty());
|
|
assert!(state.queued_user_message_history_records.is_empty());
|
|
assert!(!state.user_turn_pending_start);
|
|
assert!(state.rejected_steers_queue.is_empty());
|
|
assert!(state.rejected_steer_history_records.is_empty());
|
|
assert!(state.pending_steers.is_empty());
|
|
assert!(!state.submit_pending_steers_after_interrupt);
|
|
}
|
|
}
|