@simonyea/holysheep-cli 1.7.69 → 1.7.71

package/package.json

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

@@ -88,14 +88,8 @@ 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',
-    })
-    : () => {}
+  // 不再写 settings.json — 只用 env 变量，避免 Claude Code 从两个来源
+  // 读到同一个 proxy URL 导致重复请求 + 避免退出时覆盖 WebUI configure 的值
 
   if (runtime.launchMode === 'node-inject') {
     env.NODE_OPTIONS = appendNodeRequire(process.env.NODE_OPTIONS, INJECT_PATH)
@@ -108,7 +102,6 @@ async function runClaude(args = []) {
   })
 
   const cleanup = async () => {
-    restoreSettings()
     try {
       server.close()
     } catch {}

package/src/tools/claude-code.js

@@ -168,7 +168,6 @@ module.exports = {
     const bridge = readConfig()
     return Boolean(
       s.env?.ANTHROPIC_AUTH_TOKEN &&
-      s.env?.ANTHROPIC_BASE_URL === BASE_URL_ANTHROPIC &&
       bridge.apiKey &&
       bridge.bridgeSecret &&
       bridge.controlPlaneUrl &&
@@ -184,7 +183,8 @@ module.exports = {
     const settings = readSettings()
     if (!settings.env) settings.env = {}
     settings.env.ANTHROPIC_AUTH_TOKEN = apiKey
-    settings.env.ANTHROPIC_BASE_URL = BASE_URL_ANTHROPIC
+    // ANTHROPIC_BASE_URL 不写入 settings.json，由 hs claude 运行时通过 env 动态注入
+    delete settings.env.ANTHROPIC_BASE_URL
     settings.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = '1'
     settings.env.HOLYSHEEP_CLAUDE_LAUNCHER = 'hs'
     if (primaryModel) settings.model = primaryModel

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

@@ -209,15 +209,26 @@ function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH }) {
 
     try {
       await doForward(getCachedLease(sessionId))
-    } catch {
-      try {
-        const config = readConfig(configPath)
-        leaseCache.delete(sessionId)
-        const freshLease = await fetchFreshLease(config, sessionId)
-        await doForward(freshLease)
-      } catch (retryError) {
+    } catch (err) {
+      if (clientRes.headersSent) return
+      // 只在没有 lease 缓存时重试（首次连接或 lease 过期）
+      // 网络超时/连接错误不重试 — 让 Claude Code 自己处理重试，避免重复 API 请求
+      const noLease = !leaseCache.has(sessionId) || (err && err.message && err.message.includes('No session lease'))
+      if (noLease) {
+        try {
+          const config = readConfig(configPath)
+          leaseCache.delete(sessionId)
+          const freshLease = await fetchFreshLease(config, sessionId)
+          await doForward(freshLease)
+        } catch (retryError) {
+          if (!clientRes.headersSent) {
+            clientRes.writeHead(502, { 'content-type': 'text/plain; charset=utf-8' })
+            clientRes.end(retryError.message || 'Proxy error')
+          }
+        }
+      } else {
         clientRes.writeHead(502, { 'content-type': 'text/plain; charset=utf-8' })
-        clientRes.end(retryError.message || 'Proxy error')
+        clientRes.end(err?.message || 'Proxy error')
       }
     }
   })
@@ -244,15 +255,20 @@ function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH }) {
 
     try {
       await doConnect(getCachedLease(sessionId))
-    } catch {
-      // lease 失效，拿新 lease 重试一次
-      try {
-        const config = readConfig(configPath)
-        leaseCache.delete(sessionId)
-        const freshLease = await fetchFreshLease(config, sessionId)
-        await doConnect(freshLease)
-      } catch (retryError) {
-        clientSocket.write(`HTTP/1.1 502 Bad Gateway\r\ncontent-type: text/plain; charset=utf-8\r\n\r\n${retryError.message}`)
+    } catch (err) {
+      const noLease = !leaseCache.has(sessionId) || (err && err.message && err.message.includes('No session lease'))
+      if (noLease) {
+        try {
+          const config = readConfig(configPath)
+          leaseCache.delete(sessionId)
+          const freshLease = await fetchFreshLease(config, sessionId)
+          await doConnect(freshLease)
+        } catch (retryError) {
+          clientSocket.write(`HTTP/1.1 502 Bad Gateway\r\ncontent-type: text/plain; charset=utf-8\r\n\r\n${retryError.message}`)
+          clientSocket.destroy()
+        }
+      } else {
+        clientSocket.write(`HTTP/1.1 502 Bad Gateway\r\ncontent-type: text/plain; charset=utf-8\r\n\r\n${err?.message || 'Proxy error'}`)
         clientSocket.destroy()
       }
     }

package/src/webui/server.js

@@ -516,11 +516,10 @@ async function handleToolConfigure(req, res) {
 
   const allModelIds = [
     'gpt-5.4', 'gpt-5.3-codex-spark',
-    'claude-sonnet-4-6', 'claude-sonnet-4-6[1m]',
-    'claude-opus-4-6', 'claude-opus-4-6[1m]',
+    'claude-sonnet-4-6', 'claude-opus-4-6',
     'MiniMax-M2.7-highspeed', 'claude-haiku-4-5',
   ]
-  const primaryModel = 'claude-sonnet-4-6[1m]'
+  const primaryModel = 'claude-sonnet-4-6'
 
   sseEmit(res, { type: 'progress', message: `正在配置 ${tool.name}...` })