@simonyea/holysheep-cli 1.7.16 → 1.7.18

package/README.md

@@ -73,7 +73,6 @@ You'll be prompted for your API Key (`cr_xxx`), then select the tools to configu
 4. Open the exact dashboard URL shown in the terminal and start chatting — do not use a blank browser shell or `about:blank`
 
 **Default OpenClaw model:** `gpt-5.4`
-HolySheep keeps GPT as the OpenClaw primary model by default and leaves Claude models available for manual switching inside OpenClaw.
 
 > **Keep the gateway window open** while using OpenClaw. The gateway must be running for the browser UI to work.
 > If only `npx openclaw` is available, HolySheep will start Gateway as a direct process and will not install a persistent daemon from a temporary `npx` cache path.
@@ -163,7 +162,6 @@ hs setup
 4. 按终端里显示的准确 dashboard 地址打开浏览器，直接开始聊天，不要打开空白浏览器壳窗口或 `about:blank`
 
 **OpenClaw 默认模型：** `gpt-5.4`
-HolySheep 会默认把 GPT 设为 OpenClaw 主模型，同时保留 Claude 模型供你在 OpenClaw 内手动切换。
 
 > ⚠️ **保持 Gateway 窗口开启**，关闭后 Gateway 停止，浏览器界面无法使用。
 > 如果机器上只有 `npx openclaw`，HolySheep 会直接启动 Gateway 进程，不会把 daemon 安装到临时 `npx` 缓存路径上。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.16",
+  "version": "1.7.18",
   "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/commands/doctor.js

@@ -143,6 +143,13 @@ function printOpenClawDetails(tool, installState, nodeMajor) {
     })
   }
 
+  if (bridgePort && bridgePort === gatewayPort) {
+    details.push({
+      level: 'warn',
+      text: `Bridge 端口和 Gateway 端口都被配置成了 ${gatewayPort}；这会让 OpenClaw provider 请求打回 Gateway 自己并触发 404`,
+    })
+  }
+
   if (launchAgent?.unstable) {
     details.push({
       level: 'warn',

package/src/commands/setup.js

@@ -82,19 +82,6 @@ function getPreferredLaunchCmd(tool) {
   return tool.launchCmd.replace(/^hs\b/, prefix)
 }
 
-function pickPrimaryModelForTool(tool, selectedModels) {
-  const models = Array.isArray(selectedModels) ? selectedModels : []
-  const fallback = models[0] || 'gpt-5.4'
-
-  if (tool?.id === 'openclaw') {
-    return models.find((m) => m === 'gpt-5.4')
-      || models.find((m) => m.startsWith('gpt-'))
-      || fallback
-  }
-
-  return models.find((m) => m.startsWith('claude-')) || fallback
-}
-
 function canAutoInstall(toolId) {
   return !!AUTO_INSTALL[toolId]
 }
@@ -212,6 +199,7 @@ async function setup(options) {
     choices: MODEL_CHOICES,
     pageSize: 5,
   }])
+  const primaryModel = selectedModels.find(m => m.startsWith('claude-')) || selectedModels[0] || 'claude-sonnet-4-6'
 
   // Step 2: 选择工具（已安装 + 未安装分组显示）
   const installedTools   = TOOLS.filter(t => t.checkInstalled())
@@ -304,7 +292,6 @@ async function setup(options) {
   for (const tool of toConfigureTools) {
     const spinner = ora(`配置 ${tool.name}...`).start()
     try {
-      const primaryModel = pickPrimaryModelForTool(tool, selectedModels)
       const result = tool.configure(apiKey, BASE_URL_ANTHROPIC, BASE_URL_OPENAI, primaryModel, selectedModels)
 
       if (result.manual) {

package/src/tools/openclaw-bridge.js

@@ -613,9 +613,8 @@ async function checkGatewayHealth(config) {
 
   try {
     const response = await fetch(`http://${host}:${gatewayPort}/`, { method: 'GET', timeout })
-    return response.ok
-      ? { ok: true, reason: 'gateway_http_ok' }
-      : { ok: false, reason: `gateway_http_${response.status}` }
+    // 任何 HTTP 响应都说明 Gateway 进程存活（4xx 可能是正常的路由/auth 行为）
+    return { ok: true, reason: `gateway_http_${response.status}` }
   } catch {
     return { ok: false, reason: 'gateway_http_unreachable' }
   }

package/src/tools/openclaw.js

@@ -311,9 +311,11 @@ function listPortListeners(port) {
   }
 }
 
-function findAvailableGatewayPort(startPort = DEFAULT_GATEWAY_PORT) {
+function findAvailableGatewayPort(startPort = DEFAULT_GATEWAY_PORT, excludedPorts = []) {
+  const excluded = new Set((excludedPorts || []).map((value) => Number(value)).filter((value) => Number.isInteger(value) && value > 0))
   for (let offset = 0; offset < MAX_PORT_SCAN; offset++) {
     const port = startPort + offset
+    if (excluded.has(port)) continue
     if (!isPortInUse(port)) return port
   }
   return null
@@ -616,7 +618,7 @@ module.exports = {
     }
     this._lastGatewayPort = gatewayPort
 
-    const bridgePort = findAvailableGatewayPort(DEFAULT_BRIDGE_PORT)
+    const bridgePort = findAvailableGatewayPort(DEFAULT_BRIDGE_PORT, [gatewayPort])
     if (!bridgePort) {
       throw new Error(`找不到可用桥接端口（已检查 ${DEFAULT_BRIDGE_PORT}-${DEFAULT_BRIDGE_PORT + MAX_PORT_SCAN - 1}）`)
     }

package/src/tools/opencode.js

@@ -11,7 +11,7 @@
  *   "provider": {
  *     "anthropic": {
  *       "options": {
- *         "baseURL": "https://api.holysheep.ai",
+ *         "baseURL": "https://api.holysheep.ai/v1",
  *         "apiKey": "cr_xxx"
  *       }
  *     },
@@ -26,6 +26,8 @@
  *
  * 安装方式(推荐): brew install anomalyco/tap/opencode
  * 或: npm i -g opencode-ai@latest
+ * 说明：OpenCode 的 anthropic provider 会自行拼接 /messages，
+ * 因此这里必须写 /v1 基地址，最终才会落到 /v1/messages。
  * 官方文档: https://opencode.ai/docs/config
  */
 const fs = require('fs')
@@ -88,10 +90,10 @@ module.exports = {
     // 设置 schema（方便编辑器自动补全）
     if (!config['$schema']) config['$schema'] = 'https://opencode.ai/config.json'
 
-    // 配置 Anthropic provider（Claude 模型）
+    // OpenCode 的 anthropic provider 需要 /v1 基地址，否则会打到 /messages 并返回 404。
     config.provider.anthropic = {
       options: {
-        baseURL: baseUrlAnthropicNoV1,  // https://api.holysheep.ai (无 /v1)
+        baseURL: `${String(baseUrlAnthropicNoV1 || '').replace(/\/+$/, '')}/v1`,
         apiKey,
       },
     }