claudish 12.3.0 → 12.3.1

package/dist/index.js

@@ -901,7 +901,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "12.3.0";
+var VERSION = "12.3.1";
 
 // src/logger.ts
 import { appendFile, existsSync as existsSync2, mkdirSync, readdirSync, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
@@ -23769,6 +23769,22 @@ var init_minimax_model_dialect = __esm(() => {
   };
 });
 
+// src/auth/antigravity-client-version.ts
+function getAgyClientVersion() {
+  return version2;
+}
+function agyClientVersionReadFor(accessToken) {
+  return readForToken === accessToken;
+}
+function recordAgyClientVersionRead(read, accessToken) {
+  readForToken = accessToken;
+  if (read === null || read === version2)
+    return false;
+  version2 = read;
+  return true;
+}
+var version2 = null, readForToken = null;
+
 // src/auth/credentials/credential-error.ts
 function terminalCredentialError(message, upstreamStatus) {
   return Object.assign(new Error(message), {
@@ -23859,6 +23875,21 @@ function defaultRunAgyRefresh() {
     invalidateReadStoreMemo();
   }
 }
+function defaultReadAgyVersion() {
+  const agy = locateAgyBinary();
+  if (!agy)
+    return null;
+  try {
+    const out = execFileSync(agy, ["--version"], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+      timeout: AGY_VERSION_TIMEOUT_MS
+    });
+    return out.match(/\d+(\.\d+)+/)?.[0] ?? null;
+  } catch {
+    return null;
+  }
+}
 function parseRecord(raw) {
   if (!raw)
     return null;
@@ -23916,6 +23947,18 @@ function needsRefresh(tok, now) {
     return true;
   return now >= expMs - EXPIRY_SKEW_MS;
 }
+function captureAgyClientVersion(accessToken, deps) {
+  if (!deps.readAgyVersion || agyClientVersionReadFor(accessToken))
+    return;
+  const read = deps.readAgyVersion();
+  recordAgyClientVersionRead(read, accessToken);
+  if (read) {
+    log(`[Antigravity] Client version from agy: ${read}`);
+  } else {
+    const kept = getAgyClientVersion();
+    log("[Antigravity] Could not read the agy version" + (kept ? `; keeping ${kept}.` : "; using the fallback version."));
+  }
+}
 async function resolveValidToken(deps) {
   if (process.platform !== "darwin") {
     throw terminalCredentialError("[Antigravity] The shared Antigravity token store is macOS-only for now. " + "Use g@<model> with GEMINI_API_KEY on this platform.");
@@ -23925,6 +23968,7 @@ async function resolveValidToken(deps) {
     throw terminalCredentialError("[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).");
   }
   if (!needsRefresh(rec.token, deps.now())) {
+    captureAgyClientVersion(rec.token.access_token, deps);
     return rec.token.access_token;
   }
   log("[Antigravity] Access token expired/near-expiry \u2014 asking the Antigravity CLI to refresh.");
@@ -23932,6 +23976,7 @@ async function resolveValidToken(deps) {
   const refreshedRec = parseRecord(deps.readStore());
   if (refreshedRec && !needsRefresh(refreshedRec.token, deps.now())) {
     log("[Antigravity] Shared token refreshed by the Antigravity CLI.");
+    captureAgyClientVersion(refreshedRec.token.access_token, deps);
     return refreshedRec.token.access_token;
   }
   const message = `[Antigravity] ${describeRefreshFailure(outcome)}`;
@@ -23978,6 +24023,7 @@ async function forceRefreshAntigravityToken(deps = defaultDeps) {
   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.");
+    captureAgyClientVersion(token.access_token, deps);
     return token.access_token;
   }
   if (!refreshed || refreshed.token.access_token === original.access_token) {
@@ -24001,7 +24047,7 @@ function _resetAntigravityTokenState() {
   cachedHasToken = null;
   invalidateReadStoreMemo();
 }
-var KC_SERVICE = "gemini", KC_ACCOUNT = "antigravity", PREFIX = "go-keyring-base64:", EXPIRY_SKEW_MS = 120000, AGY_REFRESH_TIMEOUT_MS = 12000, READ_STORE_TTL_MS = 3000, cachedRawStore = null, defaultDeps, cachedHasToken = null, HAS_TOKEN_TTL_MS = 5000, inFlight = null;
+var KC_SERVICE = "gemini", KC_ACCOUNT = "antigravity", PREFIX = "go-keyring-base64:", EXPIRY_SKEW_MS = 120000, AGY_REFRESH_TIMEOUT_MS = 12000, AGY_VERSION_TIMEOUT_MS = 5000, READ_STORE_TTL_MS = 3000, cachedRawStore = null, defaultDeps, cachedHasToken = null, HAS_TOKEN_TTL_MS = 5000, inFlight = null;
 var init_antigravity_token = __esm(() => {
   init_logger();
   defaultDeps = {
@@ -24009,6 +24055,7 @@ var init_antigravity_token = __esm(() => {
     writeStore: defaultWriteStore,
     deleteStore: defaultDeleteStore,
     runAgyRefresh: defaultRunAgyRefresh,
+    readAgyVersion: defaultReadAgyVersion,
     now: () => Date.now()
   };
 });
@@ -24026,8 +24073,11 @@ function makeTerminalSetupError(message) {
   err.terminal = true;
   return err;
 }
+function antigravityClientVersion() {
+  return getAgyClientVersion() ?? AGY_FALLBACK_CLIENT_VERSION;
+}
 function buildAntigravityUserAgent() {
-  return `antigravity/cli/1.1.9 (aidev_client; os_type=${process.platform}; arch=${process.arch}; auth_method=consumer)`;
+  return `antigravity/cli/${antigravityClientVersion()} (aidev_client; os_type=${process.platform}; arch=${process.arch}; auth_method=consumer)`;
 }
 function resetAntigravityUserCache() {
   cachedAgProjectId = null;
@@ -24035,6 +24085,7 @@ function resetAntigravityUserCache() {
   cachedAgTierName = null;
   agServedCache = null;
   agServedCacheAt = 0;
+  agServedCacheVersion = null;
 }
 async function callLoadCodeAssistAntigravity(accessToken) {
   const res = await fetch(`${apiBase()}:loadCodeAssist`, {
@@ -24101,8 +24152,31 @@ async function retrieveUserQuota(accessToken, projectId) {
     return null;
   }
 }
+function flattenAgentModelSorts(sorts) {
+  if (!Array.isArray(sorts))
+    return;
+  const seen = new Set;
+  const ids = [];
+  for (const sort of sorts) {
+    for (const group of sort?.groups ?? []) {
+      for (const id of group?.modelIds ?? []) {
+        if (typeof id !== "string" || id === "" || seen.has(id))
+          continue;
+        seen.add(id);
+        ids.push(id);
+      }
+    }
+  }
+  return ids.length > 0 ? ids : undefined;
+}
 async function getServedAntigravityModels(accessToken, projectId, opts) {
   const now = Date.now();
+  const version = antigravityClientVersion();
+  if (agServedCache && agServedCacheVersion !== version) {
+    log(`[Antigravity] Client version changed (${agServedCacheVersion} -> ${version}); ` + "refetching the dynamic models catalog.");
+    agServedCache = null;
+    agServedCacheAt = 0;
+  }
   if (!opts?.force && agServedCache && now - agServedCacheAt < SERVED_MODELS_TTL_MS) {
     return agServedCache;
   }
@@ -24154,8 +24228,17 @@ async function getServedAntigravityModels(accessToken, projectId, opts) {
           if (info?.newModelId)
             deprecatedReplacements[oldId] = info.newModelId;
         }
-        agServedCache = { servedIds, defaultId, meta, excludedIds, deprecatedReplacements };
+        const agentModelIds = flattenAgentModelSorts(data.agentModelSorts);
+        agServedCache = {
+          servedIds,
+          defaultId,
+          meta,
+          excludedIds,
+          deprecatedReplacements,
+          ...agentModelIds ? { agentModelIds } : {}
+        };
         agServedCacheAt = now;
+        agServedCacheVersion = version;
         return agServedCache;
       }
     } else {
@@ -24168,7 +24251,7 @@ async function getServedAntigravityModels(accessToken, projectId, opts) {
     return agServedCache;
   return { servedIds: [], defaultId: null, meta: {} };
 }
-var ANTIGRAVITY_DEFAULT_HOST = "https://daily-cloudcode-pa.googleapis.com", SERVED_MODELS_TTL_MS, ANTIGRAVITY_IDE_TYPE = "ANTIGRAVITY", cachedAgProjectId = null, cachedAgTierId = null, cachedAgTierName = null, agServedCache = null, agServedCacheAt = 0;
+var ANTIGRAVITY_DEFAULT_HOST = "https://daily-cloudcode-pa.googleapis.com", SERVED_MODELS_TTL_MS, ANTIGRAVITY_IDE_TYPE = "ANTIGRAVITY", AGY_FALLBACK_CLIENT_VERSION = "1.1.9", cachedAgProjectId = null, cachedAgTierId = null, cachedAgTierName = null, agServedCache = null, agServedCacheAt = 0, agServedCacheVersion = null;
 var init_antigravity_user = __esm(() => {
   init_logger();
   SERVED_MODELS_TTL_MS = 10 * 60 * 1000;
@@ -33017,20 +33100,26 @@ async function fetchAntigravityModelsCatalog() {
       };
     }
     const { projectId } = await setupAntigravityUser(token);
-    const { servedIds, meta, excludedIds } = await getServedAntigravityModels(token, projectId);
+    const { servedIds, meta, excludedIds, agentModelIds } = await getServedAntigravityModels(token, projectId);
     const declaredExcluded = excludedIds ?? new Set;
-    const selectable = servedIds.filter((id) => !declaredExcluded.has(id) && !isUndeclaredEditorInternal(id));
+    const served = new Set(servedIds);
+    const agentSelectable = (agentModelIds ?? []).filter((id) => served.has(id) && !declaredExcluded.has(id));
+    const position = new Map(agentSelectable.map((id, index) => [id, index]));
+    const otherSelectable = servedIds.filter((id) => !position.has(id) && !declaredExcluded.has(id) && !isUndeclaredEditorInternal(id));
     return {
       kind: "models",
       endpoint,
-      models: selectable.map((id) => {
+      models: [...agentSelectable, ...otherSelectable].map((id) => {
         const m = meta[id];
+        const index = position.get(id);
+        const order = index === undefined ? {} : { providerOrder: index };
         return m?.contextWindow ? {
           id,
           contextWindow: m.contextWindow,
           ignoreCatalogReleaseDate: true,
-          reported: "chat"
-        } : { id, ignoreCatalogReleaseDate: true, reported: "chat" };
+          reported: "chat",
+          ...order
+        } : { id, ignoreCatalogReleaseDate: true, reported: "chat", ...order };
       })
     };
   } catch (err) {
@@ -52040,7 +52129,8 @@ function ModelPicker({ source, onDone, onDiscoveryFailure }) {
           value: filter,
           matches: shown.length,
           total: list.rows.length,
-          width: layout.inner
+          width: layout.inner,
+          idle: discovery.outcome?.kind === "rows" && discovery.outcome.providerOrdered ? "" : undefined
         }),
         /* @__PURE__ */ jsx10(ColumnHeader, {
           layout: rowLayout
@@ -53012,7 +53102,8 @@ async function buildDiscoveredModelOutcome(provider, displayName, catalog) {
   if (head === undefined) {
     return { kind: "collapsed-empty", servedCount, chatCount, fallbackRows };
   }
-  return { kind: "rows", rows: [head, ...tail], servedCount, chatCount };
+  const providerOrdered = discovered.some((m) => typeof m.providerOrder === "number");
+  return providerOrdered ? { kind: "rows", rows: [head, ...tail], servedCount, chatCount, providerOrdered: true } : { kind: "rows", rows: [head, ...tail], servedCount, chatCount };
 }
 async function buildDiscoveredModelRows(provider, displayName, catalog) {
   const outcome = await buildDiscoveredModelOutcome(provider, displayName, catalog);
@@ -53050,8 +53141,18 @@ function buildRowsFromDiscovered(provider, displayName, discovered, catalogRows)
       source: displayName
     };
   });
+  const orderById = new Map;
+  for (const m of discovered) {
+    if (typeof m.providerOrder === "number")
+      orderById.set(m.id, m.providerOrder);
+  }
+  if (orderById.size > 0)
+    return inProviderOrder(rows, orderById);
   return sortModelsNewestFirst(rows);
 }
+function inProviderOrder(rows, orderById) {
+  return rows.filter((row) => orderById.has(row.id)).sort((a, b) => (orderById.get(a.id) ?? 0) - (orderById.get(b.id) ?? 0));
+}
 async function selectModelFromProvider(provider, tierName, recommendedModels, _forceUpdate, catalog) {
   const prefix = pickerModelPrefix(provider) ?? `${provider}@`;
   const displayName = getPickerDisplayName(provider);
@@ -75177,11 +75278,9 @@ import { homedir as homedir36 } from "os";
 import { join as join56 } from "path";
 async function defaultSuggestModel() {
   try {
-    const tok = readSharedAntigravityToken();
-    if (!tok)
-      return "<model>";
-    const { projectId } = await setupAntigravityUser(tok.access_token);
-    const { servedIds, defaultId } = await getServedAntigravityModels(tok.access_token, projectId);
+    const token = await getValidAntigravityAccessToken();
+    const { projectId } = await setupAntigravityUser(token);
+    const { servedIds, defaultId } = await getServedAntigravityModels(token, projectId);
     return defaultId || servedIds[0] || "<model>";
   } catch {
     return "<model>";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "12.3.0",
+  "version": "12.3.1",
   "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": "12.3.0",
-    "@claudish/magmux-darwin-x64": "12.3.0",
-    "@claudish/magmux-linux-arm64": "12.3.0",
-    "@claudish/magmux-linux-x64": "12.3.0"
+    "@claudish/magmux-darwin-arm64": "12.3.1",
+    "@claudish/magmux-darwin-x64": "12.3.1",
+    "@claudish/magmux-linux-arm64": "12.3.1",
+    "@claudish/magmux-linux-x64": "12.3.1"
   },
   "author": "Jack Rudenko <i@madappgang.com>",
   "license": "MIT",