clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-05-23 12:34:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix current rollout path after segment rotation

Browse Source
This commit is contained in:
Friel
2026-05-04 09:02:12 +00:00
parent 36cae7deae
commit 4ce550f394
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
codex-rs/core/src/codex_thread.rs
View File

@@ -381,6 +381,13 @@ impl CodexThread {
self.rollout_path.clone()
}
pub async fn current_rollout_path(&self) -> Option<PathBuf> {
match self.codex.session.current_rollout_path().await {
Ok(Some(path)) => Some(path),
Ok(None) | Err(_) => self.rollout_path.clone(),
}
}
pub(crate) fn session_configured(&self) -> SessionConfiguredEvent {
self.session_configured.clone()
}

17
codex-rs/core/tests/suite/compact_resume_fork.rs
View File

@@ -143,7 +143,7 @@ async fn compact_resume_and_fork_preserve_model_history_view() {
user_turn(&base, "hello world").await;
compact_conversation(&base).await;
user_turn(&base, "AFTER_COMPACT").await;
let base_path = fetch_conversation_path(&base);
let base_path = fetch_conversation_path(&base).await;
assert!(
base_path.exists(),
"compact+resume test expects base path {base_path:?} to exist",
@@ -152,7 +152,7 @@ async fn compact_resume_and_fork_preserve_model_history_view() {
shutdown_conversation(&base).await;
let resumed = resume_conversation(&manager, &config, base_path).await;
user_turn(&resumed, "AFTER_RESUME").await;
let resumed_path = fetch_conversation_path(&resumed);
let resumed_path = fetch_conversation_path(&resumed).await;
assert!(
resumed_path.exists(),
"compact+resume test expects resumed path {resumed_path:?} to exist",
@@ -299,7 +299,7 @@ async fn compact_resume_after_second_compaction_preserves_history() -> Result<()
user_turn(&base, "hello world").await;
compact_conversation(&base).await;
user_turn(&base, "AFTER_COMPACT").await;
let base_path = fetch_conversation_path(&base);
let base_path = fetch_conversation_path(&base).await;
assert!(
base_path.exists(),
"second compact test expects base path {base_path:?} to exist",
@@ -308,7 +308,7 @@ async fn compact_resume_after_second_compaction_preserves_history() -> Result<()
shutdown_conversation(&base).await;
let resumed = resume_conversation(&manager, &config, base_path).await;
user_turn(&resumed, "AFTER_RESUME").await;
let resumed_path = fetch_conversation_path(&resumed);
let resumed_path = fetch_conversation_path(&resumed).await;
assert!(
resumed_path.exists(),
"second compact test expects resumed path {resumed_path:?} to exist",
@@ -319,7 +319,7 @@ async fn compact_resume_after_second_compaction_preserves_history() -> Result<()
compact_conversation(&forked).await;
user_turn(&forked, "AFTER_COMPACT_2").await;
let forked_path = fetch_conversation_path(&forked);
let forked_path = fetch_conversation_path(&forked).await;
assert!(
forked_path.exists(),
"second compact test expects forked path {forked_path:?} to exist",
@@ -814,8 +814,11 @@ async fn compact_conversation(conversation: &Arc<CodexThread>) {
wait_for_event(conversation, |ev| matches!(ev, EventMsg::TurnComplete(_))).await;
}
fn fetch_conversation_path(conversation: &Arc<CodexThread>) -> std::path::PathBuf {
conversation.rollout_path().expect("rollout path")
async fn fetch_conversation_path(conversation: &Arc<CodexThread>) -> std::path::PathBuf {
conversation
.current_rollout_path()
.await
.expect("rollout path")
}
async fn shutdown_conversation(conversation: &Arc<CodexThread>) {