openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-02 19:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 14bca55b44 into sapling-pr-archive-bolinfest

Browse Source
This commit is contained in:
Michael Bolin
2025-09-15 08:01:03 -07:00
committed by GitHub
parent 4be95fdea8 14bca55b44
commit be26c5b93e
8 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/common/src/model_presets.rs
+11 -11
View File
@@ -1,4 +1,4 @@
use codex_core::config::SWIFTFOX_MEDIUM_MODEL;
use codex_core::config::GPT_5_CODEX_MEDIUM_MODEL;
use codex_core::protocol_config_types::ReasoningEffort;
use codex_protocol::mcp_protocol::AuthMode;
@@ -19,24 +19,24 @@ pub struct ModelPreset {
const PRESETS: &[ModelPreset] = &[
ModelPreset {
id: "swiftfox-low",
label: "swiftfox low",
id: "gpt-5-codex-low",
label: "gpt-5-codex low",
description: "",
model: "swiftfox",
model: "gpt-5-codex",
effort: Some(ReasoningEffort::Low),
},
ModelPreset {
id: "swiftfox-medium",
label: "swiftfox medium",
id: "gpt-5-codex-medium",
label: "gpt-5-codex medium",
description: "",
model: "swiftfox",
model: "gpt-5-codex",
effort: None,
},
ModelPreset {
id: "swiftfox-high",
label: "swiftfox high",
id: "gpt-5-codex-high",
label: "gpt-5-codex high",
description: "",
model: "swiftfox",
model: "gpt-5-codex",
effort: Some(ReasoningEffort::High),
},
ModelPreset {
@@ -74,7 +74,7 @@ pub fn builtin_model_presets(auth_mode: Option<AuthMode>) -> Vec<ModelPreset> {
Some(AuthMode::ApiKey) => PRESETS
.iter()
.copied()
.filter(|p| p.model != SWIFTFOX_MEDIUM_MODEL)
.filter(|p| p.model != GPT_5_CODEX_MEDIUM_MODEL)
.collect(),
_ => PRESETS.to_vec(),
}
codex-rs/core/swiftfox_prompt.md → codex-rs/core/gpt_5_codex_prompt.md
+10 -2
View File
@@ -1,4 +1,4 @@
You are Swiftfox. You are running as a coding agent in the Codex CLI on a user's computer.
You are Codex, based on GPT-5. You are running as a coding agent in the Codex CLI on a user's computer.
## General
@@ -26,7 +26,7 @@ When using the planning tool:
## Codex CLI harness, sandboxing, and approvals
The Codex CLI harness supports several different sandboxing, and approval configurations that the user can choose from.
The Codex CLI harness supports several different sandboxing, and approval configurations that the user can choose from.
Filesystem sandboxing defines which files can be read or written. The options are:
- **read-only**: You can only read files.
@@ -90,3 +90,11 @@ You are producing plain text that will later be styled by the CLI. Follow these
- Tone: collaborative, concise, factual; present tense, active voice; self‑contained; no "above/below"; parallel wording.
- Don'ts: no nested bullets/hierarchies; no ANSI codes; don't cram unrelated keywords; keep keyword lists short—wrap/reformat if long; avoid naming formatting styles in answers.
- Adaptation: code explanations → precise, structured with code refs; simple tasks → lead with outcome; big changes → logical walkthrough + rationale + next actions; casual one-offs → plain sentences, no headers/bullets.
- File References: When referencing files in your response, make sure to include the relevant start line and always follow the below rules:
* Use inline code to make file paths clickable.
* Each reference should have a stand alone path. Even if it's the same file.
* Accepted: absolute, workspace‑relative, a/ or b/ diff prefixes, or bare filename/suffix.
* Line/column (1‑based, optional): :line[:column] or #Lline[Ccolumn] (column defaults to 1).
* Do not use URIs like file://, vscode://, or https://.
* Do not provide range of lines
* Examples: src/app.ts, src/app.ts:42, b/server/index.js#L10, C:\repo\project\main.rs:12:5
codex-rs/core/src/client_common.rs
+1 -1
View File
@@ -215,7 +215,7 @@ mod tests {
expects_apply_patch_instructions: false,
},
InstructionsTestCase {
slug: "swiftfox",
slug: "gpt-5-codex",
expects_apply_patch_instructions: false,
},
];
codex-rs/core/src/config.rs
+6 -6
View File
@@ -38,8 +38,8 @@ use toml_edit::Table as TomlTable;
const OPENAI_DEFAULT_MODEL: &str = "gpt-5";
const OPENAI_DEFAULT_REVIEW_MODEL: &str = "gpt-5";
pub const SWIFTFOX_MEDIUM_MODEL: &str = "swiftfox";
pub const SWIFTFOX_MODEL_DISPLAY_NAME: &str = "swiftfox-medium";
pub const GPT_5_CODEX_MEDIUM_MODEL: &str = "gpt-5-codex";
pub const GPT_5_CODEX_DISPLAY_NAME: &str = "gpt-5-codex";
/// Maximum number of bytes of the documentation that will be embedded. Larger
/// files are *silently truncated* to this size so we do not take up too much of
@@ -1296,7 +1296,7 @@ exclude_slash_tmp = true
persist_model_selection(
codex_home.path(),
None,
"swiftfox",
"gpt-5-codex",
Some(ReasoningEffort::High),
)
.await?;
@@ -1305,7 +1305,7 @@ exclude_slash_tmp = true
tokio::fs::read_to_string(codex_home.path().join(CONFIG_TOML_FILE)).await?;
let parsed: ConfigToml = toml::from_str(&serialized)?;
assert_eq!(parsed.model.as_deref(), Some("swiftfox"));
assert_eq!(parsed.model.as_deref(), Some("gpt-5-codex"));
assert_eq!(parsed.model_reasoning_effort, Some(ReasoningEffort::High));
Ok(())
@@ -1359,7 +1359,7 @@ model = "gpt-4.1"
persist_model_selection(
codex_home.path(),
Some("dev"),
"swiftfox",
"gpt-5-codex",
Some(ReasoningEffort::Medium),
)
.await?;
@@ -1372,7 +1372,7 @@ model = "gpt-4.1"
.get("dev")
.expect("profile should be created");
assert_eq!(profile.model.as_deref(), Some("swiftfox"));
assert_eq!(profile.model.as_deref(), Some("gpt-5-codex"));
assert_eq!(
profile.model_reasoning_effort,
Some(ReasoningEffort::Medium)
codex-rs/core/src/internal_storage.rs
+2 -2
View File
@@ -11,8 +11,8 @@ pub(crate) const INTERNAL_STORAGE_FILE: &str = "internal_storage.json";
pub struct InternalStorage {
#[serde(skip)]
storage_path: PathBuf,
#[serde(default, alias = "gpt_5_high_model_prompt_seen")]
pub swiftfox_model_prompt_seen: bool,
#[serde(default)]
pub gpt_5_codex_model_prompt_seen: bool,
}
// TODO(jif) generalise all the file writers and build proper async channel inserters.
codex-rs/core/src/model_family.rs
+3 -3
View File
@@ -4,7 +4,7 @@ use crate::tool_apply_patch::ApplyPatchToolType;
/// The `instructions` field in the payload sent to a model should always start
/// with this content.
const BASE_INSTRUCTIONS: &str = include_str!("../prompt.md");
const SWIFTFOX_INSTRUCTIONS: &str = include_str!("../swiftfox_prompt.md");
const GPT_5_CODEX_INSTRUCTIONS: &str = include_str!("../gpt_5_codex_prompt.md");
/// A model family is a group of models that share certain characteristics.
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -99,12 +99,12 @@ pub fn find_family_for_model(slug: &str) -> Option<ModelFamily> {
model_family!(slug, "gpt-4o", needs_special_apply_patch_instructions: true)
} else if slug.starts_with("gpt-3.5") {
model_family!(slug, "gpt-3.5", needs_special_apply_patch_instructions: true)
} else if slug.starts_with("codex-") || slug.starts_with("swiftfox") {
} else if slug.starts_with("codex-") || slug.starts_with("gpt-5-codex") {
model_family!(
slug, slug,
supports_reasoning_summaries: true,
reasoning_summary_format: ReasoningSummaryFormat::Experimental,
base_instructions: SWIFTFOX_INSTRUCTIONS.to_string(),
base_instructions: GPT_5_CODEX_INSTRUCTIONS.to_string(),
)
} else if slug.starts_with("gpt-5") {
model_family!(
codex-rs/tui/src/lib.rs
+6 -6
View File
@@ -11,7 +11,7 @@ use codex_core::RolloutRecorder;
use codex_core::config::Config;
use codex_core::config::ConfigOverrides;
use codex_core::config::ConfigToml;
use codex_core::config::SWIFTFOX_MEDIUM_MODEL;
use codex_core::config::GPT_5_CODEX_MEDIUM_MODEL;
use codex_core::config::find_codex_home;
use codex_core::config::load_config_as_toml_with_cli_overrides;
use codex_core::config::persist_model_selection;
@@ -381,9 +381,9 @@ async fn run_ratatui_app(
&cli,
&config,
active_profile.as_deref(),
internal_storage.swiftfox_model_prompt_seen,
internal_storage.gpt_5_codex_model_prompt_seen,
) {
internal_storage.swiftfox_model_prompt_seen = true;
internal_storage.gpt_5_codex_model_prompt_seen = true;
if let Err(e) = internal_storage.persist().await {
error!("Failed to persist internal storage: {e:?}");
}
@@ -392,7 +392,7 @@ async fn run_ratatui_app(
let switch_to_new_model = upgrade_decision == ModelUpgradeDecision::Switch;
if switch_to_new_model {
config.model = SWIFTFOX_MEDIUM_MODEL.to_owned();
config.model = GPT_5_CODEX_MEDIUM_MODEL.to_owned();
config.model_reasoning_effort = None;
if let Err(e) = persist_model_selection(
&config.codex_home,
@@ -525,13 +525,13 @@ fn should_show_model_rollout_prompt(
cli: &Cli,
config: &Config,
active_profile: Option<&str>,
swiftfox_model_prompt_seen: bool,
gpt_5_codex_model_prompt_seen: bool,
) -> bool {
let login_status = get_login_status(config);
active_profile.is_none()
&& cli.model.is_none()
&& !swiftfox_model_prompt_seen
&& !gpt_5_codex_model_prompt_seen
&& config.model_provider.requires_openai_auth
&& matches!(login_status, LoginStatus::AuthMode(AuthMode::ChatGPT))
&& !cli.oss
codex-rs/tui/src/new_model_popup.rs
+3 -3
View File
@@ -3,7 +3,7 @@ use crate::frames::FRAME_TICK_DEFAULT;
use crate::tui::FrameRequester;
use crate::tui::Tui;
use crate::tui::TuiEvent;
use codex_core::config::SWIFTFOX_MODEL_DISPLAY_NAME;
use codex_core::config::GPT_5_CODEX_DISPLAY_NAME;
use color_eyre::eyre::Result;
use crossterm::event::KeyCode;
use crossterm::event::KeyEvent;
@@ -130,7 +130,7 @@ impl WidgetRef for &ModelUpgradePopup {
lines.push("".into());
lines.push(
format!(" Codex is now powered by {SWIFTFOX_MODEL_DISPLAY_NAME}, a new model that is")
format!(" Codex is now powered by {GPT_5_CODEX_DISPLAY_NAME}, a new model that is")
.into(),
);
lines.push(Line::from(vec![
@@ -156,7 +156,7 @@ impl WidgetRef for &ModelUpgradePopup {
lines.push(create_option(
0,
ModelUpgradeOption::TryNewModel,
&format!("Yes, switch me to {SWIFTFOX_MODEL_DISPLAY_NAME}"),
&format!("Yes, switch me to {GPT_5_CODEX_DISPLAY_NAME}"),
));
lines.push("".into());
lines.push(create_option(