iframe-proxy

zerone0x · 2026-05-18T02:47:25Z

Summary

dedupe repeated usage rows in loadSessionUsageById using the same message/request hash strategy as the other Claude loaders
keep the existing replacement behavior so the more complete duplicate entry wins when totals differ
add a regression test covering duplicate session rows so session --id totals no longer double count

Fixes #994

Testing

pnpm typecheck
pnpm exec vitest run apps/ccusage/src/adapter/claude/data-loader.ts -t 'loadSessionUsageById'
pnpm run test

Summary by CodeRabbit

Bug Fixes
- Duplicate usage entries within a session are now properly deduplicated, preventing inaccurate cost calculations and ensuring reliable usage tracking.

Fixes ccusage#994 Co-Authored-By: Claude <noreply@anthropic.com>

coderabbitai · 2026-05-18T02:47:37Z

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: ef512438-816b-4d43-ab9f-dc079bd428b1

📥 Commits

Reviewing files that changed from the base of the PR and between a291981 and 1eb6580.

📒 Files selected for processing (1)

apps/ccusage/src/adapter/claude/data-loader.ts

📝 Walkthrough

Walkthrough

loadSessionUsageById now deduplicates Claude usage rows within a single session JSONL file by tracking entries via createUniqueHash and replacing earlier duplicates with later ones when they carry higher token counts or additional metadata, with corresponding totalCost adjustments. A test case validates this deduplication behavior.

Changes

Session usage deduplication

Layer / File(s)	Summary
Deduplication infrastructure and replacement logic `apps/ccusage/src/adapter/claude/data-loader.ts`	`loadSessionUsageById` creates a `processedEntries` index and per-line processing now detects duplicate entries via `createUniqueHash`, consults `shouldReplaceEntryMetadata` to decide replacement, and adjusts `totalCost` by removing the prior entry's cost and adding the candidate's cost.
Deduplication test case `apps/ccusage/src/adapter/claude/data-loader.ts`	Unit test asserts that repeated usage rows with the same `message.id` and request id are deduplicated and that resulting entries preserve the expected request ids and total cost.

Sequence Diagram

sequenceDiagram
  participant Loader as loadSessionUsageById
  participant Parser as JSON Parser
  participant Hash as createUniqueHash
  participant Dedupe as processedEntries
  participant Replace as shouldReplaceEntryMetadata
  participant Cost as totalCost

  Loader->>Parser: parse JSONL line
  Parser->>Hash: compute hash(message.id + requestId)
  Hash->>Dedupe: check if already processed
  alt Duplicate detected
    Dedupe->>Replace: is candidate more complete?
    alt Should replace earlier entry
      Replace->>Cost: subtract old cost
      Cost->>Cost: add new cost
      Dedupe->>Dedupe: mark new entry as processed
    else Keep earlier entry
      Dedupe->>Loader: skip candidate
    end
  else New entry
    Dedupe->>Cost: add cost
    Dedupe->>Loader: append entry
    Dedupe->>Dedupe: mark as processed
  end

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

Possibly related PRs

ryoppippi/ccusage#58: Implemented similar usage-row deduplication keyed by message.id + requestId via createUniqueHash in other data loaders (loadSessionData), establishing the pattern now applied to loadSessionUsageById.
ryoppippi/ccusage#985: Changes createUniqueHash to dedupe requestId-missing rows by message.id, directly impacting the deduplication logic in loadSessionUsageById that keys entries off this hash function.

Suggested reviewers

ryoppippi

Poem

🐰 Twice-counted tokens dance no more,
A hash-map guard unlocks the door,
Cost corrections, smooth and true,
Claude's sessions now add right—thank you! ✨

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 ESLint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

apps/ccusage/src/adapter/claude/data-loader.ts

[baseline-browser-mapping] The data in this module is over two months old. To ensure accurate Baseline data, please update: npm i baseline-browser-mapping@latest -D
tsconfig.json is not found. we cannot use type-aware rules.

Oops! Something went wrong! :(

ESLint: 9.35.0

Error [ERR_MODULE_NOT_FOUND]: Cannot find package 'eslint-plugin-format' imported from /node_modules/.pnpm/@antfu+eslint-config@4.19.0_@vue+compiler-sfc@3.5.30_eslint@9.35.0_typescript@5.9.2_vit_670a2c5c75d4275eabd7bc195a173ee6/node_modules/@antfu/eslint-config/dist/index.js
at Object.getPackageJSONURL (node:internal/modules/package_json_reader:301:9)
at packageResolve (node:internal/modules/esm/resolve:764:81)
at moduleResolve (node:internal/modules/esm/resolve:855:18)
at defaultResolve (node:internal/modules/esm/resolve:988:11)
at #cachedDefaultResolve (node:internal/modules/esm/loader:697:20)
at #resolveAndMaybeBlockOnLoaderThread (node:internal/modules/esm/loader:714:38)
at ModuleLoader.resolveSync (node:internal/modules/esm/loader:746:52)
at #resolve (node:internal/modules/esm/loader:679:17)
at ModuleLoader.getOrCreateModuleJob (node:internal/modules/esm/loader:599:35)
at node:internal/modules/esm/loader:628:32

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

github-actions · 2026-05-18T02:48:07Z

fix(ccusage): dedupe session usage by id

1eb6580

Fixes ccusage#994 Co-Authored-By: Claude <noreply@anthropic.com>

github-actions Bot closed this May 18, 2026

Sunbelt Computer Software

PL/B Language Development and Support

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

fix(ccusage): dedupe session usage by id#1047

fix(ccusage): dedupe session usage by id#1047
zerone0x wants to merge 1 commit into
ccusage:mainfrom
zerone0x:claude/fix-issue-994-session-dedupe

zerone0x commented May 18, 2026 •

edited by coderabbitai Bot

Loading

Uh oh!

coderabbitai Bot commented May 18, 2026 •

edited

Loading

Review failed

Walkthrough

Changes

Sequence Diagram

Estimated code review effort

Possibly related PRs

Suggested reviewers

Poem

Uh oh!

github-actions Bot commented May 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Sunbelt Computer Software

PL/B Language Development and Support

Uh oh!

Uh oh!

Conversation

zerone0x commented May 18, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Testing

Summary by CodeRabbit

Uh oh!

coderabbitai Bot commented May 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review failed

Walkthrough

Changes

Sequence Diagram

Estimated code review effort

Possibly related PRs

Suggested reviewers

Poem

Uh oh!

github-actions Bot commented May 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

zerone0x commented May 18, 2026 •

edited by coderabbitai Bot

Loading

coderabbitai Bot commented May 18, 2026 •

edited

Loading