@simonyea/holysheep-cli 1.7.133 → 1.7.134

package/README.md

@@ -225,6 +225,7 @@ A: OpenClaw 需要 Node.js 20+，运行 `node --version` 确认版本后重试
 
 ## Changelog
 
+- **v1.7.134** — 修复并发配置/Worker 路径下 Droid CLI 的 GPT-5.4 BYOK 配置：GPT 走 `generic-chat-completion-api + https://api.holysheep.ai/v1`，避免误走 Anthropic `/v1/messages`
 - **v1.7.53** — 修复 `hs claude` 在绝对 URL 代理路径下未透传 `x-hs-node-proxied` 的问题，避免同一会话里部分 Claude 请求被后端误判为非可信代理请求并随机触发 403
 - **v1.7.52** — 将 `hs claude` 重构为本地 API 入口 + CONNECT 兜底代理：Claude Anthropic 请求默认先进入本地 process proxy，再补齐 HolySheep 会话头后转发，降低独立二进制 Claude Code 漏代理导致的 403
 - **v1.7.51** — 修复 `hs claude` 在 Claude Code 独立二进制版本上的整进程代理：自动识别脚本入口 / 独立二进制并切换到 `NODE_OPTIONS` 注入或 `HTTP(S)_PROXY` 模式；同时增强 `hs doctor` 的 Claude 代理诊断

package/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.133",
+  "version": "1.7.134",
   "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.",
