@xgjktech/xg_cwork_im 1.17.53 → 1.17.55

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

@@ -0,0 +1,240 @@
+/**
+ * 整轮（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;
+/** 子任务全完成但父会话暂未 resume/无 lifecycle 时的静默兜底窗口。 */
+let RESUME_WAIT_FALLBACK_MS = 20_000;
+/** 完全没有 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 && s.lastEnd.yielded !== true) {
+        // 主会话 finish：最新一段父 run 是非 yield 终态 → 不会再 resume → 防抖后收尾。
+        setEligible(roundKey, s.gen, s, "non-yield-end");
+    }
+    else if (s.lifecycleSeen && s.lastEnd) {
+        // 最新一段以 yield 结束 → 主会话仍可能被 resume；等 runStart/新活动取消，
+        // 否则静默窗口后收尾（覆盖子任务完成但主会话无法被唤醒的 handoff 路径）。
+        armTimer(roundKey, s, RESUME_WAIT_FALLBACK_MS, "yield-end-wait-resume");
+    }
+    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.resumeWaitFallbackMs !== undefined)
+        RESUME_WAIT_FALLBACK_MS = overrides.resumeWaitFallbackMs;
+    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,91 @@
+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,
+            resumeWaitFallbackMs: 40,
+            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("子任务完成但父会话无法被唤醒（handoff）→ 静默兜底后收尾", 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);
+        await sleep(80);
+        assert.equal(turnIsEligible(rk, gen), true, "resume 未到来 → 兜底窗口后收尾");
+    });
+    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":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xgjktech/xg_cwork_im",
-  "version": "1.17.53",
+  "version": "1.17.55",
   "description": "XG CWork IM channel plugin for OpenClaw",
   "keywords": [
     "bot",
@@ -25,7 +25,7 @@
     "build": "tsc -p tsconfig.json",
     "type-check": "tsc -p tsconfig.json --noEmit",
     "lint": "tsc -p tsconfig.json --noEmit",
-    "test": "npm run build && node --test dist/src/account-reconciler.test.js dist/src/inbound-terminal-state.test.js dist/src/user-facing-errors.test.js dist/src/deliver-text.test.js dist/src/agent-context-types.test.js dist/src/build-project-prompt.test.js dist/src/nas-volumes.test.js dist/src/workspace-event.test.js dist/src/workspace-event-scheduler.test.js dist/src/connection-workspace-event.test.js dist/src/block-streaming-config.test.js dist/src/channel-disabled-account.test.js dist/src/per-message-fallback-notice.test.js dist/src/thinking-ws-progress.test.js dist/src/resource-file.test.js dist/src/turn-deliver-buffer.test.js dist/src/run-usage.test.js dist/src/ws-run-event-unmapped.test.js dist/src/item-event-guard.test.js dist/src/inbound-model.test.js dist/src/auto-model-router.test.js dist/src/channel-config.test.js dist/src/send-service.test.js dist/src/send-file-tool.test.js dist/src/plan-tool-result.test.js dist/src/plan-blocked-notice.test.js dist/src/plan-store-access.test.js dist/src/plan-tool-middleware.test.js dist/src/plan-event-subscription.test.js dist/src/plan-ws-registry.test.js dist/src/plan-stat-event.test.js dist/src/active-round-registry.test.js dist/src/interrupt-round.test.js dist/src/subagent-monitor.test.js dist/src/session-env-store.test.js dist/src/register-exec-env-hook.test.js dist/src/cron-appkey-binding-store.test.js dist/src/ws-inbound-schema.test.js",
+    "test": "npm run build && node --test dist/src/account-reconciler.test.js dist/src/inbound-terminal-state.test.js dist/src/user-facing-errors.test.js dist/src/deliver-text.test.js dist/src/agent-context-types.test.js dist/src/build-project-prompt.test.js dist/src/nas-volumes.test.js dist/src/workspace-event.test.js dist/src/workspace-event-scheduler.test.js dist/src/connection-workspace-event.test.js dist/src/block-streaming-config.test.js dist/src/channel-disabled-account.test.js dist/src/per-message-fallback-notice.test.js dist/src/thinking-ws-progress.test.js dist/src/resource-file.test.js dist/src/turn-deliver-buffer.test.js dist/src/run-usage.test.js dist/src/ws-run-event-unmapped.test.js dist/src/item-event-guard.test.js dist/src/inbound-model.test.js dist/src/auto-model-router.test.js dist/src/channel-config.test.js dist/src/send-service.test.js dist/src/send-file-tool.test.js dist/src/plan-tool-result.test.js dist/src/plan-blocked-notice.test.js dist/src/plan-store-access.test.js dist/src/plan-tool-middleware.test.js dist/src/plan-event-subscription.test.js dist/src/plan-ws-registry.test.js dist/src/plan-stat-event.test.js dist/src/active-round-registry.test.js dist/src/interrupt-round.test.js dist/src/subagent-monitor.test.js dist/src/turn-end-controller.test.js dist/src/session-env-store.test.js dist/src/register-exec-env-hook.test.js dist/src/cron-appkey-binding-store.test.js dist/src/ws-inbound-schema.test.js",
     "install:prod": "npm install --omit=dev",
     "prepublishOnly": "npm run build"
   },