@simonyea/holysheep-cli 2.1.54 → 2.1.56

package/dist/configure-worker.js

@@ -1561,10 +1561,10 @@ var require_droid = __commonJS({
         route: "anthropic"
       },
       {
-        model: "claude-opus-4-6",
-        id: "custom:claude-opus-4-6-0",
+        model: "claude-opus-4-7",
+        id: "custom:claude-opus-4-7-0",
         baseUrlSuffix: "",
-        displayName: "Opus 4.6",
+        displayName: "Opus 4.7",
         provider: "anthropic",
         route: "anthropic"
       },
@@ -3425,6 +3425,65 @@ var require_openclaw = __commonJS({
       }
     }
     __name(_disableGatewayAuth, "_disableGatewayAuth");
+    function disableGatewayAuthDirect() {
+      var _a, _b;
+      try {
+        if (!fs.existsSync(CONFIG_FILE)) {
+          return { changed: false, reason: "no-config" };
+        }
+        let cfg;
+        try {
+          cfg = JSON.parse(fs.readFileSync(CONFIG_FILE, "utf8"));
+        } catch (e) {
+          return { changed: false, reason: "error", error: e.message };
+        }
+        const previousMode = (_b = (_a = cfg == null ? void 0 : cfg.gateway) == null ? void 0 : _a.auth) == null ? void 0 : _b.mode;
+        if (previousMode === "none") {
+          return { changed: false, reason: "already-none" };
+        }
+        if (!cfg.gateway) cfg.gateway = {};
+        if (!cfg.gateway.auth) cfg.gateway.auth = {};
+        cfg.gateway.auth.mode = "none";
+        atomicWriteJson(CONFIG_FILE, cfg);
+        return { changed: true, previousMode: previousMode || null };
+      } catch (e) {
+        return { changed: false, reason: "error", error: e.message };
+      }
+    }
+    __name(disableGatewayAuthDirect, "disableGatewayAuthDirect");
+    function killGatewayOnPort(port) {
+      if (!port || !Number.isInteger(port)) return false;
+      try {
+        if (isWin) {
+          const out2 = execSync(
+            `powershell -NonInteractive -Command "(Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue).OwningProcess"`,
+            { stdio: "pipe", encoding: "utf8", timeout: 3e3 }
+          );
+          const pids2 = String(out2 || "").match(/\d+/g);
+          if (!pids2 || pids2.length === 0) return false;
+          for (const pid of pids2) {
+            try {
+              execSync(`taskkill /F /PID ${pid}`, { stdio: "ignore", timeout: 3e3 });
+            } catch {
+            }
+          }
+          return true;
+        }
+        const out = execSync(`lsof -ti tcp:${port} -sTCP:LISTEN 2>/dev/null || true`, { stdio: "pipe", encoding: "utf8", timeout: 3e3 });
+        const pids = String(out || "").trim().split(/\s+/).filter(Boolean);
+        if (pids.length === 0) return false;
+        for (const pid of pids) {
+          try {
+            execSync(`kill -TERM ${pid}`, { stdio: "ignore", timeout: 3e3 });
+          } catch {
+          }
+        }
+        return true;
+      } catch {
+        return false;
+      }
+    }
+    __name(killGatewayOnPort, "killGatewayOnPort");
     function _installGatewayService(port, preferNpx = false) {
       if (preferNpx) return false;
       const result = runOpenClaw(["gateway", "install", "--force", "--port", String(port)], {
@@ -3709,7 +3768,10 @@ var require_openclaw = __commonJS({
       docsUrl: "https://docs.openclaw.ai",
       // [HolySheep fork v2.1.38 / hs26] Test-only exports.
       _atomicWriteJson: atomicWriteJson,
-      _pruneClobberedBackups: pruneClobberedBackups
+      _pruneClobberedBackups: pruneClobberedBackups,
+      // [HolySheep v2.1.56] Direct JSON-level fixes for hs web auto-recovery.
+      disableGatewayAuthDirect,
+      killGatewayOnPort
     };
   }
 });
@@ -4019,11 +4081,11 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@simonyea/holysheep-cli",
-      version: "2.1.54",
+      version: "2.1.56",
       description: "Claude Code/Cursor/Cline API relay for China \u2014 \xA51=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
       scripts: {
         build: "node scripts/build.mjs",
-        test: "node tests/droid.test.js && node tests/workspace-store.test.js && node tests/runtime-stale-upgrade.test.js && node tests/hermes.test.js && node tests/preflight.test.js && node tests/opencode-auth-purge.test.js && node tests/shell-winpath.test.js && node tests/openclaw-atomic-write.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-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/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/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.54",
+      version: "2.1.56",
       description: "Claude Code/Cursor/Cline API relay for China \u2014 \xA51=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
       scripts: {
         build: "node scripts/build.mjs",
-        test: "node tests/droid.test.js && node tests/workspace-store.test.js && node tests/runtime-stale-upgrade.test.js && node tests/hermes.test.js && node tests/preflight.test.js && node tests/opencode-auth-purge.test.js && node tests/shell-winpath.test.js && node tests/openclaw-atomic-write.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-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/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/version-check.test.js && node tests/runclaude-missing-binary.test.js",
         prepublishOnly: "npm run build && npm test && node scripts/check-tarball-size.js"
       },
       keywords: [
@@ -2107,10 +2107,10 @@ var require_droid = __commonJS({
         route: "anthropic"
       },
       {
-        model: "claude-opus-4-6",
-        id: "custom:claude-opus-4-6-0",
+        model: "claude-opus-4-7",
+        id: "custom:claude-opus-4-7-0",
         baseUrlSuffix: "",
-        displayName: "Opus 4.6",
+        displayName: "Opus 4.7",
         provider: "anthropic",
         route: "anthropic"
       },
@@ -3971,6 +3971,65 @@ var require_openclaw = __commonJS({
       }
     }
     __name(_disableGatewayAuth, "_disableGatewayAuth");
+    function disableGatewayAuthDirect() {
+      var _a, _b;
+      try {
+        if (!fs.existsSync(CONFIG_FILE)) {
+          return { changed: false, reason: "no-config" };
+        }
+        let cfg;
+        try {
+          cfg = JSON.parse(fs.readFileSync(CONFIG_FILE, "utf8"));
+        } catch (e) {
+          return { changed: false, reason: "error", error: e.message };
+        }
+        const previousMode = (_b = (_a = cfg == null ? void 0 : cfg.gateway) == null ? void 0 : _a.auth) == null ? void 0 : _b.mode;
+        if (previousMode === "none") {
+          return { changed: false, reason: "already-none" };
+        }
+        if (!cfg.gateway) cfg.gateway = {};
+        if (!cfg.gateway.auth) cfg.gateway.auth = {};
+        cfg.gateway.auth.mode = "none";
+        atomicWriteJson(CONFIG_FILE, cfg);
+        return { changed: true, previousMode: previousMode || null };
+      } catch (e) {
+        return { changed: false, reason: "error", error: e.message };
+      }
+    }
+    __name(disableGatewayAuthDirect, "disableGatewayAuthDirect");
+    function killGatewayOnPort(port) {
+      if (!port || !Number.isInteger(port)) return false;
+      try {
+        if (isWin) {
+          const out2 = execSync(
+            `powershell -NonInteractive -Command "(Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue).OwningProcess"`,
+            { stdio: "pipe", encoding: "utf8", timeout: 3e3 }
+          );
+          const pids2 = String(out2 || "").match(/\d+/g);
+          if (!pids2 || pids2.length === 0) return false;
+          for (const pid of pids2) {
+            try {
+              execSync(`taskkill /F /PID ${pid}`, { stdio: "ignore", timeout: 3e3 });
+            } catch {
+            }
+          }
+          return true;
+        }
+        const out = execSync(`lsof -ti tcp:${port} -sTCP:LISTEN 2>/dev/null || true`, { stdio: "pipe", encoding: "utf8", timeout: 3e3 });
+        const pids = String(out || "").trim().split(/\s+/).filter(Boolean);
+        if (pids.length === 0) return false;
+        for (const pid of pids) {
+          try {
+            execSync(`kill -TERM ${pid}`, { stdio: "ignore", timeout: 3e3 });
+          } catch {
+          }
+        }
+        return true;
+      } catch {
+        return false;
+      }
+    }
+    __name(killGatewayOnPort, "killGatewayOnPort");
     function _installGatewayService(port, preferNpx = false) {
       if (preferNpx) return false;
       const result = runOpenClaw(["gateway", "install", "--force", "--port", String(port)], {
@@ -4255,7 +4314,10 @@ var require_openclaw = __commonJS({
       docsUrl: "https://docs.openclaw.ai",
       // [HolySheep fork v2.1.38 / hs26] Test-only exports.
       _atomicWriteJson: atomicWriteJson,
-      _pruneClobberedBackups: pruneClobberedBackups
+      _pruneClobberedBackups: pruneClobberedBackups,
+      // [HolySheep v2.1.56] Direct JSON-level fixes for hs web auto-recovery.
+      disableGatewayAuthDirect,
+      killGatewayOnPort
     };
   }
 });
@@ -4968,7 +5030,7 @@ var require_setup = __commonJS({
         { name: "gpt-5.4             (GPT 5.4, \u901A\u7528\u7F16\u7801)", value: "gpt-5.4", checked: true },
         { name: "gpt-5.3-codex-spark (GPT 5.3 Codex Spark, \u7F16\u7801)", value: "gpt-5.3-codex-spark", checked: true },
         { name: "claude-sonnet-4-6   (Sonnet 4.6, \u5747\u8861\u63A8\u8350)", value: "claude-sonnet-4-6", checked: true },
-        { name: "claude-opus-4-6     (Opus 4.6, \u5F3A\u529B\u65D7\u8230)", value: "claude-opus-4-6", checked: true },
+        { name: "claude-opus-4-7     (Opus 4.7, \u5F3A\u529B\u65D7\u8230)", value: "claude-opus-4-7", checked: true },
         { name: "MiniMax-M2.7-highspeed (\u9AD8\u901F\u7ECF\u6D4E\u7248)", value: "MiniMax-M2.7-highspeed", checked: true },
         { name: "claude-haiku-4-5    (Haiku 4.5, \u8F7B\u5FEB\u4FBF\u5B9C)", value: "claude-haiku-4-5", checked: true }
       ];
@@ -8013,7 +8075,7 @@ ${AUTO_INSTALL[toolId].cmd}
         "gpt-5.4",
         "gpt-5.3-codex-spark",
         "claude-sonnet-4-6",
-        "claude-opus-4-6",
+        "claude-opus-4-7",
         "MiniMax-M2.7-highspeed",
         "claude-haiku-4-5"
       ];
@@ -8437,8 +8499,8 @@ ${AUTO_INSTALL[toolId].cmd}
         { id: "gpt-5.3-codex-spark", label: "GPT 5.3 Codex Spark", desc: "\u7F16\u7801" },
         { id: "claude-sonnet-4-6", label: "Sonnet 4.6", desc: "\u5747\u8861\u63A8\u8350" },
         { id: "claude-sonnet-4-6[1m]", label: "Sonnet 4.6 (1M)", desc: "\u5747\u8861\u63A8\u8350\xB7100\u4E07\u4E0A\u4E0B\u6587" },
-        { id: "claude-opus-4-6", label: "Opus 4.6", desc: "\u5F3A\u529B\u65D7\u8230" },
-        { id: "claude-opus-4-6[1m]", label: "Opus 4.6 (1M)", desc: "\u5F3A\u529B\u65D7\u8230\xB7100\u4E07\u4E0A\u4E0B\u6587" },
+        { id: "claude-opus-4-7", label: "Opus 4.7", desc: "\u5F3A\u529B\u65D7\u8230" },
+        { id: "claude-opus-4-7[1m]", label: "Opus 4.7 (1M)", desc: "\u5F3A\u529B\u65D7\u8230\xB7100\u4E07\u4E0A\u4E0B\u6587" },
         { id: "MiniMax-M2.7-highspeed", label: "MiniMax M2.7", desc: "\u9AD8\u901F\u7ECF\u6D4E\u7248" },
         { id: "claude-haiku-4-5", label: "Haiku 4.5", desc: "\u8F7B\u5FEB\u4FBF\u5B9C" }
       ]);
@@ -9725,6 +9787,35 @@ var require_aionui_wrapper = __commonJS({
       }
     }
     __name(_checkOpenClawPairingNeeded, "_checkOpenClawPairingNeeded");
+    function _autoFixOpenClawPairing() {
+      if (typeof openclawTool.checkInstalled !== "function" || !openclawTool.checkInstalled()) return;
+      if (typeof openclawTool.isConfigured !== "function" || !openclawTool.isConfigured()) return;
+      const result = typeof openclawTool.disableGatewayAuthDirect === "function" ? openclawTool.disableGatewayAuthDirect() : { changed: false, reason: "helper-missing" };
+      if (result.changed) {
+        log(`OpenClaw gateway.auth.mode patched: ${result.previousMode || "?"} \u2192 none`);
+        try {
+          const port = typeof openclawTool.getGatewayPort === "function" ? openclawTool.getGatewayPort() : null;
+          if (port && typeof openclawTool.killGatewayOnPort === "function") {
+            const killed = openclawTool.killGatewayOnPort(port);
+            if (killed) log(`OpenClaw gateway on :${port} stopped \u2014 will restart with new auth config on next AionUi connection`);
+          }
+        } catch (e) {
+          log(`warn: could not stop running OpenClaw gateway: ${e && e.message ? e.message : e}`);
+        }
+        return;
+      }
+      if (result.reason === "already-none") {
+        return;
+      }
+      if (result.reason === "no-config") {
+        _startupWarnings.openclawNeedsPairing = true;
+        log("warn: ~/.openclaw/openclaw.json missing \u2014 banner will prompt for `hs openclaw`");
+      } else if (result.reason === "error") {
+        _startupWarnings.openclawNeedsPairing = true;
+        log(`warn: OpenClaw config patch failed (${result.error}) \u2014 banner will surface manual fix`);
+      }
+    }
+    __name(_autoFixOpenClawPairing, "_autoFixOpenClawPairing");
     var VERSION_CACHE_FILE = path.join(os.homedir(), ".holysheep", "last-version-check.json");
     var UPGRADE_LOG_FILE = path.join(os.homedir(), ".holysheep", "auto-update.log");
     var PACKAGE_NAME = "@simonyea/holysheep-cli";
@@ -9964,12 +10055,13 @@ var require_aionui_wrapper = __commonJS({
         log("warn: CLI auto-config error (continuing): " + (e && e.message ? e.message : e));
       }
       try {
-        _startupWarnings.openclawNeedsPairing = _checkOpenClawPairingNeeded();
-        if (_startupWarnings.openclawNeedsPairing) {
-          log('warn: OpenClaw gateway auth.mode is not "none" \u2014 users will see "pairing required" errors. Run `hs openclaw` to fix.');
-        }
+        _autoFixOpenClawPairing();
       } catch (e) {
-        log("warn: OpenClaw pairing check failed (continuing): " + (e && e.message ? e.message : e));
+        log("warn: OpenClaw pairing auto-fix failed (continuing): " + (e && e.message ? e.message : e));
+        try {
+          _startupWarnings.openclawNeedsPairing = _checkOpenClawPairingNeeded();
+        } catch {
+        }
       }
       const claudeProxyHandle = await ensureClaudeProcessProxyRunning();
       ensureOpenClawBridgeRunning();

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.54",
+  "version": "2.1.56",
   "description": "Claude Code/Cursor/Cline API relay for China — ¥1=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
   "scripts": {
     "build": "node scripts/build.mjs",
-    "test": "node tests/droid.test.js && node tests/workspace-store.test.js && node tests/runtime-stale-upgrade.test.js && node tests/hermes.test.js && node tests/preflight.test.js && node tests/opencode-auth-purge.test.js && node tests/shell-winpath.test.js && node tests/openclaw-atomic-write.test.js && node tests/opencode-default-model.test.js && node tests/paths-bundled.test.js && node tests/aionui-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/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/version-check.test.js && node tests/runclaude-missing-binary.test.js",
     "prepublishOnly": "npm run build && npm test && node scripts/check-tarball-size.js"
   },
   "keywords": [