mirror of
https://github.com/openai/codex.git
synced 2026-10-19 17:28:46 +00:00
Eric Traut
5106a5234f
## What changed Default `tui.fullscreen_transcript` to `true`, including when the `[tui]` section is absent, and apply the same default to the first frame. Update the configuration schema to match. Alternate-screen restrictions still take precedence, and `tui.fullscreen_transcript=false` restores terminal scrollback. ## Testing Update configuration and startup tests for the new default, including an empty `[tui]` section and `--no-alt-screen`. Adjust PTY tests to cover default fullscreen entry and explicit opt-out to terminal scrollback. GitOrigin-RevId: e460dcd058d52c50da2abc5113bbb678e845d5fc
95 lines
3.5 KiB
Rust
95 lines
3.5 KiB
Rust
//! Resolve first-frame screen ownership from the existing client configuration loader.
|
|
//!
|
|
//! The caller supplies its resolved profile overrides and configuration cwd, so this path does
|
|
//! not introduce separate profile or project precedence. Loading excludes cloud fetches and
|
|
//! returns the bootstrap result for reuse by startup. Final cloud or selected-project settings
|
|
//! may update screen policy before handing the terminal to the conversation.
|
|
|
|
use std::io;
|
|
use std::path::Path;
|
|
|
|
use codex_config::CloudConfigBundleLoader;
|
|
use codex_config::ConfigLoadOptions;
|
|
use codex_config::LoaderOverrides;
|
|
use codex_config::TomlValue;
|
|
use codex_utils_absolute_path::AbsolutePathBuf;
|
|
|
|
use crate::Cli;
|
|
use crate::keymap::RuntimeKeymap;
|
|
use crate::legacy_core::config::ConfigTomlLoadResult;
|
|
use crate::legacy_core::config::load_config_toml_with_layer_stack;
|
|
use crate::startup_draft::StartupScreen;
|
|
|
|
/// Screen policy and the already-loaded bootstrap configuration for this exact loading context.
|
|
pub(super) struct StartupPresentation {
|
|
pub(super) bootstrap_config: ConfigTomlLoadResult,
|
|
pub(super) config_cwd: Option<AbsolutePathBuf>,
|
|
pub(super) screen: StartupScreen,
|
|
}
|
|
|
|
/// Load client presentation settings without session setup or remote app-server connections.
|
|
///
|
|
/// `loader_overrides` must already contain the selected profile and remote login-policy choice.
|
|
/// `config_cwd` must come from the existing target/environment-aware cwd resolver. Reuse the
|
|
/// returned bootstrap only when these loading inputs still match the later startup context.
|
|
pub(super) async fn load(
|
|
cli: &Cli,
|
|
codex_home: &Path,
|
|
loader_overrides: LoaderOverrides,
|
|
cli_kv_overrides: Vec<(String, TomlValue)>,
|
|
config_cwd: Option<AbsolutePathBuf>,
|
|
) -> io::Result<StartupPresentation> {
|
|
let bootstrap_config = load_config_toml_with_layer_stack(
|
|
codex_home,
|
|
config_cwd.as_ref(),
|
|
cli_kv_overrides,
|
|
ConfigLoadOptions {
|
|
loader_overrides,
|
|
strict_config: cli.strict_config,
|
|
cloud_config_bundle: CloudConfigBundleLoader::default(),
|
|
},
|
|
)
|
|
.await?;
|
|
let config_toml = &bootstrap_config.config_toml;
|
|
let alternate_screen = config_toml
|
|
.tui
|
|
.as_ref()
|
|
.map(|tui| tui.alternate_screen)
|
|
.unwrap_or_default();
|
|
let use_alt_screen = crate::determine_alt_screen_mode(cli.no_alt_screen, alternate_screen);
|
|
let transcript_mode = crate::transcript_mode::TranscriptMode::resolve(
|
|
config_toml
|
|
.tui
|
|
.as_ref()
|
|
.is_none_or(|tui| tui.fullscreen_transcript),
|
|
use_alt_screen,
|
|
);
|
|
let status_line_enabled = config_toml
|
|
.tui
|
|
.as_ref()
|
|
.and_then(|tui| tui.status_line.as_ref())
|
|
.is_none_or(|items| !items.is_empty());
|
|
let default_tui_settings = codex_config::types::Tui::default();
|
|
let tui_settings = config_toml.tui.as_ref().unwrap_or(&default_tui_settings);
|
|
let keymap = RuntimeKeymap::from_config(&tui_settings.keymap).map_err(io::Error::other)?;
|
|
let disable_paste_burst = tui_settings
|
|
.disable_paste_burst
|
|
.or(config_toml.disable_paste_burst)
|
|
.unwrap_or(/*default*/ false);
|
|
Ok(StartupPresentation {
|
|
bootstrap_config,
|
|
config_cwd,
|
|
screen: StartupScreen {
|
|
use_alt_screen,
|
|
transcript_mode,
|
|
status_line_enabled,
|
|
keymap,
|
|
disable_paste_burst,
|
|
},
|
|
})
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "startup_presentation_tests.rs"]
|
|
mod tests;
|