claudish 3.7.2 → 3.7.4

package/dist/index.js

@@ -32160,6 +32160,7 @@ class OpenRouterHandler {
       const total = input + output;
       const limit = this.contextWindowCache.get(this.targetModel) || 200000;
       const leftPct = limit > 0 ? Math.max(0, Math.min(100, Math.round((limit - total) / limit * 100))) : 100;
+      const displayModelName = this.targetModel.replace(/^(go|g|gemini|v|vertex|oai|mmax|mm|kimi|moonshot|glm|zhipu|oc|ollama|lmstudio|vllm|mlx)[\/:]/, "");
       const data = {
         input_tokens: input,
         output_tokens: output,
@@ -32167,6 +32168,8 @@ class OpenRouterHandler {
         total_cost: this.sessionTotalCost,
         context_window: limit,
         context_left_percent: leftPct,
+        provider_name: "OpenRouter",
+        model_name: displayModelName,
         updated_at: Date.now()
       };
       const claudishDir = join4(homedir(), ".claudish");
@@ -53115,6 +53118,14 @@ class LocalProviderHandler {
       this.sessionOutputTokens += output;
       const sessionTotal = this.sessionInputTokens + this.sessionOutputTokens;
       const leftPct = this.contextWindow > 0 ? Math.max(0, Math.min(100, Math.round((this.contextWindow - sessionTotal) / this.contextWindow * 100))) : 100;
+      const providerNameMap = {
+        ollama: "Ollama",
+        lmstudio: "LM Studio",
+        vllm: "vLLM",
+        mlx: "MLX",
+        custom: "Custom"
+      };
+      const displayModelName = this.modelName.replace(/^(go|g|gemini|v|vertex|oai|mmax|mm|kimi|moonshot|glm|zhipu|oc|ollama|lmstudio|vllm|mlx)[\/:]/, "");
       const data = {
         input_tokens: this.sessionInputTokens,
         output_tokens: this.sessionOutputTokens,
@@ -53122,6 +53133,8 @@ class LocalProviderHandler {
         total_cost: 0,
         context_window: this.contextWindow,
         context_left_percent: leftPct,
+        provider_name: providerNameMap[this.provider.name] || "Local",
+        model_name: displayModelName,
         updated_at: Date.now()
       };
       const claudishDir = join5(homedir2(), ".claudish");
@@ -53853,6 +53866,8 @@ class BaseGeminiHandler {
     try {
       const total = input + output;
       const leftPct = this.contextWindow > 0 ? Math.max(0, Math.min(100, Math.round((this.contextWindow - total) / this.contextWindow * 100))) : 100;
+      const pricing = this.getPricing();
+      const displayModelName = this.modelName.replace(/^(go|g|gemini|v|vertex|oai|mmax|mm|kimi|moonshot|glm|zhipu|oc|ollama|lmstudio|vllm|mlx)[\/:]/, "");
       const data = {
         input_tokens: input,
         output_tokens: output,
@@ -53860,6 +53875,10 @@ class BaseGeminiHandler {
         total_cost: this.sessionTotalCost,
         context_window: this.contextWindow,
         context_left_percent: leftPct,
+        is_free: pricing.isFree || false,
+        is_estimated: pricing.isEstimate || false,
+        provider_name: this.getProviderName(),
+        model_name: displayModelName,
         updated_at: Date.now()
       };
       const claudishDir = join6(homedir3(), ".claudish");
@@ -54366,6 +54385,9 @@ var init_gemini_handler = __esm(() => {
         "x-goog-api-key": this.apiKey
       };
     }
+    getProviderName() {
+      return "Gemini API";
+    }
   };
 });
 
@@ -54851,6 +54873,7 @@ class GeminiCodeAssistHandler {
       const total = input + output;
       const leftPct = this.contextWindow > 0 ? Math.max(0, Math.min(100, Math.round((this.contextWindow - total) / this.contextWindow * 100))) : 100;
       const pricing = this.getPricing();
+      const displayModelName = this.modelName.replace(/^(go|g|gemini|v|vertex|oai|mmax|mm|kimi|moonshot|glm|zhipu|oc|ollama|lmstudio|vllm|mlx)[\/:]/, "");
       const data = {
         input_tokens: input,
         output_tokens: output,
@@ -54860,6 +54883,8 @@ class GeminiCodeAssistHandler {
         context_left_percent: leftPct,
         is_free: pricing.isFree || false,
         is_estimated: pricing.isEstimate || false,
+        provider_name: "Gemini Free",
+        model_name: displayModelName,
         updated_at: Date.now()
       };
       const claudishDir = join8(homedir5(), ".claudish");
@@ -55331,6 +55356,7 @@ class OpenAIHandler {
     try {
       const total = input + output;
       const leftPct = this.contextWindow > 0 ? Math.max(0, Math.min(100, Math.round((this.contextWindow - total) / this.contextWindow * 100))) : 100;
+      const displayModelName = this.modelName.replace(/^(go|g|gemini|v|vertex|oai|mmax|mm|kimi|moonshot|glm|zhipu|oc|ollama|lmstudio|vllm|mlx)[\/:]/, "");
       const data = {
         input_tokens: input,
         output_tokens: output,
@@ -55338,6 +55364,8 @@ class OpenAIHandler {
         total_cost: this.sessionTotalCost,
         context_window: this.contextWindow,
         context_left_percent: leftPct,
+        provider_name: "OpenAI",
+        model_name: displayModelName,
         updated_at: Date.now()
       };
       if (isEstimate) {
@@ -55906,6 +55934,17 @@ class AnthropicCompatHandler {
     try {
       const total = input + output;
       const leftPct = this.contextWindow > 0 ? Math.max(0, Math.min(100, Math.round((this.contextWindow - total) / this.contextWindow * 100))) : 100;
+      const providerNameMap = {
+        minimax: "MiniMax",
+        kimi: "Kimi",
+        moonshot: "Kimi",
+        glm: "GLM",
+        zhipu: "GLM"
+      };
+      const providerKey = this.provider.name.toLowerCase();
+      const providerDisplayName = providerNameMap[providerKey] || this.provider.name;
+      const pricing = this.getPricing();
+      const displayModelName = this.modelName.replace(/^(go|g|gemini|v|vertex|oai|mmax|mm|kimi|moonshot|glm|zhipu|oc|ollama|lmstudio|vllm|mlx)[\/:]/, "");
       const data = {
         input_tokens: input,
         output_tokens: output,
@@ -55913,6 +55952,10 @@ class AnthropicCompatHandler {
         total_cost: this.sessionTotalCost,
         context_window: this.contextWindow,
         context_left_percent: leftPct,
+        is_free: pricing.isFree || false,
+        is_estimated: pricing.isEstimate || false,
+        provider_name: providerDisplayName,
+        model_name: displayModelName,
         updated_at: Date.now()
       };
       const claudishDir = join10(homedir7(), ".claudish");
@@ -56245,6 +56288,8 @@ class VertexOAuthHandler {
     try {
       const total = input + output;
       const leftPct = this.contextWindow > 0 ? Math.max(0, Math.min(100, Math.round((this.contextWindow - total) / this.contextWindow * 100))) : 100;
+      const pricing = this.getPricing();
+      const displayModelName = this.modelName.replace(/^(go|g|gemini|v|vertex|oai|mmax|mm|kimi|moonshot|glm|zhipu|oc|ollama|lmstudio|vllm|mlx)[\/:]/, "");
       const data = {
         input_tokens: input,
         output_tokens: output,
@@ -56252,6 +56297,10 @@ class VertexOAuthHandler {
         total_cost: this.sessionTotalCost,
         context_window: this.contextWindow,
         context_left_percent: leftPct,
+        is_free: pricing.isFree || false,
+        is_estimated: pricing.isEstimate || false,
+        provider_name: "Vertex AI",
+        model_name: displayModelName,
         updated_at: Date.now()
       };
       const claudishDir = join12(homedir9(), ".claudish");
@@ -57695,6 +57744,7 @@ class OllamaCloudHandler {
       this.sessionOutputTokens += output;
       const sessionTotal = this.sessionInputTokens + this.sessionOutputTokens;
       const cost = calculateCost(this.provider.name, this.modelName, this.sessionInputTokens, this.sessionOutputTokens);
+      const displayModelName = this.modelName.replace(/^(go|g|gemini|v|vertex|oai|mmax|mm|kimi|moonshot|glm|zhipu|oc|ollama|lmstudio|vllm|mlx)[\/:]/, "");
       const data = {
         input_tokens: this.sessionInputTokens,
         output_tokens: this.sessionOutputTokens,
@@ -57702,6 +57752,8 @@ class OllamaCloudHandler {
         total_cost: cost,
         context_window: 0,
         context_left_percent: 100,
+        provider_name: "OllamaCloud",
+        model_name: displayModelName,
         updated_at: Date.now()
       };
       const claudishDir = join13(homedir10(), ".claudish");
@@ -62287,6 +62339,13 @@ NOTES:
 ENVIRONMENT VARIABLES:
   Claudish automatically loads .env file from current directory.
 
+  Claude Code installation:
+  CLAUDE_PATH                     Custom path to Claude Code binary (optional)
+                                  Default search order:
+                                  1. CLAUDE_PATH env var
+                                  2. ~/.claude/local/claude (local install)
+                                  3. Global PATH (npm -g install)
+
   API Keys (at least one required for cloud models):
   OPENROUTER_API_KEY              OpenRouter API key (default backend)
   GEMINI_API_KEY                  Google Gemini API key (for g/ prefix)
@@ -62944,8 +63003,8 @@ __export(exports_claude_runner, {
   checkClaudeInstalled: () => checkClaudeInstalled
 });
 import { spawn } from "node:child_process";
-import { writeFileSync as writeFileSync15, unlinkSync as unlinkSync3, mkdirSync as mkdirSync13 } from "node:fs";
-import { tmpdir as tmpdir2 } from "node:os";
+import { writeFileSync as writeFileSync15, unlinkSync as unlinkSync3, mkdirSync as mkdirSync13, existsSync as existsSync11 } from "node:fs";
+import { tmpdir as tmpdir2, homedir as homedir13 } from "node:os";
 import { join as join19 } from "node:path";
 function isWindows2() {
   return process.platform === "win32";
@@ -62964,6 +63023,7 @@ const CYAN = "\\x1b[96m";
 const YELLOW = "\\x1b[93m";
 const GREEN = "\\x1b[92m";
 const MAGENTA = "\\x1b[95m";
+const BLUE = "\\x1b[94m";
 const DIM = "\\x1b[2m";
 const RESET = "\\x1b[0m";
 const BOLD = "\\x1b[1m";
@@ -62976,8 +63036,7 @@ process.stdin.on('end', () => {
     let dir = path.basename(process.cwd());
     if (dir.length > 15) dir = dir.substring(0, 12) + '...';
 
-    let ctx = 100, cost = 0;
-    const model = process.env.CLAUDISH_ACTIVE_MODEL_NAME || 'unknown';
+    let ctx = 100, cost = 0, providerName = '', model = 'unknown';
     const isLocal = process.env.CLAUDISH_IS_LOCAL === 'true';
 
     let isFree = false, isEstimated = false;
@@ -62987,7 +63046,15 @@ process.stdin.on('end', () => {
       ctx = tokens.context_left_percent || 100;
       isFree = tokens.is_free || false;
       isEstimated = tokens.is_estimated || false;
+      providerName = tokens.provider_name || '';
+      // Read model_name from token file, fallback to env var
+      model = tokens.model_name || process.env.CLAUDISH_ACTIVE_MODEL_NAME || 'unknown';
+      // Strip provider prefix if not already stripped in token file
+      model = model.replace(/^(go|g|gemini|v|vertex|oai|mmax|mm|kimi|moonshot|glm|zhipu|oc|ollama|lmstudio|vllm|mlx)[\\/:]/, '');
     } catch (e) {
+      // Fallback to env var if token file not available
+      const rawModel = process.env.CLAUDISH_ACTIVE_MODEL_NAME || 'unknown';
+      model = rawModel.replace(/^(go|g|gemini|v|vertex|oai|mmax|mm|kimi|moonshot|glm|zhipu|oc|ollama|lmstudio|vllm|mlx)[\\/:]/, '');
       try {
         const json = JSON.parse(input);
         cost = json.total_cost_usd || 0;
@@ -63004,7 +63071,13 @@ process.stdin.on('end', () => {
     } else {
       costDisplay = '$' + cost.toFixed(3);
     }
-    console.log(\`\${CYAN}\${BOLD}\${dir}\${RESET} \${DIM}•\${RESET} \${YELLOW}\${model}\${RESET} \${DIM}•\${RESET} \${GREEN}\${costDisplay}\${RESET} \${DIM}•\${RESET} \${MAGENTA}\${ctx}%\${RESET}\`);
+
+    // Build status line with provider name
+    if (providerName) {
+      console.log(\`\${CYAN}\${BOLD}\${dir}\${RESET} \${DIM}•\${RESET} \${BLUE}\${providerName}\${RESET} \${DIM}•\${RESET} \${YELLOW}\${model}\${RESET} \${DIM}•\${RESET} \${GREEN}\${costDisplay}\${RESET} \${DIM}•\${RESET} \${MAGENTA}\${ctx}%\${RESET}\`);
+    } else {
+      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');
   }
@@ -63013,7 +63086,7 @@ process.stdin.on('end', () => {
   writeFileSync15(scriptPath, script, "utf-8");
   return scriptPath;
 }
-function createTempSettingsFile(modelDisplay, port) {
+function createTempSettingsFile(port) {
   const homeDir = process.env.HOME || process.env.USERPROFILE || tmpdir2();
   const claudishDir = join19(homeDir, ".claudish");
   try {
@@ -63031,10 +63104,11 @@ function createTempSettingsFile(modelDisplay, port) {
     const YELLOW3 = "\\033[93m";
     const GREEN3 = "\\033[92m";
     const MAGENTA = "\\033[95m";
+    const BLUE = "\\033[94m";
     const DIM2 = "\\033[2m";
     const RESET3 = "\\033[0m";
     const BOLD3 = "\\033[1m";
-    statusCommand = `JSON=$(cat) && DIR=$(basename "$(pwd)") && [ \${#DIR} -gt 15 ] && DIR="\${DIR:0:12}..." || true && CTX=100 && COST="0" && IS_FREE="false" && IS_EST="false" && if [ -f "${tokenFilePath}" ]; then TOKENS=$(cat "${tokenFilePath}" 2>/dev/null | tr -d ' \\n') && REAL_CTX=$(echo "$TOKENS" | grep -o '"context_left_percent":[0-9]*' | grep -o '[0-9]*') && if [ ! -z "$REAL_CTX" ]; then CTX="$REAL_CTX"; fi && REAL_COST=$(echo "$TOKENS" | grep -o '"total_cost":[0-9.]*' | cut -d: -f2) && if [ ! -z "$REAL_COST" ]; then COST="$REAL_COST"; fi && IS_FREE=$(echo "$TOKENS" | grep -o '"is_free":[a-z]*' | cut -d: -f2) && IS_EST=$(echo "$TOKENS" | grep -o '"is_estimated":[a-z]*' | cut -d: -f2); fi && if [ "$CLAUDISH_IS_LOCAL" = "true" ]; then COST_DISPLAY="LOCAL"; elif [ "$IS_FREE" = "true" ]; then COST_DISPLAY="FREE"; elif [ "$IS_EST" = "true" ]; then COST_DISPLAY=$(printf "~\\$%.3f" "$COST"); else COST_DISPLAY=$(printf "\\$%.3f" "$COST"); fi && printf "${CYAN3}${BOLD3}%s${RESET3} ${DIM2}•${RESET3} ${YELLOW3}%s${RESET3} ${DIM2}•${RESET3} ${GREEN3}%s${RESET3} ${DIM2}•${RESET3} ${MAGENTA}%s%%${RESET3}\\n" "$DIR" "$CLAUDISH_ACTIVE_MODEL_NAME" "$COST_DISPLAY" "$CTX"`;
+    statusCommand = `JSON=$(cat) && DIR=$(basename "$(pwd)") && [ \${#DIR} -gt 15 ] && DIR="\${DIR:0:12}..." || true && CTX=100 && COST="0" && IS_FREE="false" && IS_EST="false" && PROVIDER="" && MODEL="unknown" && if [ -f "${tokenFilePath}" ]; then TOKENS=$(cat "${tokenFilePath}" 2>/dev/null | tr -d ' \\n') && REAL_CTX=$(echo "$TOKENS" | grep -o '"context_left_percent":[0-9]*' | grep -o '[0-9]*') && if [ ! -z "$REAL_CTX" ]; then CTX="$REAL_CTX"; fi && REAL_COST=$(echo "$TOKENS" | grep -o '"total_cost":[0-9.]*' | cut -d: -f2) && if [ ! -z "$REAL_COST" ]; then COST="$REAL_COST"; fi && IS_FREE=$(echo "$TOKENS" | grep -o '"is_free":[a-z]*' | cut -d: -f2) && IS_EST=$(echo "$TOKENS" | grep -o '"is_estimated":[a-z]*' | cut -d: -f2) && PROVIDER=$(echo "$TOKENS" | grep -o '"provider_name":"[^"]*"' | cut -d: -f2 | tr -d '"') && MODEL=$(echo "$TOKENS" | grep -o '"model_name":"[^"]*"' | cut -d: -f2 | tr -d '"'); fi && if [ -z "$MODEL" ] || [ "$MODEL" = "unknown" ]; then RAW_MODEL="$CLAUDISH_ACTIVE_MODEL_NAME" && MODEL=$(echo "$RAW_MODEL" | sed -E 's/^(go|g|gemini|v|vertex|oai|mmax|mm|kimi|moonshot|glm|zhipu|oc|ollama|lmstudio|vllm|mlx)[\\/:]//'); fi && MODEL=$(echo "$MODEL" | sed -E 's/^(go|g|gemini|v|vertex|oai|mmax|mm|kimi|moonshot|glm|zhipu|oc|ollama|lmstudio|vllm|mlx)[\\/:]//') && if [ "$CLAUDISH_IS_LOCAL" = "true" ]; then COST_DISPLAY="LOCAL"; elif [ "$IS_FREE" = "true" ]; then COST_DISPLAY="FREE"; elif [ "$IS_EST" = "true" ]; then COST_DISPLAY=$(printf "~\\$%.3f" "$COST"); else COST_DISPLAY=$(printf "\\$%.3f" "$COST"); fi && if [ ! -z "$PROVIDER" ]; then printf "${CYAN3}${BOLD3}%s${RESET3} ${DIM2}•${RESET3} ${BLUE}%s${RESET3} ${DIM2}•${RESET3} ${YELLOW3}%s${RESET3} ${DIM2}•${RESET3} ${GREEN3}%s${RESET3} ${DIM2}•${RESET3} ${MAGENTA}%s%%${RESET3}\\n" "$DIR" "$PROVIDER" "$MODEL" "$COST_DISPLAY" "$CTX"; else printf "${CYAN3}${BOLD3}%s${RESET3} ${DIM2}•${RESET3} ${YELLOW3}%s${RESET3} ${DIM2}•${RESET3} ${GREEN3}%s${RESET3} ${DIM2}•${RESET3} ${MAGENTA}%s%%${RESET3}\\n" "$DIR" "$MODEL" "$COST_DISPLAY" "$CTX"; fi`;
   }
   const settings = {
     statusLine: {
@@ -63050,7 +63124,7 @@ async function runClaudeWithProxy(config3, proxyUrl) {
   const modelId = config3.model || "unknown";
   const portMatch = proxyUrl.match(/:(\d+)/);
   const port = portMatch ? portMatch[1] : "unknown";
-  const tempSettingsPath = createTempSettingsFile(modelId, port);
+  const tempSettingsPath = createTempSettingsFile(port);
   const claudeArgs = [];
   claudeArgs.push("--settings", tempSettingsPath);
   if (config3.interactive) {
@@ -63109,10 +63183,21 @@ async function runClaudeWithProxy(config3, proxyUrl) {
     log2(`[claudish] Arguments: ${claudeArgs.join(" ")}
 `);
   }
-  const proc = spawn("claude", claudeArgs, {
+  const claudeBinary = await findClaudeBinary();
+  if (!claudeBinary) {
+    console.error("Error: Claude Code CLI not found");
+    console.error("Install it from: https://claude.com/claude-code");
+    console.error(`
+Or set CLAUDE_PATH to your custom installation:`);
+    const home = homedir13();
+    const localPath = isWindows2() ? join19(home, ".claude", "local", "claude.exe") : join19(home, ".claude", "local", "claude");
+    console.error(`  export CLAUDE_PATH=${localPath}`);
+    process.exit(1);
+  }
+  const proc = spawn(claudeBinary, claudeArgs, {
     env,
     stdio: "inherit",
-    shell: isWindows2()
+    shell: false
   });
   setupSignalHandlers(proc, tempSettingsPath, config3.quiet);
   const exitCode = await new Promise((resolve) => {
@@ -63141,23 +63226,43 @@ function setupSignalHandlers(proc, tempSettingsPath, quiet) {
     });
   }
 }
-async function checkClaudeInstalled() {
+async function findClaudeBinary() {
+  const isWindows3 = process.platform === "win32";
+  if (process.env.CLAUDE_PATH) {
+    if (existsSync11(process.env.CLAUDE_PATH)) {
+      return process.env.CLAUDE_PATH;
+    }
+  }
+  const home = homedir13();
+  const localPath = isWindows3 ? join19(home, ".claude", "local", "claude.exe") : join19(home, ".claude", "local", "claude");
+  if (existsSync11(localPath)) {
+    return localPath;
+  }
   try {
-    const isWindows3 = process.platform === "win32";
     const command = isWindows3 ? "where" : "which";
     const proc = spawn(command, ["claude"], {
-      stdio: "ignore",
+      stdio: "pipe",
       shell: isWindows3
     });
+    let output = "";
+    proc.stdout?.on("data", (data) => {
+      output += data.toString();
+    });
     const exitCode = await new Promise((resolve) => {
       proc.on("exit", (code) => {
         resolve(code ?? 1);
       });
     });
-    return exitCode === 0;
-  } catch {
-    return false;
-  }
+    if (exitCode === 0 && output.trim()) {
+      return output.trim().split(`
+`)[0];
+    }
+  } catch {}
+  return null;
+}
+async function checkClaudeInstalled() {
+  const binary = await findClaudeBinary();
+  return binary !== null;
 }
 var init_claude_runner = __esm(() => {
   init_dist3();
@@ -63275,8 +63380,11 @@ async function runCli() {
       }
     }
     if (!await checkClaudeInstalled2()) {
-      console.error("Error: Claude Code CLI is not installed");
+      console.error("Error: Claude Code CLI not found");
       console.error("Install it from: https://claude.com/claude-code");
+      console.error("");
+      console.error("Or if you have a local installation, set CLAUDE_PATH:");
+      console.error("  export CLAUDE_PATH=~/.claude/local/claude");
       process.exit(1);
     }
     if (cliConfig.interactive && !cliConfig.monitor && !cliConfig.openrouterApiKey) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "3.7.2",
+  "version": "3.7.4",
   "description": "Run Claude Code with any model - OpenRouter, Ollama, LM Studio & local models",
   "type": "module",
   "main": "./dist/index.js",