[dezren39]

Resolves #3123.

Summary

In sameCharge (pm-stack/aggregator/src/charges-collect.ts), charge deduplication previously matched hand-fed rows against auto-matched rows based on amount, 3-day date window, and merchant label alone. When two distinct charges occurred with identical amounts and merchants within the deduplication window but were charged on different cards (e.g. Visa •7535 vs Visa •9545), the hand-fed row was improperly dropped.

This change:

1. Adds extractCardMask(method) to parse payment method card masks (such as Visa •7535 or •7535).
2. Updates sameCharge to check whether both rows carry known card masks, and if they conflict (maskA !== maskB), preserve them as distinct charges.
3. Preserves same-charge merging when card masks agree or either row lacks a card mask.
4. Adds tests for extractCardMask, conflicting card masks, matching masks, and missing masks.

Targeted tests

• bun test pm-stack/aggregator/test/charges-collect.test.ts — 13 passed, 0 failed.
• bun test pm-stack/aggregator/test/charges-*.test.ts — 23 passed, 0 failed.

---

^{Need help on this PR? Tag @codesmith-bot with what you need.}

[coderabbitai]

Warning

Review limit reached

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Next included review available in 36 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used the included review currently available.

Learn how review limits work.

Review configuration:

Run configuration

• Source mode: Auto
• Repository: Unavailable
• Branch: Unavailable
• File: No configuration file from this repository applied
• Commit: Unavailable
• Layers: defaults
• Review profile: CHILL
• Plan: Advanced
• Run ID: 94f88b33-5eb0-4601-8bc0-d41ecc2f75e7

Commits

Reviewing files that changed from the base of the PR and between 74064cb and cf3f3f1.

Files selected for processing: 2

• pm-stack/aggregator/src/charges-collect.ts
• pm-stack/aggregator/test/charges-collect.test.ts

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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

• X
• Mastodon
• Reddit
• LinkedIn

CodeRabbit Verify

• Run CodeRabbit Verify to test the changes in this pull request.

[chatgpt-codex-connector]

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review	Status	Commit	Review trigger
📝 Code Review	⚠️ Failed 2026-11-03T10:53:34.912715Z We couldn’t complete this review. Comment @codex review to try again.	cf3f3f1	Manual request

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

[dezren39]

Stale-PR warden: no activity for 2 days. Resolution task: #4443 — this PR should be merged, fixed, or closed.

[chatgpt-codex-connector]

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.
To continue using code reviews, you can upgrade your account or add credits to your account and enable them for code reviews in your settings.

[dezren39]

agent-note:v1

• task: 7411
• lane: code-f
• state: rebased, merge-ready — @codex review requested for the new head
• Rebased queue/4543-3123-charges-mask onto current main (was 04b58e3, a merge of stale main): single commit cf3f3f1, force-with-lease pushed. PR is mergeable/clean.
• Conflict resolution (semantic, in pm-stack/aggregator/src/charges-collect.ts): kept main's newer alias-aware token-sequence sameCharge (PR fix(aggregator): match charges to quota providers #3168 Codex fix) and grafted this PR's conflicting-card-mask guard (extractCardMask on both rows; conflicting known masks → not the same charge, both preserved) plus its doc paragraph. Final diff vs main = exactly the PR's intent: +19 src (helper + guard + comment), +83 test.
• Tests: bun test test/charges-collect.test.ts on the laptop — 19 pass / 0 fail. bunx tsc --noEmit: 27 errors, identical count and charges-collect lines on clean main — all pre-existing, 0 introduced.
• Codex: completed review of the previous head had no findings; the new-head run failed to complete (bot infra) and there are no inline findings to disposition. Re-review requested below.

@codex review

[chatgpt-codex-connector]

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.
To continue using code reviews, you can upgrade your account or add credits to your account and enable them for code reviews in your settings.