@simonyea/holysheep-cli 2.1.45 → 2.1.47

package/dist/configure-worker.js

@@ -292,6 +292,15 @@ var require_claude_process_proxy = __commonJS({
           host: target.host,
           connection: "close"
         };
+        if (process.env.HS_CLAUDE_DEBUG_HEADERS === "1") {
+          console.error(
+            `[DEBUG-HDRS forwardDirectHttps] ${JSON.stringify({
+              target: String(target),
+              ALL_outbound_headers: headers,
+              clientReqHeaders: clientReq.headers
+            })}`
+          );
+        }
         const upReq = https2.request({
           hostname: target.hostname,
           port: target.port || 443,
@@ -427,6 +436,16 @@ var require_claude_process_proxy = __commonJS({
             })}`
           );
         }
+        if (process.env.HS_CLAUDE_DEBUG_HEADERS === "1") {
+          console.error(
+            `[DEBUG-HDRS forwardViaNodeProxy] ${JSON.stringify({
+              target: String(targetUrl),
+              node: String(nodeProxyUrl),
+              ALL_outbound_headers: finalHeaders,
+              clientReqHeaders: clientReq.headers
+            })}`
+          );
+        }
         forwardReq = http.request({
           host: upstream.hostname,
           port: Number(upstream.port || 80),
@@ -3974,11 +3993,11 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@simonyea/holysheep-cli",
-      version: "2.1.45",
+      version: "2.1.47",
       description: "Claude Code/Cursor/Cline API relay for China \u2014 \xA51=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
       scripts: {
         build: "node scripts/build.mjs",
-        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 && node tests/opencode-auth-purge.test.js && node tests/shell-winpath.test.js && node tests/openclaw-atomic-write.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-wrapper-claude-proxy.test.js && node tests/aionui-wrapper-probe.test.js && node tests/aionui-wrapper-proxy-integration.test.js",
+        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 && node tests/opencode-auth-purge.test.js && node tests/shell-winpath.test.js && node tests/openclaw-atomic-write.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-wrapper-claude-proxy.test.js && node tests/aionui-wrapper-probe.test.js && node tests/aionui-wrapper-proxy-integration.test.js && node tests/aionui-wrapper-all-clis-autoconf.test.js && node tests/aionui-wrapper-env-signal.test.js",
         prepublishOnly: "npm run build && npm test && node scripts/check-tarball-size.js"
       },
       keywords: [

package/dist/index.js

@@ -12,11 +12,11 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@simonyea/holysheep-cli",
-      version: "2.1.45",
+      version: "2.1.47",
       description: "Claude Code/Cursor/Cline API relay for China \u2014 \xA51=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
       scripts: {
         build: "node scripts/build.mjs",
-        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 && node tests/opencode-auth-purge.test.js && node tests/shell-winpath.test.js && node tests/openclaw-atomic-write.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-wrapper-claude-proxy.test.js && node tests/aionui-wrapper-probe.test.js && node tests/aionui-wrapper-proxy-integration.test.js",
+        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 && node tests/opencode-auth-purge.test.js && node tests/shell-winpath.test.js && node tests/openclaw-atomic-write.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-wrapper-claude-proxy.test.js && node tests/aionui-wrapper-probe.test.js && node tests/aionui-wrapper-proxy-integration.test.js && node tests/aionui-wrapper-all-clis-autoconf.test.js && node tests/aionui-wrapper-env-signal.test.js",
         prepublishOnly: "npm run build && npm test && node scripts/check-tarball-size.js"
       },
       keywords: [
@@ -968,6 +968,15 @@ var require_claude_process_proxy = __commonJS({
           host: target.host,
           connection: "close"
         };
+        if (process.env.HS_CLAUDE_DEBUG_HEADERS === "1") {
+          console.error(
+            `[DEBUG-HDRS forwardDirectHttps] ${JSON.stringify({
+              target: String(target),
+              ALL_outbound_headers: headers,
+              clientReqHeaders: clientReq.headers
+            })}`
+          );
+        }
         const upReq = https2.request({
           hostname: target.hostname,
           port: target.port || 443,
@@ -1103,6 +1112,16 @@ var require_claude_process_proxy = __commonJS({
             })}`
           );
         }
