@xgjktech/xg_cwork_im 1.19.41 → 1.19.42

package/dist/src/turn-deliver-buffer.js

@@ -0,0 +1,133 @@
+/**
+ * 一轮 dispatch 内的 assistant 正文段缓冲：
+ * - 同段修稿（新文延展/包住旧文）→ 覆盖
+ * - 流式分块新段 → 追加合并
+ * 在 tool 边界或轮次结束冲刷 HTTP。
+ */
+import { normalizeDeliverComparableText } from "./deliver-text.js";
+/** deliver 正文/附件是否值得写入 buffer 或立即 HTTP。 */
+export function isDeliverPayloadSendable(args) {
+    return Boolean(args.textPart) || (args.hasMedia && !args.isThinking);
+}
+/**
+ * 新文是否像对旧文的「修稿/延展」（可安全覆盖），而非另一完整分块。
+ * 无权威 OpenClaw 标记，偏保守：宁可追加重复，不可覆盖丢段。
+ */
+export function isDeliverTextRevision(oldText, newText) {
+    const oldN = normalizeDeliverComparableText(oldText);
+    const newN = normalizeDeliverComparableText(newText);
+    if (!oldN)
+        return true;
+    if (!newN)
+        return true;
+    if (oldN === newN)
+        return true;
+    if (newN.startsWith(oldN) || newN.includes(oldN))
+        return true;
+    if (oldN.startsWith(newN))
+        return true;
+    return false;
+}
+/**
+ * 段边界 / 轮末 flush 时，判断是否可用 `onPartialReply` 全量快照覆盖 deliver 拼接文本。
+ * 仅当快照（归一化后）与缓冲文本相等或为其超集时才覆盖，避免流式竞态下快照落后导致截断丢内容。
+ */
+export function snapshotSupersedesBufferText(snapshot, bufferText) {
+    const ns = normalizeDeliverComparableText(snapshot);
+    const nb = normalizeDeliverComparableText(bufferText);
+    if (!ns)
+        return false;
+    if (!nb)
+        return true;
+    return ns === nb || ns.includes(nb);
+}
+function mergeAppendedEntry(prev, next) {
+    const textPart = `${prev.rawTextPart}${next.rawTextPart}`;
+    const hasMedia = prev.hasMedia || next.hasMedia;
+    const payload = {
+        ...prev.payload,
+        ...next.payload,
+        text: textPart,
+    };
+    if (prev.payload.markdown != null || next.payload.markdown != null) {
+        payload.markdown = textPart;
+    }
+    if (!next.hasMedia && prev.hasMedia) {
+        if (prev.payload.mediaUrl != null)
+            payload.mediaUrl = prev.payload.mediaUrl;
+        if (prev.payload.mediaUrls != null)
+            payload.mediaUrls = prev.payload.mediaUrls;
+    }
+    const rawTextPart = `${prev.rawTextPart}${next.rawTextPart}`;
+    return { payload, textPart, rawTextPart, hasMedia };
+}
+export class TurnDeliverBuffer {
+    buffer;
+    lastFlushedComparable = "";
+    stats = {
+        writeCount: 0,
+        revisionOverwriteCount: 0,
+        segmentAppendCount: 0,
+        flushInterimCount: 0,
+        flushFinalCount: 0,
+        skippedDuplicateFlushCount: 0,
+    };
+    hasContent() {
+        return this.buffer !== undefined;
+    }
+    getStats() {
+        return { ...this.stats };
+    }
+    write(entry) {
+        this.stats.writeCount++;
+        if (!this.buffer) {
+            this.buffer = entry;
+            return;
+        }
+        if (isDeliverTextRevision(this.buffer.textPart, entry.textPart)) {
+            this.stats.revisionOverwriteCount++;
+            this.buffer = entry;
+            return;
+        }
+        this.stats.segmentAppendCount++;
+        this.buffer = mergeAppendedEntry(this.buffer, entry);
+    }
+    takeForFlush(kind) {
+        if (!this.buffer) {
+            return { status: "empty" };
+        }
+        const comparable = buildFlushComparable(this.buffer);
+        const entry = this.buffer;
+        // 仅抑制「纯文重复」；带附件的 flush 必须发出（interim 纯文 → final 文+附件）。
+        if (comparable.length > 0 &&
+            comparable === this.lastFlushedComparable &&
+            !entry.hasMedia) {
+            this.stats.skippedDuplicateFlushCount++;
+            this.clear();
+            return { status: "skipped_duplicate", entry };
+        }
+        this.clear();
+        if (kind === "interim") {
+            this.stats.flushInterimCount++;
+        }
+        else {
+            this.stats.flushFinalCount++;
+        }
+        if (comparable.length > 0) {
+            this.lastFlushedComparable = comparable;
+        }
+        return { status: "ready", entry };
+    }
+    clear() {
+        this.buffer = undefined;
+    }
+}
+function buildFlushComparable(entry) {
+    const text = normalizeDeliverComparableText(entry.textPart);
+    if (text)
+        return text;
+    if (entry.hasMedia)
+        return "[media-only]";
+    return "";
+}
+//# sourceMappingURL=turn-deliver-buffer.js.map

