Skip to content

Fix thread entity brain split after container restart #17

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
lukemarsden merged 1 commit into from
Mar 4, 2026
Merged

Fix thread entity brain split after container restart #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions crates/agent_ui/src/agent_panel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,14 +805,20 @@ impl AgentPanel {
// focus_panel triggers set_active which creates a default thread
// if the view is Uninitialized — we need to set our view first
// to prevent that race.
// Check if current view is already for this thread
// Check if current view is already showing this exact thread entity.
// IMPORTANT: Compare Entity references, NOT session IDs. After a
// container restart, load_thread_from_agent() creates a NEW Entity
// for the same thread ID. If we only compare session IDs, the panel
// keeps observing the stale entity from state restoration while the
// new entity receives live updates — causing a "brain split" where
// Helix sees updates but Zed's display is frozen.
if let ActiveView::AgentThread { server_view } = &this.active_view {
if let Some(active_thread) = server_view.read(cx).active_thread() {
let existing_session_id = active_thread.read(cx).thread.read(cx).session_id().to_string();
if existing_session_id == incoming_session_id {
eprintln!("🔄 [AGENT_PANEL] Already showing thread {}, skipping", incoming_session_id);
if active_thread.read(cx).thread == notification.thread_entity {
eprintln!("🔄 [AGENT_PANEL] Already showing thread {} with same entity, skipping", incoming_session_id);
return;
}
eprintln!("🔄 [AGENT_PANEL] Thread {} entity changed (container restart?), rebinding to new entity", incoming_session_id);
}
}

Expand Down
Loading