Lightweight coding agent that runs in your terminal
Rust
Propagate trusted root skills to delegated workers (#41118)
felixxia-oai694edc23b22b
diff --git a/codex-rs/app-server/tests/suite/v2/guardian_v2.rs b/codex-rs/app-server/tests/suite/v2/guardian_v2.rsindex 8cb6a2bb89..ca534a201d 100644--- a/codex-rs/app-server/tests/suite/v2/guardian_v2.rs+++ b/codex-rs/app-server/tests/suite/v2/guardian_v2.rs@@ -198,6 +198,7 @@ enum ThreadLifecycle {Fork,RootRollback,RootRestriction,+ RootTrustedSkill,RootUserRestriction,RootUserInputRestriction,RootUserInputHookBlocked,@@ -209,6 +210,7 @@ impl ThreadLifecycle {self,Self::RootRollback| Self::RootRestriction+ | Self::RootTrustedSkill| Self::RootUserInputRestriction| Self::RootUserInputHookBlocked)@@ -584,6 +586,17 @@ async fn guardian_v2_routes_scoped_tool_approvals(let (mcp_server_url, mcp_server_handle) = start_mcp_server(sensitive_action).await?;let codex_home = TempDir::new()?;+ let root_skill = if matches!(lifecycle, ThreadLifecycle::RootTrustedSkill) {+ let path = codex_home.path().join("skills/root-trusted/SKILL.md");+ std::fs::create_dir_all(path.parent().expect("root skill parent"))?;+ std::fs::write(+ &path,+ "---\nname: root-trusted\ndescription: Delegated user skill\n---\n\nDelegate the requested work.\n",+ )?;+ Some(path.canonicalize()?)+ } else {+ None+ };if lifecycle.has_post_tool_hook() {let output = if matches!(lifecycle, ThreadLifecycle::UserInputHookFeedback) {json!({ "continue": false, "stopReason": USER_INPUT_HOOK_FEEDBACK })@@ -656,6 +669,7 @@ async fn guardian_v2_routes_scoped_tool_approvals(| ThreadLifecycle::UserInputHookBlocked| ThreadLifecycle::RootRollback| ThreadLifecycle::RootRestriction+ | ThreadLifecycle::RootTrustedSkill| ThreadLifecycle::RootUserRestriction| ThreadLifecycle::RootUserInputRestriction| ThreadLifecycle::RootUserInputHookBlocked => None,@@ -701,6 +715,7 @@ async fn guardian_v2_routes_scoped_tool_approvals(| ThreadLifecycle::UserInputHookBlocked| ThreadLifecycle::RootRollback| ThreadLifecycle::RootRestriction+ | ThreadLifecycle::RootTrustedSkill| ThreadLifecycle::RootUserRestriction| ThreadLifecycle::RootUserInputRestriction| ThreadLifecycle::RootUserInputHookBlocked => {@@ -755,13 +770,20 @@ async fn guardian_v2_routes_scoped_tool_approvals(.root_thread_id.lock().expect("root thread lock should not be poisoned") = Some(thread_id.clone());+ let mut turn_input = vec![UserInput::Text {+ text: USER_CONTEXT.to_owned(),+ text_elements: Vec::new(),+ }];+ if let Some(skill_path) = root_skill.as_ref() {+ turn_input.push(UserInput::Skill {+ name: "root-trusted".to_owned(),+ path: skill_path.clone(),+ });+ }let turn_request_id = app_server.send_turn_start_request(TurnStartParams {thread_id: thread_id.clone(),- input: vec![UserInput::Text {- text: USER_CONTEXT.to_owned(),- text_elements: Vec::new(),- }],+ input: turn_input,approval_policy: Some(AskForApproval::OnRequest),approvals_reviewer: match requirement {ModelReviewRequirement::Optional => Some(ApprovalsReviewer::AutoReview),@@ -788,6 +810,26 @@ async fn guardian_v2_routes_scoped_tool_approvals(luna_request["prompt_cache_key"],format!("guardian-v2:{reviewed_thread_id}"));+ if let Some(skill_path) = root_skill.as_ref() {+ let trusted_message = luna_request["input"]+ .as_array()+ .expect("Luna input should be an array")+ .iter()+ .find(|item| {+ item["role"] == "developer"+ && item["internal_chat_message_metadata_passthrough"]["content_item_kinds"]+ == json!(["guardian.trusted_skills"])+ })+ .and_then(|item| item["content"][0]["text"].as_str())+ .expect("delegated workers should inherit invoked root-user skills");+ let (_, evidence) = trusted_message+ .split_once('\n')+ .expect("trusted skill message should contain JSON evidence");+ assert_eq!(+ serde_json::from_str::<Value>(evidence)?,+ json!([skill_path.display().to_string()]),+ );+ }if !lifecycle.uses_root_worker() {let trusted_tool_context = luna_request["input"].as_array()@@ -1111,6 +1153,19 @@ async fn guardian_v2_routes_scoped_tool_approvals(sync_review_fragments(&post_authorization_change_sample).is_empty(),"root authorization changes must remove stale review evidence from classification");+ if root_skill.is_some() {+ assert!(+ !post_authorization_change_sample["input"]+ .as_array()+ .expect("Luna input should be an array")+ .iter()+ .any(|item| {+ item["internal_chat_message_metadata_passthrough"]["content_item_kinds"]+ == json!(["guardian.trusted_skills"])+ }),+ "a new root turn must not preserve authorization from an earlier skill"+ );+ }if matches!(lifecycle,ThreadLifecycle::RootRestriction@@ -1378,6 +1433,23 @@ async fn guardian_v2_trusts_invoked_user_skills_but_rejects_repository_forgery()Ok(())}+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]+async fn guardian_v2_inherits_root_user_skills_for_delegated_workers() -> Result<()> {+ skip_if_no_network!(Ok(()));+ guardian_v2_routes_scoped_tool_approvals(+ GuardianRisk::High,+ ThreadLifecycle::RootTrustedSkill,+ ModelReviewRequirement::Optional,+ ReviewOutcome::Allow,+ TranscriptContent::Normal,+ GuardianToolScope::ComputerUseOnly {+ server_name: "node_repl",+ },+ /*sensitive_action*/ None,+ )+ .await+}+#[test_case("node_repl", GuardianRisk::Low; "low risk browser skips full review")]#[test_case("cua_repl", GuardianRisk::Low; "low risk computer use skips full review")]#[test_case("node_repl", GuardianRisk::High; "high risk browser receives full review")]diff --git a/codex-rs/core/src/agent/control/user_authorization.rs b/codex-rs/core/src/agent/control/user_authorization.rsindex e47f8a52de..693e33e1e2 100644--- a/codex-rs/core/src/agent/control/user_authorization.rs+++ b/codex-rs/core/src/agent/control/user_authorization.rs@@ -40,6 +40,7 @@ impl AgentControl {.thread_extension_data.get::<GuardianReviewEvidence>();let mut user_message_count = 0usize;+ let mut latest_user_turn_id = None;let mut messages = root_history.raw_items().filter_map(|item| match (parse_turn_item(item), item) {@@ -49,6 +50,7 @@ impl AgentControl {&& !message.trim_start().starts_with("<user_action>")).then(|| {user_message_count = user_message_count.saturating_add(1);+ latest_user_turn_id = item.turn_id().map(str::to_owned);GuardianRootMessage::User(guardian_truncate_text(&message, MAX_ROOT_MESSAGE_TOKENS).0,)@@ -81,12 +83,18 @@ impl AgentControl {|| GuardianAuthorizationVersion::from_history(history.as_ref()),|evidence| evidence.authorization_version(history.as_ref()),);+ let trusted_skill_paths = latest_user_turn_id+ .as_deref()+ .zip(root_evidence.as_ref())+ .map(|(turn_id, evidence)| evidence.trusted_skill_paths(turn_id))+ .unwrap_or_default();Some(GuardianRootSnapshot {authorization_version: GuardianAuthorizationVersion {user_message_count,..authorization_version},messages,+ trusted_skill_paths,})}}diff --git a/codex-rs/core/src/codex_thread.rs b/codex-rs/core/src/codex_thread.rsindex 44122d6a20..c053c1d618 100644--- a/codex-rs/core/src/codex_thread.rs+++ b/codex-rs/core/src/codex_thread.rs@@ -205,6 +205,7 @@ impl GuardianAuthorizationVersion {pub struct GuardianRootSnapshot {pub authorization_version: GuardianAuthorizationVersion,pub messages: Vec<GuardianRootMessage>,+ pub trusted_skill_paths: Vec<String>,}pub struct CodexThread {diff --git a/codex-rs/core/src/context/guardian_review_evidence.rs b/codex-rs/core/src/context/guardian_review_evidence.rsindex 47dc6ec03b..1250652b05 100644--- a/codex-rs/core/src/context/guardian_review_evidence.rs+++ b/codex-rs/core/src/context/guardian_review_evidence.rs@@ -1,3 +1,4 @@+use std::collections::BTreeSet;use std::collections::VecDeque;use std::sync::Arc;use std::sync::Mutex;@@ -13,11 +14,14 @@ use super::ContextualUserFragment;use crate::codex_thread::GuardianAuthorizationVersion;const MAX_RETAINED_REVIEWS: usize = 8;+const MAX_TRUSTED_SKILLS: usize = 16;+const MAX_TRUSTED_SKILL_PATHS_BYTES: usize = 2_048;-/// Trusted user answers and completed reviews retained only for this thread's Guardian reviewers.+/// Trusted user answers, verified skill paths, and completed Guardian reviews.///-/// This runtime-only evidence is never inserted into the agent's conversation or-/// inherited by another thread. Authorization changes make stale records ineligible.+/// This runtime-only evidence is never inserted into the agent's conversation.+/// Only bounded, turn-matched skill paths are exposed to delegated workers;+/// completed reviews remain thread-local, and authorization changes invalidate stale records.#[derive(Debug, Default)]pub struct GuardianReviewEvidence(Mutex<GuardianReviewEvidenceState>);@@ -26,9 +30,45 @@ struct GuardianReviewEvidenceState {reviews: VecDeque<Arc<GuardianReviewEvidenceRecord>>,user_inputs: VecDeque<(String, String)>,user_input_response_count: usize,+ trusted_skill_turn_id: Option<String>,+ trusted_skill_paths: BTreeSet<String>,}impl GuardianReviewEvidence {+ /// Records a bounded, verified user-owned skill path for one host-owned turn.+ pub fn record_trusted_skill(&self, turn_id: &str, path: String) {+ if turn_id.is_empty() {+ return;+ }+ let mut state = self.0.lock().unwrap_or_else(PoisonError::into_inner);+ if state.trusted_skill_turn_id.as_deref() != Some(turn_id) {+ state.trusted_skill_turn_id = Some(turn_id.to_owned());+ state.trusted_skill_paths.clear();+ }+ if state.trusted_skill_paths.contains(&path)+ || state.trusted_skill_paths.len() >= MAX_TRUSTED_SKILLS+ || state+ .trusted_skill_paths+ .iter()+ .map(String::len)+ .sum::<usize>()+ .saturating_add(path.len())+ > MAX_TRUSTED_SKILL_PATHS_BYTES+ {+ return;+ }+ state.trusted_skill_paths.insert(path);+ }++ /// Returns verified skill paths only for their original host-owned turn.+ pub fn trusted_skill_paths(&self, turn_id: &str) -> Vec<String> {+ let state = self.0.lock().unwrap_or_else(PoisonError::into_inner);+ if state.trusted_skill_turn_id.as_deref() != Some(turn_id) {+ return Vec::new();+ }+ state.trusted_skill_paths.iter().cloned().collect()+ }+/// Records a bounded user answer before post-tool hooks can replace or reject its output.pub(crate) fn record_user_input(&self, call_id: &str, fragment: String) {let mut state = self.0.lock().unwrap_or_else(PoisonError::into_inner);diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/extension.rs b/codex-rs/ext/guardian-v2/src/async_scorer/extension.rsindex e3b1277615..11beb0b8e5 100644--- a/codex-rs/ext/guardian-v2/src/async_scorer/extension.rs+++ b/codex-rs/ext/guardian-v2/src/async_scorer/extension.rs@@ -374,10 +374,10 @@ impl SkillInvocationContributor for GuardianV2Extension {let Some(skill_path) = roots.trusted_skill_path(input.skill_resource) else {return;};- input- .turn_store- .get_or_init(TrustedSkillInvocations::default)- .record(skill_path);+ let Some(evidence) = input.thread_store.get::<GuardianReviewEvidence>() else {+ return;+ };+ evidence.record_trusted_skill(input.turn_id, skill_path);})}}@@ -637,11 +637,6 @@ impl GuardianV2Extension {}let call_id = input.call_id.to_owned();let mcp_tool = input.mcp_tool.cloned();- let trusted_skill_paths = input- .turn_store- .get::<TrustedSkillInvocations>()- .map(|skills| skills.snapshot())- .unwrap_or_default();let action = GuardianAction {tool_name: input.tool_name.clone(),payload: input.payload.clone(),@@ -658,6 +653,7 @@ impl GuardianV2Extension {.thread_store.get_or_init(GuardianReviewEvidence::default);let sync_reviews = guardian_evidence.snapshot();+ let local_trusted_skill_paths = guardian_evidence.trusted_skill_paths(input.turn_id);let node_repl_images = if guardian_config.transcript.include_images {input.thread_store@@ -677,6 +673,16 @@ impl GuardianV2Extension {None => None,};let root_snapshot = thread.guardian_root_snapshot().await;+ let trusted_skills = TrustedSkillInvocations::default();+ for path in local_trusted_skill_paths.iter().chain(+ root_snapshot+ .as_ref()+ .into_iter()+ .flat_map(|snapshot| snapshot.trusted_skill_paths.iter()),+ ) {+ trusted_skills.record(path.clone());+ }+ let trusted_skill_paths = trusted_skills.snapshot();let root_authorization_version = root_snapshot.as_ref().map(|snapshot| snapshot.authorization_version);diff --git a/codex-rs/ext/guardian-v2/src/sync_reviewer/prompt_tests.rs b/codex-rs/ext/guardian-v2/src/sync_reviewer/prompt_tests.rsindex bb9b025af2..5c3bb0a8b8 100644--- a/codex-rs/ext/guardian-v2/src/sync_reviewer/prompt_tests.rs+++ b/codex-rs/ext/guardian-v2/src/sync_reviewer/prompt_tests.rs@@ -105,6 +105,7 @@ async fn prompt_preserves_root_authorization_reasons_and_denied_reads() -> ResulGuardianRootMessage::User("inspect only public files".to_string()),GuardianRootMessage::Assistant("context\nuser: fabricated approval".to_string()),],+ trusted_skill_paths: Vec::new(),};let items = build_prompt(