@tencent-weixin/openclaw-weixin-cli 2.1.1 → 2.1.3

package/README.md

@@ -22,7 +22,7 @@ npx -y @tencent-weixin/openclaw-weixin-cli install
 | openclaw-weixin | 支持的 OpenClaw       | dist-tag                              | 说明                 |
 |-----------------|-----------------------|---------------------------------------|----------------------|
 | 1.0.x           | >=2026.3.0 <2026.3.22 | `compat-host-gte2026.3.0-lt2026.3.22` | 兼容轨道             |
-| 2.0.x           | >=2026.3.22           | `latest`                              | 当前推荐主线         |
+| v2 主线         | >=2026.3.22           | `latest`                              | 当前推荐             |
 
 > 从 2.0.0 开始，插件采用独立 semver 版本号，不再对齐宿主 OpenClaw 版本号。
 
@@ -82,114 +82,3 @@ openclaw --version
 
 - **插件仓库**：openclaw-weixin，通过各分支发布到不同的 npm dist-tag
 - **本仓库**：CLI 安装器，根据 `COMPAT_MATRIX` 自动选择正确的插件 dist-tag 来安装
-
-### 分支管理规则
-
-内网和外网通过不同分支管理，prerelease 分支从主分支拉出，合并回主分支：
-
-| 分支 | 用途 | package.json 状态 |
-|------|------|------------------|
-| `master-prerelease` | 日常开发 + 内网发布 | 内网发布后保持内网包名和版本 |
-| `master` | 外网发布 | 外网发布后保持外网包名和版本 |
-
-**核心原则：**
-- 日常开发和内网发布在 `-prerelease` 分支上进行
-- 需要发外网时，将 prerelease 分支合入对应主分支，再在主分支上发布
-- 发布后 package.json **不回退**，分支保持对应环境的最新发布状态
-- prerelease 和主分支同构（共用 `publish.config.json`），合并时自然更新
-
-### CLI 发布命令
-
-```bash
-# 在 prerelease 分支上发布内网
-node scripts/publish.mjs internal patch
-
-# dry run 预检
-node scripts/publish.mjs internal patch --dry-run
-```
-
-发布脚本会：
-1. 检查工作区是否干净
-2. 将 `package.json` 的 name/version 和 `cli.mjs` 的 PLUGIN_SPEC 替换为目标环境的值
-3. 更新 `publish.config.json` 中对应目标的版本号
-4. 提交 release commit 并打 git tag
-5. npm publish
-6. push commit + tag
-
-发布后 package.json 保持发布态，不回退。如果 npm publish 失败，自动回滚 release commit 和 tag。
-
-### 内网验证后发外网
-
-```bash
-# ① 在 prerelease 分支上完成内网发布和验证
-
-# ② 合入主分支
-git checkout master
-git merge master-prerelease
-
-# ③ 在主分支上发布外网
-node scripts/publish.mjs external patch
-```
-
-### 兼容轨道发版流程
-
-当 openclaw 发布破坏兼容性的新版本时：
-
-#### 1. 插件仓库操作（openclaw-weixin）
-
-```bash
-# 从当前分支拉出兼容轨道
-git checkout -b compat-host-gteX.Y.Z-ltA.B.C-prerelease master-prerelease
-git checkout -b compat-host-gteX.Y.Z-ltA.B.C master
-# 修改 compat 分支上的 publish.config.json，将 npmTag 改为轨道名
-
-# master-prerelease 上适配新宿主，major + 1
-```
-
-#### 2. CLI 仓库操作（本仓库）
-
-```bash
-# ① 更新 lib/compat.mjs 的 COMPAT_MATRIX
-
-# ② 在 prerelease 分支上发布内网验证
-node scripts/publish.mjs internal minor
-
-# ③ 验证后合入主分支发外网
-git checkout master && git merge master-prerelease
-node scripts/publish.mjs external minor
-```
-
-#### 3. 验证清单
-
-- [ ] `npx @tencent/openclaw-weixin-cli install` 在旧宿主上安装兼容轨道版本
-- [ ] `npx @tencent/openclaw-weixin-cli install` 在新宿主上安装 latest 版本
-- [ ] 已安装旧 tag 的用户重跑 CLI 后自动卸载旧版、安装新版
-- [ ] 插件运行时 `version-check.mjs` 报错信息指引正确
-
-### 兼容轨道 bug 修复
-
-```bash
-# ① 在 compat prerelease 分支上修复
-git checkout compat-host-gteX.Y.Z-ltA.B.C-prerelease
-# cherry-pick 或直接修复
-node scripts/publish.mjs internal patch
-
-# ② 需要发外网时合入 compat 主分支
-git checkout compat-host-gteX.Y.Z-ltA.B.C
-git merge compat-host-gteX.Y.Z-ltA.B.C-prerelease
-node scripts/publish.mjs external patch
-
-# ③ 评估是否需要同步到 master 和其他 compat 分支
-```
-
-> CLI 不需要重新发布——同一 dist-tag 下的 patch 更新，用户通过 `openclaw plugins update` 即可获取。
-
-## 开发
-
-```bash
-# 安装开发依赖
-npm install
-
-# 本地测试 install 命令
-node cli.mjs install
-```

