mirror of
https://github.com/openai/codex.git
synced 2026-10-21 03:24:00 +00:00
## What changed - Add the disabled-by-default `output_token_replay` feature to request `output.encrypted_content` from OpenAI providers. - Preserve encrypted message and tool-call output, message and function-call status, and output-text `annotations` and `logprobs` through history and replay. Update the generated protocol schemas and SDK types. - Strip output ciphertext from requests to other providers while retaining it in stored history, including after replay is disabled. Remove encrypted content from memory extraction inputs. ## Testing Add integration coverage for the feature/provider combinations, metadata replay across follow-up requests, and history preservation when resuming with replay disabled. GitOrigin-RevId: 77729a021b6771933402aebe74ece8eb39c057e2
492 lines
18 KiB
Rust
492 lines
18 KiB
Rust
#![allow(clippy::unwrap_used)]
|
|
|
|
use anyhow::Result;
|
|
use codex_core::StartIfIdleSubmission;
|
|
use codex_core::TurnInput;
|
|
use codex_core::TurnInputRequest;
|
|
use codex_core::config::Config;
|
|
use codex_exec_server::CreateDirectoryOptions;
|
|
use codex_exec_server::ExecutorFileSystem;
|
|
use codex_extension_api::ExtensionFuture;
|
|
use codex_extension_api::ExtensionRegistryBuilder;
|
|
use codex_extension_api::SkillInvocationContributor;
|
|
use codex_extension_api::SkillInvocationInput;
|
|
use codex_extension_api::SkillInvocationKind;
|
|
use codex_protocol::config_types::CollaborationMode;
|
|
use codex_protocol::config_types::ModeKind;
|
|
use codex_protocol::config_types::Settings;
|
|
use codex_protocol::models::ContentItem;
|
|
use codex_protocol::models::PermissionProfile;
|
|
use codex_protocol::models::ResponseItem;
|
|
use codex_protocol::protocol::AskForApproval;
|
|
use codex_protocol::protocol::EventMsg;
|
|
use codex_protocol::protocol::ThreadSettingsOverrides;
|
|
use codex_protocol::user_input::UserInput;
|
|
use codex_skills_extension::SkillsExtensionConfig;
|
|
use codex_skills_extension::install;
|
|
use codex_utils_absolute_path::AbsolutePathBuf;
|
|
use codex_utils_path_uri::PathUri;
|
|
use core_test_support::create_directory_symlink;
|
|
use core_test_support::responses::ev_assistant_message;
|
|
use core_test_support::responses::ev_completed;
|
|
use core_test_support::responses::ev_response_created;
|
|
use core_test_support::responses::mount_sse_once;
|
|
use core_test_support::responses::sse;
|
|
use core_test_support::responses::start_mock_server;
|
|
use core_test_support::skip_if_no_network;
|
|
use core_test_support::skip_if_remote;
|
|
use core_test_support::skip_if_wine_exec;
|
|
use core_test_support::test_codex::local_requests;
|
|
use core_test_support::test_codex::test_codex;
|
|
use core_test_support::test_codex::turn_permission_fields;
|
|
use pretty_assertions::assert_eq;
|
|
use std::sync::Arc;
|
|
use std::sync::Mutex;
|
|
use tracing::Level;
|
|
use tracing_subscriber::fmt::format::FmtSpan;
|
|
use tracing_test::internal::MockWriter;
|
|
|
|
#[derive(Default)]
|
|
struct SkillInvocationRecorder(Mutex<Vec<(String, SkillInvocationKind)>>);
|
|
|
|
impl SkillInvocationContributor for SkillInvocationRecorder {
|
|
fn on_skill_invocation<'a>(
|
|
&'a self,
|
|
input: SkillInvocationInput<'a>,
|
|
) -> ExtensionFuture<'a, ()> {
|
|
Box::pin(async move {
|
|
self.0
|
|
.lock()
|
|
.unwrap_or_else(std::sync::PoisonError::into_inner)
|
|
.push((input.skill_resource.to_owned(), input.kind));
|
|
})
|
|
}
|
|
}
|
|
|
|
async fn write_repo_skill(
|
|
cwd: AbsolutePathBuf,
|
|
fs: Arc<dyn ExecutorFileSystem>,
|
|
name: &str,
|
|
description: &str,
|
|
body: &str,
|
|
) -> Result<()> {
|
|
let skill_dir = cwd.join(".agents").join("skills").join(name);
|
|
let skill_dir_uri = PathUri::from_host_native_path(&skill_dir)?;
|
|
fs.create_directory(
|
|
&skill_dir_uri,
|
|
CreateDirectoryOptions {
|
|
recursive: true,
|
|
follow_symlinks: true,
|
|
},
|
|
/*sandbox*/ None,
|
|
)
|
|
.await?;
|
|
let contents = format!("---\nname: {name}\ndescription: {description}\n---\n\n{body}\n");
|
|
let path = skill_dir.join("SKILL.md");
|
|
let path_uri = PathUri::from_host_native_path(&path)?;
|
|
fs.write_file(
|
|
&path_uri,
|
|
contents.into_bytes(),
|
|
Default::default(),
|
|
/*sandbox*/ None,
|
|
)
|
|
.await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn user_turn_includes_skill_instructions() -> Result<()> {
|
|
skip_if_wine_exec!(
|
|
Ok(()),
|
|
"skill paths require matching host and executor path conventions"
|
|
);
|
|
skip_if_no_network!(Ok(()));
|
|
|
|
let server = start_mock_server().await;
|
|
let skill_body = "skill body";
|
|
let recorder = Arc::new(SkillInvocationRecorder::default());
|
|
let mut extensions = ExtensionRegistryBuilder::<Config>::new();
|
|
extensions.skill_invocation_contributor(recorder.clone());
|
|
let mut builder = test_codex()
|
|
.with_extensions(Arc::new(extensions.build()))
|
|
.with_workspace_setup(move |cwd, fs| async move {
|
|
write_repo_skill(cwd, fs, "demo", "demo skill", skill_body).await
|
|
});
|
|
let test = builder.build_with_auto_env(&server).await?;
|
|
|
|
let skill_path = test
|
|
.config
|
|
.cwd
|
|
.join(".agents/skills/demo/SKILL.md")
|
|
.canonicalize()
|
|
.unwrap_or_else(|_| test.config.cwd.join(".agents/skills/demo/SKILL.md"))
|
|
.to_path_buf();
|
|
|
|
let mock = mount_sse_once(
|
|
&server,
|
|
sse(vec![
|
|
ev_response_created("resp-1"),
|
|
ev_assistant_message("msg-1", "done"),
|
|
ev_completed("resp-1"),
|
|
]),
|
|
)
|
|
.await;
|
|
|
|
let session_model = test.session_configured.model.clone();
|
|
let (sandbox_policy, permission_profile) =
|
|
turn_permission_fields(PermissionProfile::Disabled, test.config.cwd.as_path());
|
|
test.codex
|
|
.start_or_steer_turn(
|
|
TurnInputRequest::user_input(vec![
|
|
UserInput::Text {
|
|
text: "please use $demo".to_string(),
|
|
text_elements: Vec::new(),
|
|
},
|
|
UserInput::Skill {
|
|
name: "demo".to_string(),
|
|
path: skill_path.clone(),
|
|
},
|
|
])
|
|
.with_thread_settings(ThreadSettingsOverrides {
|
|
environments: Some(local_requests(test.config.cwd.clone())),
|
|
approval_policy: Some(AskForApproval::Never),
|
|
sandbox_policy: Some(sandbox_policy),
|
|
permission_profile,
|
|
collaboration_mode: Some(CollaborationMode {
|
|
mode: ModeKind::Default,
|
|
settings: Settings {
|
|
model: session_model,
|
|
reasoning_effort: None,
|
|
developer_instructions: None,
|
|
},
|
|
}),
|
|
..Default::default()
|
|
}),
|
|
)
|
|
.await?;
|
|
|
|
core_test_support::wait_for_event(test.codex.as_ref(), |event| {
|
|
matches!(event, codex_protocol::protocol::EventMsg::TurnComplete(_))
|
|
})
|
|
.await;
|
|
|
|
let request = mock.single_request();
|
|
let user_texts = request.message_input_texts("user");
|
|
let skill_path_str = skill_path.to_string_lossy();
|
|
assert!(
|
|
user_texts.iter().any(|text| {
|
|
text.contains("<skill>\n<name>demo</name>")
|
|
&& text.contains("<path>")
|
|
&& text.contains(skill_body)
|
|
&& text.contains(skill_path_str.as_ref())
|
|
}),
|
|
"expected skill instructions in user input, got {user_texts:?}"
|
|
);
|
|
assert!(request.has_content_kinds(&["skills.selected_skill_instructions"]));
|
|
assert_eq!(
|
|
*recorder
|
|
.0
|
|
.lock()
|
|
.unwrap_or_else(std::sync::PoisonError::into_inner),
|
|
vec![(
|
|
skill_path.display().to_string(),
|
|
SkillInvocationKind::Explicit
|
|
)],
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "current_thread")]
|
|
async fn history_injection_skips_skill_discovery_after_initial_context() -> Result<()> {
|
|
skip_if_wine_exec!(
|
|
Ok(()),
|
|
"skill paths require matching host and executor path conventions"
|
|
);
|
|
skip_if_no_network!(Ok(()));
|
|
|
|
const SKILL_BODY: &str = "Instructions from the real demo skill.";
|
|
const FIRST_INSTRUCTIONS: &str = "First injected developer instructions.";
|
|
const SECOND_INSTRUCTIONS: &str = "Second injected developer instructions.";
|
|
|
|
let buffer: &'static Mutex<Vec<u8>> = Box::leak(Box::new(Mutex::new(Vec::new())));
|
|
let subscriber = tracing_subscriber::fmt()
|
|
.with_ansi(false)
|
|
.with_max_level(Level::TRACE)
|
|
.with_span_events(FmtSpan::NEW)
|
|
.with_writer(MockWriter::new(buffer))
|
|
.finish();
|
|
let _guard = tracing::subscriber::set_default(subscriber);
|
|
let take_logs = || String::from_utf8(std::mem::take(&mut *buffer.lock().unwrap()));
|
|
|
|
let server = start_mock_server().await;
|
|
let mut builder = test_codex().with_workspace_setup(|cwd, fs| async move {
|
|
write_repo_skill(cwd, fs, "demo", "demo skill", SKILL_BODY).await
|
|
});
|
|
let test = builder.build_with_auto_env(&server).await?;
|
|
let developer_message = |text: &str| ResponseItem::Message {
|
|
status: None,
|
|
encrypted_content: None,
|
|
id: None,
|
|
role: "developer".to_string(),
|
|
content: vec![ContentItem::InputText {
|
|
text: text.to_string(),
|
|
}],
|
|
phase: None,
|
|
internal_chat_message_metadata_passthrough: None,
|
|
};
|
|
|
|
// A fresh thread still needs full initial context before its first injected item.
|
|
buffer.lock().unwrap().clear();
|
|
test.codex
|
|
.inject_response_items_for_turn(vec![developer_message(FIRST_INSTRUCTIONS)])
|
|
.await?;
|
|
let logs = take_logs()?;
|
|
assert!(
|
|
logs.contains("skills_for_config"),
|
|
"initial injection must discover skills: {logs}"
|
|
);
|
|
|
|
test.codex
|
|
.inject_response_items_for_turn(vec![developer_message(SECOND_INSTRUCTIONS)])
|
|
.await?;
|
|
let logs = take_logs()?;
|
|
assert!(
|
|
logs.contains("record_conversation_items"),
|
|
"initialized-history injection must still record the item: {logs}"
|
|
);
|
|
assert!(
|
|
!logs.contains("skills_for_config"),
|
|
"initialized-history injection must skip skill discovery: {logs}"
|
|
);
|
|
|
|
let mock = mount_sse_once(&server, sse(vec![ev_completed("skill-response")])).await;
|
|
let skill_path = test
|
|
.config
|
|
.cwd
|
|
.join(".agents/skills/demo/SKILL.md")
|
|
.canonicalize()
|
|
.unwrap_or_else(|_| test.config.cwd.join(".agents/skills/demo/SKILL.md"))
|
|
.to_path_buf();
|
|
test.codex
|
|
.start_or_steer_turn(TurnInputRequest::user_input(vec![
|
|
UserInput::Text {
|
|
text: "please use $demo".to_string(),
|
|
text_elements: Vec::new(),
|
|
},
|
|
UserInput::Skill {
|
|
name: "demo".to_string(),
|
|
path: skill_path,
|
|
},
|
|
]))
|
|
.await?;
|
|
core_test_support::wait_for_event(test.codex.as_ref(), |event| {
|
|
matches!(event, EventMsg::TurnComplete(_))
|
|
})
|
|
.await;
|
|
let logs = take_logs()?;
|
|
assert!(
|
|
logs.contains("skills_for_config"),
|
|
"the real turn must still discover skills: {logs}"
|
|
);
|
|
|
|
let request = mock.single_request();
|
|
let developer_texts = request.message_input_texts("developer");
|
|
let injected_texts = developer_texts
|
|
.iter()
|
|
.map(String::as_str)
|
|
.filter(|text| *text == FIRST_INSTRUCTIONS || *text == SECOND_INSTRUCTIONS)
|
|
.collect::<Vec<_>>();
|
|
assert_eq!(
|
|
injected_texts,
|
|
vec![FIRST_INSTRUCTIONS, SECOND_INSTRUCTIONS]
|
|
);
|
|
let user_texts = request.message_input_texts("user");
|
|
assert!(
|
|
user_texts.iter().any(|text| {
|
|
text.contains("<skill>\n<name>demo</name>") && text.contains(SKILL_BODY)
|
|
}),
|
|
"the real skill body must reach the model: {user_texts:?}"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn user_turn_selects_symlinked_skill_by_advertised_discovery_path() -> Result<()> {
|
|
skip_if_no_network!(Ok(()));
|
|
skip_if_remote!(
|
|
Ok(()),
|
|
"remote filesystems do not expose directory symlink creation"
|
|
);
|
|
|
|
let server = start_mock_server().await;
|
|
let skill_body = "instructions from the canonical linked skill";
|
|
let mut extensions = ExtensionRegistryBuilder::<Config>::new();
|
|
install(&mut extensions, |config: &Config| SkillsExtensionConfig {
|
|
include_instructions: config.include_skill_instructions,
|
|
max_context_tokens: config.skill_max_context_tokens,
|
|
bundled_skills_enabled: false,
|
|
cloud_skill_enabled: false,
|
|
shadow_selection_enabled: false,
|
|
});
|
|
let mut builder = test_codex()
|
|
.with_extensions(Arc::new(extensions.build()))
|
|
.with_workspace_setup(move |cwd, _fs| async move {
|
|
let source_skill_dir = cwd.join("shared-skills/linked-demo");
|
|
let discovery_root = cwd.join(".agents/skills");
|
|
std::fs::create_dir_all(source_skill_dir.as_path())?;
|
|
std::fs::create_dir_all(discovery_root.as_path())?;
|
|
std::fs::write(
|
|
source_skill_dir.join("SKILL.md"),
|
|
format!(
|
|
"---\nname: linked-demo\ndescription: Linked demo skill\n---\n\n{skill_body}\n"
|
|
),
|
|
)?;
|
|
create_directory_symlink(
|
|
source_skill_dir.as_path(),
|
|
discovery_root.join("linked-demo").as_path(),
|
|
);
|
|
Ok(())
|
|
});
|
|
let test = builder.build_with_auto_env(&server).await?;
|
|
let discovery_root = test.config.cwd.join(".agents/skills").canonicalize()?;
|
|
let discovery_path = discovery_root.join("linked-demo/SKILL.md");
|
|
let canonical_path = discovery_path.canonicalize()?;
|
|
let discovery_path_display = discovery_path.display();
|
|
let canonical_path_display = canonical_path.display();
|
|
let mock = mount_sse_once(
|
|
&server,
|
|
sse(vec![
|
|
ev_response_created("linked-skill-response"),
|
|
ev_assistant_message("linked-skill-message", "done"),
|
|
ev_completed("linked-skill-response"),
|
|
]),
|
|
)
|
|
.await;
|
|
|
|
let submission = test
|
|
.codex
|
|
.start_turn_if_idle(TurnInputRequest::new(TurnInput::UserInput {
|
|
content: vec"),
|
|
text_elements: Vec::new(),
|
|
},
|
|
UserInput::Skill {
|
|
name: "linked-demo".to_string(),
|
|
path: discovery_path.to_path_buf(),
|
|
},
|
|
],
|
|
client_id: Some("linked-skill-user-message".to_string()),
|
|
}))
|
|
.await?;
|
|
assert!(matches!(submission, StartIfIdleSubmission::Started { .. }));
|
|
|
|
core_test_support::wait_for_event(test.codex.as_ref(), |event| {
|
|
matches!(event, codex_protocol::protocol::EventMsg::TurnComplete(_))
|
|
})
|
|
.await;
|
|
|
|
let request = mock.single_request();
|
|
let developer_texts = request.message_input_texts("developer");
|
|
let discovery_root_display = discovery_root.to_string_lossy().replace('\\', "/");
|
|
let root_suffix = format!(" = `{discovery_root_display}`");
|
|
let discovery_root_alias = developer_texts
|
|
.iter()
|
|
.flat_map(|text| text.lines())
|
|
.find(|line| line.ends_with(&root_suffix))
|
|
.and_then(|line| line.strip_prefix("- `"))
|
|
.and_then(|line| line.split_once("` = ").map(|(alias, _)| alias))
|
|
.expect("skill catalog should alias the advertised discovery root");
|
|
let advertised_path = format!("(file: {discovery_root_alias}/linked-demo/SKILL.md)");
|
|
assert!(
|
|
developer_texts
|
|
.iter()
|
|
.any(|text| text.contains(&advertised_path)),
|
|
"expected symlink discovery path in the skill catalog, got {developer_texts:?}"
|
|
);
|
|
|
|
let user_texts = request.message_input_texts("user");
|
|
let canonical_identity = format!("<path>{canonical_path_display}</path>");
|
|
assert!(
|
|
user_texts.iter().any(|text| {
|
|
text.contains("<skill>\n<name>linked-demo</name>")
|
|
&& text.contains(&canonical_identity)
|
|
&& text.contains(skill_body)
|
|
}),
|
|
"expected canonical skill instructions selected by discovery path, got {user_texts:?}"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn idle_user_turn_includes_skill_instructions_in_the_first_request() -> Result<()> {
|
|
skip_if_wine_exec!(
|
|
Ok(()),
|
|
"skill paths require matching host and executor path conventions"
|
|
);
|
|
skip_if_no_network!(Ok(()));
|
|
|
|
let server = start_mock_server().await;
|
|
let skill_body = "queued skill body";
|
|
let mut builder = test_codex().with_workspace_setup(move |cwd, fs| async move {
|
|
write_repo_skill(cwd, fs, "queued-demo", "queued demo skill", skill_body).await
|
|
});
|
|
let test = builder.build_with_auto_env(&server).await?;
|
|
let skill_path = test
|
|
.config
|
|
.cwd
|
|
.join(".agents/skills/queued-demo/SKILL.md")
|
|
.canonicalize()
|
|
.unwrap_or_else(|_| test.config.cwd.join(".agents/skills/queued-demo/SKILL.md"))
|
|
.to_path_buf();
|
|
let mock = mount_sse_once(
|
|
&server,
|
|
sse(vec![
|
|
ev_response_created("queued-skill-response"),
|
|
ev_assistant_message("queued-skill-message", "done"),
|
|
ev_completed("queued-skill-response"),
|
|
]),
|
|
)
|
|
.await;
|
|
|
|
let submission = test
|
|
.codex
|
|
.start_turn_if_idle(TurnInputRequest::new(TurnInput::UserInput {
|
|
content: vec![
|
|
UserInput::Text {
|
|
text: "please use $queued-demo".to_string(),
|
|
text_elements: Vec::new(),
|
|
},
|
|
UserInput::Skill {
|
|
name: "queued-demo".to_string(),
|
|
path: skill_path.clone(),
|
|
},
|
|
],
|
|
client_id: Some("queued-skill-user-message".to_string()),
|
|
}))
|
|
.await?;
|
|
assert!(matches!(submission, StartIfIdleSubmission::Started { .. }));
|
|
|
|
core_test_support::wait_for_event(test.codex.as_ref(), |event| {
|
|
matches!(event, codex_protocol::protocol::EventMsg::TurnComplete(_))
|
|
})
|
|
.await;
|
|
|
|
let user_texts = mock.single_request().message_input_texts("user");
|
|
let skill_path_str = skill_path.to_string_lossy();
|
|
assert!(
|
|
user_texts.iter().any(|text| {
|
|
text.contains("<skill>\n<name>queued-demo</name>")
|
|
&& text.contains("<path>")
|
|
&& text.contains(skill_body)
|
|
&& text.contains(skill_path_str.as_ref())
|
|
}),
|
|
"expected queued skill instructions in the first request, got {user_texts:?}"
|
|
);
|
|
|
|
Ok(())
|
|
}
|