fix(chat): keep latest activity expanded#299

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 27, 2026
Merged

fix(chat): keep latest activity expanded #299

Show file tree
Hide file tree
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
267 changes: 189 additions & 78 deletions crates/ui/src/chat/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use std::cell::RefCell;
use std::collections::{HashMap, HashSet};
use std::ops::Range;
use std::sync::Arc;
use std::time::Duration;
use std::time::{Duration, Instant};

use std::path::{Path, PathBuf};

Expand All@@ -18,7 +18,7 @@ use crate::{
icon::{Icon, IconName},
sizing::Sizable as _,
};
use agent::{ItemContent, ItemStatus, RewindMode};
use agent::{ItemContent, RewindMode};
use gpui::{
Anchor, AnyElement, App, AppContext as _, ClickEvent, ClipboardItem, Context, Entity,
FollowMode, InteractiveElement as _, IntoElement, ListAlignment, ListOffset, ListState,
Expand DownExpand Up@@ -68,14 +68,19 @@ const TRAFFIC_LIGHT_INSET: f32 = 80.;
const TURN_GAP: f32 = 32.;
/// Large documents are parsed away from the UI executor before becoming resident.
const ASYNC_MARKDOWN_THRESHOLD_BYTES: usize = 4 * 1024;
/// Keep a just-settled live activity visible long enough for its final output
/// or rendered diff to register before the automatically expanded detail folds.
const AUTO_ACTIVITY_COLLAPSE_DELAY: Duration = Duration::from_millis(500);
/// Minimum time an automatically expanded activity stays visible. The latest
/// activity remains open beyond this until another activity supersedes it.
const AUTO_ACTIVITY_MIN_VISIBILITY: Duration = Duration::from_millis(500);

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum AutoActivityExpansion {
Expanded,
CollapsePending(u64),
Expanded {
visible_since: Instant,
},
CollapsePending {
generation: u64,
visible_since: Instant,
},
Collapsed,
}

Expand All@@ -88,54 +93,94 @@ struct AutoActivityExpansions {
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
struct AutoActivityObservation {
expanded: bool,
collapse_generation: Option<u64>,
collapse: Option<(u64, Duration)>,
}

impl AutoActivityExpansions {
fn observe(&mut self, key: &str, enabled: bool, active: bool) -> AutoActivityObservation {
fn observe(
&mut self,
key: &str,
enabled: bool,
latest: bool,
now: Instant,
) -> AutoActivityObservation {
if !enabled {
self.entries.remove(key);
return AutoActivityObservation {
expanded: false,
collapse_generation: None,
collapse: None,
};
}

if active {
self.entries
.insert(key.to_string(), AutoActivityExpansion::Expanded);
let current = self.entries.get(key).copied();
if latest {
let visible_since = match current {
Some(AutoActivityExpansion::Expanded { visible_since })
| Some(AutoActivityExpansion::CollapsePending { visible_since, .. }) => {
visible_since
}
Some(AutoActivityExpansion::Collapsed) | None => now,
};
self.entries.insert(
key.to_string(),
AutoActivityExpansion::Expanded { visible_since },
);
return AutoActivityObservation {
expanded: true,
collapse_generation: None,
collapse: None,
};
}

match self.entries.get(key).copied() {
Some(AutoActivityExpansion::Expanded) | None => {
self.next_generation = self.next_generation.wrapping_add(1);
let generation = self.next_generation;
self.entries.insert(
key.to_string(),
AutoActivityExpansion::CollapsePending(generation),
);
AutoActivityObservation {
let visible_since = match current {
Some(AutoActivityExpansion::Expanded { visible_since }) => visible_since,
None => now,
Some(AutoActivityExpansion::CollapsePending { .. }) => {
return AutoActivityObservation {
expanded: true,
collapse_generation: Some(generation),
}
collapse: None,
};
}
Some(AutoActivityExpansion::CollapsePending(_)) => AutoActivityObservation {
expanded: true,
collapse_generation: None,
},
Some(AutoActivityExpansion::Collapsed) => AutoActivityObservation {
Some(AutoActivityExpansion::Collapsed) => {
return AutoActivityObservation {
expanded: false,
collapse: None,
};
}
};
let remaining = AUTO_ACTIVITY_MIN_VISIBILITY
.saturating_sub(now.saturating_duration_since(visible_since));
if remaining.is_zero() {
self.entries
.insert(key.to_string(), AutoActivityExpansion::Collapsed);
AutoActivityObservation {
expanded: false,
collapse_generation: None,
},
collapse: None,
}
} else {
self.next_generation = self.next_generation.wrapping_add(1);
let generation = self.next_generation;
self.entries.insert(
key.to_string(),
AutoActivityExpansion::CollapsePending {
generation,
visible_since,
},
);
AutoActivityObservation {
expanded: true,
collapse: Some((generation, remaining)),
}
}
}

fn finish_collapse(&mut self, key: &str, generation: u64) -> bool {
if self.entries.get(key) == Some(&AutoActivityExpansion::CollapsePending(generation)) {
if matches!(
self.entries.get(key),
Some(AutoActivityExpansion::CollapsePending {
generation: pending,
..
}) if *pending == generation
) {
self.entries
.insert(key.to_string(), AutoActivityExpansion::Collapsed);
true
Expand DownExpand Up@@ -621,13 +666,15 @@ impl ChatView {
turn: usize,
key: &str,
enabled: bool,
active: bool,
latest: bool,
cx: &mut Context<Self>,
) -> bool {
let auto = self.auto_activity_expansions.observe(key, enabled, active);
if let Some(generation) = auto.collapse_generation {
let auto = self
.auto_activity_expansions
.observe(key, enabled, latest, Instant::now());
if let Some((generation, delay)) = auto.collapse {
let collapse_key = key.to_string();
let timer = cx.background_executor().timer(AUTO_ACTIVITY_COLLAPSE_DELAY);
let timer = cx.background_executor().timer(delay);
cx.spawn(async move |this, cx| {
timer.await;
let _ = this.update(cx, |this, cx| {
Expand DownExpand Up@@ -1135,14 +1182,12 @@ impl ChatView {
let mut rows = Vec::new();
for (activity_index, entry) in activities.iter().enumerate() {
let latest = activity_index + 1 == activities.len();
if let EntryContent::Item(ItemContent::FileChange { changes, status }) = &entry.content
{
if let EntryContent::Item(ItemContent::FileChange { changes, .. }) = &entry.content {
let turn = entry.turn;
for (file_index, row) in live_edit_rows(changes, cwd).iter().enumerate() {
let key = format!("activity-{}-file-{file_index}", entry.id);
let enabled = auto_expand && row.counts.is_some();
let active = latest && *status == ItemStatus::InProgress;
let expanded = self.auto_activity_expanded(turn, &key, enabled, active, cx)
let expanded = self.auto_activity_expanded(turn, &key, enabled, latest, cx)
|| self.expanded.contains(&key);
let toggle_key = key.clone();
rows.push(components::changed_files::file_edit_row(
Expand DownExpand Up@@ -1187,16 +1232,13 @@ impl ChatView {
}
let key = format!("activity-{}", entry.id);
let turn = entry.turn;
let (is_command, running) = match &entry.content {
EntryContent::Item(ItemContent::CommandExecution { status, .. }) => {
(true, *status == ItemStatus::InProgress)
}
_ => (false, false),
};
let is_command = matches!(
&entry.content,
EntryContent::Item(ItemContent::CommandExecution { .. })
);
let auto_enabled =
auto_expand && is_command && self.workspace_store.read(cx).live_command_panel();
let auto_expanded =
self.auto_activity_expanded(turn, &key, auto_enabled, latest && running, cx);
let auto_expanded = self.auto_activity_expanded(turn, &key, auto_enabled, latest, cx);
let expanded = auto_expanded || self.expanded.contains(&key);
let command_detail = if expanded {
match &entry.content {
Expand DownExpand Up@@ -2252,7 +2294,7 @@ fn open_in_zed(cwd: &Path, window: &mut Window, cx: &mut App) {
#[cfg(test)]
mod tests {
use super::{
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_COLLAPSE_DELAY, AutoActivityExpansions,
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansions,
ChatView, ResidencyScope, markdown_entries_for_residency,
};
use crate::store::WorkspaceStore;
Expand All@@ -2263,62 +2305,131 @@ mod tests {
Arc,
atomic::{AtomicU64, Ordering},
};
use std::time::{Duration, Instant};
use tcode_core::session::{EntryContent, Timeline, TimelineEntry, TurnMeta};

static NEXT_RESIDENCY_TEST_ID: AtomicU64 = AtomicU64::new(0);

#[test]
fn settled_live_activity_stays_expanded_until_delayed_collapse() {
fn latest_activity_stays_expanded_until_a_successor_appears() {
let mut expansions = AutoActivityExpansions::default();
let first_seen = Instant::now();

let running = expansions.observe("activity-command", true, true);
let running = expansions.observe("activity-command", true, true, first_seen);
assert!(running.expanded);
assert_eq!(running.collapse_generation, None);
assert_eq!(running.collapse, None);

let completed = expansions.observe("activity-command", true, false);
let completed = expansions.observe(
"activity-command",
true,
true,
first_seen + Duration::from_secs(1),
);
assert!(completed.expanded);
let generation = completed
.collapse_generation
.expect("completion should schedule a delayed collapse");
assert_eq!(completed.collapse, None);

let superseded = expansions.observe(
"activity-command",
true,
false,
first_seen + Duration::from_secs(1),
);
assert!(!superseded.expanded);
assert_eq!(superseded.collapse, None);
assert_eq!(AUTO_ACTIVITY_MIN_VISIBILITY, Duration::from_millis(500));
}

let rerender = expansions.observe("activity-command", true, false);
assert!(rerender.expanded);
assert_eq!(rerender.collapse_generation, None);
#[test]
fn early_successor_only_waits_for_remaining_minimum_visibility() {
let mut expansions = AutoActivityExpansions::default();
let first_seen = Instant::now();
expansions.observe("activity-command", true, true, first_seen);
let superseded = expansions.observe(
"activity-command",
true,
false,
first_seen + Duration::from_millis(200),
);

assert!(superseded.expanded);
let (generation, delay) = superseded
.collapse
.expect("early successor should schedule the remaining delay");
assert_eq!(delay, Duration::from_millis(300));
assert!(expansions.finish_collapse("activity-command", generation));
assert!(!expansions.observe("activity-command", true, false).expanded);
assert_eq!(
AUTO_ACTIVITY_COLLAPSE_DELAY,
std::time::Duration::from_millis(500)
assert!(
!expansions
.observe(
"activity-command",
true,
false,
first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
)
.expanded
);
}

#[test]
fn activity_first_seen_settled_still_opens_for_the_collapse_delay() {
fn activity_first_seen_non_latest_still_gets_full_visibility_window() {
let mut expansions = AutoActivityExpansions::default();
let settled = expansions.observe("activity-command", true, false);
let first_seen = Instant::now();
let observed = expansions.observe("activity-command", true, false, first_seen);

assert!(settled.expanded);
let generation = settled
.collapse_generation
assert!(observed.expanded);
let (generation, delay) = observed
.collapse
.expect("first observation should schedule a collapse");
assert_eq!(delay, AUTO_ACTIVITY_MIN_VISIBILITY);
assert!(expansions.finish_collapse("activity-command", generation));
assert!(!expansions.observe("activity-command", true, false).expanded);
}

#[test]
fn reactivated_activity_cancels_its_stale_delayed_collapse() {
let mut expansions = AutoActivityExpansions::default();
expansions.observe("activity-command", true, true);
let generation = expansions
.observe("activity-command", true, false)
.collapse_generation
.expect("completion should schedule a collapse");
let first_seen = Instant::now();
expansions.observe("activity-command", true, true, first_seen);
let (generation, _) = expansions
.observe(
"activity-command",
true,
false,
first_seen + Duration::from_millis(100),
)
.collapse
.expect("supersession should schedule a collapse");

assert!(expansions.observe("activity-command", true, true).expanded);
assert!(
expansions
.observe(
"activity-command",
true,
true,
first_seen + Duration::from_millis(200),
)
.expanded
);
assert!(!expansions.finish_collapse("activity-command", generation));
assert!(expansions.observe("activity-command", true, true).expanded);
assert!(
!expansions
.observe(
"activity-command",
true,
false,
first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
)
.expanded
);

assert!(!expansions.observe("activity-command", false, true).expanded);
assert!(
!expansions
.observe(
"activity-command",
false,
true,
first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
)
.expanded
);
}

#[test]
Expand Down
Loading
, '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
fix(chat): keep latest activity expanded#299

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 27, 2026
 Merged


fix(chat): keep latest activity expanded
#299
Show file tree
Hide file tree
 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


267 changes: 189 additions & 78 deletions
crates/ui/src/chat/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use std::cell::RefCell;
use std::collections::{HashMap, HashSet};
use std::ops::Range;
use std::sync::Arc;
use std::time::Duration;
use std::time::{Duration, Instant};

use std::path::{Path, PathBuf};

Expand All@@ -18,7 +18,7 @@ use crate::{
 icon::{Icon, IconName},
 sizing::Sizable as _,
};
use agent::{ItemContent, ItemStatus, RewindMode};
use agent::{ItemContent, RewindMode};
use gpui::{
 Anchor, AnyElement, App, AppContext as _, ClickEvent, ClipboardItem, Context, Entity,
 FollowMode, InteractiveElement as _, IntoElement, ListAlignment, ListOffset, ListState,
Expand DownExpand Up@@ -68,14 +68,19 @@ const TRAFFIC_LIGHT_INSET: f32 = 80.;
const TURN_GAP: f32 = 32.;
/// Large documents are parsed away from the UI executor before becoming resident.
const ASYNC_MARKDOWN_THRESHOLD_BYTES: usize = 4 * 1024;
/// Keep a just-settled live activity visible long enough for its final output
/// or rendered diff to register before the automatically expanded detail folds.
const AUTO_ACTIVITY_COLLAPSE_DELAY: Duration = Duration::from_millis(500);
/// Minimum time an automatically expanded activity stays visible. The latest
/// activity remains open beyond this until another activity supersedes it.
const AUTO_ACTIVITY_MIN_VISIBILITY: Duration = Duration::from_millis(500);

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum AutoActivityExpansion {
 Expanded,
 CollapsePending(u64),
 Expanded {
 visible_since: Instant,
 },
 CollapsePending {
 generation: u64,
 visible_since: Instant,
 },
 Collapsed,
}

Expand All@@ -88,54 +93,94 @@ struct AutoActivityExpansions {
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
struct AutoActivityObservation {
 expanded: bool,
collapse_generation: Option<u64>,
collapse: Option<(u64, Duration)>,
}

impl AutoActivityExpansions {
 fn observe(&mut self, key: &str, enabled: bool, active: bool) -> AutoActivityObservation {
 fn observe(
 &mut self,
 key: &str,
 enabled: bool,
 latest: bool,
 now: Instant,
 ) -> AutoActivityObservation {
 if !enabled {
 self.entries.remove(key);
 return AutoActivityObservation {
 expanded: false,
collapse_generation: None,
collapse: None,
 };
 }

 if active {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Expanded);
 let current = self.entries.get(key).copied();
 if latest {
 let visible_since = match current {
 Some(AutoActivityExpansion::Expanded { visible_since })
 | Some(AutoActivityExpansion::CollapsePending { visible_since, .. }) => {
 visible_since
 }
 Some(AutoActivityExpansion::Collapsed) | None => now,
 };
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::Expanded { visible_since },
 );
 return AutoActivityObservation {
 expanded: true,
collapse_generation: None,
collapse: None,
 };
 }

 match self.entries.get(key).copied() {
 Some(AutoActivityExpansion::Expanded) | None => {
 self.next_generation = self.next_generation.wrapping_add(1);
 let generation = self.next_generation;
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::CollapsePending(generation),
 );
 AutoActivityObservation {
 let visible_since = match current {
 Some(AutoActivityExpansion::Expanded { visible_since }) => visible_since,
 None => now,
 Some(AutoActivityExpansion::CollapsePending { .. }) => {
 return AutoActivityObservation {
 expanded: true,
collapse_generation: Some(generation),
 }
collapse: None,
 };
 }
 Some(AutoActivityExpansion::CollapsePending(_)) => AutoActivityObservation {
 expanded: true,
 collapse_generation: None,
 },
 Some(AutoActivityExpansion::Collapsed) => AutoActivityObservation {
 Some(AutoActivityExpansion::Collapsed) => {
 return AutoActivityObservation {
 expanded: false,
 collapse: None,
 };
 }
 };
 let remaining = AUTO_ACTIVITY_MIN_VISIBILITY
 .saturating_sub(now.saturating_duration_since(visible_since));
 if remaining.is_zero() {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Collapsed);
 AutoActivityObservation {
 expanded: false,
 collapse_generation: None,
 },
 collapse: None,
 }
 } else {
 self.next_generation = self.next_generation.wrapping_add(1);
 let generation = self.next_generation;
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::CollapsePending {
 generation,
 visible_since,
 },
 );
 AutoActivityObservation {
 expanded: true,
 collapse: Some((generation, remaining)),
 }
 }
 }

 fn finish_collapse(&mut self, key: &str, generation: u64) -> bool {
 if self.entries.get(key) == Some(&AutoActivityExpansion::CollapsePending(generation)) {
 if matches!(
 self.entries.get(key),
 Some(AutoActivityExpansion::CollapsePending {
 generation: pending,
 ..
 }) if *pending == generation
 ) {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Collapsed);
 true
Expand DownExpand Up@@ -621,13 +666,15 @@ impl ChatView {
 turn: usize,
 key: &str,
 enabled: bool,
active: bool,
latest: bool,
 cx: &mut Context<Self>,
 ) -> bool {
 let auto = self.auto_activity_expansions.observe(key, enabled, active);
 if let Some(generation) = auto.collapse_generation {
 let auto = self
 .auto_activity_expansions
 .observe(key, enabled, latest, Instant::now());
 if let Some((generation, delay)) = auto.collapse {
 let collapse_key = key.to_string();
 let timer = cx.background_executor().timer(AUTO_ACTIVITY_COLLAPSE_DELAY);
 let timer = cx.background_executor().timer(delay);
 cx.spawn(async move |this, cx| {
 timer.await;
 let _ = this.update(cx, |this, cx| {
Expand DownExpand Up@@ -1135,14 +1182,12 @@ impl ChatView {
 let mut rows = Vec::new();
 for (activity_index, entry) in activities.iter().enumerate() {
 let latest = activity_index + 1 == activities.len();
 if let EntryContent::Item(ItemContent::FileChange { changes, status }) = &entry.content
 {
 if let EntryContent::Item(ItemContent::FileChange { changes, .. }) = &entry.content {
 let turn = entry.turn;
 for (file_index, row) in live_edit_rows(changes, cwd).iter().enumerate() {
 let key = format!("activity-{}-file-{file_index}", entry.id);
 let enabled = auto_expand && row.counts.is_some();
 let active = latest && *status == ItemStatus::InProgress;
 let expanded = self.auto_activity_expanded(turn, &key, enabled, active, cx)
 let expanded = self.auto_activity_expanded(turn, &key, enabled, latest, cx)
 || self.expanded.contains(&key);
 let toggle_key = key.clone();
 rows.push(components::changed_files::file_edit_row(
Expand DownExpand Up@@ -1187,16 +1232,13 @@ impl ChatView {
 }
 let key = format!("activity-{}", entry.id);
 let turn = entry.turn;
 let (is_command, running) = match &entry.content {
 EntryContent::Item(ItemContent::CommandExecution { status, .. }) => {
 (true, *status == ItemStatus::InProgress)
 }
 _ => (false, false),
 };
 let is_command = matches!(
 &entry.content,
 EntryContent::Item(ItemContent::CommandExecution { .. })
 );
 let auto_enabled =
 auto_expand && is_command && self.workspace_store.read(cx).live_command_panel();
 let auto_expanded =
 self.auto_activity_expanded(turn, &key, auto_enabled, latest && running, cx);
 let auto_expanded = self.auto_activity_expanded(turn, &key, auto_enabled, latest, cx);
 let expanded = auto_expanded || self.expanded.contains(&key);
 let command_detail = if expanded {
 match &entry.content {
Expand DownExpand Up@@ -2252,7 +2294,7 @@ fn open_in_zed(cwd: &Path, window: &mut Window, cx: &mut App) {
#[cfg(test)]
mod tests {
 use super::{
 ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_COLLAPSE_DELAY, AutoActivityExpansions,
 ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansions,
 ChatView, ResidencyScope, markdown_entries_for_residency,
 };
 use crate::store::WorkspaceStore;
Expand All@@ -2263,62 +2305,131 @@ mod tests {
 Arc,
 atomic::{AtomicU64, Ordering},
 };
 use std::time::{Duration, Instant};
 use tcode_core::session::{EntryContent, Timeline, TimelineEntry, TurnMeta};

 static NEXT_RESIDENCY_TEST_ID: AtomicU64 = AtomicU64::new(0);

 #[test]
 fn settled_live_activity_stays_expanded_until_delayed_collapse() {
 fn latest_activity_stays_expanded_until_a_successor_appears() {
 let mut expansions = AutoActivityExpansions::default();
 let first_seen = Instant::now();

 let running = expansions.observe("activity-command", true, true);
 let running = expansions.observe("activity-command", true, true, first_seen);
 assert!(running.expanded);
 assert_eq!(running.collapse_generation, None);
 assert_eq!(running.collapse, None);

 let completed = expansions.observe("activity-command", true, false);
 let completed = expansions.observe(
 "activity-command",
 true,
 true,
 first_seen + Duration::from_secs(1),
 );
 assert!(completed.expanded);
 let generation = completed
 .collapse_generation
 .expect("completion should schedule a delayed collapse");
 assert_eq!(completed.collapse, None);

 let superseded = expansions.observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_secs(1),
 );
 assert!(!superseded.expanded);
 assert_eq!(superseded.collapse, None);
 assert_eq!(AUTO_ACTIVITY_MIN_VISIBILITY, Duration::from_millis(500));
 }

 let rerender = expansions.observe("activity-command", true, false);
 assert!(rerender.expanded);
 assert_eq!(rerender.collapse_generation, None);
 #[test]
 fn early_successor_only_waits_for_remaining_minimum_visibility() {
 let mut expansions = AutoActivityExpansions::default();
 let first_seen = Instant::now();
 expansions.observe("activity-command", true, true, first_seen);
 let superseded = expansions.observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_millis(200),
 );

 assert!(superseded.expanded);
 let (generation, delay) = superseded
 .collapse
 .expect("early successor should schedule the remaining delay");
 assert_eq!(delay, Duration::from_millis(300));
 assert!(expansions.finish_collapse("activity-command", generation));
 assert!(!expansions.observe("activity-command", true, false).expanded);
 assert_eq!(
 AUTO_ACTIVITY_COLLAPSE_DELAY,
 std::time::Duration::from_millis(500)
 assert!(
 !expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );
 }

 #[test]
 fn activity_first_seen_settled_still_opens_for_the_collapse_delay() {
 fn activity_first_seen_non_latest_still_gets_full_visibility_window() {
 let mut expansions = AutoActivityExpansions::default();
 let settled = expansions.observe("activity-command", true, false);
 let first_seen = Instant::now();
 let observed = expansions.observe("activity-command", true, false, first_seen);

 assert!(settled.expanded);
 let generation = settled
 .collapse_generation
 assert!(observed.expanded);
 let (generation, delay) = observed
 .collapse
 .expect("first observation should schedule a collapse");
 assert_eq!(delay, AUTO_ACTIVITY_MIN_VISIBILITY);
 assert!(expansions.finish_collapse("activity-command", generation));
 assert!(!expansions.observe("activity-command", true, false).expanded);
 }

 #[test]
 fn reactivated_activity_cancels_its_stale_delayed_collapse() {
 let mut expansions = AutoActivityExpansions::default();
 expansions.observe("activity-command", true, true);
 let generation = expansions
 .observe("activity-command", true, false)
 .collapse_generation
 .expect("completion should schedule a collapse");
 let first_seen = Instant::now();
 expansions.observe("activity-command", true, true, first_seen);
 let (generation, _) = expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_millis(100),
 )
 .collapse
 .expect("supersession should schedule a collapse");

 assert!(expansions.observe("activity-command", true, true).expanded);
 assert!(
 expansions
 .observe(
 "activity-command",
 true,
 true,
 first_seen + Duration::from_millis(200),
 )
 .expanded
 );
 assert!(!expansions.finish_collapse("activity-command", generation));
 assert!(expansions.observe("activity-command", true, true).expanded);
 assert!(
 !expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );

 assert!(!expansions.observe("activity-command", false, true).expanded);
 assert!(
 !expansions
 .observe(
 "activity-command",
 false,
 true,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );
 }

 #[test]
Expand Down
Loading

, '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
fix(chat): keep latest activity expanded#299

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 27, 2026
 Merged


fix(chat): keep latest activity expanded
#299
Show file tree
Hide file tree
 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


267 changes: 189 additions & 78 deletions
crates/ui/src/chat/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use std::cell::RefCell;
use std::collections::{HashMap, HashSet};
use std::ops::Range;
use std::sync::Arc;
use std::time::Duration;
use std::time::{Duration, Instant};

use std::path::{Path, PathBuf};

Expand All@@ -18,7 +18,7 @@ use crate::{
 icon::{Icon, IconName},
 sizing::Sizable as _,
};
use agent::{ItemContent, ItemStatus, RewindMode};
use agent::{ItemContent, RewindMode};
use gpui::{
 Anchor, AnyElement, App, AppContext as _, ClickEvent, ClipboardItem, Context, Entity,
 FollowMode, InteractiveElement as _, IntoElement, ListAlignment, ListOffset, ListState,
Expand DownExpand Up@@ -68,14 +68,19 @@ const TRAFFIC_LIGHT_INSET: f32 = 80.;
const TURN_GAP: f32 = 32.;
/// Large documents are parsed away from the UI executor before becoming resident.
const ASYNC_MARKDOWN_THRESHOLD_BYTES: usize = 4 * 1024;
/// Keep a just-settled live activity visible long enough for its final output
/// or rendered diff to register before the automatically expanded detail folds.
const AUTO_ACTIVITY_COLLAPSE_DELAY: Duration = Duration::from_millis(500);
/// Minimum time an automatically expanded activity stays visible. The latest
/// activity remains open beyond this until another activity supersedes it.
const AUTO_ACTIVITY_MIN_VISIBILITY: Duration = Duration::from_millis(500);

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum AutoActivityExpansion {
 Expanded,
 CollapsePending(u64),
 Expanded {
 visible_since: Instant,
 },
 CollapsePending {
 generation: u64,
 visible_since: Instant,
 },
 Collapsed,
}

Expand All@@ -88,54 +93,94 @@ struct AutoActivityExpansions {
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
struct AutoActivityObservation {
 expanded: bool,
collapse_generation: Option<u64>,
collapse: Option<(u64, Duration)>,
}

impl AutoActivityExpansions {
 fn observe(&mut self, key: &str, enabled: bool, active: bool) -> AutoActivityObservation {
 fn observe(
 &mut self,
 key: &str,
 enabled: bool,
 latest: bool,
 now: Instant,
 ) -> AutoActivityObservation {
 if !enabled {
 self.entries.remove(key);
 return AutoActivityObservation {
 expanded: false,
collapse_generation: None,
collapse: None,
 };
 }

 if active {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Expanded);
 let current = self.entries.get(key).copied();
 if latest {
 let visible_since = match current {
 Some(AutoActivityExpansion::Expanded { visible_since })
 | Some(AutoActivityExpansion::CollapsePending { visible_since, .. }) => {
 visible_since
 }
 Some(AutoActivityExpansion::Collapsed) | None => now,
 };
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::Expanded { visible_since },
 );
 return AutoActivityObservation {
 expanded: true,
collapse_generation: None,
collapse: None,
 };
 }

 match self.entries.get(key).copied() {
 Some(AutoActivityExpansion::Expanded) | None => {
 self.next_generation = self.next_generation.wrapping_add(1);
 let generation = self.next_generation;
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::CollapsePending(generation),
 );
 AutoActivityObservation {
 let visible_since = match current {
 Some(AutoActivityExpansion::Expanded { visible_since }) => visible_since,
 None => now,
 Some(AutoActivityExpansion::CollapsePending { .. }) => {
 return AutoActivityObservation {
 expanded: true,
collapse_generation: Some(generation),
 }
collapse: None,
 };
 }
 Some(AutoActivityExpansion::CollapsePending(_)) => AutoActivityObservation {
 expanded: true,
 collapse_generation: None,
 },
 Some(AutoActivityExpansion::Collapsed) => AutoActivityObservation {
 Some(AutoActivityExpansion::Collapsed) => {
 return AutoActivityObservation {
 expanded: false,
 collapse: None,
 };
 }
 };
 let remaining = AUTO_ACTIVITY_MIN_VISIBILITY
 .saturating_sub(now.saturating_duration_since(visible_since));
 if remaining.is_zero() {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Collapsed);
 AutoActivityObservation {
 expanded: false,
 collapse_generation: None,
 },
 collapse: None,
 }
 } else {
 self.next_generation = self.next_generation.wrapping_add(1);
 let generation = self.next_generation;
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::CollapsePending {
 generation,
 visible_since,
 },
 );
 AutoActivityObservation {
 expanded: true,
 collapse: Some((generation, remaining)),
 }
 }
 }

 fn finish_collapse(&mut self, key: &str, generation: u64) -> bool {
 if self.entries.get(key) == Some(&AutoActivityExpansion::CollapsePending(generation)) {
 if matches!(
 self.entries.get(key),
 Some(AutoActivityExpansion::CollapsePending {
 generation: pending,
 ..
 }) if *pending == generation
 ) {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Collapsed);
 true
Expand DownExpand Up@@ -621,13 +666,15 @@ impl ChatView {
 turn: usize,
 key: &str,
 enabled: bool,
active: bool,
latest: bool,
 cx: &mut Context<Self>,
 ) -> bool {
 let auto = self.auto_activity_expansions.observe(key, enabled, active);
 if let Some(generation) = auto.collapse_generation {
 let auto = self
 .auto_activity_expansions
 .observe(key, enabled, latest, Instant::now());
 if let Some((generation, delay)) = auto.collapse {
 let collapse_key = key.to_string();
 let timer = cx.background_executor().timer(AUTO_ACTIVITY_COLLAPSE_DELAY);
 let timer = cx.background_executor().timer(delay);
 cx.spawn(async move |this, cx| {
 timer.await;
 let _ = this.update(cx, |this, cx| {
Expand DownExpand Up@@ -1135,14 +1182,12 @@ impl ChatView {
 let mut rows = Vec::new();
 for (activity_index, entry) in activities.iter().enumerate() {
 let latest = activity_index + 1 == activities.len();
 if let EntryContent::Item(ItemContent::FileChange { changes, status }) = &entry.content
 {
 if let EntryContent::Item(ItemContent::FileChange { changes, .. }) = &entry.content {
 let turn = entry.turn;
 for (file_index, row) in live_edit_rows(changes, cwd).iter().enumerate() {
 let key = format!("activity-{}-file-{file_index}", entry.id);
 let enabled = auto_expand && row.counts.is_some();
 let active = latest && *status == ItemStatus::InProgress;
 let expanded = self.auto_activity_expanded(turn, &key, enabled, active, cx)
 let expanded = self.auto_activity_expanded(turn, &key, enabled, latest, cx)
 || self.expanded.contains(&key);
 let toggle_key = key.clone();
 rows.push(components::changed_files::file_edit_row(
Expand DownExpand Up@@ -1187,16 +1232,13 @@ impl ChatView {
 }
 let key = format!("activity-{}", entry.id);
 let turn = entry.turn;
 let (is_command, running) = match &entry.content {
 EntryContent::Item(ItemContent::CommandExecution { status, .. }) => {
 (true, *status == ItemStatus::InProgress)
 }
 _ => (false, false),
 };
 let is_command = matches!(
 &entry.content,
 EntryContent::Item(ItemContent::CommandExecution { .. })
 );
 let auto_enabled =
 auto_expand && is_command && self.workspace_store.read(cx).live_command_panel();
 let auto_expanded =
 self.auto_activity_expanded(turn, &key, auto_enabled, latest && running, cx);
 let auto_expanded = self.auto_activity_expanded(turn, &key, auto_enabled, latest, cx);
 let expanded = auto_expanded || self.expanded.contains(&key);
 let command_detail = if expanded {
 match &entry.content {
Expand DownExpand Up@@ -2252,7 +2294,7 @@ fn open_in_zed(cwd: &Path, window: &mut Window, cx: &mut App) {
#[cfg(test)]
mod tests {
 use super::{
 ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_COLLAPSE_DELAY, AutoActivityExpansions,
 ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansions,
 ChatView, ResidencyScope, markdown_entries_for_residency,
 };
 use crate::store::WorkspaceStore;
Expand All@@ -2263,62 +2305,131 @@ mod tests {
 Arc,
 atomic::{AtomicU64, Ordering},
 };
 use std::time::{Duration, Instant};
 use tcode_core::session::{EntryContent, Timeline, TimelineEntry, TurnMeta};

 static NEXT_RESIDENCY_TEST_ID: AtomicU64 = AtomicU64::new(0);

 #[test]
 fn settled_live_activity_stays_expanded_until_delayed_collapse() {
 fn latest_activity_stays_expanded_until_a_successor_appears() {
 let mut expansions = AutoActivityExpansions::default();
 let first_seen = Instant::now();

 let running = expansions.observe("activity-command", true, true);
 let running = expansions.observe("activity-command", true, true, first_seen);
 assert!(running.expanded);
 assert_eq!(running.collapse_generation, None);
 assert_eq!(running.collapse, None);

 let completed = expansions.observe("activity-command", true, false);
 let completed = expansions.observe(
 "activity-command",
 true,
 true,
 first_seen + Duration::from_secs(1),
 );
 assert!(completed.expanded);
 let generation = completed
 .collapse_generation
 .expect("completion should schedule a delayed collapse");
 assert_eq!(completed.collapse, None);

 let superseded = expansions.observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_secs(1),
 );
 assert!(!superseded.expanded);
 assert_eq!(superseded.collapse, None);
 assert_eq!(AUTO_ACTIVITY_MIN_VISIBILITY, Duration::from_millis(500));
 }

 let rerender = expansions.observe("activity-command", true, false);
 assert!(rerender.expanded);
 assert_eq!(rerender.collapse_generation, None);
 #[test]
 fn early_successor_only_waits_for_remaining_minimum_visibility() {
 let mut expansions = AutoActivityExpansions::default();
 let first_seen = Instant::now();
 expansions.observe("activity-command", true, true, first_seen);
 let superseded = expansions.observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_millis(200),
 );

 assert!(superseded.expanded);
 let (generation, delay) = superseded
 .collapse
 .expect("early successor should schedule the remaining delay");
 assert_eq!(delay, Duration::from_millis(300));
 assert!(expansions.finish_collapse("activity-command", generation));
 assert!(!expansions.observe("activity-command", true, false).expanded);
 assert_eq!(
 AUTO_ACTIVITY_COLLAPSE_DELAY,
 std::time::Duration::from_millis(500)
 assert!(
 !expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );
 }

 #[test]
 fn activity_first_seen_settled_still_opens_for_the_collapse_delay() {
 fn activity_first_seen_non_latest_still_gets_full_visibility_window() {
 let mut expansions = AutoActivityExpansions::default();
 let settled = expansions.observe("activity-command", true, false);
 let first_seen = Instant::now();
 let observed = expansions.observe("activity-command", true, false, first_seen);

 assert!(settled.expanded);
 let generation = settled
 .collapse_generation
 assert!(observed.expanded);
 let (generation, delay) = observed
 .collapse
 .expect("first observation should schedule a collapse");
 assert_eq!(delay, AUTO_ACTIVITY_MIN_VISIBILITY);
 assert!(expansions.finish_collapse("activity-command", generation));
 assert!(!expansions.observe("activity-command", true, false).expanded);
 }

 #[test]
 fn reactivated_activity_cancels_its_stale_delayed_collapse() {
 let mut expansions = AutoActivityExpansions::default();
 expansions.observe("activity-command", true, true);
 let generation = expansions
 .observe("activity-command", true, false)
 .collapse_generation
 .expect("completion should schedule a collapse");
 let first_seen = Instant::now();
 expansions.observe("activity-command", true, true, first_seen);
 let (generation, _) = expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_millis(100),
 )
 .collapse
 .expect("supersession should schedule a collapse");

 assert!(expansions.observe("activity-command", true, true).expanded);
 assert!(
 expansions
 .observe(
 "activity-command",
 true,
 true,
 first_seen + Duration::from_millis(200),
 )
 .expanded
 );
 assert!(!expansions.finish_collapse("activity-command", generation));
 assert!(expansions.observe("activity-command", true, true).expanded);
 assert!(
 !expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );

 assert!(!expansions.observe("activity-command", false, true).expanded);
 assert!(
 !expansions
 .observe(
 "activity-command",
 false,
 true,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );
 }

 #[test]
Expand Down
Loading

, '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
fix(chat): keep latest activity expanded#299

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 27, 2026
 Merged


fix(chat): keep latest activity expanded
#299
Show file tree
Hide file tree
 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


267 changes: 189 additions & 78 deletions
crates/ui/src/chat/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use std::cell::RefCell;
use std::collections::{HashMap, HashSet};
use std::ops::Range;
use std::sync::Arc;
use std::time::Duration;
use std::time::{Duration, Instant};

use std::path::{Path, PathBuf};

Expand All@@ -18,7 +18,7 @@ use crate::{
 icon::{Icon, IconName},
 sizing::Sizable as _,
};
use agent::{ItemContent, ItemStatus, RewindMode};
use agent::{ItemContent, RewindMode};
use gpui::{
 Anchor, AnyElement, App, AppContext as _, ClickEvent, ClipboardItem, Context, Entity,
 FollowMode, InteractiveElement as _, IntoElement, ListAlignment, ListOffset, ListState,
Expand DownExpand Up@@ -68,14 +68,19 @@ const TRAFFIC_LIGHT_INSET: f32 = 80.;
const TURN_GAP: f32 = 32.;
/// Large documents are parsed away from the UI executor before becoming resident.
const ASYNC_MARKDOWN_THRESHOLD_BYTES: usize = 4 * 1024;
/// Keep a just-settled live activity visible long enough for its final output
/// or rendered diff to register before the automatically expanded detail folds.
const AUTO_ACTIVITY_COLLAPSE_DELAY: Duration = Duration::from_millis(500);
/// Minimum time an automatically expanded activity stays visible. The latest
/// activity remains open beyond this until another activity supersedes it.
const AUTO_ACTIVITY_MIN_VISIBILITY: Duration = Duration::from_millis(500);

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum AutoActivityExpansion {
 Expanded,
 CollapsePending(u64),
 Expanded {
 visible_since: Instant,
 },
 CollapsePending {
 generation: u64,
 visible_since: Instant,
 },
 Collapsed,
}

Expand All@@ -88,54 +93,94 @@ struct AutoActivityExpansions {
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
struct AutoActivityObservation {
 expanded: bool,
collapse_generation: Option<u64>,
collapse: Option<(u64, Duration)>,
}

impl AutoActivityExpansions {
 fn observe(&mut self, key: &str, enabled: bool, active: bool) -> AutoActivityObservation {
 fn observe(
 &mut self,
 key: &str,
 enabled: bool,
 latest: bool,
 now: Instant,
 ) -> AutoActivityObservation {
 if !enabled {
 self.entries.remove(key);
 return AutoActivityObservation {
 expanded: false,
collapse_generation: None,
collapse: None,
 };
 }

 if active {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Expanded);
 let current = self.entries.get(key).copied();
 if latest {
 let visible_since = match current {
 Some(AutoActivityExpansion::Expanded { visible_since })
 | Some(AutoActivityExpansion::CollapsePending { visible_since, .. }) => {
 visible_since
 }
 Some(AutoActivityExpansion::Collapsed) | None => now,
 };
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::Expanded { visible_since },
 );
 return AutoActivityObservation {
 expanded: true,
collapse_generation: None,
collapse: None,
 };
 }

 match self.entries.get(key).copied() {
 Some(AutoActivityExpansion::Expanded) | None => {
 self.next_generation = self.next_generation.wrapping_add(1);
 let generation = self.next_generation;
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::CollapsePending(generation),
 );
 AutoActivityObservation {
 let visible_since = match current {
 Some(AutoActivityExpansion::Expanded { visible_since }) => visible_since,
 None => now,
 Some(AutoActivityExpansion::CollapsePending { .. }) => {
 return AutoActivityObservation {
 expanded: true,
collapse_generation: Some(generation),
 }
collapse: None,
 };
 }
 Some(AutoActivityExpansion::CollapsePending(_)) => AutoActivityObservation {
 expanded: true,
 collapse_generation: None,
 },
 Some(AutoActivityExpansion::Collapsed) => AutoActivityObservation {
 Some(AutoActivityExpansion::Collapsed) => {
 return AutoActivityObservation {
 expanded: false,
 collapse: None,
 };
 }
 };
 let remaining = AUTO_ACTIVITY_MIN_VISIBILITY
 .saturating_sub(now.saturating_duration_since(visible_since));
 if remaining.is_zero() {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Collapsed);
 AutoActivityObservation {
 expanded: false,
 collapse_generation: None,
 },
 collapse: None,
 }
 } else {
 self.next_generation = self.next_generation.wrapping_add(1);
 let generation = self.next_generation;
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::CollapsePending {
 generation,
 visible_since,
 },
 );
 AutoActivityObservation {
 expanded: true,
 collapse: Some((generation, remaining)),
 }
 }
 }

 fn finish_collapse(&mut self, key: &str, generation: u64) -> bool {
 if self.entries.get(key) == Some(&AutoActivityExpansion::CollapsePending(generation)) {
 if matches!(
 self.entries.get(key),
 Some(AutoActivityExpansion::CollapsePending {
 generation: pending,
 ..
 }) if *pending == generation
 ) {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Collapsed);
 true
Expand DownExpand Up@@ -621,13 +666,15 @@ impl ChatView {
 turn: usize,
 key: &str,
 enabled: bool,
active: bool,
latest: bool,
 cx: &mut Context<Self>,
 ) -> bool {
 let auto = self.auto_activity_expansions.observe(key, enabled, active);
 if let Some(generation) = auto.collapse_generation {
 let auto = self
 .auto_activity_expansions
 .observe(key, enabled, latest, Instant::now());
 if let Some((generation, delay)) = auto.collapse {
 let collapse_key = key.to_string();
 let timer = cx.background_executor().timer(AUTO_ACTIVITY_COLLAPSE_DELAY);
 let timer = cx.background_executor().timer(delay);
 cx.spawn(async move |this, cx| {
 timer.await;
 let _ = this.update(cx, |this, cx| {
Expand DownExpand Up@@ -1135,14 +1182,12 @@ impl ChatView {
 let mut rows = Vec::new();
 for (activity_index, entry) in activities.iter().enumerate() {
 let latest = activity_index + 1 == activities.len();
 if let EntryContent::Item(ItemContent::FileChange { changes, status }) = &entry.content
 {
 if let EntryContent::Item(ItemContent::FileChange { changes, .. }) = &entry.content {
 let turn = entry.turn;
 for (file_index, row) in live_edit_rows(changes, cwd).iter().enumerate() {
 let key = format!("activity-{}-file-{file_index}", entry.id);
 let enabled = auto_expand && row.counts.is_some();
 let active = latest && *status == ItemStatus::InProgress;
 let expanded = self.auto_activity_expanded(turn, &key, enabled, active, cx)
 let expanded = self.auto_activity_expanded(turn, &key, enabled, latest, cx)
 || self.expanded.contains(&key);
 let toggle_key = key.clone();
 rows.push(components::changed_files::file_edit_row(
Expand DownExpand Up@@ -1187,16 +1232,13 @@ impl ChatView {
 }
 let key = format!("activity-{}", entry.id);
 let turn = entry.turn;
 let (is_command, running) = match &entry.content {
 EntryContent::Item(ItemContent::CommandExecution { status, .. }) => {
 (true, *status == ItemStatus::InProgress)
 }
 _ => (false, false),
 };
 let is_command = matches!(
 &entry.content,
 EntryContent::Item(ItemContent::CommandExecution { .. })
 );
 let auto_enabled =
 auto_expand && is_command && self.workspace_store.read(cx).live_command_panel();
 let auto_expanded =
 self.auto_activity_expanded(turn, &key, auto_enabled, latest && running, cx);
 let auto_expanded = self.auto_activity_expanded(turn, &key, auto_enabled, latest, cx);
 let expanded = auto_expanded || self.expanded.contains(&key);
 let command_detail = if expanded {
 match &entry.content {
Expand DownExpand Up@@ -2252,7 +2294,7 @@ fn open_in_zed(cwd: &Path, window: &mut Window, cx: &mut App) {
#[cfg(test)]
mod tests {
 use super::{
 ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_COLLAPSE_DELAY, AutoActivityExpansions,
 ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansions,
 ChatView, ResidencyScope, markdown_entries_for_residency,
 };
 use crate::store::WorkspaceStore;
Expand All@@ -2263,62 +2305,131 @@ mod tests {
 Arc,
 atomic::{AtomicU64, Ordering},
 };
 use std::time::{Duration, Instant};
 use tcode_core::session::{EntryContent, Timeline, TimelineEntry, TurnMeta};

 static NEXT_RESIDENCY_TEST_ID: AtomicU64 = AtomicU64::new(0);

 #[test]
 fn settled_live_activity_stays_expanded_until_delayed_collapse() {
 fn latest_activity_stays_expanded_until_a_successor_appears() {
 let mut expansions = AutoActivityExpansions::default();
 let first_seen = Instant::now();

 let running = expansions.observe("activity-command", true, true);
 let running = expansions.observe("activity-command", true, true, first_seen);
 assert!(running.expanded);
 assert_eq!(running.collapse_generation, None);
 assert_eq!(running.collapse, None);

 let completed = expansions.observe("activity-command", true, false);
 let completed = expansions.observe(
 "activity-command",
 true,
 true,
 first_seen + Duration::from_secs(1),
 );
 assert!(completed.expanded);
 let generation = completed
 .collapse_generation
 .expect("completion should schedule a delayed collapse");
 assert_eq!(completed.collapse, None);

 let superseded = expansions.observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_secs(1),
 );
 assert!(!superseded.expanded);
 assert_eq!(superseded.collapse, None);
 assert_eq!(AUTO_ACTIVITY_MIN_VISIBILITY, Duration::from_millis(500));
 }

 let rerender = expansions.observe("activity-command", true, false);
 assert!(rerender.expanded);
 assert_eq!(rerender.collapse_generation, None);
 #[test]
 fn early_successor_only_waits_for_remaining_minimum_visibility() {
 let mut expansions = AutoActivityExpansions::default();
 let first_seen = Instant::now();
 expansions.observe("activity-command", true, true, first_seen);
 let superseded = expansions.observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_millis(200),
 );

 assert!(superseded.expanded);
 let (generation, delay) = superseded
 .collapse
 .expect("early successor should schedule the remaining delay");
 assert_eq!(delay, Duration::from_millis(300));
 assert!(expansions.finish_collapse("activity-command", generation));
 assert!(!expansions.observe("activity-command", true, false).expanded);
 assert_eq!(
 AUTO_ACTIVITY_COLLAPSE_DELAY,
 std::time::Duration::from_millis(500)
 assert!(
 !expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );
 }

 #[test]
 fn activity_first_seen_settled_still_opens_for_the_collapse_delay() {
 fn activity_first_seen_non_latest_still_gets_full_visibility_window() {
 let mut expansions = AutoActivityExpansions::default();
 let settled = expansions.observe("activity-command", true, false);
 let first_seen = Instant::now();
 let observed = expansions.observe("activity-command", true, false, first_seen);

 assert!(settled.expanded);
 let generation = settled
 .collapse_generation
 assert!(observed.expanded);
 let (generation, delay) = observed
 .collapse
 .expect("first observation should schedule a collapse");
 assert_eq!(delay, AUTO_ACTIVITY_MIN_VISIBILITY);
 assert!(expansions.finish_collapse("activity-command", generation));
 assert!(!expansions.observe("activity-command", true, false).expanded);
 }

 #[test]
 fn reactivated_activity_cancels_its_stale_delayed_collapse() {
 let mut expansions = AutoActivityExpansions::default();
 expansions.observe("activity-command", true, true);
 let generation = expansions
 .observe("activity-command", true, false)
 .collapse_generation
 .expect("completion should schedule a collapse");
 let first_seen = Instant::now();
 expansions.observe("activity-command", true, true, first_seen);
 let (generation, _) = expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_millis(100),
 )
 .collapse
 .expect("supersession should schedule a collapse");

 assert!(expansions.observe("activity-command", true, true).expanded);
 assert!(
 expansions
 .observe(
 "activity-command",
 true,
 true,
 first_seen + Duration::from_millis(200),
 )
 .expanded
 );
 assert!(!expansions.finish_collapse("activity-command", generation));
 assert!(expansions.observe("activity-command", true, true).expanded);
 assert!(
 !expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );

 assert!(!expansions.observe("activity-command", false, true).expanded);
 assert!(
 !expansions
 .observe(
 "activity-command",
 false,
 true,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );
 }

 #[test]
Expand Down
Loading

, '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
fix(chat): keep latest activity expanded#299

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 27, 2026
 Merged


fix(chat): keep latest activity expanded
#299
Show file tree
Hide file tree
 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


267 changes: 189 additions & 78 deletions
crates/ui/src/chat/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use std::cell::RefCell;
use std::collections::{HashMap, HashSet};
use std::ops::Range;
use std::sync::Arc;
use std::time::Duration;
use std::time::{Duration, Instant};

use std::path::{Path, PathBuf};

Expand All@@ -18,7 +18,7 @@ use crate::{
 icon::{Icon, IconName},
 sizing::Sizable as _,
};
use agent::{ItemContent, ItemStatus, RewindMode};
use agent::{ItemContent, RewindMode};
use gpui::{
 Anchor, AnyElement, App, AppContext as _, ClickEvent, ClipboardItem, Context, Entity,
 FollowMode, InteractiveElement as _, IntoElement, ListAlignment, ListOffset, ListState,
Expand DownExpand Up@@ -68,14 +68,19 @@ const TRAFFIC_LIGHT_INSET: f32 = 80.;
const TURN_GAP: f32 = 32.;
/// Large documents are parsed away from the UI executor before becoming resident.
const ASYNC_MARKDOWN_THRESHOLD_BYTES: usize = 4 * 1024;
/// Keep a just-settled live activity visible long enough for its final output
/// or rendered diff to register before the automatically expanded detail folds.
const AUTO_ACTIVITY_COLLAPSE_DELAY: Duration = Duration::from_millis(500);
/// Minimum time an automatically expanded activity stays visible. The latest
/// activity remains open beyond this until another activity supersedes it.
const AUTO_ACTIVITY_MIN_VISIBILITY: Duration = Duration::from_millis(500);

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum AutoActivityExpansion {
 Expanded,
 CollapsePending(u64),
 Expanded {
 visible_since: Instant,
 },
 CollapsePending {
 generation: u64,
 visible_since: Instant,
 },
 Collapsed,
}

Expand All@@ -88,54 +93,94 @@ struct AutoActivityExpansions {
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
struct AutoActivityObservation {
 expanded: bool,
collapse_generation: Option<u64>,
collapse: Option<(u64, Duration)>,
}

impl AutoActivityExpansions {
 fn observe(&mut self, key: &str, enabled: bool, active: bool) -> AutoActivityObservation {
 fn observe(
 &mut self,
 key: &str,
 enabled: bool,
 latest: bool,
 now: Instant,
 ) -> AutoActivityObservation {
 if !enabled {
 self.entries.remove(key);
 return AutoActivityObservation {
 expanded: false,
collapse_generation: None,
collapse: None,
 };
 }

 if active {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Expanded);
 let current = self.entries.get(key).copied();
 if latest {
 let visible_since = match current {
 Some(AutoActivityExpansion::Expanded { visible_since })
 | Some(AutoActivityExpansion::CollapsePending { visible_since, .. }) => {
 visible_since
 }
 Some(AutoActivityExpansion::Collapsed) | None => now,
 };
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::Expanded { visible_since },
 );
 return AutoActivityObservation {
 expanded: true,
collapse_generation: None,
collapse: None,
 };
 }

 match self.entries.get(key).copied() {
 Some(AutoActivityExpansion::Expanded) | None => {
 self.next_generation = self.next_generation.wrapping_add(1);
 let generation = self.next_generation;
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::CollapsePending(generation),
 );
 AutoActivityObservation {
 let visible_since = match current {
 Some(AutoActivityExpansion::Expanded { visible_since }) => visible_since,
 None => now,
 Some(AutoActivityExpansion::CollapsePending { .. }) => {
 return AutoActivityObservation {
 expanded: true,
collapse_generation: Some(generation),
 }
collapse: None,
 };
 }
 Some(AutoActivityExpansion::CollapsePending(_)) => AutoActivityObservation {
 expanded: true,
 collapse_generation: None,
 },
 Some(AutoActivityExpansion::Collapsed) => AutoActivityObservation {
 Some(AutoActivityExpansion::Collapsed) => {
 return AutoActivityObservation {
 expanded: false,
 collapse: None,
 };
 }
 };
 let remaining = AUTO_ACTIVITY_MIN_VISIBILITY
 .saturating_sub(now.saturating_duration_since(visible_since));
 if remaining.is_zero() {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Collapsed);
 AutoActivityObservation {
 expanded: false,
 collapse_generation: None,
 },
 collapse: None,
 }
 } else {
 self.next_generation = self.next_generation.wrapping_add(1);
 let generation = self.next_generation;
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::CollapsePending {
 generation,
 visible_since,
 },
 );
 AutoActivityObservation {
 expanded: true,
 collapse: Some((generation, remaining)),
 }
 }
 }

 fn finish_collapse(&mut self, key: &str, generation: u64) -> bool {
 if self.entries.get(key) == Some(&AutoActivityExpansion::CollapsePending(generation)) {
 if matches!(
 self.entries.get(key),
 Some(AutoActivityExpansion::CollapsePending {
 generation: pending,
 ..
 }) if *pending == generation
 ) {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Collapsed);
 true
Expand DownExpand Up@@ -621,13 +666,15 @@ impl ChatView {
 turn: usize,
 key: &str,
 enabled: bool,
active: bool,
latest: bool,
 cx: &mut Context<Self>,
 ) -> bool {
 let auto = self.auto_activity_expansions.observe(key, enabled, active);
 if let Some(generation) = auto.collapse_generation {
 let auto = self
 .auto_activity_expansions
 .observe(key, enabled, latest, Instant::now());
 if let Some((generation, delay)) = auto.collapse {
 let collapse_key = key.to_string();
 let timer = cx.background_executor().timer(AUTO_ACTIVITY_COLLAPSE_DELAY);
 let timer = cx.background_executor().timer(delay);
 cx.spawn(async move |this, cx| {
 timer.await;
 let _ = this.update(cx, |this, cx| {
Expand DownExpand Up@@ -1135,14 +1182,12 @@ impl ChatView {
 let mut rows = Vec::new();
 for (activity_index, entry) in activities.iter().enumerate() {
 let latest = activity_index + 1 == activities.len();
 if let EntryContent::Item(ItemContent::FileChange { changes, status }) = &entry.content
 {
 if let EntryContent::Item(ItemContent::FileChange { changes, .. }) = &entry.content {
 let turn = entry.turn;
 for (file_index, row) in live_edit_rows(changes, cwd).iter().enumerate() {
 let key = format!("activity-{}-file-{file_index}", entry.id);
 let enabled = auto_expand && row.counts.is_some();
 let active = latest && *status == ItemStatus::InProgress;
 let expanded = self.auto_activity_expanded(turn, &key, enabled, active, cx)
 let expanded = self.auto_activity_expanded(turn, &key, enabled, latest, cx)
 || self.expanded.contains(&key);
 let toggle_key = key.clone();
 rows.push(components::changed_files::file_edit_row(
Expand DownExpand Up@@ -1187,16 +1232,13 @@ impl ChatView {
 }
 let key = format!("activity-{}", entry.id);
 let turn = entry.turn;
 let (is_command, running) = match &entry.content {
 EntryContent::Item(ItemContent::CommandExecution { status, .. }) => {
 (true, *status == ItemStatus::InProgress)
 }
 _ => (false, false),
 };
 let is_command = matches!(
 &entry.content,
 EntryContent::Item(ItemContent::CommandExecution { .. })
 );
 let auto_enabled =
 auto_expand && is_command && self.workspace_store.read(cx).live_command_panel();
 let auto_expanded =
 self.auto_activity_expanded(turn, &key, auto_enabled, latest && running, cx);
 let auto_expanded = self.auto_activity_expanded(turn, &key, auto_enabled, latest, cx);
 let expanded = auto_expanded || self.expanded.contains(&key);
 let command_detail = if expanded {
 match &entry.content {
Expand DownExpand Up@@ -2252,7 +2294,7 @@ fn open_in_zed(cwd: &Path, window: &mut Window, cx: &mut App) {
#[cfg(test)]
mod tests {
 use super::{
 ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_COLLAPSE_DELAY, AutoActivityExpansions,
 ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansions,
 ChatView, ResidencyScope, markdown_entries_for_residency,
 };
 use crate::store::WorkspaceStore;
Expand All@@ -2263,62 +2305,131 @@ mod tests {
 Arc,
 atomic::{AtomicU64, Ordering},
 };
 use std::time::{Duration, Instant};
 use tcode_core::session::{EntryContent, Timeline, TimelineEntry, TurnMeta};

 static NEXT_RESIDENCY_TEST_ID: AtomicU64 = AtomicU64::new(0);

 #[test]
 fn settled_live_activity_stays_expanded_until_delayed_collapse() {
 fn latest_activity_stays_expanded_until_a_successor_appears() {
 let mut expansions = AutoActivityExpansions::default();
 let first_seen = Instant::now();

 let running = expansions.observe("activity-command", true, true);
 let running = expansions.observe("activity-command", true, true, first_seen);
 assert!(running.expanded);
 assert_eq!(running.collapse_generation, None);
 assert_eq!(running.collapse, None);

 let completed = expansions.observe("activity-command", true, false);
 let completed = expansions.observe(
 "activity-command",
 true,
 true,
 first_seen + Duration::from_secs(1),
 );
 assert!(completed.expanded);
 let generation = completed
 .collapse_generation
 .expect("completion should schedule a delayed collapse");
 assert_eq!(completed.collapse, None);

 let superseded = expansions.observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_secs(1),
 );
 assert!(!superseded.expanded);
 assert_eq!(superseded.collapse, None);
 assert_eq!(AUTO_ACTIVITY_MIN_VISIBILITY, Duration::from_millis(500));
 }

 let rerender = expansions.observe("activity-command", true, false);
 assert!(rerender.expanded);
 assert_eq!(rerender.collapse_generation, None);
 #[test]
 fn early_successor_only_waits_for_remaining_minimum_visibility() {
 let mut expansions = AutoActivityExpansions::default();
 let first_seen = Instant::now();
 expansions.observe("activity-command", true, true, first_seen);
 let superseded = expansions.observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_millis(200),
 );

 assert!(superseded.expanded);
 let (generation, delay) = superseded
 .collapse
 .expect("early successor should schedule the remaining delay");
 assert_eq!(delay, Duration::from_millis(300));
 assert!(expansions.finish_collapse("activity-command", generation));
 assert!(!expansions.observe("activity-command", true, false).expanded);
 assert_eq!(
 AUTO_ACTIVITY_COLLAPSE_DELAY,
 std::time::Duration::from_millis(500)
 assert!(
 !expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );
 }

 #[test]
 fn activity_first_seen_settled_still_opens_for_the_collapse_delay() {
 fn activity_first_seen_non_latest_still_gets_full_visibility_window() {
 let mut expansions = AutoActivityExpansions::default();
 let settled = expansions.observe("activity-command", true, false);
 let first_seen = Instant::now();
 let observed = expansions.observe("activity-command", true, false, first_seen);

 assert!(settled.expanded);
 let generation = settled
 .collapse_generation
 assert!(observed.expanded);
 let (generation, delay) = observed
 .collapse
 .expect("first observation should schedule a collapse");
 assert_eq!(delay, AUTO_ACTIVITY_MIN_VISIBILITY);
 assert!(expansions.finish_collapse("activity-command", generation));
 assert!(!expansions.observe("activity-command", true, false).expanded);
 }

 #[test]
 fn reactivated_activity_cancels_its_stale_delayed_collapse() {
 let mut expansions = AutoActivityExpansions::default();
 expansions.observe("activity-command", true, true);
 let generation = expansions
 .observe("activity-command", true, false)
 .collapse_generation
 .expect("completion should schedule a collapse");
 let first_seen = Instant::now();
 expansions.observe("activity-command", true, true, first_seen);
 let (generation, _) = expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_millis(100),
 )
 .collapse
 .expect("supersession should schedule a collapse");

 assert!(expansions.observe("activity-command", true, true).expanded);
 assert!(
 expansions
 .observe(
 "activity-command",
 true,
 true,
 first_seen + Duration::from_millis(200),
 )
 .expanded
 );
 assert!(!expansions.finish_collapse("activity-command", generation));
 assert!(expansions.observe("activity-command", true, true).expanded);
 assert!(
 !expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );

 assert!(!expansions.observe("activity-command", false, true).expanded);
 assert!(
 !expansions
 .observe(
 "activity-command",
 false,
 true,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );
 }

 #[test]
Expand Down
Loading

, '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
fix(chat): keep latest activity expanded#299

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 27, 2026
 Merged


fix(chat): keep latest activity expanded
#299
Show file tree
Hide file tree
 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


267 changes: 189 additions & 78 deletions
crates/ui/src/chat/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use std::cell::RefCell;
use std::collections::{HashMap, HashSet};
use std::ops::Range;
use std::sync::Arc;
use std::time::Duration;
use std::time::{Duration, Instant};

use std::path::{Path, PathBuf};

Expand All@@ -18,7 +18,7 @@ use crate::{
 icon::{Icon, IconName},
 sizing::Sizable as _,
};
use agent::{ItemContent, ItemStatus, RewindMode};
use agent::{ItemContent, RewindMode};
use gpui::{
 Anchor, AnyElement, App, AppContext as _, ClickEvent, ClipboardItem, Context, Entity,
 FollowMode, InteractiveElement as _, IntoElement, ListAlignment, ListOffset, ListState,
Expand DownExpand Up@@ -68,14 +68,19 @@ const TRAFFIC_LIGHT_INSET: f32 = 80.;
const TURN_GAP: f32 = 32.;
/// Large documents are parsed away from the UI executor before becoming resident.
const ASYNC_MARKDOWN_THRESHOLD_BYTES: usize = 4 * 1024;
/// Keep a just-settled live activity visible long enough for its final output
/// or rendered diff to register before the automatically expanded detail folds.
const AUTO_ACTIVITY_COLLAPSE_DELAY: Duration = Duration::from_millis(500);
/// Minimum time an automatically expanded activity stays visible. The latest
/// activity remains open beyond this until another activity supersedes it.
const AUTO_ACTIVITY_MIN_VISIBILITY: Duration = Duration::from_millis(500);

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum AutoActivityExpansion {
 Expanded,
 CollapsePending(u64),
 Expanded {
 visible_since: Instant,
 },
 CollapsePending {
 generation: u64,
 visible_since: Instant,
 },
 Collapsed,
}

Expand All@@ -88,54 +93,94 @@ struct AutoActivityExpansions {
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
struct AutoActivityObservation {
 expanded: bool,
collapse_generation: Option<u64>,
collapse: Option<(u64, Duration)>,
}

impl AutoActivityExpansions {
 fn observe(&mut self, key: &str, enabled: bool, active: bool) -> AutoActivityObservation {
 fn observe(
 &mut self,
 key: &str,
 enabled: bool,
 latest: bool,
 now: Instant,
 ) -> AutoActivityObservation {
 if !enabled {
 self.entries.remove(key);
 return AutoActivityObservation {
 expanded: false,
collapse_generation: None,
collapse: None,
 };
 }

 if active {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Expanded);
 let current = self.entries.get(key).copied();
 if latest {
 let visible_since = match current {
 Some(AutoActivityExpansion::Expanded { visible_since })
 | Some(AutoActivityExpansion::CollapsePending { visible_since, .. }) => {
 visible_since
 }
 Some(AutoActivityExpansion::Collapsed) | None => now,
 };
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::Expanded { visible_since },
 );
 return AutoActivityObservation {
 expanded: true,
collapse_generation: None,
collapse: None,
 };
 }

 match self.entries.get(key).copied() {
 Some(AutoActivityExpansion::Expanded) | None => {
 self.next_generation = self.next_generation.wrapping_add(1);
 let generation = self.next_generation;
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::CollapsePending(generation),
 );
 AutoActivityObservation {
 let visible_since = match current {
 Some(AutoActivityExpansion::Expanded { visible_since }) => visible_since,
 None => now,
 Some(AutoActivityExpansion::CollapsePending { .. }) => {
 return AutoActivityObservation {
 expanded: true,
collapse_generation: Some(generation),
 }
collapse: None,
 };
 }
 Some(AutoActivityExpansion::CollapsePending(_)) => AutoActivityObservation {
 expanded: true,
 collapse_generation: None,
 },
 Some(AutoActivityExpansion::Collapsed) => AutoActivityObservation {
 Some(AutoActivityExpansion::Collapsed) => {
 return AutoActivityObservation {
 expanded: false,
 collapse: None,
 };
 }
 };
 let remaining = AUTO_ACTIVITY_MIN_VISIBILITY
 .saturating_sub(now.saturating_duration_since(visible_since));
 if remaining.is_zero() {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Collapsed);
 AutoActivityObservation {
 expanded: false,
 collapse_generation: None,
 },
 collapse: None,
 }
 } else {
 self.next_generation = self.next_generation.wrapping_add(1);
 let generation = self.next_generation;
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::CollapsePending {
 generation,
 visible_since,
 },
 );
 AutoActivityObservation {
 expanded: true,
 collapse: Some((generation, remaining)),
 }
 }
 }

 fn finish_collapse(&mut self, key: &str, generation: u64) -> bool {
 if self.entries.get(key) == Some(&AutoActivityExpansion::CollapsePending(generation)) {
 if matches!(
 self.entries.get(key),
 Some(AutoActivityExpansion::CollapsePending {
 generation: pending,
 ..
 }) if *pending == generation
 ) {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Collapsed);
 true
Expand DownExpand Up@@ -621,13 +666,15 @@ impl ChatView {
 turn: usize,
 key: &str,
 enabled: bool,
active: bool,
latest: bool,
 cx: &mut Context<Self>,
 ) -> bool {
 let auto = self.auto_activity_expansions.observe(key, enabled, active);
 if let Some(generation) = auto.collapse_generation {
 let auto = self
 .auto_activity_expansions
 .observe(key, enabled, latest, Instant::now());
 if let Some((generation, delay)) = auto.collapse {
 let collapse_key = key.to_string();
 let timer = cx.background_executor().timer(AUTO_ACTIVITY_COLLAPSE_DELAY);
 let timer = cx.background_executor().timer(delay);
 cx.spawn(async move |this, cx| {
 timer.await;
 let _ = this.update(cx, |this, cx| {
Expand DownExpand Up@@ -1135,14 +1182,12 @@ impl ChatView {
 let mut rows = Vec::new();
 for (activity_index, entry) in activities.iter().enumerate() {
 let latest = activity_index + 1 == activities.len();
 if let EntryContent::Item(ItemContent::FileChange { changes, status }) = &entry.content
 {
 if let EntryContent::Item(ItemContent::FileChange { changes, .. }) = &entry.content {
 let turn = entry.turn;
 for (file_index, row) in live_edit_rows(changes, cwd).iter().enumerate() {
 let key = format!("activity-{}-file-{file_index}", entry.id);
 let enabled = auto_expand && row.counts.is_some();
 let active = latest && *status == ItemStatus::InProgress;
 let expanded = self.auto_activity_expanded(turn, &key, enabled, active, cx)
 let expanded = self.auto_activity_expanded(turn, &key, enabled, latest, cx)
 || self.expanded.contains(&key);
 let toggle_key = key.clone();
 rows.push(components::changed_files::file_edit_row(
Expand DownExpand Up@@ -1187,16 +1232,13 @@ impl ChatView {
 }
 let key = format!("activity-{}", entry.id);
 let turn = entry.turn;
 let (is_command, running) = match &entry.content {
 EntryContent::Item(ItemContent::CommandExecution { status, .. }) => {
 (true, *status == ItemStatus::InProgress)
 }
 _ => (false, false),
 };
 let is_command = matches!(
 &entry.content,
 EntryContent::Item(ItemContent::CommandExecution { .. })
 );
 let auto_enabled =
 auto_expand && is_command && self.workspace_store.read(cx).live_command_panel();
 let auto_expanded =
 self.auto_activity_expanded(turn, &key, auto_enabled, latest && running, cx);
 let auto_expanded = self.auto_activity_expanded(turn, &key, auto_enabled, latest, cx);
 let expanded = auto_expanded || self.expanded.contains(&key);
 let command_detail = if expanded {
 match &entry.content {
Expand DownExpand Up@@ -2252,7 +2294,7 @@ fn open_in_zed(cwd: &Path, window: &mut Window, cx: &mut App) {
#[cfg(test)]
mod tests {
 use super::{
 ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_COLLAPSE_DELAY, AutoActivityExpansions,
 ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansions,
 ChatView, ResidencyScope, markdown_entries_for_residency,
 };
 use crate::store::WorkspaceStore;
Expand All@@ -2263,62 +2305,131 @@ mod tests {
 Arc,
 atomic::{AtomicU64, Ordering},
 };
 use std::time::{Duration, Instant};
 use tcode_core::session::{EntryContent, Timeline, TimelineEntry, TurnMeta};

 static NEXT_RESIDENCY_TEST_ID: AtomicU64 = AtomicU64::new(0);

 #[test]
 fn settled_live_activity_stays_expanded_until_delayed_collapse() {
 fn latest_activity_stays_expanded_until_a_successor_appears() {
 let mut expansions = AutoActivityExpansions::default();
 let first_seen = Instant::now();

 let running = expansions.observe("activity-command", true, true);
 let running = expansions.observe("activity-command", true, true, first_seen);
 assert!(running.expanded);
 assert_eq!(running.collapse_generation, None);
 assert_eq!(running.collapse, None);

 let completed = expansions.observe("activity-command", true, false);
 let completed = expansions.observe(
 "activity-command",
 true,
 true,
 first_seen + Duration::from_secs(1),
 );
 assert!(completed.expanded);
 let generation = completed
 .collapse_generation
 .expect("completion should schedule a delayed collapse");
 assert_eq!(completed.collapse, None);

 let superseded = expansions.observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_secs(1),
 );
 assert!(!superseded.expanded);
 assert_eq!(superseded.collapse, None);
 assert_eq!(AUTO_ACTIVITY_MIN_VISIBILITY, Duration::from_millis(500));
 }

 let rerender = expansions.observe("activity-command", true, false);
 assert!(rerender.expanded);
 assert_eq!(rerender.collapse_generation, None);
 #[test]
 fn early_successor_only_waits_for_remaining_minimum_visibility() {
 let mut expansions = AutoActivityExpansions::default();
 let first_seen = Instant::now();
 expansions.observe("activity-command", true, true, first_seen);
 let superseded = expansions.observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_millis(200),
 );

 assert!(superseded.expanded);
 let (generation, delay) = superseded
 .collapse
 .expect("early successor should schedule the remaining delay");
 assert_eq!(delay, Duration::from_millis(300));
 assert!(expansions.finish_collapse("activity-command", generation));
 assert!(!expansions.observe("activity-command", true, false).expanded);
 assert_eq!(
 AUTO_ACTIVITY_COLLAPSE_DELAY,
 std::time::Duration::from_millis(500)
 assert!(
 !expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );
 }

 #[test]
 fn activity_first_seen_settled_still_opens_for_the_collapse_delay() {
 fn activity_first_seen_non_latest_still_gets_full_visibility_window() {
 let mut expansions = AutoActivityExpansions::default();
 let settled = expansions.observe("activity-command", true, false);
 let first_seen = Instant::now();
 let observed = expansions.observe("activity-command", true, false, first_seen);

 assert!(settled.expanded);
 let generation = settled
 .collapse_generation
 assert!(observed.expanded);
 let (generation, delay) = observed
 .collapse
 .expect("first observation should schedule a collapse");
 assert_eq!(delay, AUTO_ACTIVITY_MIN_VISIBILITY);
 assert!(expansions.finish_collapse("activity-command", generation));
 assert!(!expansions.observe("activity-command", true, false).expanded);
 }

 #[test]
 fn reactivated_activity_cancels_its_stale_delayed_collapse() {
 let mut expansions = AutoActivityExpansions::default();
 expansions.observe("activity-command", true, true);
 let generation = expansions
 .observe("activity-command", true, false)
 .collapse_generation
 .expect("completion should schedule a collapse");
 let first_seen = Instant::now();
 expansions.observe("activity-command", true, true, first_seen);
 let (generation, _) = expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_millis(100),
 )
 .collapse
 .expect("supersession should schedule a collapse");

 assert!(expansions.observe("activity-command", true, true).expanded);
 assert!(
 expansions
 .observe(
 "activity-command",
 true,
 true,
 first_seen + Duration::from_millis(200),
 )
 .expanded
 );
 assert!(!expansions.finish_collapse("activity-command", generation));
 assert!(expansions.observe("activity-command", true, true).expanded);
 assert!(
 !expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );

 assert!(!expansions.observe("activity-command", false, true).expanded);
 assert!(
 !expansions
 .observe(
 "activity-command",
 false,
 true,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );
 }

 #[test]
Expand Down
Loading

, '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
fix(chat): keep latest activity expanded#299

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 27, 2026
 Merged


fix(chat): keep latest activity expanded
#299
Show file tree
Hide file tree
 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


267 changes: 189 additions & 78 deletions
crates/ui/src/chat/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use std::cell::RefCell;
use std::collections::{HashMap, HashSet};
use std::ops::Range;
use std::sync::Arc;
use std::time::Duration;
use std::time::{Duration, Instant};

use std::path::{Path, PathBuf};

Expand All@@ -18,7 +18,7 @@ use crate::{
 icon::{Icon, IconName},
 sizing::Sizable as _,
};
use agent::{ItemContent, ItemStatus, RewindMode};
use agent::{ItemContent, RewindMode};
use gpui::{
 Anchor, AnyElement, App, AppContext as _, ClickEvent, ClipboardItem, Context, Entity,
 FollowMode, InteractiveElement as _, IntoElement, ListAlignment, ListOffset, ListState,
Expand DownExpand Up@@ -68,14 +68,19 @@ const TRAFFIC_LIGHT_INSET: f32 = 80.;
const TURN_GAP: f32 = 32.;
/// Large documents are parsed away from the UI executor before becoming resident.
const ASYNC_MARKDOWN_THRESHOLD_BYTES: usize = 4 * 1024;
/// Keep a just-settled live activity visible long enough for its final output
/// or rendered diff to register before the automatically expanded detail folds.
const AUTO_ACTIVITY_COLLAPSE_DELAY: Duration = Duration::from_millis(500);
/// Minimum time an automatically expanded activity stays visible. The latest
/// activity remains open beyond this until another activity supersedes it.
const AUTO_ACTIVITY_MIN_VISIBILITY: Duration = Duration::from_millis(500);

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum AutoActivityExpansion {
 Expanded,
 CollapsePending(u64),
 Expanded {
 visible_since: Instant,
 },
 CollapsePending {
 generation: u64,
 visible_since: Instant,
 },
 Collapsed,
}

Expand All@@ -88,54 +93,94 @@ struct AutoActivityExpansions {
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
struct AutoActivityObservation {
 expanded: bool,
collapse_generation: Option<u64>,
collapse: Option<(u64, Duration)>,
}

impl AutoActivityExpansions {
 fn observe(&mut self, key: &str, enabled: bool, active: bool) -> AutoActivityObservation {
 fn observe(
 &mut self,
 key: &str,
 enabled: bool,
 latest: bool,
 now: Instant,
 ) -> AutoActivityObservation {
 if !enabled {
 self.entries.remove(key);
 return AutoActivityObservation {
 expanded: false,
collapse_generation: None,
collapse: None,
 };
 }

 if active {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Expanded);
 let current = self.entries.get(key).copied();
 if latest {
 let visible_since = match current {
 Some(AutoActivityExpansion::Expanded { visible_since })
 | Some(AutoActivityExpansion::CollapsePending { visible_since, .. }) => {
 visible_since
 }
 Some(AutoActivityExpansion::Collapsed) | None => now,
 };
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::Expanded { visible_since },
 );
 return AutoActivityObservation {
 expanded: true,
collapse_generation: None,
collapse: None,
 };
 }

 match self.entries.get(key).copied() {
 Some(AutoActivityExpansion::Expanded) | None => {
 self.next_generation = self.next_generation.wrapping_add(1);
 let generation = self.next_generation;
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::CollapsePending(generation),
 );
 AutoActivityObservation {
 let visible_since = match current {
 Some(AutoActivityExpansion::Expanded { visible_since }) => visible_since,
 None => now,
 Some(AutoActivityExpansion::CollapsePending { .. }) => {
 return AutoActivityObservation {
 expanded: true,
collapse_generation: Some(generation),
 }
collapse: None,
 };
 }
 Some(AutoActivityExpansion::CollapsePending(_)) => AutoActivityObservation {
 expanded: true,
 collapse_generation: None,
 },
 Some(AutoActivityExpansion::Collapsed) => AutoActivityObservation {
 Some(AutoActivityExpansion::Collapsed) => {
 return AutoActivityObservation {
 expanded: false,
 collapse: None,
 };
 }
 };
 let remaining = AUTO_ACTIVITY_MIN_VISIBILITY
 .saturating_sub(now.saturating_duration_since(visible_since));
 if remaining.is_zero() {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Collapsed);
 AutoActivityObservation {
 expanded: false,
 collapse_generation: None,
 },
 collapse: None,
 }
 } else {
 self.next_generation = self.next_generation.wrapping_add(1);
 let generation = self.next_generation;
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::CollapsePending {
 generation,
 visible_since,
 },
 );
 AutoActivityObservation {
 expanded: true,
 collapse: Some((generation, remaining)),
 }
 }
 }

 fn finish_collapse(&mut self, key: &str, generation: u64) -> bool {
 if self.entries.get(key) == Some(&AutoActivityExpansion::CollapsePending(generation)) {
 if matches!(
 self.entries.get(key),
 Some(AutoActivityExpansion::CollapsePending {
 generation: pending,
 ..
 }) if *pending == generation
 ) {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Collapsed);
 true
Expand DownExpand Up@@ -621,13 +666,15 @@ impl ChatView {
 turn: usize,
 key: &str,
 enabled: bool,
active: bool,
latest: bool,
 cx: &mut Context<Self>,
 ) -> bool {
 let auto = self.auto_activity_expansions.observe(key, enabled, active);
 if let Some(generation) = auto.collapse_generation {
 let auto = self
 .auto_activity_expansions
 .observe(key, enabled, latest, Instant::now());
 if let Some((generation, delay)) = auto.collapse {
 let collapse_key = key.to_string();
 let timer = cx.background_executor().timer(AUTO_ACTIVITY_COLLAPSE_DELAY);
 let timer = cx.background_executor().timer(delay);
 cx.spawn(async move |this, cx| {
 timer.await;
 let _ = this.update(cx, |this, cx| {
Expand DownExpand Up@@ -1135,14 +1182,12 @@ impl ChatView {
 let mut rows = Vec::new();
 for (activity_index, entry) in activities.iter().enumerate() {
 let latest = activity_index + 1 == activities.len();
 if let EntryContent::Item(ItemContent::FileChange { changes, status }) = &entry.content
 {
 if let EntryContent::Item(ItemContent::FileChange { changes, .. }) = &entry.content {
 let turn = entry.turn;
 for (file_index, row) in live_edit_rows(changes, cwd).iter().enumerate() {
 let key = format!("activity-{}-file-{file_index}", entry.id);
 let enabled = auto_expand && row.counts.is_some();
 let active = latest && *status == ItemStatus::InProgress;
 let expanded = self.auto_activity_expanded(turn, &key, enabled, active, cx)
 let expanded = self.auto_activity_expanded(turn, &key, enabled, latest, cx)
 || self.expanded.contains(&key);
 let toggle_key = key.clone();
 rows.push(components::changed_files::file_edit_row(
Expand DownExpand Up@@ -1187,16 +1232,13 @@ impl ChatView {
 }
 let key = format!("activity-{}", entry.id);
 let turn = entry.turn;
 let (is_command, running) = match &entry.content {
 EntryContent::Item(ItemContent::CommandExecution { status, .. }) => {
 (true, *status == ItemStatus::InProgress)
 }
 _ => (false, false),
 };
 let is_command = matches!(
 &entry.content,
 EntryContent::Item(ItemContent::CommandExecution { .. })
 );
 let auto_enabled =
 auto_expand && is_command && self.workspace_store.read(cx).live_command_panel();
 let auto_expanded =
 self.auto_activity_expanded(turn, &key, auto_enabled, latest && running, cx);
 let auto_expanded = self.auto_activity_expanded(turn, &key, auto_enabled, latest, cx);
 let expanded = auto_expanded || self.expanded.contains(&key);
 let command_detail = if expanded {
 match &entry.content {
Expand DownExpand Up@@ -2252,7 +2294,7 @@ fn open_in_zed(cwd: &Path, window: &mut Window, cx: &mut App) {
#[cfg(test)]
mod tests {
 use super::{
 ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_COLLAPSE_DELAY, AutoActivityExpansions,
 ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansions,
 ChatView, ResidencyScope, markdown_entries_for_residency,
 };
 use crate::store::WorkspaceStore;
Expand All@@ -2263,62 +2305,131 @@ mod tests {
 Arc,
 atomic::{AtomicU64, Ordering},
 };
 use std::time::{Duration, Instant};
 use tcode_core::session::{EntryContent, Timeline, TimelineEntry, TurnMeta};

 static NEXT_RESIDENCY_TEST_ID: AtomicU64 = AtomicU64::new(0);

 #[test]
 fn settled_live_activity_stays_expanded_until_delayed_collapse() {
 fn latest_activity_stays_expanded_until_a_successor_appears() {
 let mut expansions = AutoActivityExpansions::default();
 let first_seen = Instant::now();

 let running = expansions.observe("activity-command", true, true);
 let running = expansions.observe("activity-command", true, true, first_seen);
 assert!(running.expanded);
 assert_eq!(running.collapse_generation, None);
 assert_eq!(running.collapse, None);

 let completed = expansions.observe("activity-command", true, false);
 let completed = expansions.observe(
 "activity-command",
 true,
 true,
 first_seen + Duration::from_secs(1),
 );
 assert!(completed.expanded);
 let generation = completed
 .collapse_generation
 .expect("completion should schedule a delayed collapse");
 assert_eq!(completed.collapse, None);

 let superseded = expansions.observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_secs(1),
 );
 assert!(!superseded.expanded);
 assert_eq!(superseded.collapse, None);
 assert_eq!(AUTO_ACTIVITY_MIN_VISIBILITY, Duration::from_millis(500));
 }

 let rerender = expansions.observe("activity-command", true, false);
 assert!(rerender.expanded);
 assert_eq!(rerender.collapse_generation, None);
 #[test]
 fn early_successor_only_waits_for_remaining_minimum_visibility() {
 let mut expansions = AutoActivityExpansions::default();
 let first_seen = Instant::now();
 expansions.observe("activity-command", true, true, first_seen);
 let superseded = expansions.observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_millis(200),
 );

 assert!(superseded.expanded);
 let (generation, delay) = superseded
 .collapse
 .expect("early successor should schedule the remaining delay");
 assert_eq!(delay, Duration::from_millis(300));
 assert!(expansions.finish_collapse("activity-command", generation));
 assert!(!expansions.observe("activity-command", true, false).expanded);
 assert_eq!(
 AUTO_ACTIVITY_COLLAPSE_DELAY,
 std::time::Duration::from_millis(500)
 assert!(
 !expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );
 }

 #[test]
 fn activity_first_seen_settled_still_opens_for_the_collapse_delay() {
 fn activity_first_seen_non_latest_still_gets_full_visibility_window() {
 let mut expansions = AutoActivityExpansions::default();
 let settled = expansions.observe("activity-command", true, false);
 let first_seen = Instant::now();
 let observed = expansions.observe("activity-command", true, false, first_seen);

 assert!(settled.expanded);
 let generation = settled
 .collapse_generation
 assert!(observed.expanded);
 let (generation, delay) = observed
 .collapse
 .expect("first observation should schedule a collapse");
 assert_eq!(delay, AUTO_ACTIVITY_MIN_VISIBILITY);
 assert!(expansions.finish_collapse("activity-command", generation));
 assert!(!expansions.observe("activity-command", true, false).expanded);
 }

 #[test]
 fn reactivated_activity_cancels_its_stale_delayed_collapse() {
 let mut expansions = AutoActivityExpansions::default();
 expansions.observe("activity-command", true, true);
 let generation = expansions
 .observe("activity-command", true, false)
 .collapse_generation
 .expect("completion should schedule a collapse");
 let first_seen = Instant::now();
 expansions.observe("activity-command", true, true, first_seen);
 let (generation, _) = expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_millis(100),
 )
 .collapse
 .expect("supersession should schedule a collapse");

 assert!(expansions.observe("activity-command", true, true).expanded);
 assert!(
 expansions
 .observe(
 "activity-command",
 true,
 true,
 first_seen + Duration::from_millis(200),
 )
 .expanded
 );
 assert!(!expansions.finish_collapse("activity-command", generation));
 assert!(expansions.observe("activity-command", true, true).expanded);
 assert!(
 !expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );

 assert!(!expansions.observe("activity-command", false, true).expanded);
 assert!(
 !expansions
 .observe(
 "activity-command",
 false,
 true,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );
 }

 #[test]
Expand Down
Loading

, '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
fix(chat): keep latest activity expanded#299

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 27, 2026
 Merged


fix(chat): keep latest activity expanded
#299
Show file tree
Hide file tree
 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


267 changes: 189 additions & 78 deletions
crates/ui/src/chat/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use std::cell::RefCell;
use std::collections::{HashMap, HashSet};
use std::ops::Range;
use std::sync::Arc;
use std::time::Duration;
use std::time::{Duration, Instant};

use std::path::{Path, PathBuf};

Expand All@@ -18,7 +18,7 @@ use crate::{
 icon::{Icon, IconName},
 sizing::Sizable as _,
};
use agent::{ItemContent, ItemStatus, RewindMode};
use agent::{ItemContent, RewindMode};
use gpui::{
 Anchor, AnyElement, App, AppContext as _, ClickEvent, ClipboardItem, Context, Entity,
 FollowMode, InteractiveElement as _, IntoElement, ListAlignment, ListOffset, ListState,
Expand DownExpand Up@@ -68,14 +68,19 @@ const TRAFFIC_LIGHT_INSET: f32 = 80.;
const TURN_GAP: f32 = 32.;
/// Large documents are parsed away from the UI executor before becoming resident.
const ASYNC_MARKDOWN_THRESHOLD_BYTES: usize = 4 * 1024;
/// Keep a just-settled live activity visible long enough for its final output
/// or rendered diff to register before the automatically expanded detail folds.
const AUTO_ACTIVITY_COLLAPSE_DELAY: Duration = Duration::from_millis(500);
/// Minimum time an automatically expanded activity stays visible. The latest
/// activity remains open beyond this until another activity supersedes it.
const AUTO_ACTIVITY_MIN_VISIBILITY: Duration = Duration::from_millis(500);

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum AutoActivityExpansion {
 Expanded,
 CollapsePending(u64),
 Expanded {
 visible_since: Instant,
 },
 CollapsePending {
 generation: u64,
 visible_since: Instant,
 },
 Collapsed,
}

Expand All@@ -88,54 +93,94 @@ struct AutoActivityExpansions {
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
struct AutoActivityObservation {
 expanded: bool,
collapse_generation: Option<u64>,
collapse: Option<(u64, Duration)>,
}

impl AutoActivityExpansions {
 fn observe(&mut self, key: &str, enabled: bool, active: bool) -> AutoActivityObservation {
 fn observe(
 &mut self,
 key: &str,
 enabled: bool,
 latest: bool,
 now: Instant,
 ) -> AutoActivityObservation {
 if !enabled {
 self.entries.remove(key);
 return AutoActivityObservation {
 expanded: false,
collapse_generation: None,
collapse: None,
 };
 }

 if active {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Expanded);
 let current = self.entries.get(key).copied();
 if latest {
 let visible_since = match current {
 Some(AutoActivityExpansion::Expanded { visible_since })
 | Some(AutoActivityExpansion::CollapsePending { visible_since, .. }) => {
 visible_since
 }
 Some(AutoActivityExpansion::Collapsed) | None => now,
 };
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::Expanded { visible_since },
 );
 return AutoActivityObservation {
 expanded: true,
collapse_generation: None,
collapse: None,
 };
 }

 match self.entries.get(key).copied() {
 Some(AutoActivityExpansion::Expanded) | None => {
 self.next_generation = self.next_generation.wrapping_add(1);
 let generation = self.next_generation;
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::CollapsePending(generation),
 );
 AutoActivityObservation {
 let visible_since = match current {
 Some(AutoActivityExpansion::Expanded { visible_since }) => visible_since,
 None => now,
 Some(AutoActivityExpansion::CollapsePending { .. }) => {
 return AutoActivityObservation {
 expanded: true,
collapse_generation: Some(generation),
 }
collapse: None,
 };
 }
 Some(AutoActivityExpansion::CollapsePending(_)) => AutoActivityObservation {
 expanded: true,
 collapse_generation: None,
 },
 Some(AutoActivityExpansion::Collapsed) => AutoActivityObservation {
 Some(AutoActivityExpansion::Collapsed) => {
 return AutoActivityObservation {
 expanded: false,
 collapse: None,
 };
 }
 };
 let remaining = AUTO_ACTIVITY_MIN_VISIBILITY
 .saturating_sub(now.saturating_duration_since(visible_since));
 if remaining.is_zero() {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Collapsed);
 AutoActivityObservation {
 expanded: false,
 collapse_generation: None,
 },
 collapse: None,
 }
 } else {
 self.next_generation = self.next_generation.wrapping_add(1);
 let generation = self.next_generation;
 self.entries.insert(
 key.to_string(),
 AutoActivityExpansion::CollapsePending {
 generation,
 visible_since,
 },
 );
 AutoActivityObservation {
 expanded: true,
 collapse: Some((generation, remaining)),
 }
 }
 }

 fn finish_collapse(&mut self, key: &str, generation: u64) -> bool {
 if self.entries.get(key) == Some(&AutoActivityExpansion::CollapsePending(generation)) {
 if matches!(
 self.entries.get(key),
 Some(AutoActivityExpansion::CollapsePending {
 generation: pending,
 ..
 }) if *pending == generation
 ) {
 self.entries
 .insert(key.to_string(), AutoActivityExpansion::Collapsed);
 true
Expand DownExpand Up@@ -621,13 +666,15 @@ impl ChatView {
 turn: usize,
 key: &str,
 enabled: bool,
active: bool,
latest: bool,
 cx: &mut Context<Self>,
 ) -> bool {
 let auto = self.auto_activity_expansions.observe(key, enabled, active);
 if let Some(generation) = auto.collapse_generation {
 let auto = self
 .auto_activity_expansions
 .observe(key, enabled, latest, Instant::now());
 if let Some((generation, delay)) = auto.collapse {
 let collapse_key = key.to_string();
 let timer = cx.background_executor().timer(AUTO_ACTIVITY_COLLAPSE_DELAY);
 let timer = cx.background_executor().timer(delay);
 cx.spawn(async move |this, cx| {
 timer.await;
 let _ = this.update(cx, |this, cx| {
Expand DownExpand Up@@ -1135,14 +1182,12 @@ impl ChatView {
 let mut rows = Vec::new();
 for (activity_index, entry) in activities.iter().enumerate() {
 let latest = activity_index + 1 == activities.len();
 if let EntryContent::Item(ItemContent::FileChange { changes, status }) = &entry.content
 {
 if let EntryContent::Item(ItemContent::FileChange { changes, .. }) = &entry.content {
 let turn = entry.turn;
 for (file_index, row) in live_edit_rows(changes, cwd).iter().enumerate() {
 let key = format!("activity-{}-file-{file_index}", entry.id);
 let enabled = auto_expand && row.counts.is_some();
 let active = latest && *status == ItemStatus::InProgress;
 let expanded = self.auto_activity_expanded(turn, &key, enabled, active, cx)
 let expanded = self.auto_activity_expanded(turn, &key, enabled, latest, cx)
 || self.expanded.contains(&key);
 let toggle_key = key.clone();
 rows.push(components::changed_files::file_edit_row(
Expand DownExpand Up@@ -1187,16 +1232,13 @@ impl ChatView {
 }
 let key = format!("activity-{}", entry.id);
 let turn = entry.turn;
 let (is_command, running) = match &entry.content {
 EntryContent::Item(ItemContent::CommandExecution { status, .. }) => {
 (true, *status == ItemStatus::InProgress)
 }
 _ => (false, false),
 };
 let is_command = matches!(
 &entry.content,
 EntryContent::Item(ItemContent::CommandExecution { .. })
 );
 let auto_enabled =
 auto_expand && is_command && self.workspace_store.read(cx).live_command_panel();
 let auto_expanded =
 self.auto_activity_expanded(turn, &key, auto_enabled, latest && running, cx);
 let auto_expanded = self.auto_activity_expanded(turn, &key, auto_enabled, latest, cx);
 let expanded = auto_expanded || self.expanded.contains(&key);
 let command_detail = if expanded {
 match &entry.content {
Expand DownExpand Up@@ -2252,7 +2294,7 @@ fn open_in_zed(cwd: &Path, window: &mut Window, cx: &mut App) {
#[cfg(test)]
mod tests {
 use super::{
 ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_COLLAPSE_DELAY, AutoActivityExpansions,
 ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansions,
 ChatView, ResidencyScope, markdown_entries_for_residency,
 };
 use crate::store::WorkspaceStore;
Expand All@@ -2263,62 +2305,131 @@ mod tests {
 Arc,
 atomic::{AtomicU64, Ordering},
 };
 use std::time::{Duration, Instant};
 use tcode_core::session::{EntryContent, Timeline, TimelineEntry, TurnMeta};

 static NEXT_RESIDENCY_TEST_ID: AtomicU64 = AtomicU64::new(0);

 #[test]
 fn settled_live_activity_stays_expanded_until_delayed_collapse() {
 fn latest_activity_stays_expanded_until_a_successor_appears() {
 let mut expansions = AutoActivityExpansions::default();
 let first_seen = Instant::now();

 let running = expansions.observe("activity-command", true, true);
 let running = expansions.observe("activity-command", true, true, first_seen);
 assert!(running.expanded);
 assert_eq!(running.collapse_generation, None);
 assert_eq!(running.collapse, None);

 let completed = expansions.observe("activity-command", true, false);
 let completed = expansions.observe(
 "activity-command",
 true,
 true,
 first_seen + Duration::from_secs(1),
 );
 assert!(completed.expanded);
 let generation = completed
 .collapse_generation
 .expect("completion should schedule a delayed collapse");
 assert_eq!(completed.collapse, None);

 let superseded = expansions.observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_secs(1),
 );
 assert!(!superseded.expanded);
 assert_eq!(superseded.collapse, None);
 assert_eq!(AUTO_ACTIVITY_MIN_VISIBILITY, Duration::from_millis(500));
 }

 let rerender = expansions.observe("activity-command", true, false);
 assert!(rerender.expanded);
 assert_eq!(rerender.collapse_generation, None);
 #[test]
 fn early_successor_only_waits_for_remaining_minimum_visibility() {
 let mut expansions = AutoActivityExpansions::default();
 let first_seen = Instant::now();
 expansions.observe("activity-command", true, true, first_seen);
 let superseded = expansions.observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_millis(200),
 );

 assert!(superseded.expanded);
 let (generation, delay) = superseded
 .collapse
 .expect("early successor should schedule the remaining delay");
 assert_eq!(delay, Duration::from_millis(300));
 assert!(expansions.finish_collapse("activity-command", generation));
 assert!(!expansions.observe("activity-command", true, false).expanded);
 assert_eq!(
 AUTO_ACTIVITY_COLLAPSE_DELAY,
 std::time::Duration::from_millis(500)
 assert!(
 !expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );
 }

 #[test]
 fn activity_first_seen_settled_still_opens_for_the_collapse_delay() {
 fn activity_first_seen_non_latest_still_gets_full_visibility_window() {
 let mut expansions = AutoActivityExpansions::default();
 let settled = expansions.observe("activity-command", true, false);
 let first_seen = Instant::now();
 let observed = expansions.observe("activity-command", true, false, first_seen);

 assert!(settled.expanded);
 let generation = settled
 .collapse_generation
 assert!(observed.expanded);
 let (generation, delay) = observed
 .collapse
 .expect("first observation should schedule a collapse");
 assert_eq!(delay, AUTO_ACTIVITY_MIN_VISIBILITY);
 assert!(expansions.finish_collapse("activity-command", generation));
 assert!(!expansions.observe("activity-command", true, false).expanded);
 }

 #[test]
 fn reactivated_activity_cancels_its_stale_delayed_collapse() {
 let mut expansions = AutoActivityExpansions::default();
 expansions.observe("activity-command", true, true);
 let generation = expansions
 .observe("activity-command", true, false)
 .collapse_generation
 .expect("completion should schedule a collapse");
 let first_seen = Instant::now();
 expansions.observe("activity-command", true, true, first_seen);
 let (generation, _) = expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + Duration::from_millis(100),
 )
 .collapse
 .expect("supersession should schedule a collapse");

 assert!(expansions.observe("activity-command", true, true).expanded);
 assert!(
 expansions
 .observe(
 "activity-command",
 true,
 true,
 first_seen + Duration::from_millis(200),
 )
 .expanded
 );
 assert!(!expansions.finish_collapse("activity-command", generation));
 assert!(expansions.observe("activity-command", true, true).expanded);
 assert!(
 !expansions
 .observe(
 "activity-command",
 true,
 false,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );

 assert!(!expansions.observe("activity-command", false, true).expanded);
 assert!(
 !expansions
 .observe(
 "activity-command",
 false,
 true,
 first_seen + AUTO_ACTIVITY_MIN_VISIBILITY,
 )
 .expanded
 );
 }

 #[test]
Expand Down
Loading