Skip to content

Commit b635c35

Browse files
committed
test(claude): cover cross-session copy attribution on a different day
The unified tests used the same date for a turn and its copy in another session, so they could not tell whether a copy's session is dated by the survivor or skipped when the survivor is not counted. A direct test of DedupedEntries::main_thread_session_days now repeats a turn a day earlier in another session and asserts that the copy's session lands on the survivor's day and drops out when is_counted rejects the survivor. Refs #2016
1 parent dc67933 commit b635c35

1 file changed

Lines changed: 52 additions & 3 deletions

File tree

  • rust/adapters/claude/src

‎rust/adapters/claude/src/lib.rs‎

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,13 +1045,14 @@ mod tests {
10451045

10461046
use super::{
10471047
deserialize_usage_line, extract_session_parts, has_unsupported_null_field,
1048-
paths::is_project_path_segment, push_deduped_entry, read_usage_file, usage_files,
1048+
load_deduped_entries, paths::is_project_path_segment, push_deduped_entry, read_usage_file,
1049+
usage_files,
10491050
};
10501051
use crate::{
10511052
LoadedEntry, PricingMap, TimestampMs, TokenUsageRaw, UsageEntry, UsageMessage,
1052-
cli::CostMode,
1053+
cli::{CostMode, SharedArgs},
10531054
};
1054-
use ccusage_test_support::fs_fixture;
1055+
use ccusage_test_support::{EnvVarsGuard, fs_fixture};
10551056

10561057
#[test]
10571058
fn limits_usage_file_discovery_to_requested_project() {
@@ -1506,6 +1507,54 @@ mod tests {
15061507
assert_eq!(deduped[0].session_id.as_ref(), "session-b");
15071508
}
15081509

1510+
#[test]
1511+
fn attributes_a_cross_session_copy_to_the_survivor_day() {
1512+
let fixture = fs_fixture!({
1513+
"projects/project-a/session-a.jsonl": r#"{"timestamp":"2026-01-02T10:00:00.000Z","sessionId":"session-a","requestId":"req-shared","message":{"id":"msg-shared","model":"claude-sonnet-4-20250514","usage":{"input_tokens":200,"output_tokens":1}}}"#,
1514+
"projects/project-a/session-b.jsonl": [
1515+
r#"{"timestamp":"2026-01-01T10:00:00.000Z","sessionId":"session-b","requestId":"req-shared","message":{"id":"msg-shared","model":"claude-sonnet-4-20250514","usage":{"input_tokens":100,"output_tokens":1}}}"#,
1516+
r#"{"timestamp":"2026-01-03T10:00:00.000Z","sessionId":"session-b","requestId":"req-own","message":{"id":"msg-own","model":"claude-sonnet-4-20250514","usage":{"input_tokens":7,"output_tokens":1}}}"#,
1517+
]
1518+
.join("\n"),
1519+
});
1520+
let _env = EnvVarsGuard::set_many([(
1521+
"CLAUDE_CONFIG_DIR",
1522+
Some(fixture.root().as_os_str().to_os_string()),
1523+
)]);
1524+
let shared = SharedArgs {
1525+
mode: CostMode::Display,
1526+
timezone: Some("UTC".to_string()),
1527+
single_thread: true,
1528+
json: true,
1529+
..SharedArgs::default()
1530+
};
1531+
let deduped = load_deduped_entries(&shared, None).unwrap();
1532+
let sorted_days = |is_counted: &dyn Fn(&LoadedEntry) -> bool| {
1533+
let mut days: Vec<_> = deduped
1534+
.main_thread_session_days(is_counted)
1535+
.into_iter()
1536+
.map(|(session, date)| (session.to_string(), date))
1537+
.collect();
1538+
days.sort();
1539+
days
1540+
};
1541+
let day = |session: &str, date: &str| (session.to_string(), date.to_string());
1542+
1543+
assert_eq!(deduped.entries.len(), 2);
1544+
assert_eq!(
1545+
sorted_days(&|_| true),
1546+
[
1547+
day("session-a", "2026-01-02"),
1548+
day("session-b", "2026-01-02"),
1549+
day("session-b", "2026-01-03"),
1550+
]
1551+
);
1552+
assert_eq!(
1553+
sorted_days(&|entry| entry.date != "2026-01-02"),
1554+
[day("session-b", "2026-01-03")]
1555+
);
1556+
}
1557+
15091558
#[test]
15101559
fn dedupes_sidechain_replay_after_an_equal_copy_from_another_session() {
15111560
let mut deduped_indexes = Default::default();

0 commit comments

Comments
 (0)