claudish 7.52.0 → 7.53.0

package/dist/index.js

@@ -729,7 +729,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.52.0";
+var VERSION = "7.53.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -30167,6 +30167,9 @@ function parseRecord(raw) {
     return null;
   }
 }
+function encodeRecord(rec) {
+  return PREFIX + Buffer.from(JSON.stringify(rec), "utf8").toString("base64");
+}
 function readSharedAntigravityToken(deps = defaultDeps) {
   const rec = parseRecord(deps.readStore());
   return rec ? rec.token : null;
@@ -30184,6 +30187,15 @@ function hasSharedAntigravityToken(deps = defaultDeps) {
   cachedHasToken = { at: now, value };
   return value;
 }
+function writeSharedAntigravityToken(tok, deps = defaultDeps) {
+  const existing = parseRecord(deps.readStore());
+  const base = existing ?? { token: tok };
+  const merged = {
+    ...base,
+    token: { ...base.token, ...tok }
+  };
+  deps.writeStore(encodeRecord(merged));
+}
 function deleteSharedAntigravityToken(deps = defaultDeps) {
   (deps.deleteStore ?? defaultDeleteStore)();
   _resetAntigravityTokenState();
@@ -30222,6 +30234,31 @@ function getValidAntigravityAccessToken(deps = defaultDeps) {
   });
   return inFlight;
 }
