claudish 8.1.0 → 9.0.0

package/dist/index.js

@@ -731,7 +731,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "8.1.0";
+var VERSION = "9.0.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -28305,17 +28305,24 @@ var init_runtime_providers = __esm(() => {
 });
 
 // src/handlers/shared/remote-provider-types.ts
+function registerSubscriptionCredentialProbe(fn) {
+  const previous = _subscriptionCredentialProbe;
+  _subscriptionCredentialProbe = fn;
+  return previous;
+}
 function isSubscriptionProvider(provider) {
-  return SUBSCRIPTION_PROVIDERS.has(provider.toLowerCase());
+  const p = provider.toLowerCase();
+  if (SUBSCRIPTION_PROVIDERS.has(p))
+    return true;
+  if (!CREDENTIAL_DECIDED_PROVIDERS.has(p))
+    return false;
+  return _subscriptionCredentialProbe?.(p) === true;
 }
 function registerDynamicPricingLookup(fn) {
   _dynamicLookup = fn;
 }
 function getModelPricing(provider, modelName) {
   const p = provider.toLowerCase();
-  if (FREE_PROVIDERS.has(p)) {
-    return { inputCostPer1M: 0, outputCostPer1M: 0, isFree: true };
-  }
   if (isSubscriptionProvider(p)) {
     return { inputCostPer1M: 0, outputCostPer1M: 0, isSubscription: true };
   }
@@ -28327,7 +28334,7 @@ function getModelPricing(provider, modelName) {
   const canonical = PROVIDER_ALIAS[p] || p;
   return PROVIDER_DEFAULTS[canonical] || { inputCostPer1M: 1, outputCostPer1M: 4, isEstimate: true };
 }
-var PROVIDER_DEFAULTS, FREE_PROVIDERS, SUBSCRIPTION_PROVIDERS, PROVIDER_ALIAS, _dynamicLookup = null;
+var PROVIDER_DEFAULTS, SUBSCRIPTION_PROVIDERS, CREDENTIAL_DECIDED_PROVIDERS, _subscriptionCredentialProbe = null, PROVIDER_ALIAS, _dynamicLookup = null;
 var init_remote_provider_types = __esm(() => {
   PROVIDER_DEFAULTS = {
     gemini: { inputCostPer1M: 0.5, outputCostPer1M: 2, isEstimate: true },
@@ -28337,7 +28344,6 @@ var init_remote_provider_types = __esm(() => {
     glm: { inputCostPer1M: 0.16, outputCostPer1M: 0.8, isEstimate: true },
     ollamacloud: { inputCostPer1M: 1, outputCostPer1M: 4, isEstimate: true }
   };
-  FREE_PROVIDERS = new Set(["opencode-zen", "zen"]);
   SUBSCRIPTION_PROVIDERS = new Set([
     "minimax-coding",
     "kimi-coding",
@@ -28346,8 +28352,10 @@ var init_remote_provider_types = __esm(() => {
     "devin",
     "antigravity",
     "sakana-subscription",
-    "grok-subscription"
+    "grok-subscription",
+    "opencode-zen-go"
   ]);
+  CREDENTIAL_DECIDED_PROVIDERS = new Set(["openai-codex"]);
   PROVIDER_ALIAS = {
     google: "gemini",
     oai: "openai",
@@ -36548,7 +36556,7 @@ class ApiKeyCredentialProvider {
     } else {
       headers = { ...this.staticHeaders };
     }
-    return { headers };
+    return { arm: "api-key", headers };
   }
 }
 var init_api_key_credential = __esm(() => {
@@ -36927,6 +36935,34 @@ var init_codex_oauth = __esm(() => {
   };
 });
 
+// src/auth/credentials/billing-probe.ts
+function recordSignedArm(provider, arm) {
+  signedArm.set(provider.toLowerCase(), arm);
+}
+function clearSignedArm(provider) {
+  if (provider)
+    signedArm.delete(provider.toLowerCase());
+  else
+    signedArm.clear();
+}
+function installBillingProbes() {
+  return registerSubscriptionCredentialProbe((p) => {
+    const recorded = signedArm.get(p);
+    if (recorded)
+      return recorded === "subscription";
+    return PROBES[p]?.() === true;
+  });
+}
+var signedArm, PROBES;
+var init_billing_probe = __esm(() => {
+  init_remote_provider_types();
+  init_codex_oauth();
+  signedArm = new Map;
+  PROBES = {
+    "openai-codex": () => CodexOAuth.getInstance().hasCredentials()
+  };
+});
+
 // src/auth/credentials/composite-credential.ts
 class CompositeCredentialProvider {
   catalogName;
@@ -36994,6 +37030,7 @@ class CodexOAuthHalf {
     const token = await this.oauth.getAccessToken();
     const accountId = this.oauth.getAccountId();
     return {
+      arm: "oauth",
       headers: buildOAuthHeaders(token, accountId),
       endpoint: CODEX_RESPONSES_ENDPOINT,
       transformPayload: (p) => ({
@@ -37483,6 +37520,17 @@ var init_kimi_oauth = __esm(() => {
 import { existsSync as existsSync15, readFileSync as readFileSync14 } from "fs";
 import { homedir as homedir22 } from "os";
 import { join as join22 } from "path";
+function credentialSatisfies(descriptor, data) {
+  if (!data?.access_token)
+    return false;
+  if (data.refresh_token)
+    return true;
+  if (descriptor.expiresAtField && data[descriptor.expiresAtField]) {
+    const buffer = descriptor.expiryBufferMs ?? 0;
+    return data[descriptor.expiresAtField] > Date.now() + buffer;
+  }
+  return true;
+}
 function hasValidOAuthCredentials(descriptor) {
   const credPath = join22(homedir22(), ".claudish", descriptor.credentialFile);
   if (!existsSync15(credPath))
@@ -37491,16 +37539,7 @@ function hasValidOAuthCredentials(descriptor) {
     return true;
   }
   try {
-    const data = JSON.parse(readFileSync14(credPath, "utf-8"));
-    if (!data.access_token)
-      return false;
-    if (data.refresh_token)
-      return true;
-    if (descriptor.expiresAtField && data[descriptor.expiresAtField]) {
-      const buffer = descriptor.expiryBufferMs ?? 0;
-      return data[descriptor.expiresAtField] > Date.now() + buffer;
-    }
-    return true;
+    return credentialSatisfies(descriptor, JSON.parse(readFileSync14(credPath, "utf-8")));
   } catch {
     return false;
   }
@@ -37551,6 +37590,7 @@ class KimiOAuthHalf {
   async getRequestAuth(_ctx) {
     const token = await this.oauth.getAccessToken();
     return {
+      arm: "oauth",
       headers: {
         "anthropic-version": "2023-06-01",
         Authorization: `Bearer ${token}`,
@@ -37750,6 +37790,7 @@ class CredentialAuthority {
     return p.getRequestAuth(ctx);
   }
   invalidate(name) {
+    clearSignedArm(name);
     if (name) {
       this.registry.get(name)?.invalidate?.();
       return;
@@ -37764,9 +37805,11 @@ class CredentialAuthority {
   }
   async login(name) {
     await this.registry.get(name)?.login?.();
+    clearSignedArm(name);
   }
   async logout(name) {
     await this.registry.get(name)?.logout?.();
+    clearSignedArm(name);
   }
   get(name) {
     return this.registry.get(name);
@@ -37817,6 +37860,7 @@ var init_authority = __esm(() => {
   init_provider_definitions();
   init_antigravity_credential();
   init_api_key_credential();
+  init_billing_probe();
   init_codex_credential();
   init_devin_credential();
   init_grok_credential();
@@ -37829,6 +37873,7 @@ var init_authority = __esm(() => {
     google: ["gemini"]
   };
   credentials = CredentialAuthority.buildDefault();
+  installBillingProbes();
 });
 
 // src/providers/devin/proto-codec.ts
@@ -44976,6 +45021,7 @@ var init_openai_codex = __esm(() => {
   init_codex_api_format();
   init_model_catalog();
   init_authority();
+  init_billing_probe();
   init_harness();
   init_openai();
   FALLBACK_CONVERSATION_KEY = randomBytes6(16).toString("hex");
@@ -44989,6 +45035,8 @@ var init_openai_codex = __esm(() => {
       } catch {
         this.cachedAuth = null;
       }
+      const signedWithOAuth = this.cachedAuth?.arm === "oauth";
+      recordSignedArm("openai-codex", signedWithOAuth ? "subscription" : "metered");
     }
     getEndpoint(_targetModel) {
       return this.cachedAuth?.endpoint ?? super.getEndpoint();
@@ -45477,16 +45525,28 @@ function describeMissingCredential(providerName) {
   const keyNames = info?.envVar ? [info.envVar, ...info.aliases ?? []].join(" or ") : undefined;
   const signup = info?.url ? ` Get one at ${info.url}.` : "";
   const def = getProviderByName(providerName);
+  const sibling = describeSiblingKeys(def);
   if (isLocalTransport(providerName)) {
     const where = def ? ` Claudish will use ${getEffectiveBaseUrl(def)}.` : "";
     const keyClause = keyNames ? ` (Only set ${keyNames} if your local server requires a bearer token.)` : "";
-    return `Provider "${providerName}" is a LOCAL server and is not enabled. Enable it in \`claudish config\` (Providers tab), or add "localProviders": ["${providerName}"] to ~/.claudish/config.json.${where}${keyClause}`;
+    return `Provider "${providerName}" is a LOCAL server and is not enabled. Enable it in \`claudish config\` (Providers tab), or add "localProviders": ["${providerName}"] to ~/.claudish/config.json.${where}${keyClause}${sibling}`;
   }
   if (def?.oauthFallback) {
     const keyClause = keyNames ? ` Or set ${keyNames} (env, config, or 1Password import) to use a metered API key instead.${signup}` : "";
-    return `No credential for provider "${providerName}". Sign in with \`claudish login ${providerName}\` to use your existing subscription.${keyClause}`;
+    return `No credential for provider "${providerName}". Sign in with \`claudish login ${providerName}\` to use your existing subscription.${keyClause}${sibling}`;
   }
-  return keyNames ? `No API key for provider "${providerName}". Set ${keyNames} (env, config, or 1Password import).${signup}` : `No API key for provider "${providerName}".`;
+  return keyNames ? `No API key for provider "${providerName}". Set ${keyNames} (env, config, or 1Password import).${signup}${sibling}` : `No API key for provider "${providerName}".${sibling}`;
+}
+function describeSiblingKeys(def) {
+  const vars = def?.siblingKeyEnvVars ?? [];
+  if (vars.length === 0)
+    return "";
+  const all = getAllProviders();
+  const named = vars.map((v) => {
+    const owner = all.find((p) => p.name !== def?.name && p.apiKeyEnvVar === v);
+    return owner ? `${v} (${owner.name})` : v;
+  });
+  return ` Note: ${named.join(" or ")} is a DIFFERENT plan's key and is not accepted here.`;
 }
 function getDisplayName(providerName) {
   const def = getProviderByName(providerName);
@@ -45952,7 +46012,7 @@ var init_provider_definitions = __esm(() => {
       apiPath: "/v1/chat/completions",
       modelDiscovery: { path: "/v1/models", format: "openai-models-list" },
       apiKeyEnvVar: "OPENCODE_GO_API_KEY",
-      apiKeyAliases: ["OPENCODE_API_KEY"],
+      siblingKeyEnvVars: ["OPENCODE_API_KEY"],
       apiKeyDescription: "OpenCode Zen Go (Lite Plan) API Key",
       apiKeyUrl: "https://opencode.ai/",
       shortcuts: ["zengo", "zgo"],
@@ -47568,7 +47628,8 @@ var init_routing_hints = __esm(() => {
     openrouter: { apiKeyEnvVar: "OPENROUTER_API_KEY" },
     "x-ai": { apiKeyEnvVar: "XAI_API_KEY" },
     "z-ai": { apiKeyEnvVar: "ZAI_API_KEY" },
-    "opencode-zen": { apiKeyEnvVar: "OPENCODE_API_KEY" }
+    "opencode-zen": { apiKeyEnvVar: "OPENCODE_API_KEY" },
+    "opencode-zen-go": { apiKeyEnvVar: "OPENCODE_GO_API_KEY" }
   };
 });
 
@@ -51446,12 +51507,15 @@ function collectRoutingPrefixes(group, getNativePrefix) {
     out.push(native);
     seen.add(native);
   }
-  for (const sub of group.subscriptions) {
-    const p = sub.subscription?.prefix;
-    if (!p || seen.has(p))
-      continue;
-    seen.add(p);
-    out.push(p);
+  for (const subscriptionRow of group.subscriptions) {
+    const routes = subscriptionRow.subscriptions && subscriptionRow.subscriptions.length > 0 ? subscriptionRow.subscriptions : subscriptionRow.subscription ? [subscriptionRow.subscription] : [];
+    for (const route2 of routes) {
+      const p = route2?.prefix;
+      if (!p || seen.has(p))
+        continue;
+      seen.add(p);
+      out.push(p);
+    }
   }
   return out;
 }
@@ -75450,7 +75514,7 @@ var init_api_key_map = __esm(() => {
     "qwen-payg": { envVar: "DASHSCOPE_API_KEY", aliases: ["QWEN_API_KEY"] },
     ollamacloud: { envVar: "OLLAMA_API_KEY" },
     "opencode-zen": { envVar: "OPENCODE_API_KEY" },
-    "opencode-zen-go": { envVar: "OPENCODE_GO_API_KEY", aliases: ["OPENCODE_API_KEY"] },
+    "opencode-zen-go": { envVar: "OPENCODE_GO_API_KEY" },
     vertex: { envVar: "VERTEX_API_KEY", aliases: ["VERTEX_PROJECT"] },
     poe: { envVar: "POE_API_KEY" }
   };
@@ -77023,6 +77087,7 @@ ${h("ENVIRONMENT VARIABLES")}
   ${blue("SAKANA_SUBSCRIPTION_API_KEY")}     Sakana Fugu Subscription ${dim4("(sc@; separate subscription key)")}
   ${blue("OLLAMA_API_KEY")}                  OllamaCloud ${dim4("(oc@, llama@)")}
   ${blue("OPENCODE_API_KEY")}                OpenCode Zen ${dim4("(zen@)")}
+  ${blue("OPENCODE_GO_API_KEY")}             OpenCode Zen Go plan ${dim4("(zgo@, zengo@; separate plan key)")}
   ${blue("POE_API_KEY")}                     Poe ${dim4("(poe@)")}
   ${blue("LITELLM_API_KEY")}                 LiteLLM ${dim4("(litellm@, ll@; needs LITELLM_BASE_URL)")}
   ${blue("VERTEX_API_KEY")}                  Vertex AI Express ${dim4("(v@)")}

package/package.json

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