@xgjktech/xg_cwork_im 1.19.21 → 1.19.23

package/dist/src/turn/interrupt-round.js

@@ -0,0 +1,44 @@
+import { completeActiveRound, prepareActiveRoundInterrupt, } from "./active-round-registry.js";
+import { prepareSubagentInterrupt } from "./subagent-monitor.js";
+import { clearSessionImContext } from "../session/session-im-context.js";
+export function prepareRoundInterrupt(accountId, groupId) {
+    const round = prepareActiveRoundInterrupt(accountId, groupId);
+    if (!round)
+        return undefined;
+    clearSessionImContext(round.sessionKey, round.replyToMsgId);
+    return {
+        round,
+        subagents: prepareSubagentInterrupt(round.roundKey, round.generation),
+    };
+}
+export async function finalizeRoundInterrupt(prepared) {
+    const { round, subagents } = prepared;
+    try {
+        if (subagents.length > 0) {
+            try {
+                await round.streamClient.sendEvent({
+                    groupId: round.groupId,
+                    replyToMsgId: round.replyToMsgId,
+                    event: "SUBAGENT_STAT",
+                    data: { subagentList: subagents },
+                });
+            }
+            catch (err) {
+                console.error(`[xg_cwork_im] [stop] suspended SUBAGENT_STAT failed: ${String(err)}`);
+            }
+        }
+        try {
+            await round.streamClient.end("aborted", {
+                groupId: round.groupId,
+                replyToMsgId: round.replyToMsgId,
+            });
+        }
+        catch (err) {
+            console.error(`[xg_cwork_im] [stop] FINISHED(aborted) failed: ${String(err)}`);
+        }
+    }
+    finally {
+        completeActiveRound(round.roundKey, round.generation);
+    }
+}
+//# sourceMappingURL=interrupt-round.js.map

package/dist/src/turn/interrupt-round.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interrupt-round.js","sourceRoot":"","sources":["../../../src/turn/interrupt-round.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,mBAAmB,EACnB,2BAA2B,GAE9B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,wBAAwB,EAA4B,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAOzE,MAAM,UAAU,qBAAqB,CACjC,SAAiB,EACjB,OAAe;IAEf,MAAM,KAAK,GAAG,2BAA2B,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC9D,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,qBAAqB,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC5D,OAAO;QACH,KAAK;QACL,SAAS,EAAE,wBAAwB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC;KACxE,CAAC;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,QAAgC;IACzE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC;IACtC,IAAI,CAAC;QACD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC;gBACD,MAAM,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC;oBAC/B,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,YAAY,EAAE,KAAK,CAAC,YAAY;oBAChC,KAAK,EAAE,eAAe;oBACtB,IAAI,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE;iBACpC,CAAC,CAAC;YACP,CAAC;YAAC,OAAO,GAAY,EAAE,CAAC;gBACpB,OAAO,CAAC,KAAK,CAAC,wDAAwD,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACzF,CAAC;QACL,CAAC;QACD,IAAI,CAAC;YACD,MAAM,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE;gBACpC,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,YAAY,EAAE,KAAK,CAAC,YAAY;aACnC,CAAC,CAAC;QACP,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACpB,OAAO,CAAC,KAAK,CAAC,kDAAkD,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnF,CAAC;IACL,CAAC;YAAS,CAAC;QACP,mBAAmB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC1D,CAAC;AACL,CAAC"}

package/dist/src/turn/interrupt-round.test.d.ts

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

package/dist/src/turn/interrupt-round.test.d.ts.map

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

package/dist/src/turn/interrupt-round.test.js

