claudish 4.2.0 → 4.3.0

package/dist/index.js

@@ -28165,9 +28165,9 @@ var init_profile_config = __esm(() => {
         name: "default",
         description: "Default profile - balanced performance and cost",
         models: {
-          opus: "x-ai/grok-3-beta",
-          sonnet: "x-ai/grok-code-fast-1",
-          haiku: "google/gemini-2.5-flash"
+          opus: "xai@grok-4-0709",
+          sonnet: "xai@grok-4-1-fast-reasoning",
+          haiku: "xai@grok-code-fast-1"
         },
         createdAt: new Date().toISOString(),
         updatedAt: new Date().toISOString()
@@ -31144,6 +31144,13 @@ const DIM = "\\x1b[2m";
 const RESET = "\\x1b[0m";
 const BOLD = "\\x1b[1m";
 
+// Format token count with k/M suffix
+function formatTokens(n) {
+  if (n >= 1000000) return (n / 1000000).toFixed(n >= 10000000 ? 0 : 1).replace(/\\.0$/, '') + 'M';
+  if (n >= 1000) return (n / 1000).toFixed(n >= 10000 ? 0 : 1).replace(/\\.0$/, '') + 'k';
+  return String(n);
+}
+
 let input = '';
 process.stdin.setEncoding('utf8');
 process.stdin.on('data', chunk => input += chunk);
@@ -31152,7 +31159,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;
+    let ctx = 100, cost = 0, inputTokens = 0, contextWindow = 0;
     const model = process.env.CLAUDISH_ACTIVE_MODEL_NAME || 'unknown';
     const isLocal = process.env.CLAUDISH_IS_LOCAL === 'true';
 
@@ -31161,6 +31168,8 @@ process.stdin.on('end', () => {
       const tokens = JSON.parse(fs.readFileSync('${escapedTokenPath}', 'utf-8'));
       cost = tokens.total_cost || 0;
       ctx = tokens.context_left_percent || 100;
+      inputTokens = tokens.input_tokens || 0;
+      contextWindow = tokens.context_window || 0;
       isFree = tokens.is_free || false;
       isEstimated = tokens.is_estimated || false;
       providerName = tokens.provider_name || '';
@@ -31182,7 +31191,12 @@ process.stdin.on('end', () => {
       costDisplay = '$' + cost.toFixed(3);
     }
     const modelDisplay = providerName ? providerName + ' ' + model : model;
-    console.log(\`\${CYAN}\${BOLD}\${dir}\${RESET} \${DIM}•\${RESET} \${YELLOW}\${modelDisplay}\${RESET} \${DIM}•\${RESET} \${GREEN}\${costDisplay}\${RESET} \${DIM}•\${RESET} \${MAGENTA}\${ctx}%\${RESET}\`);
+    // Format context display: "96% (37k/1M)" or just "96%" if no token data
+    let ctxDisplay = ctx + '%';
+    if (inputTokens > 0 && contextWindow > 0) {
+      ctxDisplay = ctx + '% (' + formatTokens(inputTokens) + '/' + formatTokens(contextWindow) + ')';
+    }
+    console.log(\`\${CYAN}\${BOLD}\${dir}\${RESET} \${DIM}•\${RESET} \${YELLOW}\${modelDisplay}\${RESET} \${DIM}•\${RESET} \${GREEN}\${costDisplay}\${RESET} \${DIM}•\${RESET} \${MAGENTA}\${ctxDisplay}\${RESET}\`);
   } catch (e) {
     console.log('claudish');
   }
@@ -31212,7 +31226,8 @@ 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" && IS_FREE="false" && IS_EST="false" && PROVIDER="" && 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'"' -f4); 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 && MODEL_DISPLAY="$CLAUDISH_ACTIVE_MODEL_NAME" && if [ ! -z "$PROVIDER" ]; then MODEL_DISPLAY="$PROVIDER $MODEL_DISPLAY"; fi && printf "${CYAN2}${BOLD2}%s${RESET2} ${DIM2}•${RESET2} ${YELLOW2}%s${RESET2} ${DIM2}•${RESET2} ${GREEN2}%s${RESET2} ${DIM2}•${RESET2} ${MAGENTA}%s%%${RESET2}\\n" "$DIR" "$MODEL_DISPLAY" "$COST_DISPLAY" "$CTX"`;
+    const formatTokensBash = `fmt_tok() { local n=\${1:-0}; if [ "$n" -ge 1000000 ]; then echo "$((n/1000000))M"; elif [ "$n" -ge 1000 ]; then echo "$((n/1000))k"; else echo "$n"; fi; }`;
+    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="" && IN_TOK=0 && CTX_WIN=0 && ${formatTokensBash} && 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 && IN_TOK=$(echo "$TOKENS" | grep -o '"input_tokens":[0-9]*' | grep -o '[0-9]*') && CTX_WIN=$(echo "$TOKENS" | grep -o '"context_window":[0-9]*' | grep -o '[0-9]*') && 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'"' -f4); 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 && MODEL_DISPLAY="$CLAUDISH_ACTIVE_MODEL_NAME" && if [ ! -z "$PROVIDER" ]; then MODEL_DISPLAY="$PROVIDER $MODEL_DISPLAY"; fi && if [ "$IN_TOK" -gt 0 ] 2>/dev/null && [ "$CTX_WIN" -gt 0 ] 2>/dev/null; then CTX_DISPLAY="$CTX% ($(fmt_tok $IN_TOK)/$(fmt_tok $CTX_WIN))"; else CTX_DISPLAY="$CTX%"; fi && printf "${CYAN2}${BOLD2}%s${RESET2} ${DIM2}•${RESET2} ${YELLOW2}%s${RESET2} ${DIM2}•${RESET2} ${GREEN2}%s${RESET2} ${DIM2}•${RESET2} ${MAGENTA}%s${RESET2}\\n" "$DIR" "$MODEL_DISPLAY" "$COST_DISPLAY" "$CTX_DISPLAY"`;
   }
   const settings = {
     statusLine: {
@@ -31263,14 +31278,18 @@ async function runClaudeWithProxy(config3, proxyUrl) {
     ...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
+    CLAUDISH_IS_LOCAL: isLocalModel ? "true" : "false"
   };
   if (config3.monitor) {
     delete env.ANTHROPIC_API_KEY;
     delete env.ANTHROPIC_AUTH_TOKEN;
+    if (modelId && modelId !== "unknown") {
+      env[ENV.ANTHROPIC_MODEL] = modelId;
+      env[ENV.ANTHROPIC_SMALL_FAST_MODEL] = modelId;
+    }
   } else {
+    env[ENV.ANTHROPIC_MODEL] = modelId;
+    env[ENV.ANTHROPIC_SMALL_FAST_MODEL] = modelId;
     env.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY || "sk-ant-api03-placeholder-not-used-proxy-handles-auth-with-openrouter-key-xxxxxxxxxxxxxxxxxxxxx";
     env.ANTHROPIC_AUTH_TOKEN = process.env.ANTHROPIC_AUTH_TOKEN || "placeholder-token-not-used-proxy-handles-auth";
   }
@@ -32656,14 +32675,11 @@ async function parseArgs(args) {
   if (config3.monitor) {
     if (process.env.ANTHROPIC_API_KEY && process.env.ANTHROPIC_API_KEY.includes("placeholder")) {
       delete process.env.ANTHROPIC_API_KEY;
-      if (!config3.quiet) {
-        console.log("[claudish] Removed placeholder API key - Claude Code will use native authentication");
-      }
     }
     if (!config3.quiet) {
       console.log("[claudish] Monitor mode enabled - proxying to real Anthropic API");
-      console.log("[claudish] API key will be extracted from Claude Code's requests");
-      console.log("[claudish] Ensure you are logged in to Claude Code (claude auth login)");
+      console.log("[claudish] Using Claude Code's native authentication");
+      console.log("[claudish] Tip: Run with --debug to see request/response details");
     }
   }
   config3.openrouterApiKey = process.env[ENV.OPENROUTER_API_KEY];
@@ -33658,7 +33674,7 @@ async function fetchZenModels() {
     return [];
   }
 }
-var __filename5, __dirname5, VERSION = "4.2.0", CACHE_MAX_AGE_DAYS3 = 2, MODELS_JSON_PATH, CLAUDISH_CACHE_DIR3, ALL_MODELS_JSON_PATH2;
+var __filename5, __dirname5, VERSION = "4.3.0", CACHE_MAX_AGE_DAYS3 = 2, MODELS_JSON_PATH, CLAUDISH_CACHE_DIR3, ALL_MODELS_JSON_PATH2;
 var init_cli = __esm(() => {
   init_config();
   init_model_loader();
@@ -35916,20 +35932,15 @@ class NativeHandler {
   baseUrl;
   constructor(apiKey) {
     this.apiKey = apiKey;
-    this.baseUrl = process.env.ANTHROPIC_BASE_URL || "https://api.anthropic.com";
+    this.baseUrl = "https://api.anthropic.com";
   }
   async handle(c, payload) {
     const originalHeaders = c.req.header();
     const target = payload.model;
     log(`
 === [NATIVE] Claude Code → Anthropic API Request ===`);
-    const extractedApiKey = originalHeaders["x-api-key"] || originalHeaders["authorization"] || this.apiKey;
-    if (!extractedApiKey) {
-      log("[Native] WARNING: No API key found in headers!");
-      log("[Native] Looking for: x-api-key or authorization header");
-    } else {
-      log(`API Key found: ${maskCredential(extractedApiKey)}`);
-    }
+    log(`[Native] x-api-key: ${originalHeaders["x-api-key"] ? maskCredential(originalHeaders["x-api-key"]) : "(not set)"}`);
+    log(`[Native] authorization: ${originalHeaders["authorization"] ? maskCredential(originalHeaders["authorization"]) : "(not set)"}`);
     log(`Request body (Model: ${target}):`);
     log(`=== End Request ===
 `);
@@ -35942,8 +35953,6 @@ class NativeHandler {
     }
     if (originalHeaders["x-api-key"]) {
       headers["x-api-key"] = originalHeaders["x-api-key"];
-    } else if (extractedApiKey) {
-      headers["x-api-key"] = extractedApiKey;
     }
     if (originalHeaders["anthropic-beta"]) {
       headers["anthropic-beta"] = originalHeaders["anthropic-beta"];
@@ -36238,24 +36247,7 @@ var init_gemini_adapter = __esm(() => {
       this.inReasoningBlock = false;
       this.reasoningBlockDepth = 0;
     }
-    prepareRequest(request, originalRequest) {
-      if (originalRequest.thinking) {
-        const { budget_tokens } = originalRequest.thinking;
-        const modelId = this.modelId || "";
-        if (modelId.includes("gemini-3")) {
-          const level = budget_tokens >= 16000 ? "high" : "low";
-          request.thinking_level = level;
-          log(`[GeminiAdapter] Mapped budget ${budget_tokens} -> thinking_level: ${level}`);
-        } else {
-          const MAX_GEMINI_BUDGET = 24576;
-          const budget = Math.min(budget_tokens, MAX_GEMINI_BUDGET);
-          request.thinking_config = {
-            thinking_budget: budget
-          };
-          log(`[GeminiAdapter] Mapped budget ${budget_tokens} -> thinking_config.thinking_budget: ${budget}`);
-        }
-        delete request.thinking;
-      }
+    prepareRequest(request, _originalRequest) {
       return request;
     }
     extractThoughtSignaturesFromReasoningDetails(reasoningDetails) {
@@ -59592,6 +59584,23 @@ var init_local_provider_handler = __esm(() => {
 });
 
 // src/handlers/shared/gemini-schema.ts
+function sanitizeToolNameForGemini(name) {
+  if (!name || typeof name !== "string" || name.trim() === "") {
+    log(`[GeminiSchema] Skipping tool with invalid name: ${JSON.stringify(name)}`);
+    return null;
+  }
+  let sanitized = name.replace(/[^a-zA-Z0-9_.\-:]/g, "_");
+  if (!/^[a-zA-Z_]/.test(sanitized)) {
+    sanitized = "_" + sanitized;
+  }
+  if (sanitized.length > 64) {
+    sanitized = sanitized.substring(0, 64);
+  }
+  if (sanitized !== name) {
+    log(`[GeminiSchema] Sanitized tool name: "${name}" -> "${sanitized}"`);
+  }
+  return sanitized;
+}
 function normalizeType(type) {
   if (!type)
     return "string";
@@ -59641,13 +59650,27 @@ function convertToolsToGemini(tools) {
   if (!tools || tools.length === 0) {
     return;
   }
-  const functionDeclarations = tools.map((tool) => ({
-    name: tool.name,
-    description: tool.description,
-    parameters: sanitizeSchemaForGemini(tool.input_schema)
-  }));
+  const functionDeclarations = [];
+  for (const tool of tools) {
+    const sanitizedName = sanitizeToolNameForGemini(tool.name);
+    if (!sanitizedName) {
+      log(`[GeminiSchema] Skipping tool without valid name: ${JSON.stringify(tool)}`);
+      continue;
+    }
+    functionDeclarations.push({
+      name: sanitizedName,
+      description: tool.description || "",
+      parameters: sanitizeSchemaForGemini(tool.input_schema)
+    });
+  }
+  if (functionDeclarations.length === 0) {
+    return;
+  }
   return [{ functionDeclarations }];
 }
+var init_gemini_schema = __esm(() => {
+  init_logger();
+});
 
 // src/handlers/shared/gemini-queue.ts
 class GeminiRequestQueue {
@@ -60381,6 +60404,7 @@ var init_base_gemini_handler = __esm(() => {
   init_transform();
   init_logger();
   init_openai_compat();
+  init_gemini_schema();
   init_gemini_retry();
   init_remote_provider_types();
 });
@@ -60876,6 +60900,7 @@ var init_gemini_codeassist_handler = __esm(() => {
   init_transform();
   init_logger();
   init_openai_compat();
+  init_gemini_schema();
   init_gemini_retry();
   init_gemini_oauth();
 });
@@ -60909,7 +60934,21 @@ class OpenAIHandler {
   }
   setContextWindow() {
     const model = this.modelName.toLowerCase();
-    if (model.includes("gpt-4o") || model.includes("gpt-4-turbo")) {
+    if (model.includes("grok-4.1-fast") || model.includes("grok-4-1-fast")) {
+      this.contextWindow = 2000000;
+    } else if (model.includes("grok-4-fast")) {
+      this.contextWindow = 2000000;
+    } else if (model.includes("grok-code-fast")) {
+      this.contextWindow = 256000;
+    } else if (model.includes("grok-4")) {
+      this.contextWindow = 256000;
+    } else if (model.includes("grok-3")) {
+      this.contextWindow = 131072;
+    } else if (model.includes("grok-2")) {
+      this.contextWindow = 131072;
+    } else if (model.includes("grok")) {
+      this.contextWindow = 131072;
+    } else if (model.includes("gpt-4o") || model.includes("gpt-4-turbo")) {
       this.contextWindow = 128000;
     } else if (model.includes("gpt-5")) {
       this.contextWindow = 256000;
@@ -64307,13 +64346,14 @@ async function runCli() {
       console.error("  export CLAUDE_PATH=~/.claude/local/claude");
       process.exit(1);
     }
-    if (cliConfig.interactive && !cliConfig.monitor && !cliConfig.model) {
+    const hasProfileTiers = cliConfig.modelOpus || cliConfig.modelSonnet || cliConfig.modelHaiku || cliConfig.modelSubagent;
+    if (cliConfig.interactive && !cliConfig.monitor && !cliConfig.model && !hasProfileTiers) {
       cliConfig.model = await selectModel2({ freeOnly: cliConfig.freeOnly });
       console.log("");
     }
-    if (!cliConfig.interactive && !cliConfig.monitor && !cliConfig.model) {
+    if (!cliConfig.interactive && !cliConfig.monitor && !cliConfig.model && !hasProfileTiers) {
       console.error("Error: Model must be specified in non-interactive mode");
-      console.error("Use --model <model> flag or set CLAUDISH_MODEL environment variable");
+      console.error("Use --model <model> flag, set CLAUDISH_MODEL env var, or use --profile");
       console.error("Try: claudish --list-models");
       process.exit(1);
     }

package/package.json

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