claudish 12.3.0 → 12.3.2

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.2";
 
 // src/logger.ts
 import { appendFile, existsSync as existsSync2, mkdirSync, readdirSync, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
@@ -19605,6 +19605,11 @@ Check GOOGLE_APPLICATION_CREDENTIALS path.`);
     }
   }
 }
+function resetVertexProjectDiscovery() {
+  discoveredProjectPromise = null;
+  discoveredProjectSettled = undefined;
+  syncAdcOrigin = undefined;
+}
 function describeVertexProjectSource(origin) {
   switch (origin.source) {
     case "env":
@@ -19615,6 +19620,20 @@ function describeVertexProjectSource(origin) {
       return `\`${origin.detail}\``;
   }
 }
+function describeVertexAccessDenied({
+  status,
+  upstream,
+  projectId,
+  origin,
+  account
+}) {
+  const segments = [`HTTP ${status}: ${upstream}`];
+  if (account)
+    segments.push(`ADC account ${account}`);
+  segments.push(`project ${projectId}` + (origin ? ` (from ${describeVertexProjectSource(origin)})` : ""));
+  segments.push("to sign in as another account: gcloud auth application-default login");
+  return segments.join(" \xB7 ");
+}
 function envProjectOrigin() {
   for (const name of VERTEX_PROJECT_ENV_VARS) {
     const value = process.env[name]?.trim();
@@ -19753,6 +19772,9 @@ function buildVertexOAuthEndpoint(config, publisher, model, streaming = true) {
   }
   return `https://aiplatform.googleapis.com/v1/projects/${config.projectId}/locations/global/endpoints/openapi/chat/completions`;
 }
+function resetVertexAuthManager() {
+  authManagerInstance = null;
+}
 function getVertexAuthManager() {
   if (!authManagerInstance) {
     authManagerInstance = new VertexAuthManager;
@@ -23769,6 +23791,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 +23897,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 +23969,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 +23990,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 +23998,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 +24045,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 +24069,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 +24077,7 @@ var init_antigravity_token = __esm(() => {
     writeStore: defaultWriteStore,
     deleteStore: defaultDeleteStore,
     runAgyRefresh: defaultRunAgyRefresh,
+    readAgyVersion: defaultReadAgyVersion,
     now: () => Date.now()
   };
 });
@@ -24026,8 +24095,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 +24107,7 @@ function resetAntigravityUserCache() {
   cachedAgTierName = null;
   agServedCache = null;
   agServedCacheAt = 0;
+  agServedCacheVersion = null;
 }
 async function callLoadCodeAssistAntigravity(accessToken) {
   const res = await fetch(`${apiBase()}:loadCodeAssist`, {
@@ -24101,8 +24174,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 +24250,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 +24273,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;
@@ -31094,6 +31199,10 @@ class VertexCredentialProvider {
     const config = await resolveVertexConfig();
     return selectVertexAuthMode({ project: config?.projectId }) !== null;
   }
+  invalidate() {
+    resetVertexAuthManager();
+    resetVertexProjectDiscovery();
+  }
   async getRequestAuth(_ctx) {
     const config = await resolveVertexConfig();
     if (selectVertexAuthMode({ project: config?.projectId }) === "project") {
@@ -33017,20 +33126,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) {
@@ -40553,6 +40668,10 @@ var init_poe = __esm(() => {
 });
 
 // src/providers/transport/vertex-discovery.ts
+import { readFile as readFile4 } from "fs/promises";
+function _clearVertexDiscoveryCache() {
+  _cache3.clear();
+}
 function isServedByVertex(m) {
   if (!m.publisherModelTemplate)
     return false;
@@ -40609,8 +40728,43 @@ async function listVertexPublisherModels(publisher = VERTEX_DEFAULT_PUBLISHER) {
     signal: AbortSignal.timeout(FETCH_TIMEOUT_MS4)
   });
   if (!response.ok) {
+    log(`[vertex-discovery] HTTP ${response.status} from ${endpoint}`);
     const detail = await response.text().catch(() => "");
-    throw new Error(`HTTP ${response.status} from ${endpoint}${detail ? ` \u2014 ${oneLine4(detail)}` : ""}`);
+    const upstream = upstreamErrorMessage(detail);
+    const origin = await resolveVertexProjectOrigin();
+    if (response.status === 401 || response.status === 403) {
+      let account;
+      try {
+        const credPath = process.env.GOOGLE_APPLICATION_CREDENTIALS;
+        if (credPath) {
+          try {
+            const credential = JSON.parse(await readFile4(credPath, "utf-8"));
+            account = str2(credential.client_email);
+          } catch {}
+        }
+        if (!account) {
+          const token = auth.headers.Authorization?.match(/^Bearer\s+(.+)$/i)?.[1];
+          if (token) {
+            const tokeninfo = await fetch(`https://oauth2.googleapis.com/tokeninfo?access_token=${encodeURIComponent(token)}`, { method: "GET", signal: AbortSignal.timeout(3000) });
+            if (tokeninfo.ok) {
+              account = str2((await tokeninfo.json()).email);
+            }
+          }
+        }
+      } catch {}
+      const explanation = describeVertexAccessDenied({
+        status: response.status,
+        upstream,
+        account,
+        origin,
+        projectId: config.projectId
+      });
+      throw new Error(explanation);
+    }
+    throw new Error([
+      `HTTP ${response.status}: ${upstream}`,
+      `project ${config.projectId}` + (origin ? ` (from ${describeVertexProjectSource(origin)})` : "")
+    ].join(" \xB7 "));
   }
   const listed = parsePublisherModels(await response.json());
   const models = listed.filter(isServedByVertex).map((m) => {
@@ -40626,6 +40780,15 @@ function oneLine4(text, max = 200) {
   const flat = text.replace(/\s+/g, " ").trim();
   return flat.length > max ? `${flat.slice(0, max)}\u2026` : flat;
 }
+function upstreamErrorMessage(detail) {
+  try {
+    const body = JSON.parse(detail);
+    const message = str2(body?.error?.message);
+    if (message)
+      return message;
+  } catch {}
+  return oneLine4(detail) || "(no message)";
+}
 async function verifyServed(ids, config, headers) {
   const base = `https://${vertexApiHost(config.location)}/v1/` + `projects/${config.projectId}/locations/${config.location}/publishers`;
   return Promise.all(ids.map(async (id) => {
@@ -52040,7 +52203,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 +53176,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 +53215,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);
@@ -63952,6 +64127,9 @@ function readProcessTable() {
     return [];
   }
 }
+function processTableTrusted(table) {
+  return table.some((r) => r.pid === process.pid);
+}
 function readProcessTableAsync() {
   return new Promise((resolve) => {
     try {
@@ -64888,8 +65066,9 @@ function ownerStartOfSelf() {
   if (ownStart)
     return ownStart;
   const row = readProcessTable().find((r) => r.pid === process.pid);
-  ownStart = row?.lstart ?? "";
-  return ownStart;
+  if (row)
+    ownStart = row.lstart;
+  return row?.lstart ?? "";
 }
 function ownerAlive(rec, table) {
   const row = table.find((r) => r.pid === rec.ownerPid);
@@ -65143,6 +65322,10 @@ async function killVerified(rec, root) {
 }
 async function sweepRecord(rec, root, out) {
   const table = readProcessTable();
+  if (!processTableTrusted(table)) {
+    out.kept.push(rec.paneId);
+    return;
+  }
   if (ownerAlive(rec, table))
     return;
   const watcher = rec.watcherPid ? table.find((r) => r.pid === rec.watcherPid) : undefined;
@@ -65155,6 +65338,10 @@ async function sweepRecord(rec, root, out) {
   if (anyVerified)
     await killVerified(rec, root);
   const after = readProcessTable();
+  if (!processTableTrusted(after)) {
+    out.kept.push(rec.paneId);
+    return;
+  }
   const stillAlive = t0.group && groupCheck(after, t0.group) || liveEscaped(after, t0.group).length > 0 || t0.mag !== null && isPaneMagmux(t0.mag, rec.paneId, after);
   if (stillAlive) {
     out.kept.push(rec.paneId);
@@ -65187,6 +65374,10 @@ function ownerOfIdAlive(id, table) {
 async function sweepRecordlessSocket(root, name, out) {
   const id = name.slice("magmux-".length, -".sock".length);
   const table = readProcessTable();
+  if (!processTableTrusted(table)) {
+    out.kept.push(id);
+    return;
+  }
   if (ownerOfIdAlive(id, table))
     return;
   const sockPath = join43(root, name);
@@ -65259,7 +65450,7 @@ var init_pane_registry = __esm(() => {
 });
 
 // src/mcp-session/parent-session.ts
-import { readFile as readFile4 } from "fs/promises";
+import { readFile as readFile5 } from "fs/promises";
 import { join as join44 } from "path";
 function positiveInt(value) {
   if (value === undefined || !/^[1-9][0-9]*$/.test(value))
@@ -65288,7 +65479,7 @@ function claudeConfigDir(env) {
 }
 async function readHostSessionRecord(opts) {
   try {
-    const raw = await readFile4(join44(opts.configDir, "sessions", `${opts.hostPid}.json`), "utf-8");
+    const raw = await readFile5(join44(opts.configDir, "sessions", `${opts.hostPid}.json`), "utf-8");
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed !== "object")
       return;
@@ -73817,9 +74008,10 @@ async function main() {
   const transport = new StdioServerTransport;
   await server.connect(transport);
   installMcpShutdown(sessionManager);
-  ensureSwept(sockRootFor()).catch(() => {
-    return;
-  });
+  if (!nested)
+    ensureSwept(sockRootFor()).catch(() => {
+      return;
+    });
 }
 function installMcpShutdown(sessionManager) {
   const before = async () => {
@@ -74651,6 +74843,16 @@ var init_source = __esm(() => {
 });
 
 // src/tui/providers.ts
+function providerLoginAction(p) {
+  if (p.oauthSlug)
+    return { kind: "claudish", slug: p.oauthSlug };
+  if (p.catalogName === "vertex")
+    return { kind: "gcloud-adc" };
+  return;
+}
+function providerSetLabel(p) {
+  return p.catalogName === "vertex" ? "project" : "key";
+}
 function toProviderDef(def) {
   return {
     name: def.name === "google" ? "gemini" : def.name,
@@ -74695,7 +74897,7 @@ function providerCredentialNote(p) {
     return;
   const origin = peekVertexProjectOrigin();
   if (!origin) {
-    return hasVertexAdcCredentials() ? `ADC present, no project \u2014 ${VERTEX_SET_PROJECT_REMEDY}` : `No credential \u2014 run \`gcloud auth application-default login\`, then ${VERTEX_SET_PROJECT_REMEDY}`;
+    return hasVertexAdcCredentials() ? `ADC present, no project \u2014 ${VERTEX_SET_PROJECT_REMEDY}` : `No credential \u2014 run \`gcloud auth application-default login\` (press l), then ${VERTEX_SET_PROJECT_REMEDY}`;
   }
   return `Project ${origin.projectId} from ${describeVertexProjectSource(origin)}`;
 }
@@ -75177,11 +75379,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>";
@@ -76679,6 +76879,32 @@ var init_constants3 = __esm(() => {
 
 // src/tui/components/Footer.tsx
 import { jsx as jsx14, jsxs as jsxs10 } from "@opentui/react/jsx-runtime";
+function providerFooterKeys(providerCaps) {
+  const showKey = providerCaps ? providerCaps.apiKey : true;
+  const showEndpoint = providerCaps ? providerCaps.endpoint || providerCaps.local : true;
+  const showLogin = providerCaps ? providerCaps.oauth : true;
+  const showRemove = providerCaps ? !providerCaps.local && (providerCaps.apiKey || providerCaps.endpoint) : true;
+  const showUrl = providerCaps ? providerCaps.endpoint : true;
+  const keys = [[C.blue, "\u2191\u2193", "navigate"]];
+  if (showKey)
+    keys.push([C.green, "s", providerCaps?.setLabel === "project" ? "set project" : "set key"]);
+  if (showEndpoint)
+    keys.push([
+      C.green,
+      "e",
+      providerCaps?.local ? providerCaps.localEnabled ? "disable" : "enable" : "endpoint"
+    ]);
+  if (showUrl)
+    keys.push([C.green, "u", "url"]);
+  if (showLogin)
+    keys.push([C.green, "l", "login"]);
+  keys.push([C.cyan, "t", "test"]);
+  keys.push([C.cyan, "T", "test all"]);
+  if (showRemove)
+    keys.push([C.red, "x", "remove"]);
+  keys.push([C.dim, "q", "quit"]);
+  return keys;
+}
 function Footer({ activeTab, mode, probeMode, providerCaps }) {
   const isProfileEditMode = mode === "new_profile" || mode === "pick_profile_scope" || mode === "pick_provider_prefix" || mode === "edit_profile_opus" || mode === "edit_profile_sonnet" || mode === "edit_profile_haiku" || mode === "edit_profile_subagent";
   let keys;
@@ -76700,29 +76926,7 @@ function Footer({ activeTab, mode, probeMode, providerCaps }) {
       [C.dim, "q", "quit"]
     ];
   } else if (activeTab === "providers") {
-    const showKey = providerCaps ? providerCaps.apiKey : true;
-    const showEndpoint = providerCaps ? providerCaps.endpoint || providerCaps.local : true;
-    const showLogin = providerCaps ? providerCaps.oauth : true;
-    const showRemove = providerCaps ? !providerCaps.local && (providerCaps.apiKey || providerCaps.endpoint) : true;
-    const showUrl = providerCaps ? providerCaps.endpoint : true;
-    keys = [[C.blue, "\u2191\u2193", "navigate"]];
-    if (showKey)
-      keys.push([C.green, "s", "set key"]);
-    if (showEndpoint)
-      keys.push([
-        C.green,
-        "e",
-        providerCaps?.local ? providerCaps.localEnabled ? "disable" : "enable" : "endpoint"
-      ]);
-    if (showUrl)
-      keys.push([C.green, "u", "url"]);
-    if (showLogin)
-      keys.push([C.green, "l", "login"]);
-    keys.push([C.cyan, "t", "test"]);
-    keys.push([C.cyan, "T", "test all"]);
-    if (showRemove)
-      keys.push([C.red, "x", "remove"]);
-    keys.push([C.dim, "q", "quit"]);
+    keys = providerFooterKeys(providerCaps);
   } else if (activeTab === "profiles" && isProfileEditMode) {
     keys = [[C.dim, "wizard", "follow the panel above"]];
   } else if (activeTab === "profiles") {
@@ -78850,6 +79054,9 @@ function wrapToLines(text, maxWidth, maxLines) {
   }
   return lines;
 }
+function credentialNoteLines(note, width, hasFailure) {
+  return wrapToLines(note, width - 4 - "Auth:  ".length, hasFailure ? 1 : 2);
+}
 function resolveProviderDetailKeyDisplay(input) {
   if (input.isLocal)
     return input.isReady ? "enabled" : "disabled";
@@ -78861,6 +79068,11 @@ function resolveProviderDetailKeyDisplay(input) {
     return input.cfgKeyMask;
   return "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500";
 }
+function validTestNote(input) {
+  if (input.isLocal)
+    return "  Local provider responded through the shared probe path.";
+  return input.credential === "login" ? "  Login is valid and endpoint is reachable." : "  API key is valid and endpoint is reachable.";
+}
 function ProviderDetail({
   selectedProvider,
   mode,
@@ -78898,7 +79110,7 @@ function ProviderDetail({
       border: true,
       borderStyle: "single",
       borderColor: C.focusBorder,
-      title: mode === "input_key" ? ` Set API Key \u2014 ${selectedProvider.displayName} \u2192 ${keySaveTarget} ` : ` Set Endpoint \u2014 ${selectedProvider.displayName} `,
+      title: mode === "input_key" ? ` Set ${providerSetLabel(selectedProvider) === "project" ? "Project" : "API Key"} \u2014 ${selectedProvider.displayName} \u2192 ${keySaveTarget} ` : ` Set Endpoint \u2014 ${selectedProvider.displayName} `,
       backgroundColor: C.bg,
       flexDirection: "column",
       paddingX: 1,
@@ -78960,6 +79172,7 @@ function ProviderDetail({
   }
   const tr = testResults[selectedProvider.name];
   const failureText = tr && (tr.status === "failed" || tr.status === "unavailable") ? tr.providerMessage ?? tr.error : undefined;
+  const noteLines = credentialNote ? credentialNoteLines(credentialNote, width, !!failureText) : [];
   return /* @__PURE__ */ jsxs18("box", {
     height: DETAIL_H,
     border: true,
@@ -79122,19 +79335,19 @@ function ProviderDetail({
           })
         ]
       }),
-      credentialNote && /* @__PURE__ */ jsxs18("text", {
+      noteLines.map((line, i) => /* @__PURE__ */ jsxs18("text", {
         children: [
           /* @__PURE__ */ jsx22("span", {
             fg: C.blue,
             attributes: A.bold,
-            children: "Auth:  "
+            children: i === 0 ? "Auth:  " : "       "
           }),
           /* @__PURE__ */ jsx22("span", {
             fg: hasKey ? C.green : C.yellow,
-            children: credentialNote
+            children: line
           })
         ]
-      }),
+      }, i)),
       selectedProvider.endpointEnvVar && /* @__PURE__ */ jsxs18("text", {
         children: [
           /* @__PURE__ */ jsxs18("span", {
@@ -79151,7 +79364,7 @@ function ProviderDetail({
           })
         ]
       }),
-      !failureText && /* @__PURE__ */ jsxs18("text", {
+      !failureText && noteLines.length < 2 && /* @__PURE__ */ jsxs18("text", {
         children: [
           /* @__PURE__ */ jsxs18("span", {
             fg: C.blue,
@@ -79205,7 +79418,10 @@ function ProviderDetail({
               }),
               /* @__PURE__ */ jsx22("span", {
                 fg: C.fgMuted,
-                children: selectedProvider.isLocal ? "  Local provider responded through the shared probe path." : "  API key is valid and endpoint is reachable."
+                children: validTestNote({
+                  isLocal: !!selectedProvider.isLocal,
+                  credential: isOAuth || selectedProvider.catalogName === "vertex" ? "login" : "key"
+                })
               })
             ]
           }),
@@ -79232,6 +79448,7 @@ function ProviderDetail({
 }
 var init_ProviderDetail = __esm(() => {
   init_constants3();
+  init_providers();
   init_theme2();
 });
 
@@ -81398,6 +81615,9 @@ var init_onepassword_fields = __esm(() => {
 import { useKeyboard as useKeyboard3, useRenderer, useTerminalDimensions as useTerminalDimensions3 } from "@opentui/react";
 import { useCallback as useCallback4, useEffect as useEffect11, useMemo as useMemo5, useRef as useRef8, useState as useState11 } from "react";
 import { jsx as jsx27, jsxs as jsxs23, Fragment as Fragment15 } from "@opentui/react/jsx-runtime";
+function nextStatusAfterProbeReady(current) {
+  return current === "Starting probe proxy\u2026" ? null : current;
+}
 async function resolveOpEntrySecrets(entries, auth) {
   const secrets = {};
   for (const entry of entries) {
@@ -81987,6 +82207,7 @@ function App({ requestLogin } = {}) {
       if (prov.catalogName === "meta-muse-code")
         await prepareMuseLoginForTuiAction();
       const proxyUrl = await ensureProbeProxy();
+      setStatusMsg(nextStatusAfterProbeReady);
       const catalogModel = getProbeModel(prov.catalogName);
       const tried = new Set;
       const MAX_ATTEMPTS = 3;
@@ -82699,15 +82920,17 @@ function App({ requestLogin } = {}) {
         }
         setStatusMsg(failureMsg ?? (changed ? removedFrom.length > 0 ? `Removed ${selectedProvider.displayName} key from ${removedFrom.join(" + ")}.` : `Stored config removed for ${selectedProvider.displayName}.` : "No stored config to remove."));
       } else if (key.name === "l") {
-        const slug = selectedProvider.oauthSlug;
-        if (!slug) {
-          setStatusMsg(`${selectedProvider.displayName} doesn't support OAuth login. Press s to set an API key.`);
+        const action = providerLoginAction(selectedProvider);
+        const setLabel = providerSetLabel(selectedProvider) === "project" ? "a project" : "an API key";
+        const command = action?.kind === "gcloud-adc" ? "gcloud auth application-default login" : action ? `claudish login ${action.slug}` : "";
+        if (!action) {
+          setStatusMsg(`${selectedProvider.displayName} doesn't support OAuth login. Press s to set ${setLabel}.`);
         } else if (!requestLogin) {
-          setStatusMsg(`Run: claudish login ${slug}`);
+          setStatusMsg(`Run: ${command}`);
         } else {
-          setStatusMsg(`Launching: claudish login ${slug}\u2026`);
+          setStatusMsg(`Launching: ${command}\u2026`);
           setTimeout(() => {
-            requestLogin(slug);
+            requestLogin(action);
             renderer.destroy();
           }, 50);
         }
@@ -82728,17 +82951,18 @@ function App({ requestLogin } = {}) {
         }
       } else if (key.name === "t") {
         const caps = providerAuthCapabilities(selectedProvider, config);
+        const setLabel = providerSetLabel(selectedProvider);
         const localRunning = selectedProviderIsLocal && localLiveness[selectedProvider.catalogName] === "running";
         const ready = providerIsReady(selectedProvider, config) || localRunning;
         if (!ready) {
           if (selectedProviderIsLocal) {
             setStatusMsg(`${selectedProvider.displayName}: not running / disabled. Start the server, or press e to enable.`);
           } else if (caps.apiKey.supported && caps.oauth.supported) {
-            setStatusMsg(`${selectedProvider.displayName}: no credentials. Press s to set a key or l to login.`);
+            setStatusMsg(`${selectedProvider.displayName}: no credentials. Press s to set a ${setLabel} or l to login.`);
           } else if (caps.oauth.supported) {
             setStatusMsg(`${selectedProvider.displayName}: no credentials. Press l to login.`);
           } else if (caps.apiKey.supported) {
-            setStatusMsg(`${selectedProvider.displayName}: no key set. Press s to set an API key.`);
+            setStatusMsg(`${selectedProvider.displayName}: no ${setLabel} set. Press s to set ${setLabel === "project" ? "a project" : "an API key"}.`);
           } else {
             setStatusMsg(`${selectedProvider.displayName} doesn't support auth from the TUI.`);
           }
@@ -83167,7 +83391,8 @@ function App({ requestLogin } = {}) {
         probeMode,
         providerCaps: activeTab === "providers" && selectedProvider ? {
           apiKey: !!selectedProvider.apiKeyEnvVar,
-          oauth: !!selectedProvider.oauthSlug,
+          oauth: Boolean(providerLoginAction(selectedProvider)),
+          setLabel: providerSetLabel(selectedProvider),
           endpoint: !!selectedProvider.endpointEnvVar,
           local: selectedProviderIsLocal,
           localEnabled: selectedLocalEnabled
@@ -83241,21 +83466,25 @@ var init_App = __esm(() => {
 // src/tui/index.tsx
 var exports_tui = {};
 __export(exports_tui, {
+  gcloudCommand: () => gcloudCommand,
   startConfigTui: () => startConfigTui
 });
 import { spawnSync as spawnSync3 } from "child_process";
 import { createCliRenderer as createCliRenderer3 } from "@opentui/core";
 import { createRoot as createRoot3 } from "@opentui/react";
 import { jsx as jsx28 } from "@opentui/react/jsx-runtime";
+function gcloudCommand(platform) {
+  return platform === "win32" ? "gcloud.cmd" : "gcloud";
+}
 async function startConfigTui() {
   setCredentialPromptRole(decideTuiRole());
   ensureEndpointsRegistered();
   setStderrQuiet(true);
   const loginRequest = {
-    slug: null
+    action: null
   };
-  const requestLogin = (slug) => {
-    loginRequest.slug = slug;
+  const requestLogin = (action) => {
+    loginRequest.action = action;
   };
   const renderer = await createCliRenderer3({
     exitOnCtrlC: false
@@ -83269,23 +83498,37 @@ async function startConfigTui() {
   });
   await shutdownProbeProxy();
   setStderrQuiet(false);
-  if (loginRequest.slug !== null) {
-    const slug = loginRequest.slug;
+  if (loginRequest.action !== null) {
+    const action = loginRequest.action;
+    const command = action.kind === "gcloud-adc" ? "gcloud auth application-default login" : `claudish login ${action.slug}`;
     console.log(`
-Launching: claudish login ${slug}
+Launching: ${command}
 `);
-    const result = spawnSync3(process.argv[0], [process.argv[1], "login", slug], {
-      stdio: "inherit"
-    });
+    const result = action.kind === "gcloud-adc" ? spawnSync3(gcloudCommand(process.platform), ["auth", "application-default", "login"], {
+      stdio: "inherit",
+      shell: process.platform === "win32"
+    }) : spawnSync3(process.argv[0], [process.argv[1], "login", action.slug], { stdio: "inherit" });
     if (result.error) {
-      console.error(`
+      if (action.kind === "gcloud-adc" && result.error.code === "ENOENT") {
+        console.error(`
+gcloud not found \u2014 install the Google Cloud CLI (https://cloud.google.com/sdk/docs/install)
+`);
+      } else {
+        console.error(`
 \u274C Failed to spawn login: ${result.error.message}
 `);
+      }
     } else if (result.status !== 0) {
       console.error(`
 \u274C Login exited with status ${result.status}
 `);
+    } else if (action.kind === "gcloud-adc") {
+      resetVertexProjectDiscovery();
+      credentials.invalidate("vertex");
+      _clearVertexDiscoveryCache();
+      invalidateProbeProxyHandlers("vertex");
     } else {
+      const slug = action.slug;
       if (slug === "antigravity") {
         _resetAntigravityTokenState();
         invalidateProbeProxyHandlers("antigravity");
@@ -83315,10 +83558,12 @@ var init_tui = __esm(() => {
   init_authority();
   init_prompt_role();
   init_kimi_oauth();
+  init_vertex_auth();
   init_logger();
-  init_renderer_theme();
   init_endpoint_registration();
   init_muse_credentials();
+  init_vertex_discovery();
+  init_renderer_theme();
   init_App();
   if (isDirectRun) {
     startConfigTui().catch((err) => {
@@ -83818,6 +84063,13 @@ function shouldHideIncidentalAnthropicKey(config, env = process.env) {
     return false;
   return !wantsAnthropicApiBilling(config, env);
 }
+function applyProxyPlaceholderAuth(env, paneChild = isPaneChild()) {
+  env.ANTHROPIC_AUTH_TOKEN = CLAUDISH_PLACEHOLDER_AUTH_TOKEN;
+  if (paneChild)
+    delete env.ANTHROPIC_API_KEY;
+  else
+    env.ANTHROPIC_API_KEY = CLAUDISH_PLACEHOLDER_API_KEY;
+}
 function scrubInheritedClaudishPlaceholders(env) {
   const removed = [];
   for (const name of ["ANTHROPIC_AUTH_TOKEN", "ANTHROPIC_API_KEY"]) {
@@ -84461,8 +84713,7 @@ async function runClaudeWithProxy(config, proxyUrl, onCleanup) {
       if (classifierPassthroughEnabled(config)) {
         console.error("[claudish] classifier passthrough enabled but no Anthropic credentials detected \u2014 " + "classifier requests will fail to authenticate against api.anthropic.com. " + "Map a role to a native Claude model (e.g. --model-sonnet claude-sonnet-5) or set ANTHROPIC_API_KEY.");
       }
-      env.ANTHROPIC_API_KEY = CLAUDISH_PLACEHOLDER_API_KEY;
-      env.ANTHROPIC_AUTH_TOKEN = CLAUDISH_PLACEHOLDER_AUTH_TOKEN;
+      applyProxyPlaceholderAuth(env);
       const realWindow = await computeMainThreadContextWindow(config);
       const contextEnv = resolveContextWindowEnv(realWindow, process.env);
       Object.assign(env, contextEnv.vars);

package/package.json

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