openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-14 21:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
Roy Han
2026-03-19 13:59:01 -07:00
parent 80f3b3d1fe
commit 6c4176db18
5 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/core/src/codex.rs
+7 -23
View File
@@ -3947,14 +3947,7 @@ impl Session {
}
}
pub async fn prepend_pending_input(&self, input: Vec<ResponseInputItem>) -> Result<(), ()> {
self.prepend_pending_input_with_metadata(
input.into_iter().map(|item| (item, None)).collect(),
)
.await
}
async fn prepend_pending_input_with_metadata(
pub(crate) async fn prepend_pending_input_with_metadata(
&self,
input: Vec<(ResponseInputItem, Option<UserMessageType>)>,
) -> Result<(), ()> {
@@ -3965,10 +3958,12 @@ impl Session {
ts.prepend_pending_input(
input
.into_iter()
.map(|(input, user_message_type)| crate::state::PendingInputItem {
input,
user_message_type,
})
.map(
|(input, user_message_type)| crate::state::PendingInputItem {
input,
user_message_type,
},
)
.collect(),
);
Ok(())
@@ -3977,17 +3972,6 @@ impl Session {
}
}
pub async fn get_pending_input(&self) -> Vec<ResponseInputItem> {
let mut active = self.active_turn.lock().await;
match active.as_mut() {
Some(at) => {
let mut ts = at.turn_state.lock().await;
ts.take_pending_input()
}
None => Vec::with_capacity(0),
}
}
pub async fn has_pending_input(&self) -> bool {
let active = self.active_turn.lock().await;
match active.as_ref() {