@sleep2agi/commhub-server 0.9.0-preview.170 → 0.9.0-preview.171

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.170",
3
+ "version": "0.9.0-preview.171",
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",
@@ -11,7 +11,7 @@
11
11
 
12
12
  import { afterAll, beforeAll, describe, expect, test } from "bun:test";
13
13
  import { db } from "./db.js";
14
- import { BROADCAST_CHUNK, enqueueBroadcast } from "./broadcast-fanout.js";
14
+ import { BROADCAST_CHUNK, enqueueBroadcast, broadcastRecentState } from './broadcast-fanout.js';
15
15
 
16
16
  const stamp = `${Date.now()}`;
17
17
  let NET = "";
@@ -97,3 +97,22 @@ describe("#2721 broadcast fan-out is chunked", () => {
97
97
  expect(yields).toBe(0);
98
98
  });
99
99
  });
100
+
101
+ // #2721 —— /health 的 `broadcast` 一格:最近一次广播的时间/人数/批数/耗时。
102
+ describe('broadcastRecentState', () => {
103
+ test('records the last broadcast so a stall can be reconciled afterwards', async () => {
104
+ const targets = Array.from({ length: 7 }, (_, i) => ({ alias: `r${i}`, node_id: null, network_id: 'n1' }));
105
+ await enqueueBroadcast(targets, 'hello', 'hub', 'n1', {
106
+ isActive: () => true,
107
+ notify: () => {},
108
+ yieldBetweenChunks: async () => {},
109
+ chunkSize: 3,
110
+ });
111
+ const rec = broadcastRecentState();
112
+ expect(rec).not.toBeNull();
113
+ expect(rec!.recipients).toBe(7);
114
+ expect(rec!.chunks).toBe(3); // ceil(7/3)
115
+ expect(typeof rec!.took_ms).toBe('number');
116
+ expect(Number.isNaN(Date.parse(rec!.at))).toBe(false);
117
+ });
118
+ });
@@ -20,6 +20,26 @@ import { db } from "./db.js";
20
20
  /** 一批多少个收件人。50 是“一次事务不至于太长、又明显少于一次全量”的折中。 */
21
21
  export const BROADCAST_CHUNK = 50;
22
22
 
23
+ /**
24
+ * #2721 —— 最近一次广播的「事后可对上时间的」记录。
25
+ *
26
+ * 为什么要有:07:11 那次事故里,我花了不少时间才把“143.9 秒停顿”与“07:10 那条广播”
27
+ * 对上 —— 因为停顿记录(`event_loop.recent_stalls`)里只有时间与 RSS,没有“当时发生了什么”。
28
+ * 广播是唯一一种能一次性唤醒几百个 agent 的动作,值得在 `/health` 里留一格。
29
+ */
30
+ export type BroadcastRecord = {
31
+ at: string;
32
+ recipients: number;
33
+ chunks: number;
34
+ took_ms: number;
35
+ };
36
+
37
+ let lastBroadcast: BroadcastRecord | null = null;
38
+
39
+ export function broadcastRecentState(): BroadcastRecord | null {
40
+ return lastBroadcast;
41
+ }
42
+
23
43
  export type BroadcastTarget = { alias: string; node_id: string | null; network_id: string | null };
24
44
  export type BroadcastDelivered = { alias: string; netId: string | null };
25
45
 
@@ -40,6 +60,7 @@ export async function enqueueBroadcast(
40
60
  effectiveNetId: string | null,
41
61
  deps: BroadcastDeps,
42
62
  ): Promise<{ ids: string[]; delivered: BroadcastDelivered[] }> {
63
+ const startedMs = Date.now();
43
64
  const chunk = deps.chunkSize && deps.chunkSize > 0 ? deps.chunkSize : BROADCAST_CHUNK;
44
65
  const ids: string[] = [];
45
66
  const delivered: BroadcastDelivered[] = [];
@@ -67,5 +88,11 @@ export async function enqueueBroadcast(
67
88
  }
68
89
 
69
90
  for (const d of delivered) deps.notify(d.alias, d.netId);
91
+ lastBroadcast = {
92
+ at: new Date().toISOString(),
93
+ recipients: delivered.length,
94
+ chunks: Math.ceil(targets.length / chunk),
95
+ took_ms: Date.now() - startedMs,
96
+ };
70
97
  return { ids, delivered };
71
98
  }
