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

package/README.md

@@ -19,10 +19,10 @@ npx -y @tencent-weixin/openclaw-weixin-cli install
 
 ## 兼容矩阵
 
-| openclaw-weixin | 支持的 OpenClaw     | dist-tag | 说明       |
-|-----------------|---------------------|----------|------------|
-| 1.0.x           | >=2026.3.0 <2026.3.22 | `legacy` | 旧宿主维护线 |
-| 2.0.x           | >=2026.3.22            | `latest` | 新宿主线     |
+| 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`                              | 当前推荐主线         |
 
 > 从 2.0.0 开始，插件采用独立 semver 版本号，不再对齐宿主 OpenClaw 版本号。
 
@@ -34,11 +34,11 @@ npx -y @tencent-weixin/openclaw-weixin-cli install
 # 查看当前 OpenClaw 版本
 openclaw --version
 
-# 新宿主 (>=2026.3.22)：安装 latest 线
+# 当前推荐主线 (>=2026.3.22)
 openclaw plugins install @tencent/openclaw-weixin@latest
 
-# 旧宿主 (<2026.3.22)：安装 legacy 线
-openclaw plugins install @tencent/openclaw-weixin@legacy
+# 兼容轨道 (<2026.3.22)
+openclaw plugins install @tencent/openclaw-weixin@compat-host-gte2026.3.0-lt2026.3.22
 ```
 
 ## 运行时版本校验
@@ -49,7 +49,7 @@ openclaw plugins install @tencent/openclaw-weixin@legacy
 [openclaw-weixin] 宿主版本不兼容!
   当前 OpenClaw 版本: 2026.3.10
   当前插件支持范围:   >=2026.3.22
-  请安装 openclaw-weixin@legacy (1.0.x (旧宿主线))
+  请安装 openclaw-weixin@compat-host-gte2026.3.0-lt2026.3.22
   或运行: npx @tencent-weixin/openclaw-weixin-cli install (自动选择兼容版本)
 ```
 
@@ -68,46 +68,122 @@ openclaw --version
 npx -y @tencent-weixin/openclaw-weixin-cli install
 ```
 
-### 如何安装 legacy 线
+### 如何查看当前 openclaw 版本
 
 ```bash
-# 方式一：统一安装器（自动判断）
-npx -y @tencent-weixin/openclaw-weixin-cli install
+openclaw --version
+```
+
+## 发布策略
+
+### 本仓库（CLI installer）与插件仓库的关系
+
+本仓库发布的是 **CLI 安装器**（`openclaw-weixin-cli`），不是插件本身（`openclaw-weixin`）。
+
+- **插件仓库**：openclaw-weixin，通过各分支发布到不同的 npm dist-tag
+- **本仓库**：CLI 安装器，根据 `COMPAT_MATRIX` 自动选择正确的插件 dist-tag 来安装
+
+### 分支管理规则
 
-# 方式二：手动指定 dist-tag
-openclaw plugins install @tencent/openclaw-weixin@legacy
+内网和外网通过不同分支管理，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
 ```
 
-### 如何查看当前 openclaw 版本
+发布脚本会：
+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
-openclaw --version
+# ① 在 prerelease 分支上完成内网发布和验证
+
+# ② 合入主分支
+git checkout master
+git merge master-prerelease
+
+# ③ 在主分支上发布外网
+node scripts/publish.mjs external patch
 ```
 
-## 发布策略
+### 兼容轨道发版流程
 
-### dist-tag 说明
+当 openclaw 发布破坏兼容性的新版本时：
 
-| dist-tag | 对应版本线 | 说明 |
-|----------|-----------|------|
-| `latest` | 2.x       | 新宿主线，`npm install` / `openclaw plugins install` 默认安装 |
-| `legacy` | 1.x       | 旧宿主维护线，需显式指定 `@legacy` |
+#### 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
-# 发布新宿主线 (2.x)
-npm run publish:external:latest -- patch
-npm run publish:internal:latest -- patch
+# ① 更新 lib/compat.mjs 的 COMPAT_MATRIX
 
-# 发布旧宿主维护线 (1.x)
-npm run publish:external:legacy -- patch
-npm run publish:internal:legacy -- patch
+# ② 在 prerelease 分支上发布内网验证
+node scripts/publish.mjs internal minor
 
-# dry run 预检
-npm run publish:external:latest -- patch --dry-run
+# ③ 验证后合入主分支发外网
+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

package/cli.mjs

@@ -6,12 +6,20 @@ import path from "node:path";
 import os from "node:os";
 import {
   COMPAT_MATRIX,
+  compareVersions,
   findCompatEntry,
   formatRange,
 } from "./lib/compat.mjs";
 
 const PLUGIN_SPEC = "@tencent-weixin/openclaw-weixin";
 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";
+
+const LEGACY_TAG_ALIASES = {
+  legacy: "compat-host-gte2026.3.0-lt2026.3.22",
+};
 
 // ── helpers ──────────────────────────────────────────────────────────────────
 
