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

fix(context) include yolo on resume

Browse Source
This commit is contained in:
Dylan Hurd
2026-01-08 17:45:12 -08:00
parent 5b7707dfb1
commit 3e086b73b5
2 changed files with 99 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
codex-rs/core/src/codex.rs
View File

@@ -801,6 +801,7 @@ impl Session {
InitialHistory::Resumed(_) | InitialHistory::Forked(_) => {
let rollout_items = conversation_history.get_rollout_items();
let persist = matches!(conversation_history, InitialHistory::Forked(_));
let append_env_context = matches!(conversation_history, InitialHistory::Resumed(_));
// If resuming, warn when the last recorded model differs from the current one.
if let InitialHistory::Resumed(_) = conversation_history
@@ -845,6 +846,12 @@ impl Session {
state.set_token_info(Some(info));
}
if append_env_context {
let env_item = self.build_environment_context_item(&turn_context);
self.record_conversation_items(&turn_context, std::slice::from_ref(&env_item))
.await;
}
// If persisting, persist all rollout items as-is (recorder filters)
if persist && !rollout_items.is_empty() {
self.persist_rollout_items(&rollout_items).await;
@@ -1333,9 +1340,18 @@ impl Session {
}
}
fn build_environment_context_item(&self, turn_context: &TurnContext) -> ResponseItem {
let shell = self.user_shell();
ResponseItem::from(EnvironmentContext::new(
Some(turn_context.cwd.clone()),
Some(turn_context.approval_policy),
Some(turn_context.sandbox_policy.clone()),
shell.as_ref().clone(),
))
}
pub(crate) fn build_initial_context(&self, turn_context: &TurnContext) -> Vec<ResponseItem> {
let mut items = Vec::<ResponseItem>::with_capacity(3);
let shell = self.user_shell();
if let Some(developer_instructions) = turn_context.developer_instructions.as_deref() {
items.push(DeveloperInstructions::new(developer_instructions.to_string()).into());
}
@@ -1348,12 +1364,7 @@ impl Session {
.into(),
);
}
items.push(ResponseItem::from(EnvironmentContext::new(
Some(turn_context.cwd.clone()),
Some(turn_context.approval_policy),
Some(turn_context.sandbox_policy.clone()),
shell.as_ref().clone(),
)));
items.push(self.build_environment_context_item(turn_context));
items
}
@@ -2925,6 +2936,8 @@ mod tests {
async fn record_initial_history_reconstructs_resumed_transcript() {
let (session, turn_context) = make_session_and_context().await;
let (rollout_items, expected) = sample_rollout(&session, &turn_context);
let mut expected = expected;
expected.push(session.build_environment_context_item(&turn_context));
session
.record_initial_history(InitialHistory::Resumed(ResumedHistory {