@@ -0,0 +1,133 @@
+import assert from "node:assert/strict";
+import { afterEach, describe, it } from "node:test";
+import { __resetActiveRoundRegistryForTests, prepareActiveRoundInterrupt, registerActiveRound, } from "./active-round-registry.js";
+import { finalizeRoundInterrupt, prepareRoundInterrupt } from "./interrupt-round.js";
+import { __resetSubagentMonitorForTests, markSubagentCompleted, startMonitor, } from "./subagent-monitor.js";
+import { getSessionImContext, setSessionImContext } from "../session/session-im-context.js";
+afterEach(() => {
+    __resetSubagentMonitorForTests();
+    __resetActiveRoundRegistryForTests();
+});
+function createClient(events, failSuspended = false) {
+    return {
+        start: async () => undefined,
+        streamProgress: async () => undefined,
+        streamUsage: async () => undefined,
+        sendEvent: async (event) => {
+            events.push(`${event.event}:${String(event.data.subagentList[0]?.status)}`);
+            if (failSuspended)
+                throw new Error("send failed");
+        },
+        end: async (reason) => {
+            events.push(`FINISHED:${reason}`);
+        },
+    };
+}
+describe("round interrupt", () => {
+    it("先发送 suspended，再发送 FINISHED(aborted)，并阻止旧 monitor 复活", async () => {
+        const events = [];
+        const round = registerActiveRound({
+            accountId: "account-a",
+            groupId: "group-1",
+            agentId: "main",
+            sessionKey: "session-1",
+            replyToMsgId: "reply-1",
+            streamClient: createClient(events),
+        });
+        assert.equal(startMonitor({
+            roundKey: round.roundKey,
+            generation: round.generation,
+            groupId: round.groupId,
+            agentId: round.agentId,
+            streamClient: round.streamClient,
+            replyToMsgId: round.replyToMsgId,
+            spawn: { childSessionKey: "child-1", runId: "run-1", label: "子任务" },
+        }), true);
+        events.length = 0;
+        setSessionImContext(round.sessionKey, {
+            groupId: round.groupId,
+            replyToMsgId: round.replyToMsgId,
+            agentId: round.agentId,
+        });
+        const prepared = prepareRoundInterrupt("account-a", "group-1");
+        assert.ok(prepared);
+        assert.equal(getSessionImContext(round.sessionKey), undefined);
+        assert.equal(prepared.subagents[0]?.status, "suspended");
+        assert.equal(startMonitor({
+            roundKey: round.roundKey,
+            generation: round.generation,
+            groupId: round.groupId,
+            agentId: round.agentId,
+            streamClient: round.streamClient,
+            replyToMsgId: round.replyToMsgId,
+            spawn: { childSessionKey: "child-late", runId: "run-late" },
+        }), false);
+        markSubagentCompleted("child-1", "run-1");
+        await finalizeRoundInterrupt(prepared);
+        assert.deepEqual(events, ["SUBAGENT_STAT:suspended", "FINISHED:aborted"]);
+        assert.equal(prepareActiveRoundInterrupt("account-a", "group-1"), undefined);
+    });
+    it("suspended 发送失败时仍尝试 aborted 并清理活动轮次", async () => {
+        const events = [];
+        const round = registerActiveRound({
+            accountId: "account-a",
+            groupId: "group-1",
+            agentId: "main",
+            sessionKey: "session-1",
+            replyToMsgId: "reply-1",
+            streamClient: createClient(events, true),
+        });
+        startMonitor({
+            roundKey: round.roundKey,
+            generation: round.generation,
+            groupId: round.groupId,
+            agentId: round.agentId,
+            streamClient: round.streamClient,
+            replyToMsgId: round.replyToMsgId,
+            spawn: { childSessionKey: "child-1", runId: "run-1" },
+        });
+        events.length = 0;
+        const prepared = prepareRoundInterrupt("account-a", "group-1");
+        assert.ok(prepared);
+        await finalizeRoundInterrupt(prepared);
+        assert.deepEqual(events, ["SUBAGENT_STAT:suspended", "FINISHED:aborted"]);
+        assert.equal(prepareActiveRoundInterrupt("account-a", "group-1"), undefined);
+    });
+    it("停止混合子 Agent 时保留 completed，并只把 running 改为 suspended", async () => {
+        const events = [];
+        const client = createClient(events);
+        const round = registerActiveRound({
+            accountId: "account-a",
+            groupId: "group-1",
+            agentId: "main",
+            sessionKey: "session-1",
+            replyToMsgId: "reply-1",
+            streamClient: client,
+        });
+        const common = {
+            roundKey: round.roundKey,
+            generation: round.generation,
+            groupId: round.groupId,
+            agentId: round.agentId,
+            streamClient: client,
+            replyToMsgId: round.replyToMsgId,
+        };
+        startMonitor({
+            ...common,
+            spawn: { childSessionKey: "child-complete", runId: "run-complete" },
+        });
+        startMonitor({
+            ...common,
+            spawn: { childSessionKey: "child-running", runId: "run-running" },
+        });
+        markSubagentCompleted("child-complete", "run-complete");
+        await new Promise((resolve) => setImmediate(resolve));
+        const prepared = prepareRoundInterrupt("account-a", "group-1");
+        assert.ok(prepared);
+        assert.deepEqual(prepared.subagents.map(({ runId, status }) => ({ runId, status })), [
+            { runId: "run-complete", status: "completed" },
+            { runId: "run-running", status: "suspended" },
+        ]);
+    });
+});
+//# sourceMappingURL=interrupt-round.test.js.map

