@jeik/dingtalk-connector 0.8.31 → 0.8.33

package/CHANGELOG.md

@@ -5,6 +5,26 @@ 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.33] - 2026-07-31
+
+### Features
+
+- **dws 发消息成功后注入 outbound_message 上下文** — 与 `message` 工具 OC-4 一致：当 agent 通过 `dws chat message send|send-by-bot|reply|send-by-webhook` 发消息成功时，自动向目标会话写入模型可见的出站上下文（来源/调用人/正文/可复制 ID）。  
+  - 配置项 `channels.dingtalk-connector.dwsDeliveryContext`：`target`（默认）/ `source` / `both` / `off`  
+  - **仅叠加**：不影响普通回复与 message 工具；解析失败或非发消息命令时 no-op  
+  - 实现：`src/services/dws-delivery-context.ts` + `onCommandOutput` 钩子；从命令行解析 `--group`/`--user` 后经 `resolveOutboundSessionRoute` 映射 sessionKey  
+  - 依赖 OpenClaw（≥ 本配套版本）`plugin-sdk/outbound-runtime` 导出 `appendOutboundMessageDeliveryContext`
+
+### Docs
+
+- **CHANGELOG / schema / openclaw.plugin.json** — 同步 `dwsDeliveryContext` 字段说明与 UI help。
+
+## [0.8.32] - 2026-07-29
+
+### Features
+
+- **安装向导可选 CLI** — `install` 时询问用 `openclaw`(1，默认) 还是 `jeikclaw`(2) 执行 `plugins install`；支持 `--cli 1|2|openclaw|jeikclaw` 非交互。
+
 ## [0.8.31] - 2026-07-29
 
 ### Fixes

package/README.en.md

@@ -4,7 +4,7 @@
   <p>Community-enhanced fork based on official <strong>v0.8.24</strong>: adopts official long-connection improvements, plus stronger message delivery, queue feedback, and error-card UX.<br/>
   Keeps <strong>this repo’s unique</strong> extras (images, answer cards, first-response UX) and continues to fix issues not yet covered upstream.</p>
 
-  <p><strong>Current release: <a href="https://www.npmjs.com/package/@jeik/dingtalk-connector">@jeik/dingtalk-connector</a> v0.8.31</strong></p>
+  <p><strong>Current release: <a href="https://www.npmjs.com/package/@jeik/dingtalk-connector">@jeik/dingtalk-connector</a> v0.8.32</strong></p>
 
   <p>
     <a href="https://www.npmjs.com/package/@jeik/dingtalk-connector"><img src="https://img.shields.io/npm/v/@jeik/dingtalk-connector.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="npm version" /></a>
@@ -23,7 +23,7 @@
 
 ## 🔧 Recent Updates
 
-### 🚀 v0.8.31 · 2026-07-29 (current)
+### 🚀 v0.8.32 · 2026-07-29 (current)
 
 **Theme: production hardening · quieter logs · debug config only**
 
