From 0212f4010e2b66eea296202da90778ce9d44babb Mon Sep 17 00:00:00 2001
From: jif-oai <jif@openai.com>
Date: Fri, 30 Jan 2026 18:32:10 +0100
Subject: [PATCH] nit: fix db with multiple metadata lines (#10237)

---
 codex-rs/core/src/rollout/recorder.rs | 2 +-
 codex-rs/state/src/extract.rs         | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/codex-rs/core/src/rollout/recorder.rs b/codex-rs/core/src/rollout/recorder.rs
index 501b46271f..265ff2bde2 100644
--- a/codex-rs/core/src/rollout/recorder.rs
+++ b/codex-rs/core/src/rollout/recorder.rs
@@ -434,7 +434,7 @@ impl RolloutRecorder {
             }
         }
 
-        info!(
+        tracing::debug!(
             "Resumed rollout with {} items, thread ID: {:?}, parse errors: {}",
             items.len(),
             thread_id,
diff --git a/codex-rs/state/src/extract.rs b/codex-rs/state/src/extract.rs
index 9c8ce21556..8d327a4d1a 100644
--- a/codex-rs/state/src/extract.rs
+++ b/codex-rs/state/src/extract.rs
@@ -30,6 +30,11 @@ pub fn apply_rollout_item(
 }
 
 fn apply_session_meta_from_item(metadata: &mut ThreadMetadata, meta_line: &SessionMetaLine) {
+    if metadata.id != meta_line.meta.id {
+        // Ignore session_meta lines that don't match the canonical thread ID,
+        // e.g., forked rollouts that embed the source session metadata.
+        return;
+    }
     metadata.id = meta_line.meta.id;
     metadata.source = enum_to_string(&meta_line.meta.source);
     if let Some(provider) = meta_line.meta.model_provider.as_deref() {