feat(sidebar): animate flat thread reordering#296

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
Tryanks merged 1 commit into from
Aug 26, 2026
Merged

feat(sidebar): animate flat thread reordering #296

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
223 changes: 188 additions & 35 deletions crates/ui/src/sidebar.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,10 @@ use crate::{
sizing::Sizable as _,
};
use gpui::{
Action, AppContext as _, Context, Entity, InteractiveElement as _, IntoElement, ListAlignment,
ListState, ParentElement as _, Render, Role, StatefulInteractiveElement as _, Styled as _,
Subscription, Window, div, list, prelude::FluentBuilder as _, px,
Action, AnimationExt as _, AppContext as _, Context, Entity, InteractiveElement as _,
IntoElement, ListAlignment, ListState, ParentElement as _, Render, Role, SpringAnimation,
SpringConfig, StatefulInteractiveElement as _, Styled as _, Subscription, Window, div, list,
prelude::FluentBuilder as _, px,
};
use gpui_base::{StyledExt as _, h_flex, v_flex};
use serde::Deserialize;
Expand All@@ -44,6 +45,15 @@ const TRAFFIC_LIGHT_INSET: f32 = 8.;
/// Max threads shown per project group before the "Show more" row.
const THREADS_COLLAPSED_LIMIT: usize = 6;

/// Flat-list row geometry, including the 2px gap reserved below every row.
const FLAT_ROOT_ROW_HEIGHT: f32 = 50.;
const FLAT_CHILD_ROW_HEIGHT: f32 = 32.;

/// A critically damped spring keeps reordering legible without bouncing rows
/// past their destinations. GPUI also makes this snap to the target when the
/// operating system's reduced-motion preference is enabled.
const FLAT_REORDER_SPRING: SpringConfig = SpringConfig::new(420., 41., 1.);

/// Localized thread-list toggle, when the project has enough threads to need
/// one. Keeping the toggle present in both states is what lets an expanded list
/// be collapsed again.
Expand DownExpand Up@@ -272,6 +282,48 @@ fn flat_visible_threads<'a>(
.collect()
}

/// The target top edge for each visible flat-list row. These positions mirror
/// `render_flat_thread`: parent rows are 48px tall and child rows are 30px,
/// with another 2px of bottom spacing supplied by the list item wrapper.
fn flat_thread_top_offsets(visible: &[&SessionMeta], sessions: &[SessionMeta]) -> Vec<f32> {
let ids = sessions
.iter()
.map(|session| session.id.as_str())
.collect::<HashSet<_>>();
let mut top = 0.;

visible
.iter()
.map(|meta| {
let offset = top;
let is_child = meta
.parent_session_id
.as_deref()
.is_some_and(|parent_id| ids.contains(parent_id));
top += if is_child {
FLAT_CHILD_ROW_HEIGHT
} else {
FLAT_ROOT_ROW_HEIGHT
};
offset
})
.collect()
}

fn animate_flat_thread_position(
row: gpui::Div,
session_id: &str,
target_top: f32,
) -> impl IntoElement + use<> {
row.with_spring(
gpui::SharedString::from(format!("flat-thread-position-{session_id}")),
SpringAnimation::new(FLAT_REORDER_SPRING)
.to(px(target_top))
.with_epsilon(0.25),
move |row, animated_top| row.relative().top(animated_top - px(target_top)),
)
}

