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

Persist pre-turn updates before apps tool-list cancellation

Browse Source
This commit is contained in:
Charles Cunningham
2026-02-12 11:33:42 -08:00
parent e87455e284
commit 8d06dd5f8b
1 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4317,6 +4317,15 @@ pub(crate) async fn run_turn(
return None;
}
};
persist_pre_turn_items_for_compaction_outcome(
&sess,
&turn_context,
pre_turn_compaction_outcome,
&pre_turn_context_items,
&input,
response_item,
)
.await;
let skills_outcome = Some(
sess.services
@@ -4424,17 +4433,6 @@ pub(crate) async fn run_turn(
.track_app_mentioned(tracking.clone(), mentioned_app_invocations);
sess.merge_connector_selection(explicitly_enabled_connectors.clone())
.await;
persist_pre_turn_items_for_compaction_outcome(
&sess,
&turn_context,
pre_turn_compaction_outcome,
&pre_turn_context_items,
&input,
response_item,
)
.await;
if !skill_items.is_empty() {
sess.record_conversation_items(&turn_context, &skill_items)
.await;
@@ -6125,6 +6123,49 @@ mod tests {
assert_eq!(actual, Vec::<ResponseItem>::new());
}
#[tokio::test]
async fn run_turn_persists_pre_turn_context_before_apps_tool_listing_cancellation() {
let (session, mut turn_context) = make_session_and_context().await;
let session = Arc::new(session);
let mut config = (*turn_context.config).clone();
config.features.enable(Feature::Apps);
turn_context.features = config.features.clone();
turn_context.config = Arc::new(config);
let turn_context = Arc::new(turn_context);
let input = vec![UserInput::Text {
text: "hello".to_string(),
text_elements: Vec::new(),
}];
let response_item: ResponseItem = ResponseInputItem::from(input.clone()).into();
let pre_turn_context_items = vec![ResponseItem::Message {
id: None,
role: "developer".to_string(),
content: vec![ContentItem::InputText {
text: "model-visible setting diff".to_string(),
}],
end_turn: None,
phase: None,
}];
let cancellation_token = CancellationToken::new();
cancellation_token.cancel();
let result = run_turn(
Arc::clone(&session),
Arc::clone(&turn_context),
input,
pre_turn_context_items.clone(),
None,
cancellation_token,
)
.await;
assert_eq!(result, None);
let mut expected_history = pre_turn_context_items;
expected_history.push(response_item);
let actual_history = session.clone_history().await.raw_items().to_vec();
assert_eq!(actual_history, expected_history);
}
#[test]
fn estimate_user_input_token_count_is_positive_for_text_input() {
let input = vec![UserInput::Text {