mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
Michael BolinandGitHub
c7bcb90f9b
## Why The package layout gives Codex a stable place for runtime helpers that should travel with the entrypoint. `shell_zsh_fork` still required users to configure `zsh_path` manually, even though we already publish prebuilt zsh fork artifacts. This PR builds on #24129 and uses the shared DotSlash artifact fetcher to include the zsh fork in Codex packages when a matching target artifact exists. Packaged Codex builds can then discover the bundled fork automatically; the user/profile `zsh_path` override is removed so the feature uses the package-managed artifact instead of a legacy path knob. ## What Changed - Added `scripts/codex_package/codex-zsh`, a checked-in DotSlash manifest for the current macOS arm64 and Linux zsh fork artifacts. - Taught `scripts/build_codex_package.py` to fetch the matching zsh fork artifact and install it at `codex-resources/zsh/bin/zsh` when available for the selected target. - Added package layout validation for the optional bundled zsh resource. - Added `InstallContext::bundled_zsh_path()` and `InstallContext::bundled_zsh_bin_dir()` for package-layout resource discovery. - Threaded the packaged zsh path through config loading as the runtime `zsh_path` for packaged installs, and removed the config/profile/CLI override path. - Kept the packaged default zsh override typed as `AbsolutePathBuf` until the existing runtime `Config::zsh_path` boundary. - Updated app-server zsh-fork integration tests to spawn `codex-app-server` from a temporary package layout with `codex-resources/zsh/bin/zsh`, matching the new packaged discovery path instead of setting `zsh_path` in config. - Switched package executable copying from metadata-preserving `copy2()` to `copyfile()` plus explicit executable bits, which avoids macOS file-flag failures when local smoke tests use system binaries as inputs. ## Testing To verify that the `zsh` executable from the Codex package is picked up correctly, first I ran: ```shell ./scripts/build_codex_package.py ``` which created: ``` /private/var/folders/vw/x2knqmks50sfhfpy27nftl900000gp/T/codex-package-pms94kdp/ ``` so then I ran: ``` /private/var/folders/vw/x2knqmks50sfhfpy27nftl900000gp/T/codex-package-pms94kdp/bin/codex exec --enable shell_zsh_fork 'run `echo $0`' ``` which reported the following, as expected: ``` /private/var/folders/vw/x2knqmks50sfhfpy27nftl900000gp/T/codex-package-pms94kdp/codex-resources/zsh/bin/zsh ``` --- [//]: # (BEGIN SAPLING FOOTER) Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/openai/codex/pull/23756). * #23768 * __->__ #23756
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>,
|
|
}
|