openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-02 19:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid cloning rollout source during resume reconstruction

Browse Source 
Borrow the in-memory rollout source when reconstructing resumed history, tool selection, and token usage instead of cloning the full rollout into a second buffer during startup.

Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
Charles Cunningham
2026-03-10 15:37:54 -07:00
co-authored by Codex
parent 7363f87ac8
commit 59f4327e0c
1 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/core/src/codex.rs
+40 -15
View File
@@ -1950,20 +1950,45 @@ impl Session {
}
}
InitialHistory::Resumed(resumed_history) => {
let rollout_source = if resumed_history.history.is_empty() {
let rollout = self.services.rollout.lock().await;
match rollout.as_ref() {
Some(rollout) => rollout.source.lock().await.clone(),
None => InMemoryRolloutSource::new(Vec::new()),
}
} else {
InMemoryRolloutSource::new(resumed_history.history)
};
let restored_tool_selection =
Self::extract_mcp_tool_selection_from_rollout_source(&rollout_source);
let reconstructed_rollout =
self.reconstruct_history_from_rollout(&turn_context, &rollout_source);
let (reconstructed_rollout, restored_tool_selection, token_info) =
if resumed_history.history.is_empty() {
let rollout = self.services.rollout.lock().await;
match rollout.as_ref() {
Some(rollout) => {
let rollout_source = rollout.source.lock().await;
(
self.reconstruct_history_from_rollout(
&turn_context,
&rollout_source,
),
Self::extract_mcp_tool_selection_from_rollout_source(
&rollout_source,
),
Self::last_token_info_from_rollout_source(&rollout_source),
)
}
None => {
let rollout_source = InMemoryRolloutSource::new(Vec::new());
(
self.reconstruct_history_from_rollout(
&turn_context,
&rollout_source,
),
Self::extract_mcp_tool_selection_from_rollout_source(
&rollout_source,
),
Self::last_token_info_from_rollout_source(&rollout_source),
)
}
}
} else {
let rollout_source = InMemoryRolloutSource::new(resumed_history.history);
(
self.reconstruct_history_from_rollout(&turn_context, &rollout_source),
Self::extract_mcp_tool_selection_from_rollout_source(&rollout_source),
Self::last_token_info_from_rollout_source(&rollout_source),
)
};
let previous_turn_settings = reconstructed_rollout.previous_turn_settings.clone();
self.set_previous_turn_settings(previous_turn_settings.clone())
.await;
@@ -2001,7 +2026,7 @@ impl Session {
// Seed usage info from the recorded rollout so UIs can show token counts
// immediately on resume/fork.
if let Some(info) = Self::last_token_info_from_rollout_source(&rollout_source) {
if let Some(info) = token_info {
let mut state = self.state.lock().await;
state.set_token_info(Some(info));
}