claudish 2.9.0 → 2.10.0

package/dist/index.js

@@ -34353,6 +34353,7 @@ process.stdin.on('end', () => {
 
     let ctx = 100, cost = 0;
     const model = process.env.CLAUDISH_ACTIVE_MODEL_NAME || 'unknown';
+    const isLocal = process.env.CLAUDISH_IS_LOCAL === 'true';
 
     try {
       const tokens = JSON.parse(fs.readFileSync('${escapedTokenPath}', 'utf-8'));
@@ -34365,8 +34366,8 @@ process.stdin.on('end', () => {
       } catch {}
     }
 
-    const costStr = cost.toFixed(3);
-    console.log(\`\${CYAN}\${BOLD}\${dir}\${RESET} \${DIM}•\${RESET} \${YELLOW}\${model}\${RESET} \${DIM}•\${RESET} \${GREEN}$\${costStr}\${RESET} \${DIM}•\${RESET} \${MAGENTA}\${ctx}%\${RESET}\`);
+    const costDisplay = isLocal ? 'LOCAL' : ('$' + cost.toFixed(3));
+    console.log(\`\${CYAN}\${BOLD}\${dir}\${RESET} \${DIM}•\${RESET} \${YELLOW}\${model}\${RESET} \${DIM}•\${RESET} \${GREEN}\${costDisplay}\${RESET} \${DIM}•\${RESET} \${MAGENTA}\${ctx}%\${RESET}\`);
   } catch (e) {
     console.log('claudish');
   }
@@ -34392,7 +34393,7 @@ function createTempSettingsFile(modelDisplay, port) {
     const DIM2 = "\\033[2m";
     const RESET2 = "\\033[0m";
     const BOLD2 = "\\033[1m";
-    statusCommand = `JSON=$(cat) && DIR=$(basename "$(pwd)") && [ \${#DIR} -gt 15 ] && DIR="\${DIR:0:12}..." || true && CTX=100 && COST="0" && if [ -f "${tokenFilePath}" ]; then TOKENS=$(cat "${tokenFilePath}" 2>/dev/null) && REAL_COST=$(echo "$TOKENS" | grep -o '"total_cost":[0-9.]*' | cut -d: -f2) && REAL_CTX=$(echo "$TOKENS" | grep -o '"context_left_percent":[0-9]*' | grep -o '[0-9]*') && if [ ! -z "$REAL_COST" ]; then COST="$REAL_COST"; else COST=$(echo "$JSON" | grep -o '"total_cost_usd":[0-9.]*' | cut -d: -f2); fi && if [ ! -z "$REAL_CTX" ]; then CTX="$REAL_CTX"; fi; else COST=$(echo "$JSON" | grep -o '"total_cost_usd":[0-9.]*' | cut -d: -f2); fi && [ -z "$COST" ] && COST="0" || true && printf "${CYAN2}${BOLD2}%s${RESET2} ${DIM2}•${RESET2} ${YELLOW2}%s${RESET2} ${DIM2}•${RESET2} ${GREEN2}\\$%.3f${RESET2} ${DIM2}•${RESET2} ${MAGENTA}%s%%${RESET2}\\n" "$DIR" "$CLAUDISH_ACTIVE_MODEL_NAME" "$COST" "$CTX"`;
+    statusCommand = `JSON=$(cat) && DIR=$(basename "$(pwd)") && [ \${#DIR} -gt 15 ] && DIR="\${DIR:0:12}..." || true && CTX=100 && COST="0" && if [ -f "${tokenFilePath}" ]; then TOKENS=$(cat "${tokenFilePath}" 2>/dev/null) && REAL_COST=$(echo "$TOKENS" | grep -o '"total_cost":[0-9.]*' | cut -d: -f2) && REAL_CTX=$(echo "$TOKENS" | grep -o '"context_left_percent":[0-9]*' | grep -o '[0-9]*') && if [ ! -z "$REAL_COST" ]; then COST="$REAL_COST"; else COST=$(echo "$JSON" | grep -o '"total_cost_usd":[0-9.]*' | cut -d: -f2); fi && if [ ! -z "$REAL_CTX" ]; then CTX="$REAL_CTX"; fi; else COST=$(echo "$JSON" | grep -o '"total_cost_usd":[0-9.]*' | cut -d: -f2); fi && [ -z "$COST" ] && COST="0" || true && if [ "$CLAUDISH_IS_LOCAL" = "true" ]; then COST_DISPLAY="LOCAL"; else COST_DISPLAY=$(printf "\\$%.3f" "$COST"); fi && printf "${CYAN2}${BOLD2}%s${RESET2} ${DIM2}•${RESET2} ${YELLOW2}%s${RESET2} ${DIM2}•${RESET2} ${GREEN2}%s${RESET2} ${DIM2}•${RESET2} ${MAGENTA}%s%%${RESET2}\\n" "$DIR" "$CLAUDISH_ACTIVE_MODEL_NAME" "$COST_DISPLAY" "$CTX"`;
   }
   const settings = {
     statusLine: {
@@ -34438,10 +34439,12 @@ async function runClaudeWithProxy(config3, proxyUrl) {
       claudeArgs.push(...config3.claudeArgs);
     }
   }
+  const isLocalModel = modelId.startsWith("ollama/") || modelId.startsWith("ollama:") || modelId.startsWith("lmstudio/") || modelId.startsWith("lmstudio:") || modelId.startsWith("vllm/") || modelId.startsWith("vllm:") || modelId.startsWith("http://") || modelId.startsWith("https://");
   const env = {
     ...process.env,
     ANTHROPIC_BASE_URL: proxyUrl,
     [ENV.CLAUDISH_ACTIVE_MODEL_NAME]: modelId,
+    CLAUDISH_IS_LOCAL: isLocalModel ? "true" : "false",
     [ENV.ANTHROPIC_MODEL]: modelId,
     [ENV.ANTHROPIC_SMALL_FAST_MODEL]: modelId
   };
@@ -34926,17 +34929,40 @@ async function fetchOllamaModels() {
       return [];
     const data = await response.json();
     const models = data.models || [];
-    return models.map((m) => ({
-      id: `ollama/${m.name}`,
-      name: m.name,
-      description: `Local Ollama model (${m.details?.parameter_size || "unknown size"})`,
-      provider: "ollama",
-      context_length: null,
-      pricing: { prompt: "0", completion: "0" },
-      isLocal: true,
-      details: m.details,
-      size: m.size
+    const modelsWithCapabilities = await Promise.all(models.map(async (m) => {
+      let capabilities = [];
+      try {
+        const showResponse = await fetch(`${ollamaHost}/api/show`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ name: m.name }),
+          signal: AbortSignal.timeout(2000)
+        });
+        if (showResponse.ok) {
+          const showData = await showResponse.json();
+          capabilities = showData.capabilities || [];
+        }
+      } catch {}
+      const supportsTools = capabilities.includes("tools");
+      const isEmbeddingModel = capabilities.includes("embedding") || m.name.toLowerCase().includes("embed");
+      const sizeInfo = m.details?.parameter_size || "unknown size";
+      const toolsIndicator = supportsTools ? "✓ tools" : "✗ no tools";
+      return {
+        id: `ollama/${m.name}`,
+        name: m.name,
+        description: `Local Ollama model (${sizeInfo}, ${toolsIndicator})`,
+        provider: "ollama",
+        context_length: null,
+        pricing: { prompt: "0", completion: "0" },
+        isLocal: true,
+        supportsTools,
+        isEmbeddingModel,
+        capabilities,
+        details: m.details,
+        size: m.size
+      };
     }));
+    return modelsWithCapabilities.filter((m) => !m.isEmbeddingModel);
   } catch (e) {
     return [];
   }
@@ -34990,6 +35016,10 @@ async function searchAndPrintModels(query, forceUpdate) {
     console.log(`No models found matching "${query}"`);
     return;
   }
+  const RED = "\x1B[31m";
+  const GREEN2 = "\x1B[32m";
+  const RESET2 = "\x1B[0m";
+  const DIM2 = "\x1B[2m";
   console.log(`
 Found ${results.length} matching models:
 `);
@@ -35020,9 +35050,17 @@ Found ${results.length} matching models:
     const contextLen = model.context_length || model.top_provider?.context_length || 0;
     const context = contextLen > 0 ? `${Math.round(contextLen / 1000)}K` : "N/A";
     const contextPadded = context.padEnd(7);
-    console.log(`  ${modelIdPadded} ${providerPadded} ${pricingPadded} ${contextPadded} ${(score * 100).toFixed(0)}%`);
+    if (model.isLocal && model.supportsTools === false) {
+      console.log(`  ${RED}${modelIdPadded} ${providerPadded} ${pricingPadded} ${contextPadded} ${(score * 100).toFixed(0)}% ✗ no tools${RESET2}`);
+    } else if (model.isLocal && model.supportsTools === true) {
+      console.log(`  ${GREEN2}${modelIdPadded}${RESET2} ${providerPadded} ${pricingPadded} ${contextPadded} ${(score * 100).toFixed(0)}%`);
+    } else {
+      console.log(`  ${modelIdPadded} ${providerPadded} ${pricingPadded} ${contextPadded} ${(score * 100).toFixed(0)}%`);
+    }
   }
   console.log("");
+  console.log(`${DIM2}Local models: ${RED}red${RESET2}${DIM2} = no tool support (incompatible), ${GREEN2}green${RESET2}${DIM2} = compatible${RESET2}`);
+  console.log("");
   console.log("Use a model: claudish --model <model-id>");
   console.log("Local models: claudish --model ollama/<model-name>");
 }
@@ -35077,23 +35115,37 @@ async function printAllModels(jsonOutput, forceUpdate) {
     }, null, 2));
     return;
   }
+  const RED = "\x1B[31m";
+  const GREEN2 = "\x1B[32m";
+  const RESET2 = "\x1B[0m";
+  const DIM2 = "\x1B[2m";
   if (ollamaModels.length > 0) {
+    const toolCapableCount = ollamaModels.filter((m) => m.supportsTools).length;
     console.log(`
-\uD83C\uDFE0 LOCAL OLLAMA MODELS (${ollamaModels.length} installed):
+\uD83C\uDFE0 LOCAL OLLAMA MODELS (${ollamaModels.length} installed, ${toolCapableCount} with tool support):
 `);
-    console.log("  " + "─".repeat(70));
+    console.log("    Model                                     Size         Params    Tools");
+    console.log("  " + "─".repeat(76));
     for (const model of ollamaModels) {
-      const shortId = model.name;
-      const modelId = shortId.length > 40 ? shortId.substring(0, 37) + "..." : shortId;
-      const modelIdPadded = modelId.padEnd(42);
+      const fullId = model.id;
+      const modelId = fullId.length > 35 ? fullId.substring(0, 32) + "..." : fullId;
+      const modelIdPadded = modelId.padEnd(38);
       const size = model.size ? `${(model.size / 1e9).toFixed(1)}GB` : "N/A";
       const sizePadded = size.padEnd(12);
       const params = model.details?.parameter_size || "N/A";
       const paramsPadded = params.padEnd(8);
-      console.log(`    ${modelIdPadded} ${sizePadded} ${paramsPadded}`);
+      if (model.supportsTools) {
+        console.log(`    ${modelIdPadded} ${sizePadded} ${paramsPadded}  ${GREEN2}✓${RESET2}`);
+      } else {
+        console.log(`    ${RED}${modelIdPadded} ${sizePadded} ${paramsPadded}  ✗ no tools${RESET2}`);
+      }
     }
     console.log("");
+    console.log(`  ${GREEN2}✓${RESET2} = Compatible with Claude Code (supports tool calling)`);
+    console.log(`  ${RED}✗${RESET2} = Not compatible ${DIM2}(Claude Code requires tool support)${RESET2}`);
+    console.log("");
     console.log("  Use: claudish --model ollama/<model-name>");
+    console.log("  Pull a compatible model: ollama pull llama3.2");
   } else {
     console.log(`
 \uD83C\uDFE0 LOCAL OLLAMA: Not running or no models installed`);
@@ -39535,6 +39587,10 @@ var init_openai_compat = __esm(() => {
 });
 
 // src/handlers/local-provider-handler.ts
+import { writeFileSync as writeFileSync9 } from "node:fs";
+import { tmpdir as tmpdir3 } from "node:os";
+import { join as join9 } from "node:path";
+
 class LocalProviderHandler {
   provider;
   modelName;
@@ -39543,6 +39599,9 @@ class LocalProviderHandler {
   port;
   healthChecked = false;
   isHealthy = false;
+  contextWindow = 8192;
+  sessionInputTokens = 0;
+  sessionOutputTokens = 0;
   constructor(provider, modelName, port) {
     this.provider = provider;
     this.modelName = modelName;
@@ -39587,6 +39646,49 @@ class LocalProviderHandler {
     this.isHealthy = false;
     return false;
   }
+  async fetchContextWindow() {
+    if (this.provider.name !== "ollama")
+      return;
+    try {
+      const response = await fetch(`${this.provider.baseUrl}/api/show`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ name: this.modelName }),
+        signal: AbortSignal.timeout(3000)
+      });
+      if (response.ok) {
+        const data = await response.json();
+        const ctxFromInfo = data.model_info?.["general.context_length"];
+        const ctxFromParams = data.parameters?.match(/num_ctx\s+(\d+)/)?.[1];
+        if (ctxFromInfo) {
+          this.contextWindow = parseInt(ctxFromInfo, 10);
+        } else if (ctxFromParams) {
+          this.contextWindow = parseInt(ctxFromParams, 10);
+        } else {
+          this.contextWindow = 8192;
+        }
+        log(`[LocalProvider:${this.provider.name}] Context window: ${this.contextWindow}`);
+      }
+    } catch (e) {}
+  }
+  writeTokenFile(input, output) {
+    try {
+      this.sessionInputTokens += input;
+      this.sessionOutputTokens += output;
+      const total = this.sessionInputTokens + this.sessionOutputTokens;
+      const leftPct = this.contextWindow > 0 ? Math.max(0, Math.min(100, Math.round((this.contextWindow - total) / this.contextWindow * 100))) : 100;
+      const data = {
+        input_tokens: this.sessionInputTokens,
+        output_tokens: this.sessionOutputTokens,
+        total_tokens: total,
+        total_cost: 0,
+        context_window: this.contextWindow,
+        context_left_percent: leftPct,
+        updated_at: Date.now()
+      };
+      writeFileSync9(join9(tmpdir3(), `claudish-tokens-${this.port}.json`), JSON.stringify(data), "utf-8");
+    } catch (e) {}
+  }
   async handle(c, payload) {
     const target = this.modelName;
     logStructured(`LocalProvider Request`, {
@@ -39600,6 +39702,7 @@ class LocalProviderHandler {
       if (!healthy) {
         return this.errorResponse(c, "connection_error", this.getConnectionErrorMessage());
       }
+      await this.fetchContextWindow();
     }
     const { claudeRequest, droppedParams } = transformOpenAIToClaude(payload);
     const messages = convertMessagesToOpenAI(claudeRequest, target, filterIdentity);
@@ -39652,7 +39755,7 @@ class LocalProviderHandler {
         c.header("X-Dropped-Params", droppedParams.join(", "));
       }
       if (openAIPayload.stream) {
-        return createStreamingResponseHandler(c, response, adapter, target, this.middlewareManager);
+        return createStreamingResponseHandler(c, response, adapter, target, this.middlewareManager, (input, output) => this.writeTokenFile(input, output));
       }
       const data = await response.json();
       return c.json(data);
@@ -39948,24 +40051,24 @@ __export(exports_update_checker, {
 });
 import { execSync } from "node:child_process";
 import { createInterface as createInterface2 } from "node:readline";
-import { existsSync as existsSync7, readFileSync as readFileSync6, writeFileSync as writeFileSync9, mkdirSync as mkdirSync4, unlinkSync as unlinkSync2 } from "node:fs";
-import { join as join9 } from "node:path";
-import { tmpdir as tmpdir3, homedir as homedir2, platform as platform2 } from "node:os";
+import { existsSync as existsSync7, readFileSync as readFileSync6, writeFileSync as writeFileSync10, mkdirSync as mkdirSync4, unlinkSync as unlinkSync2 } from "node:fs";
+import { join as join10 } from "node:path";
+import { tmpdir as tmpdir4, homedir as homedir2, platform as platform2 } from "node:os";
 function getCacheFilePath() {
   let cacheDir;
   if (isWindows2) {
-    const localAppData = process.env.LOCALAPPDATA || join9(homedir2(), "AppData", "Local");
-    cacheDir = join9(localAppData, "claudish");
+    const localAppData = process.env.LOCALAPPDATA || join10(homedir2(), "AppData", "Local");
+    cacheDir = join10(localAppData, "claudish");
   } else {
-    cacheDir = join9(homedir2(), ".cache", "claudish");
+    cacheDir = join10(homedir2(), ".cache", "claudish");
   }
   try {
     if (!existsSync7(cacheDir)) {
       mkdirSync4(cacheDir, { recursive: true });
     }
-    return join9(cacheDir, "update-check.json");
+    return join10(cacheDir, "update-check.json");
   } catch {
-    return join9(tmpdir3(), "claudish-update-check.json");
+    return join10(tmpdir4(), "claudish-update-check.json");
   }
 }
 function readCache() {
@@ -39987,7 +40090,7 @@ function writeCache(latestVersion) {
       lastCheck: Date.now(),
       latestVersion
     };
-    writeFileSync9(cachePath, JSON.stringify(data), "utf-8");
+    writeFileSync10(cachePath, JSON.stringify(data), "utf-8");
   } catch {}
 }
 function isCacheValid(cache) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "description": "Run Claude Code with any OpenRouter model - CLI tool and MCP server",
   "type": "module",
   "main": "./dist/index.js",