@simonyea/holysheep-cli 2.1.29 → 2.1.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.29",
+  "version": "2.1.30",
   "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

@@ -205,6 +205,26 @@ function buildAuthHeaders(config, lease) {
   }
 }
 
+// [HolySheep fork v2.1.29 / hs22] Rewrite User-Agent away from claude-cli/*.
+// CRS enforces a "Claude Code CLI must use hs claude" policy keyed on UA —
+// when it sees claude-cli/* or claude-code/*, it 403s even with valid bridge
+// headers, under the assumption the user bypassed the wrapper. Every forward
+// path (node-proxy + direct-https fallback) now normalises UA to
+// holysheep-cli so the wrapper identity is preserved end-to-end.
+function sanitizeClaudeClientHeaders(headers, config) {
+  const out = { ...(headers || {}) }
+  for (const k of Object.keys(out)) {
+    if (/^x-forwarded-|^x-real-ip$|^forwarded$|^via$/i.test(k)) {
+      delete out[k]
+      continue
+    }
+    if (/^user-agent$/i.test(k) && /claude-cli|claude-code/i.test(String(out[k] || ''))) {
+      out[k] = `holysheep-cli/${(config && config.cliVersion) || 'process-proxy'} (hs-claude-proxy)`
+    }
+  }
+  return out
+}
+
 function deriveNodeProxyUrl(lease) {
   if (process.env.HS_CLAUDE_NODE_PROXY_OVERRIDE) {
     return String(process.env.HS_CLAUDE_NODE_PROXY_OVERRIDE).replace(/\/+$/, '')
@@ -244,12 +264,7 @@ function forwardDirectHttps({ config, lease, clientReq, clientRes, trace }) {
     // (or a proxy earlier in the chain could tag the request) and leak the
     // loopback origin / real client IP to api.holysheep.ai. The upstream
     // doesn't need them — it authenticates off bridge headers + API key.
-    const sanitized = { ...clientReq.headers }
-    for (const k of Object.keys(sanitized)) {
-      if (/^x-forwarded-|^x-real-ip$|^forwarded$|^via$/i.test(k)) {
-        delete sanitized[k]
-      }
-    }
+    const sanitized = sanitizeClaudeClientHeaders(clientReq.headers, config)
     const headers = {
       ...sanitized,
       ...buildAuthHeaders(config, lease),
@@ -375,8 +390,14 @@ function forwardViaNodeProxy({ nodeProxyUrl, targetUrl, clientReq, clientRes, ex
       stallTimer = setTimeout(() => failWithAnthropicError('upstream stream stalled'), STALL_TIMEOUT_MS)
     }
 
+    // [HolySheep fork v2.1.29 / hs22] Same UA-rewrite logic as forwardDirectHttps.
+    // Even when we go through node4:3129, the forward-proxy delivers the UA
+    // verbatim to upstream CRS; keeping claude-cli/* gets us 403.
+    // `extraHeaders` already contains bridge auth via buildAuthHeaders.
+    // `config` may be undefined here because forwardViaNodeProxy doesn't take
+    // one; use a minimal stub — cliVersion is optional.
     const finalHeaders = {
-      ...clientReq.headers,
+      ...sanitizeClaudeClientHeaders(clientReq.headers, { cliVersion: undefined }),
       ...extraHeaders,
       host: targetUrl.host,
       connection: 'close',