Merge branch 'chore/sidebar-240'

恢复不再改名;同名兄弟占位时抛 409 name_conflict_on_restore + 人话提示,
操作者自行重命名现有节点或彻底删除旧节点后再恢复。

.gitignore

@@ -15,3 +15,5 @@ node_modules/
 
 # OS / editor
 .DS_Store
+
+.omo/

.omo/run-continuation/ses_0705f8afbffePWIq7GrFfwfFwV.json

@@ -1,10 +0,0 @@
-{
-  "sessionID": "ses_0705f8afbffePWIq7GrFfwfFwV",
-  "updatedAt": "2026-07-23T15:40:15.630Z",
-  "sources": {
-    "background-task": {
-      "state": "idle",
-      "updatedAt": "2026-07-23T15:40:15.630Z"
-    }
-  }
-}

.omo/run-continuation/ses_07252990dffeRFmXnvdyynty2z.json

@@ -1,10 +0,0 @@
-{
-  "sessionID": "ses_07252990dffeRFmXnvdyynty2z",
-  "updatedAt": "2026-07-23T06:33:33.086Z",
-  "sources": {
-    "background-task": {
-      "state": "idle",
-      "updatedAt": "2026-07-23T06:33:33.086Z"
-    }
-  }
-}

.omo/run-continuation/ses_075d214a0ffe6mU8VNgukUfH5L.json

@@ -1,10 +0,0 @@
-{
-  "sessionID": "ses_075d214a0ffe6mU8VNgukUfH5L",
-  "updatedAt": "2026-07-22T14:15:01.741Z",
-  "sources": {
-    "background-task": {
-      "state": "idle",
-      "updatedAt": "2026-07-22T14:15:01.741Z"
-    }
-  }
-}

.omo/run-continuation/ses_075d3282bffejz0HFE00taOaGM.json

@@ -1,10 +0,0 @@
-{
-  "sessionID": "ses_075d3282bffejz0HFE00taOaGM",
-  "updatedAt": "2026-07-22T14:13:54.785Z",
-  "sources": {
-    "background-task": {
-      "state": "idle",
-      "updatedAt": "2026-07-22T14:13:54.785Z"
-    }
-  }
-}

.omo/run-continuation/ses_0781484caffeKJHXVKiD4BqEJw.json

@@ -1,10 +0,0 @@
-{
-  "sessionID": "ses_0781484caffeKJHXVKiD4BqEJw",
-  "updatedAt": "2026-07-22T06:17:18.238Z",
-  "sources": {
-    "background-task": {
-      "state": "idle",
-      "updatedAt": "2026-07-22T06:17:18.238Z"
-    }
-  }
-}

.omo/run-continuation/ses_07b163c13ffeudULxSfIfK986T.json

@@ -1,10 +0,0 @@
-{
-  "sessionID": "ses_07b163c13ffeudULxSfIfK986T",
-  "updatedAt": "2026-07-21T13:55:58.878Z",
-  "sources": {
-    "background-task": {
-      "state": "idle",
-      "updatedAt": "2026-07-21T13:55:58.878Z"
-    }
-  }
-}

.omo/run-continuation/ses_07b1e6c8effeq7bdmj6NgO0LqC.json

@@ -1,10 +0,0 @@
-{
-  "sessionID": "ses_07b1e6c8effeq7bdmj6NgO0LqC",
-  "updatedAt": "2026-07-21T13:38:01.132Z",
-  "sources": {
-    "background-task": {
-      "state": "idle",
-      "updatedAt": "2026-07-21T13:38:01.132Z"
-    }
-  }
-}

.omo/run-continuation/ses_07b932dddffecSipFLwlJOvoJ9.json

@@ -1,10 +0,0 @@
-{
-  "sessionID": "ses_07b932dddffecSipFLwlJOvoJ9",
-  "updatedAt": "2026-07-21T11:27:10.420Z",
-  "sources": {
-    "background-task": {
-      "state": "idle",
-      "updatedAt": "2026-07-21T11:27:10.420Z"
-    }
-  }
-}

.omo/run-continuation/ses_07b9c4268ffeic4mMXCPUt225j.json

@@ -1,10 +0,0 @@
-{
-  "sessionID": "ses_07b9c4268ffeic4mMXCPUt225j",
-  "updatedAt": "2026-07-21T11:18:53.449Z",
-  "sources": {
-    "background-task": {
-      "state": "idle",
-      "updatedAt": "2026-07-21T11:18:53.449Z"
-    }
-  }
-}

.omo/run-continuation/ses_07b9c4346ffeVBdV5pf4h6s9PW.json

@@ -1,10 +0,0 @@
-{
-  "sessionID": "ses_07b9c4346ffeVBdV5pf4h6s9PW",
-  "updatedAt": "2026-07-21T11:18:29.979Z",
-  "sources": {
-    "background-task": {
-      "state": "idle",
-      "updatedAt": "2026-07-21T11:18:29.979Z"
-    }
-  }
-}

.omo/run-continuation/ses_07b9c9a75ffeOyJ4ewp3DBvXhz.json

@@ -1,10 +0,0 @@
-{
-  "sessionID": "ses_07b9c9a75ffeOyJ4ewp3DBvXhz",
-  "updatedAt": "2026-07-21T11:21:09.776Z",
-  "sources": {
-    "background-task": {
-      "state": "idle",
-      "updatedAt": "2026-07-21T11:21:09.776Z"
-    }
-  }
-}

.omo/run-continuation/ses_07cdbac0effeiBrdcHLUUUfwuF.json

@@ -1,10 +0,0 @@
-{
-  "sessionID": "ses_07cdbac0effeiBrdcHLUUUfwuF",
-  "updatedAt": "2026-07-23T15:37:59.918Z",
-  "sources": {
-    "background-task": {
-      "state": "idle",
-      "updatedAt": "2026-07-23T15:37:59.918Z"
-    }
-  }
-}

.omo/文件库-开工计划.md

@@ -1,114 +0,0 @@
-# 文件库 · 开工计划（v1.0）
-
-> 配套文档：《文件库-接口契约.md》(v0.1，仓库根目录)。本计划已吸收规划顾问评审意见，包含开工前必须先冻结的**架构收口决策 D11–D19**（回写契约 v0.2 时并入）。
-> 工期按 1 人全栈估算；前端从 Phase 2 后可并行。
-
-## 开工判定
-
-**可以开工。** 四个外部依赖（版本包 / Group / 审计 / 平台身份）全部有契约可依、可 mock 并行开发；无阻塞项。唯一前置：本文件的 D11–D19 决策在写第一行 schema 前过一遍（半天，自查即可，有异议再升级）。
-
-## 架构收口决策（新增，先冻结再动工）
-
-| 编号 | 决策 | 理由 |
-|---|---|---|
-| D11 | `creator` 是 Node 的**不可变列**，创建时同时落一条 Manage grant；独立权限开关关闭时，**creator 的 Manage 仍生效**，其余项目级 grant 冻结不参与计算 | 否则 creator 可能被自己关掉的开关锁死 |
-| D12 | 移动节点授权 = **本节点 Manage + 目标父 Edit+**；移动在事务 + Postgres 咨询锁内完成，防并发成环 | 预检环检测在并发下不安全 |
-| D13 | Group resolve 失败返回 **503**（不伪装 404/403）；每次 HTTP 请求 fresh resolve，不跨请求缓存；单请求内多次校验合并为一次调用（此点与 Group 团队确认，OPEN-9） | 依赖故障 ≠ 无权限；契约 G4 要求实时 |
-| D14 | 命名规则：NFC 归一化、trim、≤128 字符、禁 `/` 与控制字符；**活跃兄弟节点大小写不敏感唯一**；根节点全局唯一 | 缺命名规则必有脏数据 |
-| D15 | 删除 = 只给被删节点打标，后代**不递归打标**，靠"任一祖先已删"过滤；所有查询链路强制此过滤（含递归 SQL，不只靠 Prisma middleware） | 递归打标的写放大与恢复复杂度不可控 |
-| D16 | `baseVersion` 为**文件级版本**（GET file 返回的 version）；无关文件的提交不产生冲突 | 与 C1 `head(dir, filePath)` 语义一致 |
-| D17 | breadcrumb 只暴露用户有 View 的祖先名称；无权限祖先显示占位符 `…`，不暴露名字 | 404 不泄露语义（D8）延伸到面包屑 |
-| D18 | v1 **单副本部署**（git 仓库在本地磁盘）；多副本需共享存储或分片，后置 | 不解决不存在的扩展问题 |
-| D19 | 网站管理员**不隐式读内容**；force_adjust 凭 node id 操作（id 从审计或用户上报获得） | C4 已定的最小权限原则 |
-
-## 阶段计划
-
-### Phase 0 · 骨架与身份先行（1–2 天）
-
-- [ ] 过 D11–D19，回写契约 v0.2
-- [ ] repo 骨架 `server/` + `web/`，Postgres docker-compose，CI（lint / typecheck / vitest / 集成测试用真实 Postgres service container）
-- [ ] **JWT 中间件 + 本地 JWKS 测试服务 + 签名 token fixtures**（有效/过期/错 issuer/错 audience/错算法/未知 kid/轮换）——身份先行，不做"宽松 mock 身份"
-- [ ] 4 个 port 接口定义 + mock：`VersionStore`、`GroupResolver`、`AuditSink`（直写 outbox 表的实现就是真的，mock 的是对端服务）、`ExportAdapter`
-- [ ] fastify-swagger 接入，OpenAPI 骨架——**OpenAPI 随每个端点同步产出，不留到最后**
-- **验收**：骨架可 `pnpm dev` 起服务；本地 JWKS 六类 token fixture（有效/过期/错 issuer/错 audience/错算法/未知 kid）中间件行为全对；CI 流水线绿
-
-### Phase 1 · 数据模型与权限引擎（2–3 天）⚑ 心脏
-
-- [ ] Prisma schema：`Node`（parentId **权威** + id 编码的 materialized path 派生列，name 不入 path）、`Grant`、`ProjectIndependentSettings`、`OutboxEvent`（含 attempts/nextAttemptAt/lease/lastError，relay 字段一次到位）、`ExportJob`
-- [ ] 数据库约束：kind 枚举、项目无子节点、活跃兄弟名唯一（部分唯一索引，root 的 NULL parent 特殊处理）、活跃 grant 按 (nodeId, principalType, principalId) 唯一、独立设置仅项目
-- [ ] **纯权限 reducer**：输入已解析的 grants + 祖先链 + 用户组集合，输出 role|null；不碰 DB/网络。fast-check 属性测试：max 单调、加 grant 只升不降、祖先继承、toggle 行为、顺序无关、软删过滤
-- [ ] 数据获取层 + `effective(user, node)` 组装
-- [ ] 树操作服务：create（creator 自动 Manage、root 仅管理员且必带 ≥1 Manage）、rename、move（D12 事务+咨询锁）、soft delete（D15）、breadcrumb（D17）
-- **验收**：并发对移（A→B 与 B→A）、移动+并发建子、property tests、删除祖先过滤，真实 Postgres 全绿
-
-### Phase 2 · 树与授权 API（1–2 天）
-
-- [ ] nodes 端点组 + grants 端点组 + independent-permission 开关 + effective-permission 自查
-- [ ] 授权矩阵校验（契约 8.1：creator-only 授 Manage、Manage 不可动 creator、force_adjust 独立通道）
-- [ ] 全部写操作落 outbox 事件（C3 词汇表）
-- **验收**：契约 8.1 矩阵逐格 API 测试；D8 的 404/403/503 三分语义测试
-
-### Phase 3 · 仓库生命周期与文件 API（2 天）
-
-- [ ] 项目 provisioning 状态机 `PROVISIONING → READY | FAILED`：先建 DB 行（PROVISIONING）→ 调 `VersionStore.init`（幂等）→ 置 READY；失败可重试；孤儿仓库对账 job
-- [ ] 每项目写锁（Postgres 咨询锁，跨进程安全）——不假设版本包能跨进程串行
-- [ ] 路径安全：canonical 后必须落在项目根内、拒绝 `.git`、禁 symlink 逃逸、路径长度上限
-- [ ] 上传限额（单文件 10MB / 单项目配额，数值 OPEN-5）+ 流式接收
-- [ ] files 端点组全量（list/read/upload/commits→409/diff/history/delete）+ 双客户端冲突 e2e
-- **验收**：DB/git 故障注入（init 失败、提交后崩溃）→ 对账能收敛；路径穿越语料库测试全拒
-
-### Phase 4 · 外部集成（1–2 天）
-
-- [ ] `GroupResolver` HTTP client：超时/5xx/429/畸形 JSON/万级 group 的故障注入测试；失败 → 503（D13）
-- [ ] Audit relay worker：租约领取、指数退避、eventId 幂等、重启恢复、积压告警
-- [ ] 导出 job：状态机 + 轮询 + 下载权限校验；`ExportAdapter` 桩（参数 OPEN-6 未定前**不计入完成标准**）
-- **验收**：relay 重启不丢不重（对端幂等）；group 故障时写操作 503、读操作按 D13
-
-### Phase 5 · 前端（3–5 天，Phase 2 后并行启动）
-
-- [ ] 登录（平台 SSO 占位 + 本地 JWKS 直通开关）
-- [ ] 树浏览（懒加载 + 分页）、breadcrumb（D17 占位符）、创建对话框（类型 + 批量授权选择器，Group search 接 C2）
-- [ ] 权限管理面板（按 8.1 矩阵控制可选项，creator 标识）
-- [ ] 文件页：查看/上传/下载/历史列表（编辑 UI 不归我方，留对接位）
-- [ ] 导出按钮 + job 轮询
-- **验收**：无权限节点全链路不可见；授权面板不会送出矩阵禁止的组合
-
-### Phase 6 · 硬化与交付（1–2 天）
-
-- [ ] 404/403/503 全端点核对；并发与重试幂等抽查
-- [ ] 备份脚本（DB + git 仓库一致性快照）、健康检查（DB/JWKS/磁盘/Group）、磁盘水位告警
-- [ ] OpenAPI 终稿 + 部署脚本 + 一页运维手册
-
-## 里程碑
-
-| 里程碑 | 内容 | 累计工期 |
-|---|---|---|
-| M1 | Phase 0–1：骨架 + 权限引擎 + 树操作可跑 | ~4 天 |
-| M2 | Phase 2–3：后端 API 全量（含文件冲突流） | ~7 天 |
-| M3 | Phase 4：外部集成（导出不计） | ~9 天 |
-| M4 | Phase 5–6：前端 + 硬化，可交付 | ~14–18 天 |
-
-## Mock 保真红线（mock 可以顶，但不许骗）
-
-| Mock | 不许掩盖的事 | 真身到位后的契约测试 |
-|---|---|---|
-| VersionStore | 磁盘延迟、半初始化、锁残留、跨进程并发 | 真包跑临时仓库：并发 commit/init 重试/遍历与 symlink 语料 |
-| GroupResolver | 超时、5xx、畸形响应、大规模组集 | 故障注入 HTTP 桩全过；我方绝不自己推祖先 |
-| GroupSearch（前端选择器） | 与 resolve 是**两个独立端点**，不可用 resolve mock 顶替 | C2 `/groups/search` 真身到位后跑分页/空结果/超时 |
-| Audit 对端 | 重复投递、乱序、长时间不可用 | relay 重启恢复 + 对端幂等 |
-| JWT | issuer/audience/算法/轮换 | 本地 JWKS 全用例 |
-| ExportAdapter | 参数、幂等、耗时 | 参数定了再写，之前不算完成 |
-
-## Top 5 风险
-
-1. **DB/git 分裂**（崩溃导致元数据、仓库、审计三边不一致）→ provisioning 状态机 + 对账 job，Phase 3 前置
-2. **移动子树改变整树权限** → D12 事务+锁+源目标双授权，并发测试
-3. **creator/独立权限开关交互** → D11 先冻结
-4. **外部契约缺口**（导出参数、请求内 resolve 合并）→ OPEN 清单跟踪，mock 保真红线不许掩盖
-5. **存储滥用/路径逃逸** → 路径安全 + 配额进 Phase 3 验收，不拖到硬化
-
-## OPEN 清单（在契约文档基础上增补）
-
-- OPEN-9：单请求内合并多次 resolve 是否符合 G4"实时"语义（找 Group 团队确认）
-- OPEN-10：恶意软件扫描归属（我方/平台/不做）
-- 其余 OPEN-1~8 见《文件库-接口契约.md》第 10 节

CONTEXT.md

@@ -99,3 +99,7 @@ _Avoid_: Cost budget, unlimited run
 **Emergency Workload Brake**:
 An audited Platform Administrator control that prevents new agent work for one Organization or the whole platform and may explicitly stop active work during an incident.
 _Avoid_: Organization deletion, service restart
+
+**Member Group**:
+A global, unlimited-depth, nestable authorization principal managed by the website administrator; a file-library grant on a group applies to that group and its whole descendant subtree, and a user's effective permission collects every group they belong to plus those groups' ancestors (ADR-0028). It stores no folder/project permission itself — only the user→group membership. Global: not owned by any Organization.
+_Avoid_: Team (the org-scoped flat grouping), Feishu department

docs/adr/0028-member-group-management-and-resolution.md

@@ -0,0 +1,153 @@
+# ADR 0028: Member Group Management And Resolution
+
+## Status
+
+Accepted.
+
+## Context
+
+ADR-0020 fixed `Organization` as the tenant root and ADR-0019 pinned the
+principal-set permission model. The file library (《文件库-接口契约.md》) computes
+effective permission over two principal kinds — `USER` and `GROUP` — and consumes
+the group side through a single read-only port, `GroupResolver`
+(`resolveMemberGroupIds(userId) → groupIds[]`, contract C2/G2).
+
+The contract's v0.1 proposal framed the Group system as a *separate HTTP service*
+owned by another team, consumed read-only. In practice the schema now carries the
+group tables directly in the hub database (`MemberGroup`, `MemberGroupMembership`,
+`MemberGroupClosure` — a global, unlimited-depth, closure-backed hierarchy), and
+the product requirement is to build **group management in the backend admin**, not
+to integrate a foreign service. Until this ADR, nothing read or wrote those tables:
+the live `GroupResolver` was a transitional implementation reading flat hub `Team`
+membership, and the admin "Group 管理" panel actually managed `Team`.
+
+This ADR settles the semantics needed to make the `MemberGroup` tables the real,
+in-hub group system.
+
+## Decision
+
+### Group system is in-hub, not a foreign service
+
+`MemberGroup` is the platform's global member-group principal. It lives in the hub
+database and is managed through the `/database` backend. The contract's "separate
+service" framing was an unfrozen v0.1 proposal; the implementation aligns to the
+tables that were actually built. The `GroupResolver` port stays — an external
+`HUB_GROUP_SERVICE_URL` HTTP implementation remains a supported override — but the
+default implementation reads the in-hub `MemberGroup` closure.
+
+### Authority: website administrator only
+
+Group create/delete and member add/remove are restricted to the **website
+administrator**, defined (consistently with the rest of the file library, D19/C4
+adaptation) as an `OWNER`/`ADMIN` of the silo Organization (`isWebsiteAdmin` in
+`filelib/guards.ts`). ADR-0023's `PlatformIdentity` is the future "true" platform
+control plane; the file library uniformly uses org OWNER/ADMIN today and this
+feature stays consistent with that. Reading groups for the authorization selector
+(`/groups/search`) is **not** admin-gated — picking a group to grant is a Manage
+holder's ability, not an administrator's.
+
+### Resolution semantics (the crux)
+
+`resolveMemberGroupIds(user)` returns the user's **active direct groups ∪ the
+active ancestors of those groups**, deduplicated (the closure's depth-0 self row
+makes each direct group its own ancestor). This is the single query the permission
+engine relies on; equivalently: a grant placed on group G applies to members of G
+and of every descendant of G (requirement 3.2 — permission flows down the tree, so
+resolution collects up the tree). It is computed **live, never cached** (contract
+D4/G4): a membership change is visible on the very next protected request.
+
+MemberGroup is global (no `organizationId`), so resolution is not org-scoped.
+
+### Soft delete via `archivedAt`, cascading the subtree
+
+Delete is soft: `MemberGroup.archivedAt` is a tag. Deleting a group
+cascade-soft-deletes its **whole subtree** (walk `MemberGroupClosure` where
+`ancestorId = G`, stamp `archivedAt` on each active descendant) — an application
+operation, not a DB constraint. Closure and membership rows are **retained**;
+resolution and listing filter by `archivedAt`, so an archived group and everything
+under it stop contributing to permission at once.
+
+### Closure maintenance
+
+The closure is maintained on **create**: insert `(G, G, 0)`, then for a parent `P`
+insert `(a.ancestorId, G, a.depth + 1)` for every `a` in
+`closure where descendantId = P`. v1 does **not** support reparenting a group
+(moving it under a new parent). The schema reserves reparent (closure rebuild plus
+the cycle guard "reject a new parent inside the moved subtree"); it is a follow-on.
+
+### Rename and description edits are in scope; reparent stays out
+
+A group's `name` and `description` are mutable by the website administrator
+(`PATCH /database/api/groups/:id`, audited as `group.update`). This is deliberately
+separated from reparent: renaming touches **no** closure row and cannot create a
+cycle, so it carries none of the invariant risk that keeps reparent out of v1. The
+endpoint therefore **rejects** a `parentId` field outright rather than ignoring it,
+so a future reparent cannot arrive silently through this route. Passing an empty
+`description` clears it; omitting a field leaves it unchanged.
+
+### Restore is deliberately asymmetric with delete
+
+Archived groups stay visible to the administrator (`GET
+/database/api/groups?includeArchived=1` returns them carrying `archivedAt`; the
+console tags and greys them) and can be restored (`POST
+/database/api/groups/:id/restore`, audited as `group.restore`).
+
+Restore is **not** the mirror image of delete. Delete cascades down the whole
+subtree; restore un-archives **the group plus every archived ancestor of it, and
+nothing below it**:
+
+- Restoring the ancestor chain is **mandatory**, not a convenience. An active group
+  whose parent is archived has no path in the tree, and the `depth` derivation
+  (closure row count) presumes "an active group's ancestors are active" — the
+  invariant that cascade-delete establishes. Restoring a node alone would break it.
+- The subtree is deliberately **left archived**. A group's descendants may have been
+  archived for reasons of their own, and one click should not silently re-grant
+  permission across a whole historical branch. Descendants remain visible in their
+  archived state and are each restored explicitly.
+
+Restore takes effect immediately, like every other membership change (D4/G4): the
+group resumes contributing permission on the next resolution.
+
+An archived group is **readable but not writable**. Its membership rows are never
+revoked by archiving, so `listMembers` succeeds on an archived group — the console
+must be able to show *who was in it* before deciding whether to restore it. Every
+mutation, by contrast, still requires an active group (`requireActiveGroup` → 404):
+rename, child creation, and member add/remove all reject. The group is inert for
+permission purposes and frozen for editing, but not hidden and not forgotten.
+
+### Member picker reads global users, admin-only
+
+`GET /database/api/users/search` backs the "add member" picker: it matches `User`
+by display name or Feishu open id and is gated to the website administrator, the
+same authority that may add members. It widens no existing capability — adding a
+member already accepts **any** global user (`resolveUser` does not require an org
+membership), so the endpoint only replaces blind id entry with search. It is
+deliberately **not** opened to the non-admin authorization-selector audience that
+`/groups/search` serves: choosing a group to grant is a Manage-holder action,
+whereas enumerating people is not. `excludeGroupId` filters out the target group's
+active members so the picker cannot surface a candidate that must 409.
+
+### Audit is written in-hub
+
+The contract (C3 §6.3) originally deferred group actions to the foreign Group
+service's own audit. With the group system in-hub, group mutations are audited
+through the existing file-library sink (`filelib/audit.ts`, same-transaction
+`AuditEntry`) under the silo Organization — `MemberGroup` has no `organizationId`,
+so the audit row is attributed to the silo org. New actions: `group.create`,
+`group.update`, `group.delete`, `group.restore`, `group.member_add`,
+`group.member_remove`; new audit object type `group`.
+
+## Consequences
+
+- The default `GroupResolver` becomes the in-hub `MemberGroup` closure reader.
+  `createTeamGroupResolver` is retained but deprecated (no longer wired); existing
+  flat-Team group grants no longer resolve for the file library.
+- Group grants take effect in real time through the existing `effectiveRole`
+  reducer (P6) with no change to the permission algebra — only the set of group ids
+  fed to it changes.
+- v1 omits reparent; the closure invariants above must hold whenever reparent is
+  added later (rebuild descendants' ancestor rows, reject cycles).
+- Group management is an admin-only surface; the authorization selector is not.
+- Numeric limits (max depth, max members) and a hard-delete/restore path remain
+  follow-on operational decisions; they must not weaken the archived-filter,
+  admin-authority, or live-resolution invariants fixed here.

docs/adr/0029-web-surface-frontend-backend-separation.md

@@ -0,0 +1,132 @@
+# ADR 0029: Web Surfaces Are Static SPAs; the Hub Serves JSON Only
+
+## Status
+
+Accepted.
+
+## Context
+
+The Hub exposes three browser surfaces: the org-admin console (`/admin`), the
+teacher-facing file library (`/app`), and the database admin back office
+(`/database`). They arrived at different times and diverged in how HTML reached
+the browser.
+
+`/admin` and `/app` were already separated: the backend serves a prebuilt static
+`index.html` and never inspects the request; all data flows through JSON
+endpoints. `/database` was not. Roughly 1770 lines across four modules
+(`renderDashboard`/`renderLoginPage` in `routes/databaseRoutes.ts`,
+`routes/adminPanels.ts`, `routes/libraryBrowser.ts`, `routes/libraryPage.ts`)
+assembled HTML template strings server-side, reading the session cookie and
+querying Prisma inside the page handler, with layout expressed as inline
+`style="…"` attributes and behavior as `<script>` text.
+
+A prior migration (`12628c9`) introduced a fourth frontend project,
+`hub/database-admin/`, intended to replace those pages. It was never wired up:
+the concrete route `/database/dashboard` is more specific than the SPA wildcard
+`/database/*`, so the server-rendered handler always won and the SPA's dashboard
+was unreachable. That project's file header claimed the SPA served the dashboard
+and that `/database/config` existed; neither was true. The `npm run build` script
+also never built it, so the `existsSync` guard in `database/static.ts` failed on
+every deploy and the shell was permanently disabled.
+
+Duplicated visual rules were the practical cost: card padding and type sizes were
+restated in each render module, and only the CSS variables in `routes/uiTheme.ts`
+were genuinely shared.
+
+## Decision
+
+**No Hub HTTP handler renders HTML.** Every browser surface is a prebuilt static
+SPA. Page handlers send a byte-identical `index.html` that does not depend on the
+request; all per-user and per-request data is fetched by the client from JSON
+endpoints under `/api/*` or `/database/api/*`.
+
+**`/app` and `/database` are one frontend project, `hub/filelib-web`, built once
+and mounted at two prefixes.** They share the file library browser, the session
+layer, the toast host, and the design tokens; splitting them would duplicate all
+of it. `hub/database-admin` is deleted — superseded before it ever served a
+request.
+
+Two configuration constraints follow from co-hosting two SvelteKit SPAs on one
+Fastify instance, and are load-bearing:
+
+- `filelib-web` sets `appDir: '_filelib'`. The SvelteKit default `_app` collides
+  with the root `/_app/*` asset route that `admin-web` owns
+  (`src/admin/static.ts`); Fastify rejects duplicate routes at startup, so the
+  collision is a boot failure, not a silent misroute.
+- `filelib-web` sets `paths.relative: false`. The same `index.html` is served at
+  different URL depths (`/app`, `/database/dashboard/users`), so relative asset
+  paths would resolve against the wrong base.
+
+**Client-side navigation uses real URL routes, not hash fragments or hidden
+sections.** The six back-office tabs are `/database/dashboard`,
+`/database/dashboard/library`, `/users`, `/groups`, `/search`, `/settings`.
+Refresh preserves position and links are shareable — the previous
+`location.hash` + `display:none` scheme lost both.
+
+Concrete routes must be registered before the SPA wildcards. This is an ordering
+obligation on `database/plugin.ts`, not an incidental detail: the earlier
+`/database/dashboard` shadowing bug is exactly what happens when a concrete page
+route outranks the fallback.
+
+## Consequences
+
+- Authorization is enforced only by the JSON endpoints. A client-side guard (the
+  `isWebsiteAdmin` check in the dashboard layout) is a navigation convenience and
+  carries no security weight; every endpoint keeps its own `fail closed` guard.
+- `/database/api/stats` is a new endpoint carrying what `loadDashboardStats` used
+  to compute inline. It requires silo org `OWNER`/`ADMIN` because it aggregates
+  org-wide counts and the audit stream rather than a per-node permission view.
+- `/database/api/me` grew `displayName` and `avatarUrl`. Anything the old page
+  handler read from Prisma to render chrome has to become part of a JSON payload
+  or it is simply unavailable: the sidebar identity strip showed a raw `userId`
+  until these were added. When migrating a server-rendered surface, the data the
+  template closed over is part of the contract being ported, not an incidental
+  detail of the old implementation.
+- Editing a page no longer requires a Hub restart in development; `vite dev`
+  serves the frontend and proxies data requests to the Hub. In production the
+  `index.html` is cached in memory at startup, so a frontend rebuild does require
+  a restart.
+- Deploy scripts and the silo rate-limit exemption list name `filelib-web` and
+  `/_filelib/*`. Adding a fourth surface means picking another `appDir` and
+  extending that list.
+- The design system is one file, `filelib-web/src/app.css`: an `@theme` block for
+  tokens plus an `@layer components` block for the shared component classes
+  (`.btn`, `.panel`, `.input`, `.select`, `.list`, `.tag`, `.quiet`, …).
+  `routes/uiTheme.ts` is deleted; both halves live there now.
+
+  The first cut of this migration kept only the tokens and restated button,
+  input, and panel styling inline in every component. That reproduced the
+  duplication the old code had — the admin panels visibly regressed — so the
+  component layer was ported too. Components carry layout utilities; they do not
+  restate component styling. The one admitted exception is a data-derived value
+  (tree indent computed from `depth`), which cannot be a static class.
+
+  The icon set (`lib/Icon.svelte`, 13 paths) is likewise shared rather than
+  restated. It came from `adminPanels.ts`; Group nodes deliberately use a
+  two-person silhouette, not a folder glyph, because `MemberGroup` and the file
+  library's `FOLDER`/`PROJECT` are unrelated hierarchies (ADR-0028, ADR-0021).
+
+- **A migrated surface is only done when its endpoint coverage matches.** Two
+  panels were rebuilt from a superficially similar component that predated the
+  migration rather than from the server module they replaced, and the mismatch
+  was invisible in the rendered page:
+
+  - Group management called 5 of 8 endpoints. Rename (`PATCH`),
+    `?includeArchived=1`, `/restore`, and `/users/search` had no entry point, so
+    a soft-deleted group could not be restored through the UI at all even though
+    the backend fully supported it.
+  - The library browser dropped the `授权` tab entirely — `GET/PUT/DELETE
+    .../grants` and `PUT .../independent-permission` had no caller. Permission
+    editing is the point of the back office, and it was unreachable.
+
+  Diffing the route table against the frontend's `api()` call sites catches this;
+  reading the new page does not.
+
+## Deferred
+
+- `/admin` (admin-web) stays a separate project. It has its own design language
+  (`saas-*` classes, `surface-*`/`primary-*` scales) and a different audience;
+  merging it is not motivated by shared code.
+- The `search` and `settings` tabs remain placeholders, as they were server-side.
+- Serving `/admin` and `/database` from a single SPA, which would remove the
+  `appDir` collision constraint entirely.

docs/adr/0030-project-grants-always-live.md

@@ -0,0 +1,43 @@
+# ADR 0030: Project Grants Are Always Live; The Independent-Permission Toggle Is Removed
+
+## Status
+
+Accepted. Supersedes the file-library contract rule **D11 / P5** (《文件库-接口契约.md》,
+since deleted; recoverable from git history) which introduced the per-project
+"独立权限" (independent permission) switch.
+
+## Context
+
+D11 gave each PROJECT a toggle (`FileLibProjectSettings.independentPermissionsEnabled`,
+default off). While off, project-level non-creator grants were **frozen** — present in
+`FileLibGrant` but excluded from `effectiveRole`; ancestor-chain grants and the creator's
+auto-grant were unaffected. The intent was to support two workflows: "project follows the
+folder's ACL" (off) vs "project has its own ACL" (on).
+
+In practice the toggle surprised operators twice: grants appeared to "not work" until
+someone found and flipped a per-project switch buried in the 概览 tab, and the frozen state
+was indistinguishable from missing grants in the UI. The product decision is that
+project-level grants should simply always be live.
+
+## Decision
+
+- **Project-level grants always participate in `effectiveRole`.** The freeze branch in
+  `hub/src/database/filelib/permission.ts` is deleted; `EffectiveRoleInput` no longer
+  carries `independentPermissionsEnabled`.
+- **The toggle surface is removed end-to-end**: `PUT /database/api/projects/:id/independent-permission`,
+  `grantService.setIndependentPermission`, the `independentPermission` field in the node
+  detail DTO, and the 概览 tab switch in `filelib-web`.
+- **`FileLibProjectSettings` becomes vestigial.** The table stays (existing rows are
+  ignored, no data migration); new projects no longer get a default row. It may be dropped
+  in a future migration once nothing references it.
+- Audit action vocabulary `independent_enable` / `independent_disable` is retained for
+  reading historical audit entries; no new entries are produced.
+
+Behavior change for existing deployments: projects whose toggle was off now have their
+project-level grants effective immediately — this is the intended effect of the decision.
+
+## Consequences
+
+- Permission semantics shrink to the single P6 rule: `effective = max(grants on self ∪
+  ancestors for user ∪ resolved groups)`, no exceptions by node kind.
+- One less state dimension in tests and in the admin UI.

docs/adr/0031-filelib-recycle-bin-and-recent-visits.md

@@ -0,0 +1,58 @@
+# ADR 0031: File Library Recycle Bin And Recent-Visit Tracking
+
+## Status
+
+Accepted.
+
+## Context
+
+The teacher app (`/app`) gains a left navigation rail with three entries: 文件库 /
+最近打开 / 回收站. Two of them need semantics that no prior decision covers:
+
+- **回收站 (recycle bin)**: D15 defined soft delete (mark `deletedAt` on the node only;
+  a node is invisible when any ancestor is deleted) but never defined listing, restore,
+  or permanent deletion.
+- **最近打开 (recent visits)**: nothing tracks opens.
+
+## Decision
+
+### Recycle bin
+
+- **List**: shows nodes with `deletedAt != null` whose **ancestors are all active**
+  (the topmost deleted node per branch; descendants of a deleted node are represented
+  by it and not listed separately).
+- **Visibility/auth**: a bin entry is visible to (a) the website administrator, or
+  (b) any actor holding an active MANAGE grant **on the deleted node itself**
+  (grants stay live through soft delete, so this is a plain grant query — no chain
+  walk, no inheritance; the bin is a management surface, not a browsing surface).
+- **Restore** clears `deletedAt` on that node only (D15 symmetry: delete marks one
+  node, restore unmarks one node). The subtree becomes visible again immediately.
+  Same auth as the list entry. Audited (`folder_restore` / `project_restore`).
+- **Permanent delete (彻底删除)** is **website-administrator only**: hard-deletes the
+  node **and its whole subtree** (descendants enumerated via the `pathIds` materialized
+  path, deleted deepest-first because the self-FK is `ON DELETE RESTRICT`), in one
+  transaction, with one audit entry (`node_purge`, detail carries removed count).
+  Grants/settings/export-jobs cascade. There is no recovery; the UI must confirm
+  explicitly.
+
+### Recent visits
+
+- **Model**: `FileLibRecentVisit(organizationId, userId, nodeId, filePath, openedAt)`,
+  unique on `(organizationId, userId, nodeId, filePath)` with `filePath` defaulting to
+  `""` (Postgres unique indexes treat NULLs as distinct). `filePath = ""` means the
+  visit is the node itself (drill into folder/project); non-empty means a file preview
+  inside that project.
+- **Recording is client-driven**: the teacher app POSTs after a successful open
+  (folder drill, project open, file preview). The endpoint requires VIEW on the node
+  (D8: no VIEW → 404, leaking nothing). Upsert semantics: re-opening refreshes
+  `openedAt`. No audit entries — this is a per-user read model, not a权限-sensitive
+  mutation.
+- **List**: the actor's own most recent 20, `openedAt` desc. Entries whose node is
+  deleted **or has any deleted ancestor** are filtered out (D8/D15 visibility holds
+  on every surface). Names are read live from `FileLibNode` (no denormalization).
+
+## Consequences
+
+- No change to existing permission algebra; both features are additive surfaces.
+- The bin deliberately does not offer per-owner bins or inherited-MANAGE visibility —
+  if real usage demands it, that is a new decision.

docs/adr/0032-remove-recent-visit-module.md

@@ -0,0 +1,30 @@
+# ADR 0032: Remove The Recent-Visit Module
+
+## Status
+
+Accepted. **Supersedes the "Recent visits" half of ADR-0031** (the recycle-bin half
+is unaffected and remains in force).
+
+## Context
+
+ADR-0031 (same day) introduced 最近打开: a `FileLibRecentVisit` table, client-driven
+visit recording, and a rail entry in the teacher app. After seeing it live, the product
+call is that the module is not wanted — it adds a tracking surface, a table, and rail
+noise without a compelling teacher workflow behind it.
+
+## Decision
+
+The recent-visit module is removed end-to-end:
+
+- `FileLibRecentVisit` is dropped (hand-written migration
+  `20260731090000_drop_filelib_recent_visit`; the table was created the same day and
+  held no production data).
+- `recentService` / `recentRoutes` (`/database/api/recent`) and the `RecentView`
+  component are deleted; the rail in `/app` keeps only 文件库 / 回收站.
+- `GridLibraryView` visit recording and the `navTarget` navigation entry go with it.
+- The `role` field added to breadcrumb entries for ADR-0031 is **kept** — it is a
+  cheap, additive field on an existing API and independent of the removed module.
+
+If recent-visit tracking comes back as a requirement, it is a new decision (and
+should then define why client-driven tracking is worth its surface) rather than a
+revival of this one.

docs/adr/0033-restore-deduplicates-name.md

@@ -0,0 +1,26 @@
+# ADR 0033: Restore De-Duplicates The Node Name On Sibling Conflict
+
+## Status
+
+Accepted.
+
+## Context
+
+ADR-0031 defined restore as "clear `deletedAt` on that node only". It did not cover
+the case where a same-name sibling was created **after** the deletion: D14's partial
+unique index (active siblings, case-insensitive) then rejects the restore with a 409
+`conflict`, leaving the entry permanently stuck in the bin — unrecoverable for
+non-admin users (who cannot purge) and cryptic for admins.
+
+## Decision
+
+Restore never fails on a name conflict. Before clearing `deletedAt`, the service
+checks active siblings; if the node's name is taken, it restores as
+`原名(已恢复)`, then `原名(已恢复 2)`, …, first free key wins (suffix is included
+in the `NODE_NAME_MAX_LENGTH` budget by truncating the base). The rename is part of
+the same transaction and is recorded in the restore audit entry as
+`{ name, renamedFrom }`. The API returns the final name so the UI can tell the user.
+
+Rationale: the bin's purpose is recovery; a restore that can deadlock on naming is a
+trap, not a safeguard. Users who care about the name can rename afterwards (they have
+MANAGE by definition of bin visibility).

docs/adr/0034-purge-follows-manage.md

@@ -0,0 +1,28 @@
+# ADR 0034: Permanent Delete Follows MANAGE, Not Website Administrator
+
+## Status
+
+Accepted. **Supersedes one clause of ADR-0031**: "Permanent delete (彻底删除) is
+website-administrator only".
+
+## Context
+
+ADR-0031 gated 彻底删除 to the website administrator as a high-risk-operation
+precaution. The product call is that this is inconsistent with the rest of the
+permission model: soft delete already requires only MANAGE on the node, and a
+MANAGE holder who can delete a node into the bin should also be able to purge it —
+the authority that grants deletion grants destruction. Admin-only purge strands
+non-admin managers with bins they cannot empty.
+
+## Decision
+
+Permanent delete uses **the same visibility rule as the bin entry itself**: website
+administrator, or an actor with an active MANAGE grant on the deleted node (direct
+grant, USER or resolved GROUP). Anyone else gets 404 (D8). The double confirmation
+in the UI and the `node.purge` audit entry are unchanged.
+
+## Consequences
+
+- Purge auth = restore auth = bin-entry visibility: one rule, three surfaces.
+- The operation remains irreversible and audited; no new capability is granted to
+  anyone who could not already delete the node (soft) and see it in the bin.

docs/adr/0035-restore-keeps-original-name.md

@@ -0,0 +1,20 @@
+# ADR 0035: Restore Keeps The Original Name; Conflict Is A Clear Error
+
+## Status
+
+Accepted. **Supersedes ADR-0033** (restore de-duplicates the node name on sibling
+conflict).
+
+## Context
+
+ADR-0033 made restore auto-rename to `原名(已恢复)` on sibling name conflict so
+restore never fails. In practice the suffix is unwanted noise - operators expect the
+original name back and prefer to resolve conflicts themselves.
+
+## Decision
+
+Restore clears `deletedAt` and keeps the node's **original name**. If an active
+sibling now occupies the same name (D14 partial unique index), the service throws a
+`409 name_conflict_on_restore` with a human-readable message ("同名节点已存在，请先
+重命名现有节点再恢复") - no silent renaming, no suffix. The restore audit records
+the original name only.

hub/.gitignore

@@ -8,6 +8,10 @@ dist/
 .dev-keyring.json
 .dev-workspaces/
 .dev-skills/
+.filelib-repos/
 admin-web/node_modules/
 admin-web/build/
 admin-web/.svelte-kit/
+filelib-web/node_modules/
+filelib-web/build/
+filelib-web/.svelte-kit/

hub/deploy/deploy_fleet_release.sh

@@ -82,10 +82,11 @@ REMOTE
   rsync -az --delete \
     --exclude node_modules --exclude dist --exclude .env \
     --exclude admin-web/node_modules --exclude admin-web/build --exclude admin-web/.svelte-kit \
+    --exclude filelib-web/node_modules --exclude filelib-web/build --exclude filelib-web/.svelte-kit \
     -e "ssh ${SSH_OPTS[*]}" \
     "$REPO_ROOT/hub/" "$DEPLOY_USER@$HOST:$HUB_DIR/"
 
-  echo "[fleet] npm ci + build (tsc + admin-web SPA)"
+  echo "[fleet] npm ci + build (tsc + admin-web & filelib-web SPAs)"
   ssh "${SSH_OPTS[@]}" "$DEPLOY_USER@$HOST" bash -s <<REMOTE
 set -euo pipefail
 flock /var/lock/cph-hub-release-publish bash -c '
@@ -97,9 +98,11 @@ flock /var/lock/cph-hub-release-publish bash -c '
   cd "$HUB_DIR"
   PUPPETEER_SKIP_DOWNLOAD=1 npm ci
   npm ci --prefix admin-web
+  npm ci --prefix filelib-web
   npm run audit:production
   npm run build
   test -f admin-web/build/index.html
+  test -f filelib-web/build/index.html
   touch "$RELEASE_DIR/.complete"
 '
 REMOTE

hub/deploy/deploy_platform.sh

@@ -60,10 +60,11 @@ if [ "$release_ready" = false ]; then
     -e "ssh ${SSH_OPTS[*]}" \
     "$REPO_ROOT/hub/" "$DEPLOY_USER@$HOST:$HUB_DIR/"
 
-  # 2. Install deps (hub + admin-web), audit hub prod, build tsc + SPA, mark complete.
-  # `npm run build` → tsc then admin:build → admin-web/build for registerStaticSpa.
+  # 2. Install deps (hub + both SPAs), audit hub prod, build tsc + SPAs, mark complete.
+  # `npm run build` → tsc then admin:build + filelib:build → admin-web/build and
+  # filelib-web/build for registerStaticSpa / registerDatabaseSpa.
   ssh "${SSH_OPTS[@]}" "$DEPLOY_USER@$HOST" \
-    "cd '$HUB_DIR' && PUPPETEER_SKIP_DOWNLOAD=1 npm ci && npm ci --prefix admin-web && npm run audit:production && npm run build && touch '$RELEASE_DIR/.complete'"
+    "cd '$HUB_DIR' && PUPPETEER_SKIP_DOWNLOAD=1 npm ci && npm ci --prefix admin-web && npm ci --prefix filelib-web && npm run audit:production && npm run build && touch '$RELEASE_DIR/.complete'"
 fi
 
 # 3. Ensure the service is installed (idempotent), then restart.

hub/filelib-web/index.html

@@ -1,12 +0,0 @@
-<!doctype html>
-<html lang="zh-CN">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>文件库</title>
-  </head>
-  <body>
-    <div id="app"></div>
-    <script type="module" src="/src/main.ts"></script>
-  </body>
-</html>

hub/filelib-web/package-lock.json

@@ -8,6 +8,8 @@
       "name": "filelib-web",
       "version": "0.1.0",
       "devDependencies": {
+        "@sveltejs/adapter-static": "^3.0.10",
+        "@sveltejs/kit": "^2.63.0",
         "@sveltejs/vite-plugin-svelte": "^7.1.2",
         "@tailwindcss/vite": "^4.3.2",
         "svelte": "^5.56.1",
@@ -130,6 +132,13 @@
         "url": "https://github.com/sponsors/Boshen"
       }
     },
+    "node_modules/@polka/url": {
+      "version": "1.0.0-next.29",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
+      "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@rolldown/binding-android-arm64": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.1.5.tgz",
@@ -412,6 +421,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@standard-schema/spec": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
+      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@sveltejs/acorn-typescript": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.11.tgz",
@@ -422,6 +438,58 @@
         "acorn": "^8.9.0"
       }
     },
+    "node_modules/@sveltejs/adapter-static": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-3.0.10.tgz",
+      "integrity": "sha512-7D9lYFWJmB7zxZyTE/qxjksvMqzMuYrrsyh1f4AlZqeZeACPRySjbC3aFiY55wb1tWUaKOQG9PVbm74JcN2Iew==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@sveltejs/kit": "^2.0.0"
+      }
+    },
+    "node_modules/@sveltejs/kit": {
+      "version": "2.70.1",
+      "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.70.1.tgz",
+      "integrity": "sha512-nY9SPHGOZro3doud9vZXDBwl9tCZIouuJztjgSHs6PAIrv9M/z5O7eOhPV5xU7CgVHA976Jwu3BA1hIFvXztkA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@standard-schema/spec": "^1.0.0",
+        "@sveltejs/acorn-typescript": "^1.0.9",
+        "@types/cookie": "^0.6.0",
+        "acorn": "^8.16.0",
+        "cookie": "^0.6.0",
+        "devalue": "^5.8.1",
+        "esm-env": "^1.2.2",
+        "kleur": "^4.1.5",
+        "magic-string": "^0.30.5",
+        "mrmime": "^2.0.0",
+        "set-cookie-parser": "^3.0.0",
+        "sirv": "^3.0.0"
+      },
+      "bin": {
+        "svelte-kit": "svelte-kit.js"
+      },
+      "engines": {
+        "node": ">=18.13"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.0.0",
+        "@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0 || ^6.0.0-next.0 || ^7.0.0",
+        "svelte": "^4.0.0 || ^5.0.0-next.0",
+        "typescript": "^5.3.3 || ^6.0.0",
+        "vite": "^5.0.3 || ^6.0.0 || ^7.0.0-beta.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@opentelemetry/api": {
+          "optional": true
+        },
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@sveltejs/load-config": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@sveltejs/load-config/-/load-config-0.2.0.tgz",
@@ -747,6 +815,13 @@
         "tslib": "^2.4.0"
       }
     },
+    "node_modules/@types/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/estree": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
@@ -820,6 +895,16 @@
         "node": ">=6"
       }
     },
+    "node_modules/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/deepmerge": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
@@ -946,6 +1031,16 @@
         "jiti": "lib/jiti-cli.mjs"
       }
     },
+    "node_modules/kleur": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
+      "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/lightningcss": {
       "version": "1.32.0",
       "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",
@@ -1246,6 +1341,16 @@
         "node": ">=4"
       }
     },
+    "node_modules/mrmime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz",
+      "integrity": "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/nanoid": {
       "version": "3.3.16",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz",
@@ -1389,6 +1494,28 @@
         "node": ">=6"
       }
     },
+    "node_modules/set-cookie-parser": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-3.1.2.tgz",
+      "integrity": "sha512-5/r/lTwbJ3zQ+qwdUFZYeRNqda7P5HD8zQKqlSjdGt1/S0cjLAphHusj4Y58ahDtWn/g32xrIS58/ikOvwl0Lw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/sirv": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-3.0.2.tgz",
+      "integrity": "sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@polka/url": "^1.0.0-next.24",
+        "mrmime": "^2.0.0",
+        "totalist": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/source-map-js": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
@@ -1490,6 +1617,16 @@
         "url": "https://github.com/sponsors/SuperchupuDev"
       }
     },
+    "node_modules/totalist": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/tslib": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",

hub/filelib-web/package.json

@@ -4,12 +4,15 @@
   "version": "0.1.0",
   "type": "module",
   "scripts": {
-    "dev": "vite",
+    "dev": "vite dev",
     "build": "vite build",
     "preview": "vite preview",
-    "check": "svelte-check --tsconfig ./tsconfig.json"
+    "prepare": "svelte-kit sync || echo ''",
+    "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json"
   },
   "devDependencies": {
+    "@sveltejs/adapter-static": "^3.0.10",
+    "@sveltejs/kit": "^2.63.0",
     "@sveltejs/vite-plugin-svelte": "^7.1.2",
     "@tailwindcss/vite": "^4.3.2",
     "svelte": "^5.56.1",

hub/filelib-web/src/App.svelte

@@ -1,30 +0,0 @@
-<script lang="ts">
-  import { onMount } from "svelte";
-  import { api, UnauthenticatedError } from "./lib/api.js";
-  import { me, authChecked } from "./lib/stores.js";
-  import type { MeResponse } from "./lib/types.js";
-  import LoginView from "./lib/LoginView.svelte";
-  import BrowserShell from "./lib/BrowserShell.svelte";
-  import Toasts from "./lib/Toasts.svelte";
-
-  onMount(async () => {
-    try {
-      me.set(await api<MeResponse>("/database/api/me"));
-    } catch (e) {
-      if (!(e instanceof UnauthenticatedError)) console.error(e);
-      me.set(null);
-    } finally {
-      authChecked.set(true);
-    }
-  });
-</script>
-
-{#if !$authChecked}
-  <div class="flex h-full items-center justify-center text-ink-3">加载中…</div>
-{:else if $me}
-  <BrowserShell />
-{:else}
-  <LoginView />
-{/if}
-
-<Toasts />

hub/filelib-web/src/app.css

@@ -23,8 +23,7 @@
 }
 
 html,
-body,
-#app {
+body {
   height: 100%;
 }
 
@@ -47,6 +46,204 @@ body {
   font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
 }
 
+/* 共享组件层(ADR-0029)。
+ *
+ * 从已删除的 hub/src/database/routes/uiTheme.ts 原样搬来。组件只带布局工具类,
+ * 不重述这里的组件样式 —— 第一版迁移只搬了上面的 @theme 令牌,把按钮/输入框/
+ * 面板样式在每个组件里内联重写了一遍,后台随即明显退化。 */
+@layer components {
+  .btn {
+    display: inline-flex;
+    align-items: center;
+    gap: 5px;
+    padding: 6px 14px;
+    border-radius: 8px;
+    border: 1px solid var(--color-line);
+    background: var(--color-panel);
+    color: var(--color-ink);
+    font-size: 12.5px;
+    font-weight: 500;
+    cursor: pointer;
+    transition: all 120ms ease;
+    white-space: nowrap;
+  }
+  .btn:hover {
+    background: var(--color-hover);
+  }
+  .btn-sm {
+    padding: 4px 9px;
+    font-size: 11.5px;
+  }
+  .btn-primary {
+    background: var(--color-accent);
+    border-color: var(--color-accent);
+    color: #fff;
+  }
+  .btn-primary:hover {
+    background: var(--color-accent-hover);
+    border-color: var(--color-accent-hover);
+  }
+  .btn-danger {
+    border-color: transparent;
+    background: transparent;
+    color: var(--color-danger);
+  }
+  .btn-danger:hover {
+    background: color-mix(in srgb, var(--color-danger) 7%, transparent);
+  }
+
+  .panel {
+    background: var(--color-panel);
+    border: 1px solid var(--color-line-soft);
+    border-radius: 10px;
+    padding: 20px 22px;
+  }
+
+  .tag {
+    display: inline-flex;
+    align-items: center;
+    gap: 3px;
+    font-size: 10.5px;
+    font-weight: 500;
+    font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+    padding: 2px 8px;
+    border-radius: 999px;
+    border: 1px solid var(--color-line-soft);
+    color: var(--color-ink-3);
+    background: var(--color-panel);
+  }
+
+  .input,
+  .select,
+  .textarea {
+    width: 100%;
+    padding: 7px 11px;
+    border-radius: 8px;
+    border: 1px solid var(--color-line);
+    background: var(--color-panel);
+    font-size: 13px;
+    color: var(--color-ink);
+    font-family: inherit;
+    outline: none;
+    transition: border-color 120ms ease;
+  }
+  .input:focus,
+  .select:focus,
+  .textarea:focus {
+    border-color: var(--color-accent);
+  }
+  .textarea {
+    font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+    font-size: 12.5px;
+    line-height: 1.75;
+    resize: vertical;
+  }
+  .form-label {
+    display: block;
+    font-size: 11.5px;
+    color: var(--color-ink-3);
+    margin-bottom: 4px;
+  }
+  .form-row {
+    margin-bottom: 12px;
+  }
+
+  table.list {
+    width: 100%;
+    border-collapse: collapse;
+    font-size: 13px;
+  }
+  table.list th {
+    text-align: left;
+    font-size: 11.5px;
+    font-weight: 500;
+    color: var(--color-ink-3);
+    padding: 4px 0;
+  }
+  table.list td {
+    padding: 8px 0;
+    border-top: 1px solid var(--color-line-soft);
+  }
+  table.list tr:first-child td {
+    border-top: none;
+  }
+
+  .quiet {
+    color: var(--color-ink-3);
+    font-size: 12.5px;
+  }
+  .section-title {
+    font-size: 13px;
+    font-weight: 600;
+  }
+  .section-note {
+    font-size: 11.5px;
+    color: var(--color-ink-3);
+  }
+  .file-meta {
+    font-size: 11px;
+    color: var(--color-ink-3);
+    font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+  }
+  .link-danger {
+    color: var(--color-danger);
+    font-size: 12.5px;
+    background: none;
+    border: none;
+    cursor: pointer;
+    padding: 0;
+  }
+  .link-danger:hover {
+    text-decoration: underline;
+  }
+
+  /* 开关。真 checkbox 藏在下面 —— 保留键盘可达与 :checked 语义,不做 div 假开关。 */
+  .switch {
+    display: inline-flex;
+    align-items: center;
+    gap: 8px;
+    cursor: pointer;
+    user-select: none;
+  }
+  .switch > input {
+    position: absolute;
+    opacity: 0;
+    width: 0;
+    height: 0;
+  }
+  .switch > span {
+    position: relative;
+    flex-shrink: 0;
+    width: 30px;
+    height: 17px;
+    border-radius: 999px;
+    background: var(--color-line);
+    transition: background 0.16s;
+  }
+  .switch > span::after {
+    content: "";
+    position: absolute;
+    top: 2px;
+    left: 2px;
+    width: 13px;
+    height: 13px;
+    border-radius: 50%;
+    background: #fff;
+    transition: transform 0.16s;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25);
+  }
+  .switch > input:checked + span {
+    background: var(--color-accent);
+  }
+  .switch > input:checked + span::after {
+    transform: translateX(13px);
+  }
+  .switch > input:focus-visible + span {
+    outline: 2px solid var(--color-accent);
+    outline-offset: 2px;
+  }
+}
+
 /* diff 渲染 */
 pre.diff {
   white-space: pre-wrap;

hub/filelib-web/src/app.d.ts

@@ -0,0 +1,12 @@
+// See https://svelte.dev/docs/kit/types#app
+declare global {
+	namespace App {
+		// interface Error {}
+		// interface Locals {}
+		// interface PageData {}
+		// interface PageState {}
+		// interface Platform {}
+	}
+}
+
+export {};

hub/filelib-web/src/app.html

@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="zh-CN">
+	<head>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<link rel="preconnect" href="https://fonts.googleapis.com" />
+		<link
+			href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap"
+			rel="stylesheet"
+		/>
+		%sveltekit.head%
+	</head>
+	<body data-sveltekit-preload-data="hover" style="height: 100%">
+		<div style="display: contents; height: 100%">%sveltekit.body%</div>
+	</body>
+</html>

hub/filelib-web/src/lib/Avatar.svelte

@@ -0,0 +1,31 @@
+<script lang="ts">
+  /** 头像:有 avatarUrl 用图,否则显示首字母色块。 */
+  let {
+    displayName,
+    userId,
+    avatarUrl = null,
+    size = 28,
+  }: {
+    displayName?: string | null;
+    userId?: string | null;
+    avatarUrl?: string | null;
+    size?: number;
+  } = $props();
+
+  const initial = $derived((displayName || userId || "?").slice(0, 1).toUpperCase());
+</script>
+
+{#if avatarUrl}
+  <img
+    src={avatarUrl}
+    alt=""
+    class="shrink-0 rounded-full object-cover"
+    style="width:{size}px;height:{size}px"
+  />
+{:else}
+  <span
+    class="inline-flex shrink-0 items-center justify-center rounded-full bg-accent font-semibold text-white"
+    style="width:{size}px;height:{size}px;font-size:{Math.round(size * 0.42)}px"
+    aria-hidden="true">{initial}</span
+  >
+{/if}

hub/filelib-web/src/lib/BinView.svelte

@@ -0,0 +1,105 @@
+<script lang="ts">
+  /**
+   * 回收站(ADR-0031):祖先全活跃的已删节点顶;恢复只清本节点 deletedAt;
+   * 彻底删除(整支硬删)仅网站管理员,二次确认。
+   */
+  import { onMount } from "svelte";
+  import { api } from "./api.js";
+  import { toastErr, toastOk } from "./stores.js";
+  import type { BinEntry } from "./types.js";
+  import Icon from "./Icon.svelte";
+
+  let entries = $state<BinEntry[] | null>(null);
+  let error = $state<string | null>(null);
+  let busyId = $state<string | null>(null);
+
+  async function load(): Promise<void> {
+    try {
+      const r = await api<{ entries: BinEntry[] }>("/database/api/bin");
+      entries = r.entries;
+      error = null;
+    } catch (e) {
+      error = e instanceof Error ? e.message : String(e);
+    }
+  }
+
+  onMount(load);
+
+  function fmt(iso: string): string {
+    try {
+      return new Date(iso).toLocaleString("zh-CN", { dateStyle: "medium", timeStyle: "short" });
+    } catch {
+      return iso;
+    }
+  }
+
+  async function restore(e: BinEntry): Promise<void> {
+    busyId = e.id;
+    try {
+      const r = await api<{ name: string }>(
+        `/database/api/bin/${encodeURIComponent(e.id)}/restore`,
+        { method: "POST" },
+      );
+      toastOk(`已恢复「${r.name}」`);
+      await load();
+    } catch (err) {
+      toastErr(err instanceof Error ? err.message : String(err));
+    } finally {
+      busyId = null;
+    }
+  }
+
+  async function purge(e: BinEntry): Promise<void> {
+    if (!confirm(`彻底删除「${e.name}」及其全部内容?此操作不可恢复。`)) return;
+    if (!confirm(`再次确认:整支硬删,含子文件夹/项目/文件与授权记录。继续?`)) return;
+    busyId = e.id;
+    try {
+      const r = await api<{ removed: number }>(`/database/api/bin/${encodeURIComponent(e.id)}`, { method: "DELETE" });
+      toastOk(`已彻底删除(${r.removed} 个节点)`);
+      await load();
+    } catch (err) {
+      toastErr(err instanceof Error ? err.message : String(err));
+    } finally {
+      busyId = null;
+    }
+  }
+</script>
+
+<div class="flex-1 overflow-y-auto px-6 py-5">
+  <h1 class="mb-4 text-[15px] font-semibold text-ink">回收站</h1>
+
+  {#if error !== null}
+    <div class="py-8 text-center text-[13px] text-danger">{error}</div>
+  {:else if entries === null}
+    <div class="quiet py-8 text-center">加载中…</div>
+  {:else if entries.length === 0}
+    <div class="quiet py-8 text-center">回收站是空的</div>
+  {:else}
+    <div class="panel !p-2">
+      {#each entries as e (e.id)}
+        <div class="flex items-center gap-3 rounded-lg px-3 py-2">
+          <span class="flex text-ink-3"><Icon name={e.kind === "FOLDER" ? "folder" : "layers"} size={15} /></span>
+          <span class="min-w-0 flex-1">
+            <span class="block truncate text-[13px] text-ink">{e.name}</span>
+            <span class="quiet block">删除于 {fmt(e.deletedAt)}</span>
+          </span>
+          <button
+            class="btn btn-sm disabled:opacity-50"
+            onclick={() => void restore(e)}
+            disabled={busyId === e.id}
+          >
+            <Icon name="restore" size={12} /> 恢复
+          </button>
+          <!-- 彻底删除与条目可见性同权(ADR-0034):能在回收站看到,就能清空 -->
+          <button
+            class="btn btn-sm btn-danger disabled:opacity-50"
+            onclick={() => void purge(e)}
+            disabled={busyId === e.id}
+          >
+            <Icon name="trash" size={12} /> 彻底删除
+          </button>
+        </div>
+      {/each}
+    </div>
+  {/if}
+</div>

hub/filelib-web/src/lib/ContextMenu.svelte

@@ -0,0 +1,55 @@
+<script lang="ts" module>
+  import type { IconName } from "./Icon.svelte";
+
+  export interface MenuItem {
+    readonly label: string;
+    readonly icon?: IconName;
+    readonly danger?: boolean;
+    readonly onclick: () => void;
+  }
+</script>
+
+<script lang="ts">
+  /**
+   * 通用右键菜单:光标处弹出,点任意处/再次右键关闭。
+   * 位置做视口夹取(右侧/底部溢出时向内收)。
+   */
+  import Icon from "./Icon.svelte";
+
+  let { x, y, items, onclose }: { x: number; y: number; items: readonly MenuItem[]; onclose: () => void } = $props();
+
+  const MENU_W = 178;
+  const ITEM_H = 34;
+  const px = $derived(
+    typeof window === "undefined" ? x : Math.max(4, Math.min(x, window.innerWidth - MENU_W - 8)),
+  );
+  const py = $derived(
+    typeof window === "undefined" ? y : Math.max(4, Math.min(y, window.innerHeight - items.length * ITEM_H - 20)),
+  );
+</script>
+
+<div
+  class="fixed inset-0 z-50"
+  role="presentation"
+  onclick={onclose}
+  oncontextmenu={(e) => { e.preventDefault(); onclose(); }}
+>
+  <div
+    class="fixed rounded-xl border border-line-soft bg-panel py-1.5 shadow-[0_8px_28px_rgba(26,26,24,.12)]"
+    style="left:{px}px;top:{py}px;width:{MENU_W}px"
+  >
+    {#each items as item (item.label)}
+      <button
+        class="flex w-full items-center gap-2.5 px-3.5 py-[7px] text-left text-[12.5px] transition {item.danger
+          ? 'text-danger hover:bg-hover'
+          : 'text-ink hover:bg-hover'}"
+        onclick={() => { onclose(); item.onclick(); }}
+      >
+        {#if item.icon}
+          <span class={item.danger ? "" : "text-ink-3"}><Icon name={item.icon} size={14} /></span>
+        {/if}
+        {item.label}
+      </button>
+    {/each}
+  </div>
+</div>

hub/filelib-web/src/lib/FileEditor.svelte

@@ -3,6 +3,7 @@
   import { toastOk, toastErr, toast } from "./stores.js";
   import type { FileContent, VersionInfo, Role } from "./types.js";
   import Modal from "./Modal.svelte";
+  import Icon from "./Icon.svelte";
 
   let { projectId, path, role, onchanged, onclose }: { projectId: string; path: string; role: Role; onchanged: () => void; onclose?: () => void } = $props();
 
@@ -104,32 +105,32 @@
 </script>
 
 {#if loadError}
-  <div class="rounded-xl border border-line-soft bg-panel p-5 text-xs text-danger">{loadError}</div>
+  <div class="panel text-xs text-danger">{loadError}</div>
 {:else if file}
-  <div class="rounded-xl border border-line-soft bg-panel p-5">
+  <div class="panel">
     <div class="mb-2.5 flex items-center justify-between">
-      <span class="font-mono text-[11px] text-ink-3">{file.path} @ {file.version}</span>
-      <div class="flex items-center gap-2">
-        <a class="rounded-lg border border-line bg-panel px-3 py-1 text-[12px] font-medium text-ink transition hover:bg-hover" href="/database/api/projects/{projectId}/file/raw?path={encodeURIComponent(file.path)}" download>下载</a>
-        <button class="rounded-lg border border-line bg-panel px-3 py-1 text-[12px] font-medium text-ink transition hover:bg-hover" onclick={openHistory}>历史</button>
+      <span class="file-meta">{file.path} @ {file.version}</span>
+      <div class="flex items-center gap-1.5">
+        <a class="btn" href="/database/api/projects/{projectId}/file/raw?path={encodeURIComponent(file.path)}" download>下载</a>
+        <button class="btn" onclick={openHistory}><Icon name="clock" size={13} /> 历史</button>
         {#if canEdit}
-          <button class="rounded-lg border border-transparent px-3 py-1 text-[12px] font-medium text-danger transition hover:bg-[#A13A3312]" onclick={remove}>删除文件</button>
+          <button class="btn btn-danger" onclick={remove}><Icon name="trash" size={13} /> 删除文件</button>
         {/if}
         {#if onclose}
-          <button class="rounded-lg border border-line bg-panel px-2.5 py-1 text-[12px] font-medium text-ink-3 transition hover:bg-hover hover:text-ink" onclick={onclose} title="关闭预览">✕</button>
+          <button class="btn !px-2.5" onclick={onclose} title="关闭预览" aria-label="关闭预览">✕</button>
         {/if}
       </div>
     </div>
 
     {#if file.encoding === "base64"}
-      <div class="text-xs text-ink-3">二进制文件({file.size} B),不支持在线编辑</div>
+      <div class="quiet">二进制文件({file.size} B),不支持在线编辑</div>
     {:else}
-      <textarea rows="14" class="w-full rounded-lg border border-line bg-panel px-3 py-2 font-mono text-xs leading-7 outline-none focus:border-accent" bind:value={draft} readonly={!canEdit}></textarea>
+      <textarea rows="14" class="textarea !leading-7" bind:value={draft} readonly={!canEdit}></textarea>
     {/if}
 
     {#if canEdit && file.encoding !== "base64"}
       <div class="mt-3 flex justify-end">
-        <button class="rounded-lg bg-accent px-3.5 py-1.5 text-[12.5px] font-medium text-white transition hover:bg-accent-hover" onclick={save}>提交修改</button>
+        <button class="btn btn-primary" onclick={save}>提交修改</button>
       </div>
     {/if}
 
@@ -139,13 +140,13 @@
         <pre class="diff rounded-lg border border-line-soft bg-panel p-3">{@html renderDiff(conflict.diff)}</pre>
         <div class="mt-2 text-[11.5px] text-[#8A8059]">请人工合并后,以最新内容为全文重新提交(基版将更新为 {conflict.currentVersion})</div>
         <div class="mt-2 flex justify-end">
-          <button class="rounded-lg border border-line bg-panel px-3 py-1 text-[12px] font-medium text-ink transition hover:bg-hover" onclick={acceptLatest}>载入最新内容</button>
+          <button class="btn" onclick={acceptLatest}>载入最新内容</button>
         </div>
       </div>
     {/if}
   </div>
 {:else}
-  <div class="rounded-xl border border-line-soft bg-panel p-5 text-xs text-ink-3">加载中…</div>
+  <div class="panel quiet">加载中…</div>
 {/if}
 
 {#if showHistory}
@@ -159,7 +160,7 @@
       {/each}
     </div>
     <div class="mt-3 flex justify-end">
-      <button class="rounded-lg border border-line bg-panel px-3 py-1 text-[12px] font-medium text-ink transition hover:bg-hover" onclick={() => (showHistory = false)}>关闭</button>
+      <button class="btn" onclick={() => (showHistory = false)}>关闭</button>
     </div>
   </Modal>
 {/if}

hub/filelib-web/src/lib/FilesPanel.svelte

@@ -4,6 +4,7 @@
   import { selectedFilePath, filesVersion } from "./browser.js";
   import type { FileEntry, NodeDetail } from "./types.js";
   import Modal from "./Modal.svelte";
+  import Icon from "./Icon.svelte";
 
   let { node }: { node: NodeDetail } = $props();
 
@@ -12,7 +13,8 @@
   let showNewFile = $state(false);
   let newPath = $state("");
   let newContent = $state("");
-  let uploadInput: HTMLInputElement;
+  // bind:this 的目标要用 $state,否则 svelte 5 warn 不会正确更新。
+  let uploadInput = $state<HTMLInputElement | null>(null);
 
   const canEdit = $derived(node.role !== "VIEW");
 
@@ -84,34 +86,34 @@
   }
 </script>
 
-<div class="rounded-xl border border-line-soft bg-panel p-5">
-  <div class="mb-2 flex items-center justify-between">
-    <div class="text-[13px] font-semibold">项目文件({files?.length ?? 0})</div>
+<div class="panel">
+  <div class="mb-1.5 flex items-center justify-between">
+    <div class="section-title">项目文件({files?.length ?? 0})</div>
     {#if canEdit}
-      <div class="flex gap-2">
-        <button class="rounded-lg border border-line bg-panel px-3 py-1.5 text-[12.5px] font-medium text-ink transition hover:bg-hover" onclick={() => (showNewFile = true)}>+ 新建文件</button>
-        <button class="rounded-lg bg-accent px-3 py-1.5 text-[12.5px] font-medium text-white transition hover:bg-accent-hover" onclick={() => uploadInput.click()}>上传文件</button>
+      <div class="flex gap-1.5">
+        <button class="btn" onclick={() => (showNewFile = true)}><Icon name="plus" size={13} /> 新建文件</button>
+        <button class="btn btn-primary" onclick={() => uploadInput?.click()}>上传文件</button>
         <input bind:this={uploadInput} type="file" class="hidden" onchange={doUpload} />
       </div>
     {/if}
   </div>
 
   {#if files === null && loadError === null}
-    <div class="py-5 text-center text-xs text-ink-3">加载中…</div>
+    <div class="quiet py-5 text-center">加载中…</div>
   {:else if loadError}
     <div class="py-5 text-center text-xs text-danger">{loadError}</div>
   {:else if files && files.length === 0}
-    <div class="py-5 text-center text-xs text-ink-3">空仓库 · 可新建或上传文件</div>
+    <div class="quiet py-5 text-center">空仓库 · 可新建或上传文件</div>
   {:else if files}
-    <table class="w-full border-collapse text-[13px]">
+    <table class="list">
       <tbody>
         {#each files as f (f.path)}
           <tr
-            class="cursor-pointer border-t border-line-soft first:border-t-0 {$selectedFilePath === f.path ? 'bg-selected' : 'hover:bg-hover'}"
+            class="cursor-pointer {$selectedFilePath === f.path ? 'bg-selected' : 'hover:bg-hover'}"
             onclick={() => selectedFilePath.set(f.path)}
           >
-            <td class="py-2 font-mono text-[12.5px] text-ink">{f.path}</td>
-            <td class="py-2 text-right font-mono text-[11px] text-ink-3">{f.size} B</td>
+            <td class="font-mono text-[12.5px] text-ink">{f.path}</td>
+            <td class="file-meta text-right">{f.size} B</td>
           </tr>
         {/each}
       </tbody>
@@ -121,17 +123,17 @@
 
 {#if showNewFile}
   <Modal title="新建文件" onclose={() => (showNewFile = false)}>
-    <div class="mb-3">
-      <label class="mb-1 block text-[11.5px] text-ink-3" for="nf-path">路径</label>
-      <input id="nf-path" class="w-full rounded-lg border border-line bg-panel px-3 py-2 font-mono text-[13px] outline-none focus:border-accent" bind:value={newPath} placeholder="docs/intro.md" />
+    <div class="form-row">
+      <label class="form-label" for="nf-path">路径</label>
+      <input id="nf-path" class="input font-mono" bind:value={newPath} placeholder="docs/intro.md" />
     </div>
-    <div class="mb-3">
-      <label class="mb-1 block text-[11.5px] text-ink-3" for="nf-content">内容</label>
-      <textarea id="nf-content" rows="8" class="w-full rounded-lg border border-line bg-panel px-3 py-2 font-mono text-xs outline-none focus:border-accent" bind:value={newContent} placeholder="内容…"></textarea>
+    <div class="form-row">
+      <label class="form-label" for="nf-content">内容</label>
+      <textarea id="nf-content" rows="8" class="textarea" bind:value={newContent} placeholder="内容…"></textarea>
     </div>
     <div class="mt-4 flex justify-end gap-2">
-      <button class="rounded-lg border border-line bg-panel px-3.5 py-1.5 text-[12.5px] font-medium text-ink transition hover:bg-hover" onclick={() => (showNewFile = false)}>取消</button>
-      <button class="rounded-lg bg-accent px-3.5 py-1.5 text-[12.5px] font-medium text-white transition hover:bg-accent-hover" onclick={submitNewFile}>创建</button>
+      <button class="btn" onclick={() => (showNewFile = false)}>取消</button>
+      <button class="btn btn-primary" onclick={submitNewFile}>创建</button>
     </div>
   </Modal>
 {/if}

hub/filelib-web/src/lib/GrantsPanel.svelte

@@ -0,0 +1,381 @@
+<script lang="ts">
+  /**
+   * 节点授权面板(表格化改版)。迁自已删除的 routes/libraryBrowser.ts
+   * `renderGrantsTab`(ADR-0029)。
+   *
+   * 布局:顶部工具条(左:授权成员搜索框;右:「+ 添加授权」弹窗入口);
+   * 下方一行一条授权 —— 成员(名称+id,点击跳用户管理/Group 管理)、
+   * 类型(个人/Group)、权限(下拉可改)、加入时间、操作(删除)。
+   *
+   * 语义(契约 8.1 / ADR-0021 / ADR-0028):
+   *  - 创建者授权(isCreatorGrant)不可收回、不可改;
+   *  - MANAGE 仅创建者可授,前端不做矩阵拦截 —— 后端 fail closed,报错原样 toast;
+   *  - GROUP 主体走 in-hub MemberGroup,/groups/search 搜索选(MANAGE 即可);
+   *    USER 主体用 /users/search(仅网站管理员),老师端无此权限时回落手输 id。
+   */
+  import { api } from "./api.js";
+  import { toastOk, toastErr } from "./stores.js";
+  import { ROLE_LABEL } from "./labels.js";
+  import type { Grant, MemberGroupSearchResult, NodeDetail, Role, UserSearchResult } from "./types.js";
+  import Icon from "./Icon.svelte";
+  import Modal from "./Modal.svelte";
+  import Avatar from "./Avatar.svelte";
+
+  let { node }: { node: NodeDetail } = $props();
+
+  const ROLES: readonly Role[] = ["VIEW", "EDIT", "MANAGE"];
+
+  interface PrincipalOption {
+    readonly id: string;
+    readonly label: string;
+    readonly sub: string;
+  }
+
+  let grants = $state<Grant[] | null>(null);
+  let error = $state<string | null>(null);
+  let searchText = $state("");
+
+  // 添加授权弹窗
+  let showAdd = $state(false);
+  let principalType = $state<"USER" | "GROUP">("USER");
+  let principalQuery = $state("");
+  let principalOptions = $state<readonly PrincipalOption[] | null>(null);
+  let selectedPrincipal = $state<{ readonly id: string; readonly label: string } | null>(null);
+  let manualId = $state("");
+  let searchUnavailable = $state(false);
+  let role = $state<Role>("VIEW");
+  let saving = $state(false);
+  let searchSeq = 0;
+  let searchTimer: ReturnType<typeof setTimeout> | undefined;
+
+  const canManage = $derived(node.role === "MANAGE");
+  const errText = (e: unknown): string => (e instanceof Error ? e.message : String(e));
+
+  /** 工具条搜索:按名称 / id / 类型过滤当前授权行(纯前端过滤,数据已全量在手)。 */
+  const shown = $derived.by((): Grant[] | null => {
+    if (grants === null) return null;
+    const q = searchText.trim().toLowerCase();
+    if (q === "") return grants;
+    return grants.filter(
+      (g) =>
+        g.principalId.toLowerCase().includes(q) ||
+        (g.principalName ?? "").toLowerCase().includes(q) ||
+        (g.principalOpenId ?? "").toLowerCase().includes(q) ||
+        (g.principalType === "USER" ? "个人" : "group").includes(q),
+    );
+  });
+
+  $effect(() => {
+    void node.id;
+    void load();
+  });
+
+  async function load(): Promise<void> {
+    grants = null;
+    error = null;
+    try {
+      const r = await api<{ grants: Grant[] }>(`/database/api/nodes/${node.id}/grants`);
+      grants = r.grants;
+    } catch (e) {
+      error = errText(e);
+    }
+  }
+
+  /** 成员单元格跳转:USER → 用户管理(带过滤词);GROUP → Group 管理(选中该组)。 */
+  function principalHref(g: Grant): string {
+    return g.principalType === "USER"
+      ? `/database/dashboard/users?q=${encodeURIComponent(g.principalId)}`
+      : `/database/dashboard/groups?select=${encodeURIComponent(g.principalId)}`;
+  }
+
+  function fmtDate(iso: string): string {
+    try {
+      return new Date(iso).toLocaleString("zh-CN", { dateStyle: "medium", timeStyle: "short" });
+    } catch {
+      return iso;
+    }
+  }
+
+  /* ------------------------------------------------------------ 添加授权弹窗 */
+
+  function openAdd(): void {
+    showAdd = true;
+    principalType = "USER";
+    principalQuery = "";
+    principalOptions = null;
+    selectedPrincipal = null;
+    manualId = "";
+    searchUnavailable = false;
+    role = "VIEW";
+    void searchPrincipals("");
+  }
+
+  function onTypeChange(): void {
+    principalQuery = "";
+    principalOptions = null;
+    selectedPrincipal = null;
+    manualId = "";
+    searchUnavailable = false;
+    void searchPrincipals("");
+  }
+
+  function onQueryInput(): void {
+    selectedPrincipal = null;
+    if (searchTimer !== undefined) clearTimeout(searchTimer);
+    const q = principalQuery.trim();
+    searchTimer = setTimeout(() => void searchPrincipals(q), 250);
+  }
+
+  async function searchPrincipals(q: string): Promise<void> {
+    // seq 防乱序:慢响应不覆盖新查询的结果。
+    const seq = ++searchSeq;
+    try {
+      if (principalType === "USER") {
+        const r = await api<{ users: UserSearchResult[] }>(
+          `/database/api/users/search?q=${encodeURIComponent(q)}`,
+        );
+        if (seq !== searchSeq) return;
+        principalOptions = r.users.map((u) => ({
+          id: u.userId,
+          label: u.displayName === "" ? u.userId : u.displayName,
+          sub: u.feishuOpenId,
+        }));
+      } else {
+        const r = await api<{ groups: MemberGroupSearchResult[] }>(
+          `/database/api/groups/search?q=${encodeURIComponent(q)}`,
+        );
+        if (seq !== searchSeq) return;
+        principalOptions = r.groups.map((g) => ({ id: g.id, label: g.name, sub: g.breadcrumb }));
+      }
+      searchUnavailable = false;
+    } catch {
+      if (seq !== searchSeq) return;
+      // 老师端 MANAGE 持有者没有 users/search 权限(403)——回落为手输 id。
+      principalOptions = null;
+      searchUnavailable = true;
+    }
+  }
+
+  function pick(option: PrincipalOption): void {
+    selectedPrincipal = { id: option.id, label: option.label };
+    principalQuery = option.label;
+    principalOptions = null;
+  }
+
+  async function addGrant(): Promise<void> {
+    const principalId = selectedPrincipal?.id ?? manualId.trim();
+    if (principalId === "") {
+      toastErr("请选择或填写授权主体");
+      return;
+    }
+    saving = true;
+    try {
+      // PUT /grants 是 upsert 语义(putGrants):同主体已有授权则改级别,否则新建。
+      await api(`/database/api/nodes/${node.id}/grants`, {
+        method: "PUT",
+        body: { grants: [{ principalType, principalId, role }] },
+      });
+      toastOk("已授予");
+      showAdd = false;
+      await load();
+    } catch (e) {
+      toastErr(errText(e));
+    } finally {
+      saving = false;
+    }
+  }
+
+  /** 权限下拉改级别:复用 PUT upsert;被 8.1 矩阵拒绝时 toast 并 reload 回显真实态。 */
+  async function changeRole(g: Grant, next: Role): Promise<void> {
+    if (next === g.role) return;
+    try {
+      await api(`/database/api/nodes/${node.id}/grants`, {
+        method: "PUT",
+        body: { grants: [{ principalType: g.principalType, principalId: g.principalId, role: next }] },
+      });
+      toastOk("权限已更新");
+      await load();
+    } catch (e) {
+      toastErr(errText(e));
+      await load();
+    }
+  }
+
+  async function revoke(g: Grant): Promise<void> {
+    if (!confirm(`删除「${g.principalName ?? g.principalId}」的${ROLE_LABEL[g.role]}授权?`)) return;
+    try {
+      await api(`/database/api/nodes/${node.id}/grants/${encodeURIComponent(g.id)}`, {
+        method: "DELETE",
+      });
+      toastOk("已删除");
+      await load();
+    } catch (e) {
+      toastErr(errText(e));
+    }
+  }
+</script>
+
+<div class="panel">
+  <!-- 工具条:左侧授权成员搜索框,右侧添加授权入口 -->
+  <div class="mb-3 flex items-center gap-2">
+    <div class="relative min-w-0 flex-1">
+      <span class="pointer-events-none absolute left-2.5 top-1/2 -translate-y-1/2 text-ink-3">
+        <Icon name="search" size={14} />
+      </span>
+      <input
+        class="input w-full !pl-8"
+        placeholder="搜索授权成员(名称 / id / 类型)"
+        bind:value={searchText}
+      />
+    </div>
+    {#if canManage}
+      <button class="btn btn-primary shrink-0" onclick={openAdd}>
+        <Icon name="plus" size={13} /> 添加授权
+      </button>
+    {/if}
+  </div>
+
+  {#if error !== null}
+    <div class="py-2 text-[12.5px] text-danger">{error}</div>
+  {:else if shown === null}
+    <div class="quiet py-[18px] text-center">加载中…</div>
+  {:else}
+    <!-- 内容不可断行(头像名/id/日期/下拉)可能超宽:溢出时横向滚动,
+         而不是把表格挤变形或顶出 panel 右边界(文件预览打开时主区变窄)。 -->
+    <div class="overflow-x-auto">
+      <table class="list">
+      <thead>
+        <tr>
+          <th class="whitespace-nowrap pr-4">成员</th>
+          <th class="whitespace-nowrap pr-4">userId</th>
+          <th class="whitespace-nowrap pr-4">飞书 ID</th>
+          <th class="whitespace-nowrap pr-4">类型</th>
+          <th class="whitespace-nowrap pr-4">权限</th>
+          <th class="whitespace-nowrap pr-4">加入时间</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        {#if shown.length === 0}
+          <tr>
+            <td colspan="7" class="quiet !py-[18px] text-center">
+              {searchText.trim() === "" ? "暂无授权" : `无匹配「${searchText.trim()}」的授权`}
+            </td>
+          </tr>
+        {:else}
+          {#each shown as g (g.id)}
+            <tr>
+              <td class="whitespace-nowrap pr-4">
+                <a class="inline-flex items-center gap-2 text-ink hover:text-accent" href={principalHref(g)}>
+                  <Avatar displayName={g.principalName} userId={g.principalId} size={26} />
+                  <span class="flex items-center gap-1.5 text-[13px]">
+                    {g.principalName ?? g.principalId}
+                    {#if g.isCreatorGrant}<span class="quiet">(创建者)</span>{/if}
+                  </span>
+                </a>
+              </td>
+              <td class="file-meta max-w-[230px] truncate pr-4 font-mono" title={g.principalType === "USER" ? g.principalId : ""}>
+                {g.principalType === "USER" ? g.principalId : "—"}
+              </td>
+              <td class="file-meta max-w-[230px] truncate pr-4 font-mono" title={g.principalOpenId ?? ""}>
+                {g.principalOpenId ?? "—"}
+              </td>
+              <td class="whitespace-nowrap pr-4"><span class="tag">{g.principalType === "USER" ? "个人" : "Group"}</span></td>
+              <td class="whitespace-nowrap pr-4">
+                <!-- 创建者授权不可动(契约 8.1);非 MANAGE 持有者只读。 -->
+                {#if !g.isCreatorGrant && canManage}
+                  <select
+                    class="select !w-[110px]"
+                    value={g.role}
+                    onchange={(e) => void changeRole(g, e.currentTarget.value as Role)}
+                  >
+                    {#each ROLES as r (r)}
+                      <option value={r}>{ROLE_LABEL[r]}</option>
+                    {/each}
+                  </select>
+                {:else}
+                  <span class="file-meta">{ROLE_LABEL[g.role]}</span>
+                {/if}
+              </td>
+              <td class="file-meta whitespace-nowrap pr-4">{fmtDate(g.createdAt)}</td>
+              <td class="whitespace-nowrap pr-2 text-right">
+                {#if !g.isCreatorGrant && canManage}
+                  <button class="link-danger inline-flex items-center gap-1" onclick={() => void revoke(g)}>
+                    <Icon name="trash" size={12} /> 删除
+                  </button>
+                {/if}
+              </td>
+            </tr>
+          {/each}
+        {/if}
+      </tbody>
+      </table>
+    </div>
+  {/if}
+</div>
+
+{#if showAdd}
+  <Modal title="添加授权" onclose={() => (showAdd = false)}>
+    <div class="form-row">
+      <label class="form-label" for="grant-type">类型</label>
+      <select id="grant-type" class="select" bind:value={principalType} onchange={onTypeChange}>
+        <option value="USER">个人</option>
+        <option value="GROUP">Group</option>
+      </select>
+    </div>
+    <div class="form-row">
+      <label class="form-label" for="grant-principal">{principalType === "USER" ? "用户" : "Group"}</label>
+      <input
+        id="grant-principal"
+        class="input"
+        placeholder={principalType === "USER" ? "搜索显示名 / openId" : "搜索组名"}
+        bind:value={principalQuery}
+        oninput={onQueryInput}
+      />
+    </div>
+    {#if selectedPrincipal !== null}
+      <div class="form-row">
+        <span class="form-label">已选</span>
+        <span class="quiet self-center text-[12.5px]">
+          {selectedPrincipal.label}<span class="font-mono">({selectedPrincipal.id})</span>
+        </span>
+      </div>
+    {/if}
+    {#if principalOptions !== null && principalOptions.length > 0}
+      <div class="mb-3 max-h-[180px] overflow-y-auto rounded-lg border border-line-soft">
+        {#each principalOptions as o (o.id)}
+          <button class="block w-full px-3 py-2 text-left hover:bg-hover" onclick={() => pick(o)}>
+            <span class="block text-[13px] text-ink">{o.label}</span>
+            <span class="block font-mono text-[11px] text-ink-3">{o.sub}</span>
+          </button>
+        {/each}
+      </div>
+    {:else if searchUnavailable}
+      <div class="form-row">
+        <label class="form-label" for="grant-manual-id">主体 id</label>
+        <input
+          id="grant-manual-id"
+          class="input font-mono"
+          placeholder="无搜索权限,请直接填写 id"
+          bind:value={manualId}
+        />
+      </div>
+    {:else if principalOptions !== null}
+      <div class="quiet mb-3 py-2 text-center text-[12px]">无匹配结果</div>
+    {/if}
+    <div class="form-row">
+      <label class="form-label" for="grant-role">权限</label>
+      <select id="grant-role" class="select" bind:value={role}>
+        {#each ROLES as r (r)}
+          <option value={r}>{ROLE_LABEL[r]}</option>
+        {/each}
+      </select>
+    </div>
+    <div class="mt-4 flex justify-end gap-2">
+      <button class="btn" onclick={() => (showAdd = false)}>取消</button>
+      <button class="btn btn-primary disabled:opacity-50" onclick={addGrant} disabled={saving}>
+        {saving ? "授予中…" : "添加"}
+      </button>
+    </div>
+  </Modal>
+{/if}

hub/filelib-web/src/lib/GridCard.svelte

@@ -0,0 +1,47 @@
+<script lang="ts">
+  /**
+   * 网盘式大图标卡片:文件夹(琥珀填充)/项目(立方体描边)/文件(文档描边)。
+   * 单击选中、onopen(双击)、oncontextmenu(右键,回传光标坐标)。
+   */
+  let {
+    kind,
+    name,
+    meta = null,
+    selected = false,
+    onselect,
+    onopen,
+    oncontextmenu,
+  }: {
+    kind: "FOLDER" | "PROJECT" | "FILE";
+    name: string;
+    meta?: string | null;
+    selected?: boolean;
+    onselect: () => void;
+    onopen: () => void;
+    oncontextmenu: (x: number, y: number) => void;
+  } = $props();
+</script>
+
+<button
+  class="flex cursor-pointer flex-col items-center gap-1.5 rounded-xl px-2 pb-2 pt-3 select-none {selected
+    ? 'bg-selected'
+    : 'hover:bg-hover'}"
+  onclick={onselect}
+  ondblclick={onopen}
+  oncontextmenu={(e) => { e.preventDefault(); e.stopPropagation(); oncontextmenu(e.clientX, e.clientY); }}
+  title={name}
+>
+  <span class="flex h-20 w-20 items-center justify-center">
+    {#if kind === "FOLDER"}
+      <svg width="72" height="72" viewBox="0 0 24 24" fill="#f5c94a" stroke="#d9a92b" stroke-width="0.6" stroke-linejoin="round"><path d="M3 7a2 2 0 0 1 2-2h4l2 2h8a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V7Z" /></svg>
+    {:else if kind === "PROJECT"}
+      <svg width="66" height="66" viewBox="0 0 24 24" fill="#e8f0ea" stroke="#4a6741" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"><path d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4" /></svg>
+    {:else}
+      <svg width="60" height="60" viewBox="0 0 24 24" fill="#ffffff" stroke="#9c9b96" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"><path d="M14 3H7a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V8l-5-5Z" /><path d="M14 3v5h5" /><path d="M9 13h6M9 17h6" /></svg>
+    {/if}
+  </span>
+  <span class="line-clamp-2 w-full break-all text-center text-[12.5px] leading-snug text-ink">{name}</span>
+  {#if meta !== null}
+    <span class="-mt-1 text-[10.5px] text-ink-3">{meta}</span>
+  {/if}
+</button>

hub/filelib-web/src/lib/GridLibraryView.svelte

@@ -0,0 +1,527 @@
+<script lang="ts">
+  /**
+   * 老师端网盘式文件库浏览器(仅 /app;管理后台沿用树状 LibraryView)。
+   *
+   * 下钻导航:双击文件夹/项目进入,面包屑 + 返回跳级;项目内文件同样网格化,
+   * 双击进 FileEditor 预览。管理动作全走右键菜单,按节点 role 动态显隐:
+   *  打开 / 新建子文件夹(EDIT+,仅 FOLDER)/ 重命名(MANAGE)/ 授权管理(MANAGE,
+   *  宽 Modal 复用 GrantsPanel)/ 详情(复用 OverviewPanel)/ 删除(MANAGE)。
+   * 文件菜单:打开预览 / 下载 / 删除(EDIT+)。
+   */
+  import { onMount } from "svelte";
+  import { api } from "./api.js";
+  import { me, toastErr, toastOk } from "./stores.js";
+  import { selectedFilePath, clearSelectedFile } from "./browser.js";
+  import { ROLE_LABEL } from "./labels.js";
+  import type { FileEntry, NodeChild, NodeDetail, Role } from "./types.js";
+  import Icon from "./Icon.svelte";
+  import Modal from "./Modal.svelte";
+  import ContextMenu, { type MenuItem } from "./ContextMenu.svelte";
+  import GridCard from "./GridCard.svelte";
+  import FileEditor from "./FileEditor.svelte";
+  import GrantsPanel from "./GrantsPanel.svelte";
+  import OverviewPanel from "./OverviewPanel.svelte";
+
+  const RANK: Record<Role, number> = { VIEW: 1, EDIT: 2, MANAGE: 3 };
+  const atLeast = (role: Role, min: Role): boolean => RANK[role] >= RANK[min];
+
+  type View = "nodes" | "files";
+  type StackItem = Pick<NodeChild, "id" | "name" | "kind" | "role">;
+
+  let view = $state<View>("nodes");
+  /** 下钻栈(均为 FOLDER;根层为空栈)。 */
+  let stack = $state<StackItem[]>([]);
+  let children = $state<NodeChild[] | null>(null);
+  let nodesError = $state<string | null>(null);
+
+  /** 文件视图:当前项目详情 + 文件列表。 */
+  let projectNode = $state<NodeDetail | null>(null);
+  let files = $state<FileEntry[] | null>(null);
+  let filesError = $state<string | null>(null);
+
+  let selected = $state<string | null>(null);
+  let menu = $state<{ x: number; y: number; items: readonly MenuItem[] } | null>(null);
+
+  // 弹窗:create(新建文件夹/项目)/ rename / grants / detail / newFile
+  let modal = $state<"create" | "rename" | "grants" | "detail" | "newFile" | null>(null);
+  let createKind = $state<"FOLDER" | "PROJECT">("FOLDER");
+  let createParentId = $state<string | null>(null);
+  let formName = $state("");
+  let formDesc = $state("");
+  let renameTarget = $state<StackItem | null>(null);
+  let detailNode = $state<NodeDetail | null>(null);
+  let newPath = $state("");
+  let newContent = $state("");
+  let saving = $state(false);
+
+  const errText = (e: unknown): string => (e instanceof Error ? e.message : String(e));
+  const currentFolder = $derived(stack.length === 0 ? null : stack[stack.length - 1]!);
+  const canCreateHere = $derived(
+    currentFolder === null ? ($me?.isWebsiteAdmin ?? false) : atLeast(currentFolder.role, "EDIT"),
+  );
+  const projectCanEdit = $derived(projectNode !== null && projectNode.role !== "VIEW");
+
+  /* ------------------------------------------------------------ 数据加载 */
+
+  async function loadChildren(): Promise<void> {
+    children = null;
+    nodesError = null;
+    try {
+      const parent = currentFolder;
+      const url = parent === null
+        ? "/database/api/nodes"
+        : `/database/api/nodes?parentId=${encodeURIComponent(parent.id)}`;
+      const r = await api<{ nodes: NodeChild[] }>(url);
+      children = r.nodes;
+    } catch (e) {
+      nodesError = errText(e);
+    }
+  }
+
+  async function loadFiles(): Promise<void> {
+    if (projectNode === null) return;
+    files = null;
+    filesError = null;
+    try {
+      const r = await api<{ files: FileEntry[] }>(`/database/api/projects/${projectNode.id}/files`);
+      files = r.files;
+    } catch (e) {
+      filesError = errText(e);
+    }
+  }
+
+  async function fetchDetail(id: string): Promise<NodeDetail> {
+    const r = await api<{ node: NodeDetail }>(`/database/api/nodes/${id}`);
+    return r.node;
+  }
+
+  onMount(loadChildren);
+
+  function refresh(): void {
+    selected = null;
+    menu = null;
+    if (view === "files") void loadFiles();
+    else void loadChildren();
+  }
+
+  /* ------------------------------------------------------------ 导航 */
+
+  function openNode(n: StackItem): void {
+    selected = null;
+    if (n.kind === "FOLDER") {
+      stack = [...stack, n];
+      void loadChildren();
+    } else {
+      void (async () => {
+        try {
+          projectNode = await fetchDetail(n.id);
+          view = "files";
+          await loadFiles();
+        } catch (e) {
+          toastErr(errText(e));
+        }
+      })();
+    }
+  }
+
+  function goRoot(): void {
+    if (view === "files") {
+      view = "nodes";
+      projectNode = null;
+      clearSelectedFile();
+      return;
+    }
+    stack = [];
+    void loadChildren();
+  }
+
+  function goUp(): void {
+    if (view === "files") {
+      goRoot();
+      return;
+    }
+    if (stack.length === 0) return;
+    stack = stack.slice(0, -1);
+    void loadChildren();
+  }
+
+  function goToDepth(depth: number): void {
+    if (view === "files") {
+      view = "nodes";
+      projectNode = null;
+      clearSelectedFile();
+    }
+    stack = stack.slice(0, depth);
+    void loadChildren();
+  }
+
+  /* ------------------------------------------------------------ 节点操作 */
+
+  function openCreate(kind: "FOLDER" | "PROJECT", parentId: string | null): void {
+    createKind = kind;
+    createParentId = parentId;
+    formName = "";
+    formDesc = "";
+    modal = "create";
+  }
+
+  async function submitCreate(): Promise<void> {
+    const name = formName.trim();
+    if (name === "") return;
+    saving = true;
+    try {
+      await api("/database/api/nodes", {
+        method: "POST",
+        body: {
+          parentId: createParentId,
+          kind: createKind,
+          name,
+          ...(formDesc.trim() !== "" ? { description: formDesc.trim() } : {}),
+        },
+      });
+      toastOk("已创建");
+      modal = null;
+      refresh();
+    } catch (e) {
+      toastErr(errText(e));
+    } finally {
+      saving = false;
+    }
+  }
+
+  function openRename(n: StackItem): void {
+    renameTarget = n;
+    formName = n.name;
+    modal = "rename";
+  }
+
+  async function submitRename(): Promise<void> {
+    if (renameTarget === null) return;
+    const name = formName.trim();
+    if (name === "" || name === renameTarget.name) return;
+    saving = true;
+    try {
+      await api(`/database/api/nodes/${renameTarget.id}`, { method: "PATCH", body: { name } });
+      toastOk("已重命名");
+      modal = null;
+      refresh();
+    } catch (e) {
+      toastErr(errText(e));
+    } finally {
+      saving = false;
+    }
+  }
+
+  async function removeNode(n: StackItem): Promise<void> {
+    if (!confirm(`删除「${n.name}」?软删除后不可见。`)) return;
+    try {
+      await api(`/database/api/nodes/${n.id}`, { method: "DELETE" });
+      toastOk("已删除");
+      refresh();
+    } catch (e) {
+      toastErr(errText(e));
+    }
+  }
+
+  async function openGrants(n: StackItem): Promise<void> {
+    try {
+      detailNode = await fetchDetail(n.id);
+      modal = "grants";
+    } catch (e) {
+      toastErr(errText(e));
+    }
+  }
+
+  async function openDetail(n: StackItem): Promise<void> {
+    try {
+      detailNode = await fetchDetail(n.id);
+      modal = "detail";
+    } catch (e) {
+      toastErr(errText(e));
+    }
+  }
+
+  /* ------------------------------------------------------------ 文件操作 */
+
+  function previewFile(f: FileEntry): void {
+    selectedFilePath.set(f.path);
+  }
+
+  async function submitNewFile(): Promise<void> {
+    if (projectNode === null) return;
+    const path = newPath.trim();
+    if (path === "") return;
+    saving = true;
+    try {
+      await api(`/database/api/projects/${projectNode.id}/file`, {
+        method: "PUT",
+        body: { path, content: newContent },
+      });
+      toastOk("已创建");
+      modal = null;
+      newPath = ""; newContent = "";
+      await loadFiles();
+    } catch (e) {
+      toastErr(errText(e));
+    } finally {
+      saving = false;
+    }
+  }
+
+  async function removeFile(f: FileEntry): Promise<void> {
+    if (projectNode === null || !confirm(`删除文件 ${f.path}?`)) return;
+    try {
+      const cur = await api<{ version: string }>(
+        `/database/api/projects/${projectNode.id}/file?path=${encodeURIComponent(f.path)}`,
+      );
+      await api(`/database/api/projects/${projectNode.id}/file?path=${encodeURIComponent(f.path)}`, {
+        method: "DELETE",
+        body: { baseVersion: cur.version },
+      });
+      toastOk("已删除");
+      if ($selectedFilePath === f.path) clearSelectedFile();
+      await loadFiles();
+    } catch (e) {
+      toastErr(errText(e));
+    }
+  }
+
+  /* ------------------------------------------------------------ 右键菜单 */
+
+  function nodeMenuItems(n: StackItem): MenuItem[] {
+    const items: MenuItem[] = [{ label: "打开", icon: "chevron", onclick: () => openNode(n) }];
+    if (n.kind === "FOLDER" && atLeast(n.role, "EDIT")) {
+      items.push({ label: "新建子文件夹", icon: "plus", onclick: () => openCreate("FOLDER", n.id) });
+    }
+    if (n.role === "MANAGE") {
+      items.push(
+        { label: "重命名", icon: "pencil", onclick: () => openRename(n) },
+        { label: "授权管理", icon: "shield", onclick: () => void openGrants(n) },
+      );
+    }
+    items.push({ label: "详情", icon: "info", onclick: () => void openDetail(n) });
+    if (n.role === "MANAGE") {
+      items.push({ label: "删除", icon: "trash", danger: true, onclick: () => void removeNode(n) });
+    }
+    return items;
+  }
+
+  function fileMenuItems(f: FileEntry): MenuItem[] {
+    const items: MenuItem[] = [
+      { label: "打开预览", icon: "chevron", onclick: () => previewFile(f) },
+      {
+        label: "下载",
+        icon: "download",
+        onclick: () => {
+          if (projectNode === null) return;
+          const a = document.createElement("a");
+          a.href = `/database/api/projects/${projectNode.id}/file/raw?path=${encodeURIComponent(f.path)}`;
+          a.download = "";
+          a.click();
+        },
+      },
+    ];
+    if (projectCanEdit) {
+      items.push({ label: "删除", icon: "trash", danger: true, onclick: () => void removeFile(f) });
+    }
+    return items;
+  }
+
+  function bgMenuItems(): MenuItem[] {
+    const items: MenuItem[] = [];
+    if (view === "nodes" && canCreateHere) {
+      items.push(
+        { label: "新建文件夹", icon: "plus", onclick: () => openCreate("FOLDER", currentFolder?.id ?? null) },
+        { label: "新建项目", icon: "plus", onclick: () => openCreate("PROJECT", currentFolder?.id ?? null) },
+      );
+    }
+    if (view === "files" && projectCanEdit) {
+      items.push({ label: "新建文件", icon: "plus", onclick: () => (modal = "newFile") });
+    }
+    items.push({ label: "刷新", icon: "refresh", onclick: refresh });
+    return items;
+  }
+</script>
+
+<div class="flex min-h-0 flex-1 flex-col">
+  <!-- 顶栏:返回 + 面包屑 + 动作 + 身份 -->
+  <header class="flex shrink-0 items-center gap-2 border-b border-line-soft bg-panel px-5 py-3">
+    {#if view === "files" || stack.length > 0}
+      <button class="btn btn-sm" onclick={goUp} title="返回上级">
+        <Icon name="arrowLeft" size={13} /> 返回
+      </button>
+    {/if}
+    <nav class="flex min-w-0 flex-1 items-center gap-1 text-[13px]">
+      <button
+        class="shrink-0 {view === 'nodes' && stack.length === 0 ? 'font-semibold text-ink' : 'text-ink-3 hover:text-ink'}"
+        onclick={goRoot}
+      >文件库</button>
+      {#each stack as n, i (n.id)}
+        <span class="text-line">/</span>
+        <button
+          class="truncate {view === 'nodes' && i === stack.length - 1
+            ? 'font-semibold text-ink'
+            : 'text-ink-3 hover:text-ink'}"
+          onclick={() => goToDepth(i + 1)}
+        >{n.name}</button>
+      {/each}
+      {#if view === "files" && projectNode}
+        <span class="text-line">/</span>
+        <span class="truncate font-semibold text-ink">{projectNode.name}</span>
+      {/if}
+    </nav>
+
+    {#if view === "nodes" && canCreateHere}
+      <button class="btn btn-sm" onclick={() => openCreate("FOLDER", currentFolder?.id ?? null)}>
+        <Icon name="plus" size={13} /> 新建文件夹
+      </button>
+      <button class="btn btn-sm" onclick={() => openCreate("PROJECT", currentFolder?.id ?? null)}>
+        <Icon name="plus" size={13} /> 新建项目
+      </button>
+    {/if}
+    {#if view === "files" && projectCanEdit}
+      <button class="btn btn-sm" onclick={() => (modal = "newFile")}>
+        <Icon name="plus" size={13} /> 新建文件
+      </button>
+    {/if}
+    <button class="btn btn-sm" onclick={refresh} title="刷新"><Icon name="refresh" size={13} /></button>
+  </header>
+
+  <!-- 主体:网格 + 文件预览栏 -->
+  <div class="flex min-h-0 flex-1">
+    <main
+      class="flex-1 overflow-y-auto px-6 py-5"
+      role="presentation"
+      oncontextmenu={(e) => { e.preventDefault(); menu = { x: e.clientX, y: e.clientY, items: bgMenuItems() }; }}
+    >
+      {#if view === "nodes"}
+        {#if nodesError !== null}
+          <div class="py-10 text-center text-[13px] text-danger">{nodesError}</div>
+        {:else if children === null}
+          <div class="quiet py-10 text-center">加载中…</div>
+        {:else if children.length === 0}
+          <div class="quiet py-10 text-center">
+            {currentFolder === null ? "空文件库" : "空文件夹"}{canCreateHere ? " · 右键或点上方按钮新建" : ""}
+          </div>
+        {:else}
+          <div class="grid grid-cols-[repeat(auto-fill,minmax(132px,1fr))] gap-x-2 gap-y-4">
+            {#each children as n (n.id)}
+              <GridCard
+                kind={n.kind}
+                name={n.name}
+                meta={ROLE_LABEL[n.role]}
+                selected={selected === n.id}
+                onselect={() => (selected = n.id)}
+                onopen={() => openNode(n)}
+                oncontextmenu={(x, y) => (menu = { x, y, items: nodeMenuItems(n) })}
+              />
+            {/each}
+          </div>
+        {/if}
+      {:else}
+        {#if filesError !== null}
+          <div class="py-10 text-center text-[13px] text-danger">{filesError}</div>
+        {:else if files === null}
+          <div class="quiet py-10 text-center">加载中…</div>
+        {:else if files.length === 0}
+          <div class="quiet py-10 text-center">空仓库{projectCanEdit ? " · 右键或点上方按钮新建文件" : ""}</div>
+        {:else}
+          <div class="grid grid-cols-[repeat(auto-fill,minmax(132px,1fr))] gap-x-2 gap-y-4">
+            {#each files as f (f.path)}
+              <GridCard
+                kind="FILE"
+                name={f.path}
+                meta="{f.size} B"
+                selected={selected === f.path}
+                onselect={() => (selected = f.path)}
+                onopen={() => previewFile(f)}
+                oncontextmenu={(x, y) => (menu = { x, y, items: fileMenuItems(f) })}
+              />
+            {/each}
+          </div>
+        {/if}
+      {/if}
+    </main>
+
+    {#if view === "files" && $selectedFilePath && projectNode}
+      <section class="flex w-[46%] min-w-[420px] shrink-0 flex-col overflow-y-auto border-l border-line-soft bg-bg p-4">
+        <FileEditor
+          projectId={projectNode.id}
+          path={$selectedFilePath}
+          role={projectNode.role}
+          onchanged={() => void loadFiles()}
+          onclose={clearSelectedFile}
+        />
+      </section>
+    {/if}
+  </div>
+</div>
+
+{#if menu}
+  <ContextMenu x={menu.x} y={menu.y} items={menu.items} onclose={() => (menu = null)} />
+{/if}
+
+{#if modal === "create"}
+  <Modal title={createKind === "FOLDER" ? "新建文件夹" : "新建项目"} onclose={() => (modal = null)}>
+    <div class="form-row">
+      <label class="form-label" for="gc-name">名称</label>
+      <input id="gc-name" class="input" bind:value={formName} placeholder={createKind === "FOLDER" ? "例如:物理" : "例如:微积分基础"} />
+    </div>
+    <div class="form-row">
+      <label class="form-label" for="gc-desc">简介(可选)</label>
+      <textarea id="gc-desc" rows="3" class="textarea" bind:value={formDesc} placeholder="简要说明用途…"></textarea>
+    </div>
+    <div class="mt-4 flex justify-end gap-2">
+      <button class="btn" onclick={() => (modal = null)}>取消</button>
+      <button class="btn btn-primary disabled:opacity-50" onclick={submitCreate} disabled={saving}>
+        {saving ? "创建中…" : "创建"}
+      </button>
+    </div>
+  </Modal>
+{/if}
+
+{#if modal === "rename" && renameTarget}
+  <Modal title="重命名" onclose={() => (modal = null)}>
+    <div class="form-row">
+      <label class="form-label" for="gr-name">新名称</label>
+      <input id="gr-name" class="input" bind:value={formName} />
+    </div>
+    <div class="mt-4 flex justify-end gap-2">
+      <button class="btn" onclick={() => (modal = null)}>取消</button>
+      <button class="btn btn-primary disabled:opacity-50" onclick={submitRename} disabled={saving}>
+        {saving ? "保存中…" : "保存"}
+      </button>
+    </div>
+  </Modal>
+{/if}
+
+{#if modal === "grants" && detailNode}
+  <Modal maxW={880} title="授权管理 · {detailNode.name}" onclose={() => (modal = null)}>
+    <GrantsPanel node={detailNode} />
+  </Modal>
+{/if}
+
+{#if modal === "detail" && detailNode}
+  <Modal maxW={680} title="详情 · {detailNode.name}" onclose={() => (modal = null)}>
+    <OverviewPanel node={detailNode} ondeleted={() => { modal = null; refresh(); }} />
+  </Modal>
+{/if}
+
+{#if modal === "newFile"}
+  <Modal title="新建文件" onclose={() => (modal = null)}>
+    <div class="form-row">
+      <label class="form-label" for="gf-path">路径</label>
+      <input id="gf-path" class="input font-mono" bind:value={newPath} placeholder="讲义/第一章.md" />
+    </div>
+    <div class="form-row">
+      <label class="form-label" for="gf-content">内容</label>
+      <textarea id="gf-content" rows="8" class="textarea" bind:value={newContent} placeholder="内容…"></textarea>
+    </div>
+    <div class="mt-4 flex justify-end gap-2">
+      <button class="btn" onclick={() => (modal = null)}>取消</button>
+      <button class="btn btn-primary disabled:opacity-50" onclick={submitNewFile} disabled={saving}>
+        {saving ? "创建中…" : "创建"}
+      </button>
+    </div>
+  </Modal>
+{/if}

hub/filelib-web/src/lib/GroupAdmin.svelte

@@ -0,0 +1,769 @@
+<script lang="ts">
+  /**
+   * Group 管理面板。从已删除的 routes/adminPanels.ts `renderGroupsPanel`(747 行)
+   * 迁来(ADR-0029),功能与视觉逐条对齐:折叠树 / 组名过滤(命中项保留祖先链)/
+   * 归档组展示与恢复 / 右键菜单 / 面包屑 / 统计条 / 成员表(头像·openId·加入时间)。
+   */
+  import { onMount } from "svelte";
+  import { page } from "$app/state";
+  import { api } from "./api.js";
+  import { toastErr, toastOk } from "./stores.js";
+  import type { MemberGroupNode, MemberGroupMember, UserSearchResult } from "./types.js";
+  import Modal from "./Modal.svelte";
+  import Icon from "./Icon.svelte";
+  import Avatar from "./Avatar.svelte";
+
+  // 后端返回扁平列表(ADR-0028);前端按 parentId/depth 拼成有序树。
+  let groups = $state<MemberGroupNode[]>([]);
+  let loaded = $state(false);
+  let listError = $state<string | null>(null);
+  let selectedId = $state<string | null>(null);
+
+  // 折叠的组 id(默认全展开)。用数组而非 Set:$state 的深层代理只跟踪普通对象/
+  // 数组,Set 的变更不会触发重渲染。
+  let collapsedIds = $state<string[]>([]);
+  const isCollapsed = (id: string): boolean => collapsedIds.includes(id);
+  const toggleCollapsed = (id: string): void => {
+    collapsedIds = isCollapsed(id) ? collapsedIds.filter((x) => x !== id) : [...collapsedIds, id];
+  };
+
+  let filterText = $state("");
+  let showArchived = $state(false);
+
+  let members = $state<MemberGroupMember[]>([]);
+  let membersLoaded = $state(false);
+  let membersError = $state<string | null>(null);
+  let memberFilter = $state("");
+
+  const selected = $derived(groups.find((g) => g.id === selectedId) ?? null);
+  const isArchived = $derived(selected?.archivedAt != null);
+
+  interface Row {
+    readonly g: MemberGroupNode;
+    readonly hasKids: boolean;
+    /** 过滤态下:自身是否命中(祖先链上的非命中项半透明显示)。 */
+    readonly hit: boolean;
+  }
+
+  /** 扁平列表 → 先根遍历顺序;折叠的子树整段跳过。过滤时命中项的祖先链保留。 */
+  const rows = $derived.by((): Row[] => {
+    const byParent = new Map<string | null, MemberGroupNode[]>();
+    const byId = new Map<string, MemberGroupNode>();
+    for (const g of groups) {
+      byId.set(g.id, g);
+      const arr = byParent.get(g.parentId) ?? [];
+      arr.push(g);
+      byParent.set(g.parentId, arr);
+    }
+    for (const arr of byParent.values()) arr.sort((a, b) => a.name.localeCompare(b.name, "zh-CN"));
+
+    // 过滤:命中集 = 名字命中的组 ∪ 其全部祖先(否则命中的深层组无路径可展示)。
+    const q = filterText.trim().toLowerCase();
+    let keep: Set<string> | null = null;
+    if (q !== "") {
+      keep = new Set<string>();
+      for (const g of groups) {
+        if (!g.name.toLowerCase().includes(q)) continue;
+        let cur: MemberGroupNode | undefined = g;
+        while (cur !== undefined) {
+          keep.add(cur.id);
+          cur = cur.parentId === null ? undefined : byId.get(cur.parentId);
+        }
+      }
+    }
+
+    const out: Row[] = [];
+    const walk = (parentId: string | null): void => {
+      for (const g of byParent.get(parentId) ?? []) {
+        if (keep !== null && !keep.has(g.id)) continue;
+        const kids = (byParent.get(g.id) ?? []).filter((k) => keep === null || keep.has(k.id));
+        out.push({ g, hasKids: kids.length > 0, hit: q === "" || g.name.toLowerCase().includes(q) });
+        // 过滤态下强制展开(否则命中项被折叠的祖先藏住)。
+        if (keep !== null || !isCollapsed(g.id)) walk(g.id);
+      }
+    };
+    walk(null);
+    // 兜底:父不在列表的孤儿(级联软删理论上不产生)也列出,避免"看不见"。
+    const seen = new Set(out.map((r) => r.g.id));
+    for (const g of groups) {
+      if (seen.has(g.id)) continue;
+      if (keep !== null && !keep.has(g.id)) continue;
+      out.push({ g, hasKids: false, hit: true });
+    }
+    return out;
+  });
+
+  const treeFoot = $derived.by(() => {
+    const active = groups.filter((g) => g.archivedAt === null);
+    const archivedN = groups.length - active.length;
+    const totalMembers = active.reduce((n, g) => n + g.memberCount, 0);
+    return (
+      `${active.length} 个活跃组 · ${totalMembers} 条成员关系` +
+      (archivedN > 0 ? ` · ${archivedN} 个已删除` : "")
+    );
+  });
+
+  /** 面包屑:祖先链(根在前,自身在末)。 */
+  const chain = $derived.by((): MemberGroupNode[] => {
+    if (selected === null) return [];
+    const byId = new Map(groups.map((g) => [g.id, g]));
+    const out: MemberGroupNode[] = [];
+    for (let cur: MemberGroupNode | undefined = selected; cur !== undefined; ) {
+      out.unshift(cur);
+      cur = cur.parentId === null ? undefined : byId.get(cur.parentId);
+    }
+    return out;
+  });
+
+  const childCount = $derived(groups.filter((g) => g.parentId === selectedId).length);
+
+  const shownMembers = $derived.by(() => {
+    const q = memberFilter.trim().toLowerCase();
+    if (q === "") return members;
+    return members.filter(
+      (m) =>
+        m.displayName.toLowerCase().includes(q) ||
+        m.userId.toLowerCase().includes(q) ||
+        m.feishuOpenId.toLowerCase().includes(q),
+    );
+  });
+
+  function fmtDate(iso: string): string {
+    try {
+      return new Date(iso).toLocaleString("zh-CN", { dateStyle: "medium", timeStyle: "short" });
+    } catch {
+      return iso;
+    }
+  }
+
+  const errText = (e: unknown): string => (e instanceof Error ? e.message : String(e));
+
+  async function loadGroups(): Promise<void> {
+    try {
+      const r = await api<{ groups: MemberGroupNode[] }>(
+        `/database/api/groups${showArchived ? "?includeArchived=1" : ""}`,
+      );
+      groups = r.groups;
+      listError = null;
+      loaded = true;
+      if (selectedId !== null && !groups.some((g) => g.id === selectedId)) {
+        selectedId = null;
+        members = [];
+        membersLoaded = false;
+      }
+    } catch (e) {
+      listError = errText(e);
+      loaded = true;
+    }
+  }
+
+  async function loadMembers(): Promise<void> {
+    if (selectedId === null) return;
+    membersLoaded = false;
+    membersError = null;
+    try {
+      const r = await api<{ members: MemberGroupMember[] }>(
+        `/database/api/groups/${encodeURIComponent(selectedId)}/members`,
+      );
+      members = r.members;
+      membersLoaded = true;
+    } catch (e) {
+      membersError = errText(e);
+      membersLoaded = true;
+    }
+  }
+
+  onMount(async () => {
+    await loadGroups();
+    // 授权面板「成员」单元格跳转:?select=<groupId> 直接选中该组。
+    // 组不在列表(已归档且未开归档展示)时不动作,停留默认态。
+    const target = page.url.searchParams.get("select");
+    if (target !== null && groups.some((g) => g.id === target)) select(target);
+  });
+
+  function select(id: string): void {
+    selectedId = id;
+    memberFilter = "";
+    void loadMembers();
+  }
+
+  async function toggleArchived(): Promise<void> {
+    showArchived = !showArchived;
+    await loadGroups();
+  }
+
+  /* ---------------- 右键菜单 ---------------- */
+
+  interface MenuItem {
+    readonly label?: string;
+    readonly ic?: import("./Icon.svelte").IconName;
+    readonly danger?: boolean;
+    readonly sep?: boolean;
+    readonly fn?: () => void;
+  }
+
+  let menu = $state<{ x: number; y: number; items: MenuItem[] } | null>(null);
+
+  function openMenu(e: MouseEvent, target: MemberGroupNode | null): void {
+    e.preventDefault();
+    // 已归档组:只给「恢复」—— 归档态下不允许建子组/加成员/改名(后端亦 404 兜底)。
+    const items: MenuItem[] =
+      target === null
+        ? [{ label: "新建根 Group", ic: "plus", fn: () => openCreate(null) }]
+        : target.archivedAt !== null
+          ? [
+              { label: "查看成员(只读)", ic: "users", fn: () => select(target.id) },
+              { label: "恢复此 Group", ic: "restore", fn: () => void restoreGroup(target) },
+              { sep: true },
+              { label: "新建根 Group", ic: "layers", fn: () => openCreate(null) },
+            ]
+          : [
+              { label: "新建子 Group", ic: "plus", fn: () => openCreate(target) },
+              { label: "添加成员", ic: "user", fn: () => { select(target.id); openAddMember(); } },
+              { label: "重命名 / 改描述", ic: "pencil", fn: () => openRename(target) },
+              { sep: true },
+              { label: "新建根 Group", ic: "layers", fn: () => openCreate(null) },
+              { label: "删除(级联子树)", ic: "trash", danger: true, fn: () => void deleteGroup(target) },
+            ];
+    // 贴边翻转,避免菜单溢出视口(菜单宽 184、每项约 34)。
+    const w = 184;
+    const h = items.reduce((n, it) => n + (it.sep === true ? 9 : 34), 10);
+    menu = {
+      x: Math.min(e.clientX, window.innerWidth - w - 8),
+      y: Math.min(e.clientY, window.innerHeight - h - 8),
+      items,
+    };
+  }
+
+  /* ---------------- 弹窗 ---------------- */
+
+  let showCreate = $state(false);
+  let createParent = $state<MemberGroupNode | null>(null);
+  let newName = $state("");
+  let newDesc = $state("");
+
+  let showRename = $state(false);
+  let renameTarget = $state<MemberGroupNode | null>(null);
+  let editName = $state("");
+  let editDesc = $state("");
+
+  let showAdd = $state(false);
+  let addQuery = $state("");
+  let addResults = $state<UserSearchResult[]>([]);
+  let addSearching = $state(false);
+
+  function openCreate(parent: MemberGroupNode | null): void {
+    createParent = parent;
+    newName = "";
+    newDesc = "";
+    showCreate = true;
+  }
+
+  async function createGroup(): Promise<void> {
+    const name = newName.trim();
+    if (name === "") {
+      toastErr("名称必填");
+      return;
+    }
+    const parentId = createParent?.id ?? null;
+    try {
+      await api("/database/api/groups", {
+        method: "POST",
+        body: { name, parentId, ...(newDesc.trim() !== "" ? { description: newDesc.trim() } : {}) },
+      });
+      showCreate = false;
+      // 建完自动展开父节点,否则新子组藏在折叠的父下面看不见。
+      if (parentId !== null) collapsedIds = collapsedIds.filter((x) => x !== parentId);
+      toastOk("已创建成员组");
+      await loadGroups();
+    } catch (e) {
+      toastErr(errText(e));
+    }
+  }
+
+  function openRename(g: MemberGroupNode): void {
+    renameTarget = g;
+    editName = g.name;
+    editDesc = g.description ?? "";
+    showRename = true;
+  }
+
+  async function saveRename(): Promise<void> {
+    if (renameTarget === null) return;
+    const name = editName.trim();
+    if (name === "") {
+      toastErr("名称必填");
+      return;
+    }
+    try {
+      // description 总是回传(含空串)—— 空串即清除描述(ADR-0028 决策6)。
+      await api(`/database/api/groups/${encodeURIComponent(renameTarget.id)}`, {
+        method: "PATCH",
+        body: { name, description: editDesc.trim() },
+      });
+      showRename = false;
+      toastOk("已保存");
+      await loadGroups();
+    } catch (e) {
+      toastErr(errText(e));
+    }
+  }
+
+  async function deleteGroup(g: MemberGroupNode): Promise<void> {
+    if (
+      !confirm(
+        `删除「${g.name}」?\n\n软删除:整棵子树一并标记删除,相关授权立即失效,` +
+          "但数据保留 —— 可在左侧打开「显示已删除的组」后恢复。",
+      )
+    )
+      return;
+    try {
+      const r = await api<{ archivedCount: number }>(
+        `/database/api/groups/${encodeURIComponent(g.id)}`,
+        { method: "DELETE" },
+      );
+      if (selectedId === g.id && !showArchived) {
+        selectedId = null;
+        members = [];
+        membersLoaded = false;
+      }
+      toastOk(`已删除 ${r.archivedCount} 个组(软删除,可恢复)`);
+      await loadGroups();
+      if (selectedId === g.id) await loadMembers();
+    } catch (e) {
+      toastErr(errText(e));
+    }
+  }
+
+  async function restoreGroup(g: MemberGroupNode): Promise<void> {
+    // 恢复语义与删除不对称(ADR-0028 决策7):只回该组 + 已归档祖先链,子树仍归档。
+    if (
+      !confirm(
+        `恢复「${g.name}」?\n\n其已删除的上级会一并恢复(否则它在树上无路径);` +
+          "子组保持删除状态,需各自恢复。恢复后该组的授权立即重新生效。",
+      )
+    )
+      return;
+    try {
+      const r = await api<{ restoredCount: number }>(
+        `/database/api/groups/${encodeURIComponent(g.id)}/restore`,
+        { method: "POST" },
+      );
+      toastOk(`已恢复 ${r.restoredCount} 个组`);
+      await loadGroups();
+      if (selectedId === g.id) await loadMembers();
+    } catch (e) {
+      toastErr(errText(e));
+    }
+  }
+
+  function openAddMember(): void {
+    addQuery = "";
+    addResults = [];
+    showAdd = true;
+  }
+
+  /** 成员选择器:搜全局用户,excludeGroupId 过滤掉本组已有成员。 */
+  async function searchUsers(): Promise<void> {
+    if (selectedId === null) return;
+    addSearching = true;
+    try {
+      const r = await api<{ users: UserSearchResult[] }>(
+        `/database/api/users/search?q=${encodeURIComponent(addQuery.trim())}` +
+          `&excludeGroupId=${encodeURIComponent(selectedId)}`,
+      );
+      addResults = r.users;
+    } catch (e) {
+      toastErr(errText(e));
+    } finally {
+      addSearching = false;
+    }
+  }
+
+  async function addMember(userId: string): Promise<void> {
+    if (selectedId === null) return;
+    try {
+      await api(`/database/api/groups/${encodeURIComponent(selectedId)}/members`, {
+        method: "POST",
+        body: { userId },
+      });
+      toastOk("已添加成员");
+      addResults = addResults.filter((u) => u.userId !== userId);
+      await Promise.all([loadMembers(), loadGroups()]);
+    } catch (e) {
+      toastErr(errText(e));
+    }
+  }
+
+  async function removeMember(m: MemberGroupMember): Promise<void> {
+    if (selectedId === null) return;
+    if (!confirm(`将「${m.displayName || m.userId}」移出本组?其经由本组获得的授权立即失效。`)) return;
+    try {
+      await api(
+        `/database/api/groups/${encodeURIComponent(selectedId)}/members/${encodeURIComponent(m.userId)}`,
+        { method: "DELETE" },
+      );
+      toastOk("已移除成员");
+      await Promise.all([loadMembers(), loadGroups()]);
+    } catch (e) {
+      toastErr(errText(e));
+    }
+  }
+</script>
+
+<svelte:window
+  onclick={() => (menu = null)}
+  onkeydown={(e) => {
+    if (e.key === "Escape") menu = null;
+  }}
+/>
+
+<div class="flex h-full min-h-0 items-stretch gap-3.5">
+  <!-- 左:组树 -->
+  <div class="panel flex w-[326px] shrink-0 flex-col !p-3.5" style="min-height:0">
+    <div class="mb-2.5 flex items-center gap-2">
+      <span class="flex text-accent"><Icon name="layers" size={17} /></span>
+      <div class="section-title flex-1">Group 树</div>
+      <button class="btn btn-sm" onclick={() => openCreate(null)}>
+        <Icon name="plus" size={13} /> 根组
+      </button>
+    </div>
+
+    <div class="relative mb-2">
+      <span class="pointer-events-none absolute left-[9px] top-1/2 flex -translate-y-1/2 text-ink-3">
+        <Icon name="search" size={13} />
+      </span>
+      <input class="input !pl-7 !text-[12.5px]" placeholder="过滤组名…" bind:value={filterText} />
+    </div>
+
+    <label class="switch mb-2.5 text-[11.5px] text-ink-3">
+      <input type="checkbox" checked={showArchived} onchange={toggleArchived} />
+      <span></span>
+      显示已删除的组
+    </label>
+
+    <!-- 树空白处右键 = 建根组 -->
+    <div
+      class="-mx-1.5 min-h-0 flex-1 overflow-y-auto"
+      role="tree"
+      tabindex="-1"
+      oncontextmenu={(e) => {
+        if ((e.target as HTMLElement).closest("[data-node]") !== null) return;
+        openMenu(e, null);
+      }}
+    >
+      {#if !loaded}
+        <div class="quiet px-3 py-6 text-center">加载中…</div>
+      {:else if listError !== null}
+        <div class="px-3 py-6 text-center text-xs text-danger">{listError}</div>
+      {:else if groups.length === 0}
+        <div class="quiet flex flex-col items-center gap-2 px-3 py-[22px] text-center">
+          <span class="flex text-line"><Icon name="layers" size={30} /></span>
+          暂无成员组 · 点上方「根组」开始
+        </div>
+      {:else if rows.length === 0}
+        <div class="quiet px-3 py-[22px] text-center">无匹配的组</div>
+      {:else}
+        {#each rows as { g, hasKids, hit } (g.id)}
+          {@const arch = g.archivedAt !== null}
+          <div
+            data-node
+            class="flex cursor-pointer select-none items-center gap-1.5 rounded-lg py-1.5 pr-2 text-[13px]"
+            class:bg-selected={selectedId === g.id}
+            class:opacity-50={!hit}
+            style="padding-left: {8 + g.depth * 15}px"
+            role="treeitem"
+            aria-selected={selectedId === g.id}
+            tabindex="-1"
+            onclick={() => select(g.id)}
+            onkeydown={(e) => {
+              if (e.key === "Enter" || e.key === " ") {
+                e.preventDefault();
+                select(g.id);
+              }
+            }}
+            oncontextmenu={(e) => openMenu(e, g)}
+          >
+            {#if hasKids}
+              <span
+                class="flex w-[15px] shrink-0 justify-center text-ink-3 transition-transform"
+                class:rotate-90={!(isCollapsed(g.id) && filterText.trim() === "")}
+                role="button"
+                tabindex="-1"
+                aria-label="折叠 / 展开"
+                onclick={(e) => {
+                  e.stopPropagation();
+                  toggleCollapsed(g.id);
+                }}
+                onkeydown={(e) => {
+                  if (e.key === "Enter") toggleCollapsed(g.id);
+                }}
+              >
+                <Icon name="chevron" size={13} />
+              </span>
+            {:else}
+              <span class="inline-block w-[15px] shrink-0"></span>
+            {/if}
+
+            <span class="flex" class:text-accent={selectedId === g.id && !arch} class:text-ink-3={arch || selectedId !== g.id}>
+              <Icon name={arch ? "archive" : "group"} size={15} />
+            </span>
+            <span class="flex-1 truncate" class:text-ink-3={arch} class:line-through={arch}>{g.name}</span>
+            <span class="tag shrink-0" class:opacity-70={arch}>
+              <Icon name="user" size={10} />{g.memberCount}
+            </span>
+            {#if arch}
+              <span class="tag shrink-0 !text-[10px] opacity-85">已删除</span>
+            {/if}
+          </div>
+        {/each}
+      {/if}
+    </div>
+
+    <div class="section-note mt-2 border-t border-line-soft pt-2">{loaded ? treeFoot : ""}</div>
+  </div>
+
+  <!-- 右:成员表 -->
+  <div class="panel flex min-h-0 min-w-0 flex-1 flex-col !p-0">
+    {#if selected === null}
+      <div class="quiet m-auto flex flex-col items-center gap-2.5 p-7 text-center">
+        <span class="flex text-line"><Icon name="users" size={40} /></span>
+        从左侧选择一个 Group 查看成员
+      </div>
+    {:else}
+      {#if isArchived}
+        <!-- 归档横幅:软删除是"打标",数据仍在,只是不再贡献权限。 -->
+        <div
+          class="flex shrink-0 items-center gap-2.5 border-b border-line-soft bg-hover px-[18px] py-2.5 text-[12.5px]"
+        >
+          <span class="flex text-ink-3"><Icon name="archive" size={15} /></span>
+          <span class="flex-1">
+            此 Group 已删除于 {fmtDate(selected.archivedAt ?? "")} · 成员只读,不再授予任何权限
+          </span>
+          <button class="btn !text-xs" onclick={() => void restoreGroup(selected)}>
+            <Icon name="restore" size={13} /> 恢复
+          </button>
+        </div>
+      {/if}
+
+      <div class="shrink-0 border-b border-line-soft px-[18px] pb-3 pt-4">
+        <div class="mb-1.5 text-xs">
+          {#each chain as c, i (c.id)}
+            {#if i > 0}<span class="mx-[5px] text-ink-3">/</span>{/if}
+            <span class={i === chain.length - 1 ? "font-medium text-ink" : "text-ink-3"}>{c.name}</span>
+          {/each}
+        </div>
+
+        <div class="flex items-center gap-2.5">
+          <span class="flex" class:text-ink-3={isArchived} class:text-accent={!isArchived}>
+            <Icon name={isArchived ? "archive" : "group"} size={20} />
+          </span>
+          <div class="min-w-0 flex-1">
+            <div class="text-base font-semibold" class:text-ink-3={isArchived}>{selected.name}</div>
+            {#if selected.description !== null && selected.description !== ""}
+              <div class="section-note mt-0.5">{selected.description}</div>
+            {:else}
+              <div class="section-note mt-0.5 opacity-60">无描述</div>
+            {/if}
+          </div>
+          <!-- 归档态不给改名/加成员入口(后端 requireActiveGroup 亦 404 兜底)。 -->
+          {#if !isArchived}
+            <button class="btn !text-xs" onclick={() => openRename(selected)}>
+              <Icon name="pencil" size={13} /> 编辑
+            </button>
+            <button class="btn btn-primary !text-xs" onclick={openAddMember}>
+              <Icon name="plus" size={13} /> 添加成员
+            </button>
+          {/if}
+        </div>
+
+        <div class="mt-3 flex gap-4 text-xs text-ink-3">
+          <span class="inline-flex items-center gap-1"><Icon name="user" size={12} />{members.length} 名成员</span>
+          <span class="inline-flex items-center gap-1"><Icon name="layers" size={12} />层级 {selected.depth}</span>
+          <span class="inline-flex items-center gap-1"><Icon name="group" size={12} />{childCount} 个子组</span>
+        </div>
+      </div>
+
+      <div class="flex shrink-0 items-center gap-2.5 px-[18px] py-2.5">
+        <div class="relative max-w-[280px] flex-1">
+          <span class="pointer-events-none absolute left-[9px] top-1/2 flex -translate-y-1/2 text-ink-3">
+            <Icon name="search" size={13} />
+          </span>
+          <input class="input !pl-7 !text-[12.5px]" placeholder="搜索成员…" bind:value={memberFilter} />
+        </div>
+        <span class="file-meta">
+          {memberFilter.trim() === "" ? "" : `${shownMembers.length} / ${members.length}`}
+        </span>
+      </div>
+
+      <div class="min-h-0 flex-1 overflow-y-auto px-[18px] pb-[18px]">
+        {#if !membersLoaded}
+          <div class="quiet px-3 py-9 text-center">加载中…</div>
+        {:else if membersError !== null}
+          <div class="px-3 py-9 text-center text-xs text-danger">{membersError}</div>
+        {:else if members.length === 0}
+          <div class="quiet flex flex-col items-center gap-2.5 px-3 py-9 text-center">
+            <span class="flex text-line"><Icon name="users" size={34} /></span>
+            {isArchived ? "此组无成员记录" : "此组暂无成员 · 点右上「添加成员」"}
+          </div>
+        {:else if shownMembers.length === 0}
+          <div class="quiet px-3 py-[30px] text-center">无匹配成员</div>
+        {:else}
+          <table class="list">
+            <thead>
+              <tr>
+                <th>成员</th>
+                <th>userId</th>
+                <th>飞书 openId</th>
+                <th>加入时间</th>
+                {#if !isArchived}<th class="!text-right">操作</th>{/if}
+              </tr>
+            </thead>
+            <tbody>
+              {#each shownMembers as m (m.userId)}
+                <tr>
+                  <td>
+                    <span class="inline-flex items-center gap-2.5">
+                      <Avatar displayName={m.displayName} userId={m.userId} avatarUrl={m.avatarUrl} size={28} />
+                      <span class="font-medium">{m.displayName || "(未命名)"}</span>
+                    </span>
+                  </td>
+                  <td class="file-meta">{m.userId}</td>
+                  <td class="file-meta">{m.feishuOpenId || "—"}</td>
+                  <td class="file-meta">{fmtDate(m.joinedAt)}</td>
+                  {#if !isArchived}
+                    <td class="text-right">
+                      <button class="link-danger inline-flex items-center gap-1" onclick={() => void removeMember(m)}>
+                        <Icon name="minus" size={12} /> 移除
+                      </button>
+                    </td>
+                  {/if}
+                </tr>
+              {/each}
+            </tbody>
+          </table>
+        {/if}
+      </div>
+    {/if}
+  </div>
+</div>
+
+<!-- 右键菜单 -->
+{#if menu !== null}
+  <div
+    class="fixed z-[60] min-w-[184px] rounded-[10px] border border-line bg-panel p-[5px] text-[13px] shadow-[0_4px_20px_rgba(26,26,24,.07)]"
+    style="left:{menu.x}px;top:{menu.y}px"
+    role="menu"
+    tabindex="-1"
+  >
+    {#each menu.items as it, i (i)}
+      {#if it.sep === true}
+        <div class="mx-1.5 my-1 h-px bg-line-soft"></div>
+      {:else}
+        <div
+          class="flex cursor-pointer items-center gap-2 rounded-md px-[11px] py-[7px] hover:bg-hover"
+          class:text-danger={it.danger === true}
+          role="menuitem"
+          tabindex="-1"
+          onclick={(e) => {
+            e.stopPropagation();
+            menu = null;
+            it.fn?.();
+          }}
+          onkeydown={(e) => {
+            if (e.key === "Enter") {
+              menu = null;
+              it.fn?.();
+            }
+          }}
+        >
+          {#if it.ic !== undefined}<span class="flex opacity-75"><Icon name={it.ic} size={14} /></span>{/if}
+          {it.label}
+        </div>
+      {/if}
+    {/each}
+  </div>
+{/if}
+
+{#if showCreate}
+  <Modal
+    title={createParent === null ? "新建根 Group" : `在「${createParent.name}」下新建子 Group`}
+    onclose={() => (showCreate = false)}
+  >
+    <div class="form-row">
+      <label class="form-label" for="gc-name">名称</label>
+      <input id="gc-name" class="input" bind:value={newName} placeholder="例如:物理教研组" />
+    </div>
+    <div class="form-row">
+      <label class="form-label" for="gc-desc">描述(可选)</label>
+      <input id="gc-desc" class="input" bind:value={newDesc} placeholder="一句话说明" />
+    </div>
+    <div class="mt-4 flex justify-end gap-2">
+      <button class="btn" onclick={() => (showCreate = false)}>取消</button>
+      <button class="btn btn-primary" onclick={createGroup}>创建</button>
+    </div>
+  </Modal>
+{/if}
+
+{#if showRename && renameTarget !== null}
+  <Modal title="重命名 / 改描述" onclose={() => (showRename = false)}>
+    <div class="form-row">
+      <label class="form-label" for="gr-name">名称</label>
+      <input id="gr-name" class="input" bind:value={editName} />
+    </div>
+    <div class="form-row">
+      <label class="form-label" for="gr-desc">描述</label>
+      <input id="gr-desc" class="input" bind:value={editDesc} placeholder="留空则清除描述" />
+    </div>
+    <div class="mt-4 flex justify-end gap-2">
+      <button class="btn" onclick={() => (showRename = false)}>取消</button>
+      <button class="btn btn-primary" onclick={saveRename}>保存</button>
+    </div>
+  </Modal>
+{/if}
+
+{#if showAdd && selected !== null}
+  <Modal title={`向「${selected.name}」添加成员`} onclose={() => (showAdd = false)}>
+    <div class="form-row">
+      <label class="form-label" for="ga-q">搜索用户(姓名 / userId / 飞书 openId)</label>
+      <div class="flex gap-2">
+        <input
+          id="ga-q"
+          class="input"
+          bind:value={addQuery}
+          placeholder="留空列出全部候选"
+          onkeydown={(e) => {
+            if (e.key === "Enter") void searchUsers();
+          }}
+        />
+        <button class="btn" onclick={searchUsers}><Icon name="search" size={13} /> 搜索</button>
+      </div>
+      <div class="section-note mt-1.5">已在本组的成员不会出现在结果里。</div>
+    </div>
+
+    <div class="max-h-[280px] overflow-y-auto">
+      {#if addSearching}
+        <div class="quiet px-3 py-6 text-center">搜索中…</div>
+      {:else if addResults.length === 0}
+        <div class="quiet px-3 py-6 text-center">无候选用户 · 先点「搜索」</div>
+      {:else}
+        {#each addResults as u (u.userId)}
+          <div class="flex items-center gap-2.5 border-b border-line-soft py-2 last:border-b-0">
+            <Avatar displayName={u.displayName} userId={u.userId} avatarUrl={u.avatarUrl} size={26} />
+            <div class="min-w-0 flex-1">
+              <div class="truncate text-[13px] font-medium">{u.displayName || "(未命名)"}</div>
+              <div class="file-meta truncate">{u.feishuOpenId || u.userId}</div>
+            </div>
+            <button class="btn btn-sm" onclick={() => void addMember(u.userId)}>
+              <Icon name="plus" size={12} /> 添加
+            </button>
+          </div>
+        {/each}
+      {/if}
+    </div>
+
+    <div class="mt-4 flex justify-end gap-2">
+      <button class="btn" onclick={() => (showAdd = false)}>关闭</button>
+    </div>
+  </Modal>
+{/if}

hub/filelib-web/src/lib/Icon.svelte

@@ -0,0 +1,47 @@
+<script lang="ts" module>
+  // 从已删除的 routes/adminPanels.ts 的 GROUP_ICONS 原样搬来(ADR-0029)。
+  export const ICONS = {
+    // Group 节点 = 人的集合。**不用文件夹图标** —— Group 不是目录,与文件库的
+    // FOLDER/PROJECT 是两套体系,图标上也不应混淆。两人剪影。
+    group:
+      "M16 19v-1.5a3.5 3.5 0 0 0-3.5-3.5h-5A3.5 3.5 0 0 0 4 17.5V19M10 11.5a3.25 3.25 0 1 0 0-6.5 3.25 3.25 0 0 0 0 6.5ZM20 19v-1.5a3.5 3.5 0 0 0-2.6-3.38M15.4 5.22a3.25 3.25 0 0 1 0 6.06",
+    users:
+      "M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2M9 11a4 4 0 1 0 0-8 4 4 0 0 0 0 8Zm14 10v-2a4 4 0 0 0-3-3.87M16 3.13a4 4 0 0 1 0 7.75",
+    user: "M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2M12 11a4 4 0 1 0 0-8 4 4 0 0 0 0 8Z",
+    plus: "M12 5v14M5 12h14",
+    pencil: "M17 3a2.8 2.8 0 0 1 4 4L7.5 20.5 2 22l1.5-5.5L17 3Z",
+    trash: "M3 6h18M8 6V4h8v2m-9 0 1 14h8l1-14",
+    search: "m21 21-4.3-4.3M11 18a7 7 0 1 0 0-14 7 7 0 0 0 0 14Z",
+    chevron: "m9 18 6-6-6-6",
+    layers: "m12 2 9 5-9 5-9-5 9-5Zm9 11-9 5-9-5m18 5-9 5-9-5",
+    clock: "M12 22a10 10 0 1 0 0-20 10 10 0 0 0 0 20Zm0-14v6l4 2",
+    minus: "M5 12h14",
+    download: "M12 3v12m0 0 4-4m-4 4-4-4M4 17v2a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-2",
+    refresh: "M21 12a9 9 0 1 1-2.64-6.36M21 3v6h-6",
+    arrowLeft: "M19 12H5m0 0 6 6m-6-6 6-6",
+    info: "M12 22a10 10 0 1 0 0-20 10 10 0 0 0 0 20Zm0-10v6m0-11v.5",
+    shield: "M12 3l8 3v6c0 4.5-3.2 7.7-8 9-4.8-1.3-8-4.5-8-9V6l8-3Z",
+    folder: "M3 7a2 2 0 0 1 2-2h4l2 2h8a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V7Z",
+    // 已归档(软删)标记用;与"删除"区分 —— 数据仍在,只是打了 archivedAt。
+    archive: "M3 8h18v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8Zm1-5h16l1 5H3l1-5Zm5 9h6",
+    restore: "M3 12a9 9 0 1 0 3-6.7M3 4v4.5h4.5",
+  } as const;
+
+  export type IconName = keyof typeof ICONS;
+</script>
+
+<script lang="ts">
+  let { name, size = 16 }: { name: IconName; size?: number } = $props();
+</script>
+
+<svg
+  style="width:{size}px;height:{size}px"
+  class="shrink-0"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="1.8"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+  aria-hidden="true"
+><path d={ICONS[name]} /></svg>

hub/filelib-web/src/lib/LibraryView.svelte

@@ -1,7 +1,14 @@
 <script lang="ts">
+  /**
+   * 文件库浏览器(树 + 详情 + 文件编辑栏)。
+   *
+   * 两处复用:老师端 /app(showUserFooter=true,侧栏底部带身份与退出)
+   * 与管理后台 /database/dashboard/library(false —— 外层壳已有身份区)。
+   */
   import { onMount } from "svelte";
   import { api } from "./api.js";
   import { me, toastErr, toastOk } from "./stores.js";
+  import { logout } from "./session.js";
   import { treeVersion, bumpTree, currentNode, selectedFilePath, clearSelectedFile, bumpFiles } from "./browser.js";
   import type { NodeChild } from "./types.js";
   import TreeNode from "./TreeNode.svelte";
@@ -9,6 +16,8 @@
   import FileEditor from "./FileEditor.svelte";
   import Modal from "./Modal.svelte";
 
+  let { showUserFooter = false }: { showUserFooter?: boolean } = $props();
+
   let roots = $state<NodeChild[] | null>(null);
   let treeError = $state<string | null>(null);
   let showCreateRoot = $state(false);
@@ -54,31 +63,26 @@
     }
   }
 
-  async function logout(): Promise<void> {
-    try { await fetch("/auth/logout", { method: "POST", credentials: "same-origin" }); } catch { /* ignore */ }
-    me.set(null);
-  }
-
   const initial = $derived(($me?.userId ?? "U").slice(0, 1).toUpperCase());
 </script>
 
-<div class="flex h-full">
+<div class="flex min-h-0 flex-1">
   <!-- 侧栏 -->
   <aside class="flex w-[300px] shrink-0 flex-col border-r border-line-soft bg-sidebar">
     <div class="flex items-center justify-between border-b border-line-soft px-4 py-3.5">
       <span class="text-[15px] font-semibold text-ink">文件库</span>
       {#if $me?.isWebsiteAdmin}
-        <button class="rounded-lg border border-line bg-panel px-2.5 py-1 text-[11.5px] font-medium text-ink transition hover:bg-hover" onclick={() => (showCreateRoot = true)}>
+        <button class="btn btn-sm" onclick={() => (showCreateRoot = true)}>
           + 根目录
         </button>
       {/if}
     </div>
 
     <div class="flex-1 overflow-y-auto px-2 py-2 text-[13px]">
-      {#if roots === null}
-        <div class="px-3 py-6 text-center text-xs text-ink-3">加载中…</div>
-      {:else if treeError}
+      {#if treeError}
         <div class="px-3 py-6 text-center text-xs text-danger">{treeError}</div>
+      {:else if roots === null}
+        <div class="px-3 py-6 text-center text-xs text-ink-3">加载中…</div>
       {:else if roots.length === 0}
         <div class="px-3 py-6 text-center text-xs text-ink-3">
           {$me?.isWebsiteAdmin ? "空文件库 · 点上方「+ 根目录」开始" : "文件库为空,请联系管理员创建根目录"}
@@ -90,11 +94,13 @@
       {/if}
     </div>
 
-    <div class="flex items-center gap-2 border-t border-line-soft px-4 py-3 text-[12.5px]">
-      <div class="flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-accent text-[11px] font-semibold text-white">{initial}</div>
-      <span class="flex-1 truncate text-ink">{$me?.userId ?? ""}</span>
-      <button class="rounded-lg border border-line-soft px-2.5 py-1 text-[11.5px] text-ink-3 transition hover:bg-hover hover:text-ink" onclick={logout} title="退出登录">退出</button>
-    </div>
+    {#if showUserFooter}
+      <div class="flex items-center gap-2 border-t border-line-soft px-4 py-3 text-[12.5px]">
+        <div class="flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-accent text-[11px] font-semibold text-white">{initial}</div>
+        <span class="flex-1 truncate text-ink">{$me?.userId ?? ""}</span>
+        <button class="rounded-lg border border-line-soft px-2.5 py-1 text-[11.5px] text-ink-3 transition hover:bg-hover hover:text-ink" onclick={logout} title="退出登录">退出</button>
+      </div>
+    {/if}
   </aside>
 
   <!-- 主区 -->
@@ -118,24 +124,24 @@
 
 {#if showCreateRoot}
   <Modal title="新建根目录" onclose={() => (showCreateRoot = false)}>
-    <div class="mb-3">
-      <label class="mb-1 block text-[11.5px] text-ink-3" for="root-name">名称</label>
-      <input id="root-name" class="w-full rounded-lg border border-line bg-panel px-3 py-2 text-[13px] outline-none focus:border-accent" bind:value={newName} placeholder="例如:物理教研" />
+    <div class="form-row">
+      <label class="form-label" for="root-name">名称</label>
+      <input id="root-name" class="input" bind:value={newName} placeholder="例如:物理教研" />
     </div>
-    <div class="mb-3">
-      <label class="mb-1 block text-[11.5px] text-ink-3" for="root-kind">类型</label>
-      <select id="root-kind" class="w-full rounded-lg border border-line bg-panel px-3 py-2 text-[13px] outline-none focus:border-accent" bind:value={newKind}>
+    <div class="form-row">
+      <label class="form-label" for="root-kind">类型</label>
+      <select id="root-kind" class="select" bind:value={newKind}>
         <option value="FOLDER">文件夹</option>
         <option value="PROJECT">项目(课程资源库)</option>
       </select>
     </div>
-    <div class="mb-3">
-      <label class="mb-1 block text-[11.5px] text-ink-3" for="root-desc">简介(可选)</label>
-      <textarea id="root-desc" rows="3" class="w-full rounded-lg border border-line bg-panel px-3 py-2 font-mono text-xs outline-none focus:border-accent" bind:value={newDesc} placeholder="简要说明用途…"></textarea>
+    <div class="form-row">
+      <label class="form-label" for="root-desc">简介(可选)</label>
+      <textarea id="root-desc" rows="3" class="textarea" bind:value={newDesc} placeholder="简要说明用途…"></textarea>
     </div>
     <div class="mt-4 flex justify-end gap-2">
-      <button class="rounded-lg border border-line bg-panel px-3.5 py-1.5 text-[12.5px] font-medium text-ink transition hover:bg-hover" onclick={() => (showCreateRoot = false)}>取消</button>
-      <button class="rounded-lg bg-accent px-3.5 py-1.5 text-[12.5px] font-medium text-white transition hover:bg-accent-hover" onclick={createRoot}>创建</button>
+      <button class="btn" onclick={() => (showCreateRoot = false)}>取消</button>
+      <button class="btn btn-primary" onclick={createRoot}>创建</button>
     </div>
   </Modal>
 {/if}

hub/filelib-web/src/lib/LoginView.svelte

@@ -1,18 +1,13 @@
 <script lang="ts">
   import { onMount } from "svelte";
-  import { api } from "./api.js";
+  import { loadConfig, type AppConfig } from "./config.js";
 
-  interface LoginInfo {
-    orgSlug: string;
-    devLoginEnabled: boolean;
-  }
-
-  let info = $state<LoginInfo | null>(null);
+  let info = $state<AppConfig | null>(null);
   let loadFailed = $state(false);
 
   onMount(async () => {
     try {
-      info = await api<LoginInfo>("/database/api/login-info");
+      info = await loadConfig();
     } catch {
       loadFailed = true;
     }
@@ -27,6 +22,7 @@
     {#if info}
       <a
         href="/auth/feishu/{encodeURIComponent(info.orgSlug)}"
+        data-sveltekit-reload
         class="flex w-full items-center justify-center rounded-lg bg-accent px-4 py-3 text-sm font-medium text-white transition hover:bg-accent-hover"
       >使用飞书登录</a>
 
@@ -35,7 +31,7 @@
           <span class="flex-1 border-t border-line-soft"></span>开发模式
           <span class="flex-1 border-t border-line-soft"></span>
         </div>
-        <a href="/app/dev-login-teacher" class="flex w-full items-center justify-center rounded-lg border border-line bg-panel px-4 py-2 text-[12.5px] font-medium text-ink transition hover:bg-hover">⚡ 一键登录(老师)</a>
+        <a href="/app/dev-login-teacher" data-sveltekit-reload class="flex w-full items-center justify-center rounded-lg border border-line bg-panel px-4 py-2 text-[12.5px] font-medium text-ink transition hover:bg-hover">⚡ 一键登录(老师)</a>
         <p class="mt-2.5 text-center text-[11px] text-ink-3">仅开发环境可见 · 跳过飞书 OAuth</p>
       {/if}
     {:else if loadFailed}

hub/filelib-web/src/lib/Modal.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { Snippet } from "svelte";
 
-  let { title, onclose, children }: { title: string; onclose: () => void; children: Snippet } = $props();
+  let { title, onclose, children, maxW = 440 }: { title: string; onclose: () => void; children: Snippet; maxW?: number } = $props();
 </script>
 
 <div
@@ -9,7 +9,7 @@
   role="presentation"
   onclick={(e) => { if (e.target === e.currentTarget) onclose(); }}
 >
-  <div class="w-full max-w-[440px] rounded-2xl border border-line-soft bg-panel p-6 shadow-[0_4px_20px_rgba(26,26,24,.07)]">
+  <div class="max-h-[88vh] w-full overflow-y-auto rounded-2xl border border-line-soft bg-panel p-6 shadow-[0_4px_20px_rgba(26,26,24,.07)]" style="max-width:{maxW}px">
     <div class="mb-4 text-[15px] font-semibold">{title}</div>
     {@render children()}
   </div>

hub/filelib-web/src/lib/NodeDetailPanel.svelte

@@ -2,11 +2,15 @@
   import { api } from "./api.js";
   import { currentNode, breadcrumb, bumpTree, clearSelectedFile } from "./browser.js";
   import { toastOk, toastErr } from "./stores.js";
+  import { ROLE_LABEL } from "./labels.js";
   import OverviewPanel from "./OverviewPanel.svelte";
   import FilesPanel from "./FilesPanel.svelte";
+  import GrantsPanel from "./GrantsPanel.svelte";
   import Modal from "./Modal.svelte";
+  import Icon from "./Icon.svelte";
 
-  let tab = $state<"detail" | "files">("detail");
+  type Tab = "detail" | "files" | "grants";
+  let tab = $state<Tab>("detail");
   let showCreateChild = $state(false);
   let newName = $state("");
   let newKind = $state<"FOLDER" | "PROJECT">("FOLDER");
@@ -17,6 +21,15 @@
   const canManage = $derived(node?.role === "MANAGE");
   const canEdit = $derived(canManage || node?.role === "EDIT");
 
+  // 与旧 libraryBrowser 的 tab 组装一致:概览恒有;文件仅 PROJECT;授权仅 MANAGE
+  // (FOLDER 也有授权 —— 它虽是透明组织节点,授权仍挂在节点上,ADR-0021)。
+  const tabs = $derived.by((): ReadonlyArray<readonly [Tab, string]> => {
+    const out: Array<readonly [Tab, string]> = [["detail", "概览"]];
+    if (node?.kind === "PROJECT") out.push(["files", "文件"]);
+    if (canManage) out.push(["grants", "授权"]);
+    return out;
+  });
+
   $effect(() => {
     void node?.id;
     tab = "detail";
@@ -75,7 +88,7 @@
 {#if node === null}
   <div class="flex h-full items-center justify-center text-[13px] text-ink-3">从左侧选择一个文件夹或项目</div>
 {:else}
-  <div class="mx-auto max-w-[880px] px-9 py-9">
+  <div class="mx-auto max-w-[1400px] px-9 py-9">
     <div class="mb-2 text-[12.5px] text-ink-3">
       {#each crumbs as c, i (i)}
         {#if i > 0}<span class="mx-1 text-line">/</span>{/if}
@@ -84,36 +97,43 @@
     </div>
 
     <div class="mb-5 flex items-center justify-between">
-      <div class="flex items-center gap-2.5 text-[19px] font-semibold text-ink">
+      <div class="flex items-center gap-2 text-[17px] font-semibold text-ink">
         {node.name}
-        <span class="rounded-full border border-line-soft bg-panel px-2 py-0.5 font-mono text-[10.5px] text-ink-3">{node.kind === "PROJECT" ? "项目" : "文件夹"}</span>
+        <span class="tag">{node.kind === "PROJECT" ? "项目" : "文件夹"}</span>
+        <span class="tag !border-line !text-ink-2">{ROLE_LABEL[node.role]}</span>
       </div>
-      <div class="flex gap-2">
+      <div class="flex gap-1.5">
         {#if canEdit && node.kind === "FOLDER"}
-          <button class="rounded-lg border border-line bg-panel px-3 py-1.5 text-[12.5px] font-medium text-ink transition hover:bg-hover" onclick={() => (showCreateChild = true)}>+ 新建</button>
+          <button class="btn" onclick={() => (showCreateChild = true)}>
+            <Icon name="plus" size={13} /> 新建子节点
+          </button>
         {/if}
         {#if canManage}
-          <button class="rounded-lg border border-line bg-panel px-3 py-1.5 text-[12.5px] font-medium text-ink transition hover:bg-hover" onclick={renameNode}>重命名</button>
-          <button class="rounded-lg border border-transparent px-3 py-1.5 text-[12.5px] font-medium text-danger transition hover:bg-[#A13A3312]" onclick={deleteNode}>删除</button>
+          <button class="btn" onclick={renameNode}><Icon name="pencil" size={13} /> 重命名</button>
+          <button class="btn btn-danger" onclick={deleteNode}><Icon name="trash" size={13} /> 删除</button>
         {/if}
       </div>
     </div>
 
-    {#if node.kind === "FOLDER"}
-      <div class="py-7 text-[13px] text-ink-3">点击左侧树展开以浏览子内容</div>
+    <div class="mb-[18px] flex gap-0.5 border-b border-line-soft">
+      {#each tabs as [id, label] (id)}
+        <button
+          class="-mb-px border-b-2 px-3.5 py-2 text-[13px] transition {tab === id
+            ? 'border-accent font-semibold text-ink'
+            : 'border-transparent text-ink-3 hover:text-ink'}"
+          onclick={() => (tab = id)}
+        >{label}</button>
+      {/each}
+    </div>
+
+    {#if tab === "grants"}
+      <GrantsPanel {node} />
+    {:else if tab === "files" && node.kind === "PROJECT"}
+      <FilesPanel {node} />
     {:else}
-      <div class="mb-5 flex gap-1 border-b border-line-soft">
-        {#each [["detail", "概览"], ["files", "文件"]] as [id, label] (id)}
-          <button
-            class="border-b-2 px-3.5 py-2 text-[13px] transition {tab === id ? 'border-accent font-semibold text-ink' : 'border-transparent text-ink-3 hover:text-ink'}"
-            onclick={() => (tab = id as "detail" | "files")}
-          >{label}</button>
-        {/each}
-      </div>
-      {#if tab === "detail"}
-        <OverviewPanel {node} />
-      {:else}
-        <FilesPanel {node} />
+      <OverviewPanel {node} />
+      {#if node.kind === "FOLDER"}
+        <div class="quiet mt-3.5">文件夹是透明组织节点,点左侧树展开以浏览子内容。</div>
       {/if}
     {/if}
   </div>
@@ -121,24 +141,24 @@
 
 {#if showCreateChild && node}
   <Modal title="新建子节点" onclose={() => (showCreateChild = false)}>
-    <div class="mb-3">
-      <label class="mb-1 block text-[11.5px] text-ink-3" for="child-name">名称</label>
-      <input id="child-name" class="w-full rounded-lg border border-line bg-panel px-3 py-2 text-[13px] outline-none focus:border-accent" bind:value={newName} placeholder="例如:物理必修一" />
+    <div class="form-row">
+      <label class="form-label" for="child-name">名称</label>
+      <input id="child-name" class="input" bind:value={newName} placeholder="例如:物理必修一" />
     </div>
-    <div class="mb-3">
-      <label class="mb-1 block text-[11.5px] text-ink-3" for="child-kind">类型</label>
-      <select id="child-kind" class="w-full rounded-lg border border-line bg-panel px-3 py-2 text-[13px] outline-none focus:border-accent" bind:value={newKind}>
+    <div class="form-row">
+      <label class="form-label" for="child-kind">类型</label>
+      <select id="child-kind" class="select" bind:value={newKind}>
         <option value="FOLDER">文件夹</option>
         <option value="PROJECT">项目(课程资源库)</option>
       </select>
     </div>
-    <div class="mb-3">
-      <label class="mb-1 block text-[11.5px] text-ink-3" for="child-desc">简介(可选)</label>
-      <textarea id="child-desc" rows="3" class="w-full rounded-lg border border-line bg-panel px-3 py-2 font-mono text-xs outline-none focus:border-accent" bind:value={newDesc} placeholder="简要说明用途…"></textarea>
+    <div class="form-row">
+      <label class="form-label" for="child-desc">简介(可选)</label>
+      <textarea id="child-desc" rows="3" class="textarea" bind:value={newDesc} placeholder="简要说明用途…"></textarea>
     </div>
     <div class="mt-4 flex justify-end gap-2">
-      <button class="rounded-lg border border-line bg-panel px-3.5 py-1.5 text-[12.5px] font-medium text-ink transition hover:bg-hover" onclick={() => (showCreateChild = false)}>取消</button>
-      <button class="rounded-lg bg-accent px-3.5 py-1.5 text-[12.5px] font-medium text-white transition hover:bg-accent-hover" onclick={createChild}>创建</button>
+      <button class="btn" onclick={() => (showCreateChild = false)}>取消</button>
+      <button class="btn btn-primary" onclick={createChild}>创建</button>
     </div>
   </Modal>
 {/if}

hub/filelib-web/src/lib/OverviewPanel.svelte

@@ -2,17 +2,35 @@
   import { api } from "./api.js";
   import { toastOk, toastErr } from "./stores.js";
   import { currentNode } from "./browser.js";
+  import { ROLE_LABEL } from "./labels.js";
   import type { ExportJob, NodeDetail } from "./types.js";
   import Modal from "./Modal.svelte";
 
-  let { node }: { node: NodeDetail } = $props();
+  let { node, ondeleted }: { node: NodeDetail; ondeleted?: () => void } = $props();
 
   let showEditDesc = $state(false);
   let descDraft = $state("");
   let exportJob = $state<ExportJob | null>(null);
+  let deleting = $state(false);
 
   const canEdit = $derived(node.role === "MANAGE" || node.role === "EDIT");
-  const roleLabel = $derived(node.role === "MANAGE" ? "可管理" : node.role === "EDIT" ? "可编辑" : "只读");
+  const canManage = $derived(node.role === "MANAGE");
+  const roleLabel = $derived(ROLE_LABEL[node.role]);
+
+  /** 删除(进回收站,可恢复;ADR-0031)。MANAGE 专属,与右键菜单同语义。 */
+  async function deleteNode(): Promise<void> {
+    if (!confirm(`删除「${node.name}」?移入回收站,可在回收站恢复。`)) return;
+    deleting = true;
+    try {
+      await api(`/database/api/nodes/${node.id}`, { method: "DELETE" });
+      toastOk("已移入回收站");
+      ondeleted?.();
+    } catch (e) {
+      toastErr(e instanceof Error ? e.message : String(e));
+    } finally {
+      deleting = false;
+    }
+  }
 
   $effect(() => {
     void node.id;
@@ -67,7 +85,7 @@
   }
 </script>
 
-<div class="rounded-xl border border-line-soft bg-panel p-5">
+<div class="panel">
   <div class="mb-4">
     <div class="mb-1.5 text-[11.5px] text-ink-3">简介</div>
     <div class="text-[13.5px] leading-7 text-ink">
@@ -77,7 +95,7 @@
         <span class="italic text-ink-3">暂无简介</span>
       {/if}
       {#if canEdit}
-        <button class="ml-2.5 rounded-lg border border-line bg-panel px-2.5 py-0.5 align-middle text-[11.5px] text-ink transition hover:bg-hover" onclick={openEditDesc}>编辑</button>
+        <button class="btn ml-2.5 !px-2.5 !py-0.5 align-middle !text-[11.5px]" onclick={openEditDesc}>编辑</button>
       {/if}
     </div>
   </div>
@@ -85,39 +103,55 @@
   <div class="my-4 border-t border-line-soft"></div>
 
   <div class="flex flex-col gap-1.5 text-[13px] text-ink-2">
+    <div>类型 <b class="font-semibold text-ink">{node.kind === "PROJECT" ? "项目" : "文件夹"}</b></div>
     <div>我的角色 <b class="font-semibold text-ink">{roleLabel}</b></div>
-    <div>创建时间 <b class="font-semibold text-ink">{new Date(node.createdAt).toLocaleDateString("zh-CN", { year: "numeric", month: "long", day: "numeric" })}</b></div>
-    <div>最近修改 <b class="font-semibold text-ink">{new Date(node.updatedAt).toLocaleDateString("zh-CN", { year: "numeric", month: "long", day: "numeric" })}</b></div>
+    <div>创建时间 <b class="font-semibold text-ink">{new Date(node.createdAt).toLocaleString("zh-CN")}</b></div>
+    <div>更新时间 <b class="font-semibold text-ink">{new Date(node.updatedAt).toLocaleString("zh-CN")}</b></div>
   </div>
 
-  <div class="my-4 border-t border-line-soft"></div>
+  <!-- 导出只对 PROJECT 有意义(FOLDER 是透明组织节点,ADR-0021)。 -->
+  {#if node.kind === "PROJECT"}
+    <div class="my-4 border-t border-line-soft"></div>
 
-  <div class="mb-2 text-[12.5px] font-semibold">导出</div>
-  <div class="flex items-center gap-2">
-    <button class="rounded-lg border border-line bg-panel px-3 py-1.5 text-[12.5px] font-medium text-ink transition hover:bg-hover" onclick={submitExport}>开始导出</button>
-    {#if exportJob}
-      <span class="font-mono text-[11px] text-ink-3">
-        {#if exportJob.status === "DONE"}
-          完成 · <a class="text-accent underline" href="/database/api/exports/{exportJob.id}/download">下载</a>
-        {:else if exportJob.status === "FAILED"}
-          失败:{exportJob.error ?? ""}
-        {:else}
-          {exportJob.status}…
-        {/if}
-      </span>
-    {/if}
-  </div>
+    <div class="section-title mb-2">导出</div>
+    <div class="flex items-center gap-2">
+      <select class="select !w-auto"><option value="manifest">manifest(stub)</option></select>
+      <button class="btn" onclick={submitExport}>开始导出</button>
+      {#if exportJob}
+        <span class="file-meta">
+          {#if exportJob.status === "DONE"}
+            完成 · <a class="text-accent underline" href="/database/api/exports/{exportJob.id}/download">下载</a>
+          {:else if exportJob.status === "FAILED"}
+            失败:{exportJob.error ?? ""}
+          {:else}
+            {exportJob.status}…
+          {/if}
+        </span>
+      {/if}
+    </div>
+  {/if}
+
+  {#if canManage}
+    <div class="my-4 border-t border-line-soft"></div>
+
+    <div class="flex items-center justify-between">
+      <span class="quiet">删除后移入回收站,可恢复</span>
+      <button class="btn btn-danger disabled:opacity-50" onclick={deleteNode} disabled={deleting}>
+        {deleting ? "删除中…" : `删除此${node.kind === "PROJECT" ? "项目" : "文件夹"}`}
+      </button>
+    </div>
+  {/if}
 </div>
 
 {#if showEditDesc}
   <Modal title="编辑简介" onclose={() => (showEditDesc = false)}>
-    <div class="mb-3">
-      <label class="mb-1 block text-[11.5px] text-ink-3" for="desc-draft">简要说明这个项目的内容</label>
-      <textarea id="desc-draft" rows="5" class="w-full rounded-lg border border-line bg-panel px-3 py-2 text-[13px] leading-7 outline-none focus:border-accent" bind:value={descDraft} placeholder="例如:高中物理必修一第三章,表面张力相关内容……"></textarea>
+    <div class="form-row">
+      <label class="form-label" for="desc-draft">简要说明这个项目的内容</label>
+      <textarea id="desc-draft" rows="5" class="input !leading-7" bind:value={descDraft} placeholder="例如:高中物理必修一第三章,表面张力相关内容……"></textarea>
     </div>
     <div class="mt-4 flex justify-end gap-2">
-      <button class="rounded-lg border border-line bg-panel px-3.5 py-1.5 text-[12.5px] font-medium text-ink transition hover:bg-hover" onclick={() => (showEditDesc = false)}>取消</button>
-      <button class="rounded-lg bg-accent px-3.5 py-1.5 text-[12.5px] font-medium text-white transition hover:bg-accent-hover" onclick={saveDesc}>保存</button>
+      <button class="btn" onclick={() => (showEditDesc = false)}>取消</button>
+      <button class="btn btn-primary" onclick={saveDesc}>保存</button>
     </div>
   </Modal>
 {/if}

hub/filelib-web/src/lib/TreeNode.svelte

@@ -3,6 +3,7 @@
   import { api } from "./api.js";
   import { expanded, currentNode, breadcrumb, toggleExpanded, treeVersion } from "./browser.js";
   import { toastErr } from "./stores.js";
+  import { ROLE_LABEL } from "./labels.js";
   import type { BreadcrumbEntry, NodeChild, NodeDetail } from "./types.js";
 
   let { node, depth }: { node: NodeChild; depth: number } = $props();
@@ -64,7 +65,7 @@
     </span>
     <span class="truncate">{node.name}</span>
     {#if node.role !== "MANAGE"}
-      <span class="ml-auto pr-1 font-mono text-[10px] text-ink-3">{node.role}</span>
+      <span class="ml-auto pr-1 text-[10px] text-ink-3">{ROLE_LABEL[node.role]}</span>
     {/if}
   </div>
 

hub/filelib-web/src/lib/config.ts

@@ -0,0 +1,23 @@
+/**
+ * 前端 bootstrap:silo org slug(拼飞书 OAuth 链接用)+ dev 一键登录开关。
+ *
+ * 打 `/database/config` 而非 `/database/api/login-info`:后者由 teacherApp.ts 在
+ * silo org 查找成功之后才注册,org 缺失时整条链路不存在;前者在
+ * databaseRoutes.ts 顶部无条件注册。两者形状相同(见 src/database/README.md)。
+ *
+ * 免鉴权 —— org slug 本就出现在 OAuth URL 里,不构成敏感信息。
+ */
+import { api } from "./api.js";
+
+export interface AppConfig {
+  readonly orgSlug: string;
+  readonly devLoginEnabled: boolean;
+}
+
+let cached: AppConfig | null = null;
+
+export async function loadConfig(): Promise<AppConfig> {
+  if (cached !== null) return cached;
+  cached = await api<AppConfig>("/database/config");
+  return cached;
+}

hub/filelib-web/src/lib/labels.ts

@@ -0,0 +1,10 @@
+/** 展示层文案(与 API 枚举值解耦;传参仍用英文枚举)。 */
+
+import type { Role } from "./types.js";
+
+/** 文件库权限级(契约 8.1 MANAGE>EDIT>VIEW)的中文展示名。 */
+export const ROLE_LABEL: Record<Role, string> = {
+  VIEW: "只读",
+  EDIT: "可编辑",
+  MANAGE: "可管理",
+};

hub/filelib-web/src/lib/session.ts

@@ -0,0 +1,34 @@
+/**
+ * 会话装载:GET /database/api/me 一次,结果进 `me` store。
+ * 老师端与管理后台共用 —— 两处的区别只是拿到 me 之后怎么用
+ * (老师端未登录显示登录视图;管理后台未登录跳 /database/admin,
+ * 非 isWebsiteAdmin 显示无权提示)。
+ */
+import { get } from "svelte/store";
+import { api, UnauthenticatedError } from "./api.js";
+import { me, authChecked } from "./stores.js";
+import type { MeResponse } from "./types.js";
+
+/** 幂等:已检查过就不再打请求(路由间切换不重复拉取)。 */
+export async function loadSession(force = false): Promise<void> {
+  if (get(authChecked) && !force) return;
+
+  try {
+    me.set(await api<MeResponse>("/database/api/me"));
+  } catch (e) {
+    if (!(e instanceof UnauthenticatedError)) console.error(e);
+    me.set(null);
+  } finally {
+    authChecked.set(true);
+  }
+}
+
+/** 退出登录:清后端 cookie 再清前端 store。 */
+export async function logout(): Promise<void> {
+  try {
+    await fetch("/auth/logout", { method: "POST", credentials: "same-origin" });
+  } catch {
+    /* 网络失败也照样清前端状态 */
+  }
+  me.set(null);
+}

hub/filelib-web/src/lib/types.ts

@@ -18,6 +18,8 @@ export interface BreadcrumbEntry {
   readonly id: string | null;
   readonly name: string | null;
   readonly kind: NodeKind;
+  /** 该节点对调用者的 effective role;无 View 为 null。 */
+  readonly role: Role | null;
 }
 
 export interface NodeDetail {
@@ -28,7 +30,6 @@ export interface NodeDetail {
   readonly description: string | null;
   readonly role: Role;
   readonly provisionStatus: "PROVISIONING" | "READY" | "FAILED";
-  readonly independentPermission: boolean;
   readonly createdAt: string;
   readonly updatedAt: string;
 }
@@ -36,6 +37,9 @@ export interface NodeDetail {
 export interface MeResponse {
   readonly userId: string;
   readonly isWebsiteAdmin: boolean;
+  /** 侧栏身份区显示用;后端取不到 User 行时回落为 userId。 */
+  readonly displayName: string;
+  readonly avatarUrl: string | null;
 }
 
 export interface FileEntry {
@@ -69,17 +73,96 @@ export interface ExportJob {
   readonly createdAt: string;
 }
 
-export interface Grant {
-  readonly id: string;
-  readonly principalType: "USER" | "GROUP";
-  readonly principalId: string;
-  readonly role: Role;
-  readonly isCreatorGrant: boolean;
-  readonly createdAt: string;
-}
-
 export interface GroupSearchResult {
   readonly id: string;
   readonly name: string;
   readonly breadcrumb: string;
 }
+
+/** 成员组(ADR-0028);后端返回扁平列表,前端按 parentId/depth 拼树。 */
+export interface MemberGroupNode {
+  readonly id: string;
+  readonly parentId: string | null;
+  readonly name: string;
+  readonly description: string | null;
+  readonly depth: number;
+  readonly memberCount: number;
+  /** 软删标记(ADR-0028 决策4)。null = 活跃;非 null = 已归档,不贡献任何权限。
+   *  仅在 ?includeArchived=1 时可能非 null。ISO 串(后端 JSON 序列化后不再是 Date)。 */
+  readonly archivedAt: string | null;
+}
+
+export interface MemberGroupMember {
+  readonly userId: string;
+  readonly displayName: string;
+  readonly feishuOpenId: string;
+  readonly avatarUrl: string | null;
+  /** 加入本组时间;ISO 串。 */
+  readonly joinedAt: string;
+}
+
+/** 节点授权(GET /database/api/nodes/:id/grants)。 */
+export interface Grant {
+  readonly id: string;
+  readonly principalType: "USER" | "GROUP";
+  readonly principalId: string;
+  /** 主体显示名(用户 displayName / 组 name);主体已删为 null,展示回落 principalId。 */
+  readonly principalName: string | null;
+  /** USER 主体的飞书 openId;GROUP 或主体已删为 null。 */
+  readonly principalOpenId: string | null;
+  readonly role: Role;
+  /** 创建者授权不可收回、不可改(契约 8.1)。 */
+  readonly isCreatorGrant: boolean;
+  readonly createdAt: string;
+}
+
+/** Group 选择器候选(GET /database/api/groups/search)。 */
+export interface MemberGroupSearchResult {
+  readonly id: string;
+  readonly name: string;
+  /** 祖先链(根在前,自身在末),用 " / " 连接。 */
+  readonly breadcrumb: string;
+}
+
+/** 成员选择器候选(GET /database/api/users/search)。 */
+export interface UserSearchResult {
+  readonly userId: string;
+  readonly displayName: string;
+  readonly feishuOpenId: string;
+  readonly avatarUrl: string | null;
+}
+
+/** 回收站条目(GET /database/api/bin)。 */
+export interface BinEntry {
+  readonly id: string;
+  readonly parentId: string | null;
+  readonly kind: NodeKind;
+  readonly name: string;
+  readonly deletedAt: string;
+}
+
+/** 管理后台概览统计(GET /database/api/stats)。 */
+export interface DashboardStats {  readonly folders: number;
+  readonly projects: number;
+  readonly files: number;
+  readonly grants: number;
+  readonly recent: ReadonlyArray<{
+    readonly action: string;
+    readonly actor: string;
+    readonly label: string;
+    /** ISO 串;后端 JSON 序列化后不再是 Date。 */
+    readonly when: string;
+  }>;
+}
+
+/** org 成员(GET /api/org/:slug/members);用户管理面板消费。 */
+export type OrgRole = "OWNER" | "ADMIN" | "MEMBER";
+
+export interface OrgMember {
+  readonly userId: string;
+  readonly feishuOpenId: string;
+  readonly displayName: string;
+  readonly avatarUrl: string | null;
+  readonly role: OrgRole;
+  readonly createdAt: string;
+}

hub/filelib-web/src/main.ts

@@ -1,5 +0,0 @@
-import { mount } from "svelte";
-import App from "./App.svelte";
-import "./app.css";
-
-export default mount(App, { target: document.getElementById("app")! });

hub/filelib-web/src/routes/+layout.svelte

@@ -0,0 +1,12 @@
+<script lang="ts">
+  import "../app.css";
+  import Toasts from "$lib/Toasts.svelte";
+
+  let { children } = $props();
+</script>
+
+<div class="h-full">
+  {@render children()}
+</div>
+
+<Toasts />

hub/filelib-web/src/routes/+layout.ts

@@ -0,0 +1,7 @@
+/**
+ * 纯 SPA:关掉 SSR 与预渲染,构建产物只有一个 fallback index.html
+ * (adapter-static + fallback,见 svelte.config.js),由 hub 后端在
+ * /app 与 /database/* 两个前缀下原样送出。
+ */
+export const ssr = false;
+export const prerender = false;

hub/filelib-web/src/routes/+page.svelte

@@ -0,0 +1,11 @@
+<script lang="ts">
+  import { onMount } from "svelte";
+  import { goto } from "$app/navigation";
+
+  // 根路径不承载界面:老师端在 /app,管理后台在 /database。
+  onMount(() => {
+    void goto("/app", { replaceState: true });
+  });
+</script>
+
+<div class="flex h-full items-center justify-center text-[13px] text-ink-3">跳转中…</div>

hub/filelib-web/src/routes/app/+page.svelte

@@ -0,0 +1,71 @@
+<script lang="ts">
+  /** 老师端。未登录显示登录卡片;登录后是带左栏导航的文件库(ADR-0031)。 */
+  import { onMount } from "svelte";
+  import { me, authChecked } from "$lib/stores.js";
+  import { loadSession, logout } from "$lib/session.js";
+  import LoginView from "$lib/LoginView.svelte";
+  import GridLibraryView from "$lib/GridLibraryView.svelte";
+  import BinView from "$lib/BinView.svelte";
+  import Icon from "$lib/Icon.svelte";
+
+  onMount(loadSession);
+
+  type View = "library" | "bin";
+  let view = $state<View>("library");
+
+  const tabs: ReadonlyArray<readonly [View, string, "layers" | "trash"]> = [
+    ["library", "文件库", "layers"],
+    ["bin", "回收站", "trash"],
+  ];
+
+  const initial = $derived(($me?.displayName ?? $me?.userId ?? "U").slice(0, 1).toUpperCase());
+</script>
+
+<svelte:head><title>教研数据库</title></svelte:head>
+
+{#if !$authChecked}
+  <div class="flex h-full items-center justify-center text-ink-3">加载中…</div>
+{:else if $me}
+  <div class="flex h-full">
+    <!-- 左栏导航(ADR-0031) -->
+    <nav class="flex w-[240px] shrink-0 flex-col border-r border-line-soft bg-sidebar px-3 py-4">
+      <!-- 标题 -->
+      <div class="mb-3 px-1 text-[15px] font-bold text-ink">教研数据库</div>
+      <div class="mb-2 border-t border-line-soft"></div>
+
+      <!-- 导航项 -->
+      <div class="flex flex-1 flex-col gap-0.5">
+        {#each tabs as [id, label, icon] (id)}
+          <button
+            class="flex items-center gap-2.5 rounded-lg px-3 py-2 text-left text-[13px] transition {view === id
+              ? 'bg-selected font-semibold text-ink'
+              : 'text-ink-2 hover:bg-hover'}"
+            onclick={() => (view = id)}
+          >
+            <span class="text-ink-3"><Icon name={icon} size={15} /></span>
+            {label}
+          </button>
+        {/each}
+      </div>
+
+      <!-- 底部:用户身份 + 退出 -->
+      <div class="mt-auto flex items-center gap-2 border-t border-line-soft pt-3">
+        <span class="flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-accent text-[11px] font-semibold text-white">{initial}</span>
+        <span class="min-w-0 flex-1 truncate text-[12.5px] text-ink">{$me?.displayName ?? $me?.userId ?? ""}</span>
+        <button
+          class="rounded-lg border border-line-soft px-2 py-1 text-[11.5px] text-ink-3 transition hover:bg-hover hover:text-ink"
+          onclick={logout}
+          title="退出登录"
+        >退出</button>
+      </div>
+    </nav>
+
+    {#if view === "library"}
+      <GridLibraryView />
+    {:else}
+      <BinView />
+    {/if}
+  </div>
+{:else}
+  <LoginView />
+{/if}

hub/filelib-web/src/routes/database/+page.svelte

@@ -0,0 +1,11 @@
+<script lang="ts">
+  import { onMount } from "svelte";
+  import { goto } from "$app/navigation";
+
+  // /database 本身不承载界面(与旧后端 /database/admin → dashboard 的跳转一致)。
+  onMount(() => {
+    void goto("/database/dashboard", { replaceState: true });
+  });
+</script>
+
+<div class="flex h-full items-center justify-center text-[13px] text-ink-3">跳转中…</div>

hub/filelib-web/src/routes/database/admin/+page.svelte

@@ -0,0 +1,63 @@
+<script lang="ts">
+  /**
+   * 管理后台登录页(迁自后端 renderLoginPage)。
+   * 已登录直接跳 dashboard —— 与旧后端路由 /database/admin 的行为一致。
+   */
+  import { onMount } from "svelte";
+  import { goto } from "$app/navigation";
+  import { me, authChecked } from "$lib/stores.js";
+  import { loadSession } from "$lib/session.js";
+  import { loadConfig, type AppConfig } from "$lib/config.js";
+
+  let info = $state<AppConfig | null>(null);
+  let loadFailed = $state(false);
+
+  onMount(async () => {
+    await loadSession();
+    if ($me !== null) {
+      void goto("/database/dashboard", { replaceState: true });
+      return;
+    }
+    try {
+      info = await loadConfig();
+    } catch {
+      loadFailed = true;
+    }
+  });
+</script>
+
+<svelte:head><title>Database Admin · 登录</title></svelte:head>
+
+<div class="flex min-h-full items-center justify-center p-6">
+  <div class="w-full max-w-[380px] rounded-2xl border border-line-soft bg-panel p-9 shadow-[0_4px_20px_rgba(26,26,24,.07)]">
+    <div class="text-center text-[26px] font-semibold text-ink">Database Admin</div>
+    <p class="mt-2.5 mb-8 text-center text-[13px] text-ink-3">使用飞书登录以管理数据库</p>
+
+    {#if !$authChecked}
+      <p class="text-center text-[12.5px] text-ink-3">加载中…</p>
+    {:else if info}
+      <a
+        href="/auth/feishu/{encodeURIComponent(info.orgSlug)}"
+        data-sveltekit-reload
+        class="flex w-full items-center justify-center rounded-lg bg-accent px-4 py-3 text-sm font-medium text-white transition hover:bg-accent-hover"
+      >使用飞书登录</a>
+
+      {#if info.devLoginEnabled}
+        <div class="my-5 flex items-center gap-2.5 text-[11px] text-ink-3">
+          <span class="flex-1 border-t border-line-soft"></span>开发模式
+          <span class="flex-1 border-t border-line-soft"></span>
+        </div>
+        <a
+          href="/database/dev-login"
+          data-sveltekit-reload
+          class="flex w-full items-center justify-center rounded-lg border border-line bg-panel px-4 py-2 text-[12.5px] font-medium text-ink transition hover:bg-hover"
+        >⚡ 一键登录管理员</a>
+        <p class="mt-2.5 text-center text-[11px] text-ink-3">仅开发环境可见 · 跳过飞书 OAuth</p>
+      {/if}
+    {:else if loadFailed}
+      <p class="text-center text-[12.5px] text-danger">无法加载登录配置,请稍后重试</p>
+    {:else}
+      <p class="text-center text-[12.5px] text-ink-3">加载中…</p>
+    {/if}
+  </div>
+</div>

hub/filelib-web/src/routes/database/dashboard/+layout.svelte

@@ -0,0 +1,99 @@
+<script lang="ts">
+  /**
+   * 管理后台外壳(迁自后端 renderDashboard 的侧栏 + 身份区)。
+   *
+   * 与旧实现的区别:六个 tab 是真 URL 路由(/database/dashboard/library 等),
+   * 不再是 location.hash + display:none 切换 —— 刷新不丢位置,链接可分享。
+   *
+   * 权限门:未登录跳 /database/admin;登录但非 OWNER/ADMIN(isWebsiteAdmin)
+   * 显示无权提示。语义与 ADR-0028 一致 —— 管理面板要求 silo org 的 OWNER/ADMIN。
+   */
+  import { onMount } from "svelte";
+  import { goto } from "$app/navigation";
+  import { page } from "$app/state";
+  import { me, authChecked } from "$lib/stores.js";
+  import { loadSession, logout } from "$lib/session.js";
+  import Avatar from "$lib/Avatar.svelte";
+
+  let { children } = $props();
+
+  const NAV = [
+    { seg: "", label: "概览", icon: "M4 13h6V4H4v9Zm0 7h6v-5H4v5Zm10 0h6V11h-6v9Zm0-16v5h6V4h-6Z" },
+    { seg: "library", label: "文件库", icon: "M3 7a2 2 0 0 1 2-2h4l2 2h8a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V7Z" },
+    { seg: "users", label: "用户管理", icon: "M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2M9 11a4 4 0 1 0 0-8 4 4 0 0 0 0 8Zm13 10v-2a4 4 0 0 0-3-3.87M16 3.13a4 4 0 0 1 0 7.75" },
+    { seg: "groups", label: "Group 管理", icon: "M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2M9 11a4 4 0 1 0 0-8 4 4 0 0 0 0 8Zm14 10v-2a4 4 0 0 0-3-3.87M16 3.13a4 4 0 0 1 0 7.75M23 21v-2a4 4 0 0 0-3-3.87" },
+    { seg: "search", label: "查询", icon: "m21 21-4.3-4.3M11 18a7 7 0 1 0 0-14 7 7 0 0 0 0 14Z" },
+    { seg: "settings", label: "设置", icon: "M12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6Zm7-3 2 1-2 3-2-1a7 7 0 0 1-2 1l-1 2h-4l-1-2a7 7 0 0 1-2-1l-2 1-2-3 2-1a7 7 0 0 1 0-2l-2-1 2-3 2 1a7 7 0 0 1 2 1l1-2h4l1 2a7 7 0 0 1 0 2l2-1 2 3-2 1a7 7 0 0 1 0 2Z" },
+  ] as const;
+
+  const BASE = "/database/dashboard";
+
+  onMount(async () => {
+    await loadSession();
+    if ($me === null) void goto("/database/admin", { replaceState: true });
+  });
+
+  function href(seg: string): string {
+    return seg === "" ? BASE : `${BASE}/${seg}`;
+  }
+
+  function isActive(seg: string): boolean {
+    const path = page.url.pathname.replace(/\/$/, "");
+    return seg === "" ? path === BASE : path === `${BASE}/${seg}`;
+  }
+</script>
+
+<svelte:head><title>Database Admin</title></svelte:head>
+
+{#if !$authChecked}
+  <div class="flex h-full items-center justify-center text-[13px] text-ink-3">加载中…</div>
+{:else if $me === null}
+  <div class="flex h-full items-center justify-center text-[13px] text-ink-3">跳转到登录页…</div>
+{:else if !$me.isWebsiteAdmin}
+  <div class="flex min-h-full items-center justify-center p-6">
+    <div class="w-full max-w-[420px] rounded-2xl border border-line-soft bg-panel p-9 text-center shadow-[0_4px_20px_rgba(26,26,24,.07)]">
+      <h2 class="mb-2 text-lg font-semibold text-ink">无权访问管理后台</h2>
+      <p class="mb-6 text-[13px] text-ink-3">
+        当前账号不是本组织的所有者或管理员。普通老师请到文件库使用。
+      </p>
+      <a href="/app" class="btn btn-primary justify-center">前往文件库</a>
+      <button class="btn mt-3 w-full justify-center" onclick={logout}>退出登录</button>
+    </div>
+  </div>
+{:else}
+  <div class="flex h-full">
+    <aside class="flex w-[240px] shrink-0 flex-col border-r border-line-soft bg-sidebar">
+      <div class="border-b border-line-soft px-4 py-4">
+        <span class="text-[15px] font-semibold text-ink">Database Admin</span>
+      </div>
+
+      <nav class="flex flex-1 flex-col gap-0.5 p-2.5">
+        {#each NAV as item (item.seg)}
+          {@const active = isActive(item.seg)}
+          <a
+            href={href(item.seg)}
+            class="flex items-center gap-2.5 rounded-[10px] px-3.5 py-2 text-[13px] transition"
+            class:bg-selected={active}
+            class:text-ink={active}
+            class:font-semibold={active}
+            class:text-ink-3={!active}
+            class:hover:bg-hover={!active}
+          >
+            <svg class="h-4 w-4 shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d={item.icon} /></svg>
+            {item.label}
+          </a>
+        {/each}
+      </nav>
+
+      <div class="m-2.5 flex items-center gap-2.5 border-t border-line-soft px-3 py-2.5">
+        <Avatar displayName={$me.displayName} userId={$me.userId} avatarUrl={$me.avatarUrl} size={26} />
+        <p class="min-w-0 flex-1 truncate text-[12.5px] text-ink" title={$me.userId}>{$me.displayName}</p>
+        <button class="btn !px-2.5 !py-[3px] !text-[11px]" onclick={logout}>退出</button>
+      </div>
+    </aside>
+
+    <div class="flex min-w-0 flex-1 flex-col">
+      {@render children()}
+    </div>
+  </div>
+{/if}

hub/filelib-web/src/routes/database/dashboard/+page.svelte

@@ -0,0 +1,67 @@
+<script lang="ts">
+  /** 概览(迁自后端 renderDashboard 的统计卡片 + 最近活动)。数据走 GET /database/api/stats。 */
+  import { onMount } from "svelte";
+  import { api } from "$lib/api.js";
+  import type { DashboardStats } from "$lib/types.js";
+
+  let stats = $state<DashboardStats | null>(null);
+  let error = $state<string | null>(null);
+
+  onMount(async () => {
+    try {
+      stats = await api<DashboardStats>("/database/api/stats");
+    } catch (e) {
+      error = e instanceof Error ? e.message : String(e);
+    }
+  });
+
+  const cards = $derived([
+    { label: "文件夹", value: stats?.folders },
+    { label: "项目", value: stats?.projects },
+    { label: "文件", value: stats?.files },
+    { label: "活跃授权", value: stats?.grants },
+  ]);
+
+  function fmtWhen(iso: string): string {
+    try {
+      return new Date(iso).toLocaleString("zh-CN");
+    } catch {
+      return iso;
+    }
+  }
+</script>
+
+<section class="flex-1 overflow-y-auto p-7">
+  <h1 class="mb-1 text-lg font-semibold text-ink">概览</h1>
+  <p class="mb-5 text-[11.5px] text-ink-3">文件库实时数据</p>
+
+  {#if error}
+    <div class="panel text-[12.5px] text-danger">{error}</div>
+  {:else}
+    <div class="grid grid-cols-4 gap-4">
+      {#each cards as card (card.label)}
+        <div class="panel !px-5 !py-[18px]">
+          <p class="text-[12.5px] text-ink-3">{card.label}</p>
+          <p class="mt-1.5 text-[28px] font-semibold text-ink">{card.value ?? "—"}</p>
+        </div>
+      {/each}
+    </div>
+
+    <div class="panel mt-[18px]">
+      <h2 class="mb-2 text-[13.5px] font-semibold text-ink">最近活动</h2>
+      {#if stats === null}
+        <div class="quiet py-6 text-center">加载中…</div>
+      {:else if stats.recent.length === 0}
+        <div class="quiet py-[26px] text-center">暂无文件库活动 · 到「文件库」里创建第一个文件夹吧</div>
+      {:else}
+        {#each stats.recent as row (row.action + row.when + row.label)}
+          <div class="flex items-center gap-3 border-t border-line-soft py-2.5 text-[13px]">
+            <span class="tag shrink-0">{row.action}</span>
+            <span class="truncate text-ink">{row.label}</span>
+            <span class="ml-auto shrink-0 text-[11.5px] text-ink-3">{row.actor} · {fmtWhen(row.when)}</span>
+          </div>
+        {/each}
+      {/if}
+    </div>
+  {/if}
+</section>

hub/filelib-web/src/routes/database/dashboard/groups/+page.svelte

@@ -0,0 +1,10 @@
+<script lang="ts">
+  /** Group 管理 tab —— MemberGroup 嵌套树(ADR-0028)。
+   *  外框 padding/overflow 对齐旧 `#tab-groups`(padding:20px;overflow:hidden):
+   *  两栏各自内部滚动,外层不滚。 */
+  import GroupAdmin from "$lib/GroupAdmin.svelte";
+</script>
+
+<div class="min-h-0 flex-1 overflow-hidden p-5">
+  <GroupAdmin />
+</div>

hub/filelib-web/src/routes/database/dashboard/library/+page.svelte

@@ -0,0 +1,8 @@
+<script lang="ts">
+  /** 文件库 tab —— 与老师端 /app 同一个浏览器组件,区别只在侧栏身份区由外壳提供。 */
+  import LibraryView from "$lib/LibraryView.svelte";
+</script>
+
+<div class="flex min-h-0 flex-1 flex-col">
+  <LibraryView />
+</div>

hub/filelib-web/src/routes/database/dashboard/search/+page.svelte

@@ -0,0 +1,4 @@
+<section class="flex-1 overflow-y-auto p-7">
+  <h1 class="mb-1 text-lg font-semibold text-ink">查询</h1>
+  <p class="text-[12.5px] text-ink-3">查询功能建设中</p>
+</section>

hub/filelib-web/src/routes/database/dashboard/settings/+page.svelte

@@ -0,0 +1,4 @@
+<section class="flex-1 overflow-y-auto p-7">
+  <h1 class="mb-1 text-lg font-semibold text-ink">设置</h1>
+  <p class="text-[12.5px] text-ink-3">设置功能建设中</p>
+</section>

hub/filelib-web/src/routes/database/dashboard/users/+page.svelte

@@ -0,0 +1,200 @@
+<script lang="ts">
+  /**
+   * 用户管理(迁自后端 adminPanels.ts renderUsersPanel)。
+   *
+   * 用户 = silo org 的成员,走平台层 /api/org/:slug/members(见 src/admin/routes/membersRoutes.ts)。
+   * 与 Group 管理是两套体系:MemberGroup 是全局主体、不归属 org(ADR-0028),
+   * 这里管的是 org 成员与其角色。
+   */
+  import { onMount } from "svelte";
+  import { page } from "$app/state";
+  import { api } from "$lib/api.js";
+  import { loadConfig } from "$lib/config.js";
+  import { toastOk, toastErr } from "$lib/stores.js";
+  import type { OrgMember, OrgRole } from "$lib/types.js";
+  import Icon from "$lib/Icon.svelte";
+
+  const ROLE_LABEL: Record<OrgRole, string> = {
+    OWNER: "所有者",
+    ADMIN: "管理员",
+    MEMBER: "普通老师",
+  };
+  const ROLES: readonly OrgRole[] = ["OWNER", "ADMIN", "MEMBER"];
+
+  let orgSlug = $state<string | null>(null);
+  let members = $state<OrgMember[] | null>(null);
+  let error = $state<string | null>(null);
+
+  // 列表过滤;授权面板跳转会带 ?q=<userId>,以此为初始过滤词。
+  let filterText = $state(page.url.searchParams.get("q") ?? "");
+
+  let newOpenId = $state("");
+  let newName = $state("");
+  let newRole = $state<OrgRole>("MEMBER");
+  let adding = $state(false);
+
+  const base = $derived(orgSlug === null ? null : `/api/org/${encodeURIComponent(orgSlug)}`);
+
+  /** 按显示名 / userId / openId 过滤(纯前端;成员全量在手)。 */
+  const shown = $derived.by((): OrgMember[] | null => {
+    if (members === null) return null;
+    const q = filterText.trim().toLowerCase();
+    if (q === "") return members;
+    return members.filter(
+      (m) =>
+        m.displayName.toLowerCase().includes(q) ||
+        m.userId.toLowerCase().includes(q) ||
+        m.feishuOpenId.toLowerCase().includes(q),
+    );
+  });
+
+  async function load(): Promise<void> {
+    if (base === null) return;
+    try {
+      const r = await api<{ members: OrgMember[] }>(`${base}/members`);
+      members = r.members;
+      error = null;
+    } catch (e) {
+      error = e instanceof Error ? e.message : String(e);
+    }
+  }
+
+  onMount(async () => {
+    try {
+      orgSlug = (await loadConfig()).orgSlug;
+      await load();
+    } catch (e) {
+      error = e instanceof Error ? e.message : String(e);
+    }
+  });
+
+  async function addMember(): Promise<void> {
+    const feishuOpenId = newOpenId.trim();
+    if (feishuOpenId === "") {
+      toastErr("请填写用户 openId");
+      return;
+    }
+    if (base === null) return;
+    adding = true;
+    try {
+      const displayName = newName.trim();
+      await api(`${base}/members`, {
+        method: "POST",
+        body: { feishuOpenId, role: newRole, ...(displayName !== "" ? { displayName } : {}) },
+      });
+      newOpenId = "";
+      newName = "";
+      toastOk("已添加");
+      await load();
+    } catch (e) {
+      toastErr(e instanceof Error ? e.message : String(e));
+    } finally {
+      adding = false;
+    }
+  }
+
+  async function setRole(userId: string, role: string): Promise<void> {
+    if (base === null) return;
+    try {
+      await api(`${base}/members/${encodeURIComponent(userId)}`, { method: "PATCH", body: { role } });
+      toastOk("角色已更新");
+      await load();
+    } catch (e) {
+      toastErr(e instanceof Error ? e.message : String(e));
+      await load();
+    }
+  }
+
+  async function revoke(userId: string, displayName: string): Promise<void> {
+    if (base === null) return;
+    if (!confirm(`移除成员「${displayName || userId}」?`)) return;
+    try {
+      await api(`${base}/members/${encodeURIComponent(userId)}/revoke`, { method: "POST" });
+      toastOk("已移除");
+      await load();
+    } catch (e) {
+      toastErr(e instanceof Error ? e.message : String(e));
+    }
+  }
+</script>
+
+<section class="flex-1 overflow-y-auto p-7">
+  <h1 class="mb-4 text-lg font-semibold text-ink">用户管理</h1>
+
+  <div class="max-w-[880px]">
+    <div class="panel mb-3.5">
+      <div class="section-title mb-2.5">添加成员</div>
+      <div class="flex flex-wrap items-center gap-2">
+        <input class="input min-w-0 flex-[2]" placeholder="用户 openId(飞书 ou_ 开头)" bind:value={newOpenId} />
+        <input class="input min-w-0 flex-1" placeholder="显示名(可选)" bind:value={newName} />
+        <select class="select !w-[130px]" bind:value={newRole}>
+          {#each ROLES as role (role)}
+            <option value={role}>{ROLE_LABEL[role]}</option>
+          {/each}
+        </select>
+        <button class="btn btn-primary disabled:opacity-50" onclick={addMember} disabled={adding}>
+          {adding ? "添加中…" : "添加"}
+        </button>
+      </div>
+    </div>
+
+    <div class="panel">
+      <div class="mb-2.5 flex items-center justify-between gap-2">
+        <div class="section-title">成员列表</div>
+        <div class="relative w-[260px] shrink-0">
+          <span class="pointer-events-none absolute left-2.5 top-1/2 -translate-y-1/2 text-ink-3">
+            <Icon name="search" size={13} />
+          </span>
+          <input
+            class="input w-full !py-[5px] !pl-8 !text-[12.5px]"
+            placeholder="过滤:名称 / userId / openId"
+            bind:value={filterText}
+          />
+        </div>
+      </div>
+
+      {#if error}
+        <div class="py-3 text-[12.5px] text-danger">{error}</div>
+      {:else if shown === null}
+        <div class="quiet py-[18px] text-center">加载中…</div>
+      {:else if shown.length === 0}
+        <div class="quiet py-[18px] text-center">
+          {filterText.trim() === "" ? "暂无成员" : `无匹配「${filterText.trim()}」的成员`}
+        </div>
+      {:else}
+        <table class="list">
+          <thead>
+            <tr>
+              <th>成员</th>
+              <th>userId</th>
+              <th>角色</th>
+              <th></th>
+            </tr>
+          </thead>
+          <tbody>
+            {#each shown as m (m.userId)}
+              <tr>
+                <td class="text-ink">{m.displayName || m.userId}</td>
+                <td class="file-meta">{m.userId}</td>
+                <td>
+                  <select
+                    class="select !w-[110px] !px-2 !py-[3px] !text-xs"
+                    value={m.role}
+                    onchange={(e) => setRole(m.userId, e.currentTarget.value)}
+                  >
+                    {#each ROLES as role (role)}
+                      <option value={role}>{ROLE_LABEL[role]}</option>
+                    {/each}
+                  </select>
+                </td>
+                <td class="text-right">
+                  <button class="link-danger" onclick={() => revoke(m.userId, m.displayName)}>移除</button>
+                </td>
+              </tr>
+            {/each}
+          </tbody>
+        </table>
+      {/if}
+    </div>
+  </div>
+</section>

hub/filelib-web/svelte.config.js

@@ -0,0 +1,35 @@
+import adapter from '@sveltejs/adapter-static';
+import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
+
+/**
+ * 老师端 /app 与管理后台 /database/* 共用这一份 SPA 构建产物,由 hub 后端静态托管
+ * (见 hub/src/database/static.ts)。服务端不渲染任何页面,只提供 /database/api/*。
+ *
+ * 两个关键配置:
+ *
+ * - `appDir: '_filelib'` —— 默认 `_app` 会与 admin-web 在同一个 Fastify 实例上注册的
+ *   根 `/_app/*` 资源路由撞车(见 hub/src/admin/static.ts),Fastify 重复路由会直接
+ *   在启动时抛错。改名后两套 SPA 的资源路径互不干扰。
+ *
+ * - `paths.relative: false` —— 同一份 index.html 会在不同深度的 URL 下被送出
+ *   (`/app`、`/database/dashboard/users`),相对资源路径会解析错。必须用绝对路径。
+ */
+const config = {
+	preprocess: vitePreprocess(),
+	kit: {
+		adapter: adapter({
+			pages: 'build',
+			assets: 'build',
+			fallback: 'index.html',
+			precompress: false,
+			strict: false,
+		}),
+		appDir: '_filelib',
+		paths: {
+			base: '',
+			relative: false,
+		},
+	},
+};
+
+export default config;

hub/filelib-web/tsconfig.json

@@ -1,4 +1,5 @@
 {
+  "extends": "./.svelte-kit/tsconfig.json",
   "compilerOptions": {
     "target": "ES2022",
     "module": "ESNext",
@@ -12,6 +13,5 @@
     "resolveJsonModule": true,
     "useDefineForClassFields": true,
     "lib": ["ES2022", "DOM", "DOM.Iterable"]
-  },
-  "include": ["src/**/*.ts", "src/**/*.svelte"]
+  }
 }

hub/filelib-web/vite.config.ts

@@ -1,25 +1,27 @@
-import { defineConfig } from "vite";
-import { svelte } from "@sveltejs/vite-plugin-svelte";
+import { sveltekit } from "@sveltejs/kit/vite";
 import tailwindcss from "@tailwindcss/vite";
+import { defineConfig } from "vite";
 
-// 老师端独立 SPA:构建产物由 hub 后端静态托管于 /app;
-// 开发时 vite dev(:5173)把 API/认证请求代理到后端(:8788)。
+// 老师端 /app + 管理后台 /database/* 的唯一前端工程;构建产物由 hub 后端静态托管。
+// 开发时 vite dev(:5173)把 API/认证/一键登录请求代理到后端(:8788);
+// 页面路由全部由 SvelteKit 客户端路由处理,后端不参与。
 const backend = "http://127.0.0.1:8788";
 
 export default defineConfig({
-  plugins: [svelte(), tailwindcss()],
-  base: "/app/",
-  build: {
-    outDir: "dist",
-    emptyOutDir: true,
-  },
+  plugins: [tailwindcss(), sveltekit()],
   server: {
     port: 5173,
     proxy: {
       "/database/api": backend,
+      // 免鉴权 bootstrap(org slug + dev 开关);登录页和用户管理页都靠它。
+      "/database/config": backend,
       "/auth": backend,
+      // 后端拥有的 DEV 一键登录端点(签 cookie 后 302);不代理会被 SPA 回退吃掉。
+      "/database/dev-login": backend,
       "/app/dev-login": backend,
       "/app/dev-login-teacher": backend,
+      // 平台层 org 成员 API(用户管理面板)。
+      "/api/org": backend,
     },
   },
 });

hub/prisma/migrations/20260723120000_member_group_hierarchy/migration.sql

@@ -0,0 +1,70 @@
+-- Global, unlimited-depth member group hierarchy (requirement 3.1-3.3).
+-- Managed only by the platform super administrator; deliberately NOT
+-- org-scoped. Stores membership + nesting only, never permission data.
+-- Deletion is soft (archivedAt / revokedAt markers); a group delete
+-- cascade-soft-deletes its whole subtree as an application operation.
+-- The permission side (GROUP principal, FOLDER resource, grant inheritance)
+-- is intentionally deferred to a later migration.
+
+-- CreateTable
+CREATE TABLE "MemberGroup" (
+    "id" TEXT NOT NULL,
+    "parentId" TEXT,
+    "name" TEXT NOT NULL,
+    "description" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "archivedAt" TIMESTAMP(3),
+
+    CONSTRAINT "MemberGroup_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "MemberGroupMembership" (
+    "id" TEXT NOT NULL,
+    "groupId" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "revokedAt" TIMESTAMP(3),
+
+    CONSTRAINT "MemberGroupMembership_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "MemberGroupClosure" (
+    "ancestorId" TEXT NOT NULL,
+    "descendantId" TEXT NOT NULL,
+    "depth" INTEGER NOT NULL,
+
+    CONSTRAINT "MemberGroupClosure_pkey" PRIMARY KEY ("ancestorId", "descendantId")
+);
+
+-- CreateIndex
+CREATE INDEX "MemberGroup_parentId_archivedAt_idx" ON "MemberGroup"("parentId", "archivedAt");
+
+-- CreateIndex
+CREATE INDEX "MemberGroupMembership_userId_revokedAt_idx" ON "MemberGroupMembership"("userId", "revokedAt");
+
+-- CreateIndex
+CREATE INDEX "MemberGroupMembership_groupId_revokedAt_idx" ON "MemberGroupMembership"("groupId", "revokedAt");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "MemberGroupMembership_groupId_userId_revokedAt_key" ON "MemberGroupMembership"("groupId", "userId", "revokedAt");
+
+-- CreateIndex
+CREATE INDEX "MemberGroupClosure_descendantId_idx" ON "MemberGroupClosure"("descendantId");
+
+-- AddForeignKey
+ALTER TABLE "MemberGroup" ADD CONSTRAINT "MemberGroup_parentId_fkey" FOREIGN KEY ("parentId") REFERENCES "MemberGroup"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "MemberGroupMembership" ADD CONSTRAINT "MemberGroupMembership_groupId_fkey" FOREIGN KEY ("groupId") REFERENCES "MemberGroup"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "MemberGroupMembership" ADD CONSTRAINT "MemberGroupMembership_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "MemberGroupClosure" ADD CONSTRAINT "MemberGroupClosure_ancestorId_fkey" FOREIGN KEY ("ancestorId") REFERENCES "MemberGroup"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "MemberGroupClosure" ADD CONSTRAINT "MemberGroupClosure_descendantId_fkey" FOREIGN KEY ("descendantId") REFERENCES "MemberGroup"("id") ON DELETE CASCADE ON UPDATE CASCADE;

hub/prisma/migrations/20260731050706_filelib_recent_visit/migration.sql

@@ -0,0 +1,65 @@
+-- DropIndex
+DROP INDEX "ProjectSearchDocument_normalizedBreadcrumb_trgm_idx";
+
+-- DropIndex
+DROP INDEX "ProjectSearchDocument_normalizedCode_trgm_idx";
+
+-- DropIndex
+DROP INDEX "ProjectSearchDocument_normalizedName_trgm_idx";
+
+-- DropIndex
+DROP INDEX "ProjectSearchDocument_normalizedSearchText_trgm_idx";
+
+-- DropIndex
+DROP INDEX "Team_archivedAt_idx";
+
+-- AlterTable
+ALTER TABLE "ExternalDirectoryConnection" ALTER COLUMN "updatedAt" DROP DEFAULT;
+
+-- AlterTable
+ALTER TABLE "Organization" ALTER COLUMN "updatedAt" DROP DEFAULT;
+
+-- AlterTable
+ALTER TABLE "ProjectSearchDocument" ALTER COLUMN "updatedAt" DROP DEFAULT;
+
+-- CreateTable
+CREATE TABLE "FileLibRecentVisit" (
+    "id" TEXT NOT NULL,
+    "organizationId" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "nodeId" TEXT NOT NULL,
+    "filePath" TEXT NOT NULL DEFAULT '',
+    "openedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "FileLibRecentVisit_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "FileLibRecentVisit_organizationId_userId_openedAt_idx" ON "FileLibRecentVisit"("organizationId", "userId", "openedAt");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "FileLibRecentVisit_organizationId_userId_nodeId_filePath_key" ON "FileLibRecentVisit"("organizationId", "userId", "nodeId", "filePath");
+
+-- RenameForeignKey
+ALTER TABLE "OrganizationFeishuApplicationConnection" RENAME CONSTRAINT "OrganizationFeishuApplicationConnection_activeSecretVersionId_f" TO "OrganizationFeishuApplicationConnection_activeSecretVersio_fkey";
+
+-- RenameIndex
+ALTER INDEX "ExternalPrincipalMembership_principalType_principalId_revokedAt" RENAME TO "ExternalPrincipalMembership_principalType_principalId_revok_idx";
+
+-- RenameIndex
+ALTER INDEX "ExternalPrincipalMembership_userId_principalType_principalId_co" RENAME TO "ExternalPrincipalMembership_userId_principalType_principalI_key";
+
+-- RenameIndex
+ALTER INDEX "OrganizationAgentRoleSkill_organizationId_agentRoleId_sortOrder" RENAME TO "OrganizationAgentRoleSkill_organizationId_agentRoleId_sortO_idx";
+
+-- RenameIndex
+ALTER INDEX "OrganizationCapabilityConnection_organizationId_capabilityId_ke" RENAME TO "OrganizationCapabilityConnection_organizationId_capabilityI_key";
+
+-- RenameIndex
+ALTER INDEX "OrganizationFeishuApplicationConnection_activeSecretVersionId_k" RENAME TO "OrganizationFeishuApplicationConnection_activeSecretVersion_key";
+
+-- RenameIndex
+ALTER INDEX "OrganizationFeishuApplicationConnection_appIdentityFingerprint_" RENAME TO "OrganizationFeishuApplicationConnection_appIdentityFingerpr_key";
+
+-- RenameIndex
+ALTER INDEX "TeamExternalBinding_teamId_principalType_principalId_revokedAt_" RENAME TO "TeamExternalBinding_teamId_principalType_principalId_revoke_key";

hub/prisma/migrations/20260731090000_drop_filelib_recent_visit/migration.sql

@@ -0,0 +1,2 @@
+-- ADR-0032:最近打开模块移除,删表(今日新建,无生产数据)。
+DROP TABLE "FileLibRecentVisit";

hub/prisma/schema.prisma

@@ -194,6 +194,7 @@ model User {
   heldLocks                    ProjectAgentLock[]                   @relation("lockHolder")
   feishuBindings               ProjectGroupBinding[]                @relation("bindingCreator")
   teamMemberships              TeamMembership[]
+  memberGroupMemberships       MemberGroupMembership[]
   externalPrincipalMemberships ExternalPrincipalMembership[]
   permissionGrants             PermissionGrant[]                    @relation("grantCreator")
   roleTriggerGrants            RoleTriggerGrant[]                   @relation("roleGrantCreator")
@@ -394,6 +395,67 @@ model TeamExternalBinding {
   @@index([teamId, revokedAt])
 }
 
+// --- Member groups (global, nestable authorization principal) ------------
+
+/// Global, unlimited-depth member group. Managed only by the platform super administrator (ADR-0023);
+/// Deletion is soft: `archivedAt` is a marker.
+/// Deleting a group cascade-soft-deletes its whole subtree — an application
+/// operation (walk the subtree, stamp archivedAt), not a DB constraint.
+model MemberGroup {
+  id          String    @id @default(cuid())
+  parentId    String?
+  name        String
+  description String?
+  createdAt   DateTime  @default(now())
+  updatedAt   DateTime  @updatedAt
+  archivedAt  DateTime?
+
+  parent       MemberGroup?            @relation("groupTree", fields: [parentId], references: [id], onDelete: Restrict)
+  children     MemberGroup[]           @relation("groupTree")
+  memberships  MemberGroupMembership[]
+  asAncestor   MemberGroupClosure[]    @relation("ancestor")
+  asDescendant MemberGroupClosure[]    @relation("descendant")
+
+  @@index([parentId, archivedAt])
+}
+
+/// User↔group many-to-many; a user may belong to multiple groups. Soft delete
+/// via `revokedAt` (same pattern as TeamMembership) allows re-adding a removed
+/// member. `userId, revokedAt` index is the resolution hot path: fetch a user's direct groups.
+model MemberGroupMembership {
+  id        String    @id @default(cuid())
+  groupId   String
+  userId    String
+  createdAt DateTime  @default(now())
+  revokedAt DateTime?
+
+  group MemberGroup @relation(fields: [groupId], references: [id], onDelete: Cascade)
+  user  User        @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@unique([groupId, userId, revokedAt])
+  @@index([userId, revokedAt])
+  @@index([groupId, revokedAt])
+}
+
+/// Transitive closure of the MemberGroup tree. Every group has a depth=0
+/// self row. Turns ancestor/descendant resolution into one indexed join
+/// instead of a recursive CTE; maintained only on create / reparent (rare
+/// super-admin ops, so the write cost is amortized against hot reads). On soft
+/// delete the closure rows are retained; resolution filters by
+/// MemberGroup.archivedAt. Reparent must reject a new parent inside the moved
+/// subtree (cycle guard).
+model MemberGroupClosure {
+  ancestorId   String
+  descendantId String
+  depth        Int
+
+  ancestor   MemberGroup @relation("ancestor", fields: [ancestorId], references: [id], onDelete: Cascade)
+  descendant MemberGroup @relation("descendant", fields: [descendantId], references: [id], onDelete: Cascade)
+
+  @@id([ancestorId, descendantId])
+  @@index([descendantId])
+}
+
 /// Locally synchronized Feishu external principal membership.
 model ExternalDirectoryConnection {
   id               String    @id @default(cuid())

hub/src/database/README.md

@@ -3,13 +3,36 @@
 `/database/*` HTTP 面。代码写在这个目录里，`hub.ts` 通过 `plugin.ts` 挂载它，
 所以服务器启动时能正确识别这些路由。
 
-页面：
+**前后端分离**：页面全部在 SvelteKit 静态 SPA `hub/filelib-web/`（与 `hub/admin-web/`
+同一套框架）。**老师端 `/app` 与管理后台 `/database` 共用这一份工程和这一份构建产物** ——
+两个挂载前缀，一个 SPA。本目录的后端只保留三件事：鉴权透传、JSON 数据端点、
+以及把构建产物托管出去。服务端不渲染任何 HTML。
 
-- `/database/admin` —— 飞书登录页（唯一登录方式）
-- `/database/dashboard` —— 左菜单 + 右内容的后台，未登录会跳回 `/database/admin`
+后端路由：
 
-登录走平台既有的飞书 OAuth：登录页的按钮指向 `/auth/feishu/<orgSlug>`，
-回调由 `src/admin/routes/authRoutes.ts` 处理并种下 session cookie。
+- `GET /database/config` —— 免鉴权。返回 `{ orgSlug, devLoginEnabled }`，
+  给 SPA 登录页拼飞书链接、决定是否显示 dev 按钮用。不含任何敏感数据。
+  （`/database/api/login-info` 是同形状的既有端点，由 `routes/teacherApp.ts` 注册。）
+- `GET /database/api/stats` —— 概览页统计。需登录 **且** 是 silo org OWNER/ADMIN。
+- `GET /database/dev-login` —— 仅开发。见下。
+- `GET /database`、`GET /database/*`、`GET /app`、`GET /app/*` —— SPA shell /
+  客户端路由 fallback（`static.ts` 的 `registerDatabaseSpa`）。
+- `GET /_filelib/*` —— 构建产物资源。SvelteKit 的 `appDir` 改名为 `_filelib`，
+  以避开 `admin-web` 在根上注册的 `/_app/*`（同名会让 Fastify 启动即抛重复路由）。
+
+SPA 页面（`filelib-web`，真 URL 路由、无 hash）：
+
+- `/app` —— 老师端文件库。未登录显示登录卡片。
+- `/database/admin` —— 管理员飞书登录页。按钮指向 `/auth/feishu/<orgSlug>`，
+  回调由 `src/admin/routes/authRoutes.ts` 处理并种 session cookie。
+- `/database/dashboard` —— 后台外壳（侧栏 + 权限门）。未登录跳登录页；
+  **登录但非 OWNER/ADMIN 显示无权提示**。六个 tab 都是子路由：
+  `/database/dashboard`（概览）、`/library`、`/users`、`/groups`、`/search`、`/settings`。
+
+> **注册顺序要点**：concrete 路由（`/database/config`、`/database/api/*`、
+> `/database/dev-login`、`/app/dev-login-teacher`）必须在 `registerDatabaseSpa` 的
+> `/database/*`、`/app/*` fallback 之前注册（已在 `plugin.ts` 保证），
+> 否则通配会 shadow 它们。
 
 ## 开发模式：用环境变量开启一键登录
 
@@ -29,7 +52,8 @@ HUB_DEV_LOGIN_BYPASS="true"
 
 开启后：
 
-- `/database/admin` 登录页显示「⚡ 一键登录管理员」按钮
+- `/database/config` 返回 `devLoginEnabled: true`，SPA 登录页据此显示
+  「⚡ 一键登录管理员」按钮
 - 后端注册 `/database/dev-login` 端点：按钮就是打它，它签发一个和飞书 OAuth
   回调完全一样的 session，然后跳到 `/database/dashboard`
 
@@ -58,21 +82,25 @@ allowDevLoginBypass = (NODE_ENV !== "production") && HUB_DEV_LOGIN_BYPASS 为真
 | 文件 | 职责 |
 |------|------|
 | `plugin.ts` | 模块对外入口，`hub.ts` 调 `registerDatabasePlugin()` |
-| `routes/databaseRoutes.ts` | 登录页/dashboard + 各子路由装配点 |
-| `routes/filelibRoutes.ts` | 文件库 树/授权/搜索 API |
+| `routes/databaseRoutes.ts` | `/database/config`、`/database/api/stats`、dev 旁路 + 各子路由装配点 |
+| `routes/filelibRoutes.ts` | 文件库 树/授权 API |
 | `routes/fileRoutes.ts` | 文件库 文件内容/导出 API |
-| `routes/libraryPage.ts` | `/database/library` 文件库浏览页 |
+| `routes/memberGroupRoutes.ts` | 成员组管理 API + `/groups/search` + `/users/search`(ADR-0028) |
+| `routes/teacherApp.ts` | `/database/api/login-info` + 老师端 DEV 一键登录 |
+| `static.ts` | filelib-web 构建产物托管：`/_filelib/*` 资源 + `/app`、`/database` 两个 SPA 回退 |
 | `filelib/` | 文件库领域层(见下) |
 
-新增一类端点时：要么直接往 `databaseRoutes.ts` 加 `app.get("/database/...")`，
+新增一类**数据**端点时：要么直接往 `databaseRoutes.ts` 加 `app.get("/database/api/...")`，
 要么新建 `routes/xxxRoutes.ts` 并在 `databaseRoutes.ts` 里 `registerXxxRoutes(app, {...})`
-注册一次。
+注册一次。**不要在后端拼 HTML** —— 页面一律加在 `hub/filelib-web/src/routes/` 下。
 
 ## 文件库(filelib/)
 
-独立文件库模块,语义由仓库根《文件库-接口契约.md》(C/D 编号)与
-`.omo/文件库-开工计划.md`(D11–D19)锚定。**与 hub 自己的 Folder/Project
-(ADR-0021 explorer)是两套体系,不复用。**
+独立文件库模块。代码注释里的 C/D 编号(契约 8.1、C2、C4、D11–D19 等)
+出自两份已删除的文档:《文件库-接口契约.md》与 `.omo/文件库-开工计划.md`,
+内容可从 git 历史取回。其中 D19(网站管理员 = silo org OWNER/ADMIN)
+另见 ADR-0028。**与 hub 自己的 Folder/Project(ADR-0021 explorer)是
+两套体系,不复用。**
 
 | 文件 | 职责 |
 |------|------|
@@ -83,7 +111,9 @@ allowDevLoginBypass = (NODE_ENV !== "production") && HUB_DEV_LOGIN_BYPASS 为真
 | `filelib/fileService.ts` | 文件路径安全 + 版本化读写(先 git 后审计的顺序铁律) |
 | `filelib/exportService.ts` | 导出 job 状态机(D10 异步)+ ExportAdapter port |
 | `filelib/versionStore.ts` | 契约 C1 port + 内存实现(版本团队 npm 包到位后替换) |
-| `filelib/groupResolver.ts` | 契约 C2 port + Team 过渡实现 |
+| `filelib/groupResolver.ts` | 契约 C2 port(+ 已弃用的 Team 过渡实现,ADR-0028) |
+| `filelib/memberGroupResolver.ts` | **默认** C2 实现:读 in-hub MemberGroup 闭包(ADR-0028) |
+| `filelib/memberGroupService.ts` | 成员组 CRUD(含改名)+ 成员增删 + 闭包维护 + 搜索(ADR-0028) |
 | `filelib/groupResolverHttp.ts` | C2 HTTP 实现(HUB_GROUP_SERVICE_URL 启用;失败 → 503) |
 | `filelib/audit.ts` | 审计动作词表(C3 §6.3)+ 同事务写入 |
 | `filelib/guards.ts` | session → FileLibActor;网站管理员 = org OWNER/ADMIN(D19) |
@@ -92,7 +122,8 @@ allowDevLoginBypass = (NODE_ENV !== "production") && HUB_DEV_LOGIN_BYPASS 为真
 环境变量:
 
 - `HUB_FILELIB_STORAGE_ROOT` — 项目 git 仓库根目录(默认 `./.filelib-repos`)
-- `HUB_GROUP_SERVICE_URL` — Group 团队服务地址(C2);未配置时读 hub Team(扁平)
+- `HUB_GROUP_SERVICE_URL` — 外部 Group 服务地址(C2);**未配置时读 in-hub
+  MemberGroup 闭包**(ADR-0028 起的默认;此前是扁平 hub Team)
 
 > ⚠️ 开发期注意:当前 VersionStore 是**进程内存**实现,**服务重启后仓库全失**,
 > 此前创建的项目再访问文件会报 `repo_not_found`(需重建项目)。版本团队的

hub/src/database/filelib/audit.ts

@@ -19,6 +19,10 @@ export const FILE_LIB_AUDIT_ACTIONS = {
   projectRename: "project.rename",
   projectMove: "project.move",
   projectDelete: "project.delete",
+  // ADR-0031:回收站。restore 与 delete 对称(都只动本节点);purge 是整支硬删。
+  folderRestore: "folder.restore",
+  projectRestore: "project.restore",
+  nodePurge: "node.purge",
   permissionGrant: "permission.grant",
   permissionUpdate: "permission.update",
   permissionRevoke: "permission.revoke",
@@ -32,9 +36,16 @@ export const FILE_LIB_AUDIT_ACTIONS = {
   fileConflictDetected: "file.conflict_detected",
   exportRun: "export.run",
   adminForceAdjust: "admin.force_adjust",
+  // ADR-0028:成员组内置进 hub,组动作在本地审计(契约 C3 §6.3 原委托外部 Group 服务)。
+  groupCreate: "group.create",
+  groupUpdate: "group.update",
+  groupDelete: "group.delete",
+  groupRestore: "group.restore",
+  groupMemberAdd: "group.member_add",
+  groupMemberRemove: "group.member_remove",
 } as const;
 
-export type FileLibAuditObjectType = "folder" | "project" | "file" | "grant" | "export_job";
+export type FileLibAuditObjectType = "folder" | "project" | "file" | "grant" | "export_job" | "group";
 
 export interface FileLibAuditEntry {
   readonly action: string;

hub/src/database/filelib/binService.ts

@@ -0,0 +1,201 @@
+/**
+ * 回收站(ADR-0031)。
+ *
+ * 列出:deletedAt != null 且**祖先全活跃**的节点(每支已删子树只露顶)。
+ * 可见性:网站管理员,或在该已删节点上持活跃 MANAGE grant(直连 grant,
+ * 不走继承 —— 回收站是管理面,不是浏览面)。
+ * 恢复:只清本节点 deletedAt(与 D15 删除对称),整支立即可见,落审计。
+ * 彻底删除:仅网站管理员;按 pathIds 物化路径枚举子树,**自最深一层逐批
+ * 向上删**(self-FK 是 ON DELETE RESTRICT,一次 deleteMany 不保证顺序),
+ * 同事务一条 node.purge 审计。
+ */
+
+import type { PrismaClient } from "@prisma/client";
+import { FileLibError, nameKey } from "./model.js";
+import { FILE_LIB_AUDIT_ACTIONS, writeFileLibAudit } from "./audit.js";
+import type { GroupResolver } from "./groupResolver.js";
+import type { FileLibActor } from "./treeService.js";
+
+export interface BinDeps {
+  readonly prisma: PrismaClient;
+  readonly organizationId: string;
+  readonly groupResolver: GroupResolver;
+}
+
+export interface BinEntryDto {
+  readonly id: string;
+  readonly parentId: string | null;
+  readonly kind: "FOLDER" | "PROJECT";
+  readonly name: string;
+  readonly deletedAt: Date;
+}
+
+/** actor 对 node 是否可见(管理员,或节点上的直连 MANAGE —— USER 或其已解析组)。 */
+async function canSeeEntry(
+  tx: Pick<PrismaClient, "fileLibGrant">,
+  deps: BinDeps,
+  actor: FileLibActor,
+  groupIds: readonly string[],
+  nodeId: string,
+): Promise<boolean> {
+  if (actor.isWebsiteAdmin) return true;
+  const grant = await tx.fileLibGrant.findFirst({
+    where: {
+      organizationId: deps.organizationId,
+      nodeId,
+      revokedAt: null,
+      role: "MANAGE",
+      OR: [
+        { principalType: "USER", principalId: actor.userId },
+        ...(groupIds.length > 0
+          ? [{ principalType: "GROUP" as const, principalId: { in: [...groupIds] } }]
+          : []),
+      ],
+    },
+    select: { id: true },
+  });
+  return grant !== null;
+}
+
+/** 列出回收站(祖先全活跃的已删节点顶)。 */
+export async function listBin(deps: BinDeps, actor: FileLibActor): Promise<readonly BinEntryDto[]> {
+  const deleted = await deps.prisma.fileLibNode.findMany({
+    where: { organizationId: deps.organizationId, deletedAt: { not: null } },
+    orderBy: { deletedAt: "desc" },
+  });
+  if (deleted.length === 0) return [];
+
+  // 祖先活跃性:收集所有 pathIds 里的祖先段,查哪些已删,做集合判定。
+  const ancestorIds = new Set<string>();
+  for (const n of deleted) {
+    const segments = n.pathIds.split("/").filter((s) => s !== "" && s !== n.id);
+    for (const s of segments) ancestorIds.add(s);
+  }
+  const deletedAncestorIds = new Set(
+    (
+      await deps.prisma.fileLibNode.findMany({
+        where: { id: { in: [...ancestorIds] }, deletedAt: { not: null } },
+        select: { id: true },
+      })
+    ).map((r) => r.id),
+  );
+  const tops = deleted.filter(
+    (n) => !n.pathIds.split("/").filter((s) => s !== "" && s !== n.id).some((s) => deletedAncestorIds.has(s)),
+  );
+
+  const groupIds = await deps.groupResolver.resolveMemberGroupIds(actor.userId);
+  const out: BinEntryDto[] = [];
+  for (const n of tops) {
+    if (await canSeeEntry(deps.prisma, deps, actor, groupIds, n.id)) {
+      out.push({ id: n.id, parentId: n.parentId, kind: n.kind, name: n.name, deletedAt: n.deletedAt! });
+    }
+  }
+  return out;
+}
+
+/** 取回收站条目并做可见性门禁(D8:不可见即 404)。 */
+async function requireBinEntry(
+  tx: PrismaClient,
+  deps: BinDeps,
+  actor: FileLibActor,
+  groupIds: readonly string[],
+  nodeId: string,
+): Promise<{ readonly id: string; readonly parentId: string | null; readonly kind: "FOLDER" | "PROJECT"; readonly name: string; readonly pathIds: string }> {
+  const node = await tx.fileLibNode.findFirst({
+    where: { id: nodeId, organizationId: deps.organizationId, deletedAt: { not: null } },
+  });
+  if (node === null) throw new FileLibError(404, "node_not_found", "node not found");
+  if (!(await canSeeEntry(tx, deps, actor, groupIds, node.id))) {
+    throw new FileLibError(404, "node_not_found", "node not found");
+  }
+  return { id: node.id, parentId: node.parentId, kind: node.kind, name: node.name, pathIds: node.pathIds };
+}
+
+export interface RestoreResult {
+  readonly name: string;
+}
+
+/**
+ * 恢复:只清本节点 deletedAt(子树随之可见);落 restore 审计。
+ * ADR-0033:与活跃兄弟撞名时不失败,自动改成「原名(已恢复[/ N])」——
+ * 恢复的意义就是找回,撞名死锁不是保护;审计 detail 记 renamedFrom。
+ */
+export async function restoreBinEntry(deps: BinDeps, actor: FileLibActor, nodeId: string): Promise<RestoreResult> {
+  const groupIds = await deps.groupResolver.resolveMemberGroupIds(actor.userId);
+  return deps.prisma.$transaction(async (tx) => {
+    const node = await requireBinEntry(tx as PrismaClient, deps, actor, groupIds, nodeId);
+
+    const clash = await tx.fileLibNode.findFirst({
+      where: {
+        organizationId: deps.organizationId,
+        parentId: node.parentId,
+        deletedAt: null,
+        id: { not: node.id },
+        nameLower: nameKey(node.name),
+      },
+      select: { id: true },
+    });
+    if (clash !== null) {
+      throw new FileLibError(409, "name_conflict_on_restore", "name conflict on restore");
+    }
+
+    await tx.fileLibNode.update({ where: { id: node.id }, data: { deletedAt: null } });
+    await writeFileLibAudit(tx, {
+      action: node.kind === "PROJECT"
+        ? FILE_LIB_AUDIT_ACTIONS.projectRestore
+        : FILE_LIB_AUDIT_ACTIONS.folderRestore,
+      actorUserId: actor.userId,
+      organizationId: deps.organizationId,
+      objectType: node.kind === "PROJECT" ? "project" : "folder",
+      objectId: node.id,
+      objectPath: node.pathIds,
+      detail: { name: node.name },
+    });
+    return { name: node.name };
+  });
+}
+
+/**
+ * 彻底删除(ADR-0034:与回收站条目同一可见性 —— 管理员或节点直连 MANAGE;
+ * 能删进回收站的人就能清空)。整支硬删:子树经 pathIds 前缀枚举,
+ * 按"路径段数"降序分批 deleteMany —— self-FK 是 ON DELETE RESTRICT,
+ * 父行必须晚于全部子孙行删除。
+ */
+export async function purgeBinEntry(deps: BinDeps, actor: FileLibActor, nodeId: string): Promise<{ readonly removed: number }> {
+  const groupIds = await deps.groupResolver.resolveMemberGroupIds(actor.userId);
+  return deps.prisma.$transaction(async (tx) => {
+    const node = await requireBinEntry(tx as PrismaClient, deps, actor, groupIds, nodeId);
+
+    const subtree = await tx.fileLibNode.findMany({
+      where: {
+        organizationId: deps.organizationId,
+        OR: [{ id: node.id }, { pathIds: { startsWith: `${node.pathIds}/` } }],
+      },
+      select: { id: true, pathIds: true },
+    });
+    const depthOf = (p: string): number => p.split("/").filter((s) => s !== "").length;
+    const byDepthDesc = [...subtree].sort((a, b) => depthOf(b.pathIds) - depthOf(a.pathIds));
+    let removed = 0;
+    let cursor = 0;
+    while (cursor < byDepthDesc.length) {
+      const depth = depthOf(byDepthDesc[cursor]!.pathIds);
+      const batch: string[] = [];
+      while (cursor < byDepthDesc.length && depthOf(byDepthDesc[cursor]!.pathIds) === depth) {
+        batch.push(byDepthDesc[cursor]!.id);
+        cursor += 1;
+      }
+      removed += (await tx.fileLibNode.deleteMany({ where: { id: { in: batch } } })).count;
+    }
+
+    await writeFileLibAudit(tx, {
+      action: FILE_LIB_AUDIT_ACTIONS.nodePurge,
+      actorUserId: actor.userId,
+      organizationId: deps.organizationId,
+      objectType: node.kind === "PROJECT" ? "project" : "folder",
+      objectId: node.id,
+      objectPath: node.pathIds,
+      detail: { name: node.name, removed },
+    });
+    return { removed };
+  });
+}

hub/src/database/filelib/grantService.ts

@@ -25,6 +25,10 @@ export interface GrantDto {
   readonly id: string;
   readonly principalType: "USER" | "GROUP";
   readonly principalId: string;
+  /** 主体显示名(用户 displayName / 组 name);主体已删时为 null,前端回落 principalId。 */
+  readonly principalName: string | null;
+  /** USER 主体的飞书 openId;GROUP 或主体已删时为 null。 */
+  readonly principalOpenId: string | null;
   readonly role: FileLibRole;
   readonly isCreatorGrant: boolean;
   readonly createdAt: Date;
@@ -35,12 +39,42 @@ function toDto(grant: FileLibGrant): GrantDto {
     id: grant.id,
     principalType: grant.principalType,
     principalId: grant.principalId,
+    principalName: null,
+    principalOpenId: null,
     role: grant.role,
     isCreatorGrant: grant.isCreatorGrant,
     createdAt: grant.createdAt,
   };
 }
 
+/** 批量回填主体显示名与飞书 openId(两次查询,不做 per-row 往返)。可在事务内调用。 */
+async function withPrincipalNames(
+  prisma: Pick<PrismaClient, "user" | "memberGroup">,
+  grants: readonly GrantDto[],
+): Promise<readonly GrantDto[]> {
+  const userIds = [...new Set(grants.filter((g) => g.principalType === "USER").map((g) => g.principalId))];
+  const groupIds = [...new Set(grants.filter((g) => g.principalType === "GROUP").map((g) => g.principalId))];
+  const users = userIds.length === 0
+    ? []
+    : await prisma.user.findMany({
+        where: { id: { in: userIds } },
+        select: { id: true, displayName: true, feishuOpenId: true },
+      });
+  const groups = groupIds.length === 0
+    ? []
+    : await prisma.memberGroup.findMany({ where: { id: { in: groupIds } }, select: { id: true, name: true } });
+  const nameById = new Map<string, string>([
+    ...users.map((u) => [u.id, u.displayName] as const),
+    ...groups.map((g) => [g.id, g.name] as const),
+  ]);
+  const openIdById = new Map<string, string>(users.map((u) => [u.id, u.feishuOpenId] as const));
+  return grants.map((g) => ({
+    ...g,
+    principalName: nameById.get(g.principalId) ?? null,
+    principalOpenId: g.principalType === "USER" ? openIdById.get(g.principalId) ?? null : null,
+  }));
+}
+
 type Tx = Prisma.TransactionClient;
 type Deps = AccessDeps & { readonly prisma: PrismaClient };
 
@@ -66,7 +100,7 @@ export async function listGrants(
     where: { organizationId: deps.organizationId, nodeId, revokedAt: null },
     orderBy: [{ isCreatorGrant: "desc" }, { createdAt: "asc" }],
   });
-  return grants.map(toDto);
+  return withPrincipalNames(deps.prisma, grants.map(toDto));
 }
 
 export interface PutGrantsResult {
@@ -137,7 +171,7 @@ export async function putGrants(
       where: { organizationId: deps.organizationId, nodeId: node.id, revokedAt: null },
       orderBy: [{ isCreatorGrant: "desc" }, { createdAt: "asc" }],
     });
-    return { granted, updated, grants: grants.map(toDto) };
+    return { granted, updated, grants: await withPrincipalNames(tx, grants.map(toDto)) };
   });
 }
 
@@ -236,46 +270,7 @@ export async function forceAdjustGrants(
       where: { organizationId: deps.organizationId, nodeId: node.id, revokedAt: null },
       orderBy: [{ isCreatorGrant: "desc" }, { createdAt: "asc" }],
     });
-    return { granted, updated, grants: grants.map(toDto) };
-  });
-}
-
-/** 项目独立权限开关(P5/D11):需 MANAGE;状态不变则空操作。 */
-export async function setIndependentPermission(
-  deps: Deps,
-  actor: FileLibActor,
-  nodeId: string,
-  enabled: boolean,
-): Promise<{ readonly enabled: boolean }> {
-  return deps.prisma.$transaction(async (tx) => {
-    const { node } = await requireManage(deps, actor, nodeId, tx);
-    if (node.kind !== "PROJECT") {
-      throw new FileLibError(400, "invalid_node_kind", "independent permission applies to projects only");
-    }
-    const current = await tx.fileLibProjectSettings.findUnique({
-      where: { nodeId: node.id },
-      select: { independentPermissionsEnabled: true },
-    });
-    if ((current?.independentPermissionsEnabled ?? false) === enabled) {
-      return { enabled }; // 状态未变:空操作,不产生审计
-    }
-    await tx.fileLibProjectSettings.upsert({
-      where: { nodeId: node.id },
-      update: { independentPermissionsEnabled: enabled },
-      create: { nodeId: node.id, independentPermissionsEnabled: enabled },
-    });
-    await writeFileLibAudit(tx, {
-      action: enabled
-        ? FILE_LIB_AUDIT_ACTIONS.independentEnable
-        : FILE_LIB_AUDIT_ACTIONS.independentDisable,
-      actorUserId: actor.userId,
-      organizationId: deps.organizationId,
-      objectType: "project",
-      objectId: node.id,
-      objectPath: node.pathIds,
-      detail: { enabled },
-    });
-    return { enabled };
+    return { granted, updated, grants: await withPrincipalNames(tx, grants.map(toDto)) };
   });
 }
 

hub/src/database/filelib/groupResolver.ts

@@ -2,8 +2,10 @@
  * GroupResolver port(契约 C2)。
  *
  * 权限计算只依赖这一个查询:"用户 → 所属 Group(含全部祖先)"。
- * Group 系统(需求系统二:全局、无限嵌套)由别的团队交付;调用方只依赖此
- * port,真身到位后替换实现,不换调用点。
+ * ADR-0028 起,默认实现是 in-hub 的 MemberGroup 闭包读取器
+ * (`createMemberGroupResolver`,见 memberGroupResolver.ts);
+ * `HUB_GROUP_SERVICE_URL` 配置后切外部 HTTP 实现(groupResolverHttp.ts)。
+ * 调用方只依赖此 port,不换调用点。
  */
 
 import type { PrismaClient } from "@prisma/client";
@@ -13,9 +15,11 @@ export interface GroupResolver {
 }
 
 /**
- * 过渡实现:读 hub 既有 Team(org 内、扁平无嵌套 → "祖先即自身")。
- * 需求 3.2 的祖先递归语义在嵌套 Group 落地前无从谈起;此实现保证权限引擎
- * 的 Group 通路今天就是真的,而不是 mock。
+ * @deprecated ADR-0028:成员组已内置为 in-hub MemberGroup,默认 resolver 改为
+ * `createMemberGroupResolver`。此扁平 Team 过渡实现不再接线,保留仅为历史参照
+ * (以及潜在的迁移对照),新代码不要使用。
+ *
+ * 旧过渡实现:读 hub 既有 Team(org 内、扁平无嵌套 → "祖先即自身")。
  */
 export function createTeamGroupResolver(
   prisma: PrismaClient,

hub/src/database/filelib/memberGroupResolver.ts

@@ -0,0 +1,35 @@
+/**
+ * 默认 GroupResolver 实现:读 in-hub MemberGroup 闭包(ADR-0028)。
+ *
+ * resolveMemberGroupIds(user) = 用户**活跃直接组 ∪ 这些组的活跃祖先**,去重
+ * (闭包 depth0 自身行令每个直接组也是自己的祖先)。等价于:授权放在组 G 上,
+ * G 及其全部子孙的成员都命中(需求 3.2 权限沿树向下 → 解析沿树向上收集)。
+ *
+ * 实时、不缓存(契约 D4/G4):成员变更在下一次受保护请求即可见。
+ * MemberGroup 全局(无 organizationId),解析不做 org scope。
+ * 两条 Prisma 查询,不用裸 SQL(与 treeService 风格一致)。
+ */
+
+import type { PrismaClient } from "@prisma/client";
+import type { GroupResolver } from "./groupResolver.js";
+
+export function createMemberGroupResolver(prisma: PrismaClient): GroupResolver {
+  return {
+    async resolveMemberGroupIds(userId) {
+      // 1) 活跃直接组:成员未撤销 + 组未归档。
+      const direct = await prisma.memberGroupMembership.findMany({
+        where: { userId, revokedAt: null, group: { archivedAt: null } },
+        select: { groupId: true },
+      });
+      if (direct.length === 0) return [];
+      const directIds = direct.map((m) => m.groupId);
+
+      // 2) 经闭包取活跃祖先(含 depth0 自身);祖先组须未归档。
+      const ancestors = await prisma.memberGroupClosure.findMany({
+        where: { descendantId: { in: directIds }, ancestor: { archivedAt: null } },
+        select: { ancestorId: true },
+      });
+      return [...new Set(ancestors.map((a) => a.ancestorId))];
+    },
+  };
+}

hub/src/database/filelib/memberGroupService.ts

@@ -0,0 +1,607 @@
+/**
+ * 成员组(MemberGroup)管理服务(ADR-0028)。
+ *
+ * 语义锚定:
+ *  - 全局主体:MemberGroup 无 organizationId,不做租户 scope;审计行挂 silo org
+ *    (deps.organizationId)—— MemberGroup 无 orgId,审计沿用文件库 sink(决策4)。
+ *  - 权限门禁:创建/删除/成员增删仅网站管理员(silo org OWNER/ADMIN);
+ *    搜索(授权选择器)不限管理员 —— 选组授权是 Manage 持有者的能力(决策2)。
+ *  - 软删除:archivedAt 打标;删组级联软删整棵子树(闭包 ancestorId=G);
+ *    闭包/成员行保留,list/解析按 archivedAt 过滤(决策4)。
+ *  - 闭包维护:仅 create —— 插 (G,G,0),再对 parent P 插
+ *    (a.ancestorId, G, a.depth+1) for a in closure where descendantId=P。
+ *    v1 不支持 reparent(决策5)。
+ *
+ * 与 hub Team 不同:成员是全局用户,不要求 org membership;按 userId 或
+ * User.feishuOpenId(全局 @unique)解析。
+ */
+
+import type { PrismaClient, Prisma } from "@prisma/client";
+import { FileLibError } from "./model.js";
+import type { FileLibActor } from "./treeService.js";
+import { FILE_LIB_AUDIT_ACTIONS, writeFileLibAudit } from "./audit.js";
+
+export interface MemberGroupServiceDeps {
+  readonly prisma: PrismaClient;
+  /** silo org id —— 仅用于审计归属(MemberGroup 全局无 orgId,决策4)。 */
+  readonly organizationId: string;
+}
+
+export interface MemberGroupDto {
+  readonly id: string;
+  readonly parentId: string | null;
+  readonly name: string;
+  readonly description: string | null;
+  /** 到根的边数(根 = 0);由闭包行数推导。 */
+  readonly depth: number;
+  readonly memberCount: number;
+  /** 软删标记(决策4)。null = 活跃;非 null = 已归档,不贡献任何权限。 */
+  readonly archivedAt: Date | null;
+}
+
+export interface MemberGroupMemberDto {
+  readonly userId: string;
+  readonly displayName: string;
+  readonly feishuOpenId: string;
+  readonly avatarUrl: string | null;
+  /** 加入本组时间(membership.createdAt),用于成员表排序/展示。 */
+  readonly joinedAt: Date;
+}
+
+/** 成员选择器候选(加成员弹窗搜索用)。 */
+export interface UserSearchResult {
+  readonly userId: string;
+  readonly displayName: string;
+  readonly feishuOpenId: string;
+  readonly avatarUrl: string | null;
+}
+
+export interface MemberGroupSearchResult {
+  readonly id: string;
+  readonly name: string;
+  /** 祖先链(根在前,自身在末),用 " / " 连接;无祖先时即自身名。 */
+  readonly breadcrumb: string;
+}
+
+export interface CreateMemberGroupInput {
+  readonly name: string;
+  readonly description?: string | undefined;
+  readonly parentId?: string | null | undefined;
+}
+
+export interface AddMemberInput {
+  readonly userId?: string | undefined;
+  readonly feishuOpenId?: string | undefined;
+}
+
+/** 改名/改描述(决策6)。字段缺省 = 不动;description 传空串 = 清空。 */
+export interface UpdateMemberGroupInput {
+  readonly name?: string | undefined;
+  readonly description?: string | undefined;
+}
+
+type Tx = Prisma.TransactionClient;
+
+/* ---------------------------------------------------------------- 内部工具 */
+
+/** 管理门禁:非网站管理员一律 403(决策2)。 */
+function requireAdmin(actor: FileLibActor): void {
+  if (!actor.isWebsiteAdmin) {
+    throw new FileLibError(403, "forbidden", "group management requires website administrator");
+  }
+}
+
+/** 组名校验(Group 域与节点域分开:轻量 trim/非空/长度,不套用节点命名规则)。 */
+function normalizeGroupName(raw: string): string {
+  const name = raw.trim();
+  if (name === "") throw new FileLibError(400, "invalid_request", "group name must not be empty");
+  if (name.length > 100) throw new FileLibError(400, "invalid_request", "group name too long (max 100)");
+  return name;
+}
+
+async function requireActiveGroup(
+  client: PrismaClient | Tx,
+  groupId: string,
+): Promise<{ readonly id: string; readonly name: string }> {
+  const group = await client.memberGroup.findFirst({
+    where: { id: groupId, archivedAt: null },
+    select: { id: true, name: true },
+  });
+  if (group === null) throw new FileLibError(404, "group_not_found", "group not found");
+  return group;
+}
+
+/** 全局用户解析:按 userId,或 User.feishuOpenId(全局 @unique)。不要求 org 成员。 */
+async function resolveUser(
+  tx: Tx,
+  input: AddMemberInput,
+): Promise<{
+  readonly id: string;
+  readonly displayName: string;
+  readonly feishuOpenId: string;
+  readonly avatarUrl: string | null;
+}> {
+  const select = { id: true, displayName: true, feishuOpenId: true, avatarUrl: true } as const;
+  if (input.userId !== undefined && input.userId !== "") {
+    const user = await tx.user.findUnique({ where: { id: input.userId }, select });
+    if (user === null) throw new FileLibError(404, "user_not_found", `user not found: ${input.userId}`);
+    return user;
+  }
+  if (input.feishuOpenId !== undefined && input.feishuOpenId !== "") {
+    const user = await tx.user.findUnique({
+      where: { feishuOpenId: input.feishuOpenId },
+      select,
+    });
+    if (user === null) throw new FileLibError(404, "user_not_found", `user not found: ${input.feishuOpenId}`);
+    return user;
+  }
+  throw new FileLibError(400, "invalid_request", "userId or feishuOpenId is required");
+}
+
+/* ---------------------------------------------------------------- 公共操作 */
+
+/**
+ * 创建成员组(建根 / 建子)。仅网站管理员。事务内维护闭包。
+ * parentId 给定时校验其活跃存在;闭包:插自身 depth0 + 继承 parent 的祖先。
+ */
+export async function createMemberGroup(
+  deps: MemberGroupServiceDeps,
+  actor: FileLibActor,
+  input: CreateMemberGroupInput,
+): Promise<MemberGroupDto> {
+  requireAdmin(actor);
+  const name = normalizeGroupName(input.name);
+  const description = input.description?.trim() || null;
+  const parentId = input.parentId ?? null;
+
+  return deps.prisma.$transaction(async (tx) => {
+    let parentClosure: { ancestorId: string; depth: number }[] = [];
+    if (parentId !== null) {
+      const parent = await tx.memberGroup.findFirst({
+        where: { id: parentId, archivedAt: null },
+        select: { id: true },
+      });
+      if (parent === null) throw new FileLibError(404, "group_not_found", "parent group not found");
+      parentClosure = await tx.memberGroupClosure.findMany({
+        where: { descendantId: parentId },
+        select: { ancestorId: true, depth: true },
+      });
+    }
+
+    const group = await tx.memberGroup.create({
+      data: { name, parentId, ...(description !== null ? { description } : {}) },
+      select: { id: true, parentId: true, name: true, description: true },
+    });
+
+    // 闭包维护:自身 depth0,再继承 parent 的每个祖先(depth+1)。
+    await tx.memberGroupClosure.create({
+      data: { ancestorId: group.id, descendantId: group.id, depth: 0 },
+    });
+    if (parentClosure.length > 0) {
+      await tx.memberGroupClosure.createMany({
+        data: parentClosure.map((a) => ({
+          ancestorId: a.ancestorId,
+          descendantId: group.id,
+          depth: a.depth + 1,
+        })),
+      });
+    }
+    // parent 的闭包行数 = parent.depth + 1 = 新组 depth(闭包不变量)。
+    const depth = parentClosure.length;
+
+    await writeFileLibAudit(tx, {
+      action: FILE_LIB_AUDIT_ACTIONS.groupCreate,
+      actorUserId: actor.userId,
+      organizationId: deps.organizationId,
+      objectType: "group",
+      objectId: group.id,
+      objectPath: group.id,
+      detail: { name, parentId },
+    });
+
+    return {
+      id: group.id,
+      parentId: group.parentId,
+      name: group.name,
+      description: group.description,
+      depth,
+      memberCount: 0,
+      archivedAt: null,
+    };
+  });
+}
+
+/**
+ * 改名 / 改描述(决策6)。仅网站管理员。**不动 parentId** —— reparent 仍属 v1
+ * 范围外(决策5),闭包无需维护。字段缺省即不动;description 传 "" 清空。
+ */
+export async function updateMemberGroup(
+  deps: MemberGroupServiceDeps,
+  actor: FileLibActor,
+  groupId: string,
+  input: UpdateMemberGroupInput,
+): Promise<MemberGroupDto> {
+  requireAdmin(actor);
+  if (input.name === undefined && input.description === undefined) {
+    throw new FileLibError(400, "invalid_request", "name or description is required");
+  }
+  const name = input.name === undefined ? undefined : normalizeGroupName(input.name);
+
+  return deps.prisma.$transaction(async (tx) => {
+    await requireActiveGroup(tx, groupId);
+    const group = await tx.memberGroup.update({
+      where: { id: groupId },
+      data: {
+        ...(name !== undefined ? { name } : {}),
+        ...(input.description !== undefined
+          ? { description: input.description.trim() || null }
+          : {}),
+      },
+      select: { id: true, parentId: true, name: true, description: true },
+    });
+
+    // depth 由闭包行数推导(与 listMemberGroups 同一不变量);update 不改闭包。
+    const closureCount = await tx.memberGroupClosure.count({ where: { descendantId: groupId } });
+    const memberCount = await tx.memberGroupMembership.count({
+      where: { groupId, revokedAt: null },
+    });
+
+    await writeFileLibAudit(tx, {
+      action: FILE_LIB_AUDIT_ACTIONS.groupUpdate,
+      actorUserId: actor.userId,
+      organizationId: deps.organizationId,
+      objectType: "group",
+      objectId: group.id,
+      objectPath: group.id,
+      detail: {
+        ...(name !== undefined ? { name } : {}),
+        ...(input.description !== undefined ? { description: group.description } : {}),
+      },
+    });
+
+    return {
+      id: group.id,
+      parentId: group.parentId,
+      name: group.name,
+      description: group.description,
+      depth: closureCount - 1,
+      memberCount,
+      archivedAt: null,   // requireActiveGroup 已保证是活跃组
+    };
+  });
+}
+
+/**
+ * 软删除成员组:级联软删整棵子树(闭包 ancestorId=G 的全部活跃 descendant)。
+ * 闭包/成员行保留;list/解析按 archivedAt 过滤,整支立即停止贡献权限。
+ */
+export async function deleteMemberGroup(
+  deps: MemberGroupServiceDeps,
+  actor: FileLibActor,
+  groupId: string,
+): Promise<{ readonly archivedCount: number }> {
+  requireAdmin(actor);
+  return deps.prisma.$transaction(async (tx) => {
+    const group = await requireActiveGroup(tx, groupId);
+    const subtree = await tx.memberGroupClosure.findMany({
+      where: { ancestorId: groupId },
+      select: { descendantId: true },
+    });
+    const ids = subtree.map((r) => r.descendantId);
+    const now = new Date();
+    const result = await tx.memberGroup.updateMany({
+      where: { id: { in: ids }, archivedAt: null },
+      data: { archivedAt: now },
+    });
+    await writeFileLibAudit(tx, {
+      action: FILE_LIB_AUDIT_ACTIONS.groupDelete,
+      actorUserId: actor.userId,
+      organizationId: deps.organizationId,
+      objectType: "group",
+      objectId: group.id,
+      objectPath: group.id,
+      detail: { name: group.name, archivedCount: result.count },
+    });
+    return { archivedCount: result.count };
+  });
+}
+
+/**
+ * 恢复(取消归档)。仅网站管理员。**与删除不对称**(决策7):
+ *  - 删除级联整棵子树;恢复只恢复「该组 + 其全部已归档祖先」,**不动子树**。
+ *  - 恢复祖先链是必须的:活跃组的祖先必须活跃,否则该组在树上无路径、
+ *    depth 推导(闭包行数)与"祖先必活跃"的前提脱节。
+ *  - 子树保持归档、仍可见(带标记),由管理员逐个决定是否恢复 —— 避免一次
+ *    恢复意外把整支历史组全部重新授权。
+ * 恢复即刻恢复该组贡献的权限(实时解析,不缓存)。
+ */
+export async function restoreMemberGroup(
+  deps: MemberGroupServiceDeps,
+  actor: FileLibActor,
+  groupId: string,
+): Promise<{ readonly restoredCount: number }> {
+  requireAdmin(actor);
+  return deps.prisma.$transaction(async (tx) => {
+    const group = await tx.memberGroup.findUnique({
+      where: { id: groupId },
+      select: { id: true, name: true, archivedAt: true },
+    });
+    if (group === null) throw new FileLibError(404, "group_not_found", "group not found");
+    if (group.archivedAt === null) {
+      throw new FileLibError(409, "not_archived", "group is not archived");
+    }
+
+    // 自身 + 祖先(闭包 descendantId=G 含 depth0 自身),只挑已归档的解标。
+    const chain = await tx.memberGroupClosure.findMany({
+      where: { descendantId: groupId },
+      select: { ancestorId: true },
+    });
+    const ids = chain.map((r) => r.ancestorId);
+    const result = await tx.memberGroup.updateMany({
+      where: { id: { in: ids }, archivedAt: { not: null } },
+      data: { archivedAt: null },
+    });
+
+    await writeFileLibAudit(tx, {
+      action: FILE_LIB_AUDIT_ACTIONS.groupRestore,
+      actorUserId: actor.userId,
+      organizationId: deps.organizationId,
+      objectType: "group",
+      objectId: group.id,
+      objectPath: group.id,
+      detail: { name: group.name, restoredCount: result.count },
+    });
+    return { restoredCount: result.count };
+  });
+}
+
+/**
+ * 组扁平列表(前端自行按 parentId/depth 拼树);仅网站管理员。
+ * includeArchived=true 时连已归档组一并返回(带 archivedAt 标记),供后台展示/恢复;
+ * 默认只返回活跃组 —— 权限相关的调用方一律走默认。
+ */
+export async function listMemberGroups(
+  deps: MemberGroupServiceDeps,
+  actor: FileLibActor,
+  includeArchived = false,
+): Promise<readonly MemberGroupDto[]> {
+  requireAdmin(actor);
+  const groups = await deps.prisma.memberGroup.findMany({
+    where: includeArchived ? {} : { archivedAt: null },
+    orderBy: { name: "asc" },
+    select: { id: true, parentId: true, name: true, description: true, archivedAt: true },
+  });
+  if (groups.length === 0) return [];
+  const ids = groups.map((g) => g.id);
+
+  // depth:每个组的闭包行数(自身 + 祖先)- 1。级联软删保证活跃组的祖先必活跃。
+  const closure = await deps.prisma.memberGroupClosure.findMany({
+    where: { descendantId: { in: ids } },
+    select: { descendantId: true },
+  });
+  const closureCount = new Map<string, number>();
+  for (const row of closure) {
+    closureCount.set(row.descendantId, (closureCount.get(row.descendantId) ?? 0) + 1);
+  }
+
+  const counts = await deps.prisma.memberGroupMembership.groupBy({
+    by: ["groupId"],
+    where: { groupId: { in: ids }, revokedAt: null },
+    _count: { _all: true },
+  });
+  const countByGroup = new Map(counts.map((c) => [c.groupId, c._count._all]));
+
+  return groups.map((g) => ({
+    id: g.id,
+    parentId: g.parentId,
+    name: g.name,
+    description: g.description,
+    depth: (closureCount.get(g.id) ?? 1) - 1,
+    memberCount: countByGroup.get(g.id) ?? 0,
+    archivedAt: g.archivedAt,
+  }));
+}
+
+/**
+ * 组成员列表(仅网站管理员)。**已归档组也可读**(决策7):软删是打标,成员行仍在,
+ * 后台需要看得见「这个组曾经有谁」。写操作(add/remove)仍要求活跃组 —— 可读不可改。
+ */
+export async function listMembers(
+  deps: MemberGroupServiceDeps,
+  actor: FileLibActor,
+  groupId: string,
+): Promise<readonly MemberGroupMemberDto[]> {
+  requireAdmin(actor);
+  const exists = await deps.prisma.memberGroup.findUnique({
+    where: { id: groupId },
+    select: { id: true },
+  });
+  if (exists === null) throw new FileLibError(404, "group_not_found", "group not found");
+  const rows = await deps.prisma.memberGroupMembership.findMany({
+    where: { groupId, revokedAt: null },
+    select: {
+      createdAt: true,
+      user: { select: { id: true, displayName: true, feishuOpenId: true, avatarUrl: true } },
+    },
+    orderBy: { createdAt: "asc" },
+  });
+  return rows.map((r) => ({
+    userId: r.user.id,
+    displayName: r.user.displayName,
+    feishuOpenId: r.user.feishuOpenId,
+    avatarUrl: r.user.avatarUrl,
+    joinedAt: r.createdAt,
+  }));
+}
+
+/** 加成员(userId 或 feishuOpenId 解析);已是活跃成员 → 409。仅网站管理员。 */
+export async function addMember(
+  deps: MemberGroupServiceDeps,
+  actor: FileLibActor,
+  groupId: string,
+  input: AddMemberInput,
+): Promise<MemberGroupMemberDto> {
+  requireAdmin(actor);
+  return deps.prisma.$transaction(async (tx) => {
+    const group = await requireActiveGroup(tx, groupId);
+    const user = await resolveUser(tx, input);
+    const existing = await tx.memberGroupMembership.findFirst({
+      where: { groupId: group.id, userId: user.id, revokedAt: null },
+      select: { id: true },
+    });
+    if (existing !== null) {
+      throw new FileLibError(409, "already_member", "user is already a member of this group");
+    }
+    const created = await tx.memberGroupMembership.create({
+      data: { groupId: group.id, userId: user.id },
+      select: { createdAt: true },
+    });
+    await writeFileLibAudit(tx, {
+      action: FILE_LIB_AUDIT_ACTIONS.groupMemberAdd,
+      actorUserId: actor.userId,
+      organizationId: deps.organizationId,
+      objectType: "group",
+      objectId: group.id,
+      objectPath: group.id,
+      detail: { userId: user.id },
+    });
+    return {
+      userId: user.id,
+      displayName: user.displayName,
+      feishuOpenId: user.feishuOpenId,
+      avatarUrl: user.avatarUrl,
+      joinedAt: created.createdAt,
+    };
+  });
+}
+
+/** 移成员(软删 revokedAt);不在组 → 404。仅网站管理员。 */
+export async function removeMember(
+  deps: MemberGroupServiceDeps,
+  actor: FileLibActor,
+  groupId: string,
+  userId: string,
+): Promise<void> {
+  requireAdmin(actor);
+  await deps.prisma.$transaction(async (tx) => {
+    const group = await requireActiveGroup(tx, groupId);
+    const membership = await tx.memberGroupMembership.findFirst({
+      where: { groupId: group.id, userId, revokedAt: null },
+      select: { id: true },
+    });
+    if (membership === null) throw new FileLibError(404, "member_not_found", "group member not found");
+    await tx.memberGroupMembership.update({
+      where: { id: membership.id },
+      data: { revokedAt: new Date() },
+    });
+    await writeFileLibAudit(tx, {
+      action: FILE_LIB_AUDIT_ACTIONS.groupMemberRemove,
+      actorUserId: actor.userId,
+      organizationId: deps.organizationId,
+      objectType: "group",
+      objectId: group.id,
+      objectPath: group.id,
+      detail: { userId },
+    });
+  });
+}
+
+/**
+ * 成员选择器:按显示名/openId 搜全局用户。**仅网站管理员**(与加成员同权,决策2)
+ * —— 加成员本就能指定任意全局用户(resolveUser 不要求 org 成员),故此端点不扩大
+ * 已有能力面,只是把"盲敲 id"变成"搜索选择"。
+ * excludeGroupId 给定时,过滤掉该组的活跃成员(避免选中必然 409 的人)。
+ */
+export async function searchUsers(
+  deps: MemberGroupServiceDeps,
+  actor: FileLibActor,
+  q: string,
+  excludeGroupId?: string,
+  limit = 20,
+): Promise<readonly UserSearchResult[]> {
+  requireAdmin(actor);
+  const keyword = q.trim();
+
+  let excludeIds: string[] = [];
+  if (excludeGroupId !== undefined && excludeGroupId !== "") {
+    const rows = await deps.prisma.memberGroupMembership.findMany({
+      where: { groupId: excludeGroupId, revokedAt: null },
+      select: { userId: true },
+    });
+    excludeIds = rows.map((r) => r.userId);
+  }
+
+  const users = await deps.prisma.user.findMany({
+    where: {
+      ...(excludeIds.length > 0 ? { id: { notIn: excludeIds } } : {}),
+      ...(keyword === ""
+        ? {}
+        : {
+            OR: [
+              { displayName: { contains: keyword, mode: "insensitive" as const } },
+              { feishuOpenId: { contains: keyword, mode: "insensitive" as const } },
+            ],
+          }),
+    },
+    take: limit,
+    orderBy: { displayName: "asc" },
+    select: { id: true, displayName: true, feishuOpenId: true, avatarUrl: true },
+  });
+
+  return users.map((u) => ({
+    userId: u.id,
+    displayName: u.displayName,
+    feishuOpenId: u.feishuOpenId,
+    avatarUrl: u.avatarUrl,
+  }));
+}
+
+/**
+ * 授权选择器搜索(契约 C2 /groups/search)。**不限管理员**(决策2)。
+ * 活跃组按名过滤,breadcrumb 由活跃祖先链按 depth 排序拼成。
+ */
+export async function searchMemberGroups(
+  deps: MemberGroupServiceDeps,
+  q: string,
+  limit = 20,
+): Promise<readonly MemberGroupSearchResult[]> {
+  const keyword = q.trim();
+  const groups = await deps.prisma.memberGroup.findMany({
+    where: {
+      archivedAt: null,
+      ...(keyword === "" ? {} : { name: { contains: keyword, mode: "insensitive" as const } }),
+    },
+    take: limit,
+    orderBy: { name: "asc" },
+    select: { id: true, name: true },
+  });
+  if (groups.length === 0) return [];
+  const ids = groups.map((g) => g.id);
+
+  // 祖先链(仅活跃祖先);depth 越大越靠根。
+  const closure = await deps.prisma.memberGroupClosure.findMany({
+    where: { descendantId: { in: ids }, ancestor: { archivedAt: null } },
+    select: { descendantId: true, ancestorId: true, depth: true },
+  });
+  const ancestorIds = [...new Set(closure.map((c) => c.ancestorId))];
+  const names = await deps.prisma.memberGroup.findMany({
+    where: { id: { in: ancestorIds } },
+    select: { id: true, name: true },
+  });
+  const nameById = new Map(names.map((n) => [n.id, n.name]));
+  const chainByGroup = new Map<string, { ancestorId: string; depth: number }[]>();
+  for (const row of closure) {
+    const arr = chainByGroup.get(row.descendantId) ?? [];
+    arr.push({ ancestorId: row.ancestorId, depth: row.depth });
+    chainByGroup.set(row.descendantId, arr);
+  }
+
+  return groups.map((g) => {
+    const chain = (chainByGroup.get(g.id) ?? []).slice().sort((a, b) => b.depth - a.depth);
+    const breadcrumb = chain
+      .map((c) => nameById.get(c.ancestorId) ?? "")
+      .filter((s) => s !== "")
+      .join(" / ");
+    return { id: g.id, name: g.name, breadcrumb: breadcrumb || g.name };
+  });
+}

hub/src/database/filelib/permission.ts

@@ -1,5 +1,5 @@
 /**
- * 纯权限 reducer(契约 P6 / D11 / D8)。
+ * 纯权限 reducer(契约 P6 / D8)。
  *
  * 设计约束(Metis 评审):本文件是纯函数层 —— 输入是"已解析好的" grant、祖先链
  * 与用户组集合,不碰 DB / 网络。数据获取在 treeService。这样权限代数可以脱离
@@ -23,8 +23,6 @@ export interface EffectiveRoleInput {
   readonly nodeKind: "FOLDER" | "PROJECT";
   /** 目标的全部祖先 id(不含 self,顺序无关)。 */
   readonly ancestorIds: readonly string[];
-  /** 项目独立权限开关(D11/P5);文件夹忽略此值。 */
-  readonly independentPermissionsEnabled: boolean;
   readonly userId: string;
   /** C2 resolve 结果:用户直接所属 + 全部祖先 group 的 id 集合。 */
   readonly groupIds: readonly string[];
@@ -37,20 +35,16 @@ export interface EffectiveRoleInput {
  * r ∈ {R} ∪ ancestors(R) };无匹配 → null(无任何权限)。
  * "个人权限不能降权"在 max 语义下天然成立 —— 只取最高,不做减法。
  *
- * D11:目标为 PROJECT 且独立权限关闭时,项目级(挂在 self 上)非创建者 grant
- * 冻结不参与计算;创建者的自动 grant(isCreatorGrant)始终生效。祖先链上的
- * grant 不受开关影响。
+ * 项目级 grant 恒参与计算(ADR-0030):原 D11 独立权限开关已废除,
+ * FileLibProjectSettings 不再被读取。
  */
 export function effectiveRole(input: EffectiveRoleInput): FileLibRole | null {
   const onChain = new Set<string>([input.nodeId, ...input.ancestorIds]);
   const groups = new Set(input.groupIds);
-  const freezeProjectGrants =
-    input.nodeKind === "PROJECT" && !input.independentPermissionsEnabled;
 
   let best: FileLibRole | null = null;
   for (const grant of input.grants) {
     if (!onChain.has(grant.nodeId)) continue;
-    if (freezeProjectGrants && grant.nodeId === input.nodeId && !grant.isCreatorGrant) continue;
     if (grant.principalType === "USER" && grant.principalId !== input.userId) continue;
     if (grant.principalType === "GROUP" && !groups.has(grant.principalId)) continue;
     if (best === null || ROLE_RANK[grant.role] > ROLE_RANK[best]) best = grant.role;

hub/src/database/filelib/treeService.ts

@@ -94,7 +94,7 @@ async function loadVisibleChain(
   return { node, ancestors: ordered };
 }
 
-/** 数据获取层:把 chain、grants、groups、toggle 装配成纯 reducer 的输入。 */
+/** 数据获取层:把 chain、grants、groups 装配成纯 reducer 的输入。 */
 async function resolveRole(
   tx: Tx,
   deps: AccessDeps,
@@ -106,20 +106,11 @@ async function resolveRole(
     where: { organizationId: deps.organizationId, revokedAt: null, nodeId: { in: chainIds } },
     select: { nodeId: true, principalType: true, principalId: true, role: true, isCreatorGrant: true },
   });
-  let independentPermissionsEnabled = false;
-  if (chain.node.kind === "PROJECT") {
-    const settings = await tx.fileLibProjectSettings.findUnique({
-      where: { nodeId: chain.node.id },
-      select: { independentPermissionsEnabled: true },
-    });
-    independentPermissionsEnabled = settings?.independentPermissionsEnabled ?? false;
-  }
   const groupIds = await deps.groupResolver.resolveMemberGroupIds(actor.userId);
   return effectiveRole({
     nodeId: chain.node.id,
     nodeKind: chain.node.kind,
     ancestorIds: chain.ancestors.map((a) => a.id),
-    independentPermissionsEnabled,
     userId: actor.userId,
     groupIds,
     grants,
@@ -278,11 +269,6 @@ export async function createNode(
         },
       });
     }
-    if (input.kind === "PROJECT") {
-      await tx.fileLibProjectSettings.create({
-        data: { nodeId: id, independentPermissionsEnabled: false },
-      });
-    }
 
     await writeFileLibAudit(tx, {
       action: nodeAction(input.kind, "Create"),
@@ -457,10 +443,12 @@ export async function getEffectiveRole(
 
 export interface BreadcrumbEntry {
   readonly depth: number;
-  /** D17:无 View 的祖先 id/name 都为 null(不泄露)。 */
+  /** D17:无 View 的祖先 id/name 置为 null(不泄露)。 */
   readonly id: string | null;
   readonly name: string | null;
   readonly kind: "FOLDER" | "PROJECT";
+  /** 该节点对调用者的 effective role;无 View 为 null。 */
+  readonly role: FileLibRole | null;
 }
 
 /** D17 面包屑:需 self VIEW;链上每个节点单独算权限,无 View 只留占位。 */
@@ -482,20 +470,12 @@ export async function breadcrumb(
       where: { organizationId: deps.organizationId, revokedAt: null, nodeId: { in: chainIds } },
       select: { nodeId: true, principalType: true, principalId: true, role: true, isCreatorGrant: true },
     });
-    const settings = chain.node.kind === "PROJECT"
-      ? await tx.fileLibProjectSettings.findUnique({
-          where: { nodeId: chain.node.id },
-          select: { independentPermissionsEnabled: true },
-        })
-      : null;
 
     return chainNodes.map((current, depth) => {
       const role = effectiveRole({
         nodeId: current.id,
         nodeKind: current.kind,
         ancestorIds: chainNodes.slice(0, depth).map((n) => n.id),
-        independentPermissionsEnabled:
-          current.id === chain.node.id ? settings?.independentPermissionsEnabled ?? false : false,
         userId: actor.userId,
         groupIds,
         grants: allGrants,
@@ -506,6 +486,7 @@ export async function breadcrumb(
         id: visible ? current.id : null,
         name: visible ? current.name : null,
         kind: current.kind,
+        role,
       };
     });
   });
@@ -545,14 +526,6 @@ export async function listChildren(
       where: { organizationId: deps.organizationId, revokedAt: null, nodeId: { in: idsToFetch } },
       select: { nodeId: true, principalType: true, principalId: true, role: true, isCreatorGrant: true },
     });
-    const projectIds = children.filter((c) => c.kind === "PROJECT").map((c) => c.id);
-    const settingsRows = projectIds.length === 0
-      ? []
-      : await tx.fileLibProjectSettings.findMany({
-          where: { nodeId: { in: projectIds } },
-          select: { nodeId: true, independentPermissionsEnabled: true },
-        });
-    const toggleByNode = new Map(settingsRows.map((s) => [s.nodeId, s.independentPermissionsEnabled]));
     const groupIds = await deps.groupResolver.resolveMemberGroupIds(actor.userId);
 
     const out: ChildNodeDto[] = [];
@@ -561,7 +534,6 @@ export async function listChildren(
         nodeId: child.id,
         nodeKind: child.kind,
         ancestorIds: parentAncestorIds,
-        independentPermissionsEnabled: toggleByNode.get(child.id) ?? false,
         userId: actor.userId,
         groupIds,
         grants: allGrants,

hub/src/database/plugin.ts

@@ -16,6 +16,7 @@
 import type { FastifyInstance } from "fastify";
 import type { PrismaClient } from "@prisma/client";
 import { registerDatabaseRoutes } from "./routes/databaseRoutes.js";
+import { registerDatabaseSpa } from "./static.js";
 
 export interface DatabasePluginConfig {
   readonly prisma: PrismaClient;
@@ -42,4 +43,8 @@ export async function registerDatabasePlugin(
     siloOrganizationSlug: config.siloOrganizationSlug,
     allowDevLoginBypass,
   });
+
+  // SPA shell + fallback, registered after the concrete /database/* routes above
+  // so the /database/* wildcard does not shadow them.
+  await registerDatabaseSpa(app);
 }

hub/src/database/routes/adminPanels.ts

@@ -1,227 +0,0 @@
-/**
- * 管理员后台「用户管理」「Group 管理」面板(复用 hub 已有 org 管理 API)。
- *
- * 用户管理 = org 成员(/api/org/:orgSlug/members);
- * Group 管理 = Team(当前 Group 的过渡实现,/api/org/:orgSlug/teams),
- * 真 Group 系统落地后此面板改接新 API 即可,文件库授权侧不动。
- */
-
-function apiBase(orgSlug: string): string {
-  return `/api/org/${encodeURIComponent(orgSlug)}`;
-}
-
-/* ---------------------------------------------------------------- 用户管理 */
-
-export function renderUsersPanel(orgSlug: string): string {
-  return `
-<div id="users-root" style="max-width:880px">
-  <div class="panel" style="margin-bottom:14px">
-    <div class="section-title">添加成员</div>
-    <div class="inline-form">
-      <input id="u-openid" class="input" placeholder="用户 openId(飞书 ou_ 开头)" style="flex:2"/>
-      <input id="u-name" class="input" placeholder="显示名(可选)" style="flex:1"/>
-      <select id="u-role" class="select" style="width:130px">
-        <option value="MEMBER">普通老师</option>
-        <option value="ADMIN">管理员</option>
-        <option value="OWNER">所有者</option>
-      </select>
-      <button id="u-add" class="btn btn-primary">添加</button>
-    </div>
-  </div>
-  <div class="panel">
-    <div class="section-title">成员列表</div>
-    <table class="list">
-      <thead><tr><th>成员</th><th>userId</th><th>角色</th><th></th></tr></thead>
-      <tbody id="u-tbody"></tbody>
-    </table>
-  </div>
-</div>
-<script>
-(function () {
-  const BASE = "${apiBase(orgSlug)}";
-  const tbody = document.getElementById("u-tbody");
-  const esc = (s) => String(s).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;");
-  const ROLE_LABEL = { OWNER: "所有者", ADMIN: "管理员", MEMBER: "普通老师" };
-  async function req(path, opts = {}) {
-    const res = await fetch(BASE + path, {
-      credentials: "same-origin",
-      headers: opts.body ? { "Content-Type": "application/json" } : undefined,
-      method: opts.method ?? "GET",
-      body: opts.body ? JSON.stringify(opts.body) : undefined,
-    });
-    if (res.status === 401) { location.href = "/database/admin"; throw new Error("unauthenticated"); }
-    const text = await res.text();
-    const data = text ? JSON.parse(text) : null;
-    if (!res.ok) throw new Error((data && data.error && data.error.message) || res.statusText);
-    return data;
-  }
-  async function load() {
-    const { members } = await req("/members");
-    tbody.innerHTML = members.length === 0
-      ? '<tr><td colspan="4" class="quiet" style="text-align:center;padding:18px">暂无成员</td></tr>'
-      : members.map((m) =>
-        "<tr>" +
-          "<td>" + esc(m.displayName || m.userId) + "</td>" +
-          '<td class="file-meta">' + esc(m.userId) + "</td>" +
-          '<td><select class="select" style="width:110px;padding:3px 8px;font-size:12px" data-user="' + esc(m.userId) + '">' +
-            ["OWNER","ADMIN","MEMBER"].map((r) =>
-              '<option value="' + r + '"' + (m.role === r ? " selected" : "") + ">" + ROLE_LABEL[r] + "</option>").join("") +
-          "</select></td>" +
-          '<td style="text-align:right"><button class="link-danger" data-revoke="' + esc(m.userId) + '">移除</button></td>' +
-        "</tr>").join("");
-    tbody.querySelectorAll("select[data-user]").forEach((sel) => {
-      sel.onchange = async () => {
-        try { await req("/members/" + encodeURIComponent(sel.dataset.user), { method: "PATCH", body: { role: sel.value } }); }
-        catch (e) { alert(e.message); load(); }
-      };
-    });
-    tbody.querySelectorAll("button[data-revoke]").forEach((btn) => {
-      btn.onclick = async () => {
-        if (!confirm("移除该成员?")) return;
-        try { await req("/members/" + encodeURIComponent(btn.dataset.revoke) + "/revoke", { method: "POST" }); load(); }
-        catch (e) { alert(e.message); }
-      };
-    });
-  }
-  document.getElementById("u-add").onclick = async () => {
-    const openId = document.getElementById("u-openid").value.trim();
-    if (!openId) return alert("请填写用户 openId");
-    const displayName = document.getElementById("u-name").value.trim();
-    try {
-      await req("/members", { method: "POST", body: {
-        feishuOpenId: openId,
-        role: document.getElementById("u-role").value,
-        ...(displayName ? { displayName } : {}),
-      }});
-      document.getElementById("u-openid").value = "";
-      document.getElementById("u-name").value = "";
-      load();
-    } catch (e) { alert(e.message); }
-  };
-  load().catch((e) => { tbody.innerHTML = '<tr><td colspan="4" style="color:var(--danger);padding:12px">' + esc(e.message) + "</td></tr>"; });
-})();
-</script>`;
-}
-
-/* ---------------------------------------------------------------- Group 管理 */
-
-export function renderGroupsPanel(orgSlug: string): string {
-  return `
-<div id="groups-root" style="display:flex;gap:14px;align-items:flex-start">
-  <div style="width:340px;flex-shrink:0">
-    <div class="panel" style="margin-bottom:14px">
-      <div class="section-title">新建 Group</div>
-      <div class="form-row"><label class="form-label">标识(slug)</label><input id="g-slug" class="input" placeholder="physics-dept"/></div>
-      <div class="form-row"><label class="form-label">名称</label><input id="g-name" class="input" placeholder="物理教研组"/></div>
-      <div class="form-row"><label class="form-label">描述(可选)</label><input id="g-desc" class="input" placeholder="一句话说明"/></div>
-      <div style="text-align:right"><button id="g-create" class="btn btn-primary">创建</button></div>
-    </div>
-    <div class="panel">
-      <div class="section-title">Group 列表</div>
-      <div id="g-list"></div>
-    </div>
-  </div>
-  <div class="panel" style="flex:1;min-height:200px">
-    <div id="g-detail" class="quiet" style="padding:18px;text-align:center">从左侧选择一个 Group 查看成员</div>
-  </div>
-</div>
-<script>
-(function () {
-  const BASE = "${apiBase(orgSlug)}";
-  const listEl = document.getElementById("g-list");
-  const detailEl = document.getElementById("g-detail");
-  const esc = (s) => String(s).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;");
-  let selected = null;
-  async function req(path, opts = {}) {
-    const res = await fetch(BASE + path, {
-      credentials: "same-origin",
-      headers: opts.body ? { "Content-Type": "application/json" } : undefined,
-      method: opts.method ?? "GET",
-      body: opts.body ? JSON.stringify(opts.body) : undefined,
-    });
-    if (res.status === 401) { location.href = "/database/admin"; throw new Error("unauthenticated"); }
-    const text = await res.text();
-    const data = text ? JSON.parse(text) : null;
-    if (!res.ok) throw new Error((data && data.error && data.error.message) || res.statusText);
-    return data;
-  }
-  async function loadList() {
-    const { teams } = await req("/teams");
-    listEl.innerHTML = teams.length === 0
-      ? '<div class="quiet" style="text-align:center;padding:12px">暂无 Group</div>'
-      : teams.map((t) =>
-        '<div class="g-team" data-id="' + esc(t.id) + '" data-name="' + esc(t.name) + '" style="display:flex;align-items:center;gap:8px;padding:8px 6px;border-radius:8px;cursor:pointer">' +
-          '<span style="flex:1"><b>' + esc(t.name) + '</b> <span class="file-meta">' + esc(t.slug) + "</span></span>" +
-          '<button class="link-danger" data-archive="' + esc(t.id) + '" style="font-size:11px">归档</button>' +
-        "</div>").join("");
-    listEl.querySelectorAll(".g-team").forEach((el) => {
-      el.onclick = (e) => {
-        if (e.target.closest("button")) return;
-        selected = { id: el.dataset.id, name: el.dataset.name };
-        listEl.querySelectorAll(".g-team").forEach((x) => x.style.background = "");
-        el.style.background = "var(--selected)";
-        loadMembers();
-      };
-    });
-    listEl.querySelectorAll("button[data-archive]").forEach((btn) => {
-      btn.onclick = async () => {
-        if (!confirm("归档该 Group?其成员授权将失效。")) return;
-        try { await req("/teams/" + encodeURIComponent(btn.dataset.archive) + "/archive", { method: "POST" }); selected = null; detailEl.innerHTML = '<div class="quiet" style="padding:18px;text-align:center">从左侧选择一个 Group 查看成员</div>'; loadList(); }
-        catch (e) { alert(e.message); }
-      };
-    });
-  }
-  async function loadMembers() {
-    if (!selected) return;
-    detailEl.innerHTML = '<div class="quiet" style="padding:12px;text-align:center">加载中…</div>';
-    const { members } = await req("/teams/" + encodeURIComponent(selected.id) + "/members");
-    detailEl.innerHTML =
-      '<div class="section-title">' + esc(selected.name) + " · 成员(" + members.length + ")</div>" +
-      '<table class="list"><tbody>' +
-        (members.length === 0
-          ? '<tr><td class="quiet" style="text-align:center;padding:14px">暂无成员</td></tr>'
-          : members.map((m) =>
-            "<tr><td>" + esc(m.displayName || m.userId) + '</td><td class="file-meta">' + esc(m.userId) + "</td>" +
-            '<td style="text-align:right"><button class="link-danger" data-revoke="' + esc(m.userId) + '">移除</button></td></tr>').join("")) +
-      "</tbody></table>" +
-      '<div class="divider"></div>' +
-      '<div class="section-title">添加成员</div>' +
-      '<div class="inline-form">' +
-        '<input id="g-add-openid" class="input" placeholder="用户 openId 或 userId"/>' +
-        '<button id="g-add" class="btn btn-primary">添加</button>' +
-      "</div>";
-    detailEl.querySelectorAll("button[data-revoke]").forEach((btn) => {
-      btn.onclick = async () => {
-        try { await req("/teams/" + encodeURIComponent(selected.id) + "/members/" + encodeURIComponent(btn.dataset.revoke) + "/revoke", { method: "POST" }); loadMembers(); }
-        catch (e) { alert(e.message); }
-      };
-    });
-    detailEl.querySelector("#g-add").onclick = async () => {
-      const v = detailEl.querySelector("#g-add-openid").value.trim();
-      if (!v) return alert("请填写用户 id");
-      try {
-        await req("/teams/" + encodeURIComponent(selected.id) + "/members", {
-          method: "POST",
-          body: v.startsWith("ou_") ? { feishuOpenId: v } : { userId: v },
-        });
-        loadMembers();
-      } catch (e) { alert(e.message); }
-    };
-  }
-  document.getElementById("g-create").onclick = async () => {
-    const slug = document.getElementById("g-slug").value.trim();
-    const name = document.getElementById("g-name").value.trim();
-    const description = document.getElementById("g-desc").value.trim();
-    if (!slug || !name) return alert("slug 和名称必填");
-    try {
-      await req("/teams", { method: "POST", body: { slug, name, ...(description ? { description } : {}) } });
-      document.getElementById("g-slug").value = "";
-      document.getElementById("g-name").value = "";
-      document.getElementById("g-desc").value = "";
-      loadList();
-    } catch (e) { alert(e.message); }
-  };
-  loadList().catch((e) => { listEl.innerHTML = '<div style="color:var(--danger);padding:12px">' + esc(e.message) + "</div>"; });
-})();
-</script>`;
-}

hub/src/database/routes/binRoutes.ts

@@ -0,0 +1,44 @@
+/**
+ * /database/api/bin/* 回收站端点(ADR-0031)。
+ * 约定:绝对路径;actorOrNull 前置;业务全走 binService;错误统一 sendRouteError。
+ */
+
+import type { FastifyInstance } from "fastify";
+import { listBin, purgeBinEntry, restoreBinEntry } from "../filelib/binService.js";
+import { actorOrNull, sendRouteError, type FileLibRouteDeps } from "../filelib/routeShared.js";
+
+export async function registerBinRoutes(app: FastifyInstance, deps: FileLibRouteDeps): Promise<void> {
+  const svc = { prisma: deps.prisma, organizationId: deps.organizationId, groupResolver: deps.groupResolver };
+
+  app.get("/database/api/bin", async (request, reply) => {
+    const actor = await actorOrNull(request, reply, deps);
+    if (actor === null) return reply;
+    try {
+      return { entries: await listBin(svc, actor) };
+    } catch (error) {
+      return sendRouteError(reply, error);
+    }
+  });
+
+  app.post("/database/api/bin/:id/restore", async (request, reply) => {
+    const actor = await actorOrNull(request, reply, deps);
+    if (actor === null) return reply;
+    try {
+      const { id } = request.params as { id: string };
+      return await restoreBinEntry(svc, actor, id);
+    } catch (error) {
+      return sendRouteError(reply, error);
+    }
+  });
+
+  app.delete("/database/api/bin/:id", async (request, reply) => {
+    const actor = await actorOrNull(request, reply, deps);
+    if (actor === null) return reply;
+    try {
+      const { id } = request.params as { id: string };
+      return await purgeBinEntry(svc, actor, id);
+    } catch (error) {
+      return sendRouteError(reply, error);
+    }
+  });
+}

hub/src/database/routes/databaseRoutes.ts

@@ -5,36 +5,44 @@
  * Handlers use ABSOLUTE paths (no Fastify prefix) so every route greps as the
  * literal string it serves.
  *
- *   /database/admin      — Feishu-only login page (+ dev one-click button)
- *   /database/dashboard  — sidebar + content admin shell, session-gated
+ * 标准前后端分离:本文件**不渲染任何 HTML**。登录页与管理后台六个 tab 全部由
+ * `hub/filelib-web` 这一个 SvelteKit SPA 提供(同一份产物挂 /app 与 /database,
+ * 见 ../static.ts / registerDatabaseSpa)。此处只留 SPA 依赖的 JSON/跳转端点:
+ *
+ *   /database/config     — unauthenticated bootstrap: silo org slug + dev toggle
+ *   /database/api/stats  — 概览页统计(需登录 + silo org OWNER/ADMIN)
  *   /database/dev-login  — DEV ONLY bypass, registered only when the flag is on
  *
- * The dev bypass (button + /database/dev-login) is self-contained here and
- * gated by allowDevLoginBypass (computed in ./plugin.ts from HUB_DEV_LOGIN_BYPASS
- * + NODE_ENV). Production requires real Feishu OAuth.
+ * The dev bypass (/database/dev-login) is self-contained here and gated by
+ * allowDevLoginBypass (computed in ./plugin.ts from HUB_DEV_LOGIN_BYPASS +
+ * NODE_ENV). Production requires real Feishu OAuth.
+ *
+ * NOTE: concrete routes here MUST be registered before the SPA fallback
+ * (registerDatabaseSpa serves /database and /database/*), or the wildcard would
+ * shadow them.
  */
 import type { FastifyInstance } from "fastify";
 import type { PrismaClient } from "@prisma/client";
 import path from "node:path";
-import { SESSION_COOKIE_NAME, signSession, verifySession } from "../../admin/auth/session.js";
+import { SESSION_COOKIE_NAME, signSession } from "../../admin/auth/session.js";
 import { registerFileLibRoutes } from "./filelibRoutes.js";
 import { registerFileRoutes } from "./fileRoutes.js";
+import { registerMemberGroupRoutes } from "./memberGroupRoutes.js";
+import { registerBinRoutes } from "./binRoutes.js";
 import { registerTeacherApp } from "./teacherApp.js";
-import { renderLibraryBrowser } from "./libraryBrowser.js";
-import { renderGroupsPanel, renderUsersPanel } from "./adminPanels.js";
 import { createInMemoryVersionStore } from "../filelib/versionStore.js";
-import { createTeamGroupResolver } from "../filelib/groupResolver.js";
+import { createMemberGroupResolver } from "../filelib/memberGroupResolver.js";
 import { createHttpGroupResolver } from "../filelib/groupResolverHttp.js";
 import { createManifestStubAdapter } from "../filelib/exportService.js";
 import { FILE_LIB_AUDIT_ACTIONS } from "../filelib/audit.js";
-import { UI_HEAD_FONTS, UI_THEME_CSS } from "./uiTheme.js";
+import { actorOrNull, sendRouteError } from "../filelib/routeShared.js";
 import type { FileLibRouteDeps } from "../filelib/routeShared.js";
 
 export interface DatabaseRouteConfig {
   readonly prisma: PrismaClient;
   /** HMAC secret for the signed session cookie — reused from the admin plane. */
   readonly sessionSecret: string;
-  /** Silo Organization slug — builds the org-scoped Feishu login link. */
+  /** Silo Organization slug — the SPA builds the org-scoped Feishu login link from it. */
   readonly siloOrganizationSlug: string;
   /** DEV ONLY. Enables the one-click button and the /database/dev-login route. */
   readonly allowDevLoginBypass: boolean;
@@ -47,19 +55,30 @@ export async function registerDatabaseRoutes(
   // 文件库依赖在下方装配;概览页统计在请求时经此引用读取(请求一定晚于装配完成)。
   let filelibDepsForStats: FileLibRouteDeps | null = null;
 
-  app.get("/database/admin", async (request, reply) => {
-    // Already signed in → straight to the dashboard.
-    if ((await resolveUser(request.cookies[SESSION_COOKIE_NAME], config)) !== null) {
-      return reply.redirect("/database/dashboard");
-    }
-    return reply.type("text/html").send(renderLoginPage(config));
-  });
+  // 登录页/前端 bootstrap(公开;org slug 本就在 OAuth URL 中,不构成敏感信息)。
+  // 与老师端 /database/api/login-info 同形状 —— 后者由 teacherApp.ts 注册,
+  // 两处并存是为了兼容既有前端调用点。
+  app.get("/database/config", async () => ({
+    orgSlug: config.siloOrganizationSlug,
+    devLoginEnabled: config.allowDevLoginBypass,
+  }));
 
-  app.get("/database/dashboard", async (request, reply) => {
-    const user = await resolveUser(request.cookies[SESSION_COOKIE_NAME], config);
-    if (user === null) return reply.redirect("/database/admin");
-    const stats = await loadDashboardStats(config.prisma, filelibDepsForStats);
-    return reply.type("text/html").send(renderDashboard(user.displayName, stats, config.siloOrganizationSlug));
+  // 概览页统计。登录 + silo org OWNER/ADMIN 才给 —— 它聚合的是全 org 口径的
+  // 计数与审计流,不是某个节点的授权视图,所以不走 per-node 的 role 判定。
+  app.get("/database/api/stats", async (request, reply) => {
+    if (filelibDepsForStats === null) {
+      return reply.status(503).send({ error: { code: "unavailable", message: "filelib not ready" } });
+    }
+    const actor = await actorOrNull(request, reply, filelibDepsForStats);
+    if (actor === null) return reply;
+    if (!actor.isWebsiteAdmin) {
+      return reply.status(403).send({ error: { code: "forbidden", message: "requires organization OWNER/ADMIN" } });
+    }
+    try {
+      return await loadDashboardStats(config.prisma, filelibDepsForStats);
+    } catch (error) {
+      return sendRouteError(reply, error);
+    }
   });
 
   // DEV ONLY bypass — self-contained here, registered only when the flag is on
@@ -113,9 +132,10 @@ export async function registerDatabaseRoutes(
     });
   }
 
-  // 文件库(独立模块,《文件库-接口契约.md》):API + 浏览页 + 老师端 /app。
+  // 文件库(独立模块,《文件库-接口契约.md》):API + 老师端 /app 静态托管。
   // 依赖装配:VersionStore 当前为内存+快照实现(版本团队 npm 包到位后替换);
-  // GroupResolver 默认读 hub Team,HUB_GROUP_SERVICE_URL 配置后切 HTTP(C2);
+  // GroupResolver 默认读 in-hub MemberGroup 闭包(ADR-0028),
+  // HUB_GROUP_SERVICE_URL 配置后切 HTTP(C2);
   // 导出适配器当前为 manifest stub(OPEN-6,真导出工具到位后替换)。
   const siloOrg = await config.prisma.organization.findUnique({
     where: { slug: config.siloOrganizationSlug },
@@ -134,13 +154,15 @@ export async function registerDatabaseRoutes(
     organizationId: siloOrg.id,
     storageRoot,
     groupResolver: groupServiceUrl === undefined || groupServiceUrl.trim() === ""
-      ? createTeamGroupResolver(config.prisma, siloOrg.id)
+      ? createMemberGroupResolver(config.prisma)
       : createHttpGroupResolver({ baseUrl: groupServiceUrl }),
     versionStore,
     exportAdapters: [createManifestStubAdapter(versionStore)],
   };
   await registerFileLibRoutes(app, filelibDeps);
   await registerFileRoutes(app, filelibDeps);
+  await registerMemberGroupRoutes(app, filelibDeps);
+  await registerBinRoutes(app, filelibDeps);
   await registerTeacherApp(app, {
     prisma: config.prisma,
     sessionSecret: config.sessionSecret,
@@ -148,9 +170,10 @@ export async function registerDatabaseRoutes(
     allowDevLoginBypass: config.allowDevLoginBypass,
   });
 
-  // 独立文件库页已并入后台「文件库」tab(/database/dashboard#library),旧地址跳转保留兼容。
+  // 独立文件库页已并入后台「文件库」tab;旧地址跳转保留兼容。
+  // SPA 化后目标是真路由(不再是 #library 锚点)。
   app.get("/database/library", async (_request, reply) =>
-    reply.redirect("/database/dashboard#library"),
+    reply.redirect("/database/dashboard/library"),
   );
 
   filelibDepsForStats = filelibDeps;
@@ -174,9 +197,8 @@ interface DashboardStats {
 /** 概览页统计:org 范围内的文件夹/项目/授权(DB)+ 文件(版本库)+ 最近活动(AuditEntry)。 */
 async function loadDashboardStats(
   prisma: PrismaClient,
-  deps: FileLibRouteDeps | null,
-): Promise<DashboardStats | null> {
-  if (deps === null) return null;
+  deps: FileLibRouteDeps,
+): Promise<DashboardStats> {
   const organizationId = deps.organizationId;
   const [folders, projects, grants] = await Promise.all([
     prisma.fileLibNode.count({ where: { organizationId, kind: "FOLDER", deletedAt: null } }),
@@ -224,195 +246,3 @@ async function loadDashboardStats(
   });
   return { folders, projects, files, grants, recent };
 }
-
-/** Verify the session cookie and load the user, or null if not signed in. */
-async function resolveUser(
-  rawCookie: string | undefined,
-  config: DatabaseRouteConfig,
-): Promise<{ displayName: string } | null> {
-  if (rawCookie === undefined || rawCookie === "") return null;
-  const session = verifySession(rawCookie, config.sessionSecret);
-  if (session === null) return null;
-  const user = await config.prisma.user.findUnique({
-    where: { id: session.userId },
-    select: { displayName: true },
-  });
-  return user;
-}
-
-/** 管理后台共享 head(全局 UI 主题,与老师端 /app 同源)。 */
-function pageHead(title: string): string {
-  return `<head>
-  <meta charset="utf-8"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1"/>
-  <title>${title}</title>
-  ${UI_HEAD_FONTS}
-  <style>${UI_THEME_CSS}</style>
-</head>`;
-}
-
-function renderLoginPage(config: DatabaseRouteConfig): string {
-  const feishuHref = `/auth/feishu/${encodeURIComponent(config.siloOrganizationSlug)}`;
-  const devButton = config.allowDevLoginBypass
-    ? `<div style="display:flex;align-items:center;gap:10px;margin:22px 0;color:var(--text-3);font-size:11px">
-         <span style="flex:1;border-top:1px solid var(--border-soft)"></span>开发模式
-         <span style="flex:1;border-top:1px solid var(--border-soft)"></span>
-       </div>
-       <a href="/database/dev-login" class="btn" style="width:100%;justify-content:center">⚡ 一键登录管理员</a>
-       <p style="margin:10px 0 0;text-align:center;font-size:11px;color:var(--text-3)">仅开发环境可见 · 跳过飞书 OAuth</p>`
-    : "";
-
-  return `<!doctype html>
-<html lang="zh-CN">
-${pageHead("Database Admin · 登录")}
-<body>
-  <div style="min-height:100vh;display:flex;align-items:center;justify-content:center;padding:24px">
-    <div style="width:100%;max-width:380px;background:var(--panel);border:1px solid var(--border-soft);border-radius:16px;padding:40px 36px;box-shadow:var(--shadow-pop)">
-      <div style="font-size:26px;font-weight:600;text-align:center">Database Admin</div>
-      <p style="margin:10px 0 30px;text-align:center;font-size:13px;color:var(--text-3)">使用飞书登录以管理数据库</p>
-      <a href="${feishuHref}" class="btn btn-primary" style="width:100%;justify-content:center;padding:11px 16px;font-size:14px">使用飞书登录</a>
-      ${devButton}
-    </div>
-  </div>
-</body>
-</html>`;
-}
-
-/** Sidebar nav items. `active` marks the current page. `href` "#" = placeholder. */
-const NAV_TABS: ReadonlyArray<{ id: string; label: string; icon: string }> = [
-  { id: "overview", label: "概览", icon: "M4 13h6V4H4v9Zm0 7h6v-5H4v5Zm10 0h6V11h-6v9Zm0-16v5h6V4h-6Z" },
-  { id: "library", label: "文件库", icon: "M3 7a2 2 0 0 1 2-2h4l2 2h8a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V7Z" },
-  { id: "users", label: "用户管理", icon: "M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2M9 11a4 4 0 1 0 0-8 4 4 0 0 0 0 8Zm13 10v-2a4 4 0 0 0-3-3.87M16 3.13a4 4 0 0 1 0 7.75" },
-  { id: "groups", label: "Group 管理", icon: "M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2M9 11a4 4 0 1 0 0-8 4 4 0 0 0 0 8Zm14 10v-2a4 4 0 0 0-3-3.87M16 3.13a4 4 0 0 1 0 7.75M23 21v-2a4 4 0 0 0-3-3.87" },
-  { id: "search", label: "查询", icon: "m21 21-4.3-4.3M11 18a7 7 0 1 0 0-14 7 7 0 0 0 0 14Z" },
-  { id: "settings", label: "设置", icon: "M12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6Zm7-3 2 1-2 3-2-1a7 7 0 0 1-2 1l-1 2h-4l-1-2a7 7 0 0 1-2-1l-2 1-2-3 2-1a7 7 0 0 1 0-2l-2-1 2-3 2 1a7 7 0 0 1 2 1l1-2h4l1 2a7 7 0 0 1 0 2l2-1 2 3-2 1a7 7 0 0 1 0 2Z" },
-];
-
-function renderDashboard(displayName: string, stats: DashboardStats | null, orgSlug: string): string {
-  const nav = NAV_TABS.map((t) => `
-    <button class="admin-tab" data-tab="${t.id}" style="display:flex;align-items:center;gap:10px;border-radius:10px;padding:9px 14px;font-size:13px;color:var(--text-3);background:none;border:none;cursor:pointer;text-align:left;width:100%">
-      <svg style="width:16px;height:16px;flex-shrink:0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="${t.icon}"/></svg>
-      ${t.label}
-    </button>`).join("\n");
-
-  const cards = [
-    { label: "文件夹", value: stats?.folders ?? "—" },
-    { label: "项目", value: stats?.projects ?? "—" },
-    { label: "文件", value: stats?.files ?? "—" },
-    { label: "活跃授权", value: stats?.grants ?? "—" },
-  ].map((s) => `
-        <div class="panel" style="padding:18px 20px">
-          <p style="font-size:12.5px;color:var(--text-3)">${s.label}</p>
-          <p style="margin-top:6px;font-size:28px;font-weight:600;color:var(--text)">${s.value}</p>
-        </div>`).join("");
-
-  const recentRows = stats === null || stats.recent.length === 0
-    ? `<div style="padding:26px 0;text-align:center;font-size:12.5px;color:var(--text-3)">暂无文件库活动 · 到「文件库」里创建第一个文件夹吧</div>`
-    : stats.recent.map((r) => `
-          <div style="display:flex;align-items:center;gap:12px;border-top:1px solid var(--border-soft);padding:9px 0;font-size:13px">
-            <span class="tag">${escapeHtml(r.action)}</span>
-            <span style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--text)">${escapeHtml(r.label)}</span>
-            <span style="margin-left:auto;flex-shrink:0;font-size:11.5px;color:var(--text-3)">${escapeHtml(r.actor)} · ${escapeHtml(r.when.toLocaleString("zh-CN"))}</span>
-          </div>`).join("");
-
-  const initial = escapeHtml(displayName.slice(0, 1) || "U");
-
-  return `<!doctype html>
-<html lang="zh-CN">
-${pageHead("Database Admin")}
-<body>
-  <div style="display:flex;height:100vh">
-    <aside style="width:240px;flex-shrink:0;background:var(--sidebar);border-right:1px solid var(--border-soft);display:flex;flex-direction:column">
-      <div style="padding:16px 16px 12px;border-bottom:1px solid var(--border-soft)">
-        <span style="font-size:15px;font-weight:600">Database Admin</span>
-      </div>
-      <nav style="flex:1;display:flex;flex-direction:column;gap:2px;padding:10px">
-        ${nav}
-      </nav>
-      <div style="margin:10px;padding:10px 12px;border-top:1px solid var(--border-soft);display:flex;align-items:center;gap:9px">
-        <div style="width:26px;height:26px;border-radius:50%;background:var(--accent);color:#fff;display:flex;align-items:center;justify-content:center;font-size:11px;font-weight:600;flex-shrink:0">${initial}</div>
-        <div style="min-width:0;flex:1">
-          <p style="font-size:10.5px;color:var(--text-3)">已登录</p>
-          <p style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:12.5px;color:var(--text)">${escapeHtml(displayName)}</p>
-        </div>
-        <button id="logout" class="btn" style="padding:3px 10px;font-size:11px">退出</button>
-      </div>
-    </aside>
-
-    <div style="flex:1;display:flex;flex-direction:column;min-width:0">
-      <section id="tab-overview" class="admin-tab-section" style="flex:1;overflow-y:auto;padding:28px">
-        <h1 style="font-size:18px;font-weight:600;margin-bottom:4px">概览</h1>
-        <p style="font-size:11.5px;color:var(--text-3);margin-bottom:20px">文件库实时数据</p>
-        <div style="display:grid;grid-template-columns:repeat(4,1fr);gap:16px">
-          ${cards}
-        </div>
-        <div class="panel" style="margin-top:18px">
-          <h2 style="font-size:13.5px;font-weight:600;margin-bottom:8px">最近活动</h2>
-          ${recentRows}
-        </div>
-      </section>
-
-      <section id="tab-library" class="admin-tab-section" style="display:none;flex:1;min-height:0">
-        ${renderLibraryBrowser()}
-      </section>
-
-      <section id="tab-users" class="admin-tab-section" style="display:none;flex:1;overflow-y:auto;padding:28px">
-        <h1 style="font-size:18px;font-weight:600;margin-bottom:16px">用户管理</h1>
-        ${renderUsersPanel(orgSlug)}
-      </section>
-
-      <section id="tab-groups" class="admin-tab-section" style="display:none;flex:1;overflow-y:auto;padding:28px">
-        <h1 style="font-size:18px;font-weight:600;margin-bottom:16px">Group 管理</h1>
-        ${renderGroupsPanel(orgSlug)}
-      </section>
-
-      <section id="tab-search" class="admin-tab-section" style="display:none;flex:1;overflow-y:auto;padding:28px">
-        <h1 style="font-size:18px;font-weight:600;margin-bottom:4px">查询</h1>
-        <p style="font-size:12.5px;color:var(--text-3)">查询功能建设中</p>
-      </section>
-
-      <section id="tab-settings" class="admin-tab-section" style="display:none;flex:1;overflow-y:auto;padding:28px">
-        <h1 style="font-size:18px;font-weight:600;margin-bottom:4px">设置</h1>
-        <p style="font-size:12.5px;color:var(--text-3)">设置功能建设中</p>
-      </section>
-    </div>
-  </div>
-
-  <script>
-    (function () {
-      const tabs = [...document.querySelectorAll(".admin-tab")];
-      const sections = Object.fromEntries(
-        [...document.querySelectorAll(".admin-tab-section")].map((s) => [s.id.replace("tab-", ""), s]),
-      );
-      function activate(id) {
-        tabs.forEach((t) => {
-          const on = t.dataset.tab === id;
-          t.style.background = on ? "var(--selected)" : "none";
-          t.style.color = on ? "var(--text)" : "var(--text-3)";
-          t.style.fontWeight = on ? "600" : "400";
-        });
-        Object.entries(sections).forEach(([key, s]) => {
-          s.style.display = key === id ? (key === "library" ? "block" : "block") : "none";
-        });
-        if (location.hash !== "#" + id) history.replaceState(null, "", "#" + id);
-      }
-      tabs.forEach((t) => t.addEventListener("click", () => activate(t.dataset.tab)));
-      document.getElementById("logout").addEventListener("click", async () => {
-        try { await fetch("/auth/logout", { method: "POST", credentials: "same-origin" }); } catch (e) {}
-        location.href = "/database/admin";
-      });
-      const fromHash = location.hash.replace(/^#/, "");
-      activate(tabs.some((t) => t.dataset.tab === fromHash) ? fromHash : "overview");
-    })();
-  </script>
-</body>
-</html>`;
-}
-
-function escapeHtml(value: string): string {
-  return value
-    .replaceAll("&", "&amp;")
-    .replaceAll("<", "&lt;")
-    .replaceAll(">", "&gt;")
-    .replaceAll('"', "&quot;");
-}

hub/src/database/routes/filelibRoutes.ts

@@ -21,7 +21,6 @@ import {
   listGrants,
   putGrants,
   revokeGrant,
-  setIndependentPermission,
 } from "../filelib/grantService.js";
 import { FileLibError } from "../filelib/model.js";
 import {
@@ -44,10 +43,22 @@ export async function registerFileLibRoutes(
   /* ------------------------------------------------------------ 身份 */
 
   // 前端判断能力面用:是否网站管理员(root 创建按钮显隐)。
+  // displayName/avatarUrl 供侧栏身份区显示 —— 页面不再服务端渲染(ADR-0029),
+  // 旧 renderDashboard 在 handler 里查 Prisma 拿到的名字,现在必须由这里带出去,
+  // 否则前端只有 userId 可显示。
   app.get("/database/api/me", async (request, reply) => {
     const actor = await actorOrNull(request, reply, deps);
     if (actor === null) return reply;
-    return { userId: actor.userId, isWebsiteAdmin: actor.isWebsiteAdmin };
+    const user = await deps.prisma.user.findUnique({
+      where: { id: actor.userId },
+      select: { displayName: true, avatarUrl: true },
+    });
+    return {
+      userId: actor.userId,
+      isWebsiteAdmin: actor.isWebsiteAdmin,
+      displayName: user?.displayName ?? actor.userId,
+      avatarUrl: user?.avatarUrl ?? null,
+    };
   });
 
   /* ------------------------------------------------------------ 树节点 */
@@ -102,9 +113,6 @@ export async function registerFileLibRoutes(
         where: { id, organizationId: deps.organizationId },
       });
       if (node === null) throw new FileLibError(404, "node_not_found", "node not found");
-      const settings = node.kind === "PROJECT"
-        ? await deps.prisma.fileLibProjectSettings.findUnique({ where: { nodeId: node.id } })
-        : null;
       return {
         node: {
           id: node.id,
@@ -114,7 +122,6 @@ export async function registerFileLibRoutes(
           description: node.description,
           role,
           provisionStatus: node.provisionStatus,
-          independentPermission: settings?.independentPermissionsEnabled ?? false,
           createdAt: node.createdAt,
           updatedAt: node.updatedAt,
         },
@@ -246,44 +253,8 @@ export async function registerFileLibRoutes(
     }
   });
 
-  app.put("/database/api/projects/:id/independent-permission", async (request, reply) => {
-    const actor = await actorOrNull(request, reply, deps);
-    if (actor === null) return reply;
-    try {
-      const { id } = request.params as { id: string };
-      const body = bodyObject(request.body);
-      if (typeof body["enabled"] !== "boolean") {
-        throw new FileLibError(400, "invalid_request", "enabled must be a boolean");
-      }
-      return await setIndependentPermission(grantDeps, actor, id, body["enabled"]);
-    } catch (error) {
-      return sendRouteError(reply, error);
-    }
-  });
-
-  /* ------------------------------------------------------------ Group 搜索(过渡) */
-
-  // 过渡实现:读 hub Team(C2 /groups/search 由 Group 团队交付后切换)。
-  app.get("/database/api/groups/search", async (request, reply) => {
-    const actor = await actorOrNull(request, reply, deps);
-    if (actor === null) return reply;
-    try {
-      const q = ((request.query as { q?: string }).q ?? "").trim();
-      const teams = await deps.prisma.team.findMany({
-        where: {
-          organizationId: deps.organizationId,
-          archivedAt: null,
-          ...(q === "" ? {} : { name: { contains: q, mode: "insensitive" as const } }),
-        },
-        take: 20,
-        orderBy: { name: "asc" },
-        select: { id: true, name: true },
-      });
-      return { groups: teams.map((t) => ({ id: t.id, name: t.name, breadcrumb: t.name })) };
-    } catch (error) {
-      return sendRouteError(reply, error);
-    }
-  });
+  // Group 搜索(C2 /groups/search)已迁至 memberGroupRoutes.ts,读 in-hub
+  // MemberGroup 闭包(ADR-0028)。此处不再注册,避免重复。
 }
 
 function parseGrants(raw: unknown): InitialGrant[] | undefined {

hub/src/database/routes/libraryBrowser.ts

@@ -1,596 +0,0 @@
-/**
- * 管理员后台「文件库」页内浏览器区块(树 | 内容 | 预览三栏,含授权管理)。
- *
- * renderLibraryBrowser() 返回可嵌入任意后台布局的 HTML+JS 片段:
- * 以 #lib-root 为根、内部用 q() 作用域选择器,不与宿主页其他元素冲突。
- * 与独立页版浏览器的区别:去掉了自己的 wordmark/用户栏(由后台外壳提供),
- * 保留管理员工具(根目录创建、授权面板、独立权限开关)。
- */
-
-export function renderLibraryBrowser(): string {
-  return `
-<div id="lib-root" style="display:flex;height:100%;min-height:0">
-  <!-- 左:目录树 -->
-  <div style="width:250px;flex-shrink:0;border-right:1px solid var(--border-soft);display:flex;flex-direction:column;background:var(--sidebar)">
-    <div style="display:flex;align-items:center;justify-content:space-between;padding:12px 14px;border-bottom:1px solid var(--border-soft)">
-      <span style="font-size:13px;font-weight:600;color:var(--text)">文件库</span>
-      <button id="lib-btn-new-root" class="btn hidden" style="padding:3px 10px;font-size:11px" title="新建根目录">+ 根目录</button>
-    </div>
-    <div id="lib-tree" style="flex:1;overflow-y:auto;padding:8px 8px 16px;font-size:13px"></div>
-  </div>
-
-  <!-- 中:节点内容 -->
-  <div id="lib-main" style="flex:1;overflow-y:auto;min-width:0">
-    <div class="lib-empty-hint">从左侧选择一个文件夹或项目</div>
-  </div>
-
-  <!-- 右:预览/编辑(选中文件时出现) -->
-  <div id="lib-preview" style="display:none;width:44%;min-width:380px;flex-shrink:0;overflow-y:auto;border-left:1px solid var(--border-soft);padding:16px"></div>
-
-  <div id="lib-modal-root"></div>
-  <div id="lib-toast-root" style="position:fixed;bottom:16px;right:16px;z-index:50;display:flex;flex-direction:column;gap:8px"></div>
-</div>
-
-<style>
-  #lib-root .lib-empty-hint { height:100%;display:flex;align-items:center;justify-content:center;color:var(--text-3);font-size:13px; }
-  #lib-root .tree-item { display:flex;align-items:center;gap:4px;padding:4px 6px;border-radius:6px;cursor:pointer;color:var(--text);transition:background 120ms ease;user-select:none; }
-  #lib-root .tree-item:hover { background:var(--hover); }
-  #lib-root .tree-item.selected { background:var(--selected); }
-  #lib-root .tree-children { border-left:1px solid var(--guide);margin-left:15px;padding-left:3px; }
-  #lib-root .tree-icon { width:16px;height:16px;flex-shrink:0;display:flex;align-items:center;justify-content:center; }
-  #lib-root .tree-caret { color:var(--text-3); }
-  #lib-root .tree-badge { margin-left:auto;padding-right:4px;font-size:10px;color:var(--text-3);font-family:var(--mono); }
-  #lib-root .tree-empty { padding:24px 12px;text-align:center;font-size:12px;color:var(--text-3); }
-  #lib-root .lib-toast { border-radius:8px;padding:8px 14px;font-size:12px;color:#fff;background:#333230;max-width:320px; }
-  #lib-root .lib-toast-err { background:#7E2C26; }
-  #lib-root .modal-mask { position:fixed;inset:0;z-index:40;background:rgba(26,26,24,.3);display:flex;align-items:center;justify-content:center;padding:16px; }
-  #lib-root .modal-card { width:100%;max-width:440px;background:var(--panel);border:1px solid var(--border);border-radius:12px;padding:22px; }
-  #lib-root pre.diff { white-space:pre-wrap;font-family:var(--mono);font-size:12px;line-height:1.7;background:var(--panel);border:1px solid var(--border);border-radius:8px;padding:10px;margin:0; }
-  #lib-root pre.diff .add { display:block;color:var(--diff-add-text);background:var(--diff-add-bg); }
-  #lib-root pre.diff .del { display:block;color:var(--diff-del-text);background:var(--diff-del-bg); }
-  #lib-root .meta-grid { display:grid;grid-template-columns:1fr 1fr;gap:10px 24px;font-size:13px;color:var(--text-2); }
-  #lib-root .meta-grid b { color:var(--text);font-weight:600; }
-  #lib-root .conflict-panel { margin-top:14px;border:1px solid #E8E2C8;background:#FCFBF4;border-radius:10px;padding:14px 16px; }
-  #lib-root .conflict-title { font-size:13px;font-weight:600;color:#6E6329;margin-bottom:8px; }
-  #lib-root .conflict-note { font-size:11px;color:#8A8059;margin-top:8px; }
-  #lib-root .export-status { font-size:11px;color:var(--text-3);font-family:var(--mono); }
-</style>
-
-<script>
-(function () {
-  const libRoot = document.getElementById("lib-root");
-  if (!libRoot) return;
-  const $ = (sel) => libRoot.querySelector(sel);
-  const $$ = (sel) => [...libRoot.querySelectorAll(sel)];
-  const esc = (s) => String(s).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;");
-
-  async function api(path, opts = {}) {
-    const res = await fetch(path, {
-      credentials: "same-origin",
-      headers: opts.body ? { "Content-Type": "application/json" } : undefined,
-      ...opts,
-      body: opts.body ? JSON.stringify(opts.body) : undefined,
-    });
-    if (res.status === 401) { location.href = "/database/admin"; throw new Error("unauthenticated"); }
-    if (res.status === 204) return null;
-    const text = await res.text();
-    const data = text ? JSON.parse(text) : null;
-    if (!res.ok) {
-      const err = (data && data.error) || { code: "unknown", message: res.statusText };
-      const e = new Error(err.message); e.code = err.code; e.status = res.status; Object.assign(e, err);
-      throw e;
-    }
-    return data;
-  }
-
-  function toast(msg, kind = "info") {
-    const el = document.createElement("div");
-    el.className = "lib-toast" + (kind === "err" ? " lib-toast-err" : "");
-    el.textContent = msg;
-    $("#lib-toast-root").appendChild(el);
-    setTimeout(() => el.remove(), 3600);
-  }
-  const ok = (m) => toast(m, "ok");
-  const fail = (e) => toast(e.message || String(e), "err");
-
-  function modal(html) {
-    const root = $("#lib-modal-root");
-    root.innerHTML = '<div class="modal-mask"><div class="modal-card">' + html + "</div></div>";
-    root.firstElementChild.addEventListener("click", (e) => { if (e.target === e.currentTarget) closeModal(); });
-  }
-  function closeModal() { $("#lib-modal-root").innerHTML = ""; }
-
-  let me = { userId: null, isWebsiteAdmin: false };
-  let current = null;
-  const expanded = new Set();
-  let currentFile = null;
-
-  const ICONS = {
-    caretRight: '<svg width="10" height="10" viewBox="0 0 24 24" fill="currentColor"><path d="M9 6l6 6-6 6z"/></svg>',
-    caretDown: '<svg width="10" height="10" viewBox="0 0 24 24" fill="currentColor"><path d="M6 9l6 6 6-6z"/></svg>',
-    folder: '<svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor"><path d="M3 7a2 2 0 0 1 2-2h4l2 2h8a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V7Z"/></svg>',
-    project: '<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"/></svg>',
-  };
-
-  async function loadChildren(parentId) {
-    const q = parentId === null ? "" : "?parentId=" + encodeURIComponent(parentId);
-    return (await api("/database/api/nodes" + q)).nodes;
-  }
-
-  async function renderTree() {
-    const tree = $("#lib-tree");
-    tree.innerHTML = "";
-    try {
-      const roots = await loadChildren(null);
-      if (roots.length === 0) {
-        tree.innerHTML = '<div class="tree-empty">空文件库' +
-          (me.isWebsiteAdmin ? " · 点上方「+ 根目录」开始" : "") + "</div>";
-        return;
-      }
-      for (const node of roots) tree.appendChild(await treeItem(node, 0));
-    } catch (e) { tree.innerHTML = '<div class="tree-empty">' + esc(e.message) + "</div>"; }
-  }
-
-  async function treeItem(node, depth) {
-    const wrap = document.createElement("div");
-    const row = document.createElement("div");
-    row.className = "tree-item" + (current && current.id === node.id ? " selected" : "");
-    const caret = document.createElement("span");
-    caret.className = "tree-icon tree-caret";
-    if (node.kind === "FOLDER") {
-      caret.innerHTML = expanded.has(node.id) ? ICONS.caretDown : ICONS.caretRight;
-      caret.onclick = (e) => { e.stopPropagation(); toggleExpand(node.id); };
-    }
-    row.appendChild(caret);
-    const iconSpan = document.createElement("span");
-    iconSpan.className = "tree-icon";
-    iconSpan.style.color = node.kind === "PROJECT" ? "#1A1A18" : "#9C9B96";
-    iconSpan.innerHTML = node.kind === "PROJECT" ? ICONS.project : ICONS.folder;
-    row.appendChild(iconSpan);
-    const nameSpan = document.createElement("span");
-    nameSpan.className = "truncate";
-    nameSpan.textContent = node.name;
-    row.appendChild(nameSpan);
-    if (node.role !== "MANAGE") {
-      const badge = document.createElement("span");
-      badge.className = "tree-badge";
-      badge.textContent = node.role;
-      row.appendChild(badge);
-    }
-    row.onclick = () => {
-      if (node.kind === "FOLDER") {
-        if (expanded.has(node.id)) expanded.delete(node.id); else expanded.add(node.id);
-      }
-      selectNode(node.id);
-    };
-    wrap.appendChild(row);
-    if (node.kind === "FOLDER" && expanded.has(node.id)) {
-      wrap.appendChild(await childrenBlock(node.id, depth));
-    }
-    return wrap;
-  }
-
-  async function childrenBlock(parentId, depth) {
-    const block = document.createElement("div");
-    block.className = "tree-children";
-    const kids = await loadChildren(parentId);
-    for (const kid of kids) block.appendChild(await treeItem(kid, depth + 1));
-    return block;
-  }
-
-  async function toggleExpand(id) {
-    if (expanded.has(id)) expanded.delete(id); else expanded.add(id);
-    await renderTree();
-  }
-
-  async function selectNode(id) {
-    try {
-      const [{ node }, { breadcrumb }] = await Promise.all([
-        api("/database/api/nodes/" + id),
-        api("/database/api/nodes/" + id + "/breadcrumb"),
-      ]);
-      current = node; current.breadcrumb = breadcrumb;
-      closePreview();
-      await renderTree();
-      renderMain();
-    } catch (e) { fail(e); }
-  }
-
-  function crumbsHtml() {
-    return current.breadcrumb.map((c) =>
-      c.name === null ? "<span>…</span>" : "<span>" + esc(c.name) + "</span>"
-    ).join('<span style="margin:0 4px;color:var(--border)">/</span>');
-  }
-
-  function renderMain() {
-    const n = current;
-    const canManage = n.role === "MANAGE";
-    const canEdit = canManage || n.role === "EDIT";
-    const tabs = [];
-    tabs.push(["detail", "概览"]);
-    if (n.kind === "PROJECT") tabs.push(["files", "文件"]);
-    if (canManage) tabs.push(["grants", "授权"]);
-    current.tab = current.tab && tabs.some(t => t[0] === current.tab) ? current.tab : "detail";
-
-    $("#lib-main").innerHTML =
-      '<div style="max-width:860px;margin:0 auto;padding:28px 28px 56px">' +
-        '<div style="font-size:12px;color:var(--text-3);margin-bottom:6px">' + crumbsHtml() + "</div>" +
-        '<div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:18px">' +
-          '<div style="font-size:17px;font-weight:600;color:var(--text);display:flex;align-items:center;gap:8px">' + esc(n.name) +
-            '<span class="tag">' + n.kind + "</span>" +
-            '<span class="tag tag-role">' + n.role + "</span>" +
-          "</div>" +
-          '<div style="display:flex;gap:6px">' +
-            (canEdit && n.kind === "FOLDER" ? '<button class="btn" onclick="window.__lib.createChild()">+ 新建子节点</button>' : "") +
-            (canManage ? '<button class="btn" onclick="window.__lib.renameCurrent()">重命名</button>' : "") +
-            (canManage ? '<button class="btn btn-danger" onclick="window.__lib.deleteCurrent()">删除</button>' : "") +
-          "</div>" +
-        "</div>" +
-        '<div class="tabs">' +
-          tabs.map(([id, label]) =>
-            '<button onclick="window.__lib.switchTab(\\'' + id + '\\')" class="tab' +
-            (current.tab === id ? " active" : "") + '">' + label + "</button>").join("") +
-        "</div>" +
-        '<div id="lib-tab-body"></div>' +
-      "</div>";
-    renderTab();
-  }
-
-  function renderTab() {
-    const body = $("#lib-tab-body");
-    if (current.tab === "files") return renderFilesTab(body);
-    if (current.tab === "grants") return renderGrantsTab(body);
-    let extra = "";
-    if (current.kind === "PROJECT") {
-      extra =
-        '<div class="divider"></div>' +
-        '<div class="inline-form" style="justify-content:flex-start">' +
-          '<span class="quiet">独立权限</span>' +
-          '<b style="font-size:13px">' + (current.independentPermission ? "开启" : "关闭") + "</b>" +
-          (current.role === "MANAGE"
-            ? '<button class="btn" onclick="window.__lib.toggleIndependent()">' + (current.independentPermission ? "关闭" : "开启") + "</button>"
-            : "") +
-          '<span class="quiet">关闭时仅继承父级权限(创建者除外)</span>' +
-        "</div>" +
-        '<div class="divider"></div>' +
-        '<div class="section-title">导出</div>' +
-        '<div class="inline-form">' +
-          '<select id="lib-x-target" class="select" style="width:auto"><option value="manifest">manifest(stub)</option></select>' +
-          '<button class="btn" onclick="window.__lib.submitExport()">开始导出</button>' +
-          '<span id="lib-x-status" class="export-status"></span>' +
-        "</div>";
-    }
-    body.innerHTML =
-      '<div class="panel">' +
-        '<div class="meta-grid">' +
-          "<div>类型 <b>" + current.kind + "</b></div>" +
-          "<div>我的权限 <b>" + current.role + "</b></div>" +
-          "<div>创建时间 " + new Date(current.createdAt).toLocaleString("zh-CN") + "</div>" +
-          "<div>更新时间 " + new Date(current.updatedAt).toLocaleString("zh-CN") + "</div>" +
-        "</div>" + extra +
-      "</div>";
-    pollExport();
-  }
-
-  /* ---------------- 节点操作 ---------------- */
-  function createDialog(parentId) {
-    modal(
-      '<div class="modal-title">' + (parentId ? "新建子节点" : "新建根目录") + "</div>" +
-      '<div class="form-row"><label class="form-label">名称</label>' +
-      '<input id="lib-f-name" class="input" placeholder="例如:物理必修一"/></div>' +
-      '<div class="form-row"><label class="form-label">类型</label>' +
-      '<select id="lib-f-kind" class="select">' +
-        '<option value="FOLDER">文件夹</option><option value="PROJECT">项目(Git 仓库)</option>' +
-      "</select></div>" +
-      '<div class="modal-actions">' +
-        '<button class="btn" onclick="window.__lib.closeModal()">取消</button>' +
-        '<button class="btn btn-primary" onclick="window.__lib.submitCreate(\\'' + (parentId ?? "") + '\\')">创建</button>' +
-      "</div>"
-    );
-  }
-  async function submitCreate(parentId) {
-    try {
-      await api("/database/api/nodes", { method: "POST", body: {
-        parentId: parentId === "" ? null : parentId,
-        kind: $("#lib-f-kind").value, name: $("#lib-f-name").value,
-      }});
-      closeModal(); ok("已创建");
-      if (parentId) expanded.add(parentId);
-      await renderTree();
-    } catch (e) { fail(e); }
-  }
-
-  /* ---------------- 授权 ---------------- */
-  async function renderGrantsTab(body) {
-    try {
-      const { grants } = await api("/database/api/nodes/" + current.id + "/grants");
-      const rows = grants.map((g) =>
-        "<tr>" +
-          "<td>" + (g.principalType === "USER" ? "👤" : "👥") + " " + esc(g.principalId) +
-            (g.isCreatorGrant ? ' <span class="quiet">(创建者)</span>' : "") + "</td>" +
-          '<td class="file-meta">' + g.role + "</td>" +
-          "<td style='text-align:right'>" + (g.isCreatorGrant ? "" :
-            '<button class="link-danger" onclick="window.__lib.revokeGrant(\\'' + g.id + '\\')">收回</button>') + "</td>" +
-        "</tr>").join("");
-      body.innerHTML =
-        '<div class="panel">' +
-          '<table class="list"><thead><tr><th>主体</th><th>级别</th><th></th></tr></thead>' +
-          "<tbody>" + rows + "</tbody></table>" +
-          '<div class="divider"></div>' +
-          '<div class="section-title">新增授权</div>' +
-          '<div class="inline-form">' +
-            '<select id="lib-g-type" class="select" style="width:110px" onchange="window.__lib.gTypeChanged()">' +
-              '<option value="USER">用户</option><option value="GROUP">Group</option></select>' +
-            '<input id="lib-g-principal" class="input" placeholder="用户 id"/>' +
-            '<select id="lib-g-group" class="select hidden"></select>' +
-            '<select id="lib-g-role" class="select" style="width:110px">' +
-              '<option value="VIEW">VIEW</option><option value="EDIT">EDIT</option><option value="MANAGE">MANAGE</option></select>' +
-            '<button class="btn btn-primary" onclick="window.__lib.addGrant()">授予</button>' +
-          "</div>" +
-          '<div class="section-note">MANAGE 仅创建者可授;创建者授权不可动(契约 8.1)</div>' +
-        "</div>";
-    } catch (e) { body.innerHTML = '<div class="panel quiet">' + esc(e.message) + "</div>"; }
-  }
-
-  /* ---------------- 文件 ---------------- */
-  async function renderFilesTab(body) {
-    try {
-      const { files } = await api("/database/api/projects/" + current.id + "/files");
-      const rows = files.map((f) =>
-        '<tr class="file-row" onclick="window.__lib.openFile(\\'' + esc(f.path) + '\\')">' +
-          '<td class="file-path">' + esc(f.path) + "</td>" +
-          '<td class="file-meta" style="text-align:right">' + f.size + " B</td></tr>").join("");
-      body.innerHTML =
-        '<div class="panel">' +
-          '<div class="inline-form" style="justify-content:space-between;margin-bottom:6px">' +
-            '<div class="section-title" style="margin:0">项目文件(' + files.length + ")</div>" +
-            (current.role !== "VIEW"
-              ? '<div class="inline-form" style="gap:6px">' +
-                '<button class="btn" onclick="window.__lib.newFileDialog()">+ 新建文件</button>' +
-                '<button class="btn btn-primary" onclick="document.getElementById(\\'lib-upload-input\\').click()">上传文件</button>' +
-                '<input id="lib-upload-input" type="file" class="hidden"/>' +
-                "</div>"
-              : "") +
-          "</div>" +
-          (files.length === 0 ? '<div class="quiet" style="padding:20px 0;text-align:center">空仓库 · 可新建或上传文件</div>'
-            : '<table class="list">' + rows + "</table>") +
-        "</div>";
-      const up = $("#lib-upload-input");
-      if (up) up.onchange = (e) => doUpload(e.target);
-    } catch (e) { body.innerHTML = '<div class="panel quiet">' + esc(e.message) + "</div>"; }
-  }
-
-  function newFileDialog() {
-    modal(
-      '<div class="modal-title">新建文件</div>' +
-      '<div class="form-row"><label class="form-label">路径</label>' +
-      '<input id="lib-nf-path" class="input" style="font-family:var(--mono)" placeholder="docs/intro.md"/></div>' +
-      '<div class="form-row"><label class="form-label">内容</label>' +
-      '<textarea id="lib-nf-content" rows="8" class="textarea" placeholder="内容…"></textarea></div>' +
-      '<div class="modal-actions"><button class="btn" onclick="window.__lib.closeModal()">取消</button>' +
-      '<button class="btn btn-primary" onclick="window.__lib.submitNewFile()">创建</button></div>'
-    );
-  }
-  async function submitNewFile() {
-    try {
-      await api("/database/api/projects/" + current.id + "/file", { method: "PUT", body: {
-        path: $("#lib-nf-path").value, content: $("#lib-nf-content").value,
-      }});
-      closeModal(); ok("已创建"); renderTab();
-    } catch (e) { fail(e); }
-  }
-
-  function u8ToBase64(bytes) {
-    let bin = "";
-    const CHUNK = 0x8000;
-    for (let i = 0; i < bytes.length; i += CHUNK) {
-      bin += String.fromCharCode.apply(null, bytes.subarray(i, i + CHUNK));
-    }
-    return btoa(bin);
-  }
-  async function doUpload(input) {
-    const file = input.files && input.files[0];
-    input.value = "";
-    if (!file) return;
-    if (file.size > 10 * 1024 * 1024) return toast("文件超过 10MB 上限", "err");
-    const targetPath = prompt("保存到路径(可含目录):", "材料/" + file.name);
-    if (!targetPath) return;
-    const bytes = new Uint8Array(await file.arrayBuffer());
-    const isBinary = bytes.includes(0);
-    const body = isBinary
-      ? { path: targetPath, content: u8ToBase64(bytes), encoding: "base64" }
-      : { path: targetPath, content: new TextDecoder("utf-8").decode(bytes), encoding: "utf8" };
-    try {
-      await api("/database/api/projects/" + current.id + "/file", { method: "PUT", body });
-      ok("已上传 " + file.name);
-      renderTab();
-    } catch (e) { fail(e); }
-  }
-
-  async function openFile(path) {
-    try {
-      const f = await api("/database/api/projects/" + current.id + "/file?path=" + encodeURIComponent(path));
-      currentFile = f;
-      const canEdit = current.role !== "VIEW";
-      const prev = $("#lib-preview");
-      prev.style.display = "block";
-      prev.innerHTML =
-        '<div class="panel">' +
-          '<div class="inline-form" style="justify-content:space-between;margin-bottom:10px">' +
-            '<span class="file-meta">' + esc(f.path) + " @ " + esc(f.version) + "</span>" +
-            '<div class="inline-form" style="gap:6px">' +
-              '<a class="btn" href="/database/api/projects/' + current.id + '/file/raw?path=' +
-                encodeURIComponent(f.path) + '" download>下载</a>' +
-              '<button class="btn" onclick="window.__lib.showHistory()">历史</button>' +
-              (canEdit ? '<button class="btn btn-danger" onclick="window.__lib.deleteFile()">删除文件</button>' : "") +
-              '<button class="btn" onclick="window.__lib.closePreview()" title="关闭预览">✕</button>' +
-            "</div>" +
-          "</div>" +
-          (f.encoding === "base64"
-            ? '<div class="quiet">二进制文件(' + f.size + " B),不支持在线编辑</div>"
-            : '<textarea id="lib-ef-content" rows="16" class="textarea" ' + (canEdit ? "" : "readonly") +
-              ">" + esc(f.content) + "</textarea>") +
-          (canEdit && f.encoding !== "base64"
-            ? '<div class="modal-actions"><button class="btn btn-primary" onclick="window.__lib.saveFile()">提交修改</button></div>'
-            : "") +
-          '<div id="lib-conflict-zone"></div>' +
-        "</div>";
-    } catch (e) { fail(e); }
-  }
-  function closePreview() {
-    const prev = $("#lib-preview");
-    if (prev) { prev.style.display = "none"; prev.innerHTML = ""; }
-    currentFile = null;
-  }
-  async function saveFile() {
-    try {
-      const r = await api("/database/api/projects/" + current.id + "/file/commits", { method: "POST", body: {
-        path: currentFile.path, baseVersion: currentFile.version, content: $("#lib-ef-content").value,
-      }});
-      ok("已提交 " + r.version); await openFile(currentFile.path);
-    } catch (e) {
-      if (e.status === 409 && e.currentVersion) return showConflict(e.currentVersion);
-      fail(e);
-    }
-  }
-  async function showConflict(currentVersion) {
-    const { diff } = await api("/database/api/projects/" + current.id + "/file/diff?path=" +
-      encodeURIComponent(currentFile.path) + "&from=" + encodeURIComponent(currentFile.version) +
-      "&to=" + encodeURIComponent(currentVersion));
-    $("#lib-conflict-zone").innerHTML =
-      '<div class="conflict-panel">' +
-        '<div class="conflict-title">冲突:他人已提交 ' + esc(currentVersion) + ",差异如下(你的基版 → 最新版)</div>" +
-        '<pre class="diff">' + esc(diff)
-          .replace(/^\\+(.*)$/gm, '<span class="add">+$1</span>')
-          .replace(/^-(.*)$/gm, '<span class="del">-$1</span>') + "</pre>" +
-        '<div class="conflict-note">请人工合并后,以最新内容为全文重新提交(基版将更新为 ' + esc(currentVersion) + ")</div>" +
-        '<div class="modal-actions"><button class="btn" onclick="window.__lib.acceptLatest()">载入最新内容</button></div>' +
-      "</div>";
-    currentFile.version = currentVersion;
-  }
-  async function deleteFile() {
-    if (!confirm("删除文件 " + currentFile.path + "?")) return;
-    try {
-      await api("/database/api/projects/" + current.id + "/file?path=" + encodeURIComponent(currentFile.path),
-        { method: "DELETE", body: { baseVersion: currentFile.version } });
-      ok("已删除"); closePreview(); renderTab();
-    } catch (e) { fail(e); }
-  }
-  async function showHistory() {
-    const { history } = await api("/database/api/projects/" + current.id + "/file/history?path=" +
-      encodeURIComponent(currentFile.path));
-    modal(
-      '<div class="modal-title">版本历史</div>' +
-      '<div style="max-height:320px;overflow-y:auto">' +
-        history.map((v) =>
-          '<div style="border-top:1px solid #F5F5F4;padding:8px 0;font-size:12px">' +
-            '<span class="file-meta" style="color:var(--accent)">' + esc(v.version) + "</span> " + esc(v.message) +
-            '<div class="quiet">' + new Date(v.committedAt).toLocaleString("zh-CN") +
-            (v.author ? " · " + esc(v.author) : "") + "</div></div>").join("") +
-      "</div>" +
-      '<div class="modal-actions"><button class="btn" onclick="window.__lib.closeModal()">关闭</button></div>'
-    );
-  }
-
-  /* ---------------- 导出 ---------------- */
-  let exportJobId = null;
-  async function submitExport() {
-    try {
-      const r = await api("/database/api/projects/" + current.id + "/exports", { method: "POST", body: { target: $("#lib-x-target").value } });
-      exportJobId = r.jobId;
-      $("#lib-x-status").textContent = "任务 " + r.jobId.slice(0, 8) + "… 排队中";
-      pollExport();
-    } catch (e) { fail(e); }
-  }
-  async function pollExport() {
-    if (!exportJobId) return;
-    try {
-      const job = await api("/database/api/exports/" + exportJobId);
-      const el = $("#lib-x-status");
-      if (!el) return;
-      if (job.status === "DONE") {
-        el.innerHTML = '完成 · <a href="/database/api/exports/' + exportJobId + '/download">下载</a>';
-      } else if (job.status === "FAILED") {
-        el.textContent = "失败:" + (job.error || "");
-      } else {
-        el.textContent = "状态:" + job.status + "…";
-        setTimeout(pollExport, 1000);
-      }
-    } catch { /* ignore */ }
-  }
-
-  /* ---------------- 暴露给内联 onclick 的操作表 ---------------- */
-  window.__lib = {
-    createChild() { createDialog(current.id); },
-    async renameCurrent() {
-      const name = prompt("新名称", current.name);
-      if (name === null) return;
-      try {
-        await api("/database/api/nodes/" + current.id, { method: "PATCH", body: { name } });
-        ok("已重命名"); await selectNode(current.id);
-      } catch (e) { fail(e); }
-    },
-    async deleteCurrent() {
-      if (!confirm("确认删除「" + current.name + "」?软删除后不可见。")) return;
-      try {
-        await api("/database/api/nodes/" + current.id, { method: "DELETE" });
-        ok("已删除"); current = null; await renderTree();
-        $("#lib-main").innerHTML = '<div class="lib-empty-hint">从左侧选择一个文件夹或项目</div>';
-        closePreview();
-      } catch (e) { fail(e); }
-    },
-    switchTab(id) { current.tab = id; renderMain(); },
-    async toggleIndependent() {
-      try {
-        await api("/database/api/projects/" + current.id + "/independent-permission", {
-          method: "PUT", body: { enabled: !current.independentPermission },
-        });
-        ok("已切换"); await selectNode(current.id);
-      } catch (e) { fail(e); }
-    },
-    async gTypeChanged() {
-      const isGroup = $("#lib-g-type").value === "GROUP";
-      $("#lib-g-principal").classList.toggle("hidden", isGroup);
-      $("#lib-g-group").classList.toggle("hidden", !isGroup);
-      if (isGroup && $("#lib-g-group").options.length === 0) {
-        const { groups } = await api("/database/api/groups/search?q=");
-        $("#lib-g-group").innerHTML = groups.map((g) => '<option value="' + esc(g.id) + '">' + esc(g.name) + "</option>").join("");
-      }
-    },
-    async addGrant() {
-      const type = $("#lib-g-type").value;
-      const principalId = type === "GROUP" ? $("#lib-g-group").value : $("#lib-g-principal").value.trim();
-      if (!principalId) return toast("请填写主体", "err");
-      try {
-        await api("/database/api/nodes/" + current.id + "/grants", { method: "PUT", body: {
-          grants: [{ principalType: type, principalId, role: $("#lib-g-role").value }],
-        }});
-        ok("已授予"); renderTab();
-      } catch (e) { fail(e); }
-    },
-    async revokeGrant(grantId) {
-      try {
-        await api("/database/api/nodes/" + current.id + "/grants/" + grantId, { method: "DELETE" });
-        ok("已收回"); renderTab();
-      } catch (e) { fail(e); }
-    },
-    newFileDialog, submitNewFile, openFile, closePreview, saveFile, deleteFile, showHistory,
-    acceptLatest() { openFile(currentFile.path); toast("已载入最新内容,请在此基础上合并", "info"); },
-    submitExport, closeModal,
-  };
-
-  /* ---------------- 初始化 ---------------- */
-  (async function init() {
-    try {
-      me = await api("/database/api/me");
-      if (me.isWebsiteAdmin) {
-        const btn = $("#lib-btn-new-root");
-        btn.classList.remove("hidden");
-        btn.onclick = () => createDialog(null);
-      }
-    } catch (e) { /* 401 已由 api 处理跳转 */ }
-    await renderTree();
-  })();
-})();
-</script>`;
-}

hub/src/database/routes/libraryPage.ts

@@ -1,801 +0,0 @@
-/**
- * /database/library —— 文件库浏览页(管理员后台的文件工具)。
- *
- * 服务端渲染外壳 + 浏览器端 JS 调 /database/api/*(同源 session cookie)。
- * 设计令牌与全局 UI 主题(uiTheme.ts)一致。能力面全部由 API 的 404/403 表达(D8)。
- */
-
-import type { FastifyInstance } from "fastify";
-import type { PrismaClient } from "@prisma/client";
-import { SESSION_COOKIE_NAME, verifySession } from "../../admin/auth/session.js";
-
-export interface LibraryPageConfig {
-  readonly prisma: PrismaClient;
-  readonly sessionSecret: string;
-}
-
-export async function registerLibraryPage(
-  app: FastifyInstance,
-  config: LibraryPageConfig,
-): Promise<void> {
-  app.get("/database/library", async (request, reply) => {
-    const raw = request.cookies[SESSION_COOKIE_NAME];
-    const session = raw === undefined || raw === "" ? null : verifySession(raw, config.sessionSecret);
-    if (session === null) return reply.redirect("/database/admin");
-    const user = await config.prisma.user.findUnique({
-      where: { id: session.userId },
-      select: { displayName: true },
-    });
-    if (user === null) return reply.redirect("/database/admin");
-    return reply.type("text/html").send(renderLibraryPage(user.displayName));
-  });
-}
-
-function renderLibraryPage(displayName: string): string {
-  const initial = displayName.slice(0, 1).replace(/[&<>"']/, "U");
-  return `<!doctype html>
-<html lang="zh-CN">
-<head>
-  <meta charset="utf-8"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1"/>
-  <title>文件库</title>
-  <link rel="preconnect" href="https://fonts.googleapis.com"/>
-  <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap" rel="stylesheet"/>
-  <style>
-    /* 设计令牌:与全局 UI 主题(uiTheme.ts)保持一致。 */
-    :root {
-      --bg: #FCFCFB;
-      --panel: #FFFFFF;
-      --sidebar: #F7F7F5;
-      --text: #1A1A18;
-      --text-2: #6B6A66;
-      --text-3: #9C9B96;
-      --border: #ECECE8;
-      --border-soft: #F1F1EE;
-      --accent: #1A1A18;
-      --accent-hover: #333330;
-      --selected: #EBEBE7;
-      --hover: #F4F4F1;
-      --danger: #A13A33;
-      --guide: #E9E9E5;
-      --diff-add-bg: #F3F6F2;
-      --diff-add-text: #4A6741;
-      --diff-del-bg: #F8F2F1;
-      --diff-del-text: #A13A33;
-      --mono: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
-    }
-    * { box-sizing: border-box; }
-    html, body { margin: 0; height: 100%; }
-    body {
-      font-family: 'Inter', -apple-system, 'Segoe UI', 'PingFang SC', 'Microsoft YaHei', sans-serif;
-      background: var(--bg); color: var(--text);
-      font-size: 14px; line-height: 1.6;
-      -webkit-font-smoothing: antialiased;
-    }
-    .hidden { display: none !important; }
-
-    /* 布局 */
-    .shell { display: flex; height: 100vh; }
-    .sidebar {
-      width: 292px; flex-shrink: 0; background: var(--sidebar);
-      border-right: 1px solid var(--border);
-      display: flex; flex-direction: column;
-    }
-    .sidebar-head {
-      display: flex; align-items: center; justify-content: space-between;
-      padding: 14px 16px; border-bottom: 1px solid var(--border);
-    }
-    .wordmark { font-size: 14px; font-weight: 600; color: var(--text); }
-    .sidebar-actions { display: flex; gap: 6px; }
-    .tree { flex: 1; overflow-y: auto; padding: 8px 8px 16px; font-size: 13px; }
-    .sidebar-user {
-      margin: 0; padding: 10px 16px;
-      border-top: 1px solid var(--border);
-      display: flex; align-items: center; gap: 8px;
-      font-size: 12px; color: var(--text-2);
-    }
-    .avatar {
-      width: 24px; height: 24px; border-radius: 50%;
-      background: var(--accent); color: #fff;
-      display: flex; align-items: center; justify-content: center;
-      font-size: 11px; font-weight: 600; flex-shrink: 0;
-    }
-    .main { flex: 1; overflow-y: auto; }
-    .main-inner { max-width: 860px; margin: 0 auto; padding: 32px 32px 64px; }
-    .empty-hint {
-      height: 100%; display: flex; align-items: center; justify-content: center;
-      color: var(--text-3); font-size: 13px;
-    }
-
-    /* 树 */
-    .tree-item {
-      display: flex; align-items: center; gap: 4px;
-      padding: 4px 6px; border-radius: 6px; cursor: pointer;
-      color: var(--text); transition: background 120ms ease;
-      user-select: none;
-    }
-    .tree-item:hover { background: var(--hover); }
-    .tree-item.selected { background: var(--selected); color: #1C1917; }
-    .tree-children { border-left: 1px solid var(--guide); margin-left: 15px; padding-left: 3px; }
-    .tree-icon { width: 16px; height: 16px; flex-shrink: 0; display: flex; align-items: center; justify-content: center; }
-    .tree-caret { color: var(--text-3); }
-    .tree-badge { margin-left: auto; padding-right: 4px; font-size: 10px; color: var(--text-3); font-family: var(--mono); }
-    .tree-empty { padding: 24px 12px; text-align: center; font-size: 12px; color: var(--text-3); }
-
-    /* 按钮 */
-    .btn {
-      display: inline-flex; align-items: center; gap: 4px;
-      padding: 5px 12px; border-radius: 8px;
-      border: 1px solid var(--border); background: var(--panel);
-      color: var(--accent); font-size: 12px; font-weight: 500;
-      cursor: pointer; transition: all 120ms ease; text-decoration: none;
-    }
-    .btn:hover { background: var(--hover); border-color: #D6D3D1; }
-    .btn-primary {
-      background: var(--accent); border-color: var(--accent); color: #fff;
-    }
-    .btn-primary:hover { background: var(--accent-hover); border-color: var(--accent-hover); }
-    .btn-danger {
-      border-color: transparent; background: transparent; color: var(--danger);
-    }
-    .btn-danger:hover { background: var(--diff-del-bg); border-color: transparent; }
-
-    /* 内容区 */
-    .crumbs { font-size: 12px; color: var(--text-3); margin-bottom: 6px; }
-    .crumbs span + span::before { content: " / "; color: var(--border); }
-    .node-head { display: flex; align-items: center; justify-content: space-between; margin-bottom: 18px; }
-    .node-title { font-size: 17px; font-weight: 600; color: var(--text); display: flex; align-items: center; gap: 8px; }
-    .tag {
-      font-size: 10px; font-weight: 500; font-family: var(--mono);
-      padding: 2px 7px; border-radius: 999px;
-      border: 1px solid var(--border); color: var(--text-2); background: var(--panel);
-    }
-    .tag-role { color: var(--accent); border-color: #D6D3D1; }
-    .node-actions { display: flex; gap: 6px; }
-    .tabs { display: flex; gap: 2px; border-bottom: 1px solid var(--border); margin-bottom: 18px; }
-    .tab {
-      padding: 8px 14px; font-size: 13px; color: var(--text-2);
-      border: none; background: none; cursor: pointer;
-      border-bottom: 2px solid transparent; margin-bottom: -1px;
-      transition: color 120ms ease;
-    }
-    .tab:hover { color: var(--text); }
-    .tab.active { color: var(--text); font-weight: 600; border-bottom-color: var(--accent); }
-    .panel {
-      background: var(--panel); border: 1px solid var(--border);
-      border-radius: 10px; padding: 20px 22px;
-    }
-    .panel + .panel, .panel + #file-editor { margin-top: 14px; }
-    .meta-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 10px 24px; font-size: 13px; color: var(--text-2); }
-    .meta-grid b { color: var(--text); font-weight: 600; }
-    .section-title { font-size: 13px; font-weight: 600; color: var(--text); margin-bottom: 10px; }
-    .section-note { font-size: 11px; color: var(--text-3); margin-top: 6px; }
-
-    /* 表格 */
-    table.list { width: 100%; border-collapse: collapse; font-size: 13px; }
-    table.list th { text-align: left; font-size: 11px; font-weight: 500; color: var(--text-3); padding: 4px 0; }
-    table.list td { padding: 7px 0; border-top: 1px solid #F5F5F4; }
-    table.list tr:first-child td { border-top: none; }
-    .file-row { cursor: pointer; }
-    .file-row:hover td { background: var(--hover); }
-    .file-path { font-family: var(--mono); font-size: 12px; color: var(--text); }
-    .file-meta { font-size: 11px; color: var(--text-3); font-family: var(--mono); }
-    .link-danger { color: var(--danger); font-size: 12px; background: none; border: none; cursor: pointer; padding: 0; }
-    .link-danger:hover { text-decoration: underline; }
-
-    /* 表单 */
-    .input, .select, .textarea {
-      width: 100%; padding: 7px 10px; border-radius: 8px;
-      border: 1px solid var(--border); background: var(--panel);
-      font-size: 13px; color: var(--text); font-family: inherit;
-      outline: none; transition: border-color 120ms ease;
-    }
-    .input:focus, .select:focus, .textarea:focus { border-color: var(--accent); }
-    .textarea { font-family: var(--mono); font-size: 12px; line-height: 1.7; resize: vertical; }
-    .form-label { display: block; font-size: 11px; color: var(--text-2); margin-bottom: 4px; }
-    .form-row { margin-bottom: 12px; }
-    .inline-form { display: flex; gap: 8px; align-items: center; }
-    .inline-form .input { flex: 1; }
-
-    /* 弹层 */
-    .modal-mask {
-      position: fixed; inset: 0; z-index: 40;
-      background: rgba(26, 26, 24, .3);
-      display: flex; align-items: center; justify-content: center; padding: 16px;
-    }
-    .modal-card {
-      width: 100%; max-width: 440px; background: var(--panel);
-      border: 1px solid var(--border); border-radius: 12px; padding: 22px;
-    }
-    .modal-title { font-size: 15px; font-weight: 600; margin-bottom: 14px; }
-    .modal-actions { display: flex; justify-content: flex-end; gap: 8px; margin-top: 16px; }
-    .toast {
-      border-radius: 8px; padding: 8px 14px; font-size: 12px; color: #fff;
-      background: #333230; max-width: 320px;
-    }
-    .toast-ok { background: #333230; }
-    .toast-err { background: #7E2C26; }
-    #toast-root { position: fixed; bottom: 16px; right: 16px; z-index: 50; display: flex; flex-direction: column; gap: 8px; }
-
-    /* 冲突与 diff */
-    .conflict-panel {
-      margin-top: 14px; border: 1px solid #E8E2C8; background: #FCFBF4;
-      border-radius: 10px; padding: 14px 16px;
-    }
-    .conflict-title { font-size: 13px; font-weight: 600; color: #6E6329; margin-bottom: 8px; }
-    .conflict-note { font-size: 11px; color: #8A8059; margin-top: 8px; }
-    pre.diff {
-      white-space: pre-wrap; font-family: var(--mono); font-size: 12px; line-height: 1.7;
-      background: var(--panel); border: 1px solid var(--border); border-radius: 8px; padding: 10px;
-      margin: 0;
-    }
-    pre.diff .add { display: block; color: var(--diff-add-text); background: var(--diff-add-bg); }
-    pre.diff .del { display: block; color: var(--diff-del-text); background: var(--diff-del-bg); }
-
-    .divider { border-top: 1px solid var(--border); margin: 14px 0; }
-    .quiet { color: var(--text-3); font-size: 12px; }
-    .export-status { font-size: 11px; color: var(--text-3); font-family: var(--mono); }
-    .export-status a { color: var(--accent); }
-  </style>
-</head>
-<body>
-  <div class="shell">
-    <aside class="sidebar">
-      <div class="sidebar-head">
-        <span class="wordmark">文件库</span>
-        <div class="sidebar-actions">
-          <button id="btn-new-root" class="btn hidden" title="新建根目录">+ 根目录</button>
-          <a class="btn" href="/database/dashboard">后台</a>
-        </div>
-      </div>
-      <div id="tree" class="tree"></div>
-      <div class="sidebar-user">
-        <div class="avatar">${initial}</div>
-        <span style="flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--text)">${displayName}</span>
-        <button id="btn-logout" class="btn" style="padding:3px 10px;font-size:11px" title="退出登录">退出</button>
-      </div>
-    </aside>
-    <main class="main" id="main">
-      <div class="empty-hint">从左侧选择一个文件夹或项目</div>
-    </main>
-  </div>
-
-  <div id="modal-root"></div>
-  <div id="toast-root"></div>
-
-<script>
-/* ---------------- 基础设施 ---------------- */
-const $ = (sel) => document.querySelector(sel);
-const esc = (s) => String(s).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;");
-
-async function api(path, opts = {}) {
-  const res = await fetch(path, {
-    credentials: "same-origin",
-    headers: opts.body ? { "Content-Type": "application/json" } : undefined,
-    ...opts,
-    body: opts.body ? JSON.stringify(opts.body) : undefined,
-  });
-  if (res.status === 401) { location.href = "/database/admin"; throw new Error("unauthenticated"); }
-  if (res.status === 204) return null;
-  const text = await res.text();
-  const data = text ? JSON.parse(text) : null;
-  if (!res.ok) {
-    const err = (data && data.error) || { code: "unknown", message: res.statusText };
-    const e = new Error(err.message); e.code = err.code; e.status = res.status; Object.assign(e, err);
-    throw e;
-  }
-  return data;
-}
-
-function toast(msg, kind = "info") {
-  const el = document.createElement("div");
-  el.className = "toast " + (kind === "err" ? "toast-err" : "toast-ok");
-  el.textContent = msg;
-  $("#toast-root").appendChild(el);
-  setTimeout(() => el.remove(), 3600);
-}
-const ok = (m) => toast(m, "ok");
-const fail = (e) => toast(e.message || String(e), "err");
-
-function modal(html) {
-  const root = $("#modal-root");
-  root.innerHTML = '<div class="modal-mask"><div class="modal-card">' + html + "</div></div>";
-  root.firstElementChild.addEventListener("click", (e) => { if (e.target === e.currentTarget) closeModal(); });
-}
-function closeModal() { $("#modal-root").innerHTML = ""; }
-
-/* ---------------- 状态 ---------------- */
-let me = { userId: null, isWebsiteAdmin: false };
-let current = null;
-const expanded = new Set();
-
-/* ---------------- 目录树 ---------------- */
-/* 图标统一用固定尺寸的 inline SVG。每行几何一致:[16px 箭头槽][16px 图标槽][名称]。 */
-const ICONS = {
-  caretRight: '<svg width="10" height="10" viewBox="0 0 24 24" fill="currentColor"><path d="M9 6l6 6-6 6z"/></svg>',
-  caretDown: '<svg width="10" height="10" viewBox="0 0 24 24" fill="currentColor"><path d="M6 9l6 6 6-6z"/></svg>',
-  folder: '<svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor"><path d="M3 7a2 2 0 0 1 2-2h4l2 2h8a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V7Z"/></svg>',
-  project: '<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"/></svg>',
-};
-
-async function loadChildren(parentId) {
-  const q = parentId === null ? "" : "?parentId=" + encodeURIComponent(parentId);
-  return (await api("/database/api/nodes" + q)).nodes;
-}
-
-async function renderTree() {
-  const tree = $("#tree");
-  tree.innerHTML = "";
-  try {
-    const roots = await loadChildren(null);
-    if (roots.length === 0) {
-      tree.innerHTML = '<div class="tree-empty">空文件库' +
-        (me.isWebsiteAdmin ? " · 点上方「+ 根目录」开始" : "") + "</div>";
-      return;
-    }
-    for (const node of roots) tree.appendChild(await treeItem(node, 0));
-  } catch (e) { tree.innerHTML = '<div class="tree-empty">' + esc(e.message) + "</div>"; }
-}
-
-async function treeItem(node, depth) {
-  const wrap = document.createElement("div");
-  const row = document.createElement("div");
-  row.className = "tree-item" + (current && current.id === node.id ? " selected" : "");
-
-  const caret = document.createElement("span");
-  caret.className = "tree-icon tree-caret";
-  if (node.kind === "FOLDER") {
-    caret.innerHTML = expanded.has(node.id) ? ICONS.caretDown : ICONS.caretRight;
-    caret.onclick = (e) => { e.stopPropagation(); toggleExpand(node.id, wrap, depth); };
-  }
-  row.appendChild(caret);
-
-  const iconSpan = document.createElement("span");
-  iconSpan.className = "tree-icon";
-  iconSpan.style.color = node.kind === "PROJECT" ? "#1A1A18" : "#9C9B96";
-  iconSpan.innerHTML = node.kind === "PROJECT" ? ICONS.project : ICONS.folder;
-  row.appendChild(iconSpan);
-
-  const nameSpan = document.createElement("span");
-  nameSpan.className = "truncate";
-  nameSpan.textContent = node.name;
-  row.appendChild(nameSpan);
-  if (node.role !== "MANAGE") {
-    const badge = document.createElement("span");
-    badge.className = "tree-badge";
-    badge.textContent = node.role;
-    row.appendChild(badge);
-  }
-
-  row.onclick = () => {
-    if (node.kind === "FOLDER") {
-      if (expanded.has(node.id)) expanded.delete(node.id); else expanded.add(node.id);
-    }
-    selectNode(node.id);
-  };
-  wrap.appendChild(row);
-  if (node.kind === "FOLDER" && expanded.has(node.id)) {
-    wrap.appendChild(await childrenBlock(node.id, depth));
-  }
-  return wrap;
-}
-
-async function childrenBlock(parentId, depth) {
-  const block = document.createElement("div");
-  block.className = "tree-children";
-  const kids = await loadChildren(parentId);
-  for (const kid of kids) block.appendChild(await treeItem(kid, depth + 1));
-  return block;
-}
-
-async function toggleExpand(id, wrap, depth) {
-  if (expanded.has(id)) expanded.delete(id); else expanded.add(id);
-  await renderTree();
-}
-
-/* ---------------- 节点详情 ---------------- */
-async function selectNode(id) {
-  try {
-    const [{ node }, { breadcrumb }] = await Promise.all([
-      api("/database/api/nodes/" + id),
-      api("/database/api/nodes/" + id + "/breadcrumb"),
-    ]);
-    current = node; current.breadcrumb = breadcrumb;
-    await renderTree();
-    renderMain();
-  } catch (e) { fail(e); }
-}
-
-function crumbsHtml() {
-  return current.breadcrumb.map((c) =>
-    c.name === null ? "<span>…</span>" : "<span>" + esc(c.name) + "</span>"
-  ).join("");
-}
-
-function renderMain() {
-  const n = current;
-  const canManage = n.role === "MANAGE";
-  const canEdit = canManage || n.role === "EDIT";
-  const tabs = [];
-  tabs.push(["detail", "概览"]);
-  if (n.kind === "PROJECT") tabs.push(["files", "文件"]);
-  if (canManage) tabs.push(["grants", "授权"]);
-  current.tab = current.tab && tabs.some(t => t[0] === current.tab) ? current.tab : "detail";
-
-  $("#main").innerHTML =
-    '<div class="main-inner">' +
-      '<div class="crumbs">' + crumbsHtml() + "</div>" +
-      '<div class="node-head">' +
-        '<div class="node-title">' + esc(n.name) +
-          '<span class="tag">' + n.kind + "</span>" +
-          '<span class="tag tag-role">' + n.role + "</span>" +
-        "</div>" +
-        '<div class="node-actions">' +
-          (canEdit && n.kind === "FOLDER" ? '<button class="btn" onclick="createChild()">+ 新建子节点</button>' : "") +
-          (canManage ? '<button class="btn" onclick="renameCurrent()">重命名</button>' : "") +
-          (canManage ? '<button class="btn btn-danger" onclick="deleteCurrent()">删除</button>' : "") +
-        "</div>" +
-      "</div>" +
-      '<div class="tabs">' +
-        tabs.map(([id, label]) =>
-          '<button onclick="switchTab(\\'' + id + '\\')" class="tab' +
-          (current.tab === id ? " active" : "") + '">' + label + "</button>").join("") +
-      "</div>" +
-      '<div id="tab-body"></div>' +
-    "</div>";
-  renderTab();
-}
-
-function switchTab(id) { current.tab = id; renderMain(); }
-
-async function renderTab() {
-  const body = $("#tab-body");
-  if (current.tab === "files") return renderFilesTab(body);
-  if (current.tab === "grants") return renderGrantsTab(body);
-  let extra = "";
-  if (current.kind === "PROJECT") {
-    extra =
-      '<div class="divider"></div>' +
-      '<div class="inline-form" style="justify-content:flex-start">' +
-        '<span class="quiet">独立权限</span>' +
-        '<b style="font-size:13px">' + (current.independentPermission ? "开启" : "关闭") + "</b>" +
-        (current.role === "MANAGE"
-          ? '<button class="btn" onclick="toggleIndependent()">' + (current.independentPermission ? "关闭" : "开启") + "</button>"
-          : "") +
-        '<span class="quiet">关闭时仅继承父级权限(创建者除外)</span>' +
-      "</div>" +
-      '<div class="divider"></div>' +
-      '<div class="section-title">导出</div>' +
-      '<div class="inline-form">' +
-        '<select id="x-target" class="select" style="width:auto"><option value="manifest">manifest(stub)</option></select>' +
-        '<button class="btn" onclick="submitExport()">开始导出</button>' +
-        '<span id="x-status" class="export-status"></span>' +
-      "</div>";
-  }
-  body.innerHTML =
-    '<div class="panel">' +
-      '<div class="meta-grid">' +
-        "<div>类型 <b>" + current.kind + "</b></div>" +
-        "<div>我的权限 <b>" + current.role + "</b></div>" +
-        "<div>创建时间 " + new Date(current.createdAt).toLocaleString("zh-CN") + "</div>" +
-        "<div>更新时间 " + new Date(current.updatedAt).toLocaleString("zh-CN") + "</div>" +
-      "</div>" + extra +
-    "</div>";
-  pollExport();
-}
-
-/* ---------------- 节点操作 ---------------- */
-async function createChild() {
-  createDialog(current.id);
-}
-function createDialog(parentId) {
-  modal(
-    '<div class="modal-title">' + (parentId ? "新建子节点" : "新建根目录") + "</div>" +
-    '<div class="form-row"><label class="form-label">名称</label>' +
-    '<input id="f-name" class="input" placeholder="例如:物理必修一"/></div>' +
-    '<div class="form-row"><label class="form-label">类型</label>' +
-    '<select id="f-kind" class="select">' +
-      '<option value="FOLDER">文件夹</option><option value="PROJECT">项目(Git 仓库)</option>' +
-    "</select></div>" +
-    '<div class="modal-actions">' +
-      '<button class="btn" onclick="closeModal()">取消</button>' +
-      '<button class="btn btn-primary" onclick="submitCreate(\\'' + (parentId ?? "") + '\\')">创建</button>' +
-    "</div>"
-  );
-}
-async function submitCreate(parentId) {
-  try {
-    await api("/database/api/nodes", { method: "POST", body: {
-      parentId: parentId === "" ? null : parentId,
-      kind: $("#f-kind").value, name: $("#f-name").value,
-    }});
-    closeModal(); ok("已创建");
-    if (parentId) expanded.add(parentId);
-    await renderTree();
-  } catch (e) { fail(e); }
-}
-async function renameCurrent() {
-  const name = prompt("新名称", current.name);
-  if (name === null) return;
-  try {
-    await api("/database/api/nodes/" + current.id, { method: "PATCH", body: { name } });
-    ok("已重命名"); await selectNode(current.id);
-  } catch (e) { fail(e); }
-}
-async function deleteCurrent() {
-  if (!confirm("确认删除「" + current.name + "」?软删除后不可见。")) return;
-  try {
-    await api("/database/api/nodes/" + current.id, { method: "DELETE" });
-    ok("已删除"); current = null; await renderTree();
-    $("#main").innerHTML = '<div class="empty-hint">从左侧选择一个文件夹或项目</div>';
-  } catch (e) { fail(e); }
-}
-async function toggleIndependent() {
-  try {
-    await api("/database/api/projects/" + current.id + "/independent-permission", {
-      method: "PUT", body: { enabled: !current.independentPermission },
-    });
-    ok("已切换"); await selectNode(current.id);
-  } catch (e) { fail(e); }
-}
-
-/* ---------------- 授权 ---------------- */
-async function renderGrantsTab(body) {
-  try {
-    const { grants } = await api("/database/api/nodes/" + current.id + "/grants");
-    const rows = grants.map((g) =>
-      "<tr>" +
-        "<td>" + (g.principalType === "USER" ? "👤" : "👥") + " " + esc(g.principalId) +
-          (g.isCreatorGrant ? ' <span class="quiet">(创建者)</span>' : "") + "</td>" +
-        '<td class="file-meta">' + g.role + "</td>" +
-        "<td style='text-align:right'>" + (g.isCreatorGrant ? "" :
-          '<button class="link-danger" onclick="revokeGrant(\\'' + g.id + '\\')">收回</button>') + "</td>" +
-      "</tr>").join("");
-    body.innerHTML =
-      '<div class="panel">' +
-        '<table class="list"><thead><tr><th>主体</th><th>级别</th><th></th></tr></thead>' +
-        "<tbody>" + rows + "</tbody></table>" +
-        '<div class="divider"></div>' +
-        '<div class="section-title">新增授权</div>' +
-        '<div class="inline-form">' +
-          '<select id="g-type" class="select" style="width:110px" onchange="gTypeChanged()">' +
-            '<option value="USER">用户</option><option value="GROUP">Group</option></select>' +
-          '<input id="g-principal" class="input" placeholder="用户 id"/>' +
-          '<select id="g-group" class="select hidden"></select>' +
-          '<select id="g-role" class="select" style="width:110px">' +
-            '<option value="VIEW">VIEW</option><option value="EDIT">EDIT</option><option value="MANAGE">MANAGE</option></select>' +
-          '<button class="btn btn-primary" onclick="addGrant()">授予</button>' +
-        "</div>" +
-        '<div class="section-note">MANAGE 仅创建者可授;创建者授权不可动(契约 8.1)</div>' +
-      "</div>";
-  } catch (e) { body.innerHTML = '<div class="panel quiet">' + esc(e.message) + "</div>"; }
-}
-async function gTypeChanged() {
-  const isGroup = $("#g-type").value === "GROUP";
-  $("#g-principal").classList.toggle("hidden", isGroup);
-  $("#g-group").classList.toggle("hidden", !isGroup);
-  if (isGroup && $("#g-group").options.length === 0) {
-    const { groups } = await api("/database/api/groups/search?q=");
-    $("#g-group").innerHTML = groups.map((g) => '<option value="' + esc(g.id) + '">' + esc(g.name) + "</option>").join("");
-  }
-}
-async function addGrant() {
-  const type = $("#g-type").value;
-  const principalId = type === "GROUP" ? $("#g-group").value : $("#g-principal").value.trim();
-  if (!principalId) return toast("请填写主体", "err");
-  try {
-    await api("/database/api/nodes/" + current.id + "/grants", { method: "PUT", body: {
-      grants: [{ principalType: type, principalId, role: $("#g-role").value }],
-    }});
-    ok("已授予"); renderTab();
-  } catch (e) { fail(e); }
-}
-async function revokeGrant(grantId) {
-  try {
-    await api("/database/api/nodes/" + current.id + "/grants/" + grantId, { method: "DELETE" });
-    ok("已收回"); renderTab();
-  } catch (e) { fail(e); }
-}
-
-/* ---------------- 文件 ---------------- */
-let currentFile = null;
-async function renderFilesTab(body) {
-  try {
-    const { files } = await api("/database/api/projects/" + current.id + "/files");
-    const rows = files.map((f) =>
-      '<tr class="file-row" onclick=\\'openFile("' + esc(f.path) + '")\\'>' +
-        '<td class="file-path">' + esc(f.path) + "</td>" +
-        '<td class="file-meta" style="text-align:right">' + f.size + " B</td></tr>").join("");
-    body.innerHTML =
-      '<div class="panel">' +
-        '<div class="inline-form" style="justify-content:space-between;margin-bottom:6px">' +
-          '<div class="section-title" style="margin:0">项目文件(' + files.length + ")</div>" +
-          (current.role !== "VIEW"
-            ? '<div class="inline-form" style="gap:6px">' +
-              '<button class="btn" onclick="newFileDialog()">+ 新建文件</button>' +
-              '<button class="btn btn-primary" onclick="document.getElementById(\\'upload-input\\').click()">上传文件</button>' +
-              '<input id="upload-input" type="file" class="hidden" onchange="doUpload(this)"/>' +
-              "</div>"
-            : "") +
-        "</div>" +
-        (files.length === 0 ? '<div class="quiet" style="padding:20px 0;text-align:center">空仓库 · 可新建或上传文件</div>'
-          : '<table class="list">' + rows + "</table>") +
-      "</div>" +
-      '<div id="file-editor"></div>';
-  } catch (e) { body.innerHTML = '<div class="panel quiet">' + esc(e.message) + "</div>"; }
-}
-async function newFileDialog() {
-  modal(
-    '<div class="modal-title">新建文件</div>' +
-    '<div class="form-row"><label class="form-label">路径</label>' +
-    '<input id="nf-path" class="input" style="font-family:var(--mono)" placeholder="docs/intro.md"/></div>' +
-    '<div class="form-row"><label class="form-label">内容</label>' +
-    '<textarea id="nf-content" rows="8" class="textarea" placeholder="内容…"></textarea></div>' +
-    '<div class="modal-actions"><button class="btn" onclick="closeModal()">取消</button>' +
-    '<button class="btn btn-primary" onclick="submitNewFile()">创建</button></div>'
-  );
-}
-
-/* 磁盘文件上传:文本走 utf8,含 NUL 字节判为二进制走 base64(与服务端一致)。 */
-function u8ToBase64(bytes) {
-  let bin = "";
-  const CHUNK = 0x8000;
-  for (let i = 0; i < bytes.length; i += CHUNK) {
-    bin += String.fromCharCode.apply(null, bytes.subarray(i, i + CHUNK));
-  }
-  return btoa(bin);
-}
-async function doUpload(input) {
-  const file = input.files && input.files[0];
-  input.value = "";
-  if (!file) return;
-  if (file.size > 10 * 1024 * 1024) return toast("文件超过 10MB 上限", "err");
-  const targetPath = prompt("保存到路径(可含目录):", "材料/" + file.name);
-  if (!targetPath) return;
-  const bytes = new Uint8Array(await file.arrayBuffer());
-  const isBinary = bytes.includes(0);
-  const body = isBinary
-    ? { path: targetPath, content: u8ToBase64(bytes), encoding: "base64" }
-    : { path: targetPath, content: new TextDecoder("utf-8").decode(bytes), encoding: "utf8" };
-  try {
-    await api("/database/api/projects/" + current.id + "/file", { method: "PUT", body });
-    ok("已上传 " + file.name);
-    renderTab();
-  } catch (e) { fail(e); }
-}
-async function submitNewFile() {
-  try {
-    await api("/database/api/projects/" + current.id + "/file", { method: "PUT", body: {
-      path: $("#nf-path").value, content: $("#nf-content").value,
-    }});
-    closeModal(); ok("已创建"); renderTab();
-  } catch (e) { fail(e); }
-}
-async function openFile(path) {
-  try {
-    const f = await api("/database/api/projects/" + current.id + "/file?path=" + encodeURIComponent(path));
-    currentFile = f;
-    const canEdit = current.role !== "VIEW";
-    $("#file-editor").innerHTML =
-      '<div class="panel">' +
-        '<div class="inline-form" style="justify-content:space-between;margin-bottom:10px">' +
-          '<span class="file-meta">' + esc(f.path) + " @ " + esc(f.version) + "</span>" +
-          '<div class="inline-form" style="gap:6px">' +
-            '<a class="btn" href="/database/api/projects/' + current.id + '/file/raw?path=' +
-              encodeURIComponent(f.path) + '" download>下载</a>' +
-            '<button class="btn" onclick="showHistory()">历史</button>' +
-            (canEdit ? '<button class="btn btn-danger" onclick="deleteFile()">删除文件</button>' : "") +
-          "</div>" +
-        "</div>" +
-        (f.encoding === "base64"
-          ? '<div class="quiet">二进制文件(' + f.size + " B),不支持在线编辑</div>"
-          : '<textarea id="ef-content" rows="14" class="textarea" ' + (canEdit ? "" : "readonly") +
-            ">" + esc(f.content) + "</textarea>") +
-        (canEdit && f.encoding !== "base64"
-          ? '<div class="modal-actions"><button class="btn btn-primary" onclick="saveFile()">提交修改</button></div>'
-          : "") +
-        '<div id="conflict-zone"></div>' +
-      "</div>";
-  } catch (e) { fail(e); }
-}
-async function saveFile() {
-  try {
-    const r = await api("/database/api/projects/" + current.id + "/file/commits", { method: "POST", body: {
-      path: currentFile.path, baseVersion: currentFile.version, content: $("#ef-content").value,
-    }});
-    ok("已提交 " + r.version); await openFile(currentFile.path);
-  } catch (e) {
-    if (e.status === 409 && e.currentVersion) return showConflict(e.currentVersion);
-    fail(e);
-  }
-}
-async function showConflict(currentVersion) {
-  const { diff } = await api("/database/api/projects/" + current.id + "/file/diff?path=" +
-    encodeURIComponent(currentFile.path) + "&from=" + encodeURIComponent(currentFile.version) +
-    "&to=" + encodeURIComponent(currentVersion));
-  $("#conflict-zone").innerHTML =
-    '<div class="conflict-panel">' +
-      '<div class="conflict-title">冲突:他人已提交 ' + esc(currentVersion) + ",差异如下(你的基版 → 最新版)</div>" +
-      '<pre class="diff">' + esc(diff)
-        .replace(/^\\+(.*)$/gm, '<span class="add">+$1</span>')
-        .replace(/^-(.*)$/gm, '<span class="del">-$1</span>') + "</pre>" +
-      '<div class="conflict-note">请人工合并后,以最新内容为全文重新提交(基版将更新为 ' + esc(currentVersion) + ")</div>" +
-      '<div class="modal-actions"><button class="btn" onclick="acceptLatest(\\'' + esc(currentVersion) + '\\')">载入最新内容</button></div>' +
-    "</div>";
-  currentFile.version = currentVersion;
-}
-async function acceptLatest() { await openFile(currentFile.path); toast("已载入最新内容,请在此基础上合并", "info"); }
-async function deleteFile() {
-  if (!confirm("删除文件 " + currentFile.path + "?")) return;
-  try {
-    await api("/database/api/projects/" + current.id + "/file?path=" + encodeURIComponent(currentFile.path),
-      { method: "DELETE", body: { baseVersion: currentFile.version } });
-    ok("已删除"); currentFile = null; renderTab();
-  } catch (e) { fail(e); }
-}
-async function showHistory() {
-  const { history } = await api("/database/api/projects/" + current.id + "/file/history?path=" +
-    encodeURIComponent(currentFile.path));
-  modal(
-    '<div class="modal-title">版本历史</div>' +
-    '<div style="max-height:320px;overflow-y:auto">' +
-      history.map((v) =>
-        '<div style="border-top:1px solid #F5F5F4;padding:8px 0;font-size:12px">' +
-          '<span class="file-meta" style="color:var(--accent)">' + esc(v.version) + "</span> " + esc(v.message) +
-          '<div class="quiet">' + new Date(v.committedAt).toLocaleString("zh-CN") +
-          (v.author ? " · " + esc(v.author) : "") + "</div></div>").join("") +
-    "</div>" +
-    '<div class="modal-actions"><button class="btn" onclick="closeModal()">关闭</button></div>'
-  );
-}
-
-/* ---------------- 导出 ---------------- */
-let exportJobId = null;
-async function submitExport() {
-  try {
-    const r = await api("/database/api/projects/" + current.id + "/exports", { method: "POST", body: { target: $("#x-target").value } });
-    exportJobId = r.jobId;
-    $("#x-status").textContent = "任务 " + r.jobId.slice(0, 8) + "… 排队中";
-    pollExport();
-  } catch (e) { fail(e); }
-}
-async function pollExport() {
-  if (!exportJobId) return;
-  try {
-    const job = await api("/database/api/exports/" + exportJobId);
-    const el = $("#x-status");
-    if (!el) return;
-    if (job.status === "DONE") {
-      el.innerHTML = '完成 · <a href="/database/api/exports/' + exportJobId + '/download">下载</a>';
-    } else if (job.status === "FAILED") {
-      el.textContent = "失败:" + (job.error || "");
-    } else {
-      el.textContent = "状态:" + job.status + "…";
-      setTimeout(pollExport, 1000);
-    }
-  } catch { /* job 可能属于别的项目 */ }
-}
-
-/* ---------------- 启动 ---------------- */
-(async function init() {
-  const logoutBtn = $("#btn-logout");
-  if (logoutBtn) {
-    logoutBtn.addEventListener("click", async () => {
-      try { await fetch("/auth/logout", { method: "POST", credentials: "same-origin" }); } catch {}
-      location.href = "/database/admin";
-    });
-  }
-  try {
-    me = await api("/database/api/me");
-    if (me.isWebsiteAdmin) {
-      const btn = $("#btn-new-root");
-      btn.classList.remove("hidden");
-      btn.onclick = () => createDialog(null);
-    }
-  } catch (e) { /* 401 已由 api 处理跳转 */ }
-  await renderTree();
-})();
-</script>
-</body>
-</html>`;
-}

hub/src/database/routes/memberGroupRoutes.ts

@@ -0,0 +1,196 @@
+/**
+ * /database/api/groups/* 成员组管理端点(ADR-0028)。
+ * 约定:绝对路径;actorOrNull 前置 fail closed;业务全走 memberGroupService;
+ * 错误统一 sendRouteError。
+ *
+ * 管理端点(CRUD + 成员)由 service 层门禁到网站管理员;搜索端点不限管理员
+ * (授权选择器是 Manage 持有者的能力,决策2)。
+ */
+
+import type { FastifyInstance } from "fastify";
+import {
+  addMember,
+  createMemberGroup,
+  deleteMemberGroup,
+  listMemberGroups,
+  listMembers,
+  removeMember,
+  restoreMemberGroup,
+  searchMemberGroups,
+  searchUsers,
+  updateMemberGroup,
+} from "../filelib/memberGroupService.js";
+import { FileLibError } from "../filelib/model.js";
+import {
+  actorOrNull,
+  bodyObject,
+  optionalString,
+  requireString,
+  sendRouteError,
+  type FileLibRouteDeps,
+} from "../filelib/routeShared.js";
+
+export async function registerMemberGroupRoutes(
+  app: FastifyInstance,
+  deps: FileLibRouteDeps,
+): Promise<void> {
+  const svc = { prisma: deps.prisma, organizationId: deps.organizationId };
+
+  /* ------------------------------------------------------------ 搜索(授权选择器) */
+
+  // 契约 C2 /groups/search:活跃组 + breadcrumb。**非管理员可调**(决策2)。
+  // 注:必须先于 "/database/api/groups" 之类的段前缀之外单独成路径,Fastify
+  // 静态路由不会 shadow,顺序无关;此处与其它端点平级注册。
+  app.get("/database/api/groups/search", async (request, reply) => {
+    const actor = await actorOrNull(request, reply, deps);
+    if (actor === null) return reply;
+    try {
+      const q = (request.query as { q?: string }).q ?? "";
+      return { groups: await searchMemberGroups(svc, q) };
+    } catch (error) {
+      return sendRouteError(reply, error);
+    }
+  });
+
+  // 成员选择器:搜全局用户。仅管理员(service 层门禁)。
+  // excludeGroupId 过滤掉该组已有活跃成员。
+  app.get("/database/api/users/search", async (request, reply) => {
+    const actor = await actorOrNull(request, reply, deps);
+    if (actor === null) return reply;
+    try {
+      const query = request.query as { q?: string; excludeGroupId?: string };
+      return { users: await searchUsers(svc, actor, query.q ?? "", query.excludeGroupId) };
+    } catch (error) {
+      return sendRouteError(reply, error);
+    }
+  });
+
+  /* ------------------------------------------------------------ 组 CRUD */
+
+  // includeArchived=1 时连已归档组一并返回(带 archivedAt),供后台展示/恢复。
+  app.get("/database/api/groups", async (request, reply) => {
+    const actor = await actorOrNull(request, reply, deps);
+    if (actor === null) return reply;
+    try {
+      const raw = (request.query as { includeArchived?: string }).includeArchived;
+      const includeArchived = raw === "1" || raw === "true";
+      return { groups: await listMemberGroups(svc, actor, includeArchived) };
+    } catch (error) {
+      return sendRouteError(reply, error);
+    }
+  });
+
+  app.post("/database/api/groups", async (request, reply) => {
+    const actor = await actorOrNull(request, reply, deps);
+    if (actor === null) return reply;
+    try {
+      const body = bodyObject(request.body);
+      const parentIdRaw = body["parentId"];
+      if (parentIdRaw !== undefined && parentIdRaw !== null && typeof parentIdRaw !== "string") {
+        throw new FileLibError(400, "invalid_request", "parentId must be a string or null");
+      }
+      const group = await createMemberGroup(svc, actor, {
+        name: requireString(body, "name"),
+        description: optionalString(body, "description"),
+        parentId: parentIdRaw === undefined ? null : parentIdRaw,
+      });
+      return reply.status(201).send({ group });
+    } catch (error) {
+      return sendRouteError(reply, error);
+    }
+  });
+
+  // 改名 / 改描述(决策6)。不接受 parentId —— reparent 仍不在 v1(决策5)。
+  app.patch("/database/api/groups/:id", async (request, reply) => {
+    const actor = await actorOrNull(request, reply, deps);
+    if (actor === null) return reply;
+    try {
+      const { id } = request.params as { id: string };
+      const body = bodyObject(request.body);
+      if (body["parentId"] !== undefined) {
+        throw new FileLibError(400, "invalid_request", "reparent is not supported (ADR-0028)");
+      }
+      // description 需区分"未传"(不动)与 ""(清空),故不用 optionalString
+      // (它把 "" 也归为 undefined)。
+      const descRaw = body["description"];
+      if (descRaw !== undefined && descRaw !== null && typeof descRaw !== "string") {
+        throw new FileLibError(400, "invalid_request", "description must be a string");
+      }
+      const group = await updateMemberGroup(svc, actor, id, {
+        name: optionalString(body, "name"),
+        description: descRaw === undefined || descRaw === null ? undefined : descRaw,
+      });
+      return { group };
+    } catch (error) {
+      return sendRouteError(reply, error);
+    }
+  });
+
+  app.delete("/database/api/groups/:id", async (request, reply) => {
+    const actor = await actorOrNull(request, reply, deps);
+    if (actor === null) return reply;
+    try {
+      const { id } = request.params as { id: string };
+      const result = await deleteMemberGroup(svc, actor, id);
+      return { archivedCount: result.archivedCount };
+    } catch (error) {
+      return sendRouteError(reply, error);
+    }
+  });
+
+  // 恢复(取消归档)。与删除不对称:只恢复该组 + 已归档祖先链,不动子树(决策7)。
+  app.post("/database/api/groups/:id/restore", async (request, reply) => {
+    const actor = await actorOrNull(request, reply, deps);
+    if (actor === null) return reply;
+    try {
+      const { id } = request.params as { id: string };
+      const result = await restoreMemberGroup(svc, actor, id);
+      return { restoredCount: result.restoredCount };
+    } catch (error) {
+      return sendRouteError(reply, error);
+    }
+  });
+
+  /* ------------------------------------------------------------ 成员 */
+
+  app.get("/database/api/groups/:id/members", async (request, reply) => {
+    const actor = await actorOrNull(request, reply, deps);
+    if (actor === null) return reply;
+    try {
+      const { id } = request.params as { id: string };
+      return { members: await listMembers(svc, actor, id) };
+    } catch (error) {
+      return sendRouteError(reply, error);
+    }
+  });
+
+  app.post("/database/api/groups/:id/members", async (request, reply) => {
+    const actor = await actorOrNull(request, reply, deps);
+    if (actor === null) return reply;
+    try {
+      const { id } = request.params as { id: string };
+      const body = bodyObject(request.body);
+      const userId = optionalString(body, "userId");
+      const feishuOpenId = optionalString(body, "feishuOpenId");
+      if (userId === undefined && feishuOpenId === undefined) {
+        throw new FileLibError(400, "invalid_request", "userId or feishuOpenId is required");
+      }
+      const member = await addMember(svc, actor, id, { userId, feishuOpenId });
+      return reply.status(201).send({ member });
+    } catch (error) {
+      return sendRouteError(reply, error);
+    }
+  });
+
+  app.delete("/database/api/groups/:id/members/:userId", async (request, reply) => {
+    const actor = await actorOrNull(request, reply, deps);
+    if (actor === null) return reply;
+    try {
+      const { id, userId } = request.params as { id: string; userId: string };
+      await removeMember(svc, actor, id, userId);
+      return reply.status(204).send();
+    } catch (error) {
+      return sendRouteError(reply, error);
+    }
+  });
+}

hub/src/database/routes/teacherApp.ts

@@ -1,15 +1,12 @@
 /**
- * 老师端用户前端托管(标准前后端分离):
- *   GET /app/*                  — filelib-web(Svelte SPA)构建产物静态托管 + SPA 回退
- *   GET /database/api/login-info — 登录页配置(org slug / dev 开关)
- *   GET /app/dev-login{,-teacher} — DEV ONLY 一键登录(管理员 / 普通老师)
+ * 老师端后端支撑(标准前后端分离):
+ *   GET /database/api/login-info  — 登录页配置(org slug / dev 开关)
+ *   GET /app/dev-login-teacher    — DEV ONLY 一键登录(普通老师)
  *
- * 服务端不再渲染老师端页面;页面由独立前端工程 hub/filelib-web 产出。
+ * 服务端不渲染任何页面。`/app/*` 的静态托管与 SPA 回退在 ../static.ts —— 那里
+ * 与管理后台 `/database/*` 共用同一份 filelib-web 构建产物,资源路由只注册一次。
  */
 
-import fs from "node:fs";
-import path from "node:path";
-import fastifyStatic from "@fastify/static";
 import type { FastifyInstance } from "fastify";
 import type { PrismaClient } from "@prisma/client";
 import { SESSION_COOKIE_NAME, signSession } from "../../admin/auth/session.js";
@@ -33,26 +30,6 @@ export async function registerTeacherApp(
     devLoginEnabled: config.allowDevLoginBypass,
   }));
 
-  // 标准分离:静态托管 SPA 构建产物;非文件路径回退 index.html 交给前端。
-  const distDir = path.resolve(import.meta.dirname, "../../../filelib-web/dist");
-  if (fs.existsSync(path.join(distDir, "index.html"))) {
-    await app.register(fastifyStatic, { root: distDir, prefix: "/app/", decorateReply: true });
-    app.setNotFoundHandler((request, reply) => {
-      if (request.url.startsWith("/app")) {
-        return reply.sendFile("index.html", distDir);
-      }
-      return reply.status(404).send({ error: { code: "not_found", message: "not found" } });
-    });
-  } else {
-    app.log.warn({ distDir }, "filelib-web dist not found; build it with `npm run build --prefix filelib-web`");
-    app.get("/app", async (_request, reply) =>
-      reply
-        .status(503)
-        .type("text/plain")
-        .send("filelib-web 未构建。请先运行 npm run build --prefix hub/filelib-web"),
-    );
-  }
-
   if (!config.allowDevLoginBypass) return;
   registerDevLogins(app, config);
 }

hub/src/database/routes/uiTheme.ts

@@ -1,138 +0,0 @@
-/**
- * 全局共享 UI 主题(老师端 /app、管理员后台 /database、文件页 /database/library)。
- *
- * 方向:高级简约、零视觉疲劳 —— 暖白底、发丝边框、近黑主按钮(唯一强调色)、
- * 无渐变、无彩色、无阴影(弹层仅一丝)、Inter 全界面、克制的动效。
- * 所有页面的设计令牌收敛于此,调色只改这里。
- */
-
-export const UI_HEAD_FONTS = `
-  <link rel="preconnect" href="https://fonts.googleapis.com"/>
-  <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap" rel="stylesheet"/>
-`;
-
-export const UI_THEME_CSS = `
-  :root {
-    --bg: #FCFCFB;
-    --panel: #FFFFFF;
-    --sidebar: #F7F7F5;
-    --text: #1A1A18;
-    --text-2: #6B6A66;
-    --text-3: #9C9B96;
-    --border: #ECECE8;
-    --border-soft: #F1F1EE;
-    --hover: #F4F4F1;
-    --selected: #EBEBE7;
-    --accent: #1A1A18;
-    --accent-hover: #333330;
-    --danger: #A13A33;
-    --guide: #E9E9E5;
-    --diff-add-bg: #F3F6F2;
-    --diff-add-text: #4A6741;
-    --diff-del-bg: #F8F2F1;
-    --diff-del-text: #A13A33;
-    --sans: 'Inter', -apple-system, 'Segoe UI', 'PingFang SC', 'Microsoft YaHei', sans-serif;
-    --mono: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
-    --shadow-pop: 0 4px 20px rgba(26,26,24,.07);
-  }
-  * { box-sizing: border-box; }
-  html, body { margin: 0; height: 100%; }
-  body {
-    font-family: var(--sans);
-    background: var(--bg); color: var(--text);
-    font-size: 14px; line-height: 1.65;
-    -webkit-font-smoothing: antialiased;
-  }
-  .hidden { display: none !important; }
-  h1, h2, h3 { margin: 0; }
-  a { color: var(--text); text-decoration: none; }
-  a:hover { text-decoration: underline; }
-
-  /* 按钮:近黑实心(主)/ 发丝边幽灵(次)/ 文字型(危险) */
-  .btn {
-    display: inline-flex; align-items: center; gap: 5px;
-    padding: 6px 14px; border-radius: 8px;
-    border: 1px solid var(--border); background: var(--panel);
-    color: var(--text); font-size: 12.5px; font-weight: 500;
-    cursor: pointer; transition: all 120ms ease; text-decoration: none;
-  }
-  .btn:hover { background: var(--hover); text-decoration: none; }
-  .btn-primary {
-    background: var(--accent); border-color: var(--accent); color: #fff;
-  }
-  .btn-primary:hover { background: var(--accent-hover); border-color: var(--accent-hover); }
-  .btn-danger { border-color: transparent; background: transparent; color: var(--danger); }
-  .btn-danger:hover { background: #A13A3312; }
-
-  /* 面板与标签 */
-  .panel {
-    background: var(--panel); border: 1px solid var(--border-soft);
-    border-radius: 10px; padding: 20px 22px;
-  }
-  .tag {
-    font-size: 10.5px; font-weight: 500; font-family: var(--mono);
-    padding: 2px 8px; border-radius: 999px;
-    border: 1px solid var(--border-soft); color: var(--text-3); background: var(--panel);
-  }
-  .tag-role { color: var(--text-2); border-color: var(--border); }
-
-  /* 页签 */
-  .tabs { display: flex; gap: 2px; border-bottom: 1px solid var(--border-soft); margin-bottom: 18px; }
-  .tab {
-    padding: 8px 14px; font-size: 13px; color: var(--text-3);
-    border: none; background: none; cursor: pointer;
-    border-bottom: 2px solid transparent; margin-bottom: -1px;
-    transition: color 120ms ease;
-  }
-  .tab:hover { color: var(--text); }
-  .tab.active { color: var(--text); font-weight: 600; border-bottom-color: var(--accent); }
-
-  /* 表单 */
-  .input, .select, .textarea {
-    width: 100%; padding: 7px 11px; border-radius: 8px;
-    border: 1px solid var(--border); background: var(--panel);
-    font-size: 13px; color: var(--text); font-family: inherit;
-    outline: none; transition: border-color 120ms ease;
-  }
-  .input:focus, .select:focus, .textarea:focus { border-color: var(--accent); }
-  .textarea { font-family: var(--mono); font-size: 12.5px; line-height: 1.75; resize: vertical; }
-  .form-label { display: block; font-size: 11.5px; color: var(--text-3); margin-bottom: 4px; }
-  .form-row { margin-bottom: 12px; }
-  .inline-form { display: flex; gap: 8px; align-items: center; }
-  .inline-form .input { flex: 1; }
-
-  /* 表格 */
-  table.list { width: 100%; border-collapse: collapse; font-size: 13px; }
-  table.list th { text-align: left; font-size: 11.5px; font-weight: 500; color: var(--text-3); padding: 4px 0; }
-  table.list td { padding: 8px 0; border-top: 1px solid var(--border-soft); }
-  table.list tr:first-child td { border-top: none; }
-
-  /* 弹层 */
-  .modal-mask {
-    position: fixed; inset: 0; z-index: 40;
-    background: rgba(26,26,24,.3);
-    display: flex; align-items: center; justify-content: center; padding: 16px;
-  }
-  .modal-card {
-    width: 100%; max-width: 430px; background: var(--panel);
-    border: 1px solid var(--border-soft); border-radius: 14px; padding: 22px;
-    box-shadow: var(--shadow-pop);
-  }
-  .modal-title { font-size: 15px; font-weight: 600; margin-bottom: 14px; }
-  .modal-actions { display: flex; justify-content: flex-end; gap: 8px; margin-top: 16px; }
-  .toast {
-    border-radius: 8px; padding: 8px 16px; font-size: 12.5px; color: #fff;
-    background: #333230; max-width: 330px;
-  }
-  .toast-err { background: #7E2C26; }
-  #toast-root { position: fixed; bottom: 18px; right: 18px; z-index: 50; display: flex; flex-direction: column; gap: 8px; }
-
-  .quiet { color: var(--text-3); font-size: 12.5px; }
-  .divider { border-top: 1px solid var(--border-soft); margin: 14px 0; }
-  .section-title { font-size: 13px; font-weight: 600; margin-bottom: 10px; }
-  .section-note { font-size: 11.5px; color: var(--text-3); margin-top: 6px; }
-  .file-path { font-family: var(--mono); font-size: 12.5px; color: var(--text); }
-  .file-meta { font-size: 11px; color: var(--text-3); font-family: var(--mono); }
-  .link-danger { color: var(--danger); font-size: 12.5px; background: none; border: none; cursor: pointer; padding: 0; }
-  .link-danger:hover { text-decoration: underline; }
-`;

hub/src/database/static.ts

@@ -0,0 +1,71 @@
+/**
+ * 前端静态托管:老师端 `/app/*` 与管理后台 `/database/*` 共用 `hub/filelib-web`
+ * 这**一份** SvelteKit 构建产物(adapter-static + fallback,见 filelib-web/svelte.config.js)。
+ *
+ * 标准前后端分离:服务端不渲染任何页面 —— 两个前缀下都只把同一个 index.html
+ * 原样送出,由 SvelteKit 客户端路由决定显示哪个视图;数据一律走 /database/api/*。
+ *
+ * 三类路由:
+ *   /_filelib/*           — 构建产物资源(JS/CSS/字体)。SvelteKit 的 appDir 被改名为
+ *                           `_filelib`,以避开 admin-web 在根上注册的 /_app/*
+ *                           (见 ../admin/static.ts)—— 同名会让 Fastify 启动即抛重复路由。
+ *   /app, /app/*          — 老师端 SPA 回退
+ *   /database, /database/* — 管理后台 SPA 回退
+ *
+ * 具体路由(/database/api/*、/database/dev-login、/app/dev-login-teacher 等)由
+ * databaseRoutes.ts / teacherApp.ts 先注册;Fastify 按具体度匹配,通配不遮蔽它们。
+ *
+ * Override the UI directory with `CPH_FILELIB_UI_DIR` if needed.
+ */
+import { readFile } from "node:fs/promises";
+import { existsSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { dirname, join, resolve as resolvePath } from "node:path";
+import fastifyStatic from "@fastify/static";
+import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
+
+function resolveUiDir(): string {
+  const override = process.env["CPH_FILELIB_UI_DIR"];
+  if (override && override.trim() !== "") return resolvePath(override);
+  const here = dirname(fileURLToPath(import.meta.url));
+  return resolvePath(join(here, "..", "..", "filelib-web", "build"));
+}
+
+/** 构建产物根目录下的顶层静态文件(SvelteKit 把 static/ 原样拷到这里)。 */
+const TOP_LEVEL_FILES = ["favicon.svg", "favicon.ico", "robots.txt"] as const;
+
+export async function registerDatabaseSpa(app: FastifyInstance): Promise<void> {
+  const uiDir = resolveUiDir();
+  if (!existsSync(join(uiDir, "index.html"))) {
+    app.log.warn(
+      { uiDir },
+      "filelib-web/build not found; /app and /database SPA shells disabled. Run `npm run build --prefix filelib-web` to enable. JSON APIs remain fully functional.",
+    );
+    return;
+  }
+  const indexHtml = await readFile(join(uiDir, "index.html"), "utf8");
+
+  // 构建资源。@fastify/static 负责 MIME、ETag/Last-Modified 与目录穿越防护。
+  // 只注册一次 —— /app 与 /database 下的页面引用的都是这同一组绝对路径
+  // (filelib-web 的 paths.relative=false 保证了这点)。
+  await app.register(fastifyStatic, {
+    root: join(uiDir, "_filelib"),
+    prefix: "/_filelib/",
+    decorateReply: true,
+  });
+
+  for (const name of TOP_LEVEL_FILES) {
+    if (!existsSync(join(uiDir, name))) continue;
+    app.get(`/${name}`, async (_request, reply) => reply.sendFile(name, uiDir));
+  }
+
+  // SPA 回退:两个前缀,同一份 index.html。处理器不读请求、不查库 —— 所以
+  // 启动时读一次缓存在闭包里是安全的(每个请求发出的字节完全相同)。
+  const sendIndex = async (_request: FastifyRequest, reply: FastifyReply): Promise<FastifyReply> =>
+    reply.type("text/html; charset=utf-8").send(indexHtml);
+
+  app.get("/app", sendIndex);
+  app.get("/app/*", sendIndex);
+  app.get("/database", sendIndex);
+  app.get("/database/*", sendIndex);
+}

hub/src/deployment/siloRateLimit.ts

@@ -2,8 +2,8 @@
  * Silo-wide HTTP request rate limit (ADR-0022 `requestRate`).
  *
  * Counts dynamic traffic only: APIs, auth, and other application handlers.
- * Static SPA assets and the org-admin HTML shell are exempt so a single page
- * load (dozens of `/_app/*` chunks + favicon) does not exhaust the minute budget.
+ * Static SPA assets and the admin HTML shells are exempt so a single page load
+ * (dozens of `/_app/*` chunks + favicon) does not exhaust the minute budget.
  */
 
 /** Paths that must not consume the silo HTTP request-rate budget. */
@@ -12,12 +12,21 @@ export function isSiloHttpRateLimitExempt(url: string): boolean {
 
   if (path === "/api/healthz") return true;
 
-  // SvelteKit build output and top-level static files (see admin/static.ts).
+  // admin-web SvelteKit build output at the root, and top-level static files
+  // (see admin/static.ts).
   if (path === "/_app" || path.startsWith("/_app/")) return true;
   if (path === "/favicon.ico" || path === "/favicon.svg" || path === "/robots.txt") return true;
 
-  // SPA index shell for client-side routes (not an API).
+  // filelib-web SvelteKit build output. appDir 改名为 `_filelib` 以避开根 /_app/*
+  // (见 database/static.ts);同一份产物服务 /app 与 /database 两个前缀。
+  if (path === "/_filelib" || path.startsWith("/_filelib/")) return true;
+
+  // SPA index shells for client-side routes (not APIs). /admin/*、/database/* 与
+  // /app/* 整体豁免 —— 客户端路由无法预先枚举;这也覆盖了每次加载一次的
+  // /database/config bootstrap。
   if (path === "/admin" || path.startsWith("/admin/")) return true;
+  if (path === "/database" || path.startsWith("/database/")) return true;
+  if (path === "/app" || path.startsWith("/app/")) return true;
 
   return false;
 }

hub/test/integration/filelib-nav.test.ts

@@ -0,0 +1,151 @@
+/**
+ * 回收站集成测试(真实 Postgres,ADR-0031;最近打开已由 ADR-0032 移除)。
+ * 覆盖:bin 列出(祖先全活跃顶点/直连 MANAGE 可见性/管理员)、restore 对称语义
+ * 与审计、purge 仅管理员 + 整支硬删(RESTRICT 顺序)。
+ * 运行前提:本地 PG(paradigm:paradigm@127.0.0.1:5432/cph_hub_test)且已 migrate。
+ */
+import { beforeEach, describe, expect, it } from "vitest";
+import { prisma, resetDb, DEFAULT_ORG_ID } from "./helpers.js";
+import {
+  createNode,
+  softDeleteNode,
+  listChildren,
+  renameNode,
+  type FileLibActor,
+  type TreeServiceDeps,
+} from "../../src/database/filelib/treeService.js";
+import { listBin, purgeBinEntry, restoreBinEntry, type BinDeps } from "../../src/database/filelib/binService.js";
+import { createStaticGroupResolver } from "../../src/database/filelib/groupResolver.js";
+import { createInMemoryVersionStore } from "../../src/database/filelib/versionStore.js";
+import { FILE_LIB_AUDIT_ACTIONS } from "../../src/database/filelib/audit.js";
+
+const ADMIN: FileLibActor = { userId: "u_admin", isWebsiteAdmin: true };
+const ALICE: FileLibActor = { userId: "u_alice", isWebsiteAdmin: false };
+const BOB: FileLibActor = { userId: "u_bob", isWebsiteAdmin: false };
+
+function treeDeps(): TreeServiceDeps {
+  return {
+    prisma,
+    groupResolver: createStaticGroupResolver({ u_bob: ["g_physics"] }),
+    versionStore: createInMemoryVersionStore(),
+    organizationId: DEFAULT_ORG_ID,
+    storageRoot: "/tmp/filelib-test",
+  };
+}
+
+function binDeps(): BinDeps {
+  return {
+    prisma,
+    organizationId: DEFAULT_ORG_ID,
+    groupResolver: createStaticGroupResolver({ u_bob: ["g_physics"] }),
+  };
+}
+
+beforeEach(async () => {
+  await resetDb();
+  for (const [id, openId] of [["u_admin", "ou_admin"], ["u_alice", "ou_alice"], ["u_bob", "ou_bob"]] as const) {
+    await prisma.user.create({ data: { id, feishuOpenId: openId, displayName: id } });
+  }
+});
+
+describe("binService · 列出与可见性", () => {
+  it("只露每支已删子树的顶;管理员全见,直连 MANAGE 可见,无关者不见", async () => {
+    const root = await createNode(treeDeps(), ADMIN, { parentId: null, kind: "FOLDER", name: "物理" });
+    const child = await createNode(treeDeps(), ADMIN, { parentId: root.id, kind: "FOLDER", name: "必修一" });
+    await createNode(treeDeps(), ADMIN, { parentId: child.id, kind: "PROJECT", name: "TH-141" });
+    // alice 在 child 上直连 MANAGE。
+    const own = await createNode(treeDeps(), ADMIN, {
+      parentId: null, kind: "PROJECT", name: "alice 项目",
+      grants: [{ principalType: "USER", principalId: "u_alice", role: "MANAGE" }],
+    });
+
+    await softDeleteNode(treeDeps(), ADMIN, child.id); // 删中间层:child 是顶,孙项目不单列
+    await softDeleteNode(treeDeps(), ADMIN, own.id);
+
+    const adminBin = await listBin(binDeps(), ADMIN);
+    expect(adminBin.map((e) => e.name).sort()).toEqual(["alice 项目", "必修一"]);
+
+    const aliceBin = await listBin(binDeps(), ALICE);
+    expect(aliceBin.map((e) => e.name)).toEqual(["alice 项目"]); // 只见自己 MANAGE 的
+
+    const bobBin = await listBin(binDeps(), BOB);
+    expect(bobBin).toEqual([]);
+
+    void root;
+  });
+});
+
+describe("binService · 恢复", () => {
+  it("restore 只清本节点:整支立即可见,落 folder.restore 审计;无权者 404", async () => {
+    const root = await createNode(treeDeps(), ADMIN, { parentId: null, kind: "FOLDER", name: "物理" });
+    const child = await createNode(treeDeps(), ADMIN, { parentId: root.id, kind: "FOLDER", name: "必修一" });
+    await softDeleteNode(treeDeps(), ADMIN, child.id);
+
+    await expect(restoreBinEntry(binDeps(), BOB, child.id)).rejects.toMatchObject({ statusCode: 404 });
+    await restoreBinEntry(binDeps(), ADMIN, child.id);
+
+    const visible = await listChildren(treeDeps(), ADMIN, root.id);
+    expect(visible.map((c) => c.name)).toContain("必修一");
+
+    const audits = await prisma.auditEntry.findMany({
+      where: { action: FILE_LIB_AUDIT_ACTIONS.folderRestore },
+    });
+    expect(audits).toHaveLength(1);
+  });
+
+  it("ADR-0035:撞名时恢复报 name_conflict_on_restore(不自动改名),清名后可恢复", async () => {
+    const root = await createNode(treeDeps(), ADMIN, { parentId: null, kind: "FOLDER", name: "物理" });
+    const child = await createNode(treeDeps(), ADMIN, { parentId: root.id, kind: "FOLDER", name: "必修一" });
+    await softDeleteNode(treeDeps(), ADMIN, child.id);
+    // 删除后同名新建 -> 活跃兄弟占了名字
+    await createNode(treeDeps(), ADMIN, { parentId: root.id, kind: "FOLDER", name: "必修一" });
+
+    await expect(restoreBinEntry(binDeps(), ADMIN, child.id)).rejects.toMatchObject({
+      statusCode: 409,
+      code: "name_conflict_on_restore",
+    });
+
+    // 改名现有节点后恢复 -> 成功,保留原名
+    const active = (await listChildren(treeDeps(), ADMIN, root.id)).find((c) => c.name === "必修一")!;
+    await renameNode(treeDeps(), ADMIN, active.id, "必修一(新)");
+    const result = await restoreBinEntry(binDeps(), ADMIN, child.id);
+    expect(result.name).toBe("必修一");
+    expect(result.renamedFrom).toBeUndefined();
+
+    const visible = await listChildren(treeDeps(), ADMIN, root.id);
+    expect(visible.map((c) => c.name).sort()).toEqual(["必修一", "必修一(新)"]);
+  });
+});
+
+describe("binService · 彻底删除", () => {
+  it("ADR-0034:与条目可见性同权 —— 直连 MANAGE 可清空,无关者 404;整支硬删 + node.purge 审计", async () => {
+    const root = await createNode(treeDeps(), ADMIN, { parentId: null, kind: "FOLDER", name: "物理" });
+    const child = await createNode(treeDeps(), ADMIN, {
+      parentId: root.id, kind: "PROJECT", name: "TH-141",
+      grants: [{ principalType: "USER", principalId: "u_alice", role: "MANAGE" }],
+    });
+    await softDeleteNode(treeDeps(), ADMIN, root.id); // 连根删:root 是顶;alice 在 root 上无直连 MANAGE
+
+    await expect(purgeBinEntry(binDeps(), BOB, root.id)).rejects.toMatchObject({ statusCode: 404 });
+    const { removed } = await purgeBinEntry(binDeps(), ADMIN, root.id);
+    expect(removed).toBe(2);
+
+    expect(await prisma.fileLibNode.count({ where: { id: { in: [root.id, child.id] } } })).toBe(0);
+    expect(await prisma.fileLibGrant.count({ where: { nodeId: child.id } })).toBe(0);
+
+    const audits = await prisma.auditEntry.findMany({ where: { action: FILE_LIB_AUDIT_ACTIONS.nodePurge } });
+    expect(audits).toHaveLength(1);
+  });
+
+  it("ADR-0034:非管理员的直连 MANAGE 持有者也能彻底删除", async () => {
+    const own = await createNode(treeDeps(), ADMIN, {
+      parentId: null, kind: "PROJECT", name: "alice 项目",
+      grants: [{ principalType: "USER", principalId: "u_alice", role: "MANAGE" }],
+    });
+    await softDeleteNode(treeDeps(), ADMIN, own.id);
+
+    const { removed } = await purgeBinEntry(binDeps(), ALICE, own.id);
+    expect(removed).toBe(1);
+    expect(await prisma.fileLibNode.count({ where: { id: own.id } })).toBe(0);
+  });
+});

hub/test/integration/filelib-tree.test.ts

@@ -80,20 +80,15 @@ describe("treeService · 创建规则", () => {
   });
 });
 
-describe("treeService · D11 独立权限开关", () => {
-  it("关闭时项目级非创建者 grant 冻结,创建者仍 MANAGE", async () => {
+describe("treeService · 项目级 grant 恒生效(ADR-0030)", () => {
+  it("项目级非创建者 grant 创建即生效,创建者仍 MANAGE", async () => {
     const project = await createNode(deps(), ADMIN, {
       parentId: null, kind: "PROJECT", name: "TH-141",
       grants: [{ principalType: "USER", principalId: "u_alice", role: "EDIT" }],
     });
-    await expect(getEffectiveRole(deps(), ALICE, project.id))
-      .rejects.toMatchObject({ statusCode: 404 }); // 冻结 = 无权限 = D8 不可见
+    // 无开关、无冻结:alice 的项目级 EDIT 立即可见。
+    expect(await getEffectiveRole(deps(), ALICE, project.id)).toBe("EDIT");
     expect(await getEffectiveRole(deps(), ADMIN, project.id)).toBe("MANAGE");
-    await prisma.fileLibProjectSettings.update({
-      where: { nodeId: project.id },
-      data: { independentPermissionsEnabled: true },
-    });
-    expect(await getEffectiveRole(deps(), ALICE, project.id)).toBe("EDIT"); // 恢复
   });
 });
 

hub/test/integration/helpers.ts

@@ -45,6 +45,12 @@ export async function resetDb(): Promise<void> {
     // two tables have no FK to Project and must be cleared explicitly.
     prisma.permissionGrant.deleteMany(),
     prisma.permissionSettings.deleteMany(),
+    // MemberGroup is global (ADR-0028): no FK to the org/user roots, so the
+    // cascade above never reaches it. Clear explicitly — closure/membership
+    // first (they FK into MemberGroup), groups last.
+    prisma.memberGroupClosure.deleteMany(),
+    prisma.memberGroupMembership.deleteMany(),
+    prisma.memberGroup.deleteMany(),
     prisma.user.deleteMany(),
     prisma.organization.deleteMany(),
   ]);

hub/test/integration/member-groups.test.ts

@@ -0,0 +1,311 @@
+/**
+ * 成员组(MemberGroup)集成测试(真实 Postgres)。ADR-0028。
+ * 覆盖:嵌套创建 + 闭包维护、解析(直接组 ∪ 活跃祖先)、祖先授权递归传递
+ * (3.2)、级联软删 + 实时失效、非管理员 403、成员增删幂等/重加、搜索 breadcrumb。
+ * 运行前提:本地 PG(paradigm:paradigm@127.0.0.1:5432/cph_hub_test)且已 migrate。
+ */
+import { beforeEach, describe, expect, it } from "vitest";
+import { prisma, resetDb, DEFAULT_ORG_ID } from "./helpers.js";
+import {
+  addMember,
+  createMemberGroup,
+  deleteMemberGroup,
+  listMemberGroups,
+  listMembers,
+  removeMember,
+  searchMemberGroups,
+  searchUsers,
+  updateMemberGroup,
+  type MemberGroupServiceDeps,
+} from "../../src/database/filelib/memberGroupService.js";
+import { createMemberGroupResolver } from "../../src/database/filelib/memberGroupResolver.js";
+import {
+  createNode,
+  getEffectiveRole,
+  type FileLibActor,
+  type TreeServiceDeps,
+} from "../../src/database/filelib/treeService.js";
+import { createInMemoryVersionStore } from "../../src/database/filelib/versionStore.js";
+
+const ADMIN: FileLibActor = { userId: "u_admin", isWebsiteAdmin: true };
+const ALICE: FileLibActor = { userId: "u_alice", isWebsiteAdmin: false };
+
+function svc(): MemberGroupServiceDeps {
+  return { prisma, organizationId: DEFAULT_ORG_ID };
+}
+
+/** treeService deps 用真实 MemberGroup 解析器,串起「组授权 → 成员生效」全链路。 */
+function treeDeps(): TreeServiceDeps {
+  return {
+    prisma,
+    groupResolver: createMemberGroupResolver(prisma),
+    versionStore: createInMemoryVersionStore(),
+    organizationId: DEFAULT_ORG_ID,
+    storageRoot: "/tmp/member-groups-test",
+  };
+}
+
+async function seedUsers(): Promise<void> {
+  for (const [id, openId] of [["u_admin", "ou_admin"], ["u_alice", "ou_alice"], ["u_bob", "ou_bob"]] as const) {
+    await prisma.user.create({ data: { id, feishuOpenId: openId, displayName: id } });
+  }
+}
+
+/** 建嵌套链 A>B>C,返回三者 id。 */
+async function seedChain(): Promise<{ a: string; b: string; c: string }> {
+  const a = await createMemberGroup(svc(), ADMIN, { name: "A" });
+  const b = await createMemberGroup(svc(), ADMIN, { name: "B", parentId: a.id });
+  const c = await createMemberGroup(svc(), ADMIN, { name: "C", parentId: b.id });
+  return { a: a.id, b: b.id, c: c.id };
+}
+
+beforeEach(async () => {
+  await resetDb();
+  await seedUsers();
+});
+
+describe("memberGroupService · 创建与闭包", () => {
+  it("建根 depth0;建子继承祖先闭包,depth 递增", async () => {
+    const { a, b, c } = await seedChain();
+
+    // 闭包不变量:C 有 (A,C,2)/(B,C,1)/(C,C,0) 三行。
+    const closureC = await prisma.memberGroupClosure.findMany({
+      where: { descendantId: c },
+      orderBy: { depth: "asc" },
+    });
+    expect(closureC.map((r) => [r.ancestorId, r.depth])).toEqual([
+      [c, 0], [b, 1], [a, 2],
+    ]);
+
+    const groups = await listMemberGroups(svc(), ADMIN);
+    const byId = new Map(groups.map((g) => [g.id, g]));
+    expect(byId.get(a)?.depth).toBe(0);
+    expect(byId.get(b)?.depth).toBe(1);
+    expect(byId.get(c)?.depth).toBe(2);
+    expect(byId.get(b)?.parentId).toBe(a);
+  });
+
+  it("父组不存在/已归档 → 404", async () => {
+    await expect(createMemberGroup(svc(), ADMIN, { name: "X", parentId: "nope" }))
+      .rejects.toMatchObject({ statusCode: 404 });
+  });
+});
+
+describe("memberGroupResolver · 解析(直接组 ∪ 活跃祖先)", () => {
+  it("成员在 C → 解析得 {C,B,A};无所属 → 空", async () => {
+    const { a, b, c } = await seedChain();
+    await addMember(svc(), ADMIN, c, { userId: "u_alice" });
+    const resolver = createMemberGroupResolver(prisma);
+
+    const ids = await resolver.resolveMemberGroupIds("u_alice");
+    expect([...ids].sort()).toEqual([a, b, c].sort());
+    expect(await resolver.resolveMemberGroupIds("u_bob")).toEqual([]);
+  });
+});
+
+describe("memberGroupService · 3.2 祖先授权递归传递", () => {
+  it("给祖先组 A 授文件夹权限 → C 的成员经 effectiveRole 拿到该权限", async () => {
+    const { a, c } = await seedChain();
+    await addMember(svc(), ADMIN, c, { userId: "u_alice" });
+
+    // ADMIN 建根文件夹,授权给"祖先组 A"。ALICE 只在 C,靠祖先方向解析命中 A。
+    const folder = await createNode(treeDeps(), ADMIN, {
+      parentId: null, kind: "FOLDER", name: "共享",
+      grants: [{ principalType: "GROUP", principalId: a, role: "EDIT" }],
+    });
+    expect(await getEffectiveRole(treeDeps(), ALICE, folder.id)).toBe("EDIT");
+  });
+});
+
+describe("memberGroupService · 改名/改描述(决策6)", () => {
+  it("改名不动闭包:depth/parentId/子树关系全保持", async () => {
+    const { a, b, c } = await seedChain();
+    const before = await prisma.memberGroupClosure.findMany({ orderBy: [{ ancestorId: "asc" }, { descendantId: "asc" }] });
+
+    const updated = await updateMemberGroup(svc(), ADMIN, b, { name: "B2", description: "改后" });
+    expect(updated.name).toBe("B2");
+    expect(updated.description).toBe("改后");
+    expect(updated.parentId).toBe(a);
+    expect(updated.depth).toBe(1);
+
+    // 闭包逐行未变 —— rename 不碰层级(ADR-0028 决策6 的核心不变量)。
+    const after = await prisma.memberGroupClosure.findMany({ orderBy: [{ ancestorId: "asc" }, { descendantId: "asc" }] });
+    expect(after).toEqual(before);
+    // C 仍在 B 之下,depth 不变。
+    const byId = new Map((await listMemberGroups(svc(), ADMIN)).map((g) => [g.id, g]));
+    expect(byId.get(c)?.depth).toBe(2);
+    expect(byId.get(c)?.parentId).toBe(b);
+  });
+
+  it("空描述清空;字段缺省则不动;两者皆缺 → 400", async () => {
+    const g = await createMemberGroup(svc(), ADMIN, { name: "G", description: "原描述" });
+    expect((await updateMemberGroup(svc(), ADMIN, g.id, { description: "" })).description).toBeNull();
+
+    // 只传 name → 描述保持(此时已是 null)。
+    const renamed = await updateMemberGroup(svc(), ADMIN, g.id, { name: "G2" });
+    expect(renamed.name).toBe("G2");
+    expect(renamed.description).toBeNull();
+
+    await expect(updateMemberGroup(svc(), ADMIN, g.id, {})).rejects.toMatchObject({ statusCode: 400 });
+  });
+
+  it("空名 → 400;已归档组 → 404;非管理员 → 403", async () => {
+    const g = await createMemberGroup(svc(), ADMIN, { name: "G" });
+    await expect(updateMemberGroup(svc(), ADMIN, g.id, { name: "   " })).rejects.toMatchObject({ statusCode: 400 });
+    await expect(updateMemberGroup(svc(), ALICE, g.id, { name: "X" })).rejects.toMatchObject({ statusCode: 403 });
+
+    await deleteMemberGroup(svc(), ADMIN, g.id);
+    await expect(updateMemberGroup(svc(), ADMIN, g.id, { name: "X" })).rejects.toMatchObject({ statusCode: 404 });
+  });
+
+  it("改名写 group.update 审计", async () => {
+    const g = await createMemberGroup(svc(), ADMIN, { name: "G" });
+    await updateMemberGroup(svc(), ADMIN, g.id, { name: "G2" });
+    const actions = (await prisma.auditEntry.findMany({
+      where: { organizationId: DEFAULT_ORG_ID },
+      select: { action: true },
+      orderBy: { createdAt: "asc" },
+    })).map((e) => e.action);
+    expect(actions).toEqual(["group.create", "group.update"]);
+  });
+});
+
+describe("memberGroupService · 级联软删 + 实时失效", () => {
+  it("软删 B → B、C 从 list/解析消失,经此支的权限立即失效", async () => {
+    const { a, b, c } = await seedChain();
+    await addMember(svc(), ADMIN, c, { userId: "u_alice" });
+    const folder = await createNode(treeDeps(), ADMIN, {
+      parentId: null, kind: "FOLDER", name: "共享",
+      grants: [{ principalType: "GROUP", principalId: a, role: "EDIT" }],
+    });
+    expect(await getEffectiveRole(treeDeps(), ALICE, folder.id)).toBe("EDIT");
+
+    const { archivedCount } = await deleteMemberGroup(svc(), ADMIN, b);
+    expect(archivedCount).toBe(2); // B + C
+
+    const remaining = (await listMemberGroups(svc(), ADMIN)).map((g) => g.id);
+    expect(remaining).toEqual([a]);
+
+    // C 已归档 → ALICE 的直接组失效 → 解析空 → 对该文件夹不再可见(D8 → 404)。
+    expect(await createMemberGroupResolver(prisma).resolveMemberGroupIds("u_alice")).toEqual([]);
+    await expect(getEffectiveRole(treeDeps(), ALICE, folder.id)).rejects.toMatchObject({ statusCode: 404 });
+  });
+});
+
+describe("memberGroupService · 成员增删", () => {
+  it("重复添加 → 409;移除后可重新添加", async () => {
+    const g = await createMemberGroup(svc(), ADMIN, { name: "G" });
+    await addMember(svc(), ADMIN, g.id, { userId: "u_alice" });
+    await expect(addMember(svc(), ADMIN, g.id, { userId: "u_alice" }))
+      .rejects.toMatchObject({ statusCode: 409 });
+
+    await removeMember(svc(), ADMIN, g.id, "u_alice");
+    expect(await listMembers(svc(), ADMIN, g.id)).toHaveLength(0);
+
+    // 重加(revokedAt 软删允许 @@unique([groupId,userId,revokedAt]) 下的新活跃行)。
+    await addMember(svc(), ADMIN, g.id, { userId: "u_alice" });
+    expect(await listMembers(svc(), ADMIN, g.id)).toHaveLength(1);
+  });
+
+  it("按飞书 openId 解析成员", async () => {
+    const g = await createMemberGroup(svc(), ADMIN, { name: "G" });
+    const m = await addMember(svc(), ADMIN, g.id, { feishuOpenId: "ou_bob" });
+    expect(m.userId).toBe("u_bob");
+  });
+
+  it("移除不存在成员 → 404", async () => {
+    const g = await createMemberGroup(svc(), ADMIN, { name: "G" });
+    await expect(removeMember(svc(), ADMIN, g.id, "u_alice"))
+      .rejects.toMatchObject({ statusCode: 404 });
+  });
+});
+
+describe("memberGroupService · 管理门禁(决策2)", () => {
+  it("非管理员调 CRUD/成员 → 403;搜索不限管理员", async () => {
+    const g = await createMemberGroup(svc(), ADMIN, { name: "G" });
+    await expect(createMemberGroup(svc(), ALICE, { name: "X" })).rejects.toMatchObject({ statusCode: 403 });
+    await expect(deleteMemberGroup(svc(), ALICE, g.id)).rejects.toMatchObject({ statusCode: 403 });
+    await expect(listMemberGroups(svc(), ALICE)).rejects.toMatchObject({ statusCode: 403 });
+    await expect(listMembers(svc(), ALICE, g.id)).rejects.toMatchObject({ statusCode: 403 });
+    await expect(addMember(svc(), ALICE, g.id, { userId: "u_bob" })).rejects.toMatchObject({ statusCode: 403 });
+    await expect(removeMember(svc(), ALICE, g.id, "u_bob")).rejects.toMatchObject({ statusCode: 403 });
+
+    // 搜索:非管理员可调(授权选择器)。
+    const results = await searchMemberGroups(svc(), "G");
+    expect(results.map((r) => r.id)).toContain(g.id);
+  });
+});
+
+describe("memberGroupService · 成员选择器 searchUsers", () => {
+  it("按显示名/openId 搜;excludeGroupId 排除已在组成员;仅管理员", async () => {
+    const g = await createMemberGroup(svc(), ADMIN, { name: "G" });
+
+    // 空 q 列出全部(3 个 seed 用户)。
+    expect((await searchUsers(svc(), ADMIN, "")).length).toBe(3);
+    // 按 displayName 命中(seed 的 displayName 即 id)。
+    expect((await searchUsers(svc(), ADMIN, "alice")).map((u) => u.userId)).toEqual(["u_alice"]);
+    // 按 openId 命中。
+    expect((await searchUsers(svc(), ADMIN, "ou_bob")).map((u) => u.userId)).toEqual(["u_bob"]);
+
+    // 已在组的人被排除 —— 避免选中必然 409 的候选。
+    await addMember(svc(), ADMIN, g.id, { userId: "u_alice" });
+    const ids = (await searchUsers(svc(), ADMIN, "", g.id)).map((u) => u.userId);
+    expect(ids).not.toContain("u_alice");
+    expect(ids).toContain("u_bob");
+
+    // 移除后重新成为候选(revokedAt 软删)。
+    await removeMember(svc(), ADMIN, g.id, "u_alice");
+    expect((await searchUsers(svc(), ADMIN, "", g.id)).map((u) => u.userId)).toContain("u_alice");
+
+    await expect(searchUsers(svc(), ALICE, "")).rejects.toMatchObject({ statusCode: 403 });
+  });
+});
+
+describe("memberGroupService · 成员表字段", () => {
+  it("listMembers 返回 openId/avatar/joinedAt(供成员表列展示)", async () => {
+    const g = await createMemberGroup(svc(), ADMIN, { name: "G" });
+    await addMember(svc(), ADMIN, g.id, { userId: "u_alice" });
+    const [m] = await listMembers(svc(), ADMIN, g.id);
+    expect(m).toMatchObject({
+      userId: "u_alice",
+      displayName: "u_alice",
+      feishuOpenId: "ou_alice",
+      avatarUrl: null,
+    });
+    expect(m?.joinedAt).toBeInstanceOf(Date);
+  });
+});
+
+describe("memberGroupService · 搜索 breadcrumb", () => {
+  it("breadcrumb 由活跃祖先链按 depth 拼(根在前)", async () => {
+    const { c } = await seedChain();
+    const results = await searchMemberGroups(svc(), "C");
+    const hit = results.find((r) => r.id === c);
+    expect(hit?.breadcrumb).toBe("A / B / C");
+  });
+
+  it("归档组不出现在搜索(G3)", async () => {
+    const { a, b } = await seedChain();
+    await deleteMemberGroup(svc(), ADMIN, b); // 归档 B、C
+    const ids = (await searchMemberGroups(svc(), "")).map((r) => r.id);
+    expect(ids).toContain(a);
+    expect(ids).not.toContain(b);
+  });
+});
+
+describe("memberGroupService · 审计(C3/决策4)", () => {
+  it("建组/加成员/删组写 AuditEntry(挂 silo org)", async () => {
+    const g = await createMemberGroup(svc(), ADMIN, { name: "G" });
+    await addMember(svc(), ADMIN, g.id, { userId: "u_alice" });
+    await removeMember(svc(), ADMIN, g.id, "u_alice");
+    await deleteMemberGroup(svc(), ADMIN, g.id);
+    const actions = (await prisma.auditEntry.findMany({
+      where: { organizationId: DEFAULT_ORG_ID },
+      select: { action: true },
+      orderBy: { createdAt: "asc" },
+    })).map((e) => e.action);
+    expect(actions).toEqual([
+      "group.create", "group.member_add", "group.member_remove", "group.delete",
+    ]);
+  });
+});

hub/test/unit/filelib-permission.test.ts

@@ -1,6 +1,6 @@
 /**
- * 纯权限 reducer 单测(契约 P6 / D11 / 2.3)。
- * 矩阵覆盖:个人/Group/祖先继承/max 取最高/不降权/空权限/toggle 冻结;
+ * 纯权限 reducer 单测(契约 P6 / 2.3)。
+ * 矩阵覆盖:个人/Group/祖先继承/max 取最高/不降权/空权限;
  * 外加确定性随机化不变量(单调性:任何可用 grant 都不超过 effective)。
  */
 import { describe, expect, it } from "vitest";
@@ -10,7 +10,6 @@ const base: EffectiveRoleInput = {
   nodeId: "N",
   nodeKind: "FOLDER",
   ancestorIds: ["A", "R"], // N ⊂ A ⊂ R
-  independentPermissionsEnabled: false,
   userId: "u1",
   groupIds: ["g1"],
   grants: [],
@@ -75,33 +74,28 @@ describe("effectiveRole · 契约 P6 矩阵", () => {
   });
 });
 
-describe("effectiveRole · D11 独立权限开关", () => {
+describe("effectiveRole · 项目级 grant 恒生效(ADR-0030)", () => {
   const project: EffectiveRoleInput = { ...base, nodeKind: "PROJECT", nodeId: "P" };
 
-  it("开关关闭:项目级非创建者 grant 冻结", () => {
+  it("项目级非创建者 grant 直接参与(无开关、无冻结)", () => {
     const grants = [grant({ nodeId: "P", role: "EDIT" })];
-    expect(effectiveRole({ ...project, grants })).toBeNull();
+    expect(effectiveRole({ ...project, grants })).toBe("EDIT");
   });
 
-  it("开关关闭:创建者 grant 仍生效", () => {
+  it("创建者 grant 照常生效", () => {
     const grants = [grant({ nodeId: "P", role: "MANAGE", isCreatorGrant: true })];
     expect(effectiveRole({ ...project, grants })).toBe("MANAGE");
   });
 
-  it("开关关闭:祖先链 grant 不受影响", () => {
+  it("项目级与祖先链 grant 同取 max", () => {
     const grants = [
-      grant({ nodeId: "P", role: "MANAGE" }), // 冻结
-      grant({ nodeId: "A", role: "VIEW" }),   // 生效
+      grant({ nodeId: "P", role: "VIEW" }),
+      grant({ nodeId: "A", role: "EDIT" }),
     ];
-    expect(effectiveRole({ ...project, grants })).toBe("VIEW");
+    expect(effectiveRole({ ...project, grants })).toBe("EDIT");
   });
 
-  it("开关开启:项目级 grant 恢复参与", () => {
-    const grants = [grant({ nodeId: "P", role: "EDIT" })];
-    expect(effectiveRole({ ...project, independentPermissionsEnabled: true, grants })).toBe("EDIT");
-  });
-
-  it("文件夹忽略开关(self grant 照常参与)", () => {
+  it("文件夹与项目语义一致(self grant 照常参与)", () => {
     const grants = [grant({ nodeId: "N", role: "EDIT" })];
     expect(effectiveRole({ ...base, grants })).toBe("EDIT");
   });