Skip to content

[#83]: rename CollabSpawn output field new_thread_id to new_session_id for Codex v0.131.0 #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
delexw merged 1 commit into from
Jun 3, 2026
+64 −13
Merged

[#83]: rename CollabSpawn output field new_thread_id to new_session_id for Codex v0.131.0 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shared/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export interface AgentMessage {

export interface CollabSpawn {
call_id: string;
new_thread_id: string;
new_session_id: string;
agent_nickname: string;
agent_role: string;
model?: string | null;
Expand Down
57 changes: 54 additions & 3 deletions src-tauri/src/parser/session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ fn parse_session_inner(
// Collect spawned_worker_ids from all turns
let spawned_worker_ids: Vec<String> = turns
.iter()
.flat_map(|t| t.collab_spawns.iter().map(|s| s.new_thread_id.clone()))
.flat_map(|t| t.collab_spawns.iter().map(|s| s.new_session_id.clone()))
.collect();

// Determine total tokens from last turn's token info
Expand Down Expand Up @@ -178,7 +178,7 @@ fn embed_worker_sessions(
continue;
};

let Some(worker_path) = find_session_file_by_id(parent_path, &spawn.new_thread_id)
let Some(worker_path) = find_session_file_by_id(parent_path, &spawn.new_session_id)
else {
continue;
};
Expand Down Expand Up @@ -470,7 +470,7 @@ mod tests {

assert_eq!(session.spawned_worker_ids, vec!["worker-session"]);
assert_eq!(
session.turns[0].collab_spawns[0].new_thread_id,
session.turns[0].collab_spawns[0].new_session_id,
"worker-session"
);

Expand Down Expand Up @@ -767,4 +767,55 @@ mod tests {
assert_eq!(session.turns.len(), 1);
assert!(!session.is_ongoing);
}

// Codex v0.131.0 (PR #22268): collab_agent_spawn_end uses new_session_id instead of
// new_thread_id. Verify end-to-end: parse_session reads new_session_id, populates
// spawned_worker_ids, and embed_worker_sessions correctly stitches the worker session.
#[test]
fn v0131_parse_session_stitches_worker_via_new_session_id() {
let tmp = tempdir().unwrap();
let parent_path = tmp
.path()
.join("rollout-2026-05-18T10-03-00-parent-v131.jsonl");
let worker_path = tmp
.path()
.join("rollout-2026-05-18T10-03-09-worker-v131.jsonl");
std::fs::write(
&parent_path,
[
r#"{"timestamp":"2026-05-18T10:03:00Z","type":"session_meta","payload":{"id":"parent-v131","timestamp":"2026-05-18T10:03:00Z","cli_version":"0.131.0"}}"#,
r#"{"timestamp":"2026-05-18T10:03:01Z","type":"event_msg","payload":{"type":"task_started","turn_id":"turn-1"}}"#,
r#"{"timestamp":"2026-05-18T10:03:02Z","type":"response_item","payload":{"type":"function_call","name":"spawn_agent","arguments":"{\"agent_type\":\"worker\",\"message\":\"Gather data\"}","call_id":"call-spawn-v131"}}"#,
r#"{"timestamp":"2026-05-18T10:03:03Z","type":"event_msg","payload":{"type":"collab_agent_spawn_end","call_id":"call-spawn-v131","sender_session_id":"parent-v131","new_session_id":"worker-v131","new_agent_nickname":"Hypatia","new_agent_role":"worker","prompt":"Gather data","status":"pending_init"}}"#,
r#"{"timestamp":"2026-05-18T10:03:04Z","type":"response_item","payload":{"type":"function_call_output","call_id":"call-spawn-v131","output":"{\"agent_id\":\"worker-v131\",\"nickname\":\"Hypatia\"}"}}"#,
r#"{"timestamp":"2026-05-18T10:03:05Z","type":"event_msg","payload":{"type":"task_complete","turn_id":"turn-1","completed_at":1747562585.0}}"#,
]
.join("\n"),
)
.unwrap();
std::fs::write(
&worker_path,
[
r#"{"timestamp":"2026-05-18T10:03:09Z","type":"session_meta","payload":{"id":"worker-v131","timestamp":"2026-05-18T10:03:09Z","cli_version":"0.131.0","cwd":"/tmp/worker"}}"#,
r#"{"timestamp":"2026-05-18T10:03:10Z","type":"event_msg","payload":{"type":"task_started","turn_id":"turn-worker"}}"#,
r#"{"timestamp":"2026-05-18T10:03:11Z","type":"event_msg","payload":{"type":"task_complete","turn_id":"turn-worker","completed_at":1747562591.0}}"#,
]
.join("\n"),
)
.unwrap();

let session = parse_session(&parent_path).unwrap();
assert_eq!(session.id, "parent-v131");
assert_eq!(session.spawned_worker_ids, vec!["worker-v131"]);
assert_eq!(
session.turns[0].collab_spawns[0].new_session_id,
"worker-v131"
);
assert_eq!(session.turns[0].collab_spawns[0].agent_nickname, "Hypatia");
let worker = session.turns[0].tool_calls[0]
.worker_session
.as_ref()
.expect("spawn_agent tool call should embed worker session");
assert_eq!(worker.id, "worker-v131");
}
}
18 changes: 9 additions & 9 deletions src-tauri/src/parser/turn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pub struct TokenInfo {
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct CollabSpawn {
pub call_id: String,
pub new_thread_id: String,
pub new_session_id: String,
pub agent_nickname: String,
pub agent_role: String,
pub model: Option<String>,
Expand Down Expand Up @@ -464,9 +464,9 @@ fn handle_event_msg(
if let Some(turn) = turns.get_mut(tid) {
let call_id = str_field(payload, "call_id");
// v0.131.0+ (PR #22268): field renamed new_thread_id → new_session_id
let new_thread_id = payload
.get("new_thread_id")
.or_else(|| payload.get("new_session_id"))
let new_session_id = payload
.get("new_session_id")
.or_else(|| payload.get("new_thread_id"))
.and_then(|v| v.as_str())
.unwrap_or("")
.to_string();
Expand All @@ -485,7 +485,7 @@ fn handle_event_msg(

turn.collab_spawns.push(CollabSpawn {
call_id: call_id.clone(),
new_thread_id,
new_session_id,
agent_nickname,
agent_role,
model,
Expand Down Expand Up @@ -886,7 +886,7 @@ fn spawn_from_function_call_output(

Some(CollabSpawn {
call_id: call_id.to_string(),
new_thread_id: parsed.agent_id,
new_session_id: parsed.agent_id,
agent_nickname: parsed.nickname,
agent_role,
model,
Expand Down Expand Up @@ -922,7 +922,7 @@ mod tests {
assert_eq!(turns.len(), 1);
assert_eq!(turns[0].collab_spawns.len(), 1);
assert_eq!(turns[0].collab_spawns[0].call_id, "call_spawn");
assert_eq!(turns[0].collab_spawns[0].new_thread_id, "worker-session");
assert_eq!(turns[0].collab_spawns[0].new_session_id, "worker-session");
assert_eq!(turns[0].collab_spawns[0].agent_nickname, "Parfit");
assert_eq!(turns[0].collab_spawns[0].agent_role, "worker");
assert_eq!(
Expand Down Expand Up @@ -1168,7 +1168,7 @@ mod tests {

assert_eq!(turns.len(), 1);
assert_eq!(turns[0].collab_spawns.len(), 1);
assert_eq!(turns[0].collab_spawns[0].new_thread_id, "worker-session");
assert_eq!(turns[0].collab_spawns[0].new_session_id, "worker-session");
assert_eq!(turns[0].collab_spawns[0].agent_nickname, "Noether");
assert_eq!(turns[0].tool_calls.len(), 1);
assert_eq!(turns[0].tool_calls[0].kind, ToolKind::SpawnAgent);
Expand Down Expand Up @@ -2003,7 +2003,7 @@ mod tests {

assert_eq!(turns.len(), 1);
assert_eq!(turns[0].collab_spawns.len(), 1);
assert_eq!(turns[0].collab_spawns[0].new_thread_id, "worker-sess-v131");
assert_eq!(turns[0].collab_spawns[0].new_session_id, "worker-sess-v131");
assert_eq!(turns[0].collab_spawns[0].agent_nickname, "Turing");
assert_eq!(turns[0].tool_calls.len(), 1);
assert_eq!(turns[0].tool_calls[0].kind, ToolKind::SpawnAgent);
Expand Down
Loading