Skip to content

Use Claude Code with your ChatGPT, Kimi, Cursor or Grok subscription via a local Anthropic-compatible proxy

Rust

tui: keep session row order stable

Raine Virta939ced8d2e44
diff --git a/src/monitor.rs b/src/monitor.rs
index 7f6b374..b1a1a2d 100644
--- a/src/monitor.rs
+++ b/src/monitor.rs
@@ -710,11 +710,7 @@ fn session_summaries(
}
let mut out: Vec<_> = sessions.into_values().collect();
- out.sort_by(|left, right| {
- session_sort_key(right)
- .cmp(&session_sort_key(left))
- .then_with(|| left.label().cmp(&right.label()))
- });
+ out.sort_by_key(SessionSummary::label);
out
}
@@ -726,15 +722,6 @@ fn max_system_time(left: SystemTime, right: SystemTime) -> SystemTime {
}
}
-fn session_sort_key(session: &SessionSummary) -> (u128, usize, usize) {
- let last_seen = session
- .last_seen
- .duration_since(SystemTime::UNIX_EPOCH)
- .unwrap_or_default()
- .as_millis();
- (last_seen, session.active_count, session.request_count)
-}
-
pub fn throughput(
output_tokens: Option<u64>,
streamed_bytes: u64,
@@ -976,17 +963,17 @@ data: {"type":"message_delta","delta":{"stop_reason":"end_turn"},"usage":{"input
}
#[test]
- fn active_session_order_is_stable_between_snapshots() {
+ fn session_order_is_stable_across_activity() {
let monitor = MonitorHandle::new(10);
monitor.request_started(
"r1",
- Some("session-a".to_string()),
+ Some("session-b".to_string()),
Some(1),
EndpointKind::Messages,
);
monitor.request_started(
"r2",
- Some("session-b".to_string()),
+ Some("session-a".to_string()),
Some(1),
EndpointKind::Messages,
);
@@ -997,7 +984,13 @@ data: {"type":"message_delta","delta":{"stop_reason":"end_turn"},"usage":{"input
.iter()
.map(SessionSummary::label)
.collect();
- std::thread::sleep(Duration::from_millis(2));
+ monitor.request_completed("r1", 200, None, None);
+ monitor.request_started(
+ "r3",
+ Some("session-b".to_string()),
+ Some(2),
+ EndpointKind::Messages,
+ );
let second: Vec<_> = monitor
.snapshot()
.sessions
@@ -1005,6 +998,7 @@ data: {"type":"message_delta","delta":{"stop_reason":"end_turn"},"usage":{"input
.map(SessionSummary::label)
.collect();
- assert_eq!(first, second);
+ assert_eq!(first, vec!["session-a", "session-b"]);
+ assert_eq!(second, first);
}
}