@sleep2agi/commhub-server 0.9.0-preview.84 → 0.9.0-preview.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sleep2agi/commhub-server",
-  "version": "0.9.0-preview.84",
+  "version": "0.9.0-preview.85",
   "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).",
   "type": "module",
   "main": "src/index.ts",

package/src/auth.ts

@@ -1,7 +1,7 @@
 /**
  * V3 Auth module — user registration, login, token management
  */
-import { db, generateId, hashPassword, verifyPassword, hashToken, generateToken, generateUserToken, generateNetworkToken, uuidv4 } from "./db.js";
+import { db, generateId, hashPassword, verifyPassword, hashToken, generateToken, generateUserToken, generateNetworkToken, uuidv4 } from "./db.js"; import { deleteDepartmentsForNetwork } from "./departments.js"; // #419: also ensures network_members.department_id exists (same line on purpose: docs pin auth.ts line numbers)
 import { WEAK_PASSWORDS } from "./password-dict.js";
 import { NETWORK_REST_COLUMNS, NETWORK_REST_SELECT, sqlColumns } from "./rest-projections.js";
 import { deleteAgentGrants, isAgentRestricted } from "./agent-access.js"; import { deleteTaskGrantsForMember, NEW_MEMBER_TASK_ACCESS, type TaskAccessMode } from "./task-access.js"; // 一行两个 import:文档钉着 auth.ts 的行号
@@ -445,7 +445,7 @@ export function deleteNetwork(userId: string, networkId: string): { ok: boolean;
     // single-network user to "ambiguous" or auto-resolve writes INTO the
     // deleted network. Remove memberships with the network.
     db.run("DELETE FROM network_members WHERE network_id = ?1", [networkId]);
-    deleteNetworkAgentGroups(networkId); // #2144
+    deleteNetworkAgentGroups(networkId); deleteDepartmentsForNetwork(networkId); // #2144, #419 (one line: docs pin auth.ts line numbers)
   });
   return { ok: true };
 }
