@simonyea/holysheep-cli 1.6.9 → 1.6.10

package/README.md

@@ -218,6 +218,7 @@ A: OpenClaw 需要 Node.js 20+，运行 `node --version` 确认版本后重试
 
 ## Changelog
 
+- **v1.6.10** — 将可运行的 OpenClaw runtime（含 npx 回退）视为已安装，避免 Windows/Node 环境下重复提示安装；同时修复 Droid CLI 的 GPT `/v1` 接入地址并同步写入 `~/.factory/config.json`
 - **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 代理账号创建逻辑

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.6.9",
+  "version": "1.6.10",
   "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/openai
+ * - GPT 走 OpenAI 兼容入口:   https://api.holysheep.ai/v1
  * - Claude 走 Anthropic 入口: https://api.holysheep.ai
  * - MiniMax 走 Anthropic 入口: https://api.holysheep.ai/minimax
  */
@@ -13,12 +13,13 @@ 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: '/openai',
+    baseUrlSuffix: '',
     displayName: 'GPT-5.4',
     provider: 'openai',
   },
@@ -66,6 +67,24 @@ 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
@@ -84,13 +103,17 @@ function normalizeSelectedModels(selectedModels) {
   return models.length > 0 ? models : DEFAULT_MODELS.map((item, index) => ({ ...item, index }))
 }
 
-function buildCustomModels(apiKey, baseUrlAnthropic, selectedModels) {
-  const rootUrl = String(baseUrlAnthropic || '').replace(/\/+$/, '')
+function buildCustomModels(apiKey, baseUrlAnthropic, baseUrlOpenAI, selectedModels) {
+  const anthropicRootUrl = String(baseUrlAnthropic || '').replace(/\/+$/, '')
+  const openaiRootUrl = String(baseUrlOpenAI || '').replace(/\/+$/, '')
   return normalizeSelectedModels(selectedModels).map((item) => ({
     model: item.model,
     id: item.id,
     index: item.index,
-    baseUrl: `${rootUrl}${item.baseUrlSuffix}`,
+    baseUrl:
+      item.provider === 'openai'
+        ? `${openaiRootUrl}${item.baseUrlSuffix}`
+        : `${anthropicRootUrl}${item.baseUrlSuffix}`,
     apiKey,
     displayName: item.displayName,
     maxOutputTokens: 64000,
@@ -108,25 +131,37 @@ module.exports = {
   isConfigured() {
     const settings = readSettings()
     const customModels = Array.isArray(settings.customModels) ? settings.customModels : []
-    return customModels.some((item) =>
-      typeof item.baseUrl === 'string' && item.baseUrl.includes('api.holysheep.ai')
-    )
+    if (customModels.some(isHolySheepModel)) return true
+
+    const legacy = readLegacyConfig()
+    const legacyModels = Array.isArray(legacy.customModels) ? legacy.customModels : []
+    return legacyModels.some(isHolySheepModel)
   },
-  configure(apiKey, baseUrlAnthropic, _baseUrlOpenAI, _primaryModel, selectedModels) {
+  configure(apiKey, baseUrlAnthropic, baseUrlOpenAI, _primaryModel, selectedModels) {
+    const nextModels = buildCustomModels(apiKey, baseUrlAnthropic, baseUrlOpenAI, selectedModels)
+
     const settings = readSettings()
     const preservedModels = Array.isArray(settings.customModels)
-      ? settings.customModels.filter(
-          (item) => !(typeof item.baseUrl === 'string' && item.baseUrl.includes('api.holysheep.ai'))
-        )
+      ? settings.customModels.filter((item) => !isHolySheepModel(item))
       : []
-
     settings.customModels = [
-      ...buildCustomModels(apiKey, baseUrlAnthropic, selectedModels),
+      ...nextModels,
       ...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,
@@ -135,11 +170,15 @@ module.exports = {
   reset() {
     const settings = readSettings()
     if (Array.isArray(settings.customModels)) {
-      settings.customModels = settings.customModels.filter(
-        (item) => !(typeof item.baseUrl === 'string' && item.baseUrl.includes('api.holysheep.ai'))
-      )
+      settings.customModels = settings.customModels.filter((item) => !isHolySheepModel(item))
     }
     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

@@ -452,7 +452,7 @@ module.exports = {
   id: 'openclaw',
 
   checkInstalled() {
-    return hasOpenClawBinary()
+    return detectRuntime().available
   },
 
   detectRuntime,