@xgjktech/xg_cwork_im 1.17.47 → 1.17.49
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/README.md +489 -489
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +19 -11
- package/dist/index.js.map +1 -1
- package/dist/src/build-project-prompt.test.js +18 -18
- package/dist/src/cron-appkey-binding-store.d.ts.map +1 -1
- package/dist/src/cron-appkey-binding-store.js +28 -10
- package/dist/src/cron-appkey-binding-store.js.map +1 -1
- package/dist/src/cron-appkey-binding-store.test.js +69 -1
- package/dist/src/cron-appkey-binding-store.test.js.map +1 -1
- package/dist/src/gateway-session-queue.d.ts +3 -0
- package/dist/src/gateway-session-queue.d.ts.map +1 -1
- package/dist/src/gateway-session-queue.js +1 -0
- package/dist/src/gateway-session-queue.js.map +1 -1
- package/dist/src/plugin-dispose.d.ts +8 -7
- package/dist/src/plugin-dispose.d.ts.map +1 -1
- package/dist/src/plugin-dispose.js +11 -10
- package/dist/src/plugin-dispose.js.map +1 -1
- package/dist/src/process-shared-store.d.ts +7 -8
- package/dist/src/process-shared-store.d.ts.map +1 -1
- package/dist/src/process-shared-store.js +12 -7
- package/dist/src/process-shared-store.js.map +1 -1
- package/dist/src/process-shared-store.test.js +31 -23
- package/dist/src/process-shared-store.test.js.map +1 -1
- package/dist/src/register-exec-env-hook.d.ts.map +1 -1
- package/dist/src/register-exec-env-hook.js +174 -33
- package/dist/src/register-exec-env-hook.js.map +1 -1
- package/dist/src/register-exec-env-hook.test.js +32 -0
- package/dist/src/register-exec-env-hook.test.js.map +1 -1
- package/dist/src/session-env-store.d.ts +4 -2
- package/dist/src/session-env-store.d.ts.map +1 -1
- package/dist/src/session-env-store.js +7 -3
- package/dist/src/session-env-store.js.map +1 -1
- package/dist/src/session-env-store.test.js +3 -1
- package/dist/src/session-env-store.test.js.map +1 -1
- package/dist/src/single-chat-no-reply-fallback.d.ts +14 -0
- package/dist/src/single-chat-no-reply-fallback.d.ts.map +1 -0
- package/dist/src/single-chat-no-reply-fallback.js +20 -0
- package/dist/src/single-chat-no-reply-fallback.js.map +1 -0
- package/dist/src/subagent-progress-hooks.d.ts +11 -0
- package/dist/src/subagent-progress-hooks.d.ts.map +1 -0
- package/dist/src/subagent-progress-hooks.js +41 -0
- package/dist/src/subagent-progress-hooks.js.map +1 -0
- package/package.json +1 -1
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;AAmCH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAK5D,OAAO,EAAE,uCAAuC,EAAE,MAAM,oCAAoC,CAAC;AAgD7F,QAAA,MAAM,MAAM,EAAE,qBAsOb,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -13,7 +13,7 @@ import { buildSendFileTool } from "./src/send-file-tool.js";
|
|
|
13
13
|
import { buildSendGroupMessageTool } from "./src/send-group-message-tool.js";
|
|
14
14
|
import { setPluginApi, startMonitor, markSubagentCompleted, getSubagentMonitorInstanceId, } from "./src/subagent-monitor.js";
|
|
15
15
|
import { getSessionImContext } from "./src/session-im-context.js";
|
|
16
|
-
import { currentRegisterSeq,
|
|
16
|
+
import { currentRegisterSeq, nextModuleEpoch, nextRegisterSeq, requestFullTeardownOnce, resetFullTeardownGate, setSharedRuntime, } from "./src/process-shared-store.js";
|
|
17
17
|
import { disposePluginModule } from "./src/plugin-dispose.js";
|
|
18
18
|
import { friendlyToolLabel, buildToolStartSummary } from "./src/im-tool-progress.js";
|
|
19
19
|
import { getStreamClient } from "./src/agent-stream-client-registry.js";
|
|
@@ -44,9 +44,10 @@ function isGatewayProcess() {
|
|
|
44
44
|
}
|
|
45
45
|
/**
|
|
46
46
|
* 本模块实例代际号（仅观测用）：插件每次热重载重新 import 时领取。
|
|
47
|
-
*
|
|
48
|
-
*
|
|
49
|
-
*
|
|
47
|
+
* register 序列（nextRegisterSeq / currentRegisterSeq）仅用于观测重载频率，
|
|
48
|
+
* **不作为连接 teardown 的依据**：连接只由 AccountReconciler（配置 diff，账号级）
|
|
49
|
+
* 与 gateway_stop（进程停机，once 闸门）拆解；runtimeLifecycle.cleanup 一律
|
|
50
|
+
* skipConnections=true，绝不 stopAll。
|
|
50
51
|
*/
|
|
51
52
|
const MODULE_EPOCH = nextModuleEpoch();
|
|
52
53
|
console.log(`[xg_cwork_im] [reload] module imported epoch=${MODULE_EPOCH} pid=${process.pid} title=${(process.title || "(none)").trim()}`);
|
|
@@ -58,6 +59,7 @@ const plugin = {
|
|
|
58
59
|
register(api) {
|
|
59
60
|
// runtime 写入进程级共享存储：连接派发按需现取最新 rt，不随模块实例绑定。
|
|
60
61
|
const registerSeq = nextRegisterSeq();
|
|
62
|
+
resetFullTeardownGate();
|
|
61
63
|
setSharedRuntime(api.runtime);
|
|
62
64
|
console.log(`[xg_cwork_im] [reload] register moduleEpoch=${MODULE_EPOCH} registerSeq=${registerSeq} ` +
|
|
63
65
|
`current=${currentRegisterSeq()} process=${process.title || "(none)"}`);
|
|
@@ -73,16 +75,18 @@ const plugin = {
|
|
|
73
75
|
// Reconciler 轮询 api.runtime.config.current() 将永远看不到账号变更。
|
|
74
76
|
api.registerReload({ hotPrefixes: ["channels.xg_cwork_im"] });
|
|
75
77
|
// 插件热重载/卸载时由 OpenClaw 退役旧 registry 触发。
|
|
76
|
-
//
|
|
77
|
-
//
|
|
78
|
-
//
|
|
78
|
+
// teardown 决策不在此处做：OpenClaw 的 registry 代际交替（含/不含本插件的 agent/model
|
|
79
|
+
// runtime 代）会频繁触发 cleanup，reason=restart/disable 都不能代表「真卸载」；若按
|
|
80
|
+
// registerSeq 尾端误判为真卸载而 stopAll，会把全局共享的 218 条 WebSocket 误拆。
|
|
81
|
+
// 因此 cleanup 只收尾本模块实例独占、非连接的句柄（plan/action/cron/plan-ws/token），
|
|
82
|
+
// 绝不 stopAll；连接仅在 AccountReconciler（配置 diff）与 gateway_stop（进程停机）处拆解。
|
|
79
83
|
api.lifecycle.registerRuntimeLifecycle({
|
|
80
84
|
id: "xg-cwork-im-dispose",
|
|
81
|
-
cleanup: async () => {
|
|
82
|
-
const
|
|
85
|
+
cleanup: async (ctx) => {
|
|
86
|
+
const reason = ctx?.reason ?? "(none)";
|
|
83
87
|
console.log(`[xg_cwork_im] [reload] cleanup moduleEpoch=${MODULE_EPOCH} registerSeq=${registerSeq} ` +
|
|
84
|
-
`
|
|
85
|
-
await disposePluginModule({ skipConnections:
|
|
88
|
+
`reason=${reason} pid=${process.pid} title=${(process.title || "(none)").trim()}`);
|
|
89
|
+
await disposePluginModule({ skipConnections: true });
|
|
86
90
|
},
|
|
87
91
|
});
|
|
88
92
|
if (!isGatewayProcess()) {
|
|
@@ -91,6 +95,10 @@ const plugin = {
|
|
|
91
95
|
}
|
|
92
96
|
accountReconciler.start();
|
|
93
97
|
api.on("gateway_stop", async () => {
|
|
98
|
+
if (!requestFullTeardownOnce()) {
|
|
99
|
+
return; // 多个 register 各自注册了 gateway_stop，只执行一次全量 teardown。
|
|
100
|
+
}
|
|
101
|
+
console.log(`[xg_cwork_im] [reload] gateway_stop → full teardown moduleEpoch=${MODULE_EPOCH}`);
|
|
94
102
|
await disposePluginModule();
|
|
95
103
|
});
|
|
96
104
|
api.on("subagent_spawned", async (event) => {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,uBAAuB,EAAuB,MAAM,0BAA0B,CAAC;AAExF,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AACvF,OAAO,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACrG,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EACH,YAAY,EACZ,YAAY,EACZ,qBAAqB,EACrB,4BAA4B,GAC/B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EACH,kBAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,24 +76,24 @@ describe("buildAgentContextPromptBlock nasVolumes", () => {
|
|
|
76
76
|
background,
|
|
77
77
|
},
|
|
78
78
|
});
|
|
79
|
-
assert.equal(result.block, `## 当前项目
|
|
80
|
-
|
|
81
|
-
### 本次会话文件目录
|
|
82
|
-
本次会话需要读取的文件位于以下已授权目录：
|
|
83
|
-
- \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/deliverables\`（只读）
|
|
84
|
-
- \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0000\`（只读）
|
|
85
|
-
- \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\`（可读写）
|
|
86
|
-
- 首选文件写入目录：\`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\`
|
|
87
|
-
|
|
88
|
-
### 目录用途
|
|
89
|
-
- **项目产出**：项目相关文件优先保存到可写目录 \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\` 或其子目录。
|
|
90
|
-
|
|
91
|
-
### 操作约束
|
|
92
|
-
- 仅在上述已授权 NAS 目录下读取或处理项目文件；不要在 workspace 其他位置查找类似目录。
|
|
93
|
-
- 对用户统一称为「本项目」，不要提及 OpenClaw workspace 等实现细节。
|
|
94
|
-
|
|
95
|
-
## 项目背景
|
|
96
|
-
|
|
79
|
+
assert.equal(result.block, `## 当前项目
|
|
80
|
+
|
|
81
|
+
### 本次会话文件目录
|
|
82
|
+
本次会话需要读取的文件位于以下已授权目录：
|
|
83
|
+
- \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/deliverables\`（只读）
|
|
84
|
+
- \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0000\`（只读）
|
|
85
|
+
- \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\`（可读写）
|
|
86
|
+
- 首选文件写入目录：\`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\`
|
|
87
|
+
|
|
88
|
+
### 目录用途
|
|
89
|
+
- **项目产出**：项目相关文件优先保存到可写目录 \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\` 或其子目录。
|
|
90
|
+
|
|
91
|
+
### 操作约束
|
|
92
|
+
- 仅在上述已授权 NAS 目录下读取或处理项目文件；不要在 workspace 其他位置查找类似目录。
|
|
93
|
+
- 对用户统一称为「本项目」，不要提及 OpenClaw workspace 等实现细节。
|
|
94
|
+
|
|
95
|
+
## 项目背景
|
|
96
|
+
|
|
97
97
|
${background}`);
|
|
98
98
|
});
|
|
99
99
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron-appkey-binding-store.d.ts","sourceRoot":"","sources":["../../src/cron-appkey-binding-store.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAK7C,MAAM,MAAM,iBAAiB,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;
|
|
1
|
+
{"version":3,"file":"cron-appkey-binding-store.d.ts","sourceRoot":"","sources":["../../src/cron-appkey-binding-store.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAK7C,MAAM,MAAM,iBAAiB,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;AAyGF,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAKjE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAKlG;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,iBAAiB,GAAG,SAAS,CAgDhC;AAED,wBAAgB,qCAAqC,IAAI,IAAI,CAE5D;AAED,mCAAmC;AACnC,wBAAgB,6BAA6B,IAAI,IAAI,CAIpD"}
|
|
@@ -9,7 +9,10 @@ let bindingPath;
|
|
|
9
9
|
let bindingMtimeMs = -1;
|
|
10
10
|
let bindings = new Map();
|
|
11
11
|
function key(agentId, jobId) {
|
|
12
|
-
|
|
12
|
+
// OpenClaw canonicalizes agent/job segments case-insensitively in Cron
|
|
13
|
+
// SessionKeys. Normalize lookup keys the same way while preserving the
|
|
14
|
+
// original values in the persisted record for diagnostics.
|
|
15
|
+
return `${agentId.trim().toLowerCase()}\u0000${jobId.trim().toLowerCase()}`;
|
|
13
16
|
}
|
|
14
17
|
function validText(value) {
|
|
15
18
|
return typeof value === "string" && value.trim().length > 0 && value.length <= MAX_APP_KEY_LENGTH &&
|
|
@@ -19,11 +22,10 @@ function validBinding(value) {
|
|
|
19
22
|
if (!value || typeof value !== "object")
|
|
20
23
|
return false;
|
|
21
24
|
const b = value;
|
|
22
|
-
//
|
|
23
|
-
//
|
|
25
|
+
// Only the lookup identity and AppKey are required. Metadata fields are
|
|
26
|
+
// optional so older/minimal binding files remain usable after restart.
|
|
24
27
|
return validText(b.agentId) && validText(b.jobId) &&
|
|
25
|
-
(b.appKey === "" || validText(b.appKey))
|
|
26
|
-
validText(b.createdAt) && validText(b.updatedAt) && typeof b.enabled === "boolean";
|
|
28
|
+
(b.appKey === "" || validText(b.appKey));
|
|
27
29
|
}
|
|
28
30
|
function resolvePath(stateDir) {
|
|
29
31
|
// resolveStateDir() normally points at ~/.openclaw/state; keep bindings in
|
|
@@ -52,15 +54,28 @@ function load(force = false) {
|
|
|
52
54
|
}
|
|
53
55
|
try {
|
|
54
56
|
const parsed = JSON.parse(readFileSync(bindingPath, "utf8"));
|
|
55
|
-
if (parsed.schemaVersion !== CRON_BINDING_SCHEMA_VERSION)
|
|
56
|
-
|
|
57
|
-
|
|
57
|
+
if (parsed.schemaVersion !== CRON_BINDING_SCHEMA_VERSION || !Array.isArray(parsed.bindings)) {
|
|
58
|
+
// Fail closed on an unreadable/incompatible file; do not retain a
|
|
59
|
+
// stale AppKey cache whose ownership can no longer be verified.
|
|
60
|
+
bindings = new Map();
|
|
61
|
+
bindingMtimeMs = mtime;
|
|
58
62
|
return;
|
|
63
|
+
}
|
|
59
64
|
const next = new Map();
|
|
60
65
|
for (const raw of parsed.bindings) {
|
|
61
66
|
if (!validBinding(raw))
|
|
62
67
|
continue;
|
|
63
|
-
const
|
|
68
|
+
const now = new Date().toISOString();
|
|
69
|
+
const b = {
|
|
70
|
+
...raw,
|
|
71
|
+
agentId: raw.agentId.trim(),
|
|
72
|
+
jobId: raw.jobId.trim(),
|
|
73
|
+
appKey: raw.appKey.trim(),
|
|
74
|
+
source: validText(raw.source) ? raw.source : "legacy",
|
|
75
|
+
createdAt: validText(raw.createdAt) ? raw.createdAt : now,
|
|
76
|
+
updatedAt: validText(raw.updatedAt) ? raw.updatedAt : now,
|
|
77
|
+
enabled: raw.enabled !== false,
|
|
78
|
+
};
|
|
64
79
|
const k = key(b.agentId, b.jobId);
|
|
65
80
|
const previous = next.get(k);
|
|
66
81
|
if (!previous || b.updatedAt >= previous.updatedAt)
|
|
@@ -70,7 +85,10 @@ function load(force = false) {
|
|
|
70
85
|
bindingMtimeMs = mtime;
|
|
71
86
|
}
|
|
72
87
|
catch {
|
|
73
|
-
//
|
|
88
|
+
// Fail closed when the file is temporarily malformed. A later mtime
|
|
89
|
+
// change will cause a fresh load.
|
|
90
|
+
bindings = new Map();
|
|
91
|
+
bindingMtimeMs = mtime;
|
|
74
92
|
}
|
|
75
93
|
}
|
|
76
94
|
function acquireLock(lockPath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron-appkey-binding-store.js","sourceRoot":"","sources":["../../src/cron-appkey-binding-store.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAC3D,OAAO,EACH,SAAS,EACT,UAAU,EACV,SAAS,EACT,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,UAAU,EACV,aAAa,GAChB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAC7C,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAC/B,MAAM,YAAY,GAAG,EAAE,CAAC;AACxB,MAAM,aAAa,GAAG,EAAE,CAAC;AAqBzB,IAAI,WAA+B,CAAC;AACpC,IAAI,cAAc,GAAG,CAAC,CAAC,CAAC;AACxB,IAAI,QAAQ,GAAG,IAAI,GAAG,EAA6B,CAAC;AAEpD,SAAS,GAAG,CAAC,OAAe,EAAE,KAAa;IACvC,OAAO,GAAG,OAAO,SAAS,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"cron-appkey-binding-store.js","sourceRoot":"","sources":["../../src/cron-appkey-binding-store.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAC3D,OAAO,EACH,SAAS,EACT,UAAU,EACV,SAAS,EACT,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,UAAU,EACV,aAAa,GAChB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAC7C,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAC/B,MAAM,YAAY,GAAG,EAAE,CAAC;AACxB,MAAM,aAAa,GAAG,EAAE,CAAC;AAqBzB,IAAI,WAA+B,CAAC;AACpC,IAAI,cAAc,GAAG,CAAC,CAAC,CAAC;AACxB,IAAI,QAAQ,GAAG,IAAI,GAAG,EAA6B,CAAC;AAEpD,SAAS,GAAG,CAAC,OAAe,EAAE,KAAa;IACvC,uEAAuE;IACvE,uEAAuE;IACvE,2DAA2D;IAC3D,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,SAAS,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;AAChF,CAAC;AAED,SAAS,SAAS,CAAC,KAAc;IAC7B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,IAAI,kBAAkB;QAC7F,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAChC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACtD,MAAM,CAAC,GAAG,KAAmC,CAAC;IAC9C,wEAAwE;IACxE,uEAAuE;IACvE,OAAO,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;QAC7C,CAAC,CAAC,CAAC,MAAM,KAAK,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,WAAW,CAAC,QAAgB;IACjC,2EAA2E;IAC3E,4DAA4D;IAC5D,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACnD,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IAChF,OAAO,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,2BAA2B,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,IAAI,CAAC,KAAK,GAAG,KAAK;IACvB,IAAI,CAAC,WAAW;QAAE,OAAO;IACzB,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC;IACf,IAAI,CAAC;QACD,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;IAC1C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO;IACjE,CAAC;IACD,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,cAAc;QAAE,OAAO;IAC/C,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACZ,cAAc,GAAG,CAAC,CAAC,CAAC;QACpB,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;QACrB,OAAO;IACX,CAAC;IACD,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAyB,CAAC;QACrF,IAAI,MAAM,CAAC,aAAa,KAAK,2BAA2B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1F,kEAAkE;YAClE,gEAAgE;YAChE,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;YACrB,cAAc,GAAG,KAAK,CAAC;YACvB,OAAO;QACX,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,GAAG,EAA6B,CAAC;QAClD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YAChC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC;gBAAE,SAAS;YACjC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACrC,MAAM,CAAC,GAAsB;gBACzB,GAAG,GAAG;gBACN,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE;gBAC3B,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE;gBACvB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE;gBACzB,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ;gBACrD,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG;gBACzD,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG;gBACzD,OAAO,EAAE,GAAG,CAAC,OAAO,KAAK,KAAK;aACjC,CAAC;YACF,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC7B,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,SAAS,IAAI,QAAQ,CAAC,SAAS;gBAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACvE,CAAC;QACD,QAAQ,GAAG,IAAI,CAAC;QAChB,cAAc,GAAG,KAAK,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACL,oEAAoE;QACpE,kCAAkC;QAClC,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;QACrB,cAAc,GAAG,KAAK,CAAC;IAC3B,CAAC;AACL,CAAC;AAED,SAAS,WAAW,CAAC,QAAgB;IACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC;YACD,OAAO,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACpC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ;gBAAE,OAAO,SAAS,CAAC;YACvE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,aAAa,CAAC;YACvC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC,oCAAoC,CAAC,CAAC;QACrE,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,QAAgB;IACvD,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IACpC,cAAc,GAAG,CAAC,CAAC,CAAC;IACpB,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;IACrB,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAe,EAAE,KAAa;IAC/D,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IACzC,IAAI,EAAE,CAAC;IACP,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IAC5C,OAAO,CAAC,EAAE,OAAO,IAAI,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAQ9B;IACG,IAAI,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC;QAAE,OAAO,SAAS,CAAC;IACvH,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,GAAG,WAAW,OAAO,CAAC;IACvC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IACrC,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC3C,IAAI,OAA2B,CAAC;IAChC,IAAI,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,CAAC;QACX,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC7E,MAAM,OAAO,GAAsB;YAC/B,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE;YAC7B,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE;YACzB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE;YAC3B,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClG,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9G,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxJ,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,QAAQ,EAAE,MAAM,IAAI,IAAI;YAChD,SAAS,EAAE,QAAQ,EAAE,SAAS,IAAI,GAAG;YACrC,SAAS,EAAE,GAAG;YACd,OAAO,EAAE,IAAI;SAChB,CAAC;QACF,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;QACvD,MAAM,OAAO,GAAgB;YACzB,aAAa,EAAE,2BAA2B;YAC1C,SAAS,EAAE,GAAG;YACd,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;SAC/B,CAAC;QACF,OAAO,GAAG,GAAG,WAAW,IAAI,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC;QAC5D,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5F,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC;YAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAAC,CAAC;gBAAS,CAAC;YAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAAC,CAAC;QACvD,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACjC,QAAQ,GAAG,IAAI,CAAC;QAChB,IAAI,CAAC;YAAC,cAAc,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC;YAAC,cAAc,GAAG,CAAC,CAAC,CAAC;QAAC,CAAC;QACtF,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACL,IAAI,OAAO,EAAE,CAAC;YACV,IAAI,CAAC;gBAAC,IAAI,UAAU,CAAC,OAAO,CAAC;oBAAE,UAAU,CAAC,OAAO,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;QAChF,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;YAAS,CAAC;QACP,IAAI,CAAC;YAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;QACjD,IAAI,CAAC;YAAC,IAAI,UAAU,CAAC,QAAQ,CAAC;gBAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;IAClF,CAAC;AACL,CAAC;AAED,MAAM,UAAU,qCAAqC;IACjD,6BAA6B,EAAE,CAAC;AACpC,CAAC;AAED,mCAAmC;AACnC,MAAM,UAAU,6BAA6B;IACzC,WAAW,GAAG,SAAS,CAAC;IACxB,cAAc,GAAG,CAAC,CAAC,CAAC;IACpB,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;AACzB,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { tmpdir } from "node:os";
|
|
|
4
4
|
import { join } from "node:path";
|
|
5
5
|
import { afterEach, describe, it } from "node:test";
|
|
6
6
|
import { __resetCronAppKeyBindingStoreForTests, bindCronAppKey, getCronAppKeyBinding, initCronAppKeyBindingStore, } from "./cron-appkey-binding-store.js";
|
|
7
|
-
import { extractCronJobIdFromResult, isCronCreateCommand, registerCronAppKeyBindingHook, registerExecEnvHook } from "./register-exec-env-hook.js";
|
|
7
|
+
import { extractCronJobIdFromResult, isCronCreateCommand, parseCronSessionKey, registerCronAppKeyBindingHook, registerExecEnvHook } from "./register-exec-env-hook.js";
|
|
8
8
|
import { setSessionEnvEntry, setSessionUserContext, XG_OPENAPI_APP_KEY } from "./session-env-store.js";
|
|
9
9
|
let dirs = [];
|
|
10
10
|
afterEach(() => {
|
|
@@ -73,6 +73,24 @@ describe("cron appKey binding store", () => {
|
|
|
73
73
|
after?.({ toolName: "exec", params: { command: "openclaw cron add --every 5m --json" }, result: { content: [{ text: "{\"id\":\"10d05140-09a8-4354-93f0-dd7fd0ff5e9\"}" }] } }, { sessionKey, agentId: "agent-a" });
|
|
74
74
|
assert.equal(getCronAppKeyBinding("agent-a", "10d05140-09a8-4354-93f0-dd7fd0ff5e9")?.appKey, "key-cli");
|
|
75
75
|
});
|
|
76
|
+
it("accepts isolated Cron session keys and non-UUID structured job ids", () => {
|
|
77
|
+
assert.deepEqual(parseCronSessionKey("agent:agent-a:cron:daily-report"), {
|
|
78
|
+
agentId: "agent-a",
|
|
79
|
+
jobId: "daily-report",
|
|
80
|
+
runId: "",
|
|
81
|
+
});
|
|
82
|
+
assert.equal(extractCronJobIdFromResult({ details: { jobId: "daily-report" } }), "daily-report");
|
|
83
|
+
assert.equal(extractCronJobIdFromResult({ content: [{ type: "text", text: '{"id":"daily-report"}' }] }), "daily-report");
|
|
84
|
+
});
|
|
85
|
+
it("loads a minimal persisted binding without optional metadata", () => {
|
|
86
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
87
|
+
dirs.push(dir);
|
|
88
|
+
initCronAppKeyBindingStore(join(dir, "state"));
|
|
89
|
+
const path = join(dir, "xg-cwork-im", "cron-appkey-bindings.json");
|
|
90
|
+
mkdirSync(join(dir, "xg-cwork-im"), { recursive: true });
|
|
91
|
+
writeFileSync(path, JSON.stringify({ schemaVersion: 1, bindings: [{ agentId: "agent-a", jobId: "daily-report", appKey: "key-1" }] }));
|
|
92
|
+
assert.equal(getCronAppKeyBinding("agent-a", "daily-report")?.appKey, "key-1");
|
|
93
|
+
});
|
|
76
94
|
it("injects only the matching agent/job binding and strips unbound values", () => {
|
|
77
95
|
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
78
96
|
dirs.push(dir);
|
|
@@ -86,8 +104,58 @@ describe("cron appKey binding store", () => {
|
|
|
86
104
|
});
|
|
87
105
|
const bound = before?.({ toolName: "exec", params: { env: { XG_OPENAPI_APP_KEY: "***", KEEP: "1" } } }, { sessionKey: "agent:agent-a:cron:job-1:run:r" });
|
|
88
106
|
assert.equal(bound.params.env.XG_OPENAPI_APP_KEY, "key-1");
|
|
107
|
+
const isolated = before?.({ toolName: "exec", params: { env: { XG_OPENAPI_APP_KEY: "***" } } }, { sessionKey: "agent:agent-a:cron:job-1" });
|
|
108
|
+
assert.equal(isolated.params.env.XG_OPENAPI_APP_KEY, "key-1");
|
|
89
109
|
const unbound = before?.({ toolName: "exec", params: { env: { XG_OPENAPI_APP_KEY: "***" } } }, { sessionKey: "agent:agent-b:cron:job-1:run:r" });
|
|
90
110
|
assert.deepEqual(unbound.params.env, {});
|
|
91
111
|
});
|
|
112
|
+
it("Cron 子 Agent 沿 OpenClaw 父链按 agentId + jobId 恢复绑定", () => {
|
|
113
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
114
|
+
dirs.push(dir);
|
|
115
|
+
initCronAppKeyBindingStore(join(dir, "state"));
|
|
116
|
+
bindCronAppKey({ agentId: "agent-a", jobId: "job-1", appKey: "key-1" });
|
|
117
|
+
let before;
|
|
118
|
+
registerExecEnvHook({
|
|
119
|
+
runtime: {
|
|
120
|
+
config: { current: () => ({ channels: { xg_cwork_im: {} } }) },
|
|
121
|
+
agent: {
|
|
122
|
+
session: {
|
|
123
|
+
resolveStorePath: () => "test-store",
|
|
124
|
+
getSessionEntry: ({ sessionKey }) => sessionKey === "agent:agent-a:child" ? { spawnedBy: "agent:agent-a:cron:job-1:run:old" } : undefined,
|
|
125
|
+
},
|
|
126
|
+
},
|
|
127
|
+
},
|
|
128
|
+
on: (name, handler) => { if (name === "before_tool_call")
|
|
129
|
+
before = handler; },
|
|
130
|
+
});
|
|
131
|
+
const result = before?.({ toolName: "exec", params: { env: { XG_OPENAPI_APP_KEY: "ai-wrong" } } }, { sessionKey: "agent:agent-a:child", agentId: "agent-a" });
|
|
132
|
+
assert.equal(result.params.env.XG_OPENAPI_APP_KEY, "key-1");
|
|
133
|
+
});
|
|
134
|
+
it("Cron 绑定缺失时不回退到普通父 Session 的 AppKey", () => {
|
|
135
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
136
|
+
dirs.push(dir);
|
|
137
|
+
initCronAppKeyBindingStore(join(dir, "state"));
|
|
138
|
+
setSessionEnvEntry("agent:agent-a:root", XG_OPENAPI_APP_KEY, "ordinary-key");
|
|
139
|
+
let before;
|
|
140
|
+
registerExecEnvHook({
|
|
141
|
+
runtime: {
|
|
142
|
+
config: { current: () => ({ channels: { xg_cwork_im: {} } }) },
|
|
143
|
+
agent: { session: {
|
|
144
|
+
resolveStorePath: () => "test-store",
|
|
145
|
+
getSessionEntry: ({ sessionKey }) => {
|
|
146
|
+
if (sessionKey === "agent:agent-a:child")
|
|
147
|
+
return { spawnedBy: "agent:agent-a:cron:job-missing:run:r" };
|
|
148
|
+
if (sessionKey === "agent:agent-a:cron:job-missing:run:r")
|
|
149
|
+
return { spawnedBy: "agent:agent-a:root" };
|
|
150
|
+
return undefined;
|
|
151
|
+
},
|
|
152
|
+
} },
|
|
153
|
+
},
|
|
154
|
+
on: (name, handler) => { if (name === "before_tool_call")
|
|
155
|
+
before = handler; },
|
|
156
|
+
});
|
|
157
|
+
const result = before?.({ toolName: "exec", params: { env: { XG_OPENAPI_APP_KEY: "ai-wrong" } } }, { sessionKey: "agent:agent-a:child", agentId: "agent-a" });
|
|
158
|
+
assert.deepEqual(result.params.env, {});
|
|
159
|
+
});
|
|
92
160
|
});
|
|
93
161
|
//# sourceMappingURL=cron-appkey-binding-store.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron-appkey-binding-store.test.js","sourceRoot":"","sources":["../../src/cron-appkey-binding-store.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtF,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EACH,qCAAqC,EACrC,cAAc,EACd,oBAAoB,EACpB,0BAA0B,GAC7B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"cron-appkey-binding-store.test.js","sourceRoot":"","sources":["../../src/cron-appkey-binding-store.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ import type { ImStreamClient } from "./connection.js";
|
|
|
7
7
|
import type { BotIdentity, WsMessageParams, XgImConfig } from "./types.js";
|
|
8
8
|
import type { AutoRouteResult } from "./auto-model-router.js";
|
|
9
9
|
import type { InboundTrigger } from "./inbound-terminal-state.js";
|
|
10
|
+
import type { NasVolume } from "./agent-context-types.js";
|
|
10
11
|
export interface PendingDispatch {
|
|
11
12
|
route: {
|
|
12
13
|
sessionKey: string;
|
|
@@ -16,6 +17,8 @@ export interface PendingDispatch {
|
|
|
16
17
|
params: WsMessageParams;
|
|
17
18
|
currentIdentity: BotIdentity;
|
|
18
19
|
agentWorkspaceDir?: string;
|
|
20
|
+
/** 本会话 NAS 挂载声明；同一 sessionKey 下必须保持不变。 */
|
|
21
|
+
nasVolumes?: NasVolume[];
|
|
19
22
|
/** 本条消息单轮模型（OpenClaw replyOptions.modelOverride） */
|
|
20
23
|
modelOverride?: string;
|
|
21
24
|
/** 本条消息单轮推理等级（OpenClaw replyOptions.thinkingLevelOverride；用户显式 /think 时不设） */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway-session-queue.d.ts","sourceRoot":"","sources":["../../src/gateway-session-queue.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"gateway-session-queue.d.ts","sourceRoot":"","sources":["../../src/gateway-session-queue.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D,MAAM,WAAW,eAAe;IAC5B,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/C,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC;IACxB,eAAe,EAAE,WAAW,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,0CAA0C;IAC1C,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;IACzB,oDAAoD;IACpD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,8EAA8E;IAC9E,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,gDAAgD;IAChD,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,YAAY;IACZ,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,yCAAyC;IACzC,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE;IAC/C,cAAc,EAAE,MAAM,UAAU,CAAC;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,GAAG,CAAC;IACR,WAAW,EAAE,MAAM,cAAc,CAAC;CACrC,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CA8GhG"}
|
|
@@ -57,6 +57,7 @@ export function createRunWithSessionQueue(options) {
|
|
|
57
57
|
currentIdentity: pending.currentIdentity,
|
|
58
58
|
streamClient,
|
|
59
59
|
agentWorkspaceDir: pending.agentWorkspaceDir,
|
|
60
|
+
nasVolumes: pending.nasVolumes,
|
|
60
61
|
modelOverride: pending.modelOverride,
|
|
61
62
|
thinkingLevelOverride: pending.thinkingLevelOverride,
|
|
62
63
|
autoRouteMeta: pending.autoRouteMeta,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway-session-queue.js","sourceRoot":"","sources":["../../src/gateway-session-queue.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"gateway-session-queue.js","sourceRoot":"","sources":["../../src/gateway-session-queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,16 +3,17 @@
|
|
|
3
3
|
*
|
|
4
4
|
* 语义（跨模块共享改造后）：
|
|
5
5
|
* - 真卸载 / gateway_stop：`disposePluginModule()`（skipConnections=false）——连同进程级共享的
|
|
6
|
-
* account-reconciler 一起 stopAll
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
6
|
+
* account-reconciler 一起 stopAll，并清空全部共享内存态（连接/流客户端/会话上下文/轮次/去重/env/
|
|
7
|
+
* subagent 监控）。由 index.ts 的 gateway_stop 钩子触发，且用 once 闸门保证只执行一次。
|
|
8
|
+
* - 插件热重载 / registry 代际交替：cleanup 一律以 `disposePluginModule({ skipConnections: true })`
|
|
9
|
+
* 调用——只收尾本模块实例独占、非连接的句柄（plan/action/cron SQLite、plan-ws、token 缓存），
|
|
10
|
+
* **绝不 stopAll、绝不清理共享连接/内存态**。连接只在 AccountReconciler（配置 diff，账号级）
|
|
11
|
+
* 与 gateway_stop（进程停机）处拆解，避免 OpenClaw runtime 代际交替误拆全部 WebSocket。
|
|
11
12
|
*/
|
|
12
13
|
export interface DisposePluginModuleOptions {
|
|
13
|
-
/**
|
|
14
|
+
/** 注册表代际交替（热重载）场景：只收尾独占句柄，跳过共享连接与共享内存态。 */
|
|
14
15
|
skipConnections?: boolean;
|
|
15
16
|
}
|
|
16
|
-
/**
|
|
17
|
+
/** skipConnections=false（gateway_stop）时停连接+清共享态；true（cleanup）只收尾独占句柄。 */
|
|
17
18
|
export declare function disposePluginModule(options?: DisposePluginModuleOptions): Promise<void>;
|
|
18
19
|
//# sourceMappingURL=plugin-dispose.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-dispose.d.ts","sourceRoot":"","sources":["../../src/plugin-dispose.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"plugin-dispose.d.ts","sourceRoot":"","sources":["../../src/plugin-dispose.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAiBH,MAAM,WAAW,0BAA0B;IACvC,2CAA2C;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,yEAAyE;AACzE,wBAAsB,mBAAmB,CACrC,OAAO,GAAE,0BAA+B,GACzC,OAAO,CAAC,IAAI,CAAC,CAuBf"}
|
|
@@ -3,11 +3,12 @@
|
|
|
3
3
|
*
|
|
4
4
|
* 语义（跨模块共享改造后）：
|
|
5
5
|
* - 真卸载 / gateway_stop：`disposePluginModule()`（skipConnections=false）——连同进程级共享的
|
|
6
|
-
* account-reconciler 一起 stopAll
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
6
|
+
* account-reconciler 一起 stopAll，并清空全部共享内存态（连接/流客户端/会话上下文/轮次/去重/env/
|
|
7
|
+
* subagent 监控）。由 index.ts 的 gateway_stop 钩子触发，且用 once 闸门保证只执行一次。
|
|
8
|
+
* - 插件热重载 / registry 代际交替：cleanup 一律以 `disposePluginModule({ skipConnections: true })`
|
|
9
|
+
* 调用——只收尾本模块实例独占、非连接的句柄（plan/action/cron SQLite、plan-ws、token 缓存），
|
|
10
|
+
* **绝不 stopAll、绝不清理共享连接/内存态**。连接只在 AccountReconciler（配置 diff，账号级）
|
|
11
|
+
* 与 gateway_stop（进程停机）处拆解，避免 OpenClaw runtime 代际交替误拆全部 WebSocket。
|
|
11
12
|
*/
|
|
12
13
|
import { accountReconciler } from "./account-reconciler.js";
|
|
13
14
|
import { clearStreamClients } from "./agent-stream-client-registry.js";
|
|
@@ -23,15 +24,15 @@ import { disposePlanWsRegistry } from "./plan-ws-registry.js";
|
|
|
23
24
|
import { disposeSessionEnvStore } from "./session-env-store.js";
|
|
24
25
|
import { disposeSessionImContext } from "./session-im-context.js";
|
|
25
26
|
import { disposeSubagentMonitor } from "./subagent-monitor.js";
|
|
26
|
-
/**
|
|
27
|
+
/** skipConnections=false（gateway_stop）时停连接+清共享态；true（cleanup）只收尾独占句柄。 */
|
|
27
28
|
export async function disposePluginModule(options = {}) {
|
|
28
29
|
const { skipConnections = false } = options;
|
|
29
30
|
if (skipConnections) {
|
|
30
|
-
console.log("[xg_cwork_im] [reload] disposePluginModule skipConnections=true (
|
|
31
|
+
console.log("[xg_cwork_im] [reload] disposePluginModule skipConnections=true (registry cycle)");
|
|
31
32
|
}
|
|
32
33
|
else {
|
|
33
|
-
//
|
|
34
|
-
await accountReconciler.stopAll("
|
|
34
|
+
// gateway_stop：停共享连接 + 清空共享热路径内存态（含 subagent 监控 maps/ticker）。
|
|
35
|
+
await accountReconciler.stopAll("gateway-stop");
|
|
35
36
|
disposeSubagentMonitor();
|
|
36
37
|
clearStreamClients();
|
|
37
38
|
disposeSessionImContext();
|
|
@@ -41,7 +42,7 @@ export async function disposePluginModule(options = {}) {
|
|
|
41
42
|
clearSessionNasVolumeStates();
|
|
42
43
|
disposeSessionEnvStore();
|
|
43
44
|
}
|
|
44
|
-
//
|
|
45
|
+
// 以下为本模块实例独占资源（不随模块共享），registry 代际交替时也照常清理，避免逐代泄漏：
|
|
45
46
|
// plan/action/cron SQLite 句柄、plan-ws 句柄、token 缓存。
|
|
46
47
|
disposeActionStore();
|
|
47
48
|
disposePlanStore();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-dispose.js","sourceRoot":"","sources":["../../src/plugin-dispose.ts"],"names":[],"mappings":"AAAA
|
|
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,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,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAO/D,yEAAyE;AACzE,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACrC,UAAsC,EAAE;IAExC,MAAM,EAAE,eAAe,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC;IAC5C,IAAI,eAAe,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,kFAAkF,CAAC,CAAC;IACpG,CAAC;SAAM,CAAC;QACJ,8DAA8D;QAC9D,MAAM,iBAAiB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAChD,sBAAsB,EAAE,CAAC;QACzB,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;IAC7B,CAAC;IACD,mDAAmD;IACnD,kDAAkD;IAClD,kBAAkB,EAAE,CAAC;IACrB,gBAAgB,EAAE,CAAC;IACnB,qBAAqB,EAAE,CAAC;IACxB,6BAA6B,EAAE,CAAC;IAChC,kBAAkB,EAAE,CAAC;AACzB,CAAC"}
|
|
@@ -14,13 +14,14 @@
|
|
|
14
14
|
export interface ProcessSharedStore {
|
|
15
15
|
/** 模块代际计数：每个模块实例在顶层（重）import 时递增取号（仅用于观测重载）。 */
|
|
16
16
|
moduleEpoch: number;
|
|
17
|
-
/** register() 序列：每次 register()
|
|
18
|
-
* register 接管」（兼容模块被复用 vs 重新 import 两种重载形态）。 */
|
|
17
|
+
/** register() 序列：每次 register() 自增（仅观测用，不再作为 teardown 判定依据）。 */
|
|
19
18
|
registerSeq: number;
|
|
20
19
|
/** 当前生效的插件 runtime（每次 register() 覆盖）。 */
|
|
21
20
|
runtime: unknown;
|
|
22
21
|
/** 进程级共享命名空间（连接/reconciler 等状态）。 */
|
|
23
22
|
namespace: Record<string, unknown>;
|
|
23
|
+
/** gateway_stop 全量 teardown 只执行一次的闸门。 */
|
|
24
|
+
fullTeardownDone: boolean;
|
|
24
25
|
}
|
|
25
26
|
/** 模块实例顶层调用一次：领取一个全局单调递增的代际号（仅观测用）。 */
|
|
26
27
|
export declare function nextModuleEpoch(): number;
|
|
@@ -30,12 +31,10 @@ export declare function currentModuleEpoch(): number;
|
|
|
30
31
|
export declare function nextRegisterSeq(): number;
|
|
31
32
|
/** 读取当前最大的 register 序列号。 */
|
|
32
33
|
export declare function currentRegisterSeq(): number;
|
|
33
|
-
/**
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
*/
|
|
38
|
-
export declare function isTakeover(myRegisterSeq: number): boolean;
|
|
34
|
+
/** 全量 teardown（gateway_stop）幂等闸门：首次调用返回 true，其后返回 false。 */
|
|
35
|
+
export declare function requestFullTeardownOnce(): boolean;
|
|
36
|
+
/** 出现新的 register() 时复位 teardown 闸门（允许下次停机再次 teardown）。 */
|
|
37
|
+
export declare function resetFullTeardownGate(): void;
|
|
39
38
|
/** register() 时写入最新 runtime（连接派发按需现取）。 */
|
|
40
39
|
export declare function setSharedRuntime(rt: unknown): void;
|
|
41
40
|
/** 读取当前最新 runtime。 */
|