dlinkclaw-openclaw 2026.10.26 → 2026.10.27

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dlinkclaw-openclaw",
-    "version": "2026.10.26",
+    "version": "2026.10.27",
     "description": "DLinkClaw OpenClaw channel plugin — 朵联 OpenClaw 接入通道",
     "keywords": [
         "DLinkClaw",

package/dist/src/approval-native.d.ts

@@ -1 +1,12 @@
+/**
+ * 2026-10-29 dlink 原生审批投递能力。
+ * core 产生审批请求时交给插件，插件转发中继；发起人提示由客户端弹窗负责（不改写会话气泡）。
+ */
+type AnyObj = Record<string, any>;
 export declare function createDLApprovalCapability(): any;
+/**
+ * 2026-10-29 轮询路径入口：把审批推给中继。
+ * 发起人的等待审批提示由中继通知 + 客户端弹窗完成，这里不改写会话状态。
+ */
+export declare function announceWaiting(dlClient: any, payload: AnyObj): Promise<void>;
+export {};

package/dist/src/approval-native.js

@@ -16,7 +16,7 @@ function pickRequest(ctx) {
     return {
         approvalId: firstString(payload.approvalId, req.id, req.approvalId),
         kind: firstString(ctx?.approvalKind, req.kind, 'exec'),
-        agentId: firstString(req.agentId, view.agentId, req.sessionKey ? '' : ''),
+        agentId: firstString(req.agentId, view.agentId),
         sessionKey: firstString(req.sessionKey, view.sessionKey),
         command: firstString(payload.command, view.command, req.command, req.payload?.command),
         cwd: firstString(payload.cwd, view.cwd, req.cwd),
@@ -25,18 +25,11 @@ function pickRequest(ctx) {
 }
 export function createDLApprovalCapability() {
     return {
-        availability: {
-            // dlink 是唯一通道；账号已配置即可承接审批
-            isConfigured: () => true,
-            shouldHandle: () => true
-        },
+        availability: { isConfigured: () => true, shouldHandle: () => true },
         presentation: {
             buildPendingPayload: (ctx) => {
                 const info = pickRequest(ctx);
-                return {
-                    ...info,
-                    text: firstString(ctx?.view?.summary, info.command)
-                };
+                return { ...info, text: firstString(ctx?.view?.summary, info.command) };
             },
             buildResolvedResult: () => ({ kind: 'leave' }),
             buildExpiredResult: () => ({ kind: 'leave' })
@@ -65,10 +58,10 @@ export function createDLApprovalCapability() {
                         cwd: info.cwd,
                         expiresAtMs: info.expiresAtMs
                     });
-                    logger.info?.(`approval forwarded to relay: id=${info.approvalId} agent=${info.agentId} kind=${info.kind}`);
+                    logger.info?.('approval forwarded: id=' + info.approvalId + ' agent=' + info.agentId);
                 }
                 catch (e) {
-                    logger.warn?.(`approval forward failed: ${String(e)}`);
+                    logger.warn?.('approval forward failed: ' + String(e));
                 }
                 return { approvalId: info.approvalId, deliveredAt: Date.now() };
             },
@@ -78,3 +71,20 @@ export function createDLApprovalCapability() {
         interactions: {}
     };
 }
+/**
+ * 2026-10-29 轮询路径入口：把审批推给中继。
+ * 发起人的等待审批提示由中继通知 + 客户端弹窗完成，这里不改写会话状态。
+ */
+export async function announceWaiting(dlClient, payload) {
+    const logger = getDLLogger();
+    try {
+        const pushed = await dlClient.pushApprovalEvent(payload);
+        if (!pushed) {
+            await dlClient.publishEventToServer(payload, 'onApproval', '1');
+        }
+        logger.info?.('approval pushed: id=' + String(payload?.approvalId) + ' names=' + JSON.stringify(pushed?.approverNames ?? []));
+    }
+    catch (e) {
+        logger.warn?.('announceWaiting failed: ' + String(e));
+    }
+}

package/dist/src/client/message.js

@@ -4,6 +4,7 @@ import { createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
 import { buildChannelInboundEventContext } from "openclaw/plugin-sdk/channel-inbound";
 import { beginPersonaScope, endPersonaScope } from "../persona.js";
 import { uuidStr } from "../utils.js";
+import { rememberStream, forgetStream } from "../stream-map.js";
 /** 2026-10-18：只有包含复选框行(- [ ] / - [x] / - [/])的内容才算任务清单。 */
 function isTaskListContent(content) {
     return /(^|\n)\s*[-*]\s*\[[ xX/~%>]*\]\s*\S/.test(content);
@@ -993,6 +994,8 @@ export async function routeAndDispatchMessage(ctx) {
         // 2026-10-26 群聊人设作用域：分发期间绑定被 @ 的 agent，整轮（含工具循环）都能读到正确值
         // 2026-10-26 OpenClaw 的消息上下文字段名是 SessionKey（大写），兼容两种写法
         personaScopeKey = ((ctx.SessionKey ?? ctx.sessionKey) || '');
+        // 2026-10-29 记录 sessionKey → streamId，审批等待提示需要
+        rememberStream(personaScopeKey, streamId, accountId);
         logger.debug?.(`persona scope: session=${personaScopeKey} agent=${personaAgentId ?? '-'}`);
         if (personaAgentId) {
             beginPersonaScope(personaScopeKey, personaAgentId);
@@ -1039,6 +1042,7 @@ export async function routeAndDispatchMessage(ctx) {
                 },
                 onSettled: async () => {
                     endScopeOnce();
+                    forgetStream(personaScopeKey);
                     if ((accStatus.accumulatedPayload && accStatus.accumulatedPayload.length > 0) || mediaFiles.length > 0) {
                         //发送结束状态
                         await client.publishProcessingState({

package/dist/src/services/index.js

@@ -2,6 +2,7 @@
  * CMD 消息处理器
  * 集成到 duolian 的消息处理流程中
  */
+import { announceWaiting } from '../approval-native.js';
 import ClawServices from "./services.js";
 const AGENT_RELAY_MAP = new Map();
 // 2026-10-13 去重缓存（石头哥需求：更精准控制 + 减少不必要的 MQTT 推送）：
@@ -25,8 +26,8 @@ export class CmdHandler {
             // 2026-10-22：用量上报走服务端事件，由中继落库
             void this.dlClient.publishEventToServer(payload, 'onUsage', '1');
         }, (payload) => {
-            // 2026-10-27 审批待审推送：插件发现新条目即上报中继，中继再推审批人
-            void this.dlClient.publishEventToServer(payload, 'onApproval', '1');
+            // 2026-10-29 审批推送：优先走 HTTP（可拿到审批人姓名），失败退回 MQTT 事件
+            void announceWaiting(this.dlClient, payload);
         });
     }
     log(msg, type) {

package/dist/src/services/services.js

@@ -70,7 +70,7 @@ export class ClawServices extends EventEmitter {
                             continue;
                         }
                         this.approvalSeen.add(String(id));
-                        publish({
+                        const pushed = await publish({
                             approvalId: String(id),
                             kind,
                             agentId: item?.agentId ?? item?.request?.agentId ?? '',
@@ -80,6 +80,7 @@ export class ClawServices extends EventEmitter {
                             createdAtMs: item?.createdAtMs ?? 0,
                             expiresAtMs: item?.expiresAtMs ?? 0
                         });
+                        void pushed;
                     }
                 }
                 if (this.approvalSeen.size > 500) {

package/dist/src/stream-map.d.ts

@@ -0,0 +1,6 @@
+export declare function rememberStream(sessionKey: string, streamId: string, accountId: string): void;
+export declare function streamOf(sessionKey: string): {
+    streamId: string;
+    accountId: string;
+} | undefined;
+export declare function forgetStream(sessionKey: string): void;

package/dist/src/stream-map.js

@@ -0,0 +1,32 @@
+/**
+ * 2026-10-29 sessionKey → 当前运行 streamId 映射。
+ * 审批发生时只有 sessionKey，而推送处理状态需要 streamId。
+ */
+const map = new Map();
+const TTL_MS = 30 * 60 * 1000;
+export function rememberStream(sessionKey, streamId, accountId) {
+    if (!sessionKey || !streamId) {
+        return;
+    }
+    // 2026-10-29 sessionKey 大小写可能不一致，统一小写归一
+    map.set(sessionKey.toLowerCase(), { streamId, accountId, at: Date.now() });
+}
+export function streamOf(sessionKey) {
+    if (!sessionKey) {
+        return undefined;
+    }
+    const hit = map.get(sessionKey.toLowerCase());
+    if (!hit) {
+        return undefined;
+    }
+    if (Date.now() - hit.at > TTL_MS) {
+        map.delete(sessionKey.toLowerCase());
+        return undefined;
+    }
+    return { streamId: hit.streamId, accountId: hit.accountId };
+}
+export function forgetStream(sessionKey) {
+    if (sessionKey) {
+        map.delete(sessionKey.toLowerCase());
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dlinkclaw-openclaw",
-  "version": "2026.10.26",
+  "version": "2026.10.27",
   "description": "DLinkClaw OpenClaw channel plugin — 朵联 OpenClaw 接入通道",
   "keywords": [
     "DLinkClaw",