@xgjktech/xg_cwork_im 1.19.43 → 1.19.45

package/dist/src/turn-end-controller.js

@@ -0,0 +1,239 @@
+/**
+ * 整轮（user-turn）结束仲裁。
+ *
+ * OpenClaw 7.1+ / 8.x（lifecycle 语义一致；245 实测为 2026.7.1-2）：父会话（主会话）
+ * 自己的 finish 就是它某段 run 的 lifecycle `end/error` 终态且 `yielded !== true`
+ * （`yielded:true` 只出现在该段挂起了子任务、会话被挂起等待 resume 时——核心据此把
+ * requester 保留为可唤醒）。因此：
+ * - 「yield 段终态」≠ 整轮结束（主会话还会 resume 继续派发/产出最终答复）；
+ * - 「非 yield 段终态」= 主会话 finish：该段不会再挂起子任务、不会再被唤醒。
+ *
+ * 收尾条件（防御性补强，主判据仍是主会话的非 yield finish）：
+ *   dispatch 已返回 ∧ 无段在跑（segmentActive=false，避免拿旧段终态收尾）
+ *   ∧ 无运行中子任务（兜非标准边界：异常/乱序下非 yield 终态先于子任务结束到达）
+ *   ∧ 已出现非 yield 段终态。
+ *
+ * 本模块只维护进程级共享的每轮状态与「可收尾」信号，不持有任何 WS/HTTP 副作用：
+ * - wrapper finally、subagent spawn/end、lifecycle start/end、以及组内活动心跳都来喂状态；
+ * - dispatch-mentioned-reply 在 wrapper 里 await 本模块的可收尾信号后再发 RUN_USAGE/FINISHED；
+ * - 子任务完成但主会话无法被唤醒（announce/handoff 投递，不再产生 resume 终态）、
+ *   或 lifecycle 事件完全不可达（订阅不可用等环境）时，靠静默兜底定时器收尾，保证不悬挂。
+ */
+import { getSharedMap } from "./process-shared-store.js";
+/** 非 yield 终态到达后、置可收尾前的防抖（吞掉与 resume 的竞态）。 */
+let NON_YIELD_DEBOUNCE_MS = 1_500;
+/** 完全没有 lifecycle 事件（订阅不可用）时的兜底窗口。 */
+let NO_LIFECYCLE_FALLBACK_MS = 30_000;
+const states = getSharedMap("turn-end-states");
+const DIAG = "[xg_cwork_im] [turn-diag]";
+function stateOf(roundKey, gen) {
+    const s = states.get(roundKey);
+    if (!s || s.gen !== gen)
+        return undefined;
+    return s;
+}
+function clearTimer(s) {
+    if (s.timer !== undefined) {
+        clearTimeout(s.timer);
+        s.timer = undefined;
+    }
+}
+function isQuiescent(s) {
+    return s.dispatchReturned && !s.segmentActive && s.activeChildren <= 0;
+}
+/** 防抖置位：静默窗口内无新事件才真正 eligible（避免与 resume 的毫秒级竞态）。 */
+function setEligible(roundKey, gen, s, reason) {
+    clearTimer(s);
+    s.timer = setTimeout(() => {
+        s.timer = undefined;
+        const cur = stateOf(roundKey, gen);
+        if (!cur)
+            return;
+        if (isQuiescent(cur) && !cur.eligible) {
+            cur.eligible = true;
+            console.log(`${DIAG} eligible round=${roundKey}#${gen} reason=${reason} ` +
+                `children=${cur.activeChildren} segActive=${cur.segmentActive} ` +
+                `lifecycleSeen=${cur.lifecycleSeen}`);
+        }
+    }, NON_YIELD_DEBOUNCE_MS);
+    s.timer.unref?.();
+}
+function armTimer(roundKey, s, delayMs, reason) {
+    if (s.timer !== undefined)
+        return;
+    console.log(`${DIAG} fallback arm round=${roundKey}#${s.gen} reason=${reason} delayMs=${delayMs} ` +
+        `children=${s.activeChildren} segActive=${s.segmentActive}`);
+    s.timer = setTimeout(() => {
+        s.timer = undefined;
+        const cur = stateOf(roundKey, s.gen);
+        if (!cur)
+            return;
+        if (isQuiescent(cur) && !cur.eligible) {
+            cur.eligible = true;
+            console.log(`${DIAG} eligible round=${roundKey}#${s.gen} reason=fallback:${reason} ` +
+                `children=${cur.activeChildren} segActive=${cur.segmentActive}`);
+        }
+    }, delayMs);
+    s.timer.unref?.();
+}
+/** 任一事件后统一评估：满足「已非段中、无子任务、dispatch 已返回」时决定防抖收尾或等待。 */
+function reevaluate(roundKey, s) {
+    if (!s.dispatchReturned)
+        return;
+    if (!isQuiescent(s)) {
+        // 还有段在跑 / 还有子任务：绝不收尾，也不保留旧的可收尾状态。
+        s.eligible = false;
+        return;
+    }
+    if (s.lifecycleSeen && s.lastEnd) {
+        if (s.lastEnd.yielded !== true) {
+            // 主会话 finish：最新一段父 run 是非 yield 终态 → 不会再 resume → 防抖后收尾。
+            setEligible(roundKey, s.gen, s, "non-yield-end");
+        }
+        // 段以 yield 结束：父会话因派发子任务被挂起，等待 core 把子任务完成结果 announce
+        // 回父会话（resume）。该投递时延不受控（实测可到分钟级、与子任务时长无关），
+        // 绝不能靠“N 秒没 resume 就收尾”的死窗口提前 FINISHED——那会拆除 round，使同轮
+        // 之后新派发的子任务对不上 round、丢 SUBAGENT_STAT。这里不做任何事：
+        // - resume 到来 → turnOnSegmentStart 取消旧状态并重新按新段终态评估；
+        // - 父会话确实永不被唤醒的极端场景 → 由 dispatch wrapper 的 30 分钟上限兜底。
+    }
+    else {
+        // 完全没见到 lifecycle（订阅不可用等）：纯兜底窗口收尾，防悬挂。
+        armTimer(roundKey, s, NO_LIFECYCLE_FALLBACK_MS, "no-lifecycle-seen");
+    }
+}
+export function turnOnDispatchReturned(roundKey, gen) {
+    const s = stateOf(roundKey, gen);
+    if (!s)
+        return;
+    s.dispatchReturned = true;
+    console.log(`${DIAG} dispatchReturned round=${roundKey}#${gen} children=${s.activeChildren} segActive=${s.segmentActive}`);
+    reevaluate(roundKey, s);
+}
+/** index.ts `subagent_spawned`：记录本轮见过子任务并 +1 活跃数。 */
+export function turnOnSubagentSpawn(roundKey, gen) {
+    const s = stateOf(roundKey, gen);
+    if (!s)
+        return;
+    s.sawSubagent = true;
+    s.activeChildren += 1;
+    clearTimer(s);
+    s.eligible = false;
+    console.log(`${DIAG} spawn round=${roundKey}#${gen} activeChildren=${s.activeChildren} sawSubagent=${s.sawSubagent}`);
+}
+/** index.ts `subagent_ended` / monitor settle：活跃子任务数 -1 并重新评估。 */
+export function turnOnSubagentEnded(roundKey, gen) {
+    const s = stateOf(roundKey, gen);
+    if (!s)
+        return;
+    if (s.activeChildren > 0)
+        s.activeChildren -= 1;
+    console.log(`${DIAG} childEnded round=${roundKey}#${gen} activeChildren=${s.activeChildren}`);
+    reevaluate(roundKey, s);
+}
+/**
+ * 监控层对账：本轮全部已知子任务完成（settle 触发）。与 subagent_ended 事件互补，
+ * 覆盖个别 ended 事件丢失导致计数器不为 0、从而永远等不到收尾信号的情况。
+ */
+export function turnOnAllChildrenDone(roundKey, gen) {
+    const s = stateOf(roundKey, gen);
+    if (!s)
+        return;
+    s.activeChildren = 0;
+    console.log(`${DIAG} allChildrenDone round=${roundKey}#${gen} (settle reconcile)`);
+    reevaluate(roundKey, s);
+}
+/** lifecycle start（父会话新段开始）：清掉旧终态，等待该段终态。 */
+export function turnOnSegmentStart(roundKey, gen) {
+    const s = stateOf(roundKey, gen);
+    if (!s)
+        return;
+    s.lifecycleSeen = true;
+    s.segmentActive = true;
+    s.lastEnd = undefined;
+    s.eligible = false;
+    clearTimer(s);
+    console.log(`${DIAG} segmentStart round=${roundKey}#${gen} (resume/new segment begins)`);
+}
+/** lifecycle end/error（父会话某段结束）：记录是否 yield 后评估。 */
+export function turnOnSegmentEnd(roundKey, gen, info) {
+    const s = stateOf(roundKey, gen);
+    if (!s)
+        return;
+    s.lifecycleSeen = true;
+    s.segmentActive = false;
+    s.lastEnd = { ...info, at: Date.now() };
+    console.log(`${DIAG} segmentEnd round=${roundKey}#${gen} phase=${info.phase} ` +
+        `yielded=${info.yielded === true} stopReason=${info.stopReason ?? "(none)"} ` +
+        `children=${s.activeChildren}`);
+    reevaluate(roundKey, s);
+}
+/**
+ * 组内活动心跳（before_tool_call / thinking / assistant 等属于本轮的其它事件）：
+ * 说明父会话仍在工作，取消静默收尾计时，但不算“段已结束”。
+ */
+export function turnOnActivity(roundKey, gen) {
+    const s = stateOf(roundKey, gen);
+    if (!s)
+        return;
+    if (s.timer !== undefined) {
+        console.debug(`${DIAG} activity cancels fallback round=${roundKey}#${gen} (timer cleared)`);
+    }
+    clearTimer(s);
+    s.eligible = false;
+}
+/** wrapper 侧首次建轮后登记状态；sawSubagent 由后续 spawn 事件置位。 */
+export function turnEnsureRound(roundKey, gen) {
+    const existing = states.get(roundKey);
+    if (existing && existing.gen === gen)
+        return;
+    if (existing) {
+        // 同一 group 的新一代轮次：清掉旧代计时与状态，避免旧代事件/定时器干扰新轮。
+        clearTimer(existing);
+        console.log(`${DIAG} ensure new generation round=${roundKey}#${gen} (was #${existing.gen})`);
+    }
+    states.set(roundKey, {
+        gen,
+        sawSubagent: false,
+        activeChildren: 0,
+        dispatchReturned: false,
+        lifecycleSeen: false,
+        segmentActive: false,
+        eligible: false,
+    });
+}
+export function turnIsSawSubagent(roundKey, gen) {
+    return stateOf(roundKey, gen)?.sawSubagent === true;
+}
+export function turnIsEligible(roundKey, gen) {
+    return stateOf(roundKey, gen)?.eligible === true;
+}
+/** 收尾完成 / 中断 / 插件卸载后清理。 */
+export function turnForget(roundKey, gen) {
+    const s = stateOf(roundKey, gen);
+    if (!s)
+        return;
+    console.log(`${DIAG} forget round=${roundKey}#${gen} (round finished/cleaned)`);
+    clearTimer(s);
+    states.delete(roundKey);
+}
+/** 插件卸载时清理全部轮次状态。 */
+export function disposeTurnEndController() {
+    for (const s of states.values()) {
+        if (s.timer !== undefined)
+            clearTimeout(s.timer);
+    }
+    states.clear();
+}
+/** 单测辅助。 */
+export function __resetTurnEndControllerForTests() {
+    disposeTurnEndController();
+}
+/** 单测辅助：缩短各计时窗口，避免真实等待。 */
+export function __configureTurnEndForTests(overrides) {
+    if (overrides.nonYieldDebounceMs !== undefined)
+        NON_YIELD_DEBOUNCE_MS = overrides.nonYieldDebounceMs;
+    if (overrides.noLifecycleFallbackMs !== undefined)
+        NO_LIFECYCLE_FALLBACK_MS = overrides.noLifecycleFallbackMs;
+}
+//# sourceMappingURL=turn-end-controller.js.map