@@ -588,7 +588,8 @@ export function getNetworkMembers(networkId: string) {
             (SELECT COUNT(*) FROM network_member_agent_grants g WHERE g.network_id = nm.network_id AND g.user_id = nm.user_id) AS agent_grant_count,
             CASE WHEN u.role = 'admin' OR nm.role IN ('owner', 'admin') OR nm.task_access = 'all' THEN 'all' ELSE 'scoped' END AS task_access,
             (SELECT COUNT(*) FROM network_member_project_grants pg WHERE pg.network_id = nm.network_id AND pg.user_id = nm.user_id) AS task_project_count,
-            (SELECT COUNT(*) FROM network_member_group_grants gg WHERE gg.network_id = nm.network_id AND gg.user_id = nm.user_id) AS agent_group_count
+            (SELECT COUNT(*) FROM network_member_group_grants gg WHERE gg.network_id = nm.network_id AND gg.user_id = nm.user_id) AS agent_group_count,
+            nm.department_id
      FROM network_members nm JOIN users u ON nm.user_id = u.user_id
      WHERE nm.network_id = ?1 ORDER BY nm.joined_at`,
     networkId);
@@ -836,6 +837,8 @@ const NETWORK_CLEANUP_TABLES = [
   "task_events", "task_terminal_events", "scheduled_task_runs", "external_schedule_edits",
   // 标签颜色:网络本身的元数据(标签本体在 requirements 行里,那张表是阻断项)。
   "network_tags",
+  // 组织架构(board #419):部门是网络本身的元数据。
+  "network_departments",
 ];
 
 function tableExists(name: string): boolean {

package/src/departments-http.test.ts

@@ -0,0 +1,185 @@
+// 组织架构(board #419):GET/POST/PATCH/DELETE /api/networks/:id/departments、PUT …/members/:uid/department。
+// HTTP 集成测试(真实 Bun.serve,私有端口,临时库)。钉住:谁能读 / 谁能写、部门规则(同级不重名、不成环、最多 10 层、
+// 只删空部门、负责人必须是成员)、成员所在部门,以及只增不改(/humans、/members 只多一个 department_id)。
+
+import { describe, expect, test, beforeAll, afterAll } from "bun:test";
+import { mkdtempSync, rmSync } from "fs";
+import { join } from "path";
+import { tmpdir } from "os";
+import { register, createNetworkTokenForNode } from "./auth.js";
+import { db } from "./db.js";
+
+const DIR = mkdtempSync(join(tmpdir(), "anet-departments-"));
+let BASE = "";
+let hub: any = null;
+const PW = "DepartmentsPassw0rd!x";
+let NET = "", OTHER_NET = "";
+const U: Record<string, { token: string; id: string }> = {};
+
+async function send(token: string, method: string, path: string, body?: unknown) {
+  const res = await fetch(`${BASE}${path}`, { method, headers: { ...(token ? { Authorization: `Bearer ${token}` } : {}), "Content-Type": "application/json" }, body: body === undefined ? undefined : JSON.stringify(body) });
+  const text = await res.text();
+  let json: any = null;
+  try { json = JSON.parse(text); } catch {}
+  return { status: res.status, body: json };
+}
+const D = () => `/api/networks/${NET}/departments`;
+const list = async (who = "owner") => (await send(U[who].token, "GET", D())).body;
+const mk = async (name: string, extra: Record<string, unknown> = {}) => {
+  const r = await send(U.owner.token, "POST", D(), { name, ...extra });
+  expect(r.status).toBe(201);
+  return r.body.department as { id: string; name: string; parent_id: string | null };
+};
+
+beforeAll(async () => {
+  process.env.COMMHUB_DB ||= join(DIR, "hub.db");
+  process.env.COMMHUB_UPLOADS_DIR = join(DIR, "uploads");
+  process.env.HOST = "127.0.0.1";
+  const a = register(`dep_owner_${Date.now()}`, PW, undefined, "Owner");
+  expect(a.ok).toBe(true);
+  U.owner = { token: a.token!, id: a.user!.user_id };
+  NET = a.network_id!;
+  db.run("UPDATE users SET role = 'admin' WHERE user_id = ?1", [U.owner.id]);
+  const mod: any = await import("./server.js");
+  hub = mod.bootServer({ port: 0, hostname: "127.0.0.1" });
+  BASE = `http://127.0.0.1:${hub.port}`;
+  const add = async (username: string, role: string) => {
+    expect((await send(U.owner.token, "POST", "/api/admin/users", { username, password: PW, network_id: NET, role })).status).toBe(200);
+    const login = await send("", "POST", "/api/auth/login", { username, password: PW });
+    expect(login.status).toBe(200);
+    return { token: login.body.token as string, id: login.body.user.user_id as string };
+  };
+  const stamp = Date.now();
+  U.admin = await add(`dep_admin_${stamp}`, "admin");
+  U.member = await add(`dep_member_${stamp}`, "member");
+  U.viewer = await add(`dep_viewer_${stamp}`, "viewer");
+  U.node = { token: createNetworkTokenForNode(U.owner.id, NET, "dep-node", "node_dep").token!, id: "node_dep" };
+  const o = register(`dep_outsider_${stamp}`, PW);
+  U.outsider = { token: o.token!, id: o.user!.user_id };
+  OTHER_NET = o.network_id!;
+}, 30_000);
+
+afterAll(() => {
+  try { hub?.stop?.(true); } catch {}
+  try { rmSync(DIR, { recursive: true, force: true }); } catch {}
+});
+
+describe("who can read / write", () => {
+  test("every member, a node token of this network and a hub admin can read; outsiders and other networks' nodes can't", async () => {
+    for (const who of ["owner", "admin", "member", "viewer", "node"]) expect((await send(U[who].token, "GET", D())).status).toBe(200);
+    expect((await send(U.outsider.token, "GET", D())).status).toBe(403);
+    expect((await send("", "GET", D())).status).toBe(401);
+    const otherNode = createNetworkTokenForNode(U.outsider.id, OTHER_NET, "dep-other", "node_dep_other").token!;
+    expect((await send(otherNode, "GET", D())).status).toBe(403);
+  });
+
+  test("only network owner / admin (and hub admin) can write", async () => {
+    expect((await send(U.admin.token, "POST", D(), { name: "管理员建的" })).status).toBe(201);
+    for (const who of ["member", "viewer", "node", "outsider"]) {
+      expect((await send(U[who].token, "POST", D(), { name: `不该建-${who}` })).status).toBe(403);
+    }
+    const anyDept = (await list()).departments[0].id;
+    expect((await send(U.member.token, "PATCH", `${D()}/${anyDept}`, { name: "x" })).status).toBe(403);
+    expect((await send(U.member.token, "DELETE", `${D()}/${anyDept}`)).status).toBe(403);
+    expect((await send(U.member.token, "PUT", `/api/networks/${NET}/members/${U.member.id}/department`, { department_id: anyDept })).status).toBe(403);
+  });
+});
+
+describe("departments", () => {
+  test("create: top level and child, auto id and custom id, sibling names unique, validation", async () => {
+    const top = await mk("军团基建");
+    expect(top.id).toMatch(/^dept_/);
+    expect(top.parent_id).toBeNull();
+    const child = await mk("前端组", { parent_id: top.id, id: "fe-team" });
+    expect(child.id).toBe("fe-team");
+    expect(child.parent_id).toBe(top.id);
+    expect((await send(U.owner.token, "POST", D(), { name: "前端组", parent_id: top.id })).status).toBe(409);
+    expect((await send(U.owner.token, "POST", D(), { name: "前端组" })).status).toBe(201); // same name under another parent is fine
+    expect((await send(U.owner.token, "POST", D(), { name: "另一个", id: "fe-team" })).body.error).toBe("department_id_taken");
+    expect((await send(U.owner.token, "POST", D(), { name: "  " })).body.error).toBe("invalid_department_name");
+    expect((await send(U.owner.token, "POST", D(), { name: "x".repeat(41) })).body.error).toBe("invalid_department_name");
+    expect((await send(U.owner.token, "POST", D(), { name: "坏 id", id: "has space" })).body.error).toBe("invalid_department_id");
+    expect((await send(U.owner.token, "POST", D(), { name: "孤儿", parent_id: "nope" })).body.error).toBe("parent_not_found");
+    expect((await send(U.owner.token, "POST", D(), { name: "外人负责", leader_user_id: U.outsider.id })).body.error).toBe("leader_not_member");
+  });
+
+  test("rename, move (no cycles, depth ≤ 10), set / clear leader, sort", async () => {
+    const a = await mk("移动甲");
+    const b = await mk("移动乙", { parent_id: a.id });
+    const c = await mk("移动丙", { parent_id: b.id });
+    expect((await send(U.owner.token, "PATCH", `${D()}/${a.id}`, { parent_id: c.id })).body.error).toBe("department_cycle");
+    expect((await send(U.owner.token, "PATCH", `${D()}/${a.id}`, { parent_id: a.id })).body.error).toBe("department_cycle");
+    const moved = await send(U.owner.token, "PATCH", `${D()}/${c.id}`, { parent_id: null, name: "移动丙(顶层)" });
+    expect(moved.status).toBe(200);
+    expect(moved.body.department.parent_id).toBeNull();
+    expect(moved.body.department.name).toBe("移动丙(顶层)");
+    const led = await send(U.owner.token, "PATCH", `${D()}/${b.id}`, { leader_user_id: U.member.id, sort: 5 });
+    expect(led.body.department.leader_user_id).toBe(U.member.id);
+    expect(led.body.department.sort).toBe(5);
+    expect((await send(U.owner.token, "PATCH", `${D()}/${b.id}`, { leader_user_id: null })).body.department.leader_user_id).toBeNull();
+    expect((await send(U.owner.token, "PATCH", `${D()}/${b.id}`, {})).body.error).toBe("empty_patch");
+    expect((await send(U.owner.token, "PATCH", `${D()}/missing`, { name: "x" })).status).toBe(404);
+    // depth: a chain of 10 is fine, the 11th level is refused (create and move)
+    let parent: string | null = null;
+    const chain: string[] = [];
+    for (let i = 0; i < 10; i++) { const d = await mk(`层${i}`, parent ? { parent_id: parent } : {}); chain.push(d.id); parent = d.id; }
+    expect((await send(U.owner.token, "POST", D(), { name: "第11层", parent_id: parent })).body.error).toBe("department_too_deep");
+    const two = await mk("两层");
+    await mk("两层的子", { parent_id: two.id });
+    expect((await send(U.owner.token, "PATCH", `${D()}/${two.id}`, { parent_id: chain[8] })).body.error).toBe("department_too_deep");
+  });
+
+  test("members: put into a department, counts, unassign; /members (admin list) carries department_id, /humans unchanged", async () => {
+    const team = await mk("成员测试部");
+    expect((await send(U.owner.token, "PUT", `/api/networks/${NET}/members/${U.member.id}/department`, { department_id: team.id })).body.department_id).toBe(team.id);
+    expect((await send(U.owner.token, "PUT", `/api/networks/${NET}/members/${U.viewer.id}/department`, { department_id: team.id })).status).toBe(200);
+    const l = await list("member");
+    expect(l.departments.find((d: any) => d.id === team.id).member_count).toBe(2);
+    expect(l.members.find((m: any) => m.user_id === U.member.id).department_id).toBe(team.id);
+    expect(l.members.find((m: any) => m.user_id === U.owner.id).department_id).toBeNull();
+    // /humans stays identity-only (its key set is pinned by member-presence / agent-acl tests): who sits where comes
+    // from GET …/departments (members[]), which every member can read.
+    const humans = await send(U.viewer.token, "GET", `/api/networks/${NET}/humans`);
+    expect(humans.body.humans.find((h: any) => h.user_id === U.member.id).department_id).toBeUndefined();
+    const members = await send(U.owner.token, "GET", `/api/networks/${NET}/members`);
+    const row = members.body.members.find((m: any) => m.user_id === U.member.id);
+    expect(row.department_id).toBe(team.id);
+    for (const k of ["user_id", "role", "username", "agent_access", "task_access"]) expect(row).toHaveProperty(k); // old fields unchanged
+    expect((await send(U.owner.token, "PUT", `/api/networks/${NET}/members/${U.outsider.id}/department`, { department_id: team.id })).status).toBe(404);
+    expect((await send(U.owner.token, "PUT", `/api/networks/${NET}/members/${U.member.id}/department`, { department_id: "nope" })).body.error).toBe("department_not_found");
+    expect((await send(U.owner.token, "PUT", `/api/networks/${NET}/members/${U.viewer.id}/department`, { department_id: null })).body.department_id).toBeNull();
+  });
+
+  test("delete only when empty (no sub-departments, no members), with the counts", async () => {
+    const parent = await mk("删除测试部");
+    const kid = await mk("删除测试子部", { parent_id: parent.id });
+    await send(U.owner.token, "PUT", `/api/networks/${NET}/members/${U.admin.id}/department`, { department_id: parent.id });
+    const blocked = await send(U.owner.token, "DELETE", `${D()}/${parent.id}`);
+    expect(blocked.status).toBe(409);
+    expect(blocked.body).toMatchObject({ error: "department_not_empty", children: 1, members: 1 });
+    expect((await send(U.owner.token, "DELETE", `${D()}/${kid.id}`)).status).toBe(200);
+    await send(U.owner.token, "PUT", `/api/networks/${NET}/members/${U.admin.id}/department`, { department_id: null });
+    expect((await send(U.owner.token, "DELETE", `${D()}/${parent.id}`)).status).toBe(200);
+    expect((await list()).departments.some((d: any) => d.id === parent.id)).toBe(false);
+    expect((await send(U.owner.token, "DELETE", `${D()}/${parent.id}`)).status).toBe(404);
+  });
+
+  test("a leader who leaves the network reads as no leader", async () => {
+    const stamp = Date.now();
+    expect((await send(U.owner.token, "POST", "/api/admin/users", { username: `dep_leaver_${stamp}`, password: PW, network_id: NET, role: "member" })).status).toBe(200);
+    const leaver = (await send("", "POST", "/api/auth/login", { username: `dep_leaver_${stamp}`, password: PW })).body.user.user_id as string;
+    const d = await mk("负责人会走", { leader_user_id: leaver });
+    expect(d).toBeTruthy();
+    expect((await send(U.owner.token, "DELETE", `/api/networks/${NET}/members/${leaver}`)).status).toBe(200);
+    expect((await list()).departments.find((x: any) => x.id === d.id).leader_user_id).toBeNull();
+  });
+
+  test("deleting a network removes its departments", async () => {
+    const r = register(`dep_gone_${Date.now()}`, PW);
+    const net = r.network_id!;
+    expect((await send(r.token!, "POST", `/api/networks/${net}/departments`, { name: "会被删" })).status).toBe(201);
+    expect(db.get("SELECT 1 AS x FROM network_departments WHERE network_id = ?1", net)).toBeTruthy();
+    expect((await send(r.token!, "DELETE", `/api/networks/${net}`)).status).toBe(200);
+    expect(db.get("SELECT 1 AS x FROM network_departments WHERE network_id = ?1", net)).toBeFalsy();
+  });
+});

