@simonyea/holysheep-cli 2.1.64 → 2.1.66

package/dist/configure-worker.js

@@ -73,7 +73,7 @@ var require_claude_process_proxy = __commonJS({
     var crypto = require("crypto");
     var { URL: URL2 } = require("url");
     var fetch = global.fetch || require("node-fetch");
-    var HOLYSHEEP_DIR = path.join(os.homedir(), ".holysheep");
+    var HOLYSHEEP_DIR = process.env.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__";
@@ -4099,11 +4099,11 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@simonyea/holysheep-cli",
-      version: "2.1.64",
+      version: "2.1.66",
       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/openclaw-disable-auth-direct.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-runtime-resources.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 && node tests/aionui-wrapper-csp-rewrite.test.js && node tests/aionui-wrapper-version-status.test.js && node tests/acptypes-patch.test.js && node tests/codex-approval-policy.test.js && node tests/version-check.test.js && node tests/runclaude-missing-binary.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/openclaw-disable-auth-direct.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-runtime-resources.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 && node tests/aionui-wrapper-csp-rewrite.test.js && node tests/aionui-wrapper-version-status.test.js && node tests/claude-proxy-daemon.test.js && node tests/claude-proxy-vscode-settings.test.js && node tests/acptypes-patch.test.js && node tests/codex-approval-policy.test.js && node tests/version-check.test.js && node tests/runclaude-missing-binary.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.64",
+      version: "2.1.66",
       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/openclaw-disable-auth-direct.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-runtime-resources.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 && node tests/aionui-wrapper-csp-rewrite.test.js && node tests/aionui-wrapper-version-status.test.js && node tests/acptypes-patch.test.js && node tests/codex-approval-policy.test.js && node tests/version-check.test.js && node tests/runclaude-missing-binary.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/openclaw-disable-auth-direct.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-runtime-resources.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 && node tests/aionui-wrapper-csp-rewrite.test.js && node tests/aionui-wrapper-version-status.test.js && node tests/claude-proxy-daemon.test.js && node tests/claude-proxy-vscode-settings.test.js && node tests/acptypes-patch.test.js && node tests/codex-approval-policy.test.js && node tests/version-check.test.js && node tests/runclaude-missing-binary.test.js",
         prepublishOnly: "npm run build && npm test && node scripts/check-tarball-size.js"
       },
       keywords: [
@@ -750,7 +750,7 @@ var require_claude_process_proxy = __commonJS({
     var crypto = require("crypto");
     var { URL: URL2 } = require("url");
     var fetch = global.fetch || require("node-fetch");
-    var HOLYSHEEP_DIR = path.join(os.homedir(), ".holysheep");
+    var HOLYSHEEP_DIR = process.env.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__";
@@ -7063,145 +7063,6 @@ var require_workspace_runtime = __commonJS({
   }
 });
 
-// src/commands/claude.js
-var require_claude = __commonJS({
-  "src/commands/claude.js"(exports2, module2) {
-    "use strict";
-    var path = require("path");
-    var { spawn } = require("child_process");
-    var {
-      BASE_URL_ANTHROPIC,
-      BASE_URL_CLAUDE_RELAY,
-      getApiKey
-    } = require_config();
-    var {
-      closeSession,
-      getLocalProxyUrl,
-      startProcessProxy,
-      readConfig,
-      writeConfig
-    } = require_claude_process_proxy();
-    var claudeCodeTool = require_claude_code();
-    var { processProxyInjectPath } = require_paths();
-    var INJECT_PATH = processProxyInjectPath();
-    function appendNodeRequire(existingValue, requirePath) {
-      const nextFlag = `--require ${requirePath}`;
-      if (!existingValue) return nextFlag;
-      return existingValue.includes(nextFlag) ? existingValue : `${existingValue} ${nextFlag}`.trim();
-    }
-    __name(appendNodeRequire, "appendNodeRequire");
-    function mergeNoProxy(existingValue, extraHosts = []) {
-      const merged = /* @__PURE__ */ new Set();
-      for (const chunk of String(existingValue || "").split(",")) {
-        const value = chunk.trim();
-        if (value) merged.add(value);
-      }
-      for (const host of extraHosts) {
-        if (host) merged.add(host);
-      }
-      return Array.from(merged).join(",");
-    }
-    __name(mergeNoProxy, "mergeNoProxy");
-    function ensureClaudeProxyConfig(apiKey) {
-      const config = readConfig();
-      const next = claudeCodeTool.buildBridgeConfig(apiKey, BASE_URL_ANTHROPIC, {
-        ...config,
-        relayUrl: config.relayUrl || BASE_URL_CLAUDE_RELAY
-      });
-      const changed = JSON.stringify(next) !== JSON.stringify(config);
-      if (changed) {
-        writeConfig(next);
-        return next;
-      }
-      return config;
-    }
-    __name(ensureClaudeProxyConfig, "ensureClaudeProxyConfig");
-    async function runClaude(args = []) {
-      var _a;
-      const config = readConfig();
-      const apiKey = config.apiKey || getApiKey();
-      if (!apiKey) {
-        throw new Error("Missing API Key. Run hs setup first.");
-      }
-      try {
-        const { scheduleUpgradeBannerCheck } = require_version_check();
-        const pkg2 = require_package();
-        scheduleUpgradeBannerCheck({ localVersion: pkg2.version });
-      } catch {
-      }
-      ensureClaudeProxyConfig(apiKey);
-      const runtime = typeof claudeCodeTool.detectClaudeRuntime === "function" ? claudeCodeTool.detectClaudeRuntime() : { kind: "unknown", launchMode: "env-proxy" };
-      if (runtime.kind === "missing") {
-        const installCmd = process.platform === "win32" ? "irm https://claude.ai/install.ps1 | iex" : "curl -fsSL https://claude.ai/install.sh | bash";
-        const err = new Error(
-          `\u672A\u627E\u5230 claude \u547D\u4EE4 \u2014 Claude Code \u5C1A\u672A\u5B89\u88C5\u3002
-  \u8BF7\u5148\u8FD0\u884C: ${installCmd}
-  \u5B89\u88C5\u540E\u91CD\u5F00\u7EC8\u7AEF\u518D\u6267\u884C hs claude\u3002`
-        );
-        err.code = "CLAUDE_NOT_INSTALLED";
-        err.exitCode = 127;
-        throw err;
-      }
-      const settings = claudeCodeTool.readSettings();
-      if ((_a = settings.env) == null ? void 0 : _a.ANTHROPIC_BASE_URL) {
-        delete settings.env.ANTHROPIC_BASE_URL;
-        claudeCodeTool.writeSettings(settings);
-      }
-      const { server, port, sessionId } = await startProcessProxy({});
-      const proxyUrl = getLocalProxyUrl(port);
-      const launchMode = runtime.launchMode === "node-inject" ? "local-api + connect-fallback + node-inject" : "whole-process-proxy + local-api";
-      const env = {
-        ...process.env,
-        ANTHROPIC_API_KEY: void 0,
-        ANTHROPIC_AUTH_TOKEN: apiKey,
-        ANTHROPIC_BASE_URL: proxyUrl,
-        CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: "1",
-        HOLYSHEEP_CLAUDE_PROCESS_PROXY: "1",
-        HOLYSHEEP_CLAUDE_SESSION_ID: sessionId,
-        HS_PROXY_URL: proxyUrl,
-        HOLYSHEEP_CLAUDE_RUNTIME_KIND: runtime.kind || "unknown",
-        HOLYSHEEP_CLAUDE_LAUNCH_MODE: launchMode,
-        HTTP_PROXY: proxyUrl,
-        HTTPS_PROXY: proxyUrl,
-        ALL_PROXY: proxyUrl,
-        NO_PROXY: mergeNoProxy(process.env.NO_PROXY, ["127.0.0.1", "localhost"]),
-        ANTHROPIC_MAX_RETRIES: "0",
-        MAX_RETRIES: "0"
-      };
-      if (runtime.launchMode === "node-inject") {
-        env.NODE_OPTIONS = appendNodeRequire(process.env.NODE_OPTIONS, INJECT_PATH);
-      }
-      const child = spawn("claude", args, {
-        stdio: "inherit",
-        env,
-        shell: process.platform === "win32"
-      });
-      const cleanup = /* @__PURE__ */ __name(async () => {
-        try {
-          server.close();
-        } catch {
-        }
-        await closeSession(void 0, sessionId);
-      }, "cleanup");
-      process.on("SIGINT", () => child.kill("SIGINT"));
-      process.on("SIGTERM", () => child.kill("SIGTERM"));
-      return await new Promise((resolve, reject) => {
-        child.once("error", async (error) => {
-          await cleanup();
-          reject(error);
-        });
-        child.once("exit", async (code, signal) => {
-          await cleanup();
-          if (signal) process.kill(process.pid, signal);
-          resolve(code || 0);
-        });
-      });
-    }
-    __name(runClaude, "runClaude");
-    module2.exports = runClaude;
-  }
-});
-
 // src/commands/claude-proxy.js
 var require_claude_proxy = __commonJS({
   "src/commands/claude-proxy.js"(exports2, module2) {
@@ -7209,6 +7070,7 @@ var require_claude_proxy = __commonJS({
     var fs = require("fs");
     var path = require("path");
     var os = require("os");
+    var http2 = require("http");
     var { spawn, execSync } = require("child_process");
     var chalk2 = require("chalk");
     var {
@@ -7216,12 +7078,20 @@ var require_claude_proxy = __commonJS({
       closeSession,
       getProcessProxyPort,
       getLocalProxyUrl,
-      readConfig
+      readConfig,
+      LOCAL_PING_PATH,
+      LOCAL_PING_HEADER,
+      LOCAL_PING_HEADER_VALUE
     } = require_claude_process_proxy();
     var claudeCodeTool = require_claude_code();
     var { getApiKey } = require_config();
-    var PID_FILE = path.join(os.homedir(), ".holysheep", "claude-proxy.pid");
+    var HS_DIR = process.env.HOLYSHEEP_DIR || path.join(os.homedir(), ".holysheep");
+    var PID_FILE = path.join(HS_DIR, "claude-proxy.pid");
+    var LOG_FILE = path.join(HS_DIR, "claude-proxy.log");
     var isWin = process.platform === "win32";
+    var DAEMON_READY_TIMEOUT_MS = Number(process.env.HS_CLAUDE_PROXY_DAEMON_READY_TIMEOUT_MS) || 12e3;
+    var DAEMON_READY_INTERVAL_MS = Number(process.env.HS_CLAUDE_PROXY_DAEMON_READY_INTERVAL_MS) || 400;
+    var DAEMON_TEST_CHILD_EXIT = process.env.HS_CLAUDE_PROXY_DAEMON_TEST_CHILD_EXIT === "1";
     function readPid() {
       try {
         const content = fs.readFileSync(PID_FILE, "utf8").trim();
@@ -7237,6 +7107,10 @@ var require_claude_proxy = __commonJS({
       fs.writeFileSync(PID_FILE, JSON.stringify({ pid, port, sessionId, startedAt: (/* @__PURE__ */ new Date()).toISOString() }), "utf8");
     }
     __name(writePid, "writePid");
+    function ensureStateDir() {
+      if (!fs.existsSync(HS_DIR)) fs.mkdirSync(HS_DIR, { recursive: true });
+    }
+    __name(ensureStateDir, "ensureStateDir");
     function clearPid() {
       try {
         fs.unlinkSync(PID_FILE);
@@ -7244,6 +7118,19 @@ var require_claude_proxy = __commonJS({
       }
     }
     __name(clearPid, "clearPid");
+    async function readHealthyPid({ pidFile = PID_FILE, timeoutMs = 1e3 } = {}) {
+      let info = null;
+      try {
+        info = JSON.parse(fs.readFileSync(pidFile, "utf8"));
+      } catch {
+        return null;
+      }
+      if (!(info == null ? void 0 : info.pid) || !(info == null ? void 0 : info.port)) return null;
+      if (!isProcessAlive(info.pid)) return null;
+      if (!await isProxyHealthy(info.port, timeoutMs)) return null;
+      return info;
+    }
+    __name(readHealthyPid, "readHealthyPid");
     function isProcessAlive(pid) {
       try {
         process.kill(pid, 0);
@@ -7253,34 +7140,89 @@ var require_claude_proxy = __commonJS({
       }
     }
     __name(isProcessAlive, "isProcessAlive");
-    function isProxyHealthy(port) {
+    function isProxyHealthy(port, timeoutMs = 1e3) {
+      return probeLocalProxy(port, timeoutMs);
+    }
+    __name(isProxyHealthy, "isProxyHealthy");
+    function probeLocalProxy(port, timeoutMs = 1e3) {
+      return new Promise((resolve) => {
+        const value = Number(port);
+        if (!Number.isInteger(value) || value <= 0 || value >= 65536) return resolve(false);
+        const req = http2.request({
+          hostname: "127.0.0.1",
+          port: value,
+          path: LOCAL_PING_PATH,
+          method: "GET",
+          timeout: timeoutMs,
+          headers: { "user-agent": "holysheep-claude-proxy-daemon-probe/1" }
+        }, (res) => {
+          const headerOk = String(res.headers[LOCAL_PING_HEADER] || "") === LOCAL_PING_HEADER_VALUE;
+          res.resume();
+          res.on("end", () => resolve(res.statusCode === 200 && headerOk));
+        });
+        req.on("timeout", () => {
+          req.destroy();
+          resolve(false);
+        });
+        req.on("error", () => resolve(false));
+        req.end();
+      });
+    }
+    __name(probeLocalProxy, "probeLocalProxy");
+    function tailLog(lines = 40) {
       try {
-        execSync(
-          isWin ? `powershell -NonInteractive -Command "if(Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue){exit 0}else{exit 1}"` : `curl -so /dev/null --max-time 1 http://127.0.0.1:${port}/`,
-          { stdio: "ignore", timeout: 5e3, windowsHide: true }
-        );
-        return true;
+        const raw = fs.readFileSync(LOG_FILE, "utf8");
+        return raw.split(/\r?\n/).slice(-lines).join("\n").trim();
       } catch {
-        return false;
+        return "";
       }
     }
-    __name(isProxyHealthy, "isProxyHealthy");
+    __name(tailLog, "tailLog");
+    function makeDaemonError(message, details = {}) {
+      const logTail = details.logTail !== void 0 ? details.logTail : tailLog();
+      const err = new Error(logTail ? `${message}
+--- ${LOG_FILE} tail ---
+${logTail}` : message);
+      err.code = "CLAUDE_PROXY_DAEMON_FAILED";
+      err.logFile = LOG_FILE;
+      if (details.exitCode !== void 0) err.exitCode = details.exitCode;
+      return err;
+    }
+    __name(makeDaemonError, "makeDaemonError");
     function writeBaseUrlToSettings(port) {
       const settings = claudeCodeTool.readSettings();
       if (!settings.env) settings.env = {};
       settings.env.ANTHROPIC_BASE_URL = getLocalProxyUrl(port);
+      if (settings.env.ANTHROPIC_AUTH_TOKEN === void 0 || settings.env.ANTHROPIC_AUTH_TOKEN === null || settings.env.ANTHROPIC_AUTH_TOKEN === "") {
+        const config = readConfig();
+        const apiKey = config.apiKey || getApiKey();
+        if (apiKey) settings.env.ANTHROPIC_AUTH_TOKEN = apiKey;
+      }
+      settings.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = "1";
+      settings.env.HOLYSHEEP_CLAUDE_LAUNCHER = "hs-claude-proxy";
+      settings.env.HOLYSHEEP_CLAUDE_PROCESS_PROXY = "1";
       claudeCodeTool.writeSettings(settings);
     }
     __name(writeBaseUrlToSettings, "writeBaseUrlToSettings");
     function clearBaseUrlFromSettings() {
-      var _a, _b;
+      var _a;
       const settings = claudeCodeTool.readSettings();
-      if ((_b = (_a = settings.env) == null ? void 0 : _a.ANTHROPIC_BASE_URL) == null ? void 0 : _b.includes("127.0.0.1")) {
+      if (isLocalProxyBaseUrl((_a = settings.env) == null ? void 0 : _a.ANTHROPIC_BASE_URL)) {
         delete settings.env.ANTHROPIC_BASE_URL;
         claudeCodeTool.writeSettings(settings);
       }
     }
     __name(clearBaseUrlFromSettings, "clearBaseUrlFromSettings");
+    function isLocalProxyBaseUrl(value) {
+      if (!value) return false;
+      try {
+        const url = new URL(String(value));
+        return (url.hostname === "127.0.0.1" || url.hostname === "localhost") && (url.protocol === "http:" || url.protocol === "https:");
+      } catch {
+        return String(value).includes("127.0.0.1") || String(value).includes("localhost");
+      }
+    }
+    __name(isLocalProxyBaseUrl, "isLocalProxyBaseUrl");
     async function handleStop() {
       const info = readPid();
       if (!info) {
@@ -7307,16 +7249,16 @@ var require_claude_proxy = __commonJS({
       clearPid();
     }
     __name(handleStop, "handleStop");
-    function handleStatus() {
+    async function handleStatus() {
       const info = readPid();
       if (!info) {
         console.log(chalk2.yellow("\u4EE3\u7406\u672A\u542F\u52A8"));
         return;
       }
       const alive = isProcessAlive(info.pid);
-      const healthy = alive && isProxyHealthy(info.port);
-      if (healthy) {
-        console.log(chalk2.green(`\u4EE3\u7406\u8FD0\u884C\u4E2D`));
+      const healthy = alive && await isProxyHealthy(info.port);
+      if (alive && healthy) {
+        console.log(chalk2.green(`\u4EE3\u7406\u5DF2\u8FD0\u884C`));
         console.log(chalk2.gray(`  PID:  ${info.pid}`));
         console.log(chalk2.gray(`  \u7AEF\u53E3: ${info.port}`));
         console.log(chalk2.gray(`  \u5730\u5740: ${getLocalProxyUrl(info.port)}`));
@@ -7331,37 +7273,71 @@ var require_claude_proxy = __commonJS({
     }
     __name(handleStatus, "handleStatus");
     async function handleDaemon() {
+      if (process.env.HS_CLAUDE_PROXY_DAEMON_TEST_SPAWN_FAIL === "1") {
+        throw makeDaemonError("\u4EE3\u7406\u5B50\u8FDB\u7A0B\u542F\u52A8\u5931\u8D25: \u6545\u969C\u6CE8\u5165 HS_CLAUDE_PROXY_DAEMON_TEST_SPAWN_FAIL");
+      }
       const info = readPid();
-      if (info && isProcessAlive(info.pid) && isProxyHealthy(info.port)) {
+      if (info && isProcessAlive(info.pid) && await isProxyHealthy(info.port)) {
+        writeBaseUrlToSettings(info.port);
         console.log(chalk2.green(`\u4EE3\u7406\u5DF2\u5728\u8FD0\u884C (PID ${info.pid}, \u7AEF\u53E3 ${info.port})`));
         return;
       }
       const { selfEntrypoint } = require_paths();
       const scriptPath = selfEntrypoint();
-      const spawnCmd = isWin ? "node" : process.execPath;
+      const spawnCmd = process.execPath;
+      ensureStateDir();
+      fs.appendFileSync(LOG_FILE, `
+[${(/* @__PURE__ */ new Date()).toISOString()}] starting daemon via ${spawnCmd} ${scriptPath} claude-proxy
+`, "utf8");
+      const outFd = fs.openSync(LOG_FILE, "a");
+      const errFd = fs.openSync(LOG_FILE, "a");
       const child = spawn(spawnCmd, [scriptPath, "claude-proxy"], {
         detached: true,
-        stdio: "ignore",
-        windowsHide: true
+        stdio: ["ignore", outFd, errFd],
+        windowsHide: true,
+        env: { ...process.env, HS_CLAUDE_PROXY_DAEMON_CHILD: "1" }
+      });
+      child.on("error", (err) => {
+        try {
+          fs.appendFileSync(LOG_FILE, `[${(/* @__PURE__ */ new Date()).toISOString()}] spawn error: ${err.message}
+`, "utf8");
+        } catch {
+        }
       });
+      fs.closeSync(outFd);
+      fs.closeSync(errFd);
       child.unref();
-      const port = getProcessProxyPort();
-      for (let i = 0; i < 15; i++) {
-        await new Promise((r) => setTimeout(r, 500));
-        if (isProxyHealthy(port)) {
+      const deadline = Date.now() + DAEMON_READY_TIMEOUT_MS;
+      while (Date.now() < deadline) {
+        await new Promise((r) => setTimeout(r, DAEMON_READY_INTERVAL_MS));
+        const rawLatest = readPid();
+        if (rawLatest && rawLatest.pid && !isProcessAlive(rawLatest.pid)) {
+          clearPid();
+          throw makeDaemonError(`\u4EE3\u7406\u5B50\u8FDB\u7A0B\u5DF2\u9000\u51FA (PID ${rawLatest.pid})`);
+        }
+        const latest = await readHealthyPid({ timeoutMs: 1e3 });
+        if (latest) {
+          writeBaseUrlToSettings(latest.port);
           console.log(chalk2.green(`\u4EE3\u7406\u5DF2\u5728\u540E\u53F0\u542F\u52A8`));
-          console.log(chalk2.gray(`  PID:  ${child.pid}`));
-          console.log(chalk2.gray(`  \u7AEF\u53E3: ${port}`));
-          console.log(chalk2.gray(`  \u5730\u5740: ${getLocalProxyUrl(port)}`));
+          console.log(chalk2.gray(`  PID:  ${latest.pid}`));
+          console.log(chalk2.gray(`  \u7AEF\u53E3: ${latest.port}`));
+          console.log(chalk2.gray(`  \u5730\u5740: ${getLocalProxyUrl(latest.port)}`));
+          console.log(chalk2.gray(`  \u65E5\u5FD7: ${LOG_FILE}`));
           console.log(chalk2.cyan("\n  VS Code Claude \u6269\u5C55\u73B0\u5728\u53EF\u4EE5\u4F7F\u7528\u4E86"));
           return;
         }
+        if (child.exitCode !== null) {
+          throw makeDaemonError(`\u4EE3\u7406\u5B50\u8FDB\u7A0B\u542F\u52A8\u5931\u8D25 (exit=${child.exitCode})`, { exitCode: child.exitCode });
+        }
       }
-      console.log(chalk2.yellow("\u4EE3\u7406\u542F\u52A8\u4E2D\uFF0C\u8BF7\u7A0D\u7B49..."));
-      console.log(chalk2.gray(`  PID: ${child.pid}`));
+      throw makeDaemonError(`\u4EE3\u7406\u542F\u52A8\u8D85\u65F6\uFF0C\u672A\u901A\u8FC7\u672C\u5730 HTTP \u6307\u7EB9\u5065\u5EB7\u68C0\u67E5 (log: ${LOG_FILE})`);
     }
     __name(handleDaemon, "handleDaemon");
     async function handleForeground() {
+      if (DAEMON_TEST_CHILD_EXIT) {
+        console.error("[hs-claude-proxy] daemon test child forced exit");
+        process.exit(42);
+      }
       const config = readConfig();
       const apiKey = config.apiKey || getApiKey();
       if (!apiKey) {
@@ -7369,14 +7345,12 @@ var require_claude_proxy = __commonJS({
         process.exit(1);
       }
       const existing = readPid();
-      if (existing && isProcessAlive(existing.pid) && isProxyHealthy(existing.port)) {
+      if (existing && isProcessAlive(existing.pid) && await isProxyHealthy(existing.port)) {
         console.log(chalk2.yellow(`\u4EE3\u7406\u5DF2\u5728\u8FD0\u884C (PID ${existing.pid}, \u7AEF\u53E3 ${existing.port})\uFF0C\u5148\u505C\u6B62: hs claude-proxy --stop`));
         process.exit(1);
       }
-      const ensureClaudeProxyConfig = require_claude().ensureClaudeProxyConfig || (() => {
-      });
       try {
-        ensureClaudeProxyConfig(apiKey);
+        claudeProxy.ensureClaudeProxyConfig(apiKey);
       } catch {
       }
       console.log(chalk2.gray("\u542F\u52A8 Claude \u4EE3\u7406..."));
@@ -7419,11 +7393,17 @@ var require_claude_proxy = __commonJS({
       const claudeCodeTool2 = require_claude_code();
       const proxy = require_claude_process_proxy();
       const config = proxy.readConfig();
-      if (!config.apiKey || !config.bridgeSecret) {
-        const bridgeConfig = claudeCodeTool2.buildBridgeConfig(apiKey, void 0, config);
+      const bridgeConfig = claudeCodeTool2.buildBridgeConfig(apiKey, void 0, config);
+      if (JSON.stringify(bridgeConfig) !== JSON.stringify(config)) {
         proxy.writeConfig(bridgeConfig);
       }
     };
+    claudeProxy._private = {
+      probeLocalProxy,
+      readHealthyPid,
+      daemonLogFile: /* @__PURE__ */ __name(() => LOG_FILE, "daemonLogFile"),
+      daemonPidFile: /* @__PURE__ */ __name(() => PID_FILE, "daemonPidFile")
+    };
     module2.exports = claudeProxy;
   }
 });
@@ -10916,6 +10896,145 @@ var require_webui = __commonJS({
   }
 });
 
+// src/commands/claude.js
+var require_claude = __commonJS({
+  "src/commands/claude.js"(exports2, module2) {
+    "use strict";
+    var path = require("path");
+    var { spawn } = require("child_process");
+    var {
+      BASE_URL_ANTHROPIC,
+      BASE_URL_CLAUDE_RELAY,
+      getApiKey
+    } = require_config();
+    var {
+      closeSession,
+      getLocalProxyUrl,
+      startProcessProxy,
+      readConfig,
+      writeConfig
+    } = require_claude_process_proxy();
+    var claudeCodeTool = require_claude_code();
+    var { processProxyInjectPath } = require_paths();
+    var INJECT_PATH = processProxyInjectPath();
+    function appendNodeRequire(existingValue, requirePath) {
+      const nextFlag = `--require ${requirePath}`;
+      if (!existingValue) return nextFlag;
+      return existingValue.includes(nextFlag) ? existingValue : `${existingValue} ${nextFlag}`.trim();
+    }
+    __name(appendNodeRequire, "appendNodeRequire");
+    function mergeNoProxy(existingValue, extraHosts = []) {
+      const merged = /* @__PURE__ */ new Set();
+      for (const chunk of String(existingValue || "").split(",")) {
+        const value = chunk.trim();
+        if (value) merged.add(value);
+      }
+      for (const host of extraHosts) {
+        if (host) merged.add(host);
+      }
+      return Array.from(merged).join(",");
+    }
+    __name(mergeNoProxy, "mergeNoProxy");
+    function ensureClaudeProxyConfig(apiKey) {
+      const config = readConfig();
+      const next = claudeCodeTool.buildBridgeConfig(apiKey, BASE_URL_ANTHROPIC, {
+        ...config,
+        relayUrl: config.relayUrl || BASE_URL_CLAUDE_RELAY
+      });
+      const changed = JSON.stringify(next) !== JSON.stringify(config);
+      if (changed) {
+        writeConfig(next);
+        return next;
+      }
+      return config;
+    }
+    __name(ensureClaudeProxyConfig, "ensureClaudeProxyConfig");
+    async function runClaude(args = []) {
+      var _a;
+      const config = readConfig();
+      const apiKey = config.apiKey || getApiKey();
+      if (!apiKey) {
+        throw new Error("Missing API Key. Run hs setup first.");
+      }
+      try {
+        const { scheduleUpgradeBannerCheck } = require_version_check();
+        const pkg2 = require_package();
+        scheduleUpgradeBannerCheck({ localVersion: pkg2.version });
+      } catch {
+      }
+      ensureClaudeProxyConfig(apiKey);
+      const runtime = typeof claudeCodeTool.detectClaudeRuntime === "function" ? claudeCodeTool.detectClaudeRuntime() : { kind: "unknown", launchMode: "env-proxy" };
+      if (runtime.kind === "missing") {
+        const installCmd = process.platform === "win32" ? "irm https://claude.ai/install.ps1 | iex" : "curl -fsSL https://claude.ai/install.sh | bash";
+        const err = new Error(
+          `\u672A\u627E\u5230 claude \u547D\u4EE4 \u2014 Claude Code \u5C1A\u672A\u5B89\u88C5\u3002
+  \u8BF7\u5148\u8FD0\u884C: ${installCmd}
+  \u5B89\u88C5\u540E\u91CD\u5F00\u7EC8\u7AEF\u518D\u6267\u884C hs claude\u3002`
+        );
+        err.code = "CLAUDE_NOT_INSTALLED";
+        err.exitCode = 127;
+        throw err;
+      }
+      const settings = claudeCodeTool.readSettings();
+      if ((_a = settings.env) == null ? void 0 : _a.ANTHROPIC_BASE_URL) {
+        delete settings.env.ANTHROPIC_BASE_URL;
+        claudeCodeTool.writeSettings(settings);
+      }
+      const { server, port, sessionId } = await startProcessProxy({});
+      const proxyUrl = getLocalProxyUrl(port);
+      const launchMode = runtime.launchMode === "node-inject" ? "local-api + connect-fallback + node-inject" : "whole-process-proxy + local-api";
+      const env = {
+        ...process.env,
+        ANTHROPIC_API_KEY: void 0,
+        ANTHROPIC_AUTH_TOKEN: apiKey,
+        ANTHROPIC_BASE_URL: proxyUrl,
+        CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: "1",
+        HOLYSHEEP_CLAUDE_PROCESS_PROXY: "1",
+        HOLYSHEEP_CLAUDE_SESSION_ID: sessionId,
+        HS_PROXY_URL: proxyUrl,
+        HOLYSHEEP_CLAUDE_RUNTIME_KIND: runtime.kind || "unknown",
+        HOLYSHEEP_CLAUDE_LAUNCH_MODE: launchMode,
+        HTTP_PROXY: proxyUrl,
+        HTTPS_PROXY: proxyUrl,
+        ALL_PROXY: proxyUrl,
+        NO_PROXY: mergeNoProxy(process.env.NO_PROXY, ["127.0.0.1", "localhost"]),
+        ANTHROPIC_MAX_RETRIES: "0",
+        MAX_RETRIES: "0"
+      };
+      if (runtime.launchMode === "node-inject") {
+        env.NODE_OPTIONS = appendNodeRequire(process.env.NODE_OPTIONS, INJECT_PATH);
+      }
+      const child = spawn("claude", args, {
+        stdio: "inherit",
+        env,
+        shell: process.platform === "win32"
+      });
+      const cleanup = /* @__PURE__ */ __name(async () => {
+        try {
+          server.close();
+        } catch {
+        }
+        await closeSession(void 0, sessionId);
+      }, "cleanup");
+      process.on("SIGINT", () => child.kill("SIGINT"));
+      process.on("SIGTERM", () => child.kill("SIGTERM"));
+      return await new Promise((resolve, reject) => {
+        child.once("error", async (error) => {
+          await cleanup();
+          reject(error);
+        });
+        child.once("exit", async (code, signal) => {
+          await cleanup();
+          if (signal) process.kill(process.pid, signal);
+          resolve(code || 0);
+        });
+      });
+    }
+    __name(runClaude, "runClaude");
+    module2.exports = runClaude;
+  }
+});
+
 // src/index.js
 var { program } = require("commander");
 var chalk = require("chalk");
@@ -11041,7 +11160,18 @@ ${err.message}
 });
 program.command("claude-proxy [args...]").allowUnknownOption(true).description("\u542F\u52A8 Claude \u4EE3\u7406\u670D\u52A1\uFF08\u8BA9 VS Code Claude \u6269\u5C55\u4E5F\u80FD\u7528 HolySheep\uFF09").action(async (args = []) => {
   const claudeProxy = require_claude_proxy();
-  await claudeProxy(args);
+  try {
+    await claudeProxy(args);
+  } catch (err) {
+    if (err && err.code === "CLAUDE_PROXY_DAEMON_FAILED") {
+      process.stderr.write(`
+${err.message}
+
+`);
+      process.exit(typeof err.exitCode === "number" ? err.exitCode : 1);
+    }
+    throw err;
+  }
 });
 program.parse(process.argv);
 if (process.argv.slice(2).length === 0) {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.64",
+  "version": "2.1.66",
   "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/openclaw-disable-auth-direct.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-runtime-resources.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 && node tests/aionui-wrapper-csp-rewrite.test.js && node tests/aionui-wrapper-version-status.test.js && node tests/acptypes-patch.test.js && node tests/codex-approval-policy.test.js && node tests/version-check.test.js && node tests/runclaude-missing-binary.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/openclaw-disable-auth-direct.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-runtime-resources.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 && node tests/aionui-wrapper-csp-rewrite.test.js && node tests/aionui-wrapper-version-status.test.js && node tests/claude-proxy-daemon.test.js && node tests/claude-proxy-vscode-settings.test.js && node tests/acptypes-patch.test.js && node tests/codex-approval-policy.test.js && node tests/version-check.test.js && node tests/runclaude-missing-binary.test.js",
     "prepublishOnly": "npm run build && npm test && node scripts/check-tarball-size.js"
   },
   "keywords": [