Skip to content

Port upstream 0.65.0: scan claude-swap session homes in Claude cost (stacked on #610) #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Finesssee wants to merge 5 commits into
base: codex/integrate-reviewed-ports-20260923
Choose a base branch
from
+523 −32
Open

Port upstream 0.65.0: scan claude-swap session homes in Claude cost (stacked on #610) #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
87496f1
Port upstream 0.65.0: scan claude-swap session homes in the Claude co…
Finesssee Sep 29, 2026
8da64f9
Address thermo review
Finesssee Sep 30, 2026
3f3fccf
Merge #610 (integrate-reviewed-ports) at 15f1091d into port/micro-0.6…
Finesssee Sep 30, 2026
610da6c
Match upstream claude-swap slot names and translate the swap cost tests
Finesssee Sep 30, 2026
2808b1b
Drop the optional symlink fixture results explicitly
Finesssee Sep 30, 2026
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
77 changes: 45 additions & 32 deletions rust/src/cost_scanner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ use crate::providers::claude::quota_history::{
use crate::providers::opencodego::local as opencodego_local;
use crate::settings::Settings;
mod claude_pricing;
mod claude_roots;
mod claude_usage;
mod codex;
mod read_receipt;
Expand Down Expand Up @@ -584,7 +585,7 @@ impl CostScanner {
cancel: Option<&AtomicBool>,
include_pi_sessions: bool,
) -> CostSummary {
let projects_dir = self.get_claude_projects_dir();
let roots = self.claude_projects_roots();
let mut summary = CostSummary::default();
let today = Utc::now().date_naive();
let start_date = today - Duration::days(self.days as i64);
Expand All @@ -596,7 +597,7 @@ impl CostScanner {
// Walk through projects directory, de-duplicating usage records
// that appear across multiple files.
let mut claude_scan = ClaudeFileScanResult::default();
if projects_dir.exists() {
if !roots.paths.is_empty() {
let mut seen = HashSet::new();
let mut pricing = ClaudeScanPricingResolver::default();
let traversal_read_failures = {
Expand All @@ -623,10 +624,11 @@ impl CostScanner {
}
claude_scan.absorb(file_result);
};
self.walk_claude_files(&projects_dir, &cutoff, cancel, &mut handle_file)
self.walk_claude_roots(&roots.paths, &cutoff, cancel, &mut handle_file)
};
claude_scan.read_failures = claude_scan
.read_failures
.saturating_add(roots.read_failures)
.saturating_add(traversal_read_failures);
}

Expand All @@ -649,7 +651,7 @@ impl CostScanner {
// than turning a partial zero into a known zero.
finalize_claude_summary(
&mut summary,
projects_dir.exists(),
!roots.paths.is_empty(),
claude_scan,
is_cancelled(cancel),
);
Expand All @@ -663,7 +665,7 @@ impl CostScanner {
&self,
cancel: Option<&AtomicBool>,
) -> ClaudeChartSnapshot {
let projects_dir = self.get_claude_projects_dir();
let roots = self.claude_projects_roots();
let today = Local::now().date_naive();
let cutoff = Utc::now() - Duration::days(self.days as i64);
let mut summary = CostSummary {
Expand All @@ -683,11 +685,11 @@ impl CostScanner {

let mut quota_records = Vec::new();
let mut scan_result = ClaudeFileScanResult::default();
if projects_dir.exists() {
if !roots.paths.is_empty() {
let mut seen = HashSet::new();
let mut pricing = ClaudeScanPricingResolver::default();
let traversal_read_failures =
self.walk_claude_files(&projects_dir, &cutoff, cancel, &mut |path| {
self.walk_claude_roots(&roots.paths, &cutoff, cancel, &mut |path| {
let mut file_has_usage = false;
let mut aggregation_complete = true;
let mut file_result = scan_claude_file_with_pricing(
Expand Down Expand Up @@ -724,6 +726,7 @@ impl CostScanner {
});
scan_result.read_failures = scan_result
.read_failures
.saturating_add(roots.read_failures)
.saturating_add(traversal_read_failures);
}

Expand All @@ -735,10 +738,11 @@ impl CostScanner {
&mut HashSet::new(),
);

let complete = projects_dir.exists() && !is_cancelled(cancel) && scan_result.is_complete();
let complete =
!roots.paths.is_empty() && !is_cancelled(cancel) && scan_result.is_complete();
finalize_claude_summary(
&mut summary,
projects_dir.exists(),
!roots.paths.is_empty(),
scan_result,
is_cancelled(cancel),
);
Expand Down Expand Up @@ -804,23 +808,30 @@ impl CostScanner {
}
}

fn get_claude_projects_dir(&self) -> PathBuf {
if let Ok(claude_config) = std::env::var("CLAUDE_CONFIG_DIR") {
let trimmed = claude_config.trim();
if !trimmed.is_empty() {
return PathBuf::from(trimmed).join("projects");
}
}

// Try ~/.claude/projects first
let home = dirs::home_dir().unwrap_or_else(|| PathBuf::from("."));
let claude_dir = home.join(".claude").join("projects");
if claude_dir.exists() {
return claude_dir;
}
/// Existing Claude transcript roots: the profile root plus claude-swap
/// session homes, de-duplicated by resolved path.
fn claude_projects_roots(&self) -> claude_roots::ClaudeProjectsRoots {
claude_roots::claude_projects_roots(
std::env::var("CLAUDE_CONFIG_DIR").ok().as_deref(),
dirs::home_dir().as_deref(),
)
}

// Fallback to ~/.config/claude/projects
home.join(".config").join("claude").join("projects")
/// Walk every root with one caller-owned `seen` set behind `on_file`, so a
/// row copied between homes is counted once. Returns read failures.
fn walk_claude_roots<F>(
&self,
roots: &[PathBuf],
cutoff: &DateTime<Utc>,
cancel: Option<&AtomicBool>,
on_file: &mut F,
) -> u32
where
F: FnMut(&Path),
{
roots.iter().fold(0u32, |failures, root| {
failures.saturating_add(self.walk_claude_files(root, cutoff, cancel, on_file))
})
}

fn walk_claude_files<F>(
Expand Down Expand Up @@ -1204,7 +1215,7 @@ pub fn has_cost_usage_sources() -> bool {
.get_codex_sessions_dirs()
.iter()
.any(|dir| dir.exists())
|| scanner.get_claude_projects_dir().exists()
|| scanner.claude_projects_roots().has_possible_roots()
|| crate::pi_session_cost::pi_compatible_session_roots(dirs::home_dir())
.iter()
.any(|dir| dir.exists())
Expand Down Expand Up @@ -1267,8 +1278,8 @@ pub fn get_daily_cost_history(provider: &str, days: u32) -> Vec<(String, Option<
"claude" => {
// Real per-day breakdown: walk the project logs once,
// de-duplicating records across files.
let projects_dir = scanner.get_claude_projects_dir();
if projects_dir.exists() {
let roots = scanner.claude_projects_roots();
if !roots.paths.is_empty() {
let cutoff = Utc::now() - Duration::days(days as i64);
let mut seen = HashSet::new();
let mut pricing = ClaudeScanPricingResolver::default();
Expand Down Expand Up @@ -1298,10 +1309,11 @@ pub fn get_daily_cost_history(provider: &str, days: u32) -> Vec<(String, Option<
}
claude_scan.absorb(file_result);
};
scanner.walk_claude_files(&projects_dir, &cutoff, None, &mut handle_file)
scanner.walk_claude_roots(&roots.paths, &cutoff, None, &mut handle_file)
};
claude_scan.read_failures = claude_scan
.read_failures
.saturating_add(roots.read_failures)
.saturating_add(traversal_read_failures);
if claude_scan.is_complete() {
zero_fill_uninitialized_claude_daily_costs(
Expand Down Expand Up @@ -1389,8 +1401,8 @@ pub fn get_daily_token_history(provider: &str, days: u32) -> (Vec<(String, u64)>
// Per-day token breakdown from the same de-duplicated record walk
// as the cost chart. Only a complete valid walk establishes
// authoritative coverage of the requested history window.
let projects_dir = scanner.get_claude_projects_dir();
if projects_dir.exists() {
let roots = scanner.claude_projects_roots();
if !roots.paths.is_empty() {
let cutoff = Utc::now() - Duration::days(days as i64);
let mut seen = HashSet::new();
let mut pricing = ClaudeScanPricingResolver::default();
Expand All @@ -1406,10 +1418,11 @@ pub fn get_daily_token_history(provider: &str, days: u32) -> (Vec<(String, u64)>
);
claude_scan.absorb(file_result);
};
scanner.walk_claude_files(&projects_dir, &cutoff, None, &mut handle_file)
scanner.walk_claude_roots(&roots.paths, &cutoff, None, &mut handle_file)
};
claude_scan.read_failures = claude_scan
.read_failures
.saturating_add(roots.read_failures)
.saturating_add(traversal_read_failures);
mark_claude_daily_token_coverage(&mut covered_days, &daily_tokens, claude_scan);
}
Expand Down
Loading