dlinkclaw-openclaw 2026.10.20 → 2026.10.22

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dlinkclaw-openclaw",
-    "version": "2026.10.20",
+    "version": "2026.10.22",
     "description": "DLinkClaw OpenClaw channel plugin — 朵联 OpenClaw 接入通道",
     "keywords": [
         "DLinkClaw",
@@ -92,5 +92,8 @@
     "homepage": "https://github.com/dlinkclaw/dlinkclaw-openclaw-channel#readme",
     "bugs": {
         "url": "https://github.com/dlinkclaw/dlinkclaw-openclaw-channel/issues"
+    },
+    "optionalDependencies": {
+        "@lydell/node-pty": "^1.2.0-beta.15"
     }
 }

package/dist/src/account.js

@@ -147,7 +147,7 @@ export function checkConfigured(config) {
  * 1. npm install qrcode-terminal
  * 2. 取消顶部 import qrcode 的注释
  * 3. 取消底部 qrcode.generate 的注释
- * 4. 替换 registerUrl 为沃联实际注册地址
+ * 4. 替换 registerUrl 为朵联实际注册地址
  */
 function getDLIntroLines(registerUrl) {
     const lines = [
@@ -163,12 +163,14 @@ function getDLIntroLines(registerUrl) {
     // } catch (_) {
     //     // 二维码生成失败，降级显示纯文本链接
     // }
-    lines.push("📱 扫码或在浏览器打开以下链接注册沃联账号：", registerUrl, "", "━━━ 方式二：已有 APIKEY ━━━", "直接按提示输入即可。");
+    lines.push("📱 扫码或在浏览器打开以下链接注册朵联账号：", registerUrl, "", "━━━ 方式二：已有 APIKEY ━━━", "直接按提示输入即可。");
     return lines;
 }
 export function dlSetupWizard(channelId) {
     return {
         channel: channelId,
+        // 2026-10-22：先输入 BaseUrl（textInputs），再输入 API Key / Secret（credentials）
+        stepOrder: "text-first",
         status: {
             configuredLabel: "已配置 ✓",
             unconfiguredLabel: "需要 baseUrl, APIKey 和 Secret",
@@ -180,11 +182,11 @@ export function dlSetupWizard(channelId) {
                 return configured;
             },
             resolveStatusLines: ({ configured }) => {
-                return [`沃联 WorkRelay: ${configured ? "已配置" : "需要 baseUrl, APIKey 和 Secret"}`];
+                return [`朵联 WorkRelay: ${configured ? "已配置" : "需要 baseUrl, APIKey 和 Secret"}`];
             },
         },
         introNote: {
-            title: "🔧 沃联 WorkRelay 设置向导",
+            title: "🔧 朵联 WorkRelay 设置向导",
             lines: getDLIntroLines(process.env.DL_REGISTER_URL || "https://WorkRelay.cn/register"),
             shouldShow: ({ cfg, accountId }) => {
                 const account = resolveDLAccount({ cfg, accountId }, channelId);
@@ -192,31 +194,13 @@ export function dlSetupWizard(channelId) {
             },
         },
         credentials: [
-            {
-                inputKey: "url",
-                providerHint: "沃联回调地址 (BaseUrl)",
-                credentialLabel: "BaseUrl",
-                envPrompt: "使用环境变量中的 DL_BASEURL?",
-                keepPrompt: "BaseUrl 已配置，保留当前值？",
-                inputPrompt: "请输入沃联回调地址 (BaseUrl):",
-                inspect: ({ cfg, accountId }) => {
-                    const account = resolveDLAccount({ cfg, accountId }, channelId);
-                    const hasValue = Boolean(account.config.baseUrl?.trim());
-                    return {
-                        accountConfigured: hasValue,
-                        hasConfiguredValue: hasValue,
-                        resolvedValue: account.config.baseUrl || undefined,
-                    };
-                },
-                applySet: ({ cfg, accountId, resolvedValue }) => setDLChannelAccountParamsValue({ cfg, accountId, 'param': 'baseUrl', value: resolvedValue }, channelId)
-            },
             {
                 inputKey: "token",
-                providerHint: "沃联 API Key",
+                providerHint: "朵联 API Key",
                 credentialLabel: "API Key",
                 envPrompt: "使用环境变量中的 DL_APIKEY?",
                 keepPrompt: "API Key 已配置，保留当前值？",
-                inputPrompt: "请输入沃联 API Key:",
+                inputPrompt: "请输入朵联 API Key:",
                 inspect: ({ cfg, accountId }) => {
                     const account = resolveDLAccount({ cfg, accountId }, channelId);
                     const hasValue = Boolean(account.config.apiKey?.trim());
@@ -230,11 +214,11 @@ export function dlSetupWizard(channelId) {
             },
             {
                 inputKey: "privateKey",
-                providerHint: "沃联签名密钥 (Secret)",
+                providerHint: "朵联签名密钥 (Secret)",
                 credentialLabel: "Secret",
                 envPrompt: "使用环境变量中的 DL_SECRET?",
                 keepPrompt: "Secret 已配置，保留当前值？",
-                inputPrompt: "请输入沃联签名密钥 (Secret):",
+                inputPrompt: "请输入朵联签名密钥 (Secret):",
                 inspect: ({ cfg, accountId }) => {
                     const account = resolveDLAccount({ cfg, accountId }, channelId);
                     const hasValue = Boolean(account.config.secret?.trim());
@@ -246,7 +230,21 @@ export function dlSetupWizard(channelId) {
                 },
                 applySet: ({ cfg, accountId, resolvedValue }) => setDLChannelAccountParamsValue({ cfg, accountId, 'param': 'secret', value: resolvedValue }, channelId)
             },
-        ]
+        ],
+        // 2026-10-22：BaseUrl 不是密钥，必须放 textInputs；放 credentials 会被向导掩码成 ***
+        textInputs: [
+            {
+                inputKey: "url",
+                message: "请输入朵联回调地址 (BaseUrl):",
+                placeholder: "https://your-dlink-server.example.com",
+                required: true,
+                currentValue: ({ cfg, accountId }) => {
+                    const account = resolveDLAccount({ cfg, accountId }, channelId);
+                    return account.config.baseUrl?.trim() || undefined;
+                },
+                applySet: ({ cfg, accountId, value }) => setDLChannelAccountParamsValue({ cfg, accountId, 'param': 'baseUrl', value }, channelId),
+            },
+        ],
     };
 }
 export function dlSetupAdapter(channelId) {
@@ -323,7 +321,7 @@ export function dlAccountStatus(channelId) {
                     channel: channelId,
                     accountId,
                     kind: "config",
-                    message: "沃联 baseUrl, apiKey, secret 未配置",
+                    message: "朵联 baseUrl, apiKey, secret 未配置",
                     fix: `Run: openclaw channels add ${channelId} --base-url <baseUrl> --apiKey <apiKey> --secret <secret>`,
                 });
             }

package/dist/src/monitor.js

@@ -2,6 +2,7 @@ import { listDuolinkConfiguredAccounts, resolveDLAccount } from "./account.js";
 import { getDLLogger, getDLRuntime } from "./runtime.js";
 import { DLClient } from "./client/dl-client.js";
 import { checkDmPolicy, checkGroupPolicy } from "./policy.js";
+import { bufferPendingMessage } from "./pending-pairing.js";
 import { buildMessageContext, parseMessageContent, routeAndDispatchMessage } from "./client/message.js";
 import { withTimeout } from "./client/timeout.js";
 import { getDLClient, removeDLClient, setDLClient } from "./client/client-manager.js";
@@ -165,6 +166,12 @@ async function duolinkMessageHandler(dlCtx, client) {
         logger
     });
     if (!dmPolicy.allowed) {
+        // 2026-10-22：首次未配对时原消息会被配对码回复取代而丢失，这里暂存，
+        // 由 pairing.approve 审批通过后补发（见 services.ts handleApprove）。
+        if (dmPolicy.pendingPairing) {
+            bufferPendingMessage(relayId, () => duolinkMessageHandler(dlCtx, client));
+            logger.info(`${accountLogInfo} message buffered until pairing approved, relayId=${relayId}`);
+        }
         client.publishToServer({
             streamId: msg.streamId,
             content: '[tag_error_policy_refuse]',

package/dist/src/pending-pairing.d.ts

@@ -0,0 +1,7 @@
+export declare function bufferPendingMessage(key: string, replay: () => Promise<void>): void;
+/**
+ * 补发暂存消息，返回补发条数。
+ * key 为空时补发所有（兜底场景）。
+ */
+export declare function flushPendingMessages(key?: string): number;
+export declare function pendingMessageCount(key?: string): number;

package/dist/src/pending-pairing.js

@@ -0,0 +1,70 @@
+const MAX_PER_KEY = 20;
+const MAX_KEYS = 100;
+const TTL_MS = 10 * 60 * 1000;
+const pending = new Map();
+function purgeExpired(now = Date.now()) {
+    for (const [key, list] of pending) {
+        const alive = list.filter((entry) => now - entry.at <= TTL_MS);
+        if (alive.length === 0) {
+            pending.delete(key);
+        }
+        else {
+            pending.set(key, alive);
+        }
+    }
+}
+export function bufferPendingMessage(key, replay) {
+    if (!key) {
+        return;
+    }
+    const now = Date.now();
+    purgeExpired(now);
+    const list = pending.get(key) ?? [];
+    list.push({ replay, at: now });
+    while (list.length > MAX_PER_KEY) {
+        list.shift();
+    }
+    pending.set(key, list);
+    while (pending.size > MAX_KEYS) {
+        const oldest = pending.keys().next().value;
+        if (oldest === undefined) {
+            break;
+        }
+        pending.delete(oldest);
+    }
+}
+/**
+ * 补发暂存消息，返回补发条数。
+ * key 为空时补发所有（兜底场景）。
+ */
+export function flushPendingMessages(key) {
+    purgeExpired();
+    const keys = key ? [key] : Array.from(pending.keys());
+    let count = 0;
+    for (const k of keys) {
+        const list = pending.get(k);
+        if (!list || list.length === 0) {
+            continue;
+        }
+        pending.delete(k);
+        for (const entry of list) {
+            count += 1;
+            // 串行补发，避免同时打爆消息链路
+            Promise.resolve()
+                .then(() => entry.replay())
+                .catch(() => { });
+        }
+    }
+    return count;
+}
+export function pendingMessageCount(key) {
+    purgeExpired();
+    if (key) {
+        return pending.get(key)?.length ?? 0;
+    }
+    let total = 0;
+    for (const list of pending.values()) {
+        total += list.length;
+    }
+    return total;
+}

package/dist/src/policy.d.ts

@@ -7,6 +7,8 @@ export type DLGroupPolicyCheckResult = {
 export type DmPolicyCheckResult = {
     allowed: boolean;
     allowFrom?: Array<string | number>;
+    /** 2026-10-22：因未配对被拦截（消息可暂存，配对后补发） */
+    pendingPairing?: boolean;
 };
 export declare function checkGroupPolicy(params: {
     chatId: string;

package/dist/src/policy.js

@@ -174,7 +174,8 @@ export async function checkDmPolicy(params) {
         client.publishEventToDLClient(pairingEvent, 'onPairingRequest', '0').catch(err => logger.error(`${logPreTag}发送对码事件失败:${String(err)}`));
     }
     logger.warn(`account[${account.accountId}] sender=${senderId} access denied`);
-    return { allowed: false };
+    // 2026-10-22：pairing 模式下拦截的消息可暂存，审批通过后补发
+    return { allowed: false, pendingPairing: dmPolicy === "pairing" };
 }
 /**
  * 设置 dmPolicy

package/dist/src/services/index.js

@@ -21,6 +21,9 @@ export class CmdHandler {
         // 2026-10-21：终端输出经 MQTT 事件回推客户端（协议级能力，品牌无关）
         this.services = new ClawServices(config, logger, (sessionId, data) => {
             void this.dlClient.publishEventToDLClient({ sessionId, data }, 'onTerminal');
+        }, (payload) => {
+            // 2026-10-22：用量上报走服务端事件，由中继落库
+            void this.dlClient.publishEventToServer(payload, 'onUsage', '1');
         });
     }
     log(msg, type) {
@@ -107,13 +110,21 @@ export class CmdHandler {
                 try {
                     const sessionKey = payload.sessionKey;
                     const message = payload.message;
+                    // 2026-10-23：message 可能缺失
+                    if (!message) {
+                        return;
+                    }
                     const role = message.role;
                     if (role !== 'assistant') {
                         return;
                     }
                     //this.log(`onSessionMessage >>> ${JSON.stringify(payload)}`, 'warn');
                     const stopReason = message.stopReason;
-                    const content = message.content ?? [];
+                    // 2026-10-23：content 可能是字符串（非数组），直接 .map 会 TypeError
+                    const rawContent = message.content;
+                    const content = Array.isArray(rawContent)
+                        ? rawContent
+                        : (typeof rawContent === 'string' ? [{ type: 'text', text: rawContent }] : []);
                     const result_contents = content.map(item => {
                         if (item.type === 'thinking') {
                             return item.thinking;
@@ -128,7 +139,8 @@ export class CmdHandler {
                         if (content.length === 0) {
                             return;
                         }
-                        const label = payload.origin.label || undefined;
+                        // 2026-10-23：origin 可能为空，直接取 .label 会 TypeError
+                        const label = payload.origin?.label || undefined;
                         if (!label) {
                             this.log(`不能StreamId...${label}`, 'error');
                             this.dlClient.publishEventToServer({

package/dist/src/services/services.d.ts

@@ -16,7 +16,12 @@ export declare class ClawServices extends EventEmitter {
     private isInitialized;
     private readonly logger;
     private readonly terminalManager;
-    constructor(options: ClawServiceOptions, logger: PluginLogger, terminalSink?: TerminalDataSink);
+    /** 2026-10-22：token 用量上报（中继落库，按同事聚合） */
+    private readonly usagePublisher?;
+    private usageTimer;
+    constructor(options: ClawServiceOptions, logger: PluginLogger, terminalSink?: TerminalDataSink, usagePublisher?: (payload: Record<string, unknown>) => void);
+    /** 2026-10-22：每 60 秒把最近一天的 token 用量上报中继（幂等 upsert） */
+    private startUsageReporter;
     log(msg: string, type: 'info' | 'warn' | 'error' | 'debug'): void;
     /**
      * 初始化服务
@@ -52,6 +57,14 @@ export declare class ClawServices extends EventEmitter {
      */
     private handleCurrentSessionModel;
     private handleAgentList;
+    /**
+     * 2026-10-22：网关在 agents.create/update 后会做配置热加载，RPC 响应帧可能丢失，
+     * 插件侧 ws-client 默认要干等 30s，导致中继先超时。
+     * 这里对 RPC 加短超时，超时后由调用方回查 listAgents 确认是否已生效。
+     */
+    private rpcWithTimeout;
+    /** 回查 agent 是否已写入（热加载完成后可见） */
+    private findAgentConfirmed;
     private handleAgentCreate;
     private handleAgentUpdate;
     private handleAgentDelete;
@@ -114,6 +127,7 @@ export declare class ClawServices extends EventEmitter {
      * 新增 cmd 通道 agent.stop 指令
      */
     private handleStopAgent;
+    private handleSessionsAbort;
     private handlChatAbout;
     /**
      * 2026-09-06 适配 openclaw 2026.9.1：对码审批改走宿主 RPC channels.pairing.approve（按 requestId）

package/dist/src/services/services.js

@@ -17,6 +17,7 @@ import { getSessionEntry, patchSessionEntry, resolveStorePath, listSessionEntrie
 import { setGatewayClient, approvePairingRequest } from './gateway-rpc.js';
 import { DEFAULT_ACCOUNT_ID } from 'openclaw/plugin-sdk/core';
 import { markRunStopped } from '../runtime.js';
+import { flushPendingMessages } from '../pending-pairing.js';
 import { TerminalManager } from './terminal.js';
 /**
  * Claw-Services 主类
@@ -29,12 +30,49 @@ export class ClawServices extends EventEmitter {
     logger;
     // 2026-10-21：终端会话管理（PTY / 管道）
     terminalManager;
-    constructor(options, logger, terminalSink) {
+    /** 2026-10-22：token 用量上报（中继落库，按同事聚合） */
+    usagePublisher;
+    usageTimer = null;
+    constructor(options, logger, terminalSink, usagePublisher) {
         super();
         this.options = options;
         this.logger = logger;
+        this.usagePublisher = usagePublisher;
         this.terminalManager = new TerminalManager(terminalSink ?? (() => { }), (msg, type) => this.log(msg, type ?? 'info'));
     }
+    /** 2026-10-22：每 60 秒把最近一天的 token 用量上报中继（幂等 upsert） */
+    startUsageReporter() {
+        if (this.usageTimer || !this.usagePublisher) {
+            return;
+        }
+        const tick = async () => {
+            try {
+                // 2026-10-23：上送绝对时间 + 本机时区，业务日由中继按部署时区归并；
+                // 查询窗口取近 48 小时，避免跨日/跨时区边界漏会话（窗口仅用于取数）
+                const capturedAt = Date.now();
+                const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+                const endDate = new Date().toISOString().slice(0, 10);
+                const startDate = new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString().slice(0, 10);
+                const res = await this.rpcWithTimeout(this.client.getSessionsUsage({ agentScope: 'all', startDate, endDate, limit: 1000 }), 15000, 'sessions.usage');
+                const root = res?.data ?? res;
+                const sessions = Array.isArray(root?.sessions)
+                    ? root.sessions
+                    : Array.isArray(root?.aggregates)
+                        ? root.aggregates
+                        : [];
+                if (sessions.length === 0) {
+                    return;
+                }
+                // relayId 由中继按 apiKey 补齐，这里不传
+                this.usagePublisher({ usageDate: endDate, capturedAt, timeZone, sessions });
+            }
+            catch (e) {
+                this.log(`usage reporter: ${String(e)}`, 'debug');
+            }
+        };
+        this.usageTimer = setInterval(() => { void tick(); }, 60_000);
+        void tick();
+    }
     log(msg, type) {
         switch (type) {
             case 'info':
@@ -108,6 +146,8 @@ export class ClawServices extends EventEmitter {
             });
             await this.client.connect();
             this.isInitialized = true;
+            // 2026-10-22：启动后开始周期上报用量
+            this.startUsageReporter();
             return true;
         }
         catch (error) {
@@ -270,6 +310,10 @@ export class ClawServices extends EventEmitter {
                     // 新增 cmd 通道 chat.abort ， 以上两个/stop, /queue interrupt都不能立即终止执行中的会话
                     result = await this.handlChatAbout(cmdMessage.params);
                     break;
+                case 'sessions.abort':
+                    // 2026-10-24：会话级中止，无 runId 时也能立即停止，并丢弃排队后续
+                    result = await this.handleSessionsAbort(cmdMessage.params);
+                    break;
                 // 2026-10-21：终端能力（owner-only，见 CmdHandler 校验）
                 case 'terminal.open':
                     result = await this.terminalManager.open(cmdMessage.params);
@@ -286,9 +330,9 @@ export class ClawServices extends EventEmitter {
                 case 'pairing.approve':
                     // 2026-09-06 适配 openclaw 2026.9.1：审批改按 requestId（宿主 RPC），客户端由 onPairingRequest 事件获取；
                     // code 保留解析用于旧客户端兼容提示（9.1 起宿主 list 不再暴露 code，无法按 code 审批）
-                    const { requestId, code, empId, accountId } = cmdMessage.params ?? {};
+                    const { requestId, code, empId, accountId, relayId } = cmdMessage.params ?? {};
                     //注意：accountId目前只能为 DEFAULT_ACCOUNT_ID, 本插件不需要使用多账户,服务端提供多帐户服务(openId提供AGENT路由),在安装插件时需提醒使用"default"
-                    result = await this.handleApprove({ requestId, code, empId, accountId: accountId || DEFAULT_ACCOUNT_ID });
+                    result = await this.handleApprove({ requestId, code, empId, relayId, accountId: accountId || DEFAULT_ACCOUNT_ID });
                     break;
                 // 工作区 / Artifact
                 case 'artifacts.list':
@@ -401,11 +445,12 @@ export class ClawServices extends EventEmitter {
      * 策略：先精确匹配传入 key；查不到 entry 时，用前缀匹配 store 中 updatedAt 最新的 direct 会话。
      */
     resolveDirectSessionKey(storePath, sessionKey, agentId, channelId) {
-        // 1. 传入 key 直接命中 entry → 直接用
+        // 1. 精确匹配先记下来，但不直接返回：旧的无后缀 key 可能仍存在，
+        //    直接写入会命中过期会话（表现为「切了模型但下一条消息仍用旧模型」）。
         const exact = getSessionEntry({ storePath, sessionKey });
-        if (exact) {
-            return sessionKey;
-        }
+        const exactUpdated = exact
+            ? Number(exact.updatedAt ?? exact.lastActivityAt ?? 0)
+            : -1;
         // 2. 前缀匹配：agent:<agentId>:<channelId>:direct:<...> 开头的最新会话
         const prefix = `agent:${agentId}:${channelId}:direct:`;
         try {
@@ -421,8 +466,9 @@ export class ClawServices extends EventEmitter {
                     bestKey = s.sessionKey;
                 }
             }
-            if (bestKey) {
-                this.log(`resolveDirectSessionKey: ${sessionKey} -> ${bestKey} (前缀匹配最新会话)`, 'info');
+            // 3. 谁更新得更晚就用谁：避免旧 exact 会话把模型覆盖写丢
+            if (bestKey && bestUpdated > exactUpdated) {
+                this.log(`resolveDirectSessionKey: ${sessionKey} -> ${bestKey} (更晚更新的会话)`, 'info');
                 return bestKey;
             }
         }
@@ -474,6 +520,43 @@ export class ClawServices extends EventEmitter {
             sessionCount: 0 // 需要额外API调用获取
         }));
     }
+    /**
+     * 2026-10-22：网关在 agents.create/update 后会做配置热加载，RPC 响应帧可能丢失，
+     * 插件侧 ws-client 默认要干等 30s，导致中继先超时。
+     * 这里对 RPC 加短超时，超时后由调用方回查 listAgents 确认是否已生效。
+     */
+    rpcWithTimeout(p, ms, label) {
+        // 避免落败 promise 产生 unhandledRejection
+        void p.catch(() => { });
+        return new Promise((resolve, reject) => {
+            const timer = setTimeout(() => reject(new Error(`${label} rpc timeout after ${ms}ms`)), ms);
+            p.then((v) => { clearTimeout(timer); resolve(v); }, (e) => { clearTimeout(timer); reject(e); });
+        });
+    }
+    /** 回查 agent 是否已写入（热加载完成后可见） */
+    async findAgentConfirmed(params) {
+        const wantedId = (params.id ?? '').toLowerCase();
+        const wantedName = (params.name ?? '').toLowerCase();
+        for (let i = 0; i < 6; i++) {
+            try {
+                const agents = await this.rpcWithTimeout(this.client.listAgents(), 5000, 'agents.list');
+                const found = agents.agents.find((a) => {
+                    const id = (a.id ?? '').toLowerCase();
+                    const nm = (a.name ?? '').toLowerCase();
+                    return (wantedId.length > 0 && (id === wantedId || nm === wantedId))
+                        || (wantedName.length > 0 && (nm === wantedName || id === wantedName));
+                });
+                if (found) {
+                    return found;
+                }
+            }
+            catch {
+                // 热加载期间 list 可能失败，稍后重试
+            }
+            await new Promise((r) => setTimeout(r, 800));
+        }
+        return undefined;
+    }
     async handleAgentCreate(params) {
         const workspace_path = getOpenclawPath('workspace', params.id.toLowerCase().replace(/\s+/g, '-'));
         const provider = params.provider ?? '';
@@ -485,23 +568,36 @@ export class ClawServices extends EventEmitter {
             avatar: (params.avatar && params.avatar.length > 0) ? this.options.baseUrl + params.avatar : undefined,
             model: provider.length > 0 ? `${provider}/${params.model}` : params.model,
         };
-        const result = await this.client.createAgent(createParams);
+        let result;
+        try {
+            result = await this.rpcWithTimeout(this.client.createAgent(createParams), 8000, 'agents.create');
+        }
+        catch (e) {
+            // 响应可能因热加载丢失，但配置已写入 → 回查确认
+            const confirmed = await this.findAgentConfirmed(params);
+            if (!confirmed) {
+                throw e;
+            }
+            this.log(`agents.create 响应超时但已生效：${confirmed.id}`, 'warn');
+            result = { agentId: confirmed.id };
+        }
         // 2026-09-18 修复（石头哥报：首次点击创建失败，且 name 未写入 openclaw.json）：
         // agents.create 后网关是「异步热加载配置」的（日志：create 186ms 成功，紧跟的
         // agents.update 报 agent "xiaoha" not found，1 秒后 config hot reload applied）。
         // 这里改用「update 快速失败重试」：agents.update 对未就绪 agent 是 2ms 快速返回 not found
         // （ws-client.send 在 WS 未连接时也快速抛错），不会挂起；热加载完成后下一次即成功。
         // 避免原 waitAgentReady 用 listAgents 轮询导致客户端 loading 超时的问题。
-        const MAX_UPDATE_RETRY = 10;
+        // 2026-10-22：单次 update 已加 4s 超时，重试次数收紧，避免最坏情况超过中继 30s
+        const MAX_UPDATE_RETRY = 3;
         const UPDATE_RETRY_MS = 500;
         let nameWritten = false;
         for (let i = 0; i < MAX_UPDATE_RETRY && !nameWritten; i++) {
             try {
-                const up = await this.client.updateAgent({
+                const up = await this.rpcWithTimeout(this.client.updateAgent({
                     agentId: result.agentId,
                     name: params.name,
                     workspace: workspace_path,
-                });
+                }), 4000, 'agents.update');
                 if (up?.ok) {
                     nameWritten = true;
                 }
@@ -528,25 +624,45 @@ export class ClawServices extends EventEmitter {
         };
     }
     async handleAgentUpdate(params) {
-        const agents = await this.client.listAgents();
+        let agents;
+        try {
+            agents = await this.rpcWithTimeout(this.client.listAgents(), 5000, 'agents.list');
+        }
+        catch {
+            agents = { agents: [] };
+        }
         const agent = agents.agents.find(a => a.id === params.agentId);
         const provider = params.provider ?? '';
         if (agent) {
             //agent存在直接更新
-            const result = await this.client.updateAgent({
-                agentId: params.agentId,
-                name: params.name,
-                workspace: params.workspace,
-                model: provider.length > 0 ? `${provider}/${params.model}` : params.model,
-                avatar: params.avatar
-            });
+            let result;
+            try {
+                result = await this.rpcWithTimeout(this.client.updateAgent({
+                    agentId: params.agentId,
+                    name: params.name,
+                    workspace: params.workspace,
+                    model: provider.length > 0 ? `${provider}/${params.model}` : params.model,
+                    avatar: params.avatar
+                }), 8000, 'agents.update');
+            }
+            catch (e) {
+                // 响应可能因热加载丢失，但配置已写入 → 回查确认
+                const confirmed = await this.findAgentConfirmed({ id: params.agentId, name: params.name });
+                if (!confirmed) {
+                    throw e;
+                }
+                this.log(`agents.update 响应超时但已生效：${confirmed.id}`, 'warn');
+                result = { agentId: confirmed.id };
+            }
+            // 兼容旧结构：原来的 updateAgent 调用以 result 收尾，这里保持后续逻辑
+            const legacyResult = result;
             const sessionKey = `agent:${params.agentId}:${this.options.channelId}:direct:${params.userId.toLowerCase()}`;
             await this.handleUpdateSessionModel({
                 sessionKey,
                 provider: provider,
                 model: params.model
             });
-            return { id: result.agentId };
+            return { id: legacyResult.agentId };
         }
         //不存在直接创建一个
         const p = {
@@ -856,6 +972,13 @@ export class ClawServices extends EventEmitter {
             sessionKey
         });
     }
+    async handleSessionsAbort(params) {
+        const { sessionKey } = params;
+        if (!sessionKey) {
+            throw new Error('sessions.abort 缺少 sessionKey 参数');
+        }
+        return await this.client?.sessionsAbort({ sessionKey });
+    }
     async handlChatAbout(params) {
         const { sessionKey, runId } = params;
         if (!sessionKey) {
@@ -878,7 +1001,7 @@ export class ClawServices extends EventEmitter {
      *   服务端暂无该端点会 404 噪音）；服务端回调沿用下方 onPairingResult MQTT 事件（7.1 同款链路）
      */
     async handleApprove(params) {
-        const { requestId, code, empId, accountId } = params;
+        const { requestId, code, empId, accountId, relayId } = params;
         if (!requestId) {
             // 旧客户端只传 code：9.1 无公开按 code 审批 API，提示升级（重新对码后事件会带 requestId）
             throw new Error(`审批失败:缺少 requestId${code ? `（code=${code} 已不被支持）` : ''}，请重新触发对码后重试`);
@@ -891,10 +1014,13 @@ export class ClawServices extends EventEmitter {
                 empId,
                 requestId,
             });
+            // 2026-10-22：补发该中继在未配对期间被拦截的消息；返回条数供客户端决定是否兜底重发
+            const replayed = relayId ? flushPendingMessages(relayId) : 0;
             return {
                 success: true,
                 data: {
-                    ...res
+                    ...res,
+                    replayed
                 },
                 timestamp: Date.now()
             };

package/dist/src/services/types.d.ts

@@ -306,7 +306,7 @@ export interface CmdResult {
     timestamp: string | number;
     timezone: string;
 }
-export type CmdType = 'agent.ask' | 'agent.list' | 'agent.create' | 'agent.update' | 'agent.delete' | 'agent.get' | 'agent.stop' | 'chat.abort' | 'task.list' | 'task.create' | 'task.update' | 'task.delete' | 'task.run' | 'status.health' | 'status.system' | 'status.usage' | 'models.list' | 'sessions.list' | 'sessions.get' | 'sessions.describe' | 'sessions.resolve' | 'sessions.create' | 'sessions.archive' | 'sessions.restore' | 'sessions.delete' | 'sessions.reset' | 'sessions.patch' | 'sessions.currentModel' | 'terminal.open' | 'terminal.input' | 'terminal.resize' | 'terminal.close' | 'chat.history' | 'chat.trajectory' | 'skills.status' | 'skills.search' | 'skills.detail' | 'skills.install' | 'skills.update' | 'skills.securityVerdicts' | 'cancelMessage' | 'usage.cost' | 'sessions.usage' | 'sessions.usage.logs' | 'pairing.approve' | 'artifacts.list' | 'artifacts.get' | 'artifacts.download' | 'agents.files.list' | 'agents.files.get' | 'extCapabilities.status' | 'extCapabilities.check' | 'extCapabilities.install';
+export type CmdType = 'agent.ask' | 'agent.list' | 'agent.create' | 'agent.update' | 'agent.delete' | 'agent.get' | 'agent.stop' | 'chat.abort' | 'task.list' | 'task.create' | 'task.update' | 'task.delete' | 'task.run' | 'status.health' | 'status.system' | 'status.usage' | 'models.list' | 'sessions.list' | 'sessions.get' | 'sessions.describe' | 'sessions.resolve' | 'sessions.create' | 'sessions.archive' | 'sessions.restore' | 'sessions.delete' | 'sessions.reset' | 'sessions.patch' | 'sessions.currentModel' | 'sessions.abort' | 'terminal.open' | 'terminal.input' | 'terminal.resize' | 'terminal.close' | 'chat.history' | 'chat.trajectory' | 'skills.status' | 'skills.search' | 'skills.detail' | 'skills.install' | 'skills.update' | 'skills.securityVerdicts' | 'cancelMessage' | 'usage.cost' | 'sessions.usage' | 'sessions.usage.logs' | 'pairing.approve' | 'artifacts.list' | 'artifacts.get' | 'artifacts.download' | 'agents.files.list' | 'agents.files.get' | 'extCapabilities.status' | 'extCapabilities.check' | 'extCapabilities.install';
 export type ReadlineType = Extract<CmdType, 'chat.trajectory'>;
 export interface ClawMessage {
     type: 'res' | 'event';
@@ -316,7 +316,9 @@ export interface ClawMessage {
     payload: any;
     error?: any;
 }
-export type EventType = 'onTick' | 'onHealth' | 'onHandshaked' | 'onConnectState' | 'onError' | 'onAgentReply' | 'onAgentChat' | 'onChatTrajectory' | 'onCron' | 'onShutdown' | 'onSessionsChanged' | 'onSkillInstalled' | 'onSkillInstalling' | 'onSkillError' | 'onPairingRequest' | 'onPairingResult' | 'onTerminal';
+export type EventType = 'onTick' | 'onHealth' | 'onHandshaked' | 'onConnectState' | 'onError' | 'onAgentReply' | 'onAgentChat' | 'onChatTrajectory' | 'onCron' | 'onShutdown' | 'onSessionsChanged' | 'onSkillInstalled' | 'onSkillInstalling' | 'onSkillError' | 'onPairingRequest' | 'onPairingResult'
+/** 2026-10-22：周期上报 token 用量 */
+ | 'onUsage' | 'onTerminal';
 export type CmdParamsPatchSessionEntry = {
     sessionKey: string;
     provider?: string;

package/dist/src/services/ws-client.d.ts

@@ -141,7 +141,11 @@ export declare class WSClient extends EventEmitter {
     }): Promise<any>;
     chatAbort(params: {
         sessionKey: string;
-        runId: string;
+        runId?: string;
+    }): Promise<any>;
+    /** 2026-10-24：会话级中止（无 runId 时使用），同时丢弃排队后续 */
+    sessionsAbort(params: {
+        sessionKey: string;
     }): Promise<any>;
     getSkillSecurityVerdicts(agentId?: string): Promise<any>;
     getUsageCost(params: Record<string, unknown>): Promise<any>;

package/dist/src/services/ws-client.js

@@ -460,10 +460,19 @@ export class WSClient extends EventEmitter {
             method: 'chat.abort',
             params: {
                 sessionKey,
-                runId
+                ...(runId ? { runId } : {})
             }
         });
     }
+    /** 2026-10-24：会话级中止（无 runId 时使用），同时丢弃排队后续 */
+    async sessionsAbort(params) {
+        const { sessionKey } = params;
+        return this.sendRequest({
+            type: 'req',
+            method: 'sessions.abort',
+            params: { sessionKey }
+        });
+    }
     async getSkillSecurityVerdicts(agentId) {
         const params = {};
         if (agentId)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dlinkclaw-openclaw",
-  "version": "2026.10.20",
+  "version": "2026.10.22",
   "description": "DLinkClaw OpenClaw channel plugin — 朵联 OpenClaw 接入通道",
   "keywords": [
     "DLinkClaw",
@@ -92,5 +92,8 @@
   "homepage": "https://github.com/dlinkclaw/dlinkclaw-openclaw-channel#readme",
   "bugs": {
     "url": "https://github.com/dlinkclaw/dlinkclaw-openclaw-channel/issues"
+  },
+  "optionalDependencies": {
+    "@lydell/node-pty": "^1.2.0-beta.15"
   }
 }