fix(chat): avoid replaying activity expansions#303

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): avoid replaying activity expansions #303

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
238 changes: 229 additions & 9 deletions crates/ui/src/chat/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,9 +49,9 @@ use self::components::command_panel::CommandPanelCache;
use self::model::{
ListSync, Segment, TurnIndexCache, TurnListItem, TurnRenderArgs, activity_run_duration_ms,
displayed_error_text, divergent_served_model, format_elapsed_deciseconds, latest_message_ids,
live_activity_segment, live_edit_rows, partition_activity_run, plain_text_as_markdown,
segment_entries, start_hub_projects, timeline_overdraw, user_content, user_visible_text,
work_log_capsule_label, work_log_counts, work_log_outcome,
live_activity_segment, live_edit_counts, live_edit_rows, partition_activity_run,
plain_text_as_markdown, segment_entries, start_hub_projects, timeline_overdraw, user_content,
user_visible_text, work_log_capsule_label, work_log_counts, work_log_outcome,
};
use self::residency::{
MarkdownEntry, ResidencyInput, ResidencyScope, decide, tail_turn_window, viewport_turn_window,
Expand DownExpand Up@@ -87,16 +87,52 @@ enum AutoActivityExpansion {
#[derive(Debug, Default)]
struct AutoActivityExpansions {
entries_by_session: HashMap<String, HashMap<String, AutoActivityExpansion>>,
/// Expandable details already present when the active session is hydrated.
/// Each key is consumed on first render so later live updates use the
/// ordinary minimum-visibility state machine.
session_snapshot: Option<AutoActivitySessionSnapshot>,
next_generation: u64,
}

#[derive(Debug)]
struct AutoActivitySessionSnapshot {
session_key: String,
/// `None` while the session status has switched but its asynchronous
/// timeline snapshot has not arrived yet.
pending_keys: Option<HashSet<String>>,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
struct AutoActivityObservation {
expanded: bool,
collapse: Option<(u64, Duration)>,
}

impl AutoActivityExpansions {
fn activate_session(&mut self, session_key: Option<&str>) {
self.session_snapshot = session_key.map(|session_key| AutoActivitySessionSnapshot {
session_key: session_key.to_string(),
pending_keys: None,
});
}

fn awaiting_session_snapshot(&self, session_key: Option<&str>) -> bool {
self.session_snapshot.as_ref().is_some_and(|snapshot| {
Some(snapshot.session_key.as_str()) == session_key && snapshot.pending_keys.is_none()
})
}

fn hydrate_session_snapshot(&mut self, session_key: &str, keys: HashSet<String>) {
if let Some(snapshot) = self
.session_snapshot
.as_mut()
.filter(|snapshot| snapshot.session_key == session_key)
&& snapshot.pending_keys.is_none()
{
snapshot.pending_keys = Some(keys);
}
}

fn observe(
&mut self,
session_key: &str,
Expand All@@ -115,6 +151,25 @@ impl AutoActivityExpansions {
};
}

let first_snapshot_observation = self
.session_snapshot
.as_mut()
.filter(|snapshot| snapshot.session_key == session_key)
.and_then(|snapshot| snapshot.pending_keys.as_mut())
.is_some_and(|keys| keys.remove(key));
if first_snapshot_observation {
let state = if latest {
AutoActivityExpansion::Expanded { visible_since: now }
} else {
AutoActivityExpansion::Collapsed
};
self.insert(session_key, key, state);
return AutoActivityObservation {
expanded: latest,
collapse: None,
};
}

let current = self
.entries_by_session
.get(session_key)
Expand DownExpand Up@@ -206,6 +261,26 @@ impl AutoActivityExpansions {
}
}

fn auto_activity_snapshot_keys(entries: &[Arc<TimelineEntry>]) -> HashSet<String> {
let mut keys = HashSet::new();
for entry in entries {
match &entry.content {
EntryContent::Item(ItemContent::CommandExecution { .. }) => {
keys.insert(format!("activity-{}", entry.id));
}
EntryContent::Item(ItemContent::FileChange { changes, .. }) => {
for (file_index, change) in changes.iter().enumerate() {
if live_edit_counts(change.diff.as_deref()).is_some() {
keys.insert(format!("activity-{}-file-{file_index}", entry.id));
}
}
}
_ => {}
}
}
keys
}

struct PendingMarkdownBuild {
generation: u64,
session_key: Option<String>,
Expand DownExpand Up@@ -319,8 +394,13 @@ impl ChatView {
let session_changed = session_key != self.session_key;
if session_changed {
self.expanded.clear();
self.auto_activity_expansions
.activate_session(session_key.as_deref());
}
let (running, list_sync) = self
let awaiting_activity_snapshot = self
.auto_activity_expansions
.awaiting_session_snapshot(session_key.as_deref());
let (running, list_sync, activity_snapshot_keys) = self
.workspace_store
.read(cx)
.with_active_timeline(|timeline| {
Expand All@@ -335,7 +415,9 @@ impl ChatView {
&self.expanded,
session_changed,
);
(timeline.turn_running, list_sync)
let activity_snapshot_keys = awaiting_activity_snapshot
.then(|| auto_activity_snapshot_keys(&timeline.entries));
(timeline.turn_running, list_sync, activity_snapshot_keys)
})
.unwrap_or_else(|| {
let list_sync = self.turn_index_cache.sync(
Expand All@@ -346,9 +428,16 @@ impl ChatView {
&self.expanded,
session_changed,
);
(false, list_sync)
(false, list_sync, None)
});

if let Some(session_key) = session_key.as_deref()
&& let Some(keys) = activity_snapshot_keys
{
self.auto_activity_expansions
.hydrate_session_snapshot(session_key, keys);
}

let requested_turn = session_key
.as_deref()
.and_then(|session_id| self.workspace_store.read(cx).pending_chat_turn(session_id));
Expand DownExpand Up@@ -2315,12 +2404,12 @@ fn open_in_zed(cwd: &Path, window: &mut Window, cx: &mut App) {
#[cfg(test)]
mod tests {
use super::{
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansions,
ChatView, ResidencyScope, markdown_entries_for_residency,
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansion,
AutoActivityExpansions, ChatView, ResidencyScope, markdown_entries_for_residency,
};
use crate::store::WorkspaceStore;
use crate::window_state::WindowState;
use agent::ItemContent;
use agent::{ItemContent, ItemStatus};
use gpui::{AppContext as _, Entity, TestAppContext};
use std::sync::{
Arc,
Expand DownExpand Up@@ -2435,6 +2524,137 @@ mod tests {
));
}

#[test]
fn returning_session_shows_only_latest_snapshot_activity() {
let mut expansions = AutoActivityExpansions::default();
let returned_at = Instant::now();
let keys = [
"activity-command-1",
"activity-command-2",
"activity-command-3",
"activity-command-4",
"activity-command-5",
];
expansions.activate_session(Some(AUTO_ACTIVITY_TEST_SESSION));
assert!(expansions.awaiting_session_snapshot(Some(AUTO_ACTIVITY_TEST_SESSION)));
expansions.hydrate_session_snapshot(
AUTO_ACTIVITY_TEST_SESSION,
keys.into_iter().map(str::to_owned).collect(),
);
assert!(!expansions.awaiting_session_snapshot(Some(AUTO_ACTIVITY_TEST_SESSION)));

for key in &keys[..4] {
let historical =
expansions.observe(AUTO_ACTIVITY_TEST_SESSION, key, true, false, returned_at);
assert!(!historical.expanded, "historical {key} reopened");
assert_eq!(historical.collapse, None);
}

let latest =
expansions.observe(AUTO_ACTIVITY_TEST_SESSION, keys[4], true, true, returned_at);
assert!(latest.expanded);
assert_eq!(latest.collapse, None);
}

#[test]
fn returning_session_restarts_latest_activity_visibility_window() {
let mut expansions = AutoActivityExpansions::default();
let first_seen = Instant::now();
expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
true,
first_seen,
);

let returned_at = first_seen + Duration::from_secs(10);
expansions.activate_session(Some(AUTO_ACTIVITY_TEST_SESSION));
expansions.hydrate_session_snapshot(
AUTO_ACTIVITY_TEST_SESSION,
["activity-command".to_string()].into(),
);
let returned = expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
true,
returned_at,
);
assert!(returned.expanded);

let superseded = expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
false,
returned_at + Duration::from_millis(200),
);
assert!(superseded.expanded);
assert_eq!(
superseded.collapse.map(|(_, delay)| delay),
Some(Duration::from_millis(300))
);
}

#[gpui::test]
fn running_session_snapshot_renders_only_latest_command_expanded(cx: &mut TestAppContext) {
use gpui::{VisualTestContext, px, size};

let mut timeline = Timeline::default();
timeline.turns = vec![TurnMeta {
running: true,
..TurnMeta::default()
}];
// TurnMeta drives the live Work Log rendering under test. Keep the
// timeline-wide ticker idle so no perpetual clock task outlives this
// finite visual test.
timeline.entries.push(entry("user", user_item("go")));
for index in 1..=5 {
timeline.entries.push(entry(
&format!("command-{index}"),
EntryContent::Item(ItemContent::CommandExecution {
command: format!("command {index}"),
output: format!("output {index}"),
exit_code: Some(0),
status: ItemStatus::Completed,
}),
));
}

let (workspace_store, window_state, session_id) = seed_chat(cx, timeline);
let (view, cx) = cx
.add_window_view(|window, cx| ChatView::new(workspace_store, window_state, window, cx));
let cx: &mut VisualTestContext = cx;
cx.simulate_resize(size(px(1_024.), px(700.)));
cx.update(|window, cx| {
let _ = window.draw(cx);
});

let states = view.read_with(cx, |chat, _| {
let entries = chat
.auto_activity_expansions
.entries_by_session
.get(&session_id)
.expect("rendered session expansion state");
(1..=5)
.map(|index| entries.get(&format!("activity-command-{index}")).copied())
.collect::<Vec<_>>()
});
for (index, state) in states[..4].iter().enumerate() {
assert_eq!(
*state,
Some(AutoActivityExpansion::Collapsed),
"historical command {} reopened",
index + 1
);
}
assert!(matches!(
states[4],
Some(AutoActivityExpansion::Expanded { .. })
));
}

#[test]
fn collapsed_activity_stays_collapsed_after_visiting_another_session() {
let mut expansions = AutoActivityExpansions::default();
Expand Down
5 changes: 4 additions & 1 deletion docs/DESIGN.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,10 @@ platform pays that inset.
from that row's counts. The newest command output or file-edit diff stays
automatically expanded until a newer activity appears. A superseded detail
folds immediately if it has already been visible for 500ms; otherwise it
stays open only for the remainder of that minimum visibility window.
stays open only for the remainder of that minimum visibility window. Opening
a running thread is a current-state snapshot, not a replay: among activities
that arrived while the thread was away, only the newest detail opens, and its
500ms visibility window starts when the thread becomes visible.
Assistant prose settles the run, folding every
activity in it under one summary row. A completed section's toggle summarizes
only its real, nonzero events
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e 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): avoid replaying activity expansions#303

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): avoid replaying activity expansions #303

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
238 changes: 229 additions & 9 deletions crates/ui/src/chat/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,9 +49,9 @@ use self::components::command_panel::CommandPanelCache;
use self::model::{
ListSync, Segment, TurnIndexCache, TurnListItem, TurnRenderArgs, activity_run_duration_ms,
displayed_error_text, divergent_served_model, format_elapsed_deciseconds, latest_message_ids,
live_activity_segment, live_edit_rows, partition_activity_run, plain_text_as_markdown,
segment_entries, start_hub_projects, timeline_overdraw, user_content, user_visible_text,
work_log_capsule_label, work_log_counts, work_log_outcome,
live_activity_segment, live_edit_counts, live_edit_rows, partition_activity_run,
plain_text_as_markdown, segment_entries, start_hub_projects, timeline_overdraw, user_content,
user_visible_text, work_log_capsule_label, work_log_counts, work_log_outcome,
};
use self::residency::{
MarkdownEntry, ResidencyInput, ResidencyScope, decide, tail_turn_window, viewport_turn_window,
Expand DownExpand Up@@ -87,16 +87,52 @@ enum AutoActivityExpansion {
#[derive(Debug, Default)]
struct AutoActivityExpansions {
entries_by_session: HashMap<String, HashMap<String, AutoActivityExpansion>>,
/// Expandable details already present when the active session is hydrated.
/// Each key is consumed on first render so later live updates use the
/// ordinary minimum-visibility state machine.
session_snapshot: Option<AutoActivitySessionSnapshot>,
next_generation: u64,
}

#[derive(Debug)]
struct AutoActivitySessionSnapshot {
session_key: String,
/// `None` while the session status has switched but its asynchronous
/// timeline snapshot has not arrived yet.
pending_keys: Option<HashSet<String>>,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
struct AutoActivityObservation {
expanded: bool,
collapse: Option<(u64, Duration)>,
}

impl AutoActivityExpansions {
fn activate_session(&mut self, session_key: Option<&str>) {
self.session_snapshot = session_key.map(|session_key| AutoActivitySessionSnapshot {
session_key: session_key.to_string(),
pending_keys: None,
});
}

fn awaiting_session_snapshot(&self, session_key: Option<&str>) -> bool {
self.session_snapshot.as_ref().is_some_and(|snapshot| {
Some(snapshot.session_key.as_str()) == session_key && snapshot.pending_keys.is_none()
})
}

fn hydrate_session_snapshot(&mut self, session_key: &str, keys: HashSet<String>) {
if let Some(snapshot) = self
.session_snapshot
.as_mut()
.filter(|snapshot| snapshot.session_key == session_key)
&& snapshot.pending_keys.is_none()
{
snapshot.pending_keys = Some(keys);
}
}

fn observe(
&mut self,
session_key: &str,
Expand All@@ -115,6 +151,25 @@ impl AutoActivityExpansions {
};
}

let first_snapshot_observation = self
.session_snapshot
.as_mut()
.filter(|snapshot| snapshot.session_key == session_key)
.and_then(|snapshot| snapshot.pending_keys.as_mut())
.is_some_and(|keys| keys.remove(key));
if first_snapshot_observation {
let state = if latest {
AutoActivityExpansion::Expanded { visible_since: now }
} else {
AutoActivityExpansion::Collapsed
};
self.insert(session_key, key, state);
return AutoActivityObservation {
expanded: latest,
collapse: None,
};
}

let current = self
.entries_by_session
.get(session_key)
Expand DownExpand Up@@ -206,6 +261,26 @@ impl AutoActivityExpansions {
}
}

fn auto_activity_snapshot_keys(entries: &[Arc<TimelineEntry>]) -> HashSet<String> {
let mut keys = HashSet::new();
for entry in entries {
match &entry.content {
EntryContent::Item(ItemContent::CommandExecution { .. }) => {
keys.insert(format!("activity-{}", entry.id));
}
EntryContent::Item(ItemContent::FileChange { changes, .. }) => {
for (file_index, change) in changes.iter().enumerate() {
if live_edit_counts(change.diff.as_deref()).is_some() {
keys.insert(format!("activity-{}-file-{file_index}", entry.id));
}
}
}
_ => {}
}
}
keys
}

struct PendingMarkdownBuild {
generation: u64,
session_key: Option<String>,
Expand DownExpand Up@@ -319,8 +394,13 @@ impl ChatView {
let session_changed = session_key != self.session_key;
if session_changed {
self.expanded.clear();
self.auto_activity_expansions
.activate_session(session_key.as_deref());
}
let (running, list_sync) = self
let awaiting_activity_snapshot = self
.auto_activity_expansions
.awaiting_session_snapshot(session_key.as_deref());
let (running, list_sync, activity_snapshot_keys) = self
.workspace_store
.read(cx)
.with_active_timeline(|timeline| {
Expand All@@ -335,7 +415,9 @@ impl ChatView {
&self.expanded,
session_changed,
);
(timeline.turn_running, list_sync)
let activity_snapshot_keys = awaiting_activity_snapshot
.then(|| auto_activity_snapshot_keys(&timeline.entries));
(timeline.turn_running, list_sync, activity_snapshot_keys)
})
.unwrap_or_else(|| {
let list_sync = self.turn_index_cache.sync(
Expand All@@ -346,9 +428,16 @@ impl ChatView {
&self.expanded,
session_changed,
);
(false, list_sync)
(false, list_sync, None)
});

if let Some(session_key) = session_key.as_deref()
&& let Some(keys) = activity_snapshot_keys
{
self.auto_activity_expansions
.hydrate_session_snapshot(session_key, keys);
}

let requested_turn = session_key
.as_deref()
.and_then(|session_id| self.workspace_store.read(cx).pending_chat_turn(session_id));
Expand DownExpand Up@@ -2315,12 +2404,12 @@ fn open_in_zed(cwd: &Path, window: &mut Window, cx: &mut App) {
#[cfg(test)]
mod tests {
use super::{
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansions,
ChatView, ResidencyScope, markdown_entries_for_residency,
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansion,
AutoActivityExpansions, ChatView, ResidencyScope, markdown_entries_for_residency,
};
use crate::store::WorkspaceStore;
use crate::window_state::WindowState;
use agent::ItemContent;
use agent::{ItemContent, ItemStatus};
use gpui::{AppContext as _, Entity, TestAppContext};
use std::sync::{
Arc,
Expand DownExpand Up@@ -2435,6 +2524,137 @@ mod tests {
));
}

#[test]
fn returning_session_shows_only_latest_snapshot_activity() {
let mut expansions = AutoActivityExpansions::default();
let returned_at = Instant::now();
let keys = [
"activity-command-1",
"activity-command-2",
"activity-command-3",
"activity-command-4",
"activity-command-5",
];
expansions.activate_session(Some(AUTO_ACTIVITY_TEST_SESSION));
assert!(expansions.awaiting_session_snapshot(Some(AUTO_ACTIVITY_TEST_SESSION)));
expansions.hydrate_session_snapshot(
AUTO_ACTIVITY_TEST_SESSION,
keys.into_iter().map(str::to_owned).collect(),
);
assert!(!expansions.awaiting_session_snapshot(Some(AUTO_ACTIVITY_TEST_SESSION)));

for key in &keys[..4] {
let historical =
expansions.observe(AUTO_ACTIVITY_TEST_SESSION, key, true, false, returned_at);
assert!(!historical.expanded, "historical {key} reopened");
assert_eq!(historical.collapse, None);
}

let latest =
expansions.observe(AUTO_ACTIVITY_TEST_SESSION, keys[4], true, true, returned_at);
assert!(latest.expanded);
assert_eq!(latest.collapse, None);
}

#[test]
fn returning_session_restarts_latest_activity_visibility_window() {
let mut expansions = AutoActivityExpansions::default();
let first_seen = Instant::now();
expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
true,
first_seen,
);

let returned_at = first_seen + Duration::from_secs(10);
expansions.activate_session(Some(AUTO_ACTIVITY_TEST_SESSION));
expansions.hydrate_session_snapshot(
AUTO_ACTIVITY_TEST_SESSION,
["activity-command".to_string()].into(),
);
let returned = expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
true,
returned_at,
);
assert!(returned.expanded);

let superseded = expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
false,
returned_at + Duration::from_millis(200),
);
assert!(superseded.expanded);
assert_eq!(
superseded.collapse.map(|(_, delay)| delay),
Some(Duration::from_millis(300))
);
}

#[gpui::test]
fn running_session_snapshot_renders_only_latest_command_expanded(cx: &mut TestAppContext) {
use gpui::{VisualTestContext, px, size};

let mut timeline = Timeline::default();
timeline.turns = vec![TurnMeta {
running: true,
..TurnMeta::default()
}];
// TurnMeta drives the live Work Log rendering under test. Keep the
// timeline-wide ticker idle so no perpetual clock task outlives this
// finite visual test.
timeline.entries.push(entry("user", user_item("go")));
for index in 1..=5 {
timeline.entries.push(entry(
&format!("command-{index}"),
EntryContent::Item(ItemContent::CommandExecution {
command: format!("command {index}"),
output: format!("output {index}"),
exit_code: Some(0),
status: ItemStatus::Completed,
}),
));
}

let (workspace_store, window_state, session_id) = seed_chat(cx, timeline);
let (view, cx) = cx
.add_window_view(|window, cx| ChatView::new(workspace_store, window_state, window, cx));
let cx: &mut VisualTestContext = cx;
cx.simulate_resize(size(px(1_024.), px(700.)));
cx.update(|window, cx| {
let _ = window.draw(cx);
});

let states = view.read_with(cx, |chat, _| {
let entries = chat
.auto_activity_expansions
.entries_by_session
.get(&session_id)
.expect("rendered session expansion state");
(1..=5)
.map(|index| entries.get(&format!("activity-command-{index}")).copied())
.collect::<Vec<_>>()
});
for (index, state) in states[..4].iter().enumerate() {
assert_eq!(
*state,
Some(AutoActivityExpansion::Collapsed),
"historical command {} reopened",
index + 1
);
}
assert!(matches!(
states[4],
Some(AutoActivityExpansion::Expanded { .. })
));
}

#[test]
fn collapsed_activity_stays_collapsed_after_visiting_another_session() {
let mut expansions = AutoActivityExpansions::default();
Expand Down
5 changes: 4 additions & 1 deletion docs/DESIGN.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,10 @@ platform pays that inset.
from that row's counts. The newest command output or file-edit diff stays
automatically expanded until a newer activity appears. A superseded detail
folds immediately if it has already been visible for 500ms; otherwise it
stays open only for the remainder of that minimum visibility window.
stays open only for the remainder of that minimum visibility window. Opening
a running thread is a current-state snapshot, not a replay: among activities
that arrived while the thread was away, only the newest detail opens, and its
500ms visibility window starts when the thread becomes visible.
Assistant prose settles the run, folding every
activity in it under one summary row. A completed section's toggle summarizes
only its real, nonzero events
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(chat): avoid replaying activity expansions#303

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): avoid replaying activity expansions #303

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
238 changes: 229 additions & 9 deletions crates/ui/src/chat/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,9 +49,9 @@ use self::components::command_panel::CommandPanelCache;
use self::model::{
ListSync, Segment, TurnIndexCache, TurnListItem, TurnRenderArgs, activity_run_duration_ms,
displayed_error_text, divergent_served_model, format_elapsed_deciseconds, latest_message_ids,
live_activity_segment, live_edit_rows, partition_activity_run, plain_text_as_markdown,
segment_entries, start_hub_projects, timeline_overdraw, user_content, user_visible_text,
work_log_capsule_label, work_log_counts, work_log_outcome,
live_activity_segment, live_edit_counts, live_edit_rows, partition_activity_run,
plain_text_as_markdown, segment_entries, start_hub_projects, timeline_overdraw, user_content,
user_visible_text, work_log_capsule_label, work_log_counts, work_log_outcome,
};
use self::residency::{
MarkdownEntry, ResidencyInput, ResidencyScope, decide, tail_turn_window, viewport_turn_window,
Expand DownExpand Up@@ -87,16 +87,52 @@ enum AutoActivityExpansion {
#[derive(Debug, Default)]
struct AutoActivityExpansions {
entries_by_session: HashMap<String, HashMap<String, AutoActivityExpansion>>,
/// Expandable details already present when the active session is hydrated.
/// Each key is consumed on first render so later live updates use the
/// ordinary minimum-visibility state machine.
session_snapshot: Option<AutoActivitySessionSnapshot>,
next_generation: u64,
}

#[derive(Debug)]
struct AutoActivitySessionSnapshot {
session_key: String,
/// `None` while the session status has switched but its asynchronous
/// timeline snapshot has not arrived yet.
pending_keys: Option<HashSet<String>>,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
struct AutoActivityObservation {
expanded: bool,
collapse: Option<(u64, Duration)>,
}

impl AutoActivityExpansions {
fn activate_session(&mut self, session_key: Option<&str>) {
self.session_snapshot = session_key.map(|session_key| AutoActivitySessionSnapshot {
session_key: session_key.to_string(),
pending_keys: None,
});
}

fn awaiting_session_snapshot(&self, session_key: Option<&str>) -> bool {
self.session_snapshot.as_ref().is_some_and(|snapshot| {
Some(snapshot.session_key.as_str()) == session_key && snapshot.pending_keys.is_none()
})
}

fn hydrate_session_snapshot(&mut self, session_key: &str, keys: HashSet<String>) {
if let Some(snapshot) = self
.session_snapshot
.as_mut()
.filter(|snapshot| snapshot.session_key == session_key)
&& snapshot.pending_keys.is_none()
{
snapshot.pending_keys = Some(keys);
}
}

fn observe(
&mut self,
session_key: &str,
Expand All@@ -115,6 +151,25 @@ impl AutoActivityExpansions {
};
}

let first_snapshot_observation = self
.session_snapshot
.as_mut()
.filter(|snapshot| snapshot.session_key == session_key)
.and_then(|snapshot| snapshot.pending_keys.as_mut())
.is_some_and(|keys| keys.remove(key));
if first_snapshot_observation {
let state = if latest {
AutoActivityExpansion::Expanded { visible_since: now }
} else {
AutoActivityExpansion::Collapsed
};
self.insert(session_key, key, state);
return AutoActivityObservation {
expanded: latest,
collapse: None,
};
}

let current = self
.entries_by_session
.get(session_key)
Expand DownExpand Up@@ -206,6 +261,26 @@ impl AutoActivityExpansions {
}
}

fn auto_activity_snapshot_keys(entries: &[Arc<TimelineEntry>]) -> HashSet<String> {
let mut keys = HashSet::new();
for entry in entries {
match &entry.content {
EntryContent::Item(ItemContent::CommandExecution { .. }) => {
keys.insert(format!("activity-{}", entry.id));
}
EntryContent::Item(ItemContent::FileChange { changes, .. }) => {
for (file_index, change) in changes.iter().enumerate() {
if live_edit_counts(change.diff.as_deref()).is_some() {
keys.insert(format!("activity-{}-file-{file_index}", entry.id));
}
}
}
_ => {}
}
}
keys
}

struct PendingMarkdownBuild {
generation: u64,
session_key: Option<String>,
Expand DownExpand Up@@ -319,8 +394,13 @@ impl ChatView {
let session_changed = session_key != self.session_key;
if session_changed {
self.expanded.clear();
self.auto_activity_expansions
.activate_session(session_key.as_deref());
}
let (running, list_sync) = self
let awaiting_activity_snapshot = self
.auto_activity_expansions
.awaiting_session_snapshot(session_key.as_deref());
let (running, list_sync, activity_snapshot_keys) = self
.workspace_store
.read(cx)
.with_active_timeline(|timeline| {
Expand All@@ -335,7 +415,9 @@ impl ChatView {
&self.expanded,
session_changed,
);
(timeline.turn_running, list_sync)
let activity_snapshot_keys = awaiting_activity_snapshot
.then(|| auto_activity_snapshot_keys(&timeline.entries));
(timeline.turn_running, list_sync, activity_snapshot_keys)
})
.unwrap_or_else(|| {
let list_sync = self.turn_index_cache.sync(
Expand All@@ -346,9 +428,16 @@ impl ChatView {
&self.expanded,
session_changed,
);
(false, list_sync)
(false, list_sync, None)
});

if let Some(session_key) = session_key.as_deref()
&& let Some(keys) = activity_snapshot_keys
{
self.auto_activity_expansions
.hydrate_session_snapshot(session_key, keys);
}

let requested_turn = session_key
.as_deref()
.and_then(|session_id| self.workspace_store.read(cx).pending_chat_turn(session_id));
Expand DownExpand Up@@ -2315,12 +2404,12 @@ fn open_in_zed(cwd: &Path, window: &mut Window, cx: &mut App) {
#[cfg(test)]
mod tests {
use super::{
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansions,
ChatView, ResidencyScope, markdown_entries_for_residency,
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansion,
AutoActivityExpansions, ChatView, ResidencyScope, markdown_entries_for_residency,
};
use crate::store::WorkspaceStore;
use crate::window_state::WindowState;
use agent::ItemContent;
use agent::{ItemContent, ItemStatus};
use gpui::{AppContext as _, Entity, TestAppContext};
use std::sync::{
Arc,
Expand DownExpand Up@@ -2435,6 +2524,137 @@ mod tests {
));
}

#[test]
fn returning_session_shows_only_latest_snapshot_activity() {
let mut expansions = AutoActivityExpansions::default();
let returned_at = Instant::now();
let keys = [
"activity-command-1",
"activity-command-2",
"activity-command-3",
"activity-command-4",
"activity-command-5",
];
expansions.activate_session(Some(AUTO_ACTIVITY_TEST_SESSION));
assert!(expansions.awaiting_session_snapshot(Some(AUTO_ACTIVITY_TEST_SESSION)));
expansions.hydrate_session_snapshot(
AUTO_ACTIVITY_TEST_SESSION,
keys.into_iter().map(str::to_owned).collect(),
);
assert!(!expansions.awaiting_session_snapshot(Some(AUTO_ACTIVITY_TEST_SESSION)));

for key in &keys[..4] {
let historical =
expansions.observe(AUTO_ACTIVITY_TEST_SESSION, key, true, false, returned_at);
assert!(!historical.expanded, "historical {key} reopened");
assert_eq!(historical.collapse, None);
}

let latest =
expansions.observe(AUTO_ACTIVITY_TEST_SESSION, keys[4], true, true, returned_at);
assert!(latest.expanded);
assert_eq!(latest.collapse, None);
}

#[test]
fn returning_session_restarts_latest_activity_visibility_window() {
let mut expansions = AutoActivityExpansions::default();
let first_seen = Instant::now();
expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
true,
first_seen,
);

let returned_at = first_seen + Duration::from_secs(10);
expansions.activate_session(Some(AUTO_ACTIVITY_TEST_SESSION));
expansions.hydrate_session_snapshot(
AUTO_ACTIVITY_TEST_SESSION,
["activity-command".to_string()].into(),
);
let returned = expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
true,
returned_at,
);
assert!(returned.expanded);

let superseded = expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
false,
returned_at + Duration::from_millis(200),
);
assert!(superseded.expanded);
assert_eq!(
superseded.collapse.map(|(_, delay)| delay),
Some(Duration::from_millis(300))
);
}

#[gpui::test]
fn running_session_snapshot_renders_only_latest_command_expanded(cx: &mut TestAppContext) {
use gpui::{VisualTestContext, px, size};

let mut timeline = Timeline::default();
timeline.turns = vec![TurnMeta {
running: true,
..TurnMeta::default()
}];
// TurnMeta drives the live Work Log rendering under test. Keep the
// timeline-wide ticker idle so no perpetual clock task outlives this
// finite visual test.
timeline.entries.push(entry("user", user_item("go")));
for index in 1..=5 {
timeline.entries.push(entry(
&format!("command-{index}"),
EntryContent::Item(ItemContent::CommandExecution {
command: format!("command {index}"),
output: format!("output {index}"),
exit_code: Some(0),
status: ItemStatus::Completed,
}),
));
}

let (workspace_store, window_state, session_id) = seed_chat(cx, timeline);
let (view, cx) = cx
.add_window_view(|window, cx| ChatView::new(workspace_store, window_state, window, cx));
let cx: &mut VisualTestContext = cx;
cx.simulate_resize(size(px(1_024.), px(700.)));
cx.update(|window, cx| {
let _ = window.draw(cx);
});

let states = view.read_with(cx, |chat, _| {
let entries = chat
.auto_activity_expansions
.entries_by_session
.get(&session_id)
.expect("rendered session expansion state");
(1..=5)
.map(|index| entries.get(&format!("activity-command-{index}")).copied())
.collect::<Vec<_>>()
});
for (index, state) in states[..4].iter().enumerate() {
assert_eq!(
*state,
Some(AutoActivityExpansion::Collapsed),
"historical command {} reopened",
index + 1
);
}
assert!(matches!(
states[4],
Some(AutoActivityExpansion::Expanded { .. })
));
}

#[test]
fn collapsed_activity_stays_collapsed_after_visiting_another_session() {
let mut expansions = AutoActivityExpansions::default();
Expand Down
5 changes: 4 additions & 1 deletion docs/DESIGN.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,10 @@ platform pays that inset.
from that row's counts. The newest command output or file-edit diff stays
automatically expanded until a newer activity appears. A superseded detail
folds immediately if it has already been visible for 500ms; otherwise it
stays open only for the remainder of that minimum visibility window.
stays open only for the remainder of that minimum visibility window. Opening
a running thread is a current-state snapshot, not a replay: among activities
that arrived while the thread was away, only the newest detail opens, and its
500ms visibility window starts when the thread becomes visible.
Assistant prose settles the run, folding every
activity in it under one summary row. A completed section's toggle summarizes
only its real, nonzero events
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 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): avoid replaying activity expansions#303

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): avoid replaying activity expansions #303

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
238 changes: 229 additions & 9 deletions crates/ui/src/chat/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,9 +49,9 @@ use self::components::command_panel::CommandPanelCache;
use self::model::{
ListSync, Segment, TurnIndexCache, TurnListItem, TurnRenderArgs, activity_run_duration_ms,
displayed_error_text, divergent_served_model, format_elapsed_deciseconds, latest_message_ids,
live_activity_segment, live_edit_rows, partition_activity_run, plain_text_as_markdown,
segment_entries, start_hub_projects, timeline_overdraw, user_content, user_visible_text,
work_log_capsule_label, work_log_counts, work_log_outcome,
live_activity_segment, live_edit_counts, live_edit_rows, partition_activity_run,
plain_text_as_markdown, segment_entries, start_hub_projects, timeline_overdraw, user_content,
user_visible_text, work_log_capsule_label, work_log_counts, work_log_outcome,
};
use self::residency::{
MarkdownEntry, ResidencyInput, ResidencyScope, decide, tail_turn_window, viewport_turn_window,
Expand DownExpand Up@@ -87,16 +87,52 @@ enum AutoActivityExpansion {
#[derive(Debug, Default)]
struct AutoActivityExpansions {
entries_by_session: HashMap<String, HashMap<String, AutoActivityExpansion>>,
/// Expandable details already present when the active session is hydrated.
/// Each key is consumed on first render so later live updates use the
/// ordinary minimum-visibility state machine.
session_snapshot: Option<AutoActivitySessionSnapshot>,
next_generation: u64,
}

#[derive(Debug)]
struct AutoActivitySessionSnapshot {
session_key: String,
/// `None` while the session status has switched but its asynchronous
/// timeline snapshot has not arrived yet.
pending_keys: Option<HashSet<String>>,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
struct AutoActivityObservation {
expanded: bool,
collapse: Option<(u64, Duration)>,
}

impl AutoActivityExpansions {
fn activate_session(&mut self, session_key: Option<&str>) {
self.session_snapshot = session_key.map(|session_key| AutoActivitySessionSnapshot {
session_key: session_key.to_string(),
pending_keys: None,
});
}

fn awaiting_session_snapshot(&self, session_key: Option<&str>) -> bool {
self.session_snapshot.as_ref().is_some_and(|snapshot| {
Some(snapshot.session_key.as_str()) == session_key && snapshot.pending_keys.is_none()
})
}

fn hydrate_session_snapshot(&mut self, session_key: &str, keys: HashSet<String>) {
if let Some(snapshot) = self
.session_snapshot
.as_mut()
.filter(|snapshot| snapshot.session_key == session_key)
&& snapshot.pending_keys.is_none()
{
snapshot.pending_keys = Some(keys);
}
}

fn observe(
&mut self,
session_key: &str,
Expand All@@ -115,6 +151,25 @@ impl AutoActivityExpansions {
};
}

let first_snapshot_observation = self
.session_snapshot
.as_mut()
.filter(|snapshot| snapshot.session_key == session_key)
.and_then(|snapshot| snapshot.pending_keys.as_mut())
.is_some_and(|keys| keys.remove(key));
if first_snapshot_observation {
let state = if latest {
AutoActivityExpansion::Expanded { visible_since: now }
} else {
AutoActivityExpansion::Collapsed
};
self.insert(session_key, key, state);
return AutoActivityObservation {
expanded: latest,
collapse: None,
};
}

let current = self
.entries_by_session
.get(session_key)
Expand DownExpand Up@@ -206,6 +261,26 @@ impl AutoActivityExpansions {
}
}

fn auto_activity_snapshot_keys(entries: &[Arc<TimelineEntry>]) -> HashSet<String> {
let mut keys = HashSet::new();
for entry in entries {
match &entry.content {
EntryContent::Item(ItemContent::CommandExecution { .. }) => {
keys.insert(format!("activity-{}", entry.id));
}
EntryContent::Item(ItemContent::FileChange { changes, .. }) => {
for (file_index, change) in changes.iter().enumerate() {
if live_edit_counts(change.diff.as_deref()).is_some() {
keys.insert(format!("activity-{}-file-{file_index}", entry.id));
}
}
}
_ => {}
}
}
keys
}

struct PendingMarkdownBuild {
generation: u64,
session_key: Option<String>,
Expand DownExpand Up@@ -319,8 +394,13 @@ impl ChatView {
let session_changed = session_key != self.session_key;
if session_changed {
self.expanded.clear();
self.auto_activity_expansions
.activate_session(session_key.as_deref());
}
let (running, list_sync) = self
let awaiting_activity_snapshot = self
.auto_activity_expansions
.awaiting_session_snapshot(session_key.as_deref());
let (running, list_sync, activity_snapshot_keys) = self
.workspace_store
.read(cx)
.with_active_timeline(|timeline| {
Expand All@@ -335,7 +415,9 @@ impl ChatView {
&self.expanded,
session_changed,
);
(timeline.turn_running, list_sync)
let activity_snapshot_keys = awaiting_activity_snapshot
.then(|| auto_activity_snapshot_keys(&timeline.entries));
(timeline.turn_running, list_sync, activity_snapshot_keys)
})
.unwrap_or_else(|| {
let list_sync = self.turn_index_cache.sync(
Expand All@@ -346,9 +428,16 @@ impl ChatView {
&self.expanded,
session_changed,
);
(false, list_sync)
(false, list_sync, None)
});

if let Some(session_key) = session_key.as_deref()
&& let Some(keys) = activity_snapshot_keys
{
self.auto_activity_expansions
.hydrate_session_snapshot(session_key, keys);
}

let requested_turn = session_key
.as_deref()
.and_then(|session_id| self.workspace_store.read(cx).pending_chat_turn(session_id));
Expand DownExpand Up@@ -2315,12 +2404,12 @@ fn open_in_zed(cwd: &Path, window: &mut Window, cx: &mut App) {
#[cfg(test)]
mod tests {
use super::{
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansions,
ChatView, ResidencyScope, markdown_entries_for_residency,
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansion,
AutoActivityExpansions, ChatView, ResidencyScope, markdown_entries_for_residency,
};
use crate::store::WorkspaceStore;
use crate::window_state::WindowState;
use agent::ItemContent;
use agent::{ItemContent, ItemStatus};
use gpui::{AppContext as _, Entity, TestAppContext};
use std::sync::{
Arc,
Expand DownExpand Up@@ -2435,6 +2524,137 @@ mod tests {
));
}

#[test]
fn returning_session_shows_only_latest_snapshot_activity() {
let mut expansions = AutoActivityExpansions::default();
let returned_at = Instant::now();
let keys = [
"activity-command-1",
"activity-command-2",
"activity-command-3",
"activity-command-4",
"activity-command-5",
];
expansions.activate_session(Some(AUTO_ACTIVITY_TEST_SESSION));
assert!(expansions.awaiting_session_snapshot(Some(AUTO_ACTIVITY_TEST_SESSION)));
expansions.hydrate_session_snapshot(
AUTO_ACTIVITY_TEST_SESSION,
keys.into_iter().map(str::to_owned).collect(),
);
assert!(!expansions.awaiting_session_snapshot(Some(AUTO_ACTIVITY_TEST_SESSION)));

for key in &keys[..4] {
let historical =
expansions.observe(AUTO_ACTIVITY_TEST_SESSION, key, true, false, returned_at);
assert!(!historical.expanded, "historical {key} reopened");
assert_eq!(historical.collapse, None);
}

let latest =
expansions.observe(AUTO_ACTIVITY_TEST_SESSION, keys[4], true, true, returned_at);
assert!(latest.expanded);
assert_eq!(latest.collapse, None);
}

#[test]
fn returning_session_restarts_latest_activity_visibility_window() {
let mut expansions = AutoActivityExpansions::default();
let first_seen = Instant::now();
expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
true,
first_seen,
);

let returned_at = first_seen + Duration::from_secs(10);
expansions.activate_session(Some(AUTO_ACTIVITY_TEST_SESSION));
expansions.hydrate_session_snapshot(
AUTO_ACTIVITY_TEST_SESSION,
["activity-command".to_string()].into(),
);
let returned = expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
true,
returned_at,
);
assert!(returned.expanded);

let superseded = expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
false,
returned_at + Duration::from_millis(200),
);
assert!(superseded.expanded);
assert_eq!(
superseded.collapse.map(|(_, delay)| delay),
Some(Duration::from_millis(300))
);
}

#[gpui::test]
fn running_session_snapshot_renders_only_latest_command_expanded(cx: &mut TestAppContext) {
use gpui::{VisualTestContext, px, size};

let mut timeline = Timeline::default();
timeline.turns = vec![TurnMeta {
running: true,
..TurnMeta::default()
}];
// TurnMeta drives the live Work Log rendering under test. Keep the
// timeline-wide ticker idle so no perpetual clock task outlives this
// finite visual test.
timeline.entries.push(entry("user", user_item("go")));
for index in 1..=5 {
timeline.entries.push(entry(
&format!("command-{index}"),
EntryContent::Item(ItemContent::CommandExecution {
command: format!("command {index}"),
output: format!("output {index}"),
exit_code: Some(0),
status: ItemStatus::Completed,
}),
));
}

let (workspace_store, window_state, session_id) = seed_chat(cx, timeline);
let (view, cx) = cx
.add_window_view(|window, cx| ChatView::new(workspace_store, window_state, window, cx));
let cx: &mut VisualTestContext = cx;
cx.simulate_resize(size(px(1_024.), px(700.)));
cx.update(|window, cx| {
let _ = window.draw(cx);
});

let states = view.read_with(cx, |chat, _| {
let entries = chat
.auto_activity_expansions
.entries_by_session
.get(&session_id)
.expect("rendered session expansion state");
(1..=5)
.map(|index| entries.get(&format!("activity-command-{index}")).copied())
.collect::<Vec<_>>()
});
for (index, state) in states[..4].iter().enumerate() {
assert_eq!(
*state,
Some(AutoActivityExpansion::Collapsed),
"historical command {} reopened",
index + 1
);
}
assert!(matches!(
states[4],
Some(AutoActivityExpansion::Expanded { .. })
));
}

#[test]
fn collapsed_activity_stays_collapsed_after_visiting_another_session() {
let mut expansions = AutoActivityExpansions::default();
Expand Down
5 changes: 4 additions & 1 deletion docs/DESIGN.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,10 @@ platform pays that inset.
from that row's counts. The newest command output or file-edit diff stays
automatically expanded until a newer activity appears. A superseded detail
folds immediately if it has already been visible for 500ms; otherwise it
stays open only for the remainder of that minimum visibility window.
stays open only for the remainder of that minimum visibility window. Opening
a running thread is a current-state snapshot, not a replay: among activities
that arrived while the thread was away, only the newest detail opens, and its
500ms visibility window starts when the thread becomes visible.
Assistant prose settles the run, folding every
activity in it under one summary row. A completed section's toggle summarizes
only its real, nonzero events
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

fix(chat): avoid replaying activity expansions#303

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): avoid replaying activity expansions #303

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
238 changes: 229 additions & 9 deletions crates/ui/src/chat/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,9 +49,9 @@ use self::components::command_panel::CommandPanelCache;
use self::model::{
ListSync, Segment, TurnIndexCache, TurnListItem, TurnRenderArgs, activity_run_duration_ms,
displayed_error_text, divergent_served_model, format_elapsed_deciseconds, latest_message_ids,
live_activity_segment, live_edit_rows, partition_activity_run, plain_text_as_markdown,
segment_entries, start_hub_projects, timeline_overdraw, user_content, user_visible_text,
work_log_capsule_label, work_log_counts, work_log_outcome,
live_activity_segment, live_edit_counts, live_edit_rows, partition_activity_run,
plain_text_as_markdown, segment_entries, start_hub_projects, timeline_overdraw, user_content,
user_visible_text, work_log_capsule_label, work_log_counts, work_log_outcome,
};
use self::residency::{
MarkdownEntry, ResidencyInput, ResidencyScope, decide, tail_turn_window, viewport_turn_window,
Expand DownExpand Up@@ -87,16 +87,52 @@ enum AutoActivityExpansion {
#[derive(Debug, Default)]
struct AutoActivityExpansions {
entries_by_session: HashMap<String, HashMap<String, AutoActivityExpansion>>,
/// Expandable details already present when the active session is hydrated.
/// Each key is consumed on first render so later live updates use the
/// ordinary minimum-visibility state machine.
session_snapshot: Option<AutoActivitySessionSnapshot>,
next_generation: u64,
}

#[derive(Debug)]
struct AutoActivitySessionSnapshot {
session_key: String,
/// `None` while the session status has switched but its asynchronous
/// timeline snapshot has not arrived yet.
pending_keys: Option<HashSet<String>>,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
struct AutoActivityObservation {
expanded: bool,
collapse: Option<(u64, Duration)>,
}

impl AutoActivityExpansions {
fn activate_session(&mut self, session_key: Option<&str>) {
self.session_snapshot = session_key.map(|session_key| AutoActivitySessionSnapshot {
session_key: session_key.to_string(),
pending_keys: None,
});
}

fn awaiting_session_snapshot(&self, session_key: Option<&str>) -> bool {
self.session_snapshot.as_ref().is_some_and(|snapshot| {
Some(snapshot.session_key.as_str()) == session_key && snapshot.pending_keys.is_none()
})
}

fn hydrate_session_snapshot(&mut self, session_key: &str, keys: HashSet<String>) {
if let Some(snapshot) = self
.session_snapshot
.as_mut()
.filter(|snapshot| snapshot.session_key == session_key)
&& snapshot.pending_keys.is_none()
{
snapshot.pending_keys = Some(keys);
}
}

fn observe(
&mut self,
session_key: &str,
Expand All@@ -115,6 +151,25 @@ impl AutoActivityExpansions {
};
}

let first_snapshot_observation = self
.session_snapshot
.as_mut()
.filter(|snapshot| snapshot.session_key == session_key)
.and_then(|snapshot| snapshot.pending_keys.as_mut())
.is_some_and(|keys| keys.remove(key));
if first_snapshot_observation {
let state = if latest {
AutoActivityExpansion::Expanded { visible_since: now }
} else {
AutoActivityExpansion::Collapsed
};
self.insert(session_key, key, state);
return AutoActivityObservation {
expanded: latest,
collapse: None,
};
}

let current = self
.entries_by_session
.get(session_key)
Expand DownExpand Up@@ -206,6 +261,26 @@ impl AutoActivityExpansions {
}
}

fn auto_activity_snapshot_keys(entries: &[Arc<TimelineEntry>]) -> HashSet<String> {
let mut keys = HashSet::new();
for entry in entries {
match &entry.content {
EntryContent::Item(ItemContent::CommandExecution { .. }) => {
keys.insert(format!("activity-{}", entry.id));
}
EntryContent::Item(ItemContent::FileChange { changes, .. }) => {
for (file_index, change) in changes.iter().enumerate() {
if live_edit_counts(change.diff.as_deref()).is_some() {
keys.insert(format!("activity-{}-file-{file_index}", entry.id));
}
}
}
_ => {}
}
}
keys
}

struct PendingMarkdownBuild {
generation: u64,
session_key: Option<String>,
Expand DownExpand Up@@ -319,8 +394,13 @@ impl ChatView {
let session_changed = session_key != self.session_key;
if session_changed {
self.expanded.clear();
self.auto_activity_expansions
.activate_session(session_key.as_deref());
}
let (running, list_sync) = self
let awaiting_activity_snapshot = self
.auto_activity_expansions
.awaiting_session_snapshot(session_key.as_deref());
let (running, list_sync, activity_snapshot_keys) = self
.workspace_store
.read(cx)
.with_active_timeline(|timeline| {
Expand All@@ -335,7 +415,9 @@ impl ChatView {
&self.expanded,
session_changed,
);
(timeline.turn_running, list_sync)
let activity_snapshot_keys = awaiting_activity_snapshot
.then(|| auto_activity_snapshot_keys(&timeline.entries));
(timeline.turn_running, list_sync, activity_snapshot_keys)
})
.unwrap_or_else(|| {
let list_sync = self.turn_index_cache.sync(
Expand All@@ -346,9 +428,16 @@ impl ChatView {
&self.expanded,
session_changed,
);
(false, list_sync)
(false, list_sync, None)
});

if let Some(session_key) = session_key.as_deref()
&& let Some(keys) = activity_snapshot_keys
{
self.auto_activity_expansions
.hydrate_session_snapshot(session_key, keys);
}

let requested_turn = session_key
.as_deref()
.and_then(|session_id| self.workspace_store.read(cx).pending_chat_turn(session_id));
Expand DownExpand Up@@ -2315,12 +2404,12 @@ fn open_in_zed(cwd: &Path, window: &mut Window, cx: &mut App) {
#[cfg(test)]
mod tests {
use super::{
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansions,
ChatView, ResidencyScope, markdown_entries_for_residency,
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansion,
AutoActivityExpansions, ChatView, ResidencyScope, markdown_entries_for_residency,
};
use crate::store::WorkspaceStore;
use crate::window_state::WindowState;
use agent::ItemContent;
use agent::{ItemContent, ItemStatus};
use gpui::{AppContext as _, Entity, TestAppContext};
use std::sync::{
Arc,
Expand DownExpand Up@@ -2435,6 +2524,137 @@ mod tests {
));
}

#[test]
fn returning_session_shows_only_latest_snapshot_activity() {
let mut expansions = AutoActivityExpansions::default();
let returned_at = Instant::now();
let keys = [
"activity-command-1",
"activity-command-2",
"activity-command-3",
"activity-command-4",
"activity-command-5",
];
expansions.activate_session(Some(AUTO_ACTIVITY_TEST_SESSION));
assert!(expansions.awaiting_session_snapshot(Some(AUTO_ACTIVITY_TEST_SESSION)));
expansions.hydrate_session_snapshot(
AUTO_ACTIVITY_TEST_SESSION,
keys.into_iter().map(str::to_owned).collect(),
);
assert!(!expansions.awaiting_session_snapshot(Some(AUTO_ACTIVITY_TEST_SESSION)));

for key in &keys[..4] {
let historical =
expansions.observe(AUTO_ACTIVITY_TEST_SESSION, key, true, false, returned_at);
assert!(!historical.expanded, "historical {key} reopened");
assert_eq!(historical.collapse, None);
}

let latest =
expansions.observe(AUTO_ACTIVITY_TEST_SESSION, keys[4], true, true, returned_at);
assert!(latest.expanded);
assert_eq!(latest.collapse, None);
}

#[test]
fn returning_session_restarts_latest_activity_visibility_window() {
let mut expansions = AutoActivityExpansions::default();
let first_seen = Instant::now();
expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
true,
first_seen,
);

let returned_at = first_seen + Duration::from_secs(10);
expansions.activate_session(Some(AUTO_ACTIVITY_TEST_SESSION));
expansions.hydrate_session_snapshot(
AUTO_ACTIVITY_TEST_SESSION,
["activity-command".to_string()].into(),
);
let returned = expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
true,
returned_at,
);
assert!(returned.expanded);

let superseded = expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
false,
returned_at + Duration::from_millis(200),
);
assert!(superseded.expanded);
assert_eq!(
superseded.collapse.map(|(_, delay)| delay),
Some(Duration::from_millis(300))
);
}

#[gpui::test]
fn running_session_snapshot_renders_only_latest_command_expanded(cx: &mut TestAppContext) {
use gpui::{VisualTestContext, px, size};

let mut timeline = Timeline::default();
timeline.turns = vec![TurnMeta {
running: true,
..TurnMeta::default()
}];
// TurnMeta drives the live Work Log rendering under test. Keep the
// timeline-wide ticker idle so no perpetual clock task outlives this
// finite visual test.
timeline.entries.push(entry("user", user_item("go")));
for index in 1..=5 {
timeline.entries.push(entry(
&format!("command-{index}"),
EntryContent::Item(ItemContent::CommandExecution {
command: format!("command {index}"),
output: format!("output {index}"),
exit_code: Some(0),
status: ItemStatus::Completed,
}),
));
}

let (workspace_store, window_state, session_id) = seed_chat(cx, timeline);
let (view, cx) = cx
.add_window_view(|window, cx| ChatView::new(workspace_store, window_state, window, cx));
let cx: &mut VisualTestContext = cx;
cx.simulate_resize(size(px(1_024.), px(700.)));
cx.update(|window, cx| {
let _ = window.draw(cx);
});

let states = view.read_with(cx, |chat, _| {
let entries = chat
.auto_activity_expansions
.entries_by_session
.get(&session_id)
.expect("rendered session expansion state");
(1..=5)
.map(|index| entries.get(&format!("activity-command-{index}")).copied())
.collect::<Vec<_>>()
});
for (index, state) in states[..4].iter().enumerate() {
assert_eq!(
*state,
Some(AutoActivityExpansion::Collapsed),
"historical command {} reopened",
index + 1
);
}
assert!(matches!(
states[4],
Some(AutoActivityExpansion::Expanded { .. })
));
}

#[test]
fn collapsed_activity_stays_collapsed_after_visiting_another_session() {
let mut expansions = AutoActivityExpansions::default();
Expand Down
5 changes: 4 additions & 1 deletion docs/DESIGN.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,10 @@ platform pays that inset.
from that row's counts. The newest command output or file-edit diff stays
automatically expanded until a newer activity appears. A superseded detail
folds immediately if it has already been visible for 500ms; otherwise it
stays open only for the remainder of that minimum visibility window.
stays open only for the remainder of that minimum visibility window. Opening
a running thread is a current-state snapshot, not a replay: among activities
that arrived while the thread was away, only the newest detail opens, and its
500ms visibility window starts when the thread becomes visible.
Assistant prose settles the run, folding every
activity in it under one summary row. A completed section's toggle summarizes
only its real, nonzero events
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(chat): avoid replaying activity expansions#303

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): avoid replaying activity expansions #303

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
238 changes: 229 additions & 9 deletions crates/ui/src/chat/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,9 +49,9 @@ use self::components::command_panel::CommandPanelCache;
use self::model::{
ListSync, Segment, TurnIndexCache, TurnListItem, TurnRenderArgs, activity_run_duration_ms,
displayed_error_text, divergent_served_model, format_elapsed_deciseconds, latest_message_ids,
live_activity_segment, live_edit_rows, partition_activity_run, plain_text_as_markdown,
segment_entries, start_hub_projects, timeline_overdraw, user_content, user_visible_text,
work_log_capsule_label, work_log_counts, work_log_outcome,
live_activity_segment, live_edit_counts, live_edit_rows, partition_activity_run,
plain_text_as_markdown, segment_entries, start_hub_projects, timeline_overdraw, user_content,
user_visible_text, work_log_capsule_label, work_log_counts, work_log_outcome,
};
use self::residency::{
MarkdownEntry, ResidencyInput, ResidencyScope, decide, tail_turn_window, viewport_turn_window,
Expand DownExpand Up@@ -87,16 +87,52 @@ enum AutoActivityExpansion {
#[derive(Debug, Default)]
struct AutoActivityExpansions {
entries_by_session: HashMap<String, HashMap<String, AutoActivityExpansion>>,
/// Expandable details already present when the active session is hydrated.
/// Each key is consumed on first render so later live updates use the
/// ordinary minimum-visibility state machine.
session_snapshot: Option<AutoActivitySessionSnapshot>,
next_generation: u64,
}

#[derive(Debug)]
struct AutoActivitySessionSnapshot {
session_key: String,
/// `None` while the session status has switched but its asynchronous
/// timeline snapshot has not arrived yet.
pending_keys: Option<HashSet<String>>,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
struct AutoActivityObservation {
expanded: bool,
collapse: Option<(u64, Duration)>,
}

impl AutoActivityExpansions {
fn activate_session(&mut self, session_key: Option<&str>) {
self.session_snapshot = session_key.map(|session_key| AutoActivitySessionSnapshot {
session_key: session_key.to_string(),
pending_keys: None,
});
}

fn awaiting_session_snapshot(&self, session_key: Option<&str>) -> bool {
self.session_snapshot.as_ref().is_some_and(|snapshot| {
Some(snapshot.session_key.as_str()) == session_key && snapshot.pending_keys.is_none()
})
}

fn hydrate_session_snapshot(&mut self, session_key: &str, keys: HashSet<String>) {
if let Some(snapshot) = self
.session_snapshot
.as_mut()
.filter(|snapshot| snapshot.session_key == session_key)
&& snapshot.pending_keys.is_none()
{
snapshot.pending_keys = Some(keys);
}
}

fn observe(
&mut self,
session_key: &str,
Expand All@@ -115,6 +151,25 @@ impl AutoActivityExpansions {
};
}

let first_snapshot_observation = self
.session_snapshot
.as_mut()
.filter(|snapshot| snapshot.session_key == session_key)
.and_then(|snapshot| snapshot.pending_keys.as_mut())
.is_some_and(|keys| keys.remove(key));
if first_snapshot_observation {
let state = if latest {
AutoActivityExpansion::Expanded { visible_since: now }
} else {
AutoActivityExpansion::Collapsed
};
self.insert(session_key, key, state);
return AutoActivityObservation {
expanded: latest,
collapse: None,
};
}

let current = self
.entries_by_session
.get(session_key)
Expand DownExpand Up@@ -206,6 +261,26 @@ impl AutoActivityExpansions {
}
}

fn auto_activity_snapshot_keys(entries: &[Arc<TimelineEntry>]) -> HashSet<String> {
let mut keys = HashSet::new();
for entry in entries {
match &entry.content {
EntryContent::Item(ItemContent::CommandExecution { .. }) => {
keys.insert(format!("activity-{}", entry.id));
}
EntryContent::Item(ItemContent::FileChange { changes, .. }) => {
for (file_index, change) in changes.iter().enumerate() {
if live_edit_counts(change.diff.as_deref()).is_some() {
keys.insert(format!("activity-{}-file-{file_index}", entry.id));
}
}
}
_ => {}
}
}
keys
}

struct PendingMarkdownBuild {
generation: u64,
session_key: Option<String>,
Expand DownExpand Up@@ -319,8 +394,13 @@ impl ChatView {
let session_changed = session_key != self.session_key;
if session_changed {
self.expanded.clear();
self.auto_activity_expansions
.activate_session(session_key.as_deref());
}
let (running, list_sync) = self
let awaiting_activity_snapshot = self
.auto_activity_expansions
.awaiting_session_snapshot(session_key.as_deref());
let (running, list_sync, activity_snapshot_keys) = self
.workspace_store
.read(cx)
.with_active_timeline(|timeline| {
Expand All@@ -335,7 +415,9 @@ impl ChatView {
&self.expanded,
session_changed,
);
(timeline.turn_running, list_sync)
let activity_snapshot_keys = awaiting_activity_snapshot
.then(|| auto_activity_snapshot_keys(&timeline.entries));
(timeline.turn_running, list_sync, activity_snapshot_keys)
})
.unwrap_or_else(|| {
let list_sync = self.turn_index_cache.sync(
Expand All@@ -346,9 +428,16 @@ impl ChatView {
&self.expanded,
session_changed,
);
(false, list_sync)
(false, list_sync, None)
});

if let Some(session_key) = session_key.as_deref()
&& let Some(keys) = activity_snapshot_keys
{
self.auto_activity_expansions
.hydrate_session_snapshot(session_key, keys);
}

let requested_turn = session_key
.as_deref()
.and_then(|session_id| self.workspace_store.read(cx).pending_chat_turn(session_id));
Expand DownExpand Up@@ -2315,12 +2404,12 @@ fn open_in_zed(cwd: &Path, window: &mut Window, cx: &mut App) {
#[cfg(test)]
mod tests {
use super::{
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansions,
ChatView, ResidencyScope, markdown_entries_for_residency,
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansion,
AutoActivityExpansions, ChatView, ResidencyScope, markdown_entries_for_residency,
};
use crate::store::WorkspaceStore;
use crate::window_state::WindowState;
use agent::ItemContent;
use agent::{ItemContent, ItemStatus};
use gpui::{AppContext as _, Entity, TestAppContext};
use std::sync::{
Arc,
Expand DownExpand Up@@ -2435,6 +2524,137 @@ mod tests {
));
}

#[test]
fn returning_session_shows_only_latest_snapshot_activity() {
let mut expansions = AutoActivityExpansions::default();
let returned_at = Instant::now();
let keys = [
"activity-command-1",
"activity-command-2",
"activity-command-3",
"activity-command-4",
"activity-command-5",
];
expansions.activate_session(Some(AUTO_ACTIVITY_TEST_SESSION));
assert!(expansions.awaiting_session_snapshot(Some(AUTO_ACTIVITY_TEST_SESSION)));
expansions.hydrate_session_snapshot(
AUTO_ACTIVITY_TEST_SESSION,
keys.into_iter().map(str::to_owned).collect(),
);
assert!(!expansions.awaiting_session_snapshot(Some(AUTO_ACTIVITY_TEST_SESSION)));

for key in &keys[..4] {
let historical =
expansions.observe(AUTO_ACTIVITY_TEST_SESSION, key, true, false, returned_at);
assert!(!historical.expanded, "historical {key} reopened");
assert_eq!(historical.collapse, None);
}

let latest =
expansions.observe(AUTO_ACTIVITY_TEST_SESSION, keys[4], true, true, returned_at);
assert!(latest.expanded);
assert_eq!(latest.collapse, None);
}

#[test]
fn returning_session_restarts_latest_activity_visibility_window() {
let mut expansions = AutoActivityExpansions::default();
let first_seen = Instant::now();
expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
true,
first_seen,
);

let returned_at = first_seen + Duration::from_secs(10);
expansions.activate_session(Some(AUTO_ACTIVITY_TEST_SESSION));
expansions.hydrate_session_snapshot(
AUTO_ACTIVITY_TEST_SESSION,
["activity-command".to_string()].into(),
);
let returned = expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
true,
returned_at,
);
assert!(returned.expanded);

let superseded = expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
false,
returned_at + Duration::from_millis(200),
);
assert!(superseded.expanded);
assert_eq!(
superseded.collapse.map(|(_, delay)| delay),
Some(Duration::from_millis(300))
);
}

#[gpui::test]
fn running_session_snapshot_renders_only_latest_command_expanded(cx: &mut TestAppContext) {
use gpui::{VisualTestContext, px, size};

let mut timeline = Timeline::default();
timeline.turns = vec![TurnMeta {
running: true,
..TurnMeta::default()
}];
// TurnMeta drives the live Work Log rendering under test. Keep the
// timeline-wide ticker idle so no perpetual clock task outlives this
// finite visual test.
timeline.entries.push(entry("user", user_item("go")));
for index in 1..=5 {
timeline.entries.push(entry(
&format!("command-{index}"),
EntryContent::Item(ItemContent::CommandExecution {
command: format!("command {index}"),
output: format!("output {index}"),
exit_code: Some(0),
status: ItemStatus::Completed,
}),
));
}

let (workspace_store, window_state, session_id) = seed_chat(cx, timeline);
let (view, cx) = cx
.add_window_view(|window, cx| ChatView::new(workspace_store, window_state, window, cx));
let cx: &mut VisualTestContext = cx;
cx.simulate_resize(size(px(1_024.), px(700.)));
cx.update(|window, cx| {
let _ = window.draw(cx);
});

let states = view.read_with(cx, |chat, _| {
let entries = chat
.auto_activity_expansions
.entries_by_session
.get(&session_id)
.expect("rendered session expansion state");
(1..=5)
.map(|index| entries.get(&format!("activity-command-{index}")).copied())
.collect::<Vec<_>>()
});
for (index, state) in states[..4].iter().enumerate() {
assert_eq!(
*state,
Some(AutoActivityExpansion::Collapsed),
"historical command {} reopened",
index + 1
);
}
assert!(matches!(
states[4],
Some(AutoActivityExpansion::Expanded { .. })
));
}

#[test]
fn collapsed_activity_stays_collapsed_after_visiting_another_session() {
let mut expansions = AutoActivityExpansions::default();
Expand Down
5 changes: 4 additions & 1 deletion docs/DESIGN.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,10 @@ platform pays that inset.
from that row's counts. The newest command output or file-edit diff stays
automatically expanded until a newer activity appears. A superseded detail
folds immediately if it has already been visible for 500ms; otherwise it
stays open only for the remainder of that minimum visibility window.
stays open only for the remainder of that minimum visibility window. Opening
a running thread is a current-state snapshot, not a replay: among activities
that arrived while the thread was away, only the newest detail opens, and its
500ms visibility window starts when the thread becomes visible.
Assistant prose settles the run, folding every
activity in it under one summary row. A completed section's toggle summarizes
only its real, nonzero events
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(chat): avoid replaying activity expansions#303

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): avoid replaying activity expansions #303

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
238 changes: 229 additions & 9 deletions crates/ui/src/chat/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,9 +49,9 @@ use self::components::command_panel::CommandPanelCache;
use self::model::{
ListSync, Segment, TurnIndexCache, TurnListItem, TurnRenderArgs, activity_run_duration_ms,
displayed_error_text, divergent_served_model, format_elapsed_deciseconds, latest_message_ids,
live_activity_segment, live_edit_rows, partition_activity_run, plain_text_as_markdown,
segment_entries, start_hub_projects, timeline_overdraw, user_content, user_visible_text,
work_log_capsule_label, work_log_counts, work_log_outcome,
live_activity_segment, live_edit_counts, live_edit_rows, partition_activity_run,
plain_text_as_markdown, segment_entries, start_hub_projects, timeline_overdraw, user_content,
user_visible_text, work_log_capsule_label, work_log_counts, work_log_outcome,
};
use self::residency::{
MarkdownEntry, ResidencyInput, ResidencyScope, decide, tail_turn_window, viewport_turn_window,
Expand DownExpand Up@@ -87,16 +87,52 @@ enum AutoActivityExpansion {
#[derive(Debug, Default)]
struct AutoActivityExpansions {
entries_by_session: HashMap<String, HashMap<String, AutoActivityExpansion>>,
/// Expandable details already present when the active session is hydrated.
/// Each key is consumed on first render so later live updates use the
/// ordinary minimum-visibility state machine.
session_snapshot: Option<AutoActivitySessionSnapshot>,
next_generation: u64,
}

#[derive(Debug)]
struct AutoActivitySessionSnapshot {
session_key: String,
/// `None` while the session status has switched but its asynchronous
/// timeline snapshot has not arrived yet.
pending_keys: Option<HashSet<String>>,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
struct AutoActivityObservation {
expanded: bool,
collapse: Option<(u64, Duration)>,
}

impl AutoActivityExpansions {
fn activate_session(&mut self, session_key: Option<&str>) {
self.session_snapshot = session_key.map(|session_key| AutoActivitySessionSnapshot {
session_key: session_key.to_string(),
pending_keys: None,
});
}

fn awaiting_session_snapshot(&self, session_key: Option<&str>) -> bool {
self.session_snapshot.as_ref().is_some_and(|snapshot| {
Some(snapshot.session_key.as_str()) == session_key && snapshot.pending_keys.is_none()
})
}

fn hydrate_session_snapshot(&mut self, session_key: &str, keys: HashSet<String>) {
if let Some(snapshot) = self
.session_snapshot
.as_mut()
.filter(|snapshot| snapshot.session_key == session_key)
&& snapshot.pending_keys.is_none()
{
snapshot.pending_keys = Some(keys);
}
}

fn observe(
&mut self,
session_key: &str,
Expand All@@ -115,6 +151,25 @@ impl AutoActivityExpansions {
};
}

let first_snapshot_observation = self
.session_snapshot
.as_mut()
.filter(|snapshot| snapshot.session_key == session_key)
.and_then(|snapshot| snapshot.pending_keys.as_mut())
.is_some_and(|keys| keys.remove(key));
if first_snapshot_observation {
let state = if latest {
AutoActivityExpansion::Expanded { visible_since: now }
} else {
AutoActivityExpansion::Collapsed
};
self.insert(session_key, key, state);
return AutoActivityObservation {
expanded: latest,
collapse: None,
};
}

let current = self
.entries_by_session
.get(session_key)
Expand DownExpand Up@@ -206,6 +261,26 @@ impl AutoActivityExpansions {
}
}

fn auto_activity_snapshot_keys(entries: &[Arc<TimelineEntry>]) -> HashSet<String> {
let mut keys = HashSet::new();
for entry in entries {
match &entry.content {
EntryContent::Item(ItemContent::CommandExecution { .. }) => {
keys.insert(format!("activity-{}", entry.id));
}
EntryContent::Item(ItemContent::FileChange { changes, .. }) => {
for (file_index, change) in changes.iter().enumerate() {
if live_edit_counts(change.diff.as_deref()).is_some() {
keys.insert(format!("activity-{}-file-{file_index}", entry.id));
}
}
}
_ => {}
}
}
keys
}

struct PendingMarkdownBuild {
generation: u64,
session_key: Option<String>,
Expand DownExpand Up@@ -319,8 +394,13 @@ impl ChatView {
let session_changed = session_key != self.session_key;
if session_changed {
self.expanded.clear();
self.auto_activity_expansions
.activate_session(session_key.as_deref());
}
let (running, list_sync) = self
let awaiting_activity_snapshot = self
.auto_activity_expansions
.awaiting_session_snapshot(session_key.as_deref());
let (running, list_sync, activity_snapshot_keys) = self
.workspace_store
.read(cx)
.with_active_timeline(|timeline| {
Expand All@@ -335,7 +415,9 @@ impl ChatView {
&self.expanded,
session_changed,
);
(timeline.turn_running, list_sync)
let activity_snapshot_keys = awaiting_activity_snapshot
.then(|| auto_activity_snapshot_keys(&timeline.entries));
(timeline.turn_running, list_sync, activity_snapshot_keys)
})
.unwrap_or_else(|| {
let list_sync = self.turn_index_cache.sync(
Expand All@@ -346,9 +428,16 @@ impl ChatView {
&self.expanded,
session_changed,
);
(false, list_sync)
(false, list_sync, None)
});

if let Some(session_key) = session_key.as_deref()
&& let Some(keys) = activity_snapshot_keys
{
self.auto_activity_expansions
.hydrate_session_snapshot(session_key, keys);
}

let requested_turn = session_key
.as_deref()
.and_then(|session_id| self.workspace_store.read(cx).pending_chat_turn(session_id));
Expand DownExpand Up@@ -2315,12 +2404,12 @@ fn open_in_zed(cwd: &Path, window: &mut Window, cx: &mut App) {
#[cfg(test)]
mod tests {
use super::{
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansions,
ChatView, ResidencyScope, markdown_entries_for_residency,
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansion,
AutoActivityExpansions, ChatView, ResidencyScope, markdown_entries_for_residency,
};
use crate::store::WorkspaceStore;
use crate::window_state::WindowState;
use agent::ItemContent;
use agent::{ItemContent, ItemStatus};
use gpui::{AppContext as _, Entity, TestAppContext};
use std::sync::{
Arc,
Expand DownExpand Up@@ -2435,6 +2524,137 @@ mod tests {
));
}

#[test]
fn returning_session_shows_only_latest_snapshot_activity() {
let mut expansions = AutoActivityExpansions::default();
let returned_at = Instant::now();
let keys = [
"activity-command-1",
"activity-command-2",
"activity-command-3",
"activity-command-4",
"activity-command-5",
];
expansions.activate_session(Some(AUTO_ACTIVITY_TEST_SESSION));
assert!(expansions.awaiting_session_snapshot(Some(AUTO_ACTIVITY_TEST_SESSION)));
expansions.hydrate_session_snapshot(
AUTO_ACTIVITY_TEST_SESSION,
keys.into_iter().map(str::to_owned).collect(),
);
assert!(!expansions.awaiting_session_snapshot(Some(AUTO_ACTIVITY_TEST_SESSION)));

for key in &keys[..4] {
let historical =
expansions.observe(AUTO_ACTIVITY_TEST_SESSION, key, true, false, returned_at);
assert!(!historical.expanded, "historical {key} reopened");
assert_eq!(historical.collapse, None);
}

let latest =
expansions.observe(AUTO_ACTIVITY_TEST_SESSION, keys[4], true, true, returned_at);
assert!(latest.expanded);
assert_eq!(latest.collapse, None);
}

#[test]
fn returning_session_restarts_latest_activity_visibility_window() {
let mut expansions = AutoActivityExpansions::default();
let first_seen = Instant::now();
expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
true,
first_seen,
);

let returned_at = first_seen + Duration::from_secs(10);
expansions.activate_session(Some(AUTO_ACTIVITY_TEST_SESSION));
expansions.hydrate_session_snapshot(
AUTO_ACTIVITY_TEST_SESSION,
["activity-command".to_string()].into(),
);
let returned = expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
true,
returned_at,
);
assert!(returned.expanded);

let superseded = expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
false,
returned_at + Duration::from_millis(200),
);
assert!(superseded.expanded);
assert_eq!(
superseded.collapse.map(|(_, delay)| delay),
Some(Duration::from_millis(300))
);
}

#[gpui::test]
fn running_session_snapshot_renders_only_latest_command_expanded(cx: &mut TestAppContext) {
use gpui::{VisualTestContext, px, size};

let mut timeline = Timeline::default();
timeline.turns = vec![TurnMeta {
running: true,
..TurnMeta::default()
}];
// TurnMeta drives the live Work Log rendering under test. Keep the
// timeline-wide ticker idle so no perpetual clock task outlives this
// finite visual test.
timeline.entries.push(entry("user", user_item("go")));
for index in 1..=5 {
timeline.entries.push(entry(
&format!("command-{index}"),
EntryContent::Item(ItemContent::CommandExecution {
command: format!("command {index}"),
output: format!("output {index}"),
exit_code: Some(0),
status: ItemStatus::Completed,
}),
));
}

let (workspace_store, window_state, session_id) = seed_chat(cx, timeline);
let (view, cx) = cx
.add_window_view(|window, cx| ChatView::new(workspace_store, window_state, window, cx));
let cx: &mut VisualTestContext = cx;
cx.simulate_resize(size(px(1_024.), px(700.)));
cx.update(|window, cx| {
let _ = window.draw(cx);
});

let states = view.read_with(cx, |chat, _| {
let entries = chat
.auto_activity_expansions
.entries_by_session
.get(&session_id)
.expect("rendered session expansion state");
(1..=5)
.map(|index| entries.get(&format!("activity-command-{index}")).copied())
.collect::<Vec<_>>()
});
for (index, state) in states[..4].iter().enumerate() {
assert_eq!(
*state,
Some(AutoActivityExpansion::Collapsed),
"historical command {} reopened",
index + 1
);
}
assert!(matches!(
states[4],
Some(AutoActivityExpansion::Expanded { .. })
));
}

#[test]
fn collapsed_activity_stays_collapsed_after_visiting_another_session() {
let mut expansions = AutoActivityExpansions::default();
Expand Down
5 changes: 4 additions & 1 deletion docs/DESIGN.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,10 @@ platform pays that inset.
from that row's counts. The newest command output or file-edit diff stays
automatically expanded until a newer activity appears. A superseded detail
folds immediately if it has already been visible for 500ms; otherwise it
stays open only for the remainder of that minimum visibility window.
stays open only for the remainder of that minimum visibility window. Opening
a running thread is a current-state snapshot, not a replay: among activities
that arrived while the thread was away, only the newest detail opens, and its
500ms visibility window starts when the thread becomes visible.
Assistant prose settles the run, folding every
activity in it under one summary row. A completed section's toggle summarizes
only its real, nonzero events
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

fix(chat): avoid replaying activity expansions#303

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): avoid replaying activity expansions #303

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
238 changes: 229 additions & 9 deletions crates/ui/src/chat/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,9 +49,9 @@ use self::components::command_panel::CommandPanelCache;
use self::model::{
ListSync, Segment, TurnIndexCache, TurnListItem, TurnRenderArgs, activity_run_duration_ms,
displayed_error_text, divergent_served_model, format_elapsed_deciseconds, latest_message_ids,
live_activity_segment, live_edit_rows, partition_activity_run, plain_text_as_markdown,
segment_entries, start_hub_projects, timeline_overdraw, user_content, user_visible_text,
work_log_capsule_label, work_log_counts, work_log_outcome,
live_activity_segment, live_edit_counts, live_edit_rows, partition_activity_run,
plain_text_as_markdown, segment_entries, start_hub_projects, timeline_overdraw, user_content,
user_visible_text, work_log_capsule_label, work_log_counts, work_log_outcome,
};
use self::residency::{
MarkdownEntry, ResidencyInput, ResidencyScope, decide, tail_turn_window, viewport_turn_window,
Expand DownExpand Up@@ -87,16 +87,52 @@ enum AutoActivityExpansion {
#[derive(Debug, Default)]
struct AutoActivityExpansions {
entries_by_session: HashMap<String, HashMap<String, AutoActivityExpansion>>,
/// Expandable details already present when the active session is hydrated.
/// Each key is consumed on first render so later live updates use the
/// ordinary minimum-visibility state machine.
session_snapshot: Option<AutoActivitySessionSnapshot>,
next_generation: u64,
}

#[derive(Debug)]
struct AutoActivitySessionSnapshot {
session_key: String,
/// `None` while the session status has switched but its asynchronous
/// timeline snapshot has not arrived yet.
pending_keys: Option<HashSet<String>>,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
struct AutoActivityObservation {
expanded: bool,
collapse: Option<(u64, Duration)>,
}

impl AutoActivityExpansions {
fn activate_session(&mut self, session_key: Option<&str>) {
self.session_snapshot = session_key.map(|session_key| AutoActivitySessionSnapshot {
session_key: session_key.to_string(),
pending_keys: None,
});
}

fn awaiting_session_snapshot(&self, session_key: Option<&str>) -> bool {
self.session_snapshot.as_ref().is_some_and(|snapshot| {
Some(snapshot.session_key.as_str()) == session_key && snapshot.pending_keys.is_none()
})
}

fn hydrate_session_snapshot(&mut self, session_key: &str, keys: HashSet<String>) {
if let Some(snapshot) = self
.session_snapshot
.as_mut()
.filter(|snapshot| snapshot.session_key == session_key)
&& snapshot.pending_keys.is_none()
{
snapshot.pending_keys = Some(keys);
}
}

fn observe(
&mut self,
session_key: &str,
Expand All@@ -115,6 +151,25 @@ impl AutoActivityExpansions {
};
}

let first_snapshot_observation = self
.session_snapshot
.as_mut()
.filter(|snapshot| snapshot.session_key == session_key)
.and_then(|snapshot| snapshot.pending_keys.as_mut())
.is_some_and(|keys| keys.remove(key));
if first_snapshot_observation {
let state = if latest {
AutoActivityExpansion::Expanded { visible_since: now }
} else {
AutoActivityExpansion::Collapsed
};
self.insert(session_key, key, state);
return AutoActivityObservation {
expanded: latest,
collapse: None,
};
}

let current = self
.entries_by_session
.get(session_key)
Expand DownExpand Up@@ -206,6 +261,26 @@ impl AutoActivityExpansions {
}
}

fn auto_activity_snapshot_keys(entries: &[Arc<TimelineEntry>]) -> HashSet<String> {
let mut keys = HashSet::new();
for entry in entries {
match &entry.content {
EntryContent::Item(ItemContent::CommandExecution { .. }) => {
keys.insert(format!("activity-{}", entry.id));
}
EntryContent::Item(ItemContent::FileChange { changes, .. }) => {
for (file_index, change) in changes.iter().enumerate() {
if live_edit_counts(change.diff.as_deref()).is_some() {
keys.insert(format!("activity-{}-file-{file_index}", entry.id));
}
}
}
_ => {}
}
}
keys
}

struct PendingMarkdownBuild {
generation: u64,
session_key: Option<String>,
Expand DownExpand Up@@ -319,8 +394,13 @@ impl ChatView {
let session_changed = session_key != self.session_key;
if session_changed {
self.expanded.clear();
self.auto_activity_expansions
.activate_session(session_key.as_deref());
}
let (running, list_sync) = self
let awaiting_activity_snapshot = self
.auto_activity_expansions
.awaiting_session_snapshot(session_key.as_deref());
let (running, list_sync, activity_snapshot_keys) = self
.workspace_store
.read(cx)
.with_active_timeline(|timeline| {
Expand All@@ -335,7 +415,9 @@ impl ChatView {
&self.expanded,
session_changed,
);
(timeline.turn_running, list_sync)
let activity_snapshot_keys = awaiting_activity_snapshot
.then(|| auto_activity_snapshot_keys(&timeline.entries));
(timeline.turn_running, list_sync, activity_snapshot_keys)
})
.unwrap_or_else(|| {
let list_sync = self.turn_index_cache.sync(
Expand All@@ -346,9 +428,16 @@ impl ChatView {
&self.expanded,
session_changed,
);
(false, list_sync)
(false, list_sync, None)
});

if let Some(session_key) = session_key.as_deref()
&& let Some(keys) = activity_snapshot_keys
{
self.auto_activity_expansions
.hydrate_session_snapshot(session_key, keys);
}

let requested_turn = session_key
.as_deref()
.and_then(|session_id| self.workspace_store.read(cx).pending_chat_turn(session_id));
Expand DownExpand Up@@ -2315,12 +2404,12 @@ fn open_in_zed(cwd: &Path, window: &mut Window, cx: &mut App) {
#[cfg(test)]
mod tests {
use super::{
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansions,
ChatView, ResidencyScope, markdown_entries_for_residency,
ASYNC_MARKDOWN_THRESHOLD_BYTES, AUTO_ACTIVITY_MIN_VISIBILITY, AutoActivityExpansion,
AutoActivityExpansions, ChatView, ResidencyScope, markdown_entries_for_residency,
};
use crate::store::WorkspaceStore;
use crate::window_state::WindowState;
use agent::ItemContent;
use agent::{ItemContent, ItemStatus};
use gpui::{AppContext as _, Entity, TestAppContext};
use std::sync::{
Arc,
Expand DownExpand Up@@ -2435,6 +2524,137 @@ mod tests {
));
}

#[test]
fn returning_session_shows_only_latest_snapshot_activity() {
let mut expansions = AutoActivityExpansions::default();
let returned_at = Instant::now();
let keys = [
"activity-command-1",
"activity-command-2",
"activity-command-3",
"activity-command-4",
"activity-command-5",
];
expansions.activate_session(Some(AUTO_ACTIVITY_TEST_SESSION));
assert!(expansions.awaiting_session_snapshot(Some(AUTO_ACTIVITY_TEST_SESSION)));
expansions.hydrate_session_snapshot(
AUTO_ACTIVITY_TEST_SESSION,
keys.into_iter().map(str::to_owned).collect(),
);
assert!(!expansions.awaiting_session_snapshot(Some(AUTO_ACTIVITY_TEST_SESSION)));

for key in &keys[..4] {
let historical =
expansions.observe(AUTO_ACTIVITY_TEST_SESSION, key, true, false, returned_at);
assert!(!historical.expanded, "historical {key} reopened");
assert_eq!(historical.collapse, None);
}

let latest =
expansions.observe(AUTO_ACTIVITY_TEST_SESSION, keys[4], true, true, returned_at);
assert!(latest.expanded);
assert_eq!(latest.collapse, None);
}

#[test]
fn returning_session_restarts_latest_activity_visibility_window() {
let mut expansions = AutoActivityExpansions::default();
let first_seen = Instant::now();
expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
true,
first_seen,
);

let returned_at = first_seen + Duration::from_secs(10);
expansions.activate_session(Some(AUTO_ACTIVITY_TEST_SESSION));
expansions.hydrate_session_snapshot(
AUTO_ACTIVITY_TEST_SESSION,
["activity-command".to_string()].into(),
);
let returned = expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
true,
returned_at,
);
assert!(returned.expanded);

let superseded = expansions.observe(
AUTO_ACTIVITY_TEST_SESSION,
"activity-command",
true,
false,
returned_at + Duration::from_millis(200),
);
assert!(superseded.expanded);
assert_eq!(
superseded.collapse.map(|(_, delay)| delay),
Some(Duration::from_millis(300))
);
}

#[gpui::test]
fn running_session_snapshot_renders_only_latest_command_expanded(cx: &mut TestAppContext) {
use gpui::{VisualTestContext, px, size};

let mut timeline = Timeline::default();
timeline.turns = vec![TurnMeta {
running: true,
..TurnMeta::default()
}];
// TurnMeta drives the live Work Log rendering under test. Keep the
// timeline-wide ticker idle so no perpetual clock task outlives this
// finite visual test.
timeline.entries.push(entry("user", user_item("go")));
for index in 1..=5 {
timeline.entries.push(entry(
&format!("command-{index}"),
EntryContent::Item(ItemContent::CommandExecution {
command: format!("command {index}"),
output: format!("output {index}"),
exit_code: Some(0),
status: ItemStatus::Completed,
}),
));
}

let (workspace_store, window_state, session_id) = seed_chat(cx, timeline);
let (view, cx) = cx
.add_window_view(|window, cx| ChatView::new(workspace_store, window_state, window, cx));
let cx: &mut VisualTestContext = cx;
cx.simulate_resize(size(px(1_024.), px(700.)));
cx.update(|window, cx| {
let _ = window.draw(cx);
});

let states = view.read_with(cx, |chat, _| {
let entries = chat
.auto_activity_expansions
.entries_by_session
.get(&session_id)
.expect("rendered session expansion state");
(1..=5)
.map(|index| entries.get(&format!("activity-command-{index}")).copied())
.collect::<Vec<_>>()
});
for (index, state) in states[..4].iter().enumerate() {
assert_eq!(
*state,
Some(AutoActivityExpansion::Collapsed),
"historical command {} reopened",
index + 1
);
}
assert!(matches!(
states[4],
Some(AutoActivityExpansion::Expanded { .. })
));
}

#[test]
fn collapsed_activity_stays_collapsed_after_visiting_another_session() {
let mut expansions = AutoActivityExpansions::default();
Expand Down
5 changes: 4 additions & 1 deletion docs/DESIGN.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,10 @@ platform pays that inset.
from that row's counts. The newest command output or file-edit diff stays
automatically expanded until a newer activity appears. A superseded detail
folds immediately if it has already been visible for 500ms; otherwise it
stays open only for the remainder of that minimum visibility window.
stays open only for the remainder of that minimum visibility window. Opening
a running thread is a current-state snapshot, not a replay: among activities
that arrived while the thread was away, only the newest detail opens, and its
500ms visibility window starts when the thread becomes visible.
Assistant prose settles the run, folding every
activity in it under one summary row. A completed section's toggle summarizes
only its real, nonzero events
Expand Down