@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
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
import assert from "node:assert/strict";
|
|
2
|
+
import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
|
|
3
|
+
import { tmpdir } from "node:os";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
import { DatabaseSync } from "node:sqlite";
|
|
6
|
+
import { after, afterEach, describe, it } from "node:test";
|
|
7
|
+
import { readCoreProgressCard, resolveCoreAgentSqlitePath, setCoreAgentStateBase, } from "./plan-core-db.js";
|
|
8
|
+
const tempDirs = [];
|
|
9
|
+
function makeTempBase() {
|
|
10
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-plan-core-db-"));
|
|
11
|
+
tempDirs.push(dir);
|
|
12
|
+
return dir;
|
|
13
|
+
}
|
|
14
|
+
/** 造一个带 session_progress_cards 的 openclaw-agent.sqlite。 */
|
|
15
|
+
function seedAgentDb(baseDir, agentId, rows) {
|
|
16
|
+
const agentDir = join(baseDir, "agents", agentId, "agent");
|
|
17
|
+
mkdirSync(agentDir, { recursive: true });
|
|
18
|
+
const dbPath = join(agentDir, "openclaw-agent.sqlite");
|
|
19
|
+
const db = new DatabaseSync(dbPath);
|
|
20
|
+
try {
|
|
21
|
+
db.exec(`
|
|
22
|
+
CREATE TABLE session_progress_cards (
|
|
23
|
+
session_key TEXT NOT NULL PRIMARY KEY,
|
|
24
|
+
markdown TEXT,
|
|
25
|
+
steps_json TEXT,
|
|
26
|
+
revision INTEGER NOT NULL,
|
|
27
|
+
created_at INTEGER NOT NULL,
|
|
28
|
+
updated_at INTEGER NOT NULL
|
|
29
|
+
) STRICT;
|
|
30
|
+
`);
|
|
31
|
+
const insert = db.prepare("INSERT INTO session_progress_cards (session_key, markdown, steps_json, revision, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?);");
|
|
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);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
finally {
|
|
37
|
+
db.close();
|
|
38
|
+
}
|
|
39
|
+
return dbPath;
|
|
40
|
+
}
|
|
41
|
+
after(() => {
|
|
42
|
+
for (const dir of tempDirs.splice(0)) {
|
|
43
|
+
try {
|
|
44
|
+
rmSync(dir, { recursive: true, force: true });
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
// Windows 偶发句柄未释放导致删除失败,忽略
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
});
|
|
51
|
+
afterEach(() => {
|
|
52
|
+
// 避免 module 级 base 残留影响后续用例
|
|
53
|
+
setCoreAgentStateBase("");
|
|
54
|
+
});
|
|
55
|
+
describe("resolveCoreAgentSqlitePath / readCoreProgressCard", () => {
|
|
56
|
+
it("未注入 base → 路径与读取均为 undefined,不外抛", () => {
|
|
57
|
+
setCoreAgentStateBase("");
|
|
58
|
+
assert.equal(resolveCoreAgentSqlitePath("main"), undefined);
|
|
59
|
+
assert.equal(readCoreProgressCard({ agentId: "main", sessionKey: "s-1" }), undefined);
|
|
60
|
+
});
|
|
61
|
+
it("读取到 typed steps 与时间戳/revision", () => {
|
|
62
|
+
const base = makeTempBase();
|
|
63
|
+
setCoreAgentStateBase(base);
|
|
64
|
+
seedAgentDb(base, "main", [
|
|
65
|
+
{
|
|
66
|
+
sessionKey: "agent:main:s-1",
|
|
67
|
+
stepsJson: JSON.stringify([
|
|
68
|
+
{ step: "备份", status: "completed" },
|
|
69
|
+
{ step: "校验", status: "in_progress" },
|
|
70
|
+
]),
|
|
71
|
+
revision: 3,
|
|
72
|
+
createdAtMs: 1_700_000_000_000,
|
|
73
|
+
updatedAtMs: 1_700_000_900_000,
|
|
74
|
+
},
|
|
75
|
+
]);
|
|
76
|
+
const card = readCoreProgressCard({ agentId: "main", sessionKey: "agent:main:s-1" });
|
|
77
|
+
assert.ok(card);
|
|
78
|
+
assert.deepEqual(card.steps, [
|
|
79
|
+
{ step: "备份", status: "completed" },
|
|
80
|
+
{ step: "校验", status: "in_progress" },
|
|
81
|
+
]);
|
|
82
|
+
assert.equal(card.revision, 3);
|
|
83
|
+
assert.equal(card.createdAtMs, 1_700_000_000_000);
|
|
84
|
+
assert.equal(card.updatedAtMs, 1_700_000_900_000);
|
|
85
|
+
});
|
|
86
|
+
it("steps_json 为 null → undefined;非法 JSON → undefined;非法步骤被过滤", () => {
|
|
87
|
+
const base = makeTempBase();
|
|
88
|
+
setCoreAgentStateBase(base);
|
|
89
|
+
seedAgentDb(base, "main", [
|
|
90
|
+
{ sessionKey: "s-empty", stepsJson: null },
|
|
91
|
+
{ sessionKey: "s-bad-json", stepsJson: "{not json" },
|
|
92
|
+
{
|
|
93
|
+
sessionKey: "s-filtered",
|
|
94
|
+
stepsJson: JSON.stringify([
|
|
95
|
+
{ step: "keep", status: "pending" },
|
|
96
|
+
{ step: "", status: "pending" },
|
|
97
|
+
{ status: "completed" },
|
|
98
|
+
{ step: "bad-status", status: "blocked" },
|
|
99
|
+
]),
|
|
100
|
+
},
|
|
101
|
+
]);
|
|
102
|
+
assert.equal(readCoreProgressCard({ agentId: "main", sessionKey: "s-empty" }), undefined);
|
|
103
|
+
assert.equal(readCoreProgressCard({ agentId: "main", sessionKey: "s-bad-json" }), undefined);
|
|
104
|
+
const filtered = readCoreProgressCard({ agentId: "main", sessionKey: "s-filtered" });
|
|
105
|
+
assert.deepEqual(filtered?.steps, [{ step: "keep", status: "pending" }]);
|
|
106
|
+
});
|
|
107
|
+
it("行/库不存在 → undefined;库文件不存在 → undefined 不外抛", () => {
|
|
108
|
+
const base = makeTempBase();
|
|
109
|
+
setCoreAgentStateBase(base);
|
|
110
|
+
assert.equal(readCoreProgressCard({ agentId: "missing-agent", sessionKey: "s-1" }), undefined);
|
|
111
|
+
seedAgentDb(base, "main", [{ sessionKey: "s-1", stepsJson: "[]" }]);
|
|
112
|
+
assert.equal(readCoreProgressCard({ agentId: "main", sessionKey: "s-not-exist" }), undefined);
|
|
113
|
+
});
|
|
114
|
+
});
|
|
115
|
+
//# sourceMappingURL=plan-core-db.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plan-core-db.test.js","sourceRoot":"","sources":["../../src/plan-core-db.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { Plan } from "@xgjktech/xg-openclaw-shared";
|
|
2
|
+
import type { ImStreamClient } from "./connection.js";
|
|
3
|
+
import { type StoredCoreProgressCard } from "./plan-core-db.js";
|
|
4
|
+
/** 由 core 落库卡合成 Plan(source:"snapshot");任何失败静默返回 undefined。 */
|
|
5
|
+
export declare function buildPlanFromCoreCard(params: {
|
|
6
|
+
sessionKey: string;
|
|
7
|
+
groupId: string;
|
|
8
|
+
card: StoredCoreProgressCard;
|
|
9
|
+
accountId?: string;
|
|
10
|
+
}): Plan | undefined;
|
|
11
|
+
/**
|
|
12
|
+
* 每轮 @ 触发时(热路径入口):登记 WS client 后 fire-and-forget 推送一次快照。
|
|
13
|
+
* 纪律:登记必须先于快照、快照失败绝不影响登记(沿用原 PLAN_STAT 快照语义)。
|
|
14
|
+
*/
|
|
15
|
+
export declare function registerCorePlanSnapshotClient(params: {
|
|
16
|
+
groupId: string;
|
|
17
|
+
client: ImStreamClient;
|
|
18
|
+
replyToMsgId: string;
|
|
19
|
+
agentId: string;
|
|
20
|
+
sessionKey: string;
|
|
21
|
+
nowMs?: number;
|
|
22
|
+
}): void;
|
|
23
|
+
//# sourceMappingURL=plan-core-snapshot.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plan-core-snapshot.d.ts","sourceRoot":"","sources":["../../src/plan-core-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAwB,KAAK,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAetF,+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,CAWnB;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"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { readCoreProgressCard } from "./plan-core-db.js";
|
|
2
|
+
import { buildPlanFromCoreUpdate } from "./plan-core-adapter.js";
|
|
3
|
+
import { sendPlanStat } from "./plan-stat-event.js";
|
|
4
|
+
import { setPlanWsClient } from "./plan-ws-registry.js";
|
|
5
|
+
const LOG_PREFIX = "[xg_cwork_im] [plan-core-snapshot]";
|
|
6
|
+
/** 快照新鲜度阈值:core 卡超过 1 小时未更新,视为已失败/过期,快照不再推给前端。 */
|
|
7
|
+
const CORE_PLAN_SNAPSHOT_STALE_MS = 60 * 60 * 1_000;
|
|
8
|
+
/** 「未完成」判定:存在 status !== "completed" 的步骤。空 steps 已被读取层过滤。 */
|
|
9
|
+
function isUnfinished(card) {
|
|
10
|
+
return card.steps.some((step) => step.status !== "completed");
|
|
11
|
+
}
|
|
12
|
+
/** 由 core 落库卡合成 Plan(source:"snapshot");任何失败静默返回 undefined。 */
|
|
13
|
+
export function buildPlanFromCoreCard(params) {
|
|
14
|
+
const { sessionKey, groupId, card, accountId } = params;
|
|
15
|
+
const createdAtIso = card.createdAtMs > 0 ? new Date(card.createdAtMs).toISOString() : undefined;
|
|
16
|
+
return buildPlanFromCoreUpdate({
|
|
17
|
+
sessionKey,
|
|
18
|
+
groupId,
|
|
19
|
+
accountId,
|
|
20
|
+
payload: { phase: "update", title: "Plan updated", steps: card.steps },
|
|
21
|
+
nowMs: card.updatedAtMs > 0 ? card.updatedAtMs : Date.now(),
|
|
22
|
+
...(createdAtIso ? { createdAtIso } : {}),
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* 每轮 @ 触发时(热路径入口):登记 WS client 后 fire-and-forget 推送一次快照。
|
|
27
|
+
* 纪律:登记必须先于快照、快照失败绝不影响登记(沿用原 PLAN_STAT 快照语义)。
|
|
28
|
+
*/
|
|
29
|
+
export function registerCorePlanSnapshotClient(params) {
|
|
30
|
+
const { groupId, client, replyToMsgId, agentId, sessionKey } = params;
|
|
31
|
+
setPlanWsClient(groupId, client, replyToMsgId);
|
|
32
|
+
try {
|
|
33
|
+
const card = readCoreProgressCard({ agentId, sessionKey });
|
|
34
|
+
if (!card) {
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
const nowMs = params.nowMs ?? Date.now();
|
|
38
|
+
if (nowMs - card.updatedAtMs > CORE_PLAN_SNAPSHOT_STALE_MS) {
|
|
39
|
+
console.warn("[xg_cwork_im] [plan-telemetry] stale-core-plan-dropped " +
|
|
40
|
+
JSON.stringify({
|
|
41
|
+
sessionKey,
|
|
42
|
+
planId: sessionKey,
|
|
43
|
+
updatedAt: new Date(card.updatedAtMs).toISOString(),
|
|
44
|
+
revision: card.revision,
|
|
45
|
+
}));
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
if (!isUnfinished(card)) {
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
const plan = buildPlanFromCoreCard({
|
|
52
|
+
sessionKey,
|
|
53
|
+
groupId,
|
|
54
|
+
card,
|
|
55
|
+
});
|
|
56
|
+
if (!plan) {
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
sendPlanStat({ plan, source: "snapshot" });
|
|
60
|
+
}
|
|
61
|
+
catch (err) {
|
|
62
|
+
console.warn(`${LOG_PREFIX} 快照失败已吞 sessionKey=${sessionKey} groupId=${groupId}: ${String(err)}`);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
//# sourceMappingURL=plan-core-snapshot.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plan-core-snapshot.js","sourceRoot":"","sources":["../../src/plan-core-snapshot.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plan-core-snapshot.test.d.ts","sourceRoot":"","sources":["../../src/plan-core-snapshot.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
import assert from "node:assert/strict";
|
|
2
|
+
import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
|
|
3
|
+
import { tmpdir } from "node:os";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
import { DatabaseSync } from "node:sqlite";
|
|
6
|
+
import { after, afterEach, describe, it } from "node:test";
|
|
7
|
+
import { buildCorePlanId } from "./plan-core-adapter.js";
|
|
8
|
+
import { setCoreAgentStateBase } from "./plan-core-db.js";
|
|
9
|
+
import { registerCorePlanSnapshotClient } from "./plan-core-snapshot.js";
|
|
10
|
+
import { resetPlanWsRegistryForTest } from "./plan-ws-registry.js";
|
|
11
|
+
const NOW = Date.parse("2026-09-08T12:00:00.000Z");
|
|
12
|
+
const HOUR = 60 * 60_000;
|
|
13
|
+
const tempDirs = [];
|
|
14
|
+
function makeTempBase() {
|
|
15
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-plan-core-snapshot-"));
|
|
16
|
+
tempDirs.push(dir);
|
|
17
|
+
return dir;
|
|
18
|
+
}
|
|
19
|
+
function seedCard(baseDir, agentId, sessionKey, opts) {
|
|
20
|
+
const agentDir = join(baseDir, "agents", agentId, "agent");
|
|
21
|
+
mkdirSync(agentDir, { recursive: true });
|
|
22
|
+
const db = new DatabaseSync(join(agentDir, "openclaw-agent.sqlite"));
|
|
23
|
+
try {
|
|
24
|
+
db.exec(`
|
|
25
|
+
CREATE TABLE IF NOT EXISTS session_progress_cards (
|
|
26
|
+
session_key TEXT NOT NULL PRIMARY KEY,
|
|
27
|
+
markdown TEXT,
|
|
28
|
+
steps_json TEXT,
|
|
29
|
+
revision INTEGER NOT NULL,
|
|
30
|
+
created_at INTEGER NOT NULL,
|
|
31
|
+
updated_at INTEGER NOT NULL
|
|
32
|
+
) STRICT;
|
|
33
|
+
`);
|
|
34
|
+
db.prepare("INSERT INTO session_progress_cards (session_key, markdown, steps_json, revision, created_at, updated_at) VALUES (?, NULL, ?, 1, ?, ?);").run(sessionKey, opts.stepsJson, opts.createdAtMs ?? NOW - HOUR, opts.updatedAtMs ?? NOW - 5 * 60_000);
|
|
35
|
+
}
|
|
36
|
+
finally {
|
|
37
|
+
db.close();
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
function makeRecordingClient() {
|
|
41
|
+
const calls = [];
|
|
42
|
+
const client = {
|
|
43
|
+
start: async () => { },
|
|
44
|
+
streamProgress: async () => { },
|
|
45
|
+
streamUsage: async () => { },
|
|
46
|
+
sendEvent: async (opts) => {
|
|
47
|
+
calls.push(opts);
|
|
48
|
+
},
|
|
49
|
+
end: async () => { },
|
|
50
|
+
};
|
|
51
|
+
return { client, calls };
|
|
52
|
+
}
|
|
53
|
+
after(() => {
|
|
54
|
+
for (const dir of tempDirs.splice(0)) {
|
|
55
|
+
try {
|
|
56
|
+
rmSync(dir, { recursive: true, force: true });
|
|
57
|
+
}
|
|
58
|
+
catch {
|
|
59
|
+
// Windows 偶发句柄未释放导致删除失败,忽略
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
afterEach(() => {
|
|
64
|
+
resetPlanWsRegistryForTest();
|
|
65
|
+
setCoreAgentStateBase("");
|
|
66
|
+
});
|
|
67
|
+
describe("registerCorePlanSnapshotClient", () => {
|
|
68
|
+
it("登记 client 并推送一份 source=snapshot 的未完成新鲜计划", () => {
|
|
69
|
+
const base = makeTempBase();
|
|
70
|
+
setCoreAgentStateBase(base);
|
|
71
|
+
const sessionKey = "agent:main:s-1";
|
|
72
|
+
seedCard(base, "main", sessionKey, {
|
|
73
|
+
stepsJson: JSON.stringify([
|
|
74
|
+
{ step: "备份", status: "completed" },
|
|
75
|
+
{ step: "校验", status: "in_progress" },
|
|
76
|
+
]),
|
|
77
|
+
createdAtMs: NOW - HOUR,
|
|
78
|
+
updatedAtMs: NOW - 5 * 60_000,
|
|
79
|
+
});
|
|
80
|
+
const { client, calls } = makeRecordingClient();
|
|
81
|
+
registerCorePlanSnapshotClient({
|
|
82
|
+
groupId: "g-1",
|
|
83
|
+
client,
|
|
84
|
+
replyToMsgId: "msg-1",
|
|
85
|
+
agentId: "main",
|
|
86
|
+
sessionKey,
|
|
87
|
+
nowMs: NOW,
|
|
88
|
+
});
|
|
89
|
+
assert.equal(calls.length, 1);
|
|
90
|
+
const sent = calls[0];
|
|
91
|
+
assert.equal(sent.event, "PLAN_STAT");
|
|
92
|
+
assert.equal(sent.data.source, "snapshot");
|
|
93
|
+
const plan = sent.data.plan;
|
|
94
|
+
assert.equal(plan.planId, buildCorePlanId(sessionKey));
|
|
95
|
+
assert.equal(plan.createdAt, new Date(NOW - HOUR).toISOString());
|
|
96
|
+
assert.equal(plan.updatedAt, new Date(NOW - 5 * 60_000).toISOString());
|
|
97
|
+
assert.deepEqual(plan.tasks, [
|
|
98
|
+
{ title: "备份", status: "completed" },
|
|
99
|
+
{ title: "校验", status: "in_progress" },
|
|
100
|
+
]);
|
|
101
|
+
});
|
|
102
|
+
it("超过 1 小时未更新 → 不发(陈旧)", () => {
|
|
103
|
+
const base = makeTempBase();
|
|
104
|
+
setCoreAgentStateBase(base);
|
|
105
|
+
const sessionKey = "agent:main:s-1";
|
|
106
|
+
seedCard(base, "main", sessionKey, {
|
|
107
|
+
stepsJson: JSON.stringify([{ step: "A", status: "in_progress" }]),
|
|
108
|
+
updatedAtMs: NOW - 2 * HOUR,
|
|
109
|
+
});
|
|
110
|
+
const { client, calls } = makeRecordingClient();
|
|
111
|
+
registerCorePlanSnapshotClient({
|
|
112
|
+
groupId: "g-1",
|
|
113
|
+
client,
|
|
114
|
+
replyToMsgId: "msg-1",
|
|
115
|
+
agentId: "main",
|
|
116
|
+
sessionKey,
|
|
117
|
+
nowMs: NOW,
|
|
118
|
+
});
|
|
119
|
+
assert.equal(calls.length, 0);
|
|
120
|
+
});
|
|
121
|
+
it("全部 completed → 不发", () => {
|
|
122
|
+
const base = makeTempBase();
|
|
123
|
+
setCoreAgentStateBase(base);
|
|
124
|
+
const sessionKey = "agent:main:s-1";
|
|
125
|
+
seedCard(base, "main", sessionKey, {
|
|
126
|
+
stepsJson: JSON.stringify([{ step: "A", status: "completed" }]),
|
|
127
|
+
updatedAtMs: NOW - 5 * 60_000,
|
|
128
|
+
});
|
|
129
|
+
const { client, calls } = makeRecordingClient();
|
|
130
|
+
registerCorePlanSnapshotClient({
|
|
131
|
+
groupId: "g-1",
|
|
132
|
+
client,
|
|
133
|
+
replyToMsgId: "msg-1",
|
|
134
|
+
agentId: "main",
|
|
135
|
+
sessionKey,
|
|
136
|
+
nowMs: NOW,
|
|
137
|
+
});
|
|
138
|
+
assert.equal(calls.length, 0);
|
|
139
|
+
});
|
|
140
|
+
it("core 无卡 / 库不存在 → 登记成功但不发,不外抛", () => {
|
|
141
|
+
const base = makeTempBase();
|
|
142
|
+
setCoreAgentStateBase(base);
|
|
143
|
+
const { client, calls } = makeRecordingClient();
|
|
144
|
+
assert.doesNotThrow(() => registerCorePlanSnapshotClient({
|
|
145
|
+
groupId: "g-1",
|
|
146
|
+
client,
|
|
147
|
+
replyToMsgId: "msg-1",
|
|
148
|
+
agentId: "main",
|
|
149
|
+
sessionKey: "agent:main:nope",
|
|
150
|
+
nowMs: NOW,
|
|
151
|
+
}));
|
|
152
|
+
assert.equal(calls.length, 0);
|
|
153
|
+
});
|
|
154
|
+
});
|
|
155
|
+
//# sourceMappingURL=plan-core-snapshot.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plan-core-snapshot.test.js","sourceRoot":"","sources":["../../src/plan-core-snapshot.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import type { ImStreamClient } from "./connection.js";
|
|
1
|
+
import type { Plan } from "@xgjktech/xg-openclaw-shared";
|
|
3
2
|
/**
|
|
4
3
|
* 组装发往前端的 plan:剥离 origin(内部路由信息,含 sessionKey,前端不需要也不该看到)。
|
|
5
4
|
* 返回浅拷贝,不 mutate 入参(middleware 拿到的 plan 引用可能别处还要用)。
|
|
@@ -7,26 +6,12 @@ import type { ImStreamClient } from "./connection.js";
|
|
|
7
6
|
export declare function toWirePlan(plan: Plan): Plan;
|
|
8
7
|
/**
|
|
9
8
|
* 发送一条 PLAN_STAT。绝不抛、绝不 await 调用方(内部自己 catch)。
|
|
9
|
+
*
|
|
10
|
+
* 计划状态来自 core progress_card(工具事件 or DB 回放),内部 origin 的
|
|
11
|
+
* channel/to 用于路由到对应群的 WS client。
|
|
10
12
|
*/
|
|
11
13
|
export declare function sendPlanStat(params: {
|
|
12
14
|
plan: Plan;
|
|
13
15
|
source: "tool" | "snapshot";
|
|
14
16
|
}): void;
|
|
15
|
-
/**
|
|
16
|
-
* 登记 WS client(供后续 PLAN_STAT 增量路由),登记完立刻 fire-and-forget 触发一次快照:
|
|
17
|
-
* 反查该群未完成的计划,只发最新一份 PLAN_STAT(source: "snapshot")。
|
|
18
|
-
* 同群残留的多份旧未完成计划不再逐个推给前端(前端按群只展示最新计划);
|
|
19
|
-
* 若最新一份超过 1 小时未更新,则视为已失败/过期,快照也不发(不留死计划在展示位)。
|
|
20
|
-
*
|
|
21
|
-
* dispatch 是热路径:整个快照过程包 try/catch、绝不 await、绝不抛——快照失败不能连累
|
|
22
|
-
* WS 绑定本身(登记必须先于快照执行、且不受快照结果影响)。
|
|
23
|
-
*
|
|
24
|
-
* `deps.listPlansByOrigin` 默认注入 plan-store-access 的实现;测试可传入假实现
|
|
25
|
-
* 模拟反查异常(红线防御性场景——即便被注入的反查实现意外抛出,本函数也绝不外抛)。
|
|
26
|
-
* `deps.nowMs` 供测试注入固定时钟,缺省取 Date.now()。
|
|
27
|
-
*/
|
|
28
|
-
export declare function registerPlanWsClientAndSnapshot(groupId: string, client: ImStreamClient, replyToMsgId: string, deps?: {
|
|
29
|
-
listPlansByOrigin: (channel: string, to: string) => Plan[];
|
|
30
|
-
nowMs?: number;
|
|
31
|
-
}): void;
|
|
32
17
|
//# sourceMappingURL=plan-stat-event.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-stat-event.d.ts","sourceRoot":"","sources":["../../src/plan-stat-event.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"plan-stat-event.d.ts","sourceRoot":"","sources":["../../src/plan-stat-event.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAKzD;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAG3C;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,GAAG,IAAI,CA4BtF"}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { getPlanWsClient, setPlanWsClient } from "./plan-ws-registry.js";
|
|
3
|
-
import { listPlansByOrigin } from "./plan-store-access.js";
|
|
1
|
+
import { getPlanWsClient } from "./plan-ws-registry.js";
|
|
4
2
|
const LOG_PREFIX = "[xg_cwork_im] [plan-stat-event]";
|
|
5
3
|
/**
|
|
6
4
|
* 组装发往前端的 plan:剥离 origin(内部路由信息,含 sessionKey,前端不需要也不该看到)。
|
|
@@ -12,6 +10,9 @@ export function toWirePlan(plan) {
|
|
|
12
10
|
}
|
|
13
11
|
/**
|
|
14
12
|
* 发送一条 PLAN_STAT。绝不抛、绝不 await 调用方(内部自己 catch)。
|
|
13
|
+
*
|
|
14
|
+
* 计划状态来自 core progress_card(工具事件 or DB 回放),内部 origin 的
|
|
15
|
+
* channel/to 用于路由到对应群的 WS client。
|
|
15
16
|
*/
|
|
16
17
|
export function sendPlanStat(params) {
|
|
17
18
|
const { plan, source } = params;
|
|
@@ -37,89 +38,4 @@ export function sendPlanStat(params) {
|
|
|
37
38
|
console.warn(`${LOG_PREFIX} 发送失败 planId=${plan.planId} groupId=${to}: ${String(err)}`);
|
|
38
39
|
});
|
|
39
40
|
}
|
|
40
|
-
/** 「未完成」判定:计划未取消,且存在 status !== "completed" 的 task。 */
|
|
41
|
-
function isUnfinished(plan) {
|
|
42
|
-
return !isPlanCancelled(plan) && plan.tasks.some((task) => task.status !== "completed");
|
|
43
|
-
}
|
|
44
|
-
/** 解析时间戳(ISO 或 epoch);无效按 0 处理。 */
|
|
45
|
-
function planTime(plan, key) {
|
|
46
|
-
const raw = plan[key];
|
|
47
|
-
if (typeof raw === "string" && raw.trim() !== "") {
|
|
48
|
-
const ts = Date.parse(raw);
|
|
49
|
-
if (!Number.isNaN(ts))
|
|
50
|
-
return ts;
|
|
51
|
-
}
|
|
52
|
-
return 0;
|
|
53
|
-
}
|
|
54
|
-
/** 取「最新」一份:优先 updatedAt(缺失时回退 createdAt);键相同再比 createdAt,仍相同保持入参顺序。 */
|
|
55
|
-
function pickNewestPlan(plans) {
|
|
56
|
-
if (plans.length === 0)
|
|
57
|
-
return undefined;
|
|
58
|
-
return plans.reduce((newest, plan) => {
|
|
59
|
-
const newestKey = planTime(newest, "updatedAt") || planTime(newest, "createdAt") || 0;
|
|
60
|
-
const planKey = planTime(plan, "updatedAt") || planTime(plan, "createdAt") || 0;
|
|
61
|
-
if (planKey > newestKey)
|
|
62
|
-
return plan;
|
|
63
|
-
if (planKey === newestKey) {
|
|
64
|
-
const newestCreated = planTime(newest, "createdAt");
|
|
65
|
-
const planCreated = planTime(plan, "createdAt");
|
|
66
|
-
return planCreated > newestCreated ? plan : newest;
|
|
67
|
-
}
|
|
68
|
-
return newest;
|
|
69
|
-
});
|
|
70
|
-
}
|
|
71
|
-
/** 快照新鲜度阈值:最新未完成计划超过 1 小时未更新,视为已失败/过期,快照不再推给前端。 */
|
|
72
|
-
const PLAN_SNAPSHOT_STALE_MS = 60 * 60 * 1_000;
|
|
73
|
-
/** 「新鲜」判定:以 updatedAt(缺失回退 createdAt)距 now 不超过 1 小时;取不到时间一律视为过期。 */
|
|
74
|
-
function isPlanSnapshotFresh(plan, nowMs) {
|
|
75
|
-
const lastUpdateMs = planTime(plan, "updatedAt") || planTime(plan, "createdAt") || 0;
|
|
76
|
-
if (!lastUpdateMs)
|
|
77
|
-
return false;
|
|
78
|
-
return nowMs - lastUpdateMs <= PLAN_SNAPSHOT_STALE_MS;
|
|
79
|
-
}
|
|
80
|
-
/**
|
|
81
|
-
* 登记 WS client(供后续 PLAN_STAT 增量路由),登记完立刻 fire-and-forget 触发一次快照:
|
|
82
|
-
* 反查该群未完成的计划,只发最新一份 PLAN_STAT(source: "snapshot")。
|
|
83
|
-
* 同群残留的多份旧未完成计划不再逐个推给前端(前端按群只展示最新计划);
|
|
84
|
-
* 若最新一份超过 1 小时未更新,则视为已失败/过期,快照也不发(不留死计划在展示位)。
|
|
85
|
-
*
|
|
86
|
-
* dispatch 是热路径:整个快照过程包 try/catch、绝不 await、绝不抛——快照失败不能连累
|
|
87
|
-
* WS 绑定本身(登记必须先于快照执行、且不受快照结果影响)。
|
|
88
|
-
*
|
|
89
|
-
* `deps.listPlansByOrigin` 默认注入 plan-store-access 的实现;测试可传入假实现
|
|
90
|
-
* 模拟反查异常(红线防御性场景——即便被注入的反查实现意外抛出,本函数也绝不外抛)。
|
|
91
|
-
* `deps.nowMs` 供测试注入固定时钟,缺省取 Date.now()。
|
|
92
|
-
*/
|
|
93
|
-
export function registerPlanWsClientAndSnapshot(groupId, client, replyToMsgId, deps = { listPlansByOrigin }) {
|
|
94
|
-
setPlanWsClient(groupId, client, replyToMsgId);
|
|
95
|
-
try {
|
|
96
|
-
const nowMs = deps.nowMs ?? Date.now();
|
|
97
|
-
const plans = deps.listPlansByOrigin("xg_cwork_im", groupId);
|
|
98
|
-
const unfinishedPlans = plans.filter(isUnfinished);
|
|
99
|
-
if (unfinishedPlans.length > 1) {
|
|
100
|
-
console.warn("[xg_cwork_im] [plan-telemetry] multi-active " + JSON.stringify({
|
|
101
|
-
to: groupId,
|
|
102
|
-
count: unfinishedPlans.length,
|
|
103
|
-
planIds: unfinishedPlans.map((plan) => plan.planId),
|
|
104
|
-
}));
|
|
105
|
-
}
|
|
106
|
-
// 快照只发最新一份:同群多份未完成计划时旧计划被丢弃,仅遥测提示。
|
|
107
|
-
const newest = pickNewestPlan(unfinishedPlans);
|
|
108
|
-
if (!newest)
|
|
109
|
-
return;
|
|
110
|
-
if (!isPlanSnapshotFresh(newest, nowMs)) {
|
|
111
|
-
console.warn("[xg_cwork_im] [plan-telemetry] stale-plan-dropped " + JSON.stringify({
|
|
112
|
-
to: groupId,
|
|
113
|
-
planId: newest.planId,
|
|
114
|
-
updatedAt: newest.updatedAt ?? null,
|
|
115
|
-
createdAt: newest.createdAt ?? null,
|
|
116
|
-
}));
|
|
117
|
-
return;
|
|
118
|
-
}
|
|
119
|
-
sendPlanStat({ plan: newest, source: "snapshot" });
|
|
120
|
-
}
|
|
121
|
-
catch (err) {
|
|
122
|
-
console.warn(`${LOG_PREFIX} 会话快照失败,已吞 groupId=${groupId}: ${String(err)}`);
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
41
|
//# sourceMappingURL=plan-stat-event.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-stat-event.js","sourceRoot":"","sources":["../../src/plan-stat-event.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"plan-stat-event.js","sourceRoot":"","sources":["../../src/plan-stat-event.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,UAAU,GAAG,iCAAiC,CAAC;AAErD;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,IAAU;IACjC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAC;IAC9C,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,MAAmD;IAC5E,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;IACrC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;IAC3B,IAAI,OAAO,KAAK,aAAa,IAAI,CAAC,EAAE,EAAE,CAAC;QACnC,OAAO,CAAC,IAAI,CACR,GAAG,UAAU,4CAA4C,IAAI,CAAC,MAAM,YAAY,OAAO,IAAI,QAAQ,EAAE,CACxG,CAAC;QACF,OAAO;IACX,CAAC;IAED,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;IACnC,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,sCAAsC,IAAI,CAAC,MAAM,YAAY,EAAE,EAAE,CAAC,CAAC;QAC7F,OAAO;IACX,CAAC;IAED,KAAK,MAAM,CAAC,MAAM;SACb,SAAS,CAAC;QACP,OAAO,EAAE,EAAE;QACX,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE;KAC3C,CAAC;SACD,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;QACpB,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,gBAAgB,IAAI,CAAC,MAAM,YAAY,EAAE,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC3F,CAAC,CAAC,CAAC;AACX,CAAC"}
|