claudish 7.8.0 → 7.8.1

package/dist/index.js

@@ -581,7 +581,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.8.0";
+var VERSION = "7.8.1";
 
 // src/providers/onepassword-wasm.ts
 var exports_onepassword_wasm = {};
@@ -3071,6 +3071,7 @@ __export(exports_onepassword, {
   resolveGlobImport: () => resolveGlobImport,
   resolveDesktopAccount: () => resolveDesktopAccount,
   resetSdkClientCache: () => resetSdkClientCache,
+  recordOpHydratedVars: () => recordOpHydratedVars,
   readEnvironment: () => readEnvironment,
   parseOpFlag: () => parseOpFlag,
   parseGlobImport: () => parseGlobImport,
@@ -3079,6 +3080,7 @@ __export(exports_onepassword, {
   listItems: () => listItems,
   isTransientSdkError: () => isTransientSdkError,
   isOpReference: () => isOpReference,
+  isOpHydratedVar: () => isOpHydratedVar,
   isGlobImport: () => isGlobImport,
   globToRegExp: () => globToRegExp,
   filterGlobFields: () => filterGlobFields,
@@ -3097,6 +3099,15 @@ import { spawnSync } from "child_process";
 function isOpReference(v) {
   return typeof v === "string" && OP_REF_RE.test(v);
 }
+function recordOpHydratedVars(names) {
+  for (const n of names) {
+    if (typeof n === "string" && n.length > 0)
+      opHydratedVars.add(n);
+  }
+}
+function isOpHydratedVar(name) {
+  return !!name && opHydratedVars.has(name);
+}
 function buildAuthError(detail) {
   return new Error(`${detail}
 ` + "Set OP_SERVICE_ACCOUNT_TOKEN (service account, headless) or OP_ACCOUNT " + "(your 1Password account URL, e.g. my-team.1password.com) for the desktop " + "app \u2014 or set `onepasswordAccount` in ~/.claudish/config.json.");
@@ -3557,7 +3568,7 @@ async function readEnvironment(environmentId, opts = {}) {
   }
   return out;
 }
-var OP_REF_RE, ENV_VAR_NAME_RE, sdkClientCache, defaultSdkClientFactory = async (auth) => {
+var OP_REF_RE, opHydratedVars, ENV_VAR_NAME_RE, sdkClientCache, defaultSdkClientFactory = async (auth) => {
   const key = sdkAuthCacheKey(auth);
   const cached = sdkClientCache.get(key);
   if (cached)
@@ -3605,6 +3616,7 @@ var OP_REF_RE, ENV_VAR_NAME_RE, sdkClientCache, defaultSdkClientFactory = async
 };
 var init_onepassword = __esm(() => {
   OP_REF_RE = /^op:\/\/[^\s]+$/;
+  opHydratedVars = new Set;
   ENV_VAR_NAME_RE = /^[A-Z_][A-Z0-9_]*$/;
   sdkClientCache = new Map;
   sdkQueue = Promise.resolve();
@@ -38986,7 +38998,7 @@ class ApiKeyCredentialProvider {
     this.oauthFallback = descriptor.oauthFallback;
   }
   resolveSync() {
-    return process.env[this.envVar] || this.aliases.find((a) => process.env[a]) || getApiKey(this.envVar);
+    return process.env[this.envVar] || this.aliases.map((a) => process.env[a]).find((v) => !!v) || getApiKey(this.envVar);
   }
   hasOauthFallbackFile() {
     if (!this.oauthFallback)
@@ -40474,7 +40486,13 @@ function makeKimiCredential() {
   return new CompositeCredentialProvider("kimi", new KimiOAuthHalf, new ApiKeyCredentialProvider({
     catalogName: "kimi",
     envVar: "MOONSHOT_API_KEY",
-    aliases: ["KIMI_API_KEY", "KIMI_CODING_API_KEY"]
+    aliases: ["KIMI_API_KEY"]
+  }), { fallbackSignal: "OAuth_FALLBACK_TO_API_KEY" });
+}
+function makeKimiCodingCredential() {
+  return new CompositeCredentialProvider("kimi-coding", new KimiOAuthHalf, new ApiKeyCredentialProvider({
+    catalogName: "kimi-coding",
+    envVar: "KIMI_CODING_API_KEY"
   }), { fallbackSignal: "OAuth_FALLBACK_TO_API_KEY" });
 }
 var init_kimi_credential = __esm(() => {
@@ -40727,7 +40745,8 @@ class CredentialAuthority {
     const authority = new CredentialAuthority;
     authority.register(makeCodexCredential(), ["openai-codex"]);
     authority.register(new GeminiCodeAssistCredentialProvider, ["gemini-codeassist", "google"]);
-    authority.register(makeKimiCredential(), ["kimi", "kimi-coding"]);
+    authority.register(makeKimiCredential(), ["kimi"]);
+    authority.register(makeKimiCodingCredential(), ["kimi-coding"]);
     authority.register(new VertexCredentialProvider, ["vertex"]);
     for (const name of LOCAL_PROVIDER_NAMES) {
       authority.register(new LocalCredentialProvider(name), [name]);
@@ -42096,7 +42115,6 @@ function maskKey(key) {
 }
 function resolveApiKeyProvenance(envVar, aliases) {
   const layers = [];
-  const effectiveValue = process.env[envVar] || null;
   let effectiveSource = "not set";
   const allVars = [envVar, ...aliases || []];
   const dotenvValue = readDotenvKey(allVars);
@@ -42136,6 +42154,9 @@ function resolveApiKeyProvenance(envVar, aliases) {
       effectiveSource = "~/.claudish/config.json";
       layers[1].isActive = true;
       layers[2].isActive = false;
+    } else if (isOpHydratedVar(runtimeVar)) {
+      effectiveSource = "1Password";
+      layers[2].source = `process.env[${runtimeVar}] (from 1Password)`;
     } else {
       effectiveSource = "shell environment";
     }
@@ -42182,6 +42203,7 @@ function readConfigKey(envVar) {
 }
 var import_dotenv;
 var init_api_key_provenance = __esm(() => {
+  init_onepassword();
   import_dotenv = __toESM(require_main(), 1);
 });
 
@@ -44243,6 +44265,7 @@ function toProviderDef(def) {
     defaultEndpoint: def.baseUrl || undefined,
     aliases: def.apiKeyAliases,
     isLocal: def.isLocal,
+    publicKeyFallback: !!def.publicKeyFallback,
     oauthSlug: def.oauthLoginSlug
   };
 }
@@ -44259,9 +44282,14 @@ function providerAuthSource(p, config3) {
     return "env";
   if (hasCfg)
     return "cfg";
+  if (p.publicKeyFallback)
+    return "public";
   return null;
 }
 function providerIsReady(p, config3) {
+  if (!p.oauthSlug) {
+    return providerAuthSource(p, config3) !== null;
+  }
   return credentials.isAuthenticated(p.catalogName) || providerAuthSource(p, config3) !== null;
 }
 function providerAuthCapabilities(p, config3) {
@@ -63270,6 +63298,48 @@ var init_probe_catalog = __esm(() => {
   PROBE_MODELS_CACHE_PATH = join24(homedir23(), ".claudish", "probe-models.json");
 });
 
+// src/providers/local-liveness.ts
+function localBaseUrl(catalogName) {
+  const def = getProviderByName(catalogName);
+  if (!def || !def.isLocal)
+    return null;
+  for (const envVar of def.baseUrlEnvVars ?? []) {
+    const v = process.env[envVar];
+    if (v)
+      return v.replace(/\/+$/, "");
+  }
+  return (def.baseUrl || "").replace(/\/+$/, "") || null;
+}
+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}`, {
+      method: "GET",
+      signal: AbortSignal.timeout(timeoutMs)
+    });
+    return "running";
+  } catch {
+    return "down";
+  }
+}
+async function pingLocalProviders(catalogNames, timeoutMs = PING_TIMEOUT_MS) {
+  const results = await Promise.all(catalogNames.map(async (name) => [name, await pingLocalProvider(name, timeoutMs)]));
+  return Object.fromEntries(results);
+}
+var PING_TIMEOUT_MS = 2000, HEALTH_PATH;
+var init_local_liveness = __esm(() => {
+  init_provider_definitions();
+  HEALTH_PATH = {
+    ollama: "/api/tags",
+    lmstudio: "/v1/models",
+    vllm: "/v1/models",
+    mlx: "/v1/models"
+  };
+});
+
 // src/tui/probe-proxy.ts
 async function ensureProbeProxy() {
   if (probeProxy)
@@ -64093,6 +64163,7 @@ function ProvidersContent({
   displayProviders,
   providerIndex,
   testResults,
+  localLiveness,
   contentH,
   isInputMode,
   animTick
@@ -64123,6 +64194,8 @@ function ProvidersContent({
       keyDisplay = "local";
     } else if (isOauthOnly) {
       keyDisplay = "oauth\xB7\xB7\xB7";
+    } else if (auth === "public") {
+      keyDisplay = "free";
     } else if (auth === "cfg") {
       keyDisplay = maskKey2(config3.apiKeys?.[p.apiKeyEnvVar]);
     } else if (auth === "env" || auth === "e+c") {
@@ -64133,6 +64206,23 @@ function ProvidersContent({
     const isFirstUnready = idx === firstUnreadyIdx;
     let statusFg = isReady ? C.green : C.dim;
     let statusText = p.isLocal ? isReady ? "enabled" : "disabled" : isReady ? "ready" : "not set";
+    if (p.isLocal) {
+      const live = localLiveness[p.catalogName];
+      if (isReady) {
+        if (live === "running") {
+          statusFg = C.green;
+          statusText = "running";
+        } else if (live === "down") {
+          statusFg = C.yellow;
+          statusText = "down";
+        }
+      } else {
+        if (live === "running") {
+          statusFg = C.cyan;
+          statusText = "running \xB7 off";
+        }
+      }
+    }
     if (tr) {
       if (tr.status === "testing") {
         statusFg = C.yellow;
@@ -64368,13 +64458,15 @@ function ProviderDetail({
   hasCfgKey,
   hasEnvKey,
   hasKey,
+  isOpKey,
+  isPublicKey,
   cfgKeyMask,
   envKeyMask,
   activeEndpoint,
   testResults,
   isInputMode
 }) {
-  const displayKey = selectedProvider.isLocal ? hasKey ? "enabled" : "disabled" : hasEnvKey ? envKeyMask : hasCfgKey ? cfgKeyMask : "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500";
+  const displayKey = selectedProvider.isLocal ? hasKey ? "enabled" : "disabled" : hasEnvKey ? envKeyMask : hasCfgKey ? cfgKeyMask : isPublicKey ? "free" : "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500";
   if (isInputMode) {
     return /* @__PURE__ */ jsxDEV6("box", {
       height: DETAIL_H,
@@ -64498,7 +64590,25 @@ function ProviderDetail({
               }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          hasKey && !selectedProvider.isLocal && /* @__PURE__ */ jsxDEV6(Fragment3, {
+          hasKey && !selectedProvider.isLocal && isPublicKey && /* @__PURE__ */ jsxDEV6(Fragment3, {
+            children: [
+              /* @__PURE__ */ jsxDEV6("span", {
+                fg: C.dim,
+                children: "   "
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV6("span", {
+                fg: C.blue,
+                attributes: A.bold,
+                children: "From: "
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV6("span", {
+                fg: C.green,
+                attributes: A.bold,
+                children: "public key (free)"
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this),
+          hasKey && !selectedProvider.isLocal && !isPublicKey && /* @__PURE__ */ jsxDEV6(Fragment3, {
             children: [
               /* @__PURE__ */ jsxDEV6("span", {
                 fg: C.dim,
@@ -64512,7 +64622,7 @@ function ProviderDetail({
               hasEnvKey && /* @__PURE__ */ jsxDEV6("span", {
                 fg: C.green,
                 attributes: A.bold,
-                children: "env"
+                children: isOpKey ? "1Password" : "env"
               }, undefined, false, undefined, this),
               hasEnvKey && hasCfgKey && /* @__PURE__ */ jsxDEV6("span", {
                 fg: C.fgMuted,
@@ -67728,6 +67838,7 @@ function App({ requestLogin } = {}) {
   const [editingExistingPattern, setEditingExistingPattern] = useState5(null);
   const [statusMsg, setStatusMsg] = useState5(null);
   const [testResults, setTestResults] = useState5({});
+  const [localLiveness, setLocalLiveness] = useState5({});
   const [animTick, setAnimTick] = useState5(0);
   const anyTesting = useMemo2(() => Object.values(testResults).some((r) => r?.status === "testing"), [testResults]);
   useEffect4(() => {
@@ -67736,6 +67847,25 @@ function App({ requestLogin } = {}) {
     const id = setInterval(() => setAnimTick((tick) => (tick + 1) % 1e6), 90);
     return () => clearInterval(id);
   }, [anyTesting]);
+  useEffect4(() => {
+    if (activeTab !== "providers")
+      return;
+    let cancelled = false;
+    const localNames = PROVIDERS.filter((p) => p.isLocal).map((p) => p.catalogName);
+    if (localNames.length === 0)
+      return;
+    const sweep = async () => {
+      const map3 = await pingLocalProviders(localNames);
+      if (!cancelled)
+        setLocalLiveness(map3);
+    };
+    sweep();
+    const id = setInterval(() => void sweep(), 1e4);
+    return () => {
+      cancelled = true;
+      clearInterval(id);
+    };
+  }, [activeTab]);
   const [profileIndex, setProfileIndex] = useState5(0);
   const [opIndex, setOpIndex] = useState5(0);
   const [opScopeCursor, setOpScopeCursor] = useState5(0);
@@ -67781,6 +67911,15 @@ function App({ requestLogin } = {}) {
     setBufStats(getBufferStats());
     setOpTick((t) => t + 1);
   }, []);
+  const clearTestResult = useCallback3((provName) => {
+    setTestResults((prev) => {
+      if (!(provName in prev))
+        return prev;
+      const next = { ...prev };
+      delete next[provName];
+      return next;
+    });
+  }, []);
   const probe = useRouteProbe(config3);
   const { probeMode, probeModel, probeResults } = probe;
   const wizard = useProfileWizard({ mode, setMode, refreshConfig, setStatusMsg });
@@ -67793,7 +67932,9 @@ function App({ requestLogin } = {}) {
   } = wizard;
   const hasCfgKey = !!config3.apiKeys?.[selectedProvider.apiKeyEnvVar];
   const hasEnvKey = !!process.env[selectedProvider.apiKeyEnvVar];
-  const hasKey = hasCfgKey || hasEnvKey || selectedLocalEnabled;
+  const selectedPublicKey = !!selectedProvider.publicKeyFallback && !hasCfgKey && !hasEnvKey;
+  const hasKey = hasCfgKey || hasEnvKey || selectedLocalEnabled || selectedPublicKey;
+  const isOpKey = hasEnvKey && isOpHydratedVar(selectedProvider.apiKeyEnvVar);
   const cfgKeyMask = maskKey2(config3.apiKeys?.[selectedProvider.apiKeyEnvVar]);
   const envKeyMask = maskKey2(process.env[selectedProvider.apiKeyEnvVar]);
   const activeEndpointEnvVar = selectedProvider.endpointEnvVar;
@@ -68141,6 +68282,20 @@ function App({ requestLogin } = {}) {
   const runProbeTest = useCallback3(async (prov) => {
     const provName = prov.name;
     setTestResults((prev) => ({ ...prev, [provName]: { status: "testing" } }));
+    if (prov.isLocal) {
+      const live = await pingLocalProvider(prov.catalogName);
+      if (live === "down") {
+        const base = localBaseUrl(prov.catalogName);
+        setTestResults((prev) => ({
+          ...prev,
+          [provName]: {
+            status: "failed",
+            error: `not running${base ? ` (${base} unreachable)` : ""}`
+          }
+        }));
+        return;
+      }
+    }
     const outcome = await ensureProbeModelsCached();
     if (outcome.kind !== "ok") {
       setTestResults((prev) => ({
@@ -68292,6 +68447,7 @@ function App({ requestLogin } = {}) {
         }
         invalidateProbeProxyHandlers(selectedProvider.catalogName);
         invalidateProbeDiscovery(selectedProvider.catalogName);
+        clearTestResult(selectedProvider.name);
         refreshConfig();
         setInputValue("");
         setMode("browse");
@@ -68809,6 +68965,7 @@ function App({ requestLogin } = {}) {
         if (changed) {
           invalidateProbeProxyHandlers(selectedProvider.catalogName);
           invalidateProbeDiscovery(selectedProvider.catalogName);
+          clearTestResult(selectedProvider.name);
           refreshConfig();
           setStatusMsg(`Stored config removed for ${selectedProvider.displayName}.`);
         } else {
@@ -68830,7 +68987,8 @@ function App({ requestLogin } = {}) {
       } else if (key.raw === "T") {
         const fired = [];
         for (const prov of PROVIDERS) {
-          if (!providerIsReady(prov, config3))
+          const localRunning = prov.isLocal && localLiveness[prov.catalogName] === "running";
+          if (!providerIsReady(prov, config3) && !localRunning)
             continue;
           fired.push(prov.displayName);
           runProbeTest(prov);
@@ -68843,10 +69001,11 @@ function App({ requestLogin } = {}) {
         }
       } else if (key.name === "t") {
         const caps = providerAuthCapabilities(selectedProvider, config3);
-        const ready = providerIsReady(selectedProvider, config3);
+        const localRunning = selectedProviderIsLocal && localLiveness[selectedProvider.catalogName] === "running";
+        const ready = providerIsReady(selectedProvider, config3) || localRunning;
         if (!ready) {
           if (selectedProviderIsLocal) {
-            setStatusMsg(`${selectedProvider.displayName}: disabled. Press e to enable in global config.`);
+            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.`);
           } else if (caps.oauth.supported) {
@@ -69156,6 +69315,7 @@ function App({ requestLogin } = {}) {
             displayProviders,
             providerIndex,
             testResults,
+            localLiveness,
             contentH,
             isInputMode,
             animTick
@@ -69169,6 +69329,8 @@ function App({ requestLogin } = {}) {
             hasCfgKey,
             hasEnvKey,
             hasKey,
+            isOpKey,
+            isPublicKey: selectedPublicKey,
             cfgKeyMask,
             envKeyMask,
             activeEndpoint,
@@ -69303,6 +69465,7 @@ var init_App = __esm(() => {
   init_probe_discovery();
   init_probe_live();
   init_probe_runner();
+  init_local_liveness();
   init_stats_buffer();
   init_providers();
   init_theme2();
@@ -70375,13 +70538,14 @@ async function applyOpEnvironment() {
   if (envIds.length === 0)
     return;
   try {
-    const { readEnvironment: readEnvironment2 } = await Promise.resolve().then(() => (init_onepassword(), exports_onepassword));
+    const { readEnvironment: readEnvironment2, recordOpHydratedVars: recordOpHydratedVars2 } = await Promise.resolve().then(() => (init_onepassword(), exports_onepassword));
     const auth = await getSdkAuth();
     for (const envId of envIds) {
       const vars = await readEnvironment2(envId, { auth });
       for (const [key, value] of Object.entries(vars)) {
         process.env[key] = value;
       }
+      recordOpHydratedVars2(Object.keys(vars));
     }
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
@@ -70413,12 +70577,13 @@ async function applyOpImport() {
     process.exit(0);
   }
   try {
-    const { resolveGlobImport: resolveGlobImport2 } = await Promise.resolve().then(() => (init_onepassword(), exports_onepassword));
+    const { resolveGlobImport: resolveGlobImport2, recordOpHydratedVars: recordOpHydratedVars2 } = await Promise.resolve().then(() => (init_onepassword(), exports_onepassword));
     const auth = await getSdkAuth();
     const resolved = await resolveGlobImport2(glob, { auth });
     for (const [key, value] of Object.entries(resolved)) {
       process.env[key] = value;
     }
+    recordOpHydratedVars2(Object.keys(resolved));
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     console.error(`[claudish] 1Password --op import failed: ${message}`);
@@ -70483,13 +70648,19 @@ async function loadStoredApiKeys(neededEnvVars) {
   if (refKeys.length === 0 && globImports.length === 0)
     return;
   try {
-    const { resolveSecrets: resolveSecrets2, resolveGlobImport: resolveGlobImport2, resolveGlobImportForEnvVars: resolveGlobImportForEnvVars2 } = await Promise.resolve().then(() => (init_onepassword(), exports_onepassword));
+    const {
+      resolveSecrets: resolveSecrets2,
+      resolveGlobImport: resolveGlobImport2,
+      resolveGlobImportForEnvVars: resolveGlobImportForEnvVars2,
+      recordOpHydratedVars: recordOpHydratedVars2
+    } = await Promise.resolve().then(() => (init_onepassword(), exports_onepassword));
     const auth = await getSdkAuth();
     if (refKeys.length > 0) {
       const resolved = await resolveSecrets2(opRefs, { auth });
       for (const [envVar, value] of Object.entries(resolved)) {
         process.env[envVar] = value;
       }
+      recordOpHydratedVars2(Object.keys(resolved));
     }
     for (const globPath of globImports) {
       try {
@@ -70503,6 +70674,7 @@ async function loadStoredApiKeys(neededEnvVars) {
         for (const [envVar, value] of Object.entries(resolved)) {
           if (!process.env[envVar]) {
             process.env[envVar] = value;
+            recordOpHydratedVars2([envVar]);
           }
         }
       } catch (globErr) {
@@ -70546,12 +70718,13 @@ async function applyCustomEndpointOpKeys(neededEnvVars) {
   if (Object.keys(refs).length === 0)
     return;
   try {
-    const { resolveSecrets: resolveSecrets2 } = await Promise.resolve().then(() => (init_onepassword(), exports_onepassword));
+    const { resolveSecrets: resolveSecrets2, recordOpHydratedVars: recordOpHydratedVars2 } = await Promise.resolve().then(() => (init_onepassword(), exports_onepassword));
     const auth = await getSdkAuth();
     const resolved = await resolveSecrets2(refs, { auth });
     for (const [envVar, value] of Object.entries(resolved)) {
       process.env[envVar] = value;
     }
+    recordOpHydratedVars2(Object.keys(resolved));
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     console.error(`[claudish] 1Password custom-endpoint key resolution failed: ${message}`);

package/package.json

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