agent/codex
2
0
Fork 0
mirror of https://github.com/pchuan98/codex.git synced 2026-07-01 00:31:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

[codex] core: restore absolute turn context cwd (#28629)

Browse Source 
## Why

#28152 jumped the gun on moving the rollout format to store URIs, and
would likely break compat with some features that don't go through the
same types as the core logic.

## What

Make `TurnContextItem.cwd` an `AbsolutePathBuf` again, remove test added
for `PathUri` serialization in rollouts. Also drops a bunch of error
paths that are no longer needed.
This commit is contained in:
Adam Perry @ OpenAI
2026-06-16 19:05:26 -07:00
committed by GitHub
parent 69bc0645ac
commit 3d02c443bc
21 changed files with 142 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/state/src/extract.rs
+18 -37
View File
@@ -16,10 +16,10 @@ pub fn apply_rollout_item(
metadata: &mut ThreadMetadata,
item: &RolloutItem,
default_provider: &str,
) -> std::io::Result<()> {
) {
match item {
RolloutItem::SessionMeta(meta_line) => apply_session_meta_from_item(metadata, meta_line),
RolloutItem::TurnContext(turn_ctx) => apply_turn_context(metadata, turn_ctx)?,
RolloutItem::TurnContext(turn_ctx) => apply_turn_context(metadata, turn_ctx),
RolloutItem::EventMsg(event) => apply_event_msg(metadata, event),
RolloutItem::ResponseItem(item) => apply_response_item(metadata, item),
RolloutItem::InterAgentCommunication(_) => {}
@@ -28,7 +28,6 @@ pub fn apply_rollout_item(
if metadata.model_provider.is_empty() {
metadata.model_provider = default_provider.to_string();
}
Ok(())
}
/// Return whether this rollout item can mutate thread metadata stored in SQLite.
@@ -73,21 +72,15 @@ fn apply_session_meta_from_item(metadata: &mut ThreadMetadata, meta_line: &Sessi
}
}
fn apply_turn_context(
metadata: &mut ThreadMetadata,
turn_ctx: &TurnContextItem,
) -> std::io::Result<()> {
if metadata.cwd.as_os_str().is_empty()
&& let Ok(cwd) = turn_ctx.cwd.to_abs_path()
{
metadata.cwd = cwd.into_path_buf();
fn apply_turn_context(metadata: &mut ThreadMetadata, turn_ctx: &TurnContextItem) {
if metadata.cwd.as_os_str().is_empty() {
metadata.cwd = turn_ctx.cwd.clone().into_path_buf();
}
metadata.model = Some(turn_ctx.model.clone());
metadata.reasoning_effort = turn_ctx.effort.clone();
metadata.sandbox_policy =
serde_json::to_string(&turn_ctx.permission_profile()?).unwrap_or_default();
serde_json::to_string(&turn_ctx.permission_profile()).unwrap_or_default();
metadata.approval_mode = enum_to_string(&turn_ctx.approval_policy);
Ok(())
}
fn apply_event_msg(metadata: &mut ThreadMetadata, event: &EventMsg) {
@@ -201,8 +194,7 @@ mod tests {
metadata: None,
});
apply_rollout_item(&mut metadata, &item, "test-provider")
.expect("rollout item should apply");
apply_rollout_item(&mut metadata, &item, "test-provider");
assert_eq!(metadata.first_user_message, None);
assert_eq!(metadata.preview, None);
@@ -221,8 +213,7 @@ mod tests {
..Default::default()
}));
apply_rollout_item(&mut metadata, &item, "test-provider")
.expect("rollout item should apply");
apply_rollout_item(&mut metadata, &item, "test-provider");
assert_eq!(
metadata.first_user_message.as_deref(),
@@ -244,8 +235,7 @@ mod tests {
..Default::default()
}));
apply_rollout_item(&mut metadata, &item, "test-provider")
.expect("rollout item should apply");
apply_rollout_item(&mut metadata, &item, "test-provider");
assert_eq!(
metadata.first_user_message.as_deref(),
@@ -270,8 +260,7 @@ mod tests {
..Default::default()
}));
apply_rollout_item(&mut metadata, &item, "test-provider")
.expect("rollout item should apply");
apply_rollout_item(&mut metadata, &item, "test-provider");
assert_eq!(metadata.first_user_message, None);
assert_eq!(metadata.preview, None);
@@ -297,8 +286,7 @@ mod tests {
},
}));
apply_rollout_item(&mut metadata, &goal_item, "test-provider")
.expect("rollout item should apply");
apply_rollout_item(&mut metadata, &goal_item, "test-provider");
assert_eq!(metadata.preview.as_deref(), Some("optimize the benchmark"));
assert_eq!(metadata.first_user_message, None);
@@ -313,8 +301,7 @@ mod tests {
..Default::default()
}));
apply_rollout_item(&mut metadata, &user_item, "test-provider")
.expect("rollout item should apply");
apply_rollout_item(&mut metadata, &user_item, "test-provider");
assert_eq!(metadata.preview.as_deref(), Some("optimize the benchmark"));
assert_eq!(
@@ -357,8 +344,7 @@ mod tests {
git: None,
}),
"test-provider",
)
.expect("rollout item should apply");
);
apply_rollout_item(
&mut metadata,
&RolloutItem::TurnContext(TurnContextItem {
@@ -387,8 +373,7 @@ mod tests {
summary: codex_protocol::config_types::ReasoningSummary::Auto,
}),
"test-provider",
)
.expect("rollout item should apply");
);
assert_eq!(metadata.cwd, PathBuf::from("/child/worktree"));
let permission_profile: PermissionProfile = PermissionProfile::Disabled;
@@ -432,8 +417,7 @@ mod tests {
summary: codex_protocol::config_types::ReasoningSummary::Auto,
}),
"test-provider",
)
.expect("rollout item should apply");
);
assert_eq!(
metadata.sandbox_policy,
@@ -473,8 +457,7 @@ mod tests {
summary: codex_protocol::config_types::ReasoningSummary::Auto,
}),
"test-provider",
)
.expect("rollout item should apply");
);
assert_eq!(metadata.cwd, fallback_cwd);
}
@@ -511,8 +494,7 @@ mod tests {
summary: codex_protocol::config_types::ReasoningSummary::Auto,
}),
"test-provider",
)
.expect("rollout item should apply");
);
assert_eq!(metadata.model.as_deref(), Some("gpt-5"));
assert_eq!(metadata.reasoning_effort, Some(ReasoningEffort::High));
@@ -548,8 +530,7 @@ mod tests {
git: None,
}),
"test-provider",
)
.expect("rollout item should apply");
);
assert_eq!(metadata.model, None);
assert_eq!(metadata.reasoning_effort, None);
codex-rs/state/src/runtime/threads.rs
+1 -1
View File
@@ -883,7 +883,7 @@ ON CONFLICT(id) DO UPDATE SET
.unwrap_or_else(|| builder.build(&self.default_provider));
metadata.rollout_path = builder.rollout_path.clone();
for item in items {
apply_rollout_item(&mut metadata, item, &self.default_provider)?;
apply_rollout_item(&mut metadata, item, &self.default_provider);
}
if let Some(existing_metadata) = existing_metadata.as_ref() {
metadata.prefer_existing_git_info(existing_metadata);