@simonyea/holysheep-cli 2.1.42 → 2.1.44

package/dist/configure-worker.js

@@ -76,21 +76,25 @@ var require_claude_process_proxy = __commonJS({
     var HOLYSHEEP_DIR = path.join(os.homedir(), ".holysheep");
     var CONFIG_PATH = path.join(HOLYSHEEP_DIR, "claude-proxy.json");
     var DEFAULT_PROXY_PORT = 14556;
+    var LOCAL_PING_PATH = "/__hs_local_ping__";
+    var LOCAL_PING_HEADER = "x-hs-local-proxy";
+    var LOCAL_PING_HEADER_VALUE = "1";
     function ensureDir() {
       if (!fs.existsSync(HOLYSHEEP_DIR)) fs.mkdirSync(HOLYSHEEP_DIR, { recursive: true });
     }
     __name(ensureDir, "ensureDir");
-    function readConfig() {
+    function readConfig(configPath) {
       try {
-        return JSON.parse(fs.readFileSync(CONFIG_PATH, "utf8"));
+        return JSON.parse(fs.readFileSync(configPath || CONFIG_PATH, "utf8"));
       } catch {
         return {};
       }
     }
     __name(readConfig, "readConfig");
-    function writeConfig(data) {
-      ensureDir();
-      fs.writeFileSync(CONFIG_PATH, JSON.stringify(data, null, 2), "utf8");
+    function writeConfig(data, configPath) {
+      const target = configPath || CONFIG_PATH;
+      if (!configPath) ensureDir();
+      fs.writeFileSync(target, JSON.stringify(data, null, 2), "utf8");
     }
     __name(writeConfig, "writeConfig");
     function getProcessProxyPort(config = readConfig()) {
@@ -572,6 +576,31 @@ var require_claude_process_proxy = __commonJS({
     __name(pipeWithCleanup, "pipeWithCleanup");
     function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH, allowAnthropicConnect = false }) {
       const server = http.createServer(async (clientReq, clientRes) => {
+        if (clientReq.method === "GET" && !clientReq.url.startsWith("http")) {
+          const u = clientReq.url.split("?")[0];
+          if (u === LOCAL_PING_PATH) {
+            const hostHeader = String(clientReq.headers.host || "").toLowerCase();
+            const isLoopbackHost = hostHeader.startsWith("127.0.0.1") || hostHeader.startsWith("localhost") || hostHeader.startsWith("[::1]");
+            if (!isLoopbackHost) {
+              clientRes.writeHead(404, { "content-type": "text/plain" });
+              clientRes.end("not found");
+              return;
+            }
+            const body = JSON.stringify({
+              hsLocalProxy: true,
+              sessionId: String(sessionId || ""),
+              pid: process.pid,
+              ts: Date.now()
+            });
+            clientRes.writeHead(200, {
+              "content-type": "application/json",
+              [LOCAL_PING_HEADER]: LOCAL_PING_HEADER_VALUE,
+              "cache-control": "no-store"
+            });
+            clientRes.end(body);
+            return;
+          }
+        }
         const isDirect = !clientReq.url.startsWith("http");
         if (ENABLE_TIMING_LOG) {
           console.error(
@@ -885,7 +914,16 @@ ${body}`);
             }
           });
           server.once("listening", () => {
-            resolve({ server, port: server.address().port, sessionId: effectiveSessionId });
+            const boundPort = server.address().port;
+            try {
+              const latest = readConfig(configPath);
+              if (Number(latest.processProxyPort) !== boundPort) {
+                writeConfig({ ...latest, processProxyPort: boundPort }, configPath);
+              }
+            } catch (persistErr) {
+              console.error("[hs-claude-proxy] warn: failed to persist processProxyPort:", persistErr && persistErr.message);
+            }
+            resolve({ server, port: boundPort, sessionId: effectiveSessionId });
           });
           server.listen(p, "127.0.0.1");
         }, "tryListen");
@@ -931,7 +969,10 @@ ${body}`);
       getControlPlaneUrl,
       readConfig,
       startProcessProxy,
-      writeConfig
+      writeConfig,
+      LOCAL_PING_PATH,
+      LOCAL_PING_HEADER,
+      LOCAL_PING_HEADER_VALUE
     };
   }
 });
@@ -3931,11 +3972,11 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@simonyea/holysheep-cli",
-      version: "2.1.42",
+      version: "2.1.44",
       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",
+        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",
         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.42",
+      version: "2.1.44",
       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",
+        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",
         prepublishOnly: "npm run build && npm test && node scripts/check-tarball-size.js"
       },
       keywords: [
@@ -752,21 +752,25 @@ var require_claude_process_proxy = __commonJS({
     var HOLYSHEEP_DIR = path.join(os.homedir(), ".holysheep");
     var CONFIG_PATH = path.join(HOLYSHEEP_DIR, "claude-proxy.json");
     var DEFAULT_PROXY_PORT = 14556;
+    var LOCAL_PING_PATH = "/__hs_local_ping__";
+    var LOCAL_PING_HEADER = "x-hs-local-proxy";
+    var LOCAL_PING_HEADER_VALUE = "1";
     function ensureDir() {
       if (!fs.existsSync(HOLYSHEEP_DIR)) fs.mkdirSync(HOLYSHEEP_DIR, { recursive: true });
     }
     __name(ensureDir, "ensureDir");
-    function readConfig() {
+    function readConfig(configPath) {
       try {
-        return JSON.parse(fs.readFileSync(CONFIG_PATH, "utf8"));
+        return JSON.parse(fs.readFileSync(configPath || CONFIG_PATH, "utf8"));
       } catch {
         return {};
       }
     }
     __name(readConfig, "readConfig");
-    function writeConfig(data) {
-      ensureDir();
-      fs.writeFileSync(CONFIG_PATH, JSON.stringify(data, null, 2), "utf8");
+    function writeConfig(data, configPath) {
+      const target = configPath || CONFIG_PATH;
+      if (!configPath) ensureDir();
+      fs.writeFileSync(target, JSON.stringify(data, null, 2), "utf8");
     }
     __name(writeConfig, "writeConfig");
     function getProcessProxyPort(config = readConfig()) {
@@ -1248,6 +1252,31 @@ var require_claude_process_proxy = __commonJS({
     __name(pipeWithCleanup, "pipeWithCleanup");
     function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH, allowAnthropicConnect = false }) {
       const server = http.createServer(async (clientReq, clientRes) => {
+        if (clientReq.method === "GET" && !clientReq.url.startsWith("http")) {
+          const u = clientReq.url.split("?")[0];
+          if (u === LOCAL_PING_PATH) {
+            const hostHeader = String(clientReq.headers.host || "").toLowerCase();
+            const isLoopbackHost = hostHeader.startsWith("127.0.0.1") || hostHeader.startsWith("localhost") || hostHeader.startsWith("[::1]");
+            if (!isLoopbackHost) {
+              clientRes.writeHead(404, { "content-type": "text/plain" });
+              clientRes.end("not found");
+              return;
+            }
+            const body = JSON.stringify({
+              hsLocalProxy: true,
+              sessionId: String(sessionId || ""),
+              pid: process.pid,
+              ts: Date.now()
+            });
+            clientRes.writeHead(200, {
+              "content-type": "application/json",
+              [LOCAL_PING_HEADER]: LOCAL_PING_HEADER_VALUE,
+              "cache-control": "no-store"
+            });
+            clientRes.end(body);
+            return;
+          }
+        }
         const isDirect = !clientReq.url.startsWith("http");
         if (ENABLE_TIMING_LOG) {
           console.error(
@@ -1561,7 +1590,16 @@ ${body}`);
             }
           });
           server.once("listening", () => {
-            resolve({ server, port: server.address().port, sessionId: effectiveSessionId });
+            const boundPort = server.address().port;
+            try {
+              const latest = readConfig(configPath);
+              if (Number(latest.processProxyPort) !== boundPort) {
+                writeConfig({ ...latest, processProxyPort: boundPort }, configPath);
+              }
+            } catch (persistErr) {
+              console.error("[hs-claude-proxy] warn: failed to persist processProxyPort:", persistErr && persistErr.message);
+            }
+            resolve({ server, port: boundPort, sessionId: effectiveSessionId });
           });
           server.listen(p, "127.0.0.1");
         }, "tryListen");
@@ -1607,7 +1645,10 @@ ${body}`);
       getControlPlaneUrl,
       readConfig,
       startProcessProxy,
-      writeConfig
+      writeConfig,
+      LOCAL_PING_PATH,
+      LOCAL_PING_HEADER,
+      LOCAL_PING_HEADER_VALUE
     };
   }
 });
@@ -8530,8 +8571,12 @@ var require_aionui_wrapper = __commonJS({
       getApiKey,
       loadConfig,
       saveConfig,
-      BASE_URL_OPENAI
+      BASE_URL_OPENAI,
+      BASE_URL_ANTHROPIC,
+      BASE_URL_CLAUDE_RELAY
     } = require_config();
+    var claudeProcessProxy = require_claude_process_proxy();
+    var claudeCodeTool = require_claude_code();
     var BRIDGE_DIR = path.join(os.homedir(), ".holysheep");
     var BRIDGE_CRED_FILE = path.join(BRIDGE_DIR, "aionui-bridge.json");
     var TOKEN_TTL_MS = 3e4;
@@ -8984,6 +9029,117 @@ var require_aionui_wrapper = __commonJS({
       }, "onRequest");
     }
     __name(buildRouter, "buildRouter");
+    function probeLocalPort(port, timeoutMs = 800) {
+      return new Promise((resolve) => {
+        const socket = net.createConnection({ host: "127.0.0.1", port });
+        let tcpSettled = false;
+        const tcpTimer = setTimeout(() => {
+          if (tcpSettled) return;
+          tcpSettled = true;
+          try {
+            socket.destroy();
+          } catch {
+          }
+          resolve(false);
+        }, timeoutMs);
+        socket.once("connect", () => {
+          if (tcpSettled) return;
+          tcpSettled = true;
+          clearTimeout(tcpTimer);
+          try {
+            socket.end();
+          } catch {
+          }
+          const req = http.request({
+            host: "127.0.0.1",
+            port,
+            method: "GET",
+            path: "/__hs_local_ping__",
+            timeout: timeoutMs,
+            headers: { "host": `127.0.0.1:${port}`, "connection": "close" }
+          }, (res) => {
+            const chunks = [];
+            res.on("data", (c) => chunks.push(c));
+            res.on("end", () => {
+              const header = String(res.headers["x-hs-local-proxy"] || "");
+              if (res.statusCode !== 200 || header !== "1") {
+                resolve(false);
+                return;
+              }
+              try {
+                const parsed = JSON.parse(Buffer.concat(chunks).toString("utf8"));
+                resolve(parsed && parsed.hsLocalProxy === true);
+              } catch {
+                resolve(false);
+              }
+            });
+            res.on("error", () => resolve(false));
+          });
+          req.on("timeout", () => {
+            try {
+              req.destroy();
+            } catch {
+            }
+            ;
+            resolve(false);
+          });
+          req.on("error", () => resolve(false));
+          req.end();
+        });
+        socket.once("error", () => {
+          if (tcpSettled) return;
+          tcpSettled = true;
+          clearTimeout(tcpTimer);
+          resolve(false);
+        });
+      });
+    }
+    __name(probeLocalPort, "probeLocalPort");
+    function _ensureClaudeProxyConfig(apiKey) {
+      const config = claudeProcessProxy.readConfig();
+      const next = claudeCodeTool.buildBridgeConfig(apiKey, BASE_URL_ANTHROPIC, {
+        ...config,
+        relayUrl: config.relayUrl || BASE_URL_CLAUDE_RELAY
+      });
+      if (JSON.stringify(next) !== JSON.stringify(config)) {
+        claudeProcessProxy.writeConfig(next);
+        return next;
+      }
+      return config;
+    }
+    __name(_ensureClaudeProxyConfig, "_ensureClaudeProxyConfig");
+    async function ensureClaudeProcessProxyRunning(opts = {}) {
+      const proxyModule = opts.proxyModule || claudeProcessProxy;
+      const probe = opts.probe || probeLocalPort;
+      const apiKeyGetter = opts.apiKeyGetter || getApiKey;
+      const ensureConfig = opts.ensureConfig || _ensureClaudeProxyConfig;
+      const port = proxyModule.getProcessProxyPort(proxyModule.readConfig());
+      const listening = await probe(port, 500);
+      if (listening) {
+        log(`claude process proxy already listening on 127.0.0.1:${port} (reusing; likely started by \`hs claude\` or another hs web)`);
+        return { reused: true, port };
+      }
+      let apiKey;
+      try {
+        apiKey = apiKeyGetter();
+      } catch {
+        apiKey = null;
+      }
+      if (!apiKey) {
+        log(`claude process proxy pre-start skipped: no HolySheep API key found (run \`hs login\` to enable Claude Code). Non-Claude backends unaffected.`);
+        return { skipped: true, reason: "no-api-key", port };
+      }
+      try {
+        ensureConfig(apiKey);
+        const result = await proxyModule.startProcessProxy({});
+        log(`claude process proxy listening on 127.0.0.1:${result.port} (sessionId=${String(result.sessionId).slice(0, 8)})`);
+        return { reused: false, port: result.port, sessionId: result.sessionId, server: result.server };
+      } catch (err) {
+        log(`claude process proxy pre-start failed (continuing without it): ${err && err.message ? err.message : err}`);
+        return { skipped: true, reason: "start-failed", port, error: err };
+      }
+    }
+    __name(ensureClaudeProcessProxyRunning, "ensureClaudeProcessProxyRunning");
     async function startWrapper({ port, runtimeDir, runtimeVersion, runtimeSource, bunPath }) {
       const hsNative = detectHolySheepAionUi(runtimeDir);
       log(`/login mode: ${hsNative ? "holysheep-native (apiKey)" : "legacy (username/password bridge)"}`);
@@ -8992,6 +9148,7 @@ var require_aionui_wrapper = __commonJS({
       }
       const internalPort = await pickInternalPort();
       log(`internal runtime port: ${internalPort}`);
+      const claudeProxyHandle = await ensureClaudeProcessProxyRunning();
       const debug = process.env.HS_WEB_DEBUG === "1";
       const { PACKAGE_ROOT, cliVersion, ptyHermesWrapperPath } = require_paths();
       const cliRoot = PACKAGE_ROOT;
@@ -9035,10 +9192,33 @@ var require_aionui_wrapper = __commonJS({
       }, "appendLog");
       aionui.stdout.on("data", (d) => appendLog("out", d));
       aionui.stderr.on("data", (d) => appendLog("err", d));
+      let claudeProxyCleanedUp = false;
+      const cleanupClaudeProxy = /* @__PURE__ */ __name(() => {
+        if (claudeProxyCleanedUp) return;
+        claudeProxyCleanedUp = true;
+        if (!claudeProxyHandle || claudeProxyHandle.skipped || claudeProxyHandle.reused) return;
+        try {
+          if (claudeProxyHandle.server && typeof claudeProxyHandle.server.close === "function") {
+            claudeProxyHandle.server.close();
+          }
+        } catch {
+        }
+        if (claudeProxyHandle.sessionId) {
+          Promise.resolve(claudeProcessProxy.closeSession(void 0, claudeProxyHandle.sessionId)).catch(() => {
+          });
+        }
+      }, "cleanupClaudeProxy");
       aionui.on("exit", (code) => {
         log(`runtime upstream exited (code=${code})`);
+        cleanupClaudeProxy();
         process.exit(code || 1);
       });
+      const _onSignal = /* @__PURE__ */ __name(() => {
+        cleanupClaudeProxy();
+      }, "_onSignal");
+      process.once("SIGINT", _onSignal);
+      process.once("SIGTERM", _onSignal);
+      process.once("exit", cleanupClaudeProxy);
       try {
         await waitForUpstreamReady(internalPort);
       } catch (e) {
@@ -9089,7 +9269,10 @@ ${tail.split(/\r?\n/).map((ln) => `  ${ln}`).join("\n")}
       pruneExpiredTokens,
       _tokens: bootstrapTokens,
       TOKEN_TTL_MS,
-      BRIDGE_CRED_FILE
+      BRIDGE_CRED_FILE,
+      // [HolySheep v2.1.43] Exported for aionui-wrapper-claude-proxy.test.js
+      ensureClaudeProcessProxyRunning,
+      probeLocalPort
     };
   }
 });

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.42",
+  "version": "2.1.44",
   "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",
+    "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",
     "prepublishOnly": "npm run build && npm test && node scripts/check-tarball-size.js"
   },
   "keywords": [