@simonyea/holysheep-cli 1.7.15 → 1.7.17

package/package.json

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

@@ -101,6 +101,7 @@ function printOpenClawDetails(tool, installState, nodeMajor) {
   const gatewayPort = typeof tool.getGatewayPort === 'function' ? tool.getGatewayPort() : 18789
   const bridgePort = typeof tool.getBridgePort === 'function' ? tool.getBridgePort() : null
   const primaryModel = typeof tool.getPrimaryModel === 'function' ? tool.getPrimaryModel() : ''
+  const primaryModelRoute = typeof tool.getPrimaryModelRoute === 'function' ? tool.getPrimaryModelRoute() : ''
   const listeners = typeof tool.getPortListeners === 'function' ? tool.getPortListeners(gatewayPort) : []
   const foreignListeners = listeners.filter((item) => !String(item.command || '').toLowerCase().includes('openclaw'))
   const launchAgent = typeof tool.getLaunchAgentDiagnosis === 'function' ? tool.getLaunchAgentDiagnosis() : null
@@ -128,6 +129,13 @@ function printOpenClawDetails(tool, installState, nodeMajor) {
     })
   }
 
+  if (primaryModelRoute) {
+    details.push({
+      level: 'info',
+      text: `当前默认模型路由：${primaryModelRoute}`,
+    })
+  }
+
   if (bridgePort) {
     details.push({
       level: 'info',
@@ -135,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/tools/openclaw.js

@@ -244,6 +244,26 @@ function getConfiguredPrimaryModel(config = readConfig()) {
   return config?.agents?.defaults?.model?.primary || ''
 }
 
+function normalizePrimaryModelRef(ref = getConfiguredPrimaryModel()) {
+  const value = String(ref || '')
+  const parts = value.split('/')
+  return parts[parts.length - 1] || ''
+}
+
+function getPrimaryModelRoute(modelRef = getConfiguredPrimaryModel()) {
+  const model = normalizePrimaryModelRef(modelRef)
+  if (model.startsWith('gpt-')) {
+    return 'openai /chat/completions'
+  }
+  if (model.startsWith('claude-')) {
+    return 'anthropic /v1/messages'
+  }
+  if (model.startsWith('MiniMax-')) {
+    return 'minimax /minimax/v1/messages'
+  }
+  return 'unknown'
+}
+
 function isPortInUse(port) {
   try {
     if (isWin) {
@@ -291,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
@@ -596,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}）`)
     }
@@ -723,6 +745,7 @@ module.exports = {
   getBridgePort() { return getConfiguredBridgePort() },
   getGatewayPort() { return getConfiguredGatewayPort() },
   getPrimaryModel() { return getConfiguredPrimaryModel() },
+  getPrimaryModelRoute() { return getPrimaryModelRoute() },
   getPortListeners(port = getConfiguredGatewayPort()) { return listPortListeners(port) },
   getLaunchAgentDiagnosis,
   get hint() {

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,
       },
     }