@xgjktech/xg_cwork_im 1.17.25 → 1.17.26

package/dist/src/subagent-monitor.js

@@ -1,324 +1,205 @@
-import { getStreamClient } from "./agent-stream-client-registry.js";
-// ─── 模块级状态 ─────────────────────────────────────────────────────────
-/** childSessionKey → { groupId, runId } 反向索引 */
-const childToGroup = new Map();
-/** groupId → monitor */
-const groupMonitors = new Map();
-/** groupId → replyToMsgId（dispatch 写入，startMonitor 读取） */
-const groupReplyTo = new Map();
-/** 延迟的 FINISHED 信息：groupId → { reason, groupId, replyToMsgId } */
+import { completeActiveRound } from "./active-round-registry.js";
+const childToRound = new Map();
+const roundMonitors = new Map();
 const deferredFinished = new Map();
+const roundAdmissionTombstones = new Map();
+const childTombstones = new Map();
+const POLL_INTERVAL_MS = 15_000;
+const ROUND_TOMBSTONE_TTL_MS = 30_000;
+const CHILD_TOMBSTONE_TTL_MS = 5 * 60_000;
+const MAX_INCR_MSGS = 5;
+const MSG_TRUNCATE_LEN = 40;
 let tickerTimer = null;
 let pluginApi = null;
-const POLL_INTERVAL_MS = 15000;
-console.log(`[subagent-monitor] module loaded, POLL_INTERVAL=${POLL_INTERVAL_MS}ms`);
-// ─── 公开 API ─────────────────────────────────────────────────────────
 export function setPluginApi(api) {
     pluginApi = api;
-    console.log(`[subagent-monitor] setPluginApi called, api=${typeof api}`);
 }
