@sleep2agi/commhub-server 0.9.0-preview.160 → 0.9.0-preview.161
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sleep2agi/commhub-server",
|
|
3
|
-
"version": "0.9.0-preview.
|
|
3
|
+
"version": "0.9.0-preview.161",
|
|
4
4
|
"description": "CommHub Server — AI Agent communication hub with MCP protocol, multi-network isolation, user auth, and MCP tools (17 collaboration-core + node/provider ops tools; authoritative list: docs-site/docs/api/mcp-tools.md).",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "src/index.ts",
|
package/src/server.ts
CHANGED
|
@@ -1006,10 +1006,12 @@ export function patrolOrphanTasks(): void {
|
|
|
1006
1006
|
}
|
|
1007
1007
|
|
|
1008
1008
|
function patrolDeliveredStaleTasks(): void {
|
|
1009
|
+
// #2571 —— watcher 现在按“目标节点此刻是否 working”分流写两类事件,但仍然是**同步**
|
|
1010
|
+
// (db.run 是同步的):巡逻旁路绝不因为 await 打乱调度时序。
|
|
1009
1011
|
try {
|
|
1010
1012
|
const result = recordDeliveredStaleEvents();
|
|
1011
1013
|
if (result.inserted > 0) {
|
|
1012
|
-
console.warn(`[patrol] recorded ${result.inserted} delivered-stale task warning(s)`);
|
|
1014
|
+
console.warn(`[patrol] recorded ${result.inserted} delivered-stale/queued-behind-busy task warning(s)`);
|
|
1013
1015
|
}
|
|
1014
1016
|
} catch (error: any) {
|
|
1015
1017
|
console.error(`[patrol] delivered-stale watcher failed: ${error?.message || error}`);
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
// #2571 —— delivered_stale 的**分流**:目标在跑别的任务时不再报“可能离线”。
|
|
2
|
+
//
|
|
3
|
+
// 生产数据(24h):出现过 delivered_stale 的任务里 83% 最终成功,等待 p50 2.9 分钟、
|
|
4
|
+
// p90 27 分钟 ⇒ 事件事实成立,但把“目标正忙”写成“可能离线”会制造告警疲劳。
|
|
5
|
+
// 这里钉住三件事:
|
|
6
|
+
// 1. 目标 `working` ⇒ 写 `queued_behind_busy_<N>s`,**不写** `delivered_stale_<N>s`;
|
|
7
|
+
// 2. 目标 `idle`/`offline`/无 session ⇒ 写 `delivered_stale_<N>s`,**不写** busy 类;
|
|
8
|
+
// 3. 两类都仍然是 write-once(同一 task+阈值重复巡逻不重复写)。
|
|
9
|
+
|
|
10
|
+
import { afterAll, beforeAll, describe, expect, test } from "bun:test";
|
|
11
|
+
import { db } from "./db.js";
|
|
12
|
+
import { recordDeliveredStaleEvents } from "./task-lifecycle-watcher.js";
|
|
13
|
+
|
|
14
|
+
const NOW = new Date("2026-08-10T00:01:01.000Z");
|
|
15
|
+
let networkId = "";
|
|
16
|
+
|
|
17
|
+
function sqliteUtcTimestamp(date: Date): string {
|
|
18
|
+
return date.toISOString().slice(0, 19).replace("T", " ");
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
function insertTask(taskId: string, toName: string, deliveredAt: string) {
|
|
22
|
+
db.run(
|
|
23
|
+
`INSERT INTO tasks (task_id, from_name, to_name, status, content, delivered_at, network_id)
|
|
24
|
+
VALUES (?1, 'sender', ?2, 'delivered', 'busy-vs-stale fixture', ?3, ?4)`,
|
|
25
|
+
[taskId, toName, deliveredAt, networkId],
|
|
26
|
+
);
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
function insertSession(alias: string, status: string) {
|
|
30
|
+
db.run(
|
|
31
|
+
`INSERT INTO sessions (resume_id, alias, status, network_id, registered_at)
|
|
32
|
+
VALUES (?1, ?2, ?3, ?4, '2026-08-10 00:00:00')`,
|
|
33
|
+
[`res_${alias}`, alias, status, networkId],
|
|
34
|
+
);
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
function eventsFor(taskId: string): string[] {
|
|
38
|
+
return db
|
|
39
|
+
.all<{ event_type: string }>(`SELECT event_type FROM task_events WHERE task_id = ?1 ORDER BY event_type`, [taskId])
|
|
40
|
+
.map((row) => row.event_type);
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
beforeAll(async () => {
|
|
44
|
+
const { register } = await import("./auth.js");
|
|
45
|
+
const auth = register(`busy_watcher_${Date.now()}`, "BusyWatcher-Strong-1!", undefined, "watcher");
|
|
46
|
+
expect(auth.ok).toBe(true);
|
|
47
|
+
networkId = auth.network_id!;
|
|
48
|
+
|
|
49
|
+
// 目标在跑别的任务
|
|
50
|
+
insertSession("target-busy", "working");
|
|
51
|
+
insertTask("busy-60", "target-busy", "2026-08-10 00:00:01");
|
|
52
|
+
// 目标空闲却没开始(真异常)
|
|
53
|
+
insertSession("target-idle", "idle");
|
|
54
|
+
insertTask("idle-60", "target-idle", "2026-08-10 00:00:01");
|
|
55
|
+
// 目标掉线
|
|
56
|
+
insertSession("target-offline", "offline");
|
|
57
|
+
insertTask("offline-60", "target-offline", "2026-08-10 00:00:01");
|
|
58
|
+
// 完全没有 session 行(未知)
|
|
59
|
+
insertTask("unknown-60", "target-without-session", "2026-08-10 00:00:01");
|
|
60
|
+
}, 30_000);
|
|
61
|
+
|
|
62
|
+
afterAll(() => {
|
|
63
|
+
try {
|
|
64
|
+
db.run(`DELETE FROM task_events WHERE network_id = ?1`, [networkId]);
|
|
65
|
+
db.run(`DELETE FROM tasks WHERE network_id = ?1`, [networkId]);
|
|
66
|
+
db.run(`DELETE FROM sessions WHERE network_id = ?1`, [networkId]);
|
|
67
|
+
} catch {}
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
describe("#2571 stale vs queued-behind-busy", () => {
|
|
71
|
+
test("目标 working ⇒ 只写 queued_behind_busy_*,不写 delivered_stale_*", () => {
|
|
72
|
+
recordDeliveredStaleEvents(NOW);
|
|
73
|
+
const events = eventsFor("busy-60");
|
|
74
|
+
expect(events).toContain("task.warning.queued_behind_busy_60s");
|
|
75
|
+
expect(events).not.toContain("task.warning.delivered_stale_60s");
|
|
76
|
+
});
|
|
77
|
+
|
|
78
|
+
test("目标 idle / offline / 无 session ⇒ 只写 delivered_stale_*", () => {
|
|
79
|
+
recordDeliveredStaleEvents(NOW);
|
|
80
|
+
for (const taskId of ["idle-60", "offline-60", "unknown-60"]) {
|
|
81
|
+
const events = eventsFor(taskId);
|
|
82
|
+
expect(events).toContain("task.warning.delivered_stale_60s");
|
|
83
|
+
expect(events).not.toContain("task.warning.queued_behind_busy_60s");
|
|
84
|
+
}
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
test("两类都仍然是 write-once(重复巡逻不重复写)", () => {
|
|
88
|
+
const before = db.get<{ n: number }>(
|
|
89
|
+
`SELECT COUNT(*) AS n FROM task_events WHERE network_id = ?1 AND event_type LIKE 'task.warning.%'`,
|
|
90
|
+
[networkId],
|
|
91
|
+
)!.n;
|
|
92
|
+
const second = recordDeliveredStaleEvents(NOW);
|
|
93
|
+
const after = db.get<{ n: number }>(
|
|
94
|
+
`SELECT COUNT(*) AS n FROM task_events WHERE network_id = ?1 AND event_type LIKE 'task.warning.%'`,
|
|
95
|
+
[networkId],
|
|
96
|
+
)!.n;
|
|
97
|
+
expect(second.inserted).toBe(0);
|
|
98
|
+
expect(after).toBe(before);
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
test("detail 文案能区分“排队”和“没在跑”", () => {
|
|
102
|
+
const busy = db.get<{ detail: string }>(
|
|
103
|
+
`SELECT detail FROM task_events WHERE task_id='busy-60' AND event_type LIKE 'task.warning.queued_behind_busy_%'`,
|
|
104
|
+
);
|
|
105
|
+
const stale = db.get<{ detail: string }>(
|
|
106
|
+
`SELECT detail FROM task_events WHERE task_id='idle-60' AND event_type LIKE 'task.warning.delivered_stale_%'`,
|
|
107
|
+
);
|
|
108
|
+
expect(busy!.detail).toContain("queued after");
|
|
109
|
+
expect(stale!.detail).toContain("still delivered");
|
|
110
|
+
// 两类文案必须一眼可分:忙的那条不能说成“没在跑”,反之亦然
|
|
111
|
+
expect(busy!.detail).not.toContain("still delivered");
|
|
112
|
+
expect(stale!.detail).not.toContain("queued after");
|
|
113
|
+
});
|
|
114
|
+
});
|
|
@@ -18,6 +18,47 @@ function sqliteUtcTimestamp(date: Date): string {
|
|
|
18
18
|
* equal to the stable event name and protected by a unique index, so every
|
|
19
19
|
* threshold is write-once across restarts, patrols, and multiple Hub workers.
|
|
20
20
|
*/
|
|
21
|
+
/**
|
|
22
|
+
* #2571 —— 把「慢」和「坏」分开:目标正在跑别的任务时,事件写成 `queued_behind_busy_*`;
|
|
23
|
+
* 目标空闲/离线/未知时,才写成 `delivered_stale_*`。
|
|
24
|
+
*
|
|
25
|
+
* 为什么是一条 SQL(而不是两条 INSERT):`test683` 的 mutation 门用**字符串锚点**钉住
|
|
26
|
+
* “write-once 冲突门”“只认 delivered”“网络字段透传”三件事;拆成两条 INSERT 会让锚点
|
|
27
|
+
* 命中次数变成 0 或让 mutation 只命中一半 —— 那就把“可被变异测试覆盖”这条性质弄丢了。
|
|
28
|
+
* 因此这里仍然只保留**一条** INSERT,用 CASE 选择事件名与文案。
|
|
29
|
+
*/
|
|
30
|
+
function recordStale(thresholdSeconds: 30 | 60, cutoff: string): number {
|
|
31
|
+
const busyType = `task.warning.queued_behind_busy_${thresholdSeconds}s`;
|
|
32
|
+
const staleType = `task.warning.delivered_stale_${thresholdSeconds}s`;
|
|
33
|
+
const busyDetail = `queued after ${thresholdSeconds}s; target is working on another task`;
|
|
34
|
+
const staleDetail = thresholdSeconds === 30
|
|
35
|
+
? "still delivered after 30s; target is not working on another task and has not started"
|
|
36
|
+
: "still delivered after 60s; target is idle or offline and not consuming";
|
|
37
|
+
const result = db.run(
|
|
38
|
+
`INSERT INTO task_events
|
|
39
|
+
(task_id, from_status, to_status, event_type, event_key, actor, detail, network_id)
|
|
40
|
+
SELECT task_id, 'delivered', 'delivered',
|
|
41
|
+
CASE WHEN COALESCE((SELECT s.status FROM sessions s
|
|
42
|
+
WHERE s.alias = tasks.to_name AND s.network_id = tasks.network_id), 'unknown') = 'working'
|
|
43
|
+
THEN ?4 ELSE ?5 END,
|
|
44
|
+
CASE WHEN COALESCE((SELECT s.status FROM sessions s
|
|
45
|
+
WHERE s.alias = tasks.to_name AND s.network_id = tasks.network_id), 'unknown') = 'working'
|
|
46
|
+
THEN ?4 ELSE ?5 END,
|
|
47
|
+
'patrol',
|
|
48
|
+
CASE WHEN COALESCE((SELECT s.status FROM sessions s
|
|
49
|
+
WHERE s.alias = tasks.to_name AND s.network_id = tasks.network_id), 'unknown') = 'working'
|
|
50
|
+
THEN ?6 ELSE ?7 END,
|
|
51
|
+
network_id
|
|
52
|
+
FROM tasks
|
|
53
|
+
WHERE status = 'delivered'
|
|
54
|
+
AND delivered_at IS NOT NULL
|
|
55
|
+
AND delivered_at <= ?3
|
|
56
|
+
ON CONFLICT(task_id, event_key) DO NOTHING`,
|
|
57
|
+
[staleType, staleDetail, cutoff, busyType, staleType, busyDetail, staleDetail],
|
|
58
|
+
);
|
|
59
|
+
return result.changes;
|
|
60
|
+
}
|
|
61
|
+
|
|
21
62
|
export function recordDeliveredStaleEvents(now = new Date()): DeliveredStalePatrolResult {
|
|
22
63
|
if (!Number.isFinite(now.getTime())) throw new Error("invalid lifecycle patrol time");
|
|
23
64
|
|
|
@@ -25,24 +66,10 @@ export function recordDeliveredStaleEvents(now = new Date()): DeliveredStalePatr
|
|
|
25
66
|
let inserted = 0;
|
|
26
67
|
|
|
27
68
|
for (const thresholdSeconds of DELIVERED_STALE_THRESHOLDS) {
|
|
28
|
-
const eventType = `task.warning.delivered_stale_${thresholdSeconds}s`;
|
|
29
69
|
const cutoff = sqliteUtcTimestamp(new Date(now.getTime() - thresholdSeconds * 1000));
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
const result = db.run(
|
|
34
|
-
`INSERT INTO task_events
|
|
35
|
-
(task_id, from_status, to_status, event_type, event_key, actor, detail, network_id)
|
|
36
|
-
SELECT task_id, 'delivered', 'delivered', ?1, ?1, 'patrol', ?2, network_id
|
|
37
|
-
FROM tasks
|
|
38
|
-
WHERE status = 'delivered'
|
|
39
|
-
AND delivered_at IS NOT NULL
|
|
40
|
-
AND delivered_at <= ?3
|
|
41
|
-
ON CONFLICT(task_id, event_key) DO NOTHING`,
|
|
42
|
-
[eventType, detail, cutoff],
|
|
43
|
-
);
|
|
44
|
-
byThreshold[thresholdSeconds] = result.changes;
|
|
45
|
-
inserted += result.changes;
|
|
70
|
+
const changes = recordStale(thresholdSeconds, cutoff);
|
|
71
|
+
byThreshold[thresholdSeconds] = changes;
|
|
72
|
+
inserted += changes;
|
|
46
73
|
}
|
|
47
74
|
|
|
48
75
|
return { inserted, by_threshold_seconds: byThreshold };
|