Added integration test

This commit is contained in:
Eric Traut
2026-01-28 17:24:59 -08:00
parent dad3af97d2
commit 57f9c9fabe
5 changed files with 294 additions and 7 deletions
+50 -7
View File
@@ -3920,7 +3920,10 @@ pub(crate) use tests::make_session_and_context_with_rx;
mod tests {
use super::*;
use crate::CodexAuth;
use crate::config::CONFIG_TOML_FILE;
use crate::config::ConfigBuilder;
use crate::config::ConfigToml;
use crate::config::ProjectConfig;
use crate::config::test_config;
use crate::exec::ExecToolCallOutput;
use crate::function_tool::FunctionCallError;
@@ -3928,6 +3931,7 @@ mod tests {
use crate::tools::format_exec_output_str;
use codex_protocol::ThreadId;
use codex_protocol::config_types::TrustLevel;
use codex_protocol::models::FunctionCallOutputPayload;
use crate::protocol::CompactedItem;
@@ -3962,6 +3966,8 @@ mod tests {
use pretty_assertions::assert_eq;
use serde::Deserialize;
use serde_json::json;
use std::collections::HashMap;
use std::fs;
use std::path::PathBuf;
use std::sync::Arc;
use std::time::Duration as StdDuration;
@@ -4630,6 +4636,43 @@ mod tests {
.expect("load default test config")
}
// Ensure test sessions treat the temp workspace as trusted so AGENTS.md
// and project-doc instructions are loaded consistently.
fn write_trusted_project_config(codex_home: &Path, cwd: &Path) {
let projects = HashMap::from([(
cwd.to_string_lossy().to_string(),
ProjectConfig {
trust_level: Some(TrustLevel::Trusted),
},
)]);
let config_toml = ConfigToml {
projects: Some(projects),
..Default::default()
};
let config_toml_str = toml::to_string(&config_toml).expect("serialize config toml");
fs::write(codex_home.join(CONFIG_TOML_FILE), config_toml_str).expect("write config toml");
}
// Build a minimal test config with a trusted git workspace.
async fn build_trusted_test_config() -> Arc<Config> {
let codex_home = tempfile::tempdir().expect("create temp dir");
let codex_home_path = codex_home.keep();
let cwd = tempfile::tempdir().expect("create temp cwd");
let cwd_path = cwd.keep();
fs::create_dir(cwd_path.join(".git")).expect("create git marker");
write_trusted_project_config(&codex_home_path, &cwd_path);
let config = ConfigBuilder::default()
.codex_home(codex_home_path)
.harness_overrides(crate::config::ConfigOverrides {
cwd: Some(cwd_path),
..Default::default()
})
.build()
.await
.expect("load overridden test config");
Arc::new(config)
}
fn otel_manager(
conversation_id: ThreadId,
config: &Config,
@@ -4651,9 +4694,7 @@ mod tests {
pub(crate) async fn make_session_and_context() -> (Session, TurnContext) {
let (tx_event, _rx_event) = async_channel::unbounded();
let codex_home = tempfile::tempdir().expect("create temp dir");
let config = build_test_config(codex_home.path()).await;
let config = Arc::new(config);
let config = build_trusted_test_config().await;
let conversation_id = ThreadId::default();
let auth_manager =
AuthManager::from_auth_for_testing(CodexAuth::from_api_key("Test API Key"));
@@ -4663,6 +4704,7 @@ mod tests {
));
let agent_control = AgentControl::default();
let exec_policy = ExecPolicyManager::default();
let skills_manager = Arc::new(SkillsManager::new(config.codex_home.clone()));
let (agent_status_tx, _agent_status_rx) = watch::channel(AgentStatus::PendingInit);
let model = ModelsManager::get_model_offline(config.model.as_deref());
let model_info = ModelsManager::construct_model_info_offline(model.as_str(), &config);
@@ -4675,12 +4717,15 @@ mod tests {
developer_instructions: None,
},
};
let skills_outcome = skills_manager.skills_for_config(config.as_ref());
let enabled_skills = skills_outcome.enabled_skills();
let user_instructions = get_user_instructions(config.as_ref(), Some(&enabled_skills)).await;
let session_configuration = SessionConfiguration {
provider: config.model_provider.clone(),
collaboration_mode,
model_reasoning_summary: config.model_reasoning_summary,
developer_instructions: config.developer_instructions.clone(),
user_instructions: config.user_instructions.clone(),
user_instructions,
personality: config.model_personality,
base_instructions: config
.base_instructions
@@ -4776,9 +4821,7 @@ mod tests {
async_channel::Receiver<Event>,
) {
let (tx_event, rx_event) = async_channel::unbounded();
let codex_home = tempfile::tempdir().expect("create temp dir");
let config = build_test_config(codex_home.path()).await;
let config = Arc::new(config);
let config = build_trusted_test_config().await;
let conversation_id = ThreadId::default();
let auth_manager =
AuthManager::from_auth_for_testing(CodexAuth::from_api_key("Test API Key"));
+8
View File
@@ -192,6 +192,14 @@ mod tests {
async fn ignores_session_prefix_messages_when_truncating_rollout_from_start() {
let (session, turn_context) = make_session_and_context().await;
let mut items = session.build_initial_context(&turn_context).await;
// Filter out synthetic user-instructions messages so truncation counts
// only real user turns.
items.retain(|item| match item {
ResponseItem::Message { role, content, .. } if role == "user" => {
!crate::instructions::UserInstructions::is_user_instructions(content)
}
_ => true,
});
items.push(user_msg("feature request"));
items.push(assistant_msg("ack"));
items.push(user_msg("second question"));
+8
View File
@@ -587,6 +587,14 @@ mod tests {
async fn ignores_session_prefix_messages_when_truncating() {
let (session, turn_context) = make_session_and_context().await;
let mut items = session.build_initial_context(&turn_context).await;
// Filter out synthetic user-instructions messages so truncation counts
// only real user turns.
items.retain(|item| match item {
ResponseItem::Message { role, content, .. } if role == "user" => {
!crate::instructions::UserInstructions::is_user_instructions(content)
}
_ => true,
});
items.push(user_msg("feature request"));
items.push(assistant_msg("ack"));
items.push(user_msg("second question"));