mirror of
https://github.com/openai/codex.git
synced 2026-05-29 15:30:22 +00:00
## Why `session_id` and `thread_id` are separate identities after #20437, but app-server only surfaced `sessionId` on the `thread/start`, `thread/resume`, and `thread/fork` response envelopes. Other thread-bearing surfaces such as `thread/list`, `thread/read`, `thread/started`, `thread/rollback`, `thread/metadata/update`, and `thread/unarchive` either lacked the grouping key or forced clients to special-case those three responses. Making `sessionId` part of the reusable `Thread` payload gives every v2 API surface one place to expose session-tree identity. ## Mental model 1. thread.sessionId lives on `Thread` 2. It is a view/runtime identity for the current live session tree, not durable stored lineage metadata 3. When app-server has a live loaded thread, it copies the real value from core’s session_configured.session_id 4. When it only has stored/unloaded data, it falls back to thread.sessionId = thread.id ## What changed - Added `sessionId` to the v2 [`Thread`](8fc9e9b4cf/codex-rs/app-server-protocol/src/protocol/v2/thread_data.rs (L105-L109)). - Removed the duplicate top-level `sessionId` fields from `thread/start`, `thread/resume`, and `thread/fork`; clients should now read `response.thread.sessionId`. - Populated `thread.sessionId` when building live thread responses, replaying loaded threads, and returning stored-thread summaries so the field is present across start, resume, fork, list, read, rollback, metadata-update, unarchive, and `thread/started` paths. See [`load_thread_from_resume_source_or_send_internal`](8fc9e9b4cf/codex-rs/app-server/src/request_processors/thread_processor.rs (L2824-L2918)) and [`thread_from_stored_thread`](8fc9e9b4cf/codex-rs/app-server/src/request_processors/thread_processor.rs (L3671-L3719)). - Preserved the stored-thread fallback: if a thread has not been loaded into a live session tree yet, `thread.sessionId` falls back to `thread.id`; once the thread is live again, the field reports the active session tree root. - Regenerated the JSON/TypeScript schemas and updated the app-server README examples to show [`thread.sessionId`](8fc9e9b4cf/codex-rs/app-server/README.md (L306-L310)) on the thread object.
220 lines
8.2 KiB
Rust
220 lines
8.2 KiB
Rust
//! Discovers subagent threads that belong to a primary thread by walking spawn-tree edges.
|
|
//!
|
|
//! When the TUI resumes or switches to an existing thread, it needs to populate
|
|
//! `AgentNavigationState` and `ChatWidget` metadata for every subagent that was spawned during
|
|
//! that thread's lifetime. The app server exposes a flat list of currently loaded threads via
|
|
//! `thread/loaded/list`, but the TUI must figure out which of those are descendants of the
|
|
//! primary thread.
|
|
//!
|
|
//! This module provides the pure, synchronous tree-walk that turns that flat list into the filtered
|
|
//! set of descendants. It intentionally has no async, no I/O, and no side effects so it can be
|
|
//! unit-tested in isolation.
|
|
//!
|
|
//! The walk starts from `primary_thread_id` and repeatedly follows
|
|
//! `SessionSource::SubAgent(ThreadSpawn { parent_thread_id, .. })` edges until no new children are
|
|
//! found. The primary thread itself is never included in the output.
|
|
|
|
use codex_app_server_protocol::Thread;
|
|
use codex_protocol::ThreadId;
|
|
use std::collections::HashMap;
|
|
use std::collections::HashSet;
|
|
|
|
/// A subagent thread discovered by the spawn-tree walk, carrying just enough metadata for the
|
|
/// TUI to register it in the navigation cache and rendering metadata map.
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub(crate) struct LoadedSubagentThread {
|
|
pub(crate) thread_id: ThreadId,
|
|
pub(crate) agent_nickname: Option<String>,
|
|
pub(crate) agent_role: Option<String>,
|
|
}
|
|
|
|
/// Walks the spawn tree rooted at `primary_thread_id` and returns every descendant subagent.
|
|
///
|
|
/// The walk is breadth-first over `SessionSource::SubAgent(ThreadSpawn { parent_thread_id })` edges.
|
|
/// Threads whose `source` is not a `ThreadSpawn`, or whose `parent_thread_id` does not chain back
|
|
/// to `primary_thread_id`, are excluded. The primary thread itself is never included.
|
|
///
|
|
/// Results are sorted by stringified thread id for deterministic output in tests and in the
|
|
/// navigation cache. Callers should not rely on this ordering for anything semantic; it exists
|
|
/// purely to make snapshot assertions stable.
|
|
///
|
|
/// If two threads claim the same parent, both are included. Cycles in the parent chain are not
|
|
/// possible because `ThreadId`s are server-assigned UUIDs and the server enforces acyclicity, but
|
|
/// the `included` set guards against re-visiting regardless.
|
|
pub(crate) fn find_loaded_subagent_threads_for_primary(
|
|
threads: Vec<Thread>,
|
|
primary_thread_id: ThreadId,
|
|
) -> Vec<LoadedSubagentThread> {
|
|
let mut threads_by_id = HashMap::new();
|
|
for thread in threads {
|
|
let Ok(thread_id) = ThreadId::from_string(&thread.id) else {
|
|
continue;
|
|
};
|
|
threads_by_id.insert(thread_id, thread);
|
|
}
|
|
|
|
let mut included = HashSet::new();
|
|
let mut pending = vec![primary_thread_id];
|
|
while let Some(parent_thread_id) = pending.pop() {
|
|
for (thread_id, thread) in &threads_by_id {
|
|
if included.contains(thread_id) {
|
|
continue;
|
|
}
|
|
|
|
let Some(source_parent_thread_id) = thread_spawn_parent_thread_id(&thread.source)
|
|
else {
|
|
continue;
|
|
};
|
|
|
|
if source_parent_thread_id != parent_thread_id {
|
|
continue;
|
|
}
|
|
|
|
included.insert(*thread_id);
|
|
pending.push(*thread_id);
|
|
}
|
|
}
|
|
|
|
let mut loaded_threads: Vec<LoadedSubagentThread> = included
|
|
.into_iter()
|
|
.filter_map(|thread_id| {
|
|
threads_by_id
|
|
.remove(&thread_id)
|
|
.map(|thread| LoadedSubagentThread {
|
|
thread_id,
|
|
agent_nickname: thread.agent_nickname,
|
|
agent_role: thread.agent_role,
|
|
})
|
|
})
|
|
.collect();
|
|
loaded_threads.sort_by_key(|thread| thread.thread_id.to_string());
|
|
loaded_threads
|
|
}
|
|
|
|
fn thread_spawn_parent_thread_id(
|
|
source: &codex_app_server_protocol::SessionSource,
|
|
) -> Option<ThreadId> {
|
|
let value = serde_json::to_value(source).ok()?;
|
|
let parent_thread_id = value
|
|
.get("subAgent")?
|
|
.get("thread_spawn")?
|
|
.get("parent_thread_id")?
|
|
.as_str()?;
|
|
ThreadId::from_string(parent_thread_id).ok()
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::LoadedSubagentThread;
|
|
use super::find_loaded_subagent_threads_for_primary;
|
|
use codex_app_server_protocol::SessionSource;
|
|
use codex_app_server_protocol::Thread;
|
|
use codex_app_server_protocol::ThreadStatus;
|
|
use codex_protocol::ThreadId;
|
|
use codex_utils_absolute_path::test_support::PathBufExt;
|
|
use codex_utils_absolute_path::test_support::test_path_buf;
|
|
use pretty_assertions::assert_eq;
|
|
|
|
fn test_thread(thread_id: ThreadId, source: SessionSource) -> Thread {
|
|
Thread {
|
|
id: thread_id.to_string(),
|
|
session_id: thread_id.to_string(),
|
|
forked_from_id: None,
|
|
preview: String::new(),
|
|
ephemeral: false,
|
|
model_provider: "openai".to_string(),
|
|
created_at: 0,
|
|
updated_at: 0,
|
|
status: ThreadStatus::Idle,
|
|
path: None,
|
|
cwd: test_path_buf("/tmp").abs(),
|
|
cli_version: "0.0.0".to_string(),
|
|
source,
|
|
thread_source: None,
|
|
agent_nickname: None,
|
|
agent_role: None,
|
|
git_info: None,
|
|
name: None,
|
|
turns: Vec::new(),
|
|
}
|
|
}
|
|
|
|
fn thread_spawn_source(
|
|
parent_thread_id: ThreadId,
|
|
depth: i32,
|
|
agent_nickname: &str,
|
|
agent_role: &str,
|
|
) -> SessionSource {
|
|
serde_json::from_value(serde_json::json!({
|
|
"subAgent": {
|
|
"thread_spawn": {
|
|
"parent_thread_id": parent_thread_id.to_string(),
|
|
"depth": depth,
|
|
"agent_nickname": agent_nickname,
|
|
"agent_role": agent_role,
|
|
}
|
|
}
|
|
}))
|
|
.expect("valid subagent source")
|
|
}
|
|
|
|
#[test]
|
|
fn finds_loaded_subagent_tree_for_primary_thread() {
|
|
let primary_thread_id =
|
|
ThreadId::from_string("00000000-0000-0000-0000-000000000001").expect("valid thread");
|
|
let child_thread_id =
|
|
ThreadId::from_string("00000000-0000-0000-0000-000000000002").expect("valid thread");
|
|
let grandchild_thread_id =
|
|
ThreadId::from_string("00000000-0000-0000-0000-000000000003").expect("valid thread");
|
|
let unrelated_parent_id =
|
|
ThreadId::from_string("00000000-0000-0000-0000-000000000004").expect("valid thread");
|
|
let unrelated_child_id =
|
|
ThreadId::from_string("00000000-0000-0000-0000-000000000005").expect("valid thread");
|
|
|
|
let mut child = test_thread(
|
|
child_thread_id,
|
|
thread_spawn_source(primary_thread_id, /*depth*/ 1, "Scout", "explorer"),
|
|
);
|
|
child.agent_nickname = Some("Scout".to_string());
|
|
child.agent_role = Some("explorer".to_string());
|
|
|
|
let mut grandchild = test_thread(
|
|
grandchild_thread_id,
|
|
thread_spawn_source(child_thread_id, /*depth*/ 2, "Atlas", "worker"),
|
|
);
|
|
grandchild.agent_nickname = Some("Atlas".to_string());
|
|
grandchild.agent_role = Some("worker".to_string());
|
|
|
|
let unrelated_child = test_thread(
|
|
unrelated_child_id,
|
|
thread_spawn_source(unrelated_parent_id, /*depth*/ 1, "Other", "researcher"),
|
|
);
|
|
|
|
let loaded = find_loaded_subagent_threads_for_primary(
|
|
vec![
|
|
test_thread(primary_thread_id, SessionSource::Cli),
|
|
child,
|
|
grandchild,
|
|
unrelated_child,
|
|
],
|
|
primary_thread_id,
|
|
);
|
|
|
|
assert_eq!(
|
|
loaded,
|
|
vec![
|
|
LoadedSubagentThread {
|
|
thread_id: child_thread_id,
|
|
agent_nickname: Some("Scout".to_string()),
|
|
agent_role: Some("explorer".to_string()),
|
|
},
|
|
LoadedSubagentThread {
|
|
thread_id: grandchild_thread_id,
|
|
agent_nickname: Some("Atlas".to_string()),
|
|
agent_role: Some("worker".to_string()),
|
|
},
|
|
]
|
|
);
|
|
}
|
|
}
|