@@ -110,7 +118,23 @@ function resolvePluginExtDir() {
  * openclaw package root. This lets jiti resolve openclaw/plugin-sdk/*
  * without openclaw being a runtime dependency.
  */
-function ensureOpenclawSymlink() {
+function hostVersionNeedsOpenclawSymlink(hostVersion) {
+  if (!hostVersion) return false;
+  const geMin = compareVersions(hostVersion, SYMLINK_OPENCLAW_MIN);
+  const leMax = compareVersions(hostVersion, SYMLINK_OPENCLAW_MAX);
+  return (
+    !Number.isNaN(geMin) &&
+    !Number.isNaN(leMax) &&
+    geMin >= 0 &&
+    leMax <= 0
+  );
+}
+
+function ensureOpenclawSymlink(hostVersion) {
+  if (!hostVersionNeedsOpenclawSymlink(hostVersion)) {
+    return;
+  }
+
   const hostRoot = resolveHostOpenclawRoot();
   if (!hostRoot) {
     error("无法定位宿主 openclaw 包根目录，跳过 symlink 创建");
@@ -130,7 +154,6 @@ function ensureOpenclawSymlink() {
   try {
     const existing = fs.readlinkSync(linkPath);
     if (fs.realpathSync(existing) === fs.realpathSync(hostRoot)) {
-      log("openclaw symlink 已存在且正确");
       return;
     }
     // Wrong target — remove and recreate
@@ -144,6 +167,30 @@ function ensureOpenclawSymlink() {
   log(`已创建 symlink: node_modules/openclaw → ${hostRoot}`);
 }
 
+// ── installed plugin detection ───────────────────────────────────────────────
+
+/**
+ * Read the openclaw config and return the dist-tag that was used to install
+ * the plugin.  OpenClaw stores `plugins.installs.<id>.spec` as the raw
+ * install spec (e.g. "@tencent/openclaw-weixin@latest").  We extract the
+ * trailing tag/version after the last "@".
+ * Returns the tag string, or null if not installed / unreadable.
+ */
+function getInstalledPluginTag() {
+  const stateDir = process.env.OPENCLAW_STATE_DIR || path.join(os.homedir(), ".openclaw");
+  const configPath = path.join(stateDir, "openclaw.json");
+  try {
+    const config = JSON.parse(fs.readFileSync(configPath, "utf-8"));
+    const spec = config?.plugins?.installs?.[CHANNEL_ID]?.spec;
+    if (!spec) return null;
+    const atIdx = spec.lastIndexOf("@");
+    const raw = atIdx > 0 ? spec.slice(atIdx + 1) : "latest";
+    return LEGACY_TAG_ALIASES[raw] || raw;
+  } catch {
+    return null;
+  }
+}
+
 // ── commands ─────────────────────────────────────────────────────────────────
 
 function install() {
@@ -172,7 +219,28 @@ function install() {
   const pluginInstallSpec = `${PLUGIN_SPEC}@${compat.distTag}`;
   log(`匹配兼容版本: ${compat.label} (dist-tag: ${compat.distTag})`);
 
-  // 3. Install plugin via openclaw
+  // 3. If already installed with a different dist-tag, uninstall first
+  //    so the fresh install picks up the correct dist-tag.
+  //    If the installed spec is a pinned version number, skip entirely.
+  const installedTag = getInstalledPluginTag();
+  if (installedTag !== null && /^\d+\.\d+\.\d+/.test(installedTag)) {
+    log(`本地已安装插件为固定版本 ${installedTag}，跳过升级`);
+    return;
+  }
+  if (installedTag !== null && installedTag !== compat.distTag) {
+    log(`本地已安装插件为 @${installedTag}，与目标 @${compat.distTag} 不一致，先卸载旧版本...`);
+    try {
+      run(`echo y | openclaw plugins uninstall "${CHANNEL_ID}"`);
+      log("旧版本已卸载");
+    } catch (uninstallErr) {
+      error("旧版本卸载失败，请手动执行：");
+      if (uninstallErr.stderr) console.error(uninstallErr.stderr);
+      console.log(`  openclaw plugins uninstall "${CHANNEL_ID}"`);
+      process.exit(1);
+    }
+  }
+
+  // 4. Install plugin via openclaw
   log(`正在安装插件 ${pluginInstallSpec}...`);
   try {
     const installOut = run(`openclaw plugins install "${pluginInstallSpec}"`);
@@ -197,11 +265,11 @@ function install() {
     }
   }
 
-  // 4. Symlink host openclaw into plugin's node_modules
+  // 5. Symlink host openclaw into plugin's node_modules (2026.3.22–2026.3.23 only)
   //    so jiti can resolve openclaw/plugin-sdk/* without a runtime dependency.
-  ensureOpenclawSymlink();
+  ensureOpenclawSymlink(hostVersion);
 
-  // 5. Login (interactive QR scan)
+  // 6. Login (interactive QR scan)
   log("插件就绪，开始首次连接...");
   try {
     run(`openclaw channels login --channel ${CHANNEL_ID}`, { silent: false });
@@ -211,7 +279,7 @@ function install() {
     console.log(`  openclaw channels login --channel ${CHANNEL_ID}`);
   }
 
-  // 6. Restart gateway so it picks up the new account
+  // 7. Restart gateway so it picks up the new account
   log("正在重启 OpenClaw Gateway...");
   try {
     run(`openclaw gateway restart`, { silent: false });

package/lib/compat.mjs

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

package/package.json

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