@xgjktech/xg_cwork_im 1.19.18 → 1.19.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +8 -1
- package/dist/index.js.map +1 -1
- package/dist/src/register-run-model-context-hook.d.ts +11 -0
- package/dist/src/register-run-model-context-hook.d.ts.map +1 -0
- package/dist/src/register-run-model-context-hook.js +23 -0
- package/dist/src/register-run-model-context-hook.js.map +1 -0
- package/dist/src/run-model-context.d.ts +45 -0
- package/dist/src/run-model-context.d.ts.map +1 -0
- package/dist/src/run-model-context.js +108 -0
- package/dist/src/run-model-context.js.map +1 -0
- package/dist/src/run-model-context.test.d.ts +2 -0
- package/dist/src/run-model-context.test.d.ts.map +1 -0
- package/dist/src/run-model-context.test.js +68 -0
- package/dist/src/run-model-context.test.js.map +1 -0
- package/dist/src/run-usage-session.d.ts +4 -1
- package/dist/src/run-usage-session.d.ts.map +1 -1
- package/dist/src/run-usage-session.js +8 -1
- package/dist/src/run-usage-session.js.map +1 -1
- package/dist/src/run-usage.d.ts +6 -0
- package/dist/src/run-usage.d.ts.map +1 -1
- package/dist/src/run-usage.js +16 -0
- package/dist/src/run-usage.js.map +1 -1
- package/dist/src/run-usage.test.js +52 -1
- package/dist/src/run-usage.test.js.map +1 -1
- package/package.json +2 -2
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA0CH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAK5D,OAAO,EAAE,uCAAuC,EAAE,MAAM,oCAAoC,CAAC;AAoD7F,QAAA,MAAM,MAAM,EAAE,qBAwQb,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -7,6 +7,7 @@ import { emptyPluginConfigSchema } from "openclaw/plugin-sdk/core";
|
|
|
7
7
|
import { setXgImRuntime, xgCworkImChannelPlugin } from "./src/channel.js";
|
|
8
8
|
import { buildGroupHistoryTool, extractXgCworkImConfig } from "./src/group-history-tool.js";
|
|
9
9
|
import { registerPerMessageModelHook } from "./src/register-per-message-model-hook.js";
|
|
10
|
+
import { registerRunModelContextHook } from "./src/register-run-model-context-hook.js";
|
|
10
11
|
import { registerCronAppKeyBindingHook, registerExecEnvHook } from "./src/register-exec-env-hook.js";
|
|
11
12
|
import { initSessionEnvPersistence, linkChildSession } from "./src/session-env-store.js";
|
|
12
13
|
import { buildSendFileTool } from "./src/send-file-tool.js";
|
|
@@ -51,7 +52,7 @@ function isGatewayProcess() {
|
|
|
51
52
|
*/
|
|
52
53
|
const MODULE_EPOCH = nextModuleEpoch();
|
|
53
54
|
/** 插件自身版本。⚠️ 手动维护：每次发版 bump package.json version 时同步改这里。 */
|
|
54
|
-
const PLUGIN_VERSION = "1.19.
|
|
55
|
+
const PLUGIN_VERSION = "1.19.19";
|
|
55
56
|
console.log(`[xg_cwork_im] [reload] module imported epoch=${MODULE_EPOCH} pid=${process.pid} title=${(process.title || "(none)").trim()} ` +
|
|
56
57
|
`pluginVersion=${PLUGIN_VERSION}`);
|
|
57
58
|
const plugin = {
|
|
@@ -72,6 +73,12 @@ const plugin = {
|
|
|
72
73
|
accountReconciler.setRuntime(api.runtime);
|
|
73
74
|
setPluginApi(api);
|
|
74
75
|
registerPerMessageModelHook(api);
|
|
76
|
+
try {
|
|
77
|
+
registerRunModelContextHook(api);
|
|
78
|
+
}
|
|
79
|
+
catch (err) {
|
|
80
|
+
console.warn(`[xg_cwork_im] [usage] registerRunModelContextHook failed: ${String(err)}`);
|
|
81
|
+
}
|
|
75
82
|
registerExecEnvHook(api);
|
|
76
83
|
registerCronAppKeyBindingHook(api);
|
|
77
84
|
api.registerChannel({ plugin: xgCworkImChannelPlugin });
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* llm_output hook：记录本回合「生效模型 + 有效上下文预算」。
|
|
3
|
+
*
|
|
4
|
+
* 供 RUN_USAGE 在 session entry 缺 `model` / `contextTokens` 时兜底
|
|
5
|
+
* （OpenClaw 在 preserveRuntimeModel 场景下只写用量、不写模型/上下文窗口）。
|
|
6
|
+
*
|
|
7
|
+
* `llm_output` 为较新 hook；宿主不支持时由调用方 try/catch 兜住，不影响主流程。
|
|
8
|
+
*/
|
|
9
|
+
import type { OpenClawPluginApi } from "openclaw/plugin-sdk/channel-plugin-common";
|
|
10
|
+
export declare function registerRunModelContextHook(api: OpenClawPluginApi): void;
|
|
11
|
+
//# sourceMappingURL=register-run-model-context-hook.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"register-run-model-context-hook.d.ts","sourceRoot":"","sources":["../../src/register-run-model-context-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAGnF,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAYxE"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* llm_output hook：记录本回合「生效模型 + 有效上下文预算」。
|
|
3
|
+
*
|
|
4
|
+
* 供 RUN_USAGE 在 session entry 缺 `model` / `contextTokens` 时兜底
|
|
5
|
+
* （OpenClaw 在 preserveRuntimeModel 场景下只写用量、不写模型/上下文窗口）。
|
|
6
|
+
*
|
|
7
|
+
* `llm_output` 为较新 hook；宿主不支持时由调用方 try/catch 兜住，不影响主流程。
|
|
8
|
+
*/
|
|
9
|
+
import { recordRunModelContext } from "./run-model-context.js";
|
|
10
|
+
export function registerRunModelContextHook(api) {
|
|
11
|
+
api.on("llm_output", (event, ctx) => {
|
|
12
|
+
recordRunModelContext(ctx?.sessionKey, {
|
|
13
|
+
provider: event.provider,
|
|
14
|
+
model: event.model,
|
|
15
|
+
resolvedRef: event.resolvedRef,
|
|
16
|
+
contextTokenBudget: event.contextTokenBudget,
|
|
17
|
+
contextWindowSource: event.contextWindowSource,
|
|
18
|
+
contextWindowReferenceTokens: event.contextWindowReferenceTokens,
|
|
19
|
+
runId: event.runId,
|
|
20
|
+
});
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=register-run-model-context-hook.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"register-run-model-context-hook.js","sourceRoot":"","sources":["../../src/register-run-model-context-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,MAAM,UAAU,2BAA2B,CAAC,GAAsB;IAC9D,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QAChC,qBAAqB,CAAC,GAAG,EAAE,UAAU,EAAE;YACnC,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;YAC9C,4BAA4B,EAAE,KAAK,CAAC,4BAA4B;YAChE,KAAK,EAAE,KAAK,CAAC,KAAK;SACrB,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 回合内「生效模型 + 有效上下文预算」的进程级缓存。
|
|
3
|
+
*
|
|
4
|
+
* 背景：OpenClaw 在 `preserveRuntimeModel`（模型 fallback / live switch 等）场景下，
|
|
5
|
+
* session entry 只写用量、不写 `model` / `contextTokens`，导致插件从 entry 读不到
|
|
6
|
+
* 上下文窗口，前端用量圆环拿不到分母。
|
|
7
|
+
*
|
|
8
|
+
* 数据源：OpenClaw 的 `llm_output` hook 事件带 `contextTokenBudget`（解析后的有效
|
|
9
|
+
* 上下文预算）、`contextWindowSource`、`provider` / `model` / `resolvedRef`，
|
|
10
|
+
* 且发生在嵌入式 runner 回合结束时（早于 FINISHED），可作 entry 缺字段时的兜底。
|
|
11
|
+
*
|
|
12
|
+
* 进程级共享（getSharedMap）：跨模块热重载存活，与 per-message-model-pending 同一套机制。
|
|
13
|
+
*/
|
|
14
|
+
/** llm_output 事件中与用量圆环相关的字段（结构化子集，避免依赖宿主内部类型）。 */
|
|
15
|
+
export interface RunModelContextInput {
|
|
16
|
+
provider?: string;
|
|
17
|
+
model?: string;
|
|
18
|
+
resolvedRef?: string;
|
|
19
|
+
contextTokenBudget?: number;
|
|
20
|
+
contextWindowSource?: string;
|
|
21
|
+
contextWindowReferenceTokens?: number;
|
|
22
|
+
runId?: string;
|
|
23
|
+
}
|
|
24
|
+
export interface RunModelContext {
|
|
25
|
+
provider?: string;
|
|
26
|
+
model?: string;
|
|
27
|
+
resolvedRef?: string;
|
|
28
|
+
/** 解析后的有效上下文预算（圆环分母兜底）。 */
|
|
29
|
+
contextTokenBudget?: number;
|
|
30
|
+
contextWindowSource?: string;
|
|
31
|
+
contextWindowReferenceTokens?: number;
|
|
32
|
+
runId?: string;
|
|
33
|
+
updatedAt: number;
|
|
34
|
+
}
|
|
35
|
+
/** 记录一次 llm_output（按 sessionKey 覆盖；空 sessionKey 忽略）。 */
|
|
36
|
+
export declare function recordRunModelContext(sessionKey: string | undefined, input: RunModelContextInput): RunModelContext | undefined;
|
|
37
|
+
/** 读取某 session 最近一次 llm_output 的模型上下文（过期返回 undefined）。 */
|
|
38
|
+
export declare function readRunModelContext(sessionKey: string | undefined): RunModelContext | undefined;
|
|
39
|
+
/** 清除某 session 的记录。 */
|
|
40
|
+
export declare function clearRunModelContext(sessionKey: string | undefined): void;
|
|
41
|
+
/** 插件卸载/重载时清空全部记录。 */
|
|
42
|
+
export declare function clearAllRunModelContext(): void;
|
|
43
|
+
/** 仅供测试：直接写入/读取内部 map 的条目数。 */
|
|
44
|
+
export declare function __runModelContextSizeForTests(): number;
|
|
45
|
+
//# sourceMappingURL=run-model-context.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-model-context.d.ts","sourceRoot":"","sources":["../../src/run-model-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,kDAAkD;AAClD,MAAM,WAAW,oBAAoB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2BAA2B;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACrB;AA4BD,wDAAwD;AACxD,wBAAgB,qBAAqB,CACjC,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,KAAK,EAAE,oBAAoB,GAC5B,eAAe,GAAG,SAAS,CAyC7B;AAED,0DAA0D;AAC1D,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,eAAe,GAAG,SAAS,CAU/F;AAED,uBAAuB;AACvB,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAIzE;AAED,sBAAsB;AACtB,wBAAgB,uBAAuB,IAAI,IAAI,CAE9C;AAED,+BAA+B;AAC/B,wBAAgB,6BAA6B,IAAI,MAAM,CAEtD"}
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 回合内「生效模型 + 有效上下文预算」的进程级缓存。
|
|
3
|
+
*
|
|
4
|
+
* 背景：OpenClaw 在 `preserveRuntimeModel`（模型 fallback / live switch 等）场景下，
|
|
5
|
+
* session entry 只写用量、不写 `model` / `contextTokens`，导致插件从 entry 读不到
|
|
6
|
+
* 上下文窗口，前端用量圆环拿不到分母。
|
|
7
|
+
*
|
|
8
|
+
* 数据源：OpenClaw 的 `llm_output` hook 事件带 `contextTokenBudget`（解析后的有效
|
|
9
|
+
* 上下文预算）、`contextWindowSource`、`provider` / `model` / `resolvedRef`，
|
|
10
|
+
* 且发生在嵌入式 runner 回合结束时（早于 FINISHED），可作 entry 缺字段时的兜底。
|
|
11
|
+
*
|
|
12
|
+
* 进程级共享（getSharedMap）：跨模块热重载存活，与 per-message-model-pending 同一套机制。
|
|
13
|
+
*/
|
|
14
|
+
import { getSharedMap } from "./process-shared-store.js";
|
|
15
|
+
/** 缓存条目上限（防御无界增长）。 */
|
|
16
|
+
const MAX_ENTRIES = 500;
|
|
17
|
+
/** 条目有效期：超过则视为过期（避免用上一轮/陈旧预算）。 */
|
|
18
|
+
const TTL_MS = 10 * 60_000;
|
|
19
|
+
const bySessionKey = getSharedMap("run-model-context");
|
|
20
|
+
function nonEmpty(value) {
|
|
21
|
+
if (typeof value !== "string")
|
|
22
|
+
return undefined;
|
|
23
|
+
const text = value.trim();
|
|
24
|
+
return text.length > 0 ? text : undefined;
|
|
25
|
+
}
|
|
26
|
+
function positiveInt(value) {
|
|
27
|
+
if (typeof value !== "number" || !Number.isFinite(value) || value <= 0)
|
|
28
|
+
return undefined;
|
|
29
|
+
return Math.round(value);
|
|
30
|
+
}
|
|
31
|
+
function pruneExpired(now) {
|
|
32
|
+
for (const [key, entry] of bySessionKey) {
|
|
33
|
+
if (now - entry.updatedAt > TTL_MS) {
|
|
34
|
+
bySessionKey.delete(key);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
/** 记录一次 llm_output（按 sessionKey 覆盖；空 sessionKey 忽略）。 */
|
|
39
|
+
export function recordRunModelContext(sessionKey, input) {
|
|
40
|
+
const key = nonEmpty(sessionKey);
|
|
41
|
+
if (!key)
|
|
42
|
+
return undefined;
|
|
43
|
+
const provider = nonEmpty(input.provider);
|
|
44
|
+
const model = nonEmpty(input.model);
|
|
45
|
+
const resolvedRef = nonEmpty(input.resolvedRef);
|
|
46
|
+
const contextTokenBudget = positiveInt(input.contextTokenBudget);
|
|
47
|
+
const contextWindowSource = nonEmpty(input.contextWindowSource);
|
|
48
|
+
const contextWindowReferenceTokens = positiveInt(input.contextWindowReferenceTokens);
|
|
49
|
+
const runId = nonEmpty(input.runId);
|
|
50
|
+
const now = Date.now();
|
|
51
|
+
pruneExpired(now);
|
|
52
|
+
if (!bySessionKey.has(key) && bySessionKey.size >= MAX_ENTRIES) {
|
|
53
|
+
// 容量兜底：淘汰最旧一条。
|
|
54
|
+
let oldestKey;
|
|
55
|
+
let oldestAt = Number.POSITIVE_INFINITY;
|
|
56
|
+
for (const [candidateKey, entry] of bySessionKey) {
|
|
57
|
+
if (entry.updatedAt < oldestAt) {
|
|
58
|
+
oldestAt = entry.updatedAt;
|
|
59
|
+
oldestKey = candidateKey;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
if (oldestKey !== undefined) {
|
|
63
|
+
bySessionKey.delete(oldestKey);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
const context = {
|
|
67
|
+
...(provider ? { provider } : {}),
|
|
68
|
+
...(model ? { model } : {}),
|
|
69
|
+
...(resolvedRef ? { resolvedRef } : {}),
|
|
70
|
+
...(contextTokenBudget != null ? { contextTokenBudget } : {}),
|
|
71
|
+
...(contextWindowSource ? { contextWindowSource } : {}),
|
|
72
|
+
...(contextWindowReferenceTokens != null ? { contextWindowReferenceTokens } : {}),
|
|
73
|
+
...(runId ? { runId } : {}),
|
|
74
|
+
updatedAt: now,
|
|
75
|
+
};
|
|
76
|
+
bySessionKey.set(key, context);
|
|
77
|
+
return context;
|
|
78
|
+
}
|
|
79
|
+
/** 读取某 session 最近一次 llm_output 的模型上下文（过期返回 undefined）。 */
|
|
80
|
+
export function readRunModelContext(sessionKey) {
|
|
81
|
+
const key = nonEmpty(sessionKey);
|
|
82
|
+
if (!key)
|
|
83
|
+
return undefined;
|
|
84
|
+
const entry = bySessionKey.get(key);
|
|
85
|
+
if (!entry)
|
|
86
|
+
return undefined;
|
|
87
|
+
if (Date.now() - entry.updatedAt > TTL_MS) {
|
|
88
|
+
bySessionKey.delete(key);
|
|
89
|
+
return undefined;
|
|
90
|
+
}
|
|
91
|
+
return entry;
|
|
92
|
+
}
|
|
93
|
+
/** 清除某 session 的记录。 */
|
|
94
|
+
export function clearRunModelContext(sessionKey) {
|
|
95
|
+
const key = nonEmpty(sessionKey);
|
|
96
|
+
if (!key)
|
|
97
|
+
return;
|
|
98
|
+
bySessionKey.delete(key);
|
|
99
|
+
}
|
|
100
|
+
/** 插件卸载/重载时清空全部记录。 */
|
|
101
|
+
export function clearAllRunModelContext() {
|
|
102
|
+
bySessionKey.clear();
|
|
103
|
+
}
|
|
104
|
+
/** 仅供测试：直接写入/读取内部 map 的条目数。 */
|
|
105
|
+
export function __runModelContextSizeForTests() {
|
|
106
|
+
return bySessionKey.size;
|
|
107
|
+
}
|
|
108
|
+
//# sourceMappingURL=run-model-context.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-model-context.js","sourceRoot":"","sources":["../../src/run-model-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-model-context.test.d.ts","sourceRoot":"","sources":["../../src/run-model-context.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import assert from "node:assert/strict";
|
|
2
|
+
import { beforeEach, describe, it } from "node:test";
|
|
3
|
+
import { __runModelContextSizeForTests, clearAllRunModelContext, clearRunModelContext, readRunModelContext, recordRunModelContext, } from "./run-model-context.js";
|
|
4
|
+
describe("run-model-context", () => {
|
|
5
|
+
beforeEach(() => {
|
|
6
|
+
clearAllRunModelContext();
|
|
7
|
+
});
|
|
8
|
+
it("records and reads the latest llm_output context per session", () => {
|
|
9
|
+
recordRunModelContext("session-1", {
|
|
10
|
+
provider: "openai",
|
|
11
|
+
model: "gpt-5.5",
|
|
12
|
+
resolvedRef: "openai/gpt-5.5",
|
|
13
|
+
contextTokenBudget: 200_000,
|
|
14
|
+
contextWindowSource: "model",
|
|
15
|
+
contextWindowReferenceTokens: 200_000,
|
|
16
|
+
runId: "run-1",
|
|
17
|
+
});
|
|
18
|
+
const ctx = readRunModelContext("session-1");
|
|
19
|
+
assert.ok(ctx);
|
|
20
|
+
assert.equal(ctx.provider, "openai");
|
|
21
|
+
assert.equal(ctx.model, "gpt-5.5");
|
|
22
|
+
assert.equal(ctx.resolvedRef, "openai/gpt-5.5");
|
|
23
|
+
assert.equal(ctx.contextTokenBudget, 200_000);
|
|
24
|
+
assert.equal(ctx.contextWindowSource, "model");
|
|
25
|
+
assert.equal(ctx.contextWindowReferenceTokens, 200_000);
|
|
26
|
+
assert.equal(ctx.runId, "run-1");
|
|
27
|
+
assert.equal(typeof ctx.updatedAt, "number");
|
|
28
|
+
});
|
|
29
|
+
it("overwrites the previous entry for the same session", () => {
|
|
30
|
+
recordRunModelContext("session-1", { model: "a", contextTokenBudget: 100_000 });
|
|
31
|
+
recordRunModelContext("session-1", { model: "b", contextTokenBudget: 128_000 });
|
|
32
|
+
const ctx = readRunModelContext("session-1");
|
|
33
|
+
assert.equal(ctx.model, "b");
|
|
34
|
+
assert.equal(ctx.contextTokenBudget, 128_000);
|
|
35
|
+
assert.equal(__runModelContextSizeForTests(), 1);
|
|
36
|
+
});
|
|
37
|
+
it("isolates sessions", () => {
|
|
38
|
+
recordRunModelContext("session-1", { model: "a", contextTokenBudget: 100_000 });
|
|
39
|
+
recordRunModelContext("session-2", { model: "b", contextTokenBudget: 200_000 });
|
|
40
|
+
assert.equal(readRunModelContext("session-1").model, "a");
|
|
41
|
+
assert.equal(readRunModelContext("session-2").model, "b");
|
|
42
|
+
assert.equal(readRunModelContext("session-3"), undefined);
|
|
43
|
+
});
|
|
44
|
+
it("ignores empty session key and empty input", () => {
|
|
45
|
+
assert.equal(recordRunModelContext("", { model: "a" }), undefined);
|
|
46
|
+
assert.equal(recordRunModelContext(undefined, { model: "a" }), undefined);
|
|
47
|
+
const recorded = recordRunModelContext("session-1", {});
|
|
48
|
+
assert.ok(recorded);
|
|
49
|
+
assert.equal(recorded.model, undefined);
|
|
50
|
+
assert.equal(recorded.contextTokenBudget, undefined);
|
|
51
|
+
});
|
|
52
|
+
it("drops non-positive / non-finite context budgets", () => {
|
|
53
|
+
recordRunModelContext("session-1", { contextTokenBudget: 0 });
|
|
54
|
+
assert.equal(readRunModelContext("session-1").contextTokenBudget, undefined);
|
|
55
|
+
recordRunModelContext("session-1", { contextTokenBudget: -5 });
|
|
56
|
+
assert.equal(readRunModelContext("session-1").contextTokenBudget, undefined);
|
|
57
|
+
recordRunModelContext("session-1", { contextTokenBudget: Number.NaN });
|
|
58
|
+
assert.equal(readRunModelContext("session-1").contextTokenBudget, undefined);
|
|
59
|
+
});
|
|
60
|
+
it("clearRunModelContext removes a single session", () => {
|
|
61
|
+
recordRunModelContext("session-1", { model: "a" });
|
|
62
|
+
recordRunModelContext("session-2", { model: "b" });
|
|
63
|
+
clearRunModelContext("session-1");
|
|
64
|
+
assert.equal(readRunModelContext("session-1"), undefined);
|
|
65
|
+
assert.equal(readRunModelContext("session-2").model, "b");
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
//# sourceMappingURL=run-model-context.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-model-context.test.js","sourceRoot":"","sources":["../../src/run-model-context.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* 从 OpenClaw session store 读取本轮结束后的用量 entry。
|
|
3
3
|
* 使用 `skipCache: true`，避免读到 dispatch 前的缓存快照。
|
|
4
|
+
*
|
|
5
|
+
* entry 缺 `model` / `contextTokens` 时（preserveRuntimeModel 场景），用 `llm_output`
|
|
6
|
+
* 缓存的「生效模型 + 有效上下文预算」兜底，保证前端用量圆环有分母。
|
|
4
7
|
*/
|
|
5
|
-
import type
|
|
8
|
+
import { type SessionUsageFields } from "./run-usage.js";
|
|
6
9
|
export declare function readSessionUsageFields(args: {
|
|
7
10
|
storePath: string;
|
|
8
11
|
sessionKey: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-usage-session.d.ts","sourceRoot":"","sources":["../../src/run-usage-session.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"run-usage-session.d.ts","sourceRoot":"","sources":["../../src/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"}
|
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* 从 OpenClaw session store 读取本轮结束后的用量 entry。
|
|
3
3
|
* 使用 `skipCache: true`，避免读到 dispatch 前的缓存快照。
|
|
4
|
+
*
|
|
5
|
+
* entry 缺 `model` / `contextTokens` 时（preserveRuntimeModel 场景），用 `llm_output`
|
|
6
|
+
* 缓存的「生效模型 + 有效上下文预算」兜底，保证前端用量圆环有分母。
|
|
4
7
|
*/
|
|
5
8
|
import { loadSessionStore, resolveSessionStoreEntry, } from "openclaw/plugin-sdk/session-store-runtime";
|
|
9
|
+
import { mergeRunModelContextFields } from "./run-usage.js";
|
|
10
|
+
import { readRunModelContext } from "./run-model-context.js";
|
|
6
11
|
export function readSessionUsageFields(args) {
|
|
7
12
|
const storePath = args.storePath?.trim();
|
|
8
13
|
const sessionKey = args.sessionKey?.trim();
|
|
@@ -12,7 +17,9 @@ export function readSessionUsageFields(args) {
|
|
|
12
17
|
const { existing } = resolveSessionStoreEntry({ store, sessionKey });
|
|
13
18
|
if (!existing)
|
|
14
19
|
return undefined;
|
|
15
|
-
|
|
20
|
+
const fields = pickUsageFields(existing);
|
|
21
|
+
const modelContext = readRunModelContext(sessionKey);
|
|
22
|
+
return modelContext ? mergeRunModelContextFields(fields, modelContext) : fields;
|
|
16
23
|
}
|
|
17
24
|
function pickUsageFields(entry) {
|
|
18
25
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-usage-session.js","sourceRoot":"","sources":["../../src/run-usage-session.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"run-usage-session.js","sourceRoot":"","sources":["../../src/run-usage-session.ts"],"names":[],"mappings":"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"}
|
package/dist/src/run-usage.d.ts
CHANGED
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
* （agent-runner 在回合结束时写入 modelProvider / model / inputTokens / outputTokens 等）。
|
|
7
7
|
* 不解析 deliver 正文 usage footer / usage bar。
|
|
8
8
|
*/
|
|
9
|
+
import type { RunModelContext } from "./run-model-context.js";
|
|
9
10
|
/** session store 中与用量相关的字段（子集） */
|
|
10
11
|
export type SessionUsageFields = {
|
|
11
12
|
modelProvider?: string;
|
|
@@ -45,6 +46,11 @@ export type ImStreamRunUsageData = {
|
|
|
45
46
|
replyToMsgId: string;
|
|
46
47
|
usage: RunUsageSnapshot;
|
|
47
48
|
};
|
|
49
|
+
/**
|
|
50
|
+
* entry 优先、`llm_output` 缓存兜底：entry 缺 model / contextTokens 时（preserveRuntimeModel
|
|
51
|
+
* 场景）用缓存的有效上下文预算与生效模型补全，保证前端用量圆环有分母。
|
|
52
|
+
*/
|
|
53
|
+
export declare function mergeRunModelContextFields(fields: SessionUsageFields, modelContext: RunModelContext): SessionUsageFields;
|
|
48
54
|
/** 本轮是否值得发 RUN_USAGE（至少有模型或 token 之一）。 */
|
|
49
55
|
export declare function hasReportableUsage(usage: RunUsageSnapshot | undefined): boolean;
|
|
50
56
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-usage.d.ts","sourceRoot":"","sources":["../../src/run-usage.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,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,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"}
|
|
1
|
+
{"version":3,"file":"run-usage.d.ts","sourceRoot":"","sources":["../../src/run-usage.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,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/run-usage.js
CHANGED
|
@@ -17,6 +17,22 @@ function nonEmpty(s) {
|
|
|
17
17
|
const t = s.trim();
|
|
18
18
|
return t.length > 0 ? t : undefined;
|
|
19
19
|
}
|
|
20
|
+
/**
|
|
21
|
+
* entry 优先、`llm_output` 缓存兜底：entry 缺 model / contextTokens 时（preserveRuntimeModel
|
|
22
|
+
* 场景）用缓存的有效上下文预算与生效模型补全，保证前端用量圆环有分母。
|
|
23
|
+
*/
|
|
24
|
+
export function mergeRunModelContextFields(fields, modelContext) {
|
|
25
|
+
return {
|
|
26
|
+
...fields,
|
|
27
|
+
...(fields.modelProvider == null && modelContext.provider
|
|
28
|
+
? { modelProvider: modelContext.provider }
|
|
29
|
+
: {}),
|
|
30
|
+
...(fields.model == null && modelContext.model ? { model: modelContext.model } : {}),
|
|
31
|
+
...(fields.contextTokens == null && modelContext.contextTokenBudget != null
|
|
32
|
+
? { contextTokens: modelContext.contextTokenBudget }
|
|
33
|
+
: {}),
|
|
34
|
+
};
|
|
35
|
+
}
|
|
20
36
|
/** 本轮是否值得发 RUN_USAGE（至少有模型或 token 之一）。 */
|
|
21
37
|
export function hasReportableUsage(usage) {
|
|
22
38
|
if (!usage)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-usage.js","sourceRoot":"","sources":["../../src/run-usage.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"run-usage.js","sourceRoot":"","sources":["../../src/run-usage.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AA8CH,SAAS,WAAW,CAAC,CAAU;IAC3B,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5E,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACzB,CAAC;AAED,SAAS,QAAQ,CAAC,CAAU;IACxB,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACnB,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACxC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,0BAA0B,CACtC,MAA0B,EAC1B,YAA6B;IAE7B,OAAO;QACH,GAAG,MAAM;QACT,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,IAAI,IAAI,YAAY,CAAC,QAAQ;YACrD,CAAC,CAAC,EAAE,aAAa,EAAE,YAAY,CAAC,QAAQ,EAAE;YAC1C,CAAC,CAAC,EAAE,CAAC;QACT,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,IAAI,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpF,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,IAAI,IAAI,YAAY,CAAC,kBAAkB,IAAI,IAAI;YACvE,CAAC,CAAC,EAAE,aAAa,EAAE,YAAY,CAAC,kBAAkB,EAAE;YACpD,CAAC,CAAC,EAAE,CAAC;KACZ,CAAC;AACN,CAAC;AAED,0CAA0C;AAC1C,MAAM,UAAU,kBAAkB,CAAC,KAAmC;IAClE,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IACjE,IACI,KAAK,CAAC,WAAW,IAAI,IAAI;QACzB,KAAK,CAAC,YAAY,IAAI,IAAI;QAC1B,KAAK,CAAC,WAAW,IAAI,IAAI;QACzB,KAAK,CAAC,eAAe,IAAI,IAAI;QAC7B,KAAK,CAAC,gBAAgB,IAAI,IAAI,EAChC,CAAC;QACC,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,6BAA6B,CACzC,KAA4C,EAC5C,IAAyB;IAEzB,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAE7B,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,SAAS,CAAC;IAEjF,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACrD,MAAM,eAAe,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACrD,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACvD,MAAM,gBAAgB,GAClB,OAAO,KAAK,CAAC,gBAAgB,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC;QACjF,CAAC,CAAC,KAAK,CAAC,gBAAgB;QACxB,CAAC,CAAC,SAAS,CAAC;IAEpB,wDAAwD;IACxD,mDAAmD;IACnD,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACnD,MAAM,gBAAgB,GAClB,OAAO,KAAK,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC;IACrF,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACvD,MAAM,yBAAyB,GAAG,WAAW,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAE/E,MAAM,QAAQ,GAAqB;QAC/B,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3B,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjC,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,GAAG,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjD,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,GAAG,CAAC,gBAAgB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,GAAG,CAAC,aAAa,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,GAAG,CAAC,yBAAyB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,yBAAyB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3E,GAAG,CAAC,eAAe,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,GAAG,CAAC,gBAAgB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,GAAG,CAAC,gBAAgB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,MAAM,EAAE,SAAS;KACpB,CAAC;IAEF,OAAO,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/D,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAuB;IACnD,OAAO;QACH,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3E,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,GAAG,CAAC,KAAK,CAAC,gBAAgB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvF,GAAG,CAAC,KAAK,CAAC,aAAa,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9E,GAAG,CAAC,KAAK,CAAC,yBAAyB,IAAI,IAAI;YACvC,CAAC,CAAC,EAAE,yBAAyB,EAAE,KAAK,CAAC,yBAAyB,EAAE;YAChE,CAAC,CAAC,EAAE,CAAC;QACT,GAAG,CAAC,KAAK,CAAC,eAAe,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpF,GAAG,CAAC,KAAK,CAAC,gBAAgB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvF,GAAG,CAAC,KAAK,CAAC,gBAAgB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvF,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjD,CAAC;AACN,CAAC;AAED,MAAM,UAAU,sBAAsB,CAClC,KAAuB,EACvB,OAAkD;IAElD,OAAO;QACH,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,KAAK,EAAE,sBAAsB,CAAC,KAAK,CAAC;KACvC,CAAC;AACN,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import assert from "node:assert/strict";
|
|
2
2
|
import { describe, it } from "node:test";
|
|
3
|
-
import { buildRunUsageFromSessionEntry, hasReportableUsage, toImStreamRunUsageData, } from "./run-usage.js";
|
|
3
|
+
import { buildRunUsageFromSessionEntry, hasReportableUsage, mergeRunModelContextFields, toImStreamRunUsageData, } from "./run-usage.js";
|
|
4
4
|
describe("buildRunUsageFromSessionEntry", () => {
|
|
5
5
|
it("maps session store fields to RUN_USAGE snapshot", () => {
|
|
6
6
|
const u = buildRunUsageFromSessionEntry({
|
|
@@ -124,4 +124,55 @@ describe("toImStreamRunUsageData", () => {
|
|
|
124
124
|
});
|
|
125
125
|
});
|
|
126
126
|
});
|
|
127
|
+
describe("mergeRunModelContextFields", () => {
|
|
128
|
+
it("fills missing model and contextTokens from the captured llm_output context", () => {
|
|
129
|
+
const merged = mergeRunModelContextFields({ inputTokens: 2_084, outputTokens: 92, totalTokens: 40_052 }, {
|
|
130
|
+
provider: "xgjk-newapi",
|
|
131
|
+
model: "MiniMax-M2.7-Cloud",
|
|
132
|
+
contextTokenBudget: 200_000,
|
|
133
|
+
updatedAt: Date.now(),
|
|
134
|
+
});
|
|
135
|
+
assert.deepEqual(merged, {
|
|
136
|
+
inputTokens: 2_084,
|
|
137
|
+
outputTokens: 92,
|
|
138
|
+
totalTokens: 40_052,
|
|
139
|
+
modelProvider: "xgjk-newapi",
|
|
140
|
+
model: "MiniMax-M2.7-Cloud",
|
|
141
|
+
contextTokens: 200_000,
|
|
142
|
+
});
|
|
143
|
+
});
|
|
144
|
+
it("keeps entry values when already present", () => {
|
|
145
|
+
const merged = mergeRunModelContextFields({
|
|
146
|
+
modelProvider: "openai",
|
|
147
|
+
model: "gpt-5.5",
|
|
148
|
+
contextTokens: 128_000,
|
|
149
|
+
totalTokens: 1_000,
|
|
150
|
+
}, {
|
|
151
|
+
provider: "other",
|
|
152
|
+
model: "other-model",
|
|
153
|
+
contextTokenBudget: 200_000,
|
|
154
|
+
updatedAt: Date.now(),
|
|
155
|
+
});
|
|
156
|
+
assert.equal(merged.modelProvider, "openai");
|
|
157
|
+
assert.equal(merged.model, "gpt-5.5");
|
|
158
|
+
assert.equal(merged.contextTokens, 128_000);
|
|
159
|
+
});
|
|
160
|
+
it("does not fabricate fields when the captured context is empty", () => {
|
|
161
|
+
const merged = mergeRunModelContextFields({ inputTokens: 1, outputTokens: 1 }, { updatedAt: Date.now() });
|
|
162
|
+
assert.deepEqual(merged, { inputTokens: 1, outputTokens: 1 });
|
|
163
|
+
});
|
|
164
|
+
it("merged fields produce a reportable snapshot with modelRef", () => {
|
|
165
|
+
const merged = mergeRunModelContextFields({ totalTokens: 40_052 }, {
|
|
166
|
+
provider: "xgjk-newapi",
|
|
167
|
+
model: "MiniMax-M2.7-Cloud",
|
|
168
|
+
contextTokenBudget: 200_000,
|
|
169
|
+
updatedAt: Date.now(),
|
|
170
|
+
});
|
|
171
|
+
const usage = buildRunUsageFromSessionEntry(merged);
|
|
172
|
+
assert.ok(usage);
|
|
173
|
+
assert.equal(usage.modelRef, "xgjk-newapi/MiniMax-M2.7-Cloud");
|
|
174
|
+
assert.equal(usage.contextTokens, 200_000);
|
|
175
|
+
assert.equal(usage.totalTokens, 40_052);
|
|
176
|
+
});
|
|
177
|
+
});
|
|
127
178
|
//# sourceMappingURL=run-usage.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-usage.test.js","sourceRoot":"","sources":["../../src/run-usage.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run-usage.test.js","sourceRoot":"","sources":["../../src/run-usage.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xgjktech/xg_cwork_im",
|
|
3
|
-
"version": "1.19.
|
|
3
|
+
"version": "1.19.19",
|
|
4
4
|
"description": "XG CWork IM channel plugin for OpenClaw",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"bot",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"build": "tsc -p tsconfig.json",
|
|
26
26
|
"type-check": "tsc -p tsconfig.json --noEmit",
|
|
27
27
|
"lint": "tsc -p tsconfig.json --noEmit",
|
|
28
|
-
"test": "npm run build && node --test dist/src/action-store-lifecycle.test.js dist/src/account-reconciler.test.js dist/src/inbound-terminal-state.test.js dist/src/user-facing-errors.test.js dist/src/deliver-text.test.js dist/src/assistant-item-delivery.test.js dist/src/agent-context-types.test.js dist/src/build-project-prompt.test.js dist/src/nas-volumes.test.js dist/src/workspace-event.test.js dist/src/workspace-event-scheduler.test.js dist/src/connection-workspace-event.test.js dist/src/block-streaming-config.test.js dist/src/channel-disabled-account.test.js dist/src/per-message-fallback-notice.test.js dist/src/register-per-message-model-hook.test.js dist/src/thinking-ws-progress.test.js dist/src/resource-file.test.js dist/src/turn-deliver-buffer.test.js dist/src/run-usage.test.js dist/src/ws-run-event-unmapped.test.js dist/src/item-event-guard.test.js dist/src/inbound-model.test.js dist/src/auto-model-router.test.js dist/src/channel-config.test.js dist/src/send-service.test.js dist/src/send-file-tool.test.js dist/src/tool-event-adapter.test.js dist/src/plan-core-adapter.test.js dist/src/plan-core-db.test.js dist/src/plan-core-snapshot.test.js dist/src/plan-tool-middleware.test.js dist/src/plan-ws-registry.test.js dist/src/plan-stat-event.test.js dist/src/active-round-registry.test.js dist/src/interrupt-round.test.js dist/src/subagent-monitor.test.js dist/src/turn-end-controller.test.js dist/src/turn-agent-event-subscription.test.js dist/src/session-env-store.test.js dist/src/register-exec-env-hook.test.js dist/src/cron-appkey-binding-store.test.js dist/src/ws-inbound-schema.test.js dist/src/connection.test.js dist/src/reply-dispatch-driver.test.js",
|
|
28
|
+
"test": "npm run build && node --test dist/src/action-store-lifecycle.test.js dist/src/account-reconciler.test.js dist/src/inbound-terminal-state.test.js dist/src/user-facing-errors.test.js dist/src/deliver-text.test.js dist/src/assistant-item-delivery.test.js dist/src/agent-context-types.test.js dist/src/build-project-prompt.test.js dist/src/nas-volumes.test.js dist/src/workspace-event.test.js dist/src/workspace-event-scheduler.test.js dist/src/connection-workspace-event.test.js dist/src/block-streaming-config.test.js dist/src/channel-disabled-account.test.js dist/src/per-message-fallback-notice.test.js dist/src/register-per-message-model-hook.test.js dist/src/thinking-ws-progress.test.js dist/src/resource-file.test.js dist/src/turn-deliver-buffer.test.js dist/src/run-usage.test.js dist/src/run-model-context.test.js dist/src/ws-run-event-unmapped.test.js dist/src/item-event-guard.test.js dist/src/inbound-model.test.js dist/src/auto-model-router.test.js dist/src/channel-config.test.js dist/src/send-service.test.js dist/src/send-file-tool.test.js dist/src/tool-event-adapter.test.js dist/src/plan-core-adapter.test.js dist/src/plan-core-db.test.js dist/src/plan-core-snapshot.test.js dist/src/plan-tool-middleware.test.js dist/src/plan-ws-registry.test.js dist/src/plan-stat-event.test.js dist/src/active-round-registry.test.js dist/src/interrupt-round.test.js dist/src/subagent-monitor.test.js dist/src/turn-end-controller.test.js dist/src/turn-agent-event-subscription.test.js dist/src/session-env-store.test.js dist/src/register-exec-env-hook.test.js dist/src/cron-appkey-binding-store.test.js dist/src/ws-inbound-schema.test.js dist/src/connection.test.js dist/src/reply-dispatch-driver.test.js",
|
|
29
29
|
"install:prod": "npm install --omit=dev",
|
|
30
30
|
"prepublishOnly": "npm run build"
|
|
31
31
|
},
|