@xgjktech/xg_cwork_im 1.18.9 → 1.19.1
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 +4 -14
- package/dist/index.js.map +1 -1
- package/dist/src/action-store-lifecycle.test.js +0 -2
- package/dist/src/action-store-lifecycle.test.js.map +1 -1
- package/dist/src/block-streaming-config.test.js.map +1 -1
- package/dist/src/dispatch-mentioned-reply.d.ts +1 -1
- package/dist/src/dispatch-mentioned-reply.d.ts.map +1 -1
- package/dist/src/dispatch-mentioned-reply.js +32 -4
- package/dist/src/dispatch-mentioned-reply.js.map +1 -1
- package/dist/src/inbound-display.js +1 -1
- package/dist/src/inbound-display.js.map +1 -1
- package/dist/src/per-message-model-pending.d.ts +34 -8
- package/dist/src/per-message-model-pending.d.ts.map +1 -1
- package/dist/src/per-message-model-pending.js +84 -16
- package/dist/src/per-message-model-pending.js.map +1 -1
- package/dist/src/plan-core-adapter.d.ts +46 -0
- package/dist/src/plan-core-adapter.d.ts.map +1 -0
- package/dist/src/plan-core-adapter.js +103 -0
- package/dist/src/plan-core-adapter.js.map +1 -0
- package/dist/src/plan-core-adapter.test.d.ts +2 -0
- package/dist/src/plan-core-adapter.test.d.ts.map +1 -0
- package/dist/src/plan-core-adapter.test.js +164 -0
- package/dist/src/plan-core-adapter.test.js.map +1 -0
- package/dist/src/plan-core-db.d.ts +22 -0
- package/dist/src/plan-core-db.d.ts.map +1 -0
- package/dist/src/plan-core-db.js +91 -0
- package/dist/src/plan-core-db.js.map +1 -0
- package/dist/src/plan-core-db.test.d.ts +2 -0
- package/dist/src/plan-core-db.test.d.ts.map +1 -0
- package/dist/src/plan-core-db.test.js +115 -0
- package/dist/src/plan-core-db.test.js.map +1 -0
- package/dist/src/plan-core-snapshot.d.ts +23 -0
- package/dist/src/plan-core-snapshot.d.ts.map +1 -0
- package/dist/src/plan-core-snapshot.js +65 -0
- package/dist/src/plan-core-snapshot.js.map +1 -0
- package/dist/src/plan-core-snapshot.test.d.ts +2 -0
- package/dist/src/plan-core-snapshot.test.d.ts.map +1 -0
- package/dist/src/plan-core-snapshot.test.js +155 -0
- package/dist/src/plan-core-snapshot.test.js.map +1 -0
- package/dist/src/plan-stat-event.d.ts +4 -19
- package/dist/src/plan-stat-event.d.ts.map +1 -1
- package/dist/src/plan-stat-event.js +4 -88
- package/dist/src/plan-stat-event.js.map +1 -1
- package/dist/src/plan-stat-event.test.js +1 -245
- package/dist/src/plan-stat-event.test.js.map +1 -1
- package/dist/src/plan-tool-middleware.d.ts +2 -10
- package/dist/src/plan-tool-middleware.d.ts.map +1 -1
- package/dist/src/plan-tool-middleware.js +11 -60
- package/dist/src/plan-tool-middleware.js.map +1 -1
- package/dist/src/plan-tool-middleware.test.js +83 -603
- package/dist/src/plan-tool-middleware.test.js.map +1 -1
- package/dist/src/plugin-dispose.d.ts +1 -1
- package/dist/src/plugin-dispose.d.ts.map +1 -1
- package/dist/src/plugin-dispose.js +3 -5
- package/dist/src/plugin-dispose.js.map +1 -1
- package/dist/src/register-per-message-model-hook.d.ts +8 -3
- package/dist/src/register-per-message-model-hook.d.ts.map +1 -1
- package/dist/src/register-per-message-model-hook.js +23 -9
- package/dist/src/register-per-message-model-hook.js.map +1 -1
- package/dist/src/register-per-message-model-hook.test.js +144 -27
- package/dist/src/register-per-message-model-hook.test.js.map +1 -1
- package/dist/src/session-model-fallback.d.ts +13 -0
- package/dist/src/session-model-fallback.d.ts.map +1 -0
- package/dist/src/session-model-fallback.js +24 -0
- package/dist/src/session-model-fallback.js.map +1 -0
- package/dist/src/turn-agent-event-subscription.d.ts +1 -1
- package/dist/src/turn-agent-event-subscription.js +1 -1
- package/package.json +9 -5
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import assert from "node:assert/strict";
|
|
2
2
|
import { describe, it, beforeEach } from "node:test";
|
|
3
3
|
import { resetPlanWsRegistryForTest, setPlanWsClient } from "./plan-ws-registry.js";
|
|
4
|
-
import {
|
|
4
|
+
import { sendPlanStat, toWirePlan } from "./plan-stat-event.js";
|
|
5
5
|
function makePlan(overrides = {}) {
|
|
6
6
|
return {
|
|
7
7
|
planId: "plan-1",
|
|
@@ -25,27 +25,6 @@ function makeRecordingClient() {
|
|
|
25
25
|
};
|
|
26
26
|
return { client, calls };
|
|
27
27
|
}
|
|
28
|
-
/** 快照测试固定时钟:新鲜度判定统一以此为准,避免依赖真实 now。 */
|
|
29
|
-
const SNAPSHOT_NOW = Date.parse("2026-07-27T12:00:00.000Z");
|
|
30
|
-
const MIN = 60_000;
|
|
31
|
-
const HOUR = 60 * MIN;
|
|
32
|
-
const DAY = 24 * HOUR;
|
|
33
|
-
/** 相对 SNAPSHOT_NOW 距今 msAgo 毫秒的 ISO 时间。 */
|
|
34
|
-
const ago = (msAgo) => new Date(SNAPSHOT_NOW - msAgo).toISOString();
|
|
35
|
-
function captureWarnLines(fn) {
|
|
36
|
-
const original = console.warn;
|
|
37
|
-
const lines = [];
|
|
38
|
-
console.warn = (...args) => {
|
|
39
|
-
lines.push(args.map(String).join(" "));
|
|
40
|
-
};
|
|
41
|
-
try {
|
|
42
|
-
fn();
|
|
43
|
-
}
|
|
44
|
-
finally {
|
|
45
|
-
console.warn = original;
|
|
46
|
-
}
|
|
47
|
-
return lines;
|
|
48
|
-
}
|
|
49
28
|
beforeEach(() => {
|
|
50
29
|
resetPlanWsRegistryForTest();
|
|
51
30
|
});
|
|
@@ -149,227 +128,4 @@ describe("sendPlanStat: 🔴 fire-and-forget 红线", () => {
|
|
|
149
128
|
assert.equal(result, undefined);
|
|
150
129
|
});
|
|
151
130
|
});
|
|
152
|
-
describe("registerPlanWsClientAndSnapshot: 快照路径", () => {
|
|
153
|
-
it("cancelled 计划不推送,未取消未完成计划照常推送(新鲜计划)", () => {
|
|
154
|
-
const { client, calls } = makeRecordingClient();
|
|
155
|
-
const active = makePlan({
|
|
156
|
-
planId: "plan-active",
|
|
157
|
-
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
158
|
-
createdAt: ago(40 * MIN),
|
|
159
|
-
updatedAt: ago(30 * MIN),
|
|
160
|
-
tasks: [{ title: "继续推进", status: "in_progress" }],
|
|
161
|
-
});
|
|
162
|
-
const cancelled = makePlan({
|
|
163
|
-
planId: "plan-cancelled",
|
|
164
|
-
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
165
|
-
status: "cancelled",
|
|
166
|
-
cancelledAt: ago(1 * MIN),
|
|
167
|
-
tasks: [{ title: "旧阻塞", status: "blocked", note: "不应再推" }],
|
|
168
|
-
});
|
|
169
|
-
const finished = makePlan({
|
|
170
|
-
planId: "plan-finished",
|
|
171
|
-
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
172
|
-
createdAt: ago(20 * MIN),
|
|
173
|
-
updatedAt: ago(20 * MIN),
|
|
174
|
-
tasks: [{ title: "已完成", status: "completed" }],
|
|
175
|
-
});
|
|
176
|
-
registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
|
|
177
|
-
listPlansByOrigin: () => [cancelled, active, finished],
|
|
178
|
-
nowMs: SNAPSHOT_NOW,
|
|
179
|
-
});
|
|
180
|
-
assert.equal(calls.length, 1);
|
|
181
|
-
assert.equal(calls[0].data.plan.planId, active.planId);
|
|
182
|
-
assert.equal(calls[0].data.source, "snapshot");
|
|
183
|
-
});
|
|
184
|
-
it("同群存在 2 份未完成计划时只发最新一份,另输出一行 multi-active 结构化遥测", () => {
|
|
185
|
-
const { client, calls } = makeRecordingClient();
|
|
186
|
-
const older = makePlan({
|
|
187
|
-
planId: "plan-older",
|
|
188
|
-
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
189
|
-
createdAt: ago(7 * DAY),
|
|
190
|
-
updatedAt: ago(2 * HOUR),
|
|
191
|
-
tasks: [{ title: "t1", status: "in_progress" }],
|
|
192
|
-
});
|
|
193
|
-
const newer = makePlan({
|
|
194
|
-
planId: "plan-newer",
|
|
195
|
-
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
196
|
-
createdAt: ago(40 * MIN),
|
|
197
|
-
updatedAt: ago(5 * MIN),
|
|
198
|
-
tasks: [{ title: "t1", status: "blocked", note: "n" }],
|
|
199
|
-
});
|
|
200
|
-
const finished = makePlan({
|
|
201
|
-
planId: "plan-finished",
|
|
202
|
-
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
203
|
-
createdAt: ago(20 * MIN),
|
|
204
|
-
updatedAt: ago(20 * MIN),
|
|
205
|
-
tasks: [{ title: "t1", status: "completed" }],
|
|
206
|
-
});
|
|
207
|
-
const lines = captureWarnLines(() => {
|
|
208
|
-
registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
|
|
209
|
-
listPlansByOrigin: () => [older, newer, finished],
|
|
210
|
-
nowMs: SNAPSHOT_NOW,
|
|
211
|
-
});
|
|
212
|
-
});
|
|
213
|
-
assert.equal(calls.length, 1, "同群多份未完成计划只推最新一份快照");
|
|
214
|
-
assert.equal(calls[0].data.source, "snapshot");
|
|
215
|
-
assert.equal(calls[0].data.plan.planId, newer.planId);
|
|
216
|
-
assert.deepEqual(lines, [
|
|
217
|
-
"[xg_cwork_im] [plan-telemetry] multi-active " + JSON.stringify({
|
|
218
|
-
to: "g-1",
|
|
219
|
-
count: 2,
|
|
220
|
-
planIds: ["plan-older", "plan-newer"],
|
|
221
|
-
}),
|
|
222
|
-
]);
|
|
223
|
-
});
|
|
224
|
-
it("updatedAt 相同/缺失时回退 createdAt 判定最新", () => {
|
|
225
|
-
const { client, calls } = makeRecordingClient();
|
|
226
|
-
const createdEarly = makePlan({
|
|
227
|
-
planId: "plan-created-early",
|
|
228
|
-
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
229
|
-
createdAt: ago(50 * MIN),
|
|
230
|
-
updatedAt: ago(10 * MIN),
|
|
231
|
-
tasks: [{ title: "t1", status: "in_progress" }],
|
|
232
|
-
});
|
|
233
|
-
const createdRecent = makePlan({
|
|
234
|
-
planId: "plan-created-recent",
|
|
235
|
-
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
236
|
-
createdAt: ago(20 * MIN),
|
|
237
|
-
updatedAt: ago(10 * MIN),
|
|
238
|
-
tasks: [{ title: "t1", status: "blocked", note: "n" }],
|
|
239
|
-
});
|
|
240
|
-
const noTimestamp = makePlan({
|
|
241
|
-
planId: "plan-no-ts",
|
|
242
|
-
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
243
|
-
createdAt: undefined,
|
|
244
|
-
updatedAt: undefined,
|
|
245
|
-
tasks: [{ title: "t1", status: "in_progress" }],
|
|
246
|
-
});
|
|
247
|
-
const lines = captureWarnLines(() => {
|
|
248
|
-
registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
|
|
249
|
-
listPlansByOrigin: () => [createdEarly, createdRecent, noTimestamp],
|
|
250
|
-
nowMs: SNAPSHOT_NOW,
|
|
251
|
-
});
|
|
252
|
-
});
|
|
253
|
-
assert.equal(calls.length, 1, "updatedAt 相同则比 createdAt,取更近创建的一份");
|
|
254
|
-
assert.equal(calls[0].data.plan.planId, createdRecent.planId);
|
|
255
|
-
assert.deepEqual(lines, [
|
|
256
|
-
"[xg_cwork_im] [plan-telemetry] multi-active " + JSON.stringify({
|
|
257
|
-
to: "g-1",
|
|
258
|
-
count: 3,
|
|
259
|
-
planIds: ["plan-created-early", "plan-created-recent", "plan-no-ts"],
|
|
260
|
-
}),
|
|
261
|
-
]);
|
|
262
|
-
});
|
|
263
|
-
it("最新一份超过 1 小时未更新 → 视为已失败,快照不发 + stale 遥测", () => {
|
|
264
|
-
const { client, calls } = makeRecordingClient();
|
|
265
|
-
const stale = makePlan({
|
|
266
|
-
planId: "plan-stale",
|
|
267
|
-
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
268
|
-
createdAt: ago(3 * HOUR),
|
|
269
|
-
updatedAt: ago(2 * HOUR),
|
|
270
|
-
tasks: [{ title: "t1", status: "in_progress" }],
|
|
271
|
-
});
|
|
272
|
-
const lines = captureWarnLines(() => {
|
|
273
|
-
registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
|
|
274
|
-
listPlansByOrigin: () => [stale],
|
|
275
|
-
nowMs: SNAPSHOT_NOW,
|
|
276
|
-
});
|
|
277
|
-
});
|
|
278
|
-
assert.equal(calls.length, 0, "过期计划视为失败,快照不推给前端");
|
|
279
|
-
assert.deepEqual(lines, [
|
|
280
|
-
"[xg_cwork_im] [plan-telemetry] stale-plan-dropped " + JSON.stringify({
|
|
281
|
-
to: "g-1",
|
|
282
|
-
planId: "plan-stale",
|
|
283
|
-
updatedAt: stale.updatedAt,
|
|
284
|
-
createdAt: stale.createdAt,
|
|
285
|
-
}),
|
|
286
|
-
]);
|
|
287
|
-
});
|
|
288
|
-
it("恰好 1 小时未更新仍新鲜照常发送;取不到时间戳视为过期不发", () => {
|
|
289
|
-
const { client, calls } = makeRecordingClient();
|
|
290
|
-
const boundary = makePlan({
|
|
291
|
-
planId: "plan-boundary",
|
|
292
|
-
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
293
|
-
createdAt: ago(2 * HOUR),
|
|
294
|
-
updatedAt: ago(HOUR),
|
|
295
|
-
tasks: [{ title: "t1", status: "in_progress" }],
|
|
296
|
-
});
|
|
297
|
-
const noTimestamp = makePlan({
|
|
298
|
-
planId: "plan-no-ts",
|
|
299
|
-
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
300
|
-
createdAt: undefined,
|
|
301
|
-
updatedAt: undefined,
|
|
302
|
-
tasks: [{ title: "t1", status: "in_progress" }],
|
|
303
|
-
});
|
|
304
|
-
const lines = captureWarnLines(() => {
|
|
305
|
-
registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
|
|
306
|
-
listPlansByOrigin: () => [boundary],
|
|
307
|
-
nowMs: SNAPSHOT_NOW,
|
|
308
|
-
});
|
|
309
|
-
registerPlanWsClientAndSnapshot("g-1", client, "msg-2", {
|
|
310
|
-
listPlansByOrigin: () => [noTimestamp],
|
|
311
|
-
nowMs: SNAPSHOT_NOW,
|
|
312
|
-
});
|
|
313
|
-
});
|
|
314
|
-
assert.equal(calls.length, 1);
|
|
315
|
-
assert.equal(calls[0].data.plan.planId, boundary.planId, "恰 1 小时未过期仍发");
|
|
316
|
-
assert.deepEqual(lines, [
|
|
317
|
-
"[xg_cwork_im] [plan-telemetry] stale-plan-dropped " + JSON.stringify({
|
|
318
|
-
to: "g-1",
|
|
319
|
-
planId: "plan-no-ts",
|
|
320
|
-
updatedAt: null,
|
|
321
|
-
createdAt: null,
|
|
322
|
-
}),
|
|
323
|
-
]);
|
|
324
|
-
});
|
|
325
|
-
it("同群只有 1 份或 0 份未完成计划时不输出 multi-active 遥测", () => {
|
|
326
|
-
const { client, calls } = makeRecordingClient();
|
|
327
|
-
const active = makePlan({
|
|
328
|
-
planId: "plan-active",
|
|
329
|
-
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
330
|
-
createdAt: ago(20 * MIN),
|
|
331
|
-
updatedAt: ago(10 * MIN),
|
|
332
|
-
});
|
|
333
|
-
const finished = makePlan({
|
|
334
|
-
planId: "plan-finished",
|
|
335
|
-
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
336
|
-
createdAt: ago(20 * MIN),
|
|
337
|
-
updatedAt: ago(20 * MIN),
|
|
338
|
-
tasks: [{ title: "完成", status: "completed" }],
|
|
339
|
-
});
|
|
340
|
-
const cancelled = makePlan({
|
|
341
|
-
planId: "plan-cancelled",
|
|
342
|
-
origin: { channel: "xg_cwork_im", to: "g-1" },
|
|
343
|
-
status: "cancelled",
|
|
344
|
-
});
|
|
345
|
-
const lines = captureWarnLines(() => {
|
|
346
|
-
registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
|
|
347
|
-
listPlansByOrigin: () => [active, finished, cancelled],
|
|
348
|
-
nowMs: SNAPSHOT_NOW,
|
|
349
|
-
});
|
|
350
|
-
registerPlanWsClientAndSnapshot("g-1", client, "msg-2", {
|
|
351
|
-
listPlansByOrigin: () => [finished, cancelled],
|
|
352
|
-
nowMs: SNAPSHOT_NOW,
|
|
353
|
-
});
|
|
354
|
-
});
|
|
355
|
-
assert.deepEqual(lines, []);
|
|
356
|
-
assert.equal(calls.length, 1, "只发 g-1 唯一一份未完成计划的快照");
|
|
357
|
-
assert.equal(calls[0].data.plan.planId, active.planId);
|
|
358
|
-
});
|
|
359
|
-
it("🔴 反查抛异常 → registerPlanWsClientAndSnapshot 不抛,且登记本身仍然成功", () => {
|
|
360
|
-
const { client, calls } = makeRecordingClient();
|
|
361
|
-
assert.doesNotThrow(() => {
|
|
362
|
-
registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
|
|
363
|
-
listPlansByOrigin: () => {
|
|
364
|
-
throw new Error("db locked");
|
|
365
|
-
},
|
|
366
|
-
});
|
|
367
|
-
});
|
|
368
|
-
assert.equal(calls.length, 0, "反查失败不应发出任何 PLAN_STAT");
|
|
369
|
-
// 登记仍然成功:紧接着用同一 client 发一条正常的 PLAN_STAT 应该能路由到
|
|
370
|
-
const plan = makePlan({ origin: { channel: "xg_cwork_im", to: "g-1" } });
|
|
371
|
-
sendPlanStat({ plan, source: "tool" });
|
|
372
|
-
assert.equal(calls.length, 1, "快照失败不能连累 WS 绑定,后续增量应仍能发出");
|
|
373
|
-
});
|
|
374
|
-
});
|
|
375
131
|
//# sourceMappingURL=plan-stat-event.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-stat-event.test.js","sourceRoot":"","sources":["../../src/plan-stat-event.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"plan-stat-event.test.js","sourceRoot":"","sources":["../../src/plan-stat-event.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +1,16 @@
|
|
|
1
1
|
import type { OpenClawPluginApi } from "openclaw/plugin-sdk/channel-plugin-common";
|
|
2
|
-
import { type Plan } from "@xgjktech/xg-openclaw-shared";
|
|
3
2
|
import type { ActionDispatchEvent } from "./action-store-access.js";
|
|
4
3
|
export type AgentToolResultMiddleware = Parameters<OpenClawPluginApi["registerAgentToolResultMiddleware"]>[0];
|
|
5
4
|
export interface PlanMiddlewareDeps {
|
|
6
|
-
/** 按 planId 反查权威状态(注入 TASK-2 的 getPlanById) */
|
|
7
|
-
getPlanById: (planId: string) => Plan | undefined;
|
|
8
|
-
/** 发送 PLAN_STAT 增量事件(注入实现,便于单测假实现;本身设计为同步返回、内部自行 catch) */
|
|
9
|
-
sendPlanStat: (params: {
|
|
10
|
-
plan: Plan;
|
|
11
|
-
source: "tool" | "snapshot";
|
|
12
|
-
}) => void;
|
|
13
5
|
/** 按 eventId 反查 action 的权威状态。 */
|
|
14
6
|
getActionById: (eventId: string) => ActionDispatchEvent | undefined;
|
|
15
7
|
/** 推送 Action Dispatch 事件(内部 fire-and-forget)。 */
|
|
16
8
|
sendActionRunEvent: (action: ActionDispatchEvent) => void;
|
|
17
9
|
}
|
|
18
10
|
/**
|
|
19
|
-
*
|
|
11
|
+
* 创建 xg_action_dispatch 工具结果的 middleware handler。
|
|
20
12
|
*
|
|
21
|
-
*
|
|
13
|
+
* 三条硬约束(沿用 RULING-1 红线):
|
|
22
14
|
* 1. 绝不抛异常:全身 try/catch,捕获后记 warn 并正常返回。
|
|
23
15
|
* 2. 绝不修改结果:恒返回 void,不 mutate event.result。
|
|
24
16
|
* 3. 不在 handler 内 await 网络 IO。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-tool-middleware.d.ts","sourceRoot":"","sources":["../../src/plan-tool-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,
|
|
1
|
+
{"version":3,"file":"plan-tool-middleware.d.ts","sourceRoot":"","sources":["../../src/plan-tool-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,MAAM,MAAM,yBAAyB,GAAG,UAAU,CAC9C,iBAAiB,CAAC,mCAAmC,CAAC,CACzD,CAAC,CAAC,CAAC,CAAC;AAML,MAAM,WAAW,kBAAkB;IAC/B,iCAAiC;IACjC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,mBAAmB,GAAG,SAAS,CAAC;IACpE,iDAAiD;IACjD,kBAAkB,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,IAAI,CAAC;CAC7D;AA+BD;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,kBAAkB,GAAG,yBAAyB,CAuBlG"}
|
|
@@ -1,9 +1,5 @@
|
|
|
1
|
-
import { isPlanCancelled } from "@xgjktech/xg-openclaw-shared";
|
|
2
|
-
import { buildBlockedTelemetryLine, collectBlockedNotices } from "./plan-blocked-notice.js";
|
|
3
|
-
import { parsePlanToolResultFromValue } from "./plan-tool-result.js";
|
|
4
|
-
const PLAN_TOOL_NAME = "xg_plan_write";
|
|
5
1
|
const ACTION_TOOL_NAME = "xg_action_dispatch";
|
|
6
|
-
const LOG_PREFIX = "[xg_cwork_im] [
|
|
2
|
+
const LOG_PREFIX = "[xg_cwork_im] [action-tool-middleware]";
|
|
7
3
|
function extractActionEventId(event) {
|
|
8
4
|
const values = [event.result.details, safeJsonParse(firstTextContent(event.result) ?? "")];
|
|
9
5
|
for (const value of values) {
|
|
@@ -23,27 +19,6 @@ function firstTextContent(result) {
|
|
|
23
19
|
}
|
|
24
20
|
return first.text;
|
|
25
21
|
}
|
|
26
|
-
/**
|
|
27
|
-
* 从 middleware 事件中取计划工具结果(优先级见 DESIGN.md D1):
|
|
28
|
-
* 1. `event.result.details`(结构守卫,纯对象无需 JSON.parse)
|
|
29
|
-
* 2. 回退解析 `event.result.content[0].text`
|
|
30
|
-
* 都拿不到 → undefined
|
|
31
|
-
*/
|
|
32
|
-
function extractPlanToolResult(event) {
|
|
33
|
-
const fromDetails = parsePlanToolResultFromValue(event.result.details);
|
|
34
|
-
if (fromDetails) {
|
|
35
|
-
return fromDetails;
|
|
36
|
-
}
|
|
37
|
-
const text = firstTextContent(event.result);
|
|
38
|
-
if (text === undefined) {
|
|
39
|
-
return undefined;
|
|
40
|
-
}
|
|
41
|
-
const fromText = parsePlanToolResultFromValue(safeJsonParse(text));
|
|
42
|
-
if (fromText) {
|
|
43
|
-
return fromText;
|
|
44
|
-
}
|
|
45
|
-
return undefined;
|
|
46
|
-
}
|
|
47
22
|
function safeJsonParse(text) {
|
|
48
23
|
try {
|
|
49
24
|
return JSON.parse(text);
|
|
@@ -53,9 +28,9 @@ function safeJsonParse(text) {
|
|
|
53
28
|
}
|
|
54
29
|
}
|
|
55
30
|
/**
|
|
56
|
-
*
|
|
31
|
+
* 创建 xg_action_dispatch 工具结果的 middleware handler。
|
|
57
32
|
*
|
|
58
|
-
*
|
|
33
|
+
* 三条硬约束(沿用 RULING-1 红线):
|
|
59
34
|
* 1. 绝不抛异常:全身 try/catch,捕获后记 warn 并正常返回。
|
|
60
35
|
* 2. 绝不修改结果:恒返回 void,不 mutate event.result。
|
|
61
36
|
* 3. 不在 handler 内 await 网络 IO。
|
|
@@ -63,44 +38,20 @@ function safeJsonParse(text) {
|
|
|
63
38
|
export function createPlanToolResultMiddleware(deps) {
|
|
64
39
|
return (event, _ctx) => {
|
|
65
40
|
try {
|
|
66
|
-
if (event.toolName
|
|
67
|
-
const eventId = extractActionEventId(event);
|
|
68
|
-
if (!eventId) {
|
|
69
|
-
console.warn(`${LOG_PREFIX} 无法从 action 工具返回中解析 eventId toolCallId=${event.toolCallId}`);
|
|
70
|
-
return;
|
|
71
|
-
}
|
|
72
|
-
const action = deps.getActionById(eventId);
|
|
73
|
-
if (!action) {
|
|
74
|
-
console.warn(`${LOG_PREFIX} 反查不到 action,跳过 toolCallId=${event.toolCallId} eventId=${eventId}`);
|
|
75
|
-
return;
|
|
76
|
-
}
|
|
77
|
-
deps.sendActionRunEvent(action);
|
|
41
|
+
if (event.toolName !== ACTION_TOOL_NAME) {
|
|
78
42
|
return;
|
|
79
43
|
}
|
|
80
|
-
|
|
44
|
+
const eventId = extractActionEventId(event);
|
|
45
|
+
if (!eventId) {
|
|
46
|
+
console.warn(`${LOG_PREFIX} 无法从 action 工具返回中解析 eventId toolCallId=${event.toolCallId}`);
|
|
81
47
|
return;
|
|
82
48
|
}
|
|
83
|
-
const
|
|
84
|
-
if (!
|
|
85
|
-
console.warn(`${LOG_PREFIX}
|
|
49
|
+
const action = deps.getActionById(eventId);
|
|
50
|
+
if (!action) {
|
|
51
|
+
console.warn(`${LOG_PREFIX} 反查不到 action,跳过 toolCallId=${event.toolCallId} eventId=${eventId}`);
|
|
86
52
|
return;
|
|
87
53
|
}
|
|
88
|
-
|
|
89
|
-
const plan = authoritative ?? extracted.plan;
|
|
90
|
-
if (!plan) {
|
|
91
|
-
console.warn(`${LOG_PREFIX} 反查不到 plan 且工具返回不含完整 plan,跳过 toolName=${event.toolName} toolCallId=${event.toolCallId} planId=${extracted.planId}`);
|
|
92
|
-
return;
|
|
93
|
-
}
|
|
94
|
-
// D2:每一条 blocked notice 都打一行遥测日志,不做任何去重——
|
|
95
|
-
// 日志重复恰恰是监控需要的频次信号(推群时代的去重是为了防刷屏,已不适用)。
|
|
96
|
-
if (!isPlanCancelled(plan)) {
|
|
97
|
-
for (const notice of collectBlockedNotices(plan)) {
|
|
98
|
-
console.warn(buildBlockedTelemetryLine(plan, notice, event.toolName));
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
// D3:每次 xg_plan_write 成功调用都发一条 PLAN_STAT 增量,不做 diff、不去重。
|
|
102
|
-
// sendPlanStat 本身设计为同步返回、内部自行 catch,天然满足 fire-and-forget。
|
|
103
|
-
deps.sendPlanStat({ plan, source: "tool" });
|
|
54
|
+
deps.sendActionRunEvent(action);
|
|
104
55
|
return;
|
|
105
56
|
}
|
|
106
57
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-tool-middleware.js","sourceRoot":"","sources":["../../src/plan-tool-middleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"plan-tool-middleware.js","sourceRoot":"","sources":["../../src/plan-tool-middleware.ts"],"names":[],"mappings":"AAOA,MAAM,gBAAgB,GAAG,oBAAoB,CAAC;AAE9C,MAAM,UAAU,GAAG,wCAAwC,CAAC;AAS5D,SAAS,oBAAoB,CAAC,KAAwF;IAClH,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC3F,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAG,KAAgC,CAAC;YAChD,IAAI,MAAM,CAAC,EAAE,KAAK,IAAI,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;gBAC3F,OAAO,MAAM,CAAC,OAAO,CAAC;YAC1B,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,gBAAgB,CAAC,MAA2D;IACjF,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAChC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpE,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC;AACtB,CAAC;AAED,SAAS,aAAa,CAAC,IAAY;IAC/B,IAAI,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,SAAS,CAAC;IACrB,CAAC;AACL,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,8BAA8B,CAAC,IAAwB;IACnE,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACnB,IAAI,CAAC;YACD,IAAI,KAAK,CAAC,QAAQ,KAAK,gBAAgB,EAAE,CAAC;gBACtC,OAAO;YACX,CAAC;YACD,MAAM,OAAO,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAC5C,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,0CAA0C,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;gBACxF,OAAO;YACX,CAAC;YACD,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;gBACV,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,8BAA8B,KAAK,CAAC,UAAU,YAAY,OAAO,EAAE,CAAC,CAAC;gBAC/F,OAAO;YACX,CAAC;YACD,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAChC,OAAO;QACX,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,qBAAqB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC9D,OAAO;QACX,CAAC;IACL,CAAC,CAAC;AACN,CAAC"}
|