mirror of
https://github.com/openai/codex.git
synced 2026-11-13 21:30:47 +00:00
Felipe Coury
2bb2e20d6a
## Why Reconstructing a thread session from the primary session could carry over another thread's fork parent and cached parent title. ## What changed Use the target thread's `forked_from_id` when reconstructing sessions from `thread/read` responses and `ThreadStarted` notifications. Clear the cached parent title when the parent changes, and treat absent or invalid parent IDs as no parent. ## Testing Extend the session reconstruction test to cover replacing an inherited fork parent and clearing inherited fork metadata for a thread with no parent, while retaining coverage of active permission settings. GitOrigin-RevId: 860779b40dc21fb4cc2ec1ac392523da5e439a94
88 lines
3.6 KiB
Rust
88 lines
3.6 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::models::ActivePermissionProfile;
|
|
use codex_protocol::models::PermissionProfile;
|
|
use codex_utils_absolute_path::AbsolutePathBuf;
|
|
use codex_utils_path_uri::PathUri;
|
|
|
|
#[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) daybreak_enabled: bool,
|
|
pub(crate) windows_sandbox_host: crate::app::WindowsSandboxHost,
|
|
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<PathUri>,
|
|
pub(crate) reasoning_effort: Option<codex_protocol::openai_models::ReasoningEffort>,
|
|
pub(crate) collaboration_mode: Option<Box<CollaborationMode>>,
|
|
pub(crate) message_history: Option<MessageHistoryMetadata>,
|
|
pub(crate) network_proxy: Option<SessionNetworkProxyRuntime>,
|
|
pub(crate) rollout_path: Option<PathBuf>,
|
|
}
|
|
|
|
impl ThreadSessionState {
|
|
pub(crate) fn set_fork_parent(&mut self, parent: Option<&str>) {
|
|
let parent = parent.and_then(|id| ThreadId::from_string(id).ok());
|
|
// The cached title belongs to the old parent. Drop it if the parent changes or is absent.
|
|
if self.forked_from_id != parent {
|
|
self.fork_parent_title = None;
|
|
}
|
|
self.forked_from_id = parent;
|
|
}
|
|
|
|
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);
|
|
}
|
|
}
|
|
}
|
|
}
|