Skip to content

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

Rust

stabilize monitor session ordering

Raine Virta8b9fd0407fc9
diff --git a/src/monitor.rs b/src/monitor.rs
index 3e0c7d9..e37b78d 100644
--- a/src/monitor.rs
+++ b/src/monitor.rs
@@ -569,7 +569,7 @@ fn session_summaries(
}
entry.provider = request.provider.clone().or(entry.provider.clone());
entry.model = request.model.clone().or(entry.model.clone());
- entry.last_seen = request.finished_at;
+ entry.last_seen = max_system_time(entry.last_seen, request.finished_at);
entry.input_tokens = entry
.input_tokens
.saturating_add(request.input_tokens.unwrap_or(0));
@@ -600,7 +600,7 @@ fn session_summaries(
entry.request_count += 1;
entry.provider = request.provider.clone().or(entry.provider.clone());
entry.model = request.model.clone().or(entry.model.clone());
- entry.last_seen = SystemTime::now();
+ entry.last_seen = max_system_time(entry.last_seen, request.started_at);
entry.input_tokens = entry
.input_tokens
.saturating_add(request.input_tokens.unwrap_or(0));
@@ -612,11 +612,31 @@ fn session_summaries(
}
let mut out: Vec<_> = sessions.into_values().collect();
- out.sort_by_key(|session| session.last_seen);
- out.reverse();
+ out.sort_by(|left, right| {
+ session_sort_key(right)
+ .cmp(&session_sort_key(left))
+ .then_with(|| left.label().cmp(&right.label()))
+ });
out
}
+fn max_system_time(left: SystemTime, right: SystemTime) -> SystemTime {
+ if right.duration_since(left).is_ok() {
+ right
+ } else {
+ left
+ }
+}
+
+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,
@@ -783,4 +803,37 @@ data: {"type":"message_delta","delta":{"stop_reason":"end_turn"},"usage":{"input
assert_eq!(state.sessions[0].active_count, 1);
assert_eq!(state.sessions[0].output_tokens, 20);
}
+
+ #[test]
+ fn active_session_order_is_stable_between_snapshots() {
+ let monitor = MonitorHandle::new(10);
+ monitor.request_started(
+ "r1",
+ Some("session-a".to_string()),
+ Some(1),
+ EndpointKind::Messages,
+ );
+ monitor.request_started(
+ "r2",
+ Some("session-b".to_string()),
+ Some(1),
+ EndpointKind::Messages,
+ );
+
+ let first: Vec<_> = monitor
+ .snapshot()
+ .sessions
+ .iter()
+ .map(SessionSummary::label)
+ .collect();
+ std::thread::sleep(Duration::from_millis(2));
+ let second: Vec<_> = monitor
+ .snapshot()
+ .sessions
+ .iter()
+ .map(SessionSummary::label)
+ .collect();
+
+ assert_eq!(first, second);
+ }
}