package/dist/src/turn-end-controller.js.map

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

package/dist/src/turn-end-controller.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=turn-end-controller.test.d.ts.map

package/dist/src/turn-end-controller.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-end-controller.test.d.ts","sourceRoot":"","sources":["../../src/turn-end-controller.test.ts"],"names":[],"mappings":""}

package/dist/src/turn-end-controller.test.js

@@ -0,0 +1,97 @@
+import { test, describe, beforeEach } from "node:test";
+import assert from "node:assert/strict";
+import { turnEnsureRound, turnOnDispatchReturned, turnOnSubagentSpawn, turnOnSubagentEnded, turnOnSegmentStart, turnOnSegmentEnd, turnOnActivity, turnIsEligible, turnIsSawSubagent, turnForget, __resetTurnEndControllerForTests, __configureTurnEndForTests, } from "./turn-end-controller.js";
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+describe("turn-end-controller（OpenClaw 7.1+/8.x 子任务整轮收尾）", () => {
+    beforeEach(() => {
+        __resetTurnEndControllerForTests();
+        __configureTurnEndForTests({
+            nonYieldDebounceMs: 20,
+            noLifecycleFallbackMs: 40,
+        });
+    });
+    test("顺序多子任务：仅首个/各段子任务完成不触发收尾，父会话非 yield 终态后才 eligible", async () => {
+        const rk = "acc:g1";
+        const gen = 1;
+        turnEnsureRound(rk, gen);
+        turnOnDispatchReturned(rk, gen);
+        // 第 1 段：start → spawn(child1) → yield end
+        turnOnSegmentStart(rk, gen);
+        turnOnSubagentSpawn(rk, gen);
+        turnOnSegmentEnd(rk, gen, { phase: "end", yielded: true, stopReason: "end_turn" });
+        assert.equal(turnIsEligible(rk, gen), false, "段以 yield 结束 → 不收尾");
+        // child1 完成
+        turnOnSubagentEnded(rk, gen);
+        assert.equal(turnIsEligible(rk, gen), false, "子任务完成但父会话可能 resume → 不立即收尾");
+        // 父会话 resume（新段）→ 派发 child2 → yield end
+        turnOnSegmentStart(rk, gen);
+        turnOnSubagentSpawn(rk, gen);
+        turnOnSegmentEnd(rk, gen, { phase: "end", yielded: true, stopReason: "end_turn" });
+        turnOnSubagentEnded(rk, gen);
+        assert.equal(turnIsEligible(rk, gen), false);
+        // 父会话最后一次 resume，产出最终答复后以非 yield 终态结束
+        turnOnSegmentStart(rk, gen);
+        turnOnSegmentEnd(rk, gen, { phase: "end", yielded: false, stopReason: "end_turn" });
+        await sleep(60);
+        assert.equal(turnIsEligible(rk, gen), true, "非 yield 终态 → 防抖后收尾");
+    });
+    test("子任务完成但父会话 resume 迟于旧兜底假设到达（慢 announce）→ 不提前收尾", async () => {
+        const rk = "acc:g2";
+        const gen = 1;
+        turnEnsureRound(rk, gen);
+        turnOnDispatchReturned(rk, gen);
+        turnOnSegmentStart(rk, gen);
+        turnOnSubagentSpawn(rk, gen);
+        turnOnSegmentEnd(rk, gen, { phase: "end", yielded: true });
+        turnOnSubagentEnded(rk, gen);
+        assert.equal(turnIsEligible(rk, gen), false);
+        // 父会话 resume 的 announce 投递时延不受控（与子任务时长无关），即便超过旧的
+        // “20s 兜底”假设也不得提前收尾——提前会拆 round，使后续同轮子任务丢 SUBAGENT_STAT。
+        await sleep(80);
+        assert.equal(turnIsEligible(rk, gen), false, "慢 announce 期间不能提前收尾");
+        // resume 终于到达：父会话新段产出最终答复并以非 yield 终态结束
+        turnOnSegmentStart(rk, gen);
+        turnOnSegmentEnd(rk, gen, { phase: "end", yielded: false });
+        await sleep(60);
+        assert.equal(turnIsEligible(rk, gen), true);
+    });
+    test("组内活动心跳可延续等待（父会话还在工作时不误收尾）", async () => {
+        const rk = "acc:g3";
+        const gen = 1;
+        turnEnsureRound(rk, gen);
+        turnOnDispatchReturned(rk, gen);
+        turnOnSegmentStart(rk, gen);
+        turnOnSubagentSpawn(rk, gen);
+        turnOnSegmentEnd(rk, gen, { phase: "end", yielded: true });
+        turnOnSubagentEnded(rk, gen);
+        // 兜底窗口内出现组内工具活动 → 取消收尾计时
+        turnOnActivity(rk, gen);
+        await sleep(80);
+        assert.equal(turnIsEligible(rk, gen), false, "心跳延续等待，不能提前收尾");
+        turnOnSegmentStart(rk, gen);
+        turnOnSegmentEnd(rk, gen, { phase: "end", yielded: false });
+        await sleep(60);
+        assert.equal(turnIsEligible(rk, gen), true);
+    });
+    test("lifecycle 完全不可见（订阅不可用）→ 兜底收尾且不悬挂", async () => {
+        const rk = "acc:g4";
+        const gen = 1;
+        turnEnsureRound(rk, gen);
+        turnOnDispatchReturned(rk, gen);
+        turnOnSubagentSpawn(rk, gen);
+        turnOnSubagentEnded(rk, gen);
+        await sleep(80);
+        assert.equal(turnIsEligible(rk, gen), true);
+    });
+    test("sawSubagent 标记来自 spawn 事件；turnForget 清理状态", () => {
+        const rk = "acc:g5";
+        const gen = 1;
+        turnEnsureRound(rk, gen);
+        assert.equal(turnIsSawSubagent(rk, gen), false);
+        turnOnSubagentSpawn(rk, gen);
+        assert.equal(turnIsSawSubagent(rk, gen), true);
+        turnForget(rk, gen);
+        assert.equal(turnIsSawSubagent(rk, gen), false);
+    });
+});
+//# sourceMappingURL=turn-end-controller.test.js.map

