@simonyea/holysheep-cli 1.7.92 → 1.7.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.92",
+  "version": "1.7.94",
   "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/tools/codex.js

@@ -12,11 +12,13 @@
  *   [model_providers.holysheep]
  *   name = "HolySheep"
  *   base_url = "https://api.holysheep.ai/v1"
- *   env_key = "HOLYSHEEP_API_KEY"
  *   wire_api = "responses"
  *
- * 注意：Codex RS 不支持 api_key 字段！必须用 env_key 指向环境变量。
- * 注意：旧的 config.json 会被 Rust Codex 忽略！
+ *   [model_providers.holysheep.http_headers]
+ *   Authorization = "Bearer cr_xxx"
+ *
+ * 注意：Codex RS 不支持 api_key 字段，env_key 需要环境变量（Windows 需重启终端）。
+ * 改用 http_headers 直接设置 Authorization header，配置即生效。
  */
 const fs   = require('fs')
 const path = require('path')
@@ -48,7 +50,8 @@ function stripManagedTomlConfig(content) {
     const trimmed = line.trim()
 
     if (/^\[[^\]]+\]$/.test(trimmed)) {
-      if (trimmed === '[model_providers.holysheep]') {
+      if (trimmed === '[model_providers.holysheep]' ||
+          trimmed === '[model_providers.holysheep.http_headers]') {
         currentSection = trimmed
         skipHolySheepBlock = true
         continue
@@ -96,7 +99,7 @@ function isConfiguredInToml() {
 /**
  * 写入 TOML config（合并方式：保留已有内容，只更新 holysheep 部分）
  */
-function writeTomlConfig(_apiKey, baseUrlOpenAI, model) {
+function writeTomlConfig(apiKey, baseUrlOpenAI, model) {
   if (!fs.existsSync(CONFIG_DIR)) {
     fs.mkdirSync(CONFIG_DIR, { recursive: true })
   }
@@ -104,6 +107,7 @@ function writeTomlConfig(_apiKey, baseUrlOpenAI, model) {
   const content = stripManagedTomlConfig(readTomlConfig())
 
   // 在开头插入 holysheep 配置
+  // 使用 http_headers 直接设置 Authorization，不依赖环境变量
   const newConfig = [
     `model = "${model || 'gpt-5.4'}"`,
     `model_provider = "holysheep"`,
@@ -113,9 +117,11 @@ function writeTomlConfig(_apiKey, baseUrlOpenAI, model) {
     `[model_providers.holysheep]`,
     `name = "HolySheep"`,
     `base_url = "${baseUrlOpenAI}"`,
-    `env_key = "HOLYSHEEP_API_KEY"`,
     `wire_api = "responses"`,
     '',
+    `[model_providers.holysheep.http_headers]`,
+    `Authorization = "Bearer ${apiKey}"`,
+    '',
   ].join('\n')
 
   fs.writeFileSync(CONFIG_FILE, cleanupToml(newConfig) + '\n', 'utf8')
@@ -194,14 +200,9 @@ module.exports = {
     // 清除 auth.json 中的 ChatGPT OAuth 认证，避免干扰
     neutralizeAuthJson()
 
-    // 写入 HOLYSHEEP_API_KEY 环境变量（Codex RS 通过 env_key 读取）
-    const { writeEnvToShell } = require('../utils/shell')
-    writeEnvToShell({ HOLYSHEEP_API_KEY: apiKey })
-
     return {
       file: CONFIG_FILE,
       hot:  false,
-      envVars: { HOLYSHEEP_API_KEY: apiKey },
     }
   },
   reset() {
@@ -227,11 +228,6 @@ module.exports = {
         fs.writeFileSync(CONFIG_FILE_JSON, JSON.stringify(c, null, 2), 'utf8')
       } catch {}
     }
-    // 清理环境变量
-    try {
-      const { removeEnvFromShell } = require('../utils/shell')
-      removeEnvFromShell(['HOLYSHEEP_API_KEY'])
-    } catch {}
   },
   getConfigPath() { return CONFIG_FILE },
   hint: '切换后重开终端生效；Rust Codex (v0.111+) 使用 config.toml',

package/src/tools/openclaw.js

@@ -773,6 +773,27 @@ module.exports = {
   getConfigPath() { return CONFIG_FILE },
   getBridgePort() { return getConfiguredBridgePort() },
   getGatewayPort() { return getConfiguredGatewayPort() },
+  ensureBridgeRunning(port) {
+    port = port || getConfiguredBridgePort()
+    return startBridge(port)
+  },
+  ensureGatewayRunning(port) {
+    port = port || getConfiguredGatewayPort()
+    // 先检查是否已在运行
+    try {
+      execSync(
+        isWin
+          ? `powershell -NonInteractive -Command "try{(Invoke-WebRequest -Uri http://127.0.0.1:${port}/ -TimeoutSec 1 -UseBasicParsing).StatusCode}catch{exit 1}"`
+          : `curl -sf http://127.0.0.1:${port}/ -o /dev/null --max-time 1`,
+        { stdio: 'ignore', timeout: 3000 }
+      )
+      return true
+    } catch {}
+    // 未运行，启动它
+    const preferNpx = !hasOpenClawBinary()
+    const result = _startGateway(port, preferNpx, !preferNpx)
+    return result.ok
+  },
   getPrimaryModel() { return getConfiguredPrimaryModel() },
   getPrimaryModelRoute() { return getPrimaryModelRoute() },
   getPortListeners(port = getConfiguredGatewayPort()) { return listPortListeners(port) },

package/src/webui/server.js

@@ -654,10 +654,21 @@ async function handleToolLaunch(req, res) {
   const tool = TOOLS.find(t => t.id === toolId)
   if (!tool) return json(res, { error: '未知工具' }, 400)
 
-  // OpenClaw: 打开浏览器 dashboard 而非终端
+  // OpenClaw: 先启动 Bridge + Gateway，再打开浏览器
   if (toolId === 'openclaw') {
-    const port = tool.getGatewayPort?.() || 18789
-    const url = `http://127.0.0.1:${port}/`
+    const gatewayPort = tool.getGatewayPort?.() || 18789
+    const bridgePort  = tool.getBridgePort?.()  || 18788
+
+    // 确保 Bridge 在运行
+    const bridgeUp = tool.ensureBridgeRunning?.(bridgePort)
+    // 确保 Gateway 在运行
+    const gatewayUp = tool.ensureGatewayRunning?.(gatewayPort)
+
+    if (!gatewayUp) {
+      return json(res, { ok: false, error: 'Gateway 启动失败，请先运行 hs setup 配置 OpenClaw' }, 500)
+    }
+
+    const url = `http://127.0.0.1:${gatewayPort}/`
     if (process.platform === 'darwin') spawn('open', [url], { detached: true, stdio: 'ignore' }).unref()
     else if (process.platform === 'win32') spawn('cmd.exe', ['/c', 'start', '', url], { detached: true, stdio: 'ignore', shell: true }).unref()
     else spawn('xdg-open', [url], { detached: true, stdio: 'ignore' }).unref()