package/src/departments.ts

@@ -0,0 +1,233 @@
+// 人类成员的组织架构(board #419):部门(多层)+ 每个成员归一个部门 + 部门负责人。
+//
+// 只增不改:新表 network_departments,network_members 多一列 department_id(默认 NULL = 未分配)。
+// 旧 app 不读这两样,行为不变。网络本身就是根(parent_id = NULL 的部门挂在网络下面)。
+//
+// 权限:网络里任何成员(含 viewer、受限成员)都能读组织架构 —— 和 /humans 通讯录同一可见范围;
+// 写(建 / 改名 / 移动 / 删除部门、设负责人、调人)只给网络 owner / admin 和 Hub 管理员。节点令牌只能读自己网络的。
+//
+// /humans 通讯录保持只有身份字段(它的键集合被测试钉着);谁在哪个部门从 GET …/departments 的 members[] 读。
+// 规则:同一上级下部门不重名;移动不能挂到自己或自己的下级下面;最多 MAX_DEPTH 层;
+// 只有空部门(没有子部门、没有成员)能删;负责人必须是本网络成员;人离开网络后,作为负责人的引用读出来是 null。
+
+import { db, logAudit } from "./db.js";
+
+try { db.exec("ALTER TABLE network_members ADD COLUMN department_id TEXT"); } catch {}
+db.exec(`
+  CREATE TABLE IF NOT EXISTS network_departments (
+    network_id     TEXT NOT NULL,
+    department_id  TEXT NOT NULL,
+    name           TEXT NOT NULL,
+    parent_id      TEXT,
+    leader_user_id TEXT,
+    sort           INTEGER NOT NULL DEFAULT 0,
+    created_by     TEXT,
+    created_at     TEXT NOT NULL DEFAULT (datetime('now')),
+    updated_at     TEXT NOT NULL DEFAULT (datetime('now')),
+    PRIMARY KEY (network_id, department_id)
+  );
+  CREATE INDEX IF NOT EXISTS idx_network_departments_parent ON network_departments(network_id, parent_id);
+`);
+
+export const MAX_DEPTH = 10;
+export const MAX_DEPARTMENTS = 500;
+const NAME_MAX = 40;
+const ID_RE = /^[A-Za-z0-9_-]{1,64}$/;
+
+type DeptRow = { network_id: string; department_id: string; name: string; parent_id: string | null; leader_user_id: string | null; sort: number; created_at: string; updated_at: string };
+export type Department = { id: string; name: string; parent_id: string | null; leader_user_id: string | null; sort: number; member_count: number; created_at: string; updated_at: string };
+
+type Fail = { ok: false; status: number; error: string };
+type Ok<T> = { ok: true } & T;
+
+const fail = (status: number, error: string): Fail => ({ ok: false, status, error });
+
+function rows(networkId: string): DeptRow[] {
+  return db.all<DeptRow>(
+    "SELECT network_id, department_id, name, parent_id, leader_user_id, sort, created_at, updated_at FROM network_departments WHERE network_id = ?1 ORDER BY sort, created_at, department_id",
+    networkId,
+  );
+}
+function one(networkId: string, id: string): DeptRow | null {
+  return db.get<DeptRow>(
+    "SELECT network_id, department_id, name, parent_id, leader_user_id, sort, created_at, updated_at FROM network_departments WHERE network_id = ?1 AND department_id = ?2",
+    networkId, id,
+  ) ?? null;
+}
+function isMember(networkId: string, userId: string): boolean {
+  return !!db.get<{ user_id: string }>("SELECT user_id FROM network_members WHERE network_id = ?1 AND user_id = ?2", networkId, userId);
+}
+
+/** 读:部门(带直属人数)+ 每个成员在哪个部门。负责人不在本网络了 → null。 */
+export function listDepartments(networkId: string): { departments: Department[]; members: Array<{ user_id: string; department_id: string | null }> } {
+  const members = db.all<{ user_id: string; department_id: string | null }>(
+    "SELECT user_id, department_id FROM network_members WHERE network_id = ?1 ORDER BY joined_at, user_id",
+    networkId,
+  );
+  const memberIds = new Set(members.map((m) => m.user_id));
+  const all = rows(networkId);
+  const ids = new Set(all.map((d) => d.department_id));
+  // 成员行指着一个已经不存在的部门(理论上删除时已清空;防御)→ 当未分配。
+  const placed = members.map((m) => ({ user_id: m.user_id, department_id: m.department_id && ids.has(m.department_id) ? m.department_id : null }));
+  const counts = new Map<string, number>();
+  for (const m of placed) if (m.department_id) counts.set(m.department_id, (counts.get(m.department_id) ?? 0) + 1);
+  return {
+    departments: all.map((d) => ({
+      id: d.department_id,
+      name: d.name,
+      parent_id: d.parent_id,
+      leader_user_id: d.leader_user_id && memberIds.has(d.leader_user_id) ? d.leader_user_id : null,
+      sort: d.sort,
+      member_count: counts.get(d.department_id) ?? 0,
+      created_at: d.created_at,
+      updated_at: d.updated_at,
+    })),
+    members: placed,
+  };
+}
+
+const cleanName = (raw: unknown): string | null => {
+  if (typeof raw !== "string") return null;
+  const name = raw.trim();
+  return name && [...name].length <= NAME_MAX ? name : null;
+};
+
+function depthOf(networkId: string, id: string | null): number {
+  let depth = 0;
+  let cur = id;
+  const seen = new Set<string>();
+  while (cur) {
+    if (seen.has(cur)) return Infinity;
+    seen.add(cur);
+    depth += 1;
+    cur = one(networkId, cur)?.parent_id ?? null;
+  }
+  return depth;
+}
+/** 以 id 为根的子树最深有几层(含自己)。 */
+function subtreeHeight(networkId: string, id: string): number {
+  const children = db.all<{ department_id: string }>("SELECT department_id FROM network_departments WHERE network_id = ?1 AND parent_id = ?2", networkId, id);
+  return 1 + children.reduce((m, c) => Math.max(m, subtreeHeight(networkId, c.department_id)), 0);
+}
+function isDescendant(networkId: string, ancestor: string, id: string | null): boolean {
+  let cur = id;
+  const seen = new Set<string>();
+  while (cur) {
+    if (cur === ancestor) return true;
+    if (seen.has(cur)) return true;
+    seen.add(cur);
+    cur = one(networkId, cur)?.parent_id ?? null;
+  }
+  return false;
+}
+function siblingNameTaken(networkId: string, parentId: string | null, name: string, exceptId?: string): boolean {
+  const sql = parentId === null
+    ? "SELECT department_id FROM network_departments WHERE network_id = ?1 AND parent_id IS NULL AND name = ?2"
+    : "SELECT department_id FROM network_departments WHERE network_id = ?1 AND parent_id = ?3 AND name = ?2";
+  const hits = parentId === null ? db.all<{ department_id: string }>(sql, networkId, name) : db.all<{ department_id: string }>(sql, networkId, name, parentId);
+  return hits.some((h) => h.department_id !== exceptId);
+}
+function publicOne(networkId: string, id: string): Department {
+  return listDepartments(networkId).departments.find((d) => d.id === id)!;
+}
+
+export function createDepartment(networkId: string, actor: string, body: Record<string, unknown>): Ok<{ department: Department }> | Fail {
+  const name = cleanName(body.name);
+  if (!name) return fail(400, "invalid_department_name");
+  let id: string;
+  if (body.id !== undefined && body.id !== null && body.id !== "") {
+    if (typeof body.id !== "string" || !ID_RE.test(body.id)) return fail(400, "invalid_department_id");
+    if (one(networkId, body.id)) return fail(409, "department_id_taken");
+    id = body.id;
+  } else {
+    id = `dept_${crypto.randomUUID().replace(/-/g, "").slice(0, 16)}`;
+  }
+  const parentId = body.parent_id === undefined || body.parent_id === null || body.parent_id === "" ? null : body.parent_id;
+  if (parentId !== null && (typeof parentId !== "string" || !one(networkId, parentId))) return fail(400, "parent_not_found");
+  if (depthOf(networkId, parentId as string | null) + 1 > MAX_DEPTH) return fail(400, "department_too_deep");
+  if (siblingNameTaken(networkId, parentId as string | null, name)) return fail(409, "department_name_taken");
+  const leader = body.leader_user_id === undefined || body.leader_user_id === null || body.leader_user_id === "" ? null : body.leader_user_id;
+  if (leader !== null && (typeof leader !== "string" || !isMember(networkId, leader))) return fail(400, "leader_not_member");
+  if (body.sort !== undefined && !Number.isInteger(body.sort)) return fail(400, "invalid_sort");
+  const count = db.get<{ n: number }>("SELECT COUNT(*) AS n FROM network_departments WHERE network_id = ?1", networkId)?.n ?? 0;
+  if (count >= MAX_DEPARTMENTS) return fail(400, "too_many_departments");
+  const sort = body.sort === undefined
+    ? (db.get<{ n: number }>(
+      parentId === null
+        ? "SELECT COUNT(*) AS n FROM network_departments WHERE network_id = ?1 AND parent_id IS NULL"
+        : "SELECT COUNT(*) AS n FROM network_departments WHERE network_id = ?1 AND parent_id = ?2",
+      ...(parentId === null ? [networkId] : [networkId, parentId]),
+    )?.n ?? 0)
+    : body.sort as number;
+  db.run(
+    "INSERT INTO network_departments (network_id, department_id, name, parent_id, leader_user_id, sort, created_by) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)",
+    [networkId, id, name, parentId, leader, sort, actor],
+  );
+  return { ok: true, department: publicOne(networkId, id) };
+}
+
+export function updateDepartment(networkId: string, id: string, body: Record<string, unknown>): Ok<{ department: Department }> | Fail {
+  const cur = one(networkId, id);
+  if (!cur) return fail(404, "department_not_found");
+  let name = cur.name;
+  let parentId = cur.parent_id;
+  let leader = cur.leader_user_id;
+  let sort = cur.sort;
+  let touched = false;
+  if (body.name !== undefined) {
+    const n = cleanName(body.name);
+    if (!n) return fail(400, "invalid_department_name");
+    name = n; touched = true;
+  }
+  if (body.parent_id !== undefined) {
+    const p = body.parent_id === null || body.parent_id === "" ? null : body.parent_id;
+    if (p !== null && (typeof p !== "string" || !one(networkId, p))) return fail(400, "parent_not_found");
+    if (p !== null && isDescendant(networkId, id, p as string)) return fail(400, "department_cycle");
+    if (depthOf(networkId, p as string | null) + subtreeHeight(networkId, id) > MAX_DEPTH) return fail(400, "department_too_deep");
+    parentId = p as string | null; touched = true;
+  }
+  if (body.leader_user_id !== undefined) {
+    const l = body.leader_user_id === null || body.leader_user_id === "" ? null : body.leader_user_id;
+    if (l !== null && (typeof l !== "string" || !isMember(networkId, l))) return fail(400, "leader_not_member");
+    leader = l as string | null; touched = true;
+  }
+  if (body.sort !== undefined) {
+    if (!Number.isInteger(body.sort)) return fail(400, "invalid_sort");
+    sort = body.sort as number; touched = true;
+  }
+  if (!touched) return fail(400, "empty_patch");
+  if ((name !== cur.name || parentId !== cur.parent_id) && siblingNameTaken(networkId, parentId, name, id)) return fail(409, "department_name_taken");
+  db.run(
+    "UPDATE network_departments SET name = ?3, parent_id = ?4, leader_user_id = ?5, sort = ?6, updated_at = datetime('now') WHERE network_id = ?1 AND department_id = ?2",
+    [networkId, id, name, parentId, leader, sort],
+  );
+  return { ok: true, department: publicOne(networkId, id) };
+}
+
+/** 只删空部门:有子部门 / 有成员 → 409(带数字,界面照着说)。 */
+export function deleteDepartment(networkId: string, id: string): Ok<{ deleted: string }> | (Fail & { children?: number; members?: number }) {
+  if (!one(networkId, id)) return fail(404, "department_not_found");
+  const children = db.get<{ n: number }>("SELECT COUNT(*) AS n FROM network_departments WHERE network_id = ?1 AND parent_id = ?2", networkId, id)?.n ?? 0;
+  const members = db.get<{ n: number }>("SELECT COUNT(*) AS n FROM network_members WHERE network_id = ?1 AND department_id = ?2", networkId, id)?.n ?? 0;
+  if (children || members) return { ...fail(409, "department_not_empty"), children, members };
+  db.run("DELETE FROM network_departments WHERE network_id = ?1 AND department_id = ?2", [networkId, id]);
+  return { ok: true, deleted: id };
+}
+
+/** 把成员放进一个部门(null = 未分配)。 */
+export function setMemberDepartment(networkId: string, userId: string, departmentId: unknown): Ok<{ user_id: string; department_id: string | null }> | Fail {
+  if (!isMember(networkId, userId)) return fail(404, "member_not_found");
+  const dept = departmentId === null || departmentId === "" ? null : departmentId;
+  if (dept !== null && (typeof dept !== "string" || !one(networkId, dept))) return fail(400, "department_not_found");
+  db.run("UPDATE network_members SET department_id = ?3 WHERE network_id = ?1 AND user_id = ?2", [networkId, userId, dept]);
+  return { ok: true, user_id: userId, department_id: dept as string | null };
+}
+
+/** 网络删掉时一起清(和项目授权同一时机调用)。 */
+export function deleteDepartmentsForNetwork(networkId: string): void {
+  db.run("DELETE FROM network_departments WHERE network_id = ?1", [networkId]);
+}
+
+export function auditDepartment(user: { user_id: string; username: string }, action: string, networkId: string, detail: string): void {
+  logAudit(user.user_id, user.username, action, "network", networkId, detail.slice(0, 2000), undefined, networkId);
+}

