dlinkclaw-openclaw 2026.10.23 → 2026.10.25

package/dist/index.js

@@ -1 +1 @@
-import{emptyPluginConfigSchema as e}from"openclaw/plugin-sdk/core";import{channelMeta as s,dlChannel as n,LOG_TAG as r}from"./src/channel.js";import{setDLLogger as t,setDLRuntime as o,isRunStopped as i}from"./src/runtime.js";import{loadPersonaBlock as a,currentPersonaAgent as l}from"./src/persona.js";const p=s;p.isDebug&&(process.env.NODE_TLS_REJECT_UNAUTHORIZED="0",process.env.NODE_ENV="dev");const c={id:p.id,name:p.label,description:p.blurb,configSchema:e(),register(e){o(e.runtime),t(e.logger,r),e.registerChannel({plugin:n}),e.on("before_tool_call",(e,s)=>{const n=p.id;if(s.channelId===n)return e.runId&&i(e.runId)?{block:!0,blockReason:"用户已点击停止，任务终止执行"}:void 0}),e.on("before_prompt_build",async(s,n)=>{const r=p.id;if(n.channel!==r&&n.channelId!==r)return;const t=["[AGENT CODE OF CONDUCT - ALWAYS FOLLOW]","1. ASK BEFORE GUESSING: If the task is incomplete or has multiple reasonable interpretations, send a one-line confirmation first. Never guess.",'2. STOP ON FAILURE: If the same problem fails 2-3 times in a row, stop and report: "I am stuck: <reason>. Please advise." Never retry endlessly.','3. ALWAYS REPORT COMPLETION: Every task must end with a completion signal. After sending media/files, always follow up with a short text confirmation (e.g. "✅ Sent 3 files: a.png / b.pdf / c.txt"). The client shows a spinner until it receives the final text reply.',"4. LANGUAGE: write your reply AND any intermediate/progress text (tool narration, status lines, preamble) in the same language as the user's latest message. Never default to English when the user writes in another language."],o=l(n.sessionKey);!o&&String(n.sessionKey??"").includes(":group:")&&e.logger.warn(`persona group scope missing: session=${n.sessionKey}`);const i=await a(n.sessionKey,o);return i&&t.push(i),{prependSystemContext:t.join("\n\n")}})}};export default c;
+import{emptyPluginConfigSchema as e}from"openclaw/plugin-sdk/core";import{channelMeta as n,dlChannel as s,LOG_TAG as r}from"./src/channel.js";import{setDLLogger as t,setDLRuntime as o,isRunStopped as i}from"./src/runtime.js";import{loadPersonaBlock as a,currentPersonaAgent as l}from"./src/persona.js";const p=n;p.isDebug&&(process.env.NODE_TLS_REJECT_UNAUTHORIZED="0",process.env.NODE_ENV="dev");const c={id:p.id,name:p.label,description:p.blurb,configSchema:e(),register(e){o(e.runtime),t(e.logger,r),e.registerChannel({plugin:s}),e.on("before_tool_call",(e,n)=>{const s=p.id;if(n.channelId===s)return e.runId&&i(e.runId)?{block:!0,blockReason:"用户已点击停止，任务终止执行"}:void 0}),e.on("before_prompt_build",async(n,s)=>{const r=p.id;if(s.channel!==r&&s.channelId!==r)return;const t=["[AGENT CODE OF CONDUCT - ALWAYS FOLLOW]","1. ASK BEFORE GUESSING: If the task is incomplete or has multiple reasonable interpretations, send a one-line confirmation first. Never guess.",'2. STOP ON FAILURE: If the same problem fails 2-3 times in a row, stop and report: "I am stuck: <reason>. Please advise." Never retry endlessly.','3. ALWAYS REPORT COMPLETION: Every task must end with a completion signal. After sending media/files, always follow up with a short text confirmation (e.g. "✅ Sent 3 files: a.png / b.pdf / c.txt"). The client shows a spinner until it receives the final text reply.',"4. LANGUAGE: write your reply, any intermediate/progress text (tool narration, status lines, preamble), AND your reasoning/thinking in the same language as the user's latest message. Never default to English when the user writes in another language."],o=l(s.sessionKey);!o&&String(s.sessionKey??"").includes(":group:")&&e.logger.warn(`persona group scope missing: session=${s.sessionKey}`);const i=await a(s.sessionKey,o);return i&&t.push(i),{prependSystemContext:t.join("\n\n")}})}};export default c;

package/dist/package.json

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

package/dist/src/client/message.js

@@ -946,16 +946,57 @@ export async function routeAndDispatchMessage(ctx) {
             kind: 'in_process'
         });
     }
