agy-cli-usage 0.4.2 → 0.4.3

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.3](https://github.com/abruption/agy-cli-usage/compare/v0.4.2...v0.4.3) (2026-07-02)
+
+
+### Bug Fixes
+
+* key the quota cache by source/channel, validate --source/--channel ([#33](https://github.com/abruption/agy-cli-usage/issues/33)) ([19e6860](https://github.com/abruption/agy-cli-usage/commit/19e6860bcf2aa8a547b880a4430027539b4343fb)), closes [#30](https://github.com/abruption/agy-cli-usage/issues/30)
+
 ## [0.4.2](https://github.com/abruption/agy-cli-usage/compare/v0.4.1...v0.4.2) (2026-06-30)
 
 

package/dist/src/main.d.ts

@@ -11,10 +11,18 @@ export interface CliOptions {
     version?: boolean;
     help?: boolean;
 }
+/** Exported for direct unit testing (no process.argv/exit side effects). */
+export declare function parseArgs(argv: string[]): CliOptions;
+/** Exported for direct unit testing via an injected `cacheFile` — not part of the CLI's public surface. */
+export declare function readCache(source: SnapshotOptions['source'], channel: SnapshotOptions['channel'], cacheFile?: string): Snapshot | null;
+/** Exported for direct unit testing via an injected `cacheFile` — not part of the CLI's public surface. */
+export declare function writeCache(snap: Snapshot, source: SnapshotOptions['source'], channel: SnapshotOptions['channel'], cacheFile?: string): void;
 /** Subset of options needed to produce a snapshot (also usable from server.ts). */
 export interface SnapshotOptions {
     source: 'auto' | 'api' | 'pty';
     channel: 'auto' | 'daily' | 'prod';
     cache: boolean;
+    /** Override the cache file path — for tests only; defaults to the real user cache. */
+    cacheFile?: string;
 }
 export declare function getSnapshot(opts: SnapshotOptions): Promise<Snapshot>;

package/dist/src/main.js

@@ -17,14 +17,18 @@ import { captureUsageViaPty } from './pty-fallback.js';
 import { fromApi, fromPty } from './quota.js';
 import { renderPanel } from './render.js';
 import { currentVersion, runUpdate } from './update.js';
-import { readFileSync, writeFileSync, mkdirSync } from 'node:fs';
+import { readFileSync, writeFileSync, mkdirSync, realpathSync } from 'node:fs';
 import { homedir } from 'node:os';
-import { join } from 'node:path';
+import { join, dirname } from 'node:path';
+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;
+const VALID_SOURCES = ['auto', 'api', 'pty'];
+const VALID_CHANNELS = ['auto', 'daily', 'prod'];
 const errMessage = (e) => (e instanceof Error ? e.message : String(e));
-function parseArgs(argv) {
+/** Exported for direct unit testing (no process.argv/exit side effects). */
+export function parseArgs(argv) {
     const o = {
         json: false, watch: null, source: 'auto', channel: 'auto', cache: true, command: null, check: false,
     };
@@ -43,10 +47,20 @@ function parseArgs(argv) {
             else
                 o.watch = 60;
         }
-        else if (a === '--source')
-            o.source = (argv[++i] ?? 'auto');
-        else if (a === '--channel')
-            o.channel = (argv[++i] ?? 'auto');
+        else if (a === '--source') {
+            const v = argv[++i];
+            if (!VALID_SOURCES.includes(v)) {
+                throw new Error(`invalid --source '${v}' — expected one of: ${VALID_SOURCES.join(', ')}`);
+            }
+            o.source = v;
+        }
+        else if (a === '--channel') {
+            const v = argv[++i];
+            if (!VALID_CHANNELS.includes(v)) {
+                throw new Error(`invalid --channel '${v}' — expected one of: ${VALID_CHANNELS.join(', ')}`);
+            }
+            o.channel = v;
+        }
         else if (a === '--no-cache' || a === '--refresh')
             o.cache = false;
         else if (a === '--check')
@@ -69,22 +83,25 @@ const HELP = `agy-cli-usage — Antigravity CLI (agy) usage/quota monitor
   agy-cli-usage update [--check]  self-update via npm (--check: report only)
   agy-cli-usage --version | -v
 `;
-// --- cache -------------------------------------------------------------------
-function readCache() {
+/** Exported for direct unit testing via an injected `cacheFile` — not part of the CLI's public surface. */
+export function readCache(source, channel, cacheFile = CACHE_FILE) {
     try {
-        const { ts, snap } = JSON.parse(readFileSync(CACHE_FILE, 'utf8'));
-        if (Date.now() - ts < CACHE_TTL_MS)
-            return snap;
+        const entry = JSON.parse(readFileSync(cacheFile, 'utf8'));
+        if (entry.source !== source || entry.channel !== channel)
+            return null;
+        if (Date.now() - entry.ts < CACHE_TTL_MS)
+            return entry.snap;
     }
     catch {
-        /* no/expired cache */
+        /* no/expired/incompatible-format cache */
     }
     return null;
 }
-function writeCache(snap) {
+/** Exported for direct unit testing via an injected `cacheFile` — not part of the CLI's public surface. */
+export function writeCache(snap, source, channel, cacheFile = CACHE_FILE) {
     try {
-        mkdirSync(CACHE_DIR, { recursive: true });
-        writeFileSync(CACHE_FILE, JSON.stringify({ ts: Date.now(), snap }));
+        mkdirSync(dirname(cacheFile), { recursive: true });
+        writeFileSync(cacheFile, JSON.stringify({ ts: Date.now(), source, channel, snap }));
     }
     catch {
         /* cache is best-effort */
@@ -92,7 +109,7 @@ function writeCache(snap) {
 }
 export async function getSnapshot(opts) {
     if (opts.cache && opts.source !== 'pty') {
-        const cached = readCache();
+        const cached = readCache(opts.source, opts.channel, opts.cacheFile);
         if (cached)
             return cached;
     }
@@ -114,7 +131,7 @@ export async function getSnapshot(opts) {
             snap = fromPty(await captureUsageViaPty());
         }
     }
-    writeCache(snap);
+    writeCache(snap, opts.source, opts.channel, opts.cacheFile);
     return snap;
 }
 // --- main --------------------------------------------------------------------
@@ -157,13 +174,31 @@ async function main() {
         await once(opts);
     }
 }
-main().catch((err) => {
-    if (err instanceof CredentialError) {
-        process.stderr.write(`credential error: ${err.message}\n`);
+// Only run the CLI when this file is executed directly (as the `bin` entry
+// point) — guarded so parseArgs/readCache/writeCache/etc. can be imported
+// for unit testing without triggering a full live CLI run (network calls,
+// process.exit()) as an import side effect. realpathSync resolves symlinks
+// on process.argv[1] (npm global `bin` entries are frequently symlinks);
+// import.meta.url is already symlink-resolved by Node's ESM loader.
+function isMainModule() {
+    if (!process.argv[1])
+        return false;
+    try {
+        return fileURLToPath(import.meta.url) === realpathSync(process.argv[1]);
     }
-    else {
-        process.stderr.write(`error: ${errMessage(err)}\n`);
+    catch {
+        return false;
     }
-    process.exit(1);
-});
+}
+if (isMainModule()) {
+    main().catch((err) => {
+        if (err instanceof CredentialError) {
+            process.stderr.write(`credential error: ${err.message}\n`);
+        }
+        else {
+            process.stderr.write(`error: ${errMessage(err)}\n`);
+        }
+        process.exit(1);
+    });
+}
 //# sourceMappingURL=main.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agy-cli-usage",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "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",