@freeclaude/cli 3.0.6 → 3.0.7

package/dist/cli.mjs

@@ -8,7 +8,7 @@ import { spawnSync } from 'node:child_process'
 import { homedir } from 'node:os'
 import { join } from 'node:path'
 
-const CONFIG_PATH = join(homedir(), '.freeclaude.json')
+const CONFIG_PATH = process.env.FREECLAUDE_CONFIG_PATH || join(homedir(), '.freeclaude.json')
 const CLAUDE_SETTINGS_PATH = join(homedir(), '.claude', 'settings.json')
 const WHISPER_MODEL_PATH = join(
   homedir(),
@@ -18,6 +18,128 @@ const WHISPER_MODEL_PATH = join(
   'ggml-small.bin',
 )
 
+const KNOWN_PROVIDER_DEFINITIONS = [
+  { slug: 'zai', baseUrl: 'https://api.z.ai/api/coding/paas/v4', models: ['glm-5', 'glm-4.7-flash', 'glm-4.7'] },
+  { slug: 'gemini', baseUrl: 'https://generativelanguage.googleapis.com/v1beta/openai', models: ['gemini-2.5-flash', 'gemini-2.5-pro', 'gemini-2.5-flash-lite'] },
+  { slug: 'groq', baseUrl: 'https://api.groq.com/openai/v1', models: ['llama-3.3-70b-versatile', 'llama-4-scout-17b-16e-instruct', 'qwen-qwq-32b'] },
+  { slug: 'cerebras', baseUrl: 'https://api.cerebras.ai/v1', models: ['llama-4-scout-17b-16e', 'llama3.1-8b', 'qwen-2.5-32b'] },
+  { slug: 'siliconflow', baseUrl: 'https://api.siliconflow.cn/v1', models: ['deepseek-ai/DeepSeek-V3', 'Qwen/Qwen3-8B'] },
+  { slug: 'qwen', baseUrl: 'https://dashscope.aliyuncs.com/compatible-mode/v1', models: ['qwen3-235b-a22b', 'qwen-max', 'qwen-plus', 'qwen-turbo', 'qwen-coder-plus'] },
+  { slug: 'sambanova', baseUrl: 'https://api.sambanova.ai/v1', models: ['Meta-Llama-3.3-70B-Instruct', 'DeepSeek-R1-Distill-Llama-70B'] },
+  { slug: 'ollama', baseUrl: 'http://localhost:11434/v1', models: ['qwen2.5:3b', 'qwen2.5:7b', 'llama3.2', 'deepseek-r1:8b'] },
+  { slug: 'lmstudio', baseUrl: 'http://localhost:1234/v1', models: ['(auto-detected)'] },
+  { slug: 'openai', baseUrl: 'https://api.openai.com/v1', models: ['gpt-4o', 'gpt-4o-mini', 'o3-mini'] },
+  { slug: 'deepseek', baseUrl: 'https://api.deepseek.com/v1', models: ['deepseek-chat', 'deepseek-reasoner', 'deepseek-coder'] },
+  { slug: 'mistral', baseUrl: 'https://api.mistral.ai/v1', models: ['mistral-large-latest', 'codestral-latest'] },
+  { slug: 'openrouter', baseUrl: 'https://openrouter.ai/api/v1', models: ['anthropic/claude-sonnet-4', 'google/gemini-2.5-flash', 'openai/gpt-4o', 'deepseek/deepseek-chat'] },
+  { slug: 'together', baseUrl: 'https://api.together.xyz/v1', models: ['meta-llama/Llama-4-Maverick-17B-128E-Instruct', 'Qwen/Qwen3-235B-A22B'] },
+  { slug: 'fireworks', baseUrl: 'https://api.fireworks.ai/inference/v1', models: ['accounts/fireworks/models/llama-v4p-70b-instruct'] },
+  { slug: 'deepinfra', baseUrl: 'https://api.deepinfra.com/v1/openai', models: ['meta-llama/Llama-4-Maverick-17B-128E-Instruct', 'Qwen/Qwen3-235B-A22B'] },
+  { slug: 'perplexity', baseUrl: 'https://api.perplexity.ai', models: ['sonar-pro', 'sonar-reasoning'] },
+  { slug: 'huggingface', baseUrl: 'https://api-inference.huggingface.co/v1', models: ['(any HF model ID)'] },
+]
+
+function normalizeBaseUrl(baseUrl) {
+  return (baseUrl || '').trim().replace(/\/+$/, '').toLowerCase()
+}
+
+function normalizeName(name) {
+  return (name || '').trim().toLowerCase()
+}
+
+function findKnownProviderDefinition(provider) {
+  const baseUrl = normalizeBaseUrl(provider?.baseUrl)
+  if (baseUrl) {
+    const byBaseUrl = KNOWN_PROVIDER_DEFINITIONS.find(entry => normalizeBaseUrl(entry.baseUrl) === baseUrl)
+    if (byBaseUrl) return byBaseUrl
+  }
+
+  const name = normalizeName(provider?.name)
+  if (!name) return undefined
+  return KNOWN_PROVIDER_DEFINITIONS.find(entry => normalizeName(entry.slug) === name)
+}
+
+function resolveConfiguredModel(provider, model) {
+  const trimmedModel = typeof model === 'string' ? model.trim() : ''
+  const knownProvider = findKnownProviderDefinition(provider)
+
+  if (!trimmedModel) {
+    return knownProvider?.models?.[0]
+  }
+
+  if (!knownProvider) {
+    return trimmedModel
+  }
+
+  if (/^\d+$/.test(trimmedModel)) {
+    const index = Number.parseInt(trimmedModel, 10) - 1
+    if (index >= 0 && index < knownProvider.models.length) {
+      return knownProvider.models[index]
+    }
+  }
+
+  return trimmedModel
+}
+
+function normalizeConfig(config) {
+  const providers = Array.isArray(config?.providers)
+    ? config.providers.map(provider => ({ ...provider }))
+    : []
+  let changed = false
+
+  for (const provider of providers) {
+    const resolvedModel = resolveConfiguredModel(provider, provider.model)
+    if (resolvedModel && resolvedModel !== provider.model) {
+      provider.model = resolvedModel
+      changed = true
+    }
+  }
+
+  const normalized = { ...config, providers }
+  const activeProvider = normalized.activeProvider
+    ? providers.find(provider => provider.name === normalized.activeProvider)
+    : providers.length === 1
+      ? providers[0]
+      : undefined
+  const resolvedActiveModel = resolveConfiguredModel(
+    activeProvider ?? { name: normalized.activeProvider },
+    normalized.activeModel,
+  )
+
+  if (
+    resolvedActiveModel &&
+    normalized.activeModel &&
+    resolvedActiveModel !== normalized.activeModel
+  ) {
+    normalized.activeModel = resolvedActiveModel
+    changed = true
+  }
+
+  return { config: normalized, changed }
+}
+
+function getOrderedConfiguredProviders(config) {
+  const providers = [...(config.providers || [])].sort(
+    (a, b) => (a.priority ?? 99) - (b.priority ?? 99),
+  )
+
+  if (!config.activeProvider) {
+    return providers
+  }
+
+  const activeIdx = providers.findIndex(provider => provider.name === config.activeProvider)
+  if (activeIdx < 0) {
+    return providers
+  }
+
+  const [activeProvider] = providers.splice(activeIdx, 1)
+  if (activeProvider && config.activeModel) {
+    activeProvider.model = resolveConfiguredModel(activeProvider, config.activeModel) || activeProvider.model
+  }
+  providers.unshift(activeProvider)
+  return providers
+}
+
 function resolveKey(key) {
   return (typeof key === 'string' && key.startsWith('env:'))
     ? (process.env[key.slice(4)] || '')
@@ -25,16 +147,20 @@ function resolveKey(key) {
 }
 
 function hasValidProviders() {
-  if (!existsSync(CONFIG_PATH)) return false
-  try {
-    const c = JSON.parse(readFileSync(CONFIG_PATH, 'utf-8'))
-    return Array.isArray(c.providers) && c.providers.some(p => resolveKey(p.apiKey))
-  } catch { return false }
+  const config = loadConfig()
+  return Array.isArray(config.providers) && config.providers.some(p => resolveKey(p.apiKey))
 }
 
 function loadConfig() {
   if (!existsSync(CONFIG_PATH)) return {}
-  try { return JSON.parse(readFileSync(CONFIG_PATH, 'utf-8')) }
+  try {
+    const config = JSON.parse(readFileSync(CONFIG_PATH, 'utf-8'))
+    const normalized = normalizeConfig(config)
+    if (normalized.changed) {
+      saveConfig(normalized.config)
+    }
+    return normalized.config
+  }
   catch { return {} }
 }
 
@@ -50,24 +176,7 @@ function applyConfig() {
   const config = loadConfig()
   if (!Array.isArray(config.providers)) return
 
-  const providers = config.providers
-
-  // 1. Try activeProvider first (remembers last choice)
-  if (config.activeProvider) {
-    const active = providers.find(p => p.name === config.activeProvider && p.model === config.activeModel)
-    if (active) {
-      const key = resolveKey(active.apiKey)
-      if (key) {
-        process.env.OPENAI_API_KEY = key
-        process.env.OPENAI_BASE_URL = active.baseUrl
-        process.env.OPENAI_MODEL = active.model
-        return
-      }
-    }
-  }
-
-  // 2. Fallback: first valid provider by priority
-  for (const p of [...providers].sort((a, b) => (a.priority ?? 99) - (b.priority ?? 99))) {
+  for (const p of getOrderedConfiguredProviders(config)) {
     const key = resolveKey(p.apiKey)
     if (key) {
       process.env.OPENAI_API_KEY = key
@@ -102,18 +211,7 @@ function getPrimaryConfiguredProvider() {
     return null
   }
 
-  if (config.activeProvider) {
-    const active = config.providers.find(
-      p => p.name === config.activeProvider && p.model === config.activeModel,
-    )
-    if (active && (resolveKey(active.apiKey) || isLocalProviderUrl(active.baseUrl))) {
-      return active
-    }
-  }
-
-  for (const provider of [...config.providers].sort(
-    (a, b) => (a.priority ?? 99) - (b.priority ?? 99),
-  )) {
+  for (const provider of getOrderedConfiguredProviders(config)) {
     if (resolveKey(provider.apiKey) || isLocalProviderUrl(provider.baseUrl)) {
       return provider
     }
@@ -236,7 +334,7 @@ async function main() {
 
   // --version
   if (args.length === 1 && (args[0] === '--version' || args[0] === '-v' || args[0] === '-V')) {
-    console.log('3.0.5 (FreeClaude)')
+    console.log('3.0.6 (FreeClaude)')
     return
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freeclaude/cli",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "FreeClaude - Claude Code без авторизации. Работает с ZAI, Qwen, DeepSeek, Ollama и любыми OpenAI-compatible API.",
   "type": "module",
   "bin": {