mirror of
https://github.com/openai/codex.git
synced 2026-11-18 22:20:48 +00:00
Stream partial thread search results and support cancellation (#62132)
## Why Clients using `thread/search` have to wait for the search to finish before they can show any matches. A search can also outlive the query that triggered it, such as when a user changes their task mention query. ## What changed - Add experimental `thread/search/stream` with best-effort `thread/search/partial` notifications. Each notification carries the original `requestId` and a batch of verified matches. Clients replace provisional matches with the final page, which determines results, ordering, and cursors. - Support connection-scoped cancellation through `thread/search/stream/cancel` and `thread/search/cancel` for their respective search methods. Disconnecting also stops active searches and reaps their search subprocesses. - Cancel superseded or timed-out TUI task mention searches without delaying available title matches. ## Testing Add coverage for incremental results and final-page parity, slow clients, connection-scoped cancellation and subprocess cleanup, and TUI task search cancellation. GitOrigin-RevId: b58abf7a1df424f191c8ede806d1d5266d299548
This commit is contained in:
committed by
copyberry
parent
c90234de95
commit
3bf4e138fe
@@ -213,6 +213,7 @@ pub(super) fn server_notification_thread_target(
|
||||
| ServerNotification::ExternalAgentConfigImportCompleted(_)
|
||||
| ServerNotification::DeprecationNotice(_)
|
||||
| ServerNotification::ConfigWarning(_)
|
||||
| ServerNotification::ThreadSearchPartial(_)
|
||||
| ServerNotification::FuzzyFileSearchSessionUpdated(_)
|
||||
| ServerNotification::FuzzyFileSearchSessionCompleted(_)
|
||||
| ServerNotification::CommandExecOutputDelta(_)
|
||||
|
||||
@@ -2115,6 +2115,7 @@ impl App {
|
||||
self.skill_load_warnings.startup_complete = true;
|
||||
}
|
||||
AppEvent::StartFileSearch(query) => {
|
||||
app_server.task_search.cancel();
|
||||
self.file_search.on_user_query(query.clone());
|
||||
if let Some(thread_id) = self.active_thread_id
|
||||
&& app_server.task_tools_available(thread_id)
|
||||
@@ -2130,12 +2131,12 @@ impl App {
|
||||
.map(std::path::Path::to_path_buf)
|
||||
})
|
||||
.unwrap_or_else(|| self.config.cwd.to_path_buf());
|
||||
crate::task_mentions::spawn_search(
|
||||
app_server.request_handle(),
|
||||
let handle = app_server.request_handle();
|
||||
app_server.task_search.spawn(
|
||||
handle,
|
||||
query,
|
||||
thread_id,
|
||||
cwd,
|
||||
app_server.task_search_generation(),
|
||||
self.app_event_tx.clone(),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -776,6 +776,7 @@ impl App {
|
||||
thread_id: ThreadId,
|
||||
selection: Selection,
|
||||
) -> Result<()> {
|
||||
app_server.task_search.cancel();
|
||||
let Selection {
|
||||
mode,
|
||||
cached_session,
|
||||
|
||||
@@ -2438,12 +2438,12 @@ async fn external_transport_registers_dynamic_tools_and_finds_task_mentions() ->
|
||||
.await?;
|
||||
let (sender, mut events) = tokio::sync::mpsc::unbounded_channel();
|
||||
|
||||
crate::task_mentions::spawn_search(
|
||||
restarted_app_server.request_handle(),
|
||||
let handle = restarted_app_server.request_handle();
|
||||
restarted_app_server.task_search.spawn(
|
||||
handle,
|
||||
"bbd".to_string(),
|
||||
startup.session.thread_id,
|
||||
app.config.cwd.to_path_buf(),
|
||||
restarted_app_server.task_search_generation(),
|
||||
crate::app_event_sender::AppEventSender::new(sender),
|
||||
);
|
||||
|
||||
|
||||
@@ -125,6 +125,7 @@ impl App {
|
||||
app_server: &mut AppServerSession,
|
||||
destination: Option<ThreadId>,
|
||||
) {
|
||||
app_server.task_search.cancel();
|
||||
let thread_ids: Vec<_> = self
|
||||
.thread_event_channels
|
||||
.iter()
|
||||
|
||||
Reference in New Issue
Block a user