@simonyea/holysheep-cli 1.7.52 → 1.7.54

package/README.md

@@ -225,6 +225,7 @@ A: OpenClaw 需要 Node.js 20+，运行 `node --version` 确认版本后重试
 
 ## Changelog
 
+- **v1.7.53** — 修复 `hs claude` 在绝对 URL 代理路径下未透传 `x-hs-node-proxied` 的问题，避免同一会话里部分 Claude 请求被后端误判为非可信代理请求并随机触发 403
 - **v1.7.52** — 将 `hs claude` 重构为本地 API 入口 + CONNECT 兜底代理：Claude Anthropic 请求默认先进入本地 process proxy，再补齐 HolySheep 会话头后转发，降低独立二进制 Claude Code 漏代理导致的 403
 - **v1.7.51** — 修复 `hs claude` 在 Claude Code 独立二进制版本上的整进程代理：自动识别脚本入口 / 独立二进制并切换到 `NODE_OPTIONS` 注入或 `HTTP(S)_PROXY` 模式；同时增强 `hs doctor` 的 Claude 代理诊断
 - **v1.6.14** — OpenClaw 新增 `gpt-5.3-codex-spark` 模型，通过本地 bridge 路由到 HolySheep `/v1`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.52",
+  "version": "1.7.54",
   "description": "Claude Code/Cursor/Cline API relay for China \u2014 \u00a51=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
   "keywords": [
     "openai-china",

package/src/commands/claude.js

@@ -88,6 +88,15 @@ async function runClaude(args = []) {
     NO_PROXY: mergeNoProxy(process.env.NO_PROXY, ['127.0.0.1', 'localhost']),
   }
 
+  const restoreSettings = typeof claudeCodeTool.applyRuntimeSettingsOverride === 'function'
+    ? claudeCodeTool.applyRuntimeSettingsOverride({
+      ANTHROPIC_AUTH_TOKEN: apiKey,
+      ANTHROPIC_BASE_URL: proxyUrl,
+      CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: '1',
+      HOLYSHEEP_CLAUDE_LAUNCHER: 'hs',
+    })
+    : () => {}
+
   if (runtime.launchMode === 'node-inject') {
     env.NODE_OPTIONS = appendNodeRequire(process.env.NODE_OPTIONS, INJECT_PATH)
   }
@@ -99,6 +108,7 @@ async function runClaude(args = []) {
   })
 
   const cleanup = async () => {
+    restoreSettings()
     try {
       server.close()
     } catch {}

package/src/commands/webui.js

@@ -0,0 +1,49 @@
+/**
+ * hs webui — 启动 WebUI 本地管理面板
+ */
+'use strict'
+
+const chalk = require('chalk')
+const { execSync } = require('child_process')
+
+async function webui(opts) {
+  const port = Number(opts.port) || 9876
+  const { startServer } = require('../webui/server')
+
+  console.log()
+  console.log(chalk.bold('🌐  HolySheep WebUI'))
+  console.log(chalk.gray('━'.repeat(50)))
+  console.log()
+
+  const server = startServer(port)
+
+  server.on('listening', () => {
+    const url = `http://127.0.0.1:${port}`
+    console.log(chalk.green(`✓ WebUI 已启动: ${chalk.cyan.bold(url)}`))
+    console.log(chalk.gray('  按 Ctrl+C 停止'))
+    console.log()
+
+    if (opts.open !== false) {
+      try {
+        const platform = process.platform
+        if (platform === 'darwin') execSync(`open "${url}"`)
+        else if (platform === 'win32') execSync(`start "" "${url}"`)
+        else execSync(`xdg-open "${url}"`)
+      } catch {}
+    }
+  })
+
+  server.on('error', (err) => {
+    if (err.code === 'EADDRINUSE') {
+      console.log(chalk.red(`✗ 端口 ${port} 已被占用，请使用 --port 指定其他端口`))
+    } else {
+      console.log(chalk.red(`✗ 启动失败: ${err.message}`))
+    }
+    process.exit(1)
+  })
+
+  // Keep alive
+  await new Promise(() => {})
+}
+
+module.exports = webui

package/src/index.js

@@ -170,6 +170,18 @@ program
     })
   })
 
+// ── webui ──────────────────────────────────────────────────────────────────
+program
+  .command('webui')
+  .alias('web')
+  .description('启动 WebUI 本地管理面板')
+  .option('-p, --port <port>', '指定端口', '9876')
+  .option('--no-open', '不自动打开浏览器')
+  .action(async (opts) => {
+    printBanner()
+    await require('./commands/webui')(opts)
+  })
+
 // ── claude ──────────────────────────────────────────────────────────────────
 program
   .command('claude [args...]')

package/src/tools/claude-code.js

