claudish 7.45.0 → 7.46.0

package/dist/index.js

@@ -729,7 +729,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.45.0";
+var VERSION = "7.46.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -1219,11 +1219,6 @@ function writeJsonlCapped(payload) {
 `);
   }
 }
-function printSlowLine(payload) {
-  const top = [...payload.spans].sort((a, b) => b.durMs - a.durMs).slice(0, 3).map((s) => `${s.name} ${fmtDur(s.durMs)}${fmtWaitExec(s.meta)}`);
-  const detail = top.length > 0 ? ` \u2014 ${top.join(", ")}` : "";
-  seams.stderr(`[claudish] slow start ${fmtDur(payload.totalMs)}${detail} \u2026 full data: ` + `${displayPath(seams.outPath)} (CLAUDISH_STARTUP_TRACE=1 for live detail)`);
-}
 function printTable(payload) {
   seams.stderr(`[claudish] startup trace (${payload.argvKind}) \u2014 total ${fmtDur(payload.totalMs)}` + ` \xB7 auth ${payload.authKind} \xB7 v${payload.version}`);
   seams.stderr("  start        dur  span");
@@ -1234,7 +1229,7 @@ function printTable(payload) {
   }
   seams.stderr(`  metrics: ${displayPath(seams.outPath)}`);
 }
-function finalizeStartupTrace(context, opts = {}) {
+function finalizeStartupTrace(context, _opts = {}) {
   try {
     if (finalized)
       return;
@@ -1254,8 +1249,6 @@ function finalizeStartupTrace(context, opts = {}) {
     try {
       if (terminalSuppressed) {} else if (traceModeOn()) {
         printTable(payload);
-      } else if (totalMs > seams.slowThresholdMs && !opts.quiet) {
-        printSlowLine(payload);
       }
     } catch {}
   } catch {}
@@ -1345,6 +1338,20 @@ function isAbandoned(path) {
     return true;
   return Date.now() - holder.at > timing.staleMs;
 }
+function peerHoldsHandshakeLock() {
+  if (lastHandshake?.heldByUs)
+    return false;
+  const holder = readHolder(currentLockPath());
+  if (!holder || holder.pid === process.pid)
+    return false;
+  if (!holderAlive(holder.pid))
+    return false;
+  if (Date.now() - holder.at > timing.staleMs)
+    return false;
+  if (lastHandshake && holder.at > lastHandshake.startedAt)
+    return false;
+  return true;
+}
 async function acquire(path) {
   const deadline = Date.now() + timing.timeoutMs;
   let madeDir = false;
@@ -1385,6 +1392,7 @@ function release(path) {
 async function withHandshakeLock(handshake) {
   if (process.env.CLAUDISH_NO_OP_HANDSHAKE_LOCK === "1") {
     trace("bypassed (CLAUDISH_NO_OP_HANDSHAKE_LOCK=1)");
+    lastHandshake = { heldByUs: false, startedAt: Date.now() };
     return handshake();
   }
   const path = currentLockPath();
@@ -1396,6 +1404,7 @@ async function withHandshakeLock(handshake) {
     held = false;
   }
   trace(`${held ? "acquired" : "NOT held (timeout or unwritable)"} after ${Date.now() - t0}ms`);
+  lastHandshake = { heldByUs: held, startedAt: t0 };
   try {
     return await handshake();
   } finally {
@@ -1404,7 +1413,7 @@ async function withHandshakeLock(handshake) {
     trace(`handshake done after ${Date.now() - t0}ms${held ? ", released" : ""}`);
   }
 }
-var DEFAULT_STALE_MS = 120000, DEFAULT_TIMEOUT_MS = 45000, DEFAULT_POLL_MS = 60, timing, lockPath, sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+var DEFAULT_STALE_MS = 120000, DEFAULT_TIMEOUT_MS = 45000, DEFAULT_POLL_MS = 60, timing, lockPath, sleep = (ms) => new Promise((r) => setTimeout(r, ms)), lastHandshake;
 var init_onepassword_handshake_lock = __esm(() => {
   timing = {
     staleMs: DEFAULT_STALE_MS,
@@ -3897,6 +3906,7 @@ __export(exports_onepassword, {
   wasOpAuthorizationDenied: () => wasOpAuthorizationDenied,
   valueTail: () => valueTail,
   setScreenLockProbe: () => setScreenLockProbe,
+  setPeerLockProbe: () => setPeerLockProbe,
   setLockRetryTiming: () => setLockRetryTiming,
   setAppLockProbe: () => setAppLockProbe,
   resolveSecretsPartial: () => resolveSecretsPartial,
@@ -3920,11 +3930,13 @@ __export(exports_onepassword, {
   listItems: () => listItems,
   isTransientSdkError: () => isTransientSdkError,
   isScreenLocked: () => isScreenLocked,
+  isPeerHoldingPrompt: () => isPeerHoldingPrompt,
   isOpReference: () => isOpReference,
   isOpHydratedVar: () => isOpHydratedVar,
   isLockedDenial: () => isLockedDenial,
   isGlobImport: () => isGlobImport,
   isAppLocked: () => isAppLocked,
+  humanizeOpError: () => humanizeOpError,
   globToRegExp: () => globToRegExp,
   getOpFailures: () => getOpFailures,
   filterGlobFields: () => filterGlobFields,
@@ -3938,6 +3950,7 @@ __export(exports_onepassword, {
   defaultAppLockProbe: () => defaultAppLockProbe,
   currentLockCause: () => currentLockCause,
   collectConfigImports: () => collectConfigImports,
+  clearOpSkip: () => clearOpSkip,
   classifyLockedDenial: () => classifyLockedDenial,
   buildAuthError: () => buildAuthError,
   appLockedFromSettings: () => appLockedFromSettings,
@@ -3971,6 +3984,21 @@ function resetOpFailures() {
 function wasOpAuthorizationDenied() {
   return opSourceFailures.some((f) => /denied authorization/i.test(f.message));
 }
+function humanizeOpError(err) {
+  const raw = (err instanceof Error ? err.message : String(err)).trim();
+  if (/denied authorization/i.test(raw)) {
+    const cause = currentLockCause();
+    if (cause === "screen")
+      return "your Mac is locked, so the approval prompt couldn't be shown";
+    if (cause === "app")
+      return "the 1Password app is locked, so it declined without prompting";
+    if (cause === "peer")
+      return "another claudish process is holding the 1Password prompt";
+    return "the 1Password approval prompt was dismissed (or never answered)";
+  }
+  const unwrapped = raw.match(/Error\s*\{\s*msg:\s*(.*?)(?:,\s*inner:|\s*\})/s);
+  return (unwrapped?.[1] ?? raw).trim();
+}
 function renderOpFailureNotice(envVar) {
   return renderOpFailureBlock(`for ${envVar} this run`);
 }
@@ -3997,6 +4025,12 @@ function renderOpFailureBlock(subject) {
       lines.push("");
       lines.push("  Fix: unlock 1Password (Touch ID is enough) and re-run.");
       lines.push("  To stop it re-locking mid-session, raise Settings \u2192 Security \u2192 auto-lock.");
+    } else if (cause === "peer") {
+      lines.push("  Another claudish process is at the 1Password prompt right now. 1Password");
+      lines.push("  authorizes ONE client at a time and denies every peer instantly, so this");
+      lines.push("  run lost a race rather than being refused.");
+      lines.push("");
+      lines.push("  Fix: approve the prompt in the other window, then re-run this one.");
     } else {
       lines.push("  The 1Password desktop app declined to release secrets. The approval prompt");
       lines.push("  was most likely dismissed.");
@@ -4373,11 +4407,19 @@ function setAppLockProbe(probe) {
 function isAppLocked() {
   return appLockProbe();
 }
+function setPeerLockProbe(probe) {
+  peerLockProbe = probe ?? peerHoldsHandshakeLock;
+}
+function isPeerHoldingPrompt() {
+  return peerLockProbe();
+}
 function currentLockCause() {
   if (isScreenLocked())
     return "screen";
   if (isAppLocked())
     return "app";
+  if (isPeerHoldingPrompt())
+    return "peer";
   return null;
 }
 function classifyLockedDenial(err, env = process.env) {
@@ -4395,23 +4437,28 @@ async function countdownForUnlock(round, rounds, cause) {
   const ttyOut = process.stderr.isTTY === true;
   const ttyIn = process.stdin.isTTY === true;
   let cancelled = false;
+  let skipped = false;
   if (round === 1) {
     const explain = cause === "screen" ? `${bold("\uD83D\uDD10 1Password needs your OK \u2014 but your Mac is locked, so it can't ask.")}
