baozang-activator 1.2.3 → 1.2.4

package/OPENCLAW.md

@@ -153,6 +153,19 @@ where openclaw
 ### Q3: 安装后提示 PATH 缺失
 如果提示 npm 全局 bin 不在 PATH，重开终端后仍不生效时，请把对应路径加入 shell 配置（如 `~/.bashrc` / `~/.zshrc`），再 `source` 生效。
 
+### Q4: macOS 显示 `LaunchAgent (not loaded)`，但日志里有 `RPC probe: ok`
+这是 OpenClaw 在 macOS 上的常见状态之一。只要状态输出里同时出现：
+
+```text
+RPC probe: ok
+Listening: 127.0.0.1:18789
+```
+
+就说明网关实际已经可用。`baozang-activator` `1.2.4` 起会按探活结果判定成功，不再因为 `launchctl` 的未加载提示直接报错。
+
+### Q5: Windows 卸载报 `exit null`
+这是 Windows 下 `.cmd` shim 调用方式导致的子进程状态异常。`baozang-activator` `1.2.4` 起会通过显式 `cmd.exe` 调用 `openclaw`，避免这个问题。
+
 ## 8) 验证清单
 
 安装后建议至少执行一次：

package/README.md

@@ -35,7 +35,7 @@ npm i -g baozang-activator@latest
 ```bash
 baozang-activator -v
 ```