+async function forceRefreshAntigravityToken(deps = defaultDeps) {
+  if (process.platform !== "darwin") {
+    throw new Error("[Antigravity] The shared Antigravity token store is macOS-only for now. " + "Use g@<model> with GEMINI_API_KEY on this platform.");
+  }
+  _resetAntigravityTokenState();
+  const rec = parseRecord(deps.readStore());
+  if (!rec) {
+    throw new Error("[Antigravity] No Antigravity session found. Sign in with `claudish login antigravity`, " + "or use g@<model> with GEMINI_API_KEY " + "(get one at https://aistudio.google.com/app/apikey).");
+  }
+  const original = rec.token;
+  log("[Antigravity] Upstream rejected the current token \u2014 asking the Antigravity CLI to re-mint.");
+  writeSharedAntigravityToken({ ...original, expiry: new Date(deps.now() - 1000).toISOString() }, deps);
+  deps.runAgyRefresh();
+  const refreshed = parseRecord(deps.readStore());
+  const token = refreshed?.token;
+  if (token && token.access_token !== original.access_token && !needsRefresh(token, deps.now())) {
+    log("[Antigravity] Shared token re-minted by the Antigravity CLI.");
+    return token.access_token;
+  }
+  if (!refreshed || refreshed.token.access_token === original.access_token) {
+    writeSharedAntigravityToken(original, deps);
+  }
+  _resetAntigravityTokenState();
+  throw new Error("[Antigravity] The Antigravity session was rejected upstream and could not be re-minted. " + "Run `claudish login antigravity` to sign in again.");
+}
 function _resetAntigravityTokenState() {
   inFlight = null;
   cachedHasToken = null;
@@ -30248,6 +30285,13 @@ function makeTerminalSetupError(message) {
 function buildAntigravityUserAgent() {
   return `antigravity/cli/1.1.9 (aidev_client; os_type=${process.platform}; arch=${process.arch}; auth_method=consumer)`;
 }
+function resetAntigravityUserCache() {
+  cachedAgProjectId = null;
+  cachedAgTierId = null;
+  cachedAgTierName = null;
+  agServedCache = null;
+  agServedCacheAt = 0;
+}
 async function callLoadCodeAssistAntigravity(accessToken) {
   const res = await fetch(`${ANTIGRAVITY_API_BASE}:loadCodeAssist`, {
     method: "POST",
@@ -30632,6 +30676,22 @@ class AntigravityProviderTransport {
     this.servedModelName = resolveAntigravityModelId(this.modelName, this.servedModels, this.defaultServedModel, lookupFamilyDefaultVariant(this.modelName, "antigravity"));
     log(`[Antigravity] Auth refreshed, project: ${this.projectId}, tier: ${this._displayName}, ` + `model: ${this.modelName} -> ${this.servedModelName}, served: ${this.servedModels.join(",") || "(none)"}`);
   }
+  async forceRefreshAuth() {
+    await forceRefreshAntigravityToken();
+    resetAntigravityUserCache();
+    this.cachedAuth = null;
+    await this.refreshAuth();
+  }
+  classifyTerminalError(status, bodyText) {
+    if (status !== 429)
+      return;
+    const classification = classify429(bodyText);
+    if (!classification)
+      return;
+    if (classification.reason === "MODEL_CAPACITY_EXHAUSTED")
+      return false;
+    return classification.terminal;
+  }
   transformPayload(payload) {
     const envelope = this.cachedAuth?.transformPayload ? this.cachedAuth.transformPayload(payload) : this.buildEnvelope(payload, this.servedModelName);
     this.lastEnvelope = envelope;
@@ -30672,8 +30732,7 @@ class AntigravityProviderTransport {
         return this.handleCapacityExhausted(response, queue);
       }
       if (classification.terminal) {
-        logStderr(`[Antigravity] Quota exhausted (${classification.reason || "daily limit"}). Check plan limits.`);
-        return response;
+        return await this.explainTerminalQuota(response, bodyText, classification.reason);
       }
       if (attempt < MAX_RETRY_ATTEMPTS) {
         const delay = classification.retryDelayMs ?? DEFAULT_RATE_LIMIT_DELAY_MS;
@@ -30768,6 +30827,53 @@ class AntigravityProviderTransport {
       headers: { "Content-Type": "application/json" }
     });
   }
+  async quotaRemainingForServedModel() {
+    if (!this.accessToken || !this.projectId)
+      return;
+    let timer;
+    const data = await Promise.race([
+      retrieveUserQuota(this.accessToken, this.projectId).catch(() => null),
+      new Promise((resolve) => {
+        timer = setTimeout(() => resolve(null), QUOTA_CHECK_TIMEOUT_MS);
+      })
+    ]).finally(() => {
+      if (timer)
+        clearTimeout(timer);
+    });
+    const buckets = data?.buckets;
+    if (!buckets?.length)
+      return;
+    const bucket = buckets.find((b) => b.modelId === this.servedModelName) ?? buckets.find((b) => b.modelId === this.modelName);
+    return typeof bucket?.remainingFraction === "number" ? bucket.remainingFraction : undefined;
+  }
+  async explainTerminalQuota(response, bodyText, reason) {
+    const remaining = await this.quotaRemainingForServedModel();
+    const model = this.servedModelName;
+    let advice;
+    if (remaining !== undefined && remaining > 0) {
+      advice = `your Antigravity plan still reports ${(remaining * 100).toFixed(1)}% of the ${model} ` + "allowance available, so this is probably NOT an exhausted plan. The usual cause is an " + "Antigravity session Google invalidated server-side; run `claudish login antigravity`.";
+    } else if (remaining === undefined) {
+      advice = "claudish could not read your Antigravity quota to confirm this. If your plan is not " + "actually spent, the session may be stale \u2014 run `claudish login antigravity`.";
+    } else {
+      advice = `your Antigravity plan reports no remaining ${model} allowance; it refills on Google's own schedule.`;
+    }
+    logStderr(`[Antigravity] Terminal 429 (${reason || "daily limit"}) \u2014 ${advice}`);
+    let parsed;
+    try {
+      parsed = JSON.parse(bodyText);
+    } catch {
+      return response;
+    }
+    const target = Array.isArray(parsed) ? parsed[0]?.error : parsed?.error;
+    if (!target || typeof target !== "object")
+      return response;
+    const upstream = typeof target.message === "string" && target.message.length > 0 ? target.message : "Resource has been exhausted";
+    target.message = `${upstream} \u2014 ${advice}`;
+    return new Response(JSON.stringify(parsed), {
+      status: 429,
+      headers: { "Content-Type": "application/json" }
+    });
+  }
   async logQuotaInfo() {
     if (!this.accessToken || !this.projectId)
       return;
@@ -30817,7 +30923,7 @@ ${lines.join(`
     }
   }
 }
-var ANTIGRAVITY_BASE = "https://cloudcode-pa.googleapis.com", ANTIGRAVITY_ENDPOINT, MAX_RETRY_ATTEMPTS = 3, DEFAULT_RATE_LIMIT_DELAY_MS = 1e4, REASONING_TIER_RANK;
+var ANTIGRAVITY_BASE = "https://cloudcode-pa.googleapis.com", ANTIGRAVITY_ENDPOINT, MAX_RETRY_ATTEMPTS = 3, DEFAULT_RATE_LIMIT_DELAY_MS = 1e4, QUOTA_CHECK_TIMEOUT_MS = 3000, REASONING_TIER_RANK;
 var init_antigravity = __esm(() => {
   init_model_catalog();
   init_antigravity_token();
@@ -41136,7 +41242,8 @@ class ComposedHandler {
       } else {
         const errorText = await response.text();
         log(`[${this.provider.displayName}] Error: ${errorText}`);
-        const hint = getRecoveryHint(response.status, errorText, this.provider.displayName);
+        const transportTerminal = this.provider.classifyTerminalError?.(response.status, errorText);
+        const hint = getRecoveryHint(response.status, errorText, this.provider.displayName, transportTerminal);
         let parsedErrorBody;
         try {
           parsedErrorBody = JSON.parse(errorText);
@@ -41189,7 +41296,7 @@ class ComposedHandler {
         const errorBody = parsedErrorBody ?? {
           error: { type: "api_error", message: errorText }
         };
-        if (isTerminalError(response.status, errorText, isTerminal429(errorText))) {
+        if (isTerminalError(response.status, errorText, transportTerminal ?? isTerminal429(errorText))) {
           const surfaced = buildSurfacedErrorMessage({
             providerDisplayName: this.provider.displayName,
             status: response.status,
@@ -41565,14 +41672,17 @@ class ComposedHandler {
     }
   }
 }
-function getRecoveryHint(status, errorText, providerName) {
+function getRecoveryHint(status, errorText, providerName, transportTerminal429) {
   const lower = errorText.toLowerCase();
   if (status === 503 || lower.includes("overloaded")) {
     return "Provider overloaded. Retry or use a different model.";
   }
-  if (status === 429 && isTerminal429(errorText)) {
+  if (status === 429 && (transportTerminal429 ?? isTerminal429(errorText))) {
     return "Out of quota \u2014 check your plan & billing details. This won't recover on retry.";
   }
+  if (status === 429 && transportTerminal429 === false) {
+    return "Rate limited. Wait, reduce concurrency, or check plan limits.";
+  }
   if (isQuotaExhaustionError(status, errorText)) {
     return "Subscription allowance spent \u2014 this refills on the provider's own schedule (see the message below). Reducing concurrency won't help; switch model/provider or wait.";
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "7.52.0",
+  "version": "7.53.0",
   "description": "Run Claude Code with any model - OpenRouter, Ollama, LM Studio & local models",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,10 +60,10 @@
     "ai"
   ],
   "optionalDependencies": {
-    "@claudish/magmux-darwin-arm64": "7.52.0",
-    "@claudish/magmux-darwin-x64": "7.52.0",
-    "@claudish/magmux-linux-arm64": "7.52.0",
-    "@claudish/magmux-linux-x64": "7.52.0"
+    "@claudish/magmux-darwin-arm64": "7.53.0",
+    "@claudish/magmux-darwin-x64": "7.53.0",
+    "@claudish/magmux-linux-arm64": "7.53.0",
+    "@claudish/magmux-linux-x64": "7.53.0"
   },
   "author": "Jack Rudenko <i@madappgang.com>",
   "license": "MIT",