-/** hook 调用：立即启动监控，发 HTTP 推送，首次 poll 立即执行 */
+function pruneTombstones(now = Date.now()) {
+    for (const [key, expiresAt] of roundAdmissionTombstones) {
+        if (expiresAt <= now)
+            roundAdmissionTombstones.delete(key);
+    }
+    for (const [key, expiresAt] of childTombstones) {
+        if (expiresAt <= now)
+            childTombstones.delete(key);
+    }
+}
+function stopTickerIfIdle() {
+    if (roundMonitors.size === 0 && tickerTimer) {
+        clearInterval(tickerTimer);
+        tickerTimer = null;
+    }
+}
+function removeMonitor(monitor) {
+    if (roundMonitors.get(monitor.roundKey)?.generation === monitor.generation) {
+        roundMonitors.delete(monitor.roundKey);
+    }
+    if (deferredFinished.get(monitor.roundKey)?.generation === monitor.generation) {
+        deferredFinished.delete(monitor.roundKey);
+    }
+    for (const record of monitor.subagents.values()) {
+        const indexed = childToRound.get(record.childSessionKey);
+        if (indexed?.roundKey === monitor.roundKey && indexed.generation === monitor.generation) {
+            childToRound.delete(record.childSessionKey);
+        }
+    }
+    stopTickerIfIdle();
+}
 export function startMonitor(params) {
-    const { groupId, agentId, spawn } = params;
-    console.log(`[subagent-monitor] startMonitor groupId=${groupId} agentId=${agentId} childSessionKey=${spawn.childSessionKey} runId=${spawn.runId}`);
-    let monitor = groupMonitors.get(groupId);
+    pruneTombstones();
+    if (roundAdmissionTombstones.has(params.roundKey))
+        return false;
+    let monitor = roundMonitors.get(params.roundKey);
+    if (monitor && monitor.generation !== params.generation) {
+        removeMonitor(monitor);
+        monitor = undefined;
+    }
     if (!monitor) {
         monitor = {
-            groupId,
-            agentId,
-            replyToMsgId: groupReplyTo.get(groupId) ?? undefined,
+            roundKey: params.roundKey,
+            generation: params.generation,
+            groupId: params.groupId,
+            agentId: params.agentId,
+            streamClient: params.streamClient,
+            replyToMsgId: params.replyToMsgId,
             subagents: new Map(),
-            startedAt: Date.now(),
         };
-        groupMonitors.set(groupId, monitor);
-        console.log(`[subagent-monitor] created new monitor for groupId=${groupId} agentId=${agentId}`);
-    }
-    if (monitor.subagents.has(spawn.runId)) {
-        console.log(`[subagent-monitor] duplicate subagent runId=${spawn.runId}, skipping`);
-        return;
+        roundMonitors.set(params.roundKey, monitor);
     }
-    monitor.subagents.set(spawn.runId, {
-        childSessionKey: spawn.childSessionKey,
-        runId: spawn.runId,
-        label: spawn.label,
+    if (monitor.subagents.has(params.spawn.runId))
+        return false;
+    const record = {
+        ...params.spawn,
         lastMsgIndex: 0,
         completed: false,
         messages: [],
-        startedAt: Date.now(),
         sendFrom: 0,
+    };
+    monitor.subagents.set(record.runId, record);
+    childToRound.set(record.childSessionKey, {
+        roundKey: monitor.roundKey,
+        generation: monitor.generation,
+        runId: record.runId,
     });
-    childToGroup.set(spawn.childSessionKey, { groupId, runId: spawn.runId });
-    console.log(`[subagent-monitor] subagent added, total subagents=${monitor.subagents.size}`);
-    // 立即发一次空状态，让前端第一时间看到 subagent 已启动
-    if (monitor.replyToMsgId) {
-        const client = getStreamClient(monitor.agentId);
-        if (client) {
-            sendWsStat(groupId, monitor, client, monitor.replyToMsgId);
-        }
-    }
+    sendWsStat(monitor, monitor.streamClient);
     ensureTickerRunning();
-    console.log(`[subagent-monitor] ensureTickerRunning done, tickerTimer=${tickerTimer !== null}`);
+    return true;
 }
-/** dispatch 中 BEGIN 后调用：写入 replyToMsgId */
-export function storeReplyToMsgId(groupId, replyToMsgId) {
-    console.log(`[subagent-monitor] storeReplyToMsgId groupId=${groupId} replyToMsgId=${replyToMsgId}`);
-    groupReplyTo.set(groupId, replyToMsgId);
-    const monitor = groupMonitors.get(groupId);
-    if (monitor) {
-        monitor.replyToMsgId = replyToMsgId;
-        console.log(`[subagent-monitor] storeReplyToMsgId: monitor exists, sending stat`);
-        const client = getStreamClient(monitor.agentId);
-        if (client) {
-            sendWsStat(groupId, monitor, client, replyToMsgId);
-        }
-    }
-    else {
-        console.log(`[subagent-monitor] storeReplyToMsgId: no monitor yet for groupId=${groupId}`);
-    }
-}
-/** 检查指定 groupId 是否有活跃的 subagent（用于判断是否延迟 FINISHED） */
-export function hasActiveSubagents(groupId) {
-    const monitor = groupMonitors.get(groupId);
-    if (!monitor) {
-        console.log(`[subagent-monitor] hasActiveSubagents: no monitor for groupId=${groupId}`);
-        return false;
-    }
-    const active = Array.from(monitor.subagents.values()).some(r => !r.completed);
-    console.log(`[subagent-monitor] hasActiveSubagents groupId=${groupId}: ${active} (total=${monitor.subagents.size})`);
-    return active;
+export function hasActiveSubagents(roundKey, generation) {
+    const monitor = roundMonitors.get(roundKey);
+    return Boolean(monitor &&
+        monitor.generation === generation &&
+        Array.from(monitor.subagents.values()).some((record) => !record.completed));
 }
-/** 记录延迟的 FINISHED，等所有 subagent 完成后发送 */
-export function deferFinished(groupId, reason, replyToMsgId) {
-    console.log(`[subagent-monitor] deferFinished groupId=${groupId} reason=${reason}`);
-    deferredFinished.set(groupId, { reason, groupId, replyToMsgId });
+export function deferFinished(roundKey, generation, reason) {
+    deferredFinished.set(roundKey, { reason, generation });
 }
-/** 发送延迟的 FINISHED（在所有 subagent 完成时调用） */
-async function sendDeferredFinished(groupId, monitor) {
-    const deferred = deferredFinished.get(groupId);
-    if (!deferred) {
-        console.log(`[subagent-monitor] sendDeferredFinished: no deferred FINISHED for groupId=${groupId}`);
-        return;
-    }
-    const client = getStreamClient(monitor.agentId);
-    if (!client) {
-        console.warn(`[subagent-monitor] sendDeferredFinished: no stream client for agentId=${monitor.agentId}`);
-        deferredFinished.delete(groupId);
-        return;
-    }
-    try {
-        await client.end(deferred.reason, {
-            groupId: deferred.groupId,
-            replyToMsgId: deferred.replyToMsgId,
-        });
-        console.log(`[subagent-monitor] sendDeferredFinished: FINISHED sent for groupId=${groupId} reason=${deferred.reason}`);
-    }
-    catch (err) {
-        console.error(`[subagent-monitor] sendDeferredFinished: error sending FINISHED: ${String(err)}`);
-    }
-    finally {
-        deferredFinished.delete(groupId);
-    }
+export function prepareSubagentInterrupt(roundKey, generation, now = Date.now()) {
+    pruneTombstones(now);
+    roundAdmissionTombstones.set(roundKey, now + ROUND_TOMBSTONE_TTL_MS);
+    const monitor = roundMonitors.get(roundKey);
+    if (!monitor || monitor.generation !== generation)
+        return [];
+    const result = Array.from(monitor.subagents.values()).map((record) => {
+        childTombstones.set(record.childSessionKey, now + CHILD_TOMBSTONE_TTL_MS);
+        return {
+            runId: record.runId,
+            label: record.label ?? record.runId.slice(0, 8),
+            status: record.completed ? "completed" : "suspended",
+            messages: record.messages,
+        };
+    });
+    removeMonitor(monitor);
+    return result;
 }
-/** subagent_ended hook 调用 */
 export function markSubagentCompleted(childSessionKey, runId) {
-    console.log(`[subagent-monitor] markSubagentCompleted childSessionKey=${childSessionKey} runId=${runId}`);
-    const entry = childToGroup.get(childSessionKey);
-    if (!entry) {
-        console.log(`[subagent-monitor] markSubagentCompleted: childSessionKey not found in childToGroup`);
+    pruneTombstones();
+    if (childTombstones.has(childSessionKey))
         return;
-    }
-    const monitor = groupMonitors.get(entry.groupId);
-    if (!monitor) {
-        console.log(`[subagent-monitor] markSubagentCompleted: monitor not found for groupId=${entry.groupId}`);
+    const entry = childToRound.get(childSessionKey);
+    if (!entry || entry.runId !== runId)
+        return;
+    const monitor = roundMonitors.get(entry.roundKey);
+    if (!monitor || monitor.generation !== entry.generation)
         return;
-    }
     const record = monitor.subagents.get(runId);
-    if (!record) {
-        console.log(`[subagent-monitor] markSubagentCompleted: runId not found in monitor`);
+    if (!record)
         return;
-    }
-    // 立即读取最新消息（补全 tick 间隔中可能遗漏的内容）
-    const readAndCheckCompletion = async () => {
-        if (pluginApi) {
-            try {
-                await readSubagentMessages(record);
-            }
-            catch (err) {
-                console.error(`[subagent-monitor] markSubagentCompleted: read error: ${String(err)}`);
-            }
+    void (async () => {
+        try {
+            await readSubagentMessages(record);
+        }
+        catch (err) {
+            console.error(`[subagent-monitor] completion read failed: ${String(err)}`);
         }
         record.completed = true;
-        console.log(`[subagent-monitor] markSubagentCompleted: marked completed for runId=${runId}`);
-        // ✅ 检查是否所有 subagent 都完成了
-        const allCompleted = Array.from(monitor.subagents.values()).every(r => r.completed);
-        if (allCompleted) {
-            console.log(`[subagent-monitor] markSubagentCompleted: all subagents completed for groupId=${entry.groupId}`);
-            // 发送最终 SUBAGENT_STAT
-            const client = getStreamClient(monitor.agentId);
-            if (client && monitor.replyToMsgId) {
-                try {
-                    const subagentList = Array.from(monitor.subagents.entries()).map(([rid, rec]) => ({
-                        runId: rid,
-                        label: rec.label ?? rid.slice(0, 8),
-                        status: rec.completed ? "completed" : "running",
-                        messages: rec.messages.slice(rec.sendFrom),
-                    }));
-                    await client.sendEvent({
-                        groupId: entry.groupId,
-                        replyToMsgId: monitor.replyToMsgId,
-                        event: "SUBAGENT_STAT",
-                        data: { subagentList },
-                    });
-                    console.log(`[subagent-monitor] markSubagentCompleted: final SUBAGENT_STAT sent`);
-                }
-                catch (err) {
-                    console.error(`[subagent-monitor] markSubagentCompleted: sendEvent error: ${String(err)}`);
-                }
-            }
-            // ✅ 发送延迟的 FINISHED（如果有的话）
-            await sendDeferredFinished(entry.groupId, monitor);
-            // 清理资源
-            console.log(`[subagent-monitor] markSubagentCompleted: cleaning up groupId=${entry.groupId}`);
-            for (const [childKey] of childToGroup) {
-                if (childToGroup.get(childKey)?.groupId === entry.groupId) {
-                    childToGroup.delete(childKey);
-                }
-            }
-            groupReplyTo.delete(entry.groupId);
-            groupMonitors.delete(entry.groupId);
-            stopTickerIfIdle();
+        await settleMonitorIfComplete(monitor);
+    })();
+}
+async function settleMonitorIfComplete(monitor) {
+    if (roundMonitors.get(monitor.roundKey) !== monitor)
+        return;
+    if (!Array.from(monitor.subagents.values()).every((record) => record.completed))
+        return;
+    const deferred = deferredFinished.get(monitor.roundKey);
+    const shouldCompleteRound = deferred?.generation === monitor.generation;
+    try {
+        await sendFinalStat(monitor, monitor.streamClient);
+        if (shouldCompleteRound && deferred) {
+            await monitor.streamClient.end(deferred.reason, {
+                groupId: monitor.groupId,
+                replyToMsgId: monitor.replyToMsgId,
+            });
         }
-    };
-    // 异步执行，不阻塞
-    readAndCheckCompletion().catch((err) => {
-        console.error(`[subagent-monitor] markSubagentCompleted: async error: ${String(err)}`);
-    });
+    }
+    catch (err) {
+        console.error(`[subagent-monitor] final state send failed: ${String(err)}`);
+    }
+    removeMonitor(monitor);
+    if (shouldCompleteRound) {
+        completeActiveRound(monitor.roundKey, monitor.generation);
+    }
 }
 async function readSubagentMessages(record) {
+    if (!pluginApi)
+        return;
     const result = await pluginApi.runtime.subagent.getSessionMessages({
         sessionKey: record.childSessionKey,
     });
     const messages = Array.isArray(result.messages) ? result.messages : [];
-    if (messages.length > record.lastMsgIndex) {
-        for (const msg of messages.slice(record.lastMsgIndex)) {
-            record.messages.push(cleanMsg(msg));
-        }
-        record.lastMsgIndex = messages.length;
-        console.log(`[subagent-monitor] readSubagentMessages: read ${messages.length} messages`);
-    }
+    for (const msg of messages.slice(record.lastMsgIndex))
+        record.messages.push(cleanMsg(msg));
+    record.lastMsgIndex = messages.length;
 }
-// ─── 内部 ticker ───────────────────────────────────────────────────────
 function ensureTickerRunning() {
-    console.log(`[subagent-monitor] ensureTickerRunning tickerTimer=${tickerTimer !== null}`);
     if (tickerTimer)
         return;
-    tick();
-    tickerTimer = setInterval(tick, POLL_INTERVAL_MS);
+    void tick();
+    tickerTimer = setInterval(() => void tick(), POLL_INTERVAL_MS);
     tickerTimer.unref?.();
-    console.log(`[subagent-monitor] ensureTickerRunning: ticker started, interval=${POLL_INTERVAL_MS}ms`);
-}
-function stopTickerIfIdle() {
-    console.log(`[subagent-monitor] stopTickerIfIdle monitors=${groupMonitors.size} tickerTimer=${tickerTimer !== null}`);
-    if (groupMonitors.size === 0 && tickerTimer) {
-        clearInterval(tickerTimer);
-        tickerTimer = null;
-        console.log(`[subagent-monitor] stopTickerIfIdle: ticker stopped`);
-    }
 }
 async function tick() {
-    console.log(`[subagent-monitor] tick start monitors=${groupMonitors.size}`);
-    if (groupMonitors.size === 0) {
+    if (roundMonitors.size === 0) {
         stopTickerIfIdle();
         return;
     }
-    for (const [groupId, monitor] of groupMonitors) {
-        console.log(`[subagent-monitor] tick processing groupId=${groupId}`);
-        try {
-            await pollMonitor(monitor);
-        }
-        catch (err) {
-            console.error(`[subagent-monitor] poll error groupId=${groupId}: ${String(err)}`);
-        }
-        if (Array.from(monitor.subagents.values()).every(r => r.completed)) {
-            const client = monitor.replyToMsgId ? getStreamClient(monitor.agentId) : undefined;
-            if (client && monitor.replyToMsgId) {
-                try {
-                    const subagentList = Array.from(monitor.subagents.entries()).map(([runId, record]) => ({
-                        runId,
-                        label: record.label ?? runId.slice(0, 8),
-                        status: record.completed ? "completed" : "running",
-                        messages: record.messages,
-                    }));
-                    await client.sendEvent({
-                        groupId,
-                        replyToMsgId: monitor.replyToMsgId,
-                        event: "SUBAGENT_STAT",
-                        data: { subagentList },
-                    });
-                    console.log(`[subagent-monitor] final SUBAGENT_STAT sent for groupId=${groupId}`);
-                    // ✅ 发送延迟的 FINISHED
-                    await sendDeferredFinished(groupId, monitor);
-                }
-                catch {
-                    console.log(`[subagent-monitor] WS unavailable, defer cleanup for groupId=${groupId}`);
-                    continue;
-                }
-            }
-            console.log(`[subagent-monitor] all completed, cleaning up groupId=${groupId}`);
-            for (const [childKey] of childToGroup) {
-                if (childToGroup.get(childKey)?.groupId === groupId)
-                    childToGroup.delete(childKey);
-            }
-            groupReplyTo.delete(groupId);
-            groupMonitors.delete(groupId);
-        }
-    }
-    stopTickerIfIdle();
-    console.log(`[subagent-monitor] tick end monitors=${groupMonitors.size}`);
-}
-async function pollMonitor(monitor) {
-    if (!pluginApi) {
-        console.log(`[subagent-monitor] pollMonitor: pluginApi not set, skipping`);
-        return;
-    }
-    console.log(`[subagent-monitor] pollMonitor start groupId=${monitor.groupId} subagents=${monitor.subagents.size}`);
-    let hasNewData = false;
-    for (const [runId, record] of monitor.subagents) {
-        if (record.completed) {
-            console.log(`[subagent-monitor] pollMonitor runId=${runId}: already completed, skip`);
-            continue;
-        }
-        console.log(`[subagent-monitor] pollMonitor runId=${runId}: polling childSessionKey=${record.childSessionKey}`);
+    for (const monitor of Array.from(roundMonitors.values())) {
         try {
-            const result = await pluginApi.runtime.subagent.getSessionMessages({
-                sessionKey: record.childSessionKey,
-            });
-            const messages = Array.isArray(result.messages) ? result.messages : [];
-            console.log(`[subagent-monitor] pollMonitor runId=${runId}: messages=${messages.length} lastMsgIndex=${record.lastMsgIndex}`);
-            if (messages.length > record.lastMsgIndex) {
-                const newMsgs = messages.slice(record.lastMsgIndex);
-                console.log(`[subagent-monitor] pollMonitor runId=${runId}: new messages=${newMsgs.length}`);
-                for (const msg of newMsgs) {
-                    record.messages.push(cleanMsg(msg));
-                    hasNewData = true;
-                }
-                record.lastMsgIndex = messages.length;
+            for (const record of monitor.subagents.values()) {
+                if (!record.completed)
+                    await readSubagentMessages(record);
             }
+            if (roundMonitors.get(monitor.roundKey) !== monitor)
+                continue;
+            sendWsStat(monitor, monitor.streamClient);
+            await settleMonitorIfComplete(monitor);
         }
         catch (err) {
-            console.error(`[subagent-monitor] pollMonitor runId=${runId}: getSessionMessages error: ${String(err)}`);
+            console.error(`[subagent-monitor] poll failed roundKey=${monitor.roundKey}: ${String(err)}`);
         }
     }
-    // 只要 monitor 有活跃 subagent，就发 SUBAGENT_STAT
-    if (monitor.replyToMsgId) {
-        const client = getStreamClient(monitor.agentId);
-        if (client) {
-            sendWsStat(monitor.groupId, monitor, client, monitor.replyToMsgId);
-        }
-    }
-    console.log(`[subagent-monitor] pollMonitor end`);
+    stopTickerIfIdle();
 }
-const MSG_TRUNCATE_LEN = 40;
 function cleanMsg(msg) {
     if (!msg || typeof msg !== "object")
         return "";
@@ -326,79 +207,79 @@ function cleanMsg(msg) {
     const role = typeof src.role === "string" ? src.role : "";
     if (role === "user")
         return "";
-    // toolResult → [工具] 工具名 已调用完成
     if (role === "toolResult" || role === "tool" || typeof src.toolCallId === "string") {
         const toolName = typeof src.toolName === "string" && src.toolName.trim() ? src.toolName.trim() : "工具";
         return `[工具] ${toolName} 已调用`;
     }
-    // assistant → [助手] 文本内容 + [调用X个工具]
-    if (role === "assistant") {
-        const content = Array.isArray(src.content) ? src.content : typeof src.content === "string" ? [{ type: "text", text: src.content }] : [];
-        let text = "";
-        let toolCount = 0;
-        for (const part of content) {
-            if (!part || typeof part !== "object")
-                continue;
-            const p = part;
-            if (p.type === "text" && typeof p.text === "string") {
-                text += p.text;
-            }
-            else if (p.type === "toolCall" || p.type === "tool_use") {
-                toolCount++;
-            }
-        }
-        text = text.length > MSG_TRUNCATE_LEN ? text.slice(0, MSG_TRUNCATE_LEN) + "…" : text;
-        let result = `[助手] ${text}`;
-        if (toolCount > 0)
-            result += ` [调用${toolCount}个工具]`;
-        return result;
+    if (role !== "assistant")
+        return "";
+    const content = Array.isArray(src.content)
+        ? src.content
+        : typeof src.content === "string"
+            ? [{ type: "text", text: src.content }]
+            : [];
+    let text = "";
+    let toolCount = 0;
+    for (const part of content) {
+        if (!part || typeof part !== "object")
+            continue;
+        const value = part;
+        if (value.type === "text" && typeof value.text === "string")
+            text += value.text;
+        else if (value.type === "toolCall" || value.type === "tool_use")
+            toolCount += 1;
     }
-    return "";
+    if (text.length > MSG_TRUNCATE_LEN)
+        text = `${text.slice(0, MSG_TRUNCATE_LEN)}…`;
+    return `[助手] ${text}${toolCount > 0 ? ` [调用${toolCount}个工具]` : ""}`;
 }
-const MAX_INCR_MSGS = 5;
-function sendWsStat(groupId, monitor, client, replyToMsgId) {
-    // 构建增量消息列表，同时记录每个 subagent 发了几条
-    const sentCounts = new Map();
-    const subagentList = Array.from(monitor.subagents.entries()).map(([runId, record]) => {
-        const newMsgs = record.messages.length > record.sendFrom
+function toSubagentList(monitor, incremental) {
+    return Array.from(monitor.subagents.values()).map((record) => ({
+        runId: record.runId,
+        label: record.label ?? record.runId.slice(0, 8),
+        status: record.completed ? "completed" : "running",
+        messages: incremental
             ? record.messages.slice(record.sendFrom, record.sendFrom + MAX_INCR_MSGS)
-            : [];
-        sentCounts.set(runId, newMsgs.length);
-        return {
-            runId,
-            label: record.label ?? runId.slice(0, 8),
-            status: record.completed ? "completed" : "running",
-            messages: newMsgs,
-        };
-    });
-    client.sendEvent({
-        groupId,
-        replyToMsgId,
+            : record.messages,
+    }));
+}
+function sendWsStat(monitor, client) {
+    const subagentList = toSubagentList(monitor, true);
+    client
+        .sendEvent({
+        groupId: monitor.groupId,
+        replyToMsgId: monitor.replyToMsgId,
         event: "SUBAGENT_STAT",
         data: { subagentList },
-    }).then(() => {
-        // 发送成功后推进游标
-        for (const [runId, count] of sentCounts) {
-            const record = monitor.subagents.get(runId);
+    })
+        .then(() => {
+        subagentList.forEach((item) => {
+            const record = monitor.subagents.get(item.runId);
             if (record)
-                record.sendFrom += count;
-        }
-    }).catch((err) => {
-        console.error(`[subagent-monitor] WS SUBAGENT_STAT failed: ${String(err)}`);
-        // 不推进游标，下次重试时消息不会丢失
+                record.sendFrom += item.messages.length;
+        });
+    })
+        .catch((err) => {
+        console.error(`[subagent-monitor] SUBAGENT_STAT failed: ${String(err)}`);
     });
 }
-function buildPayload(monitor) {
-    const subagents = Array.from(monitor.subagents.entries()).map(([runId, record]) => ({
-        runId,
-        label: record.label ?? runId.slice(0, 8),
-        status: record.completed ? "completed" : "running",
-        messages: record.messages,
-    }));
-    return {
-        ts: Date.now(),
+async function sendFinalStat(monitor, client) {
+    await client.sendEvent({
         groupId: monitor.groupId,
-        subagents,
-    };
+        replyToMsgId: monitor.replyToMsgId,
+        event: "SUBAGENT_STAT",
+        data: { subagentList: toSubagentList(monitor, false) },
+    });
+}
+export function __resetSubagentMonitorForTests() {
+    if (tickerTimer)
+        clearInterval(tickerTimer);
+    tickerTimer = null;
+    pluginApi = null;
+    childToRound.clear();
+    roundMonitors.clear();
+    deferredFinished.clear();
+    roundAdmissionTombstones.clear();
+    childTombstones.clear();
 }
 //# sourceMappingURL=subagent-monitor.js.map