clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-05-23 04:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

draft

Browse Source
This commit is contained in:
won
2026-05-20 15:04:07 -07:00
parent e1ec0eee5f
commit d5bd752c9a
15 changed files with 116 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
codex-rs/app-server/tests/common/models_cache.rs
View File

@@ -51,6 +51,7 @@ fn preset_to_info(preset: &ModelPreset, priority: i32) -> ModelInfo {
input_modalities: default_input_modalities(),
used_fallback_model_metadata: false,
supports_search_tool: false,
auto_review_model_override: None,
}
}

1
codex-rs/codex-api/tests/models_integration.rs
View File

@@ -97,6 +97,7 @@ async fn models_client_hits_models_endpoint() {
input_modalities: default_input_modalities(),
used_fallback_model_metadata: false,
supports_search_tool: false,
auto_review_model_override: None,
}],
};

10
codex-rs/core/src/guardian/review.rs
View File

@@ -660,9 +660,13 @@ pub(super) async fn run_guardian_review_session(
}
};
let preferred_model_id = turn.provider.approval_review_preferred_model();
let preferred_model = available_models
.iter()
.find(|preset| preset.model == preferred_model_id);
let preferred_model = if turn.model_info.auto_review_model_override == Some(true) {
None
} else {
available_models
.iter()
.find(|preset| preset.model == preferred_model_id)
};
let (guardian_model, guardian_reasoning_effort) = if let Some(preset) = preferred_model {
let reasoning_effort = preferred_reasoning_effort(
preset

88
codex-rs/core/src/guardian/tests.rs
View File

@@ -1225,6 +1225,94 @@ fn guardian_output_schema_requires_only_outcome_and_allows_optional_details() {
);
}
async fn guardian_request_model_for_auto_review_override(
auto_review_model_override: Option<bool>,
) -> anyhow::Result<(String, String, String)> {
let server = start_mock_server().await;
let guardian_assessment = serde_json::json!({
"outcome": "allow",
})
.to_string();
let request_log = mount_sse_once(
&server,
sse(vec![
ev_response_created("resp-guardian"),
ev_assistant_message("msg-guardian", &guardian_assessment),
ev_completed("resp-guardian"),
]),
)
.await;
let (session, mut turn) = guardian_test_session_and_turn(&server).await;
Arc::get_mut(&mut turn)
.expect("turn should be unique")
.model_info
.auto_review_model_override = auto_review_model_override;
let parent_model = turn.model_info.slug.clone();
let preferred_model = turn.provider.approval_review_preferred_model().to_string();
seed_guardian_parent_history(&session, &turn).await;
let outcome = run_guardian_review_session_for_test(
Arc::clone(&session),
turn,
GuardianApprovalRequest::Shell {
id: "shell-1".to_string(),
command: vec!["git".to_string(), "push".to_string()],
cwd: test_path_buf("/repo/codex-rs/core").abs(),
sandbox_permissions: crate::sandboxing::SandboxPermissions::UseDefault,
additional_permissions: None,
justification: None,
},
Some("Sandbox denied outbound git push to github.com.".to_string()),
guardian_output_schema(),
/*external_cancel*/ None,
)
.await;
let (GuardianReviewOutcome::Completed(_), _) = outcome else {
panic!("expected guardian assessment");
};
let request_model = request_log
.single_request()
.body_json()
.get("model")
.and_then(|value| value.as_str())
.expect("guardian request should include a model")
.to_string();
Ok((request_model, parent_model, preferred_model))
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn guardian_review_uses_parent_model_when_model_catalog_override_is_true()
-> anyhow::Result<()> {
skip_if_no_network!(Ok(()));
let (request_model, parent_model, preferred_model) =
guardian_request_model_for_auto_review_override(Some(true)).await?;
assert_eq!(request_model, parent_model);
assert_ne!(request_model, preferred_model);
Ok(())
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn guardian_review_uses_preferred_review_model_without_parent_override() -> anyhow::Result<()>
{
skip_if_no_network!(Ok(()));
for auto_review_model_override in [None, Some(false)] {
let (request_model, parent_model, preferred_model) =
guardian_request_model_for_auto_review_override(auto_review_model_override).await?;
assert_eq!(request_model, preferred_model);
assert_ne!(request_model, parent_model);
}
Ok(())
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn guardian_review_request_layout_matches_model_visible_request_snapshot()
-> anyhow::Result<()> {

2
codex-rs/core/tests/suite/model_switching.rs
View File

@@ -110,6 +110,7 @@ fn test_model_info(
input_modalities,
used_fallback_model_metadata: false,
supports_search_tool: false,
auto_review_model_override: None,
priority: 1,
additional_speed_tiers: Vec::new(),
service_tiers: Vec::new(),
@@ -861,6 +862,7 @@ async fn model_switch_to_smaller_model_updates_token_context_window() -> Result<
input_modalities: default_input_modalities(),
used_fallback_model_metadata: false,
supports_search_tool: false,
auto_review_model_override: None,
priority: 1,
additional_speed_tiers: Vec::new(),
service_tiers: Vec::new(),

1
codex-rs/core/tests/suite/models_cache_ttl.rs
View File

@@ -368,5 +368,6 @@ fn test_remote_model(slug: &str, priority: i32) -> ModelInfo {
input_modalities: default_input_modalities(),
used_fallback_model_metadata: false,
supports_search_tool: false,
auto_review_model_override: None,
}
}

2
codex-rs/core/tests/suite/personality.rs
View File

@@ -590,6 +590,7 @@ async fn remote_model_friendly_personality_instructions_with_feature() -> anyhow
input_modalities: default_input_modalities(),
used_fallback_model_metadata: false,
supports_search_tool: false,
auto_review_model_override: None,
};
let _models_mock = mount_models_once(
@@ -699,6 +700,7 @@ async fn user_turn_personality_remote_model_template_includes_update_message() -
input_modalities: default_input_modalities(),
used_fallback_model_metadata: false,
supports_search_tool: false,
auto_review_model_override: None,
};
let _models_mock = mount_models_once(

3
codex-rs/core/tests/suite/remote_models.rs
View File

@@ -472,6 +472,7 @@ async fn remote_models_remote_model_uses_unified_exec() -> Result<()> {
input_modalities: default_input_modalities(),
used_fallback_model_metadata: false,
supports_search_tool: false,
auto_review_model_override: None,
priority: 1,
additional_speed_tiers: Vec::new(),
service_tiers: Vec::new(),
@@ -719,6 +720,7 @@ async fn remote_models_apply_remote_base_instructions() -> Result<()> {
input_modalities: default_input_modalities(),
used_fallback_model_metadata: false,
supports_search_tool: false,
auto_review_model_override: None,
priority: 1,
additional_speed_tiers: Vec::new(),
service_tiers: Vec::new(),
@@ -1200,6 +1202,7 @@ fn test_remote_model_with_policy(
input_modalities: default_input_modalities(),
used_fallback_model_metadata: false,
supports_search_tool: false,
auto_review_model_override: None,
priority,
additional_speed_tiers: Vec::new(),
service_tiers: Vec::new(),

1
codex-rs/core/tests/suite/rmcp_client.rs
View File

@@ -1296,6 +1296,7 @@ async fn stdio_image_responses_are_sanitized_for_text_only_model() -> anyhow::Re
input_modalities: vec![InputModality::Text],
used_fallback_model_metadata: false,
supports_search_tool: false,
auto_review_model_override: None,
}],
},
)

1
codex-rs/core/tests/suite/spawn_agent_description.rs
View File

@@ -60,6 +60,7 @@ fn test_model_info(
input_modalities: default_input_modalities(),
used_fallback_model_metadata: false,
supports_search_tool: false,
auto_review_model_override: None,
priority: 1,
additional_speed_tiers: Vec::new(),
service_tiers,

1
codex-rs/core/tests/suite/view_image.rs
View File

@@ -1354,6 +1354,7 @@ async fn view_image_tool_returns_unsupported_message_for_text_only_model() -> an
input_modalities: vec![InputModality::Text],
used_fallback_model_metadata: false,
supports_search_tool: false,
auto_review_model_override: None,
priority: 1,
additional_speed_tiers: Vec::new(),
service_tiers: Vec::new(),

2
codex-rs/model-provider/src/amazon_bedrock/catalog.rs
View File

@@ -76,6 +76,7 @@ fn gpt_5_4_cmb_bedrock_model(priority: i32) -> ModelInfo {
input_modalities: vec![InputModality::Text, InputModality::Image],
used_fallback_model_metadata: false,
supports_search_tool: true,
auto_review_model_override: None,
}
}
@@ -117,6 +118,7 @@ fn bedrock_oss_model(slug: &str, display_name: &str, priority: i32) -> ModelInfo
input_modalities: vec![InputModality::Text],
used_fallback_model_metadata: false,
supports_search_tool: false,
auto_review_model_override: None,
}
}

1
codex-rs/models-manager/src/model_info.rs
View File

@@ -98,6 +98,7 @@ pub fn model_info_from_slug(slug: &str) -> ModelInfo {
input_modalities: default_input_modalities(),
used_fallback_model_metadata: true, // this is the fallback model metadata
supports_search_tool: false,
auto_review_model_override: None,
}
}

4
codex-rs/protocol/src/openai_models.rs
View File

@@ -312,6 +312,8 @@ pub struct ModelInfo {
pub used_fallback_model_metadata: bool,
#[serde(default)]
pub supports_search_tool: bool,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub auto_review_model_override: Option<bool>,
}
impl ModelInfo {
@@ -597,6 +599,7 @@ mod tests {
input_modalities: default_input_modalities(),
used_fallback_model_metadata: false,
supports_search_tool: false,
auto_review_model_override: None,
}
}
@@ -814,6 +817,7 @@ mod tests {
assert!(!model.supports_image_detail_original);
assert_eq!(model.web_search_tool_type, WebSearchToolType::Text);
assert!(!model.supports_search_tool);
assert_eq!(model.auto_review_model_override, None);
}
#[test]

1
codex-rs/tools/src/tool_config_tests.rs
View File

@@ -43,6 +43,7 @@ fn model_with_shell_type(shell_type: ConfigShellToolType) -> ModelInfo {
input_modalities: codex_protocol::openai_models::default_input_modalities(),
used_fallback_model_metadata: false,
supports_search_tool: false,
auto_review_model_override: None,
}
}