package/dist/src/turn/interrupt-round.test.js.map

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

package/dist/src/turn/item-event-guard.d.ts

@@ -0,0 +1,28 @@
+/**
+ * `onItemEvent` 条目过滤：已由专用回调覆盖的条目（工具、Reasoning）不再进入
+ * RUN_EVENT 兜底，避免把内部诊断标识 `unmapped:*` 展示给最终用户。
+ */
+export interface ItemEventPayload {
+    toolCallId?: string;
+    kind?: string;
+    title?: string;
+    name?: string;
+    phase?: string;
+    status?: string;
+}
+export type ItemEventGuardResult = {
+    suppress: true;
+    reason: "tool" | "reasoning";
+} | {
+    suppress: false;
+    kind: string;
+    title: string;
+};
+/**
+ * 判断 `onItemEvent` 条目是否应被抑制：
+ * - 工具类（`toolCallId` 或 `kind=tool`）已由 onToolStart/onToolResult 覆盖；
+ * - Reasoning 条目（`kind=analysis` 且 `title=reasoning`）已由
+ *   onReasoningStream/onReasoningEnd 覆盖，同一条目 start/end 各触发一次，禁止重复投递。
+ */
+export declare function resolveItemEventGuard(p: ItemEventPayload): ItemEventGuardResult;
+//# sourceMappingURL=item-event-guard.d.ts.map

package/dist/src/turn/item-event-guard.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"item-event-guard.d.ts","sourceRoot":"","sources":["../../../src/turn/item-event-guard.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,gBAAgB;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,oBAAoB,GAC1B;IAAE,QAAQ,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,WAAW,CAAA;CAAE,GAChD;IAAE,QAAQ,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,gBAAgB,GAAG,oBAAoB,CAU/E"}

package/dist/src/turn/item-event-guard.js

@@ -0,0 +1,22 @@
+/**
+ * `onItemEvent` 条目过滤：已由专用回调覆盖的条目（工具、Reasoning）不再进入
+ * RUN_EVENT 兜底，避免把内部诊断标识 `unmapped:*` 展示给最终用户。
+ */
+/**
+ * 判断 `onItemEvent` 条目是否应被抑制：
+ * - 工具类（`toolCallId` 或 `kind=tool`）已由 onToolStart/onToolResult 覆盖；
+ * - Reasoning 条目（`kind=analysis` 且 `title=reasoning`）已由
+ *   onReasoningStream/onReasoningEnd 覆盖，同一条目 start/end 各触发一次，禁止重复投递。
+ */
+export function resolveItemEventGuard(p) {
+    if (p.toolCallId || p.kind === "tool") {
+        return { suppress: true, reason: "tool" };
+    }
+    const kind = String(p.kind ?? "").trim().toLowerCase();
+    const title = String(p.title ?? "").trim().toLowerCase();
+    if (kind === "analysis" && title === "reasoning") {
+        return { suppress: true, reason: "reasoning" };
+    }
+    return { suppress: false, kind, title };
+}
+//# sourceMappingURL=item-event-guard.js.map

package/dist/src/turn/item-event-guard.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"item-event-guard.js","sourceRoot":"","sources":["../../../src/turn/item-event-guard.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAeH;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,CAAmB;IACrD,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACpC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC9C,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACvD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACzD,IAAI,IAAI,KAAK,UAAU,IAAI,KAAK,KAAK,WAAW,EAAE,CAAC;QAC/C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IACnD,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AAC5C,CAAC"}

package/dist/src/turn/item-event-guard.test.d.ts

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

package/dist/src/turn/item-event-guard.test.d.ts.map

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

package/dist/src/turn/item-event-guard.test.js

