claudish 7.29.0 → 7.29.1

package/dist/index.js

@@ -651,7 +651,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.29.0";
+var VERSION = "7.29.1";
 
 // src/logger.ts
 var exports_logger = {};
@@ -43033,38 +43033,32 @@ function extractModelIds(body) {
   }
   return [];
 }
+function orderByCost(models) {
+  const sized = models.filter((m) => typeof m.size === "number");
+  const unsized = models.filter((m) => typeof m.size !== "number");
+  const bySize = [...sized].sort((a, b) => (a.size ?? Number.POSITIVE_INFINITY) - (b.size ?? Number.POSITIVE_INFINITY)).map((m) => m.name);
+  return [...bySize, ...rankProbeCandidates(unsized.map((m) => m.name))];
+}
 async function discoverViaOllama(baseUrl, cacheKey) {
   const cached2 = cacheGet(cacheKey.key, cacheKey.exclude);
   if (cached2 !== undefined)
     return cached2;
-  let connectionError;
-  let loadedRaw = [];
-  try {
-    loadedRaw = await fetchOllamaModels2(`${baseUrl}/api/ps`);
-  } catch (e) {
-    connectionError = classifyFetchError(e, `${baseUrl}/api/ps`);
-  }
-  let allRaw = loadedRaw;
-  if (allRaw.length === 0) {
-    try {
-      allRaw = await fetchOllamaModels2(`${baseUrl}/api/tags`);
-    } catch (e) {
-      connectionError ??= classifyFetchError(e, `${baseUrl}/api/tags`);
-    }
-  }
-  const candidates = allRaw.filter((m) => isChatCapable(m.name));
-  if (candidates.length === 0) {
-    const reason = connectionError ?? (allRaw.length === 0 ? `no models on ${baseUrl} (pull one: ollama pull llama3.2)` : `only embedding/non-chat models on ${baseUrl}`);
+  const [psResult, tagsResult] = await Promise.allSettled([
+    fetchOllamaModels2(`${baseUrl}/api/ps`),
+    fetchOllamaModels2(`${baseUrl}/api/tags`)
+  ]);
+  const loadedRaw = psResult.status === "fulfilled" ? psResult.value : [];
+  const tagsRaw = tagsResult.status === "fulfilled" ? tagsResult.value : [];
+  const connectionError = psResult.status === "rejected" ? classifyFetchError(psResult.reason, `${baseUrl}/api/ps`) : tagsResult.status === "rejected" ? classifyFetchError(tagsResult.reason, `${baseUrl}/api/tags`) : undefined;
+  const loaded = loadedRaw.filter((m) => isChatCapable(m.name));
+  const loadedNames = new Set(loaded.map((m) => m.name));
+  const rest = tagsRaw.filter((m) => isChatCapable(m.name) && !loadedNames.has(m.name));
+  if (loaded.length === 0 && rest.length === 0) {
+    const reason = connectionError ?? (loadedRaw.length === 0 && tagsRaw.length === 0 ? `no models on ${baseUrl} (pull one: ollama pull llama3.2)` : `only embedding/non-chat models on ${baseUrl}`);
     cacheSetFailure(cacheKey.key, reason);
     return { model: null, reason };
   }
-  const sized = candidates.filter((m) => typeof m.size === "number");
-  let ranked;
-  if (sized.length > 0) {
-    ranked = [...sized].sort((a, b) => (a.size ?? Number.POSITIVE_INFINITY) - (b.size ?? Number.POSITIVE_INFINITY)).map((m) => m.name);
-  } else {
-    ranked = rankProbeCandidates(candidates.map((m) => m.name));
-  }
+  const ranked = [...orderByCost(loaded), ...orderByCost(rest)];
   if (ranked.length === 0) {
     const reason = "no chat-capable model on Ollama endpoint";
     cacheSetFailure(cacheKey.key, reason);
@@ -61892,6 +61886,8 @@ function annotateOAuthHint(result, provider, isOAuth) {
   const loginCommand2 = provider === "gemini-codeassist" ? "claudish login gemini" : provider === "vertex" ? "gcloud auth application-default login" : undefined;
   if (!loginCommand2)
     return result;
+  if (result.httpStatus === 403)
+    return result;
   const looksLikeAuthFailure = result.state === "auth-failed" || /auth|token|login|credential|unauthor/i.test(result.errorMessage || "");
   if (!looksLikeAuthFailure)
     return result;
@@ -62174,29 +62170,34 @@ function isContentEvent(parsed, eventType) {
     return true;
   return false;
 }
+function withDetail(base, message) {
+  return message ? `${base} \u2014 ${message}` : base;
+}
 function describeProbeState(result) {
+  const status = result.httpStatus ?? "";
+  const latency = result.latencyMs ? ` \xB7 ${result.latencyMs}ms` : "";
   switch (result.state) {
     case "live":
       return `live \xB7 ${result.latencyMs}ms`;
     case "key-missing":
       return result.errorMessage ? `missing (${result.errorMessage})` : "missing";
     case "auth-failed":
-      return `auth failed \xB7 ${result.httpStatus ?? ""}${result.latencyMs ? ` \xB7 ${result.latencyMs}ms` : ""}`.trim();
+      return withDetail(`auth failed \xB7 ${status}${latency}`.trim(), result.errorMessage);
     case "model-not-found":
-      return `model not found \xB7 ${result.httpStatus ?? ""}${result.latencyMs ? ` \xB7 ${result.latencyMs}ms` : ""}`.trim();
+      return withDetail(`model not found \xB7 ${status}${latency}`.trim(), result.errorMessage);
     case "rate-limited":
-      return `rate limited \xB7 ${result.latencyMs}ms`;
+      return withDetail(`rate limited \xB7 ${result.latencyMs}ms`, result.errorMessage);
     case "out-of-credit":
-      return `out of credit \xB7 ${result.httpStatus ?? ""}${result.latencyMs ? ` \xB7 ${result.latencyMs}ms` : ""}`.trim();
+      return withDetail(`out of credit \xB7 ${status}${latency}`.trim(), result.errorMessage);
     case "server-error":
-      return `server error \xB7 ${result.httpStatus ?? ""} \xB7 ${result.latencyMs}ms`;
+      return withDetail(`server error \xB7 ${status} \xB7 ${result.latencyMs}ms`, result.errorMessage);
     case "timeout":
-      return `timeout \xB7 ${result.latencyMs}ms`;
+      return withDetail(`timeout \xB7 ${result.latencyMs}ms`, result.errorMessage);
     case "network-error":
-      return `network error \xB7 ${result.latencyMs}ms`;
+      return withDetail(`network error \xB7 ${result.latencyMs}ms`, result.errorMessage);
     case "error": {
-      const base = `error${result.httpStatus ? ` \xB7 ${result.httpStatus}` : ""}${result.latencyMs ? ` \xB7 ${result.latencyMs}ms` : ""}`;
-      return result.errorMessage ? `${base} \u2014 ${result.errorMessage}` : base;
+      const base = `error${result.httpStatus ? ` \xB7 ${result.httpStatus}` : ""}${latency}`;
+      return withDetail(base, result.errorMessage);
     }
   }
 }
@@ -67013,16 +67014,22 @@ function localBaseUrl(catalogName) {
   }
   return (def.baseUrl || "").replace(/\/+$/, "") || null;
 }
+function isHtmlResponse(res) {
+  const contentType = res.headers.get("content-type") ?? "";
+  return /\btext\/html\b|\bapplication\/xhtml\+xml\b/i.test(contentType);
+}
 async function pingLocalProvider(catalogName, timeoutMs = PING_TIMEOUT_MS) {
   const base = localBaseUrl(catalogName);
   const path2 = HEALTH_PATH[catalogName];
   if (!base || !path2)
     return "unknown";
   try {
-    await fetch(`${base}${path2}`, {
+    const res = await fetch(`${base}${path2}`, {
       method: "GET",
       signal: AbortSignal.timeout(timeoutMs)
     });
+    if (res.ok && isHtmlResponse(res))
+      return "down";
     return "running";
   } catch {
     return "down";

package/package.json

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