openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-06 15:29:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(next-prompt): avoid persisting hidden usage

Browse Source
This commit is contained in:
Felipe Coury
2026-05-22 21:18:02 -03:00
parent 4e1dbe04f7
commit b7d7b5e9cd
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
codex-rs/core/src/next_prompt_suggestion.rs
View File

@@ -131,6 +131,7 @@ pub(crate) async fn suggest_next_prompt(
tokio::pin!(sample_deadline);
let completed_response_id = loop {
if !session_is_idle_for_suggestion(sess).await {
client_session.reset_websocket_session();
return Ok(None);
}
let Some(event) = (tokio::select! {
@@ -138,16 +139,19 @@ pub(crate) async fn suggest_next_prompt(
Ok(event) => event,
Err(codex_async_utils::CancelErr::Cancelled) => {
tracing::debug!("next prompt suggestion canceled while sampling");
client_session.reset_websocket_session();
return Ok(None);
}
},
_ = tokio::time::sleep(Duration::from_millis(100)) => continue,
_ = &mut sample_deadline => {
tracing::debug!("next prompt suggestion timed out while sampling");
client_session.reset_websocket_session();
return Ok(None);
},
}) else {
tracing::debug!("next prompt suggestion stream closed before completion");
client_session.reset_websocket_session();
return Ok(None);
};
let event = match event {
@@ -157,6 +161,7 @@ pub(crate) async fn suggest_next_prompt(
error = ?err,
"next prompt suggestion stream failed while sampling"
);
client_session.reset_websocket_session();
return Ok(None);
}
};
@@ -189,7 +194,7 @@ pub(crate) async fn suggest_next_prompt(
.await
.and_then(|item| item.turn_id)
{
sess.send_event_raw(Event {
sess.deliver_event_raw(Event {
id: turn_id,
msg: EventMsg::TokenCount(TokenCountEvent {
info: token_usage_info,

2
codex-rs/core/src/session/mod.rs
View File

@@ -1805,7 +1805,7 @@ impl Session {
self.deliver_event_raw(event).await;
}
async fn deliver_event_raw(&self, event: Event) {
pub(crate) async fn deliver_event_raw(&self, event: Event) {
// Record the last known agent status.
if let Some(status) = agent_status_from_event(&event.msg) {
self.agent_status.send_replace(status);