claudish 13.0.2 → 13.1.0

package/dist/index.js

@@ -575,7 +575,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "13.0.2";
+var VERSION = "13.1.0";
 
 // src/logger.ts
 import { appendFile, existsSync as existsSync2, mkdirSync, readdirSync, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
@@ -13269,7 +13269,7 @@ function createGeminiThoughtSignatureHook() {
     description: "Sends Gemini's reasoning_details back with the assistant tool calls they were produced for",
     order: "pre",
     models: ["*gemini*", "*google/*"],
-    selectByUpstream: (upstream) => upstream.wireApi === "gemini" || upstream.vendor === "google",
+    selectByUpstream: { wireApis: ["gemini"], vendors: ["google"] },
     routes: "all",
     defaultSeverity: "fix",
     statsName: GEMINI_THOUGHT_SIGNATURE_STATS_NAME,
@@ -18426,7 +18426,17 @@ async function prune(path) {
   await rename(tmp, path);
   log(`[behavior:journal] pruned ${lines.length - survivors.length} of ${lines.length} entries ` + `to stay under ${Math.round(MAX_JOURNAL_BYTES / 1e6)}MB`);
 }
-async function recordDecision(entry, path = journalPath()) {
+function recordDecision(entry, path = journalPath()) {
+  const previous = pendingAppends.get(path) ?? Promise.resolve();
+  const next = previous.then(() => appendDecision(entry, path));
+  pendingAppends.set(path, next);
+  next.then(() => {
+    if (pendingAppends.get(path) === next)
+      pendingAppends.delete(path);
+  });
+  return next;
+}
+async function appendDecision(entry, path) {
   try {
     const size = await stat(path).then((s) => s.size, () => 0);
     if (size === 0)
@@ -18440,7 +18450,7 @@ async function recordDecision(entry, path = journalPath()) {
     log(`[behavior:journal] could not record: ${err}`);
   }
 }
-var JOURNAL_SCHEMA_VERSION = 2, UPLOAD_SURFACES, UPLOAD_DECISIONS, MAX_DETAIL_CHARS = 200, MAX_JOURNAL_BYTES, PRUNE_TO_BYTES;
+var JOURNAL_SCHEMA_VERSION = 2, UPLOAD_SURFACES, UPLOAD_DECISIONS, MAX_DETAIL_CHARS = 200, MAX_JOURNAL_BYTES, PRUNE_TO_BYTES, pendingAppends;
 var init_journal = __esm(() => {
   init_logger();
   UPLOAD_SURFACES = new Set([
@@ -18458,6 +18468,7 @@ var init_journal = __esm(() => {
   ]);
   MAX_JOURNAL_BYTES = 32 * 1024 * 1024;
   PRUNE_TO_BYTES = Math.floor(MAX_JOURNAL_BYTES * 0.6);
+  pendingAppends = new Map;
 });
 
 // src/hooks/output-capture.ts
@@ -19650,6 +19661,9 @@ var init_loader = __esm(() => {
 function isProxyEvent(event) {
   return PROXY_EVENTS.has(event);
 }
+function upstreamSelected(selector, upstream) {
+  return upstream.wireApi !== null && selector.wireApis.includes(upstream.wireApi) || upstream.vendor !== null && selector.vendors.includes(upstream.vendor);
+}
 function eventsOf(def) {
   const events = [];
   const on = def.on ?? {};
@@ -19744,7 +19758,7 @@ function routeMatches(hook, route, upstream) {
   if (hook.routes === "foreign" && route.native)
     return false;
   if (upstream && hook.selectByUpstream)
-    return hook.selectByUpstream(upstream);
+    return upstreamSelected(hook.selectByUpstream, upstream);
   return hook.models.some((glob) => globMatches(glob, route.modelId));
 }
 var CLOSED_HANDLER_KEYS, RAW_KEYS2, PROXY_EVENTS, ORDER_RANK;
@@ -27780,7 +27794,8 @@ async function discoverEveryServedModel(providerName) {
       detail: `no base URL resolved \u2014 check ${overrides || "the provider's baseUrl"}`
     });
   }
-  const endpoint = registryModelsEndpoint(providerName, def) ?? `${baseUrl}${descriptor.path}`;
+  const definitionEndpoint = `${baseUrl}${descriptor.path}`;
+  let endpoint = registryModelsEndpoint(providerName, def) ?? definitionEndpoint;
   let headers = {};
   if (def.isLocal) {
     const key = def.apiKeyEnvVar ? process.env[def.apiKeyEnvVar] : undefined;
@@ -27807,13 +27822,14 @@ async function discoverEveryServedModel(providerName) {
     ...def.headers ?? {},
     ...headers
   };
+  const fetchList = (url) => fetch(url, { method: "GET", headers, signal: AbortSignal.timeout(FETCH_TIMEOUT_MS3) });
   let response;
   try {
-    response = await fetch(endpoint, {
-      method: "GET",
-      headers,
-      signal: AbortSignal.timeout(FETCH_TIMEOUT_MS3)
-    });
+    response = await fetchList(endpoint);
+    if (response.status === 404 && endpoint !== definitionEndpoint) {
+      endpoint = definitionEndpoint;
+      response = await fetchList(endpoint);
+    }
   } catch (e) {
     return recordFailure({
       kind: "unreachable",
@@ -27854,7 +27870,7 @@ async function discoverEveryServedModel(providerName) {
   }
   const models = parsed.models;
   _failures.delete(providerName);
-  log(`[model-discovery:${providerName}] discovered ${models.length} models: ` + models.map((m) => `${m.id}(${m.contextWindow ?? "?"})`).join(", "));
+  log(`[model-discovery:${providerName}] discovered ${models.length} models from ${endpoint}: ` + models.map((m) => `${m.id}(${m.contextWindow ?? "?"})`).join(", "));
   _cache2.set(providerName, { models, expiresAt: Date.now() + CACHE_TTL_MS2 });
   return { kind: "served", models };
 }
@@ -36448,8 +36464,8 @@ var init_provider_definitions = __esm(() => {
       baseUrl: "https://api.kimi.com/coding/v1",
       apiPath: "/messages",
       apiKeyEnvVar: "KIMI_CODING_API_KEY",
-      apiKeyDescription: "Kimi Coding API Key",
-      apiKeyUrl: "https://kimi.com/code (get key from membership page, or run: claudish login kimi)",
+      apiKeyDescription: "Kimi Coding API Key (membership page, or run: claudish login kimi)",
+      apiKeyUrl: "https://www.kimi.com/code",
       oauthFallback: "kimi-oauth.json",
       oauthLoginSlug: "kimi",
       shortcuts: ["kc"],
@@ -36502,7 +36518,7 @@ var init_provider_definitions = __esm(() => {
       apiKeyEnvVar: "ZHIPU_API_KEY",
       apiKeyAliases: ["GLM_API_KEY"],
       apiKeyDescription: "GLM/Zhipu API Key",
-      apiKeyUrl: "https://z.ai/",
+      apiKeyUrl: "https://z.ai/manage-apikey/apikey-list",
       shortcuts: ["glm", "zhipu"],
       shortestPrefix: "glm",
       legacyPrefixes: [
@@ -36548,7 +36564,7 @@ var init_provider_definitions = __esm(() => {
       apiPath: "/api/anthropic/v1/messages",
       apiKeyEnvVar: "ZAI_API_KEY",
       apiKeyDescription: "Z.AI API Key",
-      apiKeyUrl: "https://z.ai/",
+      apiKeyUrl: "https://z.ai/manage-apikey/apikey-list",
       shortcuts: ["z-ai", "zai"],
       shortestPrefix: "z-ai",
       legacyPrefixes: [{ prefix: "zai/", stripPrefix: true }],
@@ -36568,7 +36584,7 @@ var init_provider_definitions = __esm(() => {
       apiPath: "/api/chat",
       apiKeyEnvVar: "OLLAMA_API_KEY",
       apiKeyDescription: "OllamaCloud API Key",
-      apiKeyUrl: "https://ollama.com/account",
+      apiKeyUrl: "https://ollama.com/settings/keys",
       shortcuts: ["oc", "llama", "lc"],
       shortestPrefix: "oc",
       legacyPrefixes: [{ prefix: "oc/", stripPrefix: true }],
@@ -36592,8 +36608,8 @@ var init_provider_definitions = __esm(() => {
       baseUrlEnvVars: ["OPENCODE_BASE_URL"],
       apiPath: "/v1/chat/completions",
       apiKeyEnvVar: "OPENCODE_API_KEY",
-      apiKeyDescription: "OpenCode Zen API Key",
-      apiKeyUrl: "https://opencode.ai/",
+      apiKeyDescription: "OpenCode Zen API Key (Console > Settings > Service accounts)",
+      apiKeyUrl: "https://opencode.ai/console",
       shortcuts: ["zen"],
       shortestPrefix: "zen",
       legacyPrefixes: [{ prefix: "zen/", stripPrefix: true }],
@@ -36613,8 +36629,8 @@ var init_provider_definitions = __esm(() => {
       modelDiscovery: { path: "/v1/models", format: "openai-models-list" },
       apiKeyEnvVar: "OPENCODE_GO_API_KEY",
       siblingKeyEnvVars: ["OPENCODE_API_KEY"],
-      apiKeyDescription: "OpenCode Zen Go (Lite Plan) API Key",
-      apiKeyUrl: "https://opencode.ai/",
+      apiKeyDescription: "OpenCode Zen Go (Lite Plan) API Key (Console > Settings > Service accounts)",
+      apiKeyUrl: "https://opencode.ai/console",
       shortcuts: ["zengo", "zgo"],
       shortestPrefix: "zengo",
       legacyPrefixes: [
@@ -36718,7 +36734,7 @@ var init_provider_definitions = __esm(() => {
       apiPath: "/v1/chat/completions",
       apiKeyEnvVar: "LMSTUDIO_API_KEY",
       apiKeyDescription: "LM Studio API Key (optional \u2014 leave blank for localhost)",
-      apiKeyUrl: "https://lmstudio.ai/docs/local-server",
+      apiKeyUrl: "https://lmstudio.ai/docs/developer/core/server",
       shortcuts: ["lms", "lmstudio", "mlstudio"],
       shortestPrefix: "lms",
       legacyPrefixes: [
@@ -72083,6 +72099,7 @@ class PaneSessionImpl {
   stderrHead = "";
   paneClosed = false;
   paneExited = false;
+  exitCodeQuery = false;
   reaping = false;
   fastReap = false;
   reapPromise = null;
@@ -72593,7 +72610,7 @@ class PaneSessionImpl {
     }
   }
   checkLiveness() {
-    if (this.client || !this.panePidValue || this.paneExited)
+    if (this.client || !this.panePidValue || this.paneExited || this.exitCodeQuery)
       return;
     const now = Date.now();
     if (now - this.lastLivenessAt < 1000)
@@ -72603,11 +72620,55 @@ class PaneSessionImpl {
       process.kill(this.panePidValue, 0);
     } catch (e) {
       if (e.code === "ESRCH") {
-        this.paneExited = true;
-        this.applyExitPath(null);
+        this.exitCodeQuery = true;
+        this.exitCodeFromMagmux().then((code) => {
+          this.exitCodeQuery = false;
+          if (this.paneExited || isTerminalPhase(this.phase))
+            return;
+          this.paneExited = true;
+          this.exitCode = code;
+          this.step(() => this.applyExitPath(code));
+        });
+      }
+    }
+  }
+  async exitCodeFromMagmux() {
+    const deadline = Date.now() + EXIT_CODE_QUERY_MS;
+    const left = () => deadline - Date.now();
+    const client = await this.dialWithin(left);
+    if (!client)
+      return null;
+    try {
+      while (left() > 0) {
+        const r = await client.request({ type: "list" }, Math.max(1, left()));
+        if (!r.ok)
+          return null;
+        const p0 = r.result.panes?.find((p) => p.pane === 0);
+        if (!p0)
+          return null;
+        if (p0.dead === true)
+          return typeof p0.exitCode === "number" ? p0.exitCode : null;
+        await Bun.sleep(Math.min(EXIT_CODE_RETRY_MS, Math.max(0, left())));
       }
+      return null;
+    } finally {
+      client.close();
     }
   }
+  async dialWithin(left) {
+    while (left() > 0 && !this.reaping && !isTerminalPhase(this.phase)) {
+      try {
+        const dial = MagmuxClient.dial(this.sockPath);
+        const client = await Promise.race([dial, Bun.sleep(Math.max(0, left())).then(() => null)]);
+        if (!client)
+          dial.then((late) => late.close()).catch(() => {});
+        return client;
+      } catch {
+        await Bun.sleep(Math.min(EXIT_CODE_RETRY_MS, Math.max(0, left())));
+      }
+    }
+    return null;
+  }
   t(key, dflt) {
     return this.o.timings?.[key] ?? dflt;
   }
@@ -74556,7 +74617,7 @@ async function startPaneSession(o) {
   await session.start({ magmuxBinary: magmux.binary, env: p.magmuxEnv, cwd: p.cwd });
   return session;
 }
-var BOOT_TIMEOUT_MS = 90000, ADMIT_TIMEOUT_MS = 30000, DEGRADED_ENTRY_MS = 1e4, SCREEN_SETTLE_QUIET_MS = 3000, PANEL_SETTLE_MS = 500, SEND_CLIENT_SLACK_MS = 2000, MIN_READY_TIMEOUT_MS = 1000, BUSY_RETRY_MS = 250, MISMATCH_SETTLE_MS = 1000, CLEAR_WAIT_MS = 1000, BOOT_STATIC_MS = 5000, TICK_MS = 250, WATCH_FPS = 4, POLL_BACKSTOP_MS = 1000, TURN_END_MISSING_FACTOR = 3, RESIZE_REPLY_MS = 1e4, RESIZE_SCREEN_MS = 1000, GATE_POLL_MS = 250, GATE_REPLY_MS = 1000, GATE_STALE_MS = 1000, GATE_GRACE_MS, GATE_DEAD_BACKSTOP_MS = 1000, GATE_KINDLESS_REASONS, RUNTIME_DIALOG_KINDS, REGISTRY_READ_MS = 250, REGISTRY_DISAGREE_MS = 2000, REGISTRY_GATE_BOOT_DISAGREE_MS = 5000, REGISTRY_MISSING_MS = 5000, MAX_ANOMALY_KEYS = 64, KEPT_ANSWERS = 4, DEFAULT_MAX_CONSECUTIVE = 3, EVENT_REASON, VERDICT_EVENT, PaneStartError;
+var BOOT_TIMEOUT_MS = 90000, ADMIT_TIMEOUT_MS = 30000, DEGRADED_ENTRY_MS = 1e4, SCREEN_SETTLE_QUIET_MS = 3000, PANEL_SETTLE_MS = 500, SEND_CLIENT_SLACK_MS = 2000, MIN_READY_TIMEOUT_MS = 1000, BUSY_RETRY_MS = 250, MISMATCH_SETTLE_MS = 1000, CLEAR_WAIT_MS = 1000, BOOT_STATIC_MS = 5000, TICK_MS = 250, WATCH_FPS = 4, POLL_BACKSTOP_MS = 1000, TURN_END_MISSING_FACTOR = 3, RESIZE_REPLY_MS = 1e4, RESIZE_SCREEN_MS = 1000, GATE_POLL_MS = 250, GATE_REPLY_MS = 1000, GATE_STALE_MS = 1000, GATE_GRACE_MS, GATE_DEAD_BACKSTOP_MS = 1000, EXIT_CODE_QUERY_MS = 2000, EXIT_CODE_RETRY_MS = 50, GATE_KINDLESS_REASONS, RUNTIME_DIALOG_KINDS, REGISTRY_READ_MS = 250, REGISTRY_DISAGREE_MS = 2000, REGISTRY_GATE_BOOT_DISAGREE_MS = 5000, REGISTRY_MISSING_MS = 5000, MAX_ANOMALY_KEYS = 64, KEPT_ANSWERS = 4, DEFAULT_MAX_CONSECUTIVE = 3, EVENT_REASON, VERDICT_EVENT, PaneStartError;
 var init_pane_session = __esm(() => {
   init_queue();
   init_parent_session();
@@ -79757,10 +79818,26 @@ function hookRow(hook, severity) {
     severity,
     routes: hook.routes,
     models: [...hook.models],
+    ...hook.selectByUpstream && {
+      catalogSelection: {
+        wireApis: [...hook.selectByUpstream.wireApis],
+        vendors: [...hook.selectByUpstream.vendors]
+      }
+    },
     order: hook.order,
     unsafe: hook.unsafe
   };
 }
+function selectionOf(r) {
+  const globs = r.models.join(", ");
+  if (!r.catalogSelection)
+    return r.models.join(",") !== "*" ? `models ${globs}` : null;
+  const facts = [
+    ...r.catalogSelection.wireApis.map((w) => `wire ${w}`),
+    ...r.catalogSelection.vendors.map((v) => `vendor ${v}`)
+  ].join(" or ");
+  return `catalog ${facts}; without a catalog connection, models ${globs}`;
+}
 async function list(json) {
   const set = await loadHookSet({ hostMode: "other", moduleWarn: () => {} });
   const rows = set.registry.hooks.map((h) => hookRow(h, set.registry.severityOf(h)));
@@ -79787,7 +79864,7 @@ Hooks, in effective order
       `${r.source}`,
       `events ${r.events.join(", ")}`,
       `routes ${r.routes}`,
-      r.models.join(",") !== "*" ? `models ${r.models.join(", ")}` : null,
+      selectionOf(r),
       r.order !== "normal" ? `order ${r.order}` : null
     ].filter(Boolean);
     console.log(`  ${dim2(scope.join(" \xB7 "))}
@@ -84998,13 +85075,13 @@ function ProviderDetail({
             fg: C.blue,
             attributes: A.bold,
             children: [
-              "URL:",
+              "API:",
               " "
             ]
           }),
           /* @__PURE__ */ jsx22("span", {
             fg: C.cyan,
-            children: activeEndpoint || selectedProvider.defaultEndpoint || "default"
+            children: (activeEndpoint || selectedProvider.defaultEndpoint || "default").replace(/^https?:\/\//, "")
           })
         ]
       }),
@@ -91109,7 +91186,7 @@ function resolveContextWindowEnv(realWindow, processEnv = process.env) {
   if (processEnv[ENV.CLAUDE_CODE_AUTO_COMPACT_WINDOW])
     return { vars };
   if (realWindow >= MIN_AUTO_COMPACT_WINDOW) {
-    vars[ENV.CLAUDE_CODE_AUTO_COMPACT_WINDOW] = String(realWindow);
+    vars[ENV.CLAUDE_CODE_AUTO_COMPACT_WINDOW] = String(Math.min(realWindow, MAX_AUTO_COMPACT_WINDOW));
     return {
       vars,
       notice: `[claudish] Auto-compact window: ${realWindow.toLocaleString()} tokens ` + "(Claude Code compacts before the backend's real limit)"
@@ -91616,7 +91693,7 @@ var restoreTerminal = null, macosKeychainAnthropicResult, defaultKeychainAnthrop
     macosKeychainAnthropicResult = false;
   }
   return macosKeychainAnthropicResult;
-}, CLAUDISH_PLACEHOLDER_API_KEY = "sk-ant-api03-placeholder-not-used-proxy-handles-auth-with-openrouter-key-xxxxxxxxxxxxxxxxxxxxx", CLAUDISH_PLACEHOLDER_AUTH_TOKEN = "placeholder-token-not-used-proxy-handles-auth", STALE_TOKEN_FILE_MS, MAX_TOKEN_FILES_SCANNED = 4000, CLAUDE_CODE_DEFAULT_MAX_CONTEXT = 200000, USER_STATUS_LINE_TIMEOUT_SECONDS = 3, MIN_AUTO_COMPACT_WINDOW = 200000, ADVISOR_TOOL_ENV_VAR = "CLAUDE_CODE_ENABLE_EXPERIMENTAL_ADVISOR_TOOL", CLAUDISH_CHILD_ADVISOR_MODEL = "sonnet", CHILD_STDERR_NOISE, SIGNAL_EXIT_NUMBERS;
+}, CLAUDISH_PLACEHOLDER_API_KEY = "sk-ant-api03-placeholder-not-used-proxy-handles-auth-with-openrouter-key-xxxxxxxxxxxxxxxxxxxxx", CLAUDISH_PLACEHOLDER_AUTH_TOKEN = "placeholder-token-not-used-proxy-handles-auth", STALE_TOKEN_FILE_MS, MAX_TOKEN_FILES_SCANNED = 4000, CLAUDE_CODE_DEFAULT_MAX_CONTEXT = 200000, USER_STATUS_LINE_TIMEOUT_SECONDS = 3, MIN_AUTO_COMPACT_WINDOW = 200000, MAX_AUTO_COMPACT_WINDOW = 1e6, ADVISOR_TOOL_ENV_VAR = "CLAUDE_CODE_ENABLE_EXPERIMENTAL_ADVISOR_TOOL", CLAUDISH_CHILD_ADVISOR_MODEL = "sonnet", CHILD_STDERR_NOISE, SIGNAL_EXIT_NUMBERS;
 var init_claude_runner = __esm(() => {
   init_model_catalog();
   init_config();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "13.0.2",
+  "version": "13.1.0",
   "description": "Run Claude Code with any model - OpenRouter, Ollama, LM Studio & local models",
   "type": "module",
   "main": "./dist/index.js",
@@ -69,10 +69,10 @@
     "ai"
   ],
   "optionalDependencies": {
-    "@claudish/magmux-darwin-arm64": "13.0.2",
-    "@claudish/magmux-darwin-x64": "13.0.2",
-    "@claudish/magmux-linux-arm64": "13.0.2",
-    "@claudish/magmux-linux-x64": "13.0.2"
+    "@claudish/magmux-darwin-arm64": "13.1.0",
+    "@claudish/magmux-darwin-x64": "13.1.0",
+    "@claudish/magmux-linux-arm64": "13.1.0",
+    "@claudish/magmux-linux-x64": "13.1.0"
   },
   "author": "Jack Rudenko <i@madappgang.com>",
   "license": "MIT",