@@ -56,6 +56,30 @@ function writeSettings(data) {
   fs.writeFileSync(SETTINGS_FILE, JSON.stringify(data, null, 2), 'utf8')
 }
 
+function cloneSettings(data) {
+  return JSON.parse(JSON.stringify(data || {}))
+}
+
+function applyRuntimeSettingsOverride(overrides = {}) {
+  const previous = readSettings()
+  const next = cloneSettings(previous)
+  next.env = { ...(next.env || {}) }
+
+  for (const [key, value] of Object.entries(overrides)) {
+    if (value === undefined || value === null) {
+      delete next.env[key]
+      continue
+    }
+    next.env[key] = value
+  }
+
+  writeSettings(next)
+
+  return () => {
+    writeSettings(previous)
+  }
+}
+
 function resolveCommandPath(cmd) {
   try {
     if (process.platform === 'win32') {
@@ -198,4 +222,7 @@ module.exports = {
   },
   buildBridgeConfig,
   detectClaudeRuntime,
+  readSettings,
+  writeSettings,
+  applyRuntimeSettingsOverride,
 }

package/src/tools/claude-process-proxy.js

@@ -113,6 +113,30 @@ function deriveNodeProxyUrl(lease) {
   return upstream.toString().replace(/\/+$/, '')
 }
 
+function forwardViaNodeProxy({ nodeProxyUrl, targetUrl, clientReq, clientRes, extraHeaders = {} }) {
+  const upstream = new URL(nodeProxyUrl)
+  return new Promise((resolve, reject) => {
+    const forwardReq = http.request({
+      host: upstream.hostname,
+      port: Number(upstream.port || 80),
+      method: clientReq.method,
+      path: targetUrl.toString(),
+      headers: {
+        ...clientReq.headers,
+        ...extraHeaders,
+        host: targetUrl.host,
+        connection: 'close',
+      },
+    }, (forwardRes) => {
+      clientRes.writeHead(forwardRes.statusCode || 502, forwardRes.headers)
+      forwardRes.pipe(clientRes)
+      resolve()
+    })
+    forwardReq.once('error', reject)
+    clientReq.pipe(forwardReq)
+  })
+}
+
 function createConnectTunnel(proxyUrl, target, headers) {
   return new Promise((resolve, reject) => {
     const upstream = new URL(proxyUrl)
@@ -156,58 +180,30 @@ function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH }) {
 
     const doForward = async (lease) => {
       const config = readConfig(configPath)
+      const nodeProxyUrl = deriveNodeProxyUrl(lease)
 
       if (isDirect) {
         const crsBase = config.baseUrlAnthropic || 'https://api.holysheep.ai'
         const target = new URL(clientReq.url, crsBase)
-        const fwdHeaders = {
-          ...clientReq.headers,
-          ...buildAuthHeaders(config, lease),
-          'x-hs-node-proxied': '1',
-          host: target.host,
-        }
-        const transport = target.protocol === 'https:' ? https : http
-        return new Promise((resolve, reject) => {
-          const fwd = transport.request({
-            hostname: target.hostname,
-            port: Number(target.port || (target.protocol === 'https:' ? 443 : 80)),
-            method: clientReq.method,
-            path: target.pathname + target.search,
-            headers: fwdHeaders,
-          }, (res) => {
-            if (res.statusCode === 401 || res.statusCode === 403) {
-              res.resume()
-              return reject(new Error(`Auth error ${res.statusCode}`))
-            }
-            clientRes.writeHead(res.statusCode || 502, res.headers)
-            res.pipe(clientRes)
-            resolve()
-          })
-          fwd.once('error', reject)
-          clientReq.pipe(fwd)
+        return forwardViaNodeProxy({
+          nodeProxyUrl,
+          targetUrl: target,
+          clientReq,
+          clientRes,
+          extraHeaders: buildAuthHeaders(config, lease),
         })
       }
 
-      const nodeProxyUrl = deriveNodeProxyUrl(lease)
       const headers = {
         ...buildAuthHeaders(config, lease),
         host: new URL(clientReq.url).host,
       }
-      const upstream = new URL(nodeProxyUrl)
-      return new Promise((resolve, reject) => {
-        const forwardReq = http.request({
-          host: upstream.hostname,
-          port: Number(upstream.port || 80),
-          method: clientReq.method,
-          path: clientReq.url,
-          headers: { ...clientReq.headers, ...headers, connection: 'close' },
-        }, (forwardRes) => {
-          clientRes.writeHead(forwardRes.statusCode || 502, forwardRes.headers)
-          forwardRes.pipe(clientRes)
-          resolve()
-        })
-        forwardReq.once('error', reject)
-        clientReq.pipe(forwardReq)
+      return forwardViaNodeProxy({
+        nodeProxyUrl,
+        targetUrl: new URL(clientReq.url),
+        clientReq,
+        clientRes,
+        extraHeaders: headers,
       })
     }