mirror of
https://github.com/openai/codex.git
synced 2026-11-01 19:33:35 +00:00
## Why This PR https://github.com/openai/codex/pull/24161#discussion_r3325692763 revealed a subagent data modeling issue, where we overloaded `forked_from_id` to also mean `parent_thread_id`. That's incorrect since guardian and review subagents can be a subagent and NOT fork the main thread's history. The solution here is to explicitly store a new `parent_thread_id` on `SessionMeta`, alongside `forked_from_id` which already exists. While we're at it, also expose it in the app-server protocol on the `Thread` object. A thread->subagent relationship and a fork of thread history are orthogonal concepts. ## What Changed - Added top-level `parent_thread_id` persistence on `SessionMeta` and runtime/session plumbing through `SessionConfiguredEvent`, `CodexSpawnArgs`, `SessionConfiguration`, `ThreadConfigSnapshot`, `TurnContext`, and `ModelClient`. - Made turn metadata, request headers, analytics, and subagent-start events read the separate runtime/top-level parent field instead of deriving general parent lineage from `SessionSource` or `forked_from_thread_id`. - Passed parent lineage separately at delegated subagent, review, guardian, agent-job, and multi-agent spawn construction sites; copied-history fork lineage remains derived only from `InitialHistory`. - Persisted and exposed parent lineage through rollout/thread-store projections and app-server v2 `Thread.parentThreadId`. - Updated app-server README text and regenerated app-server schema fixtures for the additive `parentThreadId` response field.
167 lines
5.9 KiB
Rust
167 lines
5.9 KiB
Rust
use super::*;
|
|
use codex_protocol::ThreadId;
|
|
use codex_protocol::protocol::EventMsg;
|
|
use codex_protocol::protocol::RolloutItem;
|
|
use codex_protocol::protocol::RolloutLine;
|
|
use codex_protocol::protocol::SessionMeta;
|
|
use codex_protocol::protocol::SessionMetaLine;
|
|
use codex_protocol::protocol::SessionSource;
|
|
use codex_protocol::protocol::UserMessageEvent;
|
|
use codex_rollout::ARCHIVED_SESSIONS_SUBDIR;
|
|
use codex_rollout::SESSIONS_SUBDIR;
|
|
use pretty_assertions::assert_eq;
|
|
use tempfile::TempDir;
|
|
use tokio::io::AsyncWriteExt;
|
|
|
|
const TEST_TIMESTAMP: &str = "2025-01-01T00-00-00";
|
|
|
|
async fn read_config_toml(codex_home: &Path) -> io::Result<ConfigToml> {
|
|
let contents = tokio::fs::read_to_string(codex_home.join("config.toml")).await?;
|
|
toml::from_str(&contents).map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err))
|
|
}
|
|
|
|
async fn write_session_with_user_event(codex_home: &Path) -> io::Result<()> {
|
|
let thread_id = ThreadId::new();
|
|
let dir = codex_home
|
|
.join(SESSIONS_SUBDIR)
|
|
.join("2025")
|
|
.join("01")
|
|
.join("01");
|
|
write_rollout_with_user_event(&dir, thread_id).await
|
|
}
|
|
|
|
async fn write_archived_session_with_user_event(codex_home: &Path) -> io::Result<()> {
|
|
let thread_id = ThreadId::new();
|
|
let dir = codex_home.join(ARCHIVED_SESSIONS_SUBDIR);
|
|
write_rollout_with_user_event(&dir, thread_id).await
|
|
}
|
|
|
|
async fn write_rollout_with_user_event(dir: &Path, thread_id: ThreadId) -> io::Result<()> {
|
|
tokio::fs::create_dir_all(&dir).await?;
|
|
let file_path = dir.join(format!("rollout-{TEST_TIMESTAMP}-{thread_id}.jsonl"));
|
|
let mut file = tokio::fs::File::create(&file_path).await?;
|
|
|
|
let session_meta = SessionMetaLine {
|
|
meta: SessionMeta {
|
|
id: thread_id,
|
|
forked_from_id: None,
|
|
parent_thread_id: None,
|
|
timestamp: TEST_TIMESTAMP.to_string(),
|
|
cwd: std::path::PathBuf::from("."),
|
|
originator: "test_originator".to_string(),
|
|
cli_version: "test_version".to_string(),
|
|
source: SessionSource::Cli,
|
|
thread_source: None,
|
|
agent_path: None,
|
|
agent_nickname: None,
|
|
agent_role: None,
|
|
model_provider: None,
|
|
base_instructions: None,
|
|
dynamic_tools: None,
|
|
memory_mode: None,
|
|
},
|
|
git: None,
|
|
};
|
|
let meta_line = RolloutLine {
|
|
timestamp: TEST_TIMESTAMP.to_string(),
|
|
item: RolloutItem::SessionMeta(session_meta),
|
|
};
|
|
let user_event = RolloutLine {
|
|
timestamp: TEST_TIMESTAMP.to_string(),
|
|
item: RolloutItem::EventMsg(EventMsg::UserMessage(UserMessageEvent {
|
|
client_id: None,
|
|
message: "hello".to_string(),
|
|
images: None,
|
|
local_images: Vec::new(),
|
|
text_elements: Vec::new(),
|
|
..Default::default()
|
|
})),
|
|
};
|
|
|
|
file.write_all(format!("{}\n", serde_json::to_string(&meta_line)?).as_bytes())
|
|
.await?;
|
|
file.write_all(format!("{}\n", serde_json::to_string(&user_event)?).as_bytes())
|
|
.await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn applies_when_sessions_exist_and_no_personality() -> io::Result<()> {
|
|
let temp = TempDir::new()?;
|
|
write_session_with_user_event(temp.path()).await?;
|
|
|
|
let config_toml = ConfigToml::default();
|
|
let status = maybe_migrate_personality(temp.path(), &config_toml, /*state_db*/ None).await?;
|
|
|
|
assert_eq!(status, PersonalityMigrationStatus::Applied);
|
|
assert!(temp.path().join(PERSONALITY_MIGRATION_FILENAME).exists());
|
|
|
|
let persisted = read_config_toml(temp.path()).await?;
|
|
assert_eq!(persisted.personality, Some(Personality::Pragmatic));
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn applies_when_only_archived_sessions_exist_and_no_personality() -> io::Result<()> {
|
|
let temp = TempDir::new()?;
|
|
write_archived_session_with_user_event(temp.path()).await?;
|
|
|
|
let config_toml = ConfigToml::default();
|
|
let status = maybe_migrate_personality(temp.path(), &config_toml, /*state_db*/ None).await?;
|
|
|
|
assert_eq!(status, PersonalityMigrationStatus::Applied);
|
|
assert!(temp.path().join(PERSONALITY_MIGRATION_FILENAME).exists());
|
|
|
|
let persisted = read_config_toml(temp.path()).await?;
|
|
assert_eq!(persisted.personality, Some(Personality::Pragmatic));
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn skips_when_marker_exists() -> io::Result<()> {
|
|
let temp = TempDir::new()?;
|
|
create_marker(&temp.path().join(PERSONALITY_MIGRATION_FILENAME)).await?;
|
|
|
|
let config_toml = ConfigToml::default();
|
|
let status = maybe_migrate_personality(temp.path(), &config_toml, /*state_db*/ None).await?;
|
|
|
|
assert_eq!(status, PersonalityMigrationStatus::SkippedMarker);
|
|
assert!(!temp.path().join("config.toml").exists());
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn skips_when_personality_explicit() -> io::Result<()> {
|
|
let temp = TempDir::new()?;
|
|
ConfigEditsBuilder::new(temp.path())
|
|
.set_personality(Some(Personality::Friendly))
|
|
.apply()
|
|
.await
|
|
.map_err(|err| io::Error::other(format!("failed to write config: {err}")))?;
|
|
|
|
let config_toml = read_config_toml(temp.path()).await?;
|
|
let status = maybe_migrate_personality(temp.path(), &config_toml, /*state_db*/ None).await?;
|
|
|
|
assert_eq!(
|
|
status,
|
|
PersonalityMigrationStatus::SkippedExplicitPersonality
|
|
);
|
|
assert!(temp.path().join(PERSONALITY_MIGRATION_FILENAME).exists());
|
|
|
|
let persisted = read_config_toml(temp.path()).await?;
|
|
assert_eq!(persisted.personality, Some(Personality::Friendly));
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn skips_when_no_sessions() -> io::Result<()> {
|
|
let temp = TempDir::new()?;
|
|
let config_toml = ConfigToml::default();
|
|
let status = maybe_migrate_personality(temp.path(), &config_toml, /*state_db*/ None).await?;
|
|
|
|
assert_eq!(status, PersonalityMigrationStatus::SkippedNoSessions);
|
|
assert!(temp.path().join(PERSONALITY_MIGRATION_FILENAME).exists());
|
|
assert!(!temp.path().join("config.toml").exists());
|
|
Ok(())
|
|
}
|