Skip to content

perf(desktop): coalesce streaming events and isolate session/workspace switches #3922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobleer merged 2 commits into from
Nov 15, 2026
+3,526 −650
Merged

perf(desktop): coalesce streaming events and isolate session/workspace switches #3922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a523b63
perf(desktop): coalesce streaming events and isolate session/workspac…
bobleer Nov 15, 2026
271f4ee
fix(flow-chat): harden batch event routing, session buffer lifecycle,…
bobleer Nov 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/apps/desktop/src/api/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,9 +821,10 @@ async fn clear_active_workspace_context(
state: &State<'_, AppState>,
app: &AppHandle,
startup_trace: Option<&DesktopStartupTrace>,
reset_menubar: bool,
) {
#[cfg(not(target_os = "macos"))]
let _ = app;
let _ = (app, reset_menubar);

let step_started = Instant::now();
let previous_workspace_id = state.workspace_id.write().await.take();
Expand Down Expand Up @@ -880,7 +881,7 @@ async fn clear_active_workspace_context(
}

#[cfg(target_os = "macos")]
{
if reset_menubar {
let step_started = Instant::now();
let language = state
.config_service
Expand Down Expand Up @@ -914,7 +915,7 @@ async fn apply_active_workspace_context(
let _ = app;

let step_started = Instant::now();
clear_active_workspace_context(state, app, startup_trace).await;
clear_active_workspace_context(state, app, startup_trace, false).await;
if let Some(trace) = startup_trace {
trace.record_elapsed_step(
"tauri_command",
Expand Down Expand Up @@ -1024,7 +1025,7 @@ async fn initialize_global_state_impl(
);
} else {
let step_started = Instant::now();
clear_active_workspace_context(state, app, Some(trace)).await;
clear_active_workspace_context(state, app, Some(trace), true).await;
trace.record_elapsed_step(
"tauri_command",
"initialize_global_state.clear_active_workspace_context",
Expand Down Expand Up @@ -1756,7 +1757,7 @@ pub async fn delete_assistant_workspace(
if let Some(current_workspace) = state.workspace_service.get_current_workspace().await {
apply_active_workspace_context(&state, &app, &current_workspace, None).await;
} else {
clear_active_workspace_context(&state, &app, None).await;
clear_active_workspace_context(&state, &app, None, true).await;
}

if let Err(e) = state
Expand Down Expand Up @@ -1967,7 +1968,7 @@ pub async fn close_workspace(
if let Some(workspace_info) = state.workspace_service.get_current_workspace().await {
apply_active_workspace_context(&state, &app, &workspace_info, None).await;
} else {
clear_active_workspace_context(&state, &app, None).await;
clear_active_workspace_context(&state, &app, None, true).await;
}

info!("Workspace closed: workspace_id={}", request.workspace_id);
Expand Down Expand Up @@ -2297,7 +2298,7 @@ async fn cleanup_invalid_workspaces_impl(
if let Some(workspace_info) = state.workspace_service.get_current_workspace().await {
apply_active_workspace_context(state, app, &workspace_info, None).await;
} else {
clear_active_workspace_context(state, app, None).await;
clear_active_workspace_context(state, app, None, true).await;
}
startup_trace.record_elapsed_step(
"tauri_command",
Expand Down
Loading
Loading