gusage 1.2.0 → 1.3.0

package/dist/index.js

@@ -11,7 +11,7 @@ import { execSync, spawn } from "child_process";
 // package.json
 var package_default = {
   name: "gusage",
-  version: "1.2.0",
+  version: "1.3.0",
   description: "A standalone CLI to export Gemini CLI quota and usage statistics",
   module: "index.ts",
   type: "module",
@@ -66,7 +66,7 @@ var MAIN_ACCOUNT_KEY = "main-account";
 var ENCRYPTED_FILE_NAME = "mcp-oauth-tokens-v2.json";
 var LEGACY_OAUTH_FILE = "oauth_creds.json";
 var VALID_GEMINI_MODELS = new Set([
-  "gemini-3-pro-preview",
+  "gemini-3.1-pro-preview",
   "gemini-3-flash-preview",
   "gemini-2.5-pro",
   "gemini-2.5-flash",
@@ -136,6 +136,27 @@ function validateNotifyRuntime(notifyThreshold, isWatching, hasNotificationSuppo
 function shouldSendThresholdNotification(prevFraction, currentFraction, threshold) {
   return prevFraction !== undefined && prevFraction > threshold && currentFraction <= threshold;
 }
+function parseWatchIntervalArg(raw) {
+  let totalMs = 0;
+  let found = false;
+  const normalizedParts = [];
+  const matches = raw.matchAll(/(\d+)(h|m|s)?/g);
+  for (const match of matches) {
+    found = true;
+    const val = parseInt(match[1], 10);
+    const unit = match[2] || "s";
+    normalizedParts.push(`${val}${unit}`);
+    if (unit === "s")
+      totalMs += val * 1000;
+    else if (unit === "m")
+      totalMs += val * 60000;
+    else if (unit === "h")
+      totalMs += val * 3600000;
+  }
+  if (!found)
+    return null;
+  return { intervalMs: totalMs, intervalStr: normalizedParts.join("") };
+}
 function parseVersion(modelId) {
   const match = modelId.match(/gemini-(\d+)(?:\.(\d+))?-(.*)/);
   if (match) {
@@ -236,23 +257,10 @@ Options:
   let intervalMs = 1e4;
   let intervalStr = "10s";
   if (values.watch) {
-    let totalMs = 0;
-    const matches = values.watch.matchAll(/(\d+)(h|m|s)?/g);
-    let found = false;
-    for (const match of matches) {
-      found = true;
-      const val = parseInt(match[1], 10);
-      const unit = match[2] || "s";
-      if (unit === "s")
-        totalMs += val * 1000;
-      else if (unit === "m")
-        totalMs += val * 60000;
-      else if (unit === "h")
-        totalMs += val * 3600000;
-    }
-    if (found) {
-      intervalMs = totalMs;
-      intervalStr = values.watch;
+    const parsedWatch = parseWatchIntervalArg(values.watch);
+    if (parsedWatch) {
+      intervalMs = parsedWatch.intervalMs;
+      intervalStr = parsedWatch.intervalStr;
     }
   }
   const useColor = !values["no-color"] && !process.env.NO_COLOR && process.stdout.isTTY;
@@ -511,6 +519,7 @@ async function refreshAccessToken(refreshToken) {
 export {
   validateNotifyRuntime,
   shouldSendThresholdNotification,
+  parseWatchIntervalArg,
   parseNotifyThresholdArg,
   main as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gusage",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "A standalone CLI to export Gemini CLI quota and usage statistics",
   "module": "index.ts",
   "type": "module",