@simonyea/holysheep-cli 2.1.19 → 2.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.19",
+  "version": "2.1.21",
   "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.",
   "scripts": {
     "test": "node tests/droid.test.js && node tests/workspace-store.test.js && node tests/runtime-stale-upgrade.test.js && node tests/hermes.test.js && node tests/preflight.test.js",

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

@@ -206,6 +206,9 @@ function buildAuthHeaders(config, lease) {
 }
 
 function deriveNodeProxyUrl(lease) {
+  if (process.env.HS_CLAUDE_NODE_PROXY_OVERRIDE) {
+    return String(process.env.HS_CLAUDE_NODE_PROXY_OVERRIDE).replace(/\/+$/, '')
+  }
   if (lease.nodeProxyUrl) return String(lease.nodeProxyUrl)
   if (!lease.nodeBaseUrl) throw new Error('Lease does not include node proxy information')
   const upstream = new URL(String(lease.nodeBaseUrl))
@@ -315,18 +318,32 @@ function forwardViaNodeProxy({ nodeProxyUrl, targetUrl, clientReq, clientRes, ex
       stallTimer = setTimeout(() => failWithAnthropicError('upstream stream stalled'), STALL_TIMEOUT_MS)
     }
 
+    const finalHeaders = {
+      ...clientReq.headers,
+      ...extraHeaders,
+      host: targetUrl.host,
+      connection: 'close',
+    }
+    if (ENABLE_TIMING_LOG) {
+      const hsHeaders = Object.fromEntries(
+        Object.entries(finalHeaders).filter(([k]) => /^x-hs-/i.test(k))
+      )
+      console.error(
+        `[hs-claude-proxy] forward.headers ${JSON.stringify({
+          target: sanitizeUrl(targetUrl),
+          node: sanitizeUrl(nodeProxyUrl),
+          hsHeaders,
+          clientHeadersKeys: Object.keys(clientReq.headers).slice(0, 20),
+        })}`
+      )
+    }
     forwardReq = http.request({
       host: upstream.hostname,
       port: Number(upstream.port || 80),
       method: clientReq.method,
       path: targetUrl.toString(),
       agent: false,
-      headers: {
-        ...clientReq.headers,
-        ...extraHeaders,
-        host: targetUrl.host,
-        connection: 'close',
-      },
+      headers: finalHeaders,
     }, (forwardRes) => {
       sawUpstreamResponse = true
       clearResponseTimer()

package/src/tools/droid.js

@@ -166,6 +166,18 @@ module.exports = {
   configure(apiKey, baseUrlAnthropic, baseUrlOpenAI, _primaryModel, selectedModels) {
     const nextModels = buildCustomModels(apiKey, baseUrlAnthropic, baseUrlOpenAI, selectedModels)
 
+    // [HolySheep fork v2.1.19] Pick a preferred default model. Droid CLI hardcodes
+    // `claude-opus-4-6` as the default when `sessionDefaultSettings.model` is
+    // absent, and HolySheep upstream often has no opus accounts available —
+    // producing "503 No available Claude accounts support claude-opus-4-6" in
+    // hs web. Prefer sonnet-4-6 when present; fall back to the first HolySheep
+    // model so the user at least lands on a working route.
+    const preferredDefault =
+      nextModels.find((m) => m.id === 'custom:claude-sonnet-4-6-0') ||
+      nextModels.find((m) => /sonnet/i.test(m.model)) ||
+      nextModels[0]
+    const defaultModelId = preferredDefault ? preferredDefault.id : null
+
     const settings = readSettings()
     const preservedModels = Array.isArray(settings.customModels)
       ? settings.customModels.filter((item) => !isHolySheepModel(item))
@@ -175,6 +187,12 @@ module.exports = {
       ...preservedModels,
     ]
     settings.logoAnimation = 'off'
+    if (defaultModelId) {
+      settings.sessionDefaultSettings = {
+        ...(settings.sessionDefaultSettings || {}),
+        model: defaultModelId,
+      }
+    }
     writeSettings(settings)
 
     const legacy = readLegacyConfig()
@@ -186,6 +204,12 @@ module.exports = {
       ...preservedLegacyModels,
     ]
     legacy.logoAnimation = 'off'
+    if (defaultModelId) {
+      legacy.sessionDefaultSettings = {
+        ...(legacy.sessionDefaultSettings || {}),
+        model: defaultModelId,
+      }
+    }
     writeLegacyConfig(legacy)
 
     // Windows: also write FACTORY_API_KEY to user env via setx so a freshly
@@ -210,15 +234,43 @@ module.exports = {
   },
   reset() {
     const settings = readSettings()
+    // Collect ids of HolySheep customModels BEFORE filtering so we can clean
+    // up any sessionDefaultSettings.model pointing at them.
+    const hsIds = new Set(
+      (Array.isArray(settings.customModels) ? settings.customModels : [])
+        .filter(isHolySheepModel)
+        .map((m) => m?.id)
+        .filter(Boolean)
+    )
     if (Array.isArray(settings.customModels)) {
       settings.customModels = settings.customModels.filter((item) => !isHolySheepModel(item))
     }
+    if (
+      settings.sessionDefaultSettings &&
+      typeof settings.sessionDefaultSettings === 'object' &&
+      hsIds.has(settings.sessionDefaultSettings.model)
+    ) {
+      delete settings.sessionDefaultSettings.model
+    }
     writeSettings(settings)
 
     const legacy = readLegacyConfig()
+    const hsLegacyIds = new Set(
+      (Array.isArray(legacy.customModels) ? legacy.customModels : [])
+        .filter(isHolySheepModel)
+        .map((m) => m?.id)
+        .filter(Boolean)
+    )
     if (Array.isArray(legacy.customModels)) {
       legacy.customModels = legacy.customModels.filter((item) => !isHolySheepModel(item))
     }
+    if (
+      legacy.sessionDefaultSettings &&
+      typeof legacy.sessionDefaultSettings === 'object' &&
+      hsLegacyIds.has(legacy.sessionDefaultSettings.model)
+    ) {
+      delete legacy.sessionDefaultSettings.model
+    }
     writeLegacyConfig(legacy)
   },
   getConfigPath() { return SETTINGS_FILE },

package/src/webui/aionui-runtime-fetcher.js

@@ -60,10 +60,10 @@ const VENDOR_DIR = path.join(__dirname, 'vendor', 'aionui')
 // new CLI release, the next `hs web` invocation on user machines will detect
 // the version drift and upgrade the cache in place.
 const DEFAULT_RUNTIME_URL =
-  'https://mail.holysheep.ai/app/cli/aionui-runtime-v1.9.18-holysheep-hs15.tar.gz'
+  'https://mail.holysheep.ai/app/cli/aionui-runtime-v1.9.18-holysheep-hs17.tar.gz'
 const DEFAULT_RUNTIME_SHA256 =
-  'ba1c2e18b624171238185d1a95ac9bd9ff0f761acb74d8eea97812cbd15555ee'
-const DEFAULT_RUNTIME_VERSION = '1.9.18-holysheep-hs15'
+  '28083f135503a27437750c8f692a2700c69f8253aaf19dff259af6d1517572f4'
+const DEFAULT_RUNTIME_VERSION = '1.9.18-holysheep-hs17'
 
 function isValidRuntimeDir(dir) {
   if (!dir) return false