@sleep2agi/commhub-server 0.9.0-preview.190 → 0.9.0-preview.191
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 +1 -1
- package/src/schedule-starved.test.ts +9 -0
- package/src/schedule-starved.ts +21 -5
- package/src/server.ts +23 -4
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.191",
|
|
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",
|
|
@@ -45,6 +45,15 @@ describe("空转排程判定与自动暂停", () => {
|
|
|
45
45
|
expect(isStarved({ total: 129, replied: 1 }, 20)).toBe(false); // 只要成功过一次就不算
|
|
46
46
|
});
|
|
47
47
|
|
|
48
|
+
// 2026-10-28 生产实测:6 个候选里 4 个的 79 次运行全是 target_offline ——
|
|
49
|
+
// 它们在等节点回来,暂停它们反而要多一次人工恢复。
|
|
50
|
+
test("目标离线占比过高 ⇒ 不算空转(那是在等节点,不是排程有问题)", () => {
|
|
51
|
+
expect(isStarved({ total: 79, replied: 0, offline_skips: 79 }, 20)).toBe(false); // 100% 离线
|
|
52
|
+
expect(isStarved({ total: 100, replied: 0, offline_skips: 91 }, 20)).toBe(false); // >90%
|
|
53
|
+
expect(isStarved({ total: 100, replied: 0, offline_skips: 89 }, 20)).toBe(true); // <90% 仍算空转
|
|
54
|
+
expect(isStarved({ total: 94, replied: 0, offline_skips: 0 }, 20)).toBe(true); // 纯 busy/失败型
|
|
55
|
+
});
|
|
56
|
+
|
|
48
57
|
test("默认关闭:只报候选,不改排程状态", () => {
|
|
49
58
|
delete process.env.COMMHUB_SCHEDULE_STARVED_AUTOPAUSE;
|
|
50
59
|
mkSchedule("sched_starved_a", "空转A");
|
package/src/schedule-starved.ts
CHANGED
|
@@ -33,11 +33,26 @@ export function autopauseEnabled(): boolean {
|
|
|
33
33
|
export function starvedMinRuns(): number { return envInt("COMMHUB_SCHEDULE_STARVED_MIN_RUNS", 20, 1); }
|
|
34
34
|
export function starvedWindowHours(): number { return envInt("COMMHUB_SCHEDULE_STARVED_WINDOW_HOURS", 24, 1); }
|
|
35
35
|
|
|
36
|
-
export type ScheduleStats = { schedule_id: string; total: number; replied: number };
|
|
36
|
+
export type ScheduleStats = { schedule_id: string; total: number; replied: number; offline_skips: number };
|
|
37
37
|
|
|
38
|
-
/**
|
|
39
|
-
export
|
|
40
|
-
|
|
38
|
+
/** 目标不可达占比超过这个比例 ⇒ 不算空转(是在等节点回来,不是排程有问题)。 */
|
|
39
|
+
export const OFFLINE_SKIP_RATIO_MAX = 0.9;
|
|
40
|
+
|
|
41
|
+
/**
|
|
42
|
+
* 纯函数:是否判定为空转。便于单测,不做任何 IO。
|
|
43
|
+
*
|
|
44
|
+
* 🔴 2026-10-28 生产实测修正:只看「执行≥N 且成功=0」会把「等离线节点」误判成空转。
|
|
45
|
+
* 那天 6 个候选里 4 个的 79 次运行**全部是 skipped/target_offline** —— 它们没建过任务、
|
|
46
|
+
* 没浪费等待,节点一回来就会自己接着跑。把它们暂停,反而要多一次人工恢复。
|
|
47
|
+
* ⇒ target_offline 占比 > 90% 视为「目标不可达」,不算空转。
|
|
48
|
+
*/
|
|
49
|
+
export function isStarved(
|
|
50
|
+
s: { total: number; replied: number; offline_skips?: number },
|
|
51
|
+
minRuns = starvedMinRuns(),
|
|
52
|
+
): boolean {
|
|
53
|
+
if (s.total < minRuns || s.replied !== 0) return false;
|
|
54
|
+
const offline = s.offline_skips ?? 0;
|
|
55
|
+
return offline <= s.total * OFFLINE_SKIP_RATIO_MAX;
|
|
41
56
|
}
|
|
42
57
|
|
|
43
58
|
export type StarvedScanResult = { paused: string[]; candidates: string[]; enabled: boolean };
|
|
@@ -52,7 +67,8 @@ export function scanStarvedSchedules(now = new Date()): StarvedScanResult {
|
|
|
52
67
|
const rows = db.all<ScheduleStats>(
|
|
53
68
|
`SELECT schedule_id,
|
|
54
69
|
COUNT(*) AS total,
|
|
55
|
-
SUM(CASE WHEN status = 'replied' THEN 1 ELSE 0 END) AS replied
|
|
70
|
+
SUM(CASE WHEN status = 'replied' THEN 1 ELSE 0 END) AS replied,
|
|
71
|
+
SUM(CASE WHEN status = 'skipped' AND error_code = 'target_offline' THEN 1 ELSE 0 END) AS offline_skips
|
|
56
72
|
FROM scheduled_task_runs
|
|
57
73
|
WHERE created_at >= ?1
|
|
58
74
|
GROUP BY schedule_id`,
|
package/src/server.ts
CHANGED
|
@@ -5806,11 +5806,23 @@ export function startHub(opts?: { port?: number; hostname?: string }): ReturnTyp
|
|
|
5806
5806
|
// #2880 —— 空转排程巡检:默认**只记录**「本来会被暂停哪些」,不动作。
|
|
5807
5807
|
// 开启 COMMHUB_SCHEDULE_STARVED_AUTOPAUSE=1 才真暂停(判据见 schedule-starved.ts 头注释)。
|
|
5808
5808
|
// 与告警分开:告警解决「没人知道」,这里解决「知道了但一直不停」。
|
|
5809
|
+
// 🔴 「只在候选集合变化时打一行」——每 5 分钟打一次等于 288 行/天,
|
|
5810
|
+
// 那正是这套机制要治的噪音(2026-10-28 上线 15 分钟就打了 8 行才被发现)。
|
|
5811
|
+
let lastStarvedKey = "";
|
|
5809
5812
|
const scheduleStarvedTimer = setInterval(() => {
|
|
5810
5813
|
try {
|
|
5811
5814
|
const r = scanStarvedSchedules();
|
|
5812
|
-
if (r.paused.length > 0)
|
|
5813
|
-
|
|
5815
|
+
if (r.paused.length > 0) {
|
|
5816
|
+
console.log(`[commhub schedule-starved] paused ${r.paused.length}: ${r.paused.join(", ")}`);
|
|
5817
|
+
} else {
|
|
5818
|
+
const key = r.candidates.slice().sort().join(",");
|
|
5819
|
+
if (r.candidates.length > 0 && key !== lastStarvedKey) {
|
|
5820
|
+
console.log(`[commhub schedule-starved] would pause ${r.candidates.length} (autopause off): ${r.candidates.join(", ")}`);
|
|
5821
|
+
} else if (r.candidates.length === 0 && lastStarvedKey !== "") {
|
|
5822
|
+
console.log(`[commhub schedule-starved] 候选已清空(之前 ${lastStarvedKey.split(",").length} 个)`);
|
|
5823
|
+
}
|
|
5824
|
+
lastStarvedKey = key;
|
|
5825
|
+
}
|
|
5814
5826
|
} catch (e: any) {
|
|
5815
5827
|
console.log(`[commhub schedule-starved] failed: ${e?.message ?? e}`);
|
|
5816
5828
|
}
|
|
@@ -5820,11 +5832,18 @@ export function startHub(opts?: { port?: number; hostname?: string }): ReturnTyp
|
|
|
5820
5832
|
// #2880 —— 节点级「不可服务」检测:窗口内忙类失败多、成功为零 ⇒ 这个节点现在投进去必然白等。
|
|
5821
5833
|
// 与排程级分开:排程是「某条排程该停」,这里是「某台节点该暂时不投」。
|
|
5822
5834
|
// 默认只记录;开启 COMMHUB_NODE_BUSY_CIRCUIT=1 才用于派发判断。
|
|
5835
|
+
let lastCircuitKey = "";
|
|
5823
5836
|
const nodeBusyCircuitTimer = setInterval(() => {
|
|
5824
5837
|
try {
|
|
5825
5838
|
const r = scanNodeBusyCircuit();
|
|
5826
|
-
if (!r.enabled
|
|
5827
|
-
|
|
5839
|
+
if (!r.enabled) {
|
|
5840
|
+
const key = r.tripped.slice().sort().join(",");
|
|
5841
|
+
if (r.tripped.length > 0 && key !== lastCircuitKey) {
|
|
5842
|
+
console.log(`[commhub node-busy-circuit] would trip ${r.tripped.length} in ${r.windowHours}h (circuit off): ${r.tripped.join(", ")}`);
|
|
5843
|
+
} else if (r.tripped.length === 0 && lastCircuitKey !== "") {
|
|
5844
|
+
console.log(`[commhub node-busy-circuit] 候选已清空(之前 ${lastCircuitKey.split(",").length} 个)`);
|
|
5845
|
+
}
|
|
5846
|
+
lastCircuitKey = key;
|
|
5828
5847
|
}
|
|
5829
5848
|
} catch (e: any) {
|
|
5830
5849
|
console.log(`[commhub node-busy-circuit] failed: ${e?.message ?? e}`);
|