feat(antigravity-cli): support independent client with correct token mapping and pricing

[ddarkr]

This PR adds independent client support for the antigravity-cli client, ensuring accurate token usage mapping and custom pricing calculations.

Key Changes

1. New Independent Client Support: Registers antigravity-cli as a dedicated client alongside existing clients, defining scan paths and database parsing pipelines.
2. Correct Protobuf Token Field Mappings: Resolves field mapping for the metadata protobuf parser in antigravity_cli.rs (Field 5 for cached_tokens and Field 9 for thoughts_tokens), correcting cache read and reasoning token counts.
3. Exclusive Reasoning Token Pricing: Subtracts reasoning tokens (thoughts_tokens) from total completion tokens (candidates_token_count) to prevent double-charging on reasoning models.
4. Dynamic Model Resolution: Extracts human-readable display names from metadata blobs to dynamically map preview models to proper tier slugs (gemini-3.5-flash-high and gemini-3.5-flash-medium).
5. Custom Model Pricing: Configures dedicated pricing rates ($1.50/M input, $9.00/M output) for google/gemini-3.5-flash variants.
6. Monotonic Timestamps: Utilizes index-based offsets during SQLite scanning to assign distinct monotonic timestamps to message sequences, preventing deduplication conflicts.
7. Implementation Cleanup: Refactors parser helper functions with safer try_from casting, clarifies token field overlapping layout with code documentation, and tests new model aliases.

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment

Project	Deployment	Actions	Updated (UTC)
tokscale	Ignored	Preview	Jun 10, 2026 7:15am

[cubic-dev-ai]

6 issues found across 14 files

Prompt for AI agents (unresolved issues)

Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.


<file name=".asw/plans/antigravity-cli-migration.md">

<violation number="1" location=".asw/plans/antigravity-cli-migration.md:43">
P2: Documentation uses machine-local absolute file URIs that are non-portable for other environments</violation>

<violation number="2" location=".asw/plans/antigravity-cli-migration.md:48">
P2: Migration plan contains ambiguity about whether to remove or keep the combined `*.json|*.jsonl|*.db` matcher in `scan_directory`, which could result in overlapping file match paths and duplicate/misattributed session processing.</violation>
</file>

<sub>Reply with feedback, questions, or to request a fix.

Re-trigger cubic</sub>

[cubic-dev-ai]

P2: Documentation uses machine-local absolute file URIs that are non-portable for other environments

Prompt for AI agents

Check if this issue is valid — if so, understand the root cause and fix it. At .asw/plans/antigravity-cli-migration.md, line 43:

<comment>Documentation uses machine-local absolute file URIs that are non-portable for other environments</comment>

<file context>
@@ -0,0 +1,87 @@
+### Task 1: Gemini 클라이언트 롤백 및 Antigravity 클라이언트 확장
+- **목표**: `ClientId::Gemini`를 롤백하고 `ClientId::Antigravity`가 `.db` 파일을 탐색하도록 스캐너와 클라이언트 정의를 수정합니다.
+- **수정 파일**:
+  - [clients.rs](file:///Users/doda/workspace/tokscale/crates/tokscale-core/src/clients.rs)
+  - [scanner.rs](file:///Users/doda/workspace/tokscale/crates/tokscale-core/src/scanner.rs)
+- **작업 내용**:
</file context>

[cubic-dev-ai]

P2: Migration plan contains ambiguity about whether to remove or keep the combined *.json|*.jsonl|*.db matcher in scan_directory, which could result in overlapping file match paths and duplicate/misattributed session processing.

Prompt for AI agents

Check if this issue is valid — if so, understand the root cause and fix it. At .asw/plans/antigravity-cli-migration.md, line 48:

<comment>Migration plan contains ambiguity about whether to remove or keep the combined `*.json|*.jsonl|*.db` matcher in `scan_directory`, which could result in overlapping file match paths and duplicate/misattributed session processing.</comment>

<file context>
@@ -0,0 +1,87 @@
+- **작업 내용**:
+  - `clients.rs`: `Gemini` 패턴을 다시 `*.json|*.jsonl`로 롤백하고, `Antigravity` 패턴을 `*.jsonl|*.db` 로 변경합니다.
+  - `scanner.rs`: `built_in_extra_scan_paths_for`에서 `ClientId::Gemini` 분기를 제거하고, `ClientId::Antigravity` 분기로 `~/.gemini/antigravity-cli/conversations` 경로를 추가합니다.
+  - `scanner.rs`: `scan_directory` 패턴 매치 분기에서 `*.json|*.jsonl|*.db`를 제거하고(또는 놔두고), `*.jsonl|*.db` 매치 분기를 추가합니다.
+- **RED Test**: `cargo test test_scan_all_clients_gemini_antigravity_cli_db`가 깨지는지 확인하고, 이를 `ClientId::Antigravity` 용 테스트(`test_scan_all_clients_antigravity_cli_db`)로 수정하여 RED 상태를 확인합니다.
+- **GREEN Check**: `cargo test test_scan_all_clients_antigravity_cli_db` 테스트가 통과하는 것을 확인합니다.
</file context>

[junhoyeo]

Thanks for the detailed protobuf reverse-engineering here! We're landing the Antigravity CLI source via #713, which independently arrived at the same feature with byte-identical verification against real databases and the full frontend registry wiring. The gemini-3-flash-a pricing need is handled there with a targeted exact-key alias.

One important note for the record: the pricing/lookup.rs changes in this PR would revert the #707 brand-token fuzzy-match protection — they remove claude/anthropic/model/router from the fuzzy blocklist, flip is_fuzzy_eligible("claude") back to true, and delete the #707/#634 regression tests. That guard prevents real mispricing (e.g. a retired claude-2.1 eroding to bare claude and billing at an opus-fast rate), so we can't take those.

Closing in favor of #713 — your reverse-engineering work and the pricing direction were genuinely helpful in validating it. 🙏

[junhoyeo]

Hi @ddarkr — thank you for this work! To be transparent about the decision: we're landing Antigravity CLI support via @haunchen's #713, which independently implemented the same SQLite source with byte-identical verification against real databases plus the full frontend registry wiring. Your gemini-3-flash-a pricing direction is preserved there via a targeted exact-key alias.

For the record (and for anyone who finds this later): the pricing/lookup.rs changes in this PR would have reverted the #707 brand-token fuzzy-match protection — removing claude/anthropic/model/router from the fuzzy blocklist and dropping the #707/#634 regression tests — which guards against real mispricing, so we couldn't take those.

Closing in favor of #713. Your reverse-engineering genuinely helped validate the field mapping — thank you, and please keep the contributions coming! 🙏