@sleep2agi/commhub-server 0.9.0-preview.187 → 0.9.0-preview.189
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.189",
|
|
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",
|
|
@@ -149,6 +149,22 @@ describe("Agent 显式归属部门", () => {
|
|
|
149
149
|
// #1976 —— Agent 归属与人类部门是两个独立的结构。通讯录顶层要说明「这个 Hub 支持显式
|
|
150
150
|
// Agent 部门」,客户端据此把「行里没有 department_id」读成「没有显式归属」,
|
|
151
151
|
// 而不是从「负责人在哪个部门」推断出来。
|
|
152
|
+
// #2888(通信客户端欧 2026-10-28 提)—— 军团按部门分区时,N 个部门要发 N 次
|
|
153
|
+
// `…/departments/:dept/nodes` 才能拼出「每个 Agent 属于哪个部门」,人数一多就慢。
|
|
154
|
+
// 事实上 /api/nodes 早就返回全部节点,只是没 select `department_id` 这一列。
|
|
155
|
+
// 补上之后一次往返就能完成分区初始化。
|
|
156
|
+
test("/api/nodes 一次返回全部节点且带 department_id(免 N 次部门往返)", async () => {
|
|
157
|
+
expect((await send(U.owner.token, "PUT", `/api/networks/${NET}/nodes/${NODE_A}/department`, { department_id: D.tmai })).status).toBe(200);
|
|
158
|
+
const all = await send(U.owner.token, "GET", `/api/nodes?network_id=${NET}`);
|
|
159
|
+
expect(all.status).toBe(200);
|
|
160
|
+
const row = (all.body.nodes ?? []).find((n: any) => n.node_id === NODE_A);
|
|
161
|
+
expect(row).toBeDefined();
|
|
162
|
+
expect(row.department_id).toBe(D.tmai);
|
|
163
|
+
// 未归属的节点这一格是 null(不是缺键)——分区逻辑可以统一按 null 判「未分组」。
|
|
164
|
+
const other = (all.body.nodes ?? []).find((n: any) => n.node_id === NODE_OUTSIDE);
|
|
165
|
+
if (other) expect(other.department_id ?? null).toBeNull();
|
|
166
|
+
});
|
|
167
|
+
|
|
152
168
|
test("通讯录声明支持显式 Agent 部门(与人类部门相互独立)", async () => {
|
|
153
169
|
const dir = await send(U.owner.token, "GET", `/api/requirements/people/directory?network_id=${NET}`);
|
|
154
170
|
expect(dir.status).toBe(200);
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
// #2881 —— 同一个排程的「卡住」通知每日上限。
|
|
2
|
+
//
|
|
3
|
+
// 现场(2026-10-28 只读统计):7 天 1162 条 schedule_stuck 通知,单个排程 220 条。
|
|
4
|
+
// 设计前提是「新的阻塞任务 = 新事件 ⇒ 重新上膛」,但节点长期被占时每轮都会产生新阻塞者,
|
|
5
|
+
// 于是一个永远跑不成的排程能一天发几十条,结果没人再看。
|
|
6
|
+
//
|
|
7
|
+
// 这组用例钉住:前 N 条照发,第 N+1 条起被抑制,且**排程状态不受影响**(只影响通知)。
|
|
8
|
+
import { describe, expect, test, beforeAll, afterAll } from "bun:test";
|
|
9
|
+
import { mkdtempSync, rmSync } from "fs";
|
|
10
|
+
import { join } from "path";
|
|
11
|
+
import { tmpdir } from "os";
|
|
12
|
+
import { db } from "./db.js";
|
|
13
|
+
import { sendStuckNotice, stuckNoticesSentToday, stuckNoticeMaxPerDay, SCHEDULE_STUCK_NOTICE_KIND } from "./scheduled-stuck.js";
|
|
14
|
+
|
|
15
|
+
const DIR = mkdtempSync(join(tmpdir(), "anet-stuck-cap-"));
|
|
16
|
+
const NET = "net_stuck_cap";
|
|
17
|
+
const USER = "u_stuck_cap";
|
|
18
|
+
const SCHED = "sched_stuck_cap_1";
|
|
19
|
+
const OTHER = "sched_stuck_cap_2";
|
|
20
|
+
|
|
21
|
+
function seedNotice(id: string, scheduleId: string, minutesAgo = 1) {
|
|
22
|
+
db.run(
|
|
23
|
+
`INSERT INTO user_inbox (message_id, network_id, user_id, from_session, kind, title, content, severity, meta_json, acked, created_at)
|
|
24
|
+
VALUES (?1, ?2, ?3, 'cap-node', ?4, 't', 'c', 'warning', ?5, 0, datetime('now', ?6))`,
|
|
25
|
+
[id, NET, USER, SCHEDULE_STUCK_NOTICE_KIND,
|
|
26
|
+
JSON.stringify({ schedule_stuck: { reason: "stuck", schedule_id: scheduleId, blocked_by_task_id: "t1", skips: 3 } }),
|
|
27
|
+
`-${minutesAgo} minutes`],
|
|
28
|
+
);
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
const notice = (scheduleId: string) => ({
|
|
32
|
+
reason: "stuck" as const,
|
|
33
|
+
scheduleId,
|
|
34
|
+
scheduleName: "cap-test",
|
|
35
|
+
networkId: NET,
|
|
36
|
+
createdBy: USER,
|
|
37
|
+
alias: "cap-node",
|
|
38
|
+
timezone: "Asia/Shanghai",
|
|
39
|
+
taskId: "t-new",
|
|
40
|
+
taskCreatedAt: "2026-10-28 10:00:00",
|
|
41
|
+
skips: 3,
|
|
42
|
+
timeoutMs: 3_600_000,
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
describe("schedule_stuck 通知每日上限", () => {
|
|
46
|
+
beforeAll(() => {
|
|
47
|
+
db.run("DELETE FROM user_inbox WHERE network_id = ?1", [NET]);
|
|
48
|
+
});
|
|
49
|
+
afterAll(() => {
|
|
50
|
+
db.run("DELETE FROM user_inbox WHERE network_id = ?1", [NET]);
|
|
51
|
+
rmSync(DIR, { recursive: true, force: true });
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
test("默认上限是 4", () => {
|
|
55
|
+
expect(stuckNoticeMaxPerDay()).toBe(4);
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
test("前 N 条照发,第 N+1 条起被抑制", () => {
|
|
59
|
+
const cap = stuckNoticeMaxPerDay();
|
|
60
|
+
for (let i = 0; i < cap; i++) seedNotice(`msg_cap_${i}`, SCHED, i + 1);
|
|
61
|
+
expect(stuckNoticesSentToday(SCHED)).toBe(cap);
|
|
62
|
+
// 已达上限 ⇒ 返回 null(不发),且不会新增行
|
|
63
|
+
expect(sendStuckNotice(notice(SCHED))).toBeNull();
|
|
64
|
+
expect(stuckNoticesSentToday(SCHED)).toBe(cap);
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
test("计数按排程隔离:别的排程不受影响,仍能发", () => {
|
|
68
|
+
for (let i = 0; i < stuckNoticeMaxPerDay(); i++) seedNotice(`msg_cap_o_${i}`, OTHER, i + 1);
|
|
69
|
+
expect(stuckNoticesSentToday(OTHER)).toBe(stuckNoticeMaxPerDay());
|
|
70
|
+
// 另一个排程已满,但本条排程仍是 0 —— 隔离性检查
|
|
71
|
+
expect(stuckNoticesSentToday("sched_stuck_cap_3")).toBe(0);
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
test("超出 24 小时的旧通知不计入当日上限(上限是滚动的,不是历史累计)", () => {
|
|
75
|
+
db.run("DELETE FROM user_inbox WHERE network_id = ?1", [NET]);
|
|
76
|
+
seedNotice("msg_old_1", SCHED, 25 * 60);
|
|
77
|
+
seedNotice("msg_old_2", SCHED, 30 * 60);
|
|
78
|
+
expect(stuckNoticesSentToday(SCHED)).toBe(0);
|
|
79
|
+
});
|
|
80
|
+
});
|
package/src/scheduled-stuck.ts
CHANGED
|
@@ -169,9 +169,42 @@ export function stuckNoticeText(n: StuckNotice): { title: string; text: string }
|
|
|
169
169
|
};
|
|
170
170
|
}
|
|
171
171
|
|
|
172
|
-
|
|
172
|
+
// #2881 —— 同一个排程的「卡住」通知每天限 N 条。
|
|
173
|
+
//
|
|
174
|
+
// 现场(2026-10-28 只读统计):7 天 1162 条 schedule_stuck 通知,其中单个排程 220 条。
|
|
175
|
+
// 原因不是提醒不够,而是**提醒的设计前提被打破**:本意是「一个新的阻塞任务 = 一个新事件」,
|
|
176
|
+
// 于是每个阻塞者都会重新上膛。但节点如果长期被人占着,每一轮都会产生新的阻塞者,
|
|
177
|
+
// 于是一个永远跑不成的排程就能一天发几十条 —— 结果没人再看。
|
|
178
|
+
//
|
|
179
|
+
// 这里只加天花板,不动「新阻塞者 = 新事件」的语义(前 N 条照发),
|
|
180
|
+
// 也没有任何自动动作:排程状态不受影响。
|
|
181
|
+
export function stuckNoticeMaxPerDay(): number {
|
|
182
|
+
return Math.floor(envNumber("COMMHUB_SCHEDULE_STUCK_NOTICE_MAX_PER_DAY", 4, 1));
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
/** 该排程近 24 小时已发过几条卡住通知。 */
|
|
186
|
+
export function stuckNoticesSentToday(scheduleId: string): number {
|
|
187
|
+
try {
|
|
188
|
+
return db.get<{ n: number }>(
|
|
189
|
+
`SELECT COUNT(*) AS n FROM user_inbox
|
|
190
|
+
WHERE kind = ?1 AND json_extract(meta_json, '$.schedule_stuck.schedule_id') = ?2
|
|
191
|
+
AND created_at >= datetime('now', '-24 hours')`,
|
|
192
|
+
SCHEDULE_STUCK_NOTICE_KIND, scheduleId,
|
|
193
|
+
)?.n ?? 0;
|
|
194
|
+
} catch {
|
|
195
|
+
return 0; // 读不到就不拦(宁可多发一条,也不要因为查询失败而彻底静音)
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
/** 提交之后调用。没有创建者 / 创建者不在网络里 / 当日已超上限 → 不发。 */
|
|
173
200
|
export function sendStuckNotice(n: StuckNotice): string | null {
|
|
174
201
|
if (!n.createdBy) return null;
|
|
202
|
+
const cap = stuckNoticeMaxPerDay();
|
|
203
|
+
const sentToday = stuckNoticesSentToday(n.scheduleId);
|
|
204
|
+
if (sentToday >= cap) {
|
|
205
|
+
console.log(`[scheduled-tasks] stuck notice capped schedule=${n.scheduleId} sent_today=${sentToday} cap=${cap} (${n.reason})`);
|
|
206
|
+
return null;
|
|
207
|
+
}
|
|
175
208
|
try {
|
|
176
209
|
const { title, text } = stuckNoticeText(n);
|
|
177
210
|
return sendAgentNotice({
|
package/src/server.ts
CHANGED
|
@@ -5272,7 +5272,8 @@ return Bun.serve({
|
|
|
5272
5272
|
config_path, channels, server, hostname,
|
|
5273
5273
|
network_id, created_at, updated_at,
|
|
5274
5274
|
config_snapshot, lifecycle_state, avatar_url,
|
|
5275
|
-
display_name, team, tags, attrs_revision, permission_mode, owner_user_id
|
|
5275
|
+
display_name, team, tags, attrs_revision, permission_mode, owner_user_id,
|
|
5276
|
+
department_id
|
|
5276
5277
|
FROM nodes WHERE 1=1`;
|
|
5277
5278
|
const params: any[] = [];
|
|
5278
5279
|
sql = addAgentNetworkScope(sql, params, restScope, { alias: "alias", nodeId: "node_id" });
|