/// Startup fold state: every thread with visible direct children begins
/// collapsed, except the active thread and its ancestors so the restored
/// selection stays on screen (and, when it is itself a parent, open).
Expand DownExpand Up@@ -2224,7 +2276,12 @@ impl Render for SessionsSidebar {
.into_any_element();
(self.render_flat_header(cx).into_any_element(), thread_list)
} else {
let visible = visible.into_iter().cloned().collect::<Vec<_>>();
let top_offsets = flat_thread_top_offsets(&visible, &flat_sessions);
let visible = visible
.into_iter()
.cloned()
.zip(top_offsets)
.collect::<Vec<_>>();
if self.flat_list_state.item_count() != visible.len() {
self.flat_list_state.reset(visible.len());
}
Expand All@@ -2233,36 +2290,40 @@ impl Render for SessionsSidebar {
.map(|project| (project.id, project.name))
.collect::<HashMap<_, _>>();
let active_id = active_id.clone();
let thread_list = list(
self.flat_list_state.clone(),
cx.processor(move |this, index: usize, _window, cx| {
let Some(meta) = visible.get(index) else {
return div().into_any_element();
};
let project_name = meta
.project_id
.as_ref()
.and_then(|project_id| project_names.get(project_id))
.cloned();
let is_active = active_id.as_deref() == Some(meta.id.as_str());
div()
.w_full()
.px_2()
.pb(px(2.))
.child(this.render_flat_thread(
meta,
&flat_sessions,
&flags,
project_name,
is_active,
cx,
))
let thread_list =
list(
self.flat_list_state.clone(),
cx.processor(move |this, index: usize, _window, cx| {
let Some((meta, target_top)) = visible.get(index) else {
return div().into_any_element();
};
let target_top = *target_top;
let project_name = meta
.project_id
.as_ref()
.and_then(|project_id| project_names.get(project_id))
.cloned();
let is_active = active_id.as_deref() == Some(meta.id.as_str());
animate_flat_thread_position(
div().w_full().px_2().pb(px(2.)).child(
this.render_flat_thread(
meta,
&flat_sessions,
&flags,
project_name,
is_active,
cx,
),
),
&meta.id,
target_top,
)
.into_any_element()
}),
)
.flex_1()
.min_h_0()
.into_any_element();
}),
)
.flex_1()
.min_h_0()
.into_any_element();
(self.render_flat_header(cx).into_any_element(), thread_list)
}
}
Expand DownExpand Up@@ -2305,14 +2366,45 @@ impl Render for SessionsSidebar {
mod tests {
use super::*;
use agent::ProviderKind;
use gpui::{TestAppContext, VisualTestContext, size};
use std::path::PathBuf;
use gpui::{Pixels, TestAppContext, VisualTestContext, size};
use std::{cell::RefCell, path::PathBuf, rc::Rc};
use tcode_core::project::Project;
use tcode_runtime::pipe::{HostServices, spawn_host};
use tcode_services::store::SessionStore;

struct WorkingThreadRowProbe;

struct FlatReorderAnimationProbe {
reversed: bool,
positions: Rc<RefCell<HashMap<&'static str, Pixels>>>,
}

impl Render for FlatReorderAnimationProbe {
fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
let order = if self.reversed {
["second", "first"]
} else {
["first", "second"]
};
let positions = self.positions.clone();

v_flex().children(order.into_iter().enumerate().map(|(index, id)| {
let positions = positions.clone();
let target_top = index as f32 * FLAT_ROOT_ROW_HEIGHT;
div().h(px(FLAT_ROOT_ROW_HEIGHT)).with_spring(
gpui::SharedString::from(format!("flat-thread-position-{id}")),
SpringAnimation::new(FLAT_REORDER_SPRING)
.to(px(target_top))
.with_epsilon(0.25),
move |row, animated_top| {
positions.borrow_mut().insert(id, animated_top);
row.relative().top(animated_top - px(target_top))
},
)
}))
}
}

impl Render for WorkingThreadRowProbe {
fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
h_flex()
Expand DownExpand Up@@ -2389,6 +2481,36 @@ mod tests {
}
}

#[gpui::test]
fn flat_rows_start_reordering_from_their_previous_positions(cx: &mut TestAppContext) {
let positions = Rc::new(RefCell::new(HashMap::new()));
let window = cx.open_window(size(px(200.), px(200.)), {
let positions = positions.clone();
move |_, _| FlatReorderAnimationProbe {
reversed: false,
positions,
}
});
cx.run_until_parked();
assert_eq!(positions.borrow()["first"], px(0.));
assert_eq!(positions.borrow()["second"], px(FLAT_ROOT_ROW_HEIGHT));

window
.update(cx, |probe, _, cx| {
probe.reversed = true;
cx.notify();
})
.unwrap();
cx.run_until_parked();
assert_eq!(positions.borrow()["first"], px(0.));
assert_eq!(positions.borrow()["second"], px(FLAT_ROOT_ROW_HEIGHT));

let callbacks = window
.update(cx, |_, window, cx| window.simulate_next_frame(cx))
.unwrap();
assert!(callbacks > 0, "spring did not request an animation frame");
}

#[gpui::test]
fn canceling_inline_rename_discards_the_unsaved_title(cx: &mut TestAppContext) {
let root = std::env::temp_dir().join(format!(
Expand DownExpand Up@@ -2738,6 +2860,37 @@ mod tests {
);
}

#[test]
fn flat_row_offsets_follow_the_rendered_root_and_child_heights() {
let root_a = session("root-a", None);
let child_a = session("child-a", Some("root-a"));
let root_b = session("root-b", None);
let sessions = vec![root_a, child_a, root_b];
let visible = sessions.iter().collect::<Vec<_>>();

assert_eq!(
flat_thread_top_offsets(&visible, &sessions),
vec![
0.,
FLAT_ROOT_ROW_HEIGHT,
FLAT_ROOT_ROW_HEIGHT + FLAT_CHILD_ROW_HEIGHT
]
);
}

#[test]
fn flat_row_offsets_treat_orphaned_children_as_root_rows() {
let orphan = session("orphan", Some("missing-parent"));
let root = session("root", None);
let sessions = vec![orphan, root];
let visible = sessions.iter().collect::<Vec<_>>();

assert_eq!(
flat_thread_top_offsets(&visible, &sessions),
vec![0., FLAT_ROOT_ROW_HEIGHT]
);
}

#[test]
fn flat_block_attention_is_lifted_from_a_waiting_child() {
let mut lifted_root = session("lifted-root", None);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat(sidebar): animate flat thread reordering#296

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

Tryanks
merged 1 commit into

from

Aug 26, 2026
 Merged


feat(sidebar): animate flat thread reordering
#296
 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


223 changes: 188 additions & 35 deletions
crates/ui/src/sidebar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,10 @@ use crate::{
 sizing::Sizable as _,
};
use gpui::{
 Action, AppContext as _, Context, Entity, InteractiveElement as _, IntoElement, ListAlignment,
 ListState, ParentElement as _, Render, Role, StatefulInteractiveElement as _, Styled as _,
 Subscription, Window, div, list, prelude::FluentBuilder as _, px,
 Action, AnimationExt as _, AppContext as _, Context, Entity, InteractiveElement as _,
 IntoElement, ListAlignment, ListState, ParentElement as _, Render, Role, SpringAnimation,
 SpringConfig, StatefulInteractiveElement as _, Styled as _, Subscription, Window, div, list,
 prelude::FluentBuilder as _, px,
};
use gpui_base::{StyledExt as _, h_flex, v_flex};
use serde::Deserialize;
Expand All@@ -44,6 +45,15 @@ const TRAFFIC_LIGHT_INSET: f32 = 8.;
/// Max threads shown per project group before the "Show more" row.
const THREADS_COLLAPSED_LIMIT: usize = 6;

/// Flat-list row geometry, including the 2px gap reserved below every row.
const FLAT_ROOT_ROW_HEIGHT: f32 = 50.;
const FLAT_CHILD_ROW_HEIGHT: f32 = 32.;

/// A critically damped spring keeps reordering legible without bouncing rows
/// past their destinations. GPUI also makes this snap to the target when the
/// operating system's reduced-motion preference is enabled.
const FLAT_REORDER_SPRING: SpringConfig = SpringConfig::new(420., 41., 1.);

/// Localized thread-list toggle, when the project has enough threads to need
/// one. Keeping the toggle present in both states is what lets an expanded list
/// be collapsed again.
Expand DownExpand Up@@ -272,6 +282,48 @@ fn flat_visible_threads<'a>(
 .collect()
}

/// The target top edge for each visible flat-list row. These positions mirror
/// `render_flat_thread`: parent rows are 48px tall and child rows are 30px,
/// with another 2px of bottom spacing supplied by the list item wrapper.
fn flat_thread_top_offsets(visible: &[&SessionMeta], sessions: &[SessionMeta]) -> Vec<f32> {
 let ids = sessions
 .iter()
 .map(|session| session.id.as_str())
 .collect::<HashSet<_>>();
 let mut top = 0.;

 visible
 .iter()
 .map(|meta| {
 let offset = top;
 let is_child = meta
 .parent_session_id
 .as_deref()
 .is_some_and(|parent_id| ids.contains(parent_id));
 top += if is_child {
 FLAT_CHILD_ROW_HEIGHT
 } else {
 FLAT_ROOT_ROW_HEIGHT
 };
 offset
 })
 .collect()
}

fn animate_flat_thread_position(
 row: gpui::Div,
 session_id: &str,
 target_top: f32,
) -> impl IntoElement + use<> {
 row.with_spring(
 gpui::SharedString::from(format!("flat-thread-position-{session_id}")),
 SpringAnimation::new(FLAT_REORDER_SPRING)
 .to(px(target_top))
 .with_epsilon(0.25),
 move |row, animated_top| row.relative().top(animated_top - px(target_top)),
 )
}

/// Startup fold state: every thread with visible direct children begins
/// collapsed, except the active thread and its ancestors so the restored
/// selection stays on screen (and, when it is itself a parent, open).
Expand DownExpand Up@@ -2224,7 +2276,12 @@ impl Render for SessionsSidebar {
 .into_any_element();
 (self.render_flat_header(cx).into_any_element(), thread_list)
 } else {
 let visible = visible.into_iter().cloned().collect::<Vec<_>>();
 let top_offsets = flat_thread_top_offsets(&visible, &flat_sessions);
 let visible = visible
 .into_iter()
 .cloned()
 .zip(top_offsets)
 .collect::<Vec<_>>();
 if self.flat_list_state.item_count() != visible.len() {
 self.flat_list_state.reset(visible.len());
 }
Expand All@@ -2233,36 +2290,40 @@ impl Render for SessionsSidebar {
 .map(|project| (project.id, project.name))
 .collect::<HashMap<_, _>>();
 let active_id = active_id.clone();
 let thread_list = list(
 self.flat_list_state.clone(),
 cx.processor(move |this, index: usize, _window, cx| {
 let Some(meta) = visible.get(index) else {
 return div().into_any_element();
 };
 let project_name = meta
 .project_id
 .as_ref()
 .and_then(|project_id| project_names.get(project_id))
 .cloned();
 let is_active = active_id.as_deref() == Some(meta.id.as_str());
 div()
 .w_full()
 .px_2()
 .pb(px(2.))
 .child(this.render_flat_thread(
 meta,
 &flat_sessions,
 &flags,
 project_name,
 is_active,
 cx,
 ))
 let thread_list =
 list(
 self.flat_list_state.clone(),
 cx.processor(move |this, index: usize, _window, cx| {
 let Some((meta, target_top)) = visible.get(index) else {
 return div().into_any_element();
 };
 let target_top = *target_top;
 let project_name = meta
 .project_id
 .as_ref()
 .and_then(|project_id| project_names.get(project_id))
 .cloned();
 let is_active = active_id.as_deref() == Some(meta.id.as_str());
 animate_flat_thread_position(
 div().w_full().px_2().pb(px(2.)).child(
 this.render_flat_thread(
 meta,
 &flat_sessions,
 &flags,
 project_name,
 is_active,
 cx,
 ),
 ),
 &meta.id,
 target_top,
 )
 .into_any_element()
 }),
 )
 .flex_1()
 .min_h_0()
 .into_any_element();
}),
)
.flex_1()
.min_h_0()
.into_any_element();
 (self.render_flat_header(cx).into_any_element(), thread_list)
 }
 }
Expand DownExpand Up@@ -2305,14 +2366,45 @@ impl Render for SessionsSidebar {
mod tests {
 use super::*;
 use agent::ProviderKind;
 use gpui::{TestAppContext, VisualTestContext, size};
 use std::path::PathBuf;
 use gpui::{Pixels, TestAppContext, VisualTestContext, size};
 use std::{cell::RefCell, path::PathBuf, rc::Rc};
 use tcode_core::project::Project;
 use tcode_runtime::pipe::{HostServices, spawn_host};
 use tcode_services::store::SessionStore;

 struct WorkingThreadRowProbe;

 struct FlatReorderAnimationProbe {
 reversed: bool,
 positions: Rc<RefCell<HashMap<&'static str, Pixels>>>,
 }

 impl Render for FlatReorderAnimationProbe {
 fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
 let order = if self.reversed {
 ["second", "first"]
 } else {
 ["first", "second"]
 };
 let positions = self.positions.clone();

 v_flex().children(order.into_iter().enumerate().map(|(index, id)| {
 let positions = positions.clone();
 let target_top = index as f32 * FLAT_ROOT_ROW_HEIGHT;
 div().h(px(FLAT_ROOT_ROW_HEIGHT)).with_spring(
 gpui::SharedString::from(format!("flat-thread-position-{id}")),
 SpringAnimation::new(FLAT_REORDER_SPRING)
 .to(px(target_top))
 .with_epsilon(0.25),
 move |row, animated_top| {
 positions.borrow_mut().insert(id, animated_top);
 row.relative().top(animated_top - px(target_top))
 },
 )
 }))
 }
 }

 impl Render for WorkingThreadRowProbe {
 fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
 h_flex()
Expand DownExpand Up@@ -2389,6 +2481,36 @@ mod tests {
 }
 }

 #[gpui::test]
 fn flat_rows_start_reordering_from_their_previous_positions(cx: &mut TestAppContext) {
 let positions = Rc::new(RefCell::new(HashMap::new()));
 let window = cx.open_window(size(px(200.), px(200.)), {
 let positions = positions.clone();
 move |_, _| FlatReorderAnimationProbe {
 reversed: false,
 positions,
 }
 });
 cx.run_until_parked();
 assert_eq!(positions.borrow()["first"], px(0.));
 assert_eq!(positions.borrow()["second"], px(FLAT_ROOT_ROW_HEIGHT));

 window
 .update(cx, |probe, _, cx| {
 probe.reversed = true;
 cx.notify();
 })
 .unwrap();
 cx.run_until_parked();
 assert_eq!(positions.borrow()["first"], px(0.));
 assert_eq!(positions.borrow()["second"], px(FLAT_ROOT_ROW_HEIGHT));

 let callbacks = window
 .update(cx, |_, window, cx| window.simulate_next_frame(cx))
 .unwrap();
 assert!(callbacks > 0, "spring did not request an animation frame");
 }

 #[gpui::test]
 fn canceling_inline_rename_discards_the_unsaved_title(cx: &mut TestAppContext) {
 let root = std::env::temp_dir().join(format!(
Expand DownExpand Up@@ -2738,6 +2860,37 @@ mod tests {
 );
 }

 #[test]
 fn flat_row_offsets_follow_the_rendered_root_and_child_heights() {
 let root_a = session("root-a", None);
 let child_a = session("child-a", Some("root-a"));
 let root_b = session("root-b", None);
 let sessions = vec![root_a, child_a, root_b];
 let visible = sessions.iter().collect::<Vec<_>>();

 assert_eq!(
 flat_thread_top_offsets(&visible, &sessions),
 vec![
 0.,
 FLAT_ROOT_ROW_HEIGHT,
 FLAT_ROOT_ROW_HEIGHT + FLAT_CHILD_ROW_HEIGHT
 ]
 );
 }

 #[test]
 fn flat_row_offsets_treat_orphaned_children_as_root_rows() {
 let orphan = session("orphan", Some("missing-parent"));
 let root = session("root", None);
 let sessions = vec![orphan, root];
 let visible = sessions.iter().collect::<Vec<_>>();

 assert_eq!(
 flat_thread_top_offsets(&visible, &sessions),
 vec![0., FLAT_ROOT_ROW_HEIGHT]
 );
 }

 #[test]
 fn flat_block_attention_is_lifted_from_a_waiting_child() {
 let mut lifted_root = session("lifted-root", None);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(sidebar): animate flat thread reordering#296

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

Tryanks
merged 1 commit into

from

Aug 26, 2026
 Merged


feat(sidebar): animate flat thread reordering
#296
 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


223 changes: 188 additions & 35 deletions
crates/ui/src/sidebar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,10 @@ use crate::{
 sizing::Sizable as _,
};
use gpui::{
 Action, AppContext as _, Context, Entity, InteractiveElement as _, IntoElement, ListAlignment,
 ListState, ParentElement as _, Render, Role, StatefulInteractiveElement as _, Styled as _,
 Subscription, Window, div, list, prelude::FluentBuilder as _, px,
 Action, AnimationExt as _, AppContext as _, Context, Entity, InteractiveElement as _,
 IntoElement, ListAlignment, ListState, ParentElement as _, Render, Role, SpringAnimation,
 SpringConfig, StatefulInteractiveElement as _, Styled as _, Subscription, Window, div, list,
 prelude::FluentBuilder as _, px,
};
use gpui_base::{StyledExt as _, h_flex, v_flex};
use serde::Deserialize;
Expand All@@ -44,6 +45,15 @@ const TRAFFIC_LIGHT_INSET: f32 = 8.;
/// Max threads shown per project group before the "Show more" row.
const THREADS_COLLAPSED_LIMIT: usize = 6;

/// Flat-list row geometry, including the 2px gap reserved below every row.
const FLAT_ROOT_ROW_HEIGHT: f32 = 50.;
const FLAT_CHILD_ROW_HEIGHT: f32 = 32.;

/// A critically damped spring keeps reordering legible without bouncing rows
/// past their destinations. GPUI also makes this snap to the target when the
/// operating system's reduced-motion preference is enabled.
const FLAT_REORDER_SPRING: SpringConfig = SpringConfig::new(420., 41., 1.);

/// Localized thread-list toggle, when the project has enough threads to need
/// one. Keeping the toggle present in both states is what lets an expanded list
/// be collapsed again.
Expand DownExpand Up@@ -272,6 +282,48 @@ fn flat_visible_threads<'a>(
 .collect()
}

/// The target top edge for each visible flat-list row. These positions mirror
/// `render_flat_thread`: parent rows are 48px tall and child rows are 30px,
/// with another 2px of bottom spacing supplied by the list item wrapper.
fn flat_thread_top_offsets(visible: &[&SessionMeta], sessions: &[SessionMeta]) -> Vec<f32> {
 let ids = sessions
 .iter()
 .map(|session| session.id.as_str())
 .collect::<HashSet<_>>();
 let mut top = 0.;

 visible
 .iter()
 .map(|meta| {
 let offset = top;
 let is_child = meta
 .parent_session_id
 .as_deref()
 .is_some_and(|parent_id| ids.contains(parent_id));
 top += if is_child {
 FLAT_CHILD_ROW_HEIGHT
 } else {
 FLAT_ROOT_ROW_HEIGHT
 };
 offset
 })
 .collect()
}

fn animate_flat_thread_position(
 row: gpui::Div,
 session_id: &str,
 target_top: f32,
) -> impl IntoElement + use<> {
 row.with_spring(
 gpui::SharedString::from(format!("flat-thread-position-{session_id}")),
 SpringAnimation::new(FLAT_REORDER_SPRING)
 .to(px(target_top))
 .with_epsilon(0.25),
 move |row, animated_top| row.relative().top(animated_top - px(target_top)),
 )
}

/// Startup fold state: every thread with visible direct children begins
/// collapsed, except the active thread and its ancestors so the restored
/// selection stays on screen (and, when it is itself a parent, open).
Expand DownExpand Up@@ -2224,7 +2276,12 @@ impl Render for SessionsSidebar {
 .into_any_element();
 (self.render_flat_header(cx).into_any_element(), thread_list)
 } else {
 let visible = visible.into_iter().cloned().collect::<Vec<_>>();
 let top_offsets = flat_thread_top_offsets(&visible, &flat_sessions);
 let visible = visible
 .into_iter()
 .cloned()
 .zip(top_offsets)
 .collect::<Vec<_>>();
 if self.flat_list_state.item_count() != visible.len() {
 self.flat_list_state.reset(visible.len());
 }
Expand All@@ -2233,36 +2290,40 @@ impl Render for SessionsSidebar {
 .map(|project| (project.id, project.name))
 .collect::<HashMap<_, _>>();
 let active_id = active_id.clone();
 let thread_list = list(
 self.flat_list_state.clone(),
 cx.processor(move |this, index: usize, _window, cx| {
 let Some(meta) = visible.get(index) else {
 return div().into_any_element();
 };
 let project_name = meta
 .project_id
 .as_ref()
 .and_then(|project_id| project_names.get(project_id))
 .cloned();
 let is_active = active_id.as_deref() == Some(meta.id.as_str());
 div()
 .w_full()
 .px_2()
 .pb(px(2.))
 .child(this.render_flat_thread(
 meta,
 &flat_sessions,
 &flags,
 project_name,
 is_active,
 cx,
 ))
 let thread_list =
 list(
 self.flat_list_state.clone(),
 cx.processor(move |this, index: usize, _window, cx| {
 let Some((meta, target_top)) = visible.get(index) else {
 return div().into_any_element();
 };
 let target_top = *target_top;
 let project_name = meta
 .project_id
 .as_ref()
 .and_then(|project_id| project_names.get(project_id))
 .cloned();
 let is_active = active_id.as_deref() == Some(meta.id.as_str());
 animate_flat_thread_position(
 div().w_full().px_2().pb(px(2.)).child(
 this.render_flat_thread(
 meta,
 &flat_sessions,
 &flags,
 project_name,
 is_active,
 cx,
 ),
 ),
 &meta.id,
 target_top,
 )
 .into_any_element()
 }),
 )
 .flex_1()
 .min_h_0()
 .into_any_element();
}),
)
.flex_1()
.min_h_0()
.into_any_element();
 (self.render_flat_header(cx).into_any_element(), thread_list)
 }
 }
Expand DownExpand Up@@ -2305,14 +2366,45 @@ impl Render for SessionsSidebar {
mod tests {
 use super::*;
 use agent::ProviderKind;
 use gpui::{TestAppContext, VisualTestContext, size};
 use std::path::PathBuf;
 use gpui::{Pixels, TestAppContext, VisualTestContext, size};
 use std::{cell::RefCell, path::PathBuf, rc::Rc};
 use tcode_core::project::Project;
 use tcode_runtime::pipe::{HostServices, spawn_host};
 use tcode_services::store::SessionStore;

 struct WorkingThreadRowProbe;

 struct FlatReorderAnimationProbe {
 reversed: bool,
 positions: Rc<RefCell<HashMap<&'static str, Pixels>>>,
 }

 impl Render for FlatReorderAnimationProbe {
 fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
 let order = if self.reversed {
 ["second", "first"]
 } else {
 ["first", "second"]
 };
 let positions = self.positions.clone();

 v_flex().children(order.into_iter().enumerate().map(|(index, id)| {
 let positions = positions.clone();
 let target_top = index as f32 * FLAT_ROOT_ROW_HEIGHT;
 div().h(px(FLAT_ROOT_ROW_HEIGHT)).with_spring(
 gpui::SharedString::from(format!("flat-thread-position-{id}")),
 SpringAnimation::new(FLAT_REORDER_SPRING)
 .to(px(target_top))
 .with_epsilon(0.25),
 move |row, animated_top| {
 positions.borrow_mut().insert(id, animated_top);
 row.relative().top(animated_top - px(target_top))
 },
 )
 }))
 }
 }

 impl Render for WorkingThreadRowProbe {
 fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
 h_flex()
Expand DownExpand Up@@ -2389,6 +2481,36 @@ mod tests {
 }
 }

 #[gpui::test]
 fn flat_rows_start_reordering_from_their_previous_positions(cx: &mut TestAppContext) {
 let positions = Rc::new(RefCell::new(HashMap::new()));
 let window = cx.open_window(size(px(200.), px(200.)), {
 let positions = positions.clone();
 move |_, _| FlatReorderAnimationProbe {
 reversed: false,
 positions,
 }
 });
 cx.run_until_parked();
 assert_eq!(positions.borrow()["first"], px(0.));
 assert_eq!(positions.borrow()["second"], px(FLAT_ROOT_ROW_HEIGHT));

 window
 .update(cx, |probe, _, cx| {
 probe.reversed = true;
 cx.notify();
 })
 .unwrap();
 cx.run_until_parked();
 assert_eq!(positions.borrow()["first"], px(0.));
 assert_eq!(positions.borrow()["second"], px(FLAT_ROOT_ROW_HEIGHT));

 let callbacks = window
 .update(cx, |_, window, cx| window.simulate_next_frame(cx))
 .unwrap();
 assert!(callbacks > 0, "spring did not request an animation frame");
 }

 #[gpui::test]
 fn canceling_inline_rename_discards_the_unsaved_title(cx: &mut TestAppContext) {
 let root = std::env::temp_dir().join(format!(
Expand DownExpand Up@@ -2738,6 +2860,37 @@ mod tests {
 );
 }

 #[test]
 fn flat_row_offsets_follow_the_rendered_root_and_child_heights() {
 let root_a = session("root-a", None);
 let child_a = session("child-a", Some("root-a"));
 let root_b = session("root-b", None);
 let sessions = vec![root_a, child_a, root_b];
 let visible = sessions.iter().collect::<Vec<_>>();

 assert_eq!(
 flat_thread_top_offsets(&visible, &sessions),
 vec![
 0.,
 FLAT_ROOT_ROW_HEIGHT,
 FLAT_ROOT_ROW_HEIGHT + FLAT_CHILD_ROW_HEIGHT
 ]
 );
 }

 #[test]
 fn flat_row_offsets_treat_orphaned_children_as_root_rows() {
 let orphan = session("orphan", Some("missing-parent"));
 let root = session("root", None);
 let sessions = vec![orphan, root];
 let visible = sessions.iter().collect::<Vec<_>>();

 assert_eq!(
 flat_thread_top_offsets(&visible, &sessions),
 vec![0., FLAT_ROOT_ROW_HEIGHT]
 );
 }

 #[test]
 fn flat_block_attention_is_lifted_from_a_waiting_child() {
 let mut lifted_root = session("lifted-root", None);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(sidebar): animate flat thread reordering#296

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

Tryanks
merged 1 commit into

from

Aug 26, 2026
 Merged


feat(sidebar): animate flat thread reordering
#296
 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


223 changes: 188 additions & 35 deletions
crates/ui/src/sidebar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,10 @@ use crate::{
 sizing::Sizable as _,
};
use gpui::{
 Action, AppContext as _, Context, Entity, InteractiveElement as _, IntoElement, ListAlignment,
 ListState, ParentElement as _, Render, Role, StatefulInteractiveElement as _, Styled as _,
 Subscription, Window, div, list, prelude::FluentBuilder as _, px,
 Action, AnimationExt as _, AppContext as _, Context, Entity, InteractiveElement as _,
 IntoElement, ListAlignment, ListState, ParentElement as _, Render, Role, SpringAnimation,
 SpringConfig, StatefulInteractiveElement as _, Styled as _, Subscription, Window, div, list,
 prelude::FluentBuilder as _, px,
};
use gpui_base::{StyledExt as _, h_flex, v_flex};
use serde::Deserialize;
Expand All@@ -44,6 +45,15 @@ const TRAFFIC_LIGHT_INSET: f32 = 8.;
/// Max threads shown per project group before the "Show more" row.
const THREADS_COLLAPSED_LIMIT: usize = 6;

/// Flat-list row geometry, including the 2px gap reserved below every row.
const FLAT_ROOT_ROW_HEIGHT: f32 = 50.;
const FLAT_CHILD_ROW_HEIGHT: f32 = 32.;

/// A critically damped spring keeps reordering legible without bouncing rows
/// past their destinations. GPUI also makes this snap to the target when the
/// operating system's reduced-motion preference is enabled.
const FLAT_REORDER_SPRING: SpringConfig = SpringConfig::new(420., 41., 1.);

/// Localized thread-list toggle, when the project has enough threads to need
/// one. Keeping the toggle present in both states is what lets an expanded list
/// be collapsed again.
Expand DownExpand Up@@ -272,6 +282,48 @@ fn flat_visible_threads<'a>(
 .collect()
}

/// The target top edge for each visible flat-list row. These positions mirror
/// `render_flat_thread`: parent rows are 48px tall and child rows are 30px,
/// with another 2px of bottom spacing supplied by the list item wrapper.
fn flat_thread_top_offsets(visible: &[&SessionMeta], sessions: &[SessionMeta]) -> Vec<f32> {
 let ids = sessions
 .iter()
 .map(|session| session.id.as_str())
 .collect::<HashSet<_>>();
 let mut top = 0.;

 visible
 .iter()
 .map(|meta| {
 let offset = top;
 let is_child = meta
 .parent_session_id
 .as_deref()
 .is_some_and(|parent_id| ids.contains(parent_id));
 top += if is_child {
 FLAT_CHILD_ROW_HEIGHT
 } else {
 FLAT_ROOT_ROW_HEIGHT
 };
 offset
 })
 .collect()
}

fn animate_flat_thread_position(
 row: gpui::Div,
 session_id: &str,
 target_top: f32,
) -> impl IntoElement + use<> {
 row.with_spring(
 gpui::SharedString::from(format!("flat-thread-position-{session_id}")),
 SpringAnimation::new(FLAT_REORDER_SPRING)
 .to(px(target_top))
 .with_epsilon(0.25),
 move |row, animated_top| row.relative().top(animated_top - px(target_top)),
 )
}

/// Startup fold state: every thread with visible direct children begins
/// collapsed, except the active thread and its ancestors so the restored
/// selection stays on screen (and, when it is itself a parent, open).
Expand DownExpand Up@@ -2224,7 +2276,12 @@ impl Render for SessionsSidebar {
 .into_any_element();
 (self.render_flat_header(cx).into_any_element(), thread_list)
 } else {
 let visible = visible.into_iter().cloned().collect::<Vec<_>>();
 let top_offsets = flat_thread_top_offsets(&visible, &flat_sessions);
 let visible = visible
 .into_iter()
 .cloned()
 .zip(top_offsets)
 .collect::<Vec<_>>();
 if self.flat_list_state.item_count() != visible.len() {
 self.flat_list_state.reset(visible.len());
 }
Expand All@@ -2233,36 +2290,40 @@ impl Render for SessionsSidebar {
 .map(|project| (project.id, project.name))
 .collect::<HashMap<_, _>>();
 let active_id = active_id.clone();
 let thread_list = list(
 self.flat_list_state.clone(),
 cx.processor(move |this, index: usize, _window, cx| {
 let Some(meta) = visible.get(index) else {
 return div().into_any_element();
 };
 let project_name = meta
 .project_id
 .as_ref()
 .and_then(|project_id| project_names.get(project_id))
 .cloned();
 let is_active = active_id.as_deref() == Some(meta.id.as_str());
 div()
 .w_full()
 .px_2()
 .pb(px(2.))
 .child(this.render_flat_thread(
 meta,
 &flat_sessions,
 &flags,
 project_name,
 is_active,
 cx,
 ))
 let thread_list =
 list(
 self.flat_list_state.clone(),
 cx.processor(move |this, index: usize, _window, cx| {
 let Some((meta, target_top)) = visible.get(index) else {
 return div().into_any_element();
 };
 let target_top = *target_top;
 let project_name = meta
 .project_id
 .as_ref()
 .and_then(|project_id| project_names.get(project_id))
 .cloned();
 let is_active = active_id.as_deref() == Some(meta.id.as_str());
 animate_flat_thread_position(
 div().w_full().px_2().pb(px(2.)).child(
 this.render_flat_thread(
 meta,
 &flat_sessions,
 &flags,
 project_name,
 is_active,
 cx,
 ),
 ),
 &meta.id,
 target_top,
 )
 .into_any_element()
 }),
 )
 .flex_1()
 .min_h_0()
 .into_any_element();
}),
)
.flex_1()
.min_h_0()
.into_any_element();
 (self.render_flat_header(cx).into_any_element(), thread_list)
 }
 }
Expand DownExpand Up@@ -2305,14 +2366,45 @@ impl Render for SessionsSidebar {
mod tests {
 use super::*;
 use agent::ProviderKind;
 use gpui::{TestAppContext, VisualTestContext, size};
 use std::path::PathBuf;
 use gpui::{Pixels, TestAppContext, VisualTestContext, size};
 use std::{cell::RefCell, path::PathBuf, rc::Rc};
 use tcode_core::project::Project;
 use tcode_runtime::pipe::{HostServices, spawn_host};
 use tcode_services::store::SessionStore;

 struct WorkingThreadRowProbe;

 struct FlatReorderAnimationProbe {
 reversed: bool,
 positions: Rc<RefCell<HashMap<&'static str, Pixels>>>,
 }

 impl Render for FlatReorderAnimationProbe {
 fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
 let order = if self.reversed {
 ["second", "first"]
 } else {
 ["first", "second"]
 };
 let positions = self.positions.clone();

 v_flex().children(order.into_iter().enumerate().map(|(index, id)| {
 let positions = positions.clone();
 let target_top = index as f32 * FLAT_ROOT_ROW_HEIGHT;
 div().h(px(FLAT_ROOT_ROW_HEIGHT)).with_spring(
 gpui::SharedString::from(format!("flat-thread-position-{id}")),
 SpringAnimation::new(FLAT_REORDER_SPRING)
 .to(px(target_top))
 .with_epsilon(0.25),
 move |row, animated_top| {
 positions.borrow_mut().insert(id, animated_top);
 row.relative().top(animated_top - px(target_top))
 },
 )
 }))
 }
 }

 impl Render for WorkingThreadRowProbe {
 fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
 h_flex()
Expand DownExpand Up@@ -2389,6 +2481,36 @@ mod tests {
 }
 }

 #[gpui::test]
 fn flat_rows_start_reordering_from_their_previous_positions(cx: &mut TestAppContext) {
 let positions = Rc::new(RefCell::new(HashMap::new()));
 let window = cx.open_window(size(px(200.), px(200.)), {
 let positions = positions.clone();
 move |_, _| FlatReorderAnimationProbe {
 reversed: false,
 positions,
 }
 });
 cx.run_until_parked();
 assert_eq!(positions.borrow()["first"], px(0.));
 assert_eq!(positions.borrow()["second"], px(FLAT_ROOT_ROW_HEIGHT));

 window
 .update(cx, |probe, _, cx| {
 probe.reversed = true;
 cx.notify();
 })
 .unwrap();
 cx.run_until_parked();
 assert_eq!(positions.borrow()["first"], px(0.));
 assert_eq!(positions.borrow()["second"], px(FLAT_ROOT_ROW_HEIGHT));

 let callbacks = window
 .update(cx, |_, window, cx| window.simulate_next_frame(cx))
 .unwrap();
 assert!(callbacks > 0, "spring did not request an animation frame");
 }

 #[gpui::test]
 fn canceling_inline_rename_discards_the_unsaved_title(cx: &mut TestAppContext) {
 let root = std::env::temp_dir().join(format!(
Expand DownExpand Up@@ -2738,6 +2860,37 @@ mod tests {
 );
 }

 #[test]
 fn flat_row_offsets_follow_the_rendered_root_and_child_heights() {
 let root_a = session("root-a", None);
 let child_a = session("child-a", Some("root-a"));
 let root_b = session("root-b", None);
 let sessions = vec![root_a, child_a, root_b];
 let visible = sessions.iter().collect::<Vec<_>>();

 assert_eq!(
 flat_thread_top_offsets(&visible, &sessions),
 vec![
 0.,
 FLAT_ROOT_ROW_HEIGHT,
 FLAT_ROOT_ROW_HEIGHT + FLAT_CHILD_ROW_HEIGHT
 ]
 );
 }

 #[test]
 fn flat_row_offsets_treat_orphaned_children_as_root_rows() {
 let orphan = session("orphan", Some("missing-parent"));
 let root = session("root", None);
 let sessions = vec![orphan, root];
 let visible = sessions.iter().collect::<Vec<_>>();

 assert_eq!(
 flat_thread_top_offsets(&visible, &sessions),
 vec![0., FLAT_ROOT_ROW_HEIGHT]
 );
 }

 #[test]
 fn flat_block_attention_is_lifted_from_a_waiting_child() {
 let mut lifted_root = session("lifted-root", None);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat(sidebar): animate flat thread reordering#296

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

Tryanks
merged 1 commit into

from

Aug 26, 2026
 Merged


feat(sidebar): animate flat thread reordering
#296
 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


223 changes: 188 additions & 35 deletions
crates/ui/src/sidebar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,10 @@ use crate::{
 sizing::Sizable as _,
};
use gpui::{
 Action, AppContext as _, Context, Entity, InteractiveElement as _, IntoElement, ListAlignment,
 ListState, ParentElement as _, Render, Role, StatefulInteractiveElement as _, Styled as _,
 Subscription, Window, div, list, prelude::FluentBuilder as _, px,
 Action, AnimationExt as _, AppContext as _, Context, Entity, InteractiveElement as _,
 IntoElement, ListAlignment, ListState, ParentElement as _, Render, Role, SpringAnimation,
 SpringConfig, StatefulInteractiveElement as _, Styled as _, Subscription, Window, div, list,
 prelude::FluentBuilder as _, px,
};
use gpui_base::{StyledExt as _, h_flex, v_flex};
use serde::Deserialize;
Expand All@@ -44,6 +45,15 @@ const TRAFFIC_LIGHT_INSET: f32 = 8.;
/// Max threads shown per project group before the "Show more" row.
const THREADS_COLLAPSED_LIMIT: usize = 6;

/// Flat-list row geometry, including the 2px gap reserved below every row.
const FLAT_ROOT_ROW_HEIGHT: f32 = 50.;
const FLAT_CHILD_ROW_HEIGHT: f32 = 32.;

/// A critically damped spring keeps reordering legible without bouncing rows
/// past their destinations. GPUI also makes this snap to the target when the
/// operating system's reduced-motion preference is enabled.
const FLAT_REORDER_SPRING: SpringConfig = SpringConfig::new(420., 41., 1.);

/// Localized thread-list toggle, when the project has enough threads to need
/// one. Keeping the toggle present in both states is what lets an expanded list
/// be collapsed again.
Expand DownExpand Up@@ -272,6 +282,48 @@ fn flat_visible_threads<'a>(
 .collect()
}

/// The target top edge for each visible flat-list row. These positions mirror
/// `render_flat_thread`: parent rows are 48px tall and child rows are 30px,
/// with another 2px of bottom spacing supplied by the list item wrapper.
fn flat_thread_top_offsets(visible: &[&SessionMeta], sessions: &[SessionMeta]) -> Vec<f32> {
 let ids = sessions
 .iter()
 .map(|session| session.id.as_str())
 .collect::<HashSet<_>>();
 let mut top = 0.;

 visible
 .iter()
 .map(|meta| {
 let offset = top;
 let is_child = meta
 .parent_session_id
 .as_deref()
 .is_some_and(|parent_id| ids.contains(parent_id));
 top += if is_child {
 FLAT_CHILD_ROW_HEIGHT
 } else {
 FLAT_ROOT_ROW_HEIGHT
 };
 offset
 })
 .collect()
}

fn animate_flat_thread_position(
 row: gpui::Div,
 session_id: &str,
 target_top: f32,
) -> impl IntoElement + use<> {
 row.with_spring(
 gpui::SharedString::from(format!("flat-thread-position-{session_id}")),
 SpringAnimation::new(FLAT_REORDER_SPRING)
 .to(px(target_top))
 .with_epsilon(0.25),
 move |row, animated_top| row.relative().top(animated_top - px(target_top)),
 )
}

/// Startup fold state: every thread with visible direct children begins
/// collapsed, except the active thread and its ancestors so the restored
/// selection stays on screen (and, when it is itself a parent, open).
Expand DownExpand Up@@ -2224,7 +2276,12 @@ impl Render for SessionsSidebar {
 .into_any_element();
 (self.render_flat_header(cx).into_any_element(), thread_list)
 } else {
 let visible = visible.into_iter().cloned().collect::<Vec<_>>();
 let top_offsets = flat_thread_top_offsets(&visible, &flat_sessions);
 let visible = visible
 .into_iter()
 .cloned()
 .zip(top_offsets)
 .collect::<Vec<_>>();
 if self.flat_list_state.item_count() != visible.len() {
 self.flat_list_state.reset(visible.len());
 }
Expand All@@ -2233,36 +2290,40 @@ impl Render for SessionsSidebar {
 .map(|project| (project.id, project.name))
 .collect::<HashMap<_, _>>();
 let active_id = active_id.clone();
 let thread_list = list(
 self.flat_list_state.clone(),
 cx.processor(move |this, index: usize, _window, cx| {
 let Some(meta) = visible.get(index) else {
 return div().into_any_element();
 };
 let project_name = meta
 .project_id
 .as_ref()
 .and_then(|project_id| project_names.get(project_id))
 .cloned();
 let is_active = active_id.as_deref() == Some(meta.id.as_str());
 div()
 .w_full()
 .px_2()
 .pb(px(2.))
 .child(this.render_flat_thread(
 meta,
 &flat_sessions,
 &flags,
 project_name,
 is_active,
 cx,
 ))
 let thread_list =
 list(
 self.flat_list_state.clone(),
 cx.processor(move |this, index: usize, _window, cx| {
 let Some((meta, target_top)) = visible.get(index) else {
 return div().into_any_element();
 };
 let target_top = *target_top;
 let project_name = meta
 .project_id
 .as_ref()
 .and_then(|project_id| project_names.get(project_id))
 .cloned();
 let is_active = active_id.as_deref() == Some(meta.id.as_str());
 animate_flat_thread_position(
 div().w_full().px_2().pb(px(2.)).child(
 this.render_flat_thread(
 meta,
 &flat_sessions,
 &flags,
 project_name,
 is_active,
 cx,
 ),
 ),
 &meta.id,
 target_top,
 )
 .into_any_element()
 }),
 )
 .flex_1()
 .min_h_0()
 .into_any_element();
}),
)
.flex_1()
.min_h_0()
.into_any_element();
 (self.render_flat_header(cx).into_any_element(), thread_list)
 }
 }
Expand DownExpand Up@@ -2305,14 +2366,45 @@ impl Render for SessionsSidebar {
mod tests {
 use super::*;
 use agent::ProviderKind;
 use gpui::{TestAppContext, VisualTestContext, size};
 use std::path::PathBuf;
 use gpui::{Pixels, TestAppContext, VisualTestContext, size};
 use std::{cell::RefCell, path::PathBuf, rc::Rc};
 use tcode_core::project::Project;
 use tcode_runtime::pipe::{HostServices, spawn_host};
 use tcode_services::store::SessionStore;

 struct WorkingThreadRowProbe;

 struct FlatReorderAnimationProbe {
 reversed: bool,
 positions: Rc<RefCell<HashMap<&'static str, Pixels>>>,
 }

 impl Render for FlatReorderAnimationProbe {
 fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
 let order = if self.reversed {
 ["second", "first"]
 } else {
 ["first", "second"]
 };
 let positions = self.positions.clone();

 v_flex().children(order.into_iter().enumerate().map(|(index, id)| {
 let positions = positions.clone();
 let target_top = index as f32 * FLAT_ROOT_ROW_HEIGHT;
 div().h(px(FLAT_ROOT_ROW_HEIGHT)).with_spring(
 gpui::SharedString::from(format!("flat-thread-position-{id}")),
 SpringAnimation::new(FLAT_REORDER_SPRING)
 .to(px(target_top))
 .with_epsilon(0.25),
 move |row, animated_top| {
 positions.borrow_mut().insert(id, animated_top);
 row.relative().top(animated_top - px(target_top))
 },
 )
 }))
 }
 }

 impl Render for WorkingThreadRowProbe {
 fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
 h_flex()
Expand DownExpand Up@@ -2389,6 +2481,36 @@ mod tests {
 }
 }

 #[gpui::test]
 fn flat_rows_start_reordering_from_their_previous_positions(cx: &mut TestAppContext) {
 let positions = Rc::new(RefCell::new(HashMap::new()));
 let window = cx.open_window(size(px(200.), px(200.)), {
 let positions = positions.clone();
 move |_, _| FlatReorderAnimationProbe {
 reversed: false,
 positions,
 }
 });
 cx.run_until_parked();
 assert_eq!(positions.borrow()["first"], px(0.));
 assert_eq!(positions.borrow()["second"], px(FLAT_ROOT_ROW_HEIGHT));

 window
 .update(cx, |probe, _, cx| {
 probe.reversed = true;
 cx.notify();
 })
 .unwrap();
 cx.run_until_parked();
 assert_eq!(positions.borrow()["first"], px(0.));
 assert_eq!(positions.borrow()["second"], px(FLAT_ROOT_ROW_HEIGHT));

 let callbacks = window
 .update(cx, |_, window, cx| window.simulate_next_frame(cx))
 .unwrap();
 assert!(callbacks > 0, "spring did not request an animation frame");
 }

 #[gpui::test]
 fn canceling_inline_rename_discards_the_unsaved_title(cx: &mut TestAppContext) {
 let root = std::env::temp_dir().join(format!(
Expand DownExpand Up@@ -2738,6 +2860,37 @@ mod tests {
 );
 }

 #[test]
 fn flat_row_offsets_follow_the_rendered_root_and_child_heights() {
 let root_a = session("root-a", None);
 let child_a = session("child-a", Some("root-a"));
 let root_b = session("root-b", None);
 let sessions = vec![root_a, child_a, root_b];
 let visible = sessions.iter().collect::<Vec<_>>();

 assert_eq!(
 flat_thread_top_offsets(&visible, &sessions),
 vec![
 0.,
 FLAT_ROOT_ROW_HEIGHT,
 FLAT_ROOT_ROW_HEIGHT + FLAT_CHILD_ROW_HEIGHT
 ]
 );
 }

 #[test]
 fn flat_row_offsets_treat_orphaned_children_as_root_rows() {
 let orphan = session("orphan", Some("missing-parent"));
 let root = session("root", None);
 let sessions = vec![orphan, root];
 let visible = sessions.iter().collect::<Vec<_>>();

 assert_eq!(
 flat_thread_top_offsets(&visible, &sessions),
 vec![0., FLAT_ROOT_ROW_HEIGHT]
 );
 }

 #[test]
 fn flat_block_attention_is_lifted_from_a_waiting_child() {
 let mut lifted_root = session("lifted-root", None);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(sidebar): animate flat thread reordering#296

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

Tryanks
merged 1 commit into

from

Aug 26, 2026
 Merged


feat(sidebar): animate flat thread reordering
#296
 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


223 changes: 188 additions & 35 deletions
crates/ui/src/sidebar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,10 @@ use crate::{
 sizing::Sizable as _,
};
use gpui::{
 Action, AppContext as _, Context, Entity, InteractiveElement as _, IntoElement, ListAlignment,
 ListState, ParentElement as _, Render, Role, StatefulInteractiveElement as _, Styled as _,
 Subscription, Window, div, list, prelude::FluentBuilder as _, px,
 Action, AnimationExt as _, AppContext as _, Context, Entity, InteractiveElement as _,
 IntoElement, ListAlignment, ListState, ParentElement as _, Render, Role, SpringAnimation,
 SpringConfig, StatefulInteractiveElement as _, Styled as _, Subscription, Window, div, list,
 prelude::FluentBuilder as _, px,
};
use gpui_base::{StyledExt as _, h_flex, v_flex};
use serde::Deserialize;
Expand All@@ -44,6 +45,15 @@ const TRAFFIC_LIGHT_INSET: f32 = 8.;
/// Max threads shown per project group before the "Show more" row.
const THREADS_COLLAPSED_LIMIT: usize = 6;

/// Flat-list row geometry, including the 2px gap reserved below every row.
const FLAT_ROOT_ROW_HEIGHT: f32 = 50.;
const FLAT_CHILD_ROW_HEIGHT: f32 = 32.;

/// A critically damped spring keeps reordering legible without bouncing rows
/// past their destinations. GPUI also makes this snap to the target when the
/// operating system's reduced-motion preference is enabled.
const FLAT_REORDER_SPRING: SpringConfig = SpringConfig::new(420., 41., 1.);

/// Localized thread-list toggle, when the project has enough threads to need
/// one. Keeping the toggle present in both states is what lets an expanded list
/// be collapsed again.
Expand DownExpand Up@@ -272,6 +282,48 @@ fn flat_visible_threads<'a>(
 .collect()
}

/// The target top edge for each visible flat-list row. These positions mirror
/// `render_flat_thread`: parent rows are 48px tall and child rows are 30px,
/// with another 2px of bottom spacing supplied by the list item wrapper.
fn flat_thread_top_offsets(visible: &[&SessionMeta], sessions: &[SessionMeta]) -> Vec<f32> {
 let ids = sessions
 .iter()
 .map(|session| session.id.as_str())
 .collect::<HashSet<_>>();
 let mut top = 0.;

 visible
 .iter()
 .map(|meta| {
 let offset = top;
 let is_child = meta
 .parent_session_id
 .as_deref()
 .is_some_and(|parent_id| ids.contains(parent_id));
 top += if is_child {
 FLAT_CHILD_ROW_HEIGHT
 } else {
 FLAT_ROOT_ROW_HEIGHT
 };
 offset
 })
 .collect()
}

fn animate_flat_thread_position(
 row: gpui::Div,
 session_id: &str,
 target_top: f32,
) -> impl IntoElement + use<> {
 row.with_spring(
 gpui::SharedString::from(format!("flat-thread-position-{session_id}")),
 SpringAnimation::new(FLAT_REORDER_SPRING)
 .to(px(target_top))
 .with_epsilon(0.25),
 move |row, animated_top| row.relative().top(animated_top - px(target_top)),
 )
}

/// Startup fold state: every thread with visible direct children begins
/// collapsed, except the active thread and its ancestors so the restored
/// selection stays on screen (and, when it is itself a parent, open).
Expand DownExpand Up@@ -2224,7 +2276,12 @@ impl Render for SessionsSidebar {
 .into_any_element();
 (self.render_flat_header(cx).into_any_element(), thread_list)
 } else {
 let visible = visible.into_iter().cloned().collect::<Vec<_>>();
 let top_offsets = flat_thread_top_offsets(&visible, &flat_sessions);
 let visible = visible
 .into_iter()
 .cloned()
 .zip(top_offsets)
 .collect::<Vec<_>>();
 if self.flat_list_state.item_count() != visible.len() {
 self.flat_list_state.reset(visible.len());
 }
Expand All@@ -2233,36 +2290,40 @@ impl Render for SessionsSidebar {
 .map(|project| (project.id, project.name))
 .collect::<HashMap<_, _>>();
 let active_id = active_id.clone();
 let thread_list = list(
 self.flat_list_state.clone(),
 cx.processor(move |this, index: usize, _window, cx| {
 let Some(meta) = visible.get(index) else {
 return div().into_any_element();
 };
 let project_name = meta
 .project_id
 .as_ref()
 .and_then(|project_id| project_names.get(project_id))
 .cloned();
 let is_active = active_id.as_deref() == Some(meta.id.as_str());
 div()
 .w_full()
 .px_2()
 .pb(px(2.))
 .child(this.render_flat_thread(
 meta,
 &flat_sessions,
 &flags,
 project_name,
 is_active,
 cx,
 ))
 let thread_list =
 list(
 self.flat_list_state.clone(),
 cx.processor(move |this, index: usize, _window, cx| {
 let Some((meta, target_top)) = visible.get(index) else {
 return div().into_any_element();
 };
 let target_top = *target_top;
 let project_name = meta
 .project_id
 .as_ref()
 .and_then(|project_id| project_names.get(project_id))
 .cloned();
 let is_active = active_id.as_deref() == Some(meta.id.as_str());
 animate_flat_thread_position(
 div().w_full().px_2().pb(px(2.)).child(
 this.render_flat_thread(
 meta,
 &flat_sessions,
 &flags,
 project_name,
 is_active,
 cx,
 ),
 ),
 &meta.id,
 target_top,
 )
 .into_any_element()
 }),
 )
 .flex_1()
 .min_h_0()
 .into_any_element();
}),
)
.flex_1()
.min_h_0()
.into_any_element();
 (self.render_flat_header(cx).into_any_element(), thread_list)
 }
 }
Expand DownExpand Up@@ -2305,14 +2366,45 @@ impl Render for SessionsSidebar {
mod tests {
 use super::*;
 use agent::ProviderKind;
 use gpui::{TestAppContext, VisualTestContext, size};
 use std::path::PathBuf;
 use gpui::{Pixels, TestAppContext, VisualTestContext, size};
 use std::{cell::RefCell, path::PathBuf, rc::Rc};
 use tcode_core::project::Project;
 use tcode_runtime::pipe::{HostServices, spawn_host};
 use tcode_services::store::SessionStore;

 struct WorkingThreadRowProbe;

 struct FlatReorderAnimationProbe {
 reversed: bool,
 positions: Rc<RefCell<HashMap<&'static str, Pixels>>>,
 }

 impl Render for FlatReorderAnimationProbe {
 fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
 let order = if self.reversed {
 ["second", "first"]
 } else {
 ["first", "second"]
 };
 let positions = self.positions.clone();

 v_flex().children(order.into_iter().enumerate().map(|(index, id)| {
 let positions = positions.clone();
 let target_top = index as f32 * FLAT_ROOT_ROW_HEIGHT;
 div().h(px(FLAT_ROOT_ROW_HEIGHT)).with_spring(
 gpui::SharedString::from(format!("flat-thread-position-{id}")),
 SpringAnimation::new(FLAT_REORDER_SPRING)
 .to(px(target_top))
 .with_epsilon(0.25),
 move |row, animated_top| {
 positions.borrow_mut().insert(id, animated_top);
 row.relative().top(animated_top - px(target_top))
 },
 )
 }))
 }
 }

 impl Render for WorkingThreadRowProbe {
 fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
 h_flex()
Expand DownExpand Up@@ -2389,6 +2481,36 @@ mod tests {
 }
 }

 #[gpui::test]
 fn flat_rows_start_reordering_from_their_previous_positions(cx: &mut TestAppContext) {
 let positions = Rc::new(RefCell::new(HashMap::new()));
 let window = cx.open_window(size(px(200.), px(200.)), {
 let positions = positions.clone();
 move |_, _| FlatReorderAnimationProbe {
 reversed: false,
 positions,
 }
 });
 cx.run_until_parked();
 assert_eq!(positions.borrow()["first"], px(0.));
 assert_eq!(positions.borrow()["second"], px(FLAT_ROOT_ROW_HEIGHT));

 window
 .update(cx, |probe, _, cx| {
 probe.reversed = true;
 cx.notify();
 })
 .unwrap();
 cx.run_until_parked();
 assert_eq!(positions.borrow()["first"], px(0.));
 assert_eq!(positions.borrow()["second"], px(FLAT_ROOT_ROW_HEIGHT));

 let callbacks = window
 .update(cx, |_, window, cx| window.simulate_next_frame(cx))
 .unwrap();
 assert!(callbacks > 0, "spring did not request an animation frame");
 }

 #[gpui::test]
 fn canceling_inline_rename_discards_the_unsaved_title(cx: &mut TestAppContext) {
 let root = std::env::temp_dir().join(format!(
Expand DownExpand Up@@ -2738,6 +2860,37 @@ mod tests {
 );
 }

 #[test]
 fn flat_row_offsets_follow_the_rendered_root_and_child_heights() {
 let root_a = session("root-a", None);
 let child_a = session("child-a", Some("root-a"));
 let root_b = session("root-b", None);
 let sessions = vec![root_a, child_a, root_b];
 let visible = sessions.iter().collect::<Vec<_>>();

 assert_eq!(
 flat_thread_top_offsets(&visible, &sessions),
 vec![
 0.,
 FLAT_ROOT_ROW_HEIGHT,
 FLAT_ROOT_ROW_HEIGHT + FLAT_CHILD_ROW_HEIGHT
 ]
 );
 }

 #[test]
 fn flat_row_offsets_treat_orphaned_children_as_root_rows() {
 let orphan = session("orphan", Some("missing-parent"));
 let root = session("root", None);
 let sessions = vec![orphan, root];
 let visible = sessions.iter().collect::<Vec<_>>();

 assert_eq!(
 flat_thread_top_offsets(&visible, &sessions),
 vec![0., FLAT_ROOT_ROW_HEIGHT]
 );
 }

 #[test]
 fn flat_block_attention_is_lifted_from_a_waiting_child() {
 let mut lifted_root = session("lifted-root", None);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(sidebar): animate flat thread reordering#296

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

Tryanks
merged 1 commit into

from

Aug 26, 2026
 Merged


feat(sidebar): animate flat thread reordering
#296
 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


223 changes: 188 additions & 35 deletions
crates/ui/src/sidebar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,10 @@ use crate::{
 sizing::Sizable as _,
};
use gpui::{
 Action, AppContext as _, Context, Entity, InteractiveElement as _, IntoElement, ListAlignment,
 ListState, ParentElement as _, Render, Role, StatefulInteractiveElement as _, Styled as _,
 Subscription, Window, div, list, prelude::FluentBuilder as _, px,
 Action, AnimationExt as _, AppContext as _, Context, Entity, InteractiveElement as _,
 IntoElement, ListAlignment, ListState, ParentElement as _, Render, Role, SpringAnimation,
 SpringConfig, StatefulInteractiveElement as _, Styled as _, Subscription, Window, div, list,
 prelude::FluentBuilder as _, px,
};
use gpui_base::{StyledExt as _, h_flex, v_flex};
use serde::Deserialize;
Expand All@@ -44,6 +45,15 @@ const TRAFFIC_LIGHT_INSET: f32 = 8.;
/// Max threads shown per project group before the "Show more" row.
const THREADS_COLLAPSED_LIMIT: usize = 6;

/// Flat-list row geometry, including the 2px gap reserved below every row.
const FLAT_ROOT_ROW_HEIGHT: f32 = 50.;
const FLAT_CHILD_ROW_HEIGHT: f32 = 32.;

/// A critically damped spring keeps reordering legible without bouncing rows
/// past their destinations. GPUI also makes this snap to the target when the
/// operating system's reduced-motion preference is enabled.
const FLAT_REORDER_SPRING: SpringConfig = SpringConfig::new(420., 41., 1.);

/// Localized thread-list toggle, when the project has enough threads to need
/// one. Keeping the toggle present in both states is what lets an expanded list
/// be collapsed again.
Expand DownExpand Up@@ -272,6 +282,48 @@ fn flat_visible_threads<'a>(
 .collect()
}

/// The target top edge for each visible flat-list row. These positions mirror
/// `render_flat_thread`: parent rows are 48px tall and child rows are 30px,
/// with another 2px of bottom spacing supplied by the list item wrapper.
fn flat_thread_top_offsets(visible: &[&SessionMeta], sessions: &[SessionMeta]) -> Vec<f32> {
 let ids = sessions
 .iter()
 .map(|session| session.id.as_str())
 .collect::<HashSet<_>>();
 let mut top = 0.;

 visible
 .iter()
 .map(|meta| {
 let offset = top;
 let is_child = meta
 .parent_session_id
 .as_deref()
 .is_some_and(|parent_id| ids.contains(parent_id));
 top += if is_child {
 FLAT_CHILD_ROW_HEIGHT
 } else {
 FLAT_ROOT_ROW_HEIGHT
 };
 offset
 })
 .collect()
}

fn animate_flat_thread_position(
 row: gpui::Div,
 session_id: &str,
 target_top: f32,
) -> impl IntoElement + use<> {
 row.with_spring(
 gpui::SharedString::from(format!("flat-thread-position-{session_id}")),
 SpringAnimation::new(FLAT_REORDER_SPRING)
 .to(px(target_top))
 .with_epsilon(0.25),
 move |row, animated_top| row.relative().top(animated_top - px(target_top)),
 )
}

/// Startup fold state: every thread with visible direct children begins
/// collapsed, except the active thread and its ancestors so the restored
/// selection stays on screen (and, when it is itself a parent, open).
Expand DownExpand Up@@ -2224,7 +2276,12 @@ impl Render for SessionsSidebar {
 .into_any_element();
 (self.render_flat_header(cx).into_any_element(), thread_list)
 } else {
 let visible = visible.into_iter().cloned().collect::<Vec<_>>();
 let top_offsets = flat_thread_top_offsets(&visible, &flat_sessions);
 let visible = visible
 .into_iter()
 .cloned()
 .zip(top_offsets)
 .collect::<Vec<_>>();
 if self.flat_list_state.item_count() != visible.len() {
 self.flat_list_state.reset(visible.len());
 }
Expand All@@ -2233,36 +2290,40 @@ impl Render for SessionsSidebar {
 .map(|project| (project.id, project.name))
 .collect::<HashMap<_, _>>();
 let active_id = active_id.clone();
 let thread_list = list(
 self.flat_list_state.clone(),
 cx.processor(move |this, index: usize, _window, cx| {
 let Some(meta) = visible.get(index) else {
 return div().into_any_element();
 };
 let project_name = meta
 .project_id
 .as_ref()
 .and_then(|project_id| project_names.get(project_id))
 .cloned();
 let is_active = active_id.as_deref() == Some(meta.id.as_str());
 div()
 .w_full()
 .px_2()
 .pb(px(2.))
 .child(this.render_flat_thread(
 meta,
 &flat_sessions,
 &flags,
 project_name,
 is_active,
 cx,
 ))
 let thread_list =
 list(
 self.flat_list_state.clone(),
 cx.processor(move |this, index: usize, _window, cx| {
 let Some((meta, target_top)) = visible.get(index) else {
 return div().into_any_element();
 };
 let target_top = *target_top;
 let project_name = meta
 .project_id
 .as_ref()
 .and_then(|project_id| project_names.get(project_id))
 .cloned();
 let is_active = active_id.as_deref() == Some(meta.id.as_str());
 animate_flat_thread_position(
 div().w_full().px_2().pb(px(2.)).child(
 this.render_flat_thread(
 meta,
 &flat_sessions,
 &flags,
 project_name,
 is_active,
 cx,
 ),
 ),
 &meta.id,
 target_top,
 )
 .into_any_element()
 }),
 )
 .flex_1()
 .min_h_0()
 .into_any_element();
}),
)
.flex_1()
.min_h_0()
.into_any_element();
 (self.render_flat_header(cx).into_any_element(), thread_list)
 }
 }
Expand DownExpand Up@@ -2305,14 +2366,45 @@ impl Render for SessionsSidebar {
mod tests {
 use super::*;
 use agent::ProviderKind;
 use gpui::{TestAppContext, VisualTestContext, size};
 use std::path::PathBuf;
 use gpui::{Pixels, TestAppContext, VisualTestContext, size};
 use std::{cell::RefCell, path::PathBuf, rc::Rc};
 use tcode_core::project::Project;
 use tcode_runtime::pipe::{HostServices, spawn_host};
 use tcode_services::store::SessionStore;

 struct WorkingThreadRowProbe;

 struct FlatReorderAnimationProbe {
 reversed: bool,
 positions: Rc<RefCell<HashMap<&'static str, Pixels>>>,
 }

 impl Render for FlatReorderAnimationProbe {
 fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
 let order = if self.reversed {
 ["second", "first"]
 } else {
 ["first", "second"]
 };
 let positions = self.positions.clone();

 v_flex().children(order.into_iter().enumerate().map(|(index, id)| {
 let positions = positions.clone();
 let target_top = index as f32 * FLAT_ROOT_ROW_HEIGHT;
 div().h(px(FLAT_ROOT_ROW_HEIGHT)).with_spring(
 gpui::SharedString::from(format!("flat-thread-position-{id}")),
 SpringAnimation::new(FLAT_REORDER_SPRING)
 .to(px(target_top))
 .with_epsilon(0.25),
 move |row, animated_top| {
 positions.borrow_mut().insert(id, animated_top);
 row.relative().top(animated_top - px(target_top))
 },
 )
 }))
 }
 }

 impl Render for WorkingThreadRowProbe {
 fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
 h_flex()
Expand DownExpand Up@@ -2389,6 +2481,36 @@ mod tests {
 }
 }

 #[gpui::test]
 fn flat_rows_start_reordering_from_their_previous_positions(cx: &mut TestAppContext) {
 let positions = Rc::new(RefCell::new(HashMap::new()));
 let window = cx.open_window(size(px(200.), px(200.)), {
 let positions = positions.clone();
 move |_, _| FlatReorderAnimationProbe {
 reversed: false,
 positions,
 }
 });
 cx.run_until_parked();
 assert_eq!(positions.borrow()["first"], px(0.));
 assert_eq!(positions.borrow()["second"], px(FLAT_ROOT_ROW_HEIGHT));

 window
 .update(cx, |probe, _, cx| {
 probe.reversed = true;
 cx.notify();
 })
 .unwrap();
 cx.run_until_parked();
 assert_eq!(positions.borrow()["first"], px(0.));
 assert_eq!(positions.borrow()["second"], px(FLAT_ROOT_ROW_HEIGHT));

 let callbacks = window
 .update(cx, |_, window, cx| window.simulate_next_frame(cx))
 .unwrap();
 assert!(callbacks > 0, "spring did not request an animation frame");
 }

 #[gpui::test]
 fn canceling_inline_rename_discards_the_unsaved_title(cx: &mut TestAppContext) {
 let root = std::env::temp_dir().join(format!(
Expand DownExpand Up@@ -2738,6 +2860,37 @@ mod tests {
 );
 }

 #[test]
 fn flat_row_offsets_follow_the_rendered_root_and_child_heights() {
 let root_a = session("root-a", None);
 let child_a = session("child-a", Some("root-a"));
 let root_b = session("root-b", None);
 let sessions = vec![root_a, child_a, root_b];
 let visible = sessions.iter().collect::<Vec<_>>();

 assert_eq!(
 flat_thread_top_offsets(&visible, &sessions),
 vec![
 0.,
 FLAT_ROOT_ROW_HEIGHT,
 FLAT_ROOT_ROW_HEIGHT + FLAT_CHILD_ROW_HEIGHT
 ]
 );
 }

 #[test]
 fn flat_row_offsets_treat_orphaned_children_as_root_rows() {
 let orphan = session("orphan", Some("missing-parent"));
 let root = session("root", None);
 let sessions = vec![orphan, root];
 let visible = sessions.iter().collect::<Vec<_>>();

 assert_eq!(
 flat_thread_top_offsets(&visible, &sessions),
 vec![0., FLAT_ROOT_ROW_HEIGHT]
 );
 }

 #[test]
 fn flat_block_attention_is_lifted_from_a_waiting_child() {
 let mut lifted_root = session("lifted-root", None);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat(sidebar): animate flat thread reordering#296

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

Tryanks
merged 1 commit into

from

Aug 26, 2026
 Merged


feat(sidebar): animate flat thread reordering
#296
 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


223 changes: 188 additions & 35 deletions
crates/ui/src/sidebar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,10 @@ use crate::{
 sizing::Sizable as _,
};
use gpui::{
 Action, AppContext as _, Context, Entity, InteractiveElement as _, IntoElement, ListAlignment,
 ListState, ParentElement as _, Render, Role, StatefulInteractiveElement as _, Styled as _,
 Subscription, Window, div, list, prelude::FluentBuilder as _, px,
 Action, AnimationExt as _, AppContext as _, Context, Entity, InteractiveElement as _,
 IntoElement, ListAlignment, ListState, ParentElement as _, Render, Role, SpringAnimation,
 SpringConfig, StatefulInteractiveElement as _, Styled as _, Subscription, Window, div, list,
 prelude::FluentBuilder as _, px,
};
use gpui_base::{StyledExt as _, h_flex, v_flex};
use serde::Deserialize;
Expand All@@ -44,6 +45,15 @@ const TRAFFIC_LIGHT_INSET: f32 = 8.;
/// Max threads shown per project group before the "Show more" row.
const THREADS_COLLAPSED_LIMIT: usize = 6;

/// Flat-list row geometry, including the 2px gap reserved below every row.
const FLAT_ROOT_ROW_HEIGHT: f32 = 50.;
const FLAT_CHILD_ROW_HEIGHT: f32 = 32.;

/// A critically damped spring keeps reordering legible without bouncing rows
/// past their destinations. GPUI also makes this snap to the target when the
/// operating system's reduced-motion preference is enabled.
const FLAT_REORDER_SPRING: SpringConfig = SpringConfig::new(420., 41., 1.);

/// Localized thread-list toggle, when the project has enough threads to need
/// one. Keeping the toggle present in both states is what lets an expanded list
/// be collapsed again.
Expand DownExpand Up@@ -272,6 +282,48 @@ fn flat_visible_threads<'a>(
 .collect()
}

/// The target top edge for each visible flat-list row. These positions mirror
/// `render_flat_thread`: parent rows are 48px tall and child rows are 30px,
/// with another 2px of bottom spacing supplied by the list item wrapper.
fn flat_thread_top_offsets(visible: &[&SessionMeta], sessions: &[SessionMeta]) -> Vec<f32> {
 let ids = sessions
 .iter()
 .map(|session| session.id.as_str())
 .collect::<HashSet<_>>();
 let mut top = 0.;

 visible
 .iter()
 .map(|meta| {
 let offset = top;
 let is_child = meta
 .parent_session_id
 .as_deref()
 .is_some_and(|parent_id| ids.contains(parent_id));
 top += if is_child {
 FLAT_CHILD_ROW_HEIGHT
 } else {
 FLAT_ROOT_ROW_HEIGHT
 };
 offset
 })
 .collect()
}

fn animate_flat_thread_position(
 row: gpui::Div,
 session_id: &str,
 target_top: f32,
) -> impl IntoElement + use<> {
 row.with_spring(
 gpui::SharedString::from(format!("flat-thread-position-{session_id}")),
 SpringAnimation::new(FLAT_REORDER_SPRING)
 .to(px(target_top))
 .with_epsilon(0.25),
 move |row, animated_top| row.relative().top(animated_top - px(target_top)),
 )
}

/// Startup fold state: every thread with visible direct children begins
/// collapsed, except the active thread and its ancestors so the restored
/// selection stays on screen (and, when it is itself a parent, open).
Expand DownExpand Up@@ -2224,7 +2276,12 @@ impl Render for SessionsSidebar {
 .into_any_element();
 (self.render_flat_header(cx).into_any_element(), thread_list)
 } else {
 let visible = visible.into_iter().cloned().collect::<Vec<_>>();
 let top_offsets = flat_thread_top_offsets(&visible, &flat_sessions);
 let visible = visible
 .into_iter()
 .cloned()
 .zip(top_offsets)
 .collect::<Vec<_>>();
 if self.flat_list_state.item_count() != visible.len() {
 self.flat_list_state.reset(visible.len());
 }
Expand All@@ -2233,36 +2290,40 @@ impl Render for SessionsSidebar {
 .map(|project| (project.id, project.name))
 .collect::<HashMap<_, _>>();
 let active_id = active_id.clone();
 let thread_list = list(
 self.flat_list_state.clone(),
 cx.processor(move |this, index: usize, _window, cx| {
 let Some(meta) = visible.get(index) else {
 return div().into_any_element();
 };
 let project_name = meta
 .project_id
 .as_ref()
 .and_then(|project_id| project_names.get(project_id))
 .cloned();
 let is_active = active_id.as_deref() == Some(meta.id.as_str());
 div()
 .w_full()
 .px_2()
 .pb(px(2.))
 .child(this.render_flat_thread(
 meta,
 &flat_sessions,
 &flags,
 project_name,
 is_active,
 cx,
 ))
 let thread_list =
 list(
 self.flat_list_state.clone(),
 cx.processor(move |this, index: usize, _window, cx| {
 let Some((meta, target_top)) = visible.get(index) else {
 return div().into_any_element();
 };
 let target_top = *target_top;
 let project_name = meta
 .project_id
 .as_ref()
 .and_then(|project_id| project_names.get(project_id))
 .cloned();
 let is_active = active_id.as_deref() == Some(meta.id.as_str());
 animate_flat_thread_position(
 div().w_full().px_2().pb(px(2.)).child(
 this.render_flat_thread(
 meta,
 &flat_sessions,
 &flags,
 project_name,
 is_active,
 cx,
 ),
 ),
 &meta.id,
 target_top,
 )
 .into_any_element()
 }),
 )
 .flex_1()
 .min_h_0()
 .into_any_element();
}),
)
.flex_1()
.min_h_0()
.into_any_element();
 (self.render_flat_header(cx).into_any_element(), thread_list)
 }
 }
Expand DownExpand Up@@ -2305,14 +2366,45 @@ impl Render for SessionsSidebar {
mod tests {
 use super::*;
 use agent::ProviderKind;
 use gpui::{TestAppContext, VisualTestContext, size};
 use std::path::PathBuf;
 use gpui::{Pixels, TestAppContext, VisualTestContext, size};
 use std::{cell::RefCell, path::PathBuf, rc::Rc};
 use tcode_core::project::Project;
 use tcode_runtime::pipe::{HostServices, spawn_host};
 use tcode_services::store::SessionStore;

 struct WorkingThreadRowProbe;

 struct FlatReorderAnimationProbe {
 reversed: bool,
 positions: Rc<RefCell<HashMap<&'static str, Pixels>>>,
 }

 impl Render for FlatReorderAnimationProbe {
 fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
 let order = if self.reversed {
 ["second", "first"]
 } else {
 ["first", "second"]
 };
 let positions = self.positions.clone();

 v_flex().children(order.into_iter().enumerate().map(|(index, id)| {
 let positions = positions.clone();
 let target_top = index as f32 * FLAT_ROOT_ROW_HEIGHT;
 div().h(px(FLAT_ROOT_ROW_HEIGHT)).with_spring(
 gpui::SharedString::from(format!("flat-thread-position-{id}")),
 SpringAnimation::new(FLAT_REORDER_SPRING)
 .to(px(target_top))
 .with_epsilon(0.25),
 move |row, animated_top| {
 positions.borrow_mut().insert(id, animated_top);
 row.relative().top(animated_top - px(target_top))
 },
 )
 }))
 }
 }

 impl Render for WorkingThreadRowProbe {
 fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
 h_flex()
Expand DownExpand Up@@ -2389,6 +2481,36 @@ mod tests {
 }
 }

 #[gpui::test]
 fn flat_rows_start_reordering_from_their_previous_positions(cx: &mut TestAppContext) {
 let positions = Rc::new(RefCell::new(HashMap::new()));
 let window = cx.open_window(size(px(200.), px(200.)), {
 let positions = positions.clone();
 move |_, _| FlatReorderAnimationProbe {
 reversed: false,
 positions,
 }
 });
 cx.run_until_parked();
 assert_eq!(positions.borrow()["first"], px(0.));
 assert_eq!(positions.borrow()["second"], px(FLAT_ROOT_ROW_HEIGHT));

 window
 .update(cx, |probe, _, cx| {
 probe.reversed = true;
 cx.notify();
 })
 .unwrap();
 cx.run_until_parked();
 assert_eq!(positions.borrow()["first"], px(0.));
 assert_eq!(positions.borrow()["second"], px(FLAT_ROOT_ROW_HEIGHT));

 let callbacks = window
 .update(cx, |_, window, cx| window.simulate_next_frame(cx))
 .unwrap();
 assert!(callbacks > 0, "spring did not request an animation frame");
 }

 #[gpui::test]
 fn canceling_inline_rename_discards_the_unsaved_title(cx: &mut TestAppContext) {
 let root = std::env::temp_dir().join(format!(
Expand DownExpand Up@@ -2738,6 +2860,37 @@ mod tests {
 );
 }

 #[test]
 fn flat_row_offsets_follow_the_rendered_root_and_child_heights() {
 let root_a = session("root-a", None);
 let child_a = session("child-a", Some("root-a"));
 let root_b = session("root-b", None);
 let sessions = vec![root_a, child_a, root_b];
 let visible = sessions.iter().collect::<Vec<_>>();

 assert_eq!(
 flat_thread_top_offsets(&visible, &sessions),
 vec![
 0.,
 FLAT_ROOT_ROW_HEIGHT,
 FLAT_ROOT_ROW_HEIGHT + FLAT_CHILD_ROW_HEIGHT
 ]
 );
 }

 #[test]
 fn flat_row_offsets_treat_orphaned_children_as_root_rows() {
 let orphan = session("orphan", Some("missing-parent"));
 let root = session("root", None);
 let sessions = vec![orphan, root];
 let visible = sessions.iter().collect::<Vec<_>>();

 assert_eq!(
 flat_thread_top_offsets(&visible, &sessions),
 vec![0., FLAT_ROOT_ROW_HEIGHT]
 );
 }

 #[test]
 fn flat_block_attention_is_lifted_from_a_waiting_child() {
 let mut lifted_root = session("lifted-root", None);
Expand Down