openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-09 20:50:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 8e6431c80a into sapling-pr-archive-bolinfest

Browse Source
This commit is contained in:
Michael Bolin
2026-04-21 22:05:28 -07:00
committed by GitHub
parent 313b049060 8e6431c80a
commit e41b5de26e
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/core/src/guardian/review_session.rs
+2 -1
View File
@@ -719,13 +719,14 @@ pub(crate) fn build_guardian_review_session_config(
guardian_config.model = Some(active_model.to_string());
guardian_config.model_reasoning_effort = reasoning_effort;
guardian_config.include_skill_instructions = false;
guardian_config.developer_instructions = Some(
guardian_config.base_instructions = Some(
parent_config
.guardian_policy_config
.as_deref()
.map(guardian_policy_prompt_with_config)
.unwrap_or_else(guardian_policy_prompt),
);
guardian_config.developer_instructions = None;
guardian_config.permissions.approval_policy = Constrained::allow_only(AskForApproval::Never);
guardian_config.permissions.sandbox_policy =
Constrained::allow_only(SandboxPolicy::new_read_only_policy());
codex-rs/core/src/guardian/snapshots/codex_core__guardian__tests__guardian_followup_review_request_layout.snap
+5 -7
View File
File diff suppressed because one or more lines are too long
codex-rs/core/src/guardian/snapshots/codex_core__guardian__tests__guardian_review_request_layout.snap
+1 -2
View File
File diff suppressed because one or more lines are too long
codex-rs/core/src/guardian/tests.rs
+7 -4
View File
@@ -1727,7 +1727,7 @@ async fn guardian_review_session_config_preserves_parent_network_proxy() {
}
#[tokio::test]
async fn guardian_review_session_config_overrides_parent_developer_instructions() {
async fn guardian_review_session_config_clears_parent_developer_instructions() {
let mut parent_config = test_config().await;
parent_config.developer_instructions =
Some("parent or managed config should not replace guardian policy".to_string());
@@ -1740,8 +1740,9 @@ async fn guardian_review_session_config_overrides_parent_developer_instructions(
)
.expect("guardian config");
assert_eq!(guardian_config.developer_instructions, None);
assert_eq!(
guardian_config.developer_instructions,
guardian_config.base_instructions,
Some(guardian_policy_prompt())
);
}
@@ -1902,8 +1903,9 @@ async fn guardian_review_session_config_uses_requirements_guardian_policy_config
)
.expect("guardian config");
assert_eq!(guardian_config.developer_instructions, None);
assert_eq!(
guardian_config.developer_instructions,
guardian_config.base_instructions,
Some(guardian_policy_prompt_with_config(
"Use the workspace-managed guardian policy."
))
@@ -1939,8 +1941,9 @@ async fn guardian_review_session_config_uses_default_guardian_policy_without_req
)
.expect("guardian config");
assert_eq!(guardian_config.developer_instructions, None);
assert_eq!(
guardian_config.developer_instructions,
guardian_config.base_instructions,
Some(guardian_policy_prompt())
);
}