@sleep2agi/commhub-server 0.9.0-preview.281 → 0.9.0-preview.283
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/build-info.json +2 -2
- package/package.json +1 -1
- package/src/agent-acl-slice3-http.test.ts +3 -2
- package/src/api-host-supervisors-source-capabilities.test.ts +107 -0
- package/src/auth_login_guard.test.ts +15 -0
- package/src/auth_login_guard.ts +20 -1
- package/src/board-grants.test.ts +134 -0
- package/src/broadcast-attribution.test.ts +93 -0
- package/src/build-commit-report-http.test.ts +10 -0
- package/src/clone-node-adopted-db.test.ts +78 -0
- package/src/clone-node.ts +5 -1
- package/src/create-node-department.test.ts +145 -0
- package/src/create-node.ts +35 -0
- package/src/db.ts +11 -0
- package/src/department-heads.ts +3 -0
- package/src/expiry-counters.test.ts +50 -1
- package/src/expiry-counters.ts +31 -9
- package/src/mcp-write-network-resolution.test.ts +36 -0
- package/src/node-attrs-validate.ts +34 -0
- package/src/node-attrs.test.ts +32 -0
- package/src/node-config-last-update.test.ts +103 -1
- package/src/node-config-last-update.ts +70 -5
- package/src/node-daemon-bindings.ts +9 -0
- package/src/node-description-http.test.ts +121 -0
- package/src/node-description.test.ts +34 -0
- package/src/node-grants-http.test.ts +239 -0
- package/src/node-grants.ts +234 -0
- package/src/node-inbox-allowlist-http.test.ts +35 -0
- package/src/node-permissions.ts +37 -2
- package/src/opencode-v2-catalog.test.ts +22 -1
- package/src/opencode-v2-catalog.ts +36 -3
- package/src/peer-allowlist.test.ts +29 -0
- package/src/registration-switch-http.test.ts +60 -0
- package/src/reply-bare-infer-4315.test.ts +86 -0
- package/src/requirements.ts +29 -4
- package/src/schedule-agent.ts +45 -10
- package/src/scheduled-tasks-http.test.ts +25 -0
- package/src/scheduled-tasks.ts +46 -2
- package/src/server.ts +132 -11
- package/src/steer-send-message.test.ts +121 -0
- package/src/task-access.ts +21 -1
- package/src/tool-audience-http.test.ts +5 -0
- package/src/tools.ts +147 -42
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
// #4685 —— send_message 的 steer 参数(与 control:"interrupt" 并列):
|
|
2
|
+
// 1. steer 与 control 互斥(两个都给 → steer_conflicts_with_control);
|
|
3
|
+
// 2. steer:true 落库 meta_json={"delivery":"steer"},type 仍为 message(不新增 type,不惊动唤醒分叉);
|
|
4
|
+
// 3. 响应带 delivery:"steer";不传 steer 时 meta_json 为 null(回归)。
|
|
5
|
+
import { afterAll, beforeEach, afterEach, describe, expect, test } from "bun:test";
|
|
6
|
+
import { db } from "./db.js";
|
|
7
|
+
import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
|
|
8
|
+
import { registerTools } from "./tools.js";
|
|
9
|
+
import { __resetSSEClientsForTest, createSSEStream } from "./push.js";
|
|
10
|
+
|
|
11
|
+
const NET = "steer-test-net", OWNER = "steer-owner", RECV = "steer-recv";
|
|
12
|
+
type ToolHandler = (args: any) => Promise<{ content: Array<{ type: "text"; text: string }> }>;
|
|
13
|
+
|
|
14
|
+
function cleanup() {
|
|
15
|
+
for (const t of ["inbox", "tasks", "task_events"]) { try { db.run(`DELETE FROM ${t} WHERE network_id = ?1`, [NET]); } catch {} }
|
|
16
|
+
try { db.run("DELETE FROM sessions WHERE network_id = ?1", [NET]); } catch {}
|
|
17
|
+
try { db.run("DELETE FROM nodes WHERE network_id = ?1", [NET]); } catch {}
|
|
18
|
+
try { db.run("DELETE FROM network_members WHERE network_id = ?1", [NET]); } catch {}
|
|
19
|
+
try { db.run("DELETE FROM networks WHERE network_id = ?1", [NET]); } catch {}
|
|
20
|
+
try { db.run("DELETE FROM users WHERE user_id = ?1", [OWNER]); } catch {}
|
|
21
|
+
}
|
|
22
|
+
function seed() {
|
|
23
|
+
db.run(`INSERT INTO users (user_id, username, password_hash, role, created_at) VALUES (?1, ?1, 'x', 'user', datetime('now'))`, [OWNER]);
|
|
24
|
+
db.run(`INSERT INTO networks (network_id, network_name, owner_id, created_at) VALUES (?1, ?1, ?2, datetime('now'))`, [NET, OWNER]);
|
|
25
|
+
db.run(`INSERT INTO network_members (user_id, network_id, role, joined_at) VALUES (?1, ?2, 'owner', datetime('now'))`, [OWNER, NET]);
|
|
26
|
+
db.run(`INSERT INTO nodes (node_id, node_name, alias, network_id, hostname, created_at, updated_at, lifecycle_state) VALUES (?1, ?2, ?2, ?3, 'host', datetime('now'), datetime('now'), 'active')`, [`node_${RECV}`, RECV, NET]);
|
|
27
|
+
db.run(`INSERT INTO sessions (resume_id, alias, status, node_id, network_id, updated_at, last_seen_at) VALUES (?1, ?2, 'idle', ?3, ?4, datetime('now'), datetime('now'))`, [`res_${RECV}`, RECV, `node_${RECV}`, NET]);
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
beforeEach(() => { cleanup(); seed(); });
|
|
31
|
+
afterEach(() => { __resetSSEClientsForTest(); });
|
|
32
|
+
afterAll(cleanup);
|
|
33
|
+
|
|
34
|
+
function buildHandlers(alias: string): Record<string, ToolHandler> {
|
|
35
|
+
const server = new McpServer({ name: "test", version: "0" }) as any;
|
|
36
|
+
const tools: Record<string, ToolHandler> = {};
|
|
37
|
+
const origTool = server.tool.bind(server);
|
|
38
|
+
server.tool = (name: string, _desc: string, schema: any, handler: ToolHandler) => {
|
|
39
|
+
tools[name] = handler;
|
|
40
|
+
return origTool(name, _desc, schema, handler);
|
|
41
|
+
};
|
|
42
|
+
registerTools(server, undefined, NET, OWNER, alias, true, null);
|
|
43
|
+
return tools;
|
|
44
|
+
}
|
|
45
|
+
async function call(handler: ToolHandler, args: any): Promise<Record<string, any>> {
|
|
46
|
+
const r = await handler(args);
|
|
47
|
+
return JSON.parse(r.content[0].text);
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
async function readFrame(reader: ReadableStreamDefaultReader<Uint8Array>, timeoutMs = 2_000): Promise<Record<string, any>> {
|
|
51
|
+
const decoder = new TextDecoder();
|
|
52
|
+
let buf = "";
|
|
53
|
+
const deadline = Date.now() + timeoutMs;
|
|
54
|
+
while (Date.now() < deadline) {
|
|
55
|
+
const result = await Promise.race([
|
|
56
|
+
reader.read(),
|
|
57
|
+
new Promise<never>((_, rej) => setTimeout(() => rej(new Error(`no SSE frame within ${timeoutMs}ms`)), deadline - Date.now())),
|
|
58
|
+
]);
|
|
59
|
+
if (result.done) throw new Error("SSE stream ended unexpectedly");
|
|
60
|
+
buf += decoder.decode(result.value, { stream: true });
|
|
61
|
+
const sep = buf.indexOf("\n\n");
|
|
62
|
+
if (sep === -1) continue;
|
|
63
|
+
const dataLine = buf.slice(0, sep).split("\n").find((l) => l.startsWith("data: "));
|
|
64
|
+
if (!dataLine) continue;
|
|
65
|
+
return JSON.parse(dataLine.slice(6));
|
|
66
|
+
}
|
|
67
|
+
throw new Error(`no SSE frame within ${timeoutMs}ms`);
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
describe("#4685 send_message steer", () => {
|
|
71
|
+
test("steer 与 control 互斥 → steer_conflicts_with_control", async () => {
|
|
72
|
+
const tools = buildHandlers(OWNER);
|
|
73
|
+
const r = await call(tools.send_message, { alias: RECV, message: "x", control: "interrupt", steer: true, network_id: NET });
|
|
74
|
+
expect(r.ok).toBe(false);
|
|
75
|
+
expect(r.error).toBe("steer_conflicts_with_control");
|
|
76
|
+
});
|
|
77
|
+
|
|
78
|
+
test("steer:true 落库 meta_json={\"delivery\":\"steer\"},响应带 delivery", async () => {
|
|
79
|
+
const tools = buildHandlers(OWNER);
|
|
80
|
+
const r = await call(tools.send_message, { alias: RECV, message: "请改口", steer: true, network_id: NET });
|
|
81
|
+
expect(r.ok).toBe(true);
|
|
82
|
+
expect(r.delivery).toBe("steer");
|
|
83
|
+
expect(r.accepted).toBe(true);
|
|
84
|
+
const row = db.get<{ type: string; meta_json: string | null }>("SELECT type, meta_json FROM inbox WHERE network_id = ?1", NET);
|
|
85
|
+
expect(row!.type).toBe("message");
|
|
86
|
+
expect(JSON.parse(row!.meta_json!)).toEqual({ delivery: "steer" });
|
|
87
|
+
});
|
|
88
|
+
|
|
89
|
+
test("不传 steer → meta_json 为 null(回归)", async () => {
|
|
90
|
+
const tools = buildHandlers(OWNER);
|
|
91
|
+
const r = await call(tools.send_message, { alias: RECV, message: "普通", network_id: NET });
|
|
92
|
+
expect(r.ok).toBe(true);
|
|
93
|
+
expect(r.delivery).toBeUndefined();
|
|
94
|
+
const row = db.get<{ meta_json: string | null }>("SELECT meta_json FROM inbox WHERE network_id = ?1", NET);
|
|
95
|
+
expect(row!.meta_json).toBeNull();
|
|
96
|
+
});
|
|
97
|
+
|
|
98
|
+
// #4685 —— control:"interrupt" 必须让 SSE new_message 事件带上 control 字段:
|
|
99
|
+
// 节点侧(cli.ts copresence 分支)靠 ev.control 决定是否唤醒工作通道去捞 type=control 的 inbox 行。
|
|
100
|
+
// 这里不写,control 行会卡在「信息/工作」两条 lane 之间,节点永远不取 → 真机「停止」不生效。
|
|
101
|
+
test("control:interrupt 落库 type=control,且 SSE new_message 带 control 字段", async () => {
|
|
102
|
+
const reader = createSSEStream(RECV, NET).body!.getReader();
|
|
103
|
+
await readFrame(reader); // swallow connected
|
|
104
|
+
|
|
105
|
+
const tools = buildHandlers(OWNER);
|
|
106
|
+
const r = await call(tools.send_message, { alias: RECV, message: "x", control: "interrupt", network_id: NET });
|
|
107
|
+
expect(r.ok).toBe(true);
|
|
108
|
+
expect(r.control).toBe("interrupt");
|
|
109
|
+
expect(r.accepted).toBe(true);
|
|
110
|
+
|
|
111
|
+
const row = db.get<{ type: string; content: string; priority: string }>(
|
|
112
|
+
"SELECT type, content, priority FROM inbox WHERE network_id = ?1", NET);
|
|
113
|
+
expect(row!.type).toBe("control");
|
|
114
|
+
expect(JSON.parse(row!.content)).toEqual({ op: "interrupt" });
|
|
115
|
+
expect(row!.priority).toBe("high");
|
|
116
|
+
|
|
117
|
+
const evt = await readFrame(reader);
|
|
118
|
+
expect(evt.type).toBe("new_message");
|
|
119
|
+
expect(evt.control).toBe("interrupt");
|
|
120
|
+
});
|
|
121
|
+
});
|
package/src/task-access.ts
CHANGED
|
@@ -138,7 +138,15 @@ function headOf(userId: string, row: CardRow): boolean {
|
|
|
138
138
|
* only=false(正常模式、执行开关打开)—— 主人能改的能改,另外「派给这个节点的」在主人看得见时也能改;
|
|
139
139
|
* only=true (受限模式)—— 只看、只改派给这个节点的卡(负责 Agent / 参与人 / 它建的,及这些卡的子任务)。
|
|
140
140
|
*/
|
|
141
|
-
export type TaskCaller = {
|
|
141
|
+
export type TaskCaller = {
|
|
142
|
+
userId: string;
|
|
143
|
+
node?: { id: string; only: boolean };
|
|
144
|
+
/**
|
|
145
|
+
* 节点管理授权(第二期 board)带来的**额外**可见范围。
|
|
146
|
+
* 有它才拼额外的析取项;没有它,SQL 必须逐字节不变(测试钉住这一点)。
|
|
147
|
+
*/
|
|
148
|
+
board?: { network: boolean; users: ReadonlySet<string>; nodes: ReadonlySet<string> };
|
|
149
|
+
} | null;
|
|
142
150
|
|
|
143
151
|
export const nodeRefPattern = (nodeId: string) => `%${likeEscape(`"kind":"node","id":"${nodeId}"`)}%`;
|
|
144
152
|
const nodeRefIs = (json: string | null | undefined, nodeId: string) => !!json && json.includes(`"kind":"node","id":"${nodeId}"`);
|
|
@@ -315,6 +323,18 @@ function addTaskVisibilityScopeAsUser(sql: string, params: unknown[], caller: Ta
|
|
|
315
323
|
const ph = (ids: string[]) => ids.map((id) => `?${params.push(id)}`).join(", ");
|
|
316
324
|
const all = scoped.map((s) => s.networkId);
|
|
317
325
|
const parts = [`network_id NOT IN (${ph(all)})`];
|
|
326
|
+
// #board —— 节点管理授权(第二期):**只加析取项**,且只在 caller 带 board 时才动 SQL。
|
|
327
|
+
// 没有授权(人 / 普通节点)时这里一行都不执行 ⇒ SQL 逐字节不变。
|
|
328
|
+
if (caller.board) {
|
|
329
|
+
if (caller.board.network) {
|
|
330
|
+
parts.push("1 = 1"); // network 范围:放开这个节点能看的卡(不拼巨大 IN 列表)
|
|
331
|
+
} else {
|
|
332
|
+
const extra: string[] = [];
|
|
333
|
+
if (caller.board.users.size) extra.push(`owner_json IN (${ph([...caller.board.users].map((id) => JSON.stringify({ kind: "user", id })))})`);
|
|
334
|
+
if (caller.board.nodes.size) extra.push(`agent_owner_json IN (${ph([...caller.board.nodes].map((id) => JSON.stringify({ kind: "node", id })))})`);
|
|
335
|
+
if (extra.length) parts.push(`(${extra.join(" OR ")})`);
|
|
336
|
+
}
|
|
337
|
+
}
|
|
318
338
|
if (members.length) {
|
|
319
339
|
const pat = params.push(userRefPattern(caller.userId));
|
|
320
340
|
const mine = `owner_json LIKE ?${pat} ESCAPE '\\' OR participants_json LIKE ?${pat} ESCAPE '\\' OR created_by_json LIKE ?${pat} ESCAPE '\\' OR (created_by_json IS NULL AND created_by = ?${uid})`;
|
|
@@ -243,6 +243,11 @@ describe("bytes per role (#476 ceilings stay meaningful per role)", () => {
|
|
|
243
243
|
// 压到 "Build commit (hex)"(19 字符)⇒ node 64,497 B,余量 **3 B**。
|
|
244
244
|
// ⚠️ 3 B 不是「刚好」,是**陷阱**:下一个人加一个字段名就会撞墙,而这条测试的失败会
|
|
245
245
|
// 读成「谁又把描述写长了」。所以下面把余量打出来,余量低于 100 B 时大声说一句。
|
|
246
|
+
// 2026-11-14:create_node 新增 department_id(新节点归哪个部门)。all 先撞墙 86,534 > 86,500(+34 B)。
|
|
247
|
+
// 照规矩**不抬上限**:去掉工具描述末尾的 RFC / issue 编号(RFC-024/026/027/028、app#225、Hub #938,共 13 处,
|
|
248
|
+
// 调用方用不上这些编号,上下文都在代码注释里),clone_node 描述顺手压短 —— 合计约 −156 B。
|
|
249
|
+
// 2026-11-15:get_all_status / get_session_status 描述里点名 description / profile.description(节点职责介绍,
|
|
250
|
+
// 让调用方知道去哪读别的节点「负责什么」)。照规矩不抬上限,两句都压到最短。
|
|
246
251
|
const CEILINGS = { node: 64_500, user: 60_500, all: 86_500 } as const;
|
|
247
252
|
const MARGIN_FLOOR = 100;
|
|
248
253
|
test("node / user / all", async () => {
|