@simonyea/holysheep-cli 2.1.71 → 2.1.72

package/dist/configure-worker.js

@@ -1008,7 +1008,7 @@ var require_which = __commonJS({
   "src/utils/which.js"(exports2, module2) {
     var path = require("path");
     var fs = require("fs");
-    var { exec, execSync } = require("child_process");
+    var { exec, execSync, execFileSync } = require("child_process");
     function canRun(command, options = {}) {
       try {
         execSync(command, { stdio: "ignore", ...options });
@@ -1026,8 +1026,22 @@ var require_which = __commonJS({
       });
     }
     __name(canRunAsync, "canRunAsync");
+    function isWindowsLike() {
+      return process.platform === "win32" || process.env.HOLYSHEEP_TEST_PLATFORM === "win32";
+    }
+    __name(isWindowsLike, "isWindowsLike");
+    function appendDirToProcessPath(dir) {
+      if (!dir) return false;
+      const delimiter = isWindowsLike() ? ";" : path.delimiter;
+      const parts = (process.env.PATH || "").split(delimiter).map((item) => item.trim()).filter(Boolean);
+      const hasDir = parts.some((item) => item.toLowerCase() === dir.toLowerCase());
+      if (hasDir) return false;
+      process.env.PATH = [...parts, dir].join(delimiter);
+      return true;
+    }
+    __name(appendDirToProcessPath, "appendDirToProcessPath");
     function getWindowsKnownPaths(cmd) {
-      if (process.platform !== "win32") return [];
+      if (!isWindowsLike()) return [];
       const home = process.env.USERPROFILE || process.env.HOME || "";
       const appData = process.env.APPDATA || "";
       const localAppData = process.env.LOCALAPPDATA || "";
@@ -1048,7 +1062,10 @@ var require_which = __commonJS({
     function checkKnownPathsSync(cmd) {
       for (const p of getWindowsKnownPaths(cmd)) {
         try {
-          if (fs.existsSync(p)) return p;
+          if (fs.existsSync(p)) {
+            appendDirToProcessPath(path.dirname(p));
+            return p;
+          }
         } catch {
         }
       }
@@ -1057,14 +1074,15 @@ var require_which = __commonJS({
     __name(checkKnownPathsSync, "checkKnownPathsSync");
     var _userPathRefreshedAt = 0;
     function refreshWindowsUserPath() {
-      if (process.platform !== "win32") return;
+      if (!isWindowsLike()) return;
       const now = Date.now();
       if (now - _userPathRefreshedAt < 5e3) return;
       _userPathRefreshedAt = now;
       try {
-        const out = execSync(
-          `powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::GetEnvironmentVariable('Path', 'User')"`,
-          { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 5e3 }
+        const out = execFileSync(
+          "powershell.exe",
+          ["-NoProfile", "-ExecutionPolicy", "Bypass", "-Command", "[Environment]::GetEnvironmentVariable('Path', 'User')"],
+          { encoding: "utf8", windowsHide: true, timeout: 5e3 }
         ).trim();
         if (!out) return;
         const userParts = out.split(";").map((s) => s.trim()).filter(Boolean);
@@ -1085,7 +1103,7 @@ var require_which = __commonJS({
     }
     __name(refreshWindowsUserPath, "refreshWindowsUserPath");
     function commandExists(cmd) {
-      if (process.platform === "win32") {
+      if (isWindowsLike()) {
         const variants = [cmd, `${cmd}.cmd`, `${cmd}.exe`, `${cmd}.bat`];
         for (const variant of variants) {
           if (canRun(`where ${variant}`)) return true;
@@ -1105,7 +1123,7 @@ var require_which = __commonJS({
     }
     __name(commandExists, "commandExists");
     async function commandExistsAsync(cmd) {
-      if (process.platform === "win32") {
+      if (isWindowsLike()) {
         const variants = [cmd, `${cmd}.cmd`, `${cmd}.exe`, `${cmd}.bat`];
         for (const variant of variants) {
           if (await canRunAsync(`where ${variant}`)) return true;
@@ -1129,7 +1147,9 @@ var require_which = __commonJS({
       commandExistsAsync,
       // test-only exports
       _getWindowsKnownPaths: getWindowsKnownPaths,
-      _refreshWindowsUserPath: refreshWindowsUserPath
+      _refreshWindowsUserPath: refreshWindowsUserPath,
+      _checkKnownPathsSync: checkKnownPathsSync,
+      _appendDirToProcessPath: appendDirToProcessPath
     };
   }
 });
@@ -4135,11 +4155,11 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@simonyea/holysheep-cli",
-      version: "2.1.71",
+      version: "2.1.72",
       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/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 && node tests/webui-claude-proxy-virtual-tool.test.js && node tests/webui-claude-proxy-ui.test.js && node tests/webui-response-consumer.test.js && node tests/webui-claude-proxy-install-gating.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 && node tests/webui-claude-proxy-virtual-tool.test.js && node tests/webui-claude-proxy-ui.test.js && node tests/webui-response-consumer.test.js && node tests/webui-claude-proxy-install-gating.test.js && node tests/claude-code-windows-local-bin.test.js",
         prepublishOnly: "npm run build && npm test && node scripts/check-tarball-size.js"
       },
       keywords: [
@@ -4224,13 +4244,59 @@ var require_shell = __commonJS({
     var fs = require("fs");
     var path = require("path");
     var os = require("os");
-    var { execSync } = require("child_process");
+    var { execSync, execFileSync } = require("child_process");
     var pkg = require_package();
     var MARKER_START = "# >>> holysheep-cli managed >>>";
     var MARKER_END = "# <<< holysheep-cli managed <<<";
+    function isWindowsLike() {
+      return process.platform === "win32" || process.env.HOLYSHEEP_TEST_PLATFORM === "win32";
+    }
+    __name(isWindowsLike, "isWindowsLike");
+    var execFileSyncOverride = null;
+    function quotePowerShellString(value) {
+      return `'${String(value).replace(/'/g, "''")}'`;
+    }
+    __name(quotePowerShellString, "quotePowerShellString");
+    function runPowerShellUserEnvScript(script, options = {}) {
+      const runner = execFileSyncOverride || execFileSync;
+      try {
+        return runner("powershell.exe", ["-NoProfile", "-ExecutionPolicy", "Bypass", "-Command", script], {
+          encoding: "utf8",
+          windowsHide: true,
+          timeout: options.timeout || 5e3
+        });
+      } catch (err) {
+        const stderr = err && err.stderr ? String(err.stderr).trim() : "";
+        const stdout = err && err.stdout ? String(err.stdout).trim() : "";
+        const detail = stderr || stdout || err && err.message || "unknown error";
+        throw new Error(`PowerShell \u7528\u6237\u73AF\u5883\u53D8\u91CF\u64CD\u4F5C\u5931\u8D25: ${detail}`);
+      }
+    }
+    __name(runPowerShellUserEnvScript, "runPowerShellUserEnvScript");
+    function getWindowsUserEnvVar(name) {
+      return runPowerShellUserEnvScript(`[Environment]::GetEnvironmentVariable(${quotePowerShellString(name)}, 'User')`).trim();
+    }
+    __name(getWindowsUserEnvVar, "getWindowsUserEnvVar");
+    function setWindowsUserEnvVar(name, value) {
+      runPowerShellUserEnvScript(`[Environment]::SetEnvironmentVariable(${quotePowerShellString(name)}, ${value === null || value === void 0 ? "$null" : quotePowerShellString(value)}, 'User')`);
+    }
+    __name(setWindowsUserEnvVar, "setWindowsUserEnvVar");
+    function splitWindowsPath(value) {
+      return String(value || "").split(";").map((item) => item.trim()).filter(Boolean);
+    }
+    __name(splitWindowsPath, "splitWindowsPath");
+    function appendDirToProcessPath(dir) {
+      const parts = splitWindowsPath(process.env.PATH);
+      if (!parts.some((item) => item.toLowerCase() === dir.toLowerCase())) {
+        process.env.PATH = [...parts, dir].join(";");
+        return true;
+      }
+      return false;
+    }
+    __name(appendDirToProcessPath, "appendDirToProcessPath");
     function getShellRcFiles() {
       const home = os.homedir();
-      if (process.platform === "win32") return [];
+      if (isWindowsLike()) return [];
       const shell = process.env.SHELL || "";
       const candidates = [];
       if (shell.includes("zsh")) candidates.push(path.join(home, ".zshrc"));
@@ -4276,16 +4342,13 @@ var require_shell = __commonJS({
     }
     __name(buildEnvBlock, "buildEnvBlock");
     function ensureWindowsUserPathHasNpmBin() {
-      if (process.platform !== "win32") return [];
+      if (!isWindowsLike()) return [];
       const appData = process.env.APPDATA;
       if (!appData) return [];
       const npmBin = path.join(appData, "npm");
       let currentPath = "";
       try {
-        currentPath = execSync(
-          `powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::GetEnvironmentVariable('Path', 'User')"`,
-          { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }
-        ).trim();
+        currentPath = getWindowsUserEnvVar("Path");
       } catch {
         currentPath = process.env.PATH || "";
       }
@@ -4294,70 +4357,40 @@ var require_shell = __commonJS({
       if (hasNpmBin) return [];
       const nextPath = [...parts, npmBin].join(";");
       try {
-        const escapedPath = nextPath.replace(/'/g, "''");
-        execSync(
-          `powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::SetEnvironmentVariable('Path', '${escapedPath}', 'User')"`,
-          { stdio: "ignore" }
-        );
+        setWindowsUserEnvVar("Path", nextPath);
+        appendDirToProcessPath(npmBin);
         return ["[\u7528\u6237 PATH] %APPDATA%\\npm"];
-      } catch {
-        try {
-          const chalk = require("chalk");
-          console.warn(chalk.yellow(
-            `  \u26A0\uFE0F  \u65E0\u6CD5\u81EA\u52A8\u66F4\u65B0 PATH\uFF0C\u8BF7\u624B\u52A8\u5C06\u4EE5\u4E0B\u8DEF\u5F84\u52A0\u5165\u7CFB\u7EDF\u73AF\u5883\u53D8\u91CF PATH\uFF1A
-     ${npmBin}`
-          ));
-        } catch {
-        }
-        return [];
+      } catch (err) {
+        return [`[\u7528\u6237 PATH \u5199\u5165\u5931\u8D25] %APPDATA%\\npm \u2014 ${err.message}`];
       }
     }
     __name(ensureWindowsUserPathHasNpmBin, "ensureWindowsUserPathHasNpmBin");
     function ensureWindowsUserPathHasLocalBin() {
-      if (process.platform !== "win32") return [];
+      if (!isWindowsLike()) return [];
       const userProfile = process.env.USERPROFILE || os.homedir();
       if (!userProfile) return [];
       const localBin = path.join(userProfile, ".local", "bin");
       let currentPath = "";
       try {
-        currentPath = execSync(
-          `powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::GetEnvironmentVariable('Path', 'User')"`,
-          { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }
-        ).trim();
+        currentPath = getWindowsUserEnvVar("Path");
       } catch {
         currentPath = process.env.PATH || "";
       }
       const parts = currentPath.split(";").map((item) => item.trim()).filter(Boolean);
       const hasLocalBin = parts.some((item) => item.toLowerCase() === localBin.toLowerCase());
-      const procParts = (process.env.PATH || "").split(";").map((p) => p.trim()).filter(Boolean);
-      const inProcessHasIt = procParts.some((item) => item.toLowerCase() === localBin.toLowerCase());
-      if (!inProcessHasIt) {
-        process.env.PATH = [...procParts, localBin].join(";");
-      }
-      if (hasLocalBin) return inProcessHasIt ? [] : ["[\u5F53\u524D\u8FDB\u7A0B PATH] %USERPROFILE%\\.local\\bin"];
+      const inProcessHadIt = !appendDirToProcessPath(localBin);
+      if (hasLocalBin) return inProcessHadIt ? [] : ["[\u5F53\u524D\u8FDB\u7A0B PATH] %USERPROFILE%\\.local\\bin"];
       const nextPath = [...parts, localBin].join(";");
       try {
-        const escapedPath = nextPath.replace(/'/g, "''");
-        execSync(
-          `powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::SetEnvironmentVariable('Path', '${escapedPath}', 'User')"`,
-          { stdio: "ignore" }
-        );
+        setWindowsUserEnvVar("Path", nextPath);
         return ["[\u7528\u6237 PATH] %USERPROFILE%\\.local\\bin"];
-      } catch {
-        try {
-          const chalk = require("chalk");
-          console.warn(chalk.yellow(
-            `  \u26A0\uFE0F  \u65E0\u6CD5\u81EA\u52A8\u66F4\u65B0 PATH\uFF0C\u8BF7\u624B\u52A8\u5C06\u4EE5\u4E0B\u8DEF\u5F84\u52A0\u5165\u7CFB\u7EDF\u73AF\u5883\u53D8\u91CF PATH\uFF1A
-     ${localBin}`
-          ));
-        } catch {
-        }
-        return [];
+      } catch (err) {
+        return [`[\u7528\u6237 PATH \u5199\u5165\u5931\u8D25] %USERPROFILE%\\.local\\bin \u2014 ${err.message}`];
       }
     }
     __name(ensureWindowsUserPathHasLocalBin, "ensureWindowsUserPathHasLocalBin");
     function installWindowsCliShims() {
-      if (process.platform !== "win32") return [];
+      if (!isWindowsLike()) return [];
       const appData = process.env.APPDATA;
       if (!appData) return [];
       const npmBin = path.join(appData, "npm");
@@ -4397,13 +4430,15 @@ var require_shell = __commonJS({
     }
     __name(installWindowsCliShims, "installWindowsCliShims");
     function writeEnvToShell(envVars) {
-      if (process.platform === "win32") {
+      if (isWindowsLike()) {
         const written2 = [];
         for (const [k, v] of Object.entries(envVars)) {
           try {
-            execSync(`setx ${k} "${v}"`, { stdio: "ignore" });
+            setWindowsUserEnvVar(k, v);
+            process.env[k] = v;
             written2.push(`[\u7CFB\u7EDF\u73AF\u5883\u53D8\u91CF] ${k}`);
-          } catch {
+          } catch (err) {
+            written2.push(`[\u7CFB\u7EDF\u73AF\u5883\u53D8\u91CF\u5199\u5165\u5931\u8D25] ${k} \u2014 ${err.message}`);
           }
         }
         written2.push(...installWindowsCliShims());
@@ -4433,14 +4468,11 @@ var require_shell = __commonJS({
     }
     __name(writeEnvToShell, "writeEnvToShell");
     function removeWindowsUserEnvVars(keys = []) {
-      if (process.platform !== "win32") return [];
+      if (!isWindowsLike()) return [];
       const removed = [];
       for (const key of keys) {
         try {
-          execSync(
-            `powershell.exe -NoProfile -Command "[Environment]::SetEnvironmentVariable('${key}', $null, 'User')"`,
-            { stdio: "ignore" }
-          );
+          setWindowsUserEnvVar(key, null);
           delete process.env[key];
           removed.push(`[\u7CFB\u7EDF\u73AF\u5883\u53D8\u91CF] ${key}`);
         } catch {
@@ -4459,7 +4491,7 @@ var require_shell = __commonJS({
         "HOLYSHEEP_API_KEY",
         ...extraKeys
       ];
-      if (process.platform === "win32") {
+      if (isWindowsLike()) {
         return removeWindowsUserEnvVars(HS_KEYS);
       }
       const files = getShellRcFiles();
@@ -4489,7 +4521,17 @@ var require_shell = __commonJS({
       ensureWindowsUserPathHasNpmBin,
       ensureWindowsUserPathHasLocalBin,
       installWindowsCliShims,
-      removeWindowsUserEnvVars
+      removeWindowsUserEnvVars,
+      _private: {
+        runPowerShellUserEnvScript,
+        getWindowsUserEnvVar,
+        setWindowsUserEnvVar,
+        setExecFileSyncForTest(runner) {
+          execFileSyncOverride = runner || null;
+        },
+        quotePowerShellString,
+        appendDirToProcessPath
+      }
     };
   }
 });

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.71",
+      version: "2.1.72",
       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/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 && node tests/webui-claude-proxy-virtual-tool.test.js && node tests/webui-claude-proxy-ui.test.js && node tests/webui-response-consumer.test.js && node tests/webui-claude-proxy-install-gating.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 && node tests/webui-claude-proxy-virtual-tool.test.js && node tests/webui-claude-proxy-ui.test.js && node tests/webui-response-consumer.test.js && node tests/webui-claude-proxy-install-gating.test.js && node tests/claude-code-windows-local-bin.test.js",
         prepublishOnly: "npm run build && npm test && node scripts/check-tarball-size.js"
       },
       keywords: [
@@ -336,13 +336,59 @@ var require_shell = __commonJS({
     var fs = require("fs");
     var path = require("path");
     var os = require("os");
-    var { execSync } = require("child_process");
+    var { execSync, execFileSync } = require("child_process");
     var pkg2 = require_package();
     var MARKER_START = "# >>> holysheep-cli managed >>>";
     var MARKER_END = "# <<< holysheep-cli managed <<<";
+    function isWindowsLike() {
+      return process.platform === "win32" || process.env.HOLYSHEEP_TEST_PLATFORM === "win32";
+    }
+    __name(isWindowsLike, "isWindowsLike");
+    var execFileSyncOverride = null;
+    function quotePowerShellString(value) {
+      return `'${String(value).replace(/'/g, "''")}'`;
+    }
+    __name(quotePowerShellString, "quotePowerShellString");
+    function runPowerShellUserEnvScript(script, options = {}) {
+      const runner = execFileSyncOverride || execFileSync;
+      try {
+        return runner("powershell.exe", ["-NoProfile", "-ExecutionPolicy", "Bypass", "-Command", script], {
+          encoding: "utf8",
+          windowsHide: true,
+          timeout: options.timeout || 5e3
+        });
+      } catch (err) {
+        const stderr = err && err.stderr ? String(err.stderr).trim() : "";
+        const stdout = err && err.stdout ? String(err.stdout).trim() : "";
+        const detail = stderr || stdout || err && err.message || "unknown error";
+        throw new Error(`PowerShell \u7528\u6237\u73AF\u5883\u53D8\u91CF\u64CD\u4F5C\u5931\u8D25: ${detail}`);
+      }
+    }
+    __name(runPowerShellUserEnvScript, "runPowerShellUserEnvScript");
+    function getWindowsUserEnvVar(name) {
+      return runPowerShellUserEnvScript(`[Environment]::GetEnvironmentVariable(${quotePowerShellString(name)}, 'User')`).trim();
+    }
+    __name(getWindowsUserEnvVar, "getWindowsUserEnvVar");
+    function setWindowsUserEnvVar(name, value) {
+      runPowerShellUserEnvScript(`[Environment]::SetEnvironmentVariable(${quotePowerShellString(name)}, ${value === null || value === void 0 ? "$null" : quotePowerShellString(value)}, 'User')`);
+    }
+    __name(setWindowsUserEnvVar, "setWindowsUserEnvVar");
+    function splitWindowsPath(value) {
+      return String(value || "").split(";").map((item) => item.trim()).filter(Boolean);
+    }
+    __name(splitWindowsPath, "splitWindowsPath");
+    function appendDirToProcessPath(dir) {
+      const parts = splitWindowsPath(process.env.PATH);
+      if (!parts.some((item) => item.toLowerCase() === dir.toLowerCase())) {
+        process.env.PATH = [...parts, dir].join(";");
+        return true;
+      }
+      return false;
+    }
+    __name(appendDirToProcessPath, "appendDirToProcessPath");
     function getShellRcFiles() {
       const home = os.homedir();
-      if (process.platform === "win32") return [];
+      if (isWindowsLike()) return [];
       const shell = process.env.SHELL || "";
       const candidates = [];
       if (shell.includes("zsh")) candidates.push(path.join(home, ".zshrc"));
@@ -388,16 +434,13 @@ var require_shell = __commonJS({
     }
     __name(buildEnvBlock, "buildEnvBlock");
     function ensureWindowsUserPathHasNpmBin() {
-      if (process.platform !== "win32") return [];
+      if (!isWindowsLike()) return [];
       const appData = process.env.APPDATA;
       if (!appData) return [];
       const npmBin = path.join(appData, "npm");
       let currentPath = "";
       try {
-        currentPath = execSync(
-          `powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::GetEnvironmentVariable('Path', 'User')"`,
-          { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }
-        ).trim();
+        currentPath = getWindowsUserEnvVar("Path");
       } catch {
         currentPath = process.env.PATH || "";
       }
@@ -406,70 +449,40 @@ var require_shell = __commonJS({
       if (hasNpmBin) return [];
       const nextPath = [...parts, npmBin].join(";");
       try {
-        const escapedPath = nextPath.replace(/'/g, "''");
-        execSync(
-          `powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::SetEnvironmentVariable('Path', '${escapedPath}', 'User')"`,
-          { stdio: "ignore" }
-        );
+        setWindowsUserEnvVar("Path", nextPath);
+        appendDirToProcessPath(npmBin);
         return ["[\u7528\u6237 PATH] %APPDATA%\\npm"];
-      } catch {
-        try {
-          const chalk2 = require("chalk");
-          console.warn(chalk2.yellow(
-            `  \u26A0\uFE0F  \u65E0\u6CD5\u81EA\u52A8\u66F4\u65B0 PATH\uFF0C\u8BF7\u624B\u52A8\u5C06\u4EE5\u4E0B\u8DEF\u5F84\u52A0\u5165\u7CFB\u7EDF\u73AF\u5883\u53D8\u91CF PATH\uFF1A
-     ${npmBin}`
-          ));
-        } catch {
-        }
-        return [];
+      } catch (err) {
+        return [`[\u7528\u6237 PATH \u5199\u5165\u5931\u8D25] %APPDATA%\\npm \u2014 ${err.message}`];
       }
     }
     __name(ensureWindowsUserPathHasNpmBin, "ensureWindowsUserPathHasNpmBin");
     function ensureWindowsUserPathHasLocalBin() {
-      if (process.platform !== "win32") return [];
+      if (!isWindowsLike()) return [];
       const userProfile = process.env.USERPROFILE || os.homedir();
       if (!userProfile) return [];
       const localBin = path.join(userProfile, ".local", "bin");
       let currentPath = "";
       try {
-        currentPath = execSync(
-          `powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::GetEnvironmentVariable('Path', 'User')"`,
-          { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }
-        ).trim();
+        currentPath = getWindowsUserEnvVar("Path");
       } catch {
         currentPath = process.env.PATH || "";
       }
       const parts = currentPath.split(";").map((item) => item.trim()).filter(Boolean);
       const hasLocalBin = parts.some((item) => item.toLowerCase() === localBin.toLowerCase());
-      const procParts = (process.env.PATH || "").split(";").map((p) => p.trim()).filter(Boolean);
-      const inProcessHasIt = procParts.some((item) => item.toLowerCase() === localBin.toLowerCase());
-      if (!inProcessHasIt) {
-        process.env.PATH = [...procParts, localBin].join(";");
-      }
-      if (hasLocalBin) return inProcessHasIt ? [] : ["[\u5F53\u524D\u8FDB\u7A0B PATH] %USERPROFILE%\\.local\\bin"];
+      const inProcessHadIt = !appendDirToProcessPath(localBin);
+      if (hasLocalBin) return inProcessHadIt ? [] : ["[\u5F53\u524D\u8FDB\u7A0B PATH] %USERPROFILE%\\.local\\bin"];
       const nextPath = [...parts, localBin].join(";");
       try {
-        const escapedPath = nextPath.replace(/'/g, "''");
-        execSync(
-          `powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::SetEnvironmentVariable('Path', '${escapedPath}', 'User')"`,
-          { stdio: "ignore" }
-        );
+        setWindowsUserEnvVar("Path", nextPath);
         return ["[\u7528\u6237 PATH] %USERPROFILE%\\.local\\bin"];
-      } catch {
-        try {
-          const chalk2 = require("chalk");
-          console.warn(chalk2.yellow(
-            `  \u26A0\uFE0F  \u65E0\u6CD5\u81EA\u52A8\u66F4\u65B0 PATH\uFF0C\u8BF7\u624B\u52A8\u5C06\u4EE5\u4E0B\u8DEF\u5F84\u52A0\u5165\u7CFB\u7EDF\u73AF\u5883\u53D8\u91CF PATH\uFF1A
-     ${localBin}`
-          ));
-        } catch {
-        }
-        return [];
+      } catch (err) {
+        return [`[\u7528\u6237 PATH \u5199\u5165\u5931\u8D25] %USERPROFILE%\\.local\\bin \u2014 ${err.message}`];
       }
     }
     __name(ensureWindowsUserPathHasLocalBin, "ensureWindowsUserPathHasLocalBin");
     function installWindowsCliShims() {
-      if (process.platform !== "win32") return [];
+      if (!isWindowsLike()) return [];
       const appData = process.env.APPDATA;
       if (!appData) return [];
       const npmBin = path.join(appData, "npm");
@@ -509,13 +522,15 @@ var require_shell = __commonJS({
     }
     __name(installWindowsCliShims, "installWindowsCliShims");
     function writeEnvToShell(envVars) {
-      if (process.platform === "win32") {
+      if (isWindowsLike()) {
         const written2 = [];
         for (const [k, v] of Object.entries(envVars)) {
           try {
-            execSync(`setx ${k} "${v}"`, { stdio: "ignore" });
+            setWindowsUserEnvVar(k, v);
+            process.env[k] = v;
             written2.push(`[\u7CFB\u7EDF\u73AF\u5883\u53D8\u91CF] ${k}`);
-          } catch {
+          } catch (err) {
+            written2.push(`[\u7CFB\u7EDF\u73AF\u5883\u53D8\u91CF\u5199\u5165\u5931\u8D25] ${k} \u2014 ${err.message}`);
           }
         }
         written2.push(...installWindowsCliShims());
@@ -545,14 +560,11 @@ var require_shell = __commonJS({
     }
     __name(writeEnvToShell, "writeEnvToShell");
     function removeWindowsUserEnvVars(keys = []) {
-      if (process.platform !== "win32") return [];
+      if (!isWindowsLike()) return [];
       const removed = [];
       for (const key of keys) {
         try {
-          execSync(
-            `powershell.exe -NoProfile -Command "[Environment]::SetEnvironmentVariable('${key}', $null, 'User')"`,
-            { stdio: "ignore" }
-          );
+          setWindowsUserEnvVar(key, null);
           delete process.env[key];
           removed.push(`[\u7CFB\u7EDF\u73AF\u5883\u53D8\u91CF] ${key}`);
         } catch {
@@ -571,7 +583,7 @@ var require_shell = __commonJS({
         "HOLYSHEEP_API_KEY",
         ...extraKeys
       ];
-      if (process.platform === "win32") {
+      if (isWindowsLike()) {
         return removeWindowsUserEnvVars(HS_KEYS);
       }
       const files = getShellRcFiles();
@@ -601,7 +613,17 @@ var require_shell = __commonJS({
       ensureWindowsUserPathHasNpmBin,
       ensureWindowsUserPathHasLocalBin,
       installWindowsCliShims,
-      removeWindowsUserEnvVars
+      removeWindowsUserEnvVars,
+      _private: {
+        runPowerShellUserEnvScript,
+        getWindowsUserEnvVar,
+        setWindowsUserEnvVar,
+        setExecFileSyncForTest(runner) {
+          execFileSyncOverride = runner || null;
+        },
+        quotePowerShellString,
+        appendDirToProcessPath
+      }
     };
   }
 });
@@ -611,7 +633,7 @@ var require_which = __commonJS({
   "src/utils/which.js"(exports2, module2) {
     var path = require("path");
     var fs = require("fs");
-    var { exec, execSync } = require("child_process");
+    var { exec, execSync, execFileSync } = require("child_process");
     function canRun(command, options = {}) {
       try {
         execSync(command, { stdio: "ignore", ...options });
@@ -629,8 +651,22 @@ var require_which = __commonJS({
       });
     }
     __name(canRunAsync, "canRunAsync");
+    function isWindowsLike() {
+      return process.platform === "win32" || process.env.HOLYSHEEP_TEST_PLATFORM === "win32";
+    }
+    __name(isWindowsLike, "isWindowsLike");
+    function appendDirToProcessPath(dir) {
+      if (!dir) return false;
+      const delimiter = isWindowsLike() ? ";" : path.delimiter;
+      const parts = (process.env.PATH || "").split(delimiter).map((item) => item.trim()).filter(Boolean);
+      const hasDir = parts.some((item) => item.toLowerCase() === dir.toLowerCase());
+      if (hasDir) return false;
+      process.env.PATH = [...parts, dir].join(delimiter);
+      return true;
+    }
+    __name(appendDirToProcessPath, "appendDirToProcessPath");
     function getWindowsKnownPaths(cmd) {
-      if (process.platform !== "win32") return [];
+      if (!isWindowsLike()) return [];
       const home = process.env.USERPROFILE || process.env.HOME || "";
       const appData = process.env.APPDATA || "";
       const localAppData = process.env.LOCALAPPDATA || "";
@@ -651,7 +687,10 @@ var require_which = __commonJS({
     function checkKnownPathsSync(cmd) {
       for (const p of getWindowsKnownPaths(cmd)) {
         try {
-          if (fs.existsSync(p)) return p;
+          if (fs.existsSync(p)) {
+            appendDirToProcessPath(path.dirname(p));
+            return p;
+          }
         } catch {
         }
       }
@@ -660,14 +699,15 @@ var require_which = __commonJS({
     __name(checkKnownPathsSync, "checkKnownPathsSync");
     var _userPathRefreshedAt = 0;
     function refreshWindowsUserPath() {
-      if (process.platform !== "win32") return;
+      if (!isWindowsLike()) return;
       const now = Date.now();
       if (now - _userPathRefreshedAt < 5e3) return;
       _userPathRefreshedAt = now;
       try {
-        const out = execSync(
-          `powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::GetEnvironmentVariable('Path', 'User')"`,
-          { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 5e3 }
+        const out = execFileSync(
+          "powershell.exe",
+          ["-NoProfile", "-ExecutionPolicy", "Bypass", "-Command", "[Environment]::GetEnvironmentVariable('Path', 'User')"],
+          { encoding: "utf8", windowsHide: true, timeout: 5e3 }
         ).trim();
         if (!out) return;
         const userParts = out.split(";").map((s) => s.trim()).filter(Boolean);
@@ -688,7 +728,7 @@ var require_which = __commonJS({
     }
     __name(refreshWindowsUserPath, "refreshWindowsUserPath");
     function commandExists2(cmd) {
-      if (process.platform === "win32") {
+      if (isWindowsLike()) {
         const variants = [cmd, `${cmd}.cmd`, `${cmd}.exe`, `${cmd}.bat`];
         for (const variant of variants) {
           if (canRun(`where ${variant}`)) return true;
@@ -708,7 +748,7 @@ var require_which = __commonJS({
     }
     __name(commandExists2, "commandExists");
     async function commandExistsAsync(cmd) {
-      if (process.platform === "win32") {
+      if (isWindowsLike()) {
         const variants = [cmd, `${cmd}.cmd`, `${cmd}.exe`, `${cmd}.bat`];
         for (const variant of variants) {
           if (await canRunAsync(`where ${variant}`)) return true;
@@ -732,7 +772,9 @@ var require_which = __commonJS({
       commandExistsAsync,
       // test-only exports
       _getWindowsKnownPaths: getWindowsKnownPaths,
-      _refreshWindowsUserPath: refreshWindowsUserPath
+      _refreshWindowsUserPath: refreshWindowsUserPath,
+      _checkKnownPathsSync: checkKnownPathsSync,
+      _appendDirToProcessPath: appendDirToProcessPath
     };
   }
 });

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.71",
+  "version": "2.1.72",
   "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/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 && node tests/webui-claude-proxy-virtual-tool.test.js && node tests/webui-claude-proxy-ui.test.js && node tests/webui-response-consumer.test.js && node tests/webui-claude-proxy-install-gating.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 && node tests/webui-claude-proxy-virtual-tool.test.js && node tests/webui-claude-proxy-ui.test.js && node tests/webui-response-consumer.test.js && node tests/webui-claude-proxy-install-gating.test.js && node tests/claude-code-windows-local-bin.test.js",
     "prepublishOnly": "npm run build && npm test && node scripts/check-tarball-size.js"
   },
   "keywords": [