fix(antigravity): restore local spend from all conversation stores and price every logged model - #1206
Merged
robinebers merged 13 commits intoSep 5, 2026
Conversation
- Make timing field 9.4 optional in AntigravityProtoDecoder, falling back to steps.metadata timestamp or DB modification time - Query steps.metadata in AntigravityDbUsageScanner with fallback to legacy query when steps table is absent - Fall back to non-readonly open in SQLiteCLIAccessor when WAL mode errors with SQLITE_CANTOPEN (14) - Add unit tests for step metadata timestamp extraction and fallback handling - Fixes robinebers#1202
Nabsku
requested review from
davidarny,
robinebers and
validatedev
as code owners
September 3, 2026 13:27
|
Thanks for your interest in contributing to OpenUsage! External pull requests must reference an open issue that:
Please discuss the change on an issue first, wait for a maintainer to approve and assign it to you, then reopen this pull request with |
Collaborator
|
@codex review |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: efdafe8965
ℹ️ 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".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
…a errors - Match SQLiteError.queryFailed stderr for missing table/column before falling back to legacyDataSQL - Safely rethrow transient errors (process timeouts, database locks, I/O errors) - Add unit tests verifying schema-missing error discrimination
robinebers
requested changes
Sep 4, 2026
robinebers
left a comment
robinebers
left a comment
Owner
There was a problem hiding this comment.
AI Review — Codex
AI-generated review, posted on behalf of @robinebers.
Requesting changes on b10efd0 for two findings detailed inline: the file-modification-time fallback makes daily usage change after a restart, and the SQL change breaks an existing regression test.
Validation: the code builds, and 75 of 76 selected Antigravity and credential-system-client tests pass. The failing test has two assertion failures. Additional temporary tests against real SQLite databases confirm that the modern step-timestamp path works and reproduce the restart-dependent date shift when timestamps are absent. The temporary tests were removed after review.
The PR remains unmerged.
… SQL bounds test Events with no embedded timing and no steps.metadata timestamp were stamped with the database modification time, which changes on every write, so the same usage moved to a different day after a restart. The step timestamp is now the only fallback; events with neither are skipped. Update the batch SQL test for the aliased g.data columns, cover the steps.metadata and legacy query bounds, and add a real-SQLite regression test that advances the file's modification time between scans.
…to the decoder, query-only WAL retry - One dataSQL builder with includeSteps instead of two near-identical queries - Replace stderr matching for missing steps with a cached sqlite_master probe per database - generationEvent takes the steps.metadata blob; shared Timestamp reader for both paths - WAL fallback opens with PRAGMA query_only instead of a write-capable connection - Test helpers for hex encoding and step metadata; cover the query-only retry
… the CLI The IDE, the Antigravity 2.0 app, and ACP sessions each keep their own conversations directory under ~/.gemini, so usage from those surfaces was never counted. Scan all four roots; a missing or unreadable root is reported per directory instead of aborting the whole scan.
Antigravity resolves subagent tiers (flash_lite, flash, pro) through a server-sent TieredModelConfig and logs the result as e.g. gemini-3.7-flash-tiered. It is the same model at the same rate, so price it through the Gemini alias rules and show it under the base name in the breakdown instead of as a separate row.
…lay label and skip bookkeeping rows gen_metadata rows written with the picker on its default carry gemini-default or gemini-pro-default in field 19 and the served model as a label in field 21, so price and list those turns by the label. Rows with neither ID nor label that carry only a system-prompt count are prompt-context records, not generations, and no longer surface as an unknown model. Alias rules cover the labels with effort levels, Antigravity's internal Gemini 3.1 Pro IDs, and Flash experiment slots. Fixes robinebers#1215.
…versation stores, retry any read-only open failure The decoder now exposes the internal model ID and display label instead of choosing between them; the scanner prices placeholder rows by label first and falls back to the ID, and folds -tiered there too, so the alias rules no longer duplicate that suffix. Display-label alias rules share one qualifier form. Conversation stores are discovered under ~/.gemini/antigravity*/ instead of a fixed list. The SQLite accessor retries with query_only on any failed read-only open rather than matching sqlite3's error text.
Effort variants, display labels, placeholder IDs, and experiment slots bill at the base model's rate, so they now share one row named by the canonical pricing family without the catalog's -preview suffix. Adds the claude-opus-4-6 / claude-sonnet-4-6 slug aliases so those rows fold too.
validatedev
changed the title
Probe steps.metadata as a column, not just the table, and re-probe while a database lacks it so a store that gains step timestamps is re-read without a restart. De-duplicate symlinked or repeated stores so conversations are not counted twice. Surface a failed ~/.gemini listing through the read-failure reporter instead of reading it as no usage. Add a real WAL-mode fixture test and split the Antigravity test file by concern.
…d Cursor ModelPricing gains a memoized canonicalName(for:) and familyName(for:stripping:) so the Antigravity and Cursor breakdowns fold rows through one helper instead of two private copies, and the alias scan runs once per distinct name. The Antigravity scanner lists directories through one helper, discovers and de-duplicates database files in one step, and owns the unknown-model label. Antigravity test fixtures move to the shared support file.
Collaborator
|
@codex review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 94e5a4b7fb
ℹ️ 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".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
…ipping them An existence check dropped a store whose conversations directory could not be stat'ed before the listing ran, so a permission or I/O problem read as no usage. Every candidate store now goes through the listing, which treats a missing directory as empty and reports one it cannot read.
validatedev
approved these changes
Sep 4, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Approved issue
Fixes #1202
Fixes #1215
TL;DR
Antigravity's local spend tile was empty or partial for most users. This PR makes the conversation-log scanner decode newer records, open WAL-mode databases, read every Antigravity surface's store, and price the placeholder and tiered model IDs Antigravity logs, grouped by model family.
What was happening
agyversions dropped the embedded wall-clock timestamp fromgen_metadata.data, so every generation record failed to decode and the tile showed nothing.-shmsidecar cannot be opened read-only fail undersqlite3 -readonlywith "unable to open database file (14)", so those conversations were skipped with a warning.~/.gemini/antigravity-cli/conversationswas scanned. The Antigravity IDE, the Antigravity 2.0 app, and ACP sessions each keep their own store, so their usage was never counted.gemini-default/gemini-pro-defaultas the model ID and the served model only as a display label ("Gemini 3.1 Pro (High)"). No alias rule matched either, so about 12% of records were unpriced and the tile showed "Unknown models found".gemini-3.1-pro-low,gemini-3.7-flash-tiered,gemini-3.7-flash-exp-a) even though they bill at the base model's rate.What this changes
steps.metadatablob and uses its Timestamp when the embedded timing is absent. Records with neither are dropped rather than attributed to the database's modification day. The scanner probes for thesteps.metadatacolumn per database instead of matching error text, and re-probes a store that lacked it so one that gains step timestamps is re-read without a restart.SQLiteCLIAccessorretries any failed-readonlyopen withPRAGMA query_only = ON, so the fallback connection still cannot write.~/.gemini/antigravity*/conversationsdirectory, so a new Antigravity surface needs no release. Symlinked or repeated stores are scanned once. An unreadable root, or a~/.geminithat cannot be listed, is reported through the read-failure path instead of aborting the scan or reading as no usage.-tieredinto the base model, and only reports a row as unknown when nothing prices. Bookkeeping rows produce no event.-previewsuffix dropped: effort variants, display labels, placeholder IDs, and experiment slots all count under onegemini-3.1-proorgemini-3.7-flashrow. Names no alias rule knows keep their raw text.gemini-pro-defaultandgemini-pro-agentas Gemini 3.1 Pro; Flash-exp-[a-z]experiment slots; theclaude-opus-4-6/claude-sonnet-4-6slug spellings.gemini-defaultis deliberately unaliased because its label has pointed at different Flash generations over time.docs/providers/antigravity.mdanddocs/pricing.mddescribe the stores, placeholder handling, tiered IDs, and row grouping.Heads-up
sqlite3process per batch on affected databases. Caching the working mode per path is a follow-up.Tests
AntigravityProtoDecoderTests,AntigravityDbSchemaTests,AntigravityDbUsageScannerTests, shared fixtures inAntigravityTestSupport). They cover step-metadata timestamps, the no-timestamp drop, a real WAL-mode database, astepstable withoutmetadata, a store that gains step timestamps, store discovery and symlink de-duplication, an unlistable~/.gemini, placeholder and tiered resolution, the priced-ID fallback, family grouping, and bookkeeping rows.ModelPricingTestscovers the new alias rules;CredentialCacheIntegrityTestspins the retry arguments.Screenshots
Not applicable (data ingestion for existing spend tiles and charts).