claudish 9.6.0 → 9.6.1

package/dist/index.js

@@ -715,7 +715,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "9.6.0";
+var VERSION = "9.6.1";
 
 // src/logger.ts
 import { appendFile, existsSync as existsSync2, mkdirSync, readdirSync, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
@@ -21200,10 +21200,34 @@ function keepOnlyRealTools(extracted, knownToolNames, decodeToolName) {
   }
   return kept;
 }
+function unwrapToolCallTags(body) {
+  if (!body.startsWith("<tool_call>"))
+    return null;
+  const blocks = [];
+  let cursor = 0;
+  while (cursor < body.length) {
+    TOOL_CALL_OPEN_AT_CURSOR.lastIndex = cursor;
+    if (!TOOL_CALL_OPEN_AT_CURSOR.exec(body))
+      return null;
+    cursor = TOOL_CALL_OPEN_AT_CURSOR.lastIndex;
+    const close = body.indexOf(TOOL_CALL_CLOSE_TAG, cursor);
+    const block = (close === -1 ? body.slice(cursor) : body.slice(cursor, close)).trim();
+    if (!block.startsWith("<function="))
+      return null;
+    blocks.push(block);
+    if (close === -1)
+      break;
+    cursor = close + TOOL_CALL_CLOSE_TAG.length;
+    cursor += /^\s*/.exec(body.slice(cursor))?.[0].length ?? 0;
+  }
+  return blocks.length > 0 ? blocks.join(`
+`) : null;
+}
 function parseFunctionTagEnvelope(text) {
-  const body = text.trim();
-  if (body.length === 0)
+  const trimmed = text.trim();
+  if (trimmed.length === 0)
     return null;
+  const body = unwrapToolCallTags(trimmed) ?? trimmed;
   if (!body.startsWith("<function="))
     return null;
   const calls = [];
@@ -21440,7 +21464,7 @@ function validateAndRepairToolCall(toolName, argsStr, toolSchemas, textContent)
   }
   return { valid: false, args, repaired: false, missingParams };
 }
