@wps365/openclaw-wpsxiezuo 1.6.2 → 1.6.4

package/bin/cli.mjs

@@ -47,8 +47,7 @@ function env(name) {
 const CHANNEL_ID = "wps-xiezuo";
 const LEGACY_CHANNEL_IDS = ["wps", "openclaw-wps-xiezuo"];
 const ALL_IDS = [CHANNEL_ID, ...LEGACY_CHANNEL_IDS];
-// uninstall 只对真实 plugin id 生效（openclaw-wps-xiezuo 是 npm 包名，不是 plugin id）
-const UNINSTALL_IDS = [CHANNEL_ID, "wps"];
+const UNINSTALL_IDS = [CHANNEL_ID];
 const DEFAULT_BASE_URL = "https://openapi.wps.cn";
 const DEFAULT_AGENT_ID = "digital-assistant";
 const OPENCLAW_HOME = path.join(os.homedir(), ".openclaw");
@@ -444,30 +443,63 @@ function writeChannelConfig({ appId, appSecret, baseUrl }) {
   log.info(`已写入 channels.${CHANNEL_ID} + plugins.allow + bindings`);
 }
 
-function verifyInstall({ requirePluginRegistered = true } = {}) {
+async function verifyInstall({ requirePluginRegistered = true } = {}) {
   const cfg = readJsonSafe(OPENCLAW_JSON);
   if (!cfg?.channels?.[CHANNEL_ID]?.enabled) {
     log.error(`安装验证失败：channels.${CHANNEL_ID} 未写入或未启用`);
     process.exit(1);
   }
 
-  // 仅在要求插件已注册时，再跑一次 `openclaw plugins list` 兜底验证。
-  // 说明：不同 OpenClaw 版本的 list 输出格式不尽相同，我们只做"是否出现 channel id"
-  // 级别的宽松匹配，避免在少见输出上误报。
   if (!requirePluginRegistered) return;
 
-  const list = runOpenclaw(["plugins", "list"], { capture: true });
-  if (list.status !== 0) {
-    log.warn(`openclaw plugins list 执行失败（exit=${list.status}），跳过运行时验证`);
-    return;
-  }
-  const output = `${list.stdout}\n${list.stderr}`;
-  if (!output.includes(CHANNEL_ID)) {
-    log.error(`安装验证失败：openclaw plugins list 输出未包含 "${CHANNEL_ID}"`);
-    log.error("这通常表示插件虽被 `plugins install` 接受，但未被网关识别。");
-    log.error("请手动执行 `openclaw plugins list` 排查，或升级 OpenClaw 后重试。");
-    process.exit(1);
+  // 兼容不同 OpenClaw 版本的输出格式：可能显示 channel id、npm 包名或其片段
+  const knownIds = [CHANNEL_ID, "openclaw-wpsxiezuo", "@wps365/openclaw-wpsxiezuo"];
+  const RETRIES = 3;
+  const INTERVAL_MS = 5000;
+
+  console.log(`
+${c.green}${c.bold}✅ 插件安装已完成，正在自动校验注册结果...${c.reset}
+
+${c.cyan}提示：${c.reset}如果不想等待自动校验，可 ${c.bold}Ctrl+C${c.reset} 中止，然后手动执行以下命令确认：
+  ${c.cyan}openclaw plugins list${c.reset}              查看已注册插件列表
+  ${c.cyan}openclaw gateway restart${c.reset}           重启网关加载插件
+`);
+
+  for (let attempt = 1; attempt <= RETRIES; attempt++) {
+    if (attempt > 1) {
+      const secs = INTERVAL_MS / 1000;
+      for (let remaining = secs; remaining > 0; remaining--) {
+        process.stdout.write(`\r${c.cyan}[INFO]${c.reset} 等待重试（第 ${attempt}/${RETRIES} 次）：${remaining}s ... `);
+        await new Promise((r) => setTimeout(r, 1000));
+      }
+      process.stdout.write("\r" + " ".repeat(60) + "\r"); // 清除倒计时行
+    }
+
+    const list = runOpenclaw(["plugins", "list"], { capture: true });
+    if (list.status !== 0) {
+      log.warn(`openclaw plugins list 执行失败（exit=${list.status}，第 ${attempt}/${RETRIES} 次）`);
+      continue;
+    }
+
+    // 按行过滤（grep 语义），兼容 Windows / macOS / Linux。
+    // 不依赖系统 grep / findstr，用 Node.js 正则逐行匹配，跨平台一致。
+    const allLines = `${list.stdout}\n${list.stderr}`.split(/\r?\n/);
+    const pattern = new RegExp(knownIds.map((id) => id.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|"), "i");
+    const matchedLines = allLines.filter((line) => pattern.test(line));
+
+    if (matchedLines.length > 0) {
+      log.info("插件已在 openclaw plugins list 中确认注册：");
+      matchedLines.forEach((line) => log.info(`  ${line.trim()}`));
+      return;
+    }
+
+    log.info(`第 ${attempt}/${RETRIES} 次未在 plugins list 中找到插件，稍后重试...`);
   }
+
+  // 三次均未匹配，降级为警告（install 和 config 写入均已成功，可能是输出格式差异）
+  log.warn(`重试 ${RETRIES} 次后，openclaw plugins list 仍未包含已知标识（${knownIds.join(" / ")}）`);
+  log.warn("插件注册命令已成功执行，此警告可能是 OpenClaw 版本的输出格式差异导致。");
+  log.warn(`请重启网关后手动确认：openclaw gateway restart && openclaw plugins list`);
 }
 
 // ── install 子命令 ──────────────────────────────────────────────────────────
@@ -552,7 +584,7 @@ async function cmdInstall(flags) {
   runOpenclaw(["doctor", "--fix"], { silent: true });
 
   log.step("验证安装");
-  verifyInstall({ requirePluginRegistered: reg.ok });
+  await verifyInstall({ requirePluginRegistered: reg.ok });
 
   const successNote = reg.ok
     ? `${c.green}${c.bold}✅ @wps365/openclaw-wpsxiezuo 安装成功${c.reset}`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wps365/openclaw-wpsxiezuo",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "description": "WPS Xiezuo OpenClaw plugin - connect OpenClaw Agent to the WPS Open Platform enterprise robot",
   "keywords": [
     "openclaw",