@simonyea/holysheep-cli 1.6.7 → 1.6.8

package/README.md

@@ -218,6 +218,7 @@ A: OpenClaw 需要 Node.js 20+，运行 `node --version` 确认版本后重试
 
 ## Changelog
 
+- **v1.6.8** — 修复 Codex 重复写入 `config.toml` 导致的 duplicate key，并修复 OpenClaw 在 Windows 下的安装检测；针对 OpenClaw 2026.3.13 的模型路由回归，临时跳过 MiniMax 避免 `model not allowed`
 - **v1.6.7** — OpenClaw 配置新增 `MiniMax-M2.7-highspeed`，并补齐节点迁移脚本中的 SSH 代理账号创建逻辑
 - **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 的兼容

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "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/index.js

@@ -173,8 +173,3 @@ program
   })
 
 program.parse(process.argv)
-
-// 无参数时显示默认信息
-if (process.argv.length === 2) {
-  program.help()
-}

package/src/tools/codex.js

@@ -25,6 +25,49 @@ const CONFIG_FILE = path.join(CONFIG_DIR, 'config.toml')
 // 保留 JSON 兼容性（老版本 TypeScript Codex 用）
 const CONFIG_FILE_JSON = path.join(CONFIG_DIR, 'config.json')
 
+function normalizeToml(content) {
+  return String(content || '').replace(/\r\n/g, '\n')
+}
+
+function cleanupToml(content) {
+  return normalizeToml(content)
+    .replace(/\n{3,}/g, '\n\n')
+    .trim()
+}
+
+function stripManagedTomlConfig(content) {
+  const lines = normalizeToml(content).split('\n')
+  const output = []
+  let currentSection = null
+  let skipHolySheepBlock = false
+
+  for (const line of lines) {
+    const trimmed = line.trim()
+
+    if (/^\[[^\]]+\]$/.test(trimmed)) {
+      if (trimmed === '[model_providers.holysheep]') {
+        currentSection = trimmed
+        skipHolySheepBlock = true
+        continue
+      }
+
+      currentSection = trimmed
+      skipHolySheepBlock = false
+    }
+
+    if (skipHolySheepBlock) continue
+
+    if (!currentSection) {
+      if (/^model\s*=\s*"[^"]*"\s*$/.test(trimmed)) continue
+      if (/^model_provider\s*=\s*"holysheep"\s*$/.test(trimmed)) continue
+    }
+
+    output.push(line)
+  }
+
+  return cleanupToml(output.join('\n'))
+}
+
 /**
  * 读取 TOML config（简单解析，不依赖 toml 库）
  */
@@ -55,14 +98,7 @@ function writeTomlConfig(apiKey, baseUrlOpenAI, model) {
     fs.mkdirSync(CONFIG_DIR, { recursive: true })
   }
 
