@xgjktech/xg_cwork_im 1.17.52 → 1.17.54
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 +26 -3
- package/dist/index.js.map +1 -1
- package/dist/src/account-connection.d.ts.map +1 -1
- package/dist/src/account-connection.js +31 -2
- package/dist/src/account-connection.js.map +1 -1
- package/dist/src/active-round-registry.d.ts +4 -0
- package/dist/src/active-round-registry.d.ts.map +1 -1
- package/dist/src/active-round-registry.js +20 -0
- package/dist/src/active-round-registry.js.map +1 -1
- package/dist/src/build-project-prompt.test.js +18 -18
- package/dist/src/dispatch-mentioned-reply.d.ts.map +1 -1
- package/dist/src/dispatch-mentioned-reply.js +88 -40
- package/dist/src/dispatch-mentioned-reply.js.map +1 -1
- package/dist/src/gateway-session-queue.d.ts +0 -3
- package/dist/src/gateway-session-queue.d.ts.map +1 -1
- package/dist/src/gateway-session-queue.js +0 -1
- package/dist/src/gateway-session-queue.js.map +1 -1
- package/dist/src/plugin-dispose.d.ts.map +1 -1
- package/dist/src/plugin-dispose.js +4 -0
- package/dist/src/plugin-dispose.js.map +1 -1
- package/dist/src/subagent-monitor.d.ts +13 -0
- package/dist/src/subagent-monitor.d.ts.map +1 -1
- package/dist/src/subagent-monitor.js +32 -13
- package/dist/src/subagent-monitor.js.map +1 -1
- package/dist/src/turn-agent-event-subscription.d.ts +25 -0
- package/dist/src/turn-agent-event-subscription.d.ts.map +1 -0
- package/dist/src/turn-agent-event-subscription.js +172 -0
- package/dist/src/turn-agent-event-subscription.js.map +1 -0
- package/dist/src/turn-end-controller.d.ts +62 -0
- package/dist/src/turn-end-controller.d.ts.map +1 -0
- package/dist/src/turn-end-controller.js +240 -0
- package/dist/src/turn-end-controller.js.map +1 -0
- package/dist/src/turn-end-controller.test.d.ts +2 -0
- package/dist/src/turn-end-controller.test.d.ts.map +1 -0
- package/dist/src/turn-end-controller.test.js +91 -0
- package/dist/src/turn-end-controller.test.js.map +1 -0
- package/package.json +2 -2
- package/dist/src/single-chat-no-reply-fallback.d.ts +0 -14
- package/dist/src/single-chat-no-reply-fallback.d.ts.map +0 -1
- package/dist/src/single-chat-no-reply-fallback.js +0 -20
- package/dist/src/single-chat-no-reply-fallback.js.map +0 -1
- package/dist/src/subagent-progress-hooks.d.ts +0 -11
- package/dist/src/subagent-progress-hooks.d.ts.map +0 -1
- package/dist/src/subagent-progress-hooks.js +0 -41
- package/dist/src/subagent-progress-hooks.js.map +0 -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;AA2CH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAK5D,OAAO,EAAE,uCAAuC,EAAE,MAAM,oCAAoC,CAAC;AAgD7F,QAAA,MAAM,MAAM,EAAE,qBA8Pb,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -11,20 +11,22 @@ import { registerCronAppKeyBindingHook, registerExecEnvHook } from "./src/regist
|
|
|
11
11
|
import { initSessionEnvPersistence, linkChildSession } from "./src/session-env-store.js";
|
|
12
12
|
import { buildSendFileTool } from "./src/send-file-tool.js";
|
|
13
13
|
import { buildSendGroupMessageTool } from "./src/send-group-message-tool.js";
|
|
14
|
-
import { setPluginApi, startMonitor, markSubagentCompleted, getSubagentMonitorInstanceId, } from "./src/subagent-monitor.js";
|
|
14
|
+
import { setPluginApi, startMonitor, markSubagentCompleted, getSubagentMonitorInstanceId, findChildRoundIndex, } from "./src/subagent-monitor.js";
|
|
15
|
+
import { turnEnsureRound, turnOnActivity, turnOnSubagentSpawn, turnOnSubagentEnded, } from "./src/turn-end-controller.js";
|
|
15
16
|
import { getSessionImContext } from "./src/session-im-context.js";
|
|
16
17
|
import { currentRegisterSeq, nextModuleEpoch, nextRegisterSeq, requestFullTeardownOnce, resetFullTeardownGate, setSharedRuntime, } from "./src/process-shared-store.js";
|
|
17
18
|
import { disposePluginModule } from "./src/plugin-dispose.js";
|
|
18
19
|
import { friendlyToolLabel, buildToolStartSummary } from "./src/im-tool-progress.js";
|
|
19
20
|
import { getStreamClient } from "./src/agent-stream-client-registry.js";
|
|
20
21
|
import { registerPlanEventSubscription } from "./src/plan-event-subscription.js";
|
|
22
|
+
import { registerTurnAgentEventSubscription } from "./src/turn-agent-event-subscription.js";
|
|
21
23
|
import { getPlanById, setPlanStateDir } from "./src/plan-store-access.js";
|
|
22
24
|
import { getActionById, setActionStateDir } from "./src/action-store-access.js";
|
|
23
25
|
import { createPlanToolResultMiddleware } from "./src/plan-tool-middleware.js";
|
|
24
26
|
import { sendPlanStat } from "./src/plan-stat-event.js";
|
|
25
27
|
import { sendActionRunEvent } from "./src/action-run-event.js";
|
|
26
28
|
import { accountReconciler } from "./src/account-reconciler.js";
|
|
27
|
-
import { findActiveRoundForSubagent } from "./src/active-round-registry.js";
|
|
29
|
+
import { findActiveRoundForSession, findActiveRoundForSubagent } from "./src/active-round-registry.js";
|
|
28
30
|
import { initCronAppKeyBindingStore } from "./src/cron-appkey-binding-store.js";
|
|
29
31
|
export { XG_IM_RECOMMENDED_CHANNEL_SYSTEM_PROMPT } from "./src/recommended-system-prompt.js";
|
|
30
32
|
/**
|
|
@@ -62,7 +64,8 @@ const plugin = {
|
|
|
62
64
|
resetFullTeardownGate();
|
|
63
65
|
setSharedRuntime(api.runtime);
|
|
64
66
|
console.log(`[xg_cwork_im] [reload] register moduleEpoch=${MODULE_EPOCH} registerSeq=${registerSeq} ` +
|
|
65
|
-
`current=${currentRegisterSeq()} process=${process.title || "(none)"}`
|
|
67
|
+
`current=${currentRegisterSeq()} process=${process.title || "(none)"} ` +
|
|
68
|
+
`openclawVersion=${api.runtime.version ?? "(unknown)"}`);
|
|
66
69
|
setXgImRuntime(api.runtime);
|
|
67
70
|
accountReconciler.setRuntime(api.runtime);
|
|
68
71
|
setPluginApi(api);
|
|
@@ -120,6 +123,8 @@ const plugin = {
|
|
|
120
123
|
if (round.sessionKey) {
|
|
121
124
|
linkChildSession(event.childSessionKey, round.sessionKey);
|
|
122
125
|
}
|
|
126
|
+
turnEnsureRound(round.roundKey, round.generation);
|
|
127
|
+
turnOnSubagentSpawn(round.roundKey, round.generation);
|
|
123
128
|
startMonitor({
|
|
124
129
|
roundKey: round.roundKey,
|
|
125
130
|
generation: round.generation,
|
|
@@ -136,6 +141,10 @@ const plugin = {
|
|
|
136
141
|
});
|
|
137
142
|
api.on("subagent_ended", (event) => {
|
|
138
143
|
console.debug(`[subagent-monitor] subagent_ended instance=${getSubagentMonitorInstanceId()} targetSessionKey=${event.targetSessionKey} runId=${event.runId ?? "(none)"}`);
|
|
144
|
+
const idx = findChildRoundIndex(event.targetSessionKey);
|
|
145
|
+
if (idx) {
|
|
146
|
+
turnOnSubagentEnded(idx.roundKey, idx.generation);
|
|
147
|
+
}
|
|
139
148
|
markSubagentCompleted(event.targetSessionKey, event.runId);
|
|
140
149
|
});
|
|
141
150
|
api.on("before_tool_call", (event, ctx) => {
|
|
@@ -147,6 +156,10 @@ const plugin = {
|
|
|
147
156
|
const client = getStreamClient(im.agentId);
|
|
148
157
|
if (!client)
|
|
149
158
|
return;
|
|
159
|
+
const round = findActiveRoundForSession(ctx.sessionKey);
|
|
160
|
+
if (round) {
|
|
161
|
+
turnOnActivity(round.roundKey, round.generation);
|
|
162
|
+
}
|
|
150
163
|
const summary = buildToolStartSummary(event.toolName, event.params);
|
|
151
164
|
client.streamProgress({
|
|
152
165
|
groupId: im.groupId,
|
|
@@ -182,6 +195,10 @@ const plugin = {
|
|
|
182
195
|
const client = getStreamClient(im.agentId);
|
|
183
196
|
if (!client)
|
|
184
197
|
return;
|
|
198
|
+
const round = findActiveRoundForSession(ctx.sessionKey);
|
|
199
|
+
if (round) {
|
|
200
|
+
turnOnActivity(round.roundKey, round.generation);
|
|
201
|
+
}
|
|
185
202
|
const label = friendlyToolLabel(event.toolName);
|
|
186
203
|
client.streamProgress({
|
|
187
204
|
groupId: im.groupId,
|
|
@@ -237,6 +254,12 @@ const plugin = {
|
|
|
237
254
|
catch (err) {
|
|
238
255
|
console.warn(`[xg_cwork_im] [plan] registerPlanEventSubscription failed: ${String(err)}`);
|
|
239
256
|
}
|
|
257
|
+
try {
|
|
258
|
+
registerTurnAgentEventSubscription(api);
|
|
259
|
+
}
|
|
260
|
+
catch (err) {
|
|
261
|
+
console.warn(`[xg_cwork_im] [turn] registerTurnAgentEventSubscription failed: ${String(err)}`);
|
|
262
|
+
}
|
|
240
263
|
}
|
|
241
264
|
else {
|
|
242
265
|
console.warn("[xg_cwork_im] channel config not found, skipping tool registration");
|
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,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-connection.d.ts","sourceRoot":"","sources":["../../src/account-connection.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAc/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAuCtE,OAAO,KAAK,EAAE,eAAe,EAAa,UAAU,EAAE,MAAM,YAAY,CAAC;AAEzE,MAAM,WAAW,uBAAuB;IACpC,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,YAAY,EAAE,cAAc,CAAC;IAC7B,oBAAoB,EAAE,MAAM,OAAO,CAAC;CACvC;AAED,MAAM,WAAW,4BAA4B;IACzC,0CAA0C;IAC1C,GAAG,EAAE,cAAc,CAAC;IACpB,OAAO,EAAE,eAAe,CAAC;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,iDAAiD;IAEjD,EAAE,EAAE,GAAG,CAAC;IACR,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,6CAA6C;IAC7C,WAAW,CAAC,EAAE,MAAM,cAAc,CAAC;CACtC;
|
|
1
|
+
{"version":3,"file":"account-connection.d.ts","sourceRoot":"","sources":["../../src/account-connection.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAc/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAuCtE,OAAO,KAAK,EAAE,eAAe,EAAa,UAAU,EAAE,MAAM,YAAY,CAAC;AAEzE,MAAM,WAAW,uBAAuB;IACpC,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,YAAY,EAAE,cAAc,CAAC;IAC7B,oBAAoB,EAAE,MAAM,OAAO,CAAC;CACvC;AAED,MAAM,WAAW,4BAA4B;IACzC,0CAA0C;IAC1C,GAAG,EAAE,cAAc,CAAC;IACpB,OAAO,EAAE,eAAe,CAAC;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,iDAAiD;IAEjD,EAAE,EAAE,GAAG,CAAC;IACR,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,6CAA6C;IAC7C,WAAW,CAAC,EAAE,MAAM,cAAc,CAAC;CACtC;AA6CD;;;GAGG;AACH,wBAAsB,sBAAsB,CACxC,MAAM,EAAE,4BAA4B,GACrC,OAAO,CAAC,uBAAuB,CAAC,CAuelC"}
|
|
@@ -52,6 +52,21 @@ function resolveUserThinkTakesPriority(args) {
|
|
|
52
52
|
return false;
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
|
+
/**
|
|
56
|
+
* 是否把「派发前 recordInboundSession」推迟到 dispatch 结束后执行。
|
|
57
|
+
* OpenClaw 8.1 的会话 store 对同一 sessionKey 用快照 CAS：插件在 dispatch 前手动
|
|
58
|
+
* recordInboundSession 会与 dispatch 的会话初始化并发 patch 同一条 session entry →
|
|
59
|
+
* SqliteSessionMutationConflictError / SessionEntryLifecycleUpsertConflictError →
|
|
60
|
+
* 多 attempt 空 settle → “No reply was generated” 兜底吞真实回复（7.1 无此 CAS，不受影响）。
|
|
61
|
+
* 仅对「将派发」的消息延迟 record（dispatch 完成后补 updateLastRoute 路由书签）；
|
|
62
|
+
* 非派发消息保持原行为。仅在 OpenClaw 8.x 生效（7.1 不改变行为）。
|
|
63
|
+
*/
|
|
64
|
+
function shouldDeferInboundRecord(rt, dispatchable) {
|
|
65
|
+
if (!dispatchable)
|
|
66
|
+
return false;
|
|
67
|
+
const version = String(rt?.version ?? "");
|
|
68
|
+
return /^2026\.(8|9)/.test(version);
|
|
69
|
+
}
|
|
55
70
|
/**
|
|
56
71
|
* 启动一个账号的 WebSocket 连接并持续派发，直到 abortSignal 触发。
|
|
57
72
|
* 返回句柄供调用方主动 stop（幂等）。
|
|
@@ -337,8 +352,7 @@ export async function startAccountConnection(params) {
|
|
|
337
352
|
/* ignore */
|
|
338
353
|
}
|
|
339
354
|
}
|
|
340
|
-
|
|
341
|
-
await rt.channel.session.recordInboundSession({
|
|
355
|
+
const recordInbound = () => rt.channel.session.recordInboundSession({
|
|
342
356
|
storePath,
|
|
343
357
|
sessionKey: inboundCtx.SessionKey || route.sessionKey,
|
|
344
358
|
ctx: inboundCtx,
|
|
@@ -352,6 +366,16 @@ export async function startAccountConnection(params) {
|
|
|
352
366
|
log.error(`${logPrefix} Failed to record session: ${String(err)}`);
|
|
353
367
|
},
|
|
354
368
|
});
|
|
369
|
+
// 默认派发前记录；在 OpenClaw 8.x 上对「将派发」的消息推迟到 dispatch 结束后
|
|
370
|
+
// 再补写（避免与 dispatch 会话初始化对同一 session entry 抢 CAS）。
|
|
371
|
+
const deferInboundRecord = shouldDeferInboundRecord(rt, shouldDispatch);
|
|
372
|
+
if (!deferInboundRecord) {
|
|
373
|
+
log.info(`${logPrefix} [session] Recording inbound session sessionKey=${inboundCtx.SessionKey || route.sessionKey}`);
|
|
374
|
+
await recordInbound();
|
|
375
|
+
}
|
|
376
|
+
else {
|
|
377
|
+
log.info(`${logPrefix} [session] Defer recordInboundSession until after dispatch sessionKey=${inboundCtx.SessionKey || route.sessionKey}`);
|
|
378
|
+
}
|
|
355
379
|
if (shouldDispatch) {
|
|
356
380
|
// 按「最后触发者」覆盖写入本会话的 exec 环境变量（appKey 为 undefined 时清除）。
|
|
357
381
|
if (senderAppKey) {
|
|
@@ -395,6 +419,11 @@ export async function startAccountConnection(params) {
|
|
|
395
419
|
});
|
|
396
420
|
}
|
|
397
421
|
finally {
|
|
422
|
+
if (deferInboundRecord) {
|
|
423
|
+
// dispatch 已完成、会话条目稳定，再补会话元数据与 lastRoute 路由书签。
|
|
424
|
+
log.info(`${logPrefix} [session] Recording inbound session after dispatch sessionKey=${inboundCtx.SessionKey || route.sessionKey}`);
|
|
425
|
+
await recordInbound();
|
|
426
|
+
}
|
|
398
427
|
if (preparedInterrupt) {
|
|
399
428
|
await finalizeRoundInterrupt(preparedInterrupt);
|
|
400
429
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-connection.js","sourceRoot":"","sources":["../../src/account-connection.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"account-connection.js","sourceRoot":"","sources":["../../src/account-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,10 @@ export declare function registerActiveRound(params: {
|
|
|
23
23
|
now?: number;
|
|
24
24
|
}): ActiveRound;
|
|
25
25
|
export declare function findActiveRoundForSubagent(groupId: string, now?: number): ActiveRound | undefined;
|
|
26
|
+
/** 按整轮父会话 sessionKey 定位活跃轮次（lifecycle/thinking 等事件路由用）。 */
|
|
27
|
+
export declare function findActiveRoundForSession(sessionKey: string, now?: number): ActiveRound | undefined;
|
|
28
|
+
export declare function getActiveRound(roundKey: string, generation: number): ActiveRound | undefined;
|
|
29
|
+
export declare function roundExists(roundKey: string, generation: number): boolean;
|
|
26
30
|
export declare function prepareActiveRoundInterrupt(accountId: string, groupId: string, now?: number): ActiveRound | undefined;
|
|
27
31
|
export declare function completeActiveRound(roundKey: string, generation: number): boolean;
|
|
28
32
|
export declare function __resetActiveRoundRegistryForTests(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"active-round-registry.d.ts","sourceRoot":"","sources":["../../src/active-round-registry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAItD,MAAM,WAAW,WAAW;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,cAAc,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;CACxB;AAKD,eAAO,MAAM,aAAa,GAAI,WAAW,MAAM,EAAE,SAAS,MAAM,KAAG,MACI,CAAC;AAQxE,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,cAAc,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,WAAW,CAqBd;AAED,wBAAgB,0BAA0B,CACtC,OAAO,EAAE,MAAM,EACf,GAAG,SAAa,GACjB,WAAW,GAAG,SAAS,CAWzB;AAED,wBAAgB,2BAA2B,CACvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,GAAG,SAAa,GACjB,WAAW,GAAG,SAAS,CAMzB;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAKjF;AAED,wBAAgB,kCAAkC,IAAI,IAAI,CAEzD;AAED,wBAAwB;AACxB,wBAAgB,0BAA0B,IAAI,IAAI,CAGjD"}
|
|
1
|
+
{"version":3,"file":"active-round-registry.d.ts","sourceRoot":"","sources":["../../src/active-round-registry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAItD,MAAM,WAAW,WAAW;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,cAAc,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;CACxB;AAKD,eAAO,MAAM,aAAa,GAAI,WAAW,MAAM,EAAE,SAAS,MAAM,KAAG,MACI,CAAC;AAQxE,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,cAAc,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,WAAW,CAqBd;AAED,wBAAgB,0BAA0B,CACtC,OAAO,EAAE,MAAM,EACf,GAAG,SAAa,GACjB,WAAW,GAAG,SAAS,CAWzB;AAED,2DAA2D;AAC3D,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,WAAW,GAAG,SAAS,CAYvG;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAI5F;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAEzE;AAED,wBAAgB,2BAA2B,CACvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,GAAG,SAAa,GACjB,WAAW,GAAG,SAAS,CAMzB;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAKjF;AAED,wBAAgB,kCAAkC,IAAI,IAAI,CAEzD;AAED,wBAAwB;AACxB,wBAAgB,0BAA0B,IAAI,IAAI,CAGjD"}
|
|
@@ -39,6 +39,26 @@ export function findActiveRoundForSubagent(groupId, now = Date.now()) {
|
|
|
39
39
|
}
|
|
40
40
|
return matches.length === 1 ? matches[0] : undefined;
|
|
41
41
|
}
|
|
42
|
+
/** 按整轮父会话 sessionKey 定位活跃轮次（lifecycle/thinking 等事件路由用）。 */
|
|
43
|
+
export function findActiveRoundForSession(sessionKey, now = Date.now()) {
|
|
44
|
+
if (!sessionKey)
|
|
45
|
+
return undefined;
|
|
46
|
+
pruneExpired(now);
|
|
47
|
+
const matches = Array.from(rounds.values()).filter((round) => !round.interrupted && round.sessionKey === sessionKey);
|
|
48
|
+
if (matches.length > 1) {
|
|
49
|
+
console.warn(`[xg_cwork_im] [turn] ambiguous active round sessionKey=${sessionKey}; lifecycle routing rejected`);
|
|
50
|
+
}
|
|
51
|
+
return matches.length === 1 ? matches[0] : undefined;
|
|
52
|
+
}
|
|
53
|
+
export function getActiveRound(roundKey, generation) {
|
|
54
|
+
const round = rounds.get(roundKey);
|
|
55
|
+
if (!round || round.generation !== generation)
|
|
56
|
+
return undefined;
|
|
57
|
+
return round;
|
|
58
|
+
}
|
|
59
|
+
export function roundExists(roundKey, generation) {
|
|
60
|
+
return getActiveRound(roundKey, generation) !== undefined;
|
|
61
|
+
}
|
|
42
62
|
export function prepareActiveRoundInterrupt(accountId, groupId, now = Date.now()) {
|
|
43
63
|
pruneExpired(now);
|
|
44
64
|
const round = rounds.get(buildRoundKey(accountId, groupId));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"active-round-registry.js","sourceRoot":"","sources":["../../src/active-round-registry.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"active-round-registry.js","sourceRoot":"","sources":["../../src/active-round-registry.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":"dispatch-mentioned-reply.d.ts","sourceRoot":"","sources":["../../src/dispatch-mentioned-reply.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAA2C,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAqBtG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"dispatch-mentioned-reply.d.ts","sourceRoot":"","sources":["../../src/dispatch-mentioned-reply.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAA2C,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAqBtG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAqC9D,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAgC1D,4EAA4E;AAC5E,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,GAAG,CAAC;IACR,GAAG,EAAE,cAAc,CAAC;IACpB,MAAM,EAAE,UAAU,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,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,YAAY,EAAE,cAAc,CAAC;IAC7B,uDAAuD;IACvD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,uEAAuE;IACvE,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;IACzB,4EAA4E;IAC5E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uDAAuD;IACvD,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,gDAAgD;IAChD,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,qCAAqC;IACrC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,gEAAgE;IAChE,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B,GAAG,OAAO,CAAC,IAAI,CAAC,CAshChB"}
|
|
@@ -14,13 +14,17 @@ import { sendReplyDeliverBlock, sendTextMessage } from "./send-service.js";
|
|
|
14
14
|
import { isDeliverPayloadSendable, snapshotSupersedesBufferText, TurnDeliverBuffer } from "./turn-deliver-buffer.js";
|
|
15
15
|
import { buildRunUsageFromSessionEntry, hasReportableUsage, toImStreamRunUsageData } from "./run-usage.js";
|
|
16
16
|
import { readSessionUsageFields } from "./run-usage-session.js";
|
|
17
|
-
import {
|
|
17
|
+
import { finalizeRoundMonitoring } from "./subagent-monitor.js";
|
|
18
18
|
import { registerPlanWsClientAndSnapshot } from "./plan-stat-event.js";
|
|
19
19
|
import { setSessionImContext } from "./session-im-context.js";
|
|
20
|
-
import { completeActiveRound, registerActiveRound, } from "./active-round-registry.js";
|
|
20
|
+
import { completeActiveRound, registerActiveRound, roundExists, } from "./active-round-registry.js";
|
|
21
|
+
import { turnEnsureRound, turnForget, turnIsEligible, turnIsSawSubagent, turnOnDispatchReturned, } from "./turn-end-controller.js";
|
|
22
|
+
import { noteWrappedRunId } from "./turn-agent-event-subscription.js";
|
|
21
23
|
import { resolveNasVolumeDispatchConfig } from "./nas-volumes.js";
|
|
22
24
|
/** WS `displayText` 过长封顶（避免网关/客户端溢出） */
|
|
23
25
|
const WS_DISPLAY_TEXT_MAX = 200;
|
|
26
|
+
/** 子任务轮次等整轮结束（等父会话非 yield 终态 / 静默兜底）的最长等待时间；超时强制收尾，避免悬挂。 */
|
|
27
|
+
const TURN_END_WAIT_MAX_MS = 30 * 60_000;
|
|
24
28
|
/** 进度 `summary` 封顶（与网关约定一致） */
|
|
25
29
|
const WS_PROGRESS_SUMMARY_MAX = 200;
|
|
26
30
|
/** 流式正文预览（onPartialReply 快照）经 WS 展示的封顶长度 */
|
|
@@ -230,6 +234,7 @@ export async function dispatchMentionedReply(args) {
|
|
|
230
234
|
replyToMsgId: params.msgId,
|
|
231
235
|
streamClient,
|
|
232
236
|
});
|
|
237
|
+
turnEnsureRound(activeRound.roundKey, activeRound.generation);
|
|
233
238
|
registerPlanWsClientAndSnapshot(params.groupId, streamClient, params.msgId);
|
|
234
239
|
}
|
|
235
240
|
if (modelOverride) {
|
|
@@ -374,6 +379,7 @@ export async function dispatchMentionedReply(args) {
|
|
|
374
379
|
agentRunStarted = true;
|
|
375
380
|
agentRunId = runId.trim() || undefined;
|
|
376
381
|
terminal.setRunId(runId);
|
|
382
|
+
noteWrappedRunId(route.sessionKey, runId.trim());
|
|
377
383
|
log.info(`${logPrefix} [dispatch] agent run started runId=${runId}`);
|
|
378
384
|
},
|
|
379
385
|
onModelSelected: (m) => {
|
|
@@ -763,48 +769,49 @@ export async function dispatchMentionedReply(args) {
|
|
|
763
769
|
log.info(`${logPrefix} [stream] round interrupted; skip late RUN_USAGE/FINISHED`);
|
|
764
770
|
return;
|
|
765
771
|
}
|
|
766
|
-
|
|
767
|
-
|
|
768
|
-
|
|
769
|
-
|
|
770
|
-
const
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
|
|
774
|
-
|
|
775
|
-
|
|
776
|
-
|
|
777
|
-
if (hasReportableUsage(usage) && usage) {
|
|
778
|
-
await streamClient.streamUsage(toImStreamRunUsageData(usage, {
|
|
779
|
-
groupId: params.groupId,
|
|
780
|
-
replyToMsgId: params.msgId,
|
|
781
|
-
}));
|
|
772
|
+
// —— 整轮收尾（OpenClaw 7.1+/8.x）：子任务流程中 dispatch 返回只是「一段 run 结束」，
|
|
773
|
+
// FINISHED/RUN_USAGE 必须等主会话出现非 yield 段终态（或静默兜底）后才发出，
|
|
774
|
+
// 否则会在主会话 resume 继续派发更多子任务时提前结束本轮。——
|
|
775
|
+
const finishWsRound = async (reason) => {
|
|
776
|
+
const roundKey = activeRound?.roundKey;
|
|
777
|
+
const generation = activeRound?.generation;
|
|
778
|
+
const hasRound = roundKey !== undefined && generation !== undefined;
|
|
779
|
+
if (hasRound && !roundExists(roundKey, generation)) {
|
|
780
|
+
log.info(`${logPrefix} [stream] round already completed/interrupted; skip late RUN_USAGE/FINISHED`);
|
|
781
|
+
turnForget(roundKey, generation);
|
|
782
|
+
return;
|
|
782
783
|
}
|
|
783
|
-
|
|
784
|
-
|
|
785
|
-
|
|
784
|
+
try {
|
|
785
|
+
const storePath = rt.channel.session.resolveStorePath(cfg.session?.store, {
|
|
786
|
+
agentId: config.agentId || "main",
|
|
787
|
+
});
|
|
788
|
+
const sessionFields = readSessionUsageFields({
|
|
789
|
+
storePath,
|
|
790
|
+
sessionKey: route.sessionKey,
|
|
791
|
+
});
|
|
792
|
+
const usage = buildRunUsageFromSessionEntry(sessionFields, {
|
|
793
|
+
runId: agentRunId ?? terminal.getRunId(),
|
|
794
|
+
});
|
|
795
|
+
if (hasReportableUsage(usage) && usage) {
|
|
796
|
+
await streamClient.streamUsage(toImStreamRunUsageData(usage, {
|
|
797
|
+
groupId: params.groupId,
|
|
798
|
+
replyToMsgId: params.msgId,
|
|
799
|
+
}));
|
|
800
|
+
}
|
|
801
|
+
else {
|
|
802
|
+
log.info(`${logPrefix} [stream] RUN_USAGE skipped (session store has no model/token; ` +
|
|
803
|
+
`sessionKey=${route.sessionKey} deliver_call=${deliverCallCount})`);
|
|
804
|
+
}
|
|
805
|
+
}
|
|
806
|
+
catch (usageErr) {
|
|
807
|
+
log.warn(`${logPrefix} [stream] RUN_USAGE failed: ${String(usageErr)}`);
|
|
786
808
|
}
|
|
787
|
-
}
|
|
788
|
-
catch (usageErr) {
|
|
789
|
-
log.warn(`${logPrefix} [stream] RUN_USAGE failed: ${String(usageErr)}`);
|
|
790
|
-
}
|
|
791
|
-
// ✅ 检查是否有活跃的 subagent，如果有则延迟 FINISHED
|
|
792
|
-
if (activeRound &&
|
|
793
|
-
hasActiveSubagents(activeRound.roundKey, activeRound.generation)) {
|
|
794
|
-
log.info(`${logPrefix} [stream] FINISHED deferred: has active subagents, ` +
|
|
795
|
-
`will be sent by monitor when all complete. reason=${endReason} ` +
|
|
796
|
-
`terminal_state=${terminalState} deliver_invoke=${deliverInvokeCount}`);
|
|
797
|
-
// 记录延迟的 FINISHED，由 subagent-monitor 在所有完成后发送
|
|
798
|
-
deferFinished(activeRound.roundKey, activeRound.generation, endReason);
|
|
799
|
-
}
|
|
800
|
-
else {
|
|
801
|
-
// 没有活跃 subagent，正常发送 FINISHED
|
|
802
809
|
try {
|
|
803
|
-
await streamClient.end(
|
|
810
|
+
await streamClient.end(reason, {
|
|
804
811
|
groupId: params.groupId,
|
|
805
812
|
replyToMsgId: params.msgId,
|
|
806
813
|
});
|
|
807
|
-
log.info(`${logPrefix} [stream] FINISHED sent: reason=${
|
|
814
|
+
log.info(`${logPrefix} [stream] FINISHED sent: reason=${reason} terminal_state=${terminalState} ` +
|
|
808
815
|
`has_first_reply=${hasFirstReply} deliver_invoke=${deliverInvokeCount} ` +
|
|
809
816
|
`deliver_call=${deliverCallCount} skipped=${deliverSkippedCount}`);
|
|
810
817
|
}
|
|
@@ -812,10 +819,51 @@ export async function dispatchMentionedReply(args) {
|
|
|
812
819
|
log.error(`${logPrefix} [stream] FINISHED failed: ${String(endErr)}`);
|
|
813
820
|
}
|
|
814
821
|
finally {
|
|
815
|
-
if (
|
|
816
|
-
|
|
822
|
+
if (hasRound) {
|
|
823
|
+
finalizeRoundMonitoring(roundKey, generation);
|
|
824
|
+
completeActiveRound(roundKey, generation);
|
|
825
|
+
turnForget(roundKey, generation);
|
|
817
826
|
}
|
|
818
827
|
}
|
|
828
|
+
};
|
|
829
|
+
const roundKey = activeRound?.roundKey;
|
|
830
|
+
const generation = activeRound?.generation;
|
|
831
|
+
const sawSubagent = subagentNotificationSent ||
|
|
832
|
+
(roundKey !== undefined && generation !== undefined &&
|
|
833
|
+
turnIsSawSubagent(roundKey, generation));
|
|
834
|
+
if (sawSubagent) {
|
|
835
|
+
turnEnsureRound(roundKey, generation);
|
|
836
|
+
turnOnDispatchReturned(roundKey, generation);
|
|
837
|
+
const deadline = Date.now() + TURN_END_WAIT_MAX_MS;
|
|
838
|
+
log.info(`${logPrefix} [stream] FINISHED deferred: subagent turn, waiting for lifecycle ` +
|
|
839
|
+
`final segment (no premature finish on resume). reason=${endReason} ` +
|
|
840
|
+
`terminal_state=${terminalState} deliver_invoke=${deliverInvokeCount}`);
|
|
841
|
+
const waitStartedAt = Date.now();
|
|
842
|
+
// 等待整轮结束信号（lifecycle 非 yield 终态 / 子任务完成后的静默兜底）；/
|
|
843
|
+
// 若轮次被 `/stop` 或其它收口移除，则由该路径发送过 aborted，这里直接退出。
|
|
844
|
+
while (!turnIsEligible(roundKey, generation)) {
|
|
845
|
+
if (!roundExists(roundKey, generation) || activeRound?.interrupted) {
|
|
846
|
+
log.info(`${logPrefix} [stream] round interrupted while waiting; skip late RUN_USAGE/FINISHED`);
|
|
847
|
+
turnForget(roundKey, generation);
|
|
848
|
+
return;
|
|
849
|
+
}
|
|
850
|
+
if (Date.now() > deadline) {
|
|
851
|
+
log.warn(`${logPrefix} [stream] turn-end wait exceeded ${TURN_END_WAIT_MAX_MS}ms; force finishing`);
|
|
852
|
+
break;
|
|
853
|
+
}
|
|
854
|
+
await new Promise((resolve) => setTimeout(resolve, 250));
|
|
855
|
+
}
|
|
856
|
+
log.info(`${logPrefix} [stream] turn-end released round=${roundKey}#${generation} ` +
|
|
857
|
+
`eligible=${turnIsEligible(roundKey, generation)} waitMs=${Date.now() - waitStartedAt}`);
|
|
858
|
+
await finishWsRound(endReason);
|
|
859
|
+
}
|
|
860
|
+
else {
|
|
861
|
+
// 无子任务的普通轮次：dispatch 返回即整轮结束，立即收尾（保持既有行为）。
|
|
862
|
+
if (roundKey !== undefined && generation !== undefined) {
|
|
863
|
+
turnEnsureRound(roundKey, generation);
|
|
864
|
+
turnOnDispatchReturned(roundKey, generation);
|
|
865
|
+
}
|
|
866
|
+
await finishWsRound(endReason);
|
|
819
867
|
}
|
|
820
868
|
}
|
|
821
869
|
}
|