@sleep2agi/commhub-server 0.9.0-preview.280 → 0.9.0-preview.282
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/anet-variant-real-daemon-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 +13 -2
- package/src/clone-node-adopted-db.test.ts +78 -0
- package/src/clone-node.ts +5 -1
- package/src/create-node.ts +17 -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/health-redaction.test.ts +8 -4
- package/src/launched-by-cli-report-http.test.ts +155 -0
- package/src/mcp-write-network-resolution.test.ts +36 -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-grants-http.test.ts +239 -0
- package/src/node-grants.ts +234 -0
- package/src/node-inbox-allowlist-http.test.ts +355 -0
- package/src/node-lifecycle-read.ts +1 -1
- package/src/node-permissions.ts +168 -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-comment-http.test.ts +1 -1
- package/src/requirements-status-participants-http.test.ts +3 -3
- 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 +65 -5
- package/src/server.ts +186 -11
- package/src/session-project-attach-migration.test.ts +2 -1
- package/src/session-project-attach-native.test.ts +3 -1
- package/src/session-project-create-http.test.ts +3 -2
- package/src/session-project-create-native.test.ts +3 -1
- package/src/session-source-delivery.ts +5 -0
- package/src/session-source-directory-http.test.ts +5 -1
- package/src/session-source-evidence.test.ts +11 -4
- package/src/session-source-transport.ts +7 -1
- package/src/steer-send-message.test.ts +121 -0
- package/src/task-access.ts +21 -1
- package/src/test-work-root.ts +18 -0
- package/src/tools.ts +117 -33
package/build-info.json
CHANGED
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.282",
|
|
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",
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
// Isolated real Hub + real agent-node CLI startup probe, no direct handler calls.
|
|
2
2
|
import { expect, test } from "bun:test";
|
|
3
3
|
import { spawn } from "node:child_process";
|
|
4
|
-
import { mkdtempSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
4
|
+
import { existsSync, mkdtempSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
5
5
|
import { tmpdir } from "node:os";
|
|
6
6
|
import { join } from "node:path";
|
|
7
7
|
import { register, createNetworkTokenForNode } from "./auth.js";
|
|
8
8
|
import { db } from "./db.js";
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
// Needs the TEST-ONLY toolchain (/tool/bun, /out/cli.js) baked into the variant test image.
|
|
11
|
+
test.skipIf(!existsSync("/tool/bun") || !existsSync("/out/cli.js"))("real daemon reaches owned TEST-ONLY runtime readiness", async () => {
|
|
11
12
|
const root = mkdtempSync(join(tmpdir(), "anet-4099-daemon-"));
|
|
12
13
|
const stamp = Date.now(), alias = `variant-daemon-${stamp}`, nodeId = `node_variant_${stamp}`;
|
|
13
14
|
const user = register(`variant_owner_${stamp}`, "Fixture4099Only!x");
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
// #4495 — /api/host-supervisors 投影「源目录 / 新建节点 / 复用已有 Session」这五条能力。
|
|
2
|
+
//
|
|
3
|
+
// 之前这五条只存在 nodes.config_snapshot 里,没有任何 REST 出口:
|
|
4
|
+
// 生产上 daemon-dev / daemon-vdev 明明报了(见 DB),客户端却只能靠猜
|
|
5
|
+
// (app 的 NodeSourcePalette 直接写死 hasProjectCreateCapability: true)。
|
|
6
|
+
//
|
|
7
|
+
// 口径与 can_create_nodes 一致:daemon 没报 ⇒ 键不出现;报的值不认识 ⇒ 也不出现,
|
|
8
|
+
// 绝不把任意字符串透给客户端当能力。
|
|
9
|
+
import { describe, expect, test, beforeAll, afterAll } from "bun:test";
|
|
10
|
+
import "./require-explicit-test-db.js";
|
|
11
|
+
import { register, login } from "./auth.js";
|
|
12
|
+
import { db } from "./db.js";
|
|
13
|
+
|
|
14
|
+
let BASE = "";
|
|
15
|
+
let server: any = null;
|
|
16
|
+
let userToken = "";
|
|
17
|
+
let userNetworkId = "";
|
|
18
|
+
let userId = "";
|
|
19
|
+
|
|
20
|
+
const CAPS = {
|
|
21
|
+
source_directory_read: "source-directory-read-v1-opencode-2.0.22",
|
|
22
|
+
project_new_session: "project-new-session-v1-opencode-2.0.22",
|
|
23
|
+
session_attach: "existing-session-attach-v1-opencode-2.0.22",
|
|
24
|
+
source_fork_transport: "source-fork-transport-v1-opencode-2.0.22",
|
|
25
|
+
source_node_delivery: "source-node-delivery-v1-opencode-2.0.22",
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
beforeAll(async () => {
|
|
29
|
+
process.env.HOST = "127.0.0.1";
|
|
30
|
+
const suffix = `${Date.now()}_${Math.floor(Math.random() * 1000)}`;
|
|
31
|
+
const password = "BootstrapPw123Aa!";
|
|
32
|
+
const seed = register(`shc_seed_${suffix}`, password, undefined, "seed");
|
|
33
|
+
if (!seed.ok) throw new Error("seed failed");
|
|
34
|
+
db.run("UPDATE users SET role = 'admin' WHERE username = ?1", [`shc_seed_${suffix}`]);
|
|
35
|
+
const u = register(`shc_u_${suffix}`, password, undefined, "seed");
|
|
36
|
+
if (!u.ok || !u.token) throw new Error("user register failed");
|
|
37
|
+
userToken = u.token;
|
|
38
|
+
userNetworkId = u.network_id ?? "";
|
|
39
|
+
userId = login(`shc_u_${suffix}`, password).user!.user_id;
|
|
40
|
+
const { bootServer } = await import("./server.js");
|
|
41
|
+
server = bootServer({ port: 0, hostname: "127.0.0.1" });
|
|
42
|
+
BASE = `http://127.0.0.1:${server.port}`;
|
|
43
|
+
await new Promise((r) => setTimeout(r, 100));
|
|
44
|
+
}, 60_000);
|
|
45
|
+
|
|
46
|
+
afterAll(() => { try { server?.stop?.(true); } catch {} });
|
|
47
|
+
|
|
48
|
+
function seedDaemon(alias: string, snapshot: object | null): void {
|
|
49
|
+
db.run(
|
|
50
|
+
`INSERT OR REPLACE INTO nodes (node_id, node_name, alias, runtime, model, config_path,
|
|
51
|
+
channels, server, hostname, network_id, config_revision, config_snapshot)
|
|
52
|
+
VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12)`,
|
|
53
|
+
[`shc_n_${alias}`, alias, alias, "claude-agent-sdk", "m", "/tmp/c.json", "[]", "h", "h",
|
|
54
|
+
userNetworkId, 0, snapshot === null ? null : JSON.stringify(snapshot)],
|
|
55
|
+
);
|
|
56
|
+
db.run(
|
|
57
|
+
`INSERT OR REPLACE INTO api_tokens (token_id, token_hash, user_id, network_id, name, scope)
|
|
58
|
+
VALUES (?1, ?2, ?3, ?4, ?5, ?6)`,
|
|
59
|
+
[`shc_t_${alias}`, `hash_${alias}`, userId, userNetworkId, `node:${alias}`, "network"],
|
|
60
|
+
);
|
|
61
|
+
}
|
|
62
|
+
const clearDaemons = () => {
|
|
63
|
+
db.run("DELETE FROM nodes WHERE network_id = ?1", [userNetworkId]);
|
|
64
|
+
db.run("DELETE FROM api_tokens WHERE network_id = ?1 AND name LIKE 'node:%'", [userNetworkId]);
|
|
65
|
+
};
|
|
66
|
+
async function daemon(alias: string): Promise<any> {
|
|
67
|
+
const res = await fetch(`${BASE}/api/host-supervisors`, { headers: { Authorization: `Bearer ${userToken}` } });
|
|
68
|
+
const body = await res.json();
|
|
69
|
+
if (!body.ok) throw new Error("list failed: " + JSON.stringify(body));
|
|
70
|
+
const d = body.daemons.find((x: any) => x.alias === alias);
|
|
71
|
+
if (!d) throw new Error(`daemon ${alias} missing`);
|
|
72
|
+
return d;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
describe("#4495 — host_supervisors 投影源能力", () => {
|
|
76
|
+
test("报了五条 ⇒ 原值出现在响应里(客户端终于有得可读)", async () => {
|
|
77
|
+
clearDaemons();
|
|
78
|
+
seedDaemon("caps-a", { role: "host_supervisor", daemon_capabilities: { ...CAPS } });
|
|
79
|
+
const d = await daemon("caps-a");
|
|
80
|
+
for (const [k, v] of Object.entries(CAPS)) expect(d[k]).toBe(v);
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
test("值不认识 / 类型不对 ⇒ 键不出现(不透传任意字符串)", async () => {
|
|
84
|
+
clearDaemons();
|
|
85
|
+
seedDaemon("caps-b", {
|
|
86
|
+
role: "host_supervisor",
|
|
87
|
+
daemon_capabilities: {
|
|
88
|
+
source_directory_read: "source-directory-read-v0-something",
|
|
89
|
+
project_new_session: 1,
|
|
90
|
+
session_attach: "",
|
|
91
|
+
},
|
|
92
|
+
});
|
|
93
|
+
const d = await daemon("caps-b");
|
|
94
|
+
expect(d.source_directory_read).toBeUndefined();
|
|
95
|
+
expect(d.project_new_session).toBeUndefined();
|
|
96
|
+
expect(d.session_attach).toBeUndefined();
|
|
97
|
+
});
|
|
98
|
+
|
|
99
|
+
test("老 daemon(有 role 但没报这些能力)⇒ 五条都不出现,不是 false/null", async () => {
|
|
100
|
+
clearDaemons();
|
|
101
|
+
// 🔴 没有 snapshot 的节点根本不会被当成 host_supervisor 列出(role 判不出来),
|
|
102
|
+
// 所以「老 daemon」的真实形状是:有 role,但 daemon_capabilities 里没这几条。
|
|
103
|
+
seedDaemon("caps-c", { role: "host_supervisor", daemon_capabilities: { can_create_nodes: true } });
|
|
104
|
+
const d = await daemon("caps-c");
|
|
105
|
+
for (const k of Object.keys(CAPS)) expect(k in d).toBe(false);
|
|
106
|
+
});
|
|
107
|
+
});
|
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
LOGIN_IP_MAX_PER_WINDOW,
|
|
7
7
|
LOGIN_IP_WINDOW_MS,
|
|
8
8
|
getLoginClientIp,
|
|
9
|
+
trustedProxyIps,
|
|
9
10
|
LoginFailureLockout,
|
|
10
11
|
LoginIpRateLimiter,
|
|
11
12
|
normalizeLoginUsername,
|
|
@@ -127,4 +128,18 @@ describe("getLoginClientIp", () => {
|
|
|
127
128
|
expect(getLoginClientIp(withRealIp)).toBe("203.0.113.20");
|
|
128
129
|
expect(getLoginClientIp(new Request("http://127.0.0.1/api/auth/login"))).toBe("unknown");
|
|
129
130
|
});
|
|
131
|
+
|
|
132
|
+
test("COMMHUB_TRUSTED_PROXY_IPS: only a trusted peer's forwarded headers count; direct callers are keyed by their own address", () => {
|
|
133
|
+
const trusted = trustedProxyIps({ COMMHUB_TRUSTED_PROXY_IPS: " 47.0.0.1 , ::ffff:10.0.0.9" });
|
|
134
|
+
expect([...trusted!]).toEqual(["47.0.0.1", "10.0.0.9"]);
|
|
135
|
+
const spoofed = new Request("http://127.0.0.1/api/auth/login", { headers: { "x-forwarded-for": "198.51.100.1", "x-real-ip": "198.51.100.2" } });
|
|
136
|
+
// 直连(对端不在名单):伪造的头不算数。
|
|
137
|
+
expect(getLoginClientIp(spoofed, "::ffff:203.0.113.7", trusted)).toBe("203.0.113.7");
|
|
138
|
+
// 经可信代理:用代理追加的最后一跳。
|
|
139
|
+
const viaProxy = new Request("http://127.0.0.1/api/auth/login", { headers: { "x-forwarded-for": "198.51.100.1, 203.0.113.8" } });
|
|
140
|
+
expect(getLoginClientIp(viaProxy, "47.0.0.1", trusted)).toBe("203.0.113.8");
|
|
141
|
+
// 没设名单 = 旧行为。
|
|
142
|
+
expect(getLoginClientIp(spoofed, "203.0.113.7", null)).toBe("198.51.100.1");
|
|
143
|
+
expect(trustedProxyIps({})).toBeNull();
|
|
144
|
+
});
|
|
130
145
|
});
|
package/src/auth_login_guard.ts
CHANGED
|
@@ -98,7 +98,26 @@ export function normalizeLoginUsername(username: unknown): string {
|
|
|
98
98
|
return typeof username === "string" ? username.trim().toLowerCase() : "";
|
|
99
99
|
}
|
|
100
100
|
|
|
101
|
-
|
|
101
|
+
/**
|
|
102
|
+
* COMMHUB_TRUSTED_PROXY_IPS(逗号分隔)—— 只有从这些地址连进来的请求,才信它带的 X-Forwarded-For / X-Real-IP。
|
|
103
|
+
* 不设 = 旧行为(谁带都信),其它部署不受影响。设了以后,直连 Hub 端口的请求(对端不在名单里)
|
|
104
|
+
* 一律按对端地址限速:伪造 X-Forwarded-For 绕不过登录 / 注册的按 IP 限速(2026-11-11 安全排查)。
|
|
105
|
+
*/
|
|
106
|
+
export function trustedProxyIps(env: Record<string, string | undefined> = process.env): Set<string> | null {
|
|
107
|
+
const raw = env.COMMHUB_TRUSTED_PROXY_IPS?.trim();
|
|
108
|
+
if (!raw) return null;
|
|
109
|
+
return new Set(raw.split(",").map(s => normalizePeerIp(s.trim())).filter(Boolean));
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
/** `::ffff:1.2.3.4` → `1.2.3.4`(Bun 对 IPv4 连接常给映射地址)。 */
|
|
113
|
+
export function normalizePeerIp(ip: string | null | undefined): string {
|
|
114
|
+
const v = (ip ?? "").trim();
|
|
115
|
+
return v.toLowerCase().startsWith("::ffff:") ? v.slice(7) : v;
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
export function getLoginClientIp(req: Request, peer?: string | null, trusted: Set<string> | null = trustedProxyIps()): string {
|
|
119
|
+
const direct = normalizePeerIp(peer);
|
|
120
|
+
if (trusted && direct && !trusted.has(direct)) return direct;
|
|
102
121
|
const fwd = req.headers.get("x-forwarded-for");
|
|
103
122
|
if (fwd) {
|
|
104
123
|
const last = fwd.split(",").map((s) => s.trim()).filter(Boolean).at(-1);
|
|
@@ -0,0 +1,134 @@
|
|
|
1
|
+
// 第二期·任务看板(board)的判定口径。
|
|
2
|
+
//
|
|
3
|
+
// 与 schedules **不同**(别混):
|
|
4
|
+
// schedules 按「目标节点所在部门」判;
|
|
5
|
+
// board 按「**卡的负责人所在部门**」判 —— 卡没有目标节点,只有 owner(人)/ agent_owner(节点)。
|
|
6
|
+
// 这里钉住四件事:network 范围命中任何卡、department 范围按负责人部门(含子树)、
|
|
7
|
+
// node 范围只命中 agent_owner 就是那个节点的卡、readonly 模式下 edit 降 read。
|
|
8
|
+
import { afterAll, beforeAll, describe, expect, test } from "bun:test";
|
|
9
|
+
import { db } from "./db.js";
|
|
10
|
+
import { departmentCardsFor, departmentSubtree, isDepartmentCard } from "./department-heads.js";
|
|
11
|
+
import "./departments.js"; // 建 network_departments(该表的 DDL 在 departments.ts,不在 db.ts)
|
|
12
|
+
import { boardGrantForCard } from "./node-grants.js";
|
|
13
|
+
import { addTaskVisibilityScope, userRefPattern } from "./task-access.js";
|
|
14
|
+
|
|
15
|
+
const NET = `net_board_${Date.now()}`;
|
|
16
|
+
const DEPT_PARENT = `dept_bp_${Date.now()}`;
|
|
17
|
+
const DEPT_CHILD = `dept_bc_${Date.now()}`;
|
|
18
|
+
const DEPT_OTHER = `dept_bo_${Date.now()}`;
|
|
19
|
+
const U_IN = `${NET}_u_in`, U_OUT = `${NET}_u_out`, U_PARENT = `${NET}_u_parent`;
|
|
20
|
+
const N_GRANTED = `node_granted_${NET}`, N_CARD = `node_card_${NET}`, N_OTHER = `node_other_${NET}`;
|
|
21
|
+
|
|
22
|
+
const userJson = (id: string) => JSON.stringify({ kind: "user", id });
|
|
23
|
+
const nodeJson = (id: string) => JSON.stringify({ kind: "node", id });
|
|
24
|
+
|
|
25
|
+
beforeAll(() => {
|
|
26
|
+
db.run("INSERT INTO networks (network_id, network_name, owner_id, created_at) VALUES (?1, ?1, ?2, datetime('now'))", [NET, U_PARENT]);
|
|
27
|
+
for (const [id, dept] of [[U_PARENT, DEPT_PARENT], [U_IN, DEPT_CHILD], [U_OUT, DEPT_OTHER]] as const) {
|
|
28
|
+
db.run(`INSERT INTO users (user_id, username, password_hash, role, created_at) VALUES (?1, ?1, 'x', 'user', datetime('now'))`, [id]);
|
|
29
|
+
// task_access='scoped' 才走可见性收窄(成员默认就是 scoped;这里直接插行要自己写)
|
|
30
|
+
db.run("INSERT INTO network_members (user_id, network_id, role, department_id, task_access, joined_at) VALUES (?1, ?2, 'member', ?3, 'scoped', datetime('now'))", [id, NET, dept]);
|
|
31
|
+
}
|
|
32
|
+
for (const [id, dept] of [[DEPT_PARENT, null], [DEPT_CHILD, DEPT_PARENT], [DEPT_OTHER, null]] as const) {
|
|
33
|
+
db.run("INSERT INTO network_departments (department_id, network_id, name, parent_id, sort, created_at) VALUES (?1, ?2, ?1, ?3, 0, datetime('now'))", [id, NET, dept]);
|
|
34
|
+
}
|
|
35
|
+
// 🔴 卡的「agent 负责人」是否属于某部门,判的是**agent 的主人在不在部门成员里**(nodesOwnedBy),
|
|
36
|
+
// 不是 agent 节点自己的 department_id —— 所以这里用 owner_user_id 建边。
|
|
37
|
+
for (const [id, owner] of [[N_GRANTED, U_PARENT], [N_CARD, U_IN], [N_OTHER, U_OUT]] as const) {
|
|
38
|
+
db.run("INSERT INTO nodes (node_id, node_name, alias, network_id, owner_user_id, created_at) VALUES (?1, ?1, ?1, ?2, ?3, datetime('now'))", [id, NET, owner]);
|
|
39
|
+
}
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
afterAll(() => {
|
|
43
|
+
try { db.run("DELETE FROM node_grants WHERE network_id = ?1", [NET]); } catch {}
|
|
44
|
+
try { db.run("DELETE FROM nodes WHERE network_id = ?1", [NET]); } catch {}
|
|
45
|
+
try { db.run("DELETE FROM network_departments WHERE network_id = ?1", [NET]); } catch {}
|
|
46
|
+
try { db.run("DELETE FROM network_members WHERE network_id = ?1", [NET]); } catch {}
|
|
47
|
+
try { db.run("DELETE FROM users WHERE user_id LIKE ?1", [`${NET}%`]); } catch {}
|
|
48
|
+
try { db.run("DELETE FROM networks WHERE network_id = ?1", [NET]); } catch {}
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
const grant = (scope_kind: string, scope_id: string, level: string) =>
|
|
52
|
+
db.run(
|
|
53
|
+
"INSERT INTO node_grants (network_id, node_id, capability, scope_kind, scope_id, level, granted_by, created_at) VALUES (?1, ?2, 'board', ?3, ?4, ?5, ?6, datetime('now'))",
|
|
54
|
+
[NET, N_GRANTED, scope_kind, scope_id, level, U_PARENT],
|
|
55
|
+
);
|
|
56
|
+
|
|
57
|
+
describe("board 判定:按卡的负责人所在部门", () => {
|
|
58
|
+
test("部门的卡 = 负责人(人或 agent 的主人)在部门成员里", () => {
|
|
59
|
+
const cards = departmentCardsFor(NET, departmentSubtree(NET, DEPT_PARENT));
|
|
60
|
+
expect(isDepartmentCard(cards, { owner_json: userJson(U_IN) })).toBe(true);
|
|
61
|
+
expect(isDepartmentCard(cards, { owner_json: null, agent_owner_json: nodeJson(N_CARD) })).toBe(true);
|
|
62
|
+
expect(isDepartmentCard(cards, { owner_json: userJson(U_OUT) })).toBe(false);
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
test("没有授权 → null(不许默认放行)", () => {
|
|
66
|
+
expect(boardGrantForCard(NET, N_GRANTED, { owner_json: userJson(U_IN) })).toBeNull();
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
test("department=父部门 ⇒ 子部门的卡也算(子树)", () => {
|
|
70
|
+
grant("department", DEPT_PARENT, "read");
|
|
71
|
+
expect(boardGrantForCard(NET, N_GRANTED, { owner_json: userJson(U_IN) })).toBe("read");
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
test("不在授权部门子树里的卡 → null", () => {
|
|
75
|
+
expect(boardGrantForCard(NET, N_GRANTED, { owner_json: userJson(U_OUT), agent_owner_json: null })).toBeNull();
|
|
76
|
+
});
|
|
77
|
+
|
|
78
|
+
test("edit 授权 + readonly 模式 ⇒ 降为 read", () => {
|
|
79
|
+
db.run("DELETE FROM node_grants WHERE network_id = ?1", [NET]);
|
|
80
|
+
grant("department", DEPT_PARENT, "edit");
|
|
81
|
+
expect(boardGrantForCard(NET, N_GRANTED, { owner_json: userJson(U_IN) })).toBe("edit");
|
|
82
|
+
expect(boardGrantForCard(NET, N_GRANTED, { owner_json: userJson(U_IN) }, "readonly")).toBe("read");
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
test("node 范围只命中 agent_owner 就是该节点的卡", () => {
|
|
86
|
+
db.run("DELETE FROM node_grants WHERE network_id = ?1", [NET]);
|
|
87
|
+
grant("node", N_OTHER, "edit");
|
|
88
|
+
expect(boardGrantForCard(NET, N_GRANTED, { owner_json: userJson(U_IN), agent_owner_json: nodeJson(N_OTHER) })).toBe("edit");
|
|
89
|
+
expect(boardGrantForCard(NET, N_GRANTED, { owner_json: userJson(U_IN), agent_owner_json: nodeJson(N_CARD) })).toBeNull();
|
|
90
|
+
});
|
|
91
|
+
|
|
92
|
+
test("network 范围命中任何卡", () => {
|
|
93
|
+
db.run("DELETE FROM node_grants WHERE network_id = ?1", [NET]);
|
|
94
|
+
grant("network", NET, "read");
|
|
95
|
+
expect(boardGrantForCard(NET, N_GRANTED, { owner_json: userJson(U_OUT) })).toBe("read");
|
|
96
|
+
// 没有任何负责人的卡也归全网授权管(不是「默认放行」——是 network 范围本来覆盖全部卡)
|
|
97
|
+
expect(boardGrantForCard(NET, N_GRANTED, { owner_json: null })).toBe("read");
|
|
98
|
+
});
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
describe("读侧:只有带 board 的调用才动 SQL(没授权逐字节不变)", () => {
|
|
102
|
+
const sql = "FROM requirements WHERE 1=1";
|
|
103
|
+
// 逐字节 golden:任务范围收窄那段的原文(改动前就是这样)。任何「顺手多拼一个子句 / 多压一个参数」都会红。
|
|
104
|
+
const GOLDEN =
|
|
105
|
+
"FROM requirements WHERE 1=1 AND (network_id NOT IN (?2) OR (network_id IN (?4) AND (owner_json LIKE ?3 ESCAPE '\\' " +
|
|
106
|
+
"OR participants_json LIKE ?3 ESCAPE '\\' OR created_by_json LIKE ?3 ESCAPE '\\' OR (created_by_json IS NULL AND created_by = ?1) " +
|
|
107
|
+
"OR project_id IN (SELECT g.project_id FROM network_member_project_grants g WHERE g.user_id = ?1 AND g.network_id = requirements.network_id))))";
|
|
108
|
+
const goldenParams = () => [U_IN, NET, userRefPattern(U_IN), NET];
|
|
109
|
+
|
|
110
|
+
test("没授权节点:SQL 与参数逐字节不变", () => {
|
|
111
|
+
const p: unknown[] = [];
|
|
112
|
+
const got = addTaskVisibilityScope(sql, p, { userId: U_IN, node: { id: N_GRANTED, only: false } });
|
|
113
|
+
expect(got).toBe(GOLDEN);
|
|
114
|
+
expect(p).toEqual(goldenParams());
|
|
115
|
+
});
|
|
116
|
+
test("人(无 board):同样逐字节不变", () => {
|
|
117
|
+
const p: unknown[] = [];
|
|
118
|
+
expect(addTaskVisibilityScope(sql, p, { userId: U_IN })).toBe(GOLDEN);
|
|
119
|
+
expect(p).toEqual(goldenParams());
|
|
120
|
+
});
|
|
121
|
+
test("network 范围:放开(1 = 1),不拼巨大 IN 列表、不额外压参数", () => {
|
|
122
|
+
const p: unknown[] = [];
|
|
123
|
+
const got = addTaskVisibilityScope(sql, p, { userId: U_IN, board: { network: true, users: new Set(), nodes: new Set() } });
|
|
124
|
+
expect(got).toContain("1 = 1");
|
|
125
|
+
expect(p).toEqual(goldenParams());
|
|
126
|
+
});
|
|
127
|
+
test("部门范围:按 owner / agent_owner 各加一个析取项", () => {
|
|
128
|
+
const p: unknown[] = [];
|
|
129
|
+
const got = addTaskVisibilityScope(sql, p, { userId: U_IN, board: { network: false, users: new Set([U_PARENT]), nodes: new Set([N_CARD]) } });
|
|
130
|
+
expect(got).toContain("owner_json IN (?3)");
|
|
131
|
+
expect(got).toContain("agent_owner_json IN (?4)");
|
|
132
|
+
expect(p.length).toBe(6);
|
|
133
|
+
});
|
|
134
|
+
});
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
// #4066 —— 广播的发信人必须是**真的调用者**,不是 'hub'。
|
|
2
|
+
//
|
|
3
|
+
// 现场(2026-11-13,生产库实测):type='broadcast' 且 from_session='hub' 共 3253 行。
|
|
4
|
+
// 收件人看到「来自 hub」,正文却是 "[TMA客户端欧5号] …" —— 分不清谁说的。
|
|
5
|
+
// 根因:MCP `broadcast` 工具把 fromSession 写死成 "hub"(tools.ts),
|
|
6
|
+
// 而同一处已经在用 inboxSender() 取真实调用者做收件白名单判定。
|
|
7
|
+
//
|
|
8
|
+
// 这个文件钉住:节点令牌调用 broadcast 时,落库的 from_session == 该节点 alias。
|
|
9
|
+
|
|
10
|
+
import { afterAll, beforeAll, expect, test } from "bun:test";
|
|
11
|
+
import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
|
|
12
|
+
import { db } from "./db.js";
|
|
13
|
+
import { registerTools } from "./tools.js";
|
|
14
|
+
|
|
15
|
+
type ToolHandler = (args: any) => Promise<{ content: Array<{ type: "text"; text: string }> }>;
|
|
16
|
+
|
|
17
|
+
const stamp = `${Date.now()}`;
|
|
18
|
+
const CALLER = `bcast-sender-${stamp}`;
|
|
19
|
+
const TARGETS = [`bcast-target-a-${stamp}`, `bcast-target-b-${stamp}`];
|
|
20
|
+
let NET = "";
|
|
21
|
+
let USER = "";
|
|
22
|
+
let TOKEN_ID = "";
|
|
23
|
+
|
|
24
|
+
function buildBroadcastHandler(): ToolHandler {
|
|
25
|
+
const server = new McpServer({ name: "test", version: "0" }) as any;
|
|
26
|
+
const tools: Record<string, ToolHandler> = {};
|
|
27
|
+
const origTool = server.tool.bind(server);
|
|
28
|
+
server.tool = (name: string, _desc: string, _schema: any, handler: ToolHandler) => {
|
|
29
|
+
tools[name] = handler;
|
|
30
|
+
return origTool(name, _desc, _schema, handler);
|
|
31
|
+
};
|
|
32
|
+
const origRegisterTool = server.registerTool?.bind(server);
|
|
33
|
+
if (origRegisterTool) {
|
|
34
|
+
server.registerTool = (name: string, _cfg: any, handler: ToolHandler) => {
|
|
35
|
+
tools[name] = handler;
|
|
36
|
+
return origRegisterTool(name, _cfg, handler);
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
registerTools(
|
|
40
|
+
server,
|
|
41
|
+
/* clientIP */ undefined,
|
|
42
|
+
/* enforceNetworkId */ NET,
|
|
43
|
+
/* enforceUserId */ USER,
|
|
44
|
+
/* callerAlias */ CALLER,
|
|
45
|
+
/* callerTokenIsNetwork */ true,
|
|
46
|
+
/* callerTokenId */ TOKEN_ID,
|
|
47
|
+
);
|
|
48
|
+
const h = tools["broadcast"];
|
|
49
|
+
if (!h) throw new Error("broadcast tool not registered");
|
|
50
|
+
return h;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
beforeAll(async () => {
|
|
54
|
+
const { register } = await import("./auth.js");
|
|
55
|
+
const auth: any = register(`bcast_owner_${stamp}`, "Bcast-Owner-Strong-1!", undefined, "tester");
|
|
56
|
+
expect(auth.ok).toBe(true);
|
|
57
|
+
NET = auth.network_id;
|
|
58
|
+
USER = auth.user_id;
|
|
59
|
+
TOKEN_ID = `tok_${stamp}`;
|
|
60
|
+
// 收件人:只插 sessions 行(没有 nodes 行 ⇒ assertNodeActive 视为 active,见 lifecycle-guard.ts:46)。
|
|
61
|
+
TARGETS.forEach((alias, i) => {
|
|
62
|
+
db.run(
|
|
63
|
+
`INSERT INTO sessions (resume_id, alias, network_id, status, node_id, last_seen_at, updated_at)
|
|
64
|
+
VALUES (?1, ?2, ?3, 'idle', ?4, datetime('now'), datetime('now'))`,
|
|
65
|
+
[`resume-${stamp}-${i}`, alias, NET, `n_bcast_${stamp}_${i}`],
|
|
66
|
+
);
|
|
67
|
+
});
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
afterAll(() => {
|
|
71
|
+
try { db.run("DELETE FROM inbox WHERE network_id = ?1 AND session_name LIKE ?2", [NET, `bcast-target-%${stamp}`]); } catch {}
|
|
72
|
+
try { db.run("DELETE FROM sessions WHERE network_id = ?1 AND alias LIKE ?2", [NET, `bcast-target-%${stamp}`]); } catch {}
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
test("广播落库的 from_session 是调用者的 alias,不是 'hub'", async () => {
|
|
76
|
+
const handler = buildBroadcastHandler();
|
|
77
|
+
const reply = await handler({ message: `[${CALLER}] attribution probe ${stamp}` });
|
|
78
|
+
const body = JSON.parse(reply.content[0].text);
|
|
79
|
+
expect(body.ok).toBe(true);
|
|
80
|
+
|
|
81
|
+
const rows = db.all<{ session_name: string; from_session: string | null }>(
|
|
82
|
+
"SELECT session_name, from_session FROM inbox WHERE network_id = ?1 AND type = 'broadcast' AND content LIKE ?2",
|
|
83
|
+
[NET, `%attribution probe ${stamp}%`],
|
|
84
|
+
);
|
|
85
|
+
expect(rows.length).toBeGreaterThan(0);
|
|
86
|
+
for (const r of rows) {
|
|
87
|
+
expect(r.from_session).toBe(CALLER);
|
|
88
|
+
expect(r.from_session).not.toBe("hub");
|
|
89
|
+
}
|
|
90
|
+
// 两个收件人都应收到,且都记为同一个真实发信人。
|
|
91
|
+
const names = rows.map(r => r.session_name).sort();
|
|
92
|
+
expect(names).toEqual([...TARGETS].sort());
|
|
93
|
+
});
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
// ③ 读路径把它投影出来(否则界面上看不见)
|
|
8
8
|
// 少任何一处,现场表现都是「节点明明发了、hub 上没有」,与 daemon 侧 bug 一模一样。
|
|
9
9
|
import { afterAll, beforeAll, describe, expect, test } from "bun:test";
|
|
10
|
-
import { mkdtempSync, rmSync } from "node:fs";
|
|
10
|
+
import { existsSync, mkdtempSync, rmSync } from "node:fs";
|
|
11
11
|
import { tmpdir } from "node:os";
|
|
12
12
|
import { join } from "node:path";
|
|
13
13
|
import { register, createNetworkTokenForNode } from "./auth.js";
|
|
@@ -126,6 +126,16 @@ describe("#3144 opencode_catalog_seen_at 的三段链路(真 HTTP)", () => {
|
|
|
126
126
|
expect(row.opencode_catalog).toEqual(["a/b"]);
|
|
127
127
|
expect(row.opencode_catalog_seen_at).toBeNull();
|
|
128
128
|
expect(row.opencode_catalog_seen_at).not.toBe("");
|
|
129
|
+
expect(row.opencode_catalog_variants).toBeNull();
|
|
130
|
+
});
|
|
131
|
+
|
|
132
|
+
test("admin 2026-11-11:思考档位随清单上报 ⇒ 投影里读得到", async () => {
|
|
133
|
+
expect((await report({ config_snapshot: {
|
|
134
|
+
opencode_catalog: ["deepseek/deepseek-flash"],
|
|
135
|
+
opencode_catalog_variants: ["deepseek/deepseek-flash=none,low,high,max"],
|
|
136
|
+
} })).ok).toBe(true);
|
|
137
|
+
const row = (await nodes()).nodes.find((n: any) => n.alias === ALIAS);
|
|
138
|
+
expect(row.opencode_catalog_variants).toEqual(["deepseek/deepseek-flash=none,low,high,max"]);
|
|
129
139
|
});
|
|
130
140
|
});
|
|
131
141
|
|
|
@@ -156,7 +166,8 @@ test("variant-capable model update persists private ack policy across lost capab
|
|
|
156
166
|
expect((await rpc("ack_config_update", { update_id: queued.update_id, status: "rejected", error: "test_complete" })).ok).toBe(true);
|
|
157
167
|
});
|
|
158
168
|
|
|
159
|
-
|
|
169
|
+
// Needs the TEST-ONLY OpenCode build at /tool/opencode (only in the V2 test image).
|
|
170
|
+
test.skipIf(!existsSync("/tool/opencode"))("TEST-ONLY real Hub HTTP and owned runtime variant via explicit node dispatch", async () => {
|
|
160
171
|
const { openVettedOpenCodeCopresence } = await import("../../agent-node/src/runtime/opencode-copresence/runtime.js");
|
|
161
172
|
const { OPENCODE_V2_BACKEND } = await import("../../agent-node/src/runtime/opencode-backend.js");
|
|
162
173
|
const { applyVariantConfig } = await import("../../agent-node/src/runtime/opencode-copresence/variant-config-apply.js");
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
// admin 2026-11-10「fork 到新目录」走 clone_node(new_empty)。两条 Hub 侧前提:
|
|
2
|
+
// ① 被 daemon **收编**(adopt)的节点也是它的子节点 —— 此前只认 succeeded 的
|
|
3
|
+
// create 行,收编节点(vdev 上 35 个里的 31 个)一律 source_not_daemon_child;
|
|
4
|
+
// ② 克隆出来的节点落在源节点的部门(与 source fork #3485 同一条规则),
|
|
5
|
+
// 已被人显式放过部门的不覆盖。
|
|
6
|
+
import './require-explicit-test-db';
|
|
7
|
+
import './departments';
|
|
8
|
+
import { afterAll, beforeEach, expect, test } from 'bun:test';
|
|
9
|
+
import { db } from './db';
|
|
10
|
+
import { adoptedCloneSourceRow } from './node-daemon-bindings';
|
|
11
|
+
import { finalizeCreateOnFirstRegister } from './create-node';
|
|
12
|
+
import { factsFromRows } from './clone-node';
|
|
13
|
+
|
|
14
|
+
const NET = 'net_clone_adopted';
|
|
15
|
+
const DAEMON = 'node_daemon_clone_adopted';
|
|
16
|
+
|
|
17
|
+
function cleanup() {
|
|
18
|
+
db.run('DELETE FROM node_daemon_bindings WHERE network_id = ?1', [NET]);
|
|
19
|
+
db.run('DELETE FROM node_create_requests WHERE network_id = ?1', [NET]);
|
|
20
|
+
db.run('DELETE FROM nodes WHERE network_id = ?1', [NET]);
|
|
21
|
+
}
|
|
22
|
+
beforeEach(cleanup);
|
|
23
|
+
afterAll(cleanup);
|
|
24
|
+
|
|
25
|
+
function node(id: string, dept: string | null) {
|
|
26
|
+
db.run('INSERT INTO nodes(node_id,node_name,alias,network_id,department_id) VALUES(?1,?1,?1,?2,?3)', [id, NET, dept]);
|
|
27
|
+
}
|
|
28
|
+
function binding(nodeId: string, status: string) {
|
|
29
|
+
db.run(`INSERT INTO node_daemon_bindings(request_id,network_id,node_id,daemon_node_id,workdir,requested_by,status,created_at,updated_at)
|
|
30
|
+
VALUES(?1,?2,?3,?4,'/srv/ws/x','u_test',?5,1,1)`, [`adopt_${nodeId}_${status}`, NET, nodeId, DAEMON, status]);
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
test('an actively adopted node is a clone source on its daemon; refused/revoked/none are not', () => {
|
|
34
|
+
binding('n_adopted', 'active');
|
|
35
|
+
expect(adoptedCloneSourceRow('n_adopted', NET, 'opencode-cli', 'n_adopted')).toEqual({
|
|
36
|
+
daemon_node_id: DAEMON, runtime: 'opencode-cli', model: null, flags_json: '{}', child_name: 'n_adopted',
|
|
37
|
+
});
|
|
38
|
+
binding('n_refused', 'refused');
|
|
39
|
+
expect(adoptedCloneSourceRow('n_refused', NET, 'opencode-cli', 'n_refused')).toBeUndefined();
|
|
40
|
+
expect(adoptedCloneSourceRow('n_none', NET, 'opencode-cli', 'n_none')).toBeUndefined();
|
|
41
|
+
// Another network's binding never counts.
|
|
42
|
+
expect(adoptedCloneSourceRow('n_adopted', 'net_other', 'opencode-cli', 'n_adopted')).toBeUndefined();
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
test('a clone inherits the source department on first register; explicit placement wins', () => {
|
|
46
|
+
node('n_src', 'dept_tma');
|
|
47
|
+
node('n_clone', null);
|
|
48
|
+
node('n_placed', 'dept_elsewhere');
|
|
49
|
+
node('n_plain', null);
|
|
50
|
+
const seed = (id: string, name: string, clone: object | null) => db.run(
|
|
51
|
+
`INSERT INTO node_create_requests
|
|
52
|
+
(request_id, daemon_node_id, child_name, network_id, runtime, model, flags_json, env_keys, status, created_at, created_by_token, clone_json)
|
|
53
|
+
VALUES (?1, ?2, ?3, ?4, 'opencode-cli', NULL, '{}', '[]', 'pending', ?5, 'tok_test', ?6)`,
|
|
54
|
+
[id, DAEMON, name, NET, Date.now(), clone ? JSON.stringify(clone) : null]);
|
|
55
|
+
seed('cr_clone', 'n_clone', { source_node_id: 'n_src', source_alias: 'n_src', workdir_policy: 'new_empty' });
|
|
56
|
+
seed('cr_placed', 'n_placed', { source_node_id: 'n_src', source_alias: 'n_src', workdir_policy: 'new_empty' });
|
|
57
|
+
seed('cr_plain', 'n_plain', null);
|
|
58
|
+
for (const id of ['n_clone', 'n_placed', 'n_plain']) {
|
|
59
|
+
expect(finalizeCreateOnFirstRegister({ node_id: id, alias: id, network_id: NET }).finalized).toBe(1);
|
|
60
|
+
}
|
|
61
|
+
const dept = (id: string) => db.get<{ department_id: string | null }>('SELECT department_id FROM nodes WHERE node_id=?1', id)?.department_id ?? null;
|
|
62
|
+
expect(dept('n_clone')).toBe('dept_tma');
|
|
63
|
+
expect(dept('n_placed')).toBe('dept_elsewhere');
|
|
64
|
+
// An ordinary create (no clone_json) is untouched.
|
|
65
|
+
expect(dept('n_plain')).toBeNull();
|
|
66
|
+
});
|
|
67
|
+
|
|
68
|
+
test('an OpenCode node reporting the "opencode-sdk" label clones as opencode-cli (vdev 2026-11-11)', () => {
|
|
69
|
+
const facts = (runtime: string | null, snapRuntime?: string) => factsFromRows({
|
|
70
|
+
node: { node_id: 'n_oc', alias: 'n_oc', runtime, config_snapshot: snapRuntime ? JSON.stringify({ runtime: snapRuntime }) : null },
|
|
71
|
+
createRow: null, existingNames: [], inflightNames: [],
|
|
72
|
+
}).runtime;
|
|
73
|
+
expect(facts('opencode-sdk')).toBe('opencode-cli');
|
|
74
|
+
expect(facts('opencode')).toBe('opencode-cli');
|
|
75
|
+
expect(facts(null, 'opencode-sdk')).toBe('opencode-cli');
|
|
76
|
+
expect(facts('opencode-cli')).toBe('opencode-cli');
|
|
77
|
+
expect(facts('claude-code-cli')).toBe('claude-code-cli');
|
|
78
|
+
});
|
package/src/clone-node.ts
CHANGED
|
@@ -201,8 +201,12 @@ export function factsFromRows(input: {
|
|
|
201
201
|
const snapFlags = snap.flags && typeof snap.flags === "object" && !Array.isArray(snap.flags)
|
|
202
202
|
? snap.flags as Record<string, unknown>
|
|
203
203
|
: {};
|
|
204
|
-
const
|
|
204
|
+
const reported = (typeof snap.runtime === "string" && snap.runtime) ? snap.runtime
|
|
205
205
|
: (input.node.runtime || input.createRow?.runtime || null);
|
|
206
|
+
// nodes.runtime 是运行中节点自报的**标签**:OpenCode 节点报 "opencode-sdk" / "opencode",
|
|
207
|
+
// 而 daemon 能创建的 runtime 只有 "opencode-cli"(daemon 实际照磁盘上源节点 config 的 runtime 写)。
|
|
208
|
+
// 不归一就会把收编来的 OpenCode 节点一律拒成 runtime_invalid(vdev 2026-11-11 实测)。
|
|
209
|
+
const runtime = reported === "opencode-sdk" || reported === "opencode" ? "opencode-cli" : reported;
|
|
206
210
|
const model = (typeof snap.model === "string" || snap.model === null) ? (snap.model as string | null)
|
|
207
211
|
: (input.node.model ?? input.createRow?.model ?? null);
|
|
208
212
|
const channels = Array.isArray(snap.channels) ? snap.channels
|
package/src/create-node.ts
CHANGED
|
@@ -186,6 +186,22 @@ export function stopBackgroundTimersForTest(): void {
|
|
|
186
186
|
// in caller's network, mark it succeeded and stamp the real
|
|
187
187
|
// child_node_id. Mirrors RFC-024 finalizePendingMatchingUpdates.
|
|
188
188
|
|
|
189
|
+
/** A clone (fork to a new folder) lands in its source's department, unless
|
|
190
|
+
* someone already placed it. Same rule as the source fork (#3485). Best effort. */
|
|
191
|
+
export function inheritCloneDepartment(requestId: string, childNodeId: string, networkId: string): void {
|
|
192
|
+
try {
|
|
193
|
+
const raw = db.get<{ clone_json: string | null }>("SELECT clone_json FROM node_create_requests WHERE request_id = ?1", requestId)?.clone_json;
|
|
194
|
+
if (!raw) return;
|
|
195
|
+
const sourceId = (JSON.parse(raw) as { source_node_id?: unknown })?.source_node_id;
|
|
196
|
+
if (typeof sourceId !== "string" || !sourceId) return;
|
|
197
|
+
db.run(`UPDATE nodes SET department_id = (SELECT s.department_id FROM nodes s WHERE s.node_id = ?2 AND s.network_id = ?3)
|
|
198
|
+
WHERE node_id = ?1 AND network_id = ?3 AND (department_id IS NULL OR department_id = '')`,
|
|
199
|
+
[childNodeId, sourceId, networkId]);
|
|
200
|
+
} catch (e: any) {
|
|
201
|
+
console.warn(`[commhub] clone department inherit failed: ${e?.message || e}`);
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
|
|
189
205
|
export function finalizeCreateOnFirstRegister(
|
|
190
206
|
incoming: { node_id: string; alias: string; network_id: string | null },
|
|
191
207
|
): { finalized: number; matchedIds: string[] } {
|
|
@@ -208,6 +224,7 @@ export function finalizeCreateOnFirstRegister(
|
|
|
208
224
|
[incoming.node_id, Date.now(), row.request_id],
|
|
209
225
|
);
|
|
210
226
|
matchedIds.push(row.request_id);
|
|
227
|
+
inheritCloneDepartment(row.request_id, incoming.node_id, net);
|
|
211
228
|
console.log(`[commhub] ✓ create-node finalize: request=${row.request_id} child=${incoming.alias} (${incoming.node_id}) daemon=${row.daemon_node_id}`);
|
|
212
229
|
auditCreateNode({
|
|
213
230
|
action: "create_node_succeeded",
|
package/src/department-heads.ts
CHANGED
|
@@ -12,6 +12,9 @@
|
|
|
12
12
|
// can_edit=1 = 可改)。旧代码不读它,回滚安全。递归在 JS 里算(部门 ≤ 500),不依赖 WITH RECURSIVE 的方言差异。
|
|
13
13
|
|
|
14
14
|
import { db } from "./db.js";
|
|
15
|
+
// 🔴 这一行是加载顺序保证:`network_members.department_id` 的迁移在 departments.ts:19,
|
|
16
|
+
// 而本文件直接 SELECT 它。少了这行,新库(测试 / 新部署)会缺列(2026-11-11 写 board 测试时撞到)。
|
|
17
|
+
import "./departments.js";
|
|
15
18
|
|
|
16
19
|
db.exec(`
|
|
17
20
|
CREATE TABLE IF NOT EXISTS network_department_project_grants (
|