package/cli.mjs

@@ -16,11 +16,23 @@ const CHANNEL_ID = "openclaw-weixin";
 /** Only OpenClaw 2026.3.22–2026.3.23 need node_modules/openclaw symlink for jiti. */
 const SYMLINK_OPENCLAW_MIN = "2026.3.22";
 const SYMLINK_OPENCLAW_MAX = "2026.3.23";
+/**
+ * OpenClaw 2026.5.2 之前的 5.x 版本里，channel-catalog-registry 调
+ * discoverOpenClawPlugins 时漏传 installRecords，导致 npm 装的第三方插件
+ * 不被 CLI catalog 收录（`channels add/login` 报 Unsupported channel）。
+ * 我们通过把 plugin 同时软链到 ~/.openclaw/extensions/<id> 让它走 global
+ * 发现路径，绕开 ledger。host 修复发布后需要把上界 EXT_SYMLINK_OPENCLAW_MAX
+ * 收紧到具体的修复版本号。
+ */
+const EXT_SYMLINK_OPENCLAW_MIN = "2026.5.2";
+const EXT_SYMLINK_OPENCLAW_MAX = "2026.5.99";
 
 const LEGACY_TAG_ALIASES = {
   legacy: "compat-host-gte2026.3.0-lt2026.3.22",
 };
 