@@ -0,0 +1,55 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import { resolveItemEventGuard } from "./item-event-guard.js";
+describe("item-event-guard", () => {
+    it("suppresses reasoning item start (phase=start)", () => {
+        const r = resolveItemEventGuard({
+            kind: "analysis",
+            title: "Reasoning",
+            phase: "start",
+            status: "running",
+        });
+        assert.equal(r.suppress, true);
+        assert.equal(r.reason, "reasoning");
+    });
+    it("suppresses reasoning item end (phase=end)", () => {
+        const r = resolveItemEventGuard({
+            kind: "analysis",
+            title: "Reasoning",
+            phase: "end",
+            status: "completed",
+        });
+        assert.equal(r.suppress, true);
+        assert.equal(r.reason, "reasoning");
+    });
+    it("suppresses tool-call items even when title is reasoning", () => {
+        const r = resolveItemEventGuard({
+            toolCallId: "call_123",
+            kind: "analysis",
+            title: "Reasoning",
+        });
+        assert.equal(r.suppress, true);
+        assert.equal(r.reason, "tool");
+    });
+    it("suppresses kind=tool items", () => {
+        const r = resolveItemEventGuard({ kind: "tool", title: "Web search" });
+        assert.equal(r.suppress, true);
+        assert.equal(r.reason, "tool");
+    });
+    it("matches reasoning case-insensitively with surrounding whitespace", () => {
+        const r = resolveItemEventGuard({ kind: " ANALYSIS ", title: " reasoning " });
+        assert.equal(r.suppress, true);
+    });
+    it("keeps supported user-facing progress events (not suppressed)", () => {
+        const r = resolveItemEventGuard({
+            kind: "search",
+            title: "Web search",
+            phase: "start",
+            status: "running",
+        });
+        assert.equal(r.suppress, false);
+        assert.equal(r.kind, "search");
+        assert.equal(r.title, "web search");
+    });
+});
+//# sourceMappingURL=item-event-guard.test.js.map

