mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
Eric Traut
edc48e4612
Builds on #23502. ## Why #23502 adds the app-server `thread/settings/update` API and matching `thread/settings/updated` notification. The TUI already lets users change thread-scoped settings such as model, reasoning effort, service tier, approvals, permissions, personality, and collaboration mode, but those updates need to flow through the app server so embedded and connected clients observe the same thread state. This is a rework (simplification) of PR https://github.com/openai/codex/pull/22510. It has the same functionality, but the underlying `thread/settings/update` api is now simpler in that it no longer returns the effective settings as a response. Now, clients receive the effective settings only through the `thread/settings/updated` notification. ## What Changed This updates the TUI to send `thread/settings/update` whenever those thread-scoped settings change and to treat the RPC response as the authoritative acknowledgement. It also routes `thread/settings/updated` notifications back into cached session state and the visible chat widget so active and inactive threads stay in sync after app-server-originated changes. The implementation is kept to the TUI layer: settings conversion and merge logic live under `codex-rs/tui/src/app/thread_settings.rs`, with dispatch/routing hooks in the existing app and chat widget paths. ## Verification I manually tested using `codex app-server --listen unix://` and then launching two copies of the TUI that use the same local app server. I then resumed the same thread on both and verified that changes like plan mode, fast mode, model, reasoning effort, etc. are reflected "live" in the second client when modified in the first and vice versa.
78 lines
3.2 KiB
Rust
78 lines
3.2 KiB
Rust
//! Canonical TUI session state shared across app-server routing, chat display, and status UI.
|
|
//!
|
|
//! The app-server API is the boundary for session lifecycle events. Once those responses enter
|
|
//! TUI, this module holds the small internal state shape used by app orchestration and widgets.
|
|
|
|
use std::path::PathBuf;
|
|
|
|
use codex_app_server_protocol::AskForApproval;
|
|
use codex_protocol::ThreadId;
|
|
use codex_protocol::config_types::CollaborationMode;
|
|
use codex_protocol::config_types::Personality;
|
|
use codex_protocol::models::ActivePermissionProfile;
|
|
use codex_protocol::models::PermissionProfile;
|
|
use codex_utils_absolute_path::AbsolutePathBuf;
|
|
|
|
#[derive(Debug, Clone, PartialEq)]
|
|
pub(crate) struct SessionNetworkProxyRuntime {
|
|
pub(crate) http_addr: String,
|
|
pub(crate) socks_addr: String,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
|
|
pub(crate) struct MessageHistoryMetadata {
|
|
pub(crate) log_id: u64,
|
|
pub(crate) entry_count: usize,
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq)]
|
|
pub(crate) struct ThreadSessionState {
|
|
pub(crate) thread_id: ThreadId,
|
|
pub(crate) forked_from_id: Option<ThreadId>,
|
|
pub(crate) fork_parent_title: Option<String>,
|
|
pub(crate) thread_name: Option<String>,
|
|
pub(crate) model: String,
|
|
pub(crate) model_provider_id: String,
|
|
pub(crate) service_tier: Option<String>,
|
|
pub(crate) approval_policy: AskForApproval,
|
|
pub(crate) approvals_reviewer: codex_protocol::config_types::ApprovalsReviewer,
|
|
/// Permission snapshot used by TUI display surfaces. Legacy app-server
|
|
/// responses are converted to a profile at ingestion time using the
|
|
/// response cwd so cached sessions do not reinterpret cwd-bound grants.
|
|
/// Turn requests must not treat this snapshot as a local permission
|
|
/// override unless the user explicitly changed permissions in the TUI.
|
|
pub(crate) permission_profile: PermissionProfile,
|
|
/// Named or implicit built-in profile that produced `permission_profile`,
|
|
/// when the server knows it.
|
|
pub(crate) active_permission_profile: Option<ActivePermissionProfile>,
|
|
pub(crate) cwd: AbsolutePathBuf,
|
|
pub(crate) runtime_workspace_roots: Vec<AbsolutePathBuf>,
|
|
pub(crate) instruction_source_paths: Vec<AbsolutePathBuf>,
|
|
pub(crate) reasoning_effort: Option<codex_protocol::openai_models::ReasoningEffort>,
|
|
pub(crate) collaboration_mode: Option<Box<CollaborationMode>>,
|
|
pub(crate) personality: Option<Personality>,
|
|
pub(crate) message_history: Option<MessageHistoryMetadata>,
|
|
pub(crate) network_proxy: Option<SessionNetworkProxyRuntime>,
|
|
pub(crate) rollout_path: Option<PathBuf>,
|
|
}
|
|
|
|
impl ThreadSessionState {
|
|
pub(crate) fn set_cwd_retargeting_implicit_runtime_workspace_root(
|
|
&mut self,
|
|
cwd: AbsolutePathBuf,
|
|
) {
|
|
let previous_cwd = std::mem::replace(&mut self.cwd, cwd.clone());
|
|
if !self.runtime_workspace_roots.contains(&previous_cwd) {
|
|
return;
|
|
}
|
|
|
|
let previous_roots = std::mem::take(&mut self.runtime_workspace_roots);
|
|
self.runtime_workspace_roots.push(cwd);
|
|
for root in previous_roots {
|
|
if root != previous_cwd && !self.runtime_workspace_roots.contains(&root) {
|
|
self.runtime_workspace_roots.push(root);
|
|
}
|
|
}
|
|
}
|
|
}
|