mirror of
https://github.com/openai/codex.git
synced 2026-11-14 21:40:39 +00:00
## Why The primary executor's working directory can differ from the app-server's. Displaying the app-server directory can misidentify the workspace, and abbreviating a remote path using the TUI's home directory can be misleading. ## What changed - Carry the primary environment's working directory through thread initialization, restoration, and settings updates. - Use it for the status line and terminal title's current-directory item, and expose it as `thread.workspace.cwd` in the statusline state. - Preserve the known environment directory when settings omit environments; fall back to the app-server directory when the environment list is empty. - Apply home-directory abbreviation only to server-local workspaces on local connections. ## Testing Add regression coverage for remote executor paths, omitted and empty environment settings, local-only directory abbreviation, and workspace state for inactive threads. Update the resumed-thread snapshot to display the executor directory. GitOrigin-RevId: 9f3bcad186e07f942ea00d1f4233cf09f022571f
111 lines
4.5 KiB
Rust
111 lines
4.5 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_app_server_protocol::ThreadEnvironment;
|
|
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::LegacyAppPathString;
|
|
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 {
|
|
/// This TUI opened saved history without a live attachment.
|
|
pub(crate) read_only_history: bool,
|
|
/// Inferred child sessions can carry settings copied from the primary thread.
|
|
pub(crate) thread_settings_confirmed: bool,
|
|
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,
|
|
/// Native cwd of the primary executor, which can differ from the app-server cwd.
|
|
pub(crate) primary_environment_cwd: Option<EnvironmentCwd>,
|
|
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>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq)]
|
|
pub(crate) struct EnvironmentCwd {
|
|
pub(crate) path: LegacyAppPathString,
|
|
pub(crate) is_server_local: bool,
|
|
}
|
|
|
|
pub(crate) fn primary_environment_cwd(
|
|
environments: &[ThreadEnvironment],
|
|
) -> Option<EnvironmentCwd> {
|
|
environments.first().map(|primary| EnvironmentCwd {
|
|
path: primary.cwd.clone(),
|
|
is_server_local: primary.environment_id == codex_exec_server::LOCAL_ENVIRONMENT_ID,
|
|
})
|
|
}
|
|
|
|
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);
|
|
}
|
|
}
|
|
}
|
|
}
|