free-coding-models 0.5.95 → 0.5.97

package/src/core/config.js

@@ -23,8 +23,14 @@
  *       "scaleway":   "scw-xxx",
  *       "googleai":   "AIza...",
  *       "cloudflare": "cf-xxx",
- *       "zai":        "zai-xxx"
+ *       "zai":        "zai-xxx",
+ *       "onomeo":     "${ONOMEO_API_KEY}"
  *     },
+ *
+ * 📖 ${VAR} values (issue #196): an apiKeys entry of the form "${MY_VAR}" is
+ * 📖 resolved from the environment at read time. The file on disk keeps the
+ * 📖 placeholder so secrets never land on disk; saveConfig never writes the
+ * 📖 resolved value back. See getApiKey() and resolveEnvPlaceholderValue().
  *     "providers": {
  *       "nvidia":     { "enabled": true },
  *       "groq":       { "enabled": true },
@@ -105,6 +111,8 @@ import { readFileSync, writeFileSync, existsSync, mkdirSync, readdirSync, statSy
 import { homedir } from 'node:os'
 import { join, resolve, dirname } from 'node:path'
 import { syncShellEnv } from './shell-env.js'
+import { DEFAULT_LOCALE, normalizeLocale } from './i18n/index.js'
+import { resolveEnvPlaceholderValue } from './utils.js'
 
 // 📖 Expand leading ~/ or bare ~ to homedir so --config-dir ~/.config/... works.
 // 📖 resolve() alone does NOT expand tilde, it would treat ~ as a literal folder.
@@ -188,6 +196,7 @@ const ENV_VARS = {
   requesty:   'REQUESTY_API_KEY',
   orcarouter: 'ORCAROUTER_API_KEY',
   'vercel-gateway': ['VERCEL_AI_GATEWAY_API_KEY', 'AI_GATEWAY_API_KEY'],
+  onomeo:     'ONOMEO_API_KEY',
 }
 
 // 📖 Smart Router defaults are intentionally conservative: balanced probing,
@@ -331,6 +340,7 @@ function normalizeSettingsSection(settings) {
   delete safeSettings.footerHidden
   return {
     ...safeSettings,
+    language: normalizeLocale(safeSettings.language),
     hideUnconfiguredModels: typeof safeSettings.hideUnconfiguredModels === 'boolean' ? safeSettings.hideUnconfiguredModels : true,
     favoritesPinnedAndSticky: typeof safeSettings.favoritesPinnedAndSticky === 'boolean' ? safeSettings.favoritesPinnedAndSticky : false,
     runAiSpeedTestOnStartup: typeof safeSettings.runAiSpeedTestOnStartup === 'boolean' ? safeSettings.runAiSpeedTestOnStartup : false,
@@ -456,10 +466,22 @@ function normalizeRouterFailover(failover, routerFallback = {}) {
   const rawStreamStall = numberOrNull(safeFailover.streamStallTimeoutMs) ?? numberOrNull(routerFallback.streamStallTimeoutMs)
   const rawRequestTimeout = numberOrNull(safeFailover.requestTimeoutMs) ?? numberOrNull(routerFallback.requestTimeoutMs)
 
+  // 📖 router-v2 documented failover fields (lastResortModel,
+  // bodyReadTimeoutMs, totalBudgetMs, contentValidation — docs/router-v2.md)
+  // are read by the daemon at runtime but are not v1 knobs normalized here.
+  // Carry any unknown keys through so they survive load()/save() round-trips
+  // instead of being silently dropped from the on-disk config.
+  const v1FailoverKeys = new Set(['maxRetries', 'streamStallTimeoutMs', 'requestTimeoutMs'])
+  const extras = {}
+  for (const key of Object.keys(safeFailover)) {
+    if (!v1FailoverKeys.has(key)) extras[key] = safeFailover[key]
+  }
+
   return {
     maxRetries: normalizePositiveInteger(rawMaxRetries, DEFAULT_ROUTER_SETTINGS.failover.maxRetries, { min: 1, max: 20 }),
     streamStallTimeoutMs: normalizePositiveInteger(rawStreamStall, DEFAULT_ROUTER_SETTINGS.failover.streamStallTimeoutMs, { min: 1000, max: 120000 }),
     requestTimeoutMs: normalizePositiveInteger(rawRequestTimeout, DEFAULT_ROUTER_SETTINGS.failover.requestTimeoutMs, { min: 1000, max: 300000 }),
+    ...extras,
   }
 }
 
@@ -1142,12 +1164,14 @@ export function getApiKey(config, providerKey) {
   // 📖 but every consumer (ping Authorization header, tool env vars, daemon) needs
   // 📖 a single string: an array would stringify to "key1,key2" and get a
   // 📖 guaranteed 401. Return the first non-empty entry instead.
+  // 📖 ${VAR} references (issue #196) are expanded here so the file on disk
+  // 📖 can stay secret-free while every consumer gets the real value.
   const key = config?.apiKeys?.[providerKey]
   if (Array.isArray(key)) {
     const firstUsable = key.find(k => typeof k === 'string' && k.length > 0)
-    return firstUsable ?? null
+    return firstUsable !== undefined ? resolveEnvPlaceholderValue(firstUsable) : null
   }
-  if (key) return key
+  if (key) return resolveEnvPlaceholderValue(key)
 
   return null
 }
@@ -1295,6 +1319,7 @@ export function isProviderEnabled(config, providerKey) {
  */
 export function _emptyProfileSettings() {
   return {
+    language: DEFAULT_LOCALE,
     tierFilter: null,     // 📖 null = show all tiers, or 'S'|'A'|'B'|'C'|'D'
     sortColumn: 'avg',    // 📖 default sort column
     sortAsc: true,        // 📖 true = ascending (fastest first for latency)

package/src/core/i18n/index.js

@@ -0,0 +1,49 @@
+import en from './locales/en.js'
+import zhCN from './locales/zh-CN.js'
+
+export const DEFAULT_LOCALE = 'en'
+export const SUPPORTED_LOCALES = Object.freeze(['en', 'zh-CN'])
+export const LOCALE_OPTIONS = Object.freeze([
+  Object.freeze({ value: 'en', labelKey: 'common.language.english' }),
+  Object.freeze({ value: 'zh-CN', labelKey: 'common.language.simplifiedChinese' }),
+])
+
+const dictionaries = Object.freeze({ en, 'zh-CN': zhCN })
+let activeLocale = DEFAULT_LOCALE
+
+export function normalizeLocale(locale) {
+  return SUPPORTED_LOCALES.includes(locale) ? locale : DEFAULT_LOCALE
+}
+
+export function getLocale() {
+  return activeLocale
+}
+
+export function setLocale(locale) {
+  activeLocale = normalizeLocale(locale)
+  return activeLocale
+}
+
+export function createTranslator(resources = dictionaries) {
+  return (locale, key, values = {}) => {
+    if (typeof key !== 'string') return ''
+    const active = normalizeLocale(locale)
+    const localized = resources[active]?.[key]
+    const fallback = resources[DEFAULT_LOCALE]?.[key]
+    const template = typeof localized === 'string' ? localized : typeof fallback === 'string' ? fallback : key
+    return template.replace(/\{([\w.]+)\}/g, (match, name) => {
+      const value = values && Object.prototype.hasOwnProperty.call(values, name) ? values[name] : undefined
+      return value === null || value === undefined ? match : String(value)
+    })
+  }
+}
+
+const translate = createTranslator()
+
+export function t(key, values = {}) {
+  return translate(activeLocale, key, values)
+}
+
+export function hasTranslation(locale, key) {
+  return typeof dictionaries[normalizeLocale(locale)]?.[key] === 'string'
+}