diff --git a/codex-rs/app-server/src/request_processors/thread_processor.rs b/codex-rs/app-server/src/request_processors/thread_processor.rs
index c258314b2c..848afd1781 100644
--- a/codex-rs/app-server/src/request_processors/thread_processor.rs
+++ b/codex-rs/app-server/src/request_processors/thread_processor.rs
@@ -4494,7 +4494,7 @@ fn build_recent_not_loaded_turns_page_response(
         /*has_live_in_progress_turn*/ false,
     );
     apply_thread_turns_items_view(&mut turns, TurnItemsView::NotLoaded);
-    let page = paginate_thread_turns(turns, None, limit, SortDirection::Desc)?;
+    let page = paginate_thread_turns(turns, /*cursor*/ None, limit, SortDirection::Desc)?;
     Ok(ThreadTurnsListResponse {
         data: page.turns,
         next_cursor: page.next_cursor,
diff --git a/codex-rs/app-server/src/request_processors/thread_processor_tests.rs b/codex-rs/app-server/src/request_processors/thread_processor_tests.rs
index e9879de43e..5179af11f5 100644
--- a/codex-rs/app-server/src/request_processors/thread_processor_tests.rs
+++ b/codex-rs/app-server/src/request_processors/thread_processor_tests.rs
@@ -424,9 +424,9 @@ mod thread_processor_behavior_tests {
             compacted_resume_test_session(thread_id),
             compacted_resume_test_user_event("first user event"),
             RolloutItem::ResponseItem(compacted_resume_test_message("user", "first user response")),
-            compacted_resume_test_compaction("older checkpoint", 1),
+            compacted_resume_test_compaction("older checkpoint", /*window_id*/ 1),
             compacted_resume_test_user_event("middle user event"),
-            compacted_resume_test_compaction("latest checkpoint", 2),
+            compacted_resume_test_compaction("latest checkpoint", /*window_id*/ 2),
             compacted_resume_test_agent_event(&large_tail_message),
         ])?;
         std::fs::write(&path, contents)?;
@@ -469,7 +469,7 @@ mod thread_processor_behavior_tests {
             compacted_resume_test_session(thread_id),
             compacted_resume_test_user_event("first user event"),
             RolloutItem::ResponseItem(compacted_resume_test_message("user", "first user response")),
-            compacted_resume_test_compaction("latest checkpoint", 2),
+            compacted_resume_test_compaction("latest checkpoint", /*window_id*/ 2),
         ])?;
         contents.push_str("{not json}\n");
         std::fs::write(&path, contents)?;
diff --git a/codex-rs/thread-store/src/live_thread.rs b/codex-rs/thread-store/src/live_thread.rs
index c2eb875817..d24b3c2076 100644
--- a/codex-rs/thread-store/src/live_thread.rs
+++ b/codex-rs/thread-store/src/live_thread.rs
@@ -102,7 +102,7 @@ impl LiveThread {
         thread_store: Arc<dyn ThreadStore>,
         params: ResumeThreadParams,
     ) -> ThreadStoreResult<Self> {
-        Self::resume_with_observed_history(thread_store, params, None).await
+        Self::resume_with_observed_history(thread_store, params, /*observed_history*/ None).await
     }
 
     pub async fn resume_with_observed_history(