Skip to content

Commit 310c249

Browse files
fix(claude): scope session totals to date window
Co-authored-by: jeffrey0070 <[email protected]>
1 parent 15b3bef commit 310c249

2 files changed

Lines changed: 105 additions & 47 deletions

File tree

‎docs/guide/session-reports.md‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ Sessions are displayed using the last two segments of their full identifier:
8787

8888
- **Input/Output Tokens**: Total tokens exchanged in the conversation
8989
- **Cache Tokens**: Cache creation and read tokens for context efficiency
90-
- **Cost**: Estimated USD cost for the entire conversation
91-
- **Last Activity**: Date of the most recent message in the session
90+
- **Cost**: Estimated USD cost for the usage shown; without a date filter, the entire conversation
91+
- **Last Activity**: Date of the most recent message included in the report
9292

9393
### Sorting
9494

@@ -120,19 +120,21 @@ ccusage session -i <session-id>
120120

121121
### Date Filtering
122122

123-
Filter sessions by their last activity date:
123+
For Claude Code, filter session usage by the local date of each entry:
124124

125125
```bash
126126
# Show sessions active since May 10th
127-
ccusage session --since 20260510
127+
ccusage claude session --since 20260510
128128

129129
# Show sessions active in a specific date range
130-
ccusage session --since 20260501 --until 20260516
130+
ccusage claude session --since 20260501 --until 20260516
131131

132132
# Show only recent sessions (last week)
133-
ccusage session --since $(date -d '7 days ago' +%Y%m%d)
133+
ccusage claude session --since $(date -d '7 days ago' +%Y%m%d)
134134
```
135135

136+
For `ccusage claude session`, date filters are applied before session totals are calculated, so token and cost totals represent only the entries inside the selected window. Both bounds are inclusive, and `--timezone` determines the local date used for filtering.
137+
136138
### Cost Calculation Modes
137139

