@xgjktech/xg_cwork_im 1.18.9 → 1.19.1
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 +4 -14
- package/dist/index.js.map +1 -1
- package/dist/src/action-store-lifecycle.test.js +0 -2
- package/dist/src/action-store-lifecycle.test.js.map +1 -1
- package/dist/src/block-streaming-config.test.js.map +1 -1
- package/dist/src/dispatch-mentioned-reply.d.ts +1 -1
- package/dist/src/dispatch-mentioned-reply.d.ts.map +1 -1
- package/dist/src/dispatch-mentioned-reply.js +32 -4
- package/dist/src/dispatch-mentioned-reply.js.map +1 -1
- package/dist/src/inbound-display.js +1 -1
- package/dist/src/inbound-display.js.map +1 -1
- package/dist/src/per-message-model-pending.d.ts +34 -8
- package/dist/src/per-message-model-pending.d.ts.map +1 -1
- package/dist/src/per-message-model-pending.js +84 -16
- package/dist/src/per-message-model-pending.js.map +1 -1
- package/dist/src/plan-core-adapter.d.ts +46 -0
- package/dist/src/plan-core-adapter.d.ts.map +1 -0
- package/dist/src/plan-core-adapter.js +103 -0
- package/dist/src/plan-core-adapter.js.map +1 -0
- package/dist/src/plan-core-adapter.test.d.ts +2 -0
- package/dist/src/plan-core-adapter.test.d.ts.map +1 -0
- package/dist/src/plan-core-adapter.test.js +164 -0
- package/dist/src/plan-core-adapter.test.js.map +1 -0
- package/dist/src/plan-core-db.d.ts +22 -0
- package/dist/src/plan-core-db.d.ts.map +1 -0
- package/dist/src/plan-core-db.js +91 -0
- package/dist/src/plan-core-db.js.map +1 -0
- package/dist/src/plan-core-db.test.d.ts +2 -0
- package/dist/src/plan-core-db.test.d.ts.map +1 -0
- package/dist/src/plan-core-db.test.js +115 -0
- package/dist/src/plan-core-db.test.js.map +1 -0
- package/dist/src/plan-core-snapshot.d.ts +23 -0
- package/dist/src/plan-core-snapshot.d.ts.map +1 -0
- package/dist/src/plan-core-snapshot.js +65 -0
- package/dist/src/plan-core-snapshot.js.map +1 -0
- package/dist/src/plan-core-snapshot.test.d.ts +2 -0
- package/dist/src/plan-core-snapshot.test.d.ts.map +1 -0
- package/dist/src/plan-core-snapshot.test.js +155 -0
- package/dist/src/plan-core-snapshot.test.js.map +1 -0
- package/dist/src/plan-stat-event.d.ts +4 -19
- package/dist/src/plan-stat-event.d.ts.map +1 -1
- package/dist/src/plan-stat-event.js +4 -88
- package/dist/src/plan-stat-event.js.map +1 -1
- package/dist/src/plan-stat-event.test.js +1 -245
- package/dist/src/plan-stat-event.test.js.map +1 -1
- package/dist/src/plan-tool-middleware.d.ts +2 -10
- package/dist/src/plan-tool-middleware.d.ts.map +1 -1
- package/dist/src/plan-tool-middleware.js +11 -60
- package/dist/src/plan-tool-middleware.js.map +1 -1
- package/dist/src/plan-tool-middleware.test.js +83 -603
- package/dist/src/plan-tool-middleware.test.js.map +1 -1
- package/dist/src/plugin-dispose.d.ts +1 -1
- package/dist/src/plugin-dispose.d.ts.map +1 -1
- package/dist/src/plugin-dispose.js +3 -5
- package/dist/src/plugin-dispose.js.map +1 -1
- package/dist/src/register-per-message-model-hook.d.ts +8 -3
- package/dist/src/register-per-message-model-hook.d.ts.map +1 -1
- package/dist/src/register-per-message-model-hook.js +23 -9
- package/dist/src/register-per-message-model-hook.js.map +1 -1
- package/dist/src/register-per-message-model-hook.test.js +144 -27
- package/dist/src/register-per-message-model-hook.test.js.map +1 -1
- package/dist/src/session-model-fallback.d.ts +13 -0
- package/dist/src/session-model-fallback.d.ts.map +1 -0
- package/dist/src/session-model-fallback.js +24 -0
- package/dist/src/session-model-fallback.js.map +1 -0
- package/dist/src/turn-agent-event-subscription.d.ts +1 -1
- package/dist/src/turn-agent-event-subscription.js +1 -1
- package/package.json +9 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-tool-middleware.test.js","sourceRoot":"","sources":["../../src/plan-tool-middleware.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"plan-tool-middleware.test.js","sourceRoot":"","sources":["../../src/plan-tool-middleware.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* account-reconciler 一起 stopAll,并清空全部共享内存态(连接/流客户端/会话上下文/轮次/去重/env/
|
|
7
7
|
* subagent 监控)。由 index.ts 的 gateway_stop 钩子触发,且用 once 闸门保证只执行一次。
|
|
8
8
|
* - 插件热重载 / registry 代际交替:cleanup 以 `disposePluginModule({ skipConnections: true,
|
|
9
|
-
* skipPlanResources: true })`
|
|
9
|
+
* skipPlanResources: true })` 调用——只收尾可安全代际清理的句柄,保留动作读库与 plan-ws 路由,
|
|
10
10
|
* **绝不 stopAll、绝不清理共享连接/内存态**。连接只在 AccountReconciler(配置 diff,账号级)
|
|
11
11
|
* 与 gateway_stop(进程停机)处拆解,避免 OpenClaw runtime 代际交替误拆全部 WebSocket。
|
|
12
12
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-dispose.d.ts","sourceRoot":"","sources":["../../src/plugin-dispose.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;
|
|
1
|
+
{"version":3,"file":"plugin-dispose.d.ts","sourceRoot":"","sources":["../../src/plugin-dispose.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAmBH,MAAM,WAAW,0BAA0B;IACvC,2CAA2C;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;2EACuE;IACvE,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,yEAAyE;AACzE,wBAAsB,mBAAmB,CACrC,OAAO,GAAE,0BAA+B,GACzC,OAAO,CAAC,IAAI,CAAC,CAgCf"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* account-reconciler 一起 stopAll,并清空全部共享内存态(连接/流客户端/会话上下文/轮次/去重/env/
|
|
7
7
|
* subagent 监控)。由 index.ts 的 gateway_stop 钩子触发,且用 once 闸门保证只执行一次。
|
|
8
8
|
* - 插件热重载 / registry 代际交替:cleanup 以 `disposePluginModule({ skipConnections: true,
|
|
9
|
-
* skipPlanResources: true })`
|
|
9
|
+
* skipPlanResources: true })` 调用——只收尾可安全代际清理的句柄,保留动作读库与 plan-ws 路由,
|
|
10
10
|
* **绝不 stopAll、绝不清理共享连接/内存态**。连接只在 AccountReconciler(配置 diff,账号级)
|
|
11
11
|
* 与 gateway_stop(进程停机)处拆解,避免 OpenClaw runtime 代际交替误拆全部 WebSocket。
|
|
12
12
|
*/
|
|
@@ -20,9 +20,8 @@ import { disposeCronAppKeyBindingStore } from "./cron-appkey-binding-store.js";
|
|
|
20
20
|
import { disposeGlobalTerminalSent } from "./inbound-terminal-state.js";
|
|
21
21
|
import { clearSessionNasVolumeStates } from "./nas-volumes.js";
|
|
22
22
|
import { clearAllPendingPerMessageModel } from "./per-message-model-pending.js";
|
|
23
|
-
import { disposePlanStore } from "./plan-store-access.js";
|
|
24
|
-
import { disposePlanWsRegistry } from "./plan-ws-registry.js";
|
|
25
23
|
import { disposeSessionEnvStore } from "./session-env-store.js";
|
|
24
|
+
import { disposePlanWsRegistry } from "./plan-ws-registry.js";
|
|
26
25
|
import { disposeSessionImContext } from "./session-im-context.js";
|
|
27
26
|
import { disposeSubagentMonitor } from "./subagent-monitor.js";
|
|
28
27
|
import { disposeTurnAgentEvents } from "./turn-agent-event-subscription.js";
|
|
@@ -51,12 +50,11 @@ export async function disposePluginModule(options = {}) {
|
|
|
51
50
|
disposeActiveCronContextStore();
|
|
52
51
|
disposeCronAppKeyBindingStore();
|
|
53
52
|
}
|
|
54
|
-
//
|
|
53
|
+
// 动作读库与 plan-ws 路由可能被代际交替后仍在调用的旧中间件/旧发送路径继续使用:旧 cleanup 绝不能清空
|
|
55
54
|
// 它们的配置/句柄——action 若被清空,getActionById 会在打开数据库之前就因 stateDir 缺失而失败,
|
|
56
55
|
// 表现为「反查不到 action,跳过 ACTION_DISPATCH 发送」;gateway_stop(skipPlanResources=false)仍完整释放。
|
|
57
56
|
if (!skipPlanResources) {
|
|
58
57
|
disposeActionStore();
|
|
59
|
-
disposePlanStore();
|
|
60
58
|
disposePlanWsRegistry();
|
|
61
59
|
}
|
|
62
60
|
clearAllTokenCache();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-dispose.js","sourceRoot":"","sources":["../../src/plugin-dispose.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,8BAA8B,EAAE,MAAM,gCAAgC,CAAC;AAChF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"plugin-dispose.js","sourceRoot":"","sources":["../../src/plugin-dispose.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,8BAA8B,EAAE,MAAM,gCAAgC,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAUpE,yEAAyE;AACzE,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACrC,UAAsC,EAAE;IAExC,MAAM,EAAE,eAAe,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC;IAC5C,MAAM,EAAE,iBAAiB,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC;IAC9C,IAAI,eAAe,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CACP,kEAAkE;YAC9D,qBAAqB,iBAAiB,mBAAmB,CAChE,CAAC;IACN,CAAC;SAAM,CAAC;QACJ,8DAA8D;QAC9D,MAAM,iBAAiB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAChD,sBAAsB,EAAE,CAAC;QACzB,sBAAsB,EAAE,CAAC;QACzB,wBAAwB,EAAE,CAAC;QAC3B,kBAAkB,EAAE,CAAC;QACrB,uBAAuB,EAAE,CAAC;QAC1B,0BAA0B,EAAE,CAAC;QAC7B,yBAAyB,EAAE,CAAC;QAC5B,8BAA8B,EAAE,CAAC;QACjC,2BAA2B,EAAE,CAAC;QAC9B,sBAAsB,EAAE,CAAC;QACzB,6BAA6B,EAAE,CAAC;QAChC,6BAA6B,EAAE,CAAC;IACpC,CAAC;IACD,8DAA8D;IAC9D,kEAAkE;IAClE,qFAAqF;IACrF,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACrB,kBAAkB,EAAE,CAAC;QACrB,qBAAqB,EAAE,CAAC;IAC5B,CAAC;IACD,kBAAkB,EAAE,CAAC;AACzB,CAAC"}
|
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* before_model_resolve:消费 IM ext.ai_model 登记的单轮模型。
|
|
3
|
-
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
3
|
+
*
|
|
4
|
+
* 守卫语义(两层):
|
|
5
|
+
* 1. 只作用于本轮 run 的「首次模型解析」;同一 runId 的后续调用(模型 fallback 重试)不再覆盖,
|
|
6
|
+
* 避免把降级候选改回主模型。
|
|
7
|
+
* 2. 登记时该 session 正处于自动降级、且用户点名的就是降级来源(冷却中的原模型)时,
|
|
8
|
+
* 静默放弃覆盖,尊重 OpenClaw 的自动降级选择。
|
|
9
|
+
*
|
|
10
|
+
* 取后即删:无论命中与否,首个候选钩子就消费本次单轮覆盖,避免残留到下一轮消息。
|
|
6
11
|
*/
|
|
7
12
|
import type { OpenClawPluginApi } from "openclaw/plugin-sdk/channel-plugin-common";
|
|
8
13
|
export declare function registerPerMessageModelHook(api: OpenClawPluginApi): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-per-message-model-hook.d.ts","sourceRoot":"","sources":["../../src/register-per-message-model-hook.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"register-per-message-model-hook.d.ts","sourceRoot":"","sources":["../../src/register-per-message-model-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAOnF,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAgDxE"}
|
|
@@ -1,26 +1,40 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* before_model_resolve:消费 IM ext.ai_model 登记的单轮模型。
|
|
3
|
-
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
3
|
+
*
|
|
4
|
+
* 守卫语义(两层):
|
|
5
|
+
* 1. 只作用于本轮 run 的「首次模型解析」;同一 runId 的后续调用(模型 fallback 重试)不再覆盖,
|
|
6
|
+
* 避免把降级候选改回主模型。
|
|
7
|
+
* 2. 登记时该 session 正处于自动降级、且用户点名的就是降级来源(冷却中的原模型)时,
|
|
8
|
+
* 静默放弃覆盖,尊重 OpenClaw 的自动降级选择。
|
|
9
|
+
*
|
|
10
|
+
* 取后即删:无论命中与否,首个候选钩子就消费本次单轮覆盖,避免残留到下一轮消息。
|
|
6
11
|
*/
|
|
7
|
-
import {
|
|
12
|
+
import { claimPerMessageModelRun, shouldSkipOverrideForActiveFallback, takePendingPerMessageModel, } from "./per-message-model-pending.js";
|
|
8
13
|
export function registerPerMessageModelHook(api) {
|
|
9
14
|
api.on("before_model_resolve", async (_event, ctx) => {
|
|
10
|
-
// 取后即删:无论命中与否,首个候选钩子就消费本次单轮覆盖,
|
|
11
|
-
// 避免残留到下一个 fallback 候选或下一轮消息。
|
|
12
15
|
const pending = takePendingPerMessageModel(ctx.sessionKey);
|
|
13
16
|
if (!pending) {
|
|
14
17
|
return;
|
|
15
18
|
}
|
|
16
19
|
const ctxProvider = ctx.modelProviderId?.trim() ?? "";
|
|
17
20
|
const ctxModel = ctx.modelId?.trim() ?? "";
|
|
18
|
-
|
|
19
|
-
|
|
21
|
+
const runId = ctx.runId?.trim() ?? "";
|
|
22
|
+
if (!claimPerMessageModelRun(runId)) {
|
|
23
|
+
api.logger.info(`[xg_cwork_im] [model] before_model_resolve hookDecision=skip-fallback-retry ` +
|
|
24
|
+
`session=${ctx.sessionKey} runId=${runId} ` +
|
|
20
25
|
`candidate=${ctxProvider}/${ctxModel} pending=${pending.raw}`);
|
|
21
26
|
return;
|
|
22
27
|
}
|
|
23
|
-
|
|
28
|
+
if (shouldSkipOverrideForActiveFallback(pending)) {
|
|
29
|
+
api.logger.info(`[xg_cwork_im] [model] before_model_resolve hookDecision=skip-active-fallback ` +
|
|
30
|
+
`session=${ctx.sessionKey} runId=${runId} ` +
|
|
31
|
+
`candidate=${ctxProvider}/${ctxModel} pending=${pending.raw} ` +
|
|
32
|
+
`fallbackOrigin=${pending.fallbackOrigin?.provider ?? ""}/${pending.fallbackOrigin?.model ?? ""}`);
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
35
|
+
api.logger.info(`[xg_cwork_im] [model] before_model_resolve hookDecision=apply ` +
|
|
36
|
+
`session=${ctx.sessionKey} runId=${runId} ` +
|
|
37
|
+
`candidate=${ctxProvider}/${ctxModel} ` +
|
|
24
38
|
`provider=${pending.provider ?? ""} model=${pending.model}`);
|
|
25
39
|
if (pending.provider) {
|
|
26
40
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-per-message-model-hook.js","sourceRoot":"","sources":["../../src/register-per-message-model-hook.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"register-per-message-model-hook.js","sourceRoot":"","sources":["../../src/register-per-message-model-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EACH,uBAAuB,EACvB,mCAAmC,EACnC,0BAA0B,GAC7B,MAAM,gCAAgC,CAAC;AAExC,MAAM,UAAU,2BAA2B,CAAC,GAAsB;IAC9D,GAAG,CAAC,EAAE,CACF,sBAAsB,EACtB,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;QAClB,MAAM,OAAO,GAAG,0BAA0B,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC3D,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO;QACX,CAAC;QAED,MAAM,WAAW,GAAG,GAAG,CAAC,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QACtD,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QAC3C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QAEtC,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,GAAG,CAAC,MAAM,CAAC,IAAI,CACX,8EAA8E;gBAC1E,WAAW,GAAG,CAAC,UAAU,UAAU,KAAK,GAAG;gBAC3C,aAAa,WAAW,IAAI,QAAQ,YAAY,OAAO,CAAC,GAAG,EAAE,CACpE,CAAC;YACF,OAAO;QACX,CAAC;QAED,IAAI,mCAAmC,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/C,GAAG,CAAC,MAAM,CAAC,IAAI,CACX,+EAA+E;gBAC3E,WAAW,GAAG,CAAC,UAAU,UAAU,KAAK,GAAG;gBAC3C,aAAa,WAAW,IAAI,QAAQ,YAAY,OAAO,CAAC,GAAG,GAAG;gBAC9D,kBAAkB,OAAO,CAAC,cAAc,EAAE,QAAQ,IAAI,EAAE,IAAI,OAAO,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE,EAAE,CACxG,CAAC;YACF,OAAO;QACX,CAAC;QAED,GAAG,CAAC,MAAM,CAAC,IAAI,CACX,gEAAgE;YAC5D,WAAW,GAAG,CAAC,UAAU,UAAU,KAAK,GAAG;YAC3C,aAAa,WAAW,IAAI,QAAQ,GAAG;YACvC,YAAY,OAAO,CAAC,QAAQ,IAAI,EAAE,UAAU,OAAO,CAAC,KAAK,EAAE,CAClE,CAAC;QACF,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO;gBACH,gBAAgB,EAAE,OAAO,CAAC,QAAQ;gBAClC,aAAa,EAAE,OAAO,CAAC,KAAK;aAC/B,CAAC;QACN,CAAC;QACD,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1C,CAAC,EACD,EAAE,QAAQ,EAAE,GAAG,EAAE,CACpB,CAAC;AACN,CAAC"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import assert from "node:assert/strict";
|
|
2
|
+
import { mkdtempSync } from "node:fs";
|
|
3
|
+
import { tmpdir } from "node:os";
|
|
4
|
+
import { join } from "node:path";
|
|
2
5
|
import { describe, it } from "node:test";
|
|
3
|
-
import { clearAllPendingPerMessageModel,
|
|
6
|
+
import { clearAllPendingPerMessageModel, normalizeModelRefForCompare, resolveSessionFallbackContextFromEntry, setPendingPerMessageModel, shouldSkipOverrideForActiveFallback, splitModelRef, takePendingPerMessageModel, targetMatchesFallbackOrigin, } from "./per-message-model-pending.js";
|
|
4
7
|
import { registerPerMessageModelHook } from "./register-per-message-model-hook.js";
|
|
8
|
+
import { resolveSessionModelFallbackContext } from "./session-model-fallback.js";
|
|
5
9
|
function fakeApi() {
|
|
6
10
|
const captured = [];
|
|
7
11
|
const logs = [];
|
|
@@ -17,31 +21,110 @@ function fakeApi() {
|
|
|
17
21
|
};
|
|
18
22
|
return { api, captured, logs };
|
|
19
23
|
}
|
|
20
|
-
describe("
|
|
21
|
-
it("
|
|
22
|
-
const pending =
|
|
23
|
-
assert.
|
|
24
|
-
|
|
24
|
+
describe("splitModelRef / normalizeModelRefForCompare", () => {
|
|
25
|
+
it("splits provider/model refs and normalizes case", () => {
|
|
26
|
+
const pending = splitModelRef(" openai/gpt-5.6-sol ");
|
|
27
|
+
assert.equal(pending.provider, "openai");
|
|
28
|
+
assert.equal(pending.model, "gpt-5.6-sol");
|
|
29
|
+
assert.equal(pending.sessionInAutoFallback, false);
|
|
30
|
+
assert.equal(normalizeModelRefForCompare(" OpenAI ", " GPT-5.6-Sol "), "openai/gpt-5.6-sol");
|
|
31
|
+
assert.equal(normalizeModelRefForCompare(undefined, " gpt-5.6-sol "), "gpt-5.6-sol");
|
|
25
32
|
});
|
|
26
|
-
it("
|
|
27
|
-
const pending =
|
|
33
|
+
it("treats bare model ids as model-only refs", () => {
|
|
34
|
+
const pending = splitModelRef("gpt-5.6-sol");
|
|
28
35
|
assert.equal(pending.provider, undefined);
|
|
29
|
-
assert.
|
|
30
|
-
|
|
36
|
+
assert.equal(pending.model, "gpt-5.6-sol");
|
|
37
|
+
});
|
|
38
|
+
});
|
|
39
|
+
describe("targetMatchesFallbackOrigin", () => {
|
|
40
|
+
it("matches exact provider/model origin", () => {
|
|
41
|
+
const pending = setPendingPerMessageModel("s1", "openai/gpt-5.6-sol", {
|
|
42
|
+
sessionInAutoFallback: true,
|
|
43
|
+
fallbackOrigin: { provider: "openai", model: "gpt-5.6-sol" },
|
|
44
|
+
});
|
|
45
|
+
assert.ok(targetMatchesFallbackOrigin(pending));
|
|
31
46
|
clearAllPendingPerMessageModel();
|
|
32
47
|
});
|
|
33
|
-
it("
|
|
34
|
-
const pending = setPendingPerMessageModel("s1", "
|
|
35
|
-
|
|
48
|
+
it("matches model-only target against origin model", () => {
|
|
49
|
+
const pending = setPendingPerMessageModel("s1", "gpt-5.6-sol", {
|
|
50
|
+
sessionInAutoFallback: true,
|
|
51
|
+
fallbackOrigin: { provider: "openai", model: "gpt-5.6-sol" },
|
|
52
|
+
});
|
|
53
|
+
assert.ok(targetMatchesFallbackOrigin(pending));
|
|
36
54
|
clearAllPendingPerMessageModel();
|
|
37
55
|
});
|
|
38
|
-
it("
|
|
39
|
-
const pending = setPendingPerMessageModel("s1", "
|
|
40
|
-
|
|
41
|
-
|
|
56
|
+
it("does not match a different target", () => {
|
|
57
|
+
const pending = setPendingPerMessageModel("s1", "openai/gpt-6-astra", {
|
|
58
|
+
sessionInAutoFallback: true,
|
|
59
|
+
fallbackOrigin: { provider: "openai", model: "gpt-5.6-sol" },
|
|
60
|
+
});
|
|
61
|
+
assert.equal(targetMatchesFallbackOrigin(pending), false);
|
|
42
62
|
clearAllPendingPerMessageModel();
|
|
43
63
|
});
|
|
44
64
|
});
|
|
65
|
+
describe("shouldSkipOverrideForActiveFallback", () => {
|
|
66
|
+
it("skips only when session is in auto-fallback and target is the origin", () => {
|
|
67
|
+
const origin = setPendingPerMessageModel("s1", "openai/gpt-5.6-sol", {
|
|
68
|
+
sessionInAutoFallback: true,
|
|
69
|
+
fallbackOrigin: { provider: "openai", model: "gpt-5.6-sol" },
|
|
70
|
+
});
|
|
71
|
+
assert.equal(shouldSkipOverrideForActiveFallback(origin), true);
|
|
72
|
+
const otherTarget = setPendingPerMessageModel("s2", "openai/gpt-6-astra", {
|
|
73
|
+
sessionInAutoFallback: true,
|
|
74
|
+
fallbackOrigin: { provider: "openai", model: "gpt-5.6-sol" },
|
|
75
|
+
});
|
|
76
|
+
assert.equal(shouldSkipOverrideForActiveFallback(otherTarget), false);
|
|
77
|
+
const notFallback = setPendingPerMessageModel("s3", "openai/gpt-5.6-sol", {
|
|
78
|
+
sessionInAutoFallback: false,
|
|
79
|
+
fallbackOrigin: { provider: "openai", model: "gpt-5.6-sol" },
|
|
80
|
+
});
|
|
81
|
+
assert.equal(shouldSkipOverrideForActiveFallback(notFallback), false);
|
|
82
|
+
clearAllPendingPerMessageModel();
|
|
83
|
+
});
|
|
84
|
+
});
|
|
85
|
+
describe("resolveSessionFallbackContextFromEntry", () => {
|
|
86
|
+
it("returns empty context for missing entry", () => {
|
|
87
|
+
assert.deepEqual(resolveSessionFallbackContextFromEntry(undefined), {
|
|
88
|
+
sessionInAutoFallback: false,
|
|
89
|
+
});
|
|
90
|
+
});
|
|
91
|
+
it("reads auto fallback provenance", () => {
|
|
92
|
+
const ctx = resolveSessionFallbackContextFromEntry({
|
|
93
|
+
modelOverride: "openai/gpt-5.6-sol",
|
|
94
|
+
modelOverrideSource: "auto",
|
|
95
|
+
modelOverrideFallbackOriginProvider: "openai",
|
|
96
|
+
modelOverrideFallbackOriginModel: "gpt-6-astra",
|
|
97
|
+
});
|
|
98
|
+
assert.equal(ctx.sessionInAutoFallback, true);
|
|
99
|
+
assert.deepEqual(ctx.fallbackOrigin, { provider: "openai", model: "gpt-6-astra" });
|
|
100
|
+
});
|
|
101
|
+
it("ignores user overrides without fallback origin", () => {
|
|
102
|
+
const ctx = resolveSessionFallbackContextFromEntry({
|
|
103
|
+
modelOverride: "openai/gpt-6-astra",
|
|
104
|
+
modelOverrideSource: "user",
|
|
105
|
+
});
|
|
106
|
+
assert.equal(ctx.sessionInAutoFallback, false);
|
|
107
|
+
assert.equal(ctx.fallbackOrigin, undefined);
|
|
108
|
+
});
|
|
109
|
+
});
|
|
110
|
+
describe("resolveSessionModelFallbackContext", () => {
|
|
111
|
+
it("returns empty context for missing path or session key", () => {
|
|
112
|
+
assert.deepEqual(resolveSessionModelFallbackContext({ storePath: "", sessionKey: "s" }), {
|
|
113
|
+
sessionInAutoFallback: false,
|
|
114
|
+
});
|
|
115
|
+
assert.deepEqual(resolveSessionModelFallbackContext({ storePath: "p", sessionKey: "" }), {
|
|
116
|
+
sessionInAutoFallback: false,
|
|
117
|
+
});
|
|
118
|
+
});
|
|
119
|
+
it("returns empty context when the store has no matching session", () => {
|
|
120
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-fallback-ctx-"));
|
|
121
|
+
const ctx = resolveSessionModelFallbackContext({
|
|
122
|
+
storePath: join(dir, "sessions.sqlite"),
|
|
123
|
+
sessionKey: "agent:main:xg_cwork_im:group:g1",
|
|
124
|
+
});
|
|
125
|
+
assert.deepEqual(ctx, { sessionInAutoFallback: false });
|
|
126
|
+
});
|
|
127
|
+
});
|
|
45
128
|
describe("registerPerMessageModelHook", () => {
|
|
46
129
|
it("registers before_model_resolve with priority 100", () => {
|
|
47
130
|
const { api, captured } = fakeApi();
|
|
@@ -50,31 +133,65 @@ describe("registerPerMessageModelHook", () => {
|
|
|
50
133
|
assert.equal(captured[0].name, "before_model_resolve");
|
|
51
134
|
assert.deepEqual(captured[0].opts, { priority: 100 });
|
|
52
135
|
});
|
|
53
|
-
it("applies override when current candidate
|
|
136
|
+
it("applies override even when the current candidate is the agent default", async () => {
|
|
54
137
|
const { api, captured, logs } = fakeApi();
|
|
55
138
|
registerPerMessageModelHook(api);
|
|
56
|
-
setPendingPerMessageModel("s1", "openai/gpt-
|
|
57
|
-
const result = await captured[0].handler({}, { sessionKey: "s1", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
|
|
58
|
-
assert.deepEqual(result, { providerOverride: "openai", modelOverride: "gpt-
|
|
139
|
+
setPendingPerMessageModel("s1", "openai/gpt-6-astra");
|
|
140
|
+
const result = await captured[0].handler({}, { sessionKey: "s1", runId: "run-1", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
|
|
141
|
+
assert.deepEqual(result, { providerOverride: "openai", modelOverride: "gpt-6-astra" });
|
|
59
142
|
assert.match(logs.join(" "), /hookDecision=apply/);
|
|
60
143
|
assert.equal(takePendingPerMessageModel("s1"), undefined);
|
|
61
144
|
clearAllPendingPerMessageModel();
|
|
62
145
|
});
|
|
63
|
-
it("
|
|
146
|
+
it("applies model-only override when pending has no provider", async () => {
|
|
147
|
+
const { api, captured } = fakeApi();
|
|
148
|
+
registerPerMessageModelHook(api);
|
|
149
|
+
setPendingPerMessageModel("s1", "gpt-6-astra");
|
|
150
|
+
const result = await captured[0].handler({}, { sessionKey: "s1", runId: "run-1", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
|
|
151
|
+
assert.deepEqual(result, { modelOverride: "gpt-6-astra" });
|
|
152
|
+
clearAllPendingPerMessageModel();
|
|
153
|
+
});
|
|
154
|
+
it("does not re-apply the override on a fallback retry for the same run", async () => {
|
|
64
155
|
const { api, captured, logs } = fakeApi();
|
|
65
156
|
registerPerMessageModelHook(api);
|
|
66
|
-
setPendingPerMessageModel("s1", "openai/gpt-
|
|
67
|
-
|
|
157
|
+
setPendingPerMessageModel("s1", "openai/gpt-6-astra");
|
|
158
|
+
await captured[0].handler({}, { sessionKey: "s1", runId: "run-1", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
|
|
159
|
+
// 同一个 run 的第二次模型解析(fallback 重试)即便再次登记也不覆盖。
|
|
160
|
+
setPendingPerMessageModel("s1", "openai/gpt-6-astra");
|
|
161
|
+
const result = await captured[0].handler({}, { sessionKey: "s1", runId: "run-1", modelProviderId: "openai", modelId: "gpt-5.6-terra" });
|
|
162
|
+
assert.equal(result, undefined);
|
|
163
|
+
assert.match(logs.join(" "), /hookDecision=skip-fallback-retry/);
|
|
164
|
+
clearAllPendingPerMessageModel();
|
|
165
|
+
});
|
|
166
|
+
it("skips the override when the session is auto-falling back to a different model", async () => {
|
|
167
|
+
const { api, captured, logs } = fakeApi();
|
|
168
|
+
registerPerMessageModelHook(api);
|
|
169
|
+
setPendingPerMessageModel("s1", "openai/gpt-6-astra", {
|
|
170
|
+
sessionInAutoFallback: true,
|
|
171
|
+
fallbackOrigin: { provider: "openai", model: "gpt-6-astra" },
|
|
172
|
+
});
|
|
173
|
+
const result = await captured[0].handler({}, { sessionKey: "s1", runId: "run-1", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
|
|
68
174
|
assert.equal(result, undefined);
|
|
69
|
-
assert.match(logs.join(" "), /hookDecision=skip/);
|
|
175
|
+
assert.match(logs.join(" "), /hookDecision=skip-active-fallback/);
|
|
70
176
|
assert.equal(takePendingPerMessageModel("s1"), undefined);
|
|
71
177
|
clearAllPendingPerMessageModel();
|
|
72
178
|
});
|
|
179
|
+
it("still applies when auto-falling back but the requested model is not the origin", async () => {
|
|
180
|
+
const { api, captured } = fakeApi();
|
|
181
|
+
registerPerMessageModelHook(api);
|
|
182
|
+
setPendingPerMessageModel("s1", "openai/gpt-6-astra", {
|
|
183
|
+
sessionInAutoFallback: true,
|
|
184
|
+
fallbackOrigin: { provider: "openai", model: "gpt-5.6-luna" },
|
|
185
|
+
});
|
|
186
|
+
const result = await captured[0].handler({}, { sessionKey: "s1", runId: "run-1", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
|
|
187
|
+
assert.deepEqual(result, { providerOverride: "openai", modelOverride: "gpt-6-astra" });
|
|
188
|
+
clearAllPendingPerMessageModel();
|
|
189
|
+
});
|
|
73
190
|
it("does not consume another session's pending model", async () => {
|
|
74
191
|
const { api, captured } = fakeApi();
|
|
75
192
|
registerPerMessageModelHook(api);
|
|
76
193
|
setPendingPerMessageModel("s1", "openai/gpt-5.6-sol");
|
|
77
|
-
await captured[0].handler({}, { sessionKey: "s2", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
|
|
194
|
+
await captured[0].handler({}, { sessionKey: "s2", runId: "run-2", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
|
|
78
195
|
assert.equal(takePendingPerMessageModel("s2"), undefined);
|
|
79
196
|
const pendingForS1 = takePendingPerMessageModel("s1");
|
|
80
197
|
assert.equal(pendingForS1?.model, "gpt-5.6-sol");
|
|
@@ -84,7 +201,7 @@ describe("registerPerMessageModelHook", () => {
|
|
|
84
201
|
const { api, captured } = fakeApi();
|
|
85
202
|
registerPerMessageModelHook(api);
|
|
86
203
|
clearAllPendingPerMessageModel();
|
|
87
|
-
const result = await captured[0].handler({}, { sessionKey: "s1", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
|
|
204
|
+
const result = await captured[0].handler({}, { sessionKey: "s1", runId: "run-1", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
|
|
88
205
|
assert.equal(result, undefined);
|
|
89
206
|
});
|
|
90
207
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-per-message-model-hook.test.js","sourceRoot":"","sources":["../../src/register-per-message-model-hook.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EACH,8BAA8B,EAC9B,
|
|
1
|
+
{"version":3,"file":"register-per-message-model-hook.test.js","sourceRoot":"","sources":["../../src/register-per-message-model-hook.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 读取 session store 中的自动降级上下文,供单轮模型覆盖的守卫判定使用。
|
|
3
|
+
*
|
|
4
|
+
* OpenClaw 在自动降级时会把 `modelOverrideSource: "auto"` 与
|
|
5
|
+
* `modelOverrideFallbackOriginProvider/Model`(被跳过的原模型)写入 session entry。
|
|
6
|
+
* 入站时读取一次即可判断「用户点名的模型是否就是冷却中的降级来源」。
|
|
7
|
+
*/
|
|
8
|
+
import { type SessionModelFallbackContext } from "./per-message-model-pending.js";
|
|
9
|
+
export declare function resolveSessionModelFallbackContext(args: {
|
|
10
|
+
storePath: string;
|
|
11
|
+
sessionKey: string;
|
|
12
|
+
}): SessionModelFallbackContext;
|
|
13
|
+
//# sourceMappingURL=session-model-fallback.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-model-fallback.d.ts","sourceRoot":"","sources":["../../src/session-model-fallback.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAMH,OAAO,EAEH,KAAK,2BAA2B,EACnC,MAAM,gCAAgC,CAAC;AAExC,wBAAgB,kCAAkC,CAAC,IAAI,EAAE;IACrD,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACtB,GAAG,2BAA2B,CAW9B"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 读取 session store 中的自动降级上下文,供单轮模型覆盖的守卫判定使用。
|
|
3
|
+
*
|
|
4
|
+
* OpenClaw 在自动降级时会把 `modelOverrideSource: "auto"` 与
|
|
5
|
+
* `modelOverrideFallbackOriginProvider/Model`(被跳过的原模型)写入 session entry。
|
|
6
|
+
* 入站时读取一次即可判断「用户点名的模型是否就是冷却中的降级来源」。
|
|
7
|
+
*/
|
|
8
|
+
import { loadSessionStore, resolveSessionStoreEntry, } from "openclaw/plugin-sdk/session-store-runtime";
|
|
9
|
+
import { resolveSessionFallbackContextFromEntry, } from "./per-message-model-pending.js";
|
|
10
|
+
export function resolveSessionModelFallbackContext(args) {
|
|
11
|
+
const storePath = args.storePath?.trim();
|
|
12
|
+
const sessionKey = args.sessionKey?.trim();
|
|
13
|
+
if (!storePath || !sessionKey)
|
|
14
|
+
return { sessionInAutoFallback: false };
|
|
15
|
+
try {
|
|
16
|
+
const store = loadSessionStore(storePath, { skipCache: true });
|
|
17
|
+
const { existing } = resolveSessionStoreEntry({ store, sessionKey });
|
|
18
|
+
return resolveSessionFallbackContextFromEntry(existing);
|
|
19
|
+
}
|
|
20
|
+
catch {
|
|
21
|
+
return { sessionInAutoFallback: false };
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=session-model-fallback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-model-fallback.js","sourceRoot":"","sources":["../../src/session-model-fallback.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACH,gBAAgB,EAChB,wBAAwB,GAC3B,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACH,sCAAsC,GAEzC,MAAM,gCAAgC,CAAC;AAExC,MAAM,UAAU,kCAAkC,CAAC,IAGlD;IACG,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;IACzC,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;IAC3C,IAAI,CAAC,SAAS,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC;IACvE,IAAI,CAAC;QACD,MAAM,KAAK,GAAG,gBAAgB,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,MAAM,EAAE,QAAQ,EAAE,GAAG,wBAAwB,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QACrE,OAAO,sCAAsC,CAAC,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC;IAC5C,CAAC;AACL,CAAC"}
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
* - thinking / compaction(仅带 runId)→ 以 lifecycle start 建立的 runId→session 索引定位到轮次,
|
|
11
11
|
* 仅对非 wrapper 首段的 runId 转发,避免与 wrapper 回调重复展示(P1)。
|
|
12
12
|
*
|
|
13
|
-
* handle
|
|
13
|
+
* handle 内绝不容忍抛错(事件订阅统一纪律)。
|
|
14
14
|
*/
|
|
15
15
|
import type { OpenClawPluginApi } from "openclaw/plugin-sdk/channel-plugin-common";
|
|
16
16
|
/**
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
* - thinking / compaction(仅带 runId)→ 以 lifecycle start 建立的 runId→session 索引定位到轮次,
|
|
11
11
|
* 仅对非 wrapper 首段的 runId 转发,避免与 wrapper 回调重复展示(P1)。
|
|
12
12
|
*
|
|
13
|
-
* handle
|
|
13
|
+
* handle 内绝不容忍抛错(事件订阅统一纪律)。
|
|
14
14
|
*/
|
|
15
15
|
import { findActiveRoundForSession } from "./active-round-registry.js";
|
|
16
16
|
import { getSharedMap } from "./process-shared-store.js";
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xgjktech/xg_cwork_im",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.19.1",
|
|
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/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/plan-
|
|
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/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/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/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
|
},
|
|
@@ -41,11 +41,11 @@
|
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@types/node": "^22.19.0",
|
|
43
43
|
"@types/ws": "^8.5.10",
|
|
44
|
-
"openclaw": "
|
|
44
|
+
"openclaw": "2026.9.2",
|
|
45
45
|
"typescript": "^5.3.0"
|
|
46
46
|
},
|
|
47
47
|
"peerDependencies": {
|
|
48
|
-
"openclaw": ">=2026.
|
|
48
|
+
"openclaw": ">=2026.9.2"
|
|
49
49
|
},
|
|
50
50
|
"peerDependenciesMeta": {
|
|
51
51
|
"openclaw": {
|
|
@@ -72,7 +72,11 @@
|
|
|
72
72
|
},
|
|
73
73
|
"install": {
|
|
74
74
|
"localPath": ".",
|
|
75
|
-
"defaultChoice": "local"
|
|
75
|
+
"defaultChoice": "local",
|
|
76
|
+
"minHostVersion": ">=2026.9.2"
|
|
77
|
+
},
|
|
78
|
+
"compat": {
|
|
79
|
+
"pluginApi": ">=2026.9.2"
|
|
76
80
|
}
|
|
77
81
|
}
|
|
78
82
|
}
|