@simonyea/holysheep-cli 1.7.15 → 1.7.16

package/README.md

@@ -73,6 +73,7 @@ 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.
@@ -162,6 +163,7 @@ 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.15",
+  "version": "1.7.16",
   "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',

package/src/commands/setup.js

@@ -82,6 +82,19 @@ 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]
 }
@@ -199,7 +212,6 @@ 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())
@@ -292,6 +304,7 @@ 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.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) {
@@ -723,6 +743,7 @@ module.exports = {
   getBridgePort() { return getConfiguredBridgePort() },
   getGatewayPort() { return getConfiguredGatewayPort() },
   getPrimaryModel() { return getConfiguredPrimaryModel() },
+  getPrimaryModelRoute() { return getPrimaryModelRoute() },
   getPortListeners(port = getConfiguredGatewayPort()) { return listPortListeners(port) },
   getLaunchAgentDiagnosis,
   get hint() {