+  "scripts": {
+    "test": "node tests/droid.test.js"
+  },
   "keywords": [
     "openai-china",
     "claude-china",

package/src/tools/droid.js

@@ -6,6 +6,10 @@
  * - GPT 走 OpenAI 兼容入口:   https://api.holysheep.ai/v1
  * - Claude 走 Anthropic 入口: https://api.holysheep.ai
  * - MiniMax 走 Anthropic 入口: https://api.holysheep.ai/minimax
+ *
+ * Droid 的 "openai" BYOK provider 使用 Responses API；HolySheep 的 GPT
+ * 入口当前要求 /v1/chat/completions，所以 GPT 模型必须使用
+ * generic-chat-completion-api，不能使用 anthropic，也不能使用 openai。
  */
 const fs = require('fs')
 const path = require('path')
@@ -21,7 +25,8 @@ const DEFAULT_MODELS = [
     id: 'custom:gpt-5.4-0',
     baseUrlSuffix: '',
     displayName: 'GPT-5.4',
-    provider: 'anthropic',
+    provider: 'generic-chat-completion-api',
+    route: 'openai',
   },
   {
     model: 'claude-sonnet-4-6',
@@ -29,6 +34,7 @@ const DEFAULT_MODELS = [
     baseUrlSuffix: '',
     displayName: 'Sonnet 4.6',
     provider: 'anthropic',
+    route: 'anthropic',
   },
   {
     model: 'claude-opus-4-6',
@@ -36,6 +42,7 @@ const DEFAULT_MODELS = [
     baseUrlSuffix: '',
     displayName: 'Opus 4.6',
     provider: 'anthropic',
+    route: 'anthropic',
   },
   {
     model: 'MiniMax-M2.7-highspeed',
@@ -43,6 +50,7 @@ const DEFAULT_MODELS = [
     baseUrlSuffix: '/minimax',
     displayName: 'MiniMax 2.7 Highspeed',
     provider: 'anthropic',
+    route: 'anthropic',
   },
   {
     model: 'claude-haiku-4-5',
@@ -50,6 +58,7 @@ const DEFAULT_MODELS = [
     baseUrlSuffix: '',
     displayName: 'Haiku 4.5',
     provider: 'anthropic',
+    route: 'anthropic',
   },
 ]
 
@@ -98,6 +107,7 @@ function normalizeSelectedModels(selectedModels) {
     baseUrlSuffix: item.baseUrlSuffix,
     displayName: item.displayName,
     provider: item.provider,
+    route: item.route,
   }))
 
   return models.length > 0 ? models : DEFAULT_MODELS.map((item, index) => ({ ...item, index }))
@@ -111,7 +121,7 @@ function buildCustomModels(apiKey, baseUrlAnthropic, baseUrlOpenAI, selectedMode
     id: item.id,
     index: item.index,
     baseUrl:
-      item.provider === 'openai'
+      item.route === 'openai'
         ? `${openaiRootUrl}${item.baseUrlSuffix}`
         : `${anthropicRootUrl}${item.baseUrlSuffix}`,
     apiKey,

package/tests/droid.test.js

@@ -0,0 +1,75 @@
+const assert = require('assert')
+const fs = require('fs')
+const os = require('os')
+const path = require('path')
+
+const tempHome = fs.mkdtempSync(path.join(os.tmpdir(), 'hs-droid-test-'))
+process.env.HOME = tempHome
+
+const droid = require('../src/tools/droid')
+
+const factoryDir = path.join(tempHome, '.factory')
+const settingsFile = path.join(factoryDir, 'settings.json')
+const configFile = path.join(factoryDir, 'config.json')
+
+fs.mkdirSync(factoryDir, { recursive: true })
+fs.writeFileSync(settingsFile, JSON.stringify({
+  customModels: [
+    {
+      model: 'gpt-5.4',
+      id: 'custom:gpt-5.4-0',
+      baseUrl: 'https://api.holysheep.ai',
+      provider: 'anthropic',
+    },
+    {
+      model: 'local-test',
+      id: 'custom:local-test',
+      baseUrl: 'http://localhost:11434/v1',
+      provider: 'generic-chat-completion-api',
+    },
+  ],
+}, null, 2))
+fs.writeFileSync(configFile, JSON.stringify({
+  customModels: [
+    {
+      model: 'gpt-5.4',
+      id: 'custom:gpt-5.4-0',
+      baseUrl: 'https://api.holysheep.ai',
+      provider: 'anthropic',
+    },
+  ],
+}, null, 2))
+
+droid.configure(
+  'cr_test',
+  'https://api.holysheep.ai',
+  'https://api.holysheep.ai/v1',
+  'gpt-5.4',
+  ['gpt-5.4', 'claude-sonnet-4-6', 'MiniMax-M2.7-highspeed'],
+)
+
+const settings = JSON.parse(fs.readFileSync(settingsFile, 'utf8'))
+const legacy = JSON.parse(fs.readFileSync(configFile, 'utf8'))
+
+for (const config of [settings, legacy]) {
+  const gpt = config.customModels.find((entry) => entry.id === 'custom:gpt-5.4-0')
+  assert.ok(gpt, 'GPT-5.4 custom model should be present')
+  assert.strictEqual(gpt.model, 'gpt-5.4')
+  assert.strictEqual(gpt.provider, 'generic-chat-completion-api')
+  assert.strictEqual(gpt.baseUrl, 'https://api.holysheep.ai/v1')
+
+  const sonnet = config.customModels.find((entry) => entry.id === 'custom:claude-sonnet-4-6-0')
+  assert.ok(sonnet, 'Sonnet custom model should be present')
+  assert.strictEqual(sonnet.provider, 'anthropic')
+  assert.strictEqual(sonnet.baseUrl, 'https://api.holysheep.ai')
+
+  const minimax = config.customModels.find((entry) => entry.id === 'custom:MiniMax-M2.7-highspeed-0')
+  assert.ok(minimax, 'MiniMax custom model should be present')
+  assert.strictEqual(minimax.provider, 'anthropic')
+  assert.strictEqual(minimax.baseUrl, 'https://api.holysheep.ai/minimax')
+}
+
+const preserved = settings.customModels.find((entry) => entry.id === 'custom:local-test')
+assert.ok(preserved, 'non-HolySheep custom models should be preserved')
+
+console.log('droid config test passed')