From 9e3139b2bec5710bf6a31be1cbd7d470cd79c662 Mon Sep 17 00:00:00 2001 From: Ahmed Ibrahim Date: Mon, 1 Jun 2026 11:22:00 -0700 Subject: [PATCH] codex: resolve fork lock from source thread --- codex-rs/protocol/src/protocol.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/codex-rs/protocol/src/protocol.rs b/codex-rs/protocol/src/protocol.rs index 74d5bafee6..c8b4b8e839 100644 --- a/codex-rs/protocol/src/protocol.rs +++ b/codex-rs/protocol/src/protocol.rs @@ -2459,9 +2459,9 @@ impl InitialHistory { InitialHistory::Resumed(resumed) => { multi_agent_version_from_items(&resumed.history, Some(resumed.conversation_id)) } - InitialHistory::Forked(items) => { - multi_agent_version_from_items(items, /*thread_id*/ None) - } + InitialHistory::Forked(forked) => forked.source_thread_id.and_then(|thread_id| { + multi_agent_version_from_items(&forked.history, Some(thread_id)) + }), } }