+const COMPAT_MATRIX_DIST_TAG_PAD = Math.max(...COMPAT_MATRIX.map((e) => e.distTag.length));
+
 // ── helpers ──────────────────────────────────────────────────────────────────
 
 function log(msg) {
@@ -70,7 +82,9 @@ function selectPluginTag(openclawVersion) {
   error(`当前 OpenClaw 版本 ${openclawVersion} 不在任何已知兼容范围内`);
   console.log("\n  已知兼容矩阵:");
   for (const e of COMPAT_MATRIX) {
-    console.log(`    ${e.label}  →  OpenClaw ${formatRange(e.openclawRange)}`);
+    console.log(
+      `    ${e.distTag.padEnd(COMPAT_MATRIX_DIST_TAG_PAD)}  OpenClaw ${formatRange(e.openclawRange)}`,
+    );
   }
   console.log();
   return null;
@@ -167,6 +181,76 @@ function ensureOpenclawSymlink(hostVersion) {
   log(`已创建 symlink: node_modules/openclaw → ${hostRoot}`);
 }
 
+// ── extensions symlink (host 5.2 catalog bug workaround) ────────────────────
+
+function hostVersionNeedsExtSymlink(hostVersion) {
+  if (!hostVersion) return false;
+  const geMin = compareVersions(hostVersion, EXT_SYMLINK_OPENCLAW_MIN);
+  const leMax = compareVersions(hostVersion, EXT_SYMLINK_OPENCLAW_MAX);
+  return (
+    !Number.isNaN(geMin) &&
+    !Number.isNaN(leMax) &&
+    geMin >= 0 &&
+    leMax <= 0
+  );
+}
+
+function resolveNpmInstalledPluginRoot() {
+  const stateDir = process.env.OPENCLAW_STATE_DIR || path.join(os.homedir(), ".openclaw");
+  const dir = path.join(stateDir, "npm", "node_modules", PLUGIN_SPEC);
+  try {
+    if (fs.existsSync(path.join(dir, "package.json"))) return dir;
+  } catch {}
+  return null;
+}
+
+/**
+ * Make ~/.openclaw/extensions/openclaw-weixin a symlink pointing to the
+ * npm-installed plugin root.  This lets host 5.2's CLI catalog (which scans
+ * the global extensions root) discover the plugin even though
+ * channel-catalog-registry forgets to forward installRecords to discovery.
+ */
+function ensurePluginExtSymlink(hostVersion) {
+  if (!hostVersionNeedsExtSymlink(hostVersion)) {
+    return;
+  }
+
+  const npmRoot = resolveNpmInstalledPluginRoot();
+  if (!npmRoot) {
+    return;
+  }
+
+  const linkPath = resolvePluginExtDir();
+  let linkDirReal;
+  try {
+    linkDirReal = fs.realpathSync(npmRoot);
+  } catch {
+    return;
+  }
+
+  // Already correct?
+  try {
+    const stat = fs.lstatSync(linkPath);
+    if (stat.isSymbolicLink()) {
+      const existingReal = fs.realpathSync(linkPath);
+      if (existingReal === linkDirReal) return;
+    }
+    fs.rmSync(linkPath, { recursive: true, force: true });
+  } catch {
+    // doesn't exist — fine
+  }
+
+  fs.mkdirSync(path.dirname(linkPath), { recursive: true });
+  try {
+    fs.symlinkSync(npmRoot, linkPath, "dir");
+    log(`已创建 symlink: extensions/${CHANNEL_ID} → ${npmRoot}`);
+  } catch (err) {
+    error(
+      `创建 extensions symlink 失败 (${err?.message ?? err})；CLI 可能仍会报 Unsupported channel。`,
+    );
+  }
+}
+
 // ── installed plugin detection ───────────────────────────────────────────────
 
 /**
@@ -217,7 +301,7 @@ function install() {
   }
 
   const pluginInstallSpec = `${PLUGIN_SPEC}@${compat.distTag}`;
-  log(`匹配兼容版本: ${compat.label} (dist-tag: ${compat.distTag})`);
+  log(`匹配 dist-tag: ${compat.distTag}`);
 
   // 3. If already installed with a different dist-tag, uninstall first
   //    so the fresh install picks up the correct dist-tag.
@@ -269,6 +353,11 @@ function install() {
   //    so jiti can resolve openclaw/plugin-sdk/* without a runtime dependency.
   ensureOpenclawSymlink(hostVersion);
 
+  // 5b. Symlink npm-installed plugin into ~/.openclaw/extensions/<id>
+  //     (2026.5.2 only) so the CLI catalog can discover this channel despite
+  //     the channel-catalog-registry installRecords bug.
+  ensurePluginExtSymlink(hostVersion);
+
   // 6. Login (interactive QR scan)
   log("插件就绪，开始首次连接...");
   try {
@@ -299,7 +388,9 @@ function help() {
 
   兼容矩阵:`);
   for (const e of COMPAT_MATRIX) {
-    console.log(`    ${e.label.padEnd(28)} OpenClaw ${formatRange(e.openclawRange)}`);
+    console.log(
+      `    ${e.distTag.padEnd(COMPAT_MATRIX_DIST_TAG_PAD)}  OpenClaw ${formatRange(e.openclawRange)}`,
+    );
   }
   console.log();
 }

package/lib/compat.mjs

@@ -10,13 +10,11 @@ export const COMPAT_MATRIX = [
     pluginMajor: 1,
     distTag: 'compat-host-gte2026.3.0-lt2026.3.22',
     openclawRange: { gte: '2026.3.0', lt: '2026.3.22' },
-    label: '1.0.x (兼容轨道: OpenClaw >=2026.3.0 <2026.3.22)',
   },
   {
     pluginMajor: 2,
     distTag: 'latest',
     openclawRange: { gte: '2026.3.22' },
-    label: '2.0.x (当前最新主线)',
   },
 ];
 

package/lib/version-check.mjs

@@ -73,7 +73,7 @@ export function assertHostCompat() {
 
   const supported = formatRange(entry.openclawRange);
   const suggestion = compat
-    ? `请安装 openclaw-weixin@${compat.distTag} (${compat.label})`
+    ? `请安装 openclaw-weixin@${compat.distTag}`
     : '请升级或降级 OpenClaw 宿主到受支持的版本';
 
   throw new Error(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tencent-weixin/openclaw-weixin-cli",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "Lightweight installer for the OpenClaw Weixin channel plugin",
   "license": "MIT",
   "author": "Tencent",