-var FUNCTION_TAG_SOURCE, FUNCTION_TAG_PRESENT, FUNCTION_TAG_AT_CURSOR, PARAMETER_TAG_AT_CURSOR;
+var FUNCTION_TAG_SOURCE, FUNCTION_TAG_PRESENT, FUNCTION_TAG_AT_CURSOR, PARAMETER_TAG_AT_CURSOR, TOOL_CALL_OPEN_AT_CURSOR, TOOL_CALL_CLOSE_TAG = "</tool_call>";
 var init_tool_call_recovery = __esm(() => {
   init_tool_name_utils();
   init_logger();
@@ -21449,6 +21473,7 @@ var init_tool_call_recovery = __esm(() => {
   FUNCTION_TAG_PRESENT = new RegExp(`<function=${TOOL_NAME_SOURCE}>`);
   FUNCTION_TAG_AT_CURSOR = new RegExp(`<function=(${TOOL_NAME_SOURCE})>`, "y");
   PARAMETER_TAG_AT_CURSOR = /<parameter=([^>\s]+)>/y;
+  TOOL_CALL_OPEN_AT_CURSOR = /<tool_call>\s*/y;
 });
 
 // src/handlers/shared/web-search-detector.ts
@@ -57942,6 +57967,51 @@ var init_api_key_map = __esm(() => {
   };
 });
 
+// src/providers/provider-slug-resolve.ts
+function sharedPrefixLength(a, b) {
+  let n = 0;
+  while (n < a.length && n < b.length && a[n] === b[n])
+    n++;
+  return n;
+}
+function rankSuggestions(typed, providers) {
+  const needle = typed.toLowerCase();
+  const scored = [];
+  for (const provider of providers) {
+    const slug = provider.slug.toLowerCase();
+    let score = 0;
+    if (slug.includes(needle) || needle.includes(slug)) {
+      score = 2;
+    } else if (sharedPrefixLength(slug, needle) >= MIN_PREFIX_OVERLAP) {
+      score = 1;
+    }
+    if (score > 0)
+      scored.push({ provider, score });
+  }
+  scored.sort((a, b) => b.score - a.score || b.provider.count - a.provider.count);
+  return scored.slice(0, SUGGESTION_LIMIT).map((s) => s.provider);
+}
+function resolveProviderSlug(typed, providers) {
+  const routingOwner = reservedNamespaceOwner(typed) ?? null;
+  if (providers.length === 0) {
+    return { kind: "match", canonical: typed, suggestions: [], routingOwner };
+  }
+  const exact = providers.find((p) => p.slug.toLowerCase() === typed.toLowerCase());
+  if (exact) {
+    return { kind: "match", canonical: exact.slug, suggestions: [], routingOwner };
+  }
+  return {
+    kind: "unknown",
+    canonical: null,
+    suggestions: rankSuggestions(typed, providers),
+    routingOwner
+  };
+}
+var SUGGESTION_LIMIT = 5, MIN_PREFIX_OVERLAP = 3;
+var init_provider_slug_resolve = __esm(() => {
+  init_reserved_namespace();
+});
+
 // src/branding.ts
 function paint(line) {
   const { RESET, BOLD, CYAN, BLUE, DIM } = cliAnsi();
@@ -58512,7 +58582,19 @@ Usage:  claudish --models --provider <slug>`);
       const hasJsonFlag = args.includes("--json");
       const forceUpdate = config.forceUpdate || args.includes("--models-refresh");
       const providerIdx = args.indexOf("--provider");
-      const providerSlug = providerIdx !== -1 && providerIdx + 1 < args.length ? args[providerIdx + 1] : null;
+      const inlineProvider = args.find((a) => a.startsWith("--provider="));
+      let providerSlug = null;
+      if (inlineProvider) {
+        providerSlug = inlineProvider.slice("--provider=".length);
+      } else if (providerIdx !== -1) {
+        const next = args[providerIdx + 1];
+        providerSlug = next && !next.startsWith("--") ? next : "";
+      }
+      if (providerSlug === "") {
+        console.error("--provider needs a slug: claudish --models --provider <slug>");
+        console.error("Run `claudish --providers` for the full list.");
+        process.exit(1);
+      }
       if (forceUpdate)
         clearAllModelCaches();
       if (query && providerSlug) {
@@ -58787,7 +58869,46 @@ Top ${response.total} models from Firebase (pool: ${response.poolSize} eligible)
   console.log("Top recommended:    claudish --models-top");
   console.log("");
 }
-async function printByProvider(providerSlug, jsonOutput) {
+function printUnknownProviderSlug(typedSlug, resolved, catalogSize, jsonOutput) {
+  if (jsonOutput) {
+    console.log(JSON.stringify({
+      error: `"${typedSlug}" is not a provider slug in the model catalog`,
+      provider: typedSlug,
+      suggestions: resolved.suggestions.map((s) => s.slug),
+      routingPrefixOwner: resolved.routingOwner,
+      validSlugs: catalogSize
+    }, null, 2));
+    return;
+  }
+  console.error(`
+\u274C "${typedSlug}" is not a provider slug in the model catalog.`);
+  if (resolved.suggestions.length > 0) {
+    const list = resolved.suggestions.map((s) => `${s.slug} (${s.count} active model${s.count === 1 ? "" : "s"})`).join(", ");
+    console.error(`
+   Did you mean: ${list}`);
+  }
+  if (resolved.routingOwner) {
+    console.error(`
+   "${typedSlug}" IS a claudish routing prefix for the "${resolved.routingOwner}" provider \u2014` + `
+   use it with --model: claudish --model ${typedSlug}@<model-id>` + `
+   Routing prefixes and catalog vendor slugs are different vocabularies.`);
+  }
+  console.error(`
+   claudish --providers    lists all ${catalogSize} catalog slugs`);
+  console.error(`   claudish -s ${typedSlug}${" ".repeat(Math.max(1, 12 - typedSlug.length))}searches model ids instead
+`);
+}
+async function printByProvider(typedSlug, jsonOutput) {
+  let catalogProviders = [];
+  try {
+    catalogProviders = await getProviderList();
+  } catch {}
+  const resolved = resolveProviderSlug(typedSlug, catalogProviders);
+  if (resolved.kind === "unknown") {
+    printUnknownProviderSlug(typedSlug, resolved, catalogProviders.length, jsonOutput);
+    process.exit(1);
+  }
+  const providerSlug = resolved.canonical ?? typedSlug;
   let models;
   try {
     models = await getModelsByProvider(providerSlug, 200);
@@ -58802,8 +58923,8 @@ async function printByProvider(providerSlug, jsonOutput) {
   }
   if (models.length === 0) {
     console.log(`
-No active models found for provider "${providerSlug}". Try \`claudish -s <query>\` to search the full catalog.
-`);
+Provider "${providerSlug}" is in the catalog but has no active models right now.`);
+    console.log("Try `claudish -s <query>` to search the full catalog.\n");
     return;
   }
   console.log(`
@@ -59884,6 +60005,7 @@ var init_cli = __esm(() => {
   init_probe_live();
   init_probe_runner();
   init_provider_definitions();
+  init_provider_slug_resolve();
   init_routing_rules();
   init_ansi();
   init_provider_resolver();

package/package.json

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