+        if (process.env.HS_CLAUDE_DEBUG_HEADERS === "1") {
+          console.error(
+            `[DEBUG-HDRS forwardViaNodeProxy] ${JSON.stringify({
+              target: String(targetUrl),
+              node: String(nodeProxyUrl),
+              ALL_outbound_headers: finalHeaders,
+              clientReqHeaders: clientReq.headers
+            })}`
+          );
+        }
         forwardReq = http.request({
           host: upstream.hostname,
           port: Number(upstream.port || 80),
@@ -5871,9 +5890,9 @@ var require_aionui_runtime_fetcher = __commonJS({
     var http = require("http");
     var USER_CACHE_DIR = path.join(os.homedir(), ".holysheep", "aionui-runtime");
     var VENDOR_DIR = path.join(__dirname, "vendor", "aionui");
-    var DEFAULT_RUNTIME_URL = "https://mail.holysheep.ai/app/cli/aionui-runtime-v1.9.18-holysheep-hs32.tar.gz";
-    var DEFAULT_RUNTIME_SHA256 = "7efafb298109f75a7e804fa1425a52cabe0d46ee39760fc54be14e80938f27c2";
-    var DEFAULT_RUNTIME_VERSION = "1.9.18-holysheep-hs32";
+    var DEFAULT_RUNTIME_URL = "https://mail.holysheep.ai/app/cli/aionui-runtime-v1.9.18-holysheep-hs34.tar.gz";
+    var DEFAULT_RUNTIME_SHA256 = "5f656f6c049c935a26b76a70539147e7af17325817fe539a65ca46315590ecb1";
+    var DEFAULT_RUNTIME_VERSION = "1.9.18-holysheep-hs34";
     function isValidRuntimeDir(dir) {
       if (!dir) return false;
       try {
@@ -6162,6 +6181,71 @@ This runtime cannot launch the WebUI. Check HOLYSHEEP_AIONUI_RUNTIME_URL or repo
   }
 });
 
+// src/tools/gemini-cli.js
+var require_gemini_cli = __commonJS({
+  "src/tools/gemini-cli.js"(exports2, module2) {
+    var fs = require("fs");
+    var path = require("path");
+    var os = require("os");
+    var GEMINI_DIR = path.join(os.homedir(), ".gemini");
+    var SETTINGS_FILE = path.join(GEMINI_DIR, "settings.json");
+    function readSettings() {
+      try {
+        if (fs.existsSync(SETTINGS_FILE)) {
+          return JSON.parse(fs.readFileSync(SETTINGS_FILE, "utf8"));
+        }
+      } catch {
+      }
+      return {};
+    }
+    __name(readSettings, "readSettings");
+    function writeSettings(data) {
+      if (!fs.existsSync(GEMINI_DIR)) fs.mkdirSync(GEMINI_DIR, { recursive: true });
+      fs.writeFileSync(SETTINGS_FILE, JSON.stringify(data, null, 2), "utf8");
+    }
+    __name(writeSettings, "writeSettings");
+    module2.exports = {
+      name: "Gemini CLI",
+      id: "gemini-cli",
+      checkInstalled() {
+        return require_which().commandExists("gemini");
+      },
+      isConfigured() {
+        if (process.env.GEMINI_API_KEY) return true;
+        const s = readSettings();
+        return s.selectedAuthType === "gemini-api-key";
+      },
+      configure(apiKey, _baseUrlAnthropicNoV1, _baseUrlOpenAI) {
+        const settings = readSettings();
+        settings.selectedAuthType = "gemini-api-key";
+        writeSettings(settings);
+        return {
+          file: SETTINGS_FILE,
+          hot: false,
+          // 不注入 GEMINI_API_KEY，因为 HolySheep key 对 Gemini CLI 无效
+          // 用户需要手动设置真正的 Gemini API Key
+          envVars: {},
+          warning: 'Gemini CLI \u9700\u8981 Google \u5B98\u65B9 Gemini API Key\uFF0C\u65E0\u6CD5\u4F7F\u7528 HolySheep \u4E2D\u7EE7\u3002\n\u8BF7\u4ECE https://aistudio.google.com/apikey \u83B7\u53D6 API Key \u540E\u8BBE\u7F6E\u73AF\u5883\u53D8\u91CF\uFF1A\n  export GEMINI_API_KEY="your-google-api-key"'
+        };
+      },
+      reset() {
+        const settings = readSettings();
+        delete settings.selectedAuthType;
+        writeSettings(settings);
+      },
+      getConfigPath() {
+        return SETTINGS_FILE;
+      },
+      hint: "Gemini CLI \u4E0D\u652F\u6301 HolySheep \u4E2D\u7EE7\uFF0C\u9700\u4F7F\u7528 Google \u5B98\u65B9 Gemini API Key",
+      installCmd: "npm install -g @google/gemini-cli",
+      docsUrl: "https://github.com/google-gemini/gemini-cli",
+      envVarFormat: "gemini",
+      unsupported: true
+      // 标记为不支持中继
+    };
+  }
+});
+
 // src/webui/workspace-store.js
 var require_workspace_store = __commonJS({
   "src/webui/workspace-store.js"(exports2, module2) {
@@ -8579,6 +8663,10 @@ var require_aionui_wrapper = __commonJS({
     } = require_config();
     var claudeProcessProxy = require_claude_process_proxy();
     var claudeCodeTool = require_claude_code();
+    var geminiTool = require_gemini_cli();
+    var codexTool = require_codex();
+    var droidTool = require_droid();
+    var hermesTool = require_hermes();
     var BRIDGE_DIR = path.join(os.homedir(), ".holysheep");
     var BRIDGE_CRED_FILE = path.join(BRIDGE_DIR, "aionui-bridge.json");
     var TOKEN_TTL_MS = 3e4;
@@ -9097,6 +9185,75 @@ var require_aionui_wrapper = __commonJS({
       });
     }
     __name(probeLocalPort, "probeLocalPort");
+    function _ensureAllClisConfigured(apiKey) {
+      if (!apiKey) {
+        log("skipping auto-config for all CLI tools: no HolySheep apiKey available");
+        return;
+      }
+      const summary = { configured: [], skipped: [], failed: [] };
+      try {
+        _ensureClaudeProxyConfig(apiKey);
+        summary.configured.push("claude-code");
+      } catch (e) {
+        summary.failed.push({ tool: "claude-code", error: e && e.message ? e.message : String(e) });
+        log("warn: auto-config claude-code failed: " + (e && e.message ? e.message : e));
+      }
+      const siblings = [
+        {
+          id: "codex",
+          tool: codexTool,
+          settingsHint: "~/.codex/config.toml + auth.json",
+          configureArgs: [apiKey, BASE_URL_ANTHROPIC, BASE_URL_OPENAI]
+        },
+        {
+          id: "droid",
+          tool: droidTool,
+          settingsHint: "~/.factory/settings.json",
+          configureArgs: [apiKey, BASE_URL_ANTHROPIC, BASE_URL_OPENAI]
+        },
+        {
+          id: "hermes",
+          tool: hermesTool,
+          settingsHint: "~/.hermes/config.{toml,yaml}",
+          configureArgs: [apiKey, BASE_URL_ANTHROPIC, BASE_URL_OPENAI]
+        },
+        {
+          id: "gemini-cli",
+          tool: geminiTool,
+          settingsHint: "~/.gemini/settings.json (selectedAuthType only \u2014 HolySheep key does not proxy Gemini)",
+          configureArgs: [apiKey, BASE_URL_ANTHROPIC, BASE_URL_OPENAI]
+        }
+      ];
+      for (const s of siblings) {
+        try {
+          let already = false;
+          try {
+            already = typeof s.tool.isConfigured === "function" ? Boolean(s.tool.isConfigured()) : false;
+          } catch {
+            already = false;
+          }
+          if (already) {
+            summary.skipped.push(s.id);
+            log(`${s.id} already configured (${s.settingsHint}) \u2014 skipping auto-config`);
+            continue;
+          }
+          if (typeof s.tool.configure !== "function") {
+            summary.skipped.push(s.id);
+            log(`${s.id} has no configure() entry (env-only) \u2014 skipped`);
+            continue;
+          }
+          s.tool.configure.apply(s.tool, s.configureArgs);
+          summary.configured.push(s.id);
+          log(`auto-configured ${s.id} settings (${s.settingsHint}) \u2014 first-ever hs web for this user`);
+        } catch (err) {
+          summary.failed.push({ tool: s.id, error: err && err.message ? err.message : String(err) });
+          log(`warn: auto-config ${s.id} failed: ${err && err.message ? err.message : err}`);
+        }
+      }
+      log(`CLI auto-config summary: configured=[${summary.configured.join(",")}] skipped=[${summary.skipped.join(",")}] failed=[${summary.failed.map((f) => f.tool).join(",")}]`);
+      return summary;
+    }
+    __name(_ensureAllClisConfigured, "_ensureAllClisConfigured");
     function _ensureClaudeProxyConfig(apiKey) {
       const config = claudeProcessProxy.readConfig();
       const next = claudeCodeTool.buildBridgeConfig(apiKey, BASE_URL_ANTHROPIC, {
@@ -9170,6 +9327,19 @@ var require_aionui_wrapper = __commonJS({
       }
       const internalPort = await pickInternalPort();
       log(`internal runtime port: ${internalPort}`);
+      try {
+        const __apiKeyForAutoConfig = (() => {
+          try {
+            return getApiKey();
+          } catch {
+            return null;
+          }
+        })();
+        if (__apiKeyForAutoConfig) _ensureAllClisConfigured(__apiKeyForAutoConfig);
+        else log("CLI auto-config skipped: no HolySheep apiKey (run `hs login`)");
+      } catch (e) {
+        log("warn: CLI auto-config error (continuing): " + (e && e.message ? e.message : e));
+      }
       const claudeProxyHandle = await ensureClaudeProcessProxyRunning();
       const debug = process.env.HS_WEB_DEBUG === "1";
       const { PACKAGE_ROOT, cliVersion, ptyHermesWrapperPath } = require_paths();
@@ -9185,6 +9355,28 @@ var require_aionui_wrapper = __commonJS({
       }
       const sanitizedParentEnv = { ...process.env };
       delete sanitizedParentEnv.HOLYSHEEP_API_KEY;
+      delete sanitizedParentEnv.HOLYSHEEP_CLAUDE_PROXY_PORT;
+      let signalledProxyPort = "";
+      try {
+        if (claudeProxyHandle && !claudeProxyHandle.skipped) {
+          if (claudeProxyHandle.reused && claudeProxyHandle.port) {
+            signalledProxyPort = String(claudeProxyHandle.port);
+          } else if (!claudeProxyHandle.reused && claudeProxyHandle.server) {
+            const addr = claudeProxyHandle.server.address && claudeProxyHandle.server.address();
+            if (addr && typeof addr === "object" && addr.port) {
+              signalledProxyPort = String(addr.port);
+            }
+          }
+        }
+        if (!signalledProxyPort) {
+          const cfg = claudeProcessProxy.readConfig();
+          if (cfg && cfg.processProxyPort) signalledProxyPort = String(cfg.processProxyPort);
+        }
+      } catch {
+      }
+      if (signalledProxyPort) {
+        log(`exporting HOLYSHEEP_CLAUDE_PROXY_PORT=${signalledProxyPort} to aionui (authoritative proxy port \u2014 fork will skip HTTP probe)`);
+      }
       const aionui = spawn(bunPath, ["dist-server/server.mjs"], {
         cwd: runtimeDir,
         env: {
@@ -9196,7 +9388,8 @@ var require_aionui_wrapper = __commonJS({
           HOLYSHEEP_CLI_ROOT: cliRoot,
           HOLYSHEEP_CLI_VERSION: wrapperVersion,
           HOLYSHEEP_CONFIG_PATH: credPath,
-          HOLYSHEEP_PTY_HERMES_WRAPPER: ptyWrapperAbs
+          HOLYSHEEP_PTY_HERMES_WRAPPER: ptyWrapperAbs,
+          ...signalledProxyPort ? { HOLYSHEEP_CLAUDE_PROXY_PORT: signalledProxyPort } : {}
         },
         stdio: ["ignore", "pipe", "pipe"]
       });
@@ -9286,6 +9479,7 @@ ${tail.split(/\r?\n/).map((ln) => `  ${ln}`).join("\n")}
     __name(startWrapper, "startWrapper");
     module2.exports = {
       startWrapper,
+      _ensureAllClisConfigured,
       // Exported for tests / inspection
       isLoopbackRequest,
       pruneExpiredTokens,

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.45",
+  "version": "2.1.47",
   "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.",
   "scripts": {
     "build": "node scripts/build.mjs",
-    "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 && node tests/opencode-auth-purge.test.js && node tests/shell-winpath.test.js && node tests/openclaw-atomic-write.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-wrapper-claude-proxy.test.js && node tests/aionui-wrapper-probe.test.js && node tests/aionui-wrapper-proxy-integration.test.js",
+    "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 && node tests/opencode-auth-purge.test.js && node tests/shell-winpath.test.js && node tests/openclaw-atomic-write.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-wrapper-claude-proxy.test.js && node tests/aionui-wrapper-probe.test.js && node tests/aionui-wrapper-proxy-integration.test.js && node tests/aionui-wrapper-all-clis-autoconf.test.js && node tests/aionui-wrapper-env-signal.test.js",
     "prepublishOnly": "npm run build && npm test && node scripts/check-tarball-size.js"
   },
   "keywords": [