package/src/server.ts CHANGED
@@ -31,7 +31,7 @@ import { createSSEStream, createNetworkObserverStream, createUserEventStream, pu
31
31
  import { enterMcpInflight, leaveMcpInflight, getMcpInflightStats } from "./mcp-inflight.js";
32
32
  import { eventLoopStats, startEventLoopLagMonitor } from "./event-loop-lag.js";
33
33
  import { aliasBaselineRefreshState, refreshAliasBaseline } from "./alias-baseline.js";
34
- import { enqueueBroadcast } from "./broadcast-fanout.js";
34
+ import { broadcastRecentState, enqueueBroadcast } from "./broadcast-fanout.js";
35
35
  import { assertNodeActive } from "./lifecycle-guard.js";
36
36
  import { pendingInboxCount } from "./inbox-count.js";
37
37
  import { notifyExpiredTasks, type ExpiredTaskRow } from "./task-expiry-notice.js";
@@ -78,6 +78,7 @@ import { mkdirSync, writeFileSync, readFileSync, readdirSync, existsSync, statSy
78
78
  import { dirname as pathDirname, join as pathJoin } from "path";
79
79
  import { startRetentionSweeper } from "./retention.js";
80
80
  import { sweepEmptyNodeRows } from "./empty-node-sweeper.js";
81
+ import { versionStats } from "./version-stats.js";
81
82
  import { startStaleSessionSweeper } from "./stale-sweeper.js";
82
83
  import {
83
84
  AUDIT_LOG_REST_SELECT,
@@ -2814,6 +2815,9 @@ return Bun.serve({
2814
2815
  // #2571 —— 告警阈值用的「每目标 p99 基线」最近一次刷新(只读聚合:时间/写了几行/现在共几行)。
2815
2816
  // 没有它,「这条告警为什么没报」只能进机器 sqlite 查。
2816
2817
  alert_baselines: aliasBaselineRefreshState(),
2818
+ // #2721 —— 最近一次广播(时间/收件人数/批数/耗时)。广播是唯一能一次性唤醒
2819
+ // 几百个 agent 的动作;没有这一格,事后只能把停顿记录和聊天记录对时间。
2820
+ broadcast: broadcastRecentState(),
2817
2821
  auth: DEV_OPEN ? "dev-open" : "user-token",
2818
2822
  security: DEV_OPEN ? "dev-open" : "secured",
2819
2823
  tmux: TMUX_ENABLED ? "enabled" : "disabled",
@@ -3189,6 +3193,19 @@ return Bun.serve({
3189
3193
  return withCors(req, Response.json({ ok: true, ...routeStats(minutes * 60_000, Date.now(), { byCaller }) }));
3190
3194
  }
3191
3195
 
3196
+ // ── #2720 REST: 版本债务(只读聚合)──
3197
+ // 为什么要有这一条:370 个 session 里 159 个没有版本号,而「没有版本」不是一个桶 ——
3198
+ // 24 个是 claude-code(LLM 会话自己调工具,没有版本概念),9 个才是老 agent-node。
3199
+ // 把两者混算会得出“升级节点能修好 33 个”的错误结论(只能修好 9 个)。
3200
+ // 返回聚合数字,不含 alias 明细;节点令牌只看自己绑定的网络。
3201
+ if (url.pathname === "/api/stats/versions" && req.method === "GET") {
3202
+ if (restAuth && !isAdmin && !restAuth.networkId) {
3203
+ return withCors(req, Response.json({ ok: false, error: "admin or network token required" }, { status: 403 }));
3204
+ }
3205
+ const scopeNet = restAuth?.networkId ?? null;
3206
+ return withCors(req, Response.json({ ok: true, ...versionStats(scopeNet) }));
3207
+ }
3208
+
3192
3209
  // ── #473 REST: SSE connection detail (ops-only) ──
3193
3210
  // The per-key breakdown /health used to expose anonymously: keys are
3194
3211
  // `{networkId}:{alias}` (+ `\0netobs:{networkId}` observer keys via
@@ -0,0 +1,66 @@
1
+ // #2720 —— 版本债务聚合:无版本要按 agent 拆,别把「没有版本概念」算成债务。
2
+ import { afterAll, beforeAll, describe, expect, test } from "bun:test";
3
+ import { db } from "./db.js";
4
+ import { versionStats } from "./version-stats.js";
5
+
6
+ let networkId = "";
7
+
8
+ function insertSession(alias: string, agent: string, version: string | null, status: string) {
9
+ db.run(
10
+ `INSERT INTO sessions (resume_id, alias, agent, version, status, network_id, registered_at)
11
+ VALUES (?1, ?2, ?3, ?4, ?5, ?6, '2026-10-01 00:00:00')`,
12
+ [`res_${alias}`, alias, agent, version, status, networkId],
13
+ );
14
+ }
15
+
16
+ beforeAll(async () => {
17
+ const { register } = await import("./auth.js");
18
+ const auth = register(`verstats_${Date.now()}`, "VerStats-Str0ng-1!", undefined, "watcher");
19
+ expect(auth.ok).toBe(true);
20
+ networkId = auth.network_id!;
21
+
22
+ insertSession("n-new", "agent-node:opencode", "2.3.0-preview.199", "idle");
23
+ insertSession("n-old", "agent-node:opencode", "2.3.0-preview.150", "idle");
24
+ insertSession("n-old-2", "agent-node:opencode", "2.3.0-preview.150", "working");
25
+ insertSession("n-gone", "agent-node:opencode", "2.3.0-preview.150", "offline");
26
+ // LLM 自己调工具的会话:没有版本是 n/a,不是债务
27
+ insertSession("cc-1", "claude-code", null, "idle");
28
+ insertSession("cc-2", "claude-code", null, "offline");
29
+ // 老 agent-node:该报没报,是真债务
30
+ insertSession("old-node-1", "agent-node:claude", null, "idle");
31
+ }, 30_000);
32
+
33
+ afterAll(() => {});
34
+
35
+ describe("versionStats (#2720)", () => {
36
+ test("counts sessions and active sessions for the network", () => {
37
+ const s = versionStats(networkId);
38
+ expect(s.sessions).toBeGreaterThanOrEqual(7);
39
+ expect(s.active).toBeGreaterThanOrEqual(5);
40
+ });
41
+
42
+ test("keeps 'no version' split by agent, with version_expected flag", () => {
43
+ const s = versionStats(networkId);
44
+ const cc = s.no_version_by_agent.find((x) => x.agent === "claude-code");
45
+ const oldNode = s.no_version_by_agent.find((x) => x.agent === "agent-node:claude");
46
+ expect(cc?.version_expected).toBe(false); // LLM 工具调用:n/a
47
+ expect(oldNode?.version_expected).toBe(true); // 老节点:真债务
48
+ });
49
+
50
+ test("active_missing_version excludes producers with no version concept", () => {
51
+ const s = versionStats(networkId);
52
+ // 只有 old-node-1 计入(cc-1 是 n/a)
53
+ expect(s.active_missing_version).toBe(1);
54
+ });
55
+
56
+ test("active_behind_same_agent counts actives on a non-top version", () => {
57
+ const s = versionStats(networkId);
58
+ // .150 有 2 个在线(idle+working),.199 是最高的一个
59
+ expect(s.active_behind_same_agent).toBeGreaterThanOrEqual(2);
60
+ });
61
+
62
+ test("scoping by an unknown network yields nothing", () => {
63
+ const s = versionStats("net_does_not_exist");
64
+ expect(s.sessions).toBe(0);
65
+ });
66
+ });
@@ -0,0 +1,109 @@
1
+ // #2720 —— 让「版本债务」自己更新,不靠人跑 SQL。
2
+ //
3
+ // 背景(2026-10-27 生产只读统计):370 个 session 里 159 个没有版本号,
4
+ // 其中 33 个**还在线**。继续拆下去才看清真相:
5
+ // · 24 个的 `agent` 是 `claude-code` —— 那是 Claude 会话自己调
6
+ // `commhub_report_status(status=…, task=…)` 写的,**它没有 version 这个概念**;
7
+ // · 剩下 9 个才是老 agent-node(#1809 之前每次上报不带 version)。
8
+ // ⇒ 「无版本」不是一个桶:对 `claude-code` 是 n/a,对 agent-node 才是债务。
9
+ // 把两者混在一起算,会得出「升级节点能修好 33 个」的错误结论(只能修好 9 个)。
10
+ //
11
+ // 这个模块只做聚合(只读),返回:
12
+ // by_version —— (agent, version) → 总数/在线数
13
+ // no_version —— 按 agent 拆开的「无版本」,让调用方自己判 n/a 还是债务
14
+ // agent_kind —— 该 agent 的上报方式(`llm-tool-call` = 不自带版本)
15
+
16
+ import { db } from "./db.js";
17
+
18
+ /** 这些 agent 的上报者是 LLM 会话自己调工具,没有打包版本号可报(不是缺字段)。 */
19
+ const LLM_TOOL_CALL_AGENTS = new Set(["claude-code"]);
20
+
21
+ export type VersionBucket = {
22
+ agent: string;
23
+ version: string | null;
24
+ sessions: number;
25
+ active: number;
26
+ /** false = 这个 agent 没有版本概念(n/a),而不是“该报未报”。 */
27
+ version_expected: boolean;
28
+ };
29
+
30
+ export type VersionStats = {
31
+ network_id: string | null;
32
+ sessions: number;
33
+ active: number;
34
+ by_version: VersionBucket[];
35
+ no_version_by_agent: Array<{ agent: string; sessions: number; version_expected: boolean }>;
36
+ /** 在线且「该报版本却没报」的总数 —— 这才是真正的债务口径。 */
37
+ active_missing_version: number;
38
+ /** 在线且版本落后于「在线里最高版本」的数量(只对字符串完全可比的同 agent 生效)。 */
39
+ active_behind_same_agent: number;
40
+ };
41
+
42
+ export function versionStats(networkId: string | null = null): VersionStats {
43
+ const rows = db.all<{ agent: string | null; version: string | null; status: string | null; c: number }>(
44
+ `SELECT COALESCE(agent, '') AS agent,
45
+ COALESCE(NULLIF(version, ''), '') AS version,
46
+ COALESCE(status, '') AS status,
47
+ COUNT(*) AS c
48
+ FROM sessions
49
+ WHERE (?1 IS NULL OR network_id = ?1)
50
+ GROUP BY 1, 2, 3`,
51
+ networkId,
52
+ );
53
+
54
+ const buckets = new Map<string, VersionBucket>();
55
+ let sessions = 0;
56
+ let active = 0;
57
+ for (const r of rows) {
58
+ const isActive = r.status !== "offline";
59
+ sessions += r.c;
60
+ if (isActive) active += r.c;
61
+ const version = r.version === "" ? null : r.version;
62
+ const key = `${r.agent}\u0000${version ?? ""}`;
63
+ const cur = buckets.get(key) ?? {
64
+ agent: r.agent,
65
+ version,
66
+ sessions: 0,
67
+ active: 0,
68
+ version_expected: !LLM_TOOL_CALL_AGENTS.has(r.agent),
69
+ };
70
+ cur.sessions += r.c;
71
+ if (isActive) cur.active += r.c;
72
+ buckets.set(key, cur);
73
+ }
74
+
75
+ const all = [...buckets.values()].sort((a, b) => b.sessions - a.sessions || a.agent.localeCompare(b.agent));
76
+
77
+ const noVersion = all
78
+ .filter((b) => b.version === null)
79
+ .map((b) => ({ agent: b.agent, sessions: b.sessions, version_expected: b.version_expected }));
80
+
81
+ // 每个 agent 在「在线」行里出现过的最高版本(仅用于粗判落后;不做语义版本比较,
82
+ // 只在字符串完全一致时才算“同一个版本”)。
83
+ const highest = new Map<string, string>();
84
+ for (const b of all) {
85
+ if (!b.version || b.active === 0) continue;
86
+ const cur = highest.get(b.agent);
87
+ if (!cur || b.version.localeCompare(cur) > 0) highest.set(b.agent, b.version);
88
+ }
89
+ let behind = 0;
90
+ for (const b of all) {
91
+ if (!b.version || b.active === 0) continue;
92
+ const top = highest.get(b.agent);
93
+ if (top && b.version !== top) behind += b.active;
94
+ }
95
+
96
+ const activeMissingVersion = all
97
+ .filter((b) => b.version === null && b.version_expected)
98
+ .reduce((n, b) => n + b.active, 0);
99
+
100
+ return {
101
+ network_id: networkId,
102
+ sessions,
103
+ active,
104
+ by_version: all,
105
+ no_version_by_agent: noVersion,
106
+ active_missing_version: activeMissingVersion,
107
+ active_behind_same_agent: behind,
108
+ };
109
+ }