@xgjktech/xg_cwork_im 1.17.27 → 1.17.29
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 +9 -6
- package/dist/index.js.map +1 -1
- package/dist/src/subagent-monitor.d.ts +2 -1
- package/dist/src/subagent-monitor.d.ts.map +1 -1
- package/dist/src/subagent-monitor.js +88 -20
- package/dist/src/subagent-monitor.js.map +1 -1
- package/dist/src/subagent-monitor.test.d.ts +2 -0
- package/dist/src/subagent-monitor.test.d.ts.map +1 -0
- package/dist/src/subagent-monitor.test.js +214 -0
- package/dist/src/subagent-monitor.test.js.map +1 -0
- package/package.json +2 -2
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAmBH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAI5D,OAAO,EAAE,uCAAuC,EAAE,MAAM,oCAAoC,CAAC;AAsB7F,QAAA,MAAM,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAmBH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAI5D,OAAO,EAAE,uCAAuC,EAAE,MAAM,oCAAoC,CAAC;AAsB7F,QAAA,MAAM,MAAM,EAAE,qBAgKb,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -42,13 +42,18 @@ const plugin = {
|
|
|
42
42
|
await accountReconciler.stopAll();
|
|
43
43
|
});
|
|
44
44
|
api.on("subagent_spawned", async (event) => {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
const groupId = event.requester.to;
|
|
45
|
+
const requesterChannel = event.requester?.channel;
|
|
46
|
+
const groupId = event.requester?.to;
|
|
48
47
|
const agentId = event.agentId;
|
|
48
|
+
console.debug(`[subagent-monitor] subagent_spawned childSessionKey=${event.childSessionKey} runId=${event.runId} ` +
|
|
49
|
+
`requesterChannel=${requesterChannel ?? "(none)"} groupId=${groupId ?? "(none)"} agentId=${agentId ?? "(none)"}`);
|
|
50
|
+
if (requesterChannel !== "xg_cwork_im")
|
|
51
|
+
return;
|
|
49
52
|
if (!groupId || !agentId)
|
|
50
53
|
return;
|
|
51
54
|
const round = findActiveRoundForSubagent(groupId);
|
|
55
|
+
console.debug(`[subagent-monitor] subagent_spawned round childSessionKey=${event.childSessionKey} ` +
|
|
56
|
+
`groupId=${groupId} round=${round ? `${round.roundKey}#${round.generation}` : "(none)"}`);
|
|
52
57
|
if (!round)
|
|
53
58
|
return;
|
|
54
59
|
startMonitor({
|
|
@@ -66,9 +71,7 @@ const plugin = {
|
|
|
66
71
|
});
|
|
67
72
|
});
|
|
68
73
|
api.on("subagent_ended", (event) => {
|
|
69
|
-
|
|
70
|
-
markSubagentCompleted(event.targetSessionKey, event.runId);
|
|
71
|
-
}
|
|
74
|
+
markSubagentCompleted(event.targetSessionKey, event.runId);
|
|
72
75
|
});
|
|
73
76
|
api.on("before_tool_call", (event, ctx) => {
|
|
74
77
|
if (!ctx.sessionKey)
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,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,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,6BAA6B,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAE5E,OAAO,EAAE,uCAAuC,EAAE,MAAM,oCAAoC,CAAC;AAsB7F,MAAM,MAAM,GAA0B;IAClC,EAAE,EAAE,aAAa;IACjB,IAAI,EAAE,qBAAqB;IAC3B,WAAW,EAAE,2CAA2C;IACxD,YAAY,EAAE,uBAAuB,EAAE;IACvC,QAAQ,CAAC,GAAsB;QAC3B,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC5B,iBAAiB,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1C,YAAY,CAAC,GAAG,CAAC,CAAC;QAClB,2BAA2B,CAAC,GAAG,CAAC,CAAC;QACjC,GAAG,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAC;QAExD,qDAAqD;QACrD,0EAA0E;QAC1E,yDAAyD;QACzD,GAAG,CAAC,cAAc,CAAC,EAAE,WAAW,EAAE,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;QAC9D,iBAAiB,CAAC,KAAK,EAAE,CAAC;QAE1B,GAAG,CAAC,EAAE,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;YAC9B,MAAM,iBAAiB,CAAC,OAAO,EAAE,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACvC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,8 @@ export declare function startMonitor(params: {
|
|
|
24
24
|
export declare function hasActiveSubagents(roundKey: string, generation: number): boolean;
|
|
25
25
|
export declare function deferFinished(roundKey: string, generation: number, reason: string): void;
|
|
26
26
|
export declare function prepareSubagentInterrupt(roundKey: string, generation: number, now?: number): InterruptedSubagent[];
|
|
27
|
-
export declare function markSubagentCompleted(childSessionKey: string, runId
|
|
27
|
+
export declare function markSubagentCompleted(childSessionKey: string, runId?: string): void;
|
|
28
|
+
export declare function __tickForTests(): Promise<void>;
|
|
28
29
|
export declare function __resetSubagentMonitorForTests(): void;
|
|
29
30
|
export {};
|
|
30
31
|
//# sourceMappingURL=subagent-monitor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-monitor.d.ts","sourceRoot":"","sources":["../../src/subagent-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,UAAU,iBAAiB;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;
|
|
1
|
+
{"version":3,"file":"subagent-monitor.d.ts","sourceRoot":"","sources":["../../src/subagent-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,UAAU,iBAAiB;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAqBD,MAAM,WAAW,mBAAmB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,WAAW,GAAG,WAAW,CAAC;IAClC,QAAQ,EAAE,MAAM,EAAE,CAAC;CACtB;AAoBD,wBAAgB,YAAY,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAEzD;AAkCD,wBAAgB,YAAY,CAAC,MAAM,EAAE;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,cAAc,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,iBAAiB,CAAC;CAC5B,GAAG,OAAO,CAwCV;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAOhF;AAED,wBAAgB,aAAa,CACzB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACf,IAAI,CAEN;AAED,wBAAgB,wBAAwB,CACpC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,GAAG,SAAa,GACjB,mBAAmB,EAAE,CAoBvB;AAED,wBAAgB,qBAAqB,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CA2CnF;AA0KD,wBAAgB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAE9C;AAED,wBAAgB,8BAA8B,IAAI,IAAI,CASrD"}
|
|
@@ -3,12 +3,15 @@ const childToRound = new Map();
|
|
|
3
3
|
const roundMonitors = new Map();
|
|
4
4
|
const deferredFinished = new Map();
|
|
5
5
|
const roundAdmissionTombstones = new Map();
|
|
6
|
+
/** 记录被 `/stop` 中断的 subagent run（按 childSessionKey 索引，存被中断 runId 与过期时间）。 */
|
|
6
7
|
const childTombstones = new Map();
|
|
7
8
|
const POLL_INTERVAL_MS = 15_000;
|
|
8
9
|
const ROUND_TOMBSTONE_TTL_MS = 30_000;
|
|
9
10
|
const CHILD_TOMBSTONE_TTL_MS = 5 * 60_000;
|
|
10
11
|
const MAX_INCR_MSGS = 5;
|
|
11
12
|
const MSG_TRUNCATE_LEN = 40;
|
|
13
|
+
/** 单次 tick 用 openclaw `agent.wait` 对账 subagent run 状态的探测超时。 */
|
|
14
|
+
const RUN_STATUS_PROBE_TIMEOUT_MS = 1_000;
|
|
12
15
|
let tickerTimer = null;
|
|
13
16
|
let pluginApi = null;
|
|
14
17
|
export function setPluginApi(api) {
|
|
@@ -19,8 +22,8 @@ function pruneTombstones(now = Date.now()) {
|
|
|
19
22
|
if (expiresAt <= now)
|
|
20
23
|
roundAdmissionTombstones.delete(key);
|
|
21
24
|
}
|
|
22
|
-
for (const [key,
|
|
23
|
-
if (expiresAt <= now)
|
|
25
|
+
for (const [key, tombstone] of childTombstones) {
|
|
26
|
+
if (tombstone.expiresAt <= now)
|
|
24
27
|
childTombstones.delete(key);
|
|
25
28
|
}
|
|
26
29
|
}
|
|
@@ -74,6 +77,7 @@ export function startMonitor(params) {
|
|
|
74
77
|
completed: false,
|
|
75
78
|
messages: [],
|
|
76
79
|
sendFrom: 0,
|
|
80
|
+
reading: false,
|
|
77
81
|
};
|
|
78
82
|
monitor.subagents.set(record.runId, record);
|
|
79
83
|
childToRound.set(record.childSessionKey, {
|
|
@@ -101,7 +105,10 @@ export function prepareSubagentInterrupt(roundKey, generation, now = Date.now())
|
|
|
101
105
|
if (!monitor || monitor.generation !== generation)
|
|
102
106
|
return [];
|
|
103
107
|
const result = Array.from(monitor.subagents.values()).map((record) => {
|
|
104
|
-
childTombstones.set(record.childSessionKey,
|
|
108
|
+
childTombstones.set(record.childSessionKey, {
|
|
109
|
+
runId: record.runId,
|
|
110
|
+
expiresAt: now + CHILD_TOMBSTONE_TTL_MS,
|
|
111
|
+
});
|
|
105
112
|
return {
|
|
106
113
|
runId: record.runId,
|
|
107
114
|
label: record.label ?? record.runId.slice(0, 8),
|
|
@@ -114,17 +121,33 @@ export function prepareSubagentInterrupt(roundKey, generation, now = Date.now())
|
|
|
114
121
|
}
|
|
115
122
|
export function markSubagentCompleted(childSessionKey, runId) {
|
|
116
123
|
pruneTombstones();
|
|
117
|
-
|
|
124
|
+
// 仅拦截被 `/stop` 中断的同一 runId 的迟到结束事件；新 run（不同 runId 复用同 key）不受影响。
|
|
125
|
+
const tombstone = childTombstones.get(childSessionKey);
|
|
126
|
+
if (tombstone && runId && runId === tombstone.runId)
|
|
118
127
|
return;
|
|
119
128
|
const entry = childToRound.get(childSessionKey);
|
|
120
|
-
if (!entry
|
|
129
|
+
if (!entry) {
|
|
130
|
+
console.debug(`[subagent-monitor] markSubagentCompleted: no round entry childSessionKey=${childSessionKey}`);
|
|
121
131
|
return;
|
|
132
|
+
}
|
|
122
133
|
const monitor = roundMonitors.get(entry.roundKey);
|
|
123
|
-
if (!monitor || monitor.generation !== entry.generation)
|
|
134
|
+
if (!monitor || monitor.generation !== entry.generation) {
|
|
135
|
+
console.debug(`[subagent-monitor] markSubagentCompleted: monitor mismatch childSessionKey=${childSessionKey} runId=${runId ?? "(none)"} gen=${entry.generation}`);
|
|
124
136
|
return;
|
|
125
|
-
|
|
126
|
-
|
|
137
|
+
}
|
|
138
|
+
// runId 可能与 spawn 时不同（steer-restart / run 重建）：优先精确匹配，回退到 childSessionKey。
|
|
139
|
+
let record = runId ? monitor.subagents.get(runId) : undefined;
|
|
140
|
+
if (!record) {
|
|
141
|
+
record = Array.from(monitor.subagents.values()).find((r) => r.childSessionKey === childSessionKey);
|
|
142
|
+
if (record && runId && record.runId !== runId) {
|
|
143
|
+
console.debug(`[subagent-monitor] markSubagentCompleted: runId fallback childSessionKey=${childSessionKey} ` +
|
|
144
|
+
`eventRunId=${runId} recordRunId=${record.runId}`);
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
if (!record) {
|
|
148
|
+
console.debug(`[subagent-monitor] markSubagentCompleted: no record childSessionKey=${childSessionKey} runId=${runId ?? "(none)"}`);
|
|
127
149
|
return;
|
|
150
|
+
}
|
|
128
151
|
void (async () => {
|
|
129
152
|
try {
|
|
130
153
|
await readSubagentMessages(record);
|
|
@@ -132,6 +155,8 @@ export function markSubagentCompleted(childSessionKey, runId) {
|
|
|
132
155
|
catch (err) {
|
|
133
156
|
console.error(`[subagent-monitor] completion read failed: ${String(err)}`);
|
|
134
157
|
}
|
|
158
|
+
if (record.completed)
|
|
159
|
+
return;
|
|
135
160
|
record.completed = true;
|
|
136
161
|
await settleMonitorIfComplete(monitor);
|
|
137
162
|
})();
|
|
@@ -161,15 +186,48 @@ async function settleMonitorIfComplete(monitor) {
|
|
|
161
186
|
}
|
|
162
187
|
}
|
|
163
188
|
async function readSubagentMessages(record) {
|
|
164
|
-
if (!pluginApi)
|
|
189
|
+
if (!pluginApi || record.reading)
|
|
165
190
|
return;
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
191
|
+
record.reading = true;
|
|
192
|
+
try {
|
|
193
|
+
let messages = [];
|
|
194
|
+
try {
|
|
195
|
+
const result = await pluginApi.runtime.subagent.getSessionMessages({
|
|
196
|
+
sessionKey: record.childSessionKey,
|
|
197
|
+
});
|
|
198
|
+
messages = Array.isArray(result.messages) ? result.messages : [];
|
|
199
|
+
}
|
|
200
|
+
catch (err) {
|
|
201
|
+
// runtime.subagent 可能只在 gateway 请求上下文内可用（openclaw 7.x request-scoped）；
|
|
202
|
+
// 读取失败不能拖垮整个 tick，这里吞掉并继续，消息下次再拉。
|
|
203
|
+
console.warn(`[subagent-monitor] getSessionMessages failed childSessionKey=${record.childSessionKey} runId=${record.runId}: ${String(err)}`);
|
|
204
|
+
}
|
|
205
|
+
for (const msg of messages.slice(record.lastMsgIndex))
|
|
206
|
+
record.messages.push(cleanMsg(msg));
|
|
207
|
+
record.lastMsgIndex = messages.length;
|
|
208
|
+
}
|
|
209
|
+
finally {
|
|
210
|
+
record.reading = false;
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
/**
|
|
214
|
+
* 用 openclaw 权威 run 状态对账：run 已结束（ok/error）返回 true，仍在运行（timeout）返回 false。
|
|
215
|
+
* 探测失败（如 runId 已不存在、状态码异常）保守按「仍在运行」处理，交给事件路径兜底。
|
|
216
|
+
*/
|
|
217
|
+
async function probeRunStatus(record) {
|
|
218
|
+
if (!pluginApi)
|
|
219
|
+
return false;
|
|
220
|
+
try {
|
|
221
|
+
const result = await pluginApi.runtime.subagent.waitForRun({
|
|
222
|
+
runId: record.runId,
|
|
223
|
+
timeoutMs: RUN_STATUS_PROBE_TIMEOUT_MS,
|
|
224
|
+
});
|
|
225
|
+
return result.status !== "timeout";
|
|
226
|
+
}
|
|
227
|
+
catch (err) {
|
|
228
|
+
console.warn(`[subagent-monitor] waitForRun probe failed runId=${record.runId}: ${String(err)}`);
|
|
229
|
+
return false;
|
|
230
|
+
}
|
|
173
231
|
}
|
|
174
232
|
function ensureTickerRunning() {
|
|
175
233
|
if (tickerTimer)
|
|
@@ -185,10 +243,17 @@ async function tick() {
|
|
|
185
243
|
}
|
|
186
244
|
for (const monitor of Array.from(roundMonitors.values())) {
|
|
187
245
|
try {
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
246
|
+
const runningRecords = Array.from(monitor.subagents.values()).filter((record) => !record.completed);
|
|
247
|
+
await Promise.all(runningRecords.map((record) => readSubagentMessages(record)));
|
|
248
|
+
if (roundMonitors.get(monitor.roundKey) !== monitor)
|
|
249
|
+
continue;
|
|
250
|
+
// 并行对账：已结束的 run 在 gateway 侧有 terminal snapshot 缓存，立即返回；仍在跑的会阻塞至探测超时。
|
|
251
|
+
await Promise.all(runningRecords.map(async (record) => {
|
|
252
|
+
if (record.completed)
|
|
253
|
+
return;
|
|
254
|
+
if (await probeRunStatus(record))
|
|
255
|
+
record.completed = true;
|
|
256
|
+
}));
|
|
192
257
|
if (roundMonitors.get(monitor.roundKey) !== monitor)
|
|
193
258
|
continue;
|
|
194
259
|
sendWsStat(monitor, monitor.streamClient);
|
|
@@ -271,6 +336,9 @@ async function sendFinalStat(monitor, client) {
|
|
|
271
336
|
data: { subagentList: toSubagentList(monitor, false) },
|
|
272
337
|
});
|
|
273
338
|
}
|
|
339
|
+
export function __tickForTests() {
|
|
340
|
+
return tick();
|
|
341
|
+
}
|
|
274
342
|
export function __resetSubagentMonitorForTests() {
|
|
275
343
|
if (tickerTimer)
|
|
276
344
|
clearInterval(tickerTimer);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-monitor.js","sourceRoot":"","sources":["../../src/subagent-monitor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"subagent-monitor.js","sourceRoot":"","sources":["../../src/subagent-monitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subagent-monitor.test.d.ts","sourceRoot":"","sources":["../../src/subagent-monitor.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,214 @@
|
|
|
1
|
+
import assert from "node:assert/strict";
|
|
2
|
+
import { afterEach, describe, it } from "node:test";
|
|
3
|
+
import { __resetActiveRoundRegistryForTests, registerActiveRound } from "./active-round-registry.js";
|
|
4
|
+
import { __resetSubagentMonitorForTests, __tickForTests, hasActiveSubagents, markSubagentCompleted, prepareSubagentInterrupt, setPluginApi, startMonitor, } from "./subagent-monitor.js";
|
|
5
|
+
afterEach(() => {
|
|
6
|
+
__resetSubagentMonitorForTests();
|
|
7
|
+
__resetActiveRoundRegistryForTests();
|
|
8
|
+
});
|
|
9
|
+
function createClient(events) {
|
|
10
|
+
return {
|
|
11
|
+
start: async () => undefined,
|
|
12
|
+
streamProgress: async () => undefined,
|
|
13
|
+
streamUsage: async () => undefined,
|
|
14
|
+
sendEvent: async (event) => {
|
|
15
|
+
const list = event.data.subagentList ?? [];
|
|
16
|
+
events.push(`SUBAGENT_STAT:${list.map((s) => `${s.runId}:${s.status}`).join(",") || "(empty)"}`);
|
|
17
|
+
},
|
|
18
|
+
end: async (reason) => {
|
|
19
|
+
events.push(`FINISHED:${reason}`);
|
|
20
|
+
},
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
function createPluginApi(overrides) {
|
|
24
|
+
return {
|
|
25
|
+
runtime: {
|
|
26
|
+
subagent: {
|
|
27
|
+
waitForRun: overrides.waitForRun ?? (async () => ({ status: "timeout" })),
|
|
28
|
+
getSessionMessages: overrides.getSessionMessages ?? (async () => ({ messages: [] })),
|
|
29
|
+
},
|
|
30
|
+
},
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
function setupRound(events) {
|
|
34
|
+
const client = createClient(events);
|
|
35
|
+
const round = registerActiveRound({
|
|
36
|
+
accountId: "account-a",
|
|
37
|
+
groupId: "group-1",
|
|
38
|
+
agentId: "main",
|
|
39
|
+
sessionKey: "session-1",
|
|
40
|
+
replyToMsgId: "reply-1",
|
|
41
|
+
streamClient: client,
|
|
42
|
+
});
|
|
43
|
+
return { round, client };
|
|
44
|
+
}
|
|
45
|
+
function spawnParams(round, client, childSessionKey, runId) {
|
|
46
|
+
return {
|
|
47
|
+
roundKey: round.roundKey,
|
|
48
|
+
generation: round.generation,
|
|
49
|
+
groupId: round.groupId,
|
|
50
|
+
agentId: round.agentId,
|
|
51
|
+
streamClient: client,
|
|
52
|
+
replyToMsgId: round.replyToMsgId,
|
|
53
|
+
spawn: { childSessionKey, runId },
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
const settle = () => new Promise((resolve) => setImmediate(resolve));
|
|
57
|
+
describe("subagent-monitor completion matching", () => {
|
|
58
|
+
it("subagent_ended runId 与 spawn 不一致时仍按 childSessionKey 完成", async () => {
|
|
59
|
+
const events = [];
|
|
60
|
+
const { round, client } = setupRound(events);
|
|
61
|
+
assert.equal(startMonitor(spawnParams(round, client, "child-1", "run-1")), true);
|
|
62
|
+
events.length = 0;
|
|
63
|
+
markSubagentCompleted("child-1", "run-2");
|
|
64
|
+
await settle();
|
|
65
|
+
assert.deepEqual(events, ["SUBAGENT_STAT:run-1:completed"]);
|
|
66
|
+
assert.equal(hasActiveSubagents(round.roundKey, round.generation), false);
|
|
67
|
+
});
|
|
68
|
+
it("subagent_ended 缺失 runId 时按 childSessionKey 完成", async () => {
|
|
69
|
+
const events = [];
|
|
70
|
+
const { round, client } = setupRound(events);
|
|
71
|
+
startMonitor(spawnParams(round, client, "child-1", "run-1"));
|
|
72
|
+
events.length = 0;
|
|
73
|
+
markSubagentCompleted("child-1", undefined);
|
|
74
|
+
await settle();
|
|
75
|
+
assert.deepEqual(events, ["SUBAGENT_STAT:run-1:completed"]);
|
|
76
|
+
assert.equal(hasActiveSubagents(round.roundKey, round.generation), false);
|
|
77
|
+
});
|
|
78
|
+
it("中断后同 childSessionKey 重新 spawn（新 runId）的结束事件不被 tombstone 误挡", async () => {
|
|
79
|
+
const events = [];
|
|
80
|
+
const { round, client } = setupRound(events);
|
|
81
|
+
assert.equal(startMonitor(spawnParams(round, client, "child-1", "run-1")), true);
|
|
82
|
+
prepareSubagentInterrupt(round.roundKey, round.generation);
|
|
83
|
+
events.length = 0;
|
|
84
|
+
const round2 = registerActiveRound({
|
|
85
|
+
accountId: "account-a",
|
|
86
|
+
groupId: "group-2",
|
|
87
|
+
agentId: "main",
|
|
88
|
+
sessionKey: "session-1",
|
|
89
|
+
replyToMsgId: "reply-1",
|
|
90
|
+
streamClient: client,
|
|
91
|
+
});
|
|
92
|
+
assert.equal(startMonitor(spawnParams(round2, client, "child-1", "run-2")), true);
|
|
93
|
+
events.length = 0;
|
|
94
|
+
markSubagentCompleted("child-1", "run-2");
|
|
95
|
+
await settle();
|
|
96
|
+
assert.deepEqual(events, ["SUBAGENT_STAT:run-2:completed"]);
|
|
97
|
+
assert.equal(hasActiveSubagents(round2.roundKey, round2.generation), false);
|
|
98
|
+
});
|
|
99
|
+
it("中断后被中断旧 run 的迟到结束事件不会完成新 record", async () => {
|
|
100
|
+
const events = [];
|
|
101
|
+
const { round, client } = setupRound(events);
|
|
102
|
+
assert.equal(startMonitor(spawnParams(round, client, "child-1", "run-1")), true);
|
|
103
|
+
prepareSubagentInterrupt(round.roundKey, round.generation);
|
|
104
|
+
const round2 = registerActiveRound({
|
|
105
|
+
accountId: "account-a",
|
|
106
|
+
groupId: "group-2",
|
|
107
|
+
agentId: "main",
|
|
108
|
+
sessionKey: "session-1",
|
|
109
|
+
replyToMsgId: "reply-1",
|
|
110
|
+
streamClient: client,
|
|
111
|
+
});
|
|
112
|
+
assert.equal(startMonitor(spawnParams(round2, client, "child-1", "run-2")), true);
|
|
113
|
+
events.length = 0;
|
|
114
|
+
markSubagentCompleted("child-1", "run-1");
|
|
115
|
+
await settle();
|
|
116
|
+
assert.equal(events.some((e) => e.includes(":completed")), false);
|
|
117
|
+
assert.equal(hasActiveSubagents(round2.roundKey, round2.generation), true);
|
|
118
|
+
});
|
|
119
|
+
});
|
|
120
|
+
describe("subagent-monitor tick reconciliation", () => {
|
|
121
|
+
it("waitForRun 返回 ok → 标记完成并收口", async () => {
|
|
122
|
+
const events = [];
|
|
123
|
+
const { round, client } = setupRound(events);
|
|
124
|
+
setPluginApi(createPluginApi({
|
|
125
|
+
waitForRun: async () => ({ status: "ok" }),
|
|
126
|
+
}));
|
|
127
|
+
startMonitor(spawnParams(round, client, "child-1", "run-1"));
|
|
128
|
+
events.length = 0;
|
|
129
|
+
await __tickForTests();
|
|
130
|
+
assert.ok(events.some((e) => e === "SUBAGENT_STAT:run-1:completed"));
|
|
131
|
+
assert.equal(hasActiveSubagents(round.roundKey, round.generation), false);
|
|
132
|
+
});
|
|
133
|
+
it("waitForRun 返回 timeout → 保持 running 且不收口", async () => {
|
|
134
|
+
const events = [];
|
|
135
|
+
const { round, client } = setupRound(events);
|
|
136
|
+
setPluginApi(createPluginApi({
|
|
137
|
+
waitForRun: async () => ({ status: "timeout" }),
|
|
138
|
+
}));
|
|
139
|
+
startMonitor(spawnParams(round, client, "child-1", "run-1"));
|
|
140
|
+
events.length = 0;
|
|
141
|
+
await __tickForTests();
|
|
142
|
+
assert.ok(events.some((e) => e === "SUBAGENT_STAT:run-1:running"));
|
|
143
|
+
assert.equal(hasActiveSubagents(round.roundKey, round.generation), true);
|
|
144
|
+
});
|
|
145
|
+
it("getSessionMessages 抛错 → tick 不被拖垮，仍发 stat 且保持 running", async () => {
|
|
146
|
+
const events = [];
|
|
147
|
+
const { round, client } = setupRound(events);
|
|
148
|
+
setPluginApi(createPluginApi({
|
|
149
|
+
getSessionMessages: async () => {
|
|
150
|
+
throw new Error("Plugin runtime subagent methods are only available during a gateway request.");
|
|
151
|
+
},
|
|
152
|
+
waitForRun: async () => ({ status: "timeout" }),
|
|
153
|
+
}));
|
|
154
|
+
startMonitor(spawnParams(round, client, "child-1", "run-1"));
|
|
155
|
+
events.length = 0;
|
|
156
|
+
await __tickForTests();
|
|
157
|
+
assert.ok(events.some((e) => e === "SUBAGENT_STAT:run-1:running"));
|
|
158
|
+
assert.equal(hasActiveSubagents(round.roundKey, round.generation), true);
|
|
159
|
+
});
|
|
160
|
+
it("waitForRun 返回 error → 标记完成并收口", async () => {
|
|
161
|
+
const events = [];
|
|
162
|
+
const { round, client } = setupRound(events);
|
|
163
|
+
setPluginApi(createPluginApi({
|
|
164
|
+
waitForRun: async () => ({ status: "error", error: "boom" }),
|
|
165
|
+
}));
|
|
166
|
+
startMonitor(spawnParams(round, client, "child-1", "run-1"));
|
|
167
|
+
events.length = 0;
|
|
168
|
+
await __tickForTests();
|
|
169
|
+
assert.ok(events.some((e) => e === "SUBAGENT_STAT:run-1:completed"));
|
|
170
|
+
assert.equal(hasActiveSubagents(round.roundKey, round.generation), false);
|
|
171
|
+
});
|
|
172
|
+
it("waitForRun 抛异常 → 保持 running，由事件路径兜底", async () => {
|
|
173
|
+
const events = [];
|
|
174
|
+
const { round, client } = setupRound(events);
|
|
175
|
+
setPluginApi(createPluginApi({
|
|
176
|
+
waitForRun: async () => {
|
|
177
|
+
throw new Error("run not found");
|
|
178
|
+
},
|
|
179
|
+
}));
|
|
180
|
+
startMonitor(spawnParams(round, client, "child-1", "run-1"));
|
|
181
|
+
events.length = 0;
|
|
182
|
+
await __tickForTests();
|
|
183
|
+
assert.equal(hasActiveSubagents(round.roundKey, round.generation), true);
|
|
184
|
+
markSubagentCompleted("child-1", "run-1");
|
|
185
|
+
await settle();
|
|
186
|
+
assert.equal(hasActiveSubagents(round.roundKey, round.generation), false);
|
|
187
|
+
});
|
|
188
|
+
it("多 subagent 的 waitForRun 探测并发执行（互不阻塞累加）", async () => {
|
|
189
|
+
const events = [];
|
|
190
|
+
const { round, client } = setupRound(events);
|
|
191
|
+
let inFlight = 0;
|
|
192
|
+
let maxInFlight = 0;
|
|
193
|
+
setPluginApi(createPluginApi({
|
|
194
|
+
waitForRun: async () => {
|
|
195
|
+
inFlight += 1;
|
|
196
|
+
maxInFlight = Math.max(maxInFlight, inFlight);
|
|
197
|
+
await new Promise((resolve) => setTimeout(resolve, 20));
|
|
198
|
+
inFlight -= 1;
|
|
199
|
+
return { status: "timeout" };
|
|
200
|
+
},
|
|
201
|
+
}));
|
|
202
|
+
startMonitor(spawnParams(round, client, "child-1", "run-1"));
|
|
203
|
+
startMonitor(spawnParams(round, client, "child-2", "run-2"));
|
|
204
|
+
events.length = 0;
|
|
205
|
+
// startMonitor 会触发一次立即 tick（fire-and-forget），先等它跑完再单独测量。
|
|
206
|
+
await new Promise((resolve) => setTimeout(resolve, 30));
|
|
207
|
+
inFlight = 0;
|
|
208
|
+
maxInFlight = 0;
|
|
209
|
+
await __tickForTests();
|
|
210
|
+
assert.equal(maxInFlight, 2);
|
|
211
|
+
assert.equal(hasActiveSubagents(round.roundKey, round.generation), true);
|
|
212
|
+
});
|
|
213
|
+
});
|
|
214
|
+
//# sourceMappingURL=subagent-monitor.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subagent-monitor.test.js","sourceRoot":"","sources":["../../src/subagent-monitor.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xgjktech/xg_cwork_im",
|
|
3
|
-
"version": "1.17.
|
|
3
|
+
"version": "1.17.29",
|
|
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/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/block-streaming-config.test.js dist/src/channel-disabled-account.test.js dist/src/per-message-fallback-notice.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-tool-result.test.js dist/src/plan-blocked-notice.test.js dist/src/plan-store-access.test.js dist/src/plan-tool-middleware.test.js dist/src/plan-event-subscription.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",
|
|
28
|
+
"test": "npm run build && node --test 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/block-streaming-config.test.js dist/src/channel-disabled-account.test.js dist/src/per-message-fallback-notice.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-tool-result.test.js dist/src/plan-blocked-notice.test.js dist/src/plan-store-access.test.js dist/src/plan-tool-middleware.test.js dist/src/plan-event-subscription.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",
|
|
29
29
|
"install:prod": "npm install --omit=dev",
|
|
30
30
|
"prepublishOnly": "npm run build"
|
|
31
31
|
},
|