@xgjktech/xg_cwork_im 1.19.43 → 1.19.45

package/dist/src/turn-agent-event-subscription.js

@@ -0,0 +1,289 @@
+/**
+ * 订阅 OpenClaw agent-event 流（lifecycle / thinking / compaction / plan）并把整轮级信号喂给
+ * turn-end-controller，同时为「非 wrapper 覆盖的 resume 段」补发 thinking/compaction 进度，
+ * 并统一承载计划更新（PLAN_STAT / PLAN_UPDATE）。
+ *
+ * 背景：OpenClaw 7.1+ / 8.x（lifecycle 语义一致；245 实测 2026.7.1-2）中，父会话每次
+ * sessions_spawn 都会挂起并结束当前段 run（lifecycle `yielded:true`），子任务返回后父会话被
+ * 自动 resume 成新段。dispatch wrapper 只覆盖首段，之后的 resume 段只有 agent-event 流能看到。
+ * 因此：
+ * - lifecycle 终态（sessionKey 必带）→ 判定「整轮是否真正结束」（P0）；
+ * - thinking / compaction（仅带 runId）→ 以 lifecycle start 建立的 runId→session 索引定位到轮次，
+ *   仅对非 wrapper 首段的 runId 转发，避免与 wrapper 回调重复展示（P1）；
+ * - plan → 同样以 runId→session 索引定位轮次，但**所有段**都走这里（dispatch 不再绑
+ *   replyOptions.onPlanUpdate）：progress_card 的更新在首段与 resume/settle 段同一条路径，
+ *   整轮最终计划状态不会因 resume 段绕开 wrapper 而丢失。
+ *
+ * handle 内绝不容忍抛错（事件订阅统一纪律）。
+ */
+import { findActiveRoundForSession } from "./active-round-registry.js";
+import { disposeAssistantItemDelivery, flushAssistantItem, handleAssistantItemEvent, } from "./assistant-item-delivery.js";
+import { getSharedMap } from "./process-shared-store.js";
+import { handleCorePlanUpdate } from "./plan-core-adapter.js";
+import { readCoreProgressCard } from "./plan-core-db.js";
+import { buildToolEventData } from "./tool-event-adapter.js";
+import { turnOnActivity, turnOnSegmentEnd, turnOnSegmentStart, } from "./turn-end-controller.js";
+const LOG_PREFIX = "[xg_cwork_im] [turn-agent-events]";
+const runIdToSessionKey = getSharedMap("turn-runid-to-session");
+const wrappedRunIdBySession = getSharedMap("turn-wrapped-runid");
+const lastThinkingByRound = getSharedMap("turn-thinking-last");
+/** 每轮 TOOL_EVENT 单调序号（前端据此丢弃乱序）。 */
+const toolEventSeqByRound = getSharedMap("turn-tool-event-seq");
+const THINKING_FORWARD_MIN_INTERVAL_MS = 600;
+const THINKING_DISPLAY_MAX = 160;
+function isXgImGroupSessionKey(sessionKey) {
+    return (sessionKey.startsWith("agent:") &&
+        sessionKey.includes(":xg_cwork_im:group:"));
+}
+function clipWsDisplay(text, max) {
+    const t = text.trim().replace(/\r\n/g, "\n").replace(/\n+/g, " ");
+    if (!t)
+        return "";
+    if (t.length <= max)
+        return t;
+    return `${t.slice(0, Math.max(0, max - 1))}…`;
+}
+async function safeStreamProgress(round, event, displayText, summary) {
+    try {
+        await round.streamClient.streamProgress({
+            groupId: round.groupId,
+            replyToMsgId: round.replyToMsgId,
+            event,
+            displayText,
+            ...(summary ? { summary } : {}),
+        });
+    }
+    catch (err) {
+        console.warn(`${LOG_PREFIX} ${event} progress failed: ${String(err)}`);
+    }
+}
+function forwardThinking(round, runId, text) {
+    const roundKey = round.roundKey;
+    const state = lastThinkingByRound.get(roundKey);
+    const now = Date.now();
+    if (!state || state.runId !== runId) {
+        lastThinkingByRound.set(roundKey, { runId, lastText: text, lastSentAt: 0, lastSentText: "" });
+        return;
+    }
+    state.lastText = text;
+    const delta = text.startsWith(state.lastSentText) ? text.slice(state.lastSentText.length) : text;
+    if (!delta.trim())
+        return;
+    if (now - state.lastSentAt < THINKING_FORWARD_MIN_INTERVAL_MS)
+        return;
+    state.lastSentAt = now;
+    state.lastSentText = text;
+    const display = clipWsDisplay(delta, THINKING_DISPLAY_MAX);
+    if (!display)
+        return;
+    void safeStreamProgress(round, "RUN_EVENT", display, "thinking");
+}
+function forwardCompaction(round, phase) {
+    void safeStreamProgress(round, "RUN_EVENT", phase === "start" ? "正在整理上下文…" : "上下文整理完成");
+}
+/**
+ * 记录 wrapper 首段 runId（dispatch wrapper 的 onAgentRunStart）。
+ * 该 run 的 thinking/compaction 已由 wrapper 回调展示，订阅侧跳过，避免重复。
+ */
+export function noteWrappedRunId(sessionKey, runId) {
+    if (sessionKey && runId) {
+        wrappedRunIdBySession.set(sessionKey, runId);
+        console.log(`${LOG_PREFIX} wrapperRunId session=${sessionKey} runId=${runId}`);
+    }
+}
+export function createTurnAgentEventHandler() {
+    return (event, _ctx) => {
+        try {
+            const stream = event.stream;
+            const runId = event.runId;
+            if (!runId)
+                return;
+            // assistant 流：按「每条 assistant 消息(item)」逐条投递正文（item 边界 = itemId 变化；
+            // 最后一条在 lifecycle 终态 flush）。commentary 不会走 assistant，故天然不含旁白。
+            //
+            // 注意：宿主对隐藏通道 run（isControlUiVisible=false）只在 lifecycle 流上保留 sessionKey，
+            // assistant/thinking/compaction 等流不带 sessionKey。故这里与 plan/thinking 一样，
+            // 优先用事件自带 sessionKey，缺失时回退到 lifecycle start 建立的 runId→session 索引。
+            if (stream === "assistant") {
+                const sessionKey = event.sessionKey ?? runIdToSessionKey.get(runId);
+                if (sessionKey && isXgImGroupSessionKey(sessionKey)) {
+                    handleAssistantItemEvent(sessionKey, event.data ?? {});
+                }
+                return;
+            }
+            // tool 流：结构化工具调用（仅 start/result），前端据此复刻 openclaw 的工具活动展示。
+            // 与 plan/thinking 一样，隐藏通道 run 不带 sessionKey，回退 runId→session 索引。
+            // 注意：这里不要求 sessionKey 命中 group 前缀，只以“能定位到活跃轮次”为准，
+            // 避免不同会话命名导致工具事件被误丢。
+            if (stream === "tool") {
+                const sessionKey = event.sessionKey ?? runIdToSessionKey.get(runId);
+                if (!sessionKey)
+                    return;
+                const round = findActiveRoundForSession(sessionKey);
+                if (!round)
+                    return;
+                const seq = (toolEventSeqByRound.get(round.roundKey) ?? 0) + 1;
+                toolEventSeqByRound.set(round.roundKey, seq);
+                const data = buildToolEventData({
+                    name: event.data?.name,
+                    toolCallId: event.data?.toolCallId,
+                    phase: event.data?.phase,
+                    args: event.data?.args,
+                    result: event.data?.result,
+                    isError: event.data?.isError,
+                    errorText: event.data?.toolErrorSummary,
+                    exitCode: event.data?.exitCode,
+                    diffStat: event.data?.diffStat,
+                    seq,
+                });
+                if (!data)
+                    return;
+                if (data.phase === "start") {
+                    console.log(`${LOG_PREFIX} TOOL_EVENT start name=${data.name} call=${data.callId} ` +
+                        `round=${round.roundKey}#${round.generation} argsKeys=${data.args ? Object.keys(data.args).join(",") : "none"}`);
+                }
+                turnOnActivity(round.roundKey, round.generation);
+                void round.streamClient
+                    .sendEvent({
+                    groupId: round.groupId,
+                    replyToMsgId: round.replyToMsgId,
+                    event: "TOOL_EVENT",
+                    data: {
+                        groupId: round.groupId,
+                        replyToMsgId: round.replyToMsgId,
+                        ...data,
+                    },
+                })
+                    .catch((err) => {
+                    console.warn(`${LOG_PREFIX} TOOL_EVENT send failed: ${String(err)}`);
+                });
+                return;
+            }
+            if (stream === "lifecycle") {
+                const sessionKey = event.sessionKey;
+                if (!sessionKey || !isXgImGroupSessionKey(sessionKey))
+                    return;
+                const phase = event.data?.phase;
+                const round = findActiveRoundForSession(sessionKey);
+                runIdToSessionKey.set(runId, sessionKey);
+                if (phase === "start") {
+                    console.log(`${LOG_PREFIX} lifecycle start runId=${runId} session=${sessionKey} ` +
+                        `round=${round ? `${round.roundKey}#${round.generation}` : "(none)"}`);
+                    if (round) {
+                        turnOnSegmentStart(round.roundKey, round.generation);
+                    }
+                    return;
+                }
+                if (phase === "end" || phase === "error") {
+                    flushAssistantItem(sessionKey);
+                    const info = {
+                        phase,
+                        yielded: event.data?.yielded === true,
+                        ...(typeof event.data?.stopReason === "string"
+                            ? { stopReason: event.data.stopReason }
+                            : {}),
+                    };
+                    console.log(`${LOG_PREFIX} lifecycle ${phase} runId=${runId} session=${sessionKey} ` +
+                        `yielded=${info.yielded} stopReason=${info.stopReason ?? "(none)"} ` +
+                        `round=${round ? `${round.roundKey}#${round.generation}` : "(none)"}`);
+                    if (round) {
+                        turnOnSegmentEnd(round.roundKey, round.generation, info);
+                    }
+                }
+                return;
+            }
+            if (stream === "plan") {
+                // 计划更新统一走全局 agent-event 的 plan 流：dispatch 只负责登记上下文
+                // （ActiveRound / plan-ws-registry），不再绑 replyOptions.onPlanUpdate。
+                // 这样首段与子任务返回后的 resume/settle 段走同一条路径，整轮最终计划状态
+                // 不会因为 resume 段绕开 wrapper 而丢失。
+                const sessionKey = runIdToSessionKey.get(runId);
+                if (!sessionKey)
+                    return;
+                const round = findActiveRoundForSession(sessionKey);
+                if (!round)
+                    return;
+                turnOnActivity(round.roundKey, round.generation);
+                console.log(`${LOG_PREFIX} plan forward runId=${runId} session=${sessionKey} ` +
+                    `round=${round.roundKey}#${round.generation}`);
+                const payload = {
+                    ...(typeof event.data?.phase === "string" ? { phase: event.data.phase } : {}),
+                    ...(typeof event.data?.title === "string" ? { title: event.data.title } : {}),
+                    ...(typeof event.data?.explanation === "string"
+                        ? { explanation: event.data.explanation }
+                        : {}),
+                    ...(Array.isArray(event.data?.steps)
+                        ? { steps: event.data.steps }
+                        : {}),
+                    ...(typeof event.data?.source === "string" ? { source: event.data.source } : {}),
+                };
+                const card = readCoreProgressCard({ agentId: round.agentId, sessionKey });
+                handleCorePlanUpdate({
+                    sessionKey,
+                    groupId: round.groupId,
+                    accountId: round.accountId,
+                    payload,
+                    ...(card?.markdown ? { markdown: card.markdown } : {}),
+                });
+                const title = typeof event.data?.title === "string" ? event.data.title.trim() : "";
+                const explanation = typeof event.data?.explanation === "string" ? event.data.explanation.trim() : "";
+                const display = title.length > 0
+                    ? clipWsDisplay(`正在更新计划：${title}`, 160)
+                    : explanation.length > 0
+                        ? clipWsDisplay(`计划更新：${explanation}`, 160)
+                        : "正在更新执行计划…";
+                void safeStreamProgress(round, "PLAN_UPDATE", display);
+                return;
+            }
+            if (stream === "thinking" || stream === "compaction") {
+                const sessionKey = runIdToSessionKey.get(runId);
+                if (!sessionKey)
+                    return;
+                const round = findActiveRoundForSession(sessionKey);
+                if (!round)
+                    return;
+                turnOnActivity(round.roundKey, round.generation);
+                const isWrappedRun = wrappedRunIdBySession.get(sessionKey) === runId;
+                if (isWrappedRun) {
+                    console.debug(`${LOG_PREFIX} ${stream} skip runId=${runId} session=${sessionKey} ` +
+                        `(wrapper first segment runId)`);
+                    return;
+                }
+                console.log(`${LOG_PREFIX} ${stream} forward runId=${runId} session=${sessionKey} ` +
+                    `round=${round.roundKey}#${round.generation}`);
+                if (stream === "thinking") {
+                    const text = typeof event.data?.text === "string" ? event.data.text : "";
+                    if (text.trim())
+                        forwardThinking(round, runId, text);
+                }
+                else if (stream === "compaction") {
+                    const phase = String(event.data?.phase ?? "");
+                    if (phase === "start" || phase === "end") {
+                        forwardCompaction(round, phase);
+                    }
+                }
+                return;
+            }
+        }
+        catch (err) {
+            console.warn(`${LOG_PREFIX} handle 内部异常，已吞: ${String(err)}`);
+        }
+    };
+}
+/** 插件卸载时清理全部事件索引。 */
+export function disposeTurnAgentEvents() {
+    runIdToSessionKey.clear();
+    wrappedRunIdBySession.clear();
+    lastThinkingByRound.clear();
+    toolEventSeqByRound.clear();
+    disposeAssistantItemDelivery();
+}
+export function registerTurnAgentEventSubscription(api) {
+    api.agent.events.registerAgentEventSubscription({
+        id: "xg-cwork-im-turn-progress",
+        description: "订阅 lifecycle/assistant/thinking/compaction/plan/tool：驱动整轮收尾判定（子任务 resume 场景的 FINISHED）、按 assistant item 逐条投递正文、resume 段思考/整理进度、resume 段计划更新转 PLAN_STAT，以及结构化 TOOL_EVENT（工具调用 start/result）。",
+        streams: ["lifecycle", "assistant", "thinking", "compaction", "plan", "tool"],
+        handle: createTurnAgentEventHandler(),
+    });
+}
+//# sourceMappingURL=turn-agent-event-subscription.js.map

package/dist/src/turn-agent-event-subscription.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-agent-event-subscription.js","sourceRoot":"","sources":["../../src/turn-agent-event-subscription.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EAAE,yBAAyB,EAAoB,MAAM,4BAA4B,CAAC;AACzF,OAAO,EACH,4BAA4B,EAC5B,kBAAkB,EAClB,wBAAwB,GAC3B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAA8B,MAAM,wBAAwB,CAAC;AAC1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EACH,cAAc,EACd,gBAAgB,EAChB,kBAAkB,GAErB,MAAM,0BAA0B,CAAC;AAElC,MAAM,UAAU,GAAG,mCAAmC,CAAC;AAEvD,MAAM,iBAAiB,GAAG,YAAY,CAAiB,uBAAuB,CAAC,CAAC;AAChF,MAAM,qBAAqB,GAAG,YAAY,CAAiB,oBAAoB,CAAC,CAAC;AACjF,MAAM,mBAAmB,GAAG,YAAY,CAGtC,oBAAoB,CAAC,CAAC;AACxB,oCAAoC;AACpC,MAAM,mBAAmB,GAAG,YAAY,CAAiB,qBAAqB,CAAC,CAAC;AAEhF,MAAM,gCAAgC,GAAG,GAAG,CAAC;AAC7C,MAAM,oBAAoB,GAAG,GAAG,CAAC;AAEjC,SAAS,qBAAqB,CAAC,UAAkB;IAC7C,OAAO,CACH,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC;QAC/B,UAAU,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAC7C,CAAC;AACN,CAAC;AAED,SAAS,aAAa,CAAC,IAAY,EAAE,GAAW;IAC5C,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClE,IAAI,CAAC,CAAC;QAAE,OAAO,EAAE,CAAC;IAClB,IAAI,CAAC,CAAC,MAAM,IAAI,GAAG;QAAE,OAAO,CAAC,CAAC;IAC9B,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AAClD,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC7B,KAAkB,EAClB,KAAkC,EAClC,WAAmB,EACnB,OAAgB;IAEhB,IAAI,CAAC;QACD,MAAM,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC;YACpC,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,KAAK;YACL,WAAW;YACX,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAClC,CAAC,CAAC;IACP,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACpB,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,IAAI,KAAK,qBAAqB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC3E,CAAC;AACL,CAAC;AAED,SAAS,eAAe,CAAC,KAAkB,EAAE,KAAa,EAAE,IAAY;IACpE,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IAChC,MAAM,KAAK,GAAG,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;QAClC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;QAC9F,OAAO;IACX,CAAC;IACD,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;IACtB,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACjG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QAAE,OAAO;IAC1B,IAAI,GAAG,GAAG,KAAK,CAAC,UAAU,GAAG,gCAAgC;QAAE,OAAO;IACtE,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC;IACvB,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;IAC1B,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;IAC3D,IAAI,CAAC,OAAO;QAAE,OAAO;IACrB,KAAK,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;AACrE,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAkB,EAAE,KAAa;IACxD,KAAK,kBAAkB,CACnB,KAAK,EACL,WAAW,EACX,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAC7C,CAAC;AACN,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,UAAkB,EAAE,KAAa;IAC9D,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC;QACtB,qBAAqB,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,GAAG,UAAU,yBAAyB,UAAU,UAAU,KAAK,EAAE,CAAC,CAAC;IACnF,CAAC;AACL,CAAC;AAED,MAAM,UAAU,2BAA2B;IAGvC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACnB,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;YAC5B,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;YAC1B,IAAI,CAAC,KAAK;gBAAE,OAAO;YAEnB,kEAAkE;YAClE,8DAA8D;YAC9D,EAAE;YACF,wEAAwE;YACxE,uEAAuE;YACvE,kEAAkE;YAClE,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;gBACzB,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACpE,IAAI,UAAU,IAAI,qBAAqB,CAAC,UAAU,CAAC,EAAE,CAAC;oBAClD,wBAAwB,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;gBAC3D,CAAC;gBACD,OAAO;YACX,CAAC;YAED,0DAA0D;YAC1D,iEAAiE;YACjE,kDAAkD;YAClD,qBAAqB;YACrB,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;gBACpB,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACpE,IAAI,CAAC,UAAU;oBAAE,OAAO;gBACxB,MAAM,KAAK,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAC;gBACpD,IAAI,CAAC,KAAK;oBAAE,OAAO;gBACnB,MAAM,GAAG,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC/D,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBAC7C,MAAM,IAAI,GAAG,kBAAkB,CAAC;oBAC5B,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI;oBACtB,UAAU,EAAE,KAAK,CAAC,IAAI,EAAE,UAAU;oBAClC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK;oBACxB,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI;oBACtB,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM;oBAC1B,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO;oBAC5B,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,gBAAgB;oBACvC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ;oBAC9B,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ;oBAC9B,GAAG;iBACN,CAAC,CAAC;gBACH,IAAI,CAAC,IAAI;oBAAE,OAAO;gBAClB,IAAI,IAAI,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;oBACzB,OAAO,CAAC,GAAG,CACP,GAAG,UAAU,0BAA0B,IAAI,CAAC,IAAI,SAAS,IAAI,CAAC,MAAM,GAAG;wBACvE,SAAS,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,UAAU,aAAa,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAClH,CAAC;gBACN,CAAC;gBACD,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;gBACjD,KAAK,KAAK,CAAC,YAAY;qBAClB,SAAS,CAAC;oBACP,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,YAAY,EAAE,KAAK,CAAC,YAAY;oBAChC,KAAK,EAAE,YAAY;oBACnB,IAAI,EAAE;wBACF,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,YAAY,EAAE,KAAK,CAAC,YAAY;wBAChC,GAAG,IAAI;qBACV;iBACJ,CAAC;qBACD,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;oBACpB,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,4BAA4B,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACzE,CAAC,CAAC,CAAC;gBACP,OAAO;YACX,CAAC;YAED,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;gBACzB,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;gBACpC,IAAI,CAAC,UAAU,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC;oBAAE,OAAO;gBAC9D,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC;gBAChC,MAAM,KAAK,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAC;gBACpD,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;gBACzC,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;oBACpB,OAAO,CAAC,GAAG,CACP,GAAG,UAAU,0BAA0B,KAAK,YAAY,UAAU,GAAG;wBACrE,SAAS,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CACxE,CAAC;oBACF,IAAI,KAAK,EAAE,CAAC;wBACR,kBAAkB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;oBACzD,CAAC;oBACD,OAAO;gBACX,CAAC;gBACD,IAAI,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;oBACvC,kBAAkB,CAAC,UAAU,CAAC,CAAC;oBAC/B,MAAM,IAAI,GAA4B;wBAClC,KAAK;wBACL,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI;wBACrC,GAAG,CAAC,OAAO,KAAK,CAAC,IAAI,EAAE,UAAU,KAAK,QAAQ;4BAC1C,CAAC,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE;4BACvC,CAAC,CAAC,EAAE,CAAC;qBACZ,CAAC;oBACF,OAAO,CAAC,GAAG,CACP,GAAG,UAAU,cAAc,KAAK,UAAU,KAAK,YAAY,UAAU,GAAG;wBACxE,WAAW,IAAI,CAAC,OAAO,eAAe,IAAI,CAAC,UAAU,IAAI,QAAQ,GAAG;wBACpE,SAAS,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CACxE,CAAC;oBACF,IAAI,KAAK,EAAE,CAAC;wBACR,gBAAgB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;oBAC7D,CAAC;gBACL,CAAC;gBACD,OAAO;YACX,CAAC;YAED,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;gBACpB,mDAAmD;gBACnD,kEAAkE;gBAClE,8CAA8C;gBAC9C,+BAA+B;gBAC/B,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAChD,IAAI,CAAC,UAAU;oBAAE,OAAO;gBACxB,MAAM,KAAK,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAC;gBACpD,IAAI,CAAC,KAAK;oBAAE,OAAO;gBACnB,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;gBACjD,OAAO,CAAC,GAAG,CACP,GAAG,UAAU,uBAAuB,KAAK,YAAY,UAAU,GAAG;oBAClE,SAAS,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,UAAU,EAAE,CAChD,CAAC;gBACF,MAAM,OAAO,GAA0B;oBACnC,GAAG,CAAC,OAAO,KAAK,CAAC,IAAI,EAAE,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC7E,GAAG,CAAC,OAAO,KAAK,CAAC,IAAI,EAAE,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC7E,GAAG,CAAC,OAAO,KAAK,CAAC,IAAI,EAAE,WAAW,KAAK,QAAQ;wBAC3C,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE;wBACzC,CAAC,CAAC,EAAE,CAAC;oBACT,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC;wBAChC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAuC,EAAE;wBAC/D,CAAC,CAAC,EAAE,CAAC;oBACT,GAAG,CAAC,OAAO,KAAK,CAAC,IAAI,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACnF,CAAC;gBACF,MAAM,IAAI,GAAG,oBAAoB,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;gBAC1E,oBAAoB,CAAC;oBACjB,UAAU;oBACV,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,SAAS,EAAE,KAAK,CAAC,SAAS;oBAC1B,OAAO;oBACP,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACzD,CAAC,CAAC;gBACH,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,EAAE,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnF,MAAM,WAAW,GACb,OAAO,KAAK,CAAC,IAAI,EAAE,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrF,MAAM,OAAO,GACT,KAAK,CAAC,MAAM,GAAG,CAAC;oBACZ,CAAC,CAAC,aAAa,CAAC,UAAU,KAAK,EAAE,EAAE,GAAG,CAAC;oBACvC,CAAC,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;wBACtB,CAAC,CAAC,aAAa,CAAC,QAAQ,WAAW,EAAE,EAAE,GAAG,CAAC;wBAC3C,CAAC,CAAC,WAAW,CAAC;gBACxB,KAAK,kBAAkB,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;gBACvD,OAAO;YACX,CAAC;YAED,IAAI,MAAM,KAAK,UAAU,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;gBACnD,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAChD,IAAI,CAAC,UAAU;oBAAE,OAAO;gBACxB,MAAM,KAAK,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAC;gBACpD,IAAI,CAAC,KAAK;oBAAE,OAAO;gBACnB,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;gBACjD,MAAM,YAAY,GAAG,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,KAAK,CAAC;gBACrE,IAAI,YAAY,EAAE,CAAC;oBACf,OAAO,CAAC,KAAK,CACT,GAAG,UAAU,IAAI,MAAM,eAAe,KAAK,YAAY,UAAU,GAAG;wBACpE,+BAA+B,CAClC,CAAC;oBACF,OAAO;gBACX,CAAC;gBACD,OAAO,CAAC,GAAG,CACP,GAAG,UAAU,IAAI,MAAM,kBAAkB,KAAK,YAAY,UAAU,GAAG;oBACvE,SAAS,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,UAAU,EAAE,CAChD,CAAC;gBACF,IAAI,MAAM,KAAK,UAAU,EAAE,CAAC;oBACxB,MAAM,IAAI,GAAG,OAAO,KAAK,CAAC,IAAI,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBACzE,IAAI,IAAI,CAAC,IAAI,EAAE;wBAAE,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;gBACzD,CAAC;qBAAM,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;oBACjC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;oBAC9C,IAAI,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;wBACvC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;oBACpC,CAAC;gBACL,CAAC;gBACD,OAAO;YACX,CAAC;QACL,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,oBAAoB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACjE,CAAC;IACL,CAAC,CAAC;AACN,CAAC;AAED,qBAAqB;AACrB,MAAM,UAAU,sBAAsB;IAClC,iBAAiB,CAAC,KAAK,EAAE,CAAC;IAC1B,qBAAqB,CAAC,KAAK,EAAE,CAAC;IAC9B,mBAAmB,CAAC,KAAK,EAAE,CAAC;IAC5B,mBAAmB,CAAC,KAAK,EAAE,CAAC;IAC5B,4BAA4B,EAAE,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,kCAAkC,CAAC,GAAsB;IACrE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,8BAA8B,CAAC;QAC5C,EAAE,EAAE,2BAA2B;QAC/B,WAAW,EACP,6LAA6L;QACjM,OAAO,EAAE,CAAC,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC;QAC7E,MAAM,EAAE,2BAA2B,EAAE;KACxC,CAAC,CAAC;AACP,CAAC"}

package/dist/src/turn-agent-event-subscription.test.d.ts

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

package/dist/src/turn-agent-event-subscription.test.d.ts.map

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

package/dist/src/turn-agent-event-subscription.test.js

@@ -0,0 +1,165 @@
+import assert from "node:assert/strict";
+import { describe, it, beforeEach } from "node:test";
+import { __resetActiveRoundRegistryForTests, registerActiveRound } from "./active-round-registry.js";
+import { clearAssistantItemSink, setAssistantItemSink } from "./assistant-item-sink.js";
+import { buildCorePlanId, resetCorePlanFirstSeenForTest } from "./plan-core-adapter.js";
+import { resetPlanWsRegistryForTest, setPlanWsClient } from "./plan-ws-registry.js";
+import { createTurnAgentEventHandler, disposeTurnAgentEvents, noteWrappedRunId, } from "./turn-agent-event-subscription.js";
+const GROUP = "2095067076652810241";
+const ACCOUNT = "assistant-1";
+const SESSION_KEY = `agent:${ACCOUNT}:xg_cwork_im:group:${GROUP}`;
+const RESUME_RUN = "announce:requester-settle:resume-run-1";
+const FIRST_SEGMENT_RUN = "first-segment-run-1";
+function makeRecordingClient() {
+    const events = [];
+    const progress = [];
+    const client = {
+        start: async () => { },
+        streamProgress: async (opts) => {
+            progress.push(opts);
+        },
+        streamUsage: async () => { },
+        sendEvent: async (opts) => {
+            events.push(opts);
+        },
+        end: async () => { },
+    };
+    return { client, events, progress };
+}
+function emit(handler, event) {
+    handler(event, {});
+}
+function registerRound(client) {
+    registerActiveRound({
+        accountId: ACCOUNT,
+        groupId: GROUP,
+        agentId: ACCOUNT,
+        sessionKey: SESSION_KEY,
+        replyToMsgId: "msg-1",
+        streamClient: client,
+    });
+}
+beforeEach(() => {
+    resetPlanWsRegistryForTest();
+    resetCorePlanFirstSeenForTest();
+    __resetActiveRoundRegistryForTests();
+    clearAssistantItemSink(SESSION_KEY);
+    disposeTurnAgentEvents();
+});
+describe("turn-agent-event-subscription plan 流", () => {
+    it("resume 段 plan 事件 → PLAN_STAT(tool) + PLAN_UPDATE", () => {
+        const { client, events, progress } = makeRecordingClient();
+        setPlanWsClient(GROUP, client, "msg-1");
+        registerRound(client);
+        const handler = createTurnAgentEventHandler();
+        emit(handler, {
+            runId: RESUME_RUN,
+            stream: "lifecycle",
+            sessionKey: SESSION_KEY,
+            data: { phase: "start" },
+        });
+        emit(handler, {
+            runId: RESUME_RUN,
+            stream: "plan",
+            data: {
+                phase: "update",
+                title: "Plan updated",
+                source: "openclaw",
+                steps: [
+                    { step: "备份", status: "completed" },
+                    { step: "校验", status: "completed" },
+                ],
+            },
+        });
+        assert.equal(events.length, 1);
+        assert.equal(events[0].event, "PLAN_STAT");
+        assert.equal(events[0].data.source, "tool");
+        assert.equal(events[0].data.plan.planId, buildCorePlanId(SESSION_KEY));
+        assert.equal(progress.length, 1);
+        assert.equal(progress[0].event, "PLAN_UPDATE");
+        assert.equal(progress[0].groupId, GROUP);
+    });
+    it("wrapper 首段 runId 的 plan 也走订阅（不再绑 dispatch）", () => {
+        const { client, events } = makeRecordingClient();
+        setPlanWsClient(GROUP, client, "msg-1");
+        registerRound(client);
+        const handler = createTurnAgentEventHandler();
+        emit(handler, {
+            runId: FIRST_SEGMENT_RUN,
+            stream: "lifecycle",
+            sessionKey: SESSION_KEY,
+            data: { phase: "start" },
+        });
+        noteWrappedRunId(SESSION_KEY, FIRST_SEGMENT_RUN);
+        emit(handler, {
+            runId: FIRST_SEGMENT_RUN,
+            stream: "plan",
+            data: { phase: "update", steps: [{ step: "A", status: "in_progress" }] },
+        });
+        assert.equal(events.length, 1);
+        assert.equal(events[0].event, "PLAN_STAT");
+    });
+    it("无 lifecycle 索引的 plan 事件静默忽略、不外抛", () => {
+        const { client, events } = makeRecordingClient();
+        setPlanWsClient(GROUP, client, "msg-1");
+        registerRound(client);
+        const handler = createTurnAgentEventHandler();
+        assert.doesNotThrow(() => emit(handler, {
+            runId: "unknown-run",
+            stream: "plan",
+            data: { phase: "update", steps: [{ step: "A", status: "pending" }] },
+        }));
+        assert.equal(events.length, 0);
+    });
+    it("空 steps 的 plan 事件不产 PLAN_STAT", () => {
+        const { client, events } = makeRecordingClient();
+        setPlanWsClient(GROUP, client, "msg-1");
+        registerRound(client);
+        const handler = createTurnAgentEventHandler();
+        emit(handler, {
+            runId: RESUME_RUN,
+            stream: "lifecycle",
+            sessionKey: SESSION_KEY,
+            data: { phase: "start" },
+        });
+        emit(handler, {
+            runId: RESUME_RUN,
+            stream: "plan",
+            data: { phase: "update", steps: [] },
+        });
+        assert.equal(events.length, 0);
+    });
+});
+describe("turn-agent-event-subscription assistant 流", () => {
+    it("隐藏通道 run 的 assistant 事件无 sessionKey 时回退 runId→session 索引投递", () => {
+        const { client } = makeRecordingClient();
+        registerRound(client);
+        const handler = createTurnAgentEventHandler();
+        const delivered = [];
+        setAssistantItemSink(SESSION_KEY, (itemId, text) => {
+            delivered.push({ itemId, text });
+        });
+        emit(handler, {
+            runId: FIRST_SEGMENT_RUN,
+            stream: "lifecycle",
+            sessionKey: SESSION_KEY,
+            data: { phase: "start" },
+        });
+        // 宿主对隐藏通道 run（isControlUiVisible=false）的 assistant 事件不带 sessionKey，仅带 runId。
+        emit(handler, {
+            runId: FIRST_SEGMENT_RUN,
+            stream: "assistant",
+            data: { itemId: "item-1", text: "第一条" },
+        });
+        // itemId 变化触发上一条 flush。
+        emit(handler, {
+            runId: FIRST_SEGMENT_RUN,
+            stream: "assistant",
+            data: { itemId: "item-2", text: "第二条" },
+        });
+        assert.equal(delivered.length, 1);
+        assert.equal(delivered[0].itemId, "item-1");
+        assert.equal(delivered[0].text, "第一条");
+    });
+});
+//# sourceMappingURL=turn-agent-event-subscription.test.js.map

package/dist/src/turn-agent-event-subscription.test.js.map

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

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

@@ -1,36 +1,36 @@
 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_LOOSE = `确实是这个问题：昨天那版虽然用了内嵌 SVG，但你现在的文档预览器没有把 SVG 正常渲染出来，所以流程看不到。
+
+我已经重新生成了一版**纯 Markdown 可读版**：
+
+- 不用 SVG
+新文件：
+
 -----`;
-const HOUTONG_BODY_TIGHT = `确实是这个问题：昨天那版虽然用了内嵌 SVG，但你现在的文档预览器没有把 SVG 正常渲染出来，所以流程看不到。
-我已经重新生成了一版**纯 Markdown 可读版**：
-- 不用 SVG
+const HOUTONG_BODY_TIGHT = `确实是这个问题：昨天那版虽然用了内嵌 SVG，但你现在的文档预览器没有把 SVG 正常渲染出来，所以流程看不到。
+我已经重新生成了一版**纯 Markdown 可读版**：
+- 不用 SVG
 新文件：`;
-const WORLD_CUP_PARTIAL = `| 场次 | 时间 |
-| --- | --- |
-| 1 | 21:00 |
+const WORLD_CUP_PARTIAL = `| 场次 | 时间 |
+| --- | --- |
+| 1 | 21:00 |
 | 2 |`;
-const WORLD_CUP_FULL = `| 场次 | 时间 |
-| --- | --- |
-| 1 | 21:00 |
-| 2 | 00:00 |
+const WORLD_CUP_FULL = `| 场次 | 时间 |
+| --- | --- |
+| 1 | 21:00 |
+| 2 | 00:00 |
 | 3 | 03:00 |`;
-const RT002_PART1 = `BEGIN_123
-
-## 一、背景
-
+const RT002_PART1 = `BEGIN_123
+
+## 一、背景
+
 随着人工智能技术的快速发展，企业级AI助手在提升工作效率中发挥着日益重要的作用。`;
-const RT002_PART2 = `- 工具调用的完整日志必须被记录，包括调用时间、调用者、工具名称。
-
-## 六、审计
-
+const RT002_PART2 = `- 工具调用的完整日志必须被记录，包括调用时间、调用者、工具名称。
+
+## 六、审计
+
 审计是AI助手治理的监督机制。`;
 function entry(textPart, hasMedia = false) {
     return {

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"}