mirror of
https://github.com/openai/codex.git
synced 2026-11-18 23:02:23 +00:00
Batch persistent history reads during reverse search (#33905)
## Why Reverse search fetched persistent history one entry at a time, making a deep or unsuccessful search require a lookup for every older entry. ## What changed - Keep the newest-entry probe lightweight, then scan older persistent history in bounded batches. - Cache batch results by absolute offset and preserve continuation cursors across repeated searches. - Ignore stale responses, retry failed batch reads a bounded number of times, and restore the draft without reporting a false “no match” state when history is unavailable. ## Testing - Cover batch continuation, caching after query changes or cancellation, stale metadata, retry exhaustion, and thread routing. - Verify that scanning 1,024 entries uses one single-entry lookup and eight batch lookups. GitOrigin-RevId: efc791fcbd5290050af703dd31c5c21b33240e23
This commit is contained in:
1 parent
025db22058
commit
7ed19a9758
13 files changed
+965
-107
No files matched your search
@@ -500,7 +500,7 @@ impl App {
|
||||
|
||||
app_event_tx.send(AppEvent::ThreadHistoryEntryResponse {
|
||||
thread_id,
|
||||
event: HistoryLookupResponse {
|
||||
event: HistoryLookupResponse::Entry {
|
||||
offset,
|
||||
log_id,
|
||||
entry: entry_opt.map(|entry| entry.text),
|
||||
@@ -510,6 +510,55 @@ impl App {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Fetch one bounded local cross-session history batch for the requesting thread.
|
||||
pub(super) async fn lookup_message_history_batch(
|
||||
&mut self,
|
||||
thread_id: ThreadId,
|
||||
cursor: codex_message_history::HistoryBatchCursor,
|
||||
log_id: u64,
|
||||
) -> Result<()> {
|
||||
let history_config = codex_message_history::HistoryConfig::new(
|
||||
self.chat_widget.config_ref().codex_home.clone(),
|
||||
&self.chat_widget.config_ref().history,
|
||||
);
|
||||
let app_event_tx = self.app_event_tx.clone();
|
||||
tokio::spawn(async move {
|
||||
let event = match tokio::task::spawn_blocking(move || {
|
||||
codex_message_history::lookup_batch(log_id, cursor, &history_config)
|
||||
})
|
||||
.await
|
||||
{
|
||||
Ok(Ok(batch)) => {
|
||||
let entries = batch
|
||||
.entries
|
||||
.into_iter()
|
||||
.map(|entry| crate::app_event::HistoryBatchEntryResponse {
|
||||
offset: entry.offset,
|
||||
entry: entry.entry.map(|entry| entry.text),
|
||||
})
|
||||
.collect();
|
||||
HistoryLookupResponse::Batch {
|
||||
cursor,
|
||||
log_id,
|
||||
entries,
|
||||
next_older_cursor: batch.next_older_cursor,
|
||||
}
|
||||
}
|
||||
Ok(Err(err)) => {
|
||||
tracing::warn!(error = %err, "history batch lookup failed");
|
||||
HistoryLookupResponse::BatchError { cursor, log_id }
|
||||
}
|
||||
Err(err) => {
|
||||
tracing::warn!(error = %err, "history batch lookup task failed");
|
||||
HistoryLookupResponse::BatchError { cursor, log_id }
|
||||
}
|
||||
};
|
||||
|
||||
app_event_tx.send(AppEvent::ThreadHistoryEntryResponse { thread_id, event });
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(super) async fn try_submit_active_thread_op_via_app_server(
|
||||
&mut self,
|
||||
app_server: &mut AppServerSession,
|
||||
@@ -1058,18 +1107,24 @@ impl App {
|
||||
|
||||
let should_send = {
|
||||
let mut guard = store.lock().await;
|
||||
guard
|
||||
.buffer
|
||||
.push_back(ThreadBufferedEvent::HistoryEntryResponse(event.clone()));
|
||||
if guard.buffer.len() > guard.capacity
|
||||
&& let Some(removed) = guard.buffer.pop_front()
|
||||
&& let ThreadBufferedEvent::Request(request) = &removed
|
||||
{
|
||||
let should_send = guard.active;
|
||||
// Active batch responses remain queued in the receiver across a concurrent detach, so
|
||||
// retaining another deep copy for thread replay only accumulates already-delivered
|
||||
// history data. Inactive responses still need the buffer because they are not sent.
|
||||
if !should_send || !matches!(&event, HistoryLookupResponse::Batch { .. }) {
|
||||
guard
|
||||
.pending_interactive_replay
|
||||
.note_evicted_server_request(request);
|
||||
.buffer
|
||||
.push_back(ThreadBufferedEvent::HistoryEntryResponse(event.clone()));
|
||||
if guard.buffer.len() > guard.capacity
|
||||
&& let Some(removed) = guard.buffer.pop_front()
|
||||
&& let ThreadBufferedEvent::Request(request) = &removed
|
||||
{
|
||||
guard
|
||||
.pending_interactive_replay
|
||||
.note_evicted_server_request(request);
|
||||
}
|
||||
}
|
||||
guard.active
|
||||
should_send
|
||||
};
|
||||
|
||||
if should_send {
|
||||
|
||||
Reference in new issue
Block a user