@xgjktech/xg_cwork_im 1.17.32 → 1.17.34

package/dist/src/action-run-event.d.ts

@@ -1,6 +1,18 @@
 import type { ActionDispatchEvent } from "./action-store-access.js";
-/** 剥离仅用于服务端路由的 origin，避免 sessionKey 等内部字段泄露到前端。 */
-export declare function toWireAction(action: ActionDispatchEvent): Omit<ActionDispatchEvent, "origin">;
+/**
+ * 构造 ACTION_DISPATCH 的前端数据，只保留前端消费动作所需的业务字段。
+ * `origin` 是内部路由信息，`event` 与 `version` 不属于该事件的 wire 契约，均不透传。
+ */
+export declare function toWireAction(action: ActionDispatchEvent): {
+    eventId: string;
+    action: string;
+    topic?: string;
+    target: string;
+    status: ActionDispatchEvent["status"];
+    scopeControl?: ActionDispatchEvent["scopeControl"];
+    payload: ActionDispatchEvent["payload"];
+    timestamp: string;
+};
 /**
  * 将权威 action 状态发给前端。必须保持同步返回：网络发送在内部 fire-and-forget。
  */

package/dist/src/action-run-event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action-run-event.d.ts","sourceRoot":"","sources":["../../src/action-run-event.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAKpE,mDAAmD;AACnD,wBAAgB,YAAY,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAG7F;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAyBpE"}
+{"version":3,"file":"action-run-event.d.ts","sourceRoot":"","sources":["../../src/action-run-event.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAsBpE;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,mBAAmB,GAAG;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IACtC,YAAY,CAAC,EAAE,mBAAmB,CAAC,cAAc,CAAC,CAAC;IACnD,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACxC,SAAS,EAAE,MAAM,CAAC;CACrB,CAWA;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CA2BpE"}

package/dist/src/action-run-event.js

@@ -1,9 +1,35 @@
 import { getPlanWsClient } from "./plan-ws-registry.js";
 const LOG_PREFIX = "[xg_cwork_im] [action-run-event]";
-/** 剥离仅用于服务端路由的 origin，避免 sessionKey 等内部字段泄露到前端。 */
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+/**
+ * action 存储契约为 `payload.data`，但当前上游会将实际业务参数再包进 `payload.data.data`。
+ * 仅当外层没有其他字段时才解包，防止丢失未来上游追加的元数据。
+ */
+function toWirePayload(payload) {
+    const outerData = payload.data;
+    const nestedData = outerData.data;
+    if (Object.keys(outerData).length === 1 && isRecord(nestedData)) {
+        return { data: nestedData };
+    }
+    return payload;
+}
+/**
+ * 构造 ACTION_DISPATCH 的前端数据，只保留前端消费动作所需的业务字段。
+ * `origin` 是内部路由信息，`event` 与 `version` 不属于该事件的 wire 契约，均不透传。
+ */
 export function toWireAction(action) {
-    const { origin: _origin, ...wireAction } = action;
-    return wireAction;
+    return {
+        eventId: action.eventId,
+        action: action.action,
+        ...(action.topic ? { topic: action.topic } : {}),
+        target: action.target,
+        status: action.status,
+        ...(action.scopeControl ? { scopeControl: action.scopeControl } : {}),
+        payload: toWirePayload(action.payload),
+        timestamp: action.timestamp,
+    };
 }
 /**
  * 将权威 action 状态发给前端。必须保持同步返回：网络发送在内部 fire-and-forget。
@@ -12,22 +38,23 @@ export function sendActionRunEvent(action) {
     const channel = action.origin?.channel;
     const to = action.origin?.to;
     if (channel !== "xg_cwork_im" || !to) {
-        console.warn(`${LOG_PREFIX} action.origin 缺失或非本通道，跳过 RUN_EVENT eventId=${action.eventId}`);
+        console.warn(`${LOG_PREFIX} action.origin 缺失或非本通道，跳过 ACTION_DISPATCH eventId=${action.eventId}`);
         return;
     }
     const target = getPlanWsClient(to);
     if (!target) {
-        console.warn(`${LOG_PREFIX} 未登记 WS client，跳过 RUN_EVENT eventId=${action.eventId} groupId=${to}`);
+        console.warn(`${LOG_PREFIX} 未登记 WS client，跳过 ACTION_DISPATCH eventId=${action.eventId} groupId=${to}`);
         return;
     }
+    const logContext = `eventId=${action.eventId} groupId=${to} action=${action.action} target=${action.target}`;
+    console.info(`${LOG_PREFIX} 准备发送 ACTION_DISPATCH ${logContext}`);
     void target.client.sendEvent({
         groupId: to,
         replyToMsgId: target.replyToMsgId,
-        event: "RUN_EVENT",
-        data: {
-            displayText: `动作「${action.action}」已完成：${action.target}`,
-            summary: toWireAction(action),
-        },
+        event: "ACTION_DISPATCH",
+        data: toWireAction(action),
+    }).then(() => {
+        console.info(`${LOG_PREFIX} ACTION_DISPATCH 已发送 ${logContext}`);
     }).catch((err) => {
         console.warn(`${LOG_PREFIX} 发送失败 eventId=${action.eventId} groupId=${to}: ${String(err)}`);
     });

package/dist/src/action-run-event.js.map

@@ -1 +1 @@
-{"version":3,"file":"action-run-event.js","sourceRoot":"","sources":["../../src/action-run-event.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,UAAU,GAAG,kCAAkC,CAAC;AAEtD,mDAAmD;AACnD,MAAM,UAAU,YAAY,CAAC,MAA2B;IACpD,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,GAAG,MAAM,CAAC;IAClD,OAAO,UAAU,CAAC;AACtB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAA2B;IAC1D,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACvC,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;IAC7B,IAAI,OAAO,KAAK,aAAa,IAAI,CAAC,EAAE,EAAE,CAAC;QACnC,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,+CAA+C,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3F,OAAO;IACX,CAAC;IAED,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;IACnC,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,uCAAuC,MAAM,CAAC,OAAO,YAAY,EAAE,EAAE,CAAC,CAAC;QACjG,OAAO;IACX,CAAC;IAED,KAAK,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;QACzB,OAAO,EAAE,EAAE;QACX,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE;YACF,WAAW,EAAE,MAAM,MAAM,CAAC,MAAM,QAAQ,MAAM,CAAC,MAAM,EAAE;YACvD,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC;SAChC;KACJ,CAAC,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;QACtB,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,iBAAiB,MAAM,CAAC,OAAO,YAAY,EAAE,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC/F,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"action-run-event.js","sourceRoot":"","sources":["../../src/action-run-event.ts"],"names":[],"mappings":"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"}

package/dist/src/action-run-event.test.js

@@ -21,18 +21,40 @@ function makeRecordingClient() {
 }
 beforeEach(() => resetPlanWsRegistryForTest());
 describe("sendActionRunEvent", () => {
-    it("按 origin 路由为 RUN_EVENT，summary 保留 action 契约而剥离 origin", () => {
+    it("按 origin 路由为 ACTION_DISPATCH，透传精简 action 字段且剥离 origin", () => {
         const { client, calls } = makeRecordingClient();
         setPlanWsClient("g-1", client, "msg-1");
-        const action = makeAction({ origin: { channel: "xg_cwork_im", to: "g-1", sessionKey: "secret" } });
+        const action = makeAction({
+            origin: { channel: "xg_cwork_im", to: "g-1", sessionKey: "secret" },
+            payload: {
+                data: {
+                    data: {
+                        target_kind: "ops",
+                        trigger: "user_request",
+                        source: "xg_cwork_im",
+                    },
+                },
+            },
+        });
         sendActionRunEvent(action);
         assert.equal(calls.length, 1);
-        assert.equal(calls[0].event, "RUN_EVENT");
+        assert.equal(calls[0].event, "ACTION_DISPATCH");
         assert.equal(calls[0].groupId, "g-1");
-        const summary = calls[0].data.summary;
-        assert.equal(summary.event, "action_dispatch");
-        assert.equal(summary.eventId, action.eventId);
-        assert.equal(summary.origin, undefined);
+        assert.equal(calls[0].replyToMsgId, "msg-1");
+        assert.deepEqual(calls[0].data, {
+            eventId: "evt-1",
+            action: "ui_refresh",
+            target: "order_detail",
+            status: "completed",
+            payload: {
+                data: {
+                    target_kind: "ops",
+                    trigger: "user_request",
+                    source: "xg_cwork_im",
+                },
+            },
+            timestamp: "2026-08-13T00:00:00.000Z",
+        });
         assert.equal(action.origin?.sessionKey, "secret", "不 mutate 入参");
     });
     it("缺少当前通道 origin 时不发送", () => {
@@ -45,7 +67,17 @@ describe("sendActionRunEvent", () => {
         const action = makeAction({ origin: { channel: "xg_cwork_im", to: "g-1" } });
         const wire = toWireAction(action);
         assert.equal("origin" in wire, false);
+        assert.equal("event" in wire, false);
+        assert.equal("version" in wire, false);
         assert.deepEqual(action.origin, { channel: "xg_cwork_im", to: "g-1" });
     });
+    it("payload.data 含其他字段时不解包，避免丢失上游元数据", () => {
+        const wire = toWireAction(makeAction({
+            payload: { data: { data: { id: "ORD-1" }, source: "upstream" } },
+        }));
+        assert.deepEqual(wire.payload, {
+            data: { data: { id: "ORD-1" }, source: "upstream" },
+        });
+    });
 });
 //# sourceMappingURL=action-run-event.test.js.map

package/dist/src/action-run-event.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"action-run-event.test.js","sourceRoot":"","sources":["../../src/action-run-event.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AAGrD,OAAO,EAAE,0BAA0B,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAEzE,SAAS,UAAU,CAAC,YAA0C,EAAE;IAC5D,OAAO;QACH,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,cAAc;QACxF,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,0BAA0B;QAC1G,GAAG,SAAS;KACf,CAAC;AACN,CAAC;AAED,SAAS,mBAAmB;IACxB,MAAM,KAAK,GAA4B,EAAE,CAAC;IAC1C,OAAO;QACH,KAAK;QACL,MAAM,EAAE;YACJ,KAAK,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC,EAAE,cAAc,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC,EAAE,WAAW,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;YAClF,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;SACxE;KACJ,CAAC;AACN,CAAC;AAED,UAAU,CAAC,GAAG,EAAE,CAAC,0BAA0B,EAAE,CAAC,CAAC;AAE/C,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC7D,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAChD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QAEnG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAE3B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC9B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAA8B,CAAC;QAC7D,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QAC/C,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACxC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAC1B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAChD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACxC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QAC5D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0BAA0B,EAAE,GAAG,EAAE;QAChC,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAC7E,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,CAAC,KAAK,CAAC,QAAQ,IAAI,IAAI,EAAE,KAAK,CAAC,CAAC;QACtC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"action-run-event.test.js","sourceRoot":"","sources":["../../src/action-run-event.test.ts"],"names":[],"mappings":"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"}

package/dist/src/build-project-prompt.test.js

@@ -76,24 +76,24 @@ describe("buildAgentContextPromptBlock nasVolumes", () => {
                 background,
             },
         });
-        assert.equal(result.block, `## 当前项目
-
-### 本次会话文件目录
-本次会话需要读取的文件位于以下已授权目录：
-- \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/deliverables\`（只读）
-- \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0000\`（只读）
-- \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\`（可读写）
-- 首选文件写入目录：\`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\`
-
-### 目录用途
-- **项目产出**：项目相关文件优先保存到可写目录 \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\` 或其子目录。
-
-### 操作约束
-- 仅在上述已授权 NAS 目录下读取或处理项目文件；不要在 workspace 其他位置查找类似目录。
-- 对用户统一称为「本项目」，不要提及 OpenClaw workspace 等实现细节。
-
-## 项目背景
-
+        assert.equal(result.block, `## 当前项目
+
+### 本次会话文件目录
+本次会话需要读取的文件位于以下已授权目录：
+- \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/deliverables\`（只读）
+- \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0000\`（只读）
+- \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\`（可读写）
+- 首选文件写入目录：\`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\`
+
+### 目录用途
+- **项目产出**：项目相关文件优先保存到可写目录 \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\` 或其子目录。
+
+### 操作约束
+- 仅在上述已授权 NAS 目录下读取或处理项目文件；不要在 workspace 其他位置查找类似目录。
+- 对用户统一称为「本项目」，不要提及 OpenClaw workspace 等实现细节。
+
+## 项目背景
+
 ${background}`);
     });
 });

package/dist/src/deliver-text.test.js

@@ -2,30 +2,30 @@ import assert from "node:assert/strict";
 import { describe, it } from "node:test";
 import { normalizeDeliverComparableText, shouldOmitDuplicateFileCaption, shouldSuppressDuplicateTextDeliver, stripMediaDirectiveLines, stripModelUsageFooter, } from "./deliver-text.js";
 // 生产 incident 回归：侯桐 2026-07-10 终态三连发（空行/footer 微差）
-const HOUTONG_BODY_LOOSE = `确实是这个问题：昨天那版虽然用了内嵌 SVG，但你现在的文档预览器没有把 SVG 正常渲染出来，所以流程看不到。
-
-我已经重新生成了一版**纯 Markdown 可读版**：
-
-- 不用 SVG
-- 不用 Mermaid
-- 不用图片
-- 全部用 Markdown 表格 + 文本流程图 + 状态表表达
-
-这样在 IM 文件预览里也能直接看懂完整流程。
-
-新文件：
-
+const HOUTONG_BODY_LOOSE = `确实是这个问题：昨天那版虽然用了内嵌 SVG，但你现在的文档预览器没有把 SVG 正常渲染出来，所以流程看不到。
+
+我已经重新生成了一版**纯 Markdown 可读版**：
+
+- 不用 SVG
+- 不用 Mermaid
+- 不用图片
+- 全部用 Markdown 表格 + 文本流程图 + 状态表表达
+
+这样在 IM 文件预览里也能直接看懂完整流程。
+
+新文件：
+
 -----`;
-const HOUTONG_BODY_TIGHT = `确实是这个问题：昨天那版虽然用了内嵌 SVG，但你现在的文档预览器没有把 SVG 正常渲染出来，所以流程看不到。
-我已经重新生成了一版**纯 Markdown 可读版**：
-- 不用 SVG
-- 不用 Mermaid
-- 不用图片
-- 全部用 Markdown 表格 + 文本流程图 + 状态表表达
-这样在 IM 文件预览里也能直接看懂完整流程。
+const HOUTONG_BODY_TIGHT = `确实是这个问题：昨天那版虽然用了内嵌 SVG，但你现在的文档预览器没有把 SVG 正常渲染出来，所以流程看不到。
+我已经重新生成了一版**纯 Markdown 可读版**：
+- 不用 SVG
+- 不用 Mermaid
+- 不用图片
+- 全部用 Markdown 表格 + 文本流程图 + 状态表表达
+这样在 IM 文件预览里也能直接看懂完整流程。
 新文件：`;
-const HOUTONG_BODY_WITH_FOOTER = `${HOUTONG_BODY_TIGHT}
-
+const HOUTONG_BODY_WITH_FOOTER = `${HOUTONG_BODY_TIGHT}
+
 _🟡 ↑111k ↓164 · 63%ctx · openai/gpt-5.5_`;
 describe("stripMediaDirectiveLines", () => {
     it("removes MEDIA directive lines", () => {

package/dist/src/gateway-session-queue.d.ts

@@ -1,5 +1,6 @@
 /**
- * 网关内：按 sessionKey 串行派发 + FIFO 排队 + /stop 清队列与租约。
+ * 历史会话派发调度层。
+ * 注意：插件内部已移除阻塞式 FIFO 队列与租约占用，任务排队、插话与中断统一交由 OpenClaw 原生管理。
  */
 import type { OpenClawConfig } from "openclaw/plugin-sdk";
 import type { Logger } from "./channel-log.js";
@@ -7,6 +8,7 @@ import type { ImStreamClient } from "./connection.js";
 import type { BotIdentity, WsMessageParams, XgImConfig } from "./types.js";
 import type { AutoRouteResult } from "./auto-model-router.js";
 import type { InboundTrigger } from "./inbound-terminal-state.js";
+import type { NasVolume } from "./agent-context-types.js";
 export interface PendingDispatch {
     route: {
         sessionKey: string;
@@ -16,6 +18,8 @@ export interface PendingDispatch {
     params: WsMessageParams;
     currentIdentity: BotIdentity;
     agentWorkspaceDir?: string;
+    /** 本会话 NAS 挂载声明；同一 sessionKey 下必须保持不变。 */
+    nasVolumes?: NasVolume[];
     /** 本条消息单轮模型（OpenClaw replyOptions.modelOverride） */
     modelOverride?: string;
     /** 本条消息单轮推理等级（OpenClaw replyOptions.thinkingLevelOverride；用户显式 /think 时不设） */
@@ -24,7 +28,7 @@ export interface PendingDispatch {
     autoRouteMeta?: AutoRouteResult;
     /** 入站触发源 */
     inboundTrigger?: InboundTrigger;
-    /** /stop：立即交给 OpenClaw；并作废当前会话占用、清空排队 */
+    /** /stop：立即交给 OpenClaw */
     skipSessionQueue?: boolean;
 }
 export declare function createRunWithSessionQueue(options: {

package/dist/src/gateway-session-queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway-session-queue.d.ts","sourceRoot":"","sources":["../../src/gateway-session-queue.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE,MAAM,WAAW,eAAe;IAC5B,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/C,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC;IACxB,eAAe,EAAE,WAAW,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oDAAoD;IACpD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,8EAA8E;IAC9E,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,gDAAgD;IAChD,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,YAAY;IACZ,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,yCAAyC;IACzC,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE;IAC/C,cAAc,EAAE,MAAM,UAAU,CAAC;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,GAAG,CAAC;IACR,WAAW,EAAE,MAAM,cAAc,CAAC;CACrC,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CA6GhG"}
+{"version":3,"file":"gateway-session-queue.d.ts","sourceRoot":"","sources":["../../src/gateway-session-queue.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D,MAAM,WAAW,eAAe;IAC5B,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/C,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC;IACxB,eAAe,EAAE,WAAW,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,0CAA0C;IAC1C,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;IACzB,oDAAoD;IACpD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,8EAA8E;IAC9E,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,gDAAgD;IAChD,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,YAAY;IACZ,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,0BAA0B;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE;IAC/C,cAAc,EAAE,MAAM,UAAU,CAAC;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,GAAG,CAAC;IACR,WAAW,EAAE,MAAM,cAAc,CAAC;CACrC,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CA2BhG"}

package/dist/src/gateway-session-queue.js

@@ -1,86 +1,29 @@
 /**
- * 网关内：按 sessionKey 串行派发 + FIFO 排队 + /stop 清队列与租约。
+ * 历史会话派发调度层。
+ * 注意：插件内部已移除阻塞式 FIFO 队列与租约占用，任务排队、插话与中断统一交由 OpenClaw 原生管理。
  */
 import { dispatchMentionedReply } from "./dispatch-mentioned-reply.js";
-import { sendTextMessage } from "./send-service.js";
 export function createRunWithSessionQueue(options) {
     const { configProvider, log, logPrefix, rt, cfgProvider } = options;
-    const sessionBusyLease = new Map();
-    const sessionQueues = new Map();
-    const maxPendingMsgs = configProvider().maxPendingMessages ?? 5;
-    const runWithSessionQueue = async (sessionKey, pending, streamClient) => {
-        if (!pending.skipSessionQueue && sessionBusyLease.has(sessionKey)) {
-            const queue = sessionQueues.get(sessionKey) ?? [];
-            if (maxPendingMsgs === 0 || queue.length >= maxPendingMsgs) {
-                const reason = maxPendingMsgs === 0
-                    ? "当前不支持任务排队，请等待处理完成后再发送。"
-                    : `当前任务队列已满（最多 ${maxPendingMsgs} 条），请等待处理完成后再重新发送。`;
-                log.warn(`${logPrefix} [queue] Session ${sessionKey} busy & queue full/disabled (max=${maxPendingMsgs}), dropping`);
-                sendTextMessage(configProvider(), pending.currentIdentity.token, pending.params.groupId, reason, [pending.params.userInfo?.id ?? ""], log).catch((notifyErr) => {
-                    log.error(`${logPrefix} [queue] Failed to send queue-full notice: ${String(notifyErr)}`);
-                });
-                return;
-            }
-            const queuePos = queue.length + 1;
-            queue.push(pending);
-            sessionQueues.set(sessionKey, queue);
-            log.info(`${logPrefix} [queue] Session ${sessionKey} busy, queued message (pos=${queuePos})`);
-            sendTextMessage(configProvider(), pending.currentIdentity.token, pending.params.groupId, `收到，当前正在处理其他任务，您的消息已排队（队列第 ${queuePos} 位），处理完成后将自动回复。`, [pending.params.userInfo?.id ?? ""], log).catch((notifyErr) => {
-                log.warn(`${logPrefix} [queue] Failed to send queue notification: ${String(notifyErr)}`);
-            });
-            return;
-        }
-        if (pending.skipSessionQueue) {
-            const hadLease = sessionBusyLease.has(sessionKey);
-            if (hadLease) {
-                sessionBusyLease.delete(sessionKey);
-                const dropped = sessionQueues.get(sessionKey)?.length ?? 0;
-                sessionQueues.delete(sessionKey);
-                log.info(`${logPrefix} [queue] /stop: invalidated busy lease, cleared fifo (droppedQueued=${dropped})`);
-            }
-        }
-        let myLease;
-        if (!pending.skipSessionQueue) {
-            myLease = Symbol("xg_cwork_im-session-busy");
-            sessionBusyLease.set(sessionKey, myLease);
-        }
-        try {
-            await dispatchMentionedReply({
-                rt,
-                cfg: cfgProvider(),
-                config: configProvider(),
-                log,
-                logPrefix,
-                route: pending.route,
-                inboundCtx: pending.inboundCtx,
-                params: pending.params,
-                currentIdentity: pending.currentIdentity,
-                streamClient,
-                agentWorkspaceDir: pending.agentWorkspaceDir,
-                modelOverride: pending.modelOverride,
-                thinkingLevelOverride: pending.thinkingLevelOverride,
-                autoRouteMeta: pending.autoRouteMeta,
-                inboundTrigger: pending.inboundTrigger,
-            });
-        }
-        finally {
-            if (!pending.skipSessionQueue && myLease !== undefined) {
-                if (sessionBusyLease.get(sessionKey) === myLease) {
-                    sessionBusyLease.delete(sessionKey);
-                    const queue = sessionQueues.get(sessionKey);
-                    if (queue && queue.length > 0) {
-                        const next = queue.shift();
-                        if (queue.length === 0)
-                            sessionQueues.delete(sessionKey);
-                        log.info(`${logPrefix} [queue] Dispatching next queued message for session ${sessionKey} (remaining=${queue.length})`);
-                        runWithSessionQueue(sessionKey, next, streamClient).catch((err) => {
-                            log.error(`${logPrefix} [queue] Error processing queued dispatch: ${String(err)}`);
-                        });
-                    }
-                }
-            }
-        }
+    return async (_sessionKey, pending, streamClient) => {
+        await dispatchMentionedReply({
+            rt,
+            cfg: cfgProvider(),
+            config: configProvider(),
+            log,
+            logPrefix,
+            route: pending.route,
+            inboundCtx: pending.inboundCtx,
+            params: pending.params,
+            currentIdentity: pending.currentIdentity,
+            streamClient,
+            agentWorkspaceDir: pending.agentWorkspaceDir,
+            nasVolumes: pending.nasVolumes,
+            modelOverride: pending.modelOverride,
+            thinkingLevelOverride: pending.thinkingLevelOverride,
+            autoRouteMeta: pending.autoRouteMeta,
+            inboundTrigger: pending.inboundTrigger,
+        });
     };
-    return runWithSessionQueue;
 }
 //# sourceMappingURL=gateway-session-queue.js.map

package/dist/src/gateway-session-queue.js.map

@@ -1 +1 @@
-{"version":3,"file":"gateway-session-queue.js","sourceRoot":"","sources":["../../src/gateway-session-queue.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gateway-session-queue.js","sourceRoot":"","sources":["../../src/gateway-session-queue.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AA0BvE,MAAM,UAAU,yBAAyB,CAAC,OAMzC;IACG,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAEpE,OAAO,KAAK,EACR,WAAmB,EACnB,OAAwB,EACxB,YAA4B,EACf,EAAE;QACf,MAAM,sBAAsB,CAAC;YACzB,EAAE;YACF,GAAG,EAAE,WAAW,EAAE;YAClB,MAAM,EAAE,cAAc,EAAE;YACxB,GAAG;YACH,SAAS;YACT,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,YAAY;YACZ,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;YAC5C,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,qBAAqB,EAAE,OAAO,CAAC,qBAAqB;YACpD,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,cAAc,EAAE,OAAO,CAAC,cAAc;SACzC,CAAC,CAAC;IACP,CAAC,CAAC;AACN,CAAC"}

package/dist/src/modified-file-push-tracker.d.ts

@@ -0,0 +1,24 @@
+import type { Logger } from "./channel-log.js";
+import { type ReplyDeliverPayload } from "./send-service.js";
+import type { WsMessageParams, XgImConfig } from "./types.js";
+export type PatchSummaryPayload = {
+    added?: string[];
+    modified?: string[];
+    deleted?: string[];
+};
+type FlushArgs = {
+    config: XgImConfig;
+    token: string;
+    params: WsMessageParams;
+};
+export declare function createModifiedFilePushTracker(options: {
+    agentWorkspaceDir?: string;
+    log: Logger;
+    logPrefix: string;
+}): {
+    recordPatchSummary: (payload: PatchSummaryPayload) => void;
+    markDelivered: (payload: ReplyDeliverPayload) => void;
+    flush: (args: FlushArgs) => Promise<void>;
+};
+export {};
+//# sourceMappingURL=modified-file-push-tracker.d.ts.map

package/dist/src/modified-file-push-tracker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"modified-file-push-tracker.d.ts","sourceRoot":"","sources":["../../src/modified-file-push-tracker.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,EAAyB,KAAK,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE9D,MAAM,MAAM,mBAAmB,GAAG;IAC9B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,KAAK,SAAS,GAAG;IACb,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,eAAe,CAAC;CAC3B,CAAC;AAwFF,wBAAgB,6BAA6B,CAAC,OAAO,EAAE;IACnD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;CACrB,GAAG;IACA,kBAAkB,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAC3D,aAAa,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACtD,KAAK,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7C,CAgDA"}

package/dist/src/modified-file-push-tracker.js

@@ -0,0 +1,125 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { buildTargetReplyMeta } from "./inbound-display.js";
+import { resolveLocalFsPath, resolveWorkspaceCandidatePaths } from "./resource-file.js";
+import { sendReplyDeliverBlock } from "./send-service.js";
+function isUrlLike(value) {
+    return /^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//.test(value.trim());
+}
+function normalizePushPath(filePath, workspaceDir) {
+    const clean = filePath.trim();
+    if (clean.startsWith("/workspace/") || clean === "/workspace") {
+        return clean;
+    }
+    if (isUrlLike(clean)) {
+        return clean;
+    }
+    const wsDir = workspaceDir?.trim();
+    if (wsDir) {
+        const wsResolved = path.resolve(wsDir);
+        const fileResolved = path.isAbsolute(clean) ? path.resolve(clean) : path.resolve(wsResolved, clean);
+        const relToWorkspace = path.relative(wsResolved, fileResolved);
+        if (!relToWorkspace.startsWith("..") && !path.isAbsolute(relToWorkspace)) {
+            return relToWorkspace ? `/workspace/${relToWorkspace.replace(/\\/g, "/")}` : "/workspace";
+        }
+    }
+    return clean;
+}
+function pushPathCandidates(filePath, workspaceDir) {
+    const clean = filePath.trim();
+    if (!clean)
+        return [];
+    if (clean.startsWith("/workspace/") || clean === "/workspace") {
+        try {
+            return resolveWorkspaceCandidatePaths(clean, workspaceDir);
+        }
+        catch {
+            return [];
+        }
+    }
+    if (clean.startsWith("file://")) {
+        try {
+            return [fileURLToPath(clean)];
+        }
+        catch {
+            return [];
+        }
+    }
+    const local = resolveLocalFsPath(clean);
+    if (local)
+        return [local.fsPath];
+    const wsDir = workspaceDir?.trim();
+    if (wsDir && !path.isAbsolute(clean)) {
+        return [path.resolve(wsDir, clean)];
+    }
+    return [];
+}
+async function isExistingRegularPushFile(filePath, workspaceDir) {
+    for (const candidate of pushPathCandidates(filePath, workspaceDir)) {
+        try {
+            const stat = await fs.stat(candidate);
+            if (stat.isFile())
+                return true;
+        }
+        catch {
+            /* try next candidate */
+        }
+    }
+    return false;
+}
+async function filterExistingPushFiles(files, workspaceDir, log, logPrefix) {
+    const out = [];
+    for (const file of files) {
+        if (await isExistingRegularPushFile(file, workspaceDir)) {
+            out.push(file);
+        }
+        else {
+            log.warn(`${logPrefix} [sync-push] Skip non-existing or non-file path: ${JSON.stringify(file)}`);
+        }
+    }
+    return out;
+}
+function payloadMediaUrls(payload) {
+    return [
+        ...(payload.mediaUrl ? [payload.mediaUrl] : []),
+        ...(payload.mediaUrls ?? []),
+    ].filter((u) => typeof u === "string" && u.trim());
+}
+export function createModifiedFilePushTracker(options) {
+    const { agentWorkspaceDir, log, logPrefix } = options;
+    const modifiedFiles = new Set();
+    return {
+        recordPatchSummary(payload) {
+            payload.added?.forEach((f) => modifiedFiles.add(normalizePushPath(f, agentWorkspaceDir)));
+            payload.modified?.forEach((f) => modifiedFiles.add(normalizePushPath(f, agentWorkspaceDir)));
+        },
+        markDelivered(payload) {
+            for (const url of payloadMediaUrls(payload)) {
+                modifiedFiles.delete(normalizePushPath(url, agentWorkspaceDir));
+            }
+        },
+        async flush(args) {
+            if (modifiedFiles.size === 0)
+                return;
+            const mediaUrls = await filterExistingPushFiles(modifiedFiles, agentWorkspaceDir, log, logPrefix);
+            if (mediaUrls.length === 0) {
+                log.info(`${logPrefix} [sync-push] No existing modified files to push`);
+                return;
+            }
+            log.info(`${logPrefix} [sync-push] 自动推送变动文件至客户端: ${JSON.stringify(mediaUrls)}`);
+            try {
+                const reply = buildTargetReplyMeta(args.params);
+                await sendReplyDeliverBlock(args.config, args.token, args.params.groupId, {
+                    text: "已自动将本次修改的文件同步到工作区，您可以在右侧面板进行审阅：",
+                    isThinking: false,
+                    mediaUrls,
+                }, [reply.targetUserId], log, undefined, reply, agentWorkspaceDir);
+            }
+            catch (err) {
+                log.error(`${logPrefix} [sync-push] 自动推送文件附件失败: ${String(err)}`);
+            }
+        },
+    };
+}
+//# sourceMappingURL=modified-file-push-tracker.js.map

package/dist/src/modified-file-push-tracker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modified-file-push-tracker.js","sourceRoot":"","sources":["../../src/modified-file-push-tracker.ts"],"names":[],"mappings":"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"}