-   Unlock your Mac and approve the popup. Claudish picks it up from there.` : `${bold("\uD83D\uDD10 1Password is locked, so it turned claudish away without asking you.")}
+   Unlock your Mac and approve the popup. Claudish picks it up from there.` : cause === "app" ? `${bold("\uD83D\uDD10 1Password is locked, so it turned claudish away without asking you.")}
    Unlock 1Password (Touch ID is enough). Claudish retries on its own \u2014
-   no popup will appear until it's unlocked.`;
+   no popup will appear until it's unlocked.` : `${bold("\uD83D\uDD10 Another claudish is already at the 1Password prompt.")}
+   1Password only lets one through at a time, so this run has to queue.
+   Approve it in the other window (or wait \u2014 it usually takes a second).`;
     process.stderr.write(`
 ${explain}
 
 `);
   }
-  const stillLocked = () => cause === "screen" ? isScreenLocked() : isAppLocked();
+  const stillLocked = () => cause === "screen" ? isScreenLocked() : cause === "app" ? isAppLocked() : isPeerHoldingPrompt();
   let restoreInput = () => {};
   if (ttyIn) {
     const onKey = (buf) => {
       const k = buf.toString();
       if (k === "\x1B" || k === "q" || k === "\x03")
         cancelled = true;
+      if (k === "s" || k === "S")
+        skipped = true;
     };
     const wasRaw = process.stdin.isRaw === true;
     try {
@@ -4427,14 +4474,20 @@ ${explain}
       restoreInput = () => {};
     }
   }
-  const stop = ttyIn ? "Esc to stop waiting" : "Ctrl-C to stop waiting";
-  const line = (secs) => dim(`   waiting ${secs}s \xB7 try ${round} of ${rounds} \xB7 ${stop}`);
+  const stop = ttyIn ? "Esc stop waiting" : "Ctrl-C stop waiting";
+  const skip = ttyIn ? " \xB7 s skip 1Password" : "";
+  const bar = (secs) => {
+    const total = Math.max(1, lockRetrySeconds);
+    const filled = Math.round((total - secs) / total * 10);
+    return `${"\u2501".repeat(filled)}${"\u2500".repeat(Math.max(0, 10 - filled))}`;
+  };
+  const line = (secs) => dim(`   ${bar(secs)} ${secs}s \xB7 try ${round}/${rounds} \xB7 ${stop}${skip}`);
   if (!ttyOut)
     process.stderr.write(`${line(lockRetrySeconds)}
 `);
   try {
     for (let remaining = lockRetrySeconds;remaining > 0; remaining--) {
-      if (cancelled)
+      if (cancelled || skipped)
         break;
       if (!stillLocked())
         break;
@@ -4447,6 +4500,12 @@ ${explain}
     if (ttyOut)
       process.stderr.write("\r\x1B[2K");
   }
+  if (skipped) {
+    process.stderr.write(`   Skipping 1Password for this run. Keys already in your environment still work;
+` + `   anything only 1Password has will report as missing.
+`);
+    return "skip";
+  }
   if (cancelled) {
     process.stderr.write(`   OK, not waiting. You can unlock and re-run any time.
 `);
@@ -4454,6 +4513,17 @@ ${explain}
   }
   return "retry";
 }
+function latchOpSkip() {
+  opSkipLatchedByPrompt = true;
+  process.env.CLAUDISH_DISABLE_OP = "1";
+}
+function clearOpSkip() {
+  if (!opSkipLatchedByPrompt)
+    return false;
+  opSkipLatchedByPrompt = false;
+  delete process.env.CLAUDISH_DISABLE_OP;
+  return true;
+}
 async function withSdkRetry(op, label = "op:sdk-op") {
   for (let round = 1;; round++) {
     try {
@@ -4462,7 +4532,12 @@ async function withSdkRetry(op, label = "op:sdk-op") {
       const cause = classifyLockedDenial(err);
       if (round > LOCK_RETRY_ROUNDS || cause === null)
         throw err;
-      if (await countdownForUnlock(round, LOCK_RETRY_ROUNDS, cause) === "cancel")
+      const choice = await countdownForUnlock(round, LOCK_RETRY_ROUNDS, cause);
+      if (choice === "skip") {
+        latchOpSkip();
+        throw err;
+      }
+      if (choice === "cancel")
         throw err;
       resetSdkClientCache();
     }
@@ -4680,7 +4755,7 @@ var OP_REF_RE, opHydratedVars, opSourceFailures, ENV_VAR_NAME_RE, sdkClientCache
   } catch {
     return false;
   }
-}, screenLockProbe, defaultAppLockProbe = () => false, appLockProbe, OP_PROBE_TIMEOUT_MS = 5000, defaultOpAccountLister = () => {
+}, screenLockProbe, defaultAppLockProbe = () => false, appLockProbe, peerLockProbe, opSkipLatchedByPrompt = false, OP_PROBE_TIMEOUT_MS = 5000, defaultOpAccountLister = () => {
   try {
     const res = spawnSync("op", ["--cache=false", "account", "list", "--format=json"], {
       encoding: "utf-8",
@@ -4723,6 +4798,7 @@ var init_onepassword = __esm(() => {
   lockRetrySeconds = LOCK_RETRY_SECONDS;
   screenLockProbe = defaultScreenLockProbe;
   appLockProbe = defaultAppLockProbe;
+  peerLockProbe = peerHoldsHandshakeLock;
 });
 
 // src/auth/credentials/op-source.ts
@@ -4859,6 +4935,8 @@ function readConfigRaw() {
   }
 }
 function hasOpSources() {
+  if (process.env.CLAUDISH_DISABLE_OP === "1")
+    return false;
   if (sniffed !== undefined)
     return sniffed;
   sniffed = computeHasOpSources();
@@ -5137,7 +5215,8 @@ async function resolveOpKeyForEnvVarsInner(wanted, opts = {}, span) {
     resolveSecrets: resolveSecrets2,
     recordOpHydratedVars: recordOpHydratedVars2,
     recordOpFailure: recordOpFailure2,
-    withSdkRetry: withSdkRetry2
+    withSdkRetry: withSdkRetry2,
+    humanizeOpError: humanizeOpError2
   } = await Promise.resolve().then(() => (init_onepassword(), exports_onepassword));
   const cfg = readConfigRaw();
   const out = {};
@@ -5198,7 +5277,7 @@ async function resolveOpKeyForEnvVarsInner(wanted, opts = {}, span) {
         }
       } catch (globErr) {
         const m = globErr instanceof Error ? globErr.message : String(globErr);
-        warnOnce(`[claudish] 1Password import skipped: ${m}`);
+        warnOnce(`[claudish] 1Password import skipped: ${humanizeOpError2(globErr)}`);
         recordOpFailure2({ kind: "import", source: globPath, message: m });
       }
     }
@@ -5239,7 +5318,7 @@ async function resolveOpKeyForEnvVarsInner(wanted, opts = {}, span) {
           }
         } catch (envErr) {
           const m = envErr instanceof Error ? envErr.message : String(envErr);
-          warnOnce(`[claudish] 1Password environment skipped: ${m}`);
+          warnOnce(`[claudish] 1Password environment skipped: ${humanizeOpError2(envErr)}`);
           recordOpFailure2({ kind: "environment", source: envId, message: m });
         }
       }
@@ -5251,7 +5330,7 @@ async function resolveOpKeyForEnvVarsInner(wanted, opts = {}, span) {
       return out;
     }
     const message = err instanceof Error ? err.message : String(err);
-    warnOnce(`[claudish] 1Password secret resolution failed: ${message}`);
+    warnOnce(`[claudish] 1Password secret resolution failed: ${humanizeOpError2(err)}`);
     recordOpFailure2({ kind: "reference", message });
     if (onAuthFailure === "throw")
       throw err;
@@ -28811,7 +28890,9 @@ var init_remote_provider_types = __esm(() => {
     "kimi-coding",
     "glm-coding",
     "qwen-cloud",
-    "devin"
+    "devin",
+    "antigravity",
+    "sakana-subscription"
   ]);
   PROVIDER_ALIAS = {
     google: "gemini",
@@ -29911,23 +29992,33 @@ import { execFileSync } from "child_process";
 import { existsSync as existsSync7 } from "fs";
 import { homedir as homedir9 } from "os";
 import { join as join9 } from "path";
+function invalidateReadStoreMemo() {
+  cachedRawStore = null;
+}
 function defaultReadStore() {
   if (process.platform !== "darwin") {
     logStderr("[Antigravity] Shared token store is macOS-only for now (other keyring backends are a follow-up).");
     return null;
   }
+  const now = Date.now();
+  if (cachedRawStore && now - cachedRawStore.at < READ_STORE_TTL_MS)
+    return cachedRawStore.value;
+  let value = null;
   try {
     const out = execFileSync("security", ["find-generic-password", "-s", KC_SERVICE, "-a", KC_ACCOUNT, "-w"], { encoding: "utf8" });
     const trimmed2 = out.trim();
-    return trimmed2.length > 0 ? trimmed2 : null;
+    value = trimmed2.length > 0 ? trimmed2 : null;
   } catch {
-    return null;
+    value = null;
   }
+  cachedRawStore = { at: now, value };
+  return value;
 }
 function defaultWriteStore(rawValue) {
   if (process.platform !== "darwin") {
     throw new Error("[Antigravity] Cannot write the shared token store on a non-macOS platform.");
   }
+  invalidateReadStoreMemo();
   execFileSync("security", ["add-generic-password", "-U", "-s", KC_SERVICE, "-a", KC_ACCOUNT, "-w", rawValue], { stdio: ["ignore", "ignore", "ignore"] });
 }
 function locateAgyBinary() {
@@ -29942,6 +30033,7 @@ function locateAgyBinary() {
 function defaultDeleteStore() {
   if (process.platform !== "darwin")
     return;
+  invalidateReadStoreMemo();
   try {
     execFileSync("security", ["delete-generic-password", "-s", KC_SERVICE, "-a", KC_ACCOUNT], {
       stdio: ["ignore", "ignore", "ignore"]
@@ -29957,7 +30049,9 @@ function defaultRunAgyRefresh() {
       stdio: ["ignore", "ignore", "ignore"],
       timeout: AGY_REFRESH_TIMEOUT_MS
     });
-  } catch {}
+  } catch {} finally {
+    invalidateReadStoreMemo();
+  }
 }
 function parseRecord(raw) {
   if (!raw)
@@ -30035,8 +30129,9 @@ function getValidAntigravityAccessToken(deps = defaultDeps) {
 function _resetAntigravityTokenState() {
   inFlight = null;
   cachedHasToken = null;
+  invalidateReadStoreMemo();
 }
-var KC_SERVICE = "gemini", KC_ACCOUNT = "antigravity", PREFIX = "go-keyring-base64:", EXPIRY_SKEW_MS = 120000, AGY_REFRESH_TIMEOUT_MS = 40000, 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 = 40000, 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 = {
@@ -64519,8 +64614,11 @@ __export(exports_model_selector, {
   promptForApiKey: () => promptForApiKey,
   pickerProviderToFirebaseSlug: () => pickerProviderToFirebaseSlug,
   isUserDeployedProvider: () => isUserDeployedProvider,
+  isPickableProvider: () => isPickableProvider,
+  getProviderFilterAliases: () => getProviderFilterAliases,
   confirmAction: () => confirmAction,
   compareByReleaseDateDesc: () => compareByReleaseDateDesc,
+  buildProviderChoices: () => buildProviderChoices,
   buildExplicitModelSpec: () => buildExplicitModelSpec,
   buildDiscoveredModelRows: () => buildDiscoveredModelRows
 });
@@ -64679,6 +64777,18 @@ function dedupeModels(models) {
   }
   return deduped;
 }
+function dedupeByProviderSpec(provider, models) {
+  const seen = new Set;
+  const deduped = [];
+  for (const model of models) {
+    const spec = buildExplicitModelSpec(provider, resolveProviderExternalId(provider, model));
+    if (seen.has(spec))
+      continue;
+    seen.add(spec);
+    deduped.push(model);
+  }
+  return deduped;
+}
 function sortModelsNewestFirst(models) {
   return [...models].sort(compareByReleaseDateDesc);
 }
@@ -64729,6 +64839,16 @@ function formatModelChoiceAsSpec(model, spec, priceStr) {
   const dateStr = model.releaseDate ? `, ${model.releaseDate.slice(0, 7)}` : "";
   return `${spec} (${priceStr}, ${ctxStr}${capsStr}${dateStr})`;
 }
+function getProviderFilterAliases() {
+  const aliases = {};
+  for (const def of pickableProvidersInPickerOrder()) {
+    aliases[def.name.toLowerCase()] = def.name;
+    for (const shortcut of def.shortcuts) {
+      aliases[shortcut.toLowerCase()] = def.name;
+    }
+  }
+  return { ...aliases, ...PROVIDER_FILTER_ALIAS_EXTRA };
+}
 function parseProviderFilter(term, providers = []) {
   if (!term.startsWith("@")) {
     return { provider: null, searchTerm: term };
@@ -64744,7 +64864,7 @@ function parseProviderFilter(term, providers = []) {
     prefix = withoutAt.slice(0, spaceIdx);
     rest = withoutAt.slice(spaceIdx + 1).trim();
   }
-  const source = PROVIDER_FILTER_ALIASES[prefix.toLowerCase()];
+  const source = getProviderFilterAliases()[prefix.toLowerCase()];
   if (source) {
     return { provider: source, searchTerm: rest };
   }
@@ -64752,7 +64872,7 @@ function parseProviderFilter(term, providers = []) {
   if (exactMatch) {
     return { provider: exactMatch.slug, searchTerm: rest };
   }
-  const partialMatch = Object.entries(PROVIDER_FILTER_ALIASES).find(([alias]) => alias.startsWith(prefix.toLowerCase()));
+  const partialMatch = Object.entries(getProviderFilterAliases()).find(([alias]) => alias.startsWith(prefix.toLowerCase()));
   if (partialMatch) {
     return { provider: partialMatch[1], searchTerm: rest };
   }
@@ -64766,7 +64886,7 @@ async function fetchPickerModels(providerSlug, searchTerm, defaultModels, catalo
   if (providerSlug) {
     const firebaseSlug = pickerProviderToFirebaseSlug[providerSlug] ?? providerSlug;
     const vendorModels = await catalog.modelsByVendor(firebaseSlug);
-    const infos = sortModelsNewestFirst(dedupeModels(vendorModels.map(catalogModelToModelInfo)));
+    const infos = dedupeByProviderSpec(providerSlug, sortModelsNewestFirst(dedupeModels(vendorModels.map(catalogModelToModelInfo))));
     if (!searchTerm)
       return infos;
     const needle = searchTerm.toLowerCase();
@@ -64784,6 +64904,7 @@ async function selectModel(options = {}) {
   let models;
   let recommendedModels = [];
   let pickerProviders = [];
+  let interactiveProviderChoices = [];
   const remoteQueryCache = new Map;
   if (freeOnly) {
     models = await getFreeModels();
@@ -64798,7 +64919,8 @@ async function selectModel(options = {}) {
     const topModels = top100Result.status === "fulfilled" ? sortModelsNewestFirst(dedupeModels(top100Result.value.models.map(modelDocToModelInfo))) : [];
     recommendedModels = recommendedResult.status === "fulfilled" ? recommendedResult.value : [];
     models = topModels.length > 0 ? topModels : recommendedModels;
-    pickerProviders = toPickerProviders(await getInteractiveProviderChoices());
+    interactiveProviderChoices = await getInteractiveProviderChoices();
+    pickerProviders = toPickerProviders(interactiveProviderChoices);
   }
   const loadRemoteModels = async (providerSlug, searchTerm) => {
     const cacheKey = `${providerSlug || "__all__"}::${searchTerm}`;
@@ -64827,7 +64949,6 @@ async function selectModel(options = {}) {
   const cleanupKeypress = () => process.stdin.removeListener("data", onData);
   try {
     if (!freeOnly && !message && pickerProviders.length > 1) {
-      const interactiveProviderChoices = await getInteractiveProviderChoices();
       const providerChoices = [
         {
           name: "All providers",
@@ -64860,11 +64981,14 @@ async function selectModel(options = {}) {
         const { provider: filterProvider, searchTerm } = parseProviderFilter(normalizedTerm, pickerProviders);
         const effectiveProvider = filterProvider;
         const remoteModels = await loadRemoteModels(effectiveProvider, searchTerm);
-        return remoteModels.slice(0, 100).map((model) => ({
-          name: formatModelChoice(model, true),
-          value: effectiveProvider ? buildExplicitModelSpec(effectiveProvider, model.id) : model.id,
-          description: model.description?.slice(0, 160)
-        }));
+        return remoteModels.slice(0, 100).map((model) => {
+          const spec = effectiveProvider ? buildExplicitModelSpec(effectiveProvider, resolveProviderExternalId(effectiveProvider, model)) : model.id;
+          return {
+            name: effectiveProvider ? formatModelChoiceAsSpec(model, spec, resolveProviderDisplayPrice(effectiveProvider, model)) : formatModelChoice(model, true),
+            value: spec,
+            description: model.description?.slice(0, 160)
+          };
+        });
       }
     }, { signal: ac.signal });
     return selected;
@@ -64878,13 +65002,59 @@ async function selectModel(options = {}) {
     cleanupKeypress();
   }
 }
+function isPickableProvider(def) {
+  return def.shortcuts.length > 0;
+}
+function pickableProvidersInPickerOrder() {
+  const rank = new Map(PICKER_ORDER.map((name, i) => [name, i]));
+  return getAllProviders().filter(isPickableProvider).sort((a, b) => {
+    const ra = rank.get(a.name) ?? Number.MAX_SAFE_INTEGER;
+    const rb = rank.get(b.name) ?? Number.MAX_SAFE_INTEGER;
+    return ra !== rb ? ra - rb : a.displayName.localeCompare(b.displayName);
+  });
+}
+function buildProviderChoices() {
+  const derived = pickableProvidersInPickerOrder().map((def) => {
+    const copy = PICKER_COPY[def.name] ?? {};
+    return {
+      name: copy.name ?? def.displayName,
+      value: def.name,
+      description: copy.description ?? def.description ?? "",
+      provider: def.name
+    };
+  });
+  return [
+    {
+      name: "Skip (keep Claude default)",
+      value: "skip",
+      description: "Use native Claude model for this tier"
+    },
+    ...derived,
+    {
+      name: "Enter custom model",
+      value: "custom",
+      description: "Type a provider@model specification"
+    }
+  ];
+}
 async function getProviderChoices() {
-  const checks4 = await Promise.all(ALL_PROVIDER_CHOICES.map(async (choice) => {
+  const all = buildProviderChoices();
+  const checks4 = await Promise.all(all.map(async (choice) => {
     if (!choice.provider)
       return true;
     return credentials.isAvailable(choice.provider);
   }));
-  return ALL_PROVIDER_CHOICES.filter((_, i) => checks4[i]);
+  return all.filter((_, i) => checks4[i]);
+}
+function pickerModelPrefix(provider) {
+  const override = PROVIDER_MODEL_PREFIX_OVERRIDE[provider];
+  if (override)
+    return override;
+  const def = getProviderByName(provider);
+  if (!def || !isPickableProvider(def))
+    return;
+  const prefix = def.shortestPrefix || def.shortcuts[0];
+  return prefix ? `${prefix}@` : undefined;
 }
 async function getInteractiveProviderChoices() {
   return (await getProviderChoices()).filter((choice) => choice.value !== "skip");
@@ -64897,7 +65067,7 @@ function toPickerProviders(choices) {
   }));
 }
 function buildExplicitModelSpec(provider, modelId) {
-  const prefix = PROVIDER_MODEL_PREFIX[provider];
+  const prefix = pickerModelPrefix(provider);
   if (!prefix) {
     return modelId;
   }
@@ -64916,6 +65086,8 @@ function resolveProviderAggregatorEntry(provider, model) {
   return model.aggregators.find((a) => a.provider.toLowerCase() === firebaseSlug.toLowerCase());
 }
 function resolveProviderDisplayPrice(provider, model) {
+  if (isSubscriptionProvider(provider))
+    return "SUB";
   const entry = resolveProviderAggregatorEntry(provider, model);
   const entryPrice = formatAveragePricing(entry?.pricing);
   if (entryPrice?.average)
@@ -64923,7 +65095,7 @@ function resolveProviderDisplayPrice(provider, model) {
   return model.pricing?.average || "N/A";
 }
 function getPickerDisplayName(providerValue) {
-  const choice = ALL_PROVIDER_CHOICES.find((c) => c.value === providerValue);
+  const choice = buildProviderChoices().find((c) => c.value === providerValue);
   if (choice)
     return choice.name;
   return getDisplayName(providerValue);
@@ -64932,7 +65104,7 @@ async function loadModelsForPickerProvider(providerValue, catalog) {
   const firebaseSlug = pickerProviderToFirebaseSlug[providerValue] ?? providerValue;
   try {
     const vendorModels = await catalog.modelsByVendor(firebaseSlug);
-    return sortModelsNewestFirst(dedupeModels(vendorModels.map(catalogModelToModelInfo)));
+    return dedupeByProviderSpec(providerValue, sortModelsNewestFirst(dedupeModels(vendorModels.map(catalogModelToModelInfo))));
   } catch {
     return [];
   }
@@ -65024,7 +65196,7 @@ async function buildDiscoveredModelRows(provider, displayName, catalog) {
   return sortModelsNewestFirst(rows);
 }
 async function selectModelFromProvider(provider, tierName, recommendedModels, _forceUpdate, catalog) {
-  const prefix = PROVIDER_MODEL_PREFIX[provider] || `${provider}@`;
+  const prefix = pickerModelPrefix(provider) ?? `${provider}@`;
   const displayName = getPickerDisplayName(provider);
   const def = getProviderByName(provider);
   if (def?.modelDiscovery) {
@@ -65189,7 +65361,7 @@ async function selectProfile(profiles) {
 async function confirmAction(message) {
   return dist_default4({ message, default: false });
 }
-var pickerProviderToFirebaseSlug, LOCAL_OR_USER_DEPLOYED, SUBSCRIPTION_PRICING, PROVIDER_FILTER_ALIASES, ALL_PROVIDER_CHOICES, PROVIDER_MODEL_PREFIX;
+var pickerProviderToFirebaseSlug, LOCAL_OR_USER_DEPLOYED, SUBSCRIPTION_PRICING, PROVIDER_FILTER_ALIAS_EXTRA, PICKER_COPY, PICKER_ORDER, PROVIDER_MODEL_PREFIX_OVERRIDE;
 var init_model_selector = __esm(() => {
   init_dist16();
   init_model_catalog();
@@ -65227,160 +65399,73 @@ var init_model_selector = __esm(() => {
     output: "SUB",
     average: "SUB"
   };
-  PROVIDER_FILTER_ALIASES = {
-    openrouter: "openrouter",
-    or: "openrouter",
-    google: "google",
-    gemini: "google",
+  PROVIDER_FILTER_ALIAS_EXTRA = {
     gem: "google",
-    openai: "openai",
-    oai: "openai",
-    codex: "openai-codex",
-    cx: "openai-codex",
-    "x-ai": "x-ai",
-    xai: "x-ai",
-    grok: "x-ai",
-    minimax: "minimax",
-    mm: "minimax",
-    "minimax-coding": "minimax-coding",
-    mmc: "minimax-coding",
-    kimi: "kimi",
-    moon: "kimi",
-    moonshot: "kimi",
-    "kimi-coding": "kimi-coding",
-    kc: "kimi-coding",
-    glm: "glm",
-    "glm-coding": "glm-coding",
-    gc: "glm-coding",
-    "z-ai": "z-ai",
-    zai: "z-ai",
-    zen: "zen",
-    ollamacloud: "ollamacloud",
-    oc: "ollamacloud",
-    litellm: "litellm",
-    ll: "litellm",
-    deepseek: "deepseek",
-    mistralai: "mistralai",
-    mistral: "mistralai",
-    sakana: "sakana",
-    fugu: "sakana",
-    "sakana-subscription": "sakana-subscription",
-    sc: "sakana-subscription",
-    "qwen-cloud": "qwen-cloud",
-    qc: "qwen-cloud"
-  };
-  ALL_PROVIDER_CHOICES = [
-    {
-      name: "Skip (keep Claude default)",
-      value: "skip",
-      description: "Use native Claude model for this tier"
-    },
-    {
-      name: "OpenRouter",
-      value: "openrouter",
-      description: "580+ models via unified API",
-      provider: "openrouter"
-    },
-    {
-      name: "OpenCode Zen",
-      value: "zen",
-      description: "Free models, no API key needed",
-      provider: "opencode-zen"
-    },
-    { name: "Google Gemini", value: "google", description: "Direct API", provider: "google" },
-    { name: "OpenAI", value: "openai", description: "Direct API", provider: "openai" },
-    {
-      name: "OpenAI Codex",
-      value: "openai-codex",
-      description: "ChatGPT Plus/Pro subscription (Responses API)",
-      provider: "openai-codex"
-    },
-    { name: "xAI / Grok", value: "x-ai", description: "Direct API", provider: "x-ai" },
-    { name: "DeepSeek", value: "deepseek", description: "Direct API", provider: "deepseek" },
-    { name: "Mistral", value: "mistralai", description: "Direct API", provider: "mistralai" },
-    { name: "Sakana Fugu", value: "sakana", description: "Direct API", provider: "sakana" },
-    {
-      name: "Sakana Fugu Subscription",
-      value: "sakana-subscription",
-      description: "Subscription plan",
-      provider: "sakana-subscription"
-    },
-    { name: "MiniMax", value: "minimax", description: "Direct API", provider: "minimax" },
-    {
-      name: "MiniMax Coding",
-      value: "minimax-coding",
-      description: "Coding subscription",
-      provider: "minimax-coding"
-    },
-    { name: "Kimi / Moonshot", value: "kimi", description: "Direct API", provider: "kimi" },
-    {
-      name: "Kimi Coding",
-      value: "kimi-coding",
-      description: "Coding subscription",
-      provider: "kimi-coding"
-    },
-    {
-      name: "Qwen Plan",
-      value: "qwen-cloud",
-      description: "Alibaba Model Studio subscription",
-      provider: "qwen-cloud"
-    },
-    { name: "GLM / Zhipu", value: "glm", description: "Direct API", provider: "glm" },
-    {
-      name: "GLM Coding Plan",
-      value: "glm-coding",
-      description: "Coding subscription",
-      provider: "glm-coding"
-    },
-    { name: "Z.AI", value: "z-ai", description: "Direct API", provider: "z-ai" },
-    {
-      name: "OllamaCloud",
-      value: "ollamacloud",
-      description: "Cloud models",
-      provider: "ollamacloud"
-    },
-    { name: "LiteLLM", value: "litellm", description: "Configured proxy", provider: "litellm" },
-    {
-      name: "Ollama (local)",
-      value: "ollama",
-      description: "Local Ollama instance",
-      provider: "ollama"
-    },
-    {
-      name: "LM Studio (local)",
-      value: "lmstudio",
-      description: "Local LM Studio instance",
-      provider: "lmstudio"
-    },
-    {
-      name: "Enter custom model",
-      value: "custom",
-      description: "Type a provider@model specification"
-    }
+    zen: "opencode-zen"
+  };
+  PICKER_COPY = {
+    openrouter: { description: "580+ models via unified API" },
+    "opencode-zen": { name: "OpenCode Zen", description: "Free models, no API key needed" },
+    google: { name: "Google Gemini", description: "Direct API" },
+    openai: { description: "Direct API" },
+    "openai-codex": { description: "ChatGPT Plus/Pro subscription (Responses API)" },
+    "x-ai": { name: "xAI / Grok", description: "Direct API" },
+    deepseek: { description: "Direct API" },
+    mistralai: { name: "Mistral", description: "Direct API" },
+    sakana: { name: "Sakana Fugu", description: "Direct API" },
+    "sakana-subscription": { name: "Sakana Fugu Subscription", description: "Subscription plan" },
+    minimax: { description: "Direct API" },
+    "minimax-coding": { name: "MiniMax Coding", description: "Coding subscription" },
+    kimi: { name: "Kimi / Moonshot", description: "Direct API" },
+    "kimi-coding": { name: "Kimi Coding", description: "Coding subscription" },
+    "qwen-cloud": { name: "Qwen Plan", description: "Alibaba Model Studio subscription" },
+    glm: { name: "GLM / Zhipu", description: "Direct API" },
+    "glm-coding": { name: "GLM Coding Plan", description: "Coding subscription" },
+    "z-ai": { name: "Z.AI", description: "Direct API" },
+    ollamacloud: { name: "OllamaCloud", description: "Cloud models" },
+    litellm: { description: "Configured proxy" },
+    ollama: { name: "Ollama (local)", description: "Local Ollama instance" },
+    lmstudio: { name: "LM Studio (local)", description: "Local LM Studio instance" },
+    vllm: { name: "vLLM (local)", description: "Local vLLM server" },
+    mlx: { name: "MLX (local)", description: "Local MLX server" }
+  };
+  PICKER_ORDER = [
+    "openrouter",
+    "opencode-zen",
+    "opencode-zen-go",
+    "google",
+    "antigravity",
+    "openai",
+    "openai-codex",
+    "devin",
+    "x-ai",
+    "deepseek",
+    "mistralai",
+    "sakana",
+    "sakana-subscription",
+    "minimax",
+    "minimax-coding",
+    "kimi",
+    "kimi-coding",
+    "qwen-cloud",
+    "glm",
+    "glm-coding",
+    "z-ai",
+    "ollamacloud",
+    "poe",
+    "vertex",
+    "litellm",
+    "ollama",
+    "lmstudio",
+    "vllm",
+    "mlx"
   ];
-  PROVIDER_MODEL_PREFIX = {
+  PROVIDER_MODEL_PREFIX_OVERRIDE = {
     google: "google@",
-    antigravity: "ag@",
-    openai: "oai@",
-    "openai-codex": "cx@",
-    "x-ai": "x-ai@",
-    deepseek: "ds@",
-    mistralai: "mistral@",
-    sakana: "sakana@",
-    "sakana-subscription": "sc@",
-    minimax: "mm@",
-    kimi: "kimi@",
-    "minimax-coding": "mmc@",
-    "kimi-coding": "kc@",
-    "qwen-cloud": "qc@",
-    glm: "glm@",
-    "glm-coding": "gc@",
-    "z-ai": "z-ai@",
-    ollamacloud: "oc@",
-    ollama: "ollama@",
+    openrouter: "openrouter@",
     lmstudio: "lmstudio@",
-    zen: "zen@",
-    openrouter: "openrouter@"
+    sakana: "sakana@",
+    zen: "zen@"
   };
 });
 
@@ -75521,6 +75606,7 @@ function App({ requestLogin } = {}) {
     setOpFieldCursor(idx < 0 ? 0 : idx);
   }, [opFieldOptionsFiltered, opFieldCursor, mode]);
   const acquireOpAuth = useCallback3(async () => {
+    clearOpSkip();
     const auth = await resolveSdkAuth({
       interactive: true,
       configAccount: readOnepasswordAccount(),
@@ -77636,7 +77722,10 @@ async function runClaudeWithProxy(config3, proxyUrl, onCleanup) {
         setSessionContextWindow2(realWindow);
       } catch {}
       if (contextEnv.notice && !config3.quiet) {
-        console.error(contextEnv.notice);
+        if (config3.interactive)
+          console.log(contextEnv.notice);
+        else
+          console.error(contextEnv.notice);
       }
     }
   }

package/package.json

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