package/dist/src/turn-deliver-buffer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-deliver-buffer.js","sourceRoot":"","sources":["../../src/turn-deliver-buffer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,8BAA8B,EAAE,MAAM,mBAAmB,CAAC;AA4BnE,2CAA2C;AAC3C,MAAM,UAAU,wBAAwB,CAAC,IAIxC;IACG,OAAO,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AACzE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAAe,EAAE,OAAe;IAClE,MAAM,IAAI,GAAG,8BAA8B,CAAC,OAAO,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,8BAA8B,CAAC,OAAO,CAAC,CAAC;IACrD,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAC/B,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9D,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACvC,OAAO,KAAK,CAAC;AACjB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,4BAA4B,CAAC,QAAgB,EAAE,UAAkB;IAC7E,MAAM,EAAE,GAAG,8BAA8B,CAAC,QAAQ,CAAC,CAAC;IACpD,MAAM,EAAE,GAAG,8BAA8B,CAAC,UAAU,CAAC,CAAC;IACtD,IAAI,CAAC,EAAE;QAAE,OAAO,KAAK,CAAC;IACtB,IAAI,CAAC,EAAE;QAAE,OAAO,IAAI,CAAC;IACrB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,kBAAkB,CACvB,IAA0B,EAC1B,IAA0B;IAE1B,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAE1D,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC;IAChD,MAAM,OAAO,GAAwB;QACjC,GAAG,IAAI,CAAC,OAAO;QACf,GAAG,IAAI,CAAC,OAAO;QACf,IAAI,EAAE,QAAQ;KACjB,CAAC;IACF,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;QACjE,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAChC,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClC,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI;YAAE,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC5E,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI;YAAE,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IACnF,CAAC;IAED,MAAM,WAAW,GAAG,GAAG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAC7D,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC;AACxD,CAAC;AAED,MAAM,OAAO,iBAAiB;IAClB,MAAM,CAAmC;IACzC,qBAAqB,GAAG,EAAE,CAAC;IAClB,KAAK,GAA2B;QAC7C,UAAU,EAAE,CAAC;QACb,sBAAsB,EAAE,CAAC;QACzB,kBAAkB,EAAE,CAAC;QACrB,iBAAiB,EAAE,CAAC;QACpB,eAAe,EAAE,CAAC;QAClB,0BAA0B,EAAE,CAAC;KAChC,CAAC;IAEF,UAAU;QACN,OAAO,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC;IACrC,CAAC;IAED,QAAQ;QACJ,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,KAA2B;QAC7B,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YACpB,OAAO;QACX,CAAC;QAED,IAAI,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC9D,IAAI,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YACpB,OAAO;QACX,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACzD,CAAC;IAED,YAAY,CAAC,IAAsB;QAC/B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;QAC/B,CAAC;QAED,MAAM,UAAU,GAAG,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,sDAAsD;QACtD,IACI,UAAU,CAAC,MAAM,GAAG,CAAC;YACrB,UAAU,KAAK,IAAI,CAAC,qBAAqB;YACzC,CAAC,KAAK,CAAC,QAAQ,EACjB,CAAC;YACC,IAAI,CAAC,KAAK,CAAC,0BAA0B,EAAE,CAAC;YACxC,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,KAAK,EAAE,CAAC;QAClD,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;QAEb,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC;QACnC,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,qBAAqB,GAAG,UAAU,CAAC;QAC5C,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IACtC,CAAC;IAED,KAAK;QACD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC5B,CAAC;CACJ;AAED,SAAS,oBAAoB,CAAC,KAA2B;IACrD,MAAM,IAAI,GAAG,8BAA8B,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC5D,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IACtB,IAAI,KAAK,CAAC,QAAQ;QAAE,OAAO,cAAc,CAAC;IAC1C,OAAO,EAAE,CAAC;AACd,CAAC"}

package/dist/src/turn-deliver-buffer.test.d.ts

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