-应显示：`1.2.3`（或更高）
+应显示：`1.2.4`（或更高）
 
 ### 3) 重新执行激活（会刷新本地 auth.json）
 ```bash

package/lib/openclaw.js

@@ -24,6 +24,30 @@ function commandExists(command) {
   return result.status === 0;
 }
 
+function getCommandPath(command) {
+  const checker = IS_WINDOWS ? 'where' : 'which';
+  const result = spawnSync(checker, [command], {
+    encoding: 'utf8',
+    stdio: ['ignore', 'pipe', 'ignore'],
+  });
+  if (result.status !== 0) {
+    return '';
+  }
+
+  const lines = String(result.stdout || '')
+    .split(/\r?\n/)
+    .map((line) => sanitizeText(line))
+    .filter(Boolean);
+
+  for (const line of lines) {
+    if (!IS_WINDOWS || /\.cmd$|\.bat$|\.exe$/i.test(line) || fs.existsSync(line)) {
+      return line;
+    }
+  }
+
+  return lines[0] || '';
+}
+
 function getNpmCommand() {
   return IS_WINDOWS ? 'npm.cmd' : 'npm';
 }
@@ -52,9 +76,10 @@ function getNpmGlobalBin() {
 }
 
 function resolveOpenClawCommand() {
-  if (commandExists('openclaw')) {
+  const existingPath = getCommandPath('openclaw');
+  if (existingPath) {
     return {
-      cmd: 'openclaw',
+      cmd: existingPath,
       env: null,
     };
   }
@@ -111,6 +136,17 @@ function runShell(commandString, options = {}) {
   return runCommand(bash, ['-lc', commandString], options);
 }
 
+function quoteWindowsArg(value) {
+  const text = String(value || '');
+  if (!text) {
+    return '""';
+  }
+  if (!/[\s"&()^<>|]/.test(text)) {
+    return text;
+  }
+  return `"${text.replace(/(\\*)"/g, '$1$1\\"').replace(/(\\+)$/g, '$1$1')}"`;
+}
+
 function ensureDir(dirPath) {
   if (!fs.existsSync(dirPath)) {
     fs.mkdirSync(dirPath, { recursive: true });
@@ -198,6 +234,15 @@ function getDashboardUrl(options = {}) {
 function openclaw(args, options = {}) {
   const resolved = resolveOpenClawCommand();
   const env = resolved.env ? resolved.env : process.env;
+  if (IS_WINDOWS) {
+    const commandLine = [resolved.cmd, ...(args || [])]
+      .map((part) => quoteWindowsArg(part))
+      .join(' ');
+    return runCommand('cmd.exe', ['/d', '/s', '/c', commandLine], {
+      env,
+      ...options,
+    });
+  }
   return runCommand(resolved.cmd, args, {
     env,
     ...options,
@@ -490,23 +535,18 @@ function startGateway() {
   }
 
   let status = getGatewayStatusText();
-  if (status.ok && parseGatewayRunning(status.text)) {
+  if (parseGatewayRunning(status.text)) {
     return { ok: true, message: '' };
   }
 
   const startText = sanitizeText(`${startResult.stdout}\n${startResult.stderr}`);
-  if (
-    startResult.status === 0 &&
-    (startText.includes('Gateway service disabled') || sanitizeText(status.text).includes('disabled'))
-  ) {
+  if (startResult.status === 0 && (gatewayServiceNeedsInstall(startText) || gatewayServiceNeedsInstall(status.text))) {
     const installResult = openclaw(['gateway', 'install'], { stdio: 'inherit' });
     if (installResult.status === 0) {
-      const retry = openclaw(['gateway', 'start'], { stdio: 'inherit' });
-      if (retry.status === 0) {
-        status = getGatewayStatusText();
-        if (status.ok && parseGatewayRunning(status.text)) {
-          return { ok: true, message: '' };
-        }
+      openclaw(['gateway', 'start'], { stdio: 'inherit' });
+      status = getGatewayStatusText();
+      if (parseGatewayRunning(status.text)) {
+        return { ok: true, message: '' };
       }
     }
   }
@@ -523,7 +563,7 @@ function startGateway() {
     child.unref();
     sleepMs(2000);
     status = getGatewayStatusText();
-    if (status.ok && parseGatewayRunning(status.text)) {
+    if (parseGatewayRunning(status.text)) {
       return { ok: true, message: '' };
     }
   } catch (error) {
@@ -564,6 +604,9 @@ function parseGatewayRunning(statusText) {
   if (!text) {
     return false;
   }
+  if (text.includes('rpc probe: ok') || text.includes('listening: 127.0.0.1:') || text.includes('listening: localhost:')) {
+    return true;
+  }
   if (text.includes('not running') || text.includes('stopped') || text.includes('未运行') || text.includes('已停止')) {
     return false;
   }
@@ -578,14 +621,30 @@ function parseGatewayStopped(statusText) {
   if (!text) {
     return false;
   }
+  if (text.includes('rpc probe: ok') || text.includes('listening: 127.0.0.1:') || text.includes('listening: localhost:')) {
+    return false;
+  }
   return text.includes('not running') || text.includes('stopped') || text.includes('未运行') || text.includes('已停止');
 }
 
+function gatewayServiceNeedsInstall(statusText) {
+  const text = sanitizeText(statusText).toLowerCase();
+  if (!text) {
+    return false;
+  }
+  return text.includes('service disabled')
+    || text.includes('gateway service disabled')
+    || text.includes('service not loaded')
+    || text.includes('gateway service not loaded')
+    || text.includes('launchagent (not loaded)')
+    || text.includes('could not find service');
+}
+
 function verifyOpenClawReady() {
   const status = getGatewayStatusText();
   const running = parseGatewayRunning(status.text);
   const stopped = parseGatewayStopped(status.text);
-  if (status.ok && (running || !stopped)) {
+  if (running || (status.ok && !stopped)) {
     return {
       ok: true,
       status: 'gateway-running',
@@ -750,7 +809,8 @@ function uninstallOpenClaw(params) {
 
   const result = openclaw(args, { stdio: 'inherit' });
   if (result.status !== 0) {
-    return { ok: false, message: `OpenClaw 卸载失败（exit ${result.status}）` };
+    const suffix = result.error && result.error.message ? `: ${result.error.message}` : '';
+    return { ok: false, message: `OpenClaw 卸载失败（exit ${String(result.status)})${suffix}` };
   }
 
   if (removeCli) {
@@ -784,5 +844,12 @@ module.exports = {
   openBrowser,
   getDefaultDashboardUrl,
   getDashboardUrl,
+  __internal: {
+    getCommandPath,
+    quoteWindowsArg,
+    parseGatewayRunning,
+    parseGatewayStopped,
+    gatewayServiceNeedsInstall,
+  },
   HOME,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baozang-activator",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "API 激活工具 (生产环境 - baozangaizhongzhuan.net)",
   "main": "lib/index.js",
   "bin": {