baozang-activator 1.2.0 → 1.2.2

package/README.md

@@ -35,7 +35,7 @@ npm i -g baozang-activator@latest
 ```bash
 baozang-activator -v
 ```
-应显示：`1.2.0`（或更高）
+应显示：`1.2.1`（或更高）
 
 ### 3) 重新执行激活（会刷新本地 auth.json）
 ```bash
@@ -201,7 +201,7 @@ requires_openai_auth = true
 - 配置完成后会自动：
   - 启动网关 `openclaw gateway start`
   - 校验安装结果（版本 + 网关状态）
-  - 自动打开浏览器到网关 Dashboard（默认 `http://127.0.0.1:18789/`）
+  - 自动通过 `openclaw dashboard --no-open` 获取带 token 的 Dashboard 链接并打开浏览器（默认地址 `http://127.0.0.1:18789/`）
   - 提示后续操作（默认不需要关联社交账号）
 - 可预装常见 skills（默认开启）：`xiaohongshu`、`zhihu`、`wechat-official`、`douyin-script`
 
@@ -221,11 +221,11 @@ npx baozang-activator -t openclaw sk-xxxx --openclaw-skip-skills
 OpenClaw 卸载命令示例：
 
 ```bash
-# 交互询问是否删除 workspace / config(state)
+# 交互询问是否删除 workspace / config(state) / CLI 命令
 npx baozang-activator --openclaw-uninstall
 
 # 非交互指定删除策略
-npx baozang-activator --openclaw-uninstall --openclaw-remove-workspace --openclaw-remove-config
+npx baozang-activator --openclaw-uninstall --openclaw-remove-workspace --openclaw-remove-config --openclaw-remove-cli
 ```
 
 卸载完成后会自动校验网关状态，并打开浏览器到卸载说明页面。
@@ -241,6 +241,7 @@ npx baozang-activator --openclaw-uninstall --openclaw-remove-workspace --opencla
     --openclaw-uninstall    卸载 OpenClaw
     --openclaw-remove-workspace 卸载时删除 workspace
     --openclaw-remove-config    卸载时删除 state/config
+    --openclaw-remove-cli       卸载时删除全局 openclaw CLI
     --skip-activation 跳过卡密激活与余额校验
 -h, --help           显示帮助信息
 -v, --version        显示版本号

package/bin/cli.js

@@ -64,6 +64,7 @@ function parseArgs() {
     openclawUninstall: false,
     openclawRemoveWorkspace: false,
     openclawRemoveConfig: false,
+    openclawRemoveCli: false,
     openclawSkipSkills: false,
   };
   
