agy-cli-usage 0.4.5 → 0.4.6

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 * use plain v* tags in release-please ([#12](https://github.com/abruption/agy-cli-usage/issues/12)) ([74b648d](https://github.com/abruption/agy-cli-usage/commit/74b648df24967f71a43095a80e7340a6b5ac2e39)), closes [#9](https://github.com/abruption/agy-cli-usage/issues/9)
 
+## [0.4.6](https://github.com/abruption/agy-cli-usage/compare/v0.4.5...v0.4.6) (2026-09-07)
+
+
+### Bug Fixes
+
+* restore the "antigravity" User-Agent the quota API gates on ([#48](https://github.com/abruption/agy-cli-usage/issues/48)) ([c375d5a](https://github.com/abruption/agy-cli-usage/commit/c375d5a3e9c1698cbb1dfe998be6e7c388363986)), closes [#47](https://github.com/abruption/agy-cli-usage/issues/47)
+
 ## [0.4.5](https://github.com/abruption/agy-cli-usage/compare/v0.4.4...v0.4.5) (2026-07-03)
 
 

package/README.md

@@ -107,6 +107,8 @@ The token is **read only** from wherever `agy` stored it. Handled per platform a
 
 Read order: `keyring → OS CLI → Windows credman → token file → PTY`. Override the file path with `AGY_OAUTH_TOKEN_FILE`.
 
+Token files are tried in order: `AGY_OAUTH_TOKEN_FILE`, then `~/.gemini/antigravity-cli/antigravity-oauth-token`, then `~/.gemini/jetski-standalone-oauth-token`. The last one is checked only after every keyring backend has failed — on macOS it sits beside the Keychain entry and can hold an older grant from a different session, so it must not win over a working one.
+
 ## HTTP endpoint (optional)
 
 ```bash

package/dist/src/api.d.ts

@@ -1,9 +1,21 @@
 import type { FetchResult } from './types.js';
 /** Exported for direct unit testing — keeps the UA tied to the real package name/version. */
 export declare function buildUserAgent(): string;
+/**
+ * Why these are distinct: the endpoint uses 401 and 403 for unrelated problems
+ * and only one of them is fixed by signing in again.
+ *   unauthorized — the token was rejected (expired/revoked): re-authenticate.
+ *   not-entitled — the token is fine but the account has no Antigravity
+ *                  license ("You do not have a valid license of this
+ *                  product…"): signing in again changes nothing.
+ *   no-project   — HTTP 200 without `cloudaicompanionProject`.
+ *   http         — anything else (wrong host, 5xx, …).
+ */
+export type ApiErrorKind = 'unauthorized' | 'not-entitled' | 'no-project' | 'http';
 declare class ApiError extends Error {
     status: number;
-    constructor(message: string, status: number);
+    kind: ApiErrorKind;
+    constructor(message: string, status: number, kind?: ApiErrorKind);
 }
 export interface FetchOptions {
     host?: string;

package/dist/src/api.js

@@ -9,9 +9,16 @@
 // Captured from live agy traffic (mitmproxy). The internal endpoint is undocumented;
 // the PTY fallback exists for when it changes.
 import { currentVersion } from './update.js';
+// The UA is load-bearing, not cosmetic: Cloud Code picks the product from the
+// User-Agent, not from the request body. Without an `antigravity` substring
+// (case-insensitive, position and version format irrelevant) `loadCodeAssist`
+// answers HTTP 200 but omits `cloudaicompanionProject`, so the quota call can
+// never run — sending `ideType: "ANTIGRAVITY"` does not compensate. Dropping
+// that substring is what broke v0.4.5 (#47). Verified against the live daily
+// host on 2026-09-07.
 /** Exported for direct unit testing — keeps the UA tied to the real package name/version. */
 export function buildUserAgent() {
-    return `agy-cli-usage/${currentVersion()} ${process.platform}/${process.arch}`;
+    return `antigravity-agy-cli-usage/${currentVersion()} ${process.platform}/${process.arch}`;
 }
 const UA = buildUserAgent();
 // Antigravity ships against the "daily" Cloud Code host; stable builds use the
@@ -19,10 +26,12 @@ const UA = buildUserAgent();
 const HOSTS = ['daily-cloudcode-pa.googleapis.com', 'cloudcode-pa.googleapis.com'];
 class ApiError extends Error {
     status;
-    constructor(message, status) {
+    kind;
+    constructor(message, status, kind) {
         super(message);
         this.name = 'ApiError';
         this.status = status;
+        this.kind = kind ?? (status === 401 ? 'unauthorized' : status === 403 ? 'not-entitled' : 'http');
     }
 }
 // Known limitation: this is the only email source `loadCodeAssist` exposes —
@@ -77,8 +86,11 @@ export async function fetchQuotaSummary(accessToken, opts = {}) {
                 metadata: { ideType: 'ANTIGRAVITY' },
             });
             const project = lca.cloudaicompanionProject;
-            if (!project)
-                throw new ApiError('loadCodeAssist returned no cloudaicompanionProject', 0);
+            if (!project) {
+                throw new ApiError(`loadCodeAssist on ${host} returned HTTP 200 without cloudaicompanionProject — either the ` +
+                    `request was not recognized as Antigravity (the API reads the product off the User-Agent, ` +
+                    `which must contain "antigravity") or the signed-in account has no Antigravity entitlement`, 0, 'no-project');
+            }
             const raw = await postInternal(host, accessToken, 'retrieveUserQuotaSummary', { project });
             return {
                 raw,
@@ -89,8 +101,11 @@ export async function fetchQuotaSummary(accessToken, opts = {}) {
         }
         catch (err) {
             lastErr = err;
-            // 404 / wrong-host -> try next candidate; auth errors -> stop early.
-            if (err instanceof ApiError && (err.status === 401 || err.status === 403))
+            // 404 / wrong-host -> try next candidate. A rejected token or a missing
+            // license is account-level, identical on every host: stop early.
+            // `no-project` deliberately keeps going — an account can be entitled on
+            // one channel and not the other, and one extra round trip is cheap.
+            if (err instanceof ApiError && (err.kind === 'unauthorized' || err.kind === 'not-entitled'))
                 throw err;
         }
     }

package/dist/src/credentials.js

@@ -127,10 +127,18 @@ function readViaWindowsCredman() {
 }
 // On headless Linux (no Secret Service) agy persists the token to a plain-JSON
 // file instead of the keyring. Same payload shape, no `go-keyring-base64:` prefix.
+//
+// The jetski path is last on purpose. macOS keeps that file around next to the
+// Keychain entry, and the two can hold *different* grants — an observed one was
+// three days stale and belonged to a session with no Antigravity license, which
+// still refreshes fine and only fails later at the quota call. Every keyring
+// backend is tried first, so this is reached only where the alternative is no
+// credential at all.
 function readViaFile() {
     const candidates = [
         process.env.AGY_OAUTH_TOKEN_FILE,
         join(homedir(), '.gemini', 'antigravity-cli', 'antigravity-oauth-token'),
+        join(homedir(), '.gemini', 'jetski-standalone-oauth-token'),
     ].filter((p) => Boolean(p));
     for (const path of candidates) {
         try {

package/dist/src/main.js

@@ -12,7 +12,7 @@
 //   agy-cli-usage update [--check]  self-update via npm
 //   agy-cli-usage --version | -v  print the installed version
 import { getAccessToken, CredentialError } from './credentials.js';
-import { fetchQuotaSummary } from './api.js';
+import { fetchQuotaSummary, ApiError } from './api.js';
 import { captureUsageViaPty } from './pty-fallback.js';
 import { fromApi, fromPty } from './quota.js';
 import { renderPanel } from './render.js';
@@ -24,6 +24,15 @@ import { fileURLToPath } from 'node:url';
 const CACHE_DIR = join(process.env.XDG_CACHE_HOME || join(homedir(), '.cache'), 'agy-usage');
 const CACHE_FILE = join(CACHE_DIR, 'quota.json');
 const CACHE_TTL_MS = 5 * 60 * 1000;
+// The API path fails in ways that look alike on the wire but need different
+// things from the user — see ApiErrorKind in api.ts. Printing "sign in again"
+// for a missing license just sends people round a loop that cannot help.
+const API_ERROR_HINTS = {
+    unauthorized: 'hint: the stored token was rejected — run `agy` and sign in again.',
+    'not-entitled': 'hint: the token is valid but this Google account has no Antigravity license. Signing in again ' +
+        'will not change that — check which account `agy` is using, or its subscription.',
+    'no-project': 'hint: `--source pty` reads the panel from `agy` itself and does not need this endpoint.',
+};
 const VALID_SOURCES = ['auto', 'api', 'pty'];
 const VALID_CHANNELS = ['auto', 'daily', 'prod'];
 const errMessage = (e) => (e instanceof Error ? e.message : String(e));
@@ -206,6 +215,9 @@ if (isMainModule()) {
         }
         else {
             process.stderr.write(`error: ${errMessage(err)}\n`);
+            const hint = err instanceof ApiError ? API_ERROR_HINTS[err.kind] : undefined;
+            if (hint)
+                process.stderr.write(`${hint}\n`);
         }
         process.exit(1);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agy-cli-usage",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "Headless usage/quota monitor for the Antigravity CLI (agy) — reads Cloud Code quota directly, with a PTY fallback. No IDE required.",
   "type": "module",
   "types": "dist/src/main.d.ts",
@@ -56,9 +56,9 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@eslint/js": "^9.39.4",
-    "@types/node": "^18.19.0",
-    "eslint": "^9.39.4",
+    "@eslint/js": "^10.0.1",
+    "@types/node": "^26.1.2",
+    "eslint": "^10.6.0",
     "typescript": "^6.0.3",
     "typescript-eslint": "^8.62.1"
   }