agent/codex
2
0
Fork 0
mirror of https://github.com/pchuan98/codex.git synced 2026-07-01 00:31:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

store and expose parent_thread_id on Threads (#25113)

Browse Source 
## 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.
This commit is contained in:
Owen Lin
2026-05-31 21:33:20 -07:00
committed by GitHub
Unverified
parent 3b7334d099
commit cf0911076f
92 changed files with 504 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/rollout/src/list.rs
+6
View File
@@ -62,6 +62,8 @@ pub struct ThreadItem {
pub git_origin_url: Option<String>,
/// Session source from session metadata.
pub source: Option<SessionSource>,
/// Immediate control/spawn parent thread id from session metadata.
pub parent_thread_id: Option<ThreadId>,
/// Random unique nickname from session metadata for AgentControl-spawned sub-agents.
pub agent_nickname: Option<String>,
/// Role (agent_role) from session metadata for AgentControl-spawned sub-agents.
@@ -95,6 +97,7 @@ struct HeadTailSummary {
git_sha: Option<String>,
git_origin_url: Option<String>,
source: Option<SessionSource>,
parent_thread_id: Option<ThreadId>,
agent_nickname: Option<String>,
agent_role: Option<String>,
model_provider: Option<String>,
@@ -778,6 +781,7 @@ async fn build_thread_item(
git_sha,
git_origin_url,
source,
parent_thread_id,
agent_nickname,
agent_role,
model_provider,
@@ -799,6 +803,7 @@ async fn build_thread_item(
git_sha,
git_origin_url,
source,
parent_thread_id,
agent_nickname,
agent_role,
model_provider,
@@ -1101,6 +1106,7 @@ async fn read_head_summary(path: &Path, head_limit: usize) -> io::Result<HeadTai
RolloutItem::SessionMeta(session_meta_line) => {
if !summary.saw_session_meta {
summary.source = Some(session_meta_line.meta.source.clone());
summary.parent_thread_id = session_meta_line.meta.parent_thread_id;
summary.agent_nickname = session_meta_line.meta.agent_nickname.clone();
summary.agent_role = session_meta_line.meta.agent_role.clone();
summary.model_provider = session_meta_line.meta.model_provider.clone();
codex-rs/rollout/src/metadata_tests.rs
+3
View File
@@ -35,6 +35,7 @@ async fn extract_metadata_from_rollout_uses_session_meta() {
let session_meta = SessionMeta {
id,
forked_from_id: None,
parent_thread_id: None,
timestamp: "2026-01-27T12:34:56Z".to_string(),
cwd: dir.path().to_path_buf(),
originator: "cli".to_string(),
@@ -87,6 +88,7 @@ async fn extract_metadata_from_rollout_returns_latest_memory_mode() {
let session_meta = SessionMeta {
id,
forked_from_id: None,
parent_thread_id: None,
timestamp: "2026-01-27T12:34:56Z".to_string(),
cwd: dir.path().to_path_buf(),
originator: "cli".to_string(),
@@ -347,6 +349,7 @@ fn write_rollout_in_sessions_with_cwd(
let session_meta = SessionMeta {
id,
forked_from_id: None,
parent_thread_id: None,
timestamp: event_ts.to_string(),
cwd,
originator: "cli".to_string(),
codex-rs/rollout/src/recorder.rs
+10
View File
@@ -81,6 +81,7 @@ pub enum RolloutRecorderParams {
Create {
conversation_id: ThreadId,
forked_from_id: Option<ThreadId>,
parent_thread_id: Option<ThreadId>,
source: SessionSource,
thread_source: Option<ThreadSource>,
base_instructions: BaseInstructions,
@@ -156,6 +157,7 @@ impl RolloutRecorderParams {
pub fn new(
conversation_id: ThreadId,
forked_from_id: Option<ThreadId>,
parent_thread_id: Option<ThreadId>,
source: SessionSource,
thread_source: Option<ThreadSource>,
base_instructions: BaseInstructions,
@@ -164,6 +166,7 @@ impl RolloutRecorderParams {
Self::Create {
conversation_id,
forked_from_id,
parent_thread_id,
source,
thread_source,
base_instructions,
@@ -652,6 +655,7 @@ impl RolloutRecorder {
RolloutRecorderParams::Create {
conversation_id,
forked_from_id,
parent_thread_id,
source,
thread_source,
base_instructions,
@@ -673,6 +677,7 @@ impl RolloutRecorder {
let session_meta = SessionMeta {
id: session_id,
forked_from_id,
parent_thread_id,
timestamp,
cwd: config.cwd().to_path_buf(),
originator: originator().value,
@@ -1020,6 +1025,7 @@ fn fill_missing_thread_item_metadata(item: &mut ThreadItem, state_item: ThreadIt
git_sha,
git_origin_url,
source,
parent_thread_id,
agent_nickname,
agent_role,
model_provider,
@@ -1049,6 +1055,9 @@ fn fill_missing_thread_item_metadata(item: &mut ThreadItem, state_item: ThreadIt
if item.source.is_none() {
item.source = source;
}
if item.parent_thread_id.is_none() {
item.parent_thread_id = parent_thread_id;
}
if item.agent_nickname.is_none() {
item.agent_nickname = agent_nickname;
}
@@ -1690,6 +1699,7 @@ fn thread_item_from_state_metadata(item: codex_state::ThreadMetadata) -> ThreadI
.or_else(|_| serde_json::from_value(Value::String(item.source)))
.unwrap_or(SessionSource::Unknown),
),
parent_thread_id: None,
agent_nickname: item.agent_nickname,
agent_role: item.agent_role,
model_provider: Some(item.model_provider),
codex-rs/rollout/src/recorder_tests.rs
+5
View File
@@ -85,6 +85,7 @@ async fn state_db_init_backfills_before_returning() -> anyhow::Result<()> {
meta: SessionMeta {
id: thread_id,
forked_from_id: None,
parent_thread_id: None,
timestamp: "2026-01-27T12:34:56Z".to_string(),
cwd: home.path().to_path_buf(),
originator: "test".to_string(),
@@ -369,6 +370,7 @@ async fn recorder_materializes_on_flush_with_pending_items() -> std::io::Result<
RolloutRecorderParams::new(
thread_id,
/*forked_from_id*/ None,
/*parent_thread_id*/ None,
SessionSource::Exec,
/*thread_source*/ None,
BaseInstructions::default(),
@@ -449,6 +451,7 @@ async fn persist_reports_filesystem_error_and_retries_buffered_items() -> std::i
RolloutRecorderParams::new(
thread_id,
/*forked_from_id*/ None,
/*parent_thread_id*/ None,
SessionSource::Exec,
/*thread_source*/ None,
BaseInstructions::default(),
@@ -974,6 +977,7 @@ fn fill_missing_thread_item_metadata_preserves_identity_and_prefers_state_git_fi
git_sha: Some("filesystem-sha".to_string()),
git_origin_url: Some("https://example.com/filesystem.git".to_string()),
source: None,
parent_thread_id: None,
agent_nickname: None,
agent_role: None,
model_provider: None,
@@ -991,6 +995,7 @@ fn fill_missing_thread_item_metadata_preserves_identity_and_prefers_state_git_fi
git_sha: Some("state-sha".to_string()),
git_origin_url: Some("https://example.com/state.git".to_string()),
source: Some(SessionSource::Exec),
parent_thread_id: None,
agent_nickname: Some("state-agent".to_string()),
agent_role: Some("state-role".to_string()),
model_provider: Some("state-provider".to_string()),
codex-rs/rollout/src/session_index_tests.rs
+1
View File
@@ -27,6 +27,7 @@ fn write_rollout_with_metadata(path: &Path, thread_id: ThreadId) -> std::io::Res
meta: SessionMeta {
id: thread_id,
forked_from_id: None,
parent_thread_id: None,
timestamp,
cwd: ".".into(),
originator: "test_originator".into(),
codex-rs/rollout/src/tests.rs
+12
View File
@@ -606,6 +606,7 @@ async fn test_list_conversations_latest_first() {
git_sha: None,
git_origin_url: None,
source: Some(SessionSource::VSCode),
parent_thread_id: None,
agent_nickname: None,
agent_role: None,
model_provider: Some(TEST_PROVIDER.to_string()),
@@ -623,6 +624,7 @@ async fn test_list_conversations_latest_first() {
git_sha: None,
git_origin_url: None,
source: Some(SessionSource::VSCode),
parent_thread_id: None,
agent_nickname: None,
agent_role: None,
model_provider: Some(TEST_PROVIDER.to_string()),
@@ -640,6 +642,7 @@ async fn test_list_conversations_latest_first() {
git_sha: None,
git_origin_url: None,
source: Some(SessionSource::VSCode),
parent_thread_id: None,
agent_nickname: None,
agent_role: None,
model_provider: Some(TEST_PROVIDER.to_string()),
@@ -750,6 +753,7 @@ async fn test_pagination_cursor() {
git_sha: None,
git_origin_url: None,
source: Some(SessionSource::VSCode),
parent_thread_id: None,
agent_nickname: None,
agent_role: None,
model_provider: Some(TEST_PROVIDER.to_string()),
@@ -767,6 +771,7 @@ async fn test_pagination_cursor() {
git_sha: None,
git_origin_url: None,
source: Some(SessionSource::VSCode),
parent_thread_id: None,
agent_nickname: None,
agent_role: None,
model_provider: Some(TEST_PROVIDER.to_string()),
@@ -820,6 +825,7 @@ async fn test_pagination_cursor() {
git_sha: None,
git_origin_url: None,
source: Some(SessionSource::VSCode),
parent_thread_id: None,
agent_nickname: None,
agent_role: None,
model_provider: Some(TEST_PROVIDER.to_string()),
@@ -837,6 +843,7 @@ async fn test_pagination_cursor() {
git_sha: None,
git_origin_url: None,
source: Some(SessionSource::VSCode),
parent_thread_id: None,
agent_nickname: None,
agent_role: None,
model_provider: Some(TEST_PROVIDER.to_string()),
@@ -882,6 +889,7 @@ async fn test_pagination_cursor() {
git_sha: None,
git_origin_url: None,
source: Some(SessionSource::VSCode),
parent_thread_id: None,
agent_nickname: None,
agent_role: None,
model_provider: Some(TEST_PROVIDER.to_string()),
@@ -1052,6 +1060,7 @@ async fn test_get_thread_contents() {
git_sha: None,
git_origin_url: None,
source: Some(SessionSource::VSCode),
parent_thread_id: None,
agent_nickname: None,
agent_role: None,
model_provider: Some(TEST_PROVIDER.to_string()),
@@ -1251,6 +1260,7 @@ async fn test_updated_at_uses_file_mtime() -> Result<()> {
meta: SessionMeta {
id: conversation_id,
forked_from_id: None,
parent_thread_id: None,
timestamp: ts.to_string(),
cwd: ".".into(),
originator: "test_originator".into(),
@@ -1403,6 +1413,7 @@ async fn test_timestamp_only_cursor_skips_same_second_filesystem_ties() {
git_sha: None,
git_origin_url: None,
source: Some(SessionSource::VSCode),
parent_thread_id: None,
agent_nickname: None,
agent_role: None,
model_provider: Some(TEST_PROVIDER.to_string()),
@@ -1420,6 +1431,7 @@ async fn test_timestamp_only_cursor_skips_same_second_filesystem_ties() {
git_sha: None,
git_origin_url: None,
source: Some(SessionSource::VSCode),
parent_thread_id: None,
agent_nickname: None,
agent_role: None,
model_provider: Some(TEST_PROVIDER.to_string()),