mirror of
https://github.com/openai/codex.git
synced 2026-11-07 20:30:33 +00:00
Michael Bolin
eefd6490d6
Summary: - add a checked-in codex-zsh DotSlash manifest for supported Unix targets - fetch the matching zsh fork artifact during package builds and install it at codex-resources/zsh/bin/zsh when available - expose the bundled zsh fork through install-context and have Config use it as the runtime zsh path for packaged installs - remove the user/profile zsh_path config override now that the fork is package-managed - update app-server zsh-fork integration tests to spawn from a temporary package layout instead of configuring zsh_path directly - use copyfile for package executable staging so local package smoke tests do not preserve platform-specific source metadata Test Plan: - just fmt - just write-config-schema - just bazel-lock-update - just bazel-lock-check - just fix -p codex-config -p codex-core -p codex-exec - just fix -p codex-app-server - just fix -p codex-core -p codex-app-server -p codex-cli -p codex-exec -p codex-mcp-server -p codex-tui - python3 -m py_compile scripts/codex_package/cli.py scripts/codex_package/layout.py scripts/codex_package/zsh.py - python3 -m unittest discover scripts/codex_package - cargo test -p codex-core default_zsh_path_sets_runtime_zsh_path - cargo test -p codex-core session_new_fails_when_zsh_fork_enabled_without_packaged_zsh - cargo test -p codex-core restricted_read_implicitly_allows_helper_executables - cargo test -p codex-config - cargo test -p codex-app-server turn_start_shell_zsh_fork_executes_command_v2 - cargo test -p codex-app-server turn_start_shell_zsh_fork - cargo check -p codex-cli -p codex-exec -p codex-mcp-server
82 lines
3.4 KiB
Rust
82 lines
3.4 KiB
Rust
use codex_utils_absolute_path::AbsolutePathBuf;
|
|
use schemars::JsonSchema;
|
|
use serde::Deserialize;
|
|
use serde::Serialize;
|
|
|
|
use crate::config_toml::ToolsToml;
|
|
use crate::types::AnalyticsConfigToml;
|
|
use crate::types::ApprovalsReviewer;
|
|
use crate::types::Personality;
|
|
use crate::types::SessionPickerViewMode;
|
|
use crate::types::WindowsToml;
|
|
use codex_features::FeaturesToml;
|
|
use codex_protocol::config_types::ReasoningSummary;
|
|
use codex_protocol::config_types::SandboxMode;
|
|
use codex_protocol::config_types::Verbosity;
|
|
use codex_protocol::config_types::WebSearchMode;
|
|
use codex_protocol::openai_models::ReasoningEffort;
|
|
use codex_protocol::protocol::AskForApproval;
|
|
|
|
/// Collection of common configuration options that a user can define as a unit
|
|
/// in `config.toml`.
|
|
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema)]
|
|
#[schemars(deny_unknown_fields)]
|
|
pub struct ConfigProfile {
|
|
pub model: Option<String>,
|
|
/// Optional explicit service tier request id for new turns (for example
|
|
/// `default`, `priority`, or `flex`; legacy `fast` also works).
|
|
pub service_tier: Option<String>,
|
|
/// The key in the `model_providers` map identifying the
|
|
/// [`ModelProviderInfo`] to use.
|
|
pub model_provider: Option<String>,
|
|
pub approval_policy: Option<AskForApproval>,
|
|
pub approvals_reviewer: Option<ApprovalsReviewer>,
|
|
pub sandbox_mode: Option<SandboxMode>,
|
|
pub model_reasoning_effort: Option<ReasoningEffort>,
|
|
pub plan_mode_reasoning_effort: Option<ReasoningEffort>,
|
|
pub model_reasoning_summary: Option<ReasoningSummary>,
|
|
pub model_verbosity: Option<Verbosity>,
|
|
/// Optional path to a JSON model catalog (applied on startup only).
|
|
pub model_catalog_json: Option<AbsolutePathBuf>,
|
|
pub personality: Option<Personality>,
|
|
pub chatgpt_base_url: Option<String>,
|
|
/// Optional path to a file containing model instructions.
|
|
pub model_instructions_file: Option<AbsolutePathBuf>,
|
|
/// Deprecated: ignored.
|
|
#[schemars(skip)]
|
|
pub js_repl_node_path: Option<AbsolutePathBuf>,
|
|
/// Deprecated: ignored.
|
|
#[schemars(skip)]
|
|
pub js_repl_node_module_dirs: Option<Vec<AbsolutePathBuf>>,
|
|
pub experimental_compact_prompt_file: Option<AbsolutePathBuf>,
|
|
pub include_permissions_instructions: Option<bool>,
|
|
pub include_apps_instructions: Option<bool>,
|
|
pub include_collaboration_mode_instructions: Option<bool>,
|
|
pub include_environment_context: Option<bool>,
|
|
pub experimental_use_unified_exec_tool: Option<bool>,
|
|
pub tools: Option<ToolsToml>,
|
|
pub web_search: Option<WebSearchMode>,
|
|
pub analytics: Option<AnalyticsConfigToml>,
|
|
/// TUI settings scoped to this profile.
|
|
#[serde(default)]
|
|
pub tui: Option<ProfileTui>,
|
|
#[serde(default)]
|
|
pub windows: Option<WindowsToml>,
|
|
/// Optional feature toggles scoped to this profile.
|
|
#[serde(default)]
|
|
// Injects known feature keys into the schema and forbids unknown keys.
|
|
#[schemars(schema_with = "crate::schema::features_schema")]
|
|
pub features: Option<FeaturesToml>,
|
|
pub oss_provider: Option<String>,
|
|
}
|
|
|
|
/// TUI settings supported inside a named profile.
|
|
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema)]
|
|
#[serde(deny_unknown_fields)]
|
|
#[schemars(deny_unknown_fields)]
|
|
pub struct ProfileTui {
|
|
/// Preferred layout for resume/fork session picker results.
|
|
#[serde(default)]
|
|
pub session_picker_view: Option<SessionPickerViewMode>,
|
|
}
|