package/dist/src/turn-end-controller.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-end-controller.test.js","sourceRoot":"","sources":["../../src/turn-end-controller.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EACH,eAAe,EACf,sBAAsB,EACtB,mBAAmB,EACnB,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,UAAU,EACV,gCAAgC,EAChC,0BAA0B,GAC7B,MAAM,0BAA0B,CAAC;AAElC,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAEtF,QAAQ,CAAC,gDAAgD,EAAE,GAAG,EAAE;IAC5D,UAAU,CAAC,GAAG,EAAE;QACZ,gCAAgC,EAAE,CAAC;QACnC,0BAA0B,CAAC;YACvB,kBAAkB,EAAE,EAAE;YACtB,qBAAqB,EAAE,EAAE;SAC5B,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,EAAE,GAAG,QAAQ,CAAC;QACpB,MAAM,GAAG,GAAG,CAAC,CAAC;QACd,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QACzB,sBAAsB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAEhC,0CAA0C;QAC1C,kBAAkB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC5B,mBAAmB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7B,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;QACnF,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,mBAAmB,CAAC,CAAC;QAElE,YAAY;QACZ,mBAAmB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,4BAA4B,CAAC,CAAC;QAE3E,wCAAwC;QACxC,kBAAkB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC5B,mBAAmB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7B,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;QACnF,mBAAmB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;QAE7C,sCAAsC;QACtC,kBAAkB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC5B,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;QACpF,MAAM,KAAK,CAAC,EAAE,CAAC,CAAC;QAChB,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,EAAE,GAAG,QAAQ,CAAC;QACpB,MAAM,GAAG,GAAG,CAAC,CAAC;QACd,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QACzB,sBAAsB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAChC,kBAAkB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC5B,mBAAmB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7B,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,mBAAmB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;QAC7C,iDAAiD;QACjD,yDAAyD;QACzD,MAAM,KAAK,CAAC,EAAE,CAAC,CAAC;QAChB,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAAC;QACpE,wCAAwC;QACxC,kBAAkB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC5B,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5D,MAAM,KAAK,CAAC,EAAE,CAAC,CAAC;QAChB,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;QACzC,MAAM,EAAE,GAAG,QAAQ,CAAC;QACpB,MAAM,GAAG,GAAG,CAAC,CAAC;QACd,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QACzB,sBAAsB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAChC,kBAAkB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC5B,mBAAmB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7B,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,mBAAmB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7B,yBAAyB;QACzB,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QACxB,MAAM,KAAK,CAAC,EAAE,CAAC,CAAC;QAChB,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;QAC9D,kBAAkB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC5B,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5D,MAAM,KAAK,CAAC,EAAE,CAAC,CAAC;QAChB,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,EAAE,GAAG,QAAQ,CAAC;QACpB,MAAM,GAAG,GAAG,CAAC,CAAC;QACd,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QACzB,sBAAsB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAChC,mBAAmB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7B,mBAAmB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7B,MAAM,KAAK,CAAC,EAAE,CAAC,CAAC;QAChB,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,EAAE,GAAG,QAAQ,CAAC;QACpB,MAAM,GAAG,GAAG,CAAC,CAAC;QACd,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QACzB,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;QAChD,mBAAmB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QAC/C,UAAU,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QACpB,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/src/types.d.ts