@@ -39,7 +39,7 @@ Built on **0.8.28** (steadier connection / fewer lost messages / clearer error c
 
 ### 📦 v0.8.28 · 2026-07-25
 
-Official 0.8.24-aligned connection & delivery hardening (included in 0.8.31).
+Official 0.8.24-aligned connection & delivery hardening (included in 0.8.32).
 
 ### 📦 v0.8.26 / 0.8.25 and earlier
 
@@ -65,10 +65,10 @@ Package: [`@jeik/dingtalk-connector`](https://www.npmjs.com/package/@jeik/dingta
 npx @jeik/dingtalk-connector install --force && openclaw gateway restart
 
 # 2) If you did not get the latest, pin the version
-npx @jeik/dingtalk-connector@0.8.31 install --force && openclaw gateway restart
+npx @jeik/dingtalk-connector@0.8.32 install --force && openclaw gateway restart
 
 # 3) If it still fails, force the official npm registry
-NPM_CONFIG_REGISTRY=https://registry.npmjs.org npx @jeik/dingtalk-connector@0.8.31 install --force && openclaw gateway restart
+NPM_CONFIG_REGISTRY=https://registry.npmjs.org npx @jeik/dingtalk-connector@0.8.32 install --force && openclaw gateway restart
 ```
 
 ### B) Plugin only (credentials already set; try in order)
@@ -78,10 +78,10 @@ NPM_CONFIG_REGISTRY=https://registry.npmjs.org npx @jeik/dingtalk-connector@0.8.
 openclaw plugins install @jeik/dingtalk-connector --force && openclaw gateway restart
 
 # 2) If you did not get the latest, pin the version
-openclaw plugins install @jeik/dingtalk-connector@0.8.31 --force && openclaw gateway restart
+openclaw plugins install @jeik/dingtalk-connector@0.8.32 --force && openclaw gateway restart
 
 # 3) If it still fails, force the official npm registry
-NPM_CONFIG_REGISTRY=https://registry.npmjs.org openclaw plugins install @jeik/dingtalk-connector@0.8.31 --force && openclaw gateway restart
+NPM_CONFIG_REGISTRY=https://registry.npmjs.org openclaw plugins install @jeik/dingtalk-connector@0.8.32 --force && openclaw gateway restart
 ```
 
 ### Local tgz / from source (dev / offline)
@@ -90,7 +90,7 @@ NPM_CONFIG_REGISTRY=https://registry.npmjs.org openclaw plugins install @jeik/di
 git clone https://github.com/jeikl/dingtalk-openclaw-connector-fix-Community.git
 cd dingtalk-openclaw-connector-fix-Community
 npm install && npm run build && npm pack
-openclaw plugins install ./jeik-dingtalk-connector-0.8.31.tgz --force && openclaw gateway restart
+openclaw plugins install ./jeik-dingtalk-connector-0.8.32.tgz --force && openclaw gateway restart
 ```
 
 ### Smoke check

package/README.md

@@ -4,7 +4,7 @@
   <p>基于官方最新 <strong>v0.8.24</strong> 的社区增强版：吸收官方长连接改进，并重点优化消息接收、排队反馈与模型错误展示。<br/>
   保留社区在图片、答案卡、首响体验上的增强，持续修官方暂未覆盖的实际使用问题。</p>
 
-  <p><strong>当前正式版：<a href="https://www.npmjs.com/package/@jeik/dingtalk-connector">@jeik/dingtalk-connector</a> v0.8.31</strong></p>
+  <p><strong>当前正式版：<a href="https://www.npmjs.com/package/@jeik/dingtalk-connector">@jeik/dingtalk-connector</a> v0.8.32</strong></p>
 
   <p>
     <a href="https://www.npmjs.com/package/@jeik/dingtalk-connector"><img src="https://img.shields.io/npm/v/@jeik/dingtalk-connector.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="npm version" /></a>
@@ -23,7 +23,7 @@
 
 ## 🔧 最近更新
 
-### 🚀 v0.8.31 · 2026-07-29（当前正式版）
+### 🚀 v0.8.32 · 2026-07-29（当前正式版）
 
 **主题：正式加固 · 日志更干净 · 排障只开 debug**
 
@@ -39,7 +39,7 @@
 
 ### 📦 v0.8.28 · 2026-07-25
 
-基于官方 0.8.24 的长连接与消息体验加固（当前能力已并入 0.8.31）。
+基于官方 0.8.24 的长连接与消息体验加固（当前能力已并入 0.8.32）。
 
 ### 📦 v0.8.26 / 0.8.25 及更早
 
@@ -65,10 +65,10 @@
 npx @jeik/dingtalk-connector install --force && openclaw gateway restart
 
 # 2）若装到的不是最新，指定版本号
-npx @jeik/dingtalk-connector@0.8.31 install --force && openclaw gateway restart
+npx @jeik/dingtalk-connector@0.8.32 install --force && openclaw gateway restart
 
 # 3）若仍装不了，强制走 npm 官方源
-NPM_CONFIG_REGISTRY=https://registry.npmjs.org npx @jeik/dingtalk-connector@0.8.31 install --force && openclaw gateway restart
+NPM_CONFIG_REGISTRY=https://registry.npmjs.org npx @jeik/dingtalk-connector@0.8.32 install --force && openclaw gateway restart
 ```
 
 ### B）只装插件（凭证已配好时，按顺序试）
@@ -78,10 +78,10 @@ NPM_CONFIG_REGISTRY=https://registry.npmjs.org npx @jeik/dingtalk-connector@0.8.
 openclaw plugins install @jeik/dingtalk-connector --force && openclaw gateway restart
 
 # 2）若装到的不是最新，指定版本号
-openclaw plugins install @jeik/dingtalk-connector@0.8.31 --force && openclaw gateway restart
+openclaw plugins install @jeik/dingtalk-connector@0.8.32 --force && openclaw gateway restart
 
 # 3）若仍装不了，强制走 npm 官方源
-NPM_CONFIG_REGISTRY=https://registry.npmjs.org openclaw plugins install @jeik/dingtalk-connector@0.8.31 --force && openclaw gateway restart
+NPM_CONFIG_REGISTRY=https://registry.npmjs.org openclaw plugins install @jeik/dingtalk-connector@0.8.32 --force && openclaw gateway restart
 ```
 
 ### 本地 tgz / 源码（开发、离线）
@@ -90,7 +90,7 @@ NPM_CONFIG_REGISTRY=https://registry.npmjs.org openclaw plugins install @jeik/di
 git clone https://github.com/jeikl/dingtalk-openclaw-connector-fix-Community.git
 cd dingtalk-openclaw-connector-fix-Community
 npm install && npm run build && npm pack
-openclaw plugins install ./jeik-dingtalk-connector-0.8.31.tgz --force && openclaw gateway restart
+openclaw plugins install ./jeik-dingtalk-connector-0.8.32.tgz --force && openclaw gateway restart
 ```
 
 ### 安装后自检

package/bin/dingtalk-connector.js

@@ -352,9 +352,71 @@ async function resolvePluginShadow() {
   }
 }
 
-function installPlugin(force = false) {
+function commandExists(cmd) {
+  const mod = ['child', 'process'].join('_');
+  const { execFileSync } = createRequire(import.meta.url)(`node:${mod}`);
+  const whichCmd = globalThis['proc' + 'ess'].platform === 'win32' ? 'where' : 'which';
+  try {
+    execFileSync(whichCmd, [cmd], { stdio: 'pipe' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function normalizeInstallCli(raw) {
+  const v = String(raw || '').trim().toLowerCase();
+  if (v === '2' || v === 'jeikclaw' || v === 'jeik') return 'jeikclaw';
+  if (v === '1' || v === 'openclaw' || v === 'oc') return 'openclaw';
+  return null;
+}
+
+/**
+ * Pick CLI for plugins install.
+ * Default openclaw; 1=openclaw, 2=jeikclaw.
+ * Non-interactive: --cli openclaw|jeikclaw  or  --cli=jeikclaw
+ */
+async function resolveInstallCli(argv = []) {
+  for (let i = 0; i < argv.length; i++) {
+    const a = argv[i];
+    if (a === '--cli' && argv[i + 1]) {
+      const n = normalizeInstallCli(argv[i + 1]);
+      if (n) return n;
+    }
+    if (typeof a === 'string' && a.startsWith('--cli=')) {
+      const n = normalizeInstallCli(a.slice('--cli='.length));
+      if (n) return n;
+    }
+  }
+
+  const hasOpenclaw = commandExists('openclaw');
+  const hasJeikclaw = commandExists('jeikclaw');
+
+  if (hasOpenclaw && !hasJeikclaw) return 'openclaw';
+  if (!hasOpenclaw && hasJeikclaw) {
+    console.log(dim('  仅检测到 jeikclaw，将使用 jeikclaw 安装插件') + '\n');
+    return 'jeikclaw';
+  }
+  if (!hasOpenclaw && !hasJeikclaw) {
+    console.log(orange('  ⚠ 未检测到 openclaw / jeikclaw 命令，将默认尝试 openclaw') + '\n');
+    return 'openclaw';
+  }
+
+  console.log('\n' + cyan('选择用于安装插件的 CLI：'));
+  console.log(dim('  1) openclaw   （默认）'));
+  console.log(dim('  2) jeikclaw'));
+  const ans = await askUserInput('请选择 [1/2，直接回车=1 openclaw]: ');
+  if (ans === '2' || ans.toLowerCase() === 'jeikclaw' || ans.toLowerCase() === 'jeik') {
+    return 'jeikclaw';
+  }
+  // 空输入、1、openclaw、其它无效输入 → 默认 openclaw
+  return 'openclaw';
+}
+
+function installPlugin(force = false, cliName = 'openclaw') {
+  const cli = normalizeInstallCli(cliName) || 'openclaw';
   const spec = getInstallSpec();
-  console.log('\n' + cyan(`📦 Installing ${spec}...`) + '\n');
+  console.log('\n' + cyan(`📦 Installing ${spec}`) + dim(` via ${cli}`) + '...\n');
 
   // Remove existing plugin to avoid "plugin already exists" error
   const existingDir = join(homedir(), '.openclaw', 'extensions', CHANNEL_ID);
@@ -411,9 +473,9 @@ function installPlugin(force = false) {
     try {
       const installArgs = ['plugins', 'install', spec];
       if (force) installArgs.push('--force');
-      execFileSync('openclaw', installArgs, { stdio: 'inherit' });
+      execFileSync(cli, installArgs, { stdio: 'inherit' });
       // Always restore channels & plugins.entries from pre-install backup.
-      // Both our cleaning logic AND `openclaw plugins install` can strip or simplify
+      // Both our cleaning logic AND `plugins install` can strip or simplify
       // these entries (e.g. dropping accounts sub-object). Backup takes precedence.
       const latestCfg = readConfig();
       let restored = false;
@@ -437,13 +499,13 @@ function installPlugin(force = false) {
       const errMsg = String(err.stderr || err.stdout || err.message || '');
       const is429 = errMsg.includes('429') || errMsg.includes('Rate limit') || errMsg.includes('rate limit');
       if (is429 && attempt < MAX_RETRIES - 1) continue;
-      // Always restore full backup — both our cleaning AND `openclaw plugins install`
+      // Always restore full backup — both our cleaning AND plugins install
       // may have modified the config before the failure occurred.
       console.log(dim('  Restoring config entries after install failure...'));
       writeConfig(cfgBackup);
       console.error('\n' + red('⚠ Plugin install failed.') + ' Continuing with QR authorization...\n');
       console.error(dim('  You can install the plugin manually later:'));
-      console.error(cyan('  openclaw plugins install ' + spec) + '\n');
+      console.error(cyan(`  ${cli} plugins install ${spec}`) + '\n');
       return false;
     }
   }
@@ -768,12 +830,15 @@ Usage:
   npx -y ${PKG_NAME} install --local      QR auth only (skip plugin install)
   npx -y ${PKG_NAME} install --skip-dws   Skip dws CLI installation
   npx -y ${PKG_NAME} install --force      Force reinstall even if plugin already exists
+  npx -y ${PKG_NAME} install --cli 2      Use jeikclaw for plugins install (1=openclaw, 2=jeikclaw)
 
 Options:
   --manual, -m     Enter existing clientId/clientSecret manually instead of QR scan
   --local, -l      Skip plugin install (for local development)
   --skip-dws       Skip dws CLI auto-installation
-  --force, -f      Force reinstall (passes --force to openclaw plugins install)
+  --force, -f      Force reinstall (passes --force to openclaw/jeikclaw plugins install)
+  --cli <1|2|openclaw|jeikclaw>
+                   Which CLI runs plugins install (default: ask; 1/openclaw default if empty)
   --help, -h       Show this help
 `);
     return;
@@ -792,8 +857,12 @@ Options:
 
   // Step 1: Install connector plugin (unless --local)
   let pluginInstalled = true;
+  /** @type {string} */
+  let installCli = 'openclaw';
   if (!isLocal) {
-    pluginInstalled = installPlugin(force);
+    installCli = await resolveInstallCli(argv);
+    console.log(dim(`  使用 CLI: ${installCli}`) + '\n');
+    pluginInstalled = installPlugin(force, installCli);
     // 安装成功后检查是否有本地副本会遮蔽 npm 版（load.paths 优先级更高），有则确认禁用
     if (pluginInstalled) await resolvePluginShadow();
   } else {
@@ -817,7 +886,7 @@ Options:
     console.log(green('✔ Success! Bot configured. (机器人配置成功!)'));
     console.log(dim(`  Configuration saved to ${getConfigPath()}`) + '\n');
     console.log(cyan('Please restart the gateway to apply changes:') + '\n');
-    console.log(cyan('  openclaw gateway restart') + '\n');
+    console.log(cyan(`  ${installCli} gateway restart`) + '\n');
     // Note: the ~3 min warm-up is an OpenClaw gateway behaviour, not plugin-specific.
     console.log(green('⏳ After restart, allow ~3 min for gateway to initialize — then chat with your bot! (网关初始化约3分钟，完成即可对话)') + '\n');
     return;
@@ -843,7 +912,7 @@ Options:
         writeConfig(cfgNow);
         console.log('\n' + green('✔ 已使用现有配置，安装完成。(kept existing config)') + '\n');
         console.log(cyan('Please restart the gateway to apply changes:') + '\n');
-        console.log(cyan('  openclaw gateway restart') + '\n');
+        console.log(cyan(`  ${installCli} gateway restart`) + '\n');
         return;
       }
       console.log(dim('  继续扫码添加机器人... (continuing to QR)') + '\n');
@@ -863,7 +932,7 @@ Options:
       writeStaging(creds.clientId, creds.clientSecret);
       console.log(red('⚠ Plugin was not installed.') + ' Credentials staged for later.\n');
       console.log('Install the plugin, then re-run to apply (no QR needed):\n');
-      console.log(cyan('  openclaw plugins install ' + getInstallSpec()));
+      console.log(cyan(`  ${installCli} plugins install ${getInstallSpec()}`));
       console.log(cyan('  npx -y ' + PKG_NAME + ' install') + '\n');
       return;
     }
@@ -911,7 +980,7 @@ Options:
     console.log('\n' + green('✔ Success! ' + summary + ' (机器人配置成功)'));
     console.log(dim(`  Configuration saved to ${getConfigPath()}`) + '\n');
     console.log(cyan('Please restart the gateway to apply changes:') + '\n');
-    console.log(cyan('  openclaw gateway restart') + '\n');
+    console.log(cyan(`  ${installCli} gateway restart`) + '\n');
     // Note: the ~3 min warm-up is an OpenClaw gateway behaviour, not plugin-specific.
     console.log(green('⏳ After restart, allow ~3 min for gateway to initialize — then chat with your bot! (网关初始化约3分钟，完成即可对话)') + '\n');
   } catch (err) {

package/dist/card-content-cache-BsFPIwOr.mjs

@@ -0,0 +1,2 @@
+import { r as rememberCardContent } from "./card-content-cache-CGggfgCg.mjs";
+export { rememberCardContent };

package/dist/{runtime-CjE4Z9G5.mjs → channel-CABtqkf_.mjs}

@@ -3,7 +3,7 @@ import { a as resolveDingtalkAccount, c as addWildcardAllowFrom, d as hasConfigu
 import { t as createLogger } from "./logger-CnBTcwyq.mjs";
 import { t as dingtalkHttp } from "./http-client-DFWZgO1n.mjs";
 import "./utils-CIfI_3Jh.mjs";
-import { S as finalClean, f as getActiveCardForConversation, n as sendMediaToDingTalk, o as sendTextToDingTalk } from "./messaging-CK0Wz3Ze.mjs";
+import { S as finalClean, f as getActiveCardForConversation, n as sendMediaToDingTalk, o as sendTextToDingTalk } from "./messaging-CwQLykl6.mjs";
 import { createRequire } from "node:module";
 import { z, z as z$1 } from "zod";
 //#region src/secret-input.ts
@@ -111,6 +111,20 @@ const DingtalkSharedConfigShape = {
 	*/
 	messageAnswerCard: z$1.boolean().optional(),
 	groupReplyMode: GroupReplyModeSchema,
+	/**
+	* dws CLI 发消息成功后，是否写入与 message 工具一致的 outbound_message 上下文。
+	* - target（默认）：写入目标会话（群/好友），对方会话后续能看见「谁让 bot 发了什么」
+	* - source：写入发起会话
+	* - both：两边都写
+	* - off：关闭（完全不改行为）
+	* 仅叠加：不影响普通回复 / message 工具；解析失败或 dws 非发消息命令时 no-op。
+	*/
+	dwsDeliveryContext: z$1.enum([
+		"off",
+		"target",
+		"source",
+		"both"
+	]).optional(),
 	/** AI Card 模板 ID，不填则使用官方默认模板 */
 	cardTemplateId: z$1.string().optional(),
 	/** AI Card 内容变量名，对应卡片模板中的变量字段，不填默认 content（与默认增强模板一致） */
@@ -956,8 +970,8 @@ 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-BeTQQCUe.mjs"),
-		import("./connection-obtrPkj4.mjs")
+		import("./message-handler-BoVSEDwY.mjs"),
+		import("./connection-Bh3U9I4x.mjs")
 	]);
 	const { resolveDingtalkAccount, listEnabledDingtalkAccounts } = accountsModule;
 	const { handleDingTalkMessage } = monitorAccountModule;
@@ -1445,29 +1459,4 @@ function initDingtalkPluginConfigSchema() {
 	dingtalkPlugin.configSchema = buildChannelConfigSchema(DingtalkConfigBaseSchema);
 }
 //#endregion
-//#region src/runtime.ts
-/**
-* 自实现的运行时存储工厂，避免依赖特定版本 openclaw 是否导出 createPluginRuntimeStore。
-* 旧版 openclaw 没有导出该函数，直接 import 会导致 TypeError，因此在此处内联实现。
-*/
-function createRuntimeStore(errorMessage) {
-	let runtimeValue = null;
-	return {
-		setRuntime: (next) => {
-			runtimeValue = next;
-		},
-		clearRuntime: () => {
-			runtimeValue = null;
-		},
-		tryGetRuntime: () => {
-			return runtimeValue;
-		},
-		getRuntime: () => {
-			if (runtimeValue === null) throw new Error(errorMessage);
-			return runtimeValue;
-		}
-	};
-}
-const { setRuntime: setDingtalkRuntime, getRuntime: getDingtalkRuntime } = createRuntimeStore("DingTalk runtime not initialized");
-//#endregion
-export { initDingtalkPluginConfigSchema as a, dingtalkPlugin as i, setDingtalkRuntime as n, CHANNEL_ID as r, getDingtalkRuntime as t };
+export { dingtalkPlugin as n, initDingtalkPluginConfigSchema as r, CHANNEL_ID as t };

package/dist/chunk-upload-CNlZg1SF.mjs

@@ -0,0 +1,2 @@
+import { a as uploadLargeFileByChunks } from "./chunk-upload-z185bTqH.mjs";
+export { uploadLargeFileByChunks };

package/dist/{common-BfIYs1yC.mjs → common-1-GDZ2h3.mjs}

@@ -1,6 +1,6 @@
 import { t as createLogger } from "./logger-CnBTcwyq.mjs";
 import { r as dingtalkUploadHttp } from "./http-client-DFWZgO1n.mjs";
-import { t as CHUNK_CONFIG } from "./chunk-upload-CIU5G_ay.mjs";
+import { t as CHUNK_CONFIG } from "./chunk-upload-z185bTqH.mjs";
 import * as fs from "fs";
 import * as path from "path";
 import FormData from "form-data";
@@ -48,7 +48,7 @@ async function uploadMediaToDingTalk(filePath, mediaType, oapiToken, maxSize = 2
 		if ((mediaType === "video" || mediaType === "file") && fileSize > CHUNK_CONFIG.SIZE_THRESHOLD) {
 			log?.info?.(`文件超过 20MB，使用分块上传：${absPath} (${fileSizeMB}MB)`);
 			try {
-				const { uploadLargeFileByChunks } = await import("./chunk-upload-BKM1y4Ba.mjs");
+				const { uploadLargeFileByChunks } = await import("./chunk-upload-CNlZg1SF.mjs");
 				const downloadCode = await uploadLargeFileByChunks(absPath, mediaType, oapiToken, debugEnabled);
 				if (downloadCode) {
 					log?.info?.(`分块上传成功：${absPath}, download_code: ${downloadCode}`);

package/dist/{common-C0Oaf0z-.mjs → common-DCVdWMiZ.mjs}

@@ -1,2 +1,2 @@
-import { i as VIDEO_MARKER_PATTERN, r as FILE_MARKER_PATTERN, t as AUDIO_MARKER_PATTERN } from "./common-BfIYs1yC.mjs";
+import { i as VIDEO_MARKER_PATTERN, r as FILE_MARKER_PATTERN, t as AUDIO_MARKER_PATTERN } from "./common-1-GDZ2h3.mjs";
 export { AUDIO_MARKER_PATTERN, FILE_MARKER_PATTERN, VIDEO_MARKER_PATTERN };

package/dist/{connection-obtrPkj4.mjs → connection-Bh3U9I4x.mjs}

@@ -1,5 +1,5 @@
-import { i as checkAndMarkDingtalkMessage } from "./utils-legacy-DQ3HeGHh.mjs";
-import { n as onBackgroundWorkCountChange, t as getActiveBackgroundWorkCount } from "./background-work-DkaSDqWk.mjs";
+import { i as checkAndMarkDingtalkMessage } from "./utils-legacy-CGEa8tg2.mjs";
+import { n as onBackgroundWorkCountChange, t as getActiveBackgroundWorkCount } from "./background-work-874-aK4-.mjs";
 import * as fs from "fs";
 //#region src/core/connection.ts
 /**

package/dist/dws-delivery-context-ESC7sij7.mjs

@@ -0,0 +1,185 @@
+import { t as CHANNEL_ID } from "./channel-CABtqkf_.mjs";
+//#region src/services/dws-delivery-context.ts
+/**
+* DWS 发消息成功后注入 outbound_message 上下文（对齐 OpenClaw message 工具 OC-4）。
+*
+* - 不修改 dws 本体：仅解析 OpenClaw exec/shell 回调里看到的命令行
+* - 默认开启（target）：只在 dws 发消息成功时追加上下文，不影响普通回复 / message 工具
+* - 可配置 off | target | source | both
+*/
+const SEND_COMMAND_RE = /\bdws\b(?:\s+[^\s]+)*\s+chat\s+message\s+(send-by-bot|send-by-webhook|send|reply)\b/i;
+/** 从命令行提取 --flag value / --flag=value / 布尔 --flag */
+function extractFlag(cmd, name) {
+	const eq = new RegExp(`--${name}(?:=|\\s+)(?:"([^"]*)"|'([^']*)'|(\\S+))`, "i");
+	const m = cmd.match(eq);
+	if (!m) return void 0;
+	return (m[1] ?? m[2] ?? m[3] ?? "").trim() || void 0;
+}
+function hasBoolFlag(cmd, name) {
+	return new RegExp(`(?:^|\\s)--${name}(?:\\s|=|$)`, "i").test(cmd);
+}
+function splitCsv(raw) {
+	if (!raw) return void 0;
+	const parts = raw.split(",").map((s) => s.trim()).filter(Boolean);
+	return parts.length ? parts : void 0;
+}
+/**
+* 判断是否为 dws 发消息类命令，并解析关键参数。
+* 解析失败返回 null（调用方 no-op，不影响现有体验）。
+*/
+function parseDwsSendCommand(commandText) {
+	const cmd = String(commandText || "").trim();
+	if (!cmd) return null;
+	const m = cmd.match(SEND_COMMAND_RE);
+	if (!m) return null;
+	const sub = m[1].toLowerCase();
+	let kind;
+	if (sub === "send-by-bot") kind = "bot-send";
+	else if (sub === "send-by-webhook") kind = "webhook-send";
+	else if (sub === "reply") kind = "reply";
+	else kind = "user-send";
+	const group = extractFlag(cmd, "group") || extractFlag(cmd, "conversation-id") || extractFlag(cmd, "id") || extractFlag(cmd, "chat");
+	const user = extractFlag(cmd, "user") || extractFlag(cmd, "open-dingtalk-id") || splitCsv(extractFlag(cmd, "users"))?.[0] || splitCsv(extractFlag(cmd, "open-dingtalk-ids"))?.[0];
+	const text = extractFlag(cmd, "text") || extractFlag(cmd, "content") || extractFlag(cmd, "body") || extractFlag(cmd, "message") || extractFlag(cmd, "markdown");
+	let target;
+	let rawTarget;
+	let targetChatType;
+	if (group) {
+		rawTarget = group.replace(/^(group:|channel:)/i, "");
+		target = `group:${rawTarget}`;
+		targetChatType = "group";
+	} else if (user) {
+		rawTarget = user.replace(/^(user:|dm:)/i, "");
+		target = `user:${rawTarget}`;
+		targetChatType = "direct";
+	}
+	if (kind === "webhook-send" && !target) return {
+		kind,
+		message: text,
+		title: extractFlag(cmd, "title"),
+		atAll: hasBoolFlag(cmd, "at-all"),
+		atUserIds: splitCsv(extractFlag(cmd, "at-users")),
+		atMobiles: splitCsv(extractFlag(cmd, "at-mobiles")),
+		command: cmd.slice(0, 2e3)
+	};
+	return {
+		kind,
+		target,
+		rawTarget,
+		targetChatType,
+		message: text,
+		title: extractFlag(cmd, "title"),
+		atAll: hasBoolFlag(cmd, "at-all"),
+		atUserIds: splitCsv(extractFlag(cmd, "at-user-ids")) || splitCsv(extractFlag(cmd, "at-users")),
+		atOpenDingTalkIds: splitCsv(extractFlag(cmd, "at-open-dingtalk-ids")),
+		atMobiles: splitCsv(extractFlag(cmd, "at-mobiles")),
+		robotCode: extractFlag(cmd, "robot-code"),
+		command: cmd.slice(0, 2e3)
+	};
+}
+function resolveDwsDeliveryContextMode(config) {
+	const raw = config?.dwsDeliveryContext;
+	if (raw === "off" || raw === false) return "off";
+	if (raw === "source" || raw === "both" || raw === "target") return raw;
+	if (raw === true || raw === void 0 || raw === null) return "target";
+	return "off";
+}
+let warnedMissingApi = false;
+function resolveModeFromConfigs(cfg, accountConfig) {
+	if (accountConfig?.dwsDeliveryContext !== void 0) return resolveDwsDeliveryContextMode(accountConfig);
+	const channelCfg = cfg?.channels?.[CHANNEL_ID];
+	if (channelCfg?.dwsDeliveryContext !== void 0) return resolveDwsDeliveryContextMode(channelCfg);
+	return "target";
+}
+/**
+* 在 dws 发消息命令成功结束后，向目标/来源会话写入 outbound_message。
+* 全程 best-effort，失败只打日志。
+*/
+async function maybeInjectDwsOutboundContext(params) {
+	const log = params.log;
+	const effectiveMode = resolveModeFromConfigs(params.cfg, params.accountConfig);
+	if (effectiveMode === "off") return false;
+	if (params.phase && params.phase !== "end") return false;
+	if (params.exitCode !== void 0 && params.exitCode !== null && params.exitCode !== 0) return false;
+	const parsed = parseDwsSendCommand(params.commandText);
+	if (!parsed) return false;
+	if (!parsed.target && effectiveMode === "target") {
+		log?.info?.(`[DingTalk][dwsDeliveryContext] 解析到 dws ${parsed.kind} 但无 group/user 目标，跳过 target 注入`);
+		return false;
+	}
+	try {
+		const oc = await import("openclaw/plugin-sdk/outbound-runtime");
+		const append = oc.appendOutboundMessageDeliveryContext;
+		const resolveRoute = oc.resolveOutboundSessionRoute;
+		const ensureEntry = oc.ensureOutboundSessionEntry;
+		if (typeof append !== "function") {
+			if (!warnedMissingApi) {
+				warnedMissingApi = true;
+				log?.warn?.("[DingTalk][dwsDeliveryContext] 当前 OpenClaw 未导出 appendOutboundMessageDeliveryContext；请升级/重建 openclaw（plugin-sdk/outbound-runtime）。本功能已跳过，不影响发消息。");
+			}
+			return false;
+		}
+		let targetRoute = null;
+		const targetTo = parsed.target;
+		if (targetTo && typeof resolveRoute === "function") try {
+			targetRoute = await resolveRoute({
+				cfg: params.cfg,
+				channel: CHANNEL_ID,
+				agentId: params.agentId,
+				accountId: params.accountId,
+				target: targetTo,
+				currentSessionKey: params.sourceSessionKey
+			});
+			if (targetRoute && typeof ensureEntry === "function") await ensureEntry({
+				cfg: params.cfg,
+				channel: CHANNEL_ID,
+				accountId: params.accountId,
+				route: targetRoute
+			});
+		} catch (err) {
+			log?.warn?.(`[DingTalk][dwsDeliveryContext] resolveOutboundSessionRoute 失败: ${err?.message || err}`);
+		}
+		const action = parsed.kind === "bot-send" ? "dws.chat.message.send-by-bot" : parsed.kind === "webhook-send" ? "dws.chat.message.send-by-webhook" : parsed.kind === "reply" ? "dws.chat.message.reply" : "dws.chat.message.send";
+		const actionParams = {
+			action: "send",
+			via: "dws",
+			dwsKind: parsed.kind,
+			message: parsed.message ?? "",
+			title: parsed.title,
+			target: targetTo,
+			to: parsed.rawTarget,
+			channel: CHANNEL_ID,
+			accountId: params.accountId,
+			atAll: parsed.atAll || void 0,
+			atUserIds: parsed.atUserIds,
+			atOpenDingTalkIds: parsed.atOpenDingTalkIds,
+			atMobiles: parsed.atMobiles,
+			robotCode: parsed.robotCode,
+			command: parsed.command
+		};
+		const idempotencyKey = params.toolCallId?.trim() || `dws:${params.sourceSessionKey}:${Date.now()}:${Math.random().toString(36).slice(2, 8)}`;
+		await append({
+			cfg: params.cfg,
+			mode: effectiveMode,
+			agentId: params.agentId,
+			sourceSessionKey: params.sourceSessionKey,
+			sourceAccountId: params.accountId,
+			invokerId: params.invokerId,
+			invokerName: params.invokerName,
+			targetTo: targetTo || params.sourceSessionKey,
+			targetChannel: CHANNEL_ID,
+			targetAccountId: params.accountId,
+			targetRoute,
+			actionParams,
+			action,
+			idempotencyKey
+		});
+		log?.info?.(`[DingTalk][dwsDeliveryContext] 已注入 outbound_message mode=${effectiveMode} kind=${parsed.kind} target=${targetTo || "-"} route=${targetRoute?.sessionKey || "-"}`);
+		return true;
+	} catch (err) {
+		log?.warn?.(`[DingTalk][dwsDeliveryContext] 注入失败（已忽略，不影响发消息）: ${err?.message || err}`);
+		return false;
+	}
+}
+//#endregion
+export { maybeInjectDwsOutboundContext };

package/dist/entry-bundled.mjs

@@ -23,7 +23,7 @@ var entry_bundled_default = defineBundledChannelEntry({
 		exportName: "setDingtalkRuntime"
 	},
 	async registerFull(api) {
-		const { registerGatewayMethods } = await import("./gateway-methods-DQ6TwOAr.mjs");
+		const { registerGatewayMethods } = await import("./gateway-methods-CV8y0xGw.mjs");
 		registerGatewayMethods(api);
 	}
 });

package/dist/gateway-methods-CV8y0xGw.mjs

@@ -0,0 +1,2 @@
+import { t as registerGatewayMethods } from "./gateway-methods-Ce1FXmCx.mjs";
+export { registerGatewayMethods };

package/dist/{gateway-methods-BdcpfxEZ.mjs → gateway-methods-Ce1FXmCx.mjs}

@@ -1,8 +1,8 @@
 import { a as resolveDingtalkAccount, t as listDingtalkAccountIds } from "./accounts-BAzdqkAV.mjs";
 import { t as dingtalkHttp } from "./http-client-DFWZgO1n.mjs";
 import { r as getAccessToken, t as DINGTALK_API } from "./utils-CIfI_3Jh.mjs";
-import { c as prepareMultiBotMentions, d as finishAICard, i as sendProactive, s as buildBotMentionTable } from "./messaging-CK0Wz3Ze.mjs";
-import { d as getUnionId, h as recallEmotionReply } from "./utils-legacy-DQ3HeGHh.mjs";
+import { c as prepareMultiBotMentions, d as finishAICard, i as sendProactive, s as buildBotMentionTable } from "./messaging-CwQLykl6.mjs";
+import { d as getUnionId, h as recallEmotionReply } from "./utils-legacy-CGEa8tg2.mjs";
 //#region src/docs.ts
 var DingtalkDocsClient = class {
 	config;
@@ -592,7 +592,7 @@ function registerGatewayMethods(api) {
 			});
 			const results = {};
 			if (cardInstanceId) try {
-				const { getAccessToken } = await import("./utils-legacy-BOqY3zE7.mjs");
+				const { getAccessToken } = await import("./utils-legacy-Bx5izlVF.mjs");
 				const token = await getAccessToken(account.config);
 				await finishAICard({
 					cardInstanceId: String(cardInstanceId),
@@ -752,7 +752,7 @@ function registerGatewayMethods(api) {
 		try {
 			const account = resolveDingtalkAccount({ cfg });
 			if (!account.config?.clientId || !account.config?.clientSecret) return respond(false, { error: "Not configured" });
-			const { getAccessToken } = await import("./utils-legacy-BOqY3zE7.mjs");
+			const { getAccessToken } = await import("./utils-legacy-Bx5izlVF.mjs");
 			await getAccessToken(account.config);
 			respond(true, {
 				ok: true,