@simonyea/holysheep-cli 2.1.43 → 2.1.45

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,33 @@ 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",
+              "content-length": String(Buffer.byteLength(body)),
+              "connection": "close"
+            });
+            clientRes.end(body);
+            return;
+          }
+        }
         const isDirect = !clientReq.url.startsWith("http");
         if (ENABLE_TIMING_LOG) {
           console.error(
@@ -885,7 +916,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 +971,10 @@ ${body}`);
       getControlPlaneUrl,
       readConfig,
       startProcessProxy,
-      writeConfig
+      writeConfig,
+      LOCAL_PING_PATH,
+      LOCAL_PING_HEADER,
+      LOCAL_PING_HEADER_VALUE
     };
   }
 });
@@ -3931,11 +3974,11 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@simonyea/holysheep-cli",
-      version: "2.1.43",
+      version: "2.1.45",
       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",
+        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.43",
+      version: "2.1.45",
       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",
+        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,33 @@ 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",
+              "content-length": String(Buffer.byteLength(body)),
+              "connection": "close"
+            });
+            clientRes.end(body);
+            return;
+          }
+        }
         const isDirect = !clientReq.url.startsWith("http");
         if (ENABLE_TIMING_LOG) {
           console.error(
@@ -1561,7 +1592,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 +1647,10 @@ ${body}`);
       getControlPlaneUrl,
       readConfig,
       startProcessProxy,
-      writeConfig
+      writeConfig,
+      LOCAL_PING_PATH,
+      LOCAL_PING_HEADER,
+      LOCAL_PING_HEADER_VALUE
     };
   }
 });
@@ -5828,9 +5871,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-hs28.tar.gz";
-    var DEFAULT_RUNTIME_SHA256 = "360568732da1b758fc8d1a32202d69fe03e9ac4dd8da3e3f92e8d0ec303ee8a4";
-    var DEFAULT_RUNTIME_VERSION = "1.9.18-holysheep-hs28";
+    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";
     function isValidRuntimeDir(dir) {
       if (!dir) return false;
       try {
@@ -8988,10 +9031,13 @@ var require_aionui_wrapper = __commonJS({
       }, "onRequest");
     }
     __name(buildRouter, "buildRouter");
-    function probeLocalPort(port, timeoutMs = 500) {
+    function probeLocalPort(port, timeoutMs = 800) {
       return new Promise((resolve) => {
         const socket = net.createConnection({ host: "127.0.0.1", port });
-        const timer = setTimeout(() => {
+        let tcpSettled = false;
+        const tcpTimer = setTimeout(() => {
+          if (tcpSettled) return;
+          tcpSettled = true;
           try {
             socket.destroy();
           } catch {
@@ -8999,15 +9045,53 @@ var require_aionui_wrapper = __commonJS({
           resolve(false);
         }, timeoutMs);
         socket.once("connect", () => {
-          clearTimeout(timer);
+          if (tcpSettled) return;
+          tcpSettled = true;
+          clearTimeout(tcpTimer);
           try {
             socket.end();
           } catch {
           }
-          resolve(true);
+          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", () => {
-          clearTimeout(timer);
+          if (tcpSettled) return;
+          tcpSettled = true;
+          clearTimeout(tcpTimer);
           resolve(false);
         });
       });
@@ -9019,11 +9103,31 @@ var require_aionui_wrapper = __commonJS({
         ...config,
         relayUrl: config.relayUrl || BASE_URL_CLAUDE_RELAY
       });
+      let proxyConfigUpdated = false;
       if (JSON.stringify(next) !== JSON.stringify(config)) {
         claudeProcessProxy.writeConfig(next);
-        return next;
+        proxyConfigUpdated = true;
       }
-      return config;
+      try {
+        const existing = claudeCodeTool.readSettings();
+        const hasToken = existing && existing.env && existing.env.ANTHROPIC_AUTH_TOKEN === apiKey;
+        const hasLauncherMark = existing && existing.env && existing.env.HOLYSHEEP_CLAUDE_LAUNCHER === "hs";
+        if (!hasToken || !hasLauncherMark) {
+          const settings = existing || {};
+          if (!settings.env) settings.env = {};
+          settings.env.ANTHROPIC_AUTH_TOKEN = apiKey;
+          delete settings.env.ANTHROPIC_BASE_URL;
+          settings.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = "1";
+          settings.env.HOLYSHEEP_CLAUDE_LAUNCHER = "hs";
+          delete settings.env.ANTHROPIC_API_KEY;
+          delete settings.env.HOLYSHEEP_CLAUDE_BRIDGE;
+          claudeCodeTool.writeSettings(settings);
+          log("auto-configured ~/.claude/settings.json with ANTHROPIC_AUTH_TOKEN (first-ever hs web for this user)");
+        }
+      } catch (e) {
+        log("warn: failed to auto-configure ~/.claude/settings.json: " + (e && e.message ? e.message : e));
+      }
+      return proxyConfigUpdated ? next : config;
     }
     __name(_ensureClaudeProxyConfig, "_ensureClaudeProxyConfig");
     async function ensureClaudeProcessProxyRunning(opts = {}) {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.43",
+  "version": "2.1.45",
   "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",
+    "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": [