@simonyea/holysheep-cli 1.6.3 → 1.6.6

package/README.md

@@ -218,6 +218,9 @@ A: OpenClaw 需要 Node.js 20+，运行 `node --version` 确认版本后重试
 
 ## Changelog
 
+- **v1.6.6** — 修复 Droid CLI 的 GPT-5.4 配置残留问题，同时同步 `~/.factory/settings.json` 和 `~/.factory/config.json`，统一使用 `openai + https://api.holysheep.ai/v1`
+- **v1.6.5** — 修复 HolySheep 对 Droid Responses API 的兼容
+- **v1.6.4** — 修复 OpenClaw 的 npx 运行时检测，避免配置后页面仍卡在 Unauthorized / 未连接状态
 - **v1.6.3** — OpenClaw 默认模型改为 GPT-5.4，并继续保留 Claude 模型切换能力
 - **v1.6.2** — 修复 OpenClaw 配置误判与 npx 回退，端口冲突时自动切换空闲端口，并补充 Doctor 诊断
 - **v1.6.0** — 新增 Droid CLI 一键配置，默认写入 GPT-5.4 / Sonnet 4.6 / Opus 4.6 / MiniMax 2.7 Highspeed / Haiku 4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.6.3",
+  "version": "1.6.6",
   "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

@@ -74,34 +74,31 @@ function firstLine(text) {
 }
 
 function getOpenClawVersion(preferNpx = false) {
-  const result = runOpenClaw(['--version'], { preferNpx, timeout: 15000 })
+  const result = runOpenClaw(['--version'], { preferNpx, timeout: preferNpx ? 60000 : 15000 })
   if (result.status !== 0) return null
   return firstLine(result.stdout)
 }
 
 function detectRuntime() {
   const preferNpx = getPreferredRuntime()
-  const version = getOpenClawVersion(preferNpx)
+  const preferredRunner = getRunner(preferNpx)
 
-  if (version) {
-    const runner = getRunner(preferNpx)
+  if (preferredRunner) {
     return {
       available: true,
-      via: runner?.via || (preferNpx ? 'npx' : 'binary'),
-      command: runner?.label || (preferNpx ? 'npx openclaw' : 'openclaw'),
-      version,
+      via: preferredRunner.via,
+      command: preferredRunner.label,
+      version: getOpenClawVersion(preferNpx),
     }
   }
 
-  if (!preferNpx && hasNpx()) {
-    const fallbackVersion = getOpenClawVersion(true)
-    if (fallbackVersion) {
-      return {
-        available: true,
-        via: 'npx',
-        command: 'npx openclaw',
-        version: fallbackVersion,
-      }
+  const fallbackRunner = getRunner(true)
+  if (fallbackRunner) {
+    return {
+      available: true,
+      via: fallbackRunner.via,
+      command: fallbackRunner.label,
+      version: getOpenClawVersion(true),
     }
   }
 
@@ -192,6 +189,11 @@ function getLaunchCommand(port = getConfiguredGatewayPort()) {
   return `${runtime} gateway --port ${port}`
 }
 
+function getDashboardCommand() {
+  const runtime = module.exports._lastRuntimeCommand || (hasOpenClawBinary() ? 'openclaw' : 'npx openclaw')
+  return `${runtime} dashboard --no-open`
+}
+
 function buildProviderName(baseUrl, prefix) {
   const hostname = new URL(baseUrl).hostname.replace(/\./g, '-')
   return `${prefix}-${hostname}`
@@ -365,6 +367,18 @@ function _startGateway(port, preferNpx = false, preferService = true) {
   return false
 }
 
+function getDashboardUrl(port, preferNpx = false) {
+  const result = runOpenClaw(['dashboard', '--no-open'], {
+    preferNpx,
+    timeout: preferNpx ? 60000 : 20000,
+  })
+  if (result.status === 0) {
+    const match = String(result.stdout || '').match(/Dashboard URL:\s*(\S+)/)
+    if (match) return match[1]
+  }
+  return `http://127.0.0.1:${port}/`
+}
+
 module.exports = {
   name: 'OpenClaw',
   id: 'openclaw',
@@ -455,10 +469,11 @@ module.exports = {
       console.log(chalk.yellow('  ⚠️  Gateway 启动中，稍等几秒后刷新浏览器'))
     }
 
-    const dashUrl = `http://127.0.0.1:${gatewayPort}/`
-    console.log(chalk.cyan('\n  → 浏览器打开（无需 token）:'))
+    const dashUrl = getDashboardUrl(gatewayPort, runtime.via === 'npx')
+    console.log(chalk.cyan('\n  → 浏览器打开（推荐使用此地址）:'))
     console.log(chalk.bold.cyan(`     ${dashUrl}`))
     console.log(chalk.gray(`     默认模型: ${OPENCLAW_DEFAULT_MODEL}`))
+    console.log(chalk.gray('     如在 Windows 上打开裸 http://127.0.0.1:PORT/ 仍报 Unauthorized，请使用上面的 dashboard 地址'))
 
     return {
       file: CONFIG_FILE,
@@ -480,11 +495,15 @@ module.exports = {
   get hint() {
     return `Gateway 已启动，默认模型为 ${getConfiguredPrimaryModel() || OPENCLAW_DEFAULT_MODEL}`
   },
-  get launchCmd() {
-    return getLaunchCommand(getConfiguredGatewayPort())
+  get launchSteps() {
+    const port = getConfiguredGatewayPort()
+    return [
+      { cmd: getLaunchCommand(port), note: '先启动 OpenClaw Gateway' },
+      { cmd: getDashboardCommand(), note: '再生成/打开可直接连接的 Dashboard 地址（推荐）' },
+    ]
   },
   get launchNote() {
-    return `🌐 打开浏览器: http://127.0.0.1:${getConfiguredGatewayPort()}/`
+    return `🌐 推荐运行 ${getDashboardCommand()}；Windows 上不要只打开裸 http://127.0.0.1:${getConfiguredGatewayPort()}/`
   },
   installCmd: 'npm install -g openclaw@latest',
   docsUrl: 'https://docs.openclaw.ai',