Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions crates/ui/src/chat/components/work_log.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ use gpui::{
};
use gpui_base::{StyledExt as _, h_flex, v_flex};

use super::super::model::WorkLogCounts;
use tcode_core::session::{TimelineEntry, TurnMeta};

pub(crate) type WorkLogArgs<'a> = (
Expand All@@ -19,7 +18,6 @@ pub(crate) type WorkLogArgs<'a> = (
&'a TurnMeta,
&'a Path,
&'a [&'a TimelineEntry],
&'a WorkLogCounts,
bool,
);

Expand Down
27 changes: 16 additions & 11 deletions crates/ui/src/chat/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,14 @@ impl ChatView {
cx.notify();
}

fn promote_auto_expanded(&mut self, turn: usize, key: &str, cx: &mut Context<Self>) {
self.expanded.insert(manual_override_key(key));
self.expanded.insert(key.to_string());
self.sync_markdown_states(cx);
self.list_state.remeasure_items(turn..turn + 1);
cx.notify();
}

// -- turn rendering -----------------------------------------------------

/// Render one turn as chronological messages, errors, and Work Log runs.
Expand All@@ -275,8 +283,6 @@ impl ChatView {

let segmented = segment_entries(entries, turn.running);
let segments = &segmented.flow;
let turn_entries: Vec<&TimelineEntry> = entries.iter().map(AsRef::as_ref).collect();
let turn_counts = work_log_counts(&turn_entries);
let last_activity_segment = live_activity_segment(segments, turn.running);

for (segment_index, segment) in segments.iter().enumerate() {
Expand DownExpand Up@@ -318,7 +324,6 @@ impl ChatView {
turn,
cwd,
activities,
&turn_counts,
last_activity_segment == Some(segment_index),
),
cx,
Expand DownExpand Up@@ -659,20 +664,15 @@ impl ChatView {
args: components::work_log::WorkLogArgs<'_>,
cx: &mut Context<Self>,
) -> AnyElement {
let (index, segment_id, turn, cwd, activities, turn_counts, is_last) = args;
let (index, segment_id, turn, cwd, activities, is_last) = args;
let section_key = format!("worklog-{index}-{segment_id}");
let running = is_last && turn.running;
let automatic = work_log_auto_expands(activities, turn.running, is_last);
let expanded = auto_expanded(&self.expanded, &section_key, automatic);
let manually_expanded =
expanded && (self.expanded.contains(&manual_override_key(&section_key)) || !automatic);
let segment_counts = work_log_counts(activities);
let counts = if is_last {
turn_counts
} else {
&segment_counts
};
let mut capsule_label = work_log_capsule_label(counts, activities.len());
let mut capsule_label = work_log_capsule_label(&segment_counts, activities.len());
if capsule_label.is_empty() {
capsule_label = crate::tr!("chat.work_log").into_owned();
}
Expand DownExpand Up@@ -709,6 +709,7 @@ impl ChatView {
}

let toggle_section_key = section_key;
let ticker_expanded = expanded && !manually_expanded;
components::work_log::work_log(
components::work_log::WorkLogData {
index,
Expand All@@ -721,7 +722,11 @@ impl ChatView {
rows,
},
cx.listener(move |this, _, _, cx| {
this.toggle_auto_expanded(index, &toggle_section_key, automatic, cx);
if ticker_expanded {
this.promote_auto_expanded(index, &toggle_section_key, cx);
} else {
this.toggle_auto_expanded(index, &toggle_section_key, automatic, cx);
}
}),
cx,
)
Expand Down
14 changes: 7 additions & 7 deletions crates/ui/src/chat/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,7 +165,7 @@ pub(crate) fn segment_entries<'a>(
}

/// Which segment, if any, is the turn's *live* work log — the one that opens on
/// its own and reports the turn's totals.
/// its own while the turn is running.
///
/// A running turn whose last segment is prose has none: liveness is carried by
/// the turn-level working indicator standing bare after every segment, so every
Expand DownExpand Up@@ -1498,7 +1498,7 @@ mod tests {
// to host it, and the earlier run has already settled.
assert_eq!(segments.len(), 2);
assert_eq!(live_activity_segment(&segments, true), None);
// Once the turn ends, that same run carries the turn's snapshot.
// Once the turn ends, that same run is the final settled work log.
assert_eq!(live_activity_segment(&segments, false), Some(0));

let activity_tail = [entry("assistant", assistant("answer")), command("cmd")];
Expand DownExpand Up@@ -1763,14 +1763,14 @@ mod tests {
}

#[test]
fn finished_activity_runs_show_nonzero_segment_counts() {
fn finished_activity_runs_use_segment_scoped_counts() {
let _locale_guard = crate::settings::TestLocaleGuard::acquire();
let entries = [
command("command-1"),
file_change("files-1", &["src/shared.rs"]),
entry("assistant", assistant("intermediate output")),
command("command-2"),
file_change("files-2", &["src/shared.rs"]),
command("command-3"),
];
let segments = segment_entries(&entries, false).flow;
let activity_indexes: Vec<usize> = segments
Expand All@@ -1783,7 +1783,7 @@ mod tests {
assert_eq!(activity_indexes.len(), 2);

let counts = work_log_counts(&refs(&entries));
assert_eq!(counts.commands, 2);
assert_eq!(counts.commands, 3);
assert_eq!(counts.files, 1);

let labels = || {
Expand All@@ -1799,9 +1799,9 @@ mod tests {
.collect::<Vec<_>>()
};
crate::set_locale(crate::LANGUAGE_ENGLISH);
assert_eq!(labels(), ["1 edit · 1 command", "1 edit · 1 command"]);
assert_eq!(labels(), ["1 edit · 1 command", "2 commands"]);
crate::set_locale(crate::LANGUAGE_SIMPLIFIED_CHINESE);
assert_eq!(labels(), ["1 处编辑 · 1 条命令", "1 处编辑 · 1 条命令"]);
assert_eq!(labels(), ["1 处编辑 · 1 条命令", "2 条命令"]);
}

#[test]
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions crates/ui/src/chat/components/work_log.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ use gpui::{
};
use gpui_base::{StyledExt as _, h_flex, v_flex};

use super::super::model::WorkLogCounts;
use tcode_core::session::{TimelineEntry, TurnMeta};

pub(crate) type WorkLogArgs<'a> = (
Expand All@@ -19,7 +18,6 @@ pub(crate) type WorkLogArgs<'a> = (
&'a TurnMeta,
&'a Path,
&'a [&'a TimelineEntry],
&'a WorkLogCounts,
bool,
);

Expand Down
27 changes: 16 additions & 11 deletions crates/ui/src/chat/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,14 @@ impl ChatView {
cx.notify();
}

fn promote_auto_expanded(&mut self, turn: usize, key: &str, cx: &mut Context<Self>) {
self.expanded.insert(manual_override_key(key));
self.expanded.insert(key.to_string());
self.sync_markdown_states(cx);
self.list_state.remeasure_items(turn..turn + 1);
cx.notify();
}

// -- turn rendering -----------------------------------------------------

/// Render one turn as chronological messages, errors, and Work Log runs.
Expand All@@ -275,8 +283,6 @@ impl ChatView {

let segmented = segment_entries(entries, turn.running);
let segments = &segmented.flow;
let turn_entries: Vec<&TimelineEntry> = entries.iter().map(AsRef::as_ref).collect();
let turn_counts = work_log_counts(&turn_entries);
let last_activity_segment = live_activity_segment(segments, turn.running);

for (segment_index, segment) in segments.iter().enumerate() {
Expand DownExpand Up@@ -318,7 +324,6 @@ impl ChatView {
turn,
cwd,
activities,
&turn_counts,
last_activity_segment == Some(segment_index),
),
cx,
Expand DownExpand Up@@ -659,20 +664,15 @@ impl ChatView {
args: components::work_log::WorkLogArgs<'_>,
cx: &mut Context<Self>,
) -> AnyElement {
let (index, segment_id, turn, cwd, activities, turn_counts, is_last) = args;
let (index, segment_id, turn, cwd, activities, is_last) = args;
let section_key = format!("worklog-{index}-{segment_id}");
let running = is_last && turn.running;
let automatic = work_log_auto_expands(activities, turn.running, is_last);
let expanded = auto_expanded(&self.expanded, &section_key, automatic);
let manually_expanded =
expanded && (self.expanded.contains(&manual_override_key(&section_key)) || !automatic);
let segment_counts = work_log_counts(activities);
let counts = if is_last {
turn_counts
} else {
&segment_counts
};
let mut capsule_label = work_log_capsule_label(counts, activities.len());
let mut capsule_label = work_log_capsule_label(&segment_counts, activities.len());
if capsule_label.is_empty() {
capsule_label = crate::tr!("chat.work_log").into_owned();
}
Expand DownExpand Up@@ -709,6 +709,7 @@ impl ChatView {
}

let toggle_section_key = section_key;
let ticker_expanded = expanded && !manually_expanded;
components::work_log::work_log(
components::work_log::WorkLogData {
index,
Expand All@@ -721,7 +722,11 @@ impl ChatView {
rows,
},
cx.listener(move |this, _, _, cx| {
this.toggle_auto_expanded(index, &toggle_section_key, automatic, cx);
if ticker_expanded {
this.promote_auto_expanded(index, &toggle_section_key, cx);
} else {
this.toggle_auto_expanded(index, &toggle_section_key, automatic, cx);
}
}),
cx,
)
Expand Down
14 changes: 7 additions & 7 deletions crates/ui/src/chat/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,7 +165,7 @@ pub(crate) fn segment_entries<'a>(
}

/// Which segment, if any, is the turn's *live* work log — the one that opens on
/// its own and reports the turn's totals.
/// its own while the turn is running.
///
/// A running turn whose last segment is prose has none: liveness is carried by
/// the turn-level working indicator standing bare after every segment, so every
Expand DownExpand Up@@ -1498,7 +1498,7 @@ mod tests {
// to host it, and the earlier run has already settled.
assert_eq!(segments.len(), 2);
assert_eq!(live_activity_segment(&segments, true), None);
// Once the turn ends, that same run carries the turn's snapshot.
// Once the turn ends, that same run is the final settled work log.
assert_eq!(live_activity_segment(&segments, false), Some(0));

let activity_tail = [entry("assistant", assistant("answer")), command("cmd")];
Expand DownExpand Up@@ -1763,14 +1763,14 @@ mod tests {
}

#[test]
fn finished_activity_runs_show_nonzero_segment_counts() {
fn finished_activity_runs_use_segment_scoped_counts() {
let _locale_guard = crate::settings::TestLocaleGuard::acquire();
let entries = [
command("command-1"),
file_change("files-1", &["src/shared.rs"]),
entry("assistant", assistant("intermediate output")),
command("command-2"),
file_change("files-2", &["src/shared.rs"]),
command("command-3"),
];
let segments = segment_entries(&entries, false).flow;
let activity_indexes: Vec<usize> = segments
Expand All@@ -1783,7 +1783,7 @@ mod tests {
assert_eq!(activity_indexes.len(), 2);

let counts = work_log_counts(&refs(&entries));
assert_eq!(counts.commands, 2);
assert_eq!(counts.commands, 3);
assert_eq!(counts.files, 1);

let labels = || {
Expand All@@ -1799,9 +1799,9 @@ mod tests {
.collect::<Vec<_>>()
};
crate::set_locale(crate::LANGUAGE_ENGLISH);
assert_eq!(labels(), ["1 edit · 1 command", "1 edit · 1 command"]);
assert_eq!(labels(), ["1 edit · 1 command", "2 commands"]);
crate::set_locale(crate::LANGUAGE_SIMPLIFIED_CHINESE);
assert_eq!(labels(), ["1 处编辑 · 1 条命令", "1 处编辑 · 1 条命令"]);
assert_eq!(labels(), ["1 处编辑 · 1 条命令", "2 条命令"]);
}

#[test]
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions crates/ui/src/chat/components/work_log.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ use gpui::{
};
use gpui_base::{StyledExt as _, h_flex, v_flex};

use super::super::model::WorkLogCounts;
use tcode_core::session::{TimelineEntry, TurnMeta};

pub(crate) type WorkLogArgs<'a> = (
Expand All@@ -19,7 +18,6 @@ pub(crate) type WorkLogArgs<'a> = (
&'a TurnMeta,
&'a Path,
&'a [&'a TimelineEntry],
&'a WorkLogCounts,
bool,
);

Expand Down
27 changes: 16 additions & 11 deletions crates/ui/src/chat/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,14 @@ impl ChatView {
cx.notify();
}

fn promote_auto_expanded(&mut self, turn: usize, key: &str, cx: &mut Context<Self>) {
self.expanded.insert(manual_override_key(key));
self.expanded.insert(key.to_string());
self.sync_markdown_states(cx);
self.list_state.remeasure_items(turn..turn + 1);
cx.notify();
}

// -- turn rendering -----------------------------------------------------

/// Render one turn as chronological messages, errors, and Work Log runs.
Expand All@@ -275,8 +283,6 @@ impl ChatView {

let segmented = segment_entries(entries, turn.running);
let segments = &segmented.flow;
let turn_entries: Vec<&TimelineEntry> = entries.iter().map(AsRef::as_ref).collect();
let turn_counts = work_log_counts(&turn_entries);
let last_activity_segment = live_activity_segment(segments, turn.running);

for (segment_index, segment) in segments.iter().enumerate() {
Expand DownExpand Up@@ -318,7 +324,6 @@ impl ChatView {
turn,
cwd,
activities,
&turn_counts,
last_activity_segment == Some(segment_index),
),
cx,
Expand DownExpand Up@@ -659,20 +664,15 @@ impl ChatView {
args: components::work_log::WorkLogArgs<'_>,
cx: &mut Context<Self>,
) -> AnyElement {
let (index, segment_id, turn, cwd, activities, turn_counts, is_last) = args;
let (index, segment_id, turn, cwd, activities, is_last) = args;
let section_key = format!("worklog-{index}-{segment_id}");
let running = is_last && turn.running;
let automatic = work_log_auto_expands(activities, turn.running, is_last);
let expanded = auto_expanded(&self.expanded, &section_key, automatic);
let manually_expanded =
expanded && (self.expanded.contains(&manual_override_key(&section_key)) || !automatic);
let segment_counts = work_log_counts(activities);
let counts = if is_last {
turn_counts
} else {
&segment_counts
};
let mut capsule_label = work_log_capsule_label(counts, activities.len());
let mut capsule_label = work_log_capsule_label(&segment_counts, activities.len());
if capsule_label.is_empty() {
capsule_label = crate::tr!("chat.work_log").into_owned();
}
Expand DownExpand Up@@ -709,6 +709,7 @@ impl ChatView {
}

let toggle_section_key = section_key;
let ticker_expanded = expanded && !manually_expanded;
components::work_log::work_log(
components::work_log::WorkLogData {
index,
Expand All@@ -721,7 +722,11 @@ impl ChatView {
rows,
},
cx.listener(move |this, _, _, cx| {
this.toggle_auto_expanded(index, &toggle_section_key, automatic, cx);
if ticker_expanded {
this.promote_auto_expanded(index, &toggle_section_key, cx);
} else {
this.toggle_auto_expanded(index, &toggle_section_key, automatic, cx);
}
}),
cx,
)
Expand Down
14 changes: 7 additions & 7 deletions crates/ui/src/chat/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,7 +165,7 @@ pub(crate) fn segment_entries<'a>(
}

/// Which segment, if any, is the turn's *live* work log — the one that opens on
/// its own and reports the turn's totals.
/// its own while the turn is running.
///
/// A running turn whose last segment is prose has none: liveness is carried by
/// the turn-level working indicator standing bare after every segment, so every
Expand DownExpand Up@@ -1498,7 +1498,7 @@ mod tests {
// to host it, and the earlier run has already settled.
assert_eq!(segments.len(), 2);
assert_eq!(live_activity_segment(&segments, true), None);
// Once the turn ends, that same run carries the turn's snapshot.
// Once the turn ends, that same run is the final settled work log.
assert_eq!(live_activity_segment(&segments, false), Some(0));

let activity_tail = [entry("assistant", assistant("answer")), command("cmd")];
Expand DownExpand Up@@ -1763,14 +1763,14 @@ mod tests {
}

#[test]
fn finished_activity_runs_show_nonzero_segment_counts() {
fn finished_activity_runs_use_segment_scoped_counts() {
let _locale_guard = crate::settings::TestLocaleGuard::acquire();
let entries = [
command("command-1"),
file_change("files-1", &["src/shared.rs"]),
entry("assistant", assistant("intermediate output")),
command("command-2"),
file_change("files-2", &["src/shared.rs"]),
command("command-3"),
];
let segments = segment_entries(&entries, false).flow;
let activity_indexes: Vec<usize> = segments
Expand All@@ -1783,7 +1783,7 @@ mod tests {
assert_eq!(activity_indexes.len(), 2);

let counts = work_log_counts(&refs(&entries));
assert_eq!(counts.commands, 2);
assert_eq!(counts.commands, 3);
assert_eq!(counts.files, 1);

let labels = || {
Expand All@@ -1799,9 +1799,9 @@ mod tests {
.collect::<Vec<_>>()
};
crate::set_locale(crate::LANGUAGE_ENGLISH);
assert_eq!(labels(), ["1 edit · 1 command", "1 edit · 1 command"]);
assert_eq!(labels(), ["1 edit · 1 command", "2 commands"]);
crate::set_locale(crate::LANGUAGE_SIMPLIFIED_CHINESE);
assert_eq!(labels(), ["1 处编辑 · 1 条命令", "1 处编辑 · 1 条命令"]);
assert_eq!(labels(), ["1 处编辑 · 1 条命令", "2 条命令"]);
}

#[test]
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions crates/ui/src/chat/components/work_log.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ use gpui::{
};
use gpui_base::{StyledExt as _, h_flex, v_flex};

use super::super::model::WorkLogCounts;
use tcode_core::session::{TimelineEntry, TurnMeta};

pub(crate) type WorkLogArgs<'a> = (
Expand All@@ -19,7 +18,6 @@ pub(crate) type WorkLogArgs<'a> = (
&'a TurnMeta,
&'a Path,
&'a [&'a TimelineEntry],
&'a WorkLogCounts,
bool,
);

Expand Down
27 changes: 16 additions & 11 deletions crates/ui/src/chat/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,14 @@ impl ChatView {
cx.notify();
}

fn promote_auto_expanded(&mut self, turn: usize, key: &str, cx: &mut Context<Self>) {
self.expanded.insert(manual_override_key(key));
self.expanded.insert(key.to_string());
self.sync_markdown_states(cx);
self.list_state.remeasure_items(turn..turn + 1);
cx.notify();
}

// -- turn rendering -----------------------------------------------------

/// Render one turn as chronological messages, errors, and Work Log runs.
Expand All@@ -275,8 +283,6 @@ impl ChatView {

let segmented = segment_entries(entries, turn.running);
let segments = &segmented.flow;
let turn_entries: Vec<&TimelineEntry> = entries.iter().map(AsRef::as_ref).collect();
let turn_counts = work_log_counts(&turn_entries);
let last_activity_segment = live_activity_segment(segments, turn.running);

for (segment_index, segment) in segments.iter().enumerate() {
Expand DownExpand Up@@ -318,7 +324,6 @@ impl ChatView {
turn,
cwd,
activities,
&turn_counts,
last_activity_segment == Some(segment_index),
),
cx,
Expand DownExpand Up@@ -659,20 +664,15 @@ impl ChatView {
args: components::work_log::WorkLogArgs<'_>,
cx: &mut Context<Self>,
) -> AnyElement {
let (index, segment_id, turn, cwd, activities, turn_counts, is_last) = args;
let (index, segment_id, turn, cwd, activities, is_last) = args;
let section_key = format!("worklog-{index}-{segment_id}");
let running = is_last && turn.running;
let automatic = work_log_auto_expands(activities, turn.running, is_last);
let expanded = auto_expanded(&self.expanded, &section_key, automatic);
let manually_expanded =
expanded && (self.expanded.contains(&manual_override_key(&section_key)) || !automatic);
let segment_counts = work_log_counts(activities);
let counts = if is_last {
turn_counts
} else {
&segment_counts
};
let mut capsule_label = work_log_capsule_label(counts, activities.len());
let mut capsule_label = work_log_capsule_label(&segment_counts, activities.len());
if capsule_label.is_empty() {
capsule_label = crate::tr!("chat.work_log").into_owned();
}
Expand DownExpand Up@@ -709,6 +709,7 @@ impl ChatView {
}

let toggle_section_key = section_key;
let ticker_expanded = expanded && !manually_expanded;
components::work_log::work_log(
components::work_log::WorkLogData {
index,
Expand All@@ -721,7 +722,11 @@ impl ChatView {
rows,
},
cx.listener(move |this, _, _, cx| {
this.toggle_auto_expanded(index, &toggle_section_key, automatic, cx);
if ticker_expanded {
this.promote_auto_expanded(index, &toggle_section_key, cx);
} else {
this.toggle_auto_expanded(index, &toggle_section_key, automatic, cx);
}
}),
cx,
)
Expand Down
14 changes: 7 additions & 7 deletions crates/ui/src/chat/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,7 +165,7 @@ pub(crate) fn segment_entries<'a>(
}

/// Which segment, if any, is the turn's *live* work log — the one that opens on
/// its own and reports the turn's totals.
/// its own while the turn is running.
///
/// A running turn whose last segment is prose has none: liveness is carried by
/// the turn-level working indicator standing bare after every segment, so every
Expand DownExpand Up@@ -1498,7 +1498,7 @@ mod tests {
// to host it, and the earlier run has already settled.
assert_eq!(segments.len(), 2);
assert_eq!(live_activity_segment(&segments, true), None);
// Once the turn ends, that same run carries the turn's snapshot.
// Once the turn ends, that same run is the final settled work log.
assert_eq!(live_activity_segment(&segments, false), Some(0));

let activity_tail = [entry("assistant", assistant("answer")), command("cmd")];
Expand DownExpand Up@@ -1763,14 +1763,14 @@ mod tests {
}

#[test]
fn finished_activity_runs_show_nonzero_segment_counts() {
fn finished_activity_runs_use_segment_scoped_counts() {
let _locale_guard = crate::settings::TestLocaleGuard::acquire();
let entries = [
command("command-1"),
file_change("files-1", &["src/shared.rs"]),
entry("assistant", assistant("intermediate output")),
command("command-2"),
file_change("files-2", &["src/shared.rs"]),
command("command-3"),
];
let segments = segment_entries(&entries, false).flow;
let activity_indexes: Vec<usize> = segments
Expand All@@ -1783,7 +1783,7 @@ mod tests {
assert_eq!(activity_indexes.len(), 2);

let counts = work_log_counts(&refs(&entries));
assert_eq!(counts.commands, 2);
assert_eq!(counts.commands, 3);
assert_eq!(counts.files, 1);

let labels = || {
Expand All@@ -1799,9 +1799,9 @@ mod tests {
.collect::<Vec<_>>()
};
crate::set_locale(crate::LANGUAGE_ENGLISH);
assert_eq!(labels(), ["1 edit · 1 command", "1 edit · 1 command"]);
assert_eq!(labels(), ["1 edit · 1 command", "2 commands"]);
crate::set_locale(crate::LANGUAGE_SIMPLIFIED_CHINESE);
assert_eq!(labels(), ["1 处编辑 · 1 条命令", "1 处编辑 · 1 条命令"]);
assert_eq!(labels(), ["1 处编辑 · 1 条命令", "2 条命令"]);
}

#[test]
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions crates/ui/src/chat/components/work_log.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ use gpui::{
};
use gpui_base::{StyledExt as _, h_flex, v_flex};

use super::super::model::WorkLogCounts;
use tcode_core::session::{TimelineEntry, TurnMeta};

pub(crate) type WorkLogArgs<'a> = (
Expand All@@ -19,7 +18,6 @@ pub(crate) type WorkLogArgs<'a> = (
&'a TurnMeta,
&'a Path,
&'a [&'a TimelineEntry],
&'a WorkLogCounts,
bool,
);

Expand Down
27 changes: 16 additions & 11 deletions crates/ui/src/chat/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,14 @@ impl ChatView {
cx.notify();
}

fn promote_auto_expanded(&mut self, turn: usize, key: &str, cx: &mut Context<Self>) {
self.expanded.insert(manual_override_key(key));
self.expanded.insert(key.to_string());
self.sync_markdown_states(cx);
self.list_state.remeasure_items(turn..turn + 1);
cx.notify();
}

// -- turn rendering -----------------------------------------------------

/// Render one turn as chronological messages, errors, and Work Log runs.
Expand All@@ -275,8 +283,6 @@ impl ChatView {

let segmented = segment_entries(entries, turn.running);
let segments = &segmented.flow;
let turn_entries: Vec<&TimelineEntry> = entries.iter().map(AsRef::as_ref).collect();
let turn_counts = work_log_counts(&turn_entries);
let last_activity_segment = live_activity_segment(segments, turn.running);

for (segment_index, segment) in segments.iter().enumerate() {
Expand DownExpand Up@@ -318,7 +324,6 @@ impl ChatView {
turn,
cwd,
activities,
&turn_counts,
last_activity_segment == Some(segment_index),
),
cx,
Expand DownExpand Up@@ -659,20 +664,15 @@ impl ChatView {
args: components::work_log::WorkLogArgs<'_>,
cx: &mut Context<Self>,
) -> AnyElement {
let (index, segment_id, turn, cwd, activities, turn_counts, is_last) = args;
let (index, segment_id, turn, cwd, activities, is_last) = args;
let section_key = format!("worklog-{index}-{segment_id}");
let running = is_last && turn.running;
let automatic = work_log_auto_expands(activities, turn.running, is_last);
let expanded = auto_expanded(&self.expanded, &section_key, automatic);
let manually_expanded =
expanded && (self.expanded.contains(&manual_override_key(&section_key)) || !automatic);
let segment_counts = work_log_counts(activities);
let counts = if is_last {
turn_counts
} else {
&segment_counts
};
let mut capsule_label = work_log_capsule_label(counts, activities.len());
let mut capsule_label = work_log_capsule_label(&segment_counts, activities.len());
if capsule_label.is_empty() {
capsule_label = crate::tr!("chat.work_log").into_owned();
}
Expand DownExpand Up@@ -709,6 +709,7 @@ impl ChatView {
}

let toggle_section_key = section_key;
let ticker_expanded = expanded && !manually_expanded;
components::work_log::work_log(
components::work_log::WorkLogData {
index,
Expand All@@ -721,7 +722,11 @@ impl ChatView {
rows,
},
cx.listener(move |this, _, _, cx| {
this.toggle_auto_expanded(index, &toggle_section_key, automatic, cx);
if ticker_expanded {
this.promote_auto_expanded(index, &toggle_section_key, cx);
} else {
this.toggle_auto_expanded(index, &toggle_section_key, automatic, cx);
}
}),
cx,
)
Expand Down
14 changes: 7 additions & 7 deletions crates/ui/src/chat/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,7 +165,7 @@ pub(crate) fn segment_entries<'a>(
}

/// Which segment, if any, is the turn's *live* work log — the one that opens on
/// its own and reports the turn's totals.
/// its own while the turn is running.
///
/// A running turn whose last segment is prose has none: liveness is carried by
/// the turn-level working indicator standing bare after every segment, so every
Expand DownExpand Up@@ -1498,7 +1498,7 @@ mod tests {
// to host it, and the earlier run has already settled.
assert_eq!(segments.len(), 2);
assert_eq!(live_activity_segment(&segments, true), None);
// Once the turn ends, that same run carries the turn's snapshot.
// Once the turn ends, that same run is the final settled work log.
assert_eq!(live_activity_segment(&segments, false), Some(0));

let activity_tail = [entry("assistant", assistant("answer")), command("cmd")];
Expand DownExpand Up@@ -1763,14 +1763,14 @@ mod tests {
}

#[test]
fn finished_activity_runs_show_nonzero_segment_counts() {
fn finished_activity_runs_use_segment_scoped_counts() {
let _locale_guard = crate::settings::TestLocaleGuard::acquire();
let entries = [
command("command-1"),
file_change("files-1", &["src/shared.rs"]),
entry("assistant", assistant("intermediate output")),
command("command-2"),
file_change("files-2", &["src/shared.rs"]),
command("command-3"),
];
let segments = segment_entries(&entries, false).flow;
let activity_indexes: Vec<usize> = segments
Expand All@@ -1783,7 +1783,7 @@ mod tests {
assert_eq!(activity_indexes.len(), 2);

let counts = work_log_counts(&refs(&entries));
assert_eq!(counts.commands, 2);
assert_eq!(counts.commands, 3);
assert_eq!(counts.files, 1);

let labels = || {
Expand All@@ -1799,9 +1799,9 @@ mod tests {
.collect::<Vec<_>>()
};
crate::set_locale(crate::LANGUAGE_ENGLISH);
assert_eq!(labels(), ["1 edit · 1 command", "1 edit · 1 command"]);
assert_eq!(labels(), ["1 edit · 1 command", "2 commands"]);
crate::set_locale(crate::LANGUAGE_SIMPLIFIED_CHINESE);
assert_eq!(labels(), ["1 处编辑 · 1 条命令", "1 处编辑 · 1 条命令"]);
assert_eq!(labels(), ["1 处编辑 · 1 条命令", "2 条命令"]);
}

#[test]
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions crates/ui/src/chat/components/work_log.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ use gpui::{
};
use gpui_base::{StyledExt as _, h_flex, v_flex};

use super::super::model::WorkLogCounts;
use tcode_core::session::{TimelineEntry, TurnMeta};

pub(crate) type WorkLogArgs<'a> = (
Expand All@@ -19,7 +18,6 @@ pub(crate) type WorkLogArgs<'a> = (
&'a TurnMeta,
&'a Path,
&'a [&'a TimelineEntry],
&'a WorkLogCounts,
bool,
);

Expand Down
27 changes: 16 additions & 11 deletions crates/ui/src/chat/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,14 @@ impl ChatView {
cx.notify();
}

fn promote_auto_expanded(&mut self, turn: usize, key: &str, cx: &mut Context<Self>) {
self.expanded.insert(manual_override_key(key));
self.expanded.insert(key.to_string());
self.sync_markdown_states(cx);
self.list_state.remeasure_items(turn..turn + 1);
cx.notify();
}

// -- turn rendering -----------------------------------------------------

/// Render one turn as chronological messages, errors, and Work Log runs.
Expand All@@ -275,8 +283,6 @@ impl ChatView {

let segmented = segment_entries(entries, turn.running);
let segments = &segmented.flow;
let turn_entries: Vec<&TimelineEntry> = entries.iter().map(AsRef::as_ref).collect();
let turn_counts = work_log_counts(&turn_entries);
let last_activity_segment = live_activity_segment(segments, turn.running);

for (segment_index, segment) in segments.iter().enumerate() {
Expand DownExpand Up@@ -318,7 +324,6 @@ impl ChatView {
turn,
cwd,
activities,
&turn_counts,
last_activity_segment == Some(segment_index),
),
cx,
Expand DownExpand Up@@ -659,20 +664,15 @@ impl ChatView {
args: components::work_log::WorkLogArgs<'_>,
cx: &mut Context<Self>,
) -> AnyElement {
let (index, segment_id, turn, cwd, activities, turn_counts, is_last) = args;
let (index, segment_id, turn, cwd, activities, is_last) = args;
let section_key = format!("worklog-{index}-{segment_id}");
let running = is_last && turn.running;
let automatic = work_log_auto_expands(activities, turn.running, is_last);
let expanded = auto_expanded(&self.expanded, &section_key, automatic);
let manually_expanded =
expanded && (self.expanded.contains(&manual_override_key(&section_key)) || !automatic);
let segment_counts = work_log_counts(activities);
let counts = if is_last {
turn_counts
} else {
&segment_counts
};
let mut capsule_label = work_log_capsule_label(counts, activities.len());
let mut capsule_label = work_log_capsule_label(&segment_counts, activities.len());
if capsule_label.is_empty() {
capsule_label = crate::tr!("chat.work_log").into_owned();
}
Expand DownExpand Up@@ -709,6 +709,7 @@ impl ChatView {
}

let toggle_section_key = section_key;
let ticker_expanded = expanded && !manually_expanded;
components::work_log::work_log(
components::work_log::WorkLogData {
index,
Expand All@@ -721,7 +722,11 @@ impl ChatView {
rows,
},
cx.listener(move |this, _, _, cx| {
this.toggle_auto_expanded(index, &toggle_section_key, automatic, cx);
if ticker_expanded {
this.promote_auto_expanded(index, &toggle_section_key, cx);
} else {
this.toggle_auto_expanded(index, &toggle_section_key, automatic, cx);
}
}),
cx,
)
Expand Down
14 changes: 7 additions & 7 deletions crates/ui/src/chat/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,7 +165,7 @@ pub(crate) fn segment_entries<'a>(
}

/// Which segment, if any, is the turn's *live* work log — the one that opens on
/// its own and reports the turn's totals.
/// its own while the turn is running.
///
/// A running turn whose last segment is prose has none: liveness is carried by
/// the turn-level working indicator standing bare after every segment, so every
Expand DownExpand Up@@ -1498,7 +1498,7 @@ mod tests {
// to host it, and the earlier run has already settled.
assert_eq!(segments.len(), 2);
assert_eq!(live_activity_segment(&segments, true), None);
// Once the turn ends, that same run carries the turn's snapshot.
// Once the turn ends, that same run is the final settled work log.
assert_eq!(live_activity_segment(&segments, false), Some(0));

let activity_tail = [entry("assistant", assistant("answer")), command("cmd")];
Expand DownExpand Up@@ -1763,14 +1763,14 @@ mod tests {
}

#[test]
fn finished_activity_runs_show_nonzero_segment_counts() {
fn finished_activity_runs_use_segment_scoped_counts() {
let _locale_guard = crate::settings::TestLocaleGuard::acquire();
let entries = [
command("command-1"),
file_change("files-1", &["src/shared.rs"]),
entry("assistant", assistant("intermediate output")),
command("command-2"),
file_change("files-2", &["src/shared.rs"]),
command("command-3"),
];
let segments = segment_entries(&entries, false).flow;
let activity_indexes: Vec<usize> = segments
Expand All@@ -1783,7 +1783,7 @@ mod tests {
assert_eq!(activity_indexes.len(), 2);

let counts = work_log_counts(&refs(&entries));
assert_eq!(counts.commands, 2);
assert_eq!(counts.commands, 3);
assert_eq!(counts.files, 1);

let labels = || {
Expand All@@ -1799,9 +1799,9 @@ mod tests {
.collect::<Vec<_>>()
};
crate::set_locale(crate::LANGUAGE_ENGLISH);
assert_eq!(labels(), ["1 edit · 1 command", "1 edit · 1 command"]);
assert_eq!(labels(), ["1 edit · 1 command", "2 commands"]);
crate::set_locale(crate::LANGUAGE_SIMPLIFIED_CHINESE);
assert_eq!(labels(), ["1 处编辑 · 1 条命令", "1 处编辑 · 1 条命令"]);
assert_eq!(labels(), ["1 处编辑 · 1 条命令", "2 条命令"]);
}

#[test]
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions crates/ui/src/chat/components/work_log.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ use gpui::{
};
use gpui_base::{StyledExt as _, h_flex, v_flex};

use super::super::model::WorkLogCounts;
use tcode_core::session::{TimelineEntry, TurnMeta};

pub(crate) type WorkLogArgs<'a> = (
Expand All@@ -19,7 +18,6 @@ pub(crate) type WorkLogArgs<'a> = (
&'a TurnMeta,
&'a Path,
&'a [&'a TimelineEntry],
&'a WorkLogCounts,
bool,
);

Expand Down
27 changes: 16 additions & 11 deletions crates/ui/src/chat/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,14 @@ impl ChatView {
cx.notify();
}

fn promote_auto_expanded(&mut self, turn: usize, key: &str, cx: &mut Context<Self>) {
self.expanded.insert(manual_override_key(key));
self.expanded.insert(key.to_string());
self.sync_markdown_states(cx);
self.list_state.remeasure_items(turn..turn + 1);
cx.notify();
}

// -- turn rendering -----------------------------------------------------

/// Render one turn as chronological messages, errors, and Work Log runs.
Expand All@@ -275,8 +283,6 @@ impl ChatView {

let segmented = segment_entries(entries, turn.running);
let segments = &segmented.flow;
let turn_entries: Vec<&TimelineEntry> = entries.iter().map(AsRef::as_ref).collect();
let turn_counts = work_log_counts(&turn_entries);
let last_activity_segment = live_activity_segment(segments, turn.running);

for (segment_index, segment) in segments.iter().enumerate() {
Expand DownExpand Up@@ -318,7 +324,6 @@ impl ChatView {
turn,
cwd,
activities,
&turn_counts,
last_activity_segment == Some(segment_index),
),
cx,
Expand DownExpand Up@@ -659,20 +664,15 @@ impl ChatView {
args: components::work_log::WorkLogArgs<'_>,
cx: &mut Context<Self>,
) -> AnyElement {
let (index, segment_id, turn, cwd, activities, turn_counts, is_last) = args;
let (index, segment_id, turn, cwd, activities, is_last) = args;
let section_key = format!("worklog-{index}-{segment_id}");
let running = is_last && turn.running;
let automatic = work_log_auto_expands(activities, turn.running, is_last);
let expanded = auto_expanded(&self.expanded, &section_key, automatic);
let manually_expanded =
expanded && (self.expanded.contains(&manual_override_key(&section_key)) || !automatic);
let segment_counts = work_log_counts(activities);
let counts = if is_last {
turn_counts
} else {
&segment_counts
};
let mut capsule_label = work_log_capsule_label(counts, activities.len());
let mut capsule_label = work_log_capsule_label(&segment_counts, activities.len());
if capsule_label.is_empty() {
capsule_label = crate::tr!("chat.work_log").into_owned();
}
Expand DownExpand Up@@ -709,6 +709,7 @@ impl ChatView {
}

let toggle_section_key = section_key;
let ticker_expanded = expanded && !manually_expanded;
components::work_log::work_log(
components::work_log::WorkLogData {
index,
Expand All@@ -721,7 +722,11 @@ impl ChatView {
rows,
},
cx.listener(move |this, _, _, cx| {
this.toggle_auto_expanded(index, &toggle_section_key, automatic, cx);
if ticker_expanded {
this.promote_auto_expanded(index, &toggle_section_key, cx);
} else {
this.toggle_auto_expanded(index, &toggle_section_key, automatic, cx);
}
}),
cx,
)
Expand Down
14 changes: 7 additions & 7 deletions crates/ui/src/chat/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,7 +165,7 @@ pub(crate) fn segment_entries<'a>(
}

/// Which segment, if any, is the turn's *live* work log — the one that opens on
/// its own and reports the turn's totals.
/// its own while the turn is running.
///
/// A running turn whose last segment is prose has none: liveness is carried by
/// the turn-level working indicator standing bare after every segment, so every
Expand DownExpand Up@@ -1498,7 +1498,7 @@ mod tests {
// to host it, and the earlier run has already settled.
assert_eq!(segments.len(), 2);
assert_eq!(live_activity_segment(&segments, true), None);
// Once the turn ends, that same run carries the turn's snapshot.
// Once the turn ends, that same run is the final settled work log.
assert_eq!(live_activity_segment(&segments, false), Some(0));

let activity_tail = [entry("assistant", assistant("answer")), command("cmd")];
Expand DownExpand Up@@ -1763,14 +1763,14 @@ mod tests {
}

#[test]
fn finished_activity_runs_show_nonzero_segment_counts() {
fn finished_activity_runs_use_segment_scoped_counts() {
let _locale_guard = crate::settings::TestLocaleGuard::acquire();
let entries = [
command("command-1"),
file_change("files-1", &["src/shared.rs"]),
entry("assistant", assistant("intermediate output")),
command("command-2"),
file_change("files-2", &["src/shared.rs"]),
command("command-3"),
];
let segments = segment_entries(&entries, false).flow;
let activity_indexes: Vec<usize> = segments
Expand All@@ -1783,7 +1783,7 @@ mod tests {
assert_eq!(activity_indexes.len(), 2);

let counts = work_log_counts(&refs(&entries));
assert_eq!(counts.commands, 2);
assert_eq!(counts.commands, 3);
assert_eq!(counts.files, 1);

let labels = || {
Expand All@@ -1799,9 +1799,9 @@ mod tests {
.collect::<Vec<_>>()
};
crate::set_locale(crate::LANGUAGE_ENGLISH);
assert_eq!(labels(), ["1 edit · 1 command", "1 edit · 1 command"]);
assert_eq!(labels(), ["1 edit · 1 command", "2 commands"]);
crate::set_locale(crate::LANGUAGE_SIMPLIFIED_CHINESE);
assert_eq!(labels(), ["1 处编辑 · 1 条命令", "1 处编辑 · 1 条命令"]);
assert_eq!(labels(), ["1 处编辑 · 1 条命令", "2 条命令"]);
}

#[test]
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions crates/ui/src/chat/components/work_log.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ use gpui::{
};
use gpui_base::{StyledExt as _, h_flex, v_flex};

use super::super::model::WorkLogCounts;
use tcode_core::session::{TimelineEntry, TurnMeta};

pub(crate) type WorkLogArgs<'a> = (
Expand All@@ -19,7 +18,6 @@ pub(crate) type WorkLogArgs<'a> = (
&'a TurnMeta,
&'a Path,
&'a [&'a TimelineEntry],
&'a WorkLogCounts,
bool,
);

Expand Down
27 changes: 16 additions & 11 deletions crates/ui/src/chat/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,14 @@ impl ChatView {
cx.notify();
}

fn promote_auto_expanded(&mut self, turn: usize, key: &str, cx: &mut Context<Self>) {
self.expanded.insert(manual_override_key(key));
self.expanded.insert(key.to_string());
self.sync_markdown_states(cx);
self.list_state.remeasure_items(turn..turn + 1);
cx.notify();
}

// -- turn rendering -----------------------------------------------------

/// Render one turn as chronological messages, errors, and Work Log runs.
Expand All@@ -275,8 +283,6 @@ impl ChatView {

let segmented = segment_entries(entries, turn.running);
let segments = &segmented.flow;
let turn_entries: Vec<&TimelineEntry> = entries.iter().map(AsRef::as_ref).collect();
let turn_counts = work_log_counts(&turn_entries);
let last_activity_segment = live_activity_segment(segments, turn.running);

for (segment_index, segment) in segments.iter().enumerate() {
Expand DownExpand Up@@ -318,7 +324,6 @@ impl ChatView {
turn,
cwd,
activities,
&turn_counts,
last_activity_segment == Some(segment_index),
),
cx,
Expand DownExpand Up@@ -659,20 +664,15 @@ impl ChatView {
args: components::work_log::WorkLogArgs<'_>,
cx: &mut Context<Self>,
) -> AnyElement {
let (index, segment_id, turn, cwd, activities, turn_counts, is_last) = args;
let (index, segment_id, turn, cwd, activities, is_last) = args;
let section_key = format!("worklog-{index}-{segment_id}");
let running = is_last && turn.running;
let automatic = work_log_auto_expands(activities, turn.running, is_last);
let expanded = auto_expanded(&self.expanded, &section_key, automatic);
let manually_expanded =
expanded && (self.expanded.contains(&manual_override_key(&section_key)) || !automatic);
let segment_counts = work_log_counts(activities);
let counts = if is_last {
turn_counts
} else {
&segment_counts
};
let mut capsule_label = work_log_capsule_label(counts, activities.len());
let mut capsule_label = work_log_capsule_label(&segment_counts, activities.len());
if capsule_label.is_empty() {
capsule_label = crate::tr!("chat.work_log").into_owned();
}
Expand DownExpand Up@@ -709,6 +709,7 @@ impl ChatView {
}

let toggle_section_key = section_key;
let ticker_expanded = expanded && !manually_expanded;
components::work_log::work_log(
components::work_log::WorkLogData {
index,
Expand All@@ -721,7 +722,11 @@ impl ChatView {
rows,
},
cx.listener(move |this, _, _, cx| {
this.toggle_auto_expanded(index, &toggle_section_key, automatic, cx);
if ticker_expanded {
this.promote_auto_expanded(index, &toggle_section_key, cx);
} else {
this.toggle_auto_expanded(index, &toggle_section_key, automatic, cx);
}
}),
cx,
)
Expand Down
14 changes: 7 additions & 7 deletions crates/ui/src/chat/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,7 +165,7 @@ pub(crate) fn segment_entries<'a>(
}

/// Which segment, if any, is the turn's *live* work log — the one that opens on
/// its own and reports the turn's totals.
/// its own while the turn is running.
///
/// A running turn whose last segment is prose has none: liveness is carried by
/// the turn-level working indicator standing bare after every segment, so every
Expand DownExpand Up@@ -1498,7 +1498,7 @@ mod tests {
// to host it, and the earlier run has already settled.
assert_eq!(segments.len(), 2);
assert_eq!(live_activity_segment(&segments, true), None);
// Once the turn ends, that same run carries the turn's snapshot.
// Once the turn ends, that same run is the final settled work log.
assert_eq!(live_activity_segment(&segments, false), Some(0));

let activity_tail = [entry("assistant", assistant("answer")), command("cmd")];
Expand DownExpand Up@@ -1763,14 +1763,14 @@ mod tests {
}

#[test]
fn finished_activity_runs_show_nonzero_segment_counts() {
fn finished_activity_runs_use_segment_scoped_counts() {
let _locale_guard = crate::settings::TestLocaleGuard::acquire();
let entries = [
command("command-1"),
file_change("files-1", &["src/shared.rs"]),
entry("assistant", assistant("intermediate output")),
command("command-2"),
file_change("files-2", &["src/shared.rs"]),
command("command-3"),
];
let segments = segment_entries(&entries, false).flow;
let activity_indexes: Vec<usize> = segments
Expand All@@ -1783,7 +1783,7 @@ mod tests {
assert_eq!(activity_indexes.len(), 2);

let counts = work_log_counts(&refs(&entries));
assert_eq!(counts.commands, 2);
assert_eq!(counts.commands, 3);
assert_eq!(counts.files, 1);

let labels = || {
Expand All@@ -1799,9 +1799,9 @@ mod tests {
.collect::<Vec<_>>()
};
crate::set_locale(crate::LANGUAGE_ENGLISH);
assert_eq!(labels(), ["1 edit · 1 command", "1 edit · 1 command"]);
assert_eq!(labels(), ["1 edit · 1 command", "2 commands"]);
crate::set_locale(crate::LANGUAGE_SIMPLIFIED_CHINESE);
assert_eq!(labels(), ["1 处编辑 · 1 条命令", "1 处编辑 · 1 条命令"]);
assert_eq!(labels(), ["1 处编辑 · 1 条命令", "2 条命令"]);
}

#[test]
Expand Down