@simonyea/holysheep-cli 2.1.65 → 2.1.67

package/dist/configure-worker.js

@@ -1147,7 +1147,34 @@ var require_claude_code = __commonJS({
       BASE_URL_CLAUDE_RELAY
     } = require_config();
     var { readConfig, writeConfig } = require_claude_process_proxy();
-    var SETTINGS_FILE = path.join(os.homedir(), ".claude", "settings.json");
+    function resolveClaudeHomeDir() {
+      const platform = process.env.HOLYSHEEP_TEST_PLATFORM || process.platform;
+      if (platform === "win32") return process.env.USERPROFILE || process.env.HOME || os.homedir();
+      return os.homedir();
+    }
+    __name(resolveClaudeHomeDir, "resolveClaudeHomeDir");
+    function getSettingsFile() {
+      return path.join(resolveClaudeHomeDir(), ".claude", "settings.json");
+    }
+    __name(getSettingsFile, "getSettingsFile");
+    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");
+    function hasDaemonProxyMarker(env = {}) {
+      return env.HOLYSHEEP_CLAUDE_LAUNCHER === "hs-claude-proxy" || env.HOLYSHEEP_CLAUDE_PROCESS_PROXY === "1";
+    }
+    __name(hasDaemonProxyMarker, "hasDaemonProxyMarker");
+    function shouldPreserveDaemonProxyEnv(env = {}) {
+      return hasDaemonProxyMarker(env) && isLocalProxyBaseUrl(env.ANTHROPIC_BASE_URL);
+    }
+    __name(shouldPreserveDaemonProxyEnv, "shouldPreserveDaemonProxyEnv");
     function buildBridgeConfig(apiKey, baseUrl, bridge = {}) {
       const relayUrl = bridge.relayUrl || BASE_URL_CLAUDE_RELAY || "";
       return {
@@ -1169,7 +1196,7 @@ var require_claude_code = __commonJS({
     __name(buildBridgeConfig, "buildBridgeConfig");
     function readSettings() {
       try {
-        const raw = fs.readFileSync(SETTINGS_FILE, "utf8");
+        const raw = fs.readFileSync(getSettingsFile(), "utf8");
         return JSON.parse(raw.replace(/[\x00-\x1F\x7F]/g, " "));
       } catch {
         return {};
@@ -1177,9 +1204,10 @@ var require_claude_code = __commonJS({
     }
     __name(readSettings, "readSettings");
     function writeSettings(data) {
-      const dir = path.dirname(SETTINGS_FILE);
+      const file = getSettingsFile();
+      const dir = path.dirname(file);
       if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
-      fs.writeFileSync(SETTINGS_FILE, JSON.stringify(data, null, 2), "utf8");
+      fs.writeFileSync(file, JSON.stringify(data, null, 2), "utf8");
     }
     __name(writeSettings, "writeSettings");
     function cloneSettings(data) {
@@ -1293,16 +1321,23 @@ var require_claude_code = __commonJS({
         writeConfig(bridgeConfig);
         const settings = readSettings();
         if (!settings.env) settings.env = {};
+        const preserveDaemonProxy = shouldPreserveDaemonProxyEnv(settings.env);
         settings.env.ANTHROPIC_AUTH_TOKEN = apiKey;
-        delete settings.env.ANTHROPIC_BASE_URL;
+        if (preserveDaemonProxy) {
+          settings.env.HOLYSHEEP_CLAUDE_LAUNCHER = "hs-claude-proxy";
+          settings.env.HOLYSHEEP_CLAUDE_PROCESS_PROXY = "1";
+        } else {
+          delete settings.env.ANTHROPIC_BASE_URL;
+          settings.env.HOLYSHEEP_CLAUDE_LAUNCHER = "hs";
+          delete settings.env.HOLYSHEEP_CLAUDE_PROCESS_PROXY;
+        }
         settings.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = "1";
-        settings.env.HOLYSHEEP_CLAUDE_LAUNCHER = "hs";
         if (primaryModel) settings.model = primaryModel;
         delete settings.env.ANTHROPIC_API_KEY;
         delete settings.env.HOLYSHEEP_CLAUDE_BRIDGE;
         writeSettings(settings);
         return {
-          file: SETTINGS_FILE,
+          file: getSettingsFile(),
           hot: true,
           extraFiles: ["~/.holysheep/claude-proxy.json"]
         };
@@ -1320,7 +1355,7 @@ var require_claude_code = __commonJS({
         writeSettings(settings);
       },
       getConfigPath() {
-        return SETTINGS_FILE;
+        return getSettingsFile();
       },
       hint: "\u901A\u8FC7 hs claude \u4EE5\u6574\u8FDB\u7A0B\u4EE3\u7406\u65B9\u5F0F\u542F\u52A8 Claude Code",
       launchCmd: "hs claude",
@@ -1333,7 +1368,8 @@ var require_claude_code = __commonJS({
       detectClaudeRuntime,
       readSettings,
       writeSettings,
-      applyRuntimeSettingsOverride
+      applyRuntimeSettingsOverride,
+      _private: { getSettingsFile, resolveClaudeHomeDir, shouldPreserveDaemonProxyEnv, hasDaemonProxyMarker, isLocalProxyBaseUrl }
     };
   }
 });
@@ -4099,11 +4135,11 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@simonyea/holysheep-cli",
-      version: "2.1.65",
+      version: "2.1.67",
       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/claude-proxy-daemon.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/claude-proxy-vscode-env.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 && node tests/claude-code-configure-preserve.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.65",
+      version: "2.1.67",
       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/claude-proxy-daemon.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/claude-proxy-vscode-env.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 && node tests/claude-code-configure-preserve.test.js",
         prepublishOnly: "npm run build && npm test && node scripts/check-tarball-size.js"
       },
       keywords: [
@@ -1693,7 +1693,34 @@ var require_claude_code = __commonJS({
       BASE_URL_CLAUDE_RELAY
     } = require_config();
     var { readConfig, writeConfig } = require_claude_process_proxy();
-    var SETTINGS_FILE = path.join(os.homedir(), ".claude", "settings.json");
+    function resolveClaudeHomeDir() {
+      const platform = process.env.HOLYSHEEP_TEST_PLATFORM || process.platform;
+      if (platform === "win32") return process.env.USERPROFILE || process.env.HOME || os.homedir();
+      return os.homedir();
+    }
+    __name(resolveClaudeHomeDir, "resolveClaudeHomeDir");
+    function getSettingsFile() {
+      return path.join(resolveClaudeHomeDir(), ".claude", "settings.json");
+    }
+    __name(getSettingsFile, "getSettingsFile");
+    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");
+    function hasDaemonProxyMarker(env = {}) {
+      return env.HOLYSHEEP_CLAUDE_LAUNCHER === "hs-claude-proxy" || env.HOLYSHEEP_CLAUDE_PROCESS_PROXY === "1";
+    }
+    __name(hasDaemonProxyMarker, "hasDaemonProxyMarker");
+    function shouldPreserveDaemonProxyEnv(env = {}) {
+      return hasDaemonProxyMarker(env) && isLocalProxyBaseUrl(env.ANTHROPIC_BASE_URL);
+    }
+    __name(shouldPreserveDaemonProxyEnv, "shouldPreserveDaemonProxyEnv");
     function buildBridgeConfig(apiKey, baseUrl, bridge = {}) {
       const relayUrl = bridge.relayUrl || BASE_URL_CLAUDE_RELAY || "";
       return {
@@ -1715,7 +1742,7 @@ var require_claude_code = __commonJS({
     __name(buildBridgeConfig, "buildBridgeConfig");
     function readSettings() {
       try {
-        const raw = fs.readFileSync(SETTINGS_FILE, "utf8");
+        const raw = fs.readFileSync(getSettingsFile(), "utf8");
         return JSON.parse(raw.replace(/[\x00-\x1F\x7F]/g, " "));
       } catch {
         return {};
@@ -1723,9 +1750,10 @@ var require_claude_code = __commonJS({
     }
     __name(readSettings, "readSettings");
     function writeSettings(data) {
-      const dir = path.dirname(SETTINGS_FILE);
+      const file = getSettingsFile();
+      const dir = path.dirname(file);
       if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
-      fs.writeFileSync(SETTINGS_FILE, JSON.stringify(data, null, 2), "utf8");
+      fs.writeFileSync(file, JSON.stringify(data, null, 2), "utf8");
     }
     __name(writeSettings, "writeSettings");
     function cloneSettings(data) {
@@ -1839,16 +1867,23 @@ var require_claude_code = __commonJS({
         writeConfig(bridgeConfig);
         const settings = readSettings();
         if (!settings.env) settings.env = {};
+        const preserveDaemonProxy = shouldPreserveDaemonProxyEnv(settings.env);
         settings.env.ANTHROPIC_AUTH_TOKEN = apiKey;
-        delete settings.env.ANTHROPIC_BASE_URL;
+        if (preserveDaemonProxy) {
+          settings.env.HOLYSHEEP_CLAUDE_LAUNCHER = "hs-claude-proxy";
+          settings.env.HOLYSHEEP_CLAUDE_PROCESS_PROXY = "1";
+        } else {
+          delete settings.env.ANTHROPIC_BASE_URL;
+          settings.env.HOLYSHEEP_CLAUDE_LAUNCHER = "hs";
+          delete settings.env.HOLYSHEEP_CLAUDE_PROCESS_PROXY;
+        }
         settings.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = "1";
-        settings.env.HOLYSHEEP_CLAUDE_LAUNCHER = "hs";
         if (primaryModel) settings.model = primaryModel;
         delete settings.env.ANTHROPIC_API_KEY;
         delete settings.env.HOLYSHEEP_CLAUDE_BRIDGE;
         writeSettings(settings);
         return {
-          file: SETTINGS_FILE,
+          file: getSettingsFile(),
           hot: true,
           extraFiles: ["~/.holysheep/claude-proxy.json"]
         };
@@ -1866,7 +1901,7 @@ var require_claude_code = __commonJS({
         writeSettings(settings);
       },
       getConfigPath() {
-        return SETTINGS_FILE;
+        return getSettingsFile();
       },
       hint: "\u901A\u8FC7 hs claude \u4EE5\u6574\u8FDB\u7A0B\u4EE3\u7406\u65B9\u5F0F\u542F\u52A8 Claude Code",
       launchCmd: "hs claude",
@@ -1879,7 +1914,8 @@ var require_claude_code = __commonJS({
       detectClaudeRuntime,
       readSettings,
       writeSettings,
-      applyRuntimeSettingsOverride
+      applyRuntimeSettingsOverride,
+      _private: { getSettingsFile, resolveClaudeHomeDir, shouldPreserveDaemonProxyEnv, hasDaemonProxyMarker, isLocalProxyBaseUrl }
     };
   }
 });
@@ -7063,145 +7099,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) {
@@ -7231,6 +7128,18 @@ var require_claude_proxy = __commonJS({
     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";
+    var WINDOWS_ENV_KEYS = [
+      "ANTHROPIC_BASE_URL",
+      "CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC",
+      "HOLYSHEEP_CLAUDE_LAUNCHER",
+      "HOLYSHEEP_CLAUDE_PROCESS_PROXY"
+    ];
+    var platformOverride = null;
+    var winUserEnvWriterOverride = null;
+    function effectivePlatform() {
+      return platformOverride || process.env.HS_CLAUDE_PROXY_TEST_PLATFORM || process.platform;
+    }
+    __name(effectivePlatform, "effectivePlatform");
     function readPid() {
       try {
         const content = fs.readFileSync(PID_FILE, "utf8").trim();
@@ -7328,22 +7237,108 @@ ${logTail}` : message);
       return err;
     }
     __name(makeDaemonError, "makeDaemonError");
+    function getHolySheepApiKey() {
+      const config = readConfig();
+      return config.apiKey || getApiKey();
+    }
+    __name(getHolySheepApiKey, "getHolySheepApiKey");
     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 apiKey = getHolySheepApiKey();
+        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 quotePowerShellString(value) {
+      return `'${String(value).replace(/'/g, "''")}'`;
+    }
+    __name(quotePowerShellString, "quotePowerShellString");
+    function defaultWinUserEnvWriter(action, key, value) {
+      if (process.env.HS_CLAUDE_PROXY_TEST_WIN_ENV_FILE) {
+        const file = process.env.HS_CLAUDE_PROXY_TEST_WIN_ENV_FILE;
+        let env = {};
+        try {
+          env = JSON.parse(fs.readFileSync(file, "utf8"));
+        } catch {
+        }
+        if (action === "delete") delete env[key];
+        else env[key] = value;
+        fs.mkdirSync(path.dirname(file), { recursive: true });
+        fs.writeFileSync(file, JSON.stringify(env, null, 2), "utf8");
+        return;
+      }
+      if (effectivePlatform() !== "win32") return;
+      if (!/^[A-Z0-9_]+$/i.test(String(key))) throw new Error(`Invalid env var name: ${key}`);
+      const ps = action === "delete" ? `[Environment]::SetEnvironmentVariable(${quotePowerShellString(key)}, $null, 'User')` : `[Environment]::SetEnvironmentVariable(${quotePowerShellString(key)}, ${quotePowerShellString(value || "")}, 'User')`;
+      execSync(`powershell.exe -NoProfile -ExecutionPolicy Bypass -Command ${quotePowerShellString(ps)}`, { stdio: "ignore", windowsHide: true });
+    }
+    __name(defaultWinUserEnvWriter, "defaultWinUserEnvWriter");
+    function getWinUserEnvWriter() {
+      if (winUserEnvWriterOverride) return winUserEnvWriterOverride;
+      return defaultWinUserEnvWriter;
+    }
+    __name(getWinUserEnvWriter, "getWinUserEnvWriter");
+    function writeWindowsUserProxyEnv(port) {
+      if (effectivePlatform() !== "win32") return false;
+      const apiKey = getHolySheepApiKey();
+      const env = {
+        ANTHROPIC_BASE_URL: getLocalProxyUrl(port),
+        ...apiKey ? { ANTHROPIC_AUTH_TOKEN: apiKey } : {},
+        CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: "1",
+        HOLYSHEEP_CLAUDE_LAUNCHER: "hs-claude-proxy",
+        HOLYSHEEP_CLAUDE_PROCESS_PROXY: "1"
+      };
+      const writer = getWinUserEnvWriter();
+      for (const [key, value] of Object.entries(env)) writer("set", key, value);
+      return true;
+    }
+    __name(writeWindowsUserProxyEnv, "writeWindowsUserProxyEnv");
+    function persistVsCodeProxyEnvironment(port) {
+      writeBaseUrlToSettings(port);
+      const wroteWindowsEnv = writeWindowsUserProxyEnv(port);
+      return { wroteWindowsEnv };
+    }
+    __name(persistVsCodeProxyEnvironment, "persistVsCodeProxyEnvironment");
     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;
+        if (settings.env.HOLYSHEEP_CLAUDE_LAUNCHER === "hs-claude-proxy") delete settings.env.HOLYSHEEP_CLAUDE_LAUNCHER;
+        if (settings.env.HOLYSHEEP_CLAUDE_PROCESS_PROXY === "1") delete settings.env.HOLYSHEEP_CLAUDE_PROCESS_PROXY;
         claudeCodeTool.writeSettings(settings);
       }
     }
     __name(clearBaseUrlFromSettings, "clearBaseUrlFromSettings");
+    function clearWindowsUserProxyEnv() {
+      if (effectivePlatform() !== "win32") return false;
+      const writer = getWinUserEnvWriter();
+      for (const key of WINDOWS_ENV_KEYS) writer("delete", key);
+      return true;
+    }
+    __name(clearWindowsUserProxyEnv, "clearWindowsUserProxyEnv");
+    function clearVsCodeProxyEnvironment() {
+      clearBaseUrlFromSettings();
+      clearWindowsUserProxyEnv();
+    }
+    __name(clearVsCodeProxyEnvironment, "clearVsCodeProxyEnvironment");
+    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) {
@@ -7366,7 +7361,7 @@ ${logTail}` : message);
       } else {
         console.log(chalk2.gray("\u4EE3\u7406\u8FDB\u7A0B\u5DF2\u4E0D\u5B58\u5728"));
       }
-      clearBaseUrlFromSettings();
+      clearVsCodeProxyEnvironment();
       clearPid();
     }
     __name(handleStop, "handleStop");
@@ -7389,7 +7384,7 @@ ${logTail}` : message);
       } else {
         console.log(chalk2.yellow("\u4EE3\u7406\u8FDB\u7A0B\u5DF2\u9000\u51FA"));
         clearPid();
-        clearBaseUrlFromSettings();
+        clearVsCodeProxyEnvironment();
       }
     }
     __name(handleStatus, "handleStatus");
@@ -7399,7 +7394,9 @@ ${logTail}` : message);
       }
       const info = readPid();
       if (info && isProcessAlive(info.pid) && await isProxyHealthy(info.port)) {
+        const persisted = persistVsCodeProxyEnvironment(info.port);
         console.log(chalk2.green(`\u4EE3\u7406\u5DF2\u5728\u8FD0\u884C (PID ${info.pid}, \u7AEF\u53E3 ${info.port})`));
+        if (persisted.wroteWindowsEnv) console.log(chalk2.cyan("Windows \u7528\u6237\uFF1A\u8BF7\u5B8C\u5168\u9000\u51FA\u5E76\u91CD\u5F00 VS Code\uFF0C\u8BA9\u7528\u6237\u7EA7\u73AF\u5883\u53D8\u91CF\u751F\u6548"));
         return;
       }
       const { selfEntrypoint } = require_paths();
@@ -7437,12 +7434,14 @@ ${logTail}` : message);
         }
         const latest = await readHealthyPid({ timeoutMs: 1e3 });
         if (latest) {
+          const persisted = persistVsCodeProxyEnvironment(latest.port);
           console.log(chalk2.green(`\u4EE3\u7406\u5DF2\u5728\u540E\u53F0\u542F\u52A8`));
           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"));
+          if (persisted.wroteWindowsEnv) console.log(chalk2.cyan("  Windows \u7528\u6237\uFF1A\u8BF7\u5B8C\u5168\u9000\u51FA\u5E76\u91CD\u5F00 VS Code\uFF0C\u8BA9\u7528\u6237\u7EA7\u73AF\u5883\u53D8\u91CF\u751F\u6548"));
           return;
         }
         if (child.exitCode !== null) {
@@ -7468,16 +7467,14 @@ ${logTail}` : message);
         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..."));
       const { server, port, sessionId } = await startProcessProxy({});
       writePid(process.pid, port, sessionId);
-      writeBaseUrlToSettings(port);
+      persistVsCodeProxyEnvironment(port);
       console.log(chalk2.green(`
 \u2713 Claude \u4EE3\u7406\u5DF2\u542F\u52A8`));
       console.log(chalk2.gray(`  \u7AEF\u53E3: ${port}`));
@@ -7487,7 +7484,7 @@ ${logTail}` : message);
       console.log(chalk2.gray("  \u6309 Ctrl+C \u505C\u6B62\n"));
       const cleanup = /* @__PURE__ */ __name(async () => {
         console.log(chalk2.gray("\n\u6B63\u5728\u505C\u6B62..."));
-        clearBaseUrlFromSettings();
+        clearVsCodeProxyEnvironment();
         clearPid();
         server.close();
         await closeSession(void 0, sessionId);
@@ -7514,8 +7511,8 @@ ${logTail}` : message);
       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);
       }
     };
@@ -7523,7 +7520,17 @@ ${logTail}` : message);
       probeLocalProxy,
       readHealthyPid,
       daemonLogFile: /* @__PURE__ */ __name(() => LOG_FILE, "daemonLogFile"),
-      daemonPidFile: /* @__PURE__ */ __name(() => PID_FILE, "daemonPidFile")
+      daemonPidFile: /* @__PURE__ */ __name(() => PID_FILE, "daemonPidFile"),
+      persistVsCodeProxyEnvironment,
+      writeWindowsUserProxyEnv,
+      clearWindowsUserProxyEnv,
+      defaultWinUserEnvWriter,
+      setPlatformOverride(value) {
+        platformOverride = value || null;
+      },
+      setWinUserEnvWriterForTest(writer) {
+        winUserEnvWriterOverride = writer || null;
+      }
     };
     module2.exports = claudeProxy;
   }
@@ -10359,6 +10366,7 @@ var require_aionui_wrapper = __commonJS({
     }
     __name(_startDetachedNpmUpgrade, "_startDetachedNpmUpgrade");
     function _ensureClaudeProxyConfig(apiKey) {
+      var _a;
       const config = claudeProcessProxy.readConfig();
       const next = claudeCodeTool.buildBridgeConfig(apiKey, BASE_URL_ANTHROPIC, {
         ...config,
@@ -10372,14 +10380,21 @@ var require_aionui_wrapper = __commonJS({
       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";
+        const preserveDaemonProxy = typeof ((_a = claudeCodeTool._private) == null ? void 0 : _a.shouldPreserveDaemonProxyEnv) === "function" ? claudeCodeTool._private.shouldPreserveDaemonProxyEnv(existing && existing.env || {}) : false;
+        const hasLauncherMark = existing && existing.env && existing.env.HOLYSHEEP_CLAUDE_LAUNCHER === (preserveDaemonProxy ? "hs-claude-proxy" : "hs");
         if (!hasToken || !hasLauncherMark) {
           const settings = existing || {};
           if (!settings.env) settings.env = {};
           settings.env.ANTHROPIC_AUTH_TOKEN = apiKey;
-          delete settings.env.ANTHROPIC_BASE_URL;
+          if (preserveDaemonProxy) {
+            settings.env.HOLYSHEEP_CLAUDE_LAUNCHER = "hs-claude-proxy";
+            settings.env.HOLYSHEEP_CLAUDE_PROCESS_PROXY = "1";
+          } else {
+            delete settings.env.ANTHROPIC_BASE_URL;
+            settings.env.HOLYSHEEP_CLAUDE_LAUNCHER = "hs";
+            delete settings.env.HOLYSHEEP_CLAUDE_PROCESS_PROXY;
+          }
           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);
@@ -11017,6 +11032,146 @@ 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, _b;
+      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();
+      const shouldPreserveDaemonProxy = typeof ((_a = claudeCodeTool._private) == null ? void 0 : _a.shouldPreserveDaemonProxyEnv) === "function" ? claudeCodeTool._private.shouldPreserveDaemonProxyEnv(settings.env || {}) : false;
+      if (((_b = settings.env) == null ? void 0 : _b.ANTHROPIC_BASE_URL) && !shouldPreserveDaemonProxy) {
+        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");

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.65",
+  "version": "2.1.67",
   "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/claude-proxy-daemon.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/claude-proxy-vscode-env.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 && node tests/claude-code-configure-preserve.test.js",
     "prepublishOnly": "npm run build && npm test && node scripts/check-tarball-size.js"
   },
   "keywords": [