@jeik/dingtalk-connector 0.8.34 → 0.8.36

package/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.8.35] - 2026-07-31
+
+### Fixes
+
+- **outbound-runtime 降级顺序明确为 openclaw → jeikclaw** — 包名 import、createRequire、全局 node_modules 均优先 `openclaw`，失败再试 `jeikclaw`；gateway 入口旁 filesystem 仅作最后兜底。
+
 ## [0.8.34] - 2026-07-31
 
 ### Fixes

package/dist/{channel-HfPzJGwO.mjs → channel-B56QFS9m.mjs}

@@ -970,7 +970,7 @@ async function monitorDingtalkProvider(opts = {}) {
 	const log = createLogger(cfg.channels?.["dingtalk-connector"]?.debug ?? false);
 	const [accountsModule, monitorAccountModule, monitorSingleModule] = await Promise.all([
 		import("./accounts-BQptOmgB.mjs"),
-		import("./message-handler-Dsyk414y.mjs"),
+		import("./message-handler-0LEoMD85.mjs"),
 		import("./connection-Bh3U9I4x.mjs")
 	]);
 	const { resolveDingtalkAccount, listEnabledDingtalkAccounts } = accountsModule;

package/dist/{dws-delivery-context-DLR1ghNQ.mjs → dws-delivery-context-ZJalcxYA.mjs}

@@ -1,4 +1,4 @@
-import { t as CHANNEL_ID } from "./channel-HfPzJGwO.mjs";
+import { t as CHANNEL_ID } from "./channel-B56QFS9m.mjs";
 //#region src/services/dws-delivery-context.ts
 /**
 * DWS 发消息成功后注入 outbound_message 上下文（对齐 OpenClaw message 工具 OC-4）。
@@ -103,80 +103,99 @@ function resolveModeFromConfigs(cfg, accountConfig) {
 	return "target";
 }
 /**
+* 尝试 import 一个候选并校验 append 导出。
+* 成功返回 API；失败返回 null（由调用方继续降级）。
+*/
+async function tryImportOutboundRuntime(id, errors) {
+	try {
+		const oc = await import(id);
+		if (typeof oc.appendOutboundMessageDeliveryContext !== "function") {
+			errors.push(`${id}: no appendOutboundMessageDeliveryContext`);
+			return null;
+		}
+		return {
+			append: oc.appendOutboundMessageDeliveryContext.bind(oc),
+			resolveRoute: typeof oc.resolveOutboundSessionRoute === "function" ? oc.resolveOutboundSessionRoute.bind(oc) : void 0,
+			ensureEntry: typeof oc.ensureOutboundSessionEntry === "function" ? oc.ensureOutboundSessionEntry.bind(oc) : void 0,
+			via: id
+		};
+	} catch (e) {
+		errors.push(`${id}: ${e?.message || e}`);
+		return null;
+	}
+}
+/**
 * 加载 OC-4 append API。
 *
-* 注意：钉钉插件装在 ~/.openclaw/npm/projects/... 下，Node 从插件路径
-* 解析不到名为 openclaw/jeikclaw 的 package（包名还可能是 jeikclaw）。
-* 必须用 gateway 进程入口（process.argv[1]）定位 dist/plugin-sdk。
+* 降级策略（严格优先 openclaw，导不进去再 jeikclaw）：
+*  1) 包名 import：openclaw/* → jeikclaw/*
+*  2) createRequire 从 gateway 入口 resolve 包：openclaw → jeikclaw
+*  3) 文件系统：gateway argv[1] 旁 dist/plugin-sdk（不区分包名，作最后兜底）
+*  4) 全局 node_modules：openclaw → jeikclaw
+*
+* 插件装在 ~/.openclaw/npm/projects/... 时，裸 import 包名常失败，
+* 因此 2/4 会用 gateway 入口 / 全局路径再试一遍。
 */
 async function loadOutboundRuntime() {
 	const { pathToFileURL } = await import("node:url");
 	const path = await import("node:path");
 	const fs = await import("node:fs");
 	const { createRequire } = await import("node:module");
-	const candidates = [
-		"openclaw/plugin-sdk/outbound-runtime",
-		"jeikclaw/plugin-sdk/outbound-runtime",
-		"jeikclaw/dist/plugin-sdk/outbound-runtime.js",
-		"openclaw/dist/plugin-sdk/outbound-runtime.js"
-	];
-	const pushIfExists = (filePath) => {
-		try {
-			if (filePath && fs.existsSync(filePath)) candidates.push(pathToFileURL(filePath).href);
-		} catch {}
+	const errors = [];
+	const seen = /* @__PURE__ */ new Set();
+	const tryOne = async (id) => {
+		if (!id || seen.has(id)) return null;
+		seen.add(id);
+		return tryImportOutboundRuntime(id, errors);
 	};
+	for (const pkg of ["openclaw", "jeikclaw"]) for (const sub of [`${pkg}/plugin-sdk/outbound-runtime`, `${pkg}/dist/plugin-sdk/outbound-runtime.js`]) {
+		const hit = await tryOne(sub);
+		if (hit) return hit;
+	}
 	const entry = typeof process.argv[1] === "string" ? process.argv[1] : "";
+	if (entry) try {
+		const req = createRequire(pathToFileURL(path.resolve(entry)).href);
+		for (const pkg of ["openclaw", "jeikclaw"]) try {
+			const pkgJson = req.resolve(`${pkg}/package.json`);
+			const root = path.dirname(pkgJson);
+			const file = path.join(root, "dist", "plugin-sdk", "outbound-runtime.js");
+			if (fs.existsSync(file)) {
+				const hit = await tryOne(pathToFileURL(file).href);
+				if (hit) return hit;
+			}
+		} catch {}
+	} catch {}
 	if (entry) {
 		const entryDir = path.dirname(path.resolve(entry));
-		pushIfExists(path.join(entryDir, "plugin-sdk", "outbound-runtime.js"));
-		pushIfExists(path.join(entryDir, "dist", "plugin-sdk", "outbound-runtime.js"));
+		const fileCandidates = [path.join(entryDir, "plugin-sdk", "outbound-runtime.js"), path.join(entryDir, "dist", "plugin-sdk", "outbound-runtime.js")];
 		let dir = entryDir;
 		for (let i = 0; i < 5; i++) {
-			const pkgJson = path.join(dir, "package.json");
-			if (fs.existsSync(pkgJson)) {
-				pushIfExists(path.join(dir, "dist", "plugin-sdk", "outbound-runtime.js"));
-				pushIfExists(path.join(dir, "plugin-sdk", "outbound-runtime.js"));
+			if (fs.existsSync(path.join(dir, "package.json"))) {
+				fileCandidates.push(path.join(dir, "dist", "plugin-sdk", "outbound-runtime.js"), path.join(dir, "plugin-sdk", "outbound-runtime.js"));
 				break;
 			}
 			const parent = path.dirname(dir);
 			if (parent === dir) break;
 			dir = parent;
 		}
-		try {
-			const req = createRequire(pathToFileURL(path.resolve(entry)).href);
-			for (const name of ["jeikclaw", "openclaw"]) try {
-				const pkgJson = req.resolve(`${name}/package.json`);
-				const root = path.dirname(pkgJson);
-				pushIfExists(path.join(root, "dist", "plugin-sdk", "outbound-runtime.js"));
-			} catch {}
-		} catch {}
+		for (const file of fileCandidates) if (fs.existsSync(file)) {
+			const hit = await tryOne(pathToFileURL(file).href);
+			if (hit) return hit;
+		}
 	}
 	try {
 		const execDir = path.dirname(process.execPath);
-		pushIfExists(path.join(execDir, "..", "lib", "node_modules", "jeikclaw", "dist", "plugin-sdk", "outbound-runtime.js"));
-		pushIfExists(path.join(execDir, "..", "lib", "node_modules", "openclaw", "dist", "plugin-sdk", "outbound-runtime.js"));
-	} catch {}
-	const errors = [];
-	const seen = /* @__PURE__ */ new Set();
-	for (const id of candidates) {
-		if (!id || seen.has(id)) continue;
-		seen.add(id);
-		try {
-			const oc = await import(id);
-			if (typeof oc.appendOutboundMessageDeliveryContext === "function") return {
-				append: oc.appendOutboundMessageDeliveryContext.bind(oc),
-				resolveRoute: typeof oc.resolveOutboundSessionRoute === "function" ? oc.resolveOutboundSessionRoute.bind(oc) : void 0,
-				ensureEntry: typeof oc.ensureOutboundSessionEntry === "function" ? oc.ensureOutboundSessionEntry.bind(oc) : void 0,
-				via: id
-			};
-			errors.push(`${id}: no append export`);
-		} catch (e) {
-			errors.push(`${id}: ${e?.message || e}`);
+		for (const pkg of ["openclaw", "jeikclaw"]) {
+			const file = path.join(execDir, "..", "lib", "node_modules", pkg, "dist", "plugin-sdk", "outbound-runtime.js");
+			if (fs.existsSync(file)) {
+				const hit = await tryOne(pathToFileURL(file).href);
+				if (hit) return hit;
+			}
 		}
-	}
+	} catch {}
 	if (!warnedMissingApi) {
 		warnedMissingApi = true;
-		alwaysLog("warn", `无法加载 outbound-runtime。argv1=${entry || "-"} tried=${seen.size} err=${errors.slice(0, 4).join(" | ")}`);
+		alwaysLog("warn", `无法加载 outbound-runtime（openclaw→jeikclaw 均失败）。argv1=${entry || "-"} tried=${seen.size} err=${errors.slice(0, 4).join(" | ")}`);
 	}
 	return null;
 }

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { n as dingtalkPlugin, r as initDingtalkPluginConfigSchema } from "./channel-HfPzJGwO.mjs";
+import { n as dingtalkPlugin, r as initDingtalkPluginConfigSchema } from "./channel-B56QFS9m.mjs";
 import { n as setDingtalkRuntime } from "./runtime-DDMzayvA.mjs";
 import { t as registerGatewayMethods } from "./gateway-methods-Ce1FXmCx.mjs";
 //#region index.ts

package/dist/{message-handler-Dsyk414y.mjs → message-handler-0LEoMD85.mjs}

@@ -1,5 +1,5 @@
 import { a as resolveDingtalkAccount } from "./accounts-BAzdqkAV.mjs";
-import { t as CHANNEL_ID } from "./channel-HfPzJGwO.mjs";
+import { t as CHANNEL_ID } from "./channel-B56QFS9m.mjs";
 import { n as createLoggerFromConfig, r as isDingtalkDebug } from "./logger-CnBTcwyq.mjs";
 import { t as dingtalkHttp } from "./http-client-DFWZgO1n.mjs";
 import { i as getOapiAccessToken } from "./utils-CIfI_3Jh.mjs";
@@ -1036,7 +1036,7 @@ function createDingtalkReplyDispatcher(params) {
 						payload.output,
 						commandText
 					].filter(Boolean).join("\n") || "";
-					if (/\bdws\b/i.test(fullCmd)) import("./dws-delivery-context-DLR1ghNQ.mjs").then(({ maybeInjectDwsOutboundContext }) => maybeInjectDwsOutboundContext({
+					if (/\bdws\b/i.test(fullCmd)) import("./dws-delivery-context-ZJalcxYA.mjs").then(({ maybeInjectDwsOutboundContext }) => maybeInjectDwsOutboundContext({
 						cfg,
 						accountConfig: account.config,
 						agentId,

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "dingtalk-connector",
   "name": "DingTalk Channel",
-  "version": "0.8.34",
+  "version": "0.8.36",
   "description": "OpenClaw DingTalk channel plugin (community) | 钉钉 OpenClaw 社区增强版",
   "author": "jeik",
   "main": "index.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jeik/dingtalk-connector",
-  "version": "0.8.34",
+  "version": "0.8.36",
   "description": "OpenClaw DingTalk channel plugin (community) | 钉钉 OpenClaw 社区增强版（基于官方 0.8.24，长连接与消息体验增强）",
   "type": "module",
   "exports": {

package/src/services/dws-delivery-context.ts

@@ -193,124 +193,163 @@ function resolveModeFromConfigs(cfg: any, accountConfig?: any): DwsDeliveryConte
   return "target";
 }
 
+type OutboundRuntimeApi = {
+  append: (p: any) => Promise<void>;
+  resolveRoute?: (p: any) => Promise<any>;
+  ensureEntry?: (p: any) => Promise<void>;
+  via: string;
+};
+
+/**
+ * 尝试 import 一个候选并校验 append 导出。
+ * 成功返回 API；失败返回 null（由调用方继续降级）。
+ */
+async function tryImportOutboundRuntime(
+  id: string,
+  errors: string[],
+): Promise<OutboundRuntimeApi | null> {
+  try {
+    const oc: any = await import(id);
+    if (typeof oc.appendOutboundMessageDeliveryContext !== "function") {
+      errors.push(`${id}: no appendOutboundMessageDeliveryContext`);
+      return null;
+    }
+    return {
+      append: oc.appendOutboundMessageDeliveryContext.bind(oc),
+      resolveRoute:
+        typeof oc.resolveOutboundSessionRoute === "function"
+          ? oc.resolveOutboundSessionRoute.bind(oc)
+          : undefined,
+      ensureEntry:
+        typeof oc.ensureOutboundSessionEntry === "function"
+          ? oc.ensureOutboundSessionEntry.bind(oc)
+          : undefined,
+      via: id,
+    };
+  } catch (e: any) {
+    errors.push(`${id}: ${e?.message || e}`);
+    return null;
+  }
+}
+
 /**
  * 加载 OC-4 append API。
  *
- * 注意：钉钉插件装在 ~/.openclaw/npm/projects/... 下，Node 从插件路径
- * 解析不到名为 openclaw/jeikclaw 的 package（包名还可能是 jeikclaw）。
- * 必须用 gateway 进程入口（process.argv[1]）定位 dist/plugin-sdk。
+ * 降级策略（严格优先 openclaw，导不进去再 jeikclaw）：
+ *  1) 包名 import：openclaw/* → jeikclaw/*
+ *  2) createRequire 从 gateway 入口 resolve 包：openclaw → jeikclaw
+ *  3) 文件系统：gateway argv[1] 旁 dist/plugin-sdk（不区分包名，作最后兜底）
+ *  4) 全局 node_modules：openclaw → jeikclaw
+ *
+ * 插件装在 ~/.openclaw/npm/projects/... 时，裸 import 包名常失败，
+ * 因此 2/4 会用 gateway 入口 / 全局路径再试一遍。
  */
-async function loadOutboundRuntime(): Promise<{
-  append?: (p: any) => Promise<void>;
-  resolveRoute?: (p: any) => Promise<any>;
-  ensureEntry?: (p: any) => Promise<void>;
-  via?: string;
-} | null> {
+async function loadOutboundRuntime(): Promise<OutboundRuntimeApi | null> {
   const { pathToFileURL } = await import("node:url");
   const path = await import("node:path");
   const fs = await import("node:fs");
   const { createRequire } = await import("node:module");
 
-  const candidates: string[] = [
-    "openclaw/plugin-sdk/outbound-runtime",
-    "jeikclaw/plugin-sdk/outbound-runtime",
-    "jeikclaw/dist/plugin-sdk/outbound-runtime.js",
-    "openclaw/dist/plugin-sdk/outbound-runtime.js",
-  ];
+  const errors: string[] = [];
+  const seen = new Set<string>();
+
+  const tryOne = async (id: string): Promise<OutboundRuntimeApi | null> => {
+    if (!id || seen.has(id)) return null;
+    seen.add(id);
+    return tryImportOutboundRuntime(id, errors);
+  };
+
+  // ── 1) 包名 import：openclaw 优先，失败再 jeikclaw ──
+  for (const pkg of ["openclaw", "jeikclaw"] as const) {
+    for (const sub of [
+      `${pkg}/plugin-sdk/outbound-runtime`,
+      `${pkg}/dist/plugin-sdk/outbound-runtime.js`,
+    ]) {
+      const hit = await tryOne(sub);
+      if (hit) return hit;
+    }
+  }
+
+  const entry = typeof process.argv[1] === "string" ? process.argv[1] : "";
 
-  const pushIfExists = (filePath: string) => {
+  // ── 2) 从 gateway 入口 createRequire：openclaw 优先，再 jeikclaw ──
+  if (entry) {
     try {
-      if (filePath && fs.existsSync(filePath)) {
-        candidates.push(pathToFileURL(filePath).href);
+      const req = createRequire(pathToFileURL(path.resolve(entry)).href);
+      for (const pkg of ["openclaw", "jeikclaw"] as const) {
+        try {
+          const pkgJson = req.resolve(`${pkg}/package.json`);
+          const root = path.dirname(pkgJson);
+          const file = path.join(root, "dist", "plugin-sdk", "outbound-runtime.js");
+          if (fs.existsSync(file)) {
+            const hit = await tryOne(pathToFileURL(file).href);
+            if (hit) return hit;
+          }
+        } catch {
+          /* 该包名 resolve 失败，试下一个 */
+        }
       }
     } catch {
       /* ignore */
     }
-  };
+  }
 
-  // gateway 入口通常是 .../jeikclaw/dist/index.js 或 openclaw.mjs
-  const entry = typeof process.argv[1] === "string" ? process.argv[1] : "";
+  // ── 3) 文件系统兜底：gateway 入口旁（运行中的就是这份 dist）──
   if (entry) {
     const entryDir = path.dirname(path.resolve(entry));
-    // .../dist/index.js → .../dist/plugin-sdk/outbound-runtime.js
-    pushIfExists(path.join(entryDir, "plugin-sdk", "outbound-runtime.js"));
-    // .../openclaw.mjs → .../dist/plugin-sdk/...
-    pushIfExists(path.join(entryDir, "dist", "plugin-sdk", "outbound-runtime.js"));
-    // 再向上找 package root
+    const fileCandidates = [
+      path.join(entryDir, "plugin-sdk", "outbound-runtime.js"),
+      path.join(entryDir, "dist", "plugin-sdk", "outbound-runtime.js"),
+    ];
     let dir = entryDir;
     for (let i = 0; i < 5; i++) {
-      const pkgJson = path.join(dir, "package.json");
-      if (fs.existsSync(pkgJson)) {
-        pushIfExists(path.join(dir, "dist", "plugin-sdk", "outbound-runtime.js"));
-        pushIfExists(path.join(dir, "plugin-sdk", "outbound-runtime.js"));
+      if (fs.existsSync(path.join(dir, "package.json"))) {
+        fileCandidates.push(
+          path.join(dir, "dist", "plugin-sdk", "outbound-runtime.js"),
+          path.join(dir, "plugin-sdk", "outbound-runtime.js"),
+        );
         break;
       }
       const parent = path.dirname(dir);
       if (parent === dir) break;
       dir = parent;
     }
-
-    // createRequire 从 gateway 入口解析 package 名
-    try {
-      const req = createRequire(pathToFileURL(path.resolve(entry)).href);
-      for (const name of ["jeikclaw", "openclaw"]) {
-        try {
-          const pkgJson = req.resolve(`${name}/package.json`);
-          const root = path.dirname(pkgJson);
-          pushIfExists(path.join(root, "dist", "plugin-sdk", "outbound-runtime.js"));
-        } catch {
-          /* ignore */
-        }
+    for (const file of fileCandidates) {
+      if (fs.existsSync(file)) {
+        const hit = await tryOne(pathToFileURL(file).href);
+        if (hit) return hit;
       }
-    } catch {
-      /* ignore */
     }
   }
 
-  // 也试 process.execPath 同级的全局 node_modules
+  // ── 4) 全局 node_modules：openclaw 优先，再 jeikclaw ──
   try {
     const execDir = path.dirname(process.execPath);
-    pushIfExists(
-      path.join(execDir, "..", "lib", "node_modules", "jeikclaw", "dist", "plugin-sdk", "outbound-runtime.js"),
-    );
-    pushIfExists(
-      path.join(execDir, "..", "lib", "node_modules", "openclaw", "dist", "plugin-sdk", "outbound-runtime.js"),
-    );
+    for (const pkg of ["openclaw", "jeikclaw"] as const) {
+      const file = path.join(
+        execDir,
+        "..",
+        "lib",
+        "node_modules",
+        pkg,
+        "dist",
+        "plugin-sdk",
+        "outbound-runtime.js",
+      );
+      if (fs.existsSync(file)) {
+        const hit = await tryOne(pathToFileURL(file).href);
+        if (hit) return hit;
+      }
+    }
   } catch {
     /* ignore */
   }
 
-  const errors: string[] = [];
-  const seen = new Set<string>();
-  for (const id of candidates) {
-    if (!id || seen.has(id)) continue;
-    seen.add(id);
-    try {
-      const oc: any = await import(id);
-      if (typeof oc.appendOutboundMessageDeliveryContext === "function") {
-        return {
-          append: oc.appendOutboundMessageDeliveryContext.bind(oc),
-          resolveRoute:
-            typeof oc.resolveOutboundSessionRoute === "function"
-              ? oc.resolveOutboundSessionRoute.bind(oc)
-              : undefined,
-          ensureEntry:
-            typeof oc.ensureOutboundSessionEntry === "function"
-              ? oc.ensureOutboundSessionEntry.bind(oc)
-              : undefined,
-          via: id,
-        };
-      }
-      errors.push(`${id}: no append export`);
-    } catch (e: any) {
-      errors.push(`${id}: ${e?.message || e}`);
-    }
-  }
   if (!warnedMissingApi) {
     warnedMissingApi = true;
     alwaysLog(
       "warn",
-      `无法加载 outbound-runtime。argv1=${entry || "-"} tried=${seen.size} err=${errors.slice(0, 4).join(" | ")}`,
+      `无法加载 outbound-runtime（openclaw→jeikclaw 均失败）。argv1=${entry || "-"} tried=${seen.size} err=${errors.slice(0, 4).join(" | ")}`,
     );
   }
   return null;