-  let content = readTomlConfig()
-
-  // 移除旧的 holysheep 相关配置
-  content = content
-    .replace(/\nmodel\s*=\s*"[^"]*"\n/g, '\n')
-    .replace(/\nmodel_provider\s*=\s*"holysheep"\n/g, '\n')
-    .replace(/\[model_providers\.holysheep\][^\[]*(\[|$)/gs, (m, end) => end === '[' ? '[' : '')
-    .trim()
+  const content = stripManagedTomlConfig(readTomlConfig())
 
   // 在开头插入 holysheep 配置
   const newConfig = [
@@ -76,9 +112,9 @@ function writeTomlConfig(apiKey, baseUrlOpenAI, model) {
     `base_url = "${baseUrlOpenAI}"`,
     `env_key = "OPENAI_API_KEY"`,
     '',
-  ].join('\n').replace(/\n{3,}/g, '\n\n').trim() + '\n'
+  ].join('\n')
 
-  fs.writeFileSync(CONFIG_FILE, newConfig, 'utf8')
+  fs.writeFileSync(CONFIG_FILE, cleanupToml(newConfig) + '\n', 'utf8')
 }
 
 /**
@@ -91,8 +127,15 @@ function writeJsonConfigIfNeeded(apiKey, baseUrlOpenAI, model) {
       jsonConfig = JSON.parse(fs.readFileSync(CONFIG_FILE_JSON, 'utf8'))
     }
     jsonConfig.model = model || 'gpt-5.4'
+    jsonConfig.model_provider = 'holysheep'
     jsonConfig.provider = 'holysheep'
+    if (!jsonConfig.model_providers) jsonConfig.model_providers = {}
     if (!jsonConfig.providers) jsonConfig.providers = {}
+    jsonConfig.model_providers.holysheep = {
+      name: 'HolySheep',
+      base_url: baseUrlOpenAI,
+      env_key: 'OPENAI_API_KEY',
+    }
     jsonConfig.providers.holysheep = {
       name: 'HolySheep',
       baseURL: baseUrlOpenAI,
@@ -132,22 +175,23 @@ module.exports = {
   reset() {
     // 清理 TOML
     if (fs.existsSync(CONFIG_FILE)) {
-      let content = readTomlConfig()
-      content = content
-        .replace(/^model\s*=\s*"[^"]*"\n/m, '')
-        .replace(/^model_provider\s*=\s*"holysheep"\n/m, '')
-        .replace(/\[model_providers\.holysheep\][^\[]*(\[|$)/gs, (m, end) => end === '[' ? '[' : '')
-        .trim() + '\n'
-      fs.writeFileSync(CONFIG_FILE, content, 'utf8')
+      const content = stripManagedTomlConfig(readTomlConfig())
+      fs.writeFileSync(CONFIG_FILE, (content ? content + '\n' : ''), 'utf8')
     }
     // 清理 JSON
     if (fs.existsSync(CONFIG_FILE_JSON)) {
       try {
         const c = JSON.parse(fs.readFileSync(CONFIG_FILE_JSON, 'utf8'))
+        if (c.model_provider === 'holysheep') {
+          delete c.model_provider
+        }
         if (c.provider === 'holysheep') {
           delete c.provider
-          delete c.providers?.holysheep
         }
+        delete c.model_providers?.holysheep
+        delete c.providers?.holysheep
+        if (c.model_providers && Object.keys(c.model_providers).length === 0) delete c.model_providers
+        if (c.providers && Object.keys(c.providers).length === 0) delete c.providers
         fs.writeFileSync(CONFIG_FILE_JSON, JSON.stringify(c, null, 2), 'utf8')
       } catch {}
     }

package/src/tools/openclaw.js

@@ -18,9 +18,20 @@ const MAX_PORT_SCAN = 20
 const OPENCLAW_DEFAULT_MODEL = 'gpt-5.4'
 const OPENCLAW_DEFAULT_CLAUDE_MODEL = 'claude-sonnet-4-6'
 const OPENCLAW_DEFAULT_MINIMAX_MODEL = 'MiniMax-M2.7-highspeed'
+const OPENCLAW_ROUTING_REGRESSION_VERSION = /^2026\.3\.13(?:\D|$)/
+
+function getOpenClawBinaryCandidates() {
+  return isWin ? ['openclaw.cmd', 'openclaw'] : ['openclaw']
+}
+
+function getBinaryRunner() {
+  return isWin
+    ? { cmd: 'openclaw.cmd', argsPrefix: [], shell: true, label: 'openclaw', via: 'binary' }
+    : { cmd: 'openclaw', argsPrefix: [], shell: false, label: 'openclaw', via: 'binary' }
+}
 
 function hasOpenClawBinary() {
-  return commandExists('openclaw')
+  return getOpenClawBinaryCandidates().some((cmd) => commandExists(cmd))
 }
 
 function hasNpx() {
@@ -28,18 +39,41 @@ function hasNpx() {
 }
 
 function getRunner(preferNpx = false) {
+  const binaryRunner = hasOpenClawBinary() ? getBinaryRunner() : null
+
   if (!preferNpx && hasOpenClawBinary()) {
-    return { cmd: 'openclaw', argsPrefix: [], shell: false, label: 'openclaw', via: 'binary' }
+    return binaryRunner
   }
   if (hasNpx()) {
     return { cmd: 'npx', argsPrefix: ['openclaw'], shell: isWin, label: 'npx openclaw', via: 'npx' }
   }
-  if (hasOpenClawBinary()) {
-    return { cmd: 'openclaw', argsPrefix: [], shell: false, label: 'openclaw', via: 'binary' }
+  if (binaryRunner) {
+    return binaryRunner
   }
   return null
 }
 
+function runWithRunner(runner, args, opts = {}) {
+  return spawnSync(runner.cmd, [...runner.argsPrefix, ...args], {
+    shell: runner.shell,
+    timeout: opts.timeout || 30000,
+    stdio: opts.stdio || 'pipe',
+    encoding: 'utf8',
+  })
+}
+
+function normalizeVersionOutput(text) {
+  return firstLine(text).replace(/^openclaw\s+/i, '').trim()
+}
+
+function probeRunner(runner, timeout) {
+  const result = runWithRunner(runner, ['--version'], { timeout })
+  if (result.error || result.status !== 0) return null
+
+  const version = normalizeVersionOutput(result.stdout || result.stderr || '')
+  return version || null
+}
+
 /** 运行 openclaw CLI（优先全局命令，可切换到 npx 回退） */
 function runOpenClaw(args, opts = {}) {
   const runner = getRunner(Boolean(opts.preferNpx))
@@ -47,12 +81,7 @@ function runOpenClaw(args, opts = {}) {
     return { status: 1, stdout: '', stderr: 'OpenClaw CLI not found' }
   }
 
-  return spawnSync(runner.cmd, [...runner.argsPrefix, ...args], {
-    shell: runner.shell,
-    timeout: opts.timeout || 30000,
-    stdio: opts.stdio || 'pipe',
-    encoding: 'utf8',
-  })
+  return runWithRunner(runner, args, opts)
 }
 
 function spawnOpenClaw(args, opts = {}) {
@@ -75,37 +104,68 @@ function firstLine(text) {
 }
 
 function getOpenClawVersion(preferNpx = false) {
-  const result = runOpenClaw(['--version'], { preferNpx, timeout: preferNpx ? 60000 : 15000 })
-  if (result.status !== 0) return null
-  return firstLine(result.stdout)
+  const runner = getRunner(preferNpx)
+  if (!runner) return null
+  return probeRunner(runner, preferNpx ? 60000 : 15000)
 }
 
 function detectRuntime() {
   const preferNpx = getPreferredRuntime()
-  const preferredRunner = getRunner(preferNpx)
-
-  if (preferredRunner) {
-    return {
-      available: true,
-      via: preferredRunner.via,
-      command: preferredRunner.label,
-      version: getOpenClawVersion(preferNpx),
+  const runnerOrder = preferNpx ? [getRunner(true), getRunner(false)] : [getRunner(false), getRunner(true)]
+  const seen = new Set()
+
+  for (const runner of runnerOrder) {
+    if (!runner) continue
+    const key = `${runner.via}:${runner.cmd}:${runner.argsPrefix.join(' ')}`
+    if (seen.has(key)) continue
+    seen.add(key)
+
+    const version = probeRunner(runner, runner.via === 'npx' ? 60000 : 15000)
+    if (version) {
+      return {
+        available: true,
+        via: runner.via,
+        command: runner.label,
+        version,
+      }
     }
   }
 
-  const fallbackRunner = getRunner(true)
+  const fallbackRunner = getRunner(preferNpx)
   if (fallbackRunner) {
     return {
-      available: true,
+      available: false,
       via: fallbackRunner.via,
       command: fallbackRunner.label,
-      version: getOpenClawVersion(true),
+      version: null,
     }
   }
 
   return { available: false, via: null, command: null, version: null }
 }
 
+function isRoutingRegressionVersion(version) {
+  return OPENCLAW_ROUTING_REGRESSION_VERSION.test(String(version || '').trim())
+}
+
+function sanitizeSelectedModelsForRuntime(selectedModels, runtimeVersion) {
+  if (!isRoutingRegressionVersion(runtimeVersion)) {
+    return { models: selectedModels, warning: '' }
+  }
+
+  const originalModels = Array.isArray(selectedModels) ? selectedModels : []
+  const filteredModels = originalModels.filter((model) => !model.startsWith('MiniMax-'))
+
+  if (filteredModels.length === originalModels.length) {
+    return { models: selectedModels, warning: '' }
+  }
+
+  return {
+    models: filteredModels,
+    warning: '当前 OpenClaw 2026.3.13 存在 provider 路由回归，已暂时跳过 MiniMax 模型，避免 /model 和网页切换时报 model not allowed。升级 OpenClaw 后可重新运行 hs setup 恢复。',
+  }
+}
+
 function readConfig() {
   try {
     if (fs.existsSync(CONFIG_FILE)) {
@@ -425,6 +485,11 @@ module.exports = {
     }
     this._lastRuntimeCommand = runtime.command
 
+    const sanitizedSelection = sanitizeSelectedModelsForRuntime(selectedModels, runtime.version)
+    if (sanitizedSelection.warning) {
+      console.log(chalk.yellow(`  ⚠️  ${sanitizedSelection.warning}`))
+    }
+
     runOpenClaw(['gateway', 'stop'], { preferNpx: runtime.via === 'npx' })
 
     const gatewayPort = findAvailableGatewayPort(DEFAULT_GATEWAY_PORT)
@@ -470,7 +535,7 @@ module.exports = {
       apiKey,
       baseUrlAnthropic,
       baseUrlOpenAI,
-      selectedModels,
+      sanitizedSelection.models,
       gatewayPort,
     )
 

package/src/utils/which.js

@@ -4,18 +4,34 @@
  */
 const { execSync } = require('child_process')
 
-function commandExists(cmd) {
-  const finder = process.platform === 'win32' ? `where ${cmd}` : `which ${cmd}`
+function canRun(command, options = {}) {
   try {
-    execSync(finder, { stdio: 'ignore' })
+    execSync(command, { stdio: 'ignore', ...options })
     return true
   } catch {
-    // 兜底：直接跑 --version
-    try {
-      execSync(`${cmd} --version`, { stdio: 'ignore', timeout: 3000 })
-      return true
-    } catch { return false }
+    return false
   }
 }
 
+function commandExists(cmd) {
+  if (process.platform === 'win32') {
+    const variants = [cmd, `${cmd}.cmd`, `${cmd}.exe`, `${cmd}.bat`]
+    for (const variant of variants) {
+      if (canRun(`where ${variant}`)) return true
+    }
+
+    // Windows 上很多 npm 全局命令实际是 .cmd 包装器，需要交给 cmd.exe 执行。
+    for (const variant of variants) {
+      if (canRun(`cmd /d /s /c "${variant} --version"`, { timeout: 3000 })) return true
+    }
+
+    return false
+  }
+
+  if (canRun(`which ${cmd}`)) return true
+
+  // 兜底：直接跑 --version
+  return canRun(`${cmd} --version`, { timeout: 3000 })
+}
+
 module.exports = { commandExists }