package/dist/src/turn-deliver-buffer.test.d.ts.map

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

package/dist/src/turn-deliver-buffer.test.js

@@ -0,0 +1,184 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import { isDeliverPayloadSendable, isDeliverTextRevision, snapshotSupersedesBufferText, TurnDeliverBuffer, } from "./turn-deliver-buffer.js";
+const HOUTONG_BODY_LOOSE = `确实是这个问题：昨天那版虽然用了内嵌 SVG，但你现在的文档预览器没有把 SVG 正常渲染出来，所以流程看不到。
+
+我已经重新生成了一版**纯 Markdown 可读版**：
+
+- 不用 SVG
+新文件：
+
+-----`;
+const HOUTONG_BODY_TIGHT = `确实是这个问题：昨天那版虽然用了内嵌 SVG，但你现在的文档预览器没有把 SVG 正常渲染出来，所以流程看不到。
+我已经重新生成了一版**纯 Markdown 可读版**：
+- 不用 SVG
+新文件：`;
+const WORLD_CUP_PARTIAL = `| 场次 | 时间 |
+| --- | --- |
+| 1 | 21:00 |
+| 2 |`;
+const WORLD_CUP_FULL = `| 场次 | 时间 |
+| --- | --- |
+| 1 | 21:00 |
+| 2 | 00:00 |
+| 3 | 03:00 |`;
+const RT002_PART1 = `BEGIN_123
+
+## 一、背景
+
+随着人工智能技术的快速发展，企业级AI助手在提升工作效率中发挥着日益重要的作用。`;
+const RT002_PART2 = `- 工具调用的完整日志必须被记录，包括调用时间、调用者、工具名称。
+
+## 六、审计
+
+审计是AI助手治理的监督机制。`;
+function entry(textPart, hasMedia = false) {
+    return {
+        payload: { text: textPart, ...(hasMedia ? { mediaUrl: "/tmp/a.md" } : {}) },
+        textPart,
+        rawTextPart: textPart,
+        hasMedia,
+    };
+}
+describe("isDeliverPayloadSendable", () => {
+    it("accepts text or non-thinking media", () => {
+        assert.equal(isDeliverPayloadSendable({ textPart: "hi", hasMedia: false }), true);
+        assert.equal(isDeliverPayloadSendable({ textPart: "", hasMedia: true }), true);
+        assert.equal(isDeliverPayloadSendable({ textPart: "", hasMedia: true, isThinking: true }), false);
+        assert.equal(isDeliverPayloadSendable({ textPart: "", hasMedia: false }), false);
+    });
+});
+describe("isDeliverTextRevision", () => {
+    it("treats growth / containment as revision", () => {
+        assert.equal(isDeliverTextRevision(WORLD_CUP_PARTIAL, WORLD_CUP_FULL), true);
+        assert.equal(isDeliverTextRevision("abc", "abcdef"), true);
+        assert.equal(isDeliverTextRevision("abcdef", "abc"), true);
+    });
+    it("treats disjoint later chunk as not revision", () => {
+        assert.equal(isDeliverTextRevision(RT002_PART1, RT002_PART2), false);
+    });
+});
+describe("snapshotSupersedesBufferText", () => {
+    it("allows override when snapshot equals buffer after normalization", () => {
+        // buffer 用 \n\n 连接分块，snapshot 为连续段落（单 \n）→ 归一化后相等
+        const buffer = "第一段\n\n第二段";
+        const snapshot = "第一段\n第二段";
+        assert.equal(snapshotSupersedesBufferText(snapshot, buffer), true);
+    });
+    it("allows override when snapshot is a superset (full > chunk)", () => {
+        assert.equal(snapshotSupersedesBufferText(WORLD_CUP_FULL, WORLD_CUP_PARTIAL), true);
+    });
+    it("refuses override when snapshot lags behind buffer (would truncate)", () => {
+        // 竞态：快照还没追上 deliver 的完整块 → 不能覆盖，否则截断丢内容
+        assert.equal(snapshotSupersedesBufferText(WORLD_CUP_PARTIAL, WORLD_CUP_FULL), false);
+    });
+    it("empty snapshot never supersedes; empty buffer always superseded", () => {
+        assert.equal(snapshotSupersedesBufferText("", "abc"), false);
+        assert.equal(snapshotSupersedesBufferText("abc", ""), true);
+    });
+});
+describe("TurnDeliverBuffer", () => {
+    it("revision overwrite keeps last version (and media)", () => {
+        const buf = new TurnDeliverBuffer();
+        buf.write(entry(HOUTONG_BODY_LOOSE));
+        buf.write(entry(HOUTONG_BODY_TIGHT));
+        buf.write(entry(HOUTONG_BODY_TIGHT, true));
+        const final = buf.takeForFlush("final");
+        assert.equal(final.status, "ready");
+        if (final.status === "ready") {
+            assert.equal(final.entry.textPart, HOUTONG_BODY_TIGHT);
+            assert.equal(final.entry.hasMedia, true);
+        }
+        assert.equal(buf.getStats().writeCount, 3);
+        assert.ok(buf.getStats().revisionOverwriteCount >= 1);
+        assert.equal(buf.getStats().flushFinalCount, 1);
+    });
+    it("appends additive stream chunks so BEGIN is not lost", () => {
+        const buf = new TurnDeliverBuffer();
+        buf.write(entry(RT002_PART1));
+        buf.write(entry(RT002_PART2));
+        const final = buf.takeForFlush("final");
+        assert.equal(final.status, "ready");
+        if (final.status === "ready") {
+            assert.ok(final.entry.textPart.includes("BEGIN_123"));
+            assert.ok(final.entry.textPart.includes("## 六、审计"));
+            assert.ok(final.entry.textPart.includes(RT002_PART1.trim()));
+            assert.ok(final.entry.textPart.includes(RT002_PART2.trim()));
+        }
+        assert.equal(buf.getStats().segmentAppendCount, 1);
+        assert.equal(buf.getStats().revisionOverwriteCount, 0);
+    });
+    it("interim flush clears buffer; final holds post-tool segment", () => {
+        const buf = new TurnDeliverBuffer();
+        buf.write(entry("先说明"));
+        const interim = buf.takeForFlush("interim");
+        assert.equal(interim.status, "ready");
+        buf.write(entry("最终结论"));
+        const final = buf.takeForFlush("final");
+        assert.equal(final.status, "ready");
+        if (final.status === "ready") {
+            assert.equal(final.entry.textPart, "最终结论");
+        }
+        assert.equal(buf.getStats().flushInterimCount, 1);
+        assert.equal(buf.getStats().flushFinalCount, 1);
+    });
+    it("skips final flush when comparable matches last interim (text-only)", () => {
+        const buf = new TurnDeliverBuffer();
+        buf.write(entry("正在查询…"));
+        assert.equal(buf.takeForFlush("interim").status, "ready");
+        buf.write(entry("正在查询…"));
+        assert.equal(buf.takeForFlush("final").status, "skipped_duplicate");
+        assert.equal(buf.getStats().skippedDuplicateFlushCount, 1);
+        assert.equal(buf.getStats().flushFinalCount, 0);
+        const dup = buf.takeForFlush("final");
+        assert.equal(dup.status, "empty");
+    });
+    it("skipped_duplicate still exposes entry for callers", () => {
+        const buf = new TurnDeliverBuffer();
+        buf.write(entry("说明文字"));
+        assert.equal(buf.takeForFlush("interim").status, "ready");
+        const withNoise = "说明文字\n\n_🟡 ↑111k ↓164 · 63%ctx · openai/gpt-5.5_";
+        buf.write(entry(withNoise));
+        const skipped = buf.takeForFlush("final");
+        assert.equal(skipped.status, "skipped_duplicate");
+        if (skipped.status === "skipped_duplicate") {
+            assert.equal(skipped.entry.textPart, withNoise);
+        }
+    });
+    it("does not skip final when same text gains attachment after interim", () => {
+        const buf = new TurnDeliverBuffer();
+        buf.write(entry("说明文字"));
+        assert.equal(buf.takeForFlush("interim").status, "ready");
+        buf.write(entry("说明文字", true));
+        const final = buf.takeForFlush("final");
+        assert.equal(final.status, "ready");
+        if (final.status === "ready") {
+            assert.equal(final.entry.hasMedia, true);
+            assert.equal(final.entry.textPart, "说明文字");
+        }
+    });
+    it("world cup table revision: only full table in final flush", () => {
+        const buf = new TurnDeliverBuffer();
+        buf.write(entry(WORLD_CUP_PARTIAL));
+        buf.write(entry(WORLD_CUP_FULL));
+        const final = buf.takeForFlush("final");
+        assert.equal(final.status, "ready");
+        if (final.status === "ready") {
+            assert.equal(final.entry.textPart, WORLD_CUP_FULL);
+        }
+        assert.equal(buf.getStats().revisionOverwriteCount, 1);
+        assert.equal(buf.getStats().segmentAppendCount, 0);
+    });
+    it("multi-tool: two interim + one final", () => {
+        const buf = new TurnDeliverBuffer();
+        buf.write(entry("段1"));
+        assert.equal(buf.takeForFlush("interim").status, "ready");
+        buf.write(entry("段2"));
+        assert.equal(buf.takeForFlush("interim").status, "ready");
+        buf.write(entry("结论"));
+        assert.equal(buf.takeForFlush("final").status, "ready");
+        assert.equal(buf.getStats().flushInterimCount, 2);
+        assert.equal(buf.getStats().flushFinalCount, 1);
+    });
+});
+//# sourceMappingURL=turn-deliver-buffer.test.js.map