+    // 2026-10-27 terminal guard: hoisted so the finally block can always settle the stream
+    const mediaFiles = [];
+    // 2026-10-27 terminal guard: normal end, empty reply, abort and error must all send finish=true exactly once.
+    // Otherwise client runState.status.finish stays false and the UI spins forever.
+    let terminalSent = false;
+    let scopeEnded = false;
+    let personaScopeKey = '';
+    const endScopeOnce = () => {
+        if (scopeEnded) {
+            return;
+        }
+        scopeEnded = true;
+        if (personaAgentId) {
+            endPersonaScope(personaScopeKey, personaAgentId);
+        }
+    };
+    // send terminal state once; tag_status_completed is parsed as a state message, not a chat bubble
+    const settleOnce = async (content, kind = 'block') => {
+        if (terminalSent) {
+            return;
+        }
+        terminalSent = true;
+        try {
+            await client.publishProcessingState({
+                streamId,
+                content: '[tag_status_completed]',
+                status: 'read',
+                kind: 'in_process'
+            });
+        }
+        catch (e) {
+            logger.warn?.(`account[${accountId}] publish terminal status failed: ${String(e)}`);
+        }
+        try {
+            if (messageAccumulators.has(streamId)) {
+                await client.publishToServer({ streamId, content, finish: true, kind, mediaFiles }, chatOpts);
+            }
+        }
+        catch (e) {
+            logger.error(`account[${accountId}] publish terminal reply failed: ${String(e)}`);
+        }
+    };
     try {
         const ctx = await ctxPayload;
         // 2026-10-26 群聊人设作用域：分发期间绑定被 @ 的 agent，整轮（含工具循环）都能读到正确值
         // 2026-10-26 OpenClaw 的消息上下文字段名是 SessionKey（大写），兼容两种写法
-        const personaScopeKey = ((ctx.SessionKey ?? ctx.sessionKey) || '');
+        personaScopeKey = ((ctx.SessionKey ?? ctx.sessionKey) || '');
         logger.debug?.(`persona scope: session=${personaScopeKey} agent=${personaAgentId ?? '-'}`);
         if (personaAgentId) {
             beginPersonaScope(personaScopeKey, personaAgentId);
         }
-        const mediaFiles = [];
         await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
             ctx,
             cfg,
@@ -997,9 +1038,7 @@ export async function routeAndDispatchMessage(ctx) {
                     }
                 },
                 onSettled: async () => {
-                    if (personaAgentId) {
-                        endPersonaScope(personaScopeKey, personaAgentId);
-                    }
+                    endScopeOnce();
                     if ((accStatus.accumulatedPayload && accStatus.accumulatedPayload.length > 0) || mediaFiles.length > 0) {
                         //发送结束状态
                         await client.publishProcessingState({
@@ -1009,6 +1048,7 @@ export async function routeAndDispatchMessage(ctx) {
                             kind: 'in_process'
                         });
                         //处理完成整体回复
+                        terminalSent = true;
                         await client.publishToServer({
                             streamId,
                             content: accStatus.accumulatedPayload,
@@ -1017,11 +1057,13 @@ export async function routeAndDispatchMessage(ctx) {
                             mediaFiles
                         }, chatOpts);
                     }
+                    else {
+                        // 2026-10-27 空回复（含被中止、模型未产出正文）也必须收尾，否则客户端一直转圈
+                        await settleOnce('[tag_status_completed]');
+                    }
                 },
                 onError: async (err, info) => {
-                    if (personaAgentId) {
-                        endPersonaScope(personaScopeKey, personaAgentId);
-                    }
+                    endScopeOnce();
                     const errorStr = String(err);
                     await client.publishProcessingState({
                         streamId,
@@ -1029,7 +1071,10 @@ export async function routeAndDispatchMessage(ctx) {
                         status: 'read',
                         kind: 'in_process'
                     });
-                    client.publishToServer({
+                    if (info.kind === 'final') {
+                        terminalSent = true;
+                    }
+                    await client.publishToServer({
                         streamId,
                         content: `[tag_error_pross]\n${errorStr}`,
                         finish: info.kind === 'final',
@@ -1227,4 +1272,11 @@ export async function routeAndDispatchMessage(ctx) {
             kind: 'block'
         }, chatOpts);
     }
+    finally {
+        // 2026-10-27 abort 兜底：dispatch 正常返回但没走 onSettled，或异常被上层吞掉，都补发一次终态
+        endScopeOnce();
+        if (!terminalSent) {
+            await settleOnce('[tag_status_completed]');
+        }
+    }
 }

package/package.json

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