@@ -1,7 +1,10 @@
 /**
  * XG-IM Channel Plugin — 类型定义
  */
-import type { OpenClawConfig, OpenClawPluginApi, ChannelAccountSnapshot as SDKChannelAccountSnapshot, ChannelGatewayContext as SDKChannelGatewayContext, ChannelPlugin as SDKChannelPlugin, PluginRuntime } from "openclaw/plugin-sdk";
+import type { OpenClawConfig, ChannelPlugin as SDKChannelPlugin, PluginRuntime } from "openclaw/plugin-sdk/core";
+import type { OpenClawPluginApi } from "openclaw/plugin-sdk/channel-plugin-common";
+import type { ChannelAccountSnapshot as SDKChannelAccountSnapshot } from "openclaw/plugin-sdk/status-helpers";
+import type { ChannelGatewayContext as SDKChannelGatewayContext } from "openclaw/plugin-sdk/channel-contract";
 import type { RobotMentionAgentContext } from "./agent-context-types.js";
 export interface XgImPluginModule {
     id: string;
@@ -30,7 +33,9 @@ export interface AutoModelRoutingConfig {
 }
 /** IM 逻辑 NAS 根到当前 OpenClaw 宿主机真实根目录的映射。 */
 export interface NasVolumeRootMapping {
+    /** 跨机器一致的绝对逻辑根，例如 /data/touqian。 */
     logicalRoot: string;
+    /** 当前机器的真实 NAS 挂载根；仅插件内部可见，不得发送给 IM 客户端。 */
     hostRoot: string;
 }
 /** 单个机器人账户配置 */
@@ -85,8 +90,12 @@ export interface XgImAccountConfig {
     deliverSegmentBuffer?: boolean;
     /** 见 {@link XgImConfig.deliverPartialSnapshot} */
     deliverPartialSnapshot?: boolean;
+    /** 见 {@link XgImConfig.deliverAssistantItems} */
+    deliverAssistantItems?: boolean;
     /** Auto Model Routing（模型 + 推理等级自动路由）；默认关闭。 */
     autoModelRouting?: AutoModelRoutingConfig;
+    /** 见 {@link XgImConfig.dispatchDriver} */
+    dispatchDriver?: "auto" | "official" | "legacy";
 }
 /** OpenClaw block reply 合并阈值（可选；IM 默认不配） */
 export interface BlockStreamingCoalesceConfig {
@@ -164,8 +173,21 @@ export interface XgImConfig extends OpenClawConfig {
     syncServiceBaseUrl?: string;
     /** `agentContext.background` 与 `userInfo.background` 单段最大字符数（默认 15000） */
     projectPromptMaxChars?: number;
+    /**
+     * 当前 OpenClaw 服务所挂载 NAS 的站点编码。
+     * 配置路径为 channels.xg_cwork_im.nasSiteCode，默认 SZ_PRIMARY；该值会随 NAS 工作区结果回传客户端。
+     */
+    nasSiteCode?: string;
     /** 将 IM 的逻辑 realDir 根映射为当前 OpenClaw 宿主机上的真实根目录。 */
     nasVolumeRootMappings?: NasVolumeRootMapping[];
+    /** 单个插件进程中所有 Agent 共享的工作区活动请求上限，默认 32。 */
+    workspaceEventMaxConcurrency?: number;
+    /** 工作区活动请求中 FILE_REQUEST 的上限，默认 8。 */
+    workspaceEventMaxFileConcurrency?: number;
+    /** 同一个 agentId 同时执行的工作区请求上限，默认 2。 */
+    workspaceEventPerAgentConcurrency?: number;
+    /** 达到活动请求上限后允许等待的全局请求数，默认 64；设为 0 表示不排队。 */
+    workspaceEventQueueLimit?: number;
     /**
      * 是否在 assistant 每个 text 块结束（tool 调用前）通过 HTTP 发送中间正文。
      * 默认开启；设为 `false` 恢复「整轮结束才 deliver 一次」。
@@ -192,8 +214,21 @@ export interface XgImConfig extends OpenClawConfig {
      * 仅在快照包含缓冲文本时才覆盖，避免流式竞态下截断。
      */
     deliverPartialSnapshot?: boolean;
+    /**
+     * 是否改为订阅 OpenClaw `assistant` 流、按「每条 assistant 消息(item)」逐条 HTTP 投递。
+     * 默认 `true`：用 assistant item 的完整 text，避免 block reply 分块拼接丢换行，且不含 commentary；
+     * 设为 `false` 回退到 block reply 段缓冲聚合。
+     */
+    deliverAssistantItems?: boolean;
     /** Auto Model Routing（模型 + 推理等级自动路由）；默认关闭。 */
     autoModelRouting?: AutoModelRoutingConfig;
+    /**
+     * dispatch 内核驱动：`auto`（默认）= 宿主支持时用官方 assembled turn
+     * （runtime.channel.inbound.dispatchReply），否则回退 legacy；
+     * `official` 强制官方；`legacy` 强制旧路径（回退开关）。
+     * 也可用环境变量 `XG_CWORK_IM_DISPATCH_DRIVER=official|legacy` 覆盖。
+     */
+    dispatchDriver?: "auto" | "official" | "legacy";
 }
 /** GET /user/login/appkey 的响应 */
 export interface GetTokenResponse {
@@ -273,6 +308,12 @@ export interface WsMessageContent {
     type: string;
     /** 多附件；type 为 file 时由 IM 填至少一项 */
     files?: MsgFileVO[];
+    /**
+     * 透传给 AI 的扩展参数。已知键：
+     * - `ai_model`：单轮模型（`default`/`auto`/具体 model ref）；
+     * - `ai_thinking`：单轮推理强度（`off|minimal|low|medium|high|xhigh|adaptive|max|ultra`）。
+     * 两者均不进入 prompt（由 inbound-display 从 untrusted context 剔除）。
+     */
     ext?: Record<string, any>;
 }
 /** IM 在 robotMention 上下发的项目上下文（见 docs/im服务接口说明.md） */
@@ -294,6 +335,12 @@ export interface WsMessageParams {
          * 非空时写入 GroupSystemPrompt 的 `## 当前用户` 段。
          */
         background?: string;
+        /**
+         * 当前用户的原始业务 OpenAPI AppKey。
+         * 插件按「最后触发者」覆盖写入该会话的 exec 环境变量 `XG_OPENAPI_APP_KEY`，
+         * 供 skill / 命令以子进程方式调用业务 OpenAPI 时使用（不进入 LLM prompt）。
+         */
+        appKey?: string;
     };
     msgContent: WsMessageContent;
     /** 服务端可能返回 msgSendTime 或 timestamp */

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

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

package/dist/src/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAiSH,2DAA2D;AAC3D,MAAM,UAAU,kBAAkB,CAAC,MAA0B;IACzD,MAAM,CAAC,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACvC,IAAI,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACzB,MAAM,GAAG,GAA2B;QAChC,GAAG,EAAE,iBAAiB;QACtB,GAAG,EAAE,WAAW;QAChB,GAAG,EAAE,YAAY;QACjB,IAAI,EAAE,YAAY;QAClB,GAAG,EAAE,WAAW;QAChB,IAAI,EAAE,YAAY;QAClB,GAAG,EAAE,oBAAoB;QACzB,IAAI,EAAE,yEAAyE;QAC/E,GAAG,EAAE,+BAA+B;QACpC,IAAI,EAAE,2EAA2E;QACjF,GAAG,EAAE,0BAA0B;QAC/B,IAAI,EAAE,mEAAmE;QACzE,GAAG,EAAE,YAAY;QACjB,EAAE,EAAE,eAAe;QACnB,GAAG,EAAE,UAAU;QACf,GAAG,EAAE,iBAAiB;QACtB,GAAG,EAAE,YAAY;QACjB,GAAG,EAAE,WAAW;QAChB,GAAG,EAAE,WAAW;KACnB,CAAC;IACF,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAiUH,2DAA2D;AAC3D,MAAM,UAAU,kBAAkB,CAAC,MAA0B;IACzD,MAAM,CAAC,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACvC,IAAI,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACzB,MAAM,GAAG,GAA2B;QAChC,GAAG,EAAE,iBAAiB;QACtB,GAAG,EAAE,WAAW;QAChB,GAAG,EAAE,YAAY;QACjB,IAAI,EAAE,YAAY;QAClB,GAAG,EAAE,WAAW;QAChB,IAAI,EAAE,YAAY;QAClB,GAAG,EAAE,oBAAoB;QACzB,IAAI,EAAE,yEAAyE;QAC/E,GAAG,EAAE,+BAA+B;QACpC,IAAI,EAAE,2EAA2E;QACjF,GAAG,EAAE,0BAA0B;QAC/B,IAAI,EAAE,mEAAmE;QACzE,GAAG,EAAE,YAAY;QACjB,EAAE,EAAE,eAAe;QACnB,GAAG,EAAE,UAAU;QACf,GAAG,EAAE,iBAAiB;QACtB,GAAG,EAAE,YAAY;QACjB,GAAG,EAAE,WAAW;QAChB,GAAG,EAAE,WAAW;KACnB,CAAC;IACF,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC"}

package/dist/src/workspace-event-protocol.d.ts

@@ -0,0 +1,3 @@
+/** 工作区请求和结果共用一个 cmd，具体操作只通过 params.event 区分。 */
+export declare const OPENCLAW_WORKSPACE_EVENT_CMD = "openclawWorkspaceEvent";
+//# sourceMappingURL=workspace-event-protocol.d.ts.map

package/dist/src/workspace-event-protocol.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-event-protocol.d.ts","sourceRoot":"","sources":["../../src/workspace-event-protocol.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,eAAO,MAAM,4BAA4B,2BAA2B,CAAC"}

package/dist/src/workspace-event-protocol.js

@@ -0,0 +1,3 @@
+/** 工作区请求和结果共用一个 cmd，具体操作只通过 params.event 区分。 */
+export const OPENCLAW_WORKSPACE_EVENT_CMD = "openclawWorkspaceEvent";
+//# sourceMappingURL=workspace-event-protocol.js.map

package/dist/src/workspace-event-protocol.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-event-protocol.js","sourceRoot":"","sources":["../../src/workspace-event-protocol.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,MAAM,CAAC,MAAM,4BAA4B,GAAG,wBAAwB,CAAC"}

package/dist/src/workspace-event-scheduler.d.ts

@@ -0,0 +1,54 @@
+import type { XgImConfig } from "./types.js";
+/** 一台 OpenClaw 进程内共享的工作区并发默认值。 */
+export declare const DEFAULT_WORKSPACE_EVENT_MAX_CONCURRENCY = 32;
+export declare const DEFAULT_WORKSPACE_EVENT_MAX_FILE_CONCURRENCY = 8;
+export declare const DEFAULT_WORKSPACE_EVENT_PER_AGENT_CONCURRENCY = 2;
+export declare const DEFAULT_WORKSPACE_EVENT_QUEUE_LIMIT = 64;
+/**
+ * ws-notify 的回程路由默认 60 秒失效。排队超过 45 秒就返回 BUSY，给回包发送和
+ * 网络转发留出余量，避免插件完成了工作但客户端因 relay 已过期而收不到结果。
+ */
+export declare const WORKSPACE_EVENT_QUEUE_WAIT_MS = 45000;
+export type WorkspaceEventTaskKind = "TREE" | "FILE";
+export type WorkspaceEventBusyReason = "QUEUE_FULL" | "QUEUE_TIMEOUT";
+export interface WorkspaceEventConcurrencyLimits {
+    maxConcurrency: number;
+    maxFileConcurrency: number;
+    perAgentConcurrency: number;
+    queueLimit: number;
+    queueWaitMs: number;
+}
+/**
+ * 并发参数是机器级配置。即使某个旧配置绕过 schema，也在这里补默认值并保证
+ * 文件/单 Agent 上限不会大于全局上限。
+ */
+export declare function resolveWorkspaceEventConcurrencyLimits(config: Pick<XgImConfig, "workspaceEventMaxConcurrency" | "workspaceEventMaxFileConcurrency" | "workspaceEventPerAgentConcurrency" | "workspaceEventQueueLimit">): WorkspaceEventConcurrencyLimits;
+/**
+ * 进程级工作区调度器。一个插件进程中的所有机器人账户共享同一实例，避免把
+ * “每 Agent 并发”错误地放大为 Agent 数量乘以并发数。
+ */
+export declare class WorkspaceEventScheduler {
+    private activeTotal;
+    private activeFiles;
+    private readonly activeByAgent;
+    private readonly queue;
+    run<T>(args: {
+        agentKey: string;
+        kind: WorkspaceEventTaskKind;
+        limits: WorkspaceEventConcurrencyLimits;
+        task: () => Promise<T>;
+        onBusy: (reason: WorkspaceEventBusyReason) => T;
+    }): Promise<T>;
+    /** 只用于测试和运行监控，不暴露队列中的业务参数。 */
+    snapshot(): {
+        activeTotal: number;
+        activeFiles: number;
+        queued: number;
+    };
+    private canStart;
+    private start;
+    private drain;
+    private expire;
+}
+export declare const workspaceEventScheduler: WorkspaceEventScheduler;
+//# sourceMappingURL=workspace-event-scheduler.d.ts.map

package/dist/src/workspace-event-scheduler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-event-scheduler.d.ts","sourceRoot":"","sources":["../../src/workspace-event-scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,kCAAkC;AAClC,eAAO,MAAM,uCAAuC,KAAK,CAAC;AAC1D,eAAO,MAAM,4CAA4C,IAAI,CAAC;AAC9D,eAAO,MAAM,6CAA6C,IAAI,CAAC;AAC/D,eAAO,MAAM,mCAAmC,KAAK,CAAC;AAEtD;;;GAGG;AACH,eAAO,MAAM,6BAA6B,QAAS,CAAC;AAEpD,MAAM,MAAM,sBAAsB,GAAG,MAAM,GAAG,MAAM,CAAC;AACrD,MAAM,MAAM,wBAAwB,GAAG,YAAY,GAAG,eAAe,CAAC;AAEtE,MAAM,WAAW,+BAA+B;IAC5C,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACvB;AAqBD;;;GAGG;AACH,wBAAgB,sCAAsC,CAClD,MAAM,EAAE,IAAI,CACR,UAAU,EACR,8BAA8B,GAC9B,kCAAkC,GAClC,mCAAmC,GACnC,0BAA0B,CAC/B,GACF,+BAA+B,CAwBjC;AAED;;;GAGG;AACH,qBAAa,uBAAuB;IAChC,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA6B;IAC3D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAE3C,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE;QACT,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,sBAAsB,CAAC;QAC7B,MAAM,EAAE,+BAA+B,CAAC;QACxC,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;QACvB,MAAM,EAAE,CAAC,MAAM,EAAE,wBAAwB,KAAK,CAAC,CAAC;KACnD,GAAG,OAAO,CAAC,CAAC,CAAC;IA+Bd,8BAA8B;IAC9B,QAAQ,IAAI;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;IAQxE,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,KAAK;IAmBb,OAAO,CAAC,KAAK;IAab,OAAO,CAAC,MAAM;CAUjB;AAED,eAAO,MAAM,uBAAuB,yBAAgC,CAAC"}