Lightweight coding agent that runs in your terminal
Rust
Use stored item types when materializing turn summaries (#39514)
Tamir Dubersteindb675cc005db
diff --git a/codex-rs/thread-store/src/local/thread_history.rs b/codex-rs/thread-store/src/local/thread_history.rsindex c89d1b28b2..b9edf517ab 100644--- a/codex-rs/thread-store/src/local/thread_history.rs+++ b/codex-rs/thread-store/src/local/thread_history.rs@@ -328,7 +328,10 @@ SETFROM thread_itemsWHERE thread_id = ?AND turn_id = ?- AND json_extract(item_json, '$.type') = 'userMessage'+ AND (+ item_type = 'userMessage'+ OR (item_type = '' AND json_extract(item_json, '$.type') = 'userMessage')+ )ORDER BY rollout_ordinalLIMIT 1)@@ -339,7 +342,10 @@ SETFROM thread_itemsWHERE thread_id = ?AND turn_id = ?- AND json_extract(item_json, '$.type') = 'agentMessage'+ AND (+ item_type = 'agentMessage'+ OR (item_type = '' AND json_extract(item_json, '$.type') = 'agentMessage')+ )AND json_extract(item_json, '$.phase') = 'final_answer'ORDER BY rollout_ordinal DESCLIMIT 1@@ -350,7 +356,10 @@ SETFROM thread_itemsWHERE thread_id = ?AND turn_id = ?- AND json_extract(item_json, '$.type') = 'agentMessage'+ AND (+ item_type = 'agentMessage'+ OR (item_type = '' AND json_extract(item_json, '$.type') = 'agentMessage')+ )AND json_extract(item_json, '$.phase') IS NULLORDER BY rollout_ordinal DESCLIMIT 1diff --git a/codex-rs/thread-store/src/local/thread_history_materialization_tests.rs b/codex-rs/thread-store/src/local/thread_history_materialization_tests.rsindex 5bfa886f5f..42f1df3533 100644--- a/codex-rs/thread-store/src/local/thread_history_materialization_tests.rs+++ b/codex-rs/thread-store/src/local/thread_history_materialization_tests.rs@@ -1304,6 +1304,33 @@ async fn summary_items_use_final_answers_and_ignore_commentary() {}).await.expect("append items before turn lifecycle");++ let pool = codex_state::open_thread_history_db(&codex_state::SqliteConfig::new_for_testing(+ home.path().abs(),+ ))+ .await+ .expect("open thread history db");+ sqlx::query(+ r#"+INSERT OR REPLACE INTO thread_items (+ thread_id,+ turn_id,+ item_id,+ rollout_ordinal,+ created_at_ms,+ item_json+)+SELECT thread_id, turn_id, item_id, rollout_ordinal, created_at_ms, item_json+FROM thread_items+WHERE thread_id = ? AND turn_id = ?+ "#,+ )+ .bind(thread_id.to_string())+ .bind("turn-1")+ .execute(&pool)+ .await+ .expect("older writers can append items without a stored item type");+store.append_items(AppendThreadItemsParams {thread_id,