@xgjktech/xg_cwork_im 1.17.51 → 1.17.52
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.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/src/active-cron-context-store.d.ts +20 -0
- package/dist/src/active-cron-context-store.d.ts.map +1 -0
- package/dist/src/active-cron-context-store.js +73 -0
- package/dist/src/active-cron-context-store.js.map +1 -0
- package/dist/src/cron-appkey-binding-store.d.ts +2 -1
- package/dist/src/cron-appkey-binding-store.d.ts.map +1 -1
- package/dist/src/cron-appkey-binding-store.js +66 -31
- package/dist/src/cron-appkey-binding-store.js.map +1 -1
- package/dist/src/cron-appkey-binding-store.test.js +159 -1
- package/dist/src/cron-appkey-binding-store.test.js.map +1 -1
- package/dist/src/deliver-text.test.js +22 -22
- package/dist/src/gateway-session-queue.d.ts +11 -2
- package/dist/src/gateway-session-queue.d.ts.map +1 -1
- package/dist/src/gateway-session-queue.js +9 -6
- package/dist/src/gateway-session-queue.js.map +1 -1
- package/dist/src/plan-store-access.test.js +9 -9
- package/dist/src/plugin-dispose.d.ts.map +1 -1
- package/dist/src/plugin-dispose.js +3 -1
- package/dist/src/plugin-dispose.js.map +1 -1
- package/dist/src/register-exec-env-hook.d.ts +6 -0
- package/dist/src/register-exec-env-hook.d.ts.map +1 -1
- package/dist/src/register-exec-env-hook.js +99 -32
- package/dist/src/register-exec-env-hook.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/dist/src/turn-deliver-buffer.test.js +25 -25
- package/openclaw.plugin.json +30 -30
- package/package.json +78 -78
- package/dist/src/plan-session-registry.d.ts +0 -24
- package/dist/src/plan-session-registry.d.ts.map +0 -1
- package/dist/src/plan-session-registry.js +0 -84
- package/dist/src/plan-session-registry.js.map +0 -1
- package/dist/src/plan-session-registry.test.d.ts +0 -2
- package/dist/src/plan-session-registry.test.d.ts.map +0 -1
- package/dist/src/plan-session-registry.test.js +0 -109
- package/dist/src/plan-session-registry.test.js.map +0 -1
package/dist/index.js
CHANGED
|
@@ -78,8 +78,8 @@ const plugin = {
|
|
|
78
78
|
// teardown 决策不在此处做：OpenClaw 的 registry 代际交替（含/不含本插件的 agent/model
|
|
79
79
|
// runtime 代）会频繁触发 cleanup，reason=restart/disable 都不能代表「真卸载」；若按
|
|
80
80
|
// registerSeq 尾端误判为真卸载而 stopAll，会把全局共享的 218 条 WebSocket 误拆。
|
|
81
|
-
// 因此 cleanup 只收尾可安全代际清理的句柄（action/
|
|
82
|
-
//
|
|
81
|
+
// 因此 cleanup 只收尾可安全代际清理的句柄（action/token），保留计划读库、plan-ws、
|
|
82
|
+
// Cron 绑定与活动 Cron 映射供新一代继续使用；绝不 stopAll。连接仅在 AccountReconciler（配置 diff）与
|
|
83
83
|
// gateway_stop（进程停机）处拆解。
|
|
84
84
|
api.lifecycle.registerRuntimeLifecycle({
|
|
85
85
|
id: "xg-cwork-im-dispose",
|
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,20 @@
|
|
|
1
|
+
export declare const DEFAULT_ACTIVE_CRON_TTL_MS: number;
|
|
2
|
+
export type ActiveCronContext = {
|
|
3
|
+
agentId: string;
|
|
4
|
+
sessionKey: string;
|
|
5
|
+
jobId: string;
|
|
6
|
+
expiresAt: number;
|
|
7
|
+
};
|
|
8
|
+
export declare function setActiveCronContext(input: {
|
|
9
|
+
agentId: string;
|
|
10
|
+
sessionKey: string;
|
|
11
|
+
jobId: string;
|
|
12
|
+
ttlMs?: number;
|
|
13
|
+
now?: number;
|
|
14
|
+
}): ActiveCronContext | undefined;
|
|
15
|
+
export declare function getActiveCronContexts(agentId: string, sessionKey: string, now?: number): ActiveCronContext[];
|
|
16
|
+
/** Remove a finished Job from every exact Session mapping. */
|
|
17
|
+
export declare function removeActiveCronContext(jobId: string, agentId?: string): void;
|
|
18
|
+
export declare function disposeActiveCronContextStore(): void;
|
|
19
|
+
export declare function __resetActiveCronContextStoreForTests(): void;
|
|
20
|
+
//# sourceMappingURL=active-cron-context-store.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"active-cron-context-store.d.ts","sourceRoot":"","sources":["../../src/active-cron-context-store.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,0BAA0B,QAAiB,CAAC;AAEzD,MAAM,MAAM,iBAAiB,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC;AA8BF,wBAAgB,oBAAoB,CAAC,KAAK,EAAE;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,iBAAiB,GAAG,SAAS,CAkBhC;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,iBAAiB,EAAE,CAKhH;AAED,8DAA8D;AAC9D,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAS7E;AAED,wBAAgB,6BAA6B,IAAI,IAAI,CAEpD;AAED,wBAAgB,qCAAqC,IAAI,IAAI,CAE5D"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
/** Process-shared active Cron context for sessionTarget=session:agent:... jobs. */
|
|
2
|
+
import { getOrCreateShared } from "./process-shared-store.js";
|
|
3
|
+
export const DEFAULT_ACTIVE_CRON_TTL_MS = 30 * 60 * 1000;
|
|
4
|
+
function getStore() {
|
|
5
|
+
return getOrCreateShared("active-cron-context", () => ({
|
|
6
|
+
bySession: new Map(),
|
|
7
|
+
}));
|
|
8
|
+
}
|
|
9
|
+
function sessionMapKey(agentId, sessionKey) {
|
|
10
|
+
return `${agentId.trim().toLowerCase()}\u0000${sessionKey}`;
|
|
11
|
+
}
|
|
12
|
+
function isUsableIdentity(value) {
|
|
13
|
+
return typeof value === "string" && value.trim().length > 0 && !/[\0\r\n]/.test(value);
|
|
14
|
+
}
|
|
15
|
+
function pruneExpired(now = Date.now()) {
|
|
16
|
+
const store = getStore();
|
|
17
|
+
for (const [mapKey, jobs] of store.bySession) {
|
|
18
|
+
for (const [jobId, context] of jobs) {
|
|
19
|
+
if (context.expiresAt <= now)
|
|
20
|
+
jobs.delete(jobId);
|
|
21
|
+
}
|
|
22
|
+
if (jobs.size === 0)
|
|
23
|
+
store.bySession.delete(mapKey);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
export function setActiveCronContext(input) {
|
|
27
|
+
if (!isUsableIdentity(input.agentId) || !isUsableIdentity(input.sessionKey) || !isUsableIdentity(input.jobId))
|
|
28
|
+
return undefined;
|
|
29
|
+
const now = input.now ?? Date.now();
|
|
30
|
+
pruneExpired(now);
|
|
31
|
+
const requestedTtl = typeof input.ttlMs === "number" && Number.isFinite(input.ttlMs) && input.ttlMs > 0
|
|
32
|
+
? input.ttlMs
|
|
33
|
+
: DEFAULT_ACTIVE_CRON_TTL_MS;
|
|
34
|
+
const context = {
|
|
35
|
+
agentId: input.agentId.trim(),
|
|
36
|
+
sessionKey: input.sessionKey,
|
|
37
|
+
jobId: input.jobId.trim(),
|
|
38
|
+
expiresAt: now + requestedTtl,
|
|
39
|
+
};
|
|
40
|
+
const mapKey = sessionMapKey(context.agentId, context.sessionKey);
|
|
41
|
+
const jobs = getStore().bySession.get(mapKey) ?? new Map();
|
|
42
|
+
jobs.set(context.jobId, context);
|
|
43
|
+
getStore().bySession.set(mapKey, jobs);
|
|
44
|
+
return { ...context };
|
|
45
|
+
}
|
|
46
|
+
export function getActiveCronContexts(agentId, sessionKey, now = Date.now()) {
|
|
47
|
+
if (!isUsableIdentity(agentId) || !isUsableIdentity(sessionKey))
|
|
48
|
+
return [];
|
|
49
|
+
pruneExpired(now);
|
|
50
|
+
const jobs = getStore().bySession.get(sessionMapKey(agentId, sessionKey));
|
|
51
|
+
return jobs ? [...jobs.values()].map((context) => ({ ...context })) : [];
|
|
52
|
+
}
|
|
53
|
+
/** Remove a finished Job from every exact Session mapping. */
|
|
54
|
+
export function removeActiveCronContext(jobId, agentId) {
|
|
55
|
+
if (!isUsableIdentity(jobId))
|
|
56
|
+
return;
|
|
57
|
+
const normalizedAgentId = agentId?.trim().toLowerCase();
|
|
58
|
+
const store = getStore();
|
|
59
|
+
for (const [mapKey, jobs] of store.bySession) {
|
|
60
|
+
if (normalizedAgentId && !mapKey.startsWith(`${normalizedAgentId}\u0000`))
|
|
61
|
+
continue;
|
|
62
|
+
jobs.delete(jobId.trim());
|
|
63
|
+
if (jobs.size === 0)
|
|
64
|
+
store.bySession.delete(mapKey);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
export function disposeActiveCronContextStore() {
|
|
68
|
+
getStore().bySession.clear();
|
|
69
|
+
}
|
|
70
|
+
export function __resetActiveCronContextStoreForTests() {
|
|
71
|
+
disposeActiveCronContextStore();
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=active-cron-context-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"active-cron-context-store.js","sourceRoot":"","sources":["../../src/active-cron-context-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ export type CronAppKeyBinding = {
|
|
|
12
12
|
enabled: boolean;
|
|
13
13
|
};
|
|
14
14
|
export declare function initCronAppKeyBindingStore(stateDir: string): void;
|
|
15
|
+
export declare function isCronAppKeyBindingStoreInitialized(): boolean;
|
|
15
16
|
export declare function getCronAppKeyBinding(agentId: string, jobId: string): CronAppKeyBinding | undefined;
|
|
16
17
|
export declare function bindCronAppKey(input: {
|
|
17
18
|
agentId: string;
|
|
@@ -23,6 +24,6 @@ export declare function bindCronAppKey(input: {
|
|
|
23
24
|
source?: string;
|
|
24
25
|
}): CronAppKeyBinding | undefined;
|
|
25
26
|
export declare function __resetCronAppKeyBindingStoreForTests(): void;
|
|
26
|
-
/**
|
|
27
|
+
/** Gateway 真正停止时清空共享缓存；Registry cleanup 不得调用。 */
|
|
27
28
|
export declare function disposeCronAppKeyBindingStore(): void;
|
|
28
29
|
//# sourceMappingURL=cron-appkey-binding-store.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron-appkey-binding-store.d.ts","sourceRoot":"","sources":["../../src/cron-appkey-binding-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cron-appkey-binding-store.d.ts","sourceRoot":"","sources":["../../src/cron-appkey-binding-store.ts"],"names":[],"mappings":"AAgBA,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;AAsIF,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAUjE;AAED,wBAAgB,mCAAmC,IAAI,OAAO,CAE7D;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAMlG;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,CAkDhC;AAED,wBAAgB,qCAAqC,IAAI,IAAI,CAE5D;AAED,iDAAiD;AACjD,wBAAgB,6BAA6B,IAAI,IAAI,CAMpD"}
|
|
@@ -1,13 +1,30 @@
|
|
|
1
1
|
/** Persistent Cron job -> user OpenAPI AppKey bindings. */
|
|
2
2
|
import { closeSync, existsSync, fsyncSync, mkdirSync, openSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync, } from "node:fs";
|
|
3
3
|
import { dirname, join } from "node:path";
|
|
4
|
+
import { getOrCreateShared } from "./process-shared-store.js";
|
|
4
5
|
export const CRON_BINDING_SCHEMA_VERSION = 1;
|
|
5
6
|
const MAX_APP_KEY_LENGTH = 256;
|
|
6
7
|
const LOCK_RETRIES = 20;
|
|
7
8
|
const LOCK_RETRY_MS = 10;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
function getStore() {
|
|
10
|
+
return getOrCreateShared("cron-binding-store", () => ({
|
|
11
|
+
bindingPath: undefined,
|
|
12
|
+
bindingMtimeMs: -1,
|
|
13
|
+
bindings: new Map(),
|
|
14
|
+
}));
|
|
15
|
+
}
|
|
16
|
+
function warnLoadOnce(store, bindingPath, reason) {
|
|
17
|
+
const message = String(reason);
|
|
18
|
+
if (store.lastLoadWarning === message)
|
|
19
|
+
return;
|
|
20
|
+
store.lastLoadWarning = message;
|
|
21
|
+
console.warn(`[xg_cwork_im] [cron-binding] binding file read failed path=${bindingPath} reason=${message}`);
|
|
22
|
+
}
|
|
23
|
+
function replaceBindings(store, next) {
|
|
24
|
+
store.bindings.clear();
|
|
25
|
+
for (const [bindingKey, binding] of next)
|
|
26
|
+
store.bindings.set(bindingKey, binding);
|
|
27
|
+
}
|
|
11
28
|
function key(agentId, jobId) {
|
|
12
29
|
// OpenClaw canonicalizes agent/job segments case-insensitively in Cron
|
|
13
30
|
// SessionKeys. Normalize lookup keys the same way while preserving the
|
|
@@ -34,7 +51,8 @@ function resolvePath(stateDir) {
|
|
|
34
51
|
const root = /[\\/]state$/i.test(normalized) ? dirname(normalized) : normalized;
|
|
35
52
|
return join(root, "xg-cwork-im", "cron-appkey-bindings.json");
|
|
36
53
|
}
|
|
37
|
-
function load(force = false) {
|
|
54
|
+
function load(store, force = false) {
|
|
55
|
+
const bindingPath = store.bindingPath;
|
|
38
56
|
if (!bindingPath)
|
|
39
57
|
return;
|
|
40
58
|
let mtime = -1;
|
|
@@ -42,14 +60,16 @@ function load(force = false) {
|
|
|
42
60
|
mtime = statSync(bindingPath).mtimeMs;
|
|
43
61
|
}
|
|
44
62
|
catch (err) {
|
|
45
|
-
if (err.code !== "ENOENT")
|
|
63
|
+
if (err.code !== "ENOENT") {
|
|
64
|
+
warnLoadOnce(store, bindingPath, err);
|
|
46
65
|
return;
|
|
66
|
+
}
|
|
47
67
|
}
|
|
48
|
-
if (!force && mtime === bindingMtimeMs)
|
|
68
|
+
if (!force && mtime === store.bindingMtimeMs)
|
|
49
69
|
return;
|
|
50
70
|
if (mtime < 0) {
|
|
51
|
-
bindingMtimeMs = -1;
|
|
52
|
-
bindings
|
|
71
|
+
store.bindingMtimeMs = -1;
|
|
72
|
+
store.bindings.clear();
|
|
53
73
|
return;
|
|
54
74
|
}
|
|
55
75
|
try {
|
|
@@ -57,8 +77,8 @@ function load(force = false) {
|
|
|
57
77
|
if (parsed.schemaVersion !== CRON_BINDING_SCHEMA_VERSION || !Array.isArray(parsed.bindings)) {
|
|
58
78
|
// Fail closed on an unreadable/incompatible file; do not retain a
|
|
59
79
|
// stale AppKey cache whose ownership can no longer be verified.
|
|
60
|
-
bindings
|
|
61
|
-
bindingMtimeMs = mtime;
|
|
80
|
+
store.bindings.clear();
|
|
81
|
+
store.bindingMtimeMs = mtime;
|
|
62
82
|
return;
|
|
63
83
|
}
|
|
64
84
|
const next = new Map();
|
|
@@ -81,14 +101,16 @@ function load(force = false) {
|
|
|
81
101
|
if (!previous || b.updatedAt >= previous.updatedAt)
|
|
82
102
|
next.set(k, b);
|
|
83
103
|
}
|
|
84
|
-
|
|
85
|
-
bindingMtimeMs = mtime;
|
|
104
|
+
replaceBindings(store, next);
|
|
105
|
+
store.bindingMtimeMs = mtime;
|
|
106
|
+
store.lastLoadWarning = undefined;
|
|
86
107
|
}
|
|
87
|
-
catch {
|
|
108
|
+
catch (err) {
|
|
88
109
|
// Fail closed when the file is temporarily malformed. A later mtime
|
|
89
110
|
// change will cause a fresh load.
|
|
90
|
-
bindings
|
|
91
|
-
bindingMtimeMs = mtime;
|
|
111
|
+
store.bindings.clear();
|
|
112
|
+
store.bindingMtimeMs = mtime;
|
|
113
|
+
warnLoadOnce(store, bindingPath, err);
|
|
92
114
|
}
|
|
93
115
|
}
|
|
94
116
|
function acquireLock(lockPath) {
|
|
@@ -106,19 +128,30 @@ function acquireLock(lockPath) {
|
|
|
106
128
|
return undefined;
|
|
107
129
|
}
|
|
108
130
|
export function initCronAppKeyBindingStore(stateDir) {
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
131
|
+
const store = getStore();
|
|
132
|
+
const nextPath = resolvePath(stateDir);
|
|
133
|
+
if (store.bindingPath !== nextPath) {
|
|
134
|
+
store.bindingPath = nextPath;
|
|
135
|
+
store.bindingMtimeMs = -1;
|
|
136
|
+
store.bindings.clear();
|
|
137
|
+
store.lastLoadWarning = undefined;
|
|
138
|
+
}
|
|
139
|
+
load(store, true);
|
|
140
|
+
}
|
|
141
|
+
export function isCronAppKeyBindingStoreInitialized() {
|
|
142
|
+
return Boolean(getStore().bindingPath);
|
|
113
143
|
}
|
|
114
144
|
export function getCronAppKeyBinding(agentId, jobId) {
|
|
115
145
|
if (!agentId || !jobId)
|
|
116
146
|
return undefined;
|
|
117
|
-
|
|
118
|
-
|
|
147
|
+
const store = getStore();
|
|
148
|
+
load(store);
|
|
149
|
+
const b = store.bindings.get(key(agentId, jobId));
|
|
119
150
|
return b?.enabled && validText(b.appKey) ? { ...b } : undefined;
|
|
120
151
|
}
|
|
121
152
|
export function bindCronAppKey(input) {
|
|
153
|
+
const store = getStore();
|
|
154
|
+
const bindingPath = store.bindingPath;
|
|
122
155
|
if (!bindingPath || !validText(input.agentId) || !validText(input.jobId) || !validText(input.appKey))
|
|
123
156
|
return undefined;
|
|
124
157
|
const dir = dirname(bindingPath);
|
|
@@ -129,9 +162,9 @@ export function bindCronAppKey(input) {
|
|
|
129
162
|
return undefined;
|
|
130
163
|
let tmpPath;
|
|
131
164
|
try {
|
|
132
|
-
load(true);
|
|
165
|
+
load(store, true);
|
|
133
166
|
const now = new Date().toISOString();
|
|
134
|
-
const existing = bindings.get(key(input.agentId.trim(), input.jobId.trim()));
|
|
167
|
+
const existing = store.bindings.get(key(input.agentId.trim(), input.jobId.trim()));
|
|
135
168
|
const binding = {
|
|
136
169
|
agentId: input.agentId.trim(),
|
|
137
170
|
jobId: input.jobId.trim(),
|
|
@@ -144,7 +177,7 @@ export function bindCronAppKey(input) {
|
|
|
144
177
|
updatedAt: now,
|
|
145
178
|
enabled: true,
|
|
146
179
|
};
|
|
147
|
-
const next = new Map(bindings);
|
|
180
|
+
const next = new Map(store.bindings);
|
|
148
181
|
next.set(key(binding.agentId, binding.jobId), binding);
|
|
149
182
|
const payload = {
|
|
150
183
|
schemaVersion: CRON_BINDING_SCHEMA_VERSION,
|
|
@@ -161,12 +194,12 @@ export function bindCronAppKey(input) {
|
|
|
161
194
|
closeSync(tmpFd);
|
|
162
195
|
}
|
|
163
196
|
renameSync(tmpPath, bindingPath);
|
|
164
|
-
|
|
197
|
+
replaceBindings(store, next);
|
|
165
198
|
try {
|
|
166
|
-
bindingMtimeMs = statSync(bindingPath).mtimeMs;
|
|
199
|
+
store.bindingMtimeMs = statSync(bindingPath).mtimeMs;
|
|
167
200
|
}
|
|
168
201
|
catch {
|
|
169
|
-
bindingMtimeMs = -1;
|
|
202
|
+
store.bindingMtimeMs = -1;
|
|
170
203
|
}
|
|
171
204
|
return { ...binding };
|
|
172
205
|
}
|
|
@@ -195,10 +228,12 @@ export function bindCronAppKey(input) {
|
|
|
195
228
|
export function __resetCronAppKeyBindingStoreForTests() {
|
|
196
229
|
disposeCronAppKeyBindingStore();
|
|
197
230
|
}
|
|
198
|
-
/**
|
|
231
|
+
/** Gateway 真正停止时清空共享缓存；Registry cleanup 不得调用。 */
|
|
199
232
|
export function disposeCronAppKeyBindingStore() {
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
233
|
+
const store = getStore();
|
|
234
|
+
store.bindingPath = undefined;
|
|
235
|
+
store.bindingMtimeMs = -1;
|
|
236
|
+
store.bindings.clear();
|
|
237
|
+
store.lastLoadWarning = undefined;
|
|
203
238
|
}
|
|
204
239
|
//# sourceMappingURL=cron-appkey-binding-store.js.map
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"cron-appkey-binding-store.js","sourceRoot":"","sources":["../../src/cron-appkey-binding-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,14 @@ import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "nod
|
|
|
3
3
|
import { tmpdir } from "node:os";
|
|
4
4
|
import { join } from "node:path";
|
|
5
5
|
import { afterEach, describe, it } from "node:test";
|
|
6
|
+
import { __resetActiveCronContextStoreForTests, getActiveCronContexts, setActiveCronContext, } from "./active-cron-context-store.js";
|
|
6
7
|
import { __resetCronAppKeyBindingStoreForTests, bindCronAppKey, getCronAppKeyBinding, initCronAppKeyBindingStore, } from "./cron-appkey-binding-store.js";
|
|
7
|
-
import {
|
|
8
|
+
import { disposePluginModule } from "./plugin-dispose.js";
|
|
9
|
+
import { extractCronJobIdFromResult, isCronCreateCommand, parseCronSessionKey, parseCronSessionTarget, registerCronAppKeyBindingHook, registerExecEnvHook } from "./register-exec-env-hook.js";
|
|
8
10
|
import { setSessionEnvEntry, setSessionUserContext, XG_OPENAPI_APP_KEY } from "./session-env-store.js";
|
|
9
11
|
let dirs = [];
|
|
10
12
|
afterEach(() => {
|
|
13
|
+
__resetActiveCronContextStoreForTests();
|
|
11
14
|
__resetCronAppKeyBindingStoreForTests();
|
|
12
15
|
for (const dir of dirs.splice(0))
|
|
13
16
|
rmSync(dir, { recursive: true, force: true });
|
|
@@ -24,6 +27,18 @@ describe("cron appKey binding store", () => {
|
|
|
24
27
|
initCronAppKeyBindingStore(join(dir, "state"));
|
|
25
28
|
assert.equal(getCronAppKeyBinding("agent-a", "job-1")?.appKey, "key-1");
|
|
26
29
|
});
|
|
30
|
+
it("reuses one process-shared binding store across register and old Registry cleanup", async () => {
|
|
31
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
32
|
+
dirs.push(dir);
|
|
33
|
+
const stateDir = join(dir, "state");
|
|
34
|
+
initCronAppKeyBindingStore(stateDir);
|
|
35
|
+
bindCronAppKey({ agentId: "agent-a", jobId: "job-1", appKey: "key-1" });
|
|
36
|
+
// A new Registry initializes the same process store before the old
|
|
37
|
+
// Registry cleanup runs.
|
|
38
|
+
initCronAppKeyBindingStore(stateDir);
|
|
39
|
+
await disposePluginModule({ skipConnections: true, skipPlanResources: true });
|
|
40
|
+
assert.equal(getCronAppKeyBinding("agent-a", "job-1")?.appKey, "key-1");
|
|
41
|
+
});
|
|
27
42
|
it("rejects invalid values and ignores malformed records", () => {
|
|
28
43
|
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
29
44
|
dirs.push(dir);
|
|
@@ -92,6 +107,149 @@ describe("cron appKey binding store", () => {
|
|
|
92
107
|
assert.equal(extractCronJobIdFromResult({ details: { created: true, job: { id: "daily-report" } } }), "daily-report");
|
|
93
108
|
assert.equal(extractCronJobIdFromResult({ content: [{ type: "text", text: '{"id":"daily-report"}' }] }), "daily-report");
|
|
94
109
|
});
|
|
110
|
+
it("parses only confirmed session:agent: Cron targets", () => {
|
|
111
|
+
assert.deepEqual(parseCronSessionTarget("session:agent:agent-a:xg_cwork_im:group:g1"), {
|
|
112
|
+
agentId: "agent-a",
|
|
113
|
+
sessionKey: "agent:agent-a:xg_cwork_im:group:g1",
|
|
114
|
+
});
|
|
115
|
+
assert.equal(parseCronSessionTarget("isolated"), undefined);
|
|
116
|
+
assert.equal(parseCronSessionTarget("main"), undefined);
|
|
117
|
+
assert.equal(parseCronSessionTarget("session:main"), undefined);
|
|
118
|
+
});
|
|
119
|
+
it("sessionTarget=session:... injects its exact active Cron binding", () => {
|
|
120
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
121
|
+
dirs.push(dir);
|
|
122
|
+
initCronAppKeyBindingStore(join(dir, "state"));
|
|
123
|
+
bindCronAppKey({ agentId: "agent-a", jobId: "job-1", appKey: "key-1" });
|
|
124
|
+
const sessionKey = "agent:agent-a:xg_cwork_im:group:g1";
|
|
125
|
+
let before;
|
|
126
|
+
let changed;
|
|
127
|
+
const api = {
|
|
128
|
+
runtime: { config: { current: () => ({ channels: { xg_cwork_im: {} } }) } },
|
|
129
|
+
on: (name, handler) => {
|
|
130
|
+
if (name === "before_tool_call")
|
|
131
|
+
before = handler;
|
|
132
|
+
if (name === "cron_changed")
|
|
133
|
+
changed = handler;
|
|
134
|
+
},
|
|
135
|
+
};
|
|
136
|
+
registerExecEnvHook(api);
|
|
137
|
+
registerCronAppKeyBindingHook(api);
|
|
138
|
+
changed?.({
|
|
139
|
+
action: "started",
|
|
140
|
+
jobId: "job-1",
|
|
141
|
+
agentId: "agent-a",
|
|
142
|
+
job: { sessionTarget: `session:${sessionKey}` },
|
|
143
|
+
}, {});
|
|
144
|
+
const result = before?.({ toolName: "exec", params: { env: { XG_OPENAPI_APP_KEY: "ai-wrong" } } }, { sessionKey, agentId: "agent-a" });
|
|
145
|
+
assert.equal(result.params.env.XG_OPENAPI_APP_KEY, "key-1");
|
|
146
|
+
});
|
|
147
|
+
it("new Registry reads the active context created by the old Registry after cleanup", async () => {
|
|
148
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
149
|
+
dirs.push(dir);
|
|
150
|
+
initCronAppKeyBindingStore(join(dir, "state"));
|
|
151
|
+
bindCronAppKey({ agentId: "agent-a", jobId: "job-1", appKey: "key-1" });
|
|
152
|
+
const sessionKey = "agent:agent-a:xg_cwork_im:group:g1";
|
|
153
|
+
let oldChanged;
|
|
154
|
+
registerCronAppKeyBindingHook({
|
|
155
|
+
on: (name, handler) => { if (name === "cron_changed")
|
|
156
|
+
oldChanged = handler; },
|
|
157
|
+
});
|
|
158
|
+
oldChanged?.({ action: "started", jobId: "job-1", sessionTarget: `session:${sessionKey}` }, {});
|
|
159
|
+
let newBefore;
|
|
160
|
+
registerExecEnvHook({
|
|
161
|
+
runtime: { config: { current: () => ({ channels: { xg_cwork_im: {} } }) } },
|
|
162
|
+
on: (name, handler) => { if (name === "before_tool_call")
|
|
163
|
+
newBefore = handler; },
|
|
164
|
+
});
|
|
165
|
+
await disposePluginModule({ skipConnections: true, skipPlanResources: true });
|
|
166
|
+
const result = newBefore?.({ toolName: "exec", params: { env: {} } }, { sessionKey, agentId: "agent-a" });
|
|
167
|
+
assert.equal(result.params.env.XG_OPENAPI_APP_KEY, "key-1");
|
|
168
|
+
});
|
|
169
|
+
it("sessionTarget Cron child inherits through its persisted parent chain", () => {
|
|
170
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
171
|
+
dirs.push(dir);
|
|
172
|
+
initCronAppKeyBindingStore(join(dir, "state"));
|
|
173
|
+
bindCronAppKey({ agentId: "agent-a", jobId: "job-1", appKey: "key-1" });
|
|
174
|
+
const parentSessionKey = "agent:agent-a:xg_cwork_im:group:g1";
|
|
175
|
+
const childSessionKey = "agent:agent-a:subagent:child-1";
|
|
176
|
+
let before;
|
|
177
|
+
let changed;
|
|
178
|
+
const api = {
|
|
179
|
+
runtime: {
|
|
180
|
+
config: { current: () => ({ channels: { xg_cwork_im: {} } }) },
|
|
181
|
+
agent: { session: {
|
|
182
|
+
resolveStorePath: () => "test-store",
|
|
183
|
+
getSessionEntry: ({ sessionKey }) => sessionKey === childSessionKey ? { spawnedBy: parentSessionKey } : undefined,
|
|
184
|
+
} },
|
|
185
|
+
},
|
|
186
|
+
on: (name, handler) => {
|
|
187
|
+
if (name === "before_tool_call")
|
|
188
|
+
before = handler;
|
|
189
|
+
if (name === "cron_changed")
|
|
190
|
+
changed = handler;
|
|
191
|
+
},
|
|
192
|
+
};
|
|
193
|
+
registerExecEnvHook(api);
|
|
194
|
+
registerCronAppKeyBindingHook(api);
|
|
195
|
+
changed?.({ action: "started", jobId: "job-1", job: { sessionTarget: `session:${parentSessionKey}` } }, {});
|
|
196
|
+
const result = before?.({ toolName: "exec", params: { env: {} } }, { sessionKey: childSessionKey, agentId: "agent-a" });
|
|
197
|
+
assert.equal(result.params.env.XG_OPENAPI_APP_KEY, "key-1");
|
|
198
|
+
});
|
|
199
|
+
it("finished removes active context immediately and TTL removes a missing-finished context", () => {
|
|
200
|
+
const sessionKey = "agent:agent-a:xg_cwork_im:group:g1";
|
|
201
|
+
setActiveCronContext({ agentId: "agent-a", sessionKey, jobId: "job-1", ttlMs: 100, now: 1_000 });
|
|
202
|
+
assert.equal(getActiveCronContexts("agent-a", sessionKey, 1_099).length, 1);
|
|
203
|
+
assert.equal(getActiveCronContexts("agent-a", sessionKey, 1_100).length, 0);
|
|
204
|
+
let changed;
|
|
205
|
+
registerCronAppKeyBindingHook({ on: (name, handler) => { if (name === "cron_changed")
|
|
206
|
+
changed = handler; } });
|
|
207
|
+
changed?.({ action: "started", jobId: "job-2", agentId: "agent-a", sessionTarget: `session:${sessionKey}` }, {});
|
|
208
|
+
assert.equal(getActiveCronContexts("agent-a", sessionKey).length, 1);
|
|
209
|
+
changed?.({ action: "finished", jobId: "job-2", agentId: "agent-a" }, {});
|
|
210
|
+
assert.equal(getActiveCronContexts("agent-a", sessionKey).length, 0);
|
|
211
|
+
});
|
|
212
|
+
it("allows equal active Cron AppKeys and rejects conflicting AppKeys", () => {
|
|
213
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
214
|
+
dirs.push(dir);
|
|
215
|
+
initCronAppKeyBindingStore(join(dir, "state"));
|
|
216
|
+
const sessionKey = "agent:agent-a:xg_cwork_im:group:g1";
|
|
217
|
+
bindCronAppKey({ agentId: "agent-a", jobId: "job-1", appKey: "same-key" });
|
|
218
|
+
bindCronAppKey({ agentId: "agent-a", jobId: "job-2", appKey: "same-key" });
|
|
219
|
+
setActiveCronContext({ agentId: "agent-a", sessionKey, jobId: "job-1" });
|
|
220
|
+
setActiveCronContext({ agentId: "agent-a", sessionKey, jobId: "job-2" });
|
|
221
|
+
let before;
|
|
222
|
+
registerExecEnvHook({
|
|
223
|
+
runtime: { config: { current: () => ({ channels: { xg_cwork_im: {} } }) } },
|
|
224
|
+
on: (name, handler) => { if (name === "before_tool_call")
|
|
225
|
+
before = handler; },
|
|
226
|
+
});
|
|
227
|
+
const equal = before?.({ toolName: "exec", params: { env: {} } }, { sessionKey, agentId: "agent-a" });
|
|
228
|
+
assert.equal(equal.params.env.XG_OPENAPI_APP_KEY, "same-key");
|
|
229
|
+
bindCronAppKey({ agentId: "agent-a", jobId: "job-2", appKey: "different-key" });
|
|
230
|
+
const conflict = before?.({ toolName: "exec", params: { env: { XG_OPENAPI_APP_KEY: "ai-wrong" } } }, { sessionKey, agentId: "agent-a" });
|
|
231
|
+
assert.deepEqual(conflict.params.env, {});
|
|
232
|
+
});
|
|
233
|
+
it("keeps ordinary exec parameters when the Cron binding file is unreadable", () => {
|
|
234
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
235
|
+
dirs.push(dir);
|
|
236
|
+
const stateDir = join(dir, "state");
|
|
237
|
+
initCronAppKeyBindingStore(stateDir);
|
|
238
|
+
const bindingPath = join(dir, "xg-cwork-im", "cron-appkey-bindings.json");
|
|
239
|
+
mkdirSync(join(dir, "xg-cwork-im"), { recursive: true });
|
|
240
|
+
writeFileSync(bindingPath, "{not-json");
|
|
241
|
+
const sessionKey = "agent:agent-a:xg_cwork_im:group:g1";
|
|
242
|
+
setActiveCronContext({ agentId: "agent-a", sessionKey, jobId: "job-1" });
|
|
243
|
+
let before;
|
|
244
|
+
registerExecEnvHook({
|
|
245
|
+
runtime: { config: { current: () => ({ channels: { xg_cwork_im: {} } }) } },
|
|
246
|
+
on: (name, handler) => { if (name === "before_tool_call")
|
|
247
|
+
before = handler; },
|
|
248
|
+
});
|
|
249
|
+
const result = before?.({ toolName: "exec", params: { command: "echo ok", env: { XG_OPENAPI_APP_KEY: "ai-wrong", KEEP: "1" } } }, { sessionKey, agentId: "agent-a" });
|
|
250
|
+
assert.equal(result.params.command, "echo ok");
|
|
251
|
+
assert.deepEqual(result.params.env, { KEEP: "1" });
|
|
252
|
+
});
|
|
95
253
|
it("does not guess a creator AppKey from cron_changed without sessionKey", () => {
|
|
96
254
|
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
97
255
|
dirs.push(dir);
|