package/dist/src/turn-deliver-buffer.test.js.map

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

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

@@ -0,0 +1,61 @@
+/**
+ * 整轮（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 事件完全不可达（订阅不可用等环境）时，靠静默兜底定时器收尾，保证不悬挂。
+ */
+export interface TurnSegmentTerminalInfo {
+    phase: "end" | "error";
+    yielded?: boolean;
+    stopReason?: string;
+}
+export declare function turnOnDispatchReturned(roundKey: string, gen: number): void;
+/** index.ts `subagent_spawned`：记录本轮见过子任务并 +1 活跃数。 */
+export declare function turnOnSubagentSpawn(roundKey: string, gen: number): void;
+/** index.ts `subagent_ended` / monitor settle：活跃子任务数 -1 并重新评估。 */
+export declare function turnOnSubagentEnded(roundKey: string, gen: number): void;
+/**
+ * 监控层对账：本轮全部已知子任务完成（settle 触发）。与 subagent_ended 事件互补，
+ * 覆盖个别 ended 事件丢失导致计数器不为 0、从而永远等不到收尾信号的情况。
+ */
+export declare function turnOnAllChildrenDone(roundKey: string, gen: number): void;
+/** lifecycle start（父会话新段开始）：清掉旧终态，等待该段终态。 */
+export declare function turnOnSegmentStart(roundKey: string, gen: number): void;
+/** lifecycle end/error（父会话某段结束）：记录是否 yield 后评估。 */
+export declare function turnOnSegmentEnd(roundKey: string, gen: number, info: TurnSegmentTerminalInfo): void;
+/**
+ * 组内活动心跳（before_tool_call / thinking / assistant 等属于本轮的其它事件）：
+ * 说明父会话仍在工作，取消静默收尾计时，但不算“段已结束”。
+ */
+export declare function turnOnActivity(roundKey: string, gen: number): void;
+/** wrapper 侧首次建轮后登记状态；sawSubagent 由后续 spawn 事件置位。 */
+export declare function turnEnsureRound(roundKey: string, gen: number): void;
+export declare function turnIsSawSubagent(roundKey: string, gen: number): boolean;
+export declare function turnIsEligible(roundKey: string, gen: number): boolean;
+/** 收尾完成 / 中断 / 插件卸载后清理。 */
+export declare function turnForget(roundKey: string, gen: number): void;
+/** 插件卸载时清理全部轮次状态。 */
+export declare function disposeTurnEndController(): void;
+/** 单测辅助。 */
+export declare function __resetTurnEndControllerForTests(): void;
+/** 单测辅助：缩短各计时窗口，避免真实等待。 */
+export declare function __configureTurnEndForTests(overrides: {
+    nonYieldDebounceMs?: number;
+    noLifecycleFallbackMs?: number;
+}): void;
+//# sourceMappingURL=turn-end-controller.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"turn-end-controller.d.ts","sourceRoot":"","sources":["../../src/turn-end-controller.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAIH,MAAM,WAAW,uBAAuB;IACpC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AA2GD,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAQ1E;AAED,qDAAqD;AACrD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAUvE;AAED,kEAAkE;AAClE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAQvE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAQzE;AAED,6CAA6C;AAC7C,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAWtE;AAED,mDAAmD;AACnD,wBAAgB,gBAAgB,CAC5B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,uBAAuB,GAC9B,IAAI,CAYN;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAUlE;AAED,qDAAqD;AACrD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAiBnE;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAExE;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAErE;AAED,2BAA2B;AAC3B,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAM9D;AAED,qBAAqB;AACrB,wBAAgB,wBAAwB,IAAI,IAAI,CAK/C;AAED,YAAY;AACZ,wBAAgB,gCAAgC,IAAI,IAAI,CAEvD;AAED,2BAA2B;AAC3B,wBAAgB,0BAA0B,CAAC,SAAS,EAAE;IAClD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAClC,GAAG,IAAI,CAGP"}

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