package/dist/src/turn/item-event-guard.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"item-event-guard.test.js","sourceRoot":"","sources":["../../../src/turn/item-event-guard.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACrD,MAAM,CAAC,GAAG,qBAAqB,CAAC;YAC5B,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,SAAS;SACpB,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC/B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACjD,MAAM,CAAC,GAAG,qBAAqB,CAAC;YAC5B,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,WAAW;SACtB,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC/B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QAC/D,MAAM,CAAC,GAAG,qBAAqB,CAAC;YAC5B,UAAU,EAAE,UAAU;YACtB,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,WAAW;SACrB,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC/B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAClC,MAAM,CAAC,GAAG,qBAAqB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;QACvE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC/B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QACxE,MAAM,CAAC,GAAG,qBAAqB,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;QAC9E,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACpE,MAAM,CAAC,GAAG,qBAAqB,CAAC;YAC5B,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,SAAS;SACpB,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAChC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC/B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/src/turn/run-usage-session.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 从 OpenClaw session store 读取本轮结束后的用量 entry。
+ * 使用 `skipCache: true`，避免读到 dispatch 前的缓存快照。
+ *
+ * entry 缺 `model` / `contextTokens` 时（preserveRuntimeModel 场景），用 `llm_output`
+ * 缓存的「生效模型 + 有效上下文预算」兜底，保证前端用量圆环有分母。
+ */
+import { type SessionUsageFields } from "./run-usage.js";
+export declare function readSessionUsageFields(args: {
+    storePath: string;
+    sessionKey: string;
+}): SessionUsageFields | undefined;
+//# sourceMappingURL=run-usage-session.d.ts.map

package/dist/src/turn/run-usage-session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-usage-session.d.ts","sourceRoot":"","sources":["../../../src/turn/run-usage-session.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,OAAO,EAA8B,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGrF,wBAAgB,sBAAsB,CAAC,IAAI,EAAE;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACtB,GAAG,kBAAkB,GAAG,SAAS,CAYjC"}

package/dist/src/turn/run-usage-session.js

@@ -0,0 +1,41 @@
+/**
+ * 从 OpenClaw session store 读取本轮结束后的用量 entry。
+ * 使用 `skipCache: true`，避免读到 dispatch 前的缓存快照。
+ *
+ * entry 缺 `model` / `contextTokens` 时（preserveRuntimeModel 场景），用 `llm_output`
+ * 缓存的「生效模型 + 有效上下文预算」兜底，保证前端用量圆环有分母。
+ */
+import { loadSessionStore, resolveSessionStoreEntry, } from "openclaw/plugin-sdk/session-store-runtime";
+import { mergeRunModelContextFields } from "./run-usage.js";
+import { readRunModelContext } from "../session/run-model-context.js";
+export function readSessionUsageFields(args) {
+    const storePath = args.storePath?.trim();
+    const sessionKey = args.sessionKey?.trim();
+    if (!storePath || !sessionKey)
+        return undefined;
+    const store = loadSessionStore(storePath, { skipCache: true });
+    const { existing } = resolveSessionStoreEntry({ store, sessionKey });
+    if (!existing)
+        return undefined;
+    const fields = pickUsageFields(existing);
+    const modelContext = readRunModelContext(sessionKey);
+    return modelContext ? mergeRunModelContextFields(fields, modelContext) : fields;
+}
+function pickUsageFields(entry) {
+    return {
+        ...(entry.modelProvider != null ? { modelProvider: entry.modelProvider } : {}),
+        ...(entry.model != null ? { model: entry.model } : {}),
+        ...(entry.inputTokens != null ? { inputTokens: entry.inputTokens } : {}),
+        ...(entry.outputTokens != null ? { outputTokens: entry.outputTokens } : {}),
+        ...(entry.totalTokens != null ? { totalTokens: entry.totalTokens } : {}),
+        ...(entry.totalTokensFresh != null ? { totalTokensFresh: entry.totalTokensFresh } : {}),
+        ...(entry.contextTokens != null ? { contextTokens: entry.contextTokens } : {}),
+        ...(entry.contextBudgetStatus?.promptBudgetBeforeReserve != null
+            ? { promptBudgetBeforeReserve: entry.contextBudgetStatus.promptBudgetBeforeReserve }
+            : {}),
+        ...(entry.cacheRead != null ? { cacheRead: entry.cacheRead } : {}),
+        ...(entry.cacheWrite != null ? { cacheWrite: entry.cacheWrite } : {}),
+        ...(entry.estimatedCostUsd != null ? { estimatedCostUsd: entry.estimatedCostUsd } : {}),
+    };
+}
+//# sourceMappingURL=run-usage-session.js.map

package/dist/src/turn/run-usage-session.js.map

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

package/dist/src/turn/run-usage.d.ts

@@ -0,0 +1,67 @@
+/**
+ * 一轮 dispatch 结束后的用量：从 OpenClaw session store 的结构化字段汇总，
+ * 供 WS `RUN_USAGE` 回传业务系统。
+ *
+ * 数据源唯一：`sessions.json` 中本 sessionKey 的 entry
+ * （agent-runner 在回合结束时写入 modelProvider / model / inputTokens / outputTokens 等）。
+ * 不解析 deliver 正文 usage footer / usage bar。
+ */
+import type { RunModelContext } from "../session/run-model-context.js";
+/** session store 中与用量相关的字段（子集） */
+export type SessionUsageFields = {
+    modelProvider?: string;
+    model?: string;
+    inputTokens?: number;
+    outputTokens?: number;
+    totalTokens?: number;
+    /** totalTokens 是否为最新上下文快照；false 表示已过期，前端以「~」近似展示 */
+    totalTokensFresh?: boolean;
+    /** 模型上下文窗口上限（圆环分母兜底） */
+    contextTokens?: number;
+    /** 提示词预算（contextBudgetStatus.promptBudgetBeforeReserve，圆环优先分母） */
+    promptBudgetBeforeReserve?: number;
+    cacheRead?: number;
+    cacheWrite?: number;
+    estimatedCostUsd?: number;
+};
+export type RunUsageSnapshot = {
+    provider?: string;
+    model?: string;
+    modelRef?: string;
+    inputTokens?: number;
+    outputTokens?: number;
+    totalTokens?: number;
+    totalTokensFresh?: boolean;
+    contextTokens?: number;
+    promptBudgetBeforeReserve?: number;
+    cacheReadTokens?: number;
+    cacheWriteTokens?: number;
+    estimatedCostUsd?: number;
+    runId?: string;
+    /** 固定为 session：结构化 session entry */
+    source: "session";
+};
+export type ImStreamRunUsageData = {
+    groupId: string;
+    replyToMsgId: string;
+    usage: RunUsageSnapshot;
+};
+/**
+ * entry 优先、`llm_output` 缓存兜底：entry 缺 model / contextTokens 时（preserveRuntimeModel
+ * 场景）用缓存的有效上下文预算与生效模型补全，保证前端用量圆环有分母。
+ */
+export declare function mergeRunModelContextFields(fields: SessionUsageFields, modelContext: RunModelContext): SessionUsageFields;
+/** 本轮是否值得发 RUN_USAGE（至少有模型或 token 之一）。 */
+export declare function hasReportableUsage(usage: RunUsageSnapshot | undefined): boolean;
+/**
+ * 从 session entry 构建用量快照。
+ * entry 缺字段时不捏造；完全无信息返回 undefined。
+ */
+export declare function buildRunUsageFromSessionEntry(entry: SessionUsageFields | undefined | null, opts?: {
+    runId?: string;
+}): RunUsageSnapshot | undefined;
+export declare function toImStreamRunUsageData(usage: RunUsageSnapshot, anchors: {
+    groupId: string;
+    replyToMsgId: string;
+}): ImStreamRunUsageData;
+//# sourceMappingURL=run-usage.d.ts.map

package/dist/src/turn/run-usage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-usage.d.ts","sourceRoot":"","sources":["../../../src/turn/run-usage.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEvE,kCAAkC;AAClC,MAAM,MAAM,kBAAkB,GAAG;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oDAAoD;IACpD,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,wBAAwB;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kEAAkE;IAClE,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,oCAAoC;IACpC,MAAM,EAAE,SAAS,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,gBAAgB,CAAC;CAC3B,CAAC;AAaF;;;GAGG;AACH,wBAAgB,0BAA0B,CACtC,MAAM,EAAE,kBAAkB,EAC1B,YAAY,EAAE,eAAe,GAC9B,kBAAkB,CAWpB;AAED,0CAA0C;AAC1C,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,gBAAgB,GAAG,SAAS,GAAG,OAAO,CAa/E;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CACzC,KAAK,EAAE,kBAAkB,GAAG,SAAS,GAAG,IAAI,EAC5C,IAAI,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAC1B,gBAAgB,GAAG,SAAS,CA0C9B;AAuBD,wBAAgB,sBAAsB,CAClC,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GACnD,oBAAoB,CAMtB"}

package/dist/src/turn/run-usage.js

@@ -0,0 +1,119 @@
+/**
+ * 一轮 dispatch 结束后的用量：从 OpenClaw session store 的结构化字段汇总，
+ * 供 WS `RUN_USAGE` 回传业务系统。
+ *
+ * 数据源唯一：`sessions.json` 中本 sessionKey 的 entry
+ * （agent-runner 在回合结束时写入 modelProvider / model / inputTokens / outputTokens 等）。
+ * 不解析 deliver 正文 usage footer / usage bar。
+ */
+function positiveInt(n) {
+    if (typeof n !== "number" || !Number.isFinite(n) || n < 0)
+        return undefined;
+    return Math.round(n);
+}
+function nonEmpty(s) {
+    if (typeof s !== "string")
+        return undefined;
+    const t = s.trim();
+    return t.length > 0 ? t : undefined;
+}
+/**
+ * entry 优先、`llm_output` 缓存兜底：entry 缺 model / contextTokens 时（preserveRuntimeModel
+ * 场景）用缓存的有效上下文预算与生效模型补全，保证前端用量圆环有分母。
+ */
+export function mergeRunModelContextFields(fields, modelContext) {
+    return {
+        ...fields,
+        ...(fields.modelProvider == null && modelContext.provider
+            ? { modelProvider: modelContext.provider }
+            : {}),
+        ...(fields.model == null && modelContext.model ? { model: modelContext.model } : {}),
+        ...(fields.contextTokens == null && modelContext.contextTokenBudget != null
+            ? { contextTokens: modelContext.contextTokenBudget }
+            : {}),
+    };
+}
+/** 本轮是否值得发 RUN_USAGE（至少有模型或 token 之一）。 */
+export function hasReportableUsage(usage) {
+    if (!usage)
+        return false;
+    if (usage.modelRef || usage.model || usage.provider)
+        return true;
+    if (usage.inputTokens != null ||
+        usage.outputTokens != null ||
+        usage.totalTokens != null ||
+        usage.cacheReadTokens != null ||
+        usage.cacheWriteTokens != null) {
+        return true;
+    }
+    return false;
+}
+/**
+ * 从 session entry 构建用量快照。
+ * entry 缺字段时不捏造；完全无信息返回 undefined。
+ */
+export function buildRunUsageFromSessionEntry(entry, opts) {
+    if (!entry)
+        return undefined;
+    const provider = nonEmpty(entry.modelProvider);
+    const model = nonEmpty(entry.model);
+    const modelRef = provider && model ? `${provider}/${model}` : model || undefined;
+    const inputTokens = positiveInt(entry.inputTokens);
+    const outputTokens = positiveInt(entry.outputTokens);
+    const cacheReadTokens = positiveInt(entry.cacheRead);
+    const cacheWriteTokens = positiveInt(entry.cacheWrite);
+    const estimatedCostUsd = typeof entry.estimatedCostUsd === "number" && Number.isFinite(entry.estimatedCostUsd)
+        ? entry.estimatedCostUsd
+        : undefined;
+    // totalTokens 为 OpenClaw 上下文 prompt 快照，用于「当前会话用量圆环」的分子。
+    // 缺 entry 值时**不做** input+output 兜底，避免把计费合计误当上下文占用。
+    const totalTokens = positiveInt(entry.totalTokens);
+    const totalTokensFresh = typeof entry.totalTokensFresh === "boolean" ? entry.totalTokensFresh : undefined;
+    const contextTokens = positiveInt(entry.contextTokens);
+    const promptBudgetBeforeReserve = positiveInt(entry.promptBudgetBeforeReserve);
+    const snapshot = {
+        ...(provider ? { provider } : {}),
+        ...(model ? { model } : {}),
+        ...(modelRef ? { modelRef } : {}),
+        ...(inputTokens != null ? { inputTokens } : {}),
+        ...(outputTokens != null ? { outputTokens } : {}),
+        ...(totalTokens != null ? { totalTokens } : {}),
+        ...(totalTokensFresh != null ? { totalTokensFresh } : {}),
+        ...(contextTokens != null ? { contextTokens } : {}),
+        ...(promptBudgetBeforeReserve != null ? { promptBudgetBeforeReserve } : {}),
+        ...(cacheReadTokens != null ? { cacheReadTokens } : {}),
+        ...(cacheWriteTokens != null ? { cacheWriteTokens } : {}),
+        ...(estimatedCostUsd != null ? { estimatedCostUsd } : {}),
+        ...(opts?.runId?.trim() ? { runId: opts.runId.trim() } : {}),
+        source: "session",
+    };
+    return hasReportableUsage(snapshot) ? snapshot : undefined;
+}
+function runUsageSnapshotToWire(usage) {
+    return {
+        source: usage.source,
+        ...(usage.provider ? { provider: usage.provider } : {}),
+        ...(usage.model ? { model: usage.model } : {}),
+        ...(usage.modelRef ? { modelRef: usage.modelRef } : {}),
+        ...(usage.inputTokens != null ? { inputTokens: usage.inputTokens } : {}),
+        ...(usage.outputTokens != null ? { outputTokens: usage.outputTokens } : {}),
+        ...(usage.totalTokens != null ? { totalTokens: usage.totalTokens } : {}),
+        ...(usage.totalTokensFresh != null ? { totalTokensFresh: usage.totalTokensFresh } : {}),
+        ...(usage.contextTokens != null ? { contextTokens: usage.contextTokens } : {}),
+        ...(usage.promptBudgetBeforeReserve != null
+            ? { promptBudgetBeforeReserve: usage.promptBudgetBeforeReserve }
+            : {}),
+        ...(usage.cacheReadTokens != null ? { cacheReadTokens: usage.cacheReadTokens } : {}),
+        ...(usage.cacheWriteTokens != null ? { cacheWriteTokens: usage.cacheWriteTokens } : {}),
+        ...(usage.estimatedCostUsd != null ? { estimatedCostUsd: usage.estimatedCostUsd } : {}),
+        ...(usage.runId ? { runId: usage.runId } : {}),
+    };
+}
+export function toImStreamRunUsageData(usage, anchors) {
+    return {
+        groupId: anchors.groupId,
+        replyToMsgId: anchors.replyToMsgId,
+        usage: runUsageSnapshotToWire(usage),
+    };
+}
+//# sourceMappingURL=run-usage.js.map

package/dist/src/turn/run-usage.js.map

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

package/dist/src/turn/run-usage.test.d.ts

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

package/dist/src/turn/run-usage.test.d.ts.map

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