Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

assistant2: Don't block ThreadStore initialization on reloading the threads (#23728)

Browse source 
This PR changes the `ThreadStore` constructor to not block on reloading
the threads before we finish initializing it.

This allows us to make the constructor synchronous instead of
asynchronous.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2025-01-27 12:59:28 -05:00 • committed by GitHub
parent 9705764892
commit f096a28a19
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 33 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/assistant2/src/assistant_panel.rs
View file

@ -119,12 +119,10 @@ impl AssistantPanel {
cx.spawn(|mut cx| async move {
let tools = Arc::new(ToolWorkingSet::default());
log::info!("[assistant2-debug] initializing ThreadStore");
let thread_store = workspace
.update(&mut cx, |workspace, cx| {
let thread_store = workspace.update(&mut cx, |workspace, cx| {
let project = workspace.project().clone();
ThreadStore::new(project, tools.clone(), cx)
})?
.await?;
})??;
log::info!("[assistant2-debug] finished initializing ThreadStore");
let slash_commands = Arc::new(SlashCommandWorkingSet::default());

16
crates/assistant2/src/thread_store.rs
View file

@ -34,11 +34,9 @@ impl ThreadStore {
project: Entity<Project>,
tools: Arc<ToolWorkingSet>,
cx: &mut App,
) -> Task<Result<Entity<Self>>> {
cx.spawn(|mut cx| async move {
let this = cx.new(|cx: &mut Context<Self>| {
let context_server_factory_registry =
ContextServerFactoryRegistry::default_global(cx);
) -> Result<Entity<Self>> {
let this = cx.new(|cx| {
let context_server_factory_registry = ContextServerFactoryRegistry::default_global(cx);
let context_server_manager = cx.new(|cx| {
ContextServerManager::new(context_server_factory_registry, project.clone(), cx)
});
@ -63,16 +61,12 @@ impl ThreadStore {
database_future,
};
this.register_context_server_handlers(cx);
this.reload(cx).detach_and_log_err(cx);
this
})?;
log::info!("[assistant2-debug] reloading threads");
this.update(&mut cx, |this, cx| this.reload(cx))?.await?;
log::info!("[assistant2-debug] finished reloading threads");
});
Ok(this)
})
}
/// Returns the number of threads.