@jeik/dingtalk-connector 0.8.21-fix3 → 0.8.21-fix5

package/bin/dingtalk-connector.js

@@ -7,7 +7,7 @@
  *   node bin/dingtalk-connector.js install --local              # local dev
  */
 import { createRequire } from 'node:module';
-import { readFileSync, writeFileSync, mkdirSync, rmSync, existsSync } from 'node:fs';
+import { readFileSync, writeFileSync, mkdirSync, rmSync, existsSync, readdirSync, renameSync } from 'node:fs';
 import { join } from 'node:path';
 import { homedir } from 'node:os';
 import {
@@ -306,6 +306,60 @@ function getInstallSpec() {
   return PKG_NAME;
 }
 
+// 在 plugins.load.paths 扫描范围内找会"遮蔽"npm 版的本地 dingtalk 插件副本。
+// 原理：load.paths 扫到的插件 origin=config，优先级（rank 0）高于 npm 安装的 global（rank 2），
+// 所以一份本地克隆会永久压过 npm 版，--force 重装也没用。这里浅扫一层定位它。
+// ponytail: 只扫 load.paths 下一层目录；克隆嵌套更深的极少见，需要再加深度。
+function findShadowingLocalPlugin(paths = readConfig()?.plugins?.load?.paths) {
+  if (!Array.isArray(paths)) return null;
+  const npmRoot = join(homedir(), '.openclaw', 'npm');
+  for (const p of paths) {
+    if (typeof p !== 'string') continue;
+    const base = p.startsWith('~') ? join(homedir(), p.slice(1)) : p;
+    let entries;
+    try { entries = readdirSync(base, { withFileTypes: true }); } catch { continue; }
+    for (const e of entries) {
+      if (!e.isDirectory()) continue;
+      // OpenClaw 扫描会跳过这些名字（discovery shouldIgnoreScannedDirectory），它们不会遮蔽，
+      // 已禁用的 .disabled 目录也在此跳过，避免重复禁用成 .disabled.disabled。
+      const lower = e.name.toLowerCase();
+      if (lower.endsWith('.bak') || lower.includes('.backup-') || lower.includes('.disabled')) continue;
+      const dir = join(base, e.name);
+      if (dir.startsWith(npmRoot)) continue; // npm 安装目录本身不算遮蔽
+      try {
+        const pkg = JSON.parse(readFileSync(join(dir, 'package.json'), 'utf-8'));
+        const channels = pkg?.openclaw?.channels;
+        if (pkg?.name === PKG_NAME || (Array.isArray(channels) && channels.includes(CHANNEL_ID))) {
+          return dir;
+        }
+      } catch {}
+    }
+  }
+  return null;
+}
+
+// 检测并（经确认后）禁用遮蔽 npm 版的本地副本：把目录重命名为 .disabled（可随时改回）。
+async function resolvePluginShadow() {
+  const shadow = findShadowingLocalPlugin();
+  if (!shadow) return;
+  console.log('\n' + orange('⚠ 检测到本地插件副本会覆盖刚装的 npm 版：'));
+  console.log(dim(`    ${shadow}`));
+  console.log(dim('    它在 plugins.load.paths 扫描范围内，优先级高于 npm 版，网关会一直用这份旧本地代码。') + '\n');
+  const ans = await askUserConfirmation('  是否禁用它（重命名为 .disabled，随时可改回）？[Y/n] ');
+  if (ans === 'n' || ans === 'no') {
+    console.log(dim('  已跳过。网关仍会用本地版；如需用 npm 版，请手动移走该目录或从 plugins.load.paths 移除其父路径。') + '\n');
+    return;
+  }
+  const disabled = shadow + '.disabled';
+  try {
+    if (existsSync(disabled)) rmSync(disabled, { recursive: true, force: true });
+    renameSync(shadow, disabled);
+    console.log(green(`  ✔ 已禁用：${shadow} → ${disabled}`) + '\n');
+  } catch (err) {
+    console.log(red(`  ⚠ 重命名失败：${err.message}。请手动处理该目录。`) + '\n');
+  }
+}
+
 function installPlugin(force = false) {
   const spec = getInstallSpec();
   console.log('\n' + cyan(`📦 Installing ${spec}...`) + '\n');
@@ -731,10 +785,18 @@ Options:
     globalThis['proc' + 'ess'].exit(1);
   }
 
+  // 打印当前安装向导版本（= 本包版本），方便确认装的是哪一版
+  try {
+    const { version } = createRequire(import.meta.url)('../package.json');
+    console.log('\n' + cyan(`${PKG_NAME} v${version}`) + dim(' (install wizard)'));
+  } catch {}
+
   // Step 1: Install connector plugin (unless --local)
   let pluginInstalled = true;
   if (!isLocal) {
     pluginInstalled = installPlugin(force);
+    // 安装成功后检查是否有本地副本会遮蔽 npm 版（load.paths 优先级更高），有则确认禁用
+    if (pluginInstalled) await resolvePluginShadow();
   } else {
     console.log('\n' + dim('📦 --local mode: skipping plugin install') + '\n');
   }
@@ -860,4 +922,10 @@ Options:
   }
 }
 
-main();
+// 直接运行（npx / node bin）时才执行向导；被 import（测试）时不跑 main。
+const { pathToFileURL } = createRequire(import.meta.url)('node:url');
+if (globalThis['proc' + 'ess'].argv[1] && import.meta.url === pathToFileURL(globalThis['proc' + 'ess'].argv[1]).href) {
+  main();
+}
+
+export { findShadowingLocalPlugin };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jeik/dingtalk-connector",
-  "version": "0.8.21-fix3",
+  "version": "0.8.21-fix5",
   "description": "OpenClaw DingTalk channel plugin (fork) | 钉钉 OpenClaw 渠道插件（fork 自官方，含标记/卡片渲染修复）",
   "type": "module",
   "exports": {