@simonyea/holysheep-cli 1.6.8 → 1.6.9

package/README.md

@@ -218,6 +218,7 @@ A: OpenClaw 需要 Node.js 20+，运行 `node --version` 确认版本后重试
 
 ## Changelog
 
+- **v1.6.9** — 保留 OpenClaw 的 MiniMax 配置，并为 MiniMax 使用独立 provider id，避免与 Claude provider 冲突；在 OpenClaw 2026.3.13 下改为提示精确 `/model` 切换命令，而不是停止配置 MiniMax
 - **v1.6.8** — 修复 Codex 重复写入 `config.toml` 导致的 duplicate key，并修复 OpenClaw 在 Windows 下的安装检测；针对 OpenClaw 2026.3.13 的模型路由回归，临时跳过 MiniMax 避免 `model not allowed`
 - **v1.6.7** — OpenClaw 配置新增 `MiniMax-M2.7-highspeed`，并补齐节点迁移脚本中的 SSH 代理账号创建逻辑
 - **v1.6.6** — 修复 Droid CLI 的 GPT-5.4 配置残留问题，同时同步 `~/.factory/settings.json` 和 `~/.factory/config.json`，统一使用 `openai + https://api.holysheep.ai/v1`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "Claude Code/Cursor/Cline API relay for China — ¥1=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
   "keywords": [
     "openai-china",

package/src/tools/droid.js

@@ -3,7 +3,7 @@
  * 配置文件: ~/.factory/settings.json
  *
  * 使用 Droid 原生 customModels 配置 HolySheep 的多个模型入口：
- * - GPT 走 OpenAI 兼容入口:   https://api.holysheep.ai/v1
+ * - GPT 走 OpenAI 兼容入口:   https://api.holysheep.ai/openai
  * - Claude 走 Anthropic 入口: https://api.holysheep.ai
  * - MiniMax 走 Anthropic 入口: https://api.holysheep.ai/minimax
  */
@@ -13,13 +13,12 @@ const os = require('os')
 
 const CONFIG_DIR = path.join(os.homedir(), '.factory')
 const SETTINGS_FILE = path.join(CONFIG_DIR, 'settings.json')
-const LEGACY_CONFIG_FILE = path.join(CONFIG_DIR, 'config.json')
 
 const DEFAULT_MODELS = [
   {
     model: 'gpt-5.4',
     id: 'custom:gpt-5.4-0',
-    baseUrlSuffix: '',
+    baseUrlSuffix: '/openai',
     displayName: 'GPT-5.4',
     provider: 'openai',
   },
@@ -67,24 +66,6 @@ function writeSettings(data) {
   fs.writeFileSync(SETTINGS_FILE, JSON.stringify(data, null, 2), 'utf8')
 }
 
-function readLegacyConfig() {
-  try {
-    if (fs.existsSync(LEGACY_CONFIG_FILE)) {
-      return JSON.parse(fs.readFileSync(LEGACY_CONFIG_FILE, 'utf8'))
-    }
-  } catch {}
-  return {}
-}
-
-function writeLegacyConfig(data) {
-  fs.mkdirSync(CONFIG_DIR, { recursive: true })
-  fs.writeFileSync(LEGACY_CONFIG_FILE, JSON.stringify(data, null, 2), 'utf8')
-}
-
-function isHolySheepModel(item) {
-  return typeof item?.baseUrl === 'string' && item.baseUrl.includes('api.holysheep.ai')
-}
-
 function normalizeSelectedModels(selectedModels) {
   const selected = new Set(
     Array.isArray(selectedModels) && selectedModels.length > 0
@@ -103,17 +84,13 @@ function normalizeSelectedModels(selectedModels) {
   return models.length > 0 ? models : DEFAULT_MODELS.map((item, index) => ({ ...item, index }))
 }
 
-function buildCustomModels(apiKey, baseUrlAnthropic, baseUrlOpenAI, selectedModels) {
-  const anthropicRootUrl = String(baseUrlAnthropic || '').replace(/\/+$/, '')
-  const openaiRootUrl = String(baseUrlOpenAI || '').replace(/\/+$/, '')
+function buildCustomModels(apiKey, baseUrlAnthropic, selectedModels) {
+  const rootUrl = String(baseUrlAnthropic || '').replace(/\/+$/, '')
   return normalizeSelectedModels(selectedModels).map((item) => ({
     model: item.model,
     id: item.id,
     index: item.index,
-    baseUrl:
-      item.provider === 'openai'
-        ? `${openaiRootUrl}${item.baseUrlSuffix}`
-        : `${anthropicRootUrl}${item.baseUrlSuffix}`,
+    baseUrl: `${rootUrl}${item.baseUrlSuffix}`,
     apiKey,
     displayName: item.displayName,
     maxOutputTokens: 64000,
@@ -131,37 +108,25 @@ module.exports = {
   isConfigured() {
     const settings = readSettings()
     const customModels = Array.isArray(settings.customModels) ? settings.customModels : []
-    if (customModels.some(isHolySheepModel)) return true
-
-    const legacy = readLegacyConfig()
-    const legacyModels = Array.isArray(legacy.customModels) ? legacy.customModels : []
-    return legacyModels.some(isHolySheepModel)
+    return customModels.some((item) =>
+      typeof item.baseUrl === 'string' && item.baseUrl.includes('api.holysheep.ai')
+    )
   },
-  configure(apiKey, baseUrlAnthropic, baseUrlOpenAI, _primaryModel, selectedModels) {
-    const nextModels = buildCustomModels(apiKey, baseUrlAnthropic, baseUrlOpenAI, selectedModels)
-
+  configure(apiKey, baseUrlAnthropic, _baseUrlOpenAI, _primaryModel, selectedModels) {
     const settings = readSettings()
     const preservedModels = Array.isArray(settings.customModels)
-      ? settings.customModels.filter((item) => !isHolySheepModel(item))
+      ? settings.customModels.filter(
+          (item) => !(typeof item.baseUrl === 'string' && item.baseUrl.includes('api.holysheep.ai'))
+        )
       : []
+
     settings.customModels = [
-      ...nextModels,
+      ...buildCustomModels(apiKey, baseUrlAnthropic, selectedModels),
       ...preservedModels,
     ]
     settings.logoAnimation = 'off'
     writeSettings(settings)
 
-    const legacy = readLegacyConfig()
-    const preservedLegacyModels = Array.isArray(legacy.customModels)
-      ? legacy.customModels.filter((item) => !isHolySheepModel(item))
-      : []
-    legacy.customModels = [
-      ...nextModels,
-      ...preservedLegacyModels,
-    ]
-    legacy.logoAnimation = 'off'
-    writeLegacyConfig(legacy)
-
     return {
       file: SETTINGS_FILE,
       hot: true,
@@ -170,15 +135,11 @@ module.exports = {
   reset() {
     const settings = readSettings()
     if (Array.isArray(settings.customModels)) {
-      settings.customModels = settings.customModels.filter((item) => !isHolySheepModel(item))
+      settings.customModels = settings.customModels.filter(
+        (item) => !(typeof item.baseUrl === 'string' && item.baseUrl.includes('api.holysheep.ai'))
+      )
     }
     writeSettings(settings)
-
-    const legacy = readLegacyConfig()
-    if (Array.isArray(legacy.customModels)) {
-      legacy.customModels = legacy.customModels.filter((item) => !isHolySheepModel(item))
-    }
-    writeLegacyConfig(legacy)
   },
   getConfigPath() { return SETTINGS_FILE },
   hint: '已写入 ~/.factory/settings.json；重启 Droid 后可见 HolySheep 模型列表',

package/src/tools/openclaw.js

@@ -148,22 +148,12 @@ function isRoutingRegressionVersion(version) {
   return OPENCLAW_ROUTING_REGRESSION_VERSION.test(String(version || '').trim())
 }
 
-function sanitizeSelectedModelsForRuntime(selectedModels, runtimeVersion) {
-  if (!isRoutingRegressionVersion(runtimeVersion)) {
-    return { models: selectedModels, warning: '' }
+function getRoutingRegressionWarning(runtimeVersion, minimaxModelRef) {
+  if (!isRoutingRegressionVersion(runtimeVersion) || !minimaxModelRef) {
+    return ''
   }
 
-  const originalModels = Array.isArray(selectedModels) ? selectedModels : []
-  const filteredModels = originalModels.filter((model) => !model.startsWith('MiniMax-'))
-
-  if (filteredModels.length === originalModels.length) {
-    return { models: selectedModels, warning: '' }
-  }
-
-  return {
-    models: filteredModels,
-    warning: '当前 OpenClaw 2026.3.13 存在 provider 路由回归，已暂时跳过 MiniMax 模型，避免 /model 和网页切换时报 model not allowed。升级 OpenClaw 后可重新运行 hs setup 恢复。',
-  }
+  return `当前 OpenClaw 2026.3.13 存在 provider 路由回归，但 HolySheep 仍会保留 MiniMax 配置。若网页模型切换失败，请直接输入 /model ${minimaxModelRef}，或升级 OpenClaw 后再试。`
 }
 
 function readConfig() {
@@ -293,7 +283,7 @@ function buildManagedPlan(apiKey, baseUrlAnthropic, baseUrlOpenAI, selectedModel
 
   const openaiProviderName = buildProviderName(baseUrlOpenAI, 'custom-openai')
   const anthropicProviderName = buildProviderName(baseUrlAnthropic, 'custom-anthropic')
-  const minimaxProviderName = buildProviderName(`${baseUrlAnthropic.replace(/\/+$/, '')}/minimax`, 'custom-anthropic')
+  const minimaxProviderName = buildProviderName(`${baseUrlAnthropic.replace(/\/+$/, '')}/minimax`, 'custom-minimax')
 
   const providers = {
     [openaiProviderName]: {
@@ -329,6 +319,7 @@ function buildManagedPlan(apiKey, baseUrlAnthropic, baseUrlOpenAI, selectedModel
     providers,
     managedModelRefs,
     primaryRef: `${openaiProviderName}/${OPENCLAW_DEFAULT_MODEL}`,
+    minimaxRef: minimaxModels[0] ? `${minimaxProviderName}/${minimaxModels[0]}` : '',
   }
 }
 
@@ -485,11 +476,6 @@ module.exports = {
     }
     this._lastRuntimeCommand = runtime.command
 
-    const sanitizedSelection = sanitizeSelectedModelsForRuntime(selectedModels, runtime.version)
-    if (sanitizedSelection.warning) {
-      console.log(chalk.yellow(`  ⚠️  ${sanitizedSelection.warning}`))
-    }
-
     runOpenClaw(['gateway', 'stop'], { preferNpx: runtime.via === 'npx' })
 
     const gatewayPort = findAvailableGatewayPort(DEFAULT_GATEWAY_PORT)
@@ -530,15 +516,20 @@ module.exports = {
       console.log(chalk.yellow('  ⚠️  onboard 失败，使用备用配置...'))
     }
 
-    writeManagedConfig(
+    const plan = writeManagedConfig(
       result.status === 0 ? readConfig() : {},
       apiKey,
       baseUrlAnthropic,
       baseUrlOpenAI,
-      sanitizedSelection.models,
+      selectedModels,
       gatewayPort,
     )
 
+    const routingRegressionWarning = getRoutingRegressionWarning(runtime.version, plan.minimaxRef)
+    if (routingRegressionWarning) {
+      console.log(chalk.yellow(`  ⚠️  ${routingRegressionWarning}`))
+    }
+
     _disableGatewayAuth(runtime.via === 'npx')
     const serviceReady = _installGatewayService(gatewayPort, runtime.via === 'npx')