package/src/server.ts

@@ -2,6 +2,7 @@ import { buildServeErrorResponse } from "./serve-error.js";
 import { maybeGzipResponse, trimLightTask } from "./http-gzip";
 import { statusAliasResolverRead } from "./status-alias-resolver.js";
 import { readNodeHealth } from "./node-health-store.js";
+import { auditDepartment, createDepartment, deleteDepartment, listDepartments, setMemberDepartment, updateDepartment } from "./departments.js";
 import { redactMessageRow } from "./redact-tokens.js";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { parseDbTimestampMs } from "./db-timestamp.js";
@@ -1708,6 +1709,60 @@ return Bun.serve({
       return withCors(req, Response.json({ ok: true, network_id: netId, humans: humans.map((h) => ({ ...h, ...presence.get(h.user_id)! })) }));
     }
 
+    // ── 组织架构(board #419):部门 + 成员所在部门。读:网络任何成员 / 本网络的节点令牌 / Hub 管理员;
+    // 写:网络 owner / admin、Hub 管理员(节点令牌不能写)。规则在 departments.ts。 ──
+    const deptMatch = url.pathname.match(/^\/api\/networks\/([^/]+)\/departments(?:\/([^/]+))?$/);
+    const memberDeptMatch = url.pathname.match(/^\/api\/networks\/([^/]+)\/members\/([^/]+)\/department$/);
+    if (deptMatch || memberDeptMatch) {
+      const token = requestToken(req, { allowQueryToken: false });
+      const resolved = token ? resolveToken(token) : null;
+      if (!resolved) return withCors(req, Response.json({ ok: false, error: "auth required" }, { status: 401 }));
+      const netId = decodeURIComponent((deptMatch ?? memberDeptMatch)![1]);
+      if (resolved.networkId && resolved.networkId !== netId) return withCors(req, Response.json({ ok: false, error: "not a member of this network" }, { status: 403 }));
+      const hubAdmin = isHubAdminCredential(resolved);
+      const role = resolved.networkId ? null : getUserNetworkRole(resolved.user.user_id, netId);
+      if (!hubAdmin && !role && !resolved.networkId) return withCors(req, Response.json({ ok: false, error: "not a member of this network" }, { status: 403 }));
+      if (!db.get("SELECT 1 AS x FROM networks WHERE network_id = ?1", netId)) return withCors(req, Response.json({ ok: false, error: "network_not_found" }, { status: 404 }));
+      if (deptMatch && !deptMatch[2] && req.method === "GET") {
+        return withCors(req, Response.json({ ok: true, network_id: netId, ...listDepartments(netId) }));
+      }
+      const canManage = hubAdmin || (!resolved.networkId && (role === "owner" || role === "admin"));
+      if (!["POST", "PATCH", "PUT", "DELETE"].includes(req.method)) return withCors(req, Response.json({ ok: false, error: "method_not_allowed" }, { status: 405 }));
+      if (!canManage) return withCors(req, Response.json({ ok: false, error: "owner/admin required" }, { status: 403 }));
+      let body: Record<string, unknown> = {};
+      if (req.method !== "DELETE") {
+        try { const b = await req.json(); body = b && typeof b === "object" && !Array.isArray(b) ? b as Record<string, unknown> : {}; } catch { return withCors(req, Response.json({ ok: false, error: "invalid JSON" }, { status: 400 })); }
+      }
+      const reply = (r: { ok: boolean; status?: number } & Record<string, unknown>, okStatus = 200) => {
+        const { status, ...rest } = r;
+        return withCors(req, Response.json(rest, { status: r.ok ? okStatus : status ?? 400 }));
+      };
+      if (memberDeptMatch) {
+        if (req.method !== "PUT") return withCors(req, Response.json({ ok: false, error: "method_not_allowed" }, { status: 405 }));
+        const targetUid = decodeURIComponent(memberDeptMatch[2]);
+        const r = setMemberDepartment(netId, targetUid, body.department_id);
+        if (r.ok) auditDepartment(resolved.user, "member_department_set", netId, `${targetUid} → ${r.department_id ?? "(unassigned)"}`);
+        return reply(r);
+      }
+      const deptId = deptMatch![2] ? decodeURIComponent(deptMatch![2]) : null;
+      if (!deptId && req.method === "POST") {
+        const r = createDepartment(netId, resolved.user.user_id, body);
+        if (r.ok) auditDepartment(resolved.user, "department_created", netId, JSON.stringify({ id: r.department.id, name: r.department.name, parent_id: r.department.parent_id }));
+        return reply(r, 201);
+      }
+      if (deptId && req.method === "PATCH") {
+        const r = updateDepartment(netId, deptId, body);
+        if (r.ok) auditDepartment(resolved.user, "department_updated", netId, JSON.stringify({ id: deptId, ...body }));
+        return reply(r);
+      }
+      if (deptId && req.method === "DELETE") {
+        const r = deleteDepartment(netId, deptId);
+        if (r.ok) auditDepartment(resolved.user, "department_deleted", netId, deptId);
+        return reply(r as { ok: boolean; status?: number } & Record<string, unknown>);
+      }
+      return withCors(req, Response.json({ ok: false, error: "method_not_allowed" }, { status: 405 }));
+    }
+
     // ── V3.13: Network members + invites ──
     const membersMatch = url.pathname.match(/^\/api\/networks\/([^/]+)\/members(?:\/([^/]+))?$/);
     if (membersMatch) {