@@ -87,6 +88,8 @@ function parseArgs() {
       result.openclawRemoveWorkspace = true;
     } else if (arg === '--openclaw-remove-config' || arg === '--openclaw-remove-state') {
       result.openclawRemoveConfig = true;
+    } else if (arg === '--openclaw-remove-cli') {
+      result.openclawRemoveCli = true;
     } else if (arg === '--openclaw-skip-skills') {
       result.openclawSkipSkills = true;
     } else if (arg === '--openclaw') {
@@ -119,6 +122,7 @@ ${chalk.yellow('选项:')}
       --openclaw-uninstall 卸载 OpenClaw（默认仅卸载网关服务）
       --openclaw-remove-workspace  卸载时删除工作区（workspace）
       --openclaw-remove-config     卸载时删除配置/状态文件（state）
+      --openclaw-remove-cli        卸载时删除全局 openclaw CLI 命令
       --openclaw-skip-skills       安装 OpenClaw 时跳过预装 skills
       --openclaw                  等价于 -t openclaw
   -h, --help           显示帮助信息
@@ -138,7 +142,7 @@ ${chalk.yellow('示例:')}
   npx baozang-activator -y sk-ant-xxx      跳过确认直接配置
   npx baozang-activator -t codex sk-xxx    强制配置为 Codex
   npx baozang-activator -t openclaw sk-xxx  一键安装并配置 OpenClaw 网关
-  npx baozang-activator --openclaw-uninstall --openclaw-remove-workspace --openclaw-remove-config
+  npx baozang-activator --openclaw-uninstall --openclaw-remove-workspace --openclaw-remove-config --openclaw-remove-cli
 `);
 }
 
@@ -280,11 +284,16 @@ async function doConfig(type, apiKey, config) {
 
       console.log('');
       console.log(chalk.yellow('打开网关控制台（Dashboard）:'));
-      console.log(chalk.cyan(`  ${result.dashboardUrl || 'http://127.0.0.1:18789/'}`));
+      const dashboardDisplayUrl = result.dashboardUrl || 'http://127.0.0.1:18789/';
+      const dashboardOpenUrl = result.dashboardOpenUrl || dashboardDisplayUrl;
+      console.log(chalk.cyan(`  ${dashboardDisplayUrl}`));
+      if (result.dashboardTokenized) {
+        console.log(chalk.gray('  (已自动携带 gateway token 打开浏览器)'));
+      }
 
-      const opened = openBrowser(result.dashboardUrl || 'http://127.0.0.1:18789/');
+      const opened = openBrowser(dashboardOpenUrl);
       if (!opened) {
-        console.log(chalk.gray('  (无法自动打开浏览器，请手动复制以上地址到浏览器)'));
+        console.log(chalk.gray('  (无法自动打开浏览器，请运行 openclaw dashboard 或 openclaw dashboard --no-open 获取带 token 链接)'));
       }
 
       console.log('');
@@ -505,6 +514,7 @@ async function main() {
 
     let removeWorkspace = args.openclawRemoveWorkspace;
     let removeConfig = args.openclawRemoveConfig;
+    let removeCli = args.openclawRemoveCli;
 
     if (isInteractive() && !args.yes) {
       if (!args.openclawRemoveWorkspace) {
@@ -525,19 +535,31 @@ async function main() {
         }]);
         removeConfig = !!answer.removeConfig;
       }
+      if (!args.openclawRemoveCli) {
+        const answer = await inquirer.prompt([{
+          type: 'confirm',
+          name: 'removeCli',
+          message: '卸载 OpenClaw 时是否删除全局 CLI 命令（openclaw）？',
+          default: true,
+        }]);
+        removeCli = !!answer.removeCli;
+      }
     }
 
     log.info('正在卸载 OpenClaw...');
     const uninstalled = uninstallOpenClaw({
       removeWorkspace,
       removeState: removeConfig,
+      removeCli,
     });
     if (!uninstalled.ok) {
       log.error(uninstalled.message || '卸载失败');
       process.exit(1);
     }
 
-    const verified = verifyOpenClawUninstalled();
+    const verified = verifyOpenClawUninstalled({
+      expectCommandRemoved: removeCli,
+    });
     if (!verified.ok) {
       log.error(`卸载后校验失败: ${verified.text || '网关仍在运行'}`);
       process.exit(1);

package/lib/configurator.js

@@ -649,6 +649,7 @@ function configureOpenClaw(apiKey, config) {
     restartGateway,
     getGatewayStatusText,
     installBuiltinSkills,
+    getDashboardUrl,
     getDefaultDashboardUrl,
   } = require('./openclaw');
 
@@ -711,6 +712,9 @@ function configureOpenClaw(apiKey, config) {
   }
 
   const gatewayStatus = getGatewayStatusText();
+  const dashboard = getDashboardUrl({ includeToken: true });
+  const dashboardUrl = getDefaultDashboardUrl();
+  const dashboardOpenUrl = sanitizeValue((dashboard && dashboard.url) || '') || dashboardUrl;
 
   return {
     installed: install.installed,
@@ -721,7 +725,9 @@ function configureOpenClaw(apiKey, config) {
     modelId,
     primaryModel,
     configFile,
-    dashboardUrl: getDefaultDashboardUrl(),
+    dashboardUrl,
+    dashboardOpenUrl,
+    dashboardTokenized: !!(dashboard && dashboard.tokenized),
     gatewayStatus: gatewayStatus.text,
     skillsDir: skillMeta ? skillMeta.dir : '',
     installedSkills: skillMeta ? skillMeta.skills : [],

package/lib/index.js

@@ -24,9 +24,11 @@ const {
   restartGateway,
   getGatewayStatusText,
   installBuiltinSkills,
+  uninstallOpenClawCli,
   uninstallOpenClaw,
   openBrowser,
   getDefaultDashboardUrl,
+  getDashboardUrl,
 } = require('./openclaw');
 
 module.exports = {
@@ -55,7 +57,9 @@ module.exports = {
   restartGateway,
   getGatewayStatusText,
   installBuiltinSkills,
+  uninstallOpenClawCli,
   uninstallOpenClaw,
   openBrowser,
   getDefaultDashboardUrl,
+  getDashboardUrl,
 };

package/lib/openclaw.js

@@ -28,6 +28,10 @@ function getNpmCommand() {
   return IS_WINDOWS ? 'npm.cmd' : 'npm';
 }
 
+function getYarnCommand() {
+  return IS_WINDOWS ? 'yarn.cmd' : 'yarn';
+}
+
 function getNpmGlobalBin() {
   try {
     const result = spawnSync(getNpmCommand(), ['prefix', '-g'], {
@@ -148,6 +152,49 @@ function getDefaultDashboardUrl() {
   return 'http://127.0.0.1:18789/';
 }
 
+function extractFirstUrl(text) {
+  const matched = String(text || '').match(/https?:\/\/[^\s"'<>]+/i);
+  if (!matched) {
+    return '';
+  }
+  return sanitizeText(matched[0]).replace(/[),.;]+$/, '');
+}
+
+function getDashboardUrl(options = {}) {
+  const includeToken = (options && options.includeToken) !== false;
+  const fallback = getDefaultDashboardUrl();
+  if (!includeToken) {
+    return {
+      ok: true,
+      url: fallback,
+      tokenized: false,
+      source: 'default',
+      error: '',
+    };
+  }
+
+  const result = openclaw(['dashboard', '--no-open'], { stdio: ['ignore', 'pipe', 'pipe'] });
+  const combined = `${result.stdout || ''}\n${result.stderr || ''}`;
+  const url = extractFirstUrl(combined);
+  if (url) {
+    return {
+      ok: true,
+      url,
+      tokenized: url.includes('#token='),
+      source: 'openclaw-dashboard',
+      error: '',
+    };
+  }
+
+  return {
+    ok: false,
+    url: fallback,
+    tokenized: false,
+    source: 'default',
+    error: sanitizeText(combined || '无法获取 Dashboard 地址'),
+  };
+}
+
 function openclaw(args, options = {}) {
   const resolved = resolveOpenClawCommand();
   const env = resolved.env ? resolved.env : process.env;
@@ -552,7 +599,8 @@ function verifyOpenClawReady() {
   };
 }
 
-function verifyOpenClawUninstalled() {
+function verifyOpenClawUninstalled(options = {}) {
+  const expectCommandRemoved = !!(options && options.expectCommandRemoved);
   const resolved = resolveOpenClawCommand();
   const hasCommand = commandExists('openclaw') || (!!resolved.cmd && fs.existsSync(resolved.cmd));
   if (!hasCommand) {
@@ -563,6 +611,14 @@ function verifyOpenClawUninstalled() {
     };
   }
 
+  if (expectCommandRemoved) {
+    return {
+      ok: false,
+      status: 'command-still-present',
+      text: 'openclaw 命令仍存在（请执行 npm uninstall -g openclaw）',
+    };
+  }
+
   const status = getGatewayStatusText();
   const running = parseGatewayRunning(status.text);
   if (!running) {
@@ -617,9 +673,68 @@ function installBuiltinSkills(options = {}) {
   };
 }
 
+function uninstallOpenClawCli() {
+  const attempts = [];
+  const maybeCommands = [];
+
+  if (commandExists(getNpmCommand()) || commandExists('npm')) {
+    maybeCommands.push({
+      cmd: getNpmCommand(),
+      args: ['uninstall', '-g', 'openclaw'],
+      name: 'npm',
+    });
+  }
+  if (commandExists('pnpm')) {
+    maybeCommands.push({
+      cmd: 'pnpm',
+      args: ['remove', '-g', 'openclaw'],
+      name: 'pnpm',
+    });
+  }
+  if (commandExists(getYarnCommand()) || commandExists('yarn')) {
+    maybeCommands.push({
+      cmd: getYarnCommand(),
+      args: ['global', 'remove', 'openclaw'],
+      name: 'yarn',
+    });
+  }
+
+  for (const item of maybeCommands) {
+    const result = runCommand(item.cmd, item.args, { stdio: 'inherit' });
+    attempts.push(`${item.name}:${result.status}`);
+    const resolved = resolveOpenClawCommand();
+    const stillExists = commandExists('openclaw') || (!!resolved.cmd && fs.existsSync(resolved.cmd));
+    if (!stillExists) {
+      return {
+        ok: true,
+        attempts,
+        message: '',
+      };
+    }
+  }
+
+  const resolved = resolveOpenClawCommand();
+  const stillExists = commandExists('openclaw') || (!!resolved.cmd && fs.existsSync(resolved.cmd));
+  if (!stillExists) {
+    return {
+      ok: true,
+      attempts,
+      message: '',
+    };
+  }
+  return {
+    ok: false,
+    attempts,
+    message: attempts.length > 0
+      ? `已尝试卸载 CLI（${attempts.join(', ')}），但 openclaw 命令仍存在`
+      : '未检测到可用包管理器，无法自动卸载 openclaw CLI',
+  };
+}
+
 function uninstallOpenClaw(params) {
   const removeWorkspace = !!(params && params.removeWorkspace);
   const removeState = !!(params && params.removeState);
+  const removeCli = !!(params && params.removeCli);
 
   if (!commandExists('openclaw') && !fs.existsSync(resolveOpenClawCommand().cmd)) {
     return { ok: false, message: '未找到 openclaw 命令，无法执行卸载' };
@@ -637,6 +752,17 @@ function uninstallOpenClaw(params) {
   if (result.status !== 0) {
     return { ok: false, message: `OpenClaw 卸载失败（exit ${result.status}）` };
   }
+
+  if (removeCli) {
+    const cli = uninstallOpenClawCli();
+    if (!cli.ok) {
+      return {
+        ok: false,
+        message: cli.message || 'OpenClaw CLI 卸载失败',
+      };
+    }
+  }
+
   return { ok: true, message: '' };
 }
 
@@ -648,6 +774,7 @@ module.exports = {
   configureBaozangProvider,
   getOpenClawConfigFile,
   validateOpenClawConfig,
+  uninstallOpenClawCli,
   onboardOpenClaw,
   startGateway,
   restartGateway,
@@ -656,5 +783,6 @@ module.exports = {
   uninstallOpenClaw,
   openBrowser,
   getDefaultDashboardUrl,
+  getDashboardUrl,
   HOME,
 };

package/package.json

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