@xgjktech/xg_cwork_im 1.19.35 → 1.19.37
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 +24 -16
- package/dist/index.js.map +1 -1
- package/dist/src/inbound/dispatch-mentioned-reply.d.ts.map +1 -1
- package/dist/src/inbound/dispatch-mentioned-reply.js +3 -1
- package/dist/src/inbound/dispatch-mentioned-reply.js.map +1 -1
- package/dist/src/plan/plan-core-adapter.d.ts +6 -3
- package/dist/src/plan/plan-core-adapter.d.ts.map +1 -1
- package/dist/src/plan/plan-core-adapter.js +12 -6
- package/dist/src/plan/plan-core-adapter.js.map +1 -1
- package/dist/src/plan/plan-core-adapter.test.js +22 -3
- package/dist/src/plan/plan-core-adapter.test.js.map +1 -1
- package/dist/src/plan/plan-core-db.d.ts.map +1 -1
- package/dist/src/plan/plan-core-db.js +4 -2
- package/dist/src/plan/plan-core-db.js.map +1 -1
- package/dist/src/plan/plan-core-db.test.js +19 -1
- package/dist/src/plan/plan-core-db.test.js.map +1 -1
- package/dist/src/plan/plan-core-snapshot.d.ts.map +1 -1
- package/dist/src/plan/plan-core-snapshot.js +10 -2
- package/dist/src/plan/plan-core-snapshot.js.map +1 -1
- package/dist/src/plan/plan-core-snapshot.test.js +24 -0
- package/dist/src/plan/plan-core-snapshot.test.js.map +1 -1
- package/dist/src/turn/interrupt-round.test.js +23 -17
- package/dist/src/turn/interrupt-round.test.js.map +1 -1
- package/dist/src/turn/subagent-monitor.d.ts +33 -17
- package/dist/src/turn/subagent-monitor.d.ts.map +1 -1
- package/dist/src/turn/subagent-monitor.js +275 -229
- package/dist/src/turn/subagent-monitor.js.map +1 -1
- package/dist/src/turn/subagent-monitor.test.js +111 -26
- package/dist/src/turn/subagent-monitor.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -30,7 +30,7 @@ function seedAgentDb(baseDir, agentId, rows) {
|
|
|
30
30
|
`);
|
|
31
31
|
const insert = db.prepare("INSERT INTO session_progress_cards (session_key, markdown, steps_json, revision, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?);");
|
|
32
32
|
for (const row of rows) {
|
|
33
|
-
insert.run(row.sessionKey, null, row.stepsJson, row.revision ?? 1, row.createdAtMs ?? 1_700_000_000_000, row.updatedAtMs ?? 1_700_000_600_000);
|
|
33
|
+
insert.run(row.sessionKey, row.markdown ?? null, row.stepsJson, row.revision ?? 1, row.createdAtMs ?? 1_700_000_000_000, row.updatedAtMs ?? 1_700_000_600_000);
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
finally {
|
|
@@ -104,6 +104,24 @@ describe("resolveCoreAgentSqlitePath / readCoreProgressCard", () => {
|
|
|
104
104
|
const filtered = readCoreProgressCard({ agentId: "main", sessionKey: "s-filtered" });
|
|
105
105
|
assert.deepEqual(filtered?.steps, [{ step: "keep", status: "pending" }]);
|
|
106
106
|
});
|
|
107
|
+
it("steps 为空但 markdown 非空 → 返回说明卡（steps 空 + markdown）", () => {
|
|
108
|
+
const base = makeTempBase();
|
|
109
|
+
setCoreAgentStateBase(base);
|
|
110
|
+
seedAgentDb(base, "main", [
|
|
111
|
+
{
|
|
112
|
+
sessionKey: "agent:main:note-only",
|
|
113
|
+
stepsJson: null,
|
|
114
|
+
markdown: "正在核对文件",
|
|
115
|
+
revision: 2,
|
|
116
|
+
updatedAtMs: 1_700_000_900_000,
|
|
117
|
+
},
|
|
118
|
+
]);
|
|
119
|
+
const card = readCoreProgressCard({ agentId: "main", sessionKey: "agent:main:note-only" });
|
|
120
|
+
assert.ok(card);
|
|
121
|
+
assert.deepEqual(card.steps, []);
|
|
122
|
+
assert.equal(card.markdown, "正在核对文件");
|
|
123
|
+
assert.equal(card.revision, 2);
|
|
124
|
+
});
|
|
107
125
|
it("行/库不存在 → undefined；库文件不存在 → undefined 不外抛", () => {
|
|
108
126
|
const base = makeTempBase();
|
|
109
127
|
setCoreAgentStateBase(base);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-core-db.test.js","sourceRoot":"","sources":["../../../src/plan/plan-core-db.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EACH,oBAAoB,EACpB,0BAA0B,EAC1B,qBAAqB,GACxB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,QAAQ,GAAa,EAAE,CAAC;AAE9B,SAAS,YAAY;IACjB,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAC5D,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,GAAG,CAAC;AACf,CAAC;AAED,2DAA2D;AAC3D,SAAS,WAAW,CAAC,OAAe,EAAE,OAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"plan-core-db.test.js","sourceRoot":"","sources":["../../../src/plan/plan-core-db.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-core-snapshot.d.ts","sourceRoot":"","sources":["../../../src/plan/plan-core-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAwB,KAAK,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"plan-core-snapshot.d.ts","sourceRoot":"","sources":["../../../src/plan/plan-core-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAwB,KAAK,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAuBtF,+DAA+D;AAC/D,wBAAgB,qBAAqB,CAAC,MAAM,EAAE;IAC1C,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,sBAAsB,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,IAAI,GAAG,SAAS,CAYnB;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,cAAc,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,IAAI,CAqCP"}
|
|
@@ -5,9 +5,17 @@ import { setPlanWsClient } from "./plan-ws-registry.js";
|
|
|
5
5
|
const LOG_PREFIX = "[xg_cwork_im] [plan-core-snapshot]";
|
|
6
6
|
/** 快照新鲜度阈值：core 卡超过 1 小时未更新，视为已失败/过期，快照不再推给前端。 */
|
|
7
7
|
const CORE_PLAN_SNAPSHOT_STALE_MS = 60 * 60 * 1_000;
|
|
8
|
-
/**
|
|
8
|
+
/**
|
|
9
|
+
* 「未完成」判定：
|
|
10
|
+
* - 存在 status !== "completed" 的步骤；或
|
|
11
|
+
* - 无步骤但有 markdown（「说明卡」，需随快照恢复展示）。
|
|
12
|
+
* 空 steps 且无 markdown 的卡已被读取层过滤。
|
|
13
|
+
*/
|
|
9
14
|
function isUnfinished(card) {
|
|
10
|
-
|
|
15
|
+
if (card.steps.some((step) => step.status !== "completed")) {
|
|
16
|
+
return true;
|
|
17
|
+
}
|
|
18
|
+
return card.steps.length === 0 && Boolean(card.markdown?.trim());
|
|
11
19
|
}
|
|
12
20
|
/** 由 core 落库卡合成 Plan（source:"snapshot"）；任何失败静默返回 undefined。 */
|
|
13
21
|
export function buildPlanFromCoreCard(params) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-core-snapshot.js","sourceRoot":"","sources":["../../../src/plan/plan-core-snapshot.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAA+B,MAAM,mBAAmB,CAAC;AACtF,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,UAAU,GAAG,oCAAoC,CAAC;AAExD,kDAAkD;AAClD,MAAM,2BAA2B,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;AAEpD
|
|
1
|
+
{"version":3,"file":"plan-core-snapshot.js","sourceRoot":"","sources":["../../../src/plan/plan-core-snapshot.ts"],"names":[],"mappings":"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"}
|
|
@@ -139,6 +139,30 @@ describe("registerCorePlanSnapshotClient", () => {
|
|
|
139
139
|
});
|
|
140
140
|
assert.equal(calls.length, 0);
|
|
141
141
|
});
|
|
142
|
+
it("无 steps 但 markdown 的「说明卡」→ 快照发送（tasks 空 + markdown）", () => {
|
|
143
|
+
const base = makeTempBase();
|
|
144
|
+
setCoreAgentStateBase(base);
|
|
145
|
+
const sessionKey = "agent:main:s-1";
|
|
146
|
+
seedCard(base, "main", sessionKey, {
|
|
147
|
+
stepsJson: null,
|
|
148
|
+
markdown: "正在核对文件",
|
|
149
|
+
updatedAtMs: NOW - 5 * 60_000,
|
|
150
|
+
});
|
|
151
|
+
const { client, calls } = makeRecordingClient();
|
|
152
|
+
registerCorePlanSnapshotClient({
|
|
153
|
+
groupId: "g-1",
|
|
154
|
+
client,
|
|
155
|
+
replyToMsgId: "msg-1",
|
|
156
|
+
agentId: "main",
|
|
157
|
+
sessionKey,
|
|
158
|
+
nowMs: NOW,
|
|
159
|
+
});
|
|
160
|
+
assert.equal(calls.length, 1);
|
|
161
|
+
const plan = calls[0].data.plan;
|
|
162
|
+
assert.equal(calls[0].data.source, "snapshot");
|
|
163
|
+
assert.deepEqual(plan.tasks, []);
|
|
164
|
+
assert.equal(plan.markdown, "正在核对文件");
|
|
165
|
+
});
|
|
142
166
|
it("core 无卡 / 库不存在 → 登记成功但不发，不外抛", () => {
|
|
143
167
|
const base = makeTempBase();
|
|
144
168
|
setCoreAgentStateBase(base);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-core-snapshot.test.js","sourceRoot":"","sources":["../../../src/plan/plan-core-snapshot.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"plan-core-snapshot.test.js","sourceRoot":"","sources":["../../../src/plan/plan-core-snapshot.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AAG3D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAEnE,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;AACnD,MAAM,IAAI,GAAG,EAAE,GAAG,MAAM,CAAC;AAEzB,MAAM,QAAQ,GAAa,EAAE,CAAC;AAE9B,SAAS,YAAY;IACjB,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAClE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,GAAG,CAAC;AACf,CAAC;AAED,SAAS,QAAQ,CAAC,OAAe,EAAE,OAAe,EAAE,UAAkB,EAAE,IAKvE;IACG,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3D,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACzC,MAAM,EAAE,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC,CAAC;IACrE,IAAI,CAAC;QACD,EAAE,CAAC,IAAI,CAAC;;;;;;;;;SASP,CAAC,CAAC;QACH,EAAE,CAAC,OAAO,CACN,qIAAqI,CACxI,CAAC,GAAG,CACD,UAAU,EACV,IAAI,CAAC,QAAQ,IAAI,IAAI,EACrB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,WAAW,IAAI,GAAG,GAAG,IAAI,EAC9B,IAAI,CAAC,WAAW,IAAI,GAAG,GAAG,CAAC,GAAG,MAAM,CACvC,CAAC;IACN,CAAC;YAAS,CAAC;QACP,EAAE,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB;IACxB,MAAM,KAAK,GAA4B,EAAE,CAAC;IAC1C,MAAM,MAAM,GAAmB;QAC3B,KAAK,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;QACtB,cAAc,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;QAC/B,WAAW,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;QAC5B,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACtB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;QACD,GAAG,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;KACvB,CAAC;IACF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAC7B,CAAC;AAED,KAAK,CAAC,GAAG,EAAE;IACP,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,IAAI,CAAC;YACD,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAClD,CAAC;QAAC,MAAM,CAAC;YACL,2BAA2B;QAC/B,CAAC;IACL,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,SAAS,CAAC,GAAG,EAAE;IACX,0BAA0B,EAAE,CAAC;IAC7B,qBAAqB,CAAC,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,gCAAgC,EAAE,GAAG,EAAE;IAC5C,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAChD,MAAM,IAAI,GAAG,YAAY,EAAE,CAAC;QAC5B,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,UAAU,GAAG,gBAAgB,CAAC;QACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE;YAC/B,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;gBACtB,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE;gBACnC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE;aACxC,CAAC;YACF,QAAQ,EAAE,UAAU;YACpB,WAAW,EAAE,GAAG,GAAG,IAAI;YACvB,WAAW,EAAE,GAAG,GAAG,CAAC,GAAG,MAAM;SAChC,CAAC,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAEhD,8BAA8B,CAAC;YAC3B,OAAO,EAAE,KAAK;YACd,MAAM;YACN,YAAY,EAAE,OAAO;YACrB,OAAO,EAAE,MAAM;YACf,UAAU;YACV,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAoC,CAAC;QAC5D,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;QACvD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QACjE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,IAAI,CAAC,GAAG,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QACvE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QACxC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE;YACzB,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE;YACpC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE;SACzC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE;QAC3B,MAAM,IAAI,GAAG,YAAY,EAAE,CAAC;QAC5B,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,UAAU,GAAG,gBAAgB,CAAC;QACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE;YAC/B,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;YACjE,WAAW,EAAE,GAAG,GAAG,CAAC,GAAG,IAAI;SAC9B,CAAC,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAEhD,8BAA8B,CAAC;YAC3B,OAAO,EAAE,KAAK;YACd,MAAM;YACN,YAAY,EAAE,OAAO;YACrB,OAAO,EAAE,MAAM;YACf,UAAU;YACV,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACzB,MAAM,IAAI,GAAG,YAAY,EAAE,CAAC;QAC5B,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,UAAU,GAAG,gBAAgB,CAAC;QACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE;YAC/B,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;YAC/D,WAAW,EAAE,GAAG,GAAG,CAAC,GAAG,MAAM;SAChC,CAAC,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAEhD,8BAA8B,CAAC;YAC3B,OAAO,EAAE,KAAK;YACd,MAAM;YACN,YAAY,EAAE,OAAO;YACrB,OAAO,EAAE,MAAM;YACf,UAAU;YACV,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC3D,MAAM,IAAI,GAAG,YAAY,EAAE,CAAC;QAC5B,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,UAAU,GAAG,gBAAgB,CAAC;QACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE;YAC/B,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,QAAQ;YAClB,WAAW,EAAE,GAAG,GAAG,CAAC,GAAG,MAAM;SAChC,CAAC,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAEhD,8BAA8B,CAAC;YAC3B,OAAO,EAAE,KAAK;YACd,MAAM;YACN,YAAY,EAAE,OAAO;YACrB,OAAO,EAAE,MAAM;YACf,UAAU;YACV,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAoC,CAAC;QAChE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC/C,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACjC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACpC,MAAM,IAAI,GAAG,YAAY,EAAE,CAAC;QAC5B,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAChD,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CACrB,8BAA8B,CAAC;YAC3B,OAAO,EAAE,KAAK;YACd,MAAM;YACN,YAAY,EAAE,OAAO;YACrB,OAAO,EAAE,MAAM;YACf,UAAU,EAAE,iBAAiB;YAC7B,KAAK,EAAE,GAAG;SACb,CAAC,CACL,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -2,7 +2,7 @@ import assert from "node:assert/strict";
|
|
|
2
2
|
import { afterEach, describe, it } from "node:test";
|
|
3
3
|
import { __resetActiveRoundRegistryForTests, prepareActiveRoundInterrupt, registerActiveRound, } from "./active-round-registry.js";
|
|
4
4
|
import { finalizeRoundInterrupt, prepareRoundInterrupt } from "./interrupt-round.js";
|
|
5
|
-
import { __resetSubagentMonitorForTests, markSubagentCompleted,
|
|
5
|
+
import { __resetSubagentMonitorForTests, markSubagentCompleted, registerSubagent, } from "./subagent-monitor.js";
|
|
6
6
|
import { getSessionImContext, setSessionImContext } from "../session/session-im-context.js";
|
|
7
7
|
afterEach(() => {
|
|
8
8
|
__resetSubagentMonitorForTests();
|
|
@@ -34,14 +34,16 @@ describe("round interrupt", () => {
|
|
|
34
34
|
replyToMsgId: "reply-1",
|
|
35
35
|
streamClient: createClient(events),
|
|
36
36
|
});
|
|
37
|
-
assert.equal(
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
assert.equal(registerSubagent({
|
|
38
|
+
childSessionKey: "child-1",
|
|
39
|
+
runId: "run-1",
|
|
40
|
+
label: "子任务",
|
|
40
41
|
groupId: round.groupId,
|
|
41
42
|
agentId: round.agentId,
|
|
42
43
|
streamClient: round.streamClient,
|
|
43
44
|
replyToMsgId: round.replyToMsgId,
|
|
44
|
-
|
|
45
|
+
roundKey: round.roundKey,
|
|
46
|
+
generation: round.generation,
|
|
45
47
|
}), true);
|
|
46
48
|
events.length = 0;
|
|
47
49
|
setSessionImContext(round.sessionKey, {
|
|
@@ -53,14 +55,15 @@ describe("round interrupt", () => {
|
|
|
53
55
|
assert.ok(prepared);
|
|
54
56
|
assert.equal(getSessionImContext(round.sessionKey), undefined);
|
|
55
57
|
assert.equal(prepared.subagents[0]?.status, "suspended");
|
|
56
|
-
assert.equal(
|
|
57
|
-
|
|
58
|
-
|
|
58
|
+
assert.equal(registerSubagent({
|
|
59
|
+
childSessionKey: "child-late",
|
|
60
|
+
runId: "run-late",
|
|
59
61
|
groupId: round.groupId,
|
|
60
62
|
agentId: round.agentId,
|
|
61
63
|
streamClient: round.streamClient,
|
|
62
64
|
replyToMsgId: round.replyToMsgId,
|
|
63
|
-
|
|
65
|
+
roundKey: round.roundKey,
|
|
66
|
+
generation: round.generation,
|
|
64
67
|
}), false);
|
|
65
68
|
markSubagentCompleted("child-1", "run-1");
|
|
66
69
|
await finalizeRoundInterrupt(prepared);
|
|
@@ -77,14 +80,15 @@ describe("round interrupt", () => {
|
|
|
77
80
|
replyToMsgId: "reply-1",
|
|
78
81
|
streamClient: createClient(events, true),
|
|
79
82
|
});
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
+
registerSubagent({
|
|
84
|
+
childSessionKey: "child-1",
|
|
85
|
+
runId: "run-1",
|
|
83
86
|
groupId: round.groupId,
|
|
84
87
|
agentId: round.agentId,
|
|
85
88
|
streamClient: round.streamClient,
|
|
86
89
|
replyToMsgId: round.replyToMsgId,
|
|
87
|
-
|
|
90
|
+
roundKey: round.roundKey,
|
|
91
|
+
generation: round.generation,
|
|
88
92
|
});
|
|
89
93
|
events.length = 0;
|
|
90
94
|
const prepared = prepareRoundInterrupt("account-a", "group-1");
|
|
@@ -112,13 +116,15 @@ describe("round interrupt", () => {
|
|
|
112
116
|
streamClient: client,
|
|
113
117
|
replyToMsgId: round.replyToMsgId,
|
|
114
118
|
};
|
|
115
|
-
|
|
119
|
+
registerSubagent({
|
|
116
120
|
...common,
|
|
117
|
-
|
|
121
|
+
childSessionKey: "child-complete",
|
|
122
|
+
runId: "run-complete",
|
|
118
123
|
});
|
|
119
|
-
|
|
124
|
+
registerSubagent({
|
|
120
125
|
...common,
|
|
121
|
-
|
|
126
|
+
childSessionKey: "child-running",
|
|
127
|
+
runId: "run-running",
|
|
122
128
|
});
|
|
123
129
|
markSubagentCompleted("child-complete", "run-complete");
|
|
124
130
|
await new Promise((resolve) => setImmediate(resolve));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interrupt-round.test.js","sourceRoot":"","sources":["../../../src/turn/interrupt-round.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AAEpD,OAAO,EACH,kCAAkC,EAClC,2BAA2B,EAC3B,mBAAmB,GACtB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AACrF,OAAO,EACH,8BAA8B,EAC9B,qBAAqB,EACrB,
|
|
1
|
+
{"version":3,"file":"interrupt-round.test.js","sourceRoot":"","sources":["../../../src/turn/interrupt-round.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AAEpD,OAAO,EACH,kCAAkC,EAClC,2BAA2B,EAC3B,mBAAmB,GACtB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AACrF,OAAO,EACH,8BAA8B,EAC9B,qBAAqB,EACrB,gBAAgB,GACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAE5F,SAAS,CAAC,GAAG,EAAE;IACX,8BAA8B,EAAE,CAAC;IACjC,kCAAkC,EAAE,CAAC;AACzC,CAAC,CAAC,CAAC;AAEH,SAAS,YAAY,CAAC,MAAgB,EAAE,aAAa,GAAG,KAAK;IACzD,OAAO;QACH,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS;QAC5B,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS;QACrC,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS;QAClC,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACvB,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,IAAI,MAAM,CAAE,KAAK,CAAC,IAAI,CAAC,YAA0C,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;YAC3G,IAAI,aAAa;gBAAE,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;QACtD,CAAC;QACD,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YAClB,MAAM,CAAC,IAAI,CAAC,YAAY,MAAM,EAAE,CAAC,CAAC;QACtC,CAAC;KACJ,CAAC;AACN,CAAC;AAED,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;QACjE,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,mBAAmB,CAAC;YAC9B,SAAS,EAAE,WAAW;YACtB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,MAAM;YACf,UAAU,EAAE,WAAW;YACvB,YAAY,EAAE,SAAS;YACvB,YAAY,EAAE,YAAY,CAAC,MAAM,CAAC;SACrC,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CACR,gBAAgB,CAAC;YACb,eAAe,EAAE,SAAS;YAC1B,KAAK,EAAE,OAAO;YACd,KAAK,EAAE,KAAK;YACZ,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,UAAU,EAAE,KAAK,CAAC,UAAU;SAC/B,CAAC,EACF,IAAI,CACP,CAAC;QACF,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAClB,mBAAmB,CAAC,KAAK,CAAC,UAAU,EAAE;YAClC,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,OAAO,EAAE,KAAK,CAAC,OAAO;SACzB,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,qBAAqB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QAC/D,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QACpB,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC,CAAC;QAC/D,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;QACzD,MAAM,CAAC,KAAK,CACR,gBAAgB,CAAC;YACb,eAAe,EAAE,YAAY;YAC7B,KAAK,EAAE,UAAU;YACjB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,UAAU,EAAE,KAAK,CAAC,UAAU;SAC/B,CAAC,EACF,KAAK,CACR,CAAC;QACF,qBAAqB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAE1C,MAAM,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QACvC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,yBAAyB,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAC1E,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,mBAAmB,CAAC;YAC9B,SAAS,EAAE,WAAW;YACtB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,MAAM;YACf,UAAU,EAAE,WAAW;YACvB,YAAY,EAAE,SAAS;YACvB,YAAY,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC;SAC3C,CAAC,CAAC;QACH,gBAAgB,CAAC;YACb,eAAe,EAAE,SAAS;YAC1B,KAAK,EAAE,OAAO;YACd,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,UAAU,EAAE,KAAK,CAAC,UAAU;SAC/B,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAElB,MAAM,QAAQ,GAAG,qBAAqB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QAC/D,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QACpB,MAAM,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QAEvC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,yBAAyB,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAC1E,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,KAAK,GAAG,mBAAmB,CAAC;YAC9B,SAAS,EAAE,WAAW;YACtB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,MAAM;YACf,UAAU,EAAE,WAAW;YACvB,YAAY,EAAE,SAAS;YACvB,YAAY,EAAE,MAAM;SACvB,CAAC,CAAC;QACH,MAAM,MAAM,GAAG;YACX,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,YAAY,EAAE,MAAM;YACpB,YAAY,EAAE,KAAK,CAAC,YAAY;SACnC,CAAC;QACF,gBAAgB,CAAC;YACb,GAAG,MAAM;YACT,eAAe,EAAE,gBAAgB;YACjC,KAAK,EAAE,cAAc;SACxB,CAAC,CAAC;QACH,gBAAgB,CAAC;YACb,GAAG,MAAM;YACT,eAAe,EAAE,eAAe;YAChC,KAAK,EAAE,aAAa;SACvB,CAAC,CAAC;QACH,qBAAqB,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;QACxD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QAE5D,MAAM,QAAQ,GAAG,qBAAqB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QAC/D,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QACpB,MAAM,CAAC,SAAS,CACZ,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,EAClE;YACI,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE;YAC9C,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE;SAChD,CACJ,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1,10 +1,17 @@
|
|
|
1
1
|
import type { OpenClawPluginApi } from "openclaw/plugin-sdk/channel-plugin-common";
|
|
2
2
|
import type { ImStreamClient } from "../connection/connection.js";
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
3
|
+
/**
|
|
4
|
+
* 子任务实时状态（SUBAGENT_STAT）发送与轮次解耦：
|
|
5
|
+
*
|
|
6
|
+
* - 发送目标按 `childSessionKey` 独立登记（`SubagentTarget`），自带 groupId / 锚点 /
|
|
7
|
+
* streamClient；spawn 即发 running，结束即发 completed，**不依赖轮次存活**。
|
|
8
|
+
* - 轮次（roundKey/generation）只是「可选归属」，仅用于：
|
|
9
|
+
* * `/stop` 时定位并挂起该轮仍在跑的子任务（`prepareSubagentInterrupt`）；
|
|
10
|
+
* * 整轮 `activeChildren` 对账（`turnOnAllChildrenDone`）。
|
|
11
|
+
* 轮次收尾（`finalizeRoundMonitoring`）绝不销毁仍在跑的目标——迟到完成仍能补发。
|
|
12
|
+
* - `replyToMsgId` 取触发父 run 的原生消息 id（`requester.messageId`），拿不到时回退到
|
|
13
|
+
* 该会话最近一次已知锚点（`noteSubagentGroupAnchor`）。
|
|
14
|
+
*/
|
|
8
15
|
export interface InterruptedSubagent {
|
|
9
16
|
runId: string;
|
|
10
17
|
label: string;
|
|
@@ -13,14 +20,23 @@ export interface InterruptedSubagent {
|
|
|
13
20
|
}
|
|
14
21
|
export declare function setPluginApi(api: OpenClawPluginApi): void;
|
|
15
22
|
export declare function getSubagentMonitorInstanceId(): string;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
23
|
+
/** 记录该会话最近一次消息锚点，供拿不到 `requester.messageId` 时兜底。 */
|
|
24
|
+
export declare function noteSubagentGroupAnchor(groupId: string, anchor: string): void;
|
|
25
|
+
/**
|
|
26
|
+
* 登记一个子任务的发送目标并立即推送 running。
|
|
27
|
+
*
|
|
28
|
+
* 不要求存在活跃轮次：`roundKey`/`generation` 缺省时仅做发送与对账，不参与整轮计数。
|
|
29
|
+
*/
|
|
30
|
+
export declare function registerSubagent(params: {
|
|
31
|
+
childSessionKey: string;
|
|
32
|
+
runId: string;
|
|
33
|
+
label?: string;
|
|
20
34
|
agentId: string;
|
|
35
|
+
groupId: string;
|
|
36
|
+
replyToMsgId?: string;
|
|
21
37
|
streamClient: ImStreamClient;
|
|
22
|
-
|
|
23
|
-
|
|
38
|
+
roundKey?: string;
|
|
39
|
+
generation?: number;
|
|
24
40
|
}): boolean;
|
|
25
41
|
export declare function hasActiveSubagents(roundKey: string, generation: number): boolean;
|
|
26
42
|
/** 子任务结束事件定位其所属轮次（供 turn-end-controller 递减活跃子任务数）。 */
|
|
@@ -29,17 +45,17 @@ export declare function findChildRoundIndex(childSessionKey: string): {
|
|
|
29
45
|
generation: number;
|
|
30
46
|
runId: string;
|
|
31
47
|
} | undefined;
|
|
32
|
-
export declare function deferFinished(roundKey: string, generation: number, reason: string): void;
|
|
33
|
-
export declare function prepareSubagentInterrupt(roundKey: string, generation: number, now?: number): InterruptedSubagent[];
|
|
34
|
-
export declare function markSubagentCompleted(childSessionKey: string, runId?: string): void;
|
|
35
48
|
/**
|
|
36
|
-
*
|
|
37
|
-
*
|
|
49
|
+
* 整轮收尾（dispatch wrapper finally）调用。
|
|
50
|
+
*
|
|
51
|
+
* 与旧实现不同：**不销毁仍在跑的目标**——仅解除其轮次归属（保留 groupId/锚点/client），
|
|
52
|
+
* 迟到完成仍能补发 completed；已完成的同类目标顺带回收。
|
|
38
53
|
*/
|
|
39
54
|
export declare function finalizeRoundMonitoring(roundKey: string, generation: number): void;
|
|
55
|
+
export declare function prepareSubagentInterrupt(roundKey: string, generation: number, now?: number): InterruptedSubagent[];
|
|
56
|
+
export declare function markSubagentCompleted(childSessionKey: string, runId?: string): void;
|
|
40
57
|
export declare function __tickForTests(): Promise<void>;
|
|
41
58
|
export declare function __resetSubagentMonitorForTests(): void;
|
|
42
59
|
/** 插件卸载/重载时停掉 subagent-monitor 的全部轮询与状态，避免旧实例 ticker 泄漏。 */
|
|
43
60
|
export declare function disposeSubagentMonitor(): void;
|
|
44
|
-
export {};
|
|
45
61
|
//# sourceMappingURL=subagent-monitor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-monitor.d.ts","sourceRoot":"","sources":["../../../src/turn/subagent-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAGnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE
|
|
1
|
+
{"version":3,"file":"subagent-monitor.d.ts","sourceRoot":"","sources":["../../../src/turn/subagent-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAGnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE;;;;;;;;;;;GAWG;AAEH,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;AAwED,wBAAgB,YAAY,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAsCzD;AA+CD,wBAAgB,4BAA4B,IAAI,MAAM,CAErD;AAED,oDAAoD;AACpD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAK7E;AAuDD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE;IACrC,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAkEV;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAKhF;AAED,sDAAsD;AACtD,wBAAgB,mBAAmB,CAC/B,eAAe,EAAE,MAAM,GACxB;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAIrE;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAWlF;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,CA8BnF;AAuND,wBAAgB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAE9C;AAED,wBAAgB,8BAA8B,IAAI,IAAI,CAErD;AAED,4DAA4D;AAC5D,wBAAgB,sBAAsB,IAAI,IAAI,CAU7C"}
|