138140
```bash

‎rust/crates/ccusage/src/commands/mod.rs‎

Lines changed: 97 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ use std::{
66
time::{SystemTime, UNIX_EPOCH},
77
};
88

9+
use ccusage_adapter_common::filter_loaded_entries_by_date;
910
use serde::{Deserialize, Serialize};
1011
use serde_json::json;
1112

1213
use crate::pricing::PricingMap;
1314
use crate::{
1415
BucketKind, Color, Context, DEFAULT_RECENT_DAYS, DEFAULT_SESSION_DURATION_HOURS,
15-
MILLIS_PER_DAY, MILLIS_PER_MINUTE, Result, SessionAccumulator, TimestampMs, block_json,
16-
calculate_burn_rate,
16+
MILLIS_PER_DAY, MILLIS_PER_MINUTE, Result, SessionAccumulator, TimestampMs, UsageSummary,
17+
block_json, calculate_burn_rate,
1718
cli::{
1819
BlocksArgs, CostSource, DailyArgs, SessionArgs, SharedArgs, SortOrder, StatuslineArgs,
1920
VisualBurnRate, WeekDay, WeeklyArgs,
@@ -149,43 +150,7 @@ pub(crate) fn run_session(args: SessionArgs) -> Result<()> {
149150

150151
let mut session_shared = shared.clone();
151152
session_shared.order = SortOrder::Desc;
152-
let entries = load_entries(&session_shared, None)?;
153-
let mut grouped = Vec::<SessionAccumulator>::new();
154-
let mut group_indexes = FxHashMap::<(Arc<str>, Arc<str>), usize>::default();
155-
for entry in &entries {
156-
let key = (
157-
Arc::clone(&entry.project_path),
158-
Arc::clone(&entry.session_id),
159-
);
160-
let index = *group_indexes.entry(key).or_insert_with(|| {
161-
let index = grouped.len();
162-
grouped.push(SessionAccumulator::default());
163-
index
164-
});
165-
grouped[index].add_entry(entry);
166-
}
167-
168-
let mut rows = Vec::with_capacity(grouped.len());
169-
for group in grouped {
170-
rows.push(group.into_summary()?);
171-
}
172-
if session_shared.since.is_some() || session_shared.until.is_some() {
173-
rows.retain(|row| {
174-
let date = row
175-
.last_activity
176-
.as_deref()
177-
.unwrap_or_default()
178-
.replace('-', "");
179-
session_shared
180-
.since
181-
.as_ref()
182-
.is_none_or(|since| &date >= since)
183-
&& session_shared
184-
.until
185-
.as_ref()
186-
.is_none_or(|until| &date <= until)
187-
});
188-
}
153+
let mut rows = load_session_rows(&session_shared)?;
189154
rows.retain(|row| {
190155
row.input_tokens + row.output_tokens + row.cache_creation_tokens + row.cache_read_tokens > 0
191156
});
@@ -214,8 +179,34 @@ pub(crate) fn run_session(args: SessionArgs) -> Result<()> {
214179
Ok(())
215180
}
216181

182+
fn load_session_rows(shared: &SharedArgs) -> Result<Vec<UsageSummary>> {
183+
let mut entries = load_entries(shared, None)?;
184+
filter_loaded_entries_by_date(&mut entries, shared);
185+
let mut grouped = Vec::<SessionAccumulator>::new();
186+
let mut group_indexes = FxHashMap::<(Arc<str>, Arc<str>), usize>::default();
187+
for entry in &entries {
188+
let key = (
189+
Arc::clone(&entry.project_path),
190+
Arc::clone(&entry.session_id),
191+
);
192+
let index = *group_indexes.entry(key).or_insert_with(|| {
193+
let index = grouped.len();
194+
grouped.push(SessionAccumulator::default());
195+
index
196+
});
197+
grouped[index].add_entry(entry);
198+
}
199+
200+
let mut rows = Vec::with_capacity(grouped.len());
201+
for group in grouped {
202+
rows.push(group.into_summary()?);
203+
}
204+
Ok(rows)
205+
}
206+
217207
fn run_session_id(id: &str, shared: &SharedArgs) -> Result<()> {
218-
let entries = load_entries(shared, None)?;
208+
let mut entries = load_entries(shared, None)?;
209+
filter_loaded_entries_by_date(&mut entries, shared);
219210
let mut session_entries = entries
220211
.into_iter()
221212
.filter(|entry| {
@@ -853,7 +844,72 @@ mod tests {
853844
use ccusage_test_support::{EnvVarGuard, fs_fixture};
854845

855846
use super::*;
856-
use crate::cli::{Cli, Command};
847+
use crate::cli::{Cli, Command, CostMode};
848+
849+
#[test]
850+
fn claude_session_totals_only_include_entries_inside_date_window() {
851+
let rows = claude_session_rows(
852+
&[
853+
r#"{"timestamp":"2026-08-12T12:00:00.000Z","sessionId":"session-a","requestId":"request-old","costUSD":1.25,"message":{"id":"message-old","model":"claude-sonnet-4-20250514","usage":{"input_tokens":10,"output_tokens":2}}}"#,
854+
r#"{"timestamp":"2026-08-13T12:00:00.000Z","sessionId":"session-a","requestId":"request-new","costUSD":2.5,"message":{"id":"message-new","model":"claude-sonnet-4-20250514","usage":{"input_tokens":30,"output_tokens":4}}}"#,
855+
]
856+
.join("\n"),
857+
SharedArgs {
858+
mode: CostMode::Display,
859+
since: Some("20260813".to_string()),
860+
timezone: Some("UTC".to_string()),
861+
..SharedArgs::default()
862+
},
863+
);
864+
865+
assert_eq!(rows.len(), 1);
866+
assert_eq!(rows[0].input_tokens, 30);
867+
assert_eq!(rows[0].output_tokens, 4);
868+
assert_eq!(rows[0].total_tokens(), 34);
869+
assert_eq!(rows[0].total_cost, 2.5);
870+
}
871+
872+
#[test]
873+
fn claude_session_until_includes_the_boundary_date() {
874+
let rows = claude_session_rows(
875+
r#"{"timestamp":"2026-08-14T09:38:56.467Z","sessionId":"session-a","requestId":"request-boundary","costUSD":3.75,"message":{"id":"message-boundary","model":"claude-sonnet-4-20250514","usage":{"input_tokens":40,"output_tokens":5}}}"#,
876+
SharedArgs {
877+
mode: CostMode::Display,
878+
until: Some("20260814".to_string()),
879+
timezone: Some("UTC".to_string()),
880+
..SharedArgs::default()
881+
},
882+
);
883+
884+
assert_eq!(rows.len(), 1);
885+
assert_eq!(rows[0].total_tokens(), 45);
886+
assert_eq!(rows[0].total_cost, 3.75);
887+
}
888+
889+
#[test]
890+
fn claude_session_date_window_uses_requested_timezone() {
891+
let rows = claude_session_rows(
892+
r#"{"timestamp":"2026-08-14T23:30:00.000Z","sessionId":"session-a","requestId":"request-timezone","costUSD":4.5,"message":{"id":"message-timezone","model":"claude-sonnet-4-20250514","usage":{"input_tokens":50,"output_tokens":6}}}"#,
893+
SharedArgs {
894+
mode: CostMode::Display,
895+
since: Some("20260815".to_string()),
896+
timezone: Some("Asia/Tokyo".to_string()),
897+
..SharedArgs::default()
898+
},
899+
);
900+
901+
assert_eq!(rows.len(), 1);
902+
assert_eq!(rows[0].total_tokens(), 56);
903+
assert_eq!(rows[0].total_cost, 4.5);
904+
}
905+
906+
fn claude_session_rows(log: &str, shared: SharedArgs) -> Vec<UsageSummary> {
907+
let fixture = fs_fixture!({
908+
"projects/project-a/session-a/chat.jsonl": log,
909+
});
910+
let _env = EnvVarGuard::set("CLAUDE_CONFIG_DIR", fixture.root());
911+
load_session_rows(&shared).unwrap()
912+
}
857913

858914
#[test]
859915
fn statusline_invocation_passes_config_pricing_overrides_to_cost_loading() {

0 commit comments

Comments
 (0)