feat: 「查看接口」改为站内路由，只换右侧内容

- ServicePanel 新增 onOpenApi，链接点击接管为 navigate('/interface')；
  按住 Ctrl/Cmd/Shift/Alt 仍保留新标签打开
- 前台内容区已有 route.kind === 'api' 分支，直接渲染接口一览
- 顺手删掉两个没人引用的旧组件：sidebar/Sidebar.tsx、sidebar/CategoryNav.tsx

Cargo.lock

@@ -79,6 +79,18 @@ version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
 
+[[package]]
+name = "argon2"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072"
+dependencies = [
+ "base64ct",
+ "blake2",
+ "cpufeatures",
+ "password-hash",
+]
+
 [[package]]
 name = "async-stream"
 version = "0.3.6"
@@ -159,12 +171,36 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "base64ct"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
+
 [[package]]
 name = "bitflags"
 version = "2.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
 
+[[package]]
+name = "blake2"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "bytes"
 version = "1.12.1"
@@ -242,6 +278,36 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+ "subtle",
+]
+
 [[package]]
 name = "errno"
 version = "0.3.14"
@@ -318,6 +384,27 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -656,6 +743,17 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "password-hash"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
+dependencies = [
+ "base64ct",
+ "rand_core",
+ "subtle",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
@@ -694,6 +792,15 @@ version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548"
 
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.107"
@@ -712,6 +819,36 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "rand"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.18"
@@ -839,6 +976,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -891,6 +1039,7 @@ name = "stash"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "argon2",
  "async-stream",
  "axum",
  "clap",
@@ -898,9 +1047,11 @@ dependencies = [
  "include_dir",
  "mime_guess",
  "notify",
+ "rand",
  "rusqlite",
  "serde",
  "serde_json",
+ "sha2",
  "thiserror",
  "tokio",
  "tower 0.4.13",
@@ -916,6 +1067,12 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
 [[package]]
 name = "syn"
 version = "2.0.119"
@@ -1145,6 +1302,12 @@ dependencies = [
  "tracing-log",
 ]
 
+[[package]]
+name = "typenum"
+version = "1.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
+
 [[package]]
 name = "unicase"
 version = "2.10.0"

Cargo.toml

@@ -27,6 +27,9 @@ notify = "8"
 
 # 内容库：SQLite 随二进制静态编译，运行时不需要任何外部 DLL
 rusqlite = { version = "0.32", features = ["bundled"] }
+argon2 = "0.5"
+rand = "0.8"
+sha2 = "0.10"
 
 [build-dependencies]
 # build.rs 用它递归复制前端产物到 $OUT_DIR/web

HANDOFF.md

@@ -0,0 +1,232 @@
+# Stash 交接文档
+
+> 写于 2026-10-29。新会话第一件事：读这份 + `docs/ADMIN-PLAN.md` + `stash-ui/README.md`。
+
+## 0. 一句话现状
+
+Stash 已从「只读本地导航站」升级为**可登录、可配置、可编辑内容的本地发布台**：
+
+- 登录（单用户，argon2id + Cookie 会话）；
+- `/admin` 设置页（页头滚动信息 / 首页卡片 / 归类 / 侧栏 / 资料 / 系统）；
+- 条目就地编辑（Drawer + 乐观锁）；
+- 分区新增/删除、**条目新增/删除（可选分区与分组）**、分组（子分类）新建/改名/删除、侧栏子分类配置、浏览/点赞/分享/跳转；
+- 数据库自动迁移到 **v18**；
+- 前端 100% 使用组件库 `@stash/ui`（v0.3.1，42 个组件）。
+
+当前数据库**已设置管理员密码**（2026-10-30 由使用者设置）；忘记密码按 §6 删除 `admin` 行即可回到首次设置。
+
+## 1. 仓库与运行环境
+
+| 项目 | 路径 | 分支 | 端口 | 说明 |
+| --- | --- | --- | --- | --- |
+| 新版（组件重构） | `D:\CNWei\CNW\Rust\stash` | `feat/use-stash-ui` | **8080** | 所有新功能都在这里 |
+| 旧版（1:1 基线） | `D:\CNWei\CNW\Rust\stash-old`（worktree） | `develop` | **8081** | 只用于视觉对照，不要改 |
+| 组件库 | `D:\CNWei\CNW\Rust\stash-ui` | `master` | — | tag `v0.1.0` / `v0.2.0` / `v0.3.0` / `v0.3.1` |
+
+后端：Rust 2024 + Axum 0.8 + rusqlite（bundled）。前端：React 19 + Vite + TS + CSS Modules，`@stash/ui` 通过 `file:` 依赖引入。
+
+### 启动 / 构建（顺序重要）
+
+```powershell
+# 1) 前端（产物会被 build.rs 内嵌，必须先构建）
+cd D:\CNWei\CNW\Rust\stash\stash-web
+npm run build
+
+# 2) 先杀掉正在运行的 stash.exe，否则 cargo 会报「拒绝访问」
+Get-Process stash -ErrorAction SilentlyContinue | Where-Object { $_.Path -like '*stash\target*' } | Stop-Process -Force
+
+# 3) 后端
+cd ..
+cargo build
+Start-Process .\target\debug\stash.exe -RedirectStandardOutput "$env:TEMP\stash.log" -RedirectStandardError "$env:TEMP\stash-err.log" -WindowStyle Hidden
+```
+
+旧版（8081，仅在需要对照时）：
+
+```powershell
+D:\CNWei\CNW\Rust\stash-old\target\debug\stash.exe --port 8081
+```
+
+### 测试
+
+Windows 下 `TEMP` 权限有问题，跑测试要覆盖临时目录：
+
+```powershell
+$env:TEMP = "D:\CNWei\CNW\Rust\stash\target\tmp"; $env:TMP = $env:TEMP
+cargo test        # 当前 48 passed
+```
+
+## 2. 目录 / 文件地图
+
+```
+src/
+  main.rs / lib.rs            启动、日志
+  config.rs                   端口 / 数据目录（默认 target/debug/data）
+  server.rs                   全部路由（API + 内嵌前端 + SPA 回落）
+  error.rs                    StashError（含 Conflict → 409）
+  db/
+    mod.rs                    Db 门面（所有方法）+ 迁移测试
+    schema.rs                 建表、种子、版本迁移（0/15→16→17）
+    auth.rs                   管理员、密码哈希、会话（token 只存 sha256）
+    settings.rs               settings JSON（header/sidebar/sections/profile）
+    entries.rs                条目读取/编辑、浏览数、点赞、审计
+    categories.rs             分区新增/删除
+    catalog.rs                查询组装（前端三种视图）
+stash-web/src/
+  App.tsx                     主页壳、登录弹窗、编辑器、设置应用
+  main.tsx                    入口分流（/admin 与 /login）
+  auth.ts / settings.ts / items.ts   前端 API 客户端
+  components/
+    header/SiteHeader.tsx     品牌 + 滚动信息 + 操作图标
+    admin/AdminPage.tsx       /admin 全部 Tab
+    auth/LoginDialog.tsx      Modal 登录
+    auth/PasswordInput.tsx    带显隐切换的密码框
+    content/                  首页、分区、条目、文章、编辑器
+    sidebar/                  资料卡、服务面板、导航
+docs/ADMIN-PLAN.md            后台方案 + P0–P4 实施记录 + 未做项
+README.md                     运行、路由、库结构、登录说明
+```
+
+## 3. 功能清单（已完成）
+
+### 登录
+- 单用户 `admin`，密码 argon2id；
+- 会话：随机 32 字节 token，HttpOnly + SameSite=Strict + Path=/，7 天，库里存 sha256；
+- 登录失败 5 次锁 60 秒；写接口校验 Origin；写接口需要会话。
+
+### `/admin`（新原子模型）
+| Tab | 能力 |
+| --- | --- |
+| 分组管理 | 树形表格：新建根分组（左侧）、加子分组、编辑（名称/上级/图标/排序/状态）、删除；格式已下沉到条目，不再在分组上设置 |
+| 内容 | 选分组以列表展示条目（选主分组时包含所有子分组）；列：标题 / 格式 / 跳转链接 / 所属分组 / 操作；每条内容单独选格式（应用/海报/图文），同一分组可混合 |
+| 侧边栏 | 顶部「侧栏卡片」控制本地管理员 / 本地服务显隐；下方「分组导航」逐项勾选；开关即保存 |
+| 首页卡片 | 左侧列表含「本地服务」只读表（不可删除，但可拖动排序）+ 自建卡片；右侧分组表格；表格内开关/条数即时保存，标题用「保存」按钮 |
+| 页头 | 启用开关、速度、条目、标签与色调 |
+| 资料 | 头像 URL、名称、角色、简介、位置 |
+| 系统 | 修改密码、下载备份 |
+
+保存：分组/内容/卡片逐项保存；侧边栏、页头、资料走 `PATCH /api/settings`（`version` 乐观锁）。
+
+### 内容编辑
+- 详情页 `[编辑]` 只在登录后显示；
+- 打开右侧 Drawer：标题、简介、标签、一句话评价、正文 Markdown、封面、跳转地址；
+- `PATCH /api/items/{key}`，`updatedAt` 乐观锁；
+- 保存后 `catalog.reload()` 局部刷新，不整页刷新。
+
+### 详情操作条
+- 浏览：进入页面 `POST /api/items/{key}/view`，数字 +1；
+- 点赞：可切换，`POST /like`，localStorage 记住状态；
+- 分享：复制当前链接，Toast 反馈；
+- 跳转：保存时规范化 `href`（`www.` 自动补 `https://`，拒绝 `javascript:` 等协议）；为空或 `#` 时按钮置灰。
+
+## 4. HTTP API
+
+```
+GET    /api/health
+GET    /api/projects            GET /api/projects/events (SSE)
+GET    /api/catalog             GET /api/catalog/events (SSE)   旧结构（兼容）
+GET    /api/catalog2            分组树 + 卡片（新前台/后台）
+GET    /api/cards               卡片列表
+POST   /api/nodes               {key,title,parentKey?,format?}   需登录
+PATCH  /api/nodes/{key}         {title,parentKey?,sort?,format?} 需登录
+DELETE /api/nodes/{key}                                          需登录，级联
+POST   /api/cards               {title}                          需登录
+PATCH  /api/cards/{id}          {title?,sort?}                   需登录
+DELETE /api/cards/{id}                                           需登录
+PUT    /api/cards/{id}/groups   [{groupKey,previewLimit}]        需登录
+
+GET    /api/auth/session        -> {authenticated, has_admin, username}
+POST   /api/auth/setup          {password}        仅当无管理员
+POST   /api/auth/login          {password}
+POST   /api/auth/logout
+PATCH  /api/auth/password       {current, next}
+
+GET    /api/settings            -> {version, settings}
+PATCH  /api/settings            {version, settings}     需登录
+
+GET    /api/items/{key}         -> 原始字段（编辑表单）
+POST   /api/items               {key,nodeKey,item}      需登录
+PATCH  /api/items/{key}         {updatedAt, item, nodeKey?}  需登录，nodeKey 可移动条目
+DELETE /api/items/{key}                                  需登录
+POST   /api/items/{key}/view
+POST   /api/items/{key}/like    {liked}
+
+POST   /api/categories          {id,title,kind}         需登录
+PATCH  /api/categories/{id}     {title,icon,barColor,kind,previewLimit,emptyText,blockNodeKey,allowGroups}  需登录
+POST   /api/categories/{id}/groups {id,title}           需登录，仅应用分区
+DELETE /api/categories/{id}                             需登录，级联，local 不可删
+PATCH  /api/groups/{id}         {title,showInSidebar}   需登录
+DELETE /api/groups/{id}                                 需登录，级联组内条目
+
+GET    /api/backup              SQLite 快照附件         需登录
+```
+
+## 5. 数据库与迁移
+
+- 文件：开发态在 `target/debug/data/stash.db`；可用 `--root` / 数据目录覆盖（见 `config.rs`）。
+- 当前 `PRAGMA user_version = 22`；`schema::migrate` 逐级升级：0 建全量、15→16→17→18→19→20→21→22、更高版本拒绝启动。
+- 格式在 `entry.format`（apps / posters / articles），同组可混合；`node` 的旧 `view_mode` 仅保留兼容，不再决定渲染。
+- `settings.sidebar.show_profile / show_service` 控制侧栏两张卡片显隐（默认 true）。
+- 首页滚动：`#page-scroll`（Layout 的 body）是唯一滚动容器，搜索框固定在其上方；左右两栏顶部对齐，左侧到底后通过 `translateY` 吸底，右侧继续滚动；滚动条隐藏；页头实底，搜索框 50% 透明，顶部另有一层上下渐隐的软虚化（`blur(8px)`）。
+- 本地服务是运行时卡片，但 `card` 表里有一行 `local-service` 只用于排序；内容来自 `/api/projects`，后端禁止删除/改名/配置分组。
+- `node` 是统一分组树（根节点 `kind='section'`，子节点 `kind='group'` 可多层）；`enabled` 控制启停；`icon` 可为空。
+- 主要表：`node`、`entry`、`entry_tag`、`section_block`、`admin`、`session`、`setting`、`audit`。
+- `entry.updated_at` 用于编辑乐观锁；`setting` 表 `key='site'` 存站点 JSON。
+- **设置/内容都是 SQLite**：备份用 `/api/backup`，恢复需停机替换文件。
+
+## 6. 认证运维
+
+- 忘记密码：删除 `admin` 行（或整库）后重启 → 回到首次设置。
+  ```powershell
+  node -e "const {DatabaseSync}=require('node:sqlite');const d=new DatabaseSync('target/debug/data/stash.db');d.exec('DELETE FROM admin; DELETE FROM session;')"
+  ```
+- 改密码：`/admin → 系统`，成功后该账号所有会话失效，需要重新登录。
+- 首个管理员由 `/api/auth/setup` 创建，密码至少 8 位。
+
+## 7. 组件库 `@stash/ui`
+
+- 42 个组件，文档站：`cd stash-ui && npm run dev`（也可 `npm run build:site` 后看 `dist-site`）。
+- 关键命令：`npm run typecheck && npm run lint && npm run build && npm run build:site`。
+- 组件契约：`docs/COMPONENTS.md`；设计规范：`DESIGN.md`；外部风格接入流程：`docs/STYLE-INTAKE.md`（闸门：截图 → 映射 → 决策 → 评审 → 再写代码）。
+- 主题：`themes/example.css` 只改变量；页面禁止写组件内部选择器。
+- **判断归属**：全局配置放 `/admin`；页面版式（间距、布局容器）写在页面 CSS；只有「第二个页面也复用」的才抽组件。
+
+## 8. 验证与截图
+
+- 后端逻辑：`cargo test`（48 passed，覆盖迁移/登录/设置/条目编辑/分区）。
+- 前端构建：`stash-web npm run build`（tsc -b + vite）。
+- 视觉/交互：Playwright 脚本在 `stash-ui/.ref/*.mjs`（不提交 git），截图在 `stash-ui/shots/`。
+  - `measure-final.mjs` **已过时**（旧 1:1 对照用），选择器 `.app header` 仍可用；
+  - `c3-check.mjs`、`d-check.mjs`、`p2-check.mjs` 是后期功能检查脚本。
+- 常用冒烟：首页卡片、`/admin` 各 Tab、详情编辑、登录弹窗。
+
+## 9. 已知限制 / 未做
+
+| 项 | 状态 |
+| --- | --- |
+| 备份恢复/导入 | 只提供下载快照；恢复需停机替换 `stash.db` |
+| 回收站/软删除 | 未做，删除分组会级联删子分组与条目（有二次确认） |
+| 图片上传 | 只支持 URL；上传需存储目录、大小/类型校验 |
+| 拖拽排序 | 分组/卡片顺序暂用创建顺序；上移下移/拖拽未做 |
+| 多用户/角色 | 未做，当前单管理员 |
+| 分组移动 | 编辑弹窗里可改「上级分组」（防环）；根分组不能移到子级 |
+| 条目移动 | 内容弹窗里可直接换分组（`PATCH /api/items/{key}` 的 `nodeKey`） |
+| 分组排序 | 可编辑「排序权重」数值；拖拽排序未做 |
+| 旧接口 | `/api/catalog`、`/api/categories/*`、`/api/groups/*` 仍保留给旧组件/兼容，后续可删 |
+| 登录限流 | 进程内计数，重启清空 |
+
+## 10. 约定与坑
+
+- 回复用中文，表格化优先；视觉工作要截图验证。
+- **任何共享组件改动**都要在 `docs/COMPONENTS.md` 补契约 + changelog，并说明兼容性。
+- PowerShell 写文件注意 UTF-8；优先用编辑工具，别用 `Set-Content` 写带中文的源码。
+- 改前端后必须 `npm run build` 再 `cargo build`，否则内嵌资源是旧的。
+- 重启前先杀 `stash.exe`，否则 cargo 报「拒绝访问」。
+- `/login` 是旧地址，`main.tsx` 会重定向到 `/`；登录已改为弹窗。
+- 前端路由：`/`、`/g/<分组 key>`、`/g/<分组 key>/i/<条目>`；旧 `/c/...` 地址按第一个路径段当分组 key 兼容，`/admin` 独立壳。
+
+## 11. 新会话建议的下一步
+
+1. 先跑 `cargo test` + 打开 8080 冒烟，确认基线；
+2. 若要继续产品化：条目移动 UI、回收站、图片上传、拖拽排序；
+3. 若要发布：确认 `stash-ui` 以 `file:` 引入的方式在发布构建里如何锁定版本（建议改为 git tag 依赖或构建前 `npm pack`）。

README.md

@@ -31,6 +31,17 @@ cargo run -- --root ./sites --host 0.0.0.0 --port 3000
 - Rust 工具链（2024 Edition）
 - Node.js 24，推荐用 [Volta](https://volta.sh/) 管理；`stash-web/package.json` 里已用 `volta` 字段固定版本
 
+### 登录与设置（v0.1.1 起）
+
+- 登录是**页内弹窗**：点右上角用户图标；首次使用弹窗里是「设置密码 + 确认」（至少 8 位）；
+- 登录后点「站点设置」进入 `/admin`：分组管理（树形表格，可建根/子分组、图标可空、排序权重、启停、删除）、内容（选分组以列表查看/编辑条目，每条可单独设格式，主分组含子分组）、侧边栏（侧栏卡片显隐 + 分组导航勾选）、首页卡片（本地服务只读表 + 左侧卡片列表 + 分组表格，可拖动排序），以及页头滚动信息、资料与系统设置；
+- 详情页的 `[编辑]` 只在登录后显示；保存后局部刷新，`updated_at` 乐观锁；
+- `/admin` 的「系统」页可以改密码、下载整库备份（`VACUUM INTO` 快照）；
+- 密码用 argon2id 哈希存在 `data/stash.db` 的 `admin` 表，会话是 HttpOnly + SameSite=Strict 的 Cookie（7 天）；
+- 读接口公开（本地工具可只读使用），写接口（设置、改密等）要求登录；
+- 忘记密码：删除 `admin` 表里的那一行（或整个库）后重启，会回到「设置密码」；
+- 方案与后续阶段见 [`docs/ADMIN-PLAN.md`](docs/ADMIN-PLAN.md)。
+
 ## 工作方式
 
 请求按下面的顺序命中：
@@ -54,11 +65,9 @@ cargo run -- --root ./sites --host 0.0.0.0 --port 3000
 
 | 地址 | 页面 |
 | --- | --- |
-| `/` | 首页分区卡片 |
-| `/c/<分区>` | 分类明细 |
-| `/c/<分区>/<分组>` | 只展示该分组 |
-| `/c/<分区>/i/<条目>` | 条目详情，返回 → 分类明细 |
-| `/c/<分区>/<分组>/i/<条目>` | 条目详情，返回 → 该分组 |
+| `/` | 首页卡片（按后台勾选的分组组合） |
+| `/g/<分组>` | 分组页（自身内容 + 子分组） |
+| `/g/<分组>/i/<条目>` | 条目详情 |
 
 地址里的每一段都是**业务键**（也就是接口 JSON 里的 `id`）：库里是 `node.key` / `entry.key`，
 本地项目则是目录名（访问地址仍然是 `route_path`，两者不再混用）。

docs/ADMIN-PLAN.md

@@ -0,0 +1,388 @@
+# Stash 后台与编辑能力方案（讨论稿）
+
+> 目标：登录后能改「左侧布局」「分区布局」「页头滚动信息」，并且能编辑内容。
+> 状态：**待评审**，评审通过后按 §8 分期实现。
+
+## 1. 结论先行
+
+| 问题 | 建议 | 理由 |
+| --- | --- | --- |
+| 要不要单独的设置页？ | **要**，`/admin`，只放「全局配置」 | 布局、页头、侧栏是低频、结构化、跨页面的配置，塞进当前页会让页面变编辑器 |
+| 内容（条目/文章）在哪编辑 | **就地编辑**：详情页的 `[编辑]` 打开右侧 Drawer | 编辑需要上下文预览；跳设置页会丢上下文 |
+| 本地服务面板纳入设置吗 | **只纳入「显隐/位置」**，数据本身不进设置 | 项目数、连接状态是运行时只读状态，不是可编辑配置 |
+| 详情页要不要独立设置页 | **不要** | 内容编辑用 Drawer，全局配置才进 `/admin` |
+
+一句话：**全局配置进 `/admin`，单个内容就地改。**
+
+## 2. 登录方案（单用户、本地）
+
+- 账号：单管理员（`admin`），密码用 **argon2id** 哈希存库；首次启动若无密码，生成随机密码打印到控制台 / 或首访引导设置。
+- 会话：登录成功下发 **HttpOnly + SameSite=Lax + Secure(可选)** 的 Cookie（随机 256bit token，库里存哈希，7 天过期，可撤销）。
+- 写操作：所有 `POST/PATCH/DELETE` 校验会话 + **CSRF token**（双提交 Cookie 或自定义头）。
+- 读操作：页面与 `GET /api/*` 保持公开（本地工具，保持只读可用）；写接口一律要求登录。
+- 频控：登录失败 5 次锁 1 分钟，防止本地暴破。
+- 不做的：多用户/角色、OAuth、找回密码（单用户场景用「重置密码」命令）。
+
+## 3. 信息架构：`/admin`
+
+| Tab | 内容 | 存储 |
+| --- | --- | --- |
+| 布局 | 侧栏项顺序/显隐/分组、分区卡片顺序、每卡展示的分组与条数 | `settings.layout` |
+| 页头 | 滚动信息条目（文本/标签/强调色）、速度、是否启用；品牌名 | `settings.header` |
+| 内容 | 分区、分组、条目的增删改与排序（批量） | 现有内容库表 |
+| 系统 | 修改密码、本地服务面板显隐、备份/导出、恢复默认 | `settings.system` / `auth` |
+
+侧栏与页头的实时预览：设置页右侧放一个缩小的 `Layout` 预览（复用组件库）。
+
+## 4. 编辑模型
+
+### 4.1 内容编辑（就地）
+
+- 详情页 `[编辑]` → `Drawer`（宽 480）表单：标题、标签、描述、正文（Markdown）、封面、链接；
+- 保存：`PATCH /api/items/:id`，乐观锁（`updatedAt`），冲突时提示「内容已被修改，刷新后重试」；
+- 成功：`toast.success` + 局部刷新当前条目（不整页刷新）。
+
+### 4.2 全局配置（`/admin`）
+
+- 表单保存走 `PATCH /api/settings`，整块 JSON 校验后落库；
+- 提供「恢复默认」与「导出 JSON / 导入」。
+
+## 5. 数据模型
+
+```sql
+-- 设置：一个 key 一段 JSON，带版本号用于乐观锁
+settings(key TEXT PRIMARY KEY, value TEXT NOT NULL, version INTEGER NOT NULL, updated_at TEXT);
+
+-- 管理员（单行）
+admin(id INTEGER PRIMARY KEY CHECK (id = 1), username TEXT, password_hash TEXT, updated_at TEXT);
+
+-- 会话
+sessions(token_hash TEXT PRIMARY KEY, created_at TEXT, expires_at TEXT, last_seen_at TEXT);
+
+-- 审计（谁在什么时候改了什么）
+audit(id INTEGER PRIMARY KEY AUTOINCREMENT, at TEXT, action TEXT, target TEXT, detail TEXT);
+```
+
+**迁移问题**：当前 `PRAGMA user_version = 15` 且「删库重建」。加这些表要引入**第一套迁移**（v15 → v16），否则老库升级会坏。这是必须先解决的前置项。
+
+## 6. API 草案
+
+```
+POST   /api/auth/login      {username,password} -> set-cookie
+POST   /api/auth/logout
+GET    /api/auth/session    -> {authenticated, username}
+PATCH  /api/auth/password   {current,next}
+
+GET    /api/settings        -> {layout, header, system, version}
+PATCH  /api/settings        {partial} + If-Match: version
+
+PATCH  /api/items/:id       条目编辑（乐观锁）
+POST   /api/categories      新建分区
+PATCH  /api/categories/:id  分区配置（展示块、预览条数、色条）
+DELETE /api/items/:id
+```
+
+## 7. 没被提到、但必须一起考虑的
+
+### 安全
+1. **XSS**：正文是 Markdown，现有渲染器不处理 HTML；编辑后必须转义/白名单，否则登录用户可自注入脚本（虽然是本地单用户，仍要防）。
+2. **CSRF**：Cookie 会话必须配 token 或 `SameSite=Strict`。
+3. **上传**：封面/配图上传的存储路径、大小限制、MIME 校验、防目录穿越（public 是静态托管目录）。
+4. **密码**：哈希算法与参数、首次设置流程、重置命令。
+5. **会话**：过期、撤销、记住我、并发登录。
+6. **CSP / 安全头**：内嵌页面与 iconfont 的 CSP 白名单。
+
+### 数据与迁移
+7. **迁移机制**：现在没有迁移，`user_version` 只是标记；加表必须写迁移 + 升级测试。
+8. **默认值与校验**：设置 JSON 的 schema 校验、缺字段回退默认、坏 JSON 不能白屏。
+9. **备份/恢复**：编辑前自动备份（`stash.db.bak`）、一键导出/导入。
+10. **审计**：谁改了什么（单用户也需要排查）。
+11. **乐观锁/冲突**：多标签页同时编辑。
+12. **草稿/发布**：编辑后立即生效，还是保存草稿再发布？（内容库现在没有状态字段）
+13. **撤销**：误删条目能否恢复（软删除 + 回收站）。
+
+### 编辑体验
+14. **未保存离开**：Drawer 关闭前的确认（beforeunload / 二次确认）。
+15. **表单校验**：必填、长度、URL 合法性、错误定位。
+16. **图片上传**：拖拽、进度、失败重试。
+17. **排序交互**：拖拽排序（新组件），键盘可达的排序替代方案。
+18. **实时预览**：Markdown 编辑预览（复用 `ArticleBody`）。
+19. **移动端编辑**：Drawer 全宽、软键盘遮挡、保存按钮吸底。
+20. **可访问性**：Drawer 焦点陷阱（已有 `<dialog>`）、表单 label/错误关联、快捷键。
+21. **编辑模式提示**：登录后页面出现明显「编辑中」状态，避免误操作。
+
+### 工程
+22. **SSE 推送**：编辑后前端已有 `live` 通道，需要定义「设置变更」是否也推送。
+23. **缓存**：设置读取缓存与失效策略。
+24. **并发写 SQLite**：WAL、事务边界、写冲突重试。
+25. **测试**：登录/权限/迁移/设置校验/编辑接口的单测 + e2e。
+26. **权限边界**：未来多用户时，哪些接口要按角色收敛（现在先留 `require_auth` 中间件层）。
+
+## 8. 分期建议
+
+| 阶段 | 范围 | 依赖 |
+| --- | --- | --- |
+| **P0** | 迁移机制 v16 + admin/sessions/settings 表 + 登录/登出/会话 + 登录页 + 写接口鉴权 | 无 |
+| **P1** | `/admin` 设置页：页头滚动信息、侧栏项显隐/顺序、分区卡配置 | P0 |
+| **P2** | 内容就地编辑（Drawer 表单 + 乐观锁 + 富文本/图片上传） | P0 + 迁移 |
+| **P3** | 备份/恢复、审计、回收站、导入导出 | P1/P2 |
+
+## 9. 组件库缺口（P1/P2 会用到）
+
+| 缺口 | 说明 |
+| --- | --- |
+| `Textarea` | 多行输入（Markdown、描述），当前只有单行 `Input` |
+| `ColorPicker` | 分区色条 / 标签色 |
+| `SortableList` | 拖拽排序 + 键盘上/下移 |
+| 表单布局 | `FormField` 有了，但「两列/分组/折叠」还需要页面组合或补 `Form` |
+| `Tabs`/`Drawer`/`Switch`/`Toast` | 已有，可直接用 |
+
+## 10. 开放决策（需拍板）
+
+1. 设置入口：独立 `/admin` 页面（推荐）/ 右侧设置抽屉 / 两者都有。
+2. 登录范围：单用户密码（推荐）/ 仅局域网免密 + 编辑口令 / 多用户。
+3. 读接口是否也要登录：公开（推荐）/ 全站需登录。
+4. 内容编辑是否要「草稿 → 发布」两态：先不要（推荐，保持即时生效）/ 要。
+5. 编辑图片：先只接受 URL（推荐，P2 后期再做上传）/ 首期就要上传。
+
+## 11. 实施记录
+
+### P29（2026-10-31，搜索框不受虚化/透明度影响）
+
+- 移除 `.search-row > *:first-child` 的半透明与 `backdrop-filter` 覆盖，搜索框回到组件默认实底白色；
+- 顶部软虚化只作用于搜索框周围区域，不再透过输入框；
+- 验证：搜索框背景 `rgb(255,255,255)`、`backdrop-filter: none`、opacity=1。
+
+### P28（2026-10-31，搜索框 30% 透明与分组块底部留白）
+
+- 搜索框背景透明度从 50% 调到 30%（`rgba(255,255,255,0.3)`），保留 blur；
+- 侧栏 `.sidebar-home` 增加 24px 底部内边距，分组导航块滚到底时距离视口底部保留 24px；
+- 验证：搜索框 alpha=0.30；页面滚到底时 navBottom=856、viewportBottom=880，间距 24px。
+
+### P27（2026-10-31，分类块圆角与顶部软虚化）
+
+- 侧栏导航 `.nav-card` 是普通 div（不是 Card），之前没有圆角；补 `border-radius: 12px` + `overflow: hidden`，和资料/服务卡一致；
+- 搜索框透明度提到 50%，模糊提到 14px；
+- 新增 `.top-blur`：固定在 header 下方（top 60、height 120），`blur(8px)` + 18% 页面色渐变，并用上下 `mask-image` 渐隐，避免再次出现分割线；
+- 验证：nav 圆角 12px、top-blur 存在且 blur 生效、搜索框仍可点击、滚动时顶部软虚化无硬边。
+
+### P26（2026-10-31，顶部留白加高）
+
+- 首页顶部偏移 `TOP_OFFSET` 从 88 调到 104，搜索框与内容卡片之间的空白从 28px 增加到 44px；
+- Layout `contentOffset` 与 `#page-scroll` 的 `margin-top`/`height` 使用同一个常量，左右两栏仍从 164 对齐开始；
+- 验证：content/sider top=164，search top=76 / bottom=120。
+
+### P25（2026-10-31，去掉顶部块的接缝）
+
+- 删除 `.top-dock` 整块：不再有 60–148 的半透明填充与底边，避免出现一条横向分割线；
+- 搜索框继续 fixed 悬浮，页头保持实底；顶部与内容之间只剩页面背景的自然渐变；
+- 背景图渐隐保持 80%，与内容起点无硬边；
+- 验证：`.top-dock` 数量 0，左侧与右侧顶部背景连续。
+
+### P24（2026-10-31，独立的半透明顶部块）
+
+- 页头恢复实底（`headerVariant="solid"`），去掉 `.app > header` 的透明度覆盖；
+- 页头下方新增独立 `.top-dock`：`position: fixed; top:60px; height:88px`，背景 28% 页面色 + `blur(10px)` + 半透明底边，作为承载搜索框的单独块，而不是让整条看起来像背景填充；
+- 搜索框保持 60% 半透明；
+- 背景图渐隐层恢复 80%（撤掉上一轮为露出背景做的 65%）；
+- 验证：dock top=60、height=88、alpha=0.28；header 纯白；搜索框可见；无 mask 元素。
+
+### P23（2026-10-31，去掉遮罩、顶部透明）
+
+- 删除 `scroll-fade` 整条遮罩及创建逻辑，页面不再有顶部渐隐/模糊层；
+- 页头改为 `headerVariant="blur"`，并用 `.app > header` 把底色降到 55%；搜索框底色降到 60% 并保留轻微 blur；
+- 背景图渐隐层高度从 80% 调到 65%，让页头到内容之间那一条保持背景原色，不再发白；
+- 验证：`.scroll-fade` 数量为 0；header 背景 alpha=0.55；搜索框 alpha=0.60。
+
+### P22（2026-10-31，遮罩合并为整条）
+
+- 去掉内容区自带的 `.content-veil`，只保留一条固定遮罩；
+- 遮罩宽度从侧栏左边缘一直覆盖到内容区右边缘（实测 left=50、width=1340），左右同一水平高度（top=148），不再像两个块拼接；
+- 渐变、模糊参数不变，滚动后整体淡入。
+
+### P21（2026-10-31，侧栏虚化遮罩与透明度）
+
+- 侧栏顶部增加独立 fixed 遮罩层：位置跟随侧栏左右/宽度，固定在滚动区顶部（y=148），滚动后淡入；
+- 遮罩用 `backdrop-filter: blur(14px)` + 45%→20%→透明的页面色渐变，既虚化又不挡内容；不能挂在侧栏内部（会被吸底 `translateY` 带走）；
+- 左侧资料卡 / 本地服务 / 导航卡改成 64% 不透明 + `backdrop-filter` 毛玻璃，露出页面背景；
+- 修复 Tailwind/构建器只保留 `-webkit-backdrop-filter` 导致 Chromium 不生效的问题：只写标准属性；
+- 验证：滚动后遮罩 top=148、opacity=1、backdrop-filter=blur(14px) saturate(1.1)，卡片背景 alpha=0.64。
+
+### P20（2026-10-31，双栏非对称吸底滚动）
+
+- 两栏顶部对齐：去掉首页侧栏额外的 `padding-top`，两栏都从 `#page-scroll` 顶部（y=148）开始；
+- 隐藏滚动条：`#page-scroll` 使用 `scrollbar-width: none` / `::-webkit-scrollbar { display:none }`；
+- 非对称吸底：仍共用一个滚动容器；滚动时用 `translateY(max(0, scrollTop - (侧栏高度 - 视口高度)))` 补偿左栏，左侧内容到底后吸附在视口底部，右侧继续滚动；
+- 右侧先到底、左侧更长时不补偿，两栏同步滚到整体底部；`ResizeObserver` 在内容变化时重算；
+- 验证：初始左右 top 均为 148；滚动 120/300/600 时左侧 top 稳定在 144、bottom 贴住 900，右侧正常滚动；页面无滚动条。
+
+### P19（2026-10-31，左右两栏共用滚动容器）
+
+- 不再用 `sider.scrollTop = content.scrollTop` 模拟同步：把 Layout 的 body（`#page-scroll`）设为滚动容器，`margin-top: 88px`、高度 `calc(100% - 88px)`，左右两栏都在这个容器里；
+- 搜索框仍 fixed 在页头下方；滚动内容从搜索框下方开始；左右两栏位移完全一致（滚动 300px 后两边 top 都是 -152）；
+- 内容区 `overflow: visible`，侧栏高度改为 auto；返回顶部与路由切换都改用 `#page-scroll`；
+- 验证：滚动后两栏 top 相同、搜索框位置不变、返回顶部回到 0、切分组后滚动归零。
+
+### P18（2026-10-31，搜索框下滚动、本地服务排序、拖拽末位修复）
+
+- 前台恢复「内容区内部滚动」：页头与搜索框固定，滚动区域从搜索框下方开始；侧栏不再独立滚动，内容区滚动时同步设置侧栏 `scrollTop`，滚轮在侧栏上也驱动内容区；
+- 本地服务卡片正式进入 `card` 表（v22，key=`local-service`，sort=-1），后台卡片列表可拖动排序，首页按顺序渲染；后端禁止删除、改名、配置分组；
+- 修复拖拽排序：向下拖时插到目标之后，倒数第二项可以拖到最后一项；
+- 验证：搜索框滚动前后位置不变；内容滚动 300px 时侧栏 `scrollTop` 跟随（受可滚高度限制）；本地服务拖到末位、倒数第二拖到末位均落库；首页顺序与后台一致；删除本地服务返回 400。
+
+### P17（2026-10-31，侧栏卡片显隐、本地服务卡片、同步滚动）
+
+- 侧边栏设置顶部新增「侧栏卡片」：本地管理员 / 本地服务各一个开关，即时保存到 `settings.sidebar.show_profile / show_service`；与下方分组导航分区显示；
+- 首页恢复「本地服务」卡片（由 `/api/projects` 运行时生成，应用网格），固定排在最前；移除卡片右上角三点；
+- 首页卡片后台新增只读「本地服务」表：列出项目名 / 访问地址，标记不可删除，不提供删除/改名；
+- 前台放弃整屏内滚动，改为页面整体滚动，左右两栏同步滚动；
+- 验证：开关即落库、前台隐藏对应卡片、三点数量为 0、本地服务表无删除按钮、滚动 300px 两栏同步位移 300px。
+
+### P16（2026-10-31，格式下沉到条目）
+
+- 数据库 v21：`entry.format`（apps / posters / articles），老数据按所属根分组的 `view_mode` 自动回填；新库 seed 按分区写入；
+- 分组管理移除「格式」字段与显示，根分组只作为容器；
+- 内容弹窗新增「格式」选择，列表增加「格式」列；同一条目可单独设为应用/海报/图文；
+- 前台改为按 `entry.format` 渲染：首页卡片、分组页同一分组内可同时出现应用网格与海报/图文网格；详情页按条目格式选择模板；
+- 验证：迁移后 20 应用 / 13 海报；在应用分组内新建海报条目后，内容列表、首页卡片、分组页均能混合展示。
+
+### P15（2026-10-31，卡片新建弹窗、标题保存/删除、拖动排序）
+
+- 新建卡片改为弹窗：输入标题 → 确认新建 / 取消关闭；创建后自动选中新表；
+- 卡片标题右侧增加「保存」和「删除」按钮，标题按 Enter 或保存按钮提交；
+- 左侧卡片支持 HTML5 拖动排序，拖放后按顺序写入 `card.sort`，刷新后首页卡片顺序一致；
+- 标签栏与内容之间补 20px 间距；左侧卡片增加拖动手柄和提示；
+- 验证：弹窗取消/确认、保存/删除按钮、拖动 `sadf`/新卡到首位后 `/api/catalog2` 顺序变化。
+
+### P14（2026-10-31，首页卡片改为侧栏 + 表格）
+
+- 首页卡片不再纵向堆叠：左侧是卡片列表（名称 + 已选分组数），右侧是当前卡片的分组表格（分组名称 / 预览条数 / 展示开关）；
+- 「新建卡片」即新增一张表，创建后自动选中；卡片标题、删除在表格上方；
+- 表格内开关、条数即时保存，未选分组显示 —；侧栏卡片可一键切换；
+- 验证：切换卡片表格同步、新建后自动选中、表格开关即时写入 `card_group`、无卡片级保存按钮。
+
+### P13（2026-10-31，首页卡片按侧边栏逻辑）
+
+- 每张卡片的分组勾选改为与侧边栏一致：标题在左、开关在右、勾选/取消即时保存（`PUT /api/cards/{id}/groups`），去掉每张卡的「保存」按钮；
+- 卡片标题、单组预览条数改为失焦保存；条数清空表示使用默认；
+- 卡片删除仍保留图标按钮；验证：无卡片级保存按钮、开关在右、勾选后 `card_group` 即时更新、条数 2 与改名均落库。
+
+### P12（2026-10-31，内容/侧边栏交互微调）
+
+- 内容页与条目弹窗的分组下拉只显示分组名，去掉格式后缀与缩进空格，选项统一左对齐；
+- 侧边栏页：开关移到右侧，拨动即写入 `settings.sidebar.tree_hidden`；移除「保存侧边栏 / 撤销改动 / 保存」按钮，保存成功用 Toast 提示；
+- 验证：下拉选项无括号、x 对齐；侧边栏无保存按钮、开关在右、切换后设置即时落库。
+
+### P11（2026-10-31，内容页列表化）
+
+- 内容页改为与分组管理一致的列表：标题 / 跳转链接 / 所属分组 / 操作；
+- 选中主分组时递归列出其所有子分组的条目（显示所属分组），选子分组只列该子树；
+- 编辑弹窗始终显示「标识」字段（编辑时只读，创建时可填）；
+- 条目接口补齐图文的 `href`，列表统一展示跳转链接（空值显示 —）；
+- 验证：主分组 20 条、子分组 4 条；编辑弹窗标识为 `github` 且只读；`cargo test` 59 passed。
+
+### P10（2026-10-31，分组管理页重做）
+
+- 参考 `TT-Helper/需求/5297/1.html` 重做分组管理：树形表格（分组名称 / 排序权重 / 关联网页数 / 状态 / 操作），去掉「展开全部 / 折叠全部」，新建根分组放左侧；
+- 分组弹窗：上级分组（可移动、防环）、名称、格式（根）、**图标（可留空）**、排序权重、状态；
+- 数据层：`node.enabled`（迁移 v20）控制启停，禁用分组在前台侧栏/卡片隐藏；`node.icon` 支持 iconfont 名、字符或空；
+- 排序修复：同一父级下编辑排序权重不再被当成「移动」重置为末尾；
+- 验证：无图标/有图标、排序 5、禁用后前台隐藏、折叠行均通过；`cargo test` 59 passed。
+
+### P9（2026-10-30，前台切换）
+
+- **前台**：`AppNext` 改为读 `/api/catalog2`，首页按 `card` 勾选的分组渲染（可混合格式，每组条数独立），侧栏按分组树 + `tree_hidden` 渲染，分组页 `/g/<key>`、条目页 `/g/<key>/i/<id>`；
+- **详情**：条目在分组子树内递归查找，面包屑显示完整祖先链；编辑仍用 Drawer + `PATCH /api/items`；
+- **服务端**：SPA 回落增加 `/g/` 前缀；
+- **兼容**：旧 `/c/...` 地址按第一段作为分组 key 跳转；旧 `/api/catalog`、旧后台组件暂时保留；
+- 验证：首页卡片、混合格式卡片（应用 + 海报）、侧栏隐藏指定分组、分组页/条目页均通过。
+
+### P8（2026-10-30，子分组开关）
+
+- **与类型解耦**：分区新增 `allow_groups` 开关（迁移 v18）；三种类型共用同一模板，开启后可建分组，关闭后平铺；
+- **默认值**：老库升级时应用类开启、海报/图文关闭；已有分组的非应用分区自动开启；新建分区按类型给默认值，之后可随时改；
+- **平铺兼容**：关闭开关时读取会把（历史）分组内条目一起平铺，内容不丢；首页卡片若指向分组会自动挪回分区；
+- **后台**：「分区」每行新增「子分组」开关，**拨动即保存并立刻出现/收起分组管理**；「内容」弹窗的分组选择随开关出现；「侧栏导航」的建组入口同理；空分组不在侧栏显示；
+- 验证：推荐电影（海报）开启开关 → 建组 → 加海报 → 详情按组显示；关闭 → 恢复平铺且条目仍在；`cargo test` 59 passed。
+
+### P7（2026-10-30，统一内容模型）
+
+- **模型统一**：分区（section）是容器，分组（group）是任意类型的可选子容器，条目可挂在分区或分组上；`view_mode` 只决定渲染方式；
+- **catalog**：所有类型都输出 `groups`（带条目）与 `items`（直属分区条目）；
+- **渲染**：详情页三种类型都支持分组（多组显示小标题，直属条目进「未分组」）；侧栏子菜单、首页卡片预览分组对所有类型生效；
+- **后台**：「分区」「侧栏导航」对所有类型可建组；「内容」弹窗的分组选择新增「直属分区」，编辑可换组；
+- **修复**：首页卡片配置为「整个分区」时应用类预览为空；catalog 条目查询改为按节点取，避免分组重复/错漏；
+- 测试：59 passed。
+
+### P6（2026-10-30）
+
+- **后台新增内容**：`POST /api/items`（`key` + `nodeKey` + 条目字段）、`DELETE /api/items/{key}`；「内容」Tab 用弹窗新增，列表逐条编辑（含换分区/分组）与删除；
+- **分组 CRUD**：`POST /api/categories/{id}/groups`、`PATCH /api/groups/{id}`（改名/侧栏显隐）、`DELETE /api/groups/{id}`（级联组内条目）；「分区」Tab 内联管理，「侧栏导航」Tab 也可直接新建子分组；
+- **卡片预览分组**：`PATCH /api/categories/{id}` 增加 `blockNodeKey`，可在「分区」Tab 选择首页卡片预览哪个分组；
+- 后端校验：应用类条目必须挂在分组上；条目移动通过 `PATCH /api/items/{key}` 的 `nodeKey`；
+- 测试：59 passed（新增条目创建/移动/删除 3 例、分组 2 例）。
+
+### P5（2026-10-30）
+
+- **跳转修复**：保存条目时规范化 `href`（`www.zhihu.com` → `https://www.zhihu.com`，站内路径保留，`javascript:` / `data:` 等协议拒绝），前端渲染再做一次兜底；
+- **侧栏子分类**：`settings.sidebar` 增加 `hidden_groups` / `shown_groups` / `group_order`，侧栏 Tab 展示分组并支持单独显隐、上下移；
+- **归类页**：新增 `PATCH /api/categories/{id}`，`/admin` 的「归类」Tab 可改分区类型（应用/海报/图文）、标题、图标、色条、预览条数；切换类型时自动迁移条目与首页卡片指向；
+- 测试：54 passed（新增 href 规范化 3 例、分类更新 3 例）。
+
+### P4（2026-10-29，收尾）
+
+- 分区增删：`POST /api/categories`、`DELETE /api/categories/{id}`（需登录，级联内容，`local` 不可删），首页与侧栏共用；
+- 资料设置：头像 URL / 名称 / 角色 / 简介 / 位置，应用到侧栏资料卡；
+- 操作条：进入详情页记一次浏览、点赞可切换（localStorage 记状态）、分享复制链接、跳转外链；
+- 交互细节：`[编辑]` 与标题垂直居中并留 12px 间距；设置页操作按钮与内容拉开间距；保存改用 Toast（2.4s 自动消失）；设置页 Tabs 不再出现滚动条；
+- 登录密码框增加显示/隐藏切换（错误后仍可用）；
+- 测试：48 passed（新增 categories 2 例、settings 资料校验）。
+
+
+### P0（已完成，2026-10-29）
+
+- 迁移机制：`user_version 15 → 16`，`schema::migrate` 逐级升级；v15 老库启动时自动补 `admin` / `session` / `setting` 三表；
+- 登录：`POST /api/auth/setup`（仅首次）、`/login`、`/logout`、`PATCH /api/auth/password`；argon2id + sha256(token) 落库；
+- 会话：HttpOnly + SameSite=Strict + Path=/，7 天；改密后所有会话失效；
+- 防护：Origin 同源校验、连续失败 5 次锁 60 秒；
+- 前端：`/login` 独立壳（入口按 pathname 分流）、页头登录/退出登录切换；
+- 测试：后端 37 个单测（新增迁移 2 个 + 登录 4 个），登录流程 e2e 手动脚本验证通过。
+
+**未做（P1/P2）**：`/admin` 设置页、侧栏/页头编辑、内容就编辑、`setting` 表的读写接口。
+
+### P1（已完成，2026-10-29）
+
+- 登录改为**页内弹窗**（`LoginDialog`）：`/login` 旧地址重定向回首页，不再单开页面；
+- 设置读写：`GET /api/settings`（公开）、`PATCH /api/settings`（需登录，`version` 乐观锁，冲突 409、校验失败 400）；
+- `setting` 表存 `key='site'` 的 JSON：页头（启用 / 速度 / 条目与标签/色调）、侧栏（隐藏 / 顺序）；
+- `/admin` 设置页：Tabs（页头滚动信息 / 侧栏导航），条目支持增删、上移下移、占位符 `{count}`/`{project}`/`{status}`；
+- 首页应用设置：滚动条目的文本/标签/速度/启用，侧栏按顺序与显隐渲染；
+- 测试：42 passed（新增 settings 5 例：默认值、版本递增、冲突、校验、坏 JSON 回落）。
+
+### P1 扩展（2026-10-29，同日）
+
+- 首页卡片可配置：显隐、顺序、标题覆盖、每卡预览条数（`settings.sections`，前端 `HomeView` 应用）；
+- 页头滚动信息支持**启用/禁用**（`header.enabled`，关闭后页头中间留空）；
+- 「编辑」按钮只在登录后出现（`canEdit`，未登录时详情页与文章页不渲染 `[编辑]`）；
+- 侧栏「首页」与卡片顺序相互独立：侧栏管导航，卡片管首页布局。
+
+
+### P2（已完成，2026-10-29）
+
+- 库新增 `Textarea`（stash-ui v0.2.0）：`rows` / `resize` / `invalid`；
+- 条目编辑：`GET /api/items/{key}`（公开读）、`PATCH /api/items/{key}`（需登录）；
+- 乐观锁：`entry.updated_at`（迁移 v17），冲突返回 409；
+- 可编辑字段：标题、简介、标签、一句话评价、正文 Markdown、封面、跳转地址；
+- 前端：详情页 `[编辑]` → `Drawer` 表单；保存后 `catalog.reload()` 局部刷新，不整页刷新；
+- 审计：每次条目更新写入 `audit` 表；
+- 测试：46 passed（新增 entries 4 例：更新/标签替换、冲突、空标题、不存在）。
+
+### P3（部分完成，2026-10-29）
+
+- 审计表 `audit`：记录 `item.update`、`settings.update`；
+- 备份：`GET /api/backup`（需登录）用 `VACUUM INTO` 生成一致性副本并以附件下载；
+- 系统设置 Tab：修改密码（成功后所有会话失效）、下载备份；
+- **未做**：恢复/导入（需要停机替换文件或在线校验导入流程）、回收站/软删除、图片上传、拖拽排序（当前用上移/下移按钮替代）。
+
+
+

src/db/auth.rs

@@ -0,0 +1,309 @@
+//! 登录与会话。
+//!
+//! - 单管理员：`admin` 表只允许一行，密码用 argon2id 存 PHC 字符串；
+//! - 会话：随机 32 字节 token 放在 HttpOnly Cookie 里，库里只存它的 sha256；
+//! - 所有函数都是同步的，调用方负责放到 `spawn_blocking` 里。
+
+use std::time::{SystemTime, UNIX_EPOCH};
+
+use argon2::{
+    Argon2, PasswordHash, PasswordHasher, PasswordVerifier,
+    password_hash::{SaltString, rand_core::OsRng},
+};
+use rusqlite::{Connection, OptionalExtension, params};
+use sha2::{Digest, Sha256};
+
+use crate::{db::map_error, error::StashError};
+
+/// 会话有效期：7 天
+pub const SESSION_TTL_SECS: i64 = 7 * 24 * 60 * 60;
+/// 密码最短长度
+pub const MIN_PASSWORD_LEN: usize = 8;
+
+#[derive(Debug, Clone, PartialEq, Eq, Default, serde::Serialize)]
+pub struct SessionState {
+    pub authenticated: bool,
+    /// 是否已经设置过管理员密码（前端据此显示「登录」还是「首次设置」）
+    pub has_admin: bool,
+    pub username: Option<String>,
+}
+
+fn now() -> i64 {
+    SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .map(|duration| duration.as_secs() as i64)
+        .unwrap_or(0)
+}
+
+fn hash_token(token: &str) -> String {
+    let mut hasher = Sha256::new();
+    hasher.update(token.as_bytes());
+    hasher.finalize().iter().map(|byte| format!("{byte:02x}")).collect()
+}
+
+fn random_token() -> String {
+    let bytes: [u8; 32] = rand::random();
+    bytes.iter().map(|byte| format!("{byte:02x}")).collect()
+}
+
+fn hash_password(password: &str) -> Result<String, StashError> {
+    let salt = SaltString::generate(&mut OsRng);
+    Argon2::default()
+        .hash_password(password.as_bytes(), &salt)
+        .map(|hash| hash.to_string())
+        .map_err(|error| StashError::Database(format!("密码哈希失败: {error}")))
+}
+
+fn verify_hash(password: &str, hash: &str) -> bool {
+    match PasswordHash::new(hash) {
+        Ok(parsed) => Argon2::default()
+            .verify_password(password.as_bytes(), &parsed)
+            .is_ok(),
+        Err(_) => false,
+    }
+}
+
+pub fn has_admin(conn: &Connection) -> Result<bool, StashError> {
+    let count: i64 = conn
+        .query_row("SELECT COUNT(*) FROM admin", [], |row| row.get(0))
+        .map_err(map_error)?;
+    Ok(count > 0)
+}
+
+fn admin_row(conn: &Connection) -> Result<Option<(String, String)>, StashError> {
+    conn.query_row("SELECT username, password_hash FROM admin WHERE id = 1", [], |row| {
+        Ok((row.get(0)?, row.get(1)?))
+    })
+    .optional()
+    .map_err(map_error)
+}
+
+fn validate_password(password: &str) -> Result<(), StashError> {
+    if password.chars().count() < MIN_PASSWORD_LEN {
+        return Err(StashError::InvalidDirectory(format!(
+            "密码至少 {MIN_PASSWORD_LEN} 位"
+        )));
+    }
+    Ok(())
+}
+
+/// 首次设置管理员密码；已经设置过则拒绝。
+pub fn create_admin(conn: &Connection, username: &str, password: &str) -> Result<(), StashError> {
+    validate_password(password)?;
+    if has_admin(conn)? {
+        return Err(StashError::InvalidDirectory("管理员已存在，不能重复初始化".into()));
+    }
+
+    let hash = hash_password(password)?;
+    conn.execute(
+        "INSERT INTO admin (id, username, password_hash, updated_at) VALUES (1, ?1, ?2, ?3)",
+        params![username, hash, now()],
+    )
+    .map_err(map_error)?;
+    Ok(())
+}
+
+/// 校验密码；成功返回用户名。
+pub fn verify_login(conn: &Connection, password: &str) -> Result<Option<String>, StashError> {
+    let Some((username, hash)) = admin_row(conn)? else {
+        return Ok(None);
+    };
+    Ok(verify_hash(password, &hash).then_some(username))
+}
+
+/// 修改密码：必须提供当前密码；成功后清掉其它会话。
+pub fn change_password(
+    conn: &mut Connection,
+    current: &str,
+    next: &str,
+) -> Result<bool, StashError> {
+    validate_password(next)?;
+    let Some((_, hash)) = admin_row(conn)? else {
+        return Err(StashError::InvalidDirectory("尚未设置管理员密码".into()));
+    };
+    if !verify_hash(current, &hash) {
+        return Ok(false);
+    }
+
+    let new_hash = hash_password(next)?;
+    let tx = conn.transaction().map_err(map_error)?;
+    tx.execute(
+        "UPDATE admin SET password_hash = ?1, updated_at = ?2 WHERE id = 1",
+        params![new_hash, now()],
+    )
+    .map_err(map_error)?;
+    tx.execute("DELETE FROM session", []).map_err(map_error)?;
+    tx.commit().map_err(map_error)?;
+    Ok(true)
+}
+
+/// 新建会话，返回**原始 token**（只在这里出现一次，库里存哈希）。
+pub fn issue_session(conn: &Connection) -> Result<String, StashError> {
+    let token = random_token();
+    let issued = now();
+    conn.execute(
+        "INSERT INTO session (token_hash, created_at, expires_at, last_seen_at)
+         VALUES (?1, ?2, ?3, ?2)",
+        params![hash_token(&token), issued, issued + SESSION_TTL_SECS],
+    )
+    .map_err(map_error)?;
+    Ok(token)
+}
+
+/// 读取会话状态；token 无效/过期都返回未登录。
+pub fn state(conn: &Connection, token: Option<&str>) -> Result<SessionState, StashError> {
+    let has = has_admin(conn)?;
+    let Some(token) = token else {
+        return Ok(SessionState {
+            authenticated: false,
+            has_admin: has,
+            username: None,
+        });
+    };
+
+    let token_hash = hash_token(token);
+    let row: Option<(i64,)> = conn
+        .query_row(
+            "SELECT expires_at FROM session WHERE token_hash = ?1",
+            [&token_hash],
+            |row| Ok((row.get(0)?,)),
+        )
+        .optional()
+        .map_err(map_error)?;
+
+    let Some((expires_at,)) = row else {
+        return Ok(SessionState {
+            authenticated: false,
+            has_admin: has,
+            username: None,
+        });
+    };
+
+    if expires_at <= now() {
+        conn.execute("DELETE FROM session WHERE token_hash = ?1", [&token_hash])
+            .map_err(map_error)?;
+        return Ok(SessionState {
+            authenticated: false,
+            has_admin: has,
+            username: None,
+        });
+    }
+
+    conn.execute(
+        "UPDATE session SET last_seen_at = ?1 WHERE token_hash = ?2",
+        params![now(), token_hash],
+    )
+    .map_err(map_error)?;
+
+    Ok(SessionState {
+        authenticated: true,
+        has_admin: has,
+        username: admin_row(conn)?.map(|(username, _)| username),
+    })
+}
+
+pub fn revoke(conn: &Connection, token: &str) -> Result<(), StashError> {
+    conn.execute("DELETE FROM session WHERE token_hash = ?1", [hash_token(token)])
+        .map_err(map_error)?;
+    Ok(())
+}
+
+/// 清理过期会话（登录时顺手调用即可）。
+pub fn purge_expired(conn: &Connection) -> Result<(), StashError> {
+    conn.execute("DELETE FROM session WHERE expires_at <= ?1", [now()])
+        .map_err(map_error)?;
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn db() -> Connection {
+        let conn = Connection::open_in_memory().expect("内存库应能打开");
+        conn.execute_batch(
+            "CREATE TABLE admin (
+                id INTEGER PRIMARY KEY CHECK (id = 1),
+                username TEXT NOT NULL,
+                password_hash TEXT NOT NULL,
+                updated_at INTEGER NOT NULL
+             );
+             CREATE TABLE session (
+                token_hash TEXT PRIMARY KEY,
+                created_at INTEGER NOT NULL,
+                expires_at INTEGER NOT NULL,
+                last_seen_at INTEGER NOT NULL
+             );",
+        )
+        .expect("应能建表");
+        conn
+    }
+
+    #[test]
+    fn setup_then_login_and_session() {
+        let conn = db();
+        assert!(!has_admin(&conn).expect("可查"));
+        create_admin(&conn, "admin", "stash-pass-1").expect("首次设置应成功");
+
+        assert!(has_admin(&conn).expect("可查"));
+        assert!(verify_login(&conn, "wrong-pass").expect("可校验").is_none());
+        assert_eq!(
+            verify_login(&conn, "stash-pass-1").expect("可校验").as_deref(),
+            Some("admin")
+        );
+
+        let token = issue_session(&conn).expect("应能建会话");
+        let session = state(&conn, Some(&token)).expect("应能读状态");
+        assert!(session.authenticated);
+        assert_eq!(session.username.as_deref(), Some("admin"));
+
+        // 原始 token 不落库
+        let stored: String = conn
+            .query_row("SELECT token_hash FROM session", [], |row| row.get(0))
+            .expect("应有会话行");
+        assert_ne!(stored, token);
+        assert_eq!(stored, hash_token(&token));
+
+        revoke(&conn, &token).expect("应能撤销");
+        assert!(!state(&conn, Some(&token)).expect("应能读状态").authenticated);
+    }
+
+    #[test]
+    fn rejects_short_password_and_second_setup() {
+        let conn = db();
+        assert!(create_admin(&conn, "admin", "short").is_err());
+        create_admin(&conn, "admin", "stash-pass-1").expect("首次设置应成功");
+        assert!(create_admin(&conn, "admin", "stash-pass-2").is_err());
+    }
+
+    #[test]
+    fn change_password_requires_current_and_clears_sessions() {
+        let mut conn = db();
+        create_admin(&conn, "admin", "stash-pass-1").expect("应能设置");
+        let token = issue_session(&conn).expect("应能建会话");
+
+        assert!(!change_password(&mut conn, "nope", "stash-pass-2").expect("可调用"));
+        assert!(change_password(&mut conn, "stash-pass-1", "stash-pass-2").expect("可调用"));
+
+        assert_eq!(
+            verify_login(&conn, "stash-pass-2").expect("可校验").as_deref(),
+            Some("admin")
+        );
+        assert!(!state(&conn, Some(&token)).expect("可读").authenticated);
+    }
+
+    #[test]
+    fn expired_session_is_rejected_and_deleted() {
+        let conn = db();
+        create_admin(&conn, "admin", "stash-pass-1").expect("应能设置");
+        let token = issue_session(&conn).expect("应能建会话");
+        conn.execute("UPDATE session SET expires_at = ?1", [now() - 1])
+            .expect("应能改过期时间");
+
+        assert!(!state(&conn, Some(&token)).expect("可读").authenticated);
+        let count: i64 = conn
+            .query_row("SELECT COUNT(*) FROM session", [], |row| row.get(0))
+            .expect("可查");
+        assert_eq!(count, 0, "过期会话应被删除");
+    }
+}

src/db/cards.rs

@@ -0,0 +1,237 @@
+//! 首页卡片：只存标题/顺序，内容由 `card_group` 勾选分组组成。
+//!
+//! 卡片与分组是多对多：一张卡可以放不同格式的分组，分组也可以被多张卡复用。
+//! 卡片本身不拥有数据，删卡不影响内容。
+
+use rusqlite::{Connection, OptionalExtension, params};
+use serde::Deserialize;
+use serde_json::{Value, json};
+
+use crate::{db::entries, db::map_error, error::StashError};
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct NewCard {
+    pub title: String,
+}
+
+#[derive(Debug, Clone, Default, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UpdateCard {
+    pub title: Option<String>,
+    pub sort: Option<i64>,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct CardGroupInput {
+    pub group_key: String,
+    #[serde(default)]
+    pub preview_limit: Option<i64>,
+}
+
+pub fn load(conn: &Connection) -> Result<Vec<Value>, StashError> {
+    let mut stmt = conn
+        .prepare("SELECT id, key, title, sort FROM card ORDER BY sort, id")
+        .map_err(map_error)?;
+
+    let cards = stmt
+        .query_map([], |row| {
+            Ok((
+                row.get::<_, i64>(0)?,
+                row.get::<_, String>(1)?,
+                row.get::<_, String>(2)?,
+                row.get::<_, i64>(3)?,
+            ))
+        })
+        .map_err(map_error)?
+        .collect::<Result<Vec<_>, _>>()
+        .map_err(map_error)?;
+
+    drop(stmt);
+
+    let mut result = Vec::with_capacity(cards.len());
+    for (id, key, title, sort) in cards {
+        let mut group_stmt = conn
+            .prepare(
+                "SELECT group_key, preview_limit FROM card_group
+                 WHERE card_id = ?1 ORDER BY sort",
+            )
+            .map_err(map_error)?;
+        let groups = group_stmt
+            .query_map([id], |row| {
+                Ok((
+                    row.get::<_, String>(0)?,
+                    row.get::<_, Option<i64>>(1)?,
+                ))
+            })
+            .map_err(map_error)?
+            .collect::<Result<Vec<_>, _>>()
+            .map_err(map_error)?;
+
+        result.push(json!({
+            "id": id,
+            "key": key,
+            "title": title,
+            "sort": sort,
+            "groups": groups
+                .into_iter()
+                .map(|(group_key, preview_limit)| json!({
+                    "groupKey": group_key,
+                    "previewLimit": preview_limit,
+                }))
+                .collect::<Vec<_>>(),
+        }));
+    }
+
+    Ok(result)
+}
+
+pub fn create(conn: &mut Connection, new: NewCard) -> Result<i64, StashError> {
+    let title = new.title.trim();
+    if title.is_empty() || title.chars().count() > 40 {
+        return Err(StashError::InvalidDirectory("卡片名称需为 1–40 个字".into()));
+    }
+
+    let tx = conn.transaction().map_err(map_error)?;
+    let sort: i64 = tx
+        .query_row("SELECT COALESCE(MAX(sort), 0) + 1 FROM card", [], |row| {
+            row.get(0)
+        })
+        .map_err(map_error)?;
+
+    tx.execute(
+        "INSERT INTO card (key, title, sort) VALUES ('pending', ?1, ?2)",
+        params![title, sort],
+    )
+    .map_err(map_error)?;
+    let id = tx.last_insert_rowid();
+    tx.execute(
+        "UPDATE card SET key = ?1 WHERE id = ?2",
+        params![format!("card-{id}"), id],
+    )
+    .map_err(map_error)?;
+
+    entries::audit(&tx, "card.create", &format!("card-{id}"), title)?;
+    tx.commit().map_err(map_error)?;
+    Ok(id)
+}
+
+pub fn update(conn: &mut Connection, id: i64, patch: UpdateCard) -> Result<(), StashError> {
+    let current: Option<(String, String, i64)> = conn
+        .query_row(
+            "SELECT key, title, sort FROM card WHERE id = ?1",
+            [id],
+            |row| Ok((row.get(0)?, row.get(1)?, row.get(2)?)),
+        )
+        .optional()
+        .map_err(map_error)?;
+
+    let Some((current_key, current_title, current_sort)) = current else {
+        return Err(StashError::NotFound(format!("卡片不存在: {id}")));
+    };
+    if current_key == "local-service" && patch.title.is_some() {
+        return Err(StashError::InvalidDirectory(
+            "本地服务卡片由系统生成，不能改名".into(),
+        ));
+    }
+
+    let title = match patch.title {
+        Some(title) => {
+            let title = title.trim().to_string();
+            if title.is_empty() || title.chars().count() > 40 {
+                return Err(StashError::InvalidDirectory("卡片名称需为 1–40 个字".into()));
+            }
+            title
+        }
+        None => current_title,
+    };
+    let sort = patch.sort.unwrap_or(current_sort);
+
+    let tx = conn.transaction().map_err(map_error)?;
+    tx.execute(
+        "UPDATE card SET title = ?1, sort = ?2 WHERE id = ?3",
+        params![title, sort, id],
+    )
+    .map_err(map_error)?;
+    entries::audit(&tx, "card.update", &format!("card-{id}"), &title)?;
+    tx.commit().map_err(map_error)?;
+    Ok(())
+}
+
+pub fn remove(conn: &Connection, id: i64) -> Result<(), StashError> {
+    let key: Option<String> = conn
+        .query_row("SELECT key FROM card WHERE id = ?1", [id], |row| row.get(0))
+        .optional()
+        .map_err(map_error)?;
+    if key.as_deref() == Some("local-service") {
+        return Err(StashError::InvalidDirectory(
+            "本地服务卡片由系统生成，不能删除".into(),
+        ));
+    }
+    let removed = conn
+        .execute("DELETE FROM card WHERE id = ?1", [id])
+        .map_err(map_error)?;
+    if removed == 0 {
+        return Err(StashError::NotFound(format!("卡片不存在: {id}")));
+    }
+    entries::audit(conn, "card.delete", &format!("card-{id}"), "")?;
+    Ok(())
+}
+
+/// 整组替换卡片勾选的分组（顺序即数组顺序）。
+pub fn set_groups(
+    conn: &mut Connection,
+    id: i64,
+    groups: Vec<CardGroupInput>,
+) -> Result<(), StashError> {
+    let key: Option<String> = conn
+        .query_row("SELECT key FROM card WHERE id = ?1", [id], |row| row.get(0))
+        .optional()
+        .map_err(map_error)?;
+    if key.as_deref() == Some("local-service") {
+        return Err(StashError::InvalidDirectory(
+            "本地服务卡片由系统生成，不能配置分组".into(),
+        ));
+    }
+
+    let exists: i64 = conn
+        .query_row("SELECT COUNT(*) FROM card WHERE id = ?1", [id], |row| row.get(0))
+        .map_err(map_error)?;
+    if exists == 0 {
+        return Err(StashError::NotFound(format!("卡片不存在: {id}")));
+    }
+
+    for group in &groups {
+        let node_exists: i64 = conn
+            .query_row("SELECT COUNT(*) FROM node WHERE key = ?1", [&group.group_key], |row| {
+                row.get(0)
+            })
+            .map_err(map_error)?;
+        if node_exists == 0 {
+            return Err(StashError::NotFound(format!(
+                "分组不存在: {}",
+                group.group_key
+            )));
+        }
+        if let Some(limit) = group.preview_limit {
+            if !(1..=60).contains(&limit) {
+                return Err(StashError::InvalidDirectory("预览条数需在 1–60 之间".into()));
+            }
+        }
+    }
+
+    let tx = conn.transaction().map_err(map_error)?;
+    tx.execute("DELETE FROM card_group WHERE card_id = ?1", [id])
+        .map_err(map_error)?;
+    for (sort, group) in groups.iter().enumerate() {
+        tx.execute(
+            "INSERT INTO card_group (card_id, group_key, sort, preview_limit)
+             VALUES (?1, ?2, ?3, ?4)",
+            params![id, group.group_key, sort as i64, group.preview_limit],
+        )
+        .map_err(map_error)?;
+    }
+    entries::audit(&tx, "card.groups", &format!("card-{id}"), "")?;
+    tx.commit().map_err(map_error)?;
+    Ok(())
+}

src/db/catalog.rs

@@ -25,12 +25,13 @@ struct NodeRow {
     preview_limit: Option<i64>,
     empty_text: Option<String>,
     show_in_sidebar: bool,
+    allow_groups: bool,
 }
 
 /// 条目行：与 `entry` 表的列一一对应
 struct EntryRow {
     key: String,
-    node_key: String,
+    format: String,
     name: String,
     description: Option<String>,
     icon: Option<String>,
@@ -53,11 +54,160 @@ pub fn load(conn: &Connection) -> Result<Catalog, StashError> {
     })
 }
 
+/// 分组树节点（新视图用）
+struct TreeNode {
+    key: String,
+    parent: Option<String>,
+    title: String,
+    view_mode: Option<String>,
+    icon: Option<String>,
+    bar_color: Option<String>,
+    preview_limit: Option<i64>,
+    sort: i64,
+    enabled: bool,
+}
+
+/// 新的原子视图：完整分组树（多层、带格式、带条目），供新首页/侧栏/后台使用。
+pub fn load_tree(conn: &Connection) -> Result<Value, StashError> {
+    let mut stmt = conn
+        .prepare(
+            "SELECT key, parent_key, title, view_mode, icon, bar_color, preview_limit, sort, enabled
+             FROM node ORDER BY sort, key",
+        )
+        .map_err(map_error)?;
+
+    let nodes = stmt
+        .query_map([], |row| {
+            Ok(TreeNode {
+                key: row.get(0)?,
+                parent: row.get(1)?,
+                title: row.get(2)?,
+                view_mode: row.get(3)?,
+                icon: row.get(4)?,
+                bar_color: row.get(5)?,
+                preview_limit: row.get(6)?,
+                sort: row.get(7)?,
+                enabled: row.get(8)?,
+            })
+        })
+        .map_err(map_error)?
+        .collect::<Result<Vec<_>, _>>()
+        .map_err(map_error)?;
+
+    drop(stmt);
+
+    let index: HashMap<String, usize> = nodes
+        .iter()
+        .enumerate()
+        .map(|(idx, node)| (node.key.clone(), idx))
+        .collect();
+
+    // 子节点索引（按 sort 已排好序）
+    let mut children: HashMap<Option<String>, Vec<usize>> = HashMap::new();
+    for (idx, node) in nodes.iter().enumerate() {
+        children.entry(node.parent.clone()).or_default().push(idx);
+    }
+
+    // 每个节点继承最近根分组的格式
+    let mut formats: Vec<String> = vec![String::new(); nodes.len()];
+    for idx in 0..nodes.len() {
+        let mut cursor = Some(idx);
+        let mut format = "apps".to_string();
+        while let Some(current) = cursor {
+            if let Some(mode) = &nodes[current].view_mode {
+                format = mode.clone();
+                break;
+            }
+            cursor = nodes[current]
+                .parent
+                .as_ref()
+                .and_then(|parent| index.get(parent).copied());
+        }
+        formats[idx] = format;
+    }
+
+    let tags = load_all_tags(conn)?;
+
+    fn render(
+        conn: &Connection,
+        nodes: &[TreeNode],
+        children: &HashMap<Option<String>, Vec<usize>>,
+        formats: &[String],
+        tags: &HashMap<String, Vec<String>>,
+        idx: usize,
+    ) -> Result<Value, StashError> {
+        let node = &nodes[idx];
+        let format = &formats[idx];
+        let entries = load_node_entries(conn, &node.key)?;
+        let items = entries
+            .iter()
+            .map(|entry| item_for(entry, tags))
+            .collect::<Vec<_>>();
+
+        let child_values = children
+            .get(&Some(node.key.clone()))
+            .map(|list| {
+                list.iter()
+                    .map(|child| render(conn, nodes, children, formats, tags, *child))
+                    .collect::<Result<Vec<_>, _>>()
+            })
+            .transpose()?
+            .unwrap_or_default();
+
+        Ok(json!({
+            "key": node.key,
+            "parentKey": node.parent,
+            "title": node.title,
+            "format": format,
+            "icon": node.icon.clone().unwrap_or_default(),
+            "barColor": node.bar_color.clone().unwrap_or_default(),
+            "previewLimit": node.preview_limit,
+            "sort": node.sort,
+            "enabled": node.enabled,
+            "entries": items,
+            "children": child_values,
+        }))
+    }
+
+    let roots = children
+        .get(&None)
+        .map(|list| {
+            list.iter()
+                .map(|idx| render(conn, &nodes, &children, &formats, &tags, *idx))
+                .collect::<Result<Vec<_>, _>>()
+        })
+        .transpose()?
+        .unwrap_or_default();
+
+    Ok(Value::Array(roots))
+}
+
+/// 全部条目标签（一次查询，树组装时用）
+fn load_all_tags(conn: &Connection) -> Result<HashMap<String, Vec<String>>, StashError> {
+    let mut stmt = conn
+        .prepare("SELECT entry_key, label FROM entry_tag ORDER BY entry_key, sort")
+        .map_err(map_error)?;
+
+    let rows = stmt
+        .query_map([], |row| {
+            Ok((row.get::<_, String>(0)?, row.get::<_, String>(1)?))
+        })
+        .map_err(map_error)?
+        .collect::<Result<Vec<_>, _>>()
+        .map_err(map_error)?;
+
+    let mut grouped: HashMap<String, Vec<String>> = HashMap::new();
+    for (entry_key, label) in rows {
+        grouped.entry(entry_key).or_default().push(label);
+    }
+    Ok(grouped)
+}
+
 /// 读出全部分区，按 `sort` 排序；顺序即首页分区顺序。
 fn load_sections(conn: &Connection) -> Result<Vec<Value>, StashError> {
     let mut stmt = conn
         .prepare(
-            "SELECT key, title, view_mode, bar_color, icon, preview_limit, empty_text, show_in_sidebar
+            "SELECT key, title, view_mode, bar_color, icon, preview_limit, empty_text, show_in_sidebar, allow_groups
              FROM node
              WHERE kind = 'section'
              ORDER BY sort, key",
@@ -75,6 +225,7 @@ fn load_sections(conn: &Connection) -> Result<Vec<Value>, StashError> {
                 preview_limit: row.get(5)?,
                 empty_text: row.get(6)?,
                 show_in_sidebar: row.get(7)?,
+                allow_groups: row.get(8)?,
             })
         })
         .map_err(map_error)?
@@ -160,6 +311,7 @@ fn build_section(
     );
     object.insert("icon".into(), json!(section.icon.clone().unwrap_or_default()));
     object.insert("showInSidebar".into(), json!(section.show_in_sidebar));
+    object.insert("allowGroups".into(), json!(section.allow_groups));
 
     // 可选字段：没配就不下发，交给前端用 `?? 默认值` 处理
     if let Some(limit) = section.preview_limit {
@@ -173,22 +325,61 @@ fn build_section(
     }
 
     match view_mode {
-        "apps" => object.insert("groups".into(), build_groups(conn, section)?),
-        "posters" => object.insert("items".into(), build_poster_items(conn, section)?),
-        "articles" => object.insert("items".into(), build_article_items(conn, section)?),
+        "apps" | "posters" | "articles" => {}
         other => {
             return Err(StashError::Database(format!(
                 "分区 {} 的 view_mode 非法: {other}",
                 section.key
             )));
         }
-    };
+    }
+
+    // 「允许子分组」开启：分区 → 分组 → 条目；关闭：全部条目平铺
+    let tags = load_tags(conn, &section.key)?;
+    if section.allow_groups {
+        object.insert(
+            "groups".into(),
+            build_groups(conn, section, &tags)?,
+        );
+        let direct = load_node_entries(conn, &section.key)?;
+        let items = direct
+            .iter()
+            .map(|entry| item_for(entry, &tags))
+            .collect::<Vec<_>>();
+        object.insert("items".into(), json!(items));
+    } else {
+        object.insert("groups".into(), json!([]));
+        // 平铺：把（可能存在的）分组里的条目一起取出来，关闭开关时不丢内容
+        let entries = load_section_entries(conn, &section.key)?;
+        let items = entries
+            .iter()
+            .map(|entry| item_for(entry, &tags))
+            .collect::<Vec<_>>();
+        object.insert("items".into(), json!(items));
+    }
 
     Ok(Value::Object(object))
 }
 
-/// 应用类：取出分组节点，再把条目按 `node_key` 分派进去。
-fn build_groups(conn: &Connection, section: &NodeRow) -> Result<Value, StashError> {
+/// 按条目自身的格式组装列表项。
+fn item_for(entry: &EntryRow, tags: &HashMap<String, Vec<String>>) -> Value {
+    let mut value = match entry.format.as_str() {
+        "posters" => poster_item(entry, tags.get(&entry.key)),
+        "articles" => article_item(entry, tags.get(&entry.key)),
+        _ => app_item(entry),
+    };
+    if let Some(object) = value.as_object_mut() {
+        object.insert("format".into(), json!(entry.format));
+    }
+    value
+}
+
+/// 取出某个分区下的分组，并把条目按 `node_key` 分派进去。
+fn build_groups(
+    conn: &Connection,
+    section: &NodeRow,
+    tags: &HashMap<String, Vec<String>>,
+) -> Result<Value, StashError> {
     let mut stmt = conn
         .prepare(
             "SELECT key, title, show_in_sidebar FROM node
@@ -211,15 +402,12 @@ fn build_groups(conn: &Connection, section: &NodeRow) -> Result<Value, StashErro
 
     drop(stmt);
 
-    let entries = load_entries(conn, &section.key)?;
     let mut rendered_groups = Vec::with_capacity(groups.len());
-
     for (group_key, group_title, show_in_sidebar) in groups {
+        let entries = load_node_entries(conn, &group_key)?;
         let items = entries
             .iter()
-            // 保持 entry.sort 决定的顺序
-            .filter(|entry| entry.node_key == group_key)
-            .map(app_item)
+            .map(|entry| item_for(entry, tags))
             .collect::<Vec<_>>();
 
         rendered_groups.push(json!({
@@ -234,32 +422,6 @@ fn build_groups(conn: &Connection, section: &NodeRow) -> Result<Value, StashErro
     Ok(Value::Array(rendered_groups))
 }
 
-/// 海报类：竖版卡片要 `title` / `cover` / `tags`。
-fn build_poster_items(conn: &Connection, section: &NodeRow) -> Result<Value, StashError> {
-    let entries = load_entries(conn, &section.key)?;
-    let tags = load_tags(conn, &section.key)?;
-
-    let items = entries
-        .iter()
-        .map(|entry| poster_item(entry, tags.get(&entry.key)))
-        .collect::<Vec<_>>();
-
-    Ok(Value::Array(items))
-}
-
-/// 图文类：需要 `title` / `desc` / `cover` / `meta` / `body`。
-fn build_article_items(conn: &Connection, section: &NodeRow) -> Result<Value, StashError> {
-    let entries = load_entries(conn, &section.key)?;
-    let tags = load_tags(conn, &section.key)?;
-
-    let items = entries
-        .iter()
-        .map(|entry| article_item(entry, tags.get(&entry.key)))
-        .collect::<Vec<_>>();
-
-    Ok(Value::Array(items))
-}
-
 /// 应用条目：`name` / `desc` / `icon` / `href` 是必填，其余按需下发。
 fn app_item(entry: &EntryRow) -> Value {
     let mut object = Map::new();
@@ -330,6 +492,7 @@ fn article_item(entry: &EntryRow, meta: Option<&Vec<String>>) -> Value {
     if let Some(body) = entry.body.as_ref().filter(|body| !body.trim().is_empty()) {
         object.insert("body".into(), json!(body));
     }
+    insert_optional(&mut object, "href", &entry.href);
 
     Value::Object(object)
 }
@@ -345,11 +508,16 @@ fn insert_optional(object: &mut Map<String, Value>, key: &str, value: &Option<St
 ///
 /// 条目只存 `node_key`，所属分区由父节点推导：
 /// 父节点是分组就取它的 `parent_key`，父节点是分区就取它自己。
-fn load_entries(conn: &Connection, section_key: &str) -> Result<Vec<EntryRow>, StashError> {
+/// 取某个分区下的全部条目（含分组内的），海报 / 图文平铺用。
+fn load_section_entries(
+    conn: &Connection,
+    section_key: &str,
+) -> Result<Vec<EntryRow>, StashError> {
     let mut stmt = conn
         .prepare(
-            "SELECT e.key, e.node_key, e.name, e.description, e.icon, e.href, e.cover,
-                    e.banner, e.badge, e.comment, e.summary, e.body, e.hot, e.views, e.likes
+            "SELECT e.key, e.name, e.description, e.icon, e.href, e.cover,
+                    e.banner, e.badge, e.comment, e.summary, e.body, e.hot, e.views, e.likes,
+                    COALESCE(e.format, 'apps')
              FROM entry e
              JOIN node p ON p.key = e.node_key
              WHERE COALESCE(p.parent_key, p.key) = ?1
@@ -361,20 +529,58 @@ fn load_entries(conn: &Connection, section_key: &str) -> Result<Vec<EntryRow>, S
         .query_map([section_key], |row| {
             Ok(EntryRow {
                 key: row.get(0)?,
-                node_key: row.get(1)?,
-                name: row.get(2)?,
-                description: row.get(3)?,
-                icon: row.get(4)?,
-                href: row.get(5)?,
-                cover: row.get(6)?,
-                banner: row.get(7)?,
-                badge: row.get(8)?,
-                comment: row.get(9)?,
-                summary: row.get(10)?,
-                body: row.get(11)?,
-                hot: row.get(12)?,
-                views: row.get(13)?,
-                likes: row.get(14)?,
+                name: row.get(1)?,
+                description: row.get(2)?,
+                icon: row.get(3)?,
+                href: row.get(4)?,
+                cover: row.get(5)?,
+                banner: row.get(6)?,
+                badge: row.get(7)?,
+                comment: row.get(8)?,
+                summary: row.get(9)?,
+                body: row.get(10)?,
+                hot: row.get(11)?,
+                views: row.get(12)?,
+                likes: row.get(13)?,
+                format: row.get(14)?,
+            })
+        })
+        .map_err(map_error)?
+        .collect::<Result<Vec<_>, _>>()
+        .map_err(map_error)?;
+
+    Ok(entries)
+}
+
+fn load_node_entries(conn: &Connection, node_key: &str) -> Result<Vec<EntryRow>, StashError> {    let mut stmt = conn
+        .prepare(
+            "SELECT e.key, e.name, e.description, e.icon, e.href, e.cover,
+                    e.banner, e.badge, e.comment, e.summary, e.body, e.hot, e.views, e.likes,
+                    COALESCE(e.format, 'apps')
+             FROM entry e
+             WHERE e.node_key = ?1
+             ORDER BY e.sort, e.key",
+        )
+        .map_err(map_error)?;
+
+    let entries = stmt
+        .query_map([node_key], |row| {
+            Ok(EntryRow {
+                key: row.get(0)?,
+                name: row.get(1)?,
+                description: row.get(2)?,
+                icon: row.get(3)?,
+                href: row.get(4)?,
+                cover: row.get(5)?,
+                banner: row.get(6)?,
+                badge: row.get(7)?,
+                comment: row.get(8)?,
+                summary: row.get(9)?,
+                body: row.get(10)?,
+                hot: row.get(11)?,
+                views: row.get(12)?,
+                likes: row.get(13)?,
+                format: row.get(14)?,
             })
         })
         .map_err(map_error)?

src/db/categories.rs

@@ -0,0 +1,827 @@
+//! 分区（首页卡片 / 侧栏项）的新增与删除。
+//!
+//! 分区就是 `node` 表里 `kind='section'` 的行；删除会级联分组、条目与展示块。
+//! 新增时顺手建一条首页展示块，保证它立刻出现在首页。
+
+use rusqlite::{Connection, OptionalExtension, params};
+use serde::Deserialize;
+
+use crate::{db::map_error, error::StashError, db::entries};
+
+const KINDS: [&str; 3] = ["apps", "posters", "articles"];
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct NewCategory {
+    /// 业务键，只允许小写字母、数字与连字符
+    pub id: String,
+    pub title: String,
+    /// apps / posters / articles
+    pub kind: String,
+}
+
+/// 修改分区：字段都可选，只改传进来的。
+#[derive(Debug, Clone, Default, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UpdateCategory {
+    pub title: Option<String>,
+    pub icon: Option<String>,
+    pub bar_color: Option<String>,
+    /// 改类型（应用 / 海报 / 图文）时会顺带迁移条目归属
+    pub kind: Option<String>,
+    pub preview_limit: Option<i64>,
+    pub empty_text: Option<String>,
+    /// 首页卡片预览哪个节点（分区自己或它下面的分组）
+    pub block_node_key: Option<String>,
+    /// 是否允许子分组（与类型无关，后台开关）
+    pub allow_groups: Option<bool>,
+}
+
+/// 新建分组（子分类）
+#[derive(Debug, Clone, Deserialize)]
+pub struct NewGroup {
+    pub id: String,
+    pub title: String,
+}
+
+/// 修改分组：改名 / 侧栏显隐
+#[derive(Debug, Clone, Default, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UpdateGroup {
+    pub title: Option<String>,
+    pub show_in_sidebar: Option<bool>,
+}
+
+fn valid_id(id: &str) -> bool {
+    !id.is_empty()
+        && id.len() <= 32
+        && id
+            .chars()
+            .all(|ch| ch.is_ascii_lowercase() || ch.is_ascii_digit() || ch == '-')
+}
+
+pub fn create(conn: &mut Connection, new: NewCategory) -> Result<(), StashError> {
+    let id = new.id.trim();
+    let title = new.title.trim();
+
+    if !valid_id(id) {
+        return Err(StashError::InvalidDirectory(
+            "标识只能用小写字母、数字与连字符（≤32）".into(),
+        ));
+    }
+    if title.is_empty() || title.chars().count() > 40 {
+        return Err(StashError::InvalidDirectory("标题需为 1–40 个字".into()));
+    }
+    if !KINDS.contains(&new.kind.as_str()) {
+        return Err(StashError::InvalidDirectory("类型不合法".into()));
+    }
+
+    let exists: i64 = conn
+        .query_row("SELECT COUNT(*) FROM node WHERE key = ?1", [id], |row| row.get(0))
+        .map_err(map_error)?;
+    if exists > 0 {
+        return Err(StashError::Conflict(format!("分区已存在: {id}")));
+    }
+
+    let tx = conn.transaction().map_err(map_error)?;
+    let sort: i64 = tx
+        .query_row(
+            "SELECT COALESCE(MAX(sort), 0) + 1 FROM node WHERE kind = 'section'",
+            [],
+            |row| row.get(0),
+        )
+        .map_err(map_error)?;
+
+    tx.execute(
+        "INSERT INTO node (key, parent_key, title, kind, view_mode, allow_groups, sort, show_in_sidebar)
+         VALUES (?1, NULL, ?2, 'section', ?3, ?4, ?5, 1)",
+        params![id, title, new.kind, i64::from(new.kind == "apps"), sort],
+    )
+    .map_err(map_error)?;
+
+    let block_sort: i64 = tx
+        .query_row(
+            "SELECT COALESCE(MAX(sort), 0) + 1 FROM section_block",
+            [],
+            |row| row.get(0),
+        )
+        .map_err(map_error)?;
+    tx.execute(
+        "INSERT INTO section_block (node_key, title, preview_limit, sort) VALUES (?1, NULL, NULL, ?2)",
+        params![id, block_sort],
+    )
+    .map_err(map_error)?;
+
+    entries::audit(&tx, "category.create", id, title)?;
+    tx.commit().map_err(map_error)?;
+    Ok(())
+}
+
+struct SectionRow {
+    title: String,
+    icon: Option<String>,
+    bar_color: Option<String>,
+    view_mode: Option<String>,
+    preview_limit: Option<i64>,
+    empty_text: Option<String>,
+    allow_groups: bool,
+}
+
+fn valid_color(color: &str) -> bool {
+    if color.is_empty() {
+        return true;
+    }
+    let hex = color.strip_prefix('#').unwrap_or("");
+    (hex.len() == 3 || hex.len() == 6) && hex.chars().all(|ch| ch.is_ascii_hexdigit())
+}
+
+/// 修改分区：标题 / 图标 / 色条 / 预览条数 / 空态文案，以及「归类」类型。
+///
+/// 改类型时迁移数据，保证切换后条目不丢：
+/// - 海报 / 图文 → 应用：确保有一个分组，把直接挂在分区上的条目挪进去，
+///   首页卡片也改指向该分组；
+/// - 应用 → 海报 / 图文：卡片从分组挪回分区，分组保留（不影响条目读取）。
+pub fn update(conn: &mut Connection, id: &str, patch: UpdateCategory) -> Result<(), StashError> {
+    if id == "local" {
+        return Err(StashError::InvalidDirectory(
+            "「本地服务」是运行时分类，不能编辑".into(),
+        ));
+    }
+
+    let tx = conn.transaction().map_err(map_error)?;
+
+    let current = tx
+        .query_row(
+            "SELECT title, icon, bar_color, view_mode, preview_limit, empty_text, allow_groups
+             FROM node WHERE key = ?1 AND kind = 'section'",
+            [id],
+            |row| {
+                Ok(SectionRow {
+                    title: row.get(0)?,
+                    icon: row.get(1)?,
+                    bar_color: row.get(2)?,
+                    view_mode: row.get(3)?,
+                    preview_limit: row.get(4)?,
+                    empty_text: row.get(5)?,
+                    allow_groups: row.get(6)?,
+                })
+            },
+        )
+        .optional()
+        .map_err(map_error)?;
+
+    let Some(current) = current else {
+        return Err(StashError::NotFound(format!("分区不存在: {id}")));
+    };
+
+    let title = match patch.title {
+        Some(title) => {
+            let title = title.trim().to_string();
+            if title.is_empty() || title.chars().count() > 40 {
+                return Err(StashError::InvalidDirectory("标题需为 1–40 个字".into()));
+            }
+            title
+        }
+        None => current.title,
+    };
+
+    let icon = match patch.icon {
+        Some(icon) => {
+            let icon = icon.trim().to_string();
+            if icon.chars().count() > 8 {
+                return Err(StashError::InvalidDirectory("图标最多 8 个字符".into()));
+            }
+            (!icon.is_empty()).then_some(icon)
+        }
+        None => current.icon,
+    };
+
+    let bar_color = match patch.bar_color {
+        Some(color) => {
+            let color = color.trim().to_ascii_lowercase();
+            if !valid_color(&color) {
+                return Err(StashError::InvalidDirectory(
+                    "色条需为 #rgb 或 #rrggbb".into(),
+                ));
+            }
+            (!color.is_empty()).then_some(color)
+        }
+        None => current.bar_color,
+    };
+
+    let empty_text = match patch.empty_text {
+        Some(text) => {
+            let text = text.trim().to_string();
+            (!text.is_empty()).then_some(text)
+        }
+        None => current.empty_text,
+    };
+
+    let preview_limit = match patch.preview_limit {
+        Some(limit) => {
+            if !(1..=60).contains(&limit) {
+                return Err(StashError::InvalidDirectory("预览条数需在 1–60 之间".into()));
+            }
+            Some(limit)
+        }
+        None => current.preview_limit,
+    };
+
+    let kind = match patch.kind {
+        Some(kind) => {
+            if !KINDS.contains(&kind.as_str()) {
+                return Err(StashError::InvalidDirectory("类型不合法".into()));
+            }
+            kind
+        }
+        None => current
+            .view_mode
+            .clone()
+            .ok_or_else(|| StashError::Database(format!("分区 {id} 缺少 view_mode")))?,
+    };
+
+    let was_apps = current.view_mode.as_deref() == Some("apps");
+    let is_apps = kind == "apps";
+    let allow_groups = patch.allow_groups.unwrap_or(current.allow_groups);
+
+    if is_apps && !was_apps && allow_groups {
+        // 切到应用且开启子分组：条目必须有分组可挂；没有就建一个「全部」
+        let group_count: i64 = tx
+            .query_row(
+                "SELECT COUNT(*) FROM node WHERE kind = 'group' AND parent_key = ?1",
+                [id],
+                |row| row.get(0),
+            )
+            .map_err(map_error)?;
+
+        let group_key = if group_count == 0 {
+            let group_key = format!("{id}-all");
+            tx.execute(
+                "INSERT INTO node (key, parent_key, title, kind, sort, show_in_sidebar)
+                 VALUES (?1, ?2, '全部', 'group', 1, 1)",
+                params![group_key, id],
+            )
+            .map_err(map_error)?;
+            group_key
+        } else {
+            tx.query_row(
+                "SELECT key FROM node WHERE kind = 'group' AND parent_key = ?1
+                 ORDER BY sort, key LIMIT 1",
+                [id],
+                |row| row.get(0),
+            )
+            .map_err(map_error)?
+        };
+
+        tx.execute(
+            "UPDATE entry SET node_key = ?1 WHERE node_key = ?2",
+            params![group_key, id],
+        )
+        .map_err(map_error)?;
+        tx.execute(
+            "UPDATE section_block SET node_key = ?1 WHERE node_key = ?2",
+            params![group_key, id],
+        )
+        .map_err(map_error)?;
+    }
+
+    // 关闭子分组：首页卡片如果指着分组，挪回分区，避免标题/预览错位
+    if !allow_groups {
+        tx.execute(
+            "UPDATE section_block SET node_key = ?1, title = NULL
+             WHERE node_key IN (
+                SELECT key FROM node WHERE kind = 'group' AND parent_key = ?1
+             )",
+            [id],
+        )
+        .map_err(map_error)?;
+    }
+
+    tx.execute(
+        "UPDATE node SET title = ?1, icon = ?2, bar_color = ?3, view_mode = ?4,
+                preview_limit = ?5, empty_text = ?6, allow_groups = ?7
+         WHERE key = ?8",
+        params![
+            title,
+            icon,
+            bar_color,
+            kind,
+            preview_limit,
+            empty_text,
+            allow_groups,
+            id
+        ],
+    )
+    .map_err(map_error)?;
+
+    // 首页卡片预览哪个节点：分区自己或它下面的分组
+    if let Some(block_node_key) = patch.block_node_key {
+        let block_node_key = block_node_key.trim().to_string();
+        let valid: i64 = tx
+            .query_row(
+                "SELECT COUNT(*) FROM node n LEFT JOIN node p ON p.key = n.parent_key
+                 WHERE n.key = ?1 AND (n.key = ?2 OR p.key = ?2)",
+                params![block_node_key, id],
+                |row| row.get(0),
+            )
+            .map_err(map_error)?;
+        if valid == 0 {
+            return Err(StashError::InvalidDirectory(
+                "首页卡片只能预览本分区或它的分组".into(),
+            ));
+        }
+
+        let updated = tx
+            .execute(
+                "UPDATE section_block SET node_key = ?1, title = NULL
+                 WHERE id IN (
+                    SELECT b.id FROM section_block b
+                    JOIN node n ON n.key = b.node_key
+                    LEFT JOIN node p ON p.key = n.parent_key
+                    WHERE COALESCE(p.key, n.key) = ?2
+                 )",
+                params![block_node_key, id],
+            )
+            .map_err(map_error)?;
+
+        if updated == 0 {
+            let sort: i64 = tx
+                .query_row("SELECT COALESCE(MAX(sort), 0) + 1 FROM section_block", [], |row| {
+                    row.get(0)
+                })
+                .map_err(map_error)?;
+            tx.execute(
+                "INSERT INTO section_block (node_key, title, preview_limit, sort)
+                 VALUES (?1, NULL, NULL, ?2)",
+                params![block_node_key, sort],
+            )
+            .map_err(map_error)?;
+        }
+    }
+
+    entries::audit(&tx, "category.update", id, &title)?;
+    tx.commit().map_err(map_error)?;
+    Ok(())
+}
+
+/// 在应用类分区下新建分组（子分类）。
+pub fn create_group(conn: &mut Connection, section_id: &str, new: NewGroup) -> Result<(), StashError> {
+    let id = new.id.trim();
+    let title = new.title.trim();
+
+    if !valid_id(id) {
+        return Err(StashError::InvalidDirectory(
+            "分组标识只能用小写字母、数字与连字符（≤32）".into(),
+        ));
+    }
+    if title.is_empty() || title.chars().count() > 40 {
+        return Err(StashError::InvalidDirectory("分组标题需为 1–40 个字".into()));
+    }
+
+    let allow_groups: Option<bool> = conn
+        .query_row(
+            "SELECT allow_groups FROM node WHERE key = ?1 AND kind = 'section'",
+            [section_id],
+            |row| row.get(0),
+        )
+        .optional()
+        .map_err(map_error)?;
+
+    let Some(allow_groups) = allow_groups else {
+        return Err(StashError::NotFound(format!("分区不存在: {section_id}")));
+    };
+    if !allow_groups {
+        return Err(StashError::InvalidDirectory(
+            "该分区未开启「允许子分组」".into(),
+        ));
+    }
+
+    let exists: i64 = conn
+        .query_row("SELECT COUNT(*) FROM node WHERE key = ?1", [id], |row| {
+            row.get(0)
+        })
+        .map_err(map_error)?;
+    if exists > 0 {
+        return Err(StashError::Conflict(format!("分组已存在: {id}")));
+    }
+
+    let sort: i64 = conn
+        .query_row(
+            "SELECT COALESCE(MAX(sort), 0) + 1 FROM node WHERE parent_key = ?1",
+            [section_id],
+            |row| row.get(0),
+        )
+        .map_err(map_error)?;
+
+    conn.execute(
+        "INSERT INTO node (key, parent_key, title, kind, view_mode, sort, show_in_sidebar)
+         VALUES (?1, ?2, ?3, 'group', NULL, ?4, 1)",
+        params![id, section_id, title, sort],
+    )
+    .map_err(map_error)?;
+
+    entries::audit(conn, "group.create", id, title)?;
+    Ok(())
+}
+
+/// 修改分组：改名 / 侧栏显隐。
+pub fn update_group(conn: &Connection, id: &str, patch: UpdateGroup) -> Result<(), StashError> {
+    let current: Option<String> = conn
+        .query_row(
+            "SELECT title FROM node WHERE key = ?1 AND kind = 'group'",
+            [id],
+            |row| row.get(0),
+        )
+        .optional()
+        .map_err(map_error)?;
+
+    let Some(current) = current else {
+        return Err(StashError::NotFound(format!("分组不存在: {id}")));
+    };
+
+    let title = match patch.title {
+        Some(title) => {
+            let title = title.trim().to_string();
+            if title.is_empty() || title.chars().count() > 40 {
+                return Err(StashError::InvalidDirectory("分组标题需为 1–40 个字".into()));
+            }
+            title
+        }
+        None => current,
+    };
+
+    match patch.show_in_sidebar {
+        Some(show) => conn.execute(
+            "UPDATE node SET title = ?1, show_in_sidebar = ?2 WHERE key = ?3",
+            params![title, show, id],
+        ),
+        None => conn.execute(
+            "UPDATE node SET title = ?1 WHERE key = ?2",
+            params![title, id],
+        ),
+    }
+    .map_err(map_error)?;
+
+    entries::audit(conn, "group.update", id, &title)?;
+    Ok(())
+}
+
+/// 删除分组：组内条目会一起删除（前端需二次确认）。
+pub fn remove_group(conn: &Connection, id: &str) -> Result<(), StashError> {
+    let removed = conn
+        .execute("DELETE FROM node WHERE key = ?1 AND kind = 'group'", [id])
+        .map_err(map_error)?;
+
+    if removed == 0 {
+        return Err(StashError::NotFound(format!("分组不存在: {id}")));
+    }
+
+    entries::audit(conn, "group.delete", id, "")?;
+    Ok(())
+}
+
+pub fn remove(conn: &mut Connection, id: &str) -> Result<(), StashError> {
+    if id == "local" {
+        return Err(StashError::InvalidDirectory("本地服务不能删除".into()));
+    }
+
+    let removed = conn
+        .execute("DELETE FROM node WHERE key = ?1 AND kind = 'section'", [id])
+        .map_err(map_error)?;
+
+    if removed == 0 {
+        return Err(StashError::NotFound(format!("分区不存在: {id}")));
+    }
+
+    entries::audit(conn, "category.delete", id, "")?;
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn db() -> Connection {
+        let conn = Connection::open_in_memory().expect("内存库应能打开");
+        conn.execute_batch(
+            "PRAGMA foreign_keys = ON;
+             CREATE TABLE node (
+                id INTEGER PRIMARY KEY,
+                key TEXT NOT NULL UNIQUE,
+                parent_key TEXT REFERENCES node(key) ON DELETE CASCADE ON UPDATE CASCADE,
+                title TEXT NOT NULL,
+                kind TEXT NOT NULL,
+                view_mode TEXT,
+                icon TEXT,
+                bar_color TEXT,
+                preview_limit INTEGER,
+                empty_text TEXT,
+                sort INTEGER NOT NULL DEFAULT 0,
+                show_in_sidebar INTEGER NOT NULL DEFAULT 1,
+                allow_groups INTEGER NOT NULL DEFAULT 0
+             );
+             CREATE TABLE entry (
+                key TEXT PRIMARY KEY,
+                node_key TEXT NOT NULL
+             );
+             CREATE TABLE section_block (
+                id INTEGER PRIMARY KEY,
+                node_key TEXT NOT NULL REFERENCES node(key) ON DELETE CASCADE ON UPDATE CASCADE,
+                title TEXT,
+                preview_limit INTEGER,
+                sort INTEGER NOT NULL DEFAULT 0
+             );
+             CREATE TABLE audit (
+                id INTEGER PRIMARY KEY AUTOINCREMENT,
+                at INTEGER NOT NULL,
+                action TEXT NOT NULL,
+                target TEXT,
+                detail TEXT
+             );",
+        )
+        .expect("应能建表");
+        conn
+    }
+
+    #[test]
+    fn create_then_delete() {
+        let mut conn = db();
+        create(
+            &mut conn,
+            NewCategory {
+                id: "books".into(),
+                title: "书单".into(),
+                kind: "posters".into(),
+            },
+        )
+        .expect("应能创建");
+
+        let blocks: i64 = conn
+            .query_row("SELECT COUNT(*) FROM section_block", [], |row| row.get(0))
+            .expect("应能查");
+        assert_eq!(blocks, 1);
+
+        remove(&mut conn, "books").expect("应能删除");
+        let nodes: i64 = conn
+            .query_row("SELECT COUNT(*) FROM node", [], |row| row.get(0))
+            .expect("应能查");
+        assert_eq!(nodes, 0);
+    }
+
+    #[test]
+    fn rejects_bad_id_and_duplicate() {
+        let mut conn = db();
+        assert!(
+            create(
+                &mut conn,
+                NewCategory {
+                    id: "Bad Id".into(),
+                    title: "x".into(),
+                    kind: "apps".into()
+                }
+            )
+            .is_err()
+        );
+
+        create(
+            &mut conn,
+            NewCategory {
+                id: "books".into(),
+                title: "书单".into(),
+                kind: "apps".into(),
+            },
+        )
+        .expect("应能创建");
+
+        let error = create(
+            &mut conn,
+            NewCategory {
+                id: "books".into(),
+                title: "书单".into(),
+                kind: "apps".into(),
+            },
+        )
+        .expect_err("重复应失败");
+        assert!(matches!(error, StashError::Conflict(_)));
+    }
+
+    fn section(id: &str, title: &str, kind: &str) -> NewCategory {
+        NewCategory {
+            id: id.into(),
+            title: title.into(),
+            kind: kind.into(),
+        }
+    }
+
+    #[test]
+    fn updates_fields_and_rejects_bad_values() {
+        let mut conn = db();
+        create(&mut conn, section("books", "书单", "posters")).expect("应能创建");
+
+        update(
+            &mut conn,
+            "books",
+            UpdateCategory {
+                title: Some("读过的书".into()),
+                icon: Some("📚".into()),
+                bar_color: Some("#ff6034".into()),
+                preview_limit: Some(8),
+                ..Default::default()
+            },
+        )
+        .expect("应能更新");
+
+        let (title, icon, color, limit): (String, Option<String>, Option<String>, Option<i64>) =
+            conn.query_row(
+                "SELECT title, icon, bar_color, preview_limit FROM node WHERE key='books'",
+                [],
+                |row| Ok((row.get(0)?, row.get(1)?, row.get(2)?, row.get(3)?)),
+            )
+            .expect("应能查");
+        assert_eq!(title, "读过的书");
+        assert_eq!(icon.as_deref(), Some("📚"));
+        assert_eq!(color.as_deref(), Some("#ff6034"));
+        assert_eq!(limit, Some(8));
+
+        assert!(update(&mut conn, "books", UpdateCategory { bar_color: Some("red".into()), ..Default::default() }).is_err());
+        assert!(update(&mut conn, "books", UpdateCategory { kind: Some("videos".into()), ..Default::default() }).is_err());
+        assert!(update(&mut conn, "local", UpdateCategory { title: Some("x".into()), ..Default::default() }).is_err());
+        assert!(matches!(
+            update(&mut conn, "none", UpdateCategory::default()).expect_err("应不存在"),
+            StashError::NotFound(_)
+        ));
+    }
+
+    #[test]
+    fn switching_apps_to_posters_keeps_groups_until_disabled() {
+        let mut conn = db();
+        create(&mut conn, section("books", "书单", "apps")).expect("应能创建");
+        conn.execute(
+            "INSERT INTO node (key, parent_key, title, kind, sort) VALUES ('books-g', 'books', '分组', 'group', 1)",
+            [],
+        )
+        .expect("应能建分组");
+        conn.execute("INSERT INTO entry (key, node_key) VALUES ('b1', 'books-g')", [])
+            .expect("应能建条目");
+        // create() 会顺手建一张分区卡片；这里只保留分组卡片，模拟真实配置
+        conn.execute("DELETE FROM section_block", []).expect("应能清卡片");
+        conn.execute(
+            "INSERT INTO section_block (node_key, title, sort) VALUES ('books-g', '分组', 1)",
+            [],
+        )
+        .expect("应能建卡片");
+
+        // 类型切到海报但子分组仍开启：分组和卡片都保留
+        update(
+            &mut conn,
+            "books",
+            UpdateCategory {
+                kind: Some("posters".into()),
+                ..Default::default()
+            },
+        )
+        .expect("应能改类型");
+        let block: String = conn
+            .query_row("SELECT node_key FROM section_block", [], |row| row.get(0))
+            .expect("应能查");
+        assert_eq!(block, "books-g");
+
+        // 关闭子分组：卡片挪回分区
+        update(
+            &mut conn,
+            "books",
+            UpdateCategory {
+                allow_groups: Some(false),
+                ..Default::default()
+            },
+        )
+        .expect("应能关闭");
+        let block: String = conn
+            .query_row("SELECT node_key FROM section_block", [], |row| row.get(0))
+            .expect("应能查");
+        assert_eq!(block, "books", "关闭子分组后卡片应指回分区");
+    }
+
+    #[test]
+    fn creates_updates_and_removes_group() {
+        let mut conn = db();
+        create(&mut conn, section("apps1", "应用", "apps")).expect("应能创建");
+
+        create_group(
+            &mut conn,
+            "apps1",
+            NewGroup {
+                id: "g1".into(),
+                title: "常用".into(),
+            },
+        )
+        .expect("应能建分组");
+
+        update_group(
+            &conn,
+            "g1",
+            UpdateGroup {
+                title: Some("改名".into()),
+                show_in_sidebar: Some(false),
+            },
+        )
+        .expect("应能改分组");
+
+        let (title, show): (String, i64) = conn
+            .query_row(
+                "SELECT title, show_in_sidebar FROM node WHERE key='g1'",
+                [],
+                |row| Ok((row.get(0)?, row.get(1)?)),
+            )
+            .expect("应能查");
+        assert_eq!(title, "改名");
+        assert_eq!(show, 0);
+
+        remove_group(&conn, "g1").expect("应能删分组");
+        let left: i64 = conn
+            .query_row("SELECT COUNT(*) FROM node WHERE key='g1'", [], |row| {
+                row.get(0)
+            })
+            .expect("应能查");
+        assert_eq!(left, 0);
+    }
+
+    #[test]
+    fn groups_only_under_apps_sections() {
+        let mut conn = db();
+        create(&mut conn, section("films", "电影", "posters")).expect("应能创建");
+        assert!(
+            create_group(
+                &mut conn,
+                "films",
+                NewGroup {
+                    id: "g1".into(),
+                    title: "片单".into()
+                }
+            )
+            .is_err(),
+            "未开启子分组的分区不能建组"
+        );
+
+        // 打开「允许子分组」后，海报分区也可以建组
+        update(
+            &mut conn,
+            "films",
+            UpdateCategory {
+                allow_groups: Some(true),
+                ..Default::default()
+            },
+        )
+        .expect("应能开启");
+        create_group(
+            &mut conn,
+            "films",
+            NewGroup {
+                id: "g1".into(),
+                title: "片单".into(),
+            },
+        )
+        .expect("开启后应能建组");
+    }
+
+    #[test]
+    fn switching_posters_to_apps_creates_group_and_moves_entries() {        let mut conn = db();
+        create(&mut conn, section("films", "电影", "posters")).expect("应能创建");
+        conn.execute("INSERT INTO entry (key, node_key) VALUES ('f1', 'films')", [])
+            .expect("应能建条目");
+        conn.execute(
+            "INSERT INTO section_block (node_key, title, sort) VALUES ('films', '电影', 1)",
+            [],
+        )
+        .expect("应能建卡片");
+
+        update(
+            &mut conn,
+            "films",
+            UpdateCategory {
+                kind: Some("apps".into()),
+                allow_groups: Some(true),
+                ..Default::default()
+            },
+        )
+        .expect("应能改类型");
+
+        let (entry_node, block_node): (String, String) = conn
+            .query_row(
+                "SELECT (SELECT node_key FROM entry WHERE key='f1'),
+                        (SELECT node_key FROM section_block)",
+                [],
+                |row| Ok((row.get(0)?, row.get(1)?)),
+            )
+            .expect("应能查");
+        assert_eq!(entry_node, "films-all", "条目应挂到默认分组");
+        assert_eq!(block_node, "films-all", "首页卡片应指向默认分组");
+        let groups: i64 = conn
+            .query_row(
+                "SELECT COUNT(*) FROM node WHERE kind='group' AND parent_key='films'",
+                [],
+                |row| row.get(0),
+            )
+            .expect("应能查");
+        assert_eq!(groups, 1);
+    }
+}

src/db/entries.rs

@@ -0,0 +1,686 @@
+//! 条目的读取与编辑（P2）。
+//!
+//! 编辑用 `updated_at` 做乐观锁：带上打开表单时的时间戳，
+//! 别人已经改过就返回冲突，而不是静默覆盖。
+
+use rusqlite::{Connection, OptionalExtension, params};
+use serde::{Deserialize, Serialize};
+
+use crate::{db::map_error, error::StashError};
+
+const MAX_NAME: usize = 120;
+const MAX_BODY: usize = 100_000;
+const MAX_TAGS: usize = 30;
+const MAX_TAG_LEN: usize = 40;
+
+#[derive(Debug, Clone, Serialize, PartialEq, Eq)]
+pub struct EntryRecord {
+    pub key: String,
+    pub format: String,
+    pub name: String,
+    pub description: String,
+    pub icon: String,
+    pub href: String,
+    pub cover: String,
+    pub banner: String,
+    pub badge: String,
+    pub comment: String,
+    pub summary: String,
+    pub body: String,
+    pub tags: Vec<String>,
+    pub updated_at: i64,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct EntryPatch {
+    pub name: String,
+    #[serde(default)]
+    pub description: String,
+    #[serde(default)]
+    pub icon: String,
+    #[serde(default)]
+    pub href: String,
+    #[serde(default)]
+    pub cover: String,
+    #[serde(default)]
+    pub banner: String,
+    #[serde(default)]
+    pub badge: String,
+    #[serde(default)]
+    pub comment: String,
+    #[serde(default)]
+    pub summary: String,
+    #[serde(default)]
+    pub body: String,
+    #[serde(default)]
+    pub tags: Vec<String>,
+    /// 可选：把条目移动到另一个分区 / 分组（不传则保持原位）
+    #[serde(default)]
+    pub node_key: Option<String>,
+    /// 条目自身的展示格式：apps / posters / articles；不传默认 apps
+    #[serde(default)]
+    pub format: Option<String>,
+}
+
+/// 新建条目的请求体：`key` 是业务键，`nodeKey` 决定挂在哪个分区 / 分组。
+#[derive(Debug, Clone, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct NewEntry {
+    pub key: String,
+    pub node_key: String,
+    pub item: EntryPatch,
+}
+
+fn now() -> i64 {
+    std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .map(|duration| duration.as_secs() as i64)
+        .unwrap_or(0)
+}
+
+/// 规范化跳转地址：补协议、拒绝危险协议、空值统一成空串。
+///
+/// 用户经常直接填 `www.zhihu.com`。原样存进 `href` 会被浏览器当成
+/// 相对地址（点「跳转到」会跳到 `/c/.../www.zhihu.com`），所以这里统一补
+/// `https://`。`href` 会原样渲染进 `<a>`，`javascript:` / `data:` 这类
+/// 协议必须直接拒绝，不能只靠前端过滤。
+fn normalize_href(raw: &str) -> Result<String, StashError> {
+    let value = raw.trim();
+    if value.is_empty() || value == "#" {
+        return Ok(String::new());
+    }
+    if value.chars().any(char::is_whitespace) {
+        return Err(StashError::InvalidDirectory("跳转地址不能包含空格".into()));
+    }
+
+    // 站内路径（单个斜杠开头）；`//host` 是协议相对地址，按外链处理
+    if value.starts_with('/') && !value.starts_with("//") {
+        return Ok(value.to_string());
+    }
+
+    let lower = value.to_ascii_lowercase();
+    if lower.starts_with("http://") || lower.starts_with("https://") {
+        return Ok(value.to_string());
+    }
+    if value.starts_with("//") {
+        return Ok(format!("https:{value}"));
+    }
+
+    // 带「其他协议」的地址一律拒绝（javascript: / data: / vbscript: / file: / mailto: …）；
+    // 只放行上面已经处理过的 http(s) 与站内路径。
+    if let Some((scheme, _)) = lower.split_once(':') {
+        let looks_like_scheme = !scheme.is_empty()
+            && scheme.chars().next().is_some_and(|ch| ch.is_ascii_alphabetic())
+            && scheme
+                .chars()
+                .all(|ch| ch.is_ascii_alphanumeric() || ch == '+' || ch == '-' || ch == '.');
+        if looks_like_scheme && !looks_like_domain(value) {
+            return Err(StashError::InvalidDirectory(
+                "跳转地址只支持 http(s)、站内路径或域名".into(),
+            ));
+        }
+    }
+
+    if looks_like_domain(value) {
+        return Ok(format!("https://{value}"));
+    }
+
+    Err(StashError::InvalidDirectory(
+        "跳转地址需以 http(s):// 或 / 开头".into(),
+    ))
+}
+
+/// 裸域名判断：`www.zhihu.com`、`example.com:8080/path` 这类没有协议头的地址。
+fn looks_like_domain(value: &str) -> bool {
+    let host_port = value.split('/').next().unwrap_or("");
+    let host = host_port.split(':').next().unwrap_or("");
+    if !host.contains('.') {
+        return false;
+    }
+
+    let mut parts = host.split('.');
+    let Some(tld) = parts.next_back() else {
+        return false;
+    };
+
+    tld.len() >= 2
+        && tld.chars().all(|ch| ch.is_ascii_alphabetic())
+        && parts.all(|part| {
+            !part.is_empty()
+                && part
+                    .chars()
+                    .all(|ch| ch.is_ascii_alphanumeric() || ch == '-')
+        })
+}
+
+fn validate(patch: &EntryPatch) -> Result<(), StashError> {
+    if let Some(format) = patch.format.as_deref() {
+        if !matches!(format, "apps" | "posters" | "articles") {
+            return Err(StashError::InvalidDirectory("格式不合法".into()));
+        }
+    }
+    if patch.name.trim().is_empty() {
+        return Err(StashError::InvalidDirectory("标题不能为空".into()));
+    }
+    if patch.name.chars().count() > MAX_NAME {
+        return Err(StashError::InvalidDirectory(format!(
+            "标题最多 {MAX_NAME} 个字"
+        )));
+    }
+    if patch.body.chars().count() > MAX_BODY {
+        return Err(StashError::InvalidDirectory("正文过长".into()));
+    }
+    if patch.tags.len() > MAX_TAGS {
+        return Err(StashError::InvalidDirectory(format!(
+            "标签最多 {MAX_TAGS} 个"
+        )));
+    }
+    for tag in &patch.tags {
+        if tag.chars().count() > MAX_TAG_LEN {
+            return Err(StashError::InvalidDirectory(format!(
+                "单个标签最多 {MAX_TAG_LEN} 个字"
+            )));
+        }
+    }
+    Ok(())
+}
+
+/// 读一条条目（编辑表单用），不存在返回 None。
+pub fn load(conn: &Connection, key: &str) -> Result<Option<EntryRecord>, StashError> {
+    let row = conn
+        .query_row(
+            "SELECT key, COALESCE(format, 'apps'), name, COALESCE(description, ''), COALESCE(icon, ''), COALESCE(href, ''),
+                    COALESCE(cover, ''), COALESCE(banner, ''), COALESCE(badge, ''),
+                    COALESCE(comment, ''), COALESCE(summary, ''), COALESCE(body, ''), updated_at
+             FROM entry WHERE key = ?1",
+            [key],
+            |row| {
+                Ok(EntryRecord {
+                    key: row.get(0)?,
+                    format: row.get(1)?,
+                    name: row.get(2)?,
+                    description: row.get(3)?,
+                    icon: row.get(4)?,
+                    href: row.get(5)?,
+                    cover: row.get(6)?,
+                    banner: row.get(7)?,
+                    badge: row.get(8)?,
+                    comment: row.get(9)?,
+                    summary: row.get(10)?,
+                    body: row.get(11)?,
+                    tags: Vec::new(),
+                    updated_at: row.get(12)?,
+                })
+            },
+        )
+        .optional()
+        .map_err(map_error)?;
+
+    let Some(mut entry) = row else {
+        return Ok(None);
+    };
+
+    let mut statement = conn
+        .prepare("SELECT label FROM entry_tag WHERE entry_key = ?1 ORDER BY sort")
+        .map_err(map_error)?;
+    entry.tags = statement
+        .query_map([key], |row| row.get::<_, String>(0))
+        .map_err(map_error)?
+        .collect::<Result<Vec<_>, _>>()
+        .map_err(map_error)?;
+
+    Ok(Some(entry))
+}
+
+/// 条目能挂到哪：分区本身，或分区下的分组（任意类型都支持分组）。
+fn validate_target(conn: &Connection, node_key: &str) -> Result<(), StashError> {
+    let row: Option<(String, Option<String>)> = conn
+        .query_row(
+            "SELECT n.kind, p.kind
+             FROM node n LEFT JOIN node p ON p.key = n.parent_key
+             WHERE n.key = ?1",
+            [node_key],
+            |row| Ok((row.get(0)?, row.get(1)?)),
+        )
+        .optional()
+        .map_err(map_error)?;
+
+    let Some((kind, parent_kind)) = row else {
+        return Err(StashError::NotFound(format!("节点不存在: {node_key}")));
+    };
+
+    match (kind.as_str(), parent_kind.as_deref()) {
+        ("section", _) => Ok(()),
+        // 多层分组：父级可以是分区或任意分组
+        ("group", Some(_)) => Ok(()),
+        ("group", _) => Err(StashError::InvalidDirectory(
+            "分组的父节点必须是分区或分组".into(),
+        )),
+        _ => Err(StashError::InvalidDirectory(
+            "条目只能挂在分区或分组下".into(),
+        )),
+    }
+}
+
+fn valid_key(key: &str) -> bool {
+    !key.is_empty()
+        && key.len() <= 64
+        && key
+            .chars()
+            .all(|ch| ch.is_ascii_lowercase() || ch.is_ascii_digit() || ch == '-')
+}
+
+fn write_tags(conn: &Connection, key: &str, tags: &[String]) -> Result<(), StashError> {
+    conn.execute("DELETE FROM entry_tag WHERE entry_key = ?1", [key])
+        .map_err(map_error)?;
+    for (index, tag) in tags.iter().enumerate() {
+        conn.execute(
+            "INSERT INTO entry_tag (entry_key, sort, label) VALUES (?1, ?2, ?3)",
+            params![key, index as i64, tag],
+        )
+        .map_err(map_error)?;
+    }
+    Ok(())
+}
+
+/// 新建条目：用于后台「内容」页添加网址 / 海报 / 图文。
+pub fn create(conn: &mut Connection, new: NewEntry) -> Result<EntryRecord, StashError> {
+    let key = new.key.trim().to_string();
+    if !valid_key(&key) {
+        return Err(StashError::InvalidDirectory(
+            "标识只能用小写字母、数字与连字符（≤64）".into(),
+        ));
+    }
+
+    let patch = new.item;
+    validate(&patch)?;
+    let format = patch.format.clone().unwrap_or_else(|| "apps".into());
+    let href = normalize_href(&patch.href)?;
+    validate_target(conn, &new.node_key)?;
+
+    let exists: i64 = conn
+        .query_row("SELECT COUNT(*) FROM entry WHERE key = ?1", [&key], |row| {
+            row.get(0)
+        })
+        .map_err(map_error)?;
+    if exists > 0 {
+        return Err(StashError::Conflict(format!("条目已存在: {key}")));
+    }
+
+    let tags: Vec<String> = patch
+        .tags
+        .iter()
+        .map(|tag| tag.trim().to_string())
+        .filter(|tag| !tag.is_empty())
+        .collect();
+
+    let timestamp = now();
+    let tx = conn.transaction().map_err(map_error)?;
+
+    let sort: i64 = tx
+        .query_row(
+            "SELECT COALESCE(MAX(sort), 0) + 1 FROM entry WHERE node_key = ?1",
+            [&new.node_key],
+            |row| row.get(0),
+        )
+        .map_err(map_error)?;
+
+    tx.execute(
+        "INSERT INTO entry (key, node_key, format, name, description, icon, href, cover, banner,
+                            badge, comment, summary, body, hot, views, likes, sort, updated_at)
+         VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, 0, 0, 0, ?14, ?15)",
+        params![
+            key,
+            new.node_key,
+            format,
+            patch.name.trim(),
+            patch.description,
+            patch.icon,
+            href,
+            patch.cover,
+            patch.banner,
+            patch.badge,
+            patch.comment,
+            patch.summary,
+            patch.body,
+            sort,
+            timestamp
+        ],
+    )
+    .map_err(map_error)?;
+
+    write_tags(&tx, &key, &tags)?;
+    tx.execute(
+        "INSERT INTO audit (at, action, target, detail) VALUES (?1, 'item.create', ?2, ?3)",
+        params![timestamp, key, patch.name.trim()],
+    )
+    .map_err(map_error)?;
+
+    tx.commit().map_err(map_error)?;
+    load(conn, &key)?
+        .ok_or_else(|| StashError::NotFound(format!("条目不存在: {key}")))
+}
+
+/// 删除条目（后台内容页用）。
+pub fn remove(conn: &Connection, key: &str) -> Result<(), StashError> {
+    let removed = conn
+        .execute("DELETE FROM entry WHERE key = ?1", [key])
+        .map_err(map_error)?;
+    if removed == 0 {
+        return Err(StashError::NotFound(format!("条目不存在: {key}")));
+    }
+
+    audit(conn, "item.delete", key, "")?;
+    Ok(())
+}
+
+/// 更新条目；`expected_updated_at` 与库里不一致时冲突。
+pub fn update(    conn: &mut Connection,
+    key: &str,
+    patch: EntryPatch,
+    expected_updated_at: i64,
+) -> Result<EntryRecord, StashError> {
+    validate(&patch)?;
+    let format = patch.format.clone().unwrap_or_else(|| "apps".into());
+    // 跳转地址先规范化：补 https、拒绝 javascript: 等危险协议
+    let href = normalize_href(&patch.href)?;
+    if let Some(node_key) = patch.node_key.as_deref() {
+        validate_target(conn, node_key)?;
+    }
+
+    let tags: Vec<String> = patch
+        .tags
+        .iter()
+        .map(|tag| tag.trim().to_string())
+        .filter(|tag| !tag.is_empty())
+        .collect();
+
+    let timestamp = now();
+    let tx = conn.transaction().map_err(map_error)?;
+
+    let updated = tx
+        .execute(
+            "UPDATE entry SET
+                name = ?1, description = ?2, icon = ?3, href = ?4,
+                cover = ?5, banner = ?6, badge = ?7, comment = ?8,
+                summary = ?9, body = ?10, updated_at = ?11,
+                node_key = COALESCE(?14, node_key),
+                format = ?15
+             WHERE key = ?12 AND updated_at = ?13",
+            params![
+                patch.name.trim(),
+                patch.description,
+                patch.icon,
+                href,
+                patch.cover,
+                patch.banner,
+                patch.badge,
+                patch.comment,
+                patch.summary,
+                patch.body,
+                timestamp,
+                key,
+                expected_updated_at,
+                patch.node_key,
+                format
+            ],
+        )
+        .map_err(map_error)?;
+
+    if updated == 0 {
+        return Err(StashError::Conflict(
+            "条目已被修改，请刷新后重试".into(),
+        ));
+    }
+
+    tx.execute("DELETE FROM entry_tag WHERE entry_key = ?1", [key])
+        .map_err(map_error)?;
+    for (index, tag) in tags.iter().enumerate() {
+        tx.execute(
+            "INSERT INTO entry_tag (entry_key, sort, label) VALUES (?1, ?2, ?3)",
+            params![key, index as i64, tag],
+        )
+        .map_err(map_error)?;
+    }
+
+    tx.execute(
+        "INSERT INTO audit (at, action, target, detail) VALUES (?1, 'item.update', ?2, ?3)",
+        params![timestamp, key, patch.name.trim()],
+    )
+    .map_err(map_error)?;
+
+    tx.commit().map_err(map_error)?;
+
+    load(conn, key)?
+        .ok_or_else(|| StashError::NotFound(format!("条目不存在: {key}")))
+}
+
+/// 记录一次浏览：views +1，返回 (views, likes)。
+pub fn bump_view(conn: &Connection, key: &str) -> Result<(i64, i64), StashError> {
+    conn.execute("UPDATE entry SET views = views + 1 WHERE key = ?1", [key])
+        .map_err(map_error)?;
+    counts(conn, key)
+}
+
+/// 点赞 / 取消点赞：likes 加一或减一（不低于 0），返回 (views, likes)。
+pub fn set_like(conn: &Connection, key: &str, liked: bool) -> Result<(i64, i64), StashError> {
+    let delta: i64 = if liked { 1 } else { -1 };
+    conn.execute(
+        "UPDATE entry SET likes = MAX(0, likes + ?1) WHERE key = ?2",
+        params![delta, key],
+    )
+    .map_err(map_error)?;
+    counts(conn, key)
+}
+
+fn counts(conn: &Connection, key: &str) -> Result<(i64, i64), StashError> {
+    conn.query_row("SELECT views, likes FROM entry WHERE key = ?1", [key], |row| {
+        Ok((row.get(0)?, row.get(1)?))
+    })
+    .optional()
+    .map_err(map_error)?
+    .ok_or_else(|| StashError::NotFound(format!("条目不存在: {key}")))
+}
+
+/// 记录一条审计（设置保存等）。
+pub fn audit(conn: &Connection, action: &str, target: &str, detail: &str) -> Result<(), StashError> {
+    conn.execute(
+        "INSERT INTO audit (at, action, target, detail) VALUES (?1, ?2, ?3, ?4)",
+        params![now(), action, target, detail],
+    )
+    .map_err(map_error)?;
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn db() -> Connection {
+        let conn = Connection::open_in_memory().expect("内存库应能打开");
+        conn.execute_batch(
+            "CREATE TABLE entry (
+                key TEXT PRIMARY KEY,
+                node_key TEXT NOT NULL,
+                format TEXT NOT NULL DEFAULT 'apps',
+                name TEXT NOT NULL,
+                description TEXT, icon TEXT, href TEXT, cover TEXT, banner TEXT,
+                badge TEXT, comment TEXT, summary TEXT, body TEXT,
+                hot INTEGER NOT NULL DEFAULT 0, views INTEGER NOT NULL DEFAULT 0,
+                likes INTEGER NOT NULL DEFAULT 0, sort INTEGER NOT NULL DEFAULT 0,
+                updated_at INTEGER NOT NULL DEFAULT 0
+             );
+             CREATE TABLE entry_tag (
+                entry_key TEXT NOT NULL,
+                sort INTEGER NOT NULL DEFAULT 0,
+                label TEXT NOT NULL,
+                PRIMARY KEY (entry_key, sort)
+             );
+             CREATE TABLE audit (
+                id INTEGER PRIMARY KEY AUTOINCREMENT,
+                at INTEGER NOT NULL,
+                action TEXT NOT NULL,
+                target TEXT,
+                detail TEXT
+             );
+             CREATE TABLE node (
+                key TEXT PRIMARY KEY,
+                parent_key TEXT,
+                title TEXT NOT NULL,
+                kind TEXT NOT NULL,
+                view_mode TEXT
+             );
+             INSERT INTO node (key, parent_key, title, kind, view_mode) VALUES
+                ('movie', NULL, '推荐电影', 'section', 'posters'),
+                ('apps1', NULL, '常用推荐', 'section', 'apps'),
+                ('g1', 'apps1', '常用站点', 'group', NULL);
+             INSERT INTO entry (key, node_key, name, updated_at) VALUES ('movie-1', 'movie', '千与千寻', 0);",
+        )
+        .expect("应能建表");
+        conn
+    }
+
+    fn patch(name: &str) -> EntryPatch {
+        EntryPatch {
+            name: name.into(),
+            description: "简介".into(),
+            icon: String::new(),
+            href: "https://example.com".into(),
+            cover: String::new(),
+            banner: String::new(),
+            badge: "推荐".into(),
+            comment: "一句话".into(),
+            summary: "正文".into(),
+            body: "## 标题".into(),
+            tags: vec!["推荐电影".into(), "动画".into()],
+            node_key: None,
+            format: None,
+        }
+    }
+
+    #[test]
+    fn update_replaces_fields_and_tags() {
+        let mut conn = db();
+        let saved = update(&mut conn, "movie-1", patch("千与千寻 2"), 0).expect("应能更新");
+        assert_eq!(saved.name, "千与千寻 2");
+        assert_eq!(saved.tags, vec!["推荐电影".to_string(), "动画".to_string()]);
+        assert!(saved.updated_at > 0);
+
+        let audit: i64 = conn
+            .query_row("SELECT COUNT(*) FROM audit", [], |row| row.get(0))
+            .expect("应能查审计");
+        assert_eq!(audit, 1);
+    }
+
+    #[test]
+    fn stale_timestamp_conflicts() {
+        let mut conn = db();
+        let saved = update(&mut conn, "movie-1", patch("A"), 0).expect("应能更新");
+        let error = update(&mut conn, "movie-1", patch("B"), saved.updated_at - 1)
+            .expect_err("应冲突");
+        assert!(matches!(error, StashError::Conflict(_)));
+    }
+
+    #[test]
+    fn rejects_empty_name() {
+        let mut conn = db();
+        assert!(update(&mut conn, "movie-1", patch("  "), 0).is_err());
+    }
+
+    #[test]
+    fn missing_entry_is_not_found() {
+        let mut conn = db();
+        let error = update(&mut conn, "none", patch("X"), 0).expect_err("应不存在");
+        assert!(matches!(error, StashError::Conflict(_) | StashError::NotFound(_)));
+    }
+
+    #[test]
+    fn normalizes_links_so_jump_works() {
+        // 裸域名补 https，避免被浏览器当成相对地址
+        assert_eq!(normalize_href("www.zhihu.com").unwrap(), "https://www.zhihu.com");
+        assert_eq!(
+            normalize_href("example.com:8080/path").unwrap(),
+            "https://example.com:8080/path"
+        );
+        // 已带协议的保持原样；站内路径保持站内
+        assert_eq!(normalize_href("https://example.com/a").unwrap(), "https://example.com/a");
+        assert_eq!(normalize_href("/git_helper/").unwrap(), "/git_helper/");
+        // 空值和占位符统一成空串
+        assert_eq!(normalize_href("  ").unwrap(), "");
+        assert_eq!(normalize_href("#").unwrap(), "");
+    }
+
+    #[test]
+    fn rejects_dangerous_or_unknown_links() {
+        for bad in ["javascript:alert(1)", "data:text/html,hi", "mailto:[email protected]", "not a url"] {
+            assert!(normalize_href(bad).is_err(), "{bad} 应被拒绝");
+        }
+    }
+
+    #[test]
+    fn update_stores_normalized_href() {
+        let mut conn = db();
+        let mut input = patch("知乎");
+        input.href = "www.zhihu.com".into();
+        let saved = update(&mut conn, "movie-1", input, 0).expect("应能更新");
+        assert_eq!(saved.href, "https://www.zhihu.com");
+    }
+
+    #[test]
+    fn creates_entry_under_section_or_group() {
+        let mut conn = db();
+        let saved = create(
+            &mut conn,
+            NewEntry {
+                key: "new-site".into(),
+                node_key: "g1".into(),
+                item: patch("新站点"),
+            },
+        )
+        .expect("应能创建");
+        assert_eq!(saved.key, "new-site");
+        assert_eq!(saved.name, "新站点");
+
+        let node: String = conn
+            .query_row("SELECT node_key FROM entry WHERE key='new-site'", [], |row| {
+                row.get(0)
+            })
+            .expect("应能查");
+        assert_eq!(node, "g1");
+
+        // 任何类型的分区都允许条目直属分区
+        let direct = create(
+            &mut conn,
+            NewEntry {
+                key: "direct-site".into(),
+                node_key: "apps1".into(),
+                item: patch("直属条目"),
+            },
+        )
+        .expect("应能创建");
+        assert_eq!(direct.key, "direct-site");
+    }
+
+    #[test]
+    fn moves_entry_between_nodes() {
+        let mut conn = db();
+        let mut input = patch("搬家");
+        input.node_key = Some("g1".into());
+        update(&mut conn, "movie-1", input, 0).expect("应能移动");
+
+        let node: String = conn
+            .query_row("SELECT node_key FROM entry WHERE key='movie-1'", [], |row| {
+                row.get(0)
+            })
+            .expect("应能查");
+        assert_eq!(node, "g1");
+    }
+
+    #[test]
+    fn deletes_entry() {
+        let conn = db();
+        remove(&conn, "movie-1").expect("应能删除");
+        assert!(remove(&conn, "movie-1").is_err(), "重复删除应失败");
+    }
+}

src/db/groups.rs

@@ -0,0 +1,291 @@
+//! 分组树的管理：多层分组、格式、父级移动与排序。
+//!
+//! 数据层只有一张 `node` 树：顶层节点是「根分组」（`kind='section'`，带
+//! `view_mode` 格式），下面的节点都叫分组（`kind='group'`），可以继续嵌套。
+//! 条目挂在任意节点上，格式由最近的根分组决定。
+
+use rusqlite::{Connection, OptionalExtension, params};
+use serde::Deserialize;
+
+use crate::{db::entries, db::map_error, error::StashError};
+
+const FORMATS: [&str; 3] = ["apps", "posters", "articles"];
+
+#[derive(Debug, Clone, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct NewNode {
+    /// 业务键，只允许小写字母、数字与连字符
+    pub key: String,
+    pub title: String,
+    /// 为空表示新建一个根分组
+    #[serde(default)]
+    pub parent_key: Option<String>,
+    /// 根分组的格式：apps / posters / articles（子分组继承，不需要传）
+    #[serde(default)]
+    pub format: Option<String>,
+    /// 图标：可以是 iconfont 名或字符；空字符串表示不显示
+    #[serde(default)]
+    pub icon: Option<String>,
+    /// 排序权重；不传则排到同级末尾
+    #[serde(default)]
+    pub sort: Option<i64>,
+    /// 是否启用，默认 true
+    #[serde(default)]
+    pub enabled: Option<bool>,
+}
+
+#[derive(Debug, Clone, Default, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UpdateNode {
+    pub title: Option<String>,
+    /// 传入即移动到新的父节点；不支持移回根（根分组请直接新建）
+    pub parent_key: Option<String>,
+    pub sort: Option<i64>,
+    /// 只对根分组生效
+    pub format: Option<String>,
+    /// 图标：空字符串表示清除图标
+    pub icon: Option<String>,
+    pub enabled: Option<bool>,
+}
+
+fn valid_key(key: &str) -> bool {
+    !key.is_empty()
+        && key.len() <= 64
+        && key
+            .chars()
+            .all(|ch| ch.is_ascii_lowercase() || ch.is_ascii_digit() || ch == '-')
+}
+
+pub fn create(conn: &mut Connection, new: NewNode) -> Result<(), StashError> {
+    let key = new.key.trim();
+    let title = new.title.trim();
+
+    if !valid_key(key) {
+        return Err(StashError::InvalidDirectory(
+            "分组标识只能用小写字母、数字与连字符（≤64）".into(),
+        ));
+    }
+    if title.is_empty() || title.chars().count() > 40 {
+        return Err(StashError::InvalidDirectory("分组名称需为 1–40 个字".into()));
+    }
+
+    let exists: i64 = conn
+        .query_row("SELECT COUNT(*) FROM node WHERE key = ?1", [key], |row| {
+            row.get(0)
+        })
+        .map_err(map_error)?;
+    if exists > 0 {
+        return Err(StashError::Conflict(format!("分组已存在: {key}")));
+    }
+
+    let (kind, view_mode) = match new.parent_key.as_deref() {
+        Some(parent) => {
+            let parent_exists: i64 = conn
+                .query_row("SELECT COUNT(*) FROM node WHERE key = ?1", [parent], |row| {
+                    row.get(0)
+                })
+                .map_err(map_error)?;
+            if parent_exists == 0 {
+                return Err(StashError::NotFound(format!("父分组不存在: {parent}")));
+            }
+            ("group", None)
+        }
+        None => {
+            let format = new.format.unwrap_or_else(|| "apps".into());
+            if !FORMATS.contains(&format.as_str()) {
+                return Err(StashError::InvalidDirectory("格式不合法".into()));
+            }
+            ("section", Some(format))
+        }
+    };
+
+    let default_sort: i64 = match new.parent_key.as_deref() {
+        Some(parent) => conn
+            .query_row(
+                "SELECT COALESCE(MAX(sort), 0) + 1 FROM node WHERE parent_key = ?1",
+                [parent],
+                |row| row.get(0),
+            )
+            .map_err(map_error)?,
+        None => conn
+            .query_row(
+                "SELECT COALESCE(MAX(sort), 0) + 1 FROM node WHERE parent_key IS NULL",
+                [],
+                |row| row.get(0),
+            )
+            .map_err(map_error)?,
+    };
+    let sort = new.sort.unwrap_or(default_sort);
+    let icon = new
+        .icon
+        .as_deref()
+        .map(str::trim)
+        .filter(|value| !value.is_empty())
+        .map(str::to_string);
+    let enabled = new.enabled.unwrap_or(true);
+
+    let tx = conn.transaction().map_err(map_error)?;
+    tx.execute(
+        "INSERT INTO node (key, parent_key, title, kind, view_mode, icon, enabled, sort, show_in_sidebar, allow_groups)
+         VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, 1, 1)",
+        params![
+            key,
+            new.parent_key,
+            title,
+            kind,
+            view_mode,
+            icon,
+            enabled,
+            sort
+        ],
+    )
+    .map_err(map_error)?;
+    entries::audit(&tx, "node.create", key, title)?;
+    tx.commit().map_err(map_error)?;
+    Ok(())
+}
+
+pub fn update(conn: &mut Connection, key: &str, patch: UpdateNode) -> Result<(), StashError> {
+    let current: Option<(String, Option<String>, Option<String>, i64, Option<String>, bool)> = conn
+        .query_row(
+            "SELECT title, parent_key, view_mode, sort, icon, enabled FROM node WHERE key = ?1",
+            [key],
+            |row| {
+                Ok((
+                    row.get(0)?,
+                    row.get(1)?,
+                    row.get(2)?,
+                    row.get(3)?,
+                    row.get(4)?,
+                    row.get(5)?,
+                ))
+            },
+        )
+        .optional()
+        .map_err(map_error)?;
+
+    let Some((current_title, current_parent, current_format, current_sort, current_icon, current_enabled)) =
+        current
+    else {
+        return Err(StashError::NotFound(format!("分组不存在: {key}")));
+    };
+
+    let title = match patch.title {
+        Some(title) => {
+            let title = title.trim().to_string();
+            if title.is_empty() || title.chars().count() > 40 {
+                return Err(StashError::InvalidDirectory("分组名称需为 1–40 个字".into()));
+            }
+            title
+        }
+        None => current_title,
+    };
+
+    let parent_key = match patch.parent_key.clone() {
+        Some(parent) => {
+            if parent == key {
+                return Err(StashError::InvalidDirectory("不能把分组移到自己下面".into()));
+            }
+            let exists: i64 = conn
+                .query_row("SELECT COUNT(*) FROM node WHERE key = ?1", [&parent], |row| {
+                    row.get(0)
+                })
+                .map_err(map_error)?;
+            if exists == 0 {
+                return Err(StashError::NotFound(format!("父分组不存在: {parent}")));
+            }
+            // 防止把节点移进自己的子孙
+            let mut cursor = Some(parent.clone());
+            while let Some(candidate) = cursor {
+                if candidate == key {
+                    return Err(StashError::InvalidDirectory(
+                        "不能把分组移到自己的子分组下面".into(),
+                    ));
+                }
+                cursor = conn
+                    .query_row(
+                        "SELECT parent_key FROM node WHERE key = ?1",
+                        [candidate],
+                        |row| row.get::<_, Option<String>>(0),
+                    )
+                    .optional()
+                    .map_err(map_error)?
+                    .flatten();
+            }
+            Some(parent)
+        }
+        // 不传表示保持原父级（不支持移回根）
+        None => current_parent.clone(),
+    };
+
+    let is_root = parent_key.is_none();
+    let format = if is_root {
+        match patch.format {
+            Some(format) => {
+                if !FORMATS.contains(&format.as_str()) {
+                    return Err(StashError::InvalidDirectory("格式不合法".into()));
+                }
+                Some(format)
+            }
+            None => current_format,
+        }
+    } else {
+        // 子分组没有自己的格式，跟随根分组
+        None
+    };
+
+    if is_root && format.is_none() {
+        return Err(StashError::InvalidDirectory("根分组缺少格式".into()));
+    }
+
+    let icon = match patch.icon {
+        Some(icon) => {
+            let icon = icon.trim().to_string();
+            (!icon.is_empty()).then_some(icon)
+        }
+        None => current_icon,
+    };
+    let enabled = patch.enabled.unwrap_or(current_enabled);
+
+    let sort = patch.sort.unwrap_or(current_sort);
+
+    let tx = conn.transaction().map_err(map_error)?;
+    // 只有真正换了父级才排到末尾；同一父级下编辑排序权重时按传入值保存
+    let parent_changed = patch
+        .parent_key
+        .as_deref()
+        .is_some_and(|parent| Some(parent) != current_parent.as_deref());
+    let final_sort = if parent_changed {
+        let parent = patch.parent_key.as_deref().unwrap_or_default();
+        tx.query_row(
+            "SELECT COALESCE(MAX(sort), 0) + 1 FROM node WHERE parent_key = ?1 AND key <> ?2",
+            params![parent, key],
+            |row| row.get::<_, i64>(0),
+        )
+        .map_err(map_error)?
+    } else {
+        sort
+    };
+
+    tx.execute(
+        "UPDATE node SET title = ?1, parent_key = ?2, view_mode = ?3, sort = ?4,
+                icon = ?5, enabled = ?6
+         WHERE key = ?7",
+        params![title, parent_key, format, final_sort, icon, enabled, key],
+    )
+    .map_err(map_error)?;
+    entries::audit(&tx, "node.update", key, &title)?;
+    tx.commit().map_err(map_error)?;
+    Ok(())
+}
+
+pub fn remove(conn: &Connection, key: &str) -> Result<(), StashError> {
+    let removed = conn
+        .execute("DELETE FROM node WHERE key = ?1", [key])
+        .map_err(map_error)?;
+    if removed == 0 {
+        return Err(StashError::NotFound(format!("分组不存在: {key}")));
+    }
+    entries::audit(conn, "node.delete", key, "")?;
+    Ok(())
+}

src/db/mod.rs

@@ -8,8 +8,14 @@
 //! 3. **开发期不做迁移**：表结构还在变，改结构就删掉 `data/stash.db` 重启，
 //!    启动时会重新建表并灌入内嵌种子。
 
+pub mod auth;
+pub mod cards;
+pub mod categories;
 mod catalog;
+pub mod entries;
+pub mod groups;
 mod schema;
+pub mod settings;
 
 use std::sync::Mutex;
 
@@ -21,6 +27,13 @@ use crate::{config::Config, error::StashError};
 
 pub use schema::SeedReport;
 
+/// 登录/会话的对外状态（server 层直接用）。
+pub use auth::SessionState;
+/// 站点设置：页头滚动信息 + 侧栏顺序/显隐。
+pub use settings::{Settings, SettingsDocument};
+/// 条目编辑（P2）。
+pub use entries::{EntryPatch, EntryRecord};
+
 /// 一次查询得到的完整内容目录。
 ///
 /// 侧栏已改为由这份分类树派生，不再单独下发导航数据。
@@ -57,14 +70,14 @@ impl Db {
         )
         .map_err(map_error)?;
 
-        // 先校验结构版本，再动任何东西：旧库直接报错，避免用旧表跑新查询
-        let version = schema::check_version(&conn)?;
-
-        schema::apply(&conn)?;
-
-        // 写入当前结构版本，供下次启动比对
-        conn.pragma_update(None, "user_version", schema::SCHEMA_VERSION)
-            .map_err(map_error)?;
+        // 先迁移结构，再动数据：迁移失败会直接报错，不会用半套表跑查询
+        let version = schema::migrate(&conn)?;
+        if version != schema::SCHEMA_VERSION {
+            return Err(StashError::Database(format!(
+                "内容库迁移后版本为 {version}，期望 {}",
+                schema::SCHEMA_VERSION
+            )));
+        }
 
         // 空库才灌种子：用户删掉内置条目后重启不会被重新塞回来
         let existing: i64 = conn
@@ -115,6 +128,186 @@ impl Db {
             .lock()
             .map_err(|_| StashError::Database("数据库连接锁已损坏，请重启进程".into()))
     }
+
+    // ---------- 登录 / 会话 ----------
+
+    pub fn auth_state(&self, token: Option<&str>) -> Result<SessionState, StashError> {
+        let conn = self.lock()?;
+        auth::state(&conn, token)
+    }
+
+    pub fn setup_admin(&self, username: &str, password: &str) -> Result<(), StashError> {
+        let conn = self.lock()?;
+        auth::create_admin(&conn, username, password)
+    }
+
+    pub fn login(&self, password: &str) -> Result<Option<String>, StashError> {
+        let conn = self.lock()?;
+        auth::purge_expired(&conn)?;
+        auth::verify_login(&conn, password)
+    }
+
+    pub fn issue_session(&self) -> Result<String, StashError> {
+        let conn = self.lock()?;
+        auth::issue_session(&conn)
+    }
+
+    pub fn logout(&self, token: &str) -> Result<(), StashError> {
+        let conn = self.lock()?;
+        auth::revoke(&conn, token)
+    }
+
+    pub fn change_password(&self, current: &str, next: &str) -> Result<bool, StashError> {
+        let mut conn = self.lock()?;
+        auth::change_password(&mut conn, current, next)
+    }
+
+    // ---------- 站点设置 ----------
+
+    pub fn load_settings(&self) -> Result<SettingsDocument, StashError> {
+        let conn = self.lock()?;
+        settings::load(&conn)
+    }
+
+    pub fn save_settings(
+        &self,
+        next: Settings,
+        expected_version: i64,
+    ) -> Result<SettingsDocument, StashError> {
+        let mut conn = self.lock()?;
+        let document = settings::save(&mut conn, next, expected_version)?;
+        entries::audit(&conn, "settings.update", "site", "站点设置")?;
+        Ok(document)
+    }
+
+    // ---------- 条目编辑 ----------
+
+    pub fn load_entry(&self, key: &str) -> Result<Option<EntryRecord>, StashError> {
+        let conn = self.lock()?;
+        entries::load(&conn, key)
+    }
+
+    pub fn create_entry(&self, new: entries::NewEntry) -> Result<EntryRecord, StashError> {
+        let mut conn = self.lock()?;
+        entries::create(&mut conn, new)
+    }
+
+    pub fn remove_entry(&self, key: &str) -> Result<(), StashError> {
+        let conn = self.lock()?;
+        entries::remove(&conn, key)
+    }
+
+    pub fn update_entry(
+        &self,
+        key: &str,
+        patch: EntryPatch,
+        expected_updated_at: i64,
+    ) -> Result<EntryRecord, StashError> {
+        let mut conn = self.lock()?;
+        entries::update(&mut conn, key, patch, expected_updated_at)
+    }
+
+    pub fn bump_view(&self, key: &str) -> Result<(i64, i64), StashError> {
+        let conn = self.lock()?;
+        entries::bump_view(&conn, key)
+    }
+
+    pub fn set_like(&self, key: &str, liked: bool) -> Result<(i64, i64), StashError> {
+        let conn = self.lock()?;
+        entries::set_like(&conn, key, liked)
+    }
+
+    // ---------- 分区（首页卡片 / 侧栏项） ----------
+
+    pub fn create_category(&self, new: categories::NewCategory) -> Result<(), StashError> {
+        let mut conn = self.lock()?;
+        categories::create(&mut conn, new)
+    }
+
+    pub fn update_category(
+        &self,
+        id: &str,
+        patch: categories::UpdateCategory,
+    ) -> Result<(), StashError> {
+        let mut conn = self.lock()?;
+        categories::update(&mut conn, id, patch)
+    }
+
+    pub fn create_group(
+        &self,
+        section_id: &str,
+        new: categories::NewGroup,
+    ) -> Result<(), StashError> {
+        let mut conn = self.lock()?;
+        categories::create_group(&mut conn, section_id, new)
+    }
+
+    pub fn update_group(&self, id: &str, patch: categories::UpdateGroup) -> Result<(), StashError> {
+        let conn = self.lock()?;
+        categories::update_group(&conn, id, patch)
+    }
+
+    pub fn remove_group(&self, id: &str) -> Result<(), StashError> {
+        let conn = self.lock()?;
+        categories::remove_group(&conn, id)
+    }
+
+    // ---------- 原子模型：分组树 / 卡片 ----------
+
+    /// 完整分组树（多层，带条目）
+    pub fn load_tree(&self) -> Result<Value, StashError> {
+        let conn = self.lock()?;
+        catalog::load_tree(&conn)
+    }
+
+    pub fn load_cards(&self) -> Result<Vec<Value>, StashError> {
+        let conn = self.lock()?;
+        cards::load(&conn)
+    }
+
+    pub fn create_node(&self, new: groups::NewNode) -> Result<(), StashError> {
+        let mut conn = self.lock()?;
+        groups::create(&mut conn, new)
+    }
+
+    pub fn update_node(&self, key: &str, patch: groups::UpdateNode) -> Result<(), StashError> {
+        let mut conn = self.lock()?;
+        groups::update(&mut conn, key, patch)
+    }
+
+    pub fn remove_node(&self, key: &str) -> Result<(), StashError> {
+        let conn = self.lock()?;
+        groups::remove(&conn, key)
+    }
+
+    pub fn create_card(&self, new: cards::NewCard) -> Result<i64, StashError> {
+        let mut conn = self.lock()?;
+        cards::create(&mut conn, new)
+    }
+
+    pub fn update_card(&self, id: i64, patch: cards::UpdateCard) -> Result<(), StashError> {
+        let mut conn = self.lock()?;
+        cards::update(&mut conn, id, patch)
+    }
+
+    pub fn remove_card(&self, id: i64) -> Result<(), StashError> {
+        let conn = self.lock()?;
+        cards::remove(&conn, id)
+    }
+
+    pub fn set_card_groups(
+        &self,
+        id: i64,
+        groups: Vec<cards::CardGroupInput>,
+    ) -> Result<(), StashError> {
+        let mut conn = self.lock()?;
+        cards::set_groups(&mut conn, id, groups)
+    }
+
+    pub fn remove_category(&self, id: &str) -> Result<(), StashError> {
+        let mut conn = self.lock()?;
+        categories::remove(&mut conn, id)
+    }
 }
 
 /// 把 rusqlite 的错误统一收敛成 `StashError::Database`。
@@ -446,37 +639,59 @@ mod tests {
         assert!(db.data_version().expect("应能读取 data_version") >= 0);
     }
 
-    /// 全新库（user_version = 0）允许直接建表；当前版本也允许。
+    /// 全新库（user_version = 0）建全量结构；当前版本直接返回；
+    /// 15 会迁移到 16；比程序新的版本拒绝。
     #[test]
-    fn accepts_fresh_or_current_schema_version() {
+    fn migrates_fresh_previous_and_current_schema() {
         let conn = Connection::open_in_memory().expect("内存库应能打开");
 
         assert_eq!(
-            schema::check_version(&conn).expect("全新库应放行"),
-            0,
-            "新库的 user_version 应为 0"
+            schema::migrate(&conn).expect("全新库应能建表"),
+            schema::SCHEMA_VERSION,
+            "新库应直接建到当前版本"
         );
 
-        conn.pragma_update(None, "user_version", schema::SCHEMA_VERSION)
-            .expect("应能写入版本");
+        let fresh = Connection::open_in_memory().expect("内存库应能打开");
+        fresh
+            .execute_batch(
+                "CREATE TABLE node (key TEXT PRIMARY KEY, parent_key TEXT, title TEXT, kind TEXT, view_mode TEXT);
+                 CREATE TABLE entry (key TEXT PRIMARY KEY, node_key TEXT NOT NULL, name TEXT NOT NULL);
+                 CREATE TABLE section_block (id INTEGER PRIMARY KEY, node_key TEXT NOT NULL, title TEXT, preview_limit INTEGER, sort INTEGER NOT NULL DEFAULT 0);
+                 PRAGMA user_version = 15;",
+            )
+            .expect("应能造出 v15 老库");
         assert_eq!(
-            schema::check_version(&conn).expect("当前版本应放行"),
+            schema::migrate(&fresh).expect("v15 应能迁移"),
             schema::SCHEMA_VERSION
         );
+
+        let migrated: i64 = fresh
+            .pragma_query_value(None, "user_version", |row| row.get(0))
+            .expect("应能读出版本");
+        assert_eq!(migrated, schema::SCHEMA_VERSION);
+
+        let table: i64 = fresh
+            .query_row(
+                "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name IN ('admin','session','setting')",
+                [],
+                |row| row.get(0),
+            )
+            .expect("应能查表");
+        assert_eq!(table, 3, "迁移后必须有登录/设置三张表");
     }
 
-    /// 结构变过之后，旧库必须被拒绝并提示删库，而不是用旧表跑新查询。
+    /// 比程序更新的库必须被拒绝，不能按旧结构乱读。
     #[test]
-    fn rejects_database_from_older_schema() {
+    fn rejects_database_from_newer_schema() {
         let conn = Connection::open_in_memory().expect("内存库应能打开");
-        conn.pragma_update(None, "user_version", schema::SCHEMA_VERSION - 1)
-            .expect("应能写入旧版本号");
+        conn.pragma_update(None, "user_version", schema::SCHEMA_VERSION + 1)
+            .expect("应能写入新版本号");
 
-        let error = schema::check_version(&conn).expect_err("旧库必须被拒绝");
+        let error = schema::migrate(&conn).expect_err("更新的库必须被拒绝");
         let message = error.to_string();
 
         assert!(message.contains("结构版本"), "报错要说明原因: {message}");
-        assert!(message.contains("删除数据库"), "报错要给出处理方式: {message}");
+        assert!(message.contains("升级程序"), "报错要给出处理方式: {message}");
     }
 
     /// 回归测试：外部连接提交后，服务端连接读到的 data_version 必须变化。

src/db/schema.rs

@@ -46,6 +46,10 @@ CREATE TABLE IF NOT EXISTS node (
     empty_text    TEXT,                                          -- 分区为空时的提示文案
     show_in_sidebar INTEGER NOT NULL DEFAULT 1 CHECK (show_in_sidebar IN (0, 1)),
                                                                  -- 是否出现在侧栏：0 表示只当首页卡片/内容，不进导航
+    allow_groups  INTEGER NOT NULL DEFAULT 0 CHECK (allow_groups IN (0, 1)),
+                                                                 -- 是否允许子分组（与类型无关，后台开关）
+    enabled       INTEGER NOT NULL DEFAULT 1 CHECK (enabled IN (0, 1)),
+                                                                 -- 是否启用（禁用后前台侧栏/卡片不展示）
     sort          INTEGER NOT NULL DEFAULT 0,                    -- 同级顺序，越小越靠前
     CHECK (
         (kind = 'section' AND parent_key IS NULL AND view_mode IS NOT NULL)
@@ -62,6 +66,7 @@ CREATE TABLE IF NOT EXISTS entry (
     node_key      TEXT NOT NULL REFERENCES node(key) ON DELETE CASCADE ON UPDATE CASCADE,
                                                                  -- 直接所属容器：应用是分组，海报/图文是分区本身
                                                                  -- 所属分区不单独存：由 node_key 推导（分组看它的 parent_key）
+    format        TEXT NOT NULL DEFAULT 'apps',                  -- 条目自身的展示格式：apps / posters / articles
     name          TEXT NOT NULL,                                 -- 名称：网站名 / 电影名 / 文章标题
     description   TEXT,                                          -- 一句话简介，列表卡片的副标题
     icon          TEXT,                                          -- 字符图标（封面缺失时的占位）
@@ -75,7 +80,8 @@ CREATE TABLE IF NOT EXISTS entry (
     hot           INTEGER NOT NULL DEFAULT 0 CHECK (hot IN (0, 1)),-- 是否热门：列表里显示 HOT 徽标
     views         INTEGER NOT NULL DEFAULT 0,                    -- 浏览量，详情页操作条「眼睛」后的数字
     likes         INTEGER NOT NULL DEFAULT 0,                    -- 点赞数，详情页操作条「赞」后的数字
-    sort          INTEGER NOT NULL DEFAULT 0                     -- 条目顺序（组内或分区内），越小越靠前
+    sort          INTEGER NOT NULL DEFAULT 0,                    -- 条目顺序（组内或分区内），越小越靠前
+    updated_at    INTEGER NOT NULL DEFAULT 0                     -- 最近一次编辑时间（unix 秒），0 = 从未编辑
 );
 
 CREATE INDEX IF NOT EXISTS entry_parent_idx ON entry(node_key, sort);
@@ -100,6 +106,185 @@ CREATE TABLE IF NOT EXISTS section_block (
     preview_limit INTEGER,                                       -- 卡片里显示几条；NULL 时用前端默认
     sort          INTEGER NOT NULL DEFAULT 0                     -- 卡片顺序
 );
+
+-- ========== v16：登录与设置 ==========
+
+-- 管理员：单用户场景只允许一行
+CREATE TABLE IF NOT EXISTS admin (
+    id            INTEGER PRIMARY KEY CHECK (id = 1),
+    username      TEXT NOT NULL,
+    password_hash TEXT NOT NULL,                                  -- argon2id PHC 字符串
+    updated_at    INTEGER NOT NULL                                -- unix 秒
+);
+
+-- 会话：只存 token 的 sha256，原始 token 只在 Cookie 里
+CREATE TABLE IF NOT EXISTS session (
+    token_hash   TEXT PRIMARY KEY,
+    created_at   INTEGER NOT NULL,
+    expires_at   INTEGER NOT NULL,
+    last_seen_at INTEGER NOT NULL
+);
+
+CREATE INDEX IF NOT EXISTS session_expiry_idx ON session(expires_at);
+
+-- 全局设置：一个 key 一段 JSON，version 用于乐观锁
+CREATE TABLE IF NOT EXISTS setting (
+    key        TEXT PRIMARY KEY,
+    value      TEXT NOT NULL,
+    version    INTEGER NOT NULL DEFAULT 1,
+    updated_at INTEGER NOT NULL
+);
+
+-- ========== v17：审计 ==========
+
+CREATE TABLE IF NOT EXISTS audit (
+    id     INTEGER PRIMARY KEY AUTOINCREMENT,
+    at     INTEGER NOT NULL,
+    action TEXT NOT NULL,
+    target TEXT,
+    detail TEXT
+);
+
+-- ========== v19：首页卡片（展示层组合） ==========
+
+-- 一张卡片 = 标题 + 顺序；内容由 card_group 勾选分组组成，卡片不拥有数据
+CREATE TABLE IF NOT EXISTS card (
+    id    INTEGER PRIMARY KEY AUTOINCREMENT,
+    key   TEXT NOT NULL UNIQUE,
+    title TEXT NOT NULL,
+    sort  INTEGER NOT NULL DEFAULT 0
+);
+
+-- 卡片包含哪些分组（可混合格式），每个分组可单独设预览条数
+CREATE TABLE IF NOT EXISTS card_group (
+    card_id       INTEGER NOT NULL REFERENCES card(id) ON DELETE CASCADE,
+    group_key     TEXT NOT NULL REFERENCES node(key) ON DELETE CASCADE ON UPDATE CASCADE,
+    sort          INTEGER NOT NULL DEFAULT 0,
+    preview_limit INTEGER,
+    PRIMARY KEY (card_id, group_key)
+);
+"#;
+
+/// 把老的「分区 → 一个展示块」迁移成「卡片 → 多个分组」。
+const BACKFILL_CARDS_SQL: &str = r#"
+INSERT OR IGNORE INTO card (key, title, sort)
+SELECT 'card-' || COALESCE(p.key, n.key),
+       COALESCE(b.title, COALESCE(p.title, n.title)),
+       MIN(b.sort)
+FROM section_block b
+JOIN node n ON n.key = b.node_key
+LEFT JOIN node p ON p.key = n.parent_key
+GROUP BY COALESCE(p.key, n.key);
+
+INSERT OR IGNORE INTO card_group (card_id, group_key, sort, preview_limit)
+SELECT c.id, b.node_key, b.sort, b.preview_limit
+FROM section_block b
+JOIN node n ON n.key = b.node_key
+LEFT JOIN node p ON p.key = n.parent_key
+JOIN card c ON c.key = 'card-' || COALESCE(p.key, n.key);
+
+-- 本地服务是运行时卡片，但用一行 card 记录它的位置，参与首页排序
+INSERT OR IGNORE INTO card (key, title, sort) VALUES ('local-service', '本地服务', -1);
+"#;
+
+/// v16 → v17：条目加 `updated_at`（乐观锁），新增审计表。
+const V17_SQL: &str = r#"
+ALTER TABLE entry ADD COLUMN updated_at INTEGER NOT NULL DEFAULT 0;
+
+CREATE TABLE IF NOT EXISTS audit (
+    id     INTEGER PRIMARY KEY AUTOINCREMENT,
+    at     INTEGER NOT NULL,
+    action TEXT NOT NULL,
+    target TEXT,
+    detail TEXT
+);
+"#;
+
+/// v17 → v18：分区增加「允许子分组」开关（与类型无关）。
+///
+/// 老库默认保持原行为：应用类开启，其余类型关闭；已经有分组的非应用分区也开启。
+const V18_SQL: &str = r#"
+ALTER TABLE node ADD COLUMN allow_groups INTEGER NOT NULL DEFAULT 1;
+
+UPDATE node SET allow_groups = 0
+WHERE kind = 'section' AND view_mode <> 'apps';
+
+UPDATE node SET allow_groups = 1
+WHERE kind = 'section' AND key IN (
+    SELECT DISTINCT parent_key FROM node
+    WHERE kind = 'group' AND parent_key IS NOT NULL
+);
+"#;
+
+/// v19 → v20：分组增加启停状态。
+const V20_SQL: &str = r#"
+ALTER TABLE node ADD COLUMN enabled INTEGER NOT NULL DEFAULT 1;
+"#;
+
+/// v21 → v22：本地服务卡片入库，用 card.sort 参与首页排序（内容仍来自运行时项目）。
+const V22_SQL: &str = r#"
+INSERT OR IGNORE INTO card (key, title, sort) VALUES ('local-service', '本地服务', -1);
+"#;
+
+/// v20 → v21：格式从分组下沉到条目；老数据按所属根分组的 view_mode 回填。
+const V21_SQL: &str = r#"
+ALTER TABLE entry ADD COLUMN format TEXT NOT NULL DEFAULT 'apps';
+
+WITH RECURSIVE roots(key, root_key, view_mode) AS (
+    SELECT key, key, view_mode FROM node WHERE parent_key IS NULL
+    UNION ALL
+    SELECT n.key, r.root_key, r.view_mode
+    FROM node n JOIN roots r ON n.parent_key = r.key
+)
+UPDATE entry
+SET format = COALESCE(
+    (SELECT view_mode FROM roots WHERE roots.key = entry.node_key),
+    'apps'
+);
+"#;
+
+/// v18 → v19：首页卡片改为「卡片 + 勾选分组」。
+const V19_SQL: &str = r#"
+CREATE TABLE IF NOT EXISTS card (
+    id    INTEGER PRIMARY KEY AUTOINCREMENT,
+    key   TEXT NOT NULL UNIQUE,
+    title TEXT NOT NULL,
+    sort  INTEGER NOT NULL DEFAULT 0
+);
+
+CREATE TABLE IF NOT EXISTS card_group (
+    card_id       INTEGER NOT NULL REFERENCES card(id) ON DELETE CASCADE,
+    group_key     TEXT NOT NULL REFERENCES node(key) ON DELETE CASCADE ON UPDATE CASCADE,
+    sort          INTEGER NOT NULL DEFAULT 0,
+    preview_limit INTEGER,
+    PRIMARY KEY (card_id, group_key)
+);
+"#;
+
+/// v15 → v16 的增量（老库升级用；新库直接走 SCHEMA_SQL）。
+const V16_SQL: &str = r#"
+CREATE TABLE IF NOT EXISTS admin (
+    id            INTEGER PRIMARY KEY CHECK (id = 1),
+    username      TEXT NOT NULL,
+    password_hash TEXT NOT NULL,
+    updated_at    INTEGER NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS session (
+    token_hash   TEXT PRIMARY KEY,
+    created_at   INTEGER NOT NULL,
+    expires_at   INTEGER NOT NULL,
+    last_seen_at INTEGER NOT NULL
+);
+
+CREATE INDEX IF NOT EXISTS session_expiry_idx ON session(expires_at);
+
+CREATE TABLE IF NOT EXISTS setting (
+    key        TEXT PRIMARY KEY,
+    value      TEXT NOT NULL,
+    version    INTEGER NOT NULL DEFAULT 1,
+    updated_at INTEGER NOT NULL
+);
 "#;
 
 /// 种子导入结果，仅用于启动日志。
@@ -115,28 +300,86 @@ pub struct SeedReport {
 
 /// 当前表结构版本，写在 SQLite 的 `PRAGMA user_version` 里。
 ///
-/// 开发阶段不做迁移：版本对不上时直接拒绝启动，让用户删库重建，
-/// 比悄悄用旧表跑新查询（最终表现为 500）好排查得多。
-/// 结构调整时把这个数字 +1。
-pub const SCHEMA_VERSION: i64 = 15;
+/// 从 v16 起有了第一套迁移：`migrate` 会把老库逐级升上来，
+/// 只有「比程序更新」或「没有迁移路径」的版本才拒绝启动。
+pub const SCHEMA_VERSION: i64 = 22;
 
-/// 校验库结构版本：0 表示全新库，允许；其它非当前版本一律拒绝。
-pub fn check_version(conn: &Connection) -> Result<i64, StashError> {
-    let version: i64 = conn
-        .pragma_query_value(None, "user_version", |row| row.get(0))
-        .map_err(map_error)?;
+fn current_version(conn: &Connection) -> Result<i64, StashError> {
+    conn.pragma_query_value(None, "user_version", |row| row.get(0))
+        .map_err(map_error)
+}
 
-    if version != 0 && version != SCHEMA_VERSION {
+/// 把库升到 `SCHEMA_VERSION`，返回升级后的版本。
+///
+/// 逐级迁移：0 建全量；15 → 16 → 17；已最新直接返回；更高版本拒绝。
+pub fn migrate(conn: &Connection) -> Result<i64, StashError> {
+    let mut version = current_version(conn)?;
+
+    if version == 0 {
+        conn.execute_batch(SCHEMA_SQL).map_err(map_error)?;
+        conn.pragma_update(None, "user_version", SCHEMA_VERSION)
+            .map_err(map_error)?;
+        return Ok(SCHEMA_VERSION);
+    }
+
+    if version > SCHEMA_VERSION {
         return Err(StashError::Database(format!(
-            "内容库结构版本为 {version}，当前程序需要 {SCHEMA_VERSION}。\
-             开发阶段不做自动迁移，请删除数据库后重启（种子会自动重新导入）。"
+            "内容库结构版本为 {version}，比当前程序（{SCHEMA_VERSION}）更新；\
+             请升级程序，或用旧版本打开。"
         )));
     }
 
+    if version < 15 {
+        return Err(StashError::Database(format!(
+            "内容库结构版本为 {version}，缺少可用的迁移路径（当前程序支持 15 → {SCHEMA_VERSION}）。\
+             请备份后删除数据库重建。"
+        )));
+    }
+
+    if version == 15 {
+        conn.execute_batch(V16_SQL).map_err(map_error)?;
+        version = 16;
+    }
+
+    if version == 16 {
+        conn.execute_batch(V17_SQL).map_err(map_error)?;
+        version = 17;
+    }
+
+    if version == 17 {
+        conn.execute_batch(V18_SQL).map_err(map_error)?;
+        version = 18;
+    }
+
+    if version == 18 {
+        conn.execute_batch(V19_SQL).map_err(map_error)?;
+        conn.execute_batch(BACKFILL_CARDS_SQL).map_err(map_error)?;
+        version = 19;
+    }
+
+    if version == 19 {
+        conn.execute_batch(V20_SQL).map_err(map_error)?;
+        version = 20;
+    }
+
+    if version == 20 {
+        conn.execute_batch(V21_SQL).map_err(map_error)?;
+        version = 21;
+    }
+
+    if version == 21 {
+        conn.execute_batch(V22_SQL).map_err(map_error)?;
+        version = 22;
+    }
+
+    conn.pragma_update(None, "user_version", version)
+        .map_err(map_error)?;
+
     Ok(version)
 }
 
-/// 建表（幂等）：每次启动都跑一遍，缺表就补，已有数据不动。
+/// 建表（幂等）：只在测试里直接用；启动流程走 `migrate`。
+#[cfg(test)]
 pub fn apply(conn: &Connection) -> Result<(), StashError> {
     conn.execute_batch(SCHEMA_SQL).map_err(map_error)
 }
@@ -173,8 +416,8 @@ pub fn seed(conn: &mut Connection) -> Result<SeedReport, StashError> {
         }
 
         tx.execute(
-            "INSERT INTO node (key, parent_key, title, kind, view_mode, bar_color, icon, preview_limit, empty_text, show_in_sidebar, sort)
-             VALUES (?1, NULL, ?2, 'section', ?3, ?4, ?5, ?6, ?7, ?8, ?9)",
+            "INSERT INTO node (key, parent_key, title, kind, view_mode, bar_color, icon, preview_limit, empty_text, show_in_sidebar, allow_groups, sort)
+             VALUES (?1, NULL, ?2, 'section', ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10)",
             params![
                 section.key,
                 section.title,
@@ -184,6 +427,7 @@ pub fn seed(conn: &mut Connection) -> Result<SeedReport, StashError> {
                 section.preview_limit,
                 section.empty_text,
                 i64::from(section.show_in_sidebar),
+                i64::from(view == "apps"),
                 section.sort,
             ],
         )
@@ -207,13 +451,13 @@ pub fn seed(conn: &mut Connection) -> Result<SeedReport, StashError> {
                 report.groups += 1;
 
                 for (index, entry) in group.entries.iter().enumerate() {
-                    insert_entry(&tx, &group.key, index, entry, &mut report)?;
+                    insert_entry(&tx, &group.key, &section.view, index, entry, &mut report)?;
                 }
             }
         } else {
             // 海报与图文没有分组，直接挂在分区上（node_key 就是分区自己）
             for (index, entry) in section.entries.iter().enumerate() {
-                insert_entry(&tx, &section.key, index, entry, &mut report)?;
+                insert_entry(&tx, &section.key, &section.view, index, entry, &mut report)?;
             }
         }
 
@@ -237,6 +481,9 @@ pub fn seed(conn: &mut Connection) -> Result<SeedReport, StashError> {
         report.blocks += 1;
     }
 
+    // 老结构（分区 → 展示块）同步生成卡片，保证新首页立刻有内容
+    tx.execute_batch(BACKFILL_CARDS_SQL).map_err(map_error)?;
+
     tx.commit().map_err(map_error)?;
 
     Ok(report)
@@ -248,18 +495,20 @@ pub fn seed(conn: &mut Connection) -> Result<SeedReport, StashError> {
 fn insert_entry(
     tx: &rusqlite::Transaction<'_>,
     node_key: &str,
+    format: &str,
     index: usize,
     entry: &SeedEntry,
     report: &mut SeedReport,
 ) -> Result<(), StashError> {
     tx.execute(
         "INSERT INTO entry (
-             key, node_key, name, description, icon, href, cover,
+             key, node_key, format, name, description, icon, href, cover,
              banner, badge, comment, summary, body, hot, views, likes, sort
-         ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16)",
+         ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16, ?17)",
         params![
             entry.key,
             node_key,
+            format,
             entry.name,
             entry.description,
             entry.icon,

src/db/settings.rs

@@ -0,0 +1,512 @@
+//! 站点级设置（页头滚动信息、侧栏顺序/显隐）。
+//!
+//! 存 `setting` 表：`key = 'site'`，`value` 是一段 JSON，`version` 做乐观锁。
+//! 读的时候任何字段缺失都回落默认值，坏 JSON 也回落默认值——
+//! 设置坏掉不应该让首页白屏。
+
+use rusqlite::{Connection, OptionalExtension, params};
+use serde::{Deserialize, Serialize};
+
+use crate::{db::map_error, error::StashError};
+
+pub const SETTINGS_KEY: &str = "site";
+pub const MAX_HEADER_ITEMS: usize = 8;
+pub const MIN_SPEED: u32 = 8;
+pub const MAX_SPEED: u32 = 120;
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Default)]
+#[serde(rename_all = "snake_case")]
+pub enum Tone {
+    #[default]
+    Plain,
+    Primary,
+    Success,
+    Neutral,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(default)]
+pub struct HeaderItem {
+    /// 文本，支持占位符 `{count}` / `{project}` / `{status}`
+    pub text: String,
+    /// 前置小标签，如「本地」「状态」
+    pub tag: Option<String>,
+    pub tone: Tone,
+}
+
+impl Default for HeaderItem {
+    fn default() -> Self {
+        Self {
+            text: String::new(),
+            tag: None,
+            tone: Tone::Plain,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(default)]
+pub struct HeaderSettings {
+    pub enabled: bool,
+    /// 滚动一轮的秒数
+    pub speed: u32,
+    /// 信息条目之间的间距（px），默认 26 ≈ 两个中文字宽
+    pub gap: u32,
+    pub items: Vec<HeaderItem>,
+}
+
+impl Default for HeaderSettings {
+    fn default() -> Self {
+        Self {
+            enabled: true,
+            speed: 24,
+            gap: 26,
+            items: vec![
+                HeaderItem {
+                    text: "共 {count} 个本地应用".into(),
+                    tag: None,
+                    tone: Tone::Plain,
+                },
+                HeaderItem {
+                    text: "{project}".into(),
+                    tag: Some("本地".into()),
+                    tone: Tone::Primary,
+                },
+                HeaderItem {
+                    text: "{status}".into(),
+                    tag: Some("状态".into()),
+                    tone: Tone::Success,
+                },
+            ],
+        }
+    }
+}
+
+fn default_true() -> bool {
+    true
+}
+
+impl Default for SidebarSettings {
+    fn default() -> Self {
+        Self {
+            show_profile: true,
+            show_service: true,
+            show_nav: true,
+            hidden: Vec::new(),
+            order: Vec::new(),
+            hidden_groups: Vec::new(),
+            shown_groups: Vec::new(),
+            group_order: std::collections::HashMap::new(),
+            tree_hidden: Vec::new(),
+            tree_order: std::collections::HashMap::new(),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(default)]
+pub struct SidebarSettings {
+    /// 是否显示「本地管理员」资料卡
+    #[serde(default = "default_true")]
+    pub show_profile: bool,
+    /// 是否显示「本地服务」面板
+    #[serde(default = "default_true")]
+    pub show_service: bool,
+    /// 是否显示「分组导航」卡片（首页 / 分组树）
+    #[serde(default = "default_true")]
+    pub show_nav: bool,
+    /// 隐藏的分类 id
+    pub hidden: Vec<String>,
+    /// 分类显示顺序（id）；未列出的排在后面，保持原有顺序
+    pub order: Vec<String>,
+    /// 隐藏的分组，键为 `分区id/分组id`
+    pub hidden_groups: Vec<String>,
+    /// 强制显示的分组（覆盖数据库里的 show_in_sidebar=0）
+    pub shown_groups: Vec<String>,
+    /// 每个分区下分组的顺序：分区 id → 分组 id 列表
+    pub group_order: std::collections::HashMap<String, Vec<String>>,
+    /// 新模型：侧栏隐藏的分组 key（任意层级）
+    pub tree_hidden: Vec<String>,
+    /// 新模型：每级分组的顺序，键是父分组 key（根级用空串）
+    pub tree_order: std::collections::HashMap<String, Vec<String>>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Default)]
+#[serde(default)]
+pub struct SectionsSettings {
+    /// 隐藏的首页卡片（分类 id）
+    pub hidden: Vec<String>,
+    /// 卡片顺序（分类 id）
+    pub order: Vec<String>,
+    /// 标题覆盖：id → 标题
+    pub titles: std::collections::HashMap<String, String>,
+    /// 预览条数覆盖：id → 条数
+    pub limits: std::collections::HashMap<String, u32>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(default)]
+pub struct ProfileSettings {
+    pub name: String,
+    pub role: String,
+    pub description: String,
+    pub location: String,
+    /// 头像地址；空字符串表示用首字占位
+    pub avatar: String,
+}
+
+impl Default for ProfileSettings {
+    fn default() -> Self {
+        Self {
+            name: "本地管理员".into(),
+            role: "管理员".into(),
+            description: "本地静态站点托管与预览，所有项目都运行在这台机器上。".into(),
+            location: "IP属地：局域网".into(),
+            avatar: String::new(),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(default)]
+pub struct BrandSettings {
+    /// 品牌文字（页头左侧，可留空只显示 logo）
+    pub name: String,
+    /// 没有 logo 图片时，圆形标记里显示的首字
+    pub mark: String,
+    /// logo 图片地址；空字符串表示用首字
+    pub logo: String,
+}
+
+impl Default for BrandSettings {
+    fn default() -> Self {
+        Self {
+            name: "STASH".into(),
+            mark: "S".into(),
+            logo: String::new(),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(default)]
+pub struct ActionSettings {
+    /// 明暗切换图标
+    #[serde(default = "default_true")]
+    pub theme: bool,
+    /// 刷新图标（重扫本地项目并重拉内容库）
+    pub refresh: bool,
+    /// 站点设置图标（仅登录后出现）
+    pub settings: bool,
+    /// 登录 / 退出登录
+    pub session: bool,
+}
+
+impl Default for ActionSettings {
+    fn default() -> Self {
+        Self {
+            theme: true,
+            refresh: true,
+            settings: true,
+            session: true,
+        }
+    }
+}
+
+/// 配色：浅色 / 深色 / 跟随系统。
+/// 落到 `<html data-scheme>` 上，深色由组件库的令牌块接管，页面不用改组件。
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Default)]
+#[serde(rename_all = "snake_case")]
+pub enum ThemeSetting {
+    Light,
+    Dark,
+    #[default]
+    Auto,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(default)]
+pub struct SiteMetaSettings {
+    /// 浏览器标签标题
+    pub title: String,
+    /// favicon 地址；空字符串表示用内置图标
+    pub favicon: String,
+    /// 配色
+    pub theme: ThemeSetting,
+    pub brand: BrandSettings,
+    pub actions: ActionSettings,
+}
+
+impl Default for SiteMetaSettings {
+    fn default() -> Self {
+        Self {
+            title: "Stash · 本地应用工作区".into(),
+            favicon: String::new(),
+            theme: ThemeSetting::Auto,
+            brand: BrandSettings::default(),
+            actions: ActionSettings::default(),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Default)]
+#[serde(default)]
+pub struct Settings {
+    pub header: HeaderSettings,
+    pub sidebar: SidebarSettings,
+    pub sections: SectionsSettings,
+    pub profile: ProfileSettings,
+    pub site: SiteMetaSettings,
+}
+
+/// 读到/保存后的完整状态：设置本体 + 版本号（前端提交时要带回来）。
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub struct SettingsDocument {
+    pub version: i64,
+    pub settings: Settings,
+}
+
+/// 校验：条数、长度、速度范围。
+pub fn validate(settings: &Settings) -> Result<(), StashError> {
+    if settings.header.items.is_empty() {
+        return Err(StashError::InvalidDirectory("页头至少保留一条信息".into()));
+    }
+    if settings.header.items.len() > MAX_HEADER_ITEMS {
+        return Err(StashError::InvalidDirectory(format!(
+            "页头最多 {MAX_HEADER_ITEMS} 条信息"
+        )));
+    }
+    if !(MIN_SPEED..=MAX_SPEED).contains(&settings.header.speed) {
+        return Err(StashError::InvalidDirectory(format!(
+            "滚动速度需在 {MIN_SPEED}–{MAX_SPEED} 秒之间"
+        )));
+    }
+    if settings.header.gap > 120 {
+        return Err(StashError::InvalidDirectory("信息间距最多 120".into()));
+    }
+    for item in &settings.header.items {
+        let text = item.text.trim();
+        if text.is_empty() {
+            return Err(StashError::InvalidDirectory("信息文本不能为空".into()));
+        }
+        if text.chars().count() > 60 {
+            return Err(StashError::InvalidDirectory("单条信息最多 60 个字".into()));
+        }
+        if let Some(tag) = &item.tag {
+            if tag.chars().count() > 8 {
+                return Err(StashError::InvalidDirectory("标签最多 8 个字".into()));
+            }
+        }
+    }
+    if settings.sidebar.hidden.len() > 100 || settings.sidebar.order.len() > 100 {
+        return Err(StashError::InvalidDirectory("侧栏配置过长".into()));
+    }
+    if settings.sidebar.hidden_groups.len() > 200
+        || settings.sidebar.shown_groups.len() > 200
+        || settings.sidebar.group_order.len() > 100
+        || settings.sidebar.tree_hidden.len() > 500
+        || settings.sidebar.tree_order.len() > 200
+    {
+        return Err(StashError::InvalidDirectory("侧栏分组配置过长".into()));
+    }
+    if settings.sections.hidden.len() > 100 || settings.sections.order.len() > 100 {
+        return Err(StashError::InvalidDirectory("首页卡片配置过长".into()));
+    }
+    if settings.sections.titles.len() > 100 || settings.sections.limits.len() > 100 {
+        return Err(StashError::InvalidDirectory("首页卡片配置过长".into()));
+    }
+    for title in settings.sections.titles.values() {
+        if title.chars().count() > 40 {
+            return Err(StashError::InvalidDirectory("卡片标题最多 40 个字".into()));
+        }
+    }
+    for limit in settings.sections.limits.values() {
+        if *limit > 60 {
+            return Err(StashError::InvalidDirectory("卡片条数最多 60".into()));
+        }
+    }
+    if settings.profile.name.chars().count() > 40 {
+        return Err(StashError::InvalidDirectory("名称最多 40 个字".into()));
+    }
+    if settings.profile.role.chars().count() > 20 {
+        return Err(StashError::InvalidDirectory("角色最多 20 个字".into()));
+    }
+    if settings.profile.description.chars().count() > 200 {
+        return Err(StashError::InvalidDirectory("描述最多 200 个字".into()));
+    }
+    if settings.profile.location.chars().count() > 40 {
+        return Err(StashError::InvalidDirectory("位置最多 40 个字".into()));
+    }
+    if settings.site.title.chars().count() > 120 {
+        return Err(StashError::InvalidDirectory("页面标题最多 120 个字".into()));
+    }
+    if settings.site.favicon.chars().count() > 500 {
+        return Err(StashError::InvalidDirectory("favicon 地址最多 500 个字符".into()));
+    }
+    if settings.site.brand.name.chars().count() > 20 {
+        return Err(StashError::InvalidDirectory("品牌文字最多 20 个字".into()));
+    }
+    if settings.site.brand.mark.chars().count() > 4 {
+        return Err(StashError::InvalidDirectory("logo 标记最多 4 个字".into()));
+    }
+    if settings.site.brand.logo.chars().count() > 500 {
+        return Err(StashError::InvalidDirectory("logo 地址最多 500 个字符".into()));
+    }
+    Ok(())
+}
+
+fn now() -> i64 {
+    std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .map(|duration| duration.as_secs() as i64)
+        .unwrap_or(0)
+}
+
+/// 读设置；没有记录时返回默认值与 version = 0。
+pub fn load(conn: &Connection) -> Result<SettingsDocument, StashError> {
+    let row: Option<(String, i64)> = conn
+        .query_row(
+            "SELECT value, version FROM setting WHERE key = ?1",
+            [SETTINGS_KEY],
+            |row| Ok((row.get(0)?, row.get(1)?)),
+        )
+        .optional()
+        .map_err(map_error)?;
+
+    let Some((raw, version)) = row else {
+        return Ok(SettingsDocument {
+            version: 0,
+            settings: Settings::default(),
+        });
+    };
+
+    let settings = serde_json::from_str::<Settings>(&raw).unwrap_or_else(|error| {
+        tracing::warn!("设置 JSON 解析失败，使用默认值: {error}");
+        Settings::default()
+    });
+
+    Ok(SettingsDocument { version, settings })
+}
+
+/// 保存设置；`expected_version` 与库里不一致时返回冲突。
+pub fn save(
+    conn: &mut Connection,
+    settings: Settings,
+    expected_version: i64,
+) -> Result<SettingsDocument, StashError> {
+    validate(&settings)?;
+    let value = serde_json::to_string(&settings)
+        .map_err(|error| StashError::Database(format!("设置序列化失败: {error}")))?;
+
+    let tx = conn.transaction().map_err(map_error)?;
+    let updated = if expected_version == 0 {
+        tx.execute(
+            "INSERT INTO setting (key, value, version, updated_at) VALUES (?1, ?2, 1, ?3)
+             ON CONFLICT(key) DO NOTHING",
+            params![SETTINGS_KEY, value, now()],
+        )
+        .map_err(map_error)?
+    } else {
+        tx.execute(
+            "UPDATE setting SET value = ?1, version = version + 1, updated_at = ?2
+             WHERE key = ?3 AND version = ?4",
+            params![value, now(), SETTINGS_KEY, expected_version],
+        )
+        .map_err(map_error)?
+    };
+
+    if updated == 0 {
+        return Err(StashError::Conflict(
+            "设置已被其它页面修改，请刷新后重试".into(),
+        ));
+    }
+
+    let (version,): (i64,) = tx
+        .query_row(
+            "SELECT version FROM setting WHERE key = ?1",
+            [SETTINGS_KEY],
+            |row| Ok((row.get(0)?,)),
+        )
+        .map_err(map_error)?;
+
+    tx.commit().map_err(map_error)?;
+
+    Ok(SettingsDocument { version, settings })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn db() -> Connection {
+        let conn = Connection::open_in_memory().expect("内存库应能打开");
+        conn.execute_batch(
+            "CREATE TABLE setting (
+                key TEXT PRIMARY KEY,
+                value TEXT NOT NULL,
+                version INTEGER NOT NULL DEFAULT 1,
+                updated_at INTEGER NOT NULL
+             );",
+        )
+        .expect("应能建表");
+        conn
+    }
+
+    #[test]
+    fn defaults_are_stable_and_valid() {
+        let settings = Settings::default();
+        assert!(settings.header.enabled);
+        assert_eq!(settings.header.items.len(), 3);
+        assert!(settings.sections.hidden.is_empty());
+        assert!(validate(&settings).is_ok());
+    }
+
+    #[test]
+    fn roundtrip_and_version_bump() {
+        let mut conn = db();
+        let saved = save(&mut conn, Settings::default(), 0).expect("首次保存应成功");
+        assert_eq!(saved.version, 1);
+
+        let loaded = load(&conn).expect("应能读");
+        assert_eq!(loaded, saved);
+
+        let mut next = saved.settings.clone();
+        next.header.speed = 40;
+        let saved2 = save(&mut conn, next, saved.version).expect("更新应成功");
+        assert_eq!(saved2.version, 2);
+        assert_eq!(saved2.settings.header.speed, 40);
+    }
+
+    #[test]
+    fn stale_version_conflicts() {
+        let mut conn = db();
+        let saved = save(&mut conn, Settings::default(), 0).expect("首次保存应成功");
+        let error = save(&mut conn, Settings::default(), saved.version - 1).expect_err("应冲突");
+        assert!(matches!(error, StashError::Conflict(_)));
+    }
+
+    #[test]
+    fn invalid_settings_are_rejected() {
+        let mut conn = db();
+        let mut bad = Settings::default();
+        bad.header.speed = 1;
+        assert!(save(&mut conn, bad, 0).is_err());
+
+        let mut empty = Settings::default();
+        empty.header.items.clear();
+        assert!(save(&mut conn, empty, 0).is_err());
+    }
+
+    #[test]
+    fn broken_json_falls_back_to_defaults() {
+        let conn = db();
+        conn.execute(
+            "INSERT INTO setting (key, value, version, updated_at) VALUES (?1, '{bad json', 3, 0)",
+            [SETTINGS_KEY],
+        )
+        .expect("应能写入");
+        let loaded = load(&conn).expect("坏 JSON 不应报错");
+        assert_eq!(loaded.version, 3);
+        assert_eq!(loaded.settings, Settings::default());
+    }
+}

src/error.rs

@@ -30,6 +30,10 @@ pub enum StashError {
     /// 统一收敛成一个变体，避免把 rusqlite 的类型泄漏到库的公开 API。
     #[error("数据库错误: {0}")]
     Database(String),
+
+    /// 乐观锁冲突：资源在本次编辑期间被别人改过。
+    #[error("冲突: {0}")]
+    Conflict(String),
 }
 
 impl IntoResponse for StashError {
@@ -37,6 +41,7 @@ impl IntoResponse for StashError {
         let (status, err_msg) = match self {
             StashError::NotFound(msg) => (StatusCode::NOT_FOUND, msg),
             StashError::InvalidDirectory(msg) => (StatusCode::BAD_REQUEST, msg),
+            StashError::Conflict(msg) => (StatusCode::CONFLICT, msg),
             _ => (StatusCode::INTERNAL_SERVER_ERROR, self.to_string()),
         };
 

stash-web/package-lock.json

@@ -8,6 +8,7 @@
       "name": "stash-web",
       "version": "0.0.0",
       "dependencies": {
+        "@stash/ui": "file:../../stash-ui",
         "react": "^19.3.1",
         "react-dom": "^19.3.1"
       },
@@ -21,6 +22,25 @@
         "vite": "^8.3.4"
       }
     },
+    "../../stash-ui": {
+      "name": "@stash/ui",
+      "version": "0.1.0",
+      "devDependencies": {
+        "@types/react": "^19.3.0",
+        "@types/react-dom": "^19.3.0",
+        "@vitejs/plugin-react": "^6.1.2",
+        "oxlint": "^1.88.0",
+        "playwright-core": "^1.64.1",
+        "react": "^19.3.1",
+        "react-dom": "^19.3.1",
+        "typescript": "~6.0.3",
+        "vite": "^8.3.4"
+      },
+      "peerDependencies": {
+        "react": ">=19",
+        "react-dom": ">=19"
+      }
+    },
     "node_modules/@oxc-project/types": {
       "version": "0.154.0",
       "resolved": "https://registry.npmmirror.com/@oxc-project/types/-/types-0.154.0.tgz",
@@ -616,6 +636,10 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@stash/ui": {
+      "resolved": "../../stash-ui",
+      "link": true
+    },
     "node_modules/@types/node": {
       "version": "24.19.2",
       "resolved": "https://registry.npmmirror.com/@types/node/-/node-24.19.2.tgz",

stash-web/package.json

@@ -10,6 +10,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@stash/ui": "file:../../stash-ui",
     "react": "^19.3.1",
     "react-dom": "^19.3.1"
   },

stash-web/src/App.tsx

@@ -1,359 +0,0 @@
-import { useEffect, useMemo, useRef, useState } from 'react'
-import { BackToTop } from './components/common/BackToTop'
-import { ArticleDetailView } from './components/content/ArticleDetailView'
-import { DetailView } from './components/content/DetailView'
-import { HomeView } from './components/content/HomeView'
-import { ItemDetailView } from './components/content/ItemDetailView'
-import { SiteHeader } from './components/header/SiteHeader'
-import { SearchBar } from './components/search/SearchBar'
-import { Sidebar } from './components/sidebar/Sidebar'
-import { withLocalCategory } from './data/local'
-import {
-  appDetailModel,
-  posterDetailModel,
-  posterToRelatedItem,
-  toRelatedItem,
-} from './data/detail'
-import { filterCategories } from './data/filter'
-import type { NavTarget } from './data/nav'
-import {
-  type Category,
-  findAppItem,
-  findArticleItem,
-  findPosterItem,
-  relatedAppItems,
-  relatedPosterItems,
-} from './data/types'
-import { useProjects } from './useProjects'
-import { useCatalog } from './useCatalog'
-import { useViewRoute } from './useViewRoute'
-import type { ItemRoute, View } from './data/view'
-import './App.css'
-
-export default function App() {
-  const { status, projects, error, live, refreshing, refresh } = useProjects()
-  // 内容目录来自后端 SQLite 内容库；本地服务分类仍由托管项目动态生成
-  const catalog = useCatalog()
-  const [keyword, setKeyword] = useState('')
-  // 当前视图由地址栏决定：刷新 / 收藏 / 前进后退都回到同一页（见 useViewRoute.ts）
-  const { view, go, back } = useViewRoute()
-  const [scrolled, setScrolled] = useState(false)
-  const searchRef = useRef<HTMLInputElement>(null)
-  const scrollRef = useRef<HTMLDivElement>(null)
-
-  const categories = useMemo(
-    () => withLocalCategory(projects, catalog.categories),
-    [projects, catalog.categories],
-  )
-  const visibleCategories = useMemo(
-    () => filterCategories(categories, keyword),
-    [categories, keyword],
-  )
-
-  // 侧栏不显示「本地服务」，也不显示被标记 show_in_sidebar = 0 的分区
-  const sidebarCategories = useMemo(
-    () =>
-      categories.filter(
-        (category) => category.id !== 'local' && category.showInSidebar !== false,
-      ),
-    [categories],
-  )
-
-  const detailView = view.type === 'detail' ? view : undefined
-  const itemView = view.type === 'item' ? view : undefined
-
-  const detailCategory =
-    detailView !== undefined
-      ? categories.find((category) => category.id === detailView.categoryId)
-      : undefined
-
-  const itemCategory =
-    itemView !== undefined
-      ? categories.find((category) => category.id === itemView.categoryId)
-      : undefined
-
-  // 应用与电影共用一个详情模型，这里按分类类型做映射
-  const detailModel = useMemo(() => {
-    if (itemView === undefined || itemCategory === undefined) return undefined
-
-    if (itemCategory.kind === 'apps') {
-      const item = findAppItem(itemCategory, itemView.itemId)
-      return item !== undefined ? appDetailModel(item) : undefined
-    }
-
-    if (itemCategory.kind === 'posters') {
-      const poster = findPosterItem(itemCategory, itemView.itemId)
-      return poster !== undefined ? posterDetailModel(poster) : undefined
-    }
-
-    return undefined
-  }, [itemView, itemCategory])
-
-  const relatedItems = useMemo(() => {
-    if (itemView === undefined || itemCategory === undefined) return []
-
-    if (itemCategory.kind === 'apps') {
-      return relatedAppItems(itemCategory, itemView.itemId, 4).map(toRelatedItem)
-    }
-
-    if (itemCategory.kind === 'posters') {
-      return relatedPosterItems(itemCategory, itemView.itemId, 4).map(posterToRelatedItem)
-    }
-
-    return []
-  }, [itemView, itemCategory])
-
-  // 切换视图时把内容区滚回顶部
-  useEffect(() => {
-    scrollRef.current?.scrollTo({ top: 0 })
-  }, [view])
-
-  // 桌面端滚动作在内容容器里，窄屏滚的是窗口：
-  // 两处都要驱动「已滚动」状态（顶部渐隐层 + 返回顶部按钮共用）
-  useEffect(() => {
-    const sync = () => {
-      const inner = scrollRef.current?.scrollTop ?? 0
-      const next = Math.max(inner, window.scrollY) > 4
-      setScrolled((current) => (current === next ? current : next))
-    }
-
-    window.addEventListener('scroll', sync, { passive: true })
-    return () => window.removeEventListener('scroll', sync)
-  }, [])
-
-  /**
-   * 「打开这个分区」应该落到哪个视图。
-   *
-   * 应用类分区配了首页展示块时，直接落到那个分组；其余情况打开整个分区。
-   * 这样卡片上的「···」和分区标题都通向卡片里实际展示的那块内容。
-   */
-  const detailViewFor = (categoryId: string): View => {
-    const category = categories.find((item) => item.id === categoryId)
-
-    if (category?.kind === 'apps' && category.block !== undefined) {
-      const group = category.groups.find((item) => item.id === category.block?.nodeKey)
-      if (group !== undefined) {
-        return { type: 'detail', categoryId, groupId: group.id }
-      }
-    }
-
-    return { type: 'detail', categoryId }
-  }
-
-  const openDetail = (categoryId: string) => go(detailViewFor(categoryId))
-
-  /** 条目所在的分组：应用按组组织，海报 / 图文直接挂在分区下 */
-  const groupOfItem = (category: Category, itemId: string): string | undefined => {
-    if (category.kind !== 'apps') return undefined
-    return category.groups.find((group) => group.items.some((item) => item.id === itemId))?.id
-  }
-
-  const openItem = (categoryId: string, itemId: string) => {
-    const category = categories.find((item) => item.id === categoryId)
-
-    go({
-      type: 'item',
-      categoryId,
-      itemId,
-      // 地址里带上条目自己的分组，刷新后「返回」才有确定的落点
-      groupId: category === undefined ? undefined : groupOfItem(category, itemId),
-    })
-  }
-
-  /**
-   * 条目详情的「返回」目标：优先回到该条目所在的分组，
-   * 没有分组（海报 / 图文）时回到分区，走和侧栏一样的展示块规则。
-   */
-  const detailTargetFor = (item: ItemRoute): View =>
-    item.groupId === undefined
-      ? detailViewFor(item.categoryId)
-      : { type: 'detail', categoryId: item.categoryId, groupId: item.groupId }
-
-  /**
-   * 侧栏导航：带分组时直接打开那个分组；
-   * 点分区本身时，交给 openDetail 按展示块落到对应节点。
-   */
-  const navigate = (target: NavTarget) => {
-    if (target.groupId === undefined) {
-      openDetail(target.categoryId)
-      return
-    }
-
-    go({ type: 'detail', categoryId: target.categoryId, groupId: target.groupId })
-  }
-
-  const goHome = () => go({ type: 'home' })
-
-  const searching = keyword.trim() !== ''
-
-  const viewCategoryId = detailView?.categoryId ?? itemView?.categoryId
-
-  /**
-   * 首屏数据还没回来时，地址指向的分类 / 条目只是「暂时查不到」，
-   * 不能直接报「不存在」——刷新详情页时最容易被这个误导。
-   */
-  const dataPending =
-    viewCategoryId !== undefined &&
-    (catalog.status === 'loading' || (viewCategoryId === 'local' && status === 'loading'))
-
-  /**
-   * 条目详情按分类类型分流：
-   * 图文走长文版式，应用 / 电影走通用的条目版式。
-   */
-  function renderItemView() {
-    if (itemView === undefined) return null
-    if (itemCategory === undefined) {
-      return (
-        <p className="section-empty">
-          {dataPending ? '正在读取内容库…' : '分类不存在'}
-        </p>
-      )
-    }
-
-    if (itemCategory.kind === 'articles') {
-      const article = findArticleItem(itemCategory, itemView.itemId)
-      if (article === undefined) {
-        return (
-          <p className="section-empty">
-            {dataPending ? '正在读取内容库…' : '条目不存在'}
-          </p>
-        )
-      }
-
-      return (
-        <ArticleDetailView
-          article={article}
-          categoryTitle={itemCategory.title}
-          onBack={() => back(detailTargetFor(itemView))}
-        />
-      )
-    }
-
-    if (detailModel === undefined) {
-      return (
-        <p className="section-empty">
-          {dataPending ? '正在读取内容库…' : '条目不存在'}
-        </p>
-      )
-    }
-
-    return (
-      <ItemDetailView
-        breadcrumb={`${itemCategory.title} / ${detailModel.title}`}
-        model={detailModel}
-        related={relatedItems}
-        onBack={() => back(detailTargetFor(itemView))}
-        onOpenItem={(itemId) => openItem(itemCategory.id, itemId)}
-      />
-    )
-  }
-
-  return (
-    <div className="app">
-      {/* 主题的顶部背景图：固定 65vh，底部渐隐到页面底色 */}
-      <div className="site-background" aria-hidden="true" />
-
-      <SiteHeader
-        projectCount={projects.length}
-        sampleProject={projects[0]?.name}
-        live={live}
-        onFocusSearch={() => searchRef.current?.focus()}
-      />
-
-      <div className="search-row">
-        <SearchBar value={keyword} onChange={setKeyword} inputRef={searchRef} />
-      </div>
-
-      <div className="layout">
-        <Sidebar
-          projects={projects}
-          categories={sidebarCategories}
-          live={live}
-          refreshing={refreshing}
-          onRefresh={refresh}
-          activeCategoryId={viewCategoryId}
-          activeGroupId={detailView?.groupId}
-          onNavigate={navigate}
-        />
-
-        <main className="content">
-          {/* 滚动后才淡入的顶部遮罩，避免内容在容器顶边被硬切 */}
-          <div className={`content-veil${scrolled ? ' is-visible' : ''}`} aria-hidden="true" />
-
-          <div
-            className="content-scroll"
-            id="content-scroll"
-            ref={scrollRef}
-            onScroll={(event) => {
-              const next = event.currentTarget.scrollTop > 4
-              setScrolled((current) => (current === next ? current : next))
-            }}
-          >
-            <h1 className="sr-only">Stash 本地应用工作区</h1>
-
-            {status === 'error' && (
-              <div className="notice notice-error" role="alert">
-                <strong>连不上 Stash 服务</strong>
-                <p>{error}</p>
-                <button type="button" className="notice-action" onClick={refresh}>
-                  重试
-                </button>
-              </div>
-            )}
-
-            {/* 内容库读取失败通常是用户改坏了 data 列里的 JSON，错误信息会带条目 id */}
-            {catalog.status === 'error' && (
-              <div className="notice notice-error" role="alert">
-                <strong>内容库读取失败</strong>
-                <p>{catalog.error}</p>
-                <button type="button" className="notice-action" onClick={catalog.reload}>
-                  重试
-                </button>
-              </div>
-            )}
-
-            {detailView === undefined && itemView === undefined && (
-              <>
-                {catalog.status === 'loading' && (
-                  <p className="section-empty">正在读取内容库…</p>
-                )}
-
-                <HomeView
-                  categories={visibleCategories}
-                  onOpenDetail={openDetail}
-                  onOpenItem={openItem}
-                />
-
-                {searching && visibleCategories.length === 0 && (
-                  <div className="notice">
-                    <strong>没有匹配「{keyword.trim()}」的内容</strong>
-                    <p>换个关键字试试，或清空搜索查看全部。</p>
-                  </div>
-                )}
-              </>
-            )}
-
-            {detailView !== undefined && detailCategory !== undefined && (
-              <DetailView
-                category={detailCategory}
-                groupId={detailView.groupId}
-                onBack={goHome}
-                onOpenItem={(itemId) => openItem(detailCategory.id, itemId)}
-              />
-            )}
-
-            {detailView !== undefined && detailCategory === undefined && (
-              <p className="section-empty">
-                {dataPending ? '正在读取内容库…' : '分类不存在'}
-              </p>
-            )}
-
-            {itemView !== undefined && renderItemView()}
-          </div>
-        </main>
-      </div>
-
-      <BackToTop visible={scrolled} />
-    </div>
-  )
-}

stash-web/src/AppNext.tsx

@@ -0,0 +1,756 @@
+import {
+  Empty,
+  Layout,
+  Menu,
+  Notice,
+  SearchField,
+  Space,
+  Toaster,
+  type MenuItem,
+} from '@stash/ui'
+import { useEffect, useMemo, useRef, useState } from 'react'
+import { BackToTop } from './components/common/BackToTop'
+import { ArticleDetailView } from './components/content/ArticleDetailView'
+import { AppGrid } from './components/content/AppGrid'
+import { CesCardGrid } from './components/content/CesCardGrid'
+import { ItemDetailView } from './components/content/ItemDetailView'
+import { ItemEditor } from './components/content/ItemEditor'
+import { PosterGrid } from './components/content/PosterGrid'
+import { SectionCard } from './components/content/SectionCard'
+import { SiteHeader } from './components/header/SiteHeader'
+import { ApiDocs } from './components/api/ApiDocs'
+import { GroupMark } from './components/common/GroupMark'
+import { LoginDialog } from './components/auth/LoginDialog'
+import { ProfileCard } from './components/sidebar/ProfileCard'
+import { ServicePanel } from './components/sidebar/ServicePanel'
+import { useProjects } from './useProjects'
+import { fetchSession, logout, type SessionState } from './auth'
+import {
+  fetchSettings,
+  type SettingsDocument,
+  type SiteSettings,
+} from './settings'
+import {
+  isDarkScheme,
+  readThemeOverride,
+  writeThemeOverride,
+  type ThemeChoice,
+} from './theme'
+import {
+  appDetailModel,
+  posterDetailModel,
+  posterToRelatedItem,
+  toRelatedItem,
+  type ItemDetailModel,
+} from './data/detail'
+import type { AppItem, ArticleItem, PosterItem, RelatedItem } from './data/types'
+import { fetchManage, type CardItem, type GroupNode, type ManageData } from './manage'
+import './App.css'
+
+/**
+ * 新前台：分组树 + 卡片组合。
+ *
+ * 路由：
+ *   /                    首页（卡片按勾选分组渲染）
+ *   /g/<分组 key>         分组页（自身条目 + 子分组）
+ *   /g/<分组 key>/i/<条目> 条目详情
+ * 旧 /c/... 地址按第一个路径段当成分组 key，兼容老书签。
+ */
+type Route =
+  | { kind: 'home' }
+  | { kind: 'group'; key: string }
+  | { kind: 'item'; key: string; itemId: string }
+  | { kind: 'api' }
+
+function parseRoute(pathname: string): Route {
+  const segments = pathname.split('/').filter(Boolean)
+  if (segments[0] === 'interface') return { kind: 'api' }
+  if (
+    (segments[0] === 'g' || segments[0] === 'c') &&
+    segments[1] !== undefined
+  ) {
+    if (segments[2] === 'i' && segments[3] !== undefined) {
+      return { kind: 'item', key: decodeURIComponent(segments[1]), itemId: decodeURIComponent(segments[3]) }
+    }
+    return { kind: 'group', key: decodeURIComponent(segments[1]) }
+  }
+  return { kind: 'home' }
+}
+
+function useRoute() {
+  const [route, setRoute] = useState<Route>(() => parseRoute(window.location.pathname))
+
+  useEffect(() => {
+    const sync = () => setRoute(parseRoute(window.location.pathname))
+    window.addEventListener('popstate', sync)
+    return () => window.removeEventListener('popstate', sync)
+  }, [])
+
+  const navigate = (path: string) => {
+    if (window.location.pathname === path) return
+    window.history.pushState({}, '', path)
+    setRoute(parseRoute(path))
+    document.getElementById('page-scroll')?.scrollTo({ top: 0 })
+    window.scrollTo({ top: 0 })
+  }
+
+  return { route, navigate }
+}
+
+function findGroup(groups: GroupNode[], key: string): GroupNode | undefined {
+  for (const group of groups) {
+    if (group.key === key) return group
+    const found = findGroup(group.children, key)
+    if (found !== undefined) return found
+  }
+  return undefined
+}
+
+function findPath(groups: GroupNode[], key: string, trail: GroupNode[] = []): GroupNode[] | undefined {
+  for (const group of groups) {
+    const next = [...trail, group]
+    if (group.key === key) return next
+    const found = findPath(group.children, key, next)
+    if (found !== undefined) return found
+  }
+  return undefined
+}
+
+function findEntryInGroup(
+  group: GroupNode,
+  entryId: string,
+): { group: GroupNode; entry: Record<string, unknown> } | undefined {
+  const direct = group.entries.find((candidate) => candidate.id === entryId)
+  if (direct !== undefined) {
+    return { group, entry: direct as unknown as Record<string, unknown> }
+  }
+  for (const child of group.children) {
+    const found = findEntryInGroup(child, entryId)
+    if (found !== undefined) return found
+  }
+  return undefined
+}
+
+function findEntry(
+  groups: GroupNode[],
+  groupKey: string,
+  entryId: string,
+): { group: GroupNode; entry: Record<string, unknown> } | undefined {
+  const group = findGroup(groups, groupKey)
+  if (group === undefined) return undefined
+  return findEntryInGroup(group, entryId)
+}
+
+function groupEntryCount(group: GroupNode): number {
+  const children = group.children.filter((child) => child.enabled !== false)
+  return group.entries.length + children.reduce((total, child) => total + groupEntryCount(child), 0)
+}
+
+/** 分组自身与所有祖先都启用时才可见：停用父级会连带停用整棵子树 */
+function isGroupVisible(groups: GroupNode[], key: string): boolean {
+  const path = findPath(groups, key)
+  if (path === undefined) return false
+  return path.every((node) => node.enabled !== false)
+}
+
+/** 分组子树里的全部条目（格式沿根分组继承，所以可以放在同一个网格里） */
+function collectEntries(group: GroupNode): Record<string, unknown>[] {
+  return [
+    ...(group.entries as unknown as Record<string, unknown>[]),
+    ...group.children
+      .filter((child) => child.enabled !== false)
+      .flatMap((child) => collectEntries(child)),
+  ]
+}
+
+function defaultLimit(group: GroupNode): number {
+  return group.previewLimit ?? 6
+}
+
+function entryFormat(entry: Record<string, unknown>): 'apps' | 'posters' | 'articles' {
+  const value = entry.format
+  return value === 'posters' || value === 'articles' ? value : 'apps'
+}
+
+function matches(entry: Record<string, unknown>, keyword: string): boolean {
+  if (keyword === '') return true
+  const text = [entry.name, entry.title, entry.description, entry.desc]
+    .filter((value) => typeof value === 'string')
+    .join(' ')
+    .toLowerCase()
+  return text.includes(keyword)
+}
+
+export default function AppNext() {
+  const { status, projects, error, live, refreshing, refresh } = useProjects()
+  const { route, navigate } = useRoute()
+  const [manage, setManage] = useState<ManageData>({ groups: [], cards: [] })
+  const [loading, setLoading] = useState(true)
+  const [keyword, setKeyword] = useState('')
+  const [session, setSession] = useState<SessionState | null>(null)
+  const [settings, setSettings] = useState<SettingsDocument | null>(null)
+  const [loginOpen, setLoginOpen] = useState(false)
+  const [editingKey, setEditingKey] = useState<string | null>(null)
+  const [scrolled, setScrolled] = useState(false)
+  const searchRef = useRef<HTMLInputElement>(null)
+
+  const load = () => {
+    void fetchManage().then((data) => {
+      setManage(data)
+      setLoading(false)
+    })
+  }
+
+  useEffect(() => {
+    load()
+    void fetchSession().then(setSession)
+    void fetchSettings().then(setSettings)
+
+    const source = new EventSource('/api/catalog/events')
+    // 服务端推的是具名事件 `catalog`（不是默认的 message），两种都接；
+    // 收到后连站点设置一起重拉，改完设置不用手动刷新页面。
+    const onCatalogChange = () => {
+      load()
+      void fetchSettings().then(setSettings)
+    }
+    source.onmessage = onCatalogChange
+    source.addEventListener('catalog', onCatalogChange)
+    return () => source.close()
+  }, [])
+
+  useEffect(() => {
+    const content = document.getElementById('content-scroll')
+    const main = content?.parentElement
+    const body = main?.parentElement
+    if (
+      !(content instanceof HTMLElement) ||
+      !(main instanceof HTMLElement) ||
+      !(body instanceof HTMLElement)
+    ) {
+      return
+    }
+
+    // 左右两栏放进同一个滚动容器：滚动区域从搜索条下方开始，两栏位移完全一致。
+    // 左栏的吸顶交给 CSS position: sticky（App.css 里 #page-scroll > aside）：
+    // 之前用 scroll 事件改 transform，主线程永远落后平滑滚动一帧，看起来就在抖。
+    // 注意别再给 aside 设内联 overflow，否则会盖掉 CSS 里的 overflow-y: auto，
+    // 侧栏比视口高时就没法在栏内滚动了。
+    body.id = 'page-scroll'
+    body.style.overflowY = 'auto'
+    body.style.overflowX = 'hidden'
+    content.style.overflow = 'visible'
+    content.style.marginTop = '0'
+    main.style.height = 'auto'
+
+    const onScroll = () => setScrolled(body.scrollTop > 4)
+
+    // 滚动容器只覆盖 1380 的两栏，窗口两侧的空白、页头与搜索条都在它外面，
+    // 滚轮落在这些地方时浏览器找不到可滚动元素。统一转发给内容区。
+    const forwardWheel = (event: WheelEvent) => {
+      if (event.target instanceof Node && body.contains(event.target)) return
+      // deltaMode 1 = 按行（Firefox 鼠标滚轮），换算成像素
+      body.scrollTop += event.deltaMode === 1 ? event.deltaY * 16 : event.deltaY
+      event.preventDefault()
+    }
+    window.addEventListener('wheel', forwardWheel, { passive: false })
+
+    body.addEventListener('scroll', onScroll, { passive: true })
+    onScroll()
+
+    return () => {
+      body.removeEventListener('scroll', onScroll)
+      window.removeEventListener('wheel', forwardWheel)
+      body.id = ''
+      body.style.overflowY = ''
+      body.style.overflowX = ''
+      content.style.overflow = ''
+      content.style.marginTop = ''
+      main.style.height = ''
+    }
+  }, [])
+
+  const site: SiteSettings = settings?.settings ?? {
+    header: { enabled: true, speed: 24, gap: 26, items: [] },
+    sidebar: {
+      show_profile: true,
+      show_service: true,
+      show_nav: true,
+      hidden: [],
+      order: [],
+      hidden_groups: [],
+      shown_groups: [],
+      group_order: {},
+      tree_hidden: [],
+      tree_order: {},
+    },
+    sections: { hidden: [], order: [], titles: {}, limits: {} },
+    profile: {
+      name: '本地管理员',
+      role: '管理员',
+      description: '',
+      location: '',
+      avatar: '',
+    },
+    site: {
+      title: 'Stash · 本地应用工作区',
+      favicon: '',
+      theme: 'auto',
+      brand: { name: 'STASH', mark: 'S', logo: '' },
+      actions: { theme: true, refresh: true, settings: true, session: true },
+    },
+  }
+
+  const keywordLower = keyword.trim().toLowerCase()
+
+  // 配色：本机偏好优先于站点默认，写在 <html data-scheme> 上，
+  // 深色由组件库的令牌块接管，页面与组件都不用改
+  const [themeOverride, setThemeOverride] = useState<ThemeChoice | null>(() =>
+    readThemeOverride(),
+  )
+  const effectiveTheme = themeOverride ?? site.site.theme
+
+  useEffect(() => {
+    document.documentElement.dataset.scheme = effectiveTheme
+  }, [effectiveTheme])
+
+  /** 当前实际是深色吗（auto 时按系统偏好算） */
+  const isDark = isDarkScheme(effectiveTheme)
+
+  /** 页头的明暗切换：只写本机偏好，不需要登录；站点默认值在后台改 */
+  const toggleTheme = () => {
+    const next: ThemeChoice = isDark ? 'light' : 'dark'
+    setThemeOverride(next)
+    writeThemeOverride(next)
+  }
+
+  // 站点级设置：浏览器标签标题与 favicon（空值回落到内置）
+  useEffect(() => {
+    const title = site.site.title.trim()
+    if (title !== '') document.title = title
+
+    const href = site.site.favicon.trim() === '' ? '/favicon.svg' : site.site.favicon.trim()
+    let link = document.head.querySelector<HTMLLinkElement>('link[rel="icon"]')
+    if (link === null) {
+      link = document.createElement('link')
+      link.rel = 'icon'
+      document.head.appendChild(link)
+    }
+    link.href = href
+    link.type = href.endsWith('.svg') ? 'image/svg+xml' : ''
+  }, [site.site.title, site.site.favicon])
+
+  const sidebarItems: MenuItem[] = useMemo(() => {
+    // 侧边栏的显隐只认「分组管理 → 状态」：停用的分组整棵子树都不进导航，
+    // 顺序按分组自己的排序权重，不再有侧栏专属的隐藏/排序状态。
+    const build = (nodes: GroupNode[]): MenuItem[] =>
+      [...nodes]
+        .sort((a, b) => a.sort - b.sort)
+        .flatMap((node) => {
+          if (node.enabled === false) return []
+          const children = build(node.children)
+          return [
+            {
+              key: `g:${node.key}`,
+              label: node.title,
+              children: children.length > 0 ? children : undefined,
+            },
+          ]
+        })
+
+    return [{ key: 'home', label: '首页' }, ...build(manage.groups)]
+  }, [manage.groups])
+
+  const activeKey =
+    route.kind === 'home' || route.kind === 'api'
+      ? 'home'
+      : route.kind === 'group'
+        ? `g:${route.key}`
+        : `g:${route.key}`
+
+  function renderEntries(
+    group: GroupNode,
+    entries: Record<string, unknown>[],
+    options: { detail?: boolean; limit?: number } = {},
+  ) {
+    const filtered = entries.filter((entry) => matches(entry, keywordLower))
+    const limit = options.limit ?? filtered.length
+    const items = filtered.slice(0, limit)
+    const open = (itemId: string) => navigate(`/g/${encodeURIComponent(group.key)}/i/${encodeURIComponent(itemId)}`)
+
+    return (
+      <>
+        {(['apps', 'posters', 'articles'] as const).map((format) => {
+          const subset = items.filter((entry) => entryFormat(entry) === format)
+          if (subset.length === 0) return null
+          return (
+            <div className="mixed-format-block" key={format}>
+              {format === 'posters' ? (
+                <PosterGrid items={subset as unknown as PosterItem[]} onOpen={open} />
+              ) : format === 'articles' ? (
+                <CesCardGrid items={subset as unknown as ArticleItem[]} onOpen={open} />
+              ) : (
+                <AppGrid items={subset as unknown as AppItem[]} onOpen={open} />
+              )}
+            </div>
+          )
+        })}
+      </>
+    )
+  }
+
+  function renderGroupBlock(group: GroupNode, limit: number, showTitle: boolean) {
+    // 根分组（分区）只展示直接挂在它下面的条目，子分组各自成块，避免同一批内容出现两次
+    const rootGroup = group.parentKey === undefined || group.parentKey === null
+    const source = rootGroup
+      ? (group.entries as unknown as Record<string, unknown>[])
+      : collectEntries(group)
+    const all = source.filter((entry) => matches(entry, keywordLower))
+    if (all.length === 0) return null
+    return (
+      <div key={group.key} className="card-group-block">
+        {showTitle && !rootGroup && <h3 className="card-group-title">{group.title}</h3>}
+        {renderEntries(group, all, { limit })}
+      </div>
+    )
+  }
+
+  function renderLocalService(card: CardItem) {
+    const items: AppItem[] = projects.map((project) => ({
+      id: project.name,
+      name: project.name,
+      desc: project.route_path,
+      icon: project.name.slice(0, 1).toUpperCase(),
+      href: project.route_path,
+      badge: '本地项目',
+      comment: '本地静态站点，由 Stash 直接托管。',
+      views: 0,
+      likes: 0,
+    }))
+
+    return (
+      <SectionCard key={card.id} title="本地服务" count={items.length} barColor="#3858f6">
+        {items.length > 0 ? (
+          <AppGrid items={items} />
+        ) : (
+          <Empty text="还没有项目：在托管目录下建一个子目录并放入 index.html，刷新后就会出现在这里。" />
+        )}
+      </SectionCard>
+    )
+  }
+
+  function renderCard(card: CardItem) {
+    const resolved = card.groups
+      .map((ref) => ({ ref, group: findGroup(manage.groups, ref.groupKey) }))
+      .filter(
+        (item): item is { ref: typeof item.ref; group: GroupNode } =>
+          item.group !== undefined && isGroupVisible(manage.groups, item.ref.groupKey),
+      )
+
+    const total = resolved.reduce((sum, item) => sum + groupEntryCount(item.group), 0)
+    const first = resolved[0]?.group
+    if (resolved.length === 0 || total === 0) return null
+
+    return (
+      <SectionCard
+        key={card.id}
+        title={card.title}
+        count={total}
+        barColor={first?.barColor}
+      >
+        {resolved.map(({ group, ref }) =>
+          renderGroupBlock(group, ref.previewLimit ?? defaultLimit(group), resolved.length > 1),
+        )}
+      </SectionCard>
+    )
+  }
+
+  function renderHome() {
+    const cards = manage.cards
+    return (
+      <div className="home-view">
+        {loading && <Empty text="正在读取内容库…" />}
+        {!loading && cards.length === 0 && <Empty text="后台还没有创建首页卡片" />}
+        {cards.map((card) =>
+          card.key === 'local-service' ? renderLocalService(card) : renderCard(card),
+        )}
+        {keywordLower !== '' && cards.length > 0 && (
+          <Notice title={`搜索结果：${keyword.trim()}`}>在卡片与分组内按标题过滤。</Notice>
+        )}
+      </div>
+    )
+  }
+
+  function renderGroupPage(key: string) {
+    const group = findGroup(manage.groups, key)
+    if (group === undefined || !isGroupVisible(manage.groups, key)) {
+      return <Empty text={loading ? '正在读取内容库…' : '分组不存在'} />
+    }
+
+    const trail = findPath(manage.groups, key) ?? [group]
+    // 根分组页就是「这个分区的全部内容」：所有启用的子分组整段铺开，不再需要「查看全部」
+    const rootGroup = group.parentKey === undefined || group.parentKey === null
+
+    return (
+      <div className="detail-view">
+        <nav className="detail-breadcrumb group-crumbs">
+          <button type="button" className="link-button" onClick={() => navigate('/')}>
+            首页
+          </button>
+          {trail.map((node) => (
+            <span key={node.key}>
+              <span className="group-crumb-sep">/</span>
+              <button
+                type="button"
+                className="link-button"
+                onClick={() => navigate(`/g/${encodeURIComponent(node.key)}`)}
+              >
+                {node.title}
+              </button>
+            </span>
+          ))}
+        </nav>
+
+        <div className="detail-hero">
+          <span className="detail-hero-icon" aria-hidden="true">
+            <GroupMark icon={group.icon} fallback="•" />
+          </span>
+          <h2 className="detail-hero-title">{group.title}</h2>
+          <span className="detail-hero-count">[{groupEntryCount(group)}]</span>
+        </div>
+
+        {group.entries.length > 0 ? (
+          renderEntries(group, group.entries)
+        ) : group.children.some((child) => groupEntryCount(child) > 0) ? null : (
+          <Empty text="这个分组还没有内容" />
+        )}
+
+        <Space direction="column" gap="lg" align="stretch">
+          {group.children
+            .filter((child) => child.enabled !== false)
+            .map((child) => (
+            <section key={child.key} className="group-child-block">
+              <div className="group-title">
+                <span
+                  className="group-bar"
+                  style={{ backgroundColor: child.barColor || undefined }}
+                  aria-hidden="true"
+                />
+                <h3>{child.title}</h3>
+                {!rootGroup && (
+                  <button
+                    type="button"
+                    className="link-button"
+                    onClick={() => navigate(`/g/${encodeURIComponent(child.key)}`)}
+                  >
+                    查看全部
+                  </button>
+                )}
+              </div>
+              {child.entries.length > 0 ? (
+                renderEntries(child, child.entries, rootGroup ? {} : { limit: 12 })
+              ) : (
+                <Empty text="暂无内容" />
+              )}
+            </section>
+          ))}
+        </Space>
+      </div>
+    )
+  }
+
+  function renderItemPage(key: string, itemId: string) {
+    const found = findEntry(manage.groups, key, itemId)
+    if (found === undefined || !isGroupVisible(manage.groups, found.group.key)) {
+      return <Empty text={loading ? '正在读取内容库…' : '条目不存在'} />
+    }
+
+    const { group, entry } = found
+    const trail = findPath(manage.groups, group.key) ?? [group]
+    const crumbs = [
+      { label: '首页', href: '/' },
+      ...trail.map((node) => ({
+        label: node.title,
+        href: `/g/${encodeURIComponent(node.key)}`,
+      })),
+      { label: String(entry.name ?? entry.title ?? entry.id) },
+    ]
+
+    const format = entryFormat(entry)
+
+    if (format === 'articles') {
+      const article = entry as unknown as ArticleItem
+      return (
+        <ArticleDetailView
+          article={article}
+          categoryId={group.key}
+          categoryTitle={group.title}
+          onNavigate={navigate}
+          onEdit={() => setEditingKey(String(entry.id))}
+          canEdit={session?.authenticated === true}
+        />
+      )
+    }
+
+    const model: ItemDetailModel =
+      format === 'posters'
+        ? posterDetailModel(entry as unknown as PosterItem)
+        : appDetailModel(entry as unknown as AppItem)
+
+    const related: RelatedItem[] =
+      format === 'posters'
+        ? group.entries
+            .filter((item) => item.id !== entry.id && entryFormat(item as unknown as Record<string, unknown>) === format)
+            .slice(0, 4)
+            .map((item) => posterToRelatedItem(item as unknown as PosterItem))
+        : group.entries
+            .filter((item) => item.id !== entry.id && entryFormat(item as unknown as Record<string, unknown>) === format)
+            .slice(0, 4)
+            .map((item) => toRelatedItem(item as unknown as AppItem))
+
+    return (
+      <ItemDetailView
+        itemKey={String(entry.id)}
+        crumbs={crumbs}
+        model={model}
+        related={related}
+        onNavigate={navigate}
+        onOpenItem={(next) => navigate(`/g/${encodeURIComponent(group.key)}/i/${encodeURIComponent(next)}`)}
+        onEdit={() => setEditingKey(String(entry.id))}
+        canEdit={session?.authenticated === true}
+      />
+    )
+  }
+
+  return (
+    <>
+      <Toaster />
+      <LoginDialog
+        open={loginOpen}
+        hasAdmin={session?.has_admin ?? true}
+        onClose={() => setLoginOpen(false)}
+        onSuccess={(next) => {
+          setSession(next)
+          setLoginOpen(false)
+        }}
+      />
+
+      <ItemEditor
+        open={editingKey !== null}
+        itemKey={editingKey}
+        onClose={() => setEditingKey(null)}
+        onSaved={() => {
+          setEditingKey(null)
+          load()
+        }}
+      />
+
+      <div className="site-background" aria-hidden="true" />
+
+      <Layout
+        contained
+        maxWidth={1380}
+        gutter={20}
+        siderWidth={240}
+        gap={20}
+        headerHeight={60}
+        headerVariant="solid"
+        siderBordered={false}
+        contentPadding="none"
+        height="screen"
+        scrollable
+        hideScrollbar
+        contentId="content-scroll"
+        className="app"
+        header={
+          <SiteHeader
+            projectCount={projects.length}
+            sampleProject={projects[0]?.name}
+            live={live}
+            headerItems={site.header.items}
+            headerEnabled={site.header.enabled}
+            headerSpeed={site.header.speed}
+            headerGap={site.header.gap}
+            site={site.site}
+            authenticated={session?.authenticated === true}
+            username={session?.username ?? undefined}
+            refreshing={refreshing}
+            dark={isDark}
+            onToggleTheme={() => void toggleTheme()}
+            onRefresh={() => {
+              // 刷新 = 整页重载：项目扫描、内容库、设置、主题都重新走一遍
+              window.location.reload()
+            }}
+            onLogin={() => setLoginOpen(true)}
+            onLogout={() => {
+              void logout().then(() => setSession({ authenticated: false, has_admin: true }))
+            }}
+            onSettings={() => window.location.assign('/admin')}
+          />
+        }
+        toolbar={
+          <div className="search-toolbar">
+            <SearchField
+              value={keyword}
+              onChange={setKeyword}
+              inputRef={searchRef}
+              placeholder="搜索本地项目…"
+              label="搜索本地项目"
+              variant="card"
+              hotkey="k"
+            />
+          </div>
+        }
+        sider={
+          <div className="sidebar-wrap">
+            <div className="sidebar sidebar-home">
+              {site.sidebar.show_profile !== false && <ProfileCard profile={site.profile} />}
+              {site.sidebar.show_service !== false && (
+                <ServicePanel
+                  projects={projects}
+                  live={live}
+                  refreshing={refreshing}
+                  onRefresh={refresh}
+                  onOpenApi={() => navigate('/interface')}
+                />
+              )}
+              {site.sidebar.show_nav !== false && (
+                <div className="nav-card">
+                  <Menu
+                    items={sidebarItems}
+                    activeKey={activeKey}
+                    itemHeight={39}
+                    onSelect={(key) => {
+                      if (key === 'home') navigate('/')
+                      else navigate(`/g/${encodeURIComponent(key.slice(2))}`)
+                    }}
+                  />
+                </div>
+              )}
+            </div>
+          </div>
+        }
+      >
+        <div className="content">
+          <h1 className="sr-only">Stash 本地应用工作区</h1>
+
+          {status === 'error' && (
+            <Notice
+              tone="error"
+              title="连不上 Stash 服务"
+              action={{ label: '重试', onClick: refresh }}
+            >
+              {error}
+            </Notice>
+          )}
+
+          {route.kind === 'home' && renderHome()}
+          {route.kind === 'api' && <ApiDocs />}
+          {route.kind === 'group' && renderGroupPage(route.key)}
+          {route.kind === 'item' && renderItemPage(route.key, route.itemId)}
+        </div>
+      </Layout>
+
+      <BackToTop visible={scrolled} targetId="page-scroll" />
+    </>
+  )
+}

stash-web/src/auth.ts

@@ -0,0 +1,64 @@
+/**
+ * 登录/会话的接口封装。
+ *
+ * 会话是 HttpOnly Cookie，前端拿不到 token，只能问 `/api/auth/session`。
+ */
+export type SessionState = {
+  authenticated: boolean
+  has_admin: boolean
+  username?: string | null
+}
+
+type Result = { ok: true } | { ok: false; status: number; error: string }
+
+async function request(
+  method: 'POST' | 'PATCH',
+  url: string,
+  body: unknown,
+): Promise<Result> {
+  try {
+    const response = await fetch(url, {
+      method,
+      credentials: 'same-origin',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify(body),
+    })
+
+    if (response.ok) return { ok: true }
+
+    const payload = (await response.json().catch(() => null)) as { error?: string } | null
+    return {
+      ok: false,
+      status: response.status,
+      error: payload?.error ?? `请求失败（${response.status}）`,
+    }
+  } catch (error) {
+    return { ok: false, status: 0, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+export async function fetchSession(): Promise<SessionState> {
+  try {
+    const response = await fetch('/api/auth/session', { credentials: 'same-origin' })
+    if (!response.ok) return { authenticated: false, has_admin: false }
+    return (await response.json()) as SessionState
+  } catch {
+    return { authenticated: false, has_admin: false }
+  }
+}
+
+export function login(password: string): Promise<Result> {
+  return request('POST', '/api/auth/login', { password })
+}
+
+export function setup(password: string, username = 'admin'): Promise<Result> {
+  return request('POST', '/api/auth/setup', { password, username })
+}
+
+export function logout(): Promise<Result> {
+  return request('POST', '/api/auth/logout', {})
+}
+
+export function changePassword(current: string, next: string): Promise<Result> {
+  return request('PATCH', '/api/auth/password', { current, next })
+}

stash-web/src/components/api/ApiDocs.tsx

@@ -0,0 +1,131 @@
+import { Card, Space, Table, Tag, Text, Title } from '@stash/ui'
+
+/**
+ * 接口一览：把 `/api/*` 按用途分组列出来。
+ *
+ * 页面只做展示，不请求后端——清单跟 `src/server.rs` 的路由表人工对齐，
+ * 改接口时顺手改这里（文件顶部有分组与权限说明）。
+ */
+type Endpoint = {
+  method: 'GET' | 'POST' | 'PATCH' | 'PUT' | 'DELETE'
+  path: string
+  summary: string
+  /** 需要登录会话 */
+  auth?: boolean
+}
+
+const GROUPS: { title: string; desc: string; items: Endpoint[] }[] = [
+  {
+    title: '健康与项目',
+    desc: '托管目录的扫描结果与实时推送。',
+    items: [
+      { method: 'GET', path: '/api/health', summary: '存活检查，返回服务名与状态' },
+      { method: 'GET', path: '/api/projects', summary: '扫描托管目录（每次请求都重新扫描）' },
+      { method: 'GET', path: '/api/projects/events', summary: 'SSE：目录变化时推送最新项目列表' },
+    ],
+  },
+  {
+    title: '内容库',
+    desc: '分区 / 分组 / 条目 / 卡片。写操作都需要登录会话与同源 Origin。',
+    items: [
+      { method: 'GET', path: '/api/catalog', summary: '旧版完整目录（兼容保留）' },
+      { method: 'GET', path: '/api/catalog2', summary: '分组树 + 卡片，后台配置用' },
+      { method: 'GET', path: '/api/catalog/events', summary: 'SSE：内容库变更时推送「该重拉」' },
+      { method: 'POST', path: '/api/nodes', summary: '新建分区 / 分组', auth: true },
+      { method: 'PATCH', path: '/api/nodes/{key}', summary: '改标题、所属、图标、排序、启停', auth: true },
+      { method: 'DELETE', path: '/api/nodes/{key}', summary: '删除分区 / 分组（级联子节点）', auth: true },
+      { method: 'GET', path: '/api/items/{key}', summary: '条目详情' },
+      { method: 'POST', path: '/api/items', summary: '新建条目', auth: true },
+      { method: 'PATCH', path: '/api/items/{key}', summary: '就地编辑（带 updatedAt 乐观锁）', auth: true },
+      { method: 'DELETE', path: '/api/items/{key}', summary: '删除条目', auth: true },
+      { method: 'POST', path: '/api/items/{key}/view', summary: '浏览数 +1' },
+      { method: 'POST', path: '/api/items/{key}/like', summary: '点赞 / 取消点赞' },
+      { method: 'POST', path: '/api/cards', summary: '新建首页卡片', auth: true },
+      { method: 'PATCH', path: '/api/cards/{id}', summary: '改卡片标题 / 顺序', auth: true },
+      { method: 'DELETE', path: '/api/cards/{id}', summary: '删除卡片', auth: true },
+      { method: 'PUT', path: '/api/cards/{id}/groups', summary: '整组替换卡片包含的分组与顺序', auth: true },
+      { method: 'POST', path: '/api/categories', summary: '旧版：新建分类', auth: true },
+      { method: 'PATCH', path: '/api/categories/{id}', summary: '旧版：改分类', auth: true },
+      { method: 'DELETE', path: '/api/categories/{id}', summary: '旧版：删分类', auth: true },
+      { method: 'POST', path: '/api/categories/{id}/groups', summary: '旧版：新建分组', auth: true },
+      { method: 'PATCH', path: '/api/groups/{id}', summary: '旧版：改分组', auth: true },
+      { method: 'DELETE', path: '/api/groups/{id}', summary: '旧版：删分组', auth: true },
+    ],
+  },
+  {
+    title: '站点设置',
+    desc: '页头、侧边栏、卡片、资料、站点信息等整份 JSON。',
+    items: [
+      { method: 'GET', path: '/api/settings', summary: '读取设置（含 version 乐观锁）' },
+      { method: 'PATCH', path: '/api/settings', summary: '整份保存设置', auth: true },
+      { method: 'GET', path: '/api/backup', summary: '下载 SQLite 快照', auth: true },
+    ],
+  },
+  {
+    title: '认证',
+    desc: '单管理员账号；会话 token 只存 sha256，Cookie 为 HttpOnly + SameSite=Strict。',
+    items: [
+      { method: 'GET', path: '/api/auth/session', summary: '当前会话状态（是否登录、是否已设密码）' },
+      { method: 'POST', path: '/api/auth/setup', summary: '首次设置管理员密码（仅空库可用）' },
+      { method: 'POST', path: '/api/auth/login', summary: '登录；连续失败 5 次锁 60 秒' },
+      { method: 'POST', path: '/api/auth/logout', summary: '退出并清掉会话' },
+      { method: 'PATCH', path: '/api/auth/password', summary: '改密码（需当前密码）', auth: true },
+    ],
+  },
+]
+
+const METHOD_TONE = {
+  GET: 'neutral',
+  POST: 'primary',
+  PATCH: 'warning',
+  PUT: 'warning',
+  DELETE: 'danger',
+} as const
+
+export function ApiDocs() {
+  return (
+    <div className="api-docs">
+      <Space direction="column" gap="sm" align="stretch">
+        <Title level={2}>接口一览</Title>
+        <Text size="sm" tone="muted">
+          说明：这是 Stash 自带的 HTTP 接口清单，全部挂在同一个端口上。读接口公开，写接口需要登录会话并校验同源
+          Origin；带 <Tag tone="primary">需登录</Tag> 标记的即为写操作。
+        </Text>
+      </Space>
+
+      {GROUPS.map((group) => (
+        <Card key={group.title} padding="lg">
+          <Space direction="column" gap="sm" align="stretch">
+            <Space gap="sm" align="center">
+              <Title level={4} as="h2">
+                {group.title}
+              </Title>
+              <Text size="sm" tone="muted">
+                {group.items.length} 个
+              </Text>
+            </Space>
+            <Text size="sm" tone="muted">
+              {group.desc}
+            </Text>
+            <Table
+              rowKey="id"
+              columns={[
+                { key: 'method', title: '方法', width: 90 },
+                { key: 'path', title: '路径', width: 280 },
+                { key: 'summary', title: '说明' },
+                { key: 'auth', title: '权限', width: 100 },
+              ]}
+              rows={group.items.map((item) => ({
+                id: `${item.method} ${item.path}`,
+                method: <Tag tone={METHOD_TONE[item.method]}>{item.method}</Tag>,
+                path: <code className="api-path">{item.path}</code>,
+                summary: item.summary,
+                auth: item.auth === true ? <Tag tone="primary">需登录</Tag> : <Text tone="muted">公开</Text>,
+              }))}
+            />
+          </Space>
+        </Card>
+      ))}
+    </div>
+  )
+}

stash-web/src/components/auth/LoginDialog.tsx

@@ -0,0 +1,117 @@
+import { Button, FormField, Icon, Modal, Notice, PasswordInput, Space, Text } from '@stash/ui'
+import { useEffect, useState } from 'react'
+import { login, setup, type SessionState } from '../../auth'
+
+/**
+ * 登录弹窗：首次使用显示「设置密码 + 确认」，之后只显示密码。
+ *
+ * 成功后由父组件刷新会话状态；弹窗本身不跳转页面。
+ */
+type LoginDialogProps = {
+  open: boolean
+  hasAdmin: boolean
+  onClose: () => void
+  onSuccess: (session: SessionState) => void
+}
+
+export function LoginDialog({ open, hasAdmin, onClose, onSuccess }: LoginDialogProps) {
+  const [password, setPassword] = useState('')
+  const [confirm, setConfirm] = useState('')
+  const [error, setError] = useState('')
+  const [busy, setBusy] = useState(false)
+
+  // 每次打开重置，避免上次的错误/输入残留
+  useEffect(() => {
+    if (!open) return
+    setPassword('')
+    setConfirm('')
+    setError('')
+    setBusy(false)
+  }, [open])
+
+  const isSetup = !hasAdmin
+
+  const submit = async () => {
+    setError('')
+    if (isSetup && password !== confirm) {
+      setError('两次输入的密码不一致')
+      return
+    }
+
+    setBusy(true)
+    const result = isSetup ? await setup(password) : await login(password)
+    setBusy(false)
+
+    if (!result.ok) {
+      setError(result.error)
+      return
+    }
+
+    onSuccess({
+      authenticated: true,
+      has_admin: true,
+      username: 'admin',
+    })
+  }
+
+  return (
+    <Modal
+      open={open}
+      onClose={onClose}
+      title={isSetup ? '设置管理员密码' : '登录'}
+      footer={
+        <Space gap="sm" justify="end">
+          <Button variant="secondary" onClick={onClose}>
+            取消
+          </Button>
+          <Button loading={busy} icon={<Icon name="lock_line" />} onClick={submit}>
+            {isSetup ? '设置并登录' : '登录'}
+          </Button>
+        </Space>
+      }
+    >
+      <Space direction="column" gap="md" align="stretch">
+        <Text size="sm" tone="muted">
+          {isSetup
+            ? '首次使用：设置一个至少 8 位的密码，之后用它登录编辑。'
+            : '登录后可以编辑页头滚动信息、侧栏顺序与显示。'}
+        </Text>
+
+        {error !== '' && (
+          <Notice tone="error" title="操作失败">
+            {error}
+          </Notice>
+        )}
+
+        <FormField label="密码" htmlFor="login-password" required>
+          <PasswordInput
+            id="login-password"
+            placeholder="输入密码"
+            autoComplete={isSetup ? 'new-password' : 'current-password'}
+            value={password}
+            autoFocus
+            onChange={(event) => setPassword(event.target.value)}
+            onKeyDown={(event) => {
+              if (event.key === 'Enter') void submit()
+            }}
+          />
+        </FormField>
+
+        {isSetup && (
+          <FormField label="确认密码" htmlFor="login-confirm" required>
+            <PasswordInput
+              id="login-confirm"
+              placeholder="再输入一次"
+              autoComplete="new-password"
+              value={confirm}
+              onChange={(event) => setConfirm(event.target.value)}
+              onKeyDown={(event) => {
+                if (event.key === 'Enter') void submit()
+              }}
+            />
+          </FormField>
+        )}
+      </Space>
+    </Modal>
+  )
+}

stash-web/src/components/common/BackToTop.tsx

@@ -1,33 +1,16 @@
-import { ArrowUpIcon } from './Icon'
+import { ScrollTop } from '@stash/ui'
 
 /**
- * 回到顶部：复刻 Alright 主题的 .scroll-toolbar .totop-button。
- *
- * - 42px 圆形、浅灰底，固定在右侧（bottom: 50%）
- * - 默认隐藏，只有内容区滚动后才淡入，回到顶部后再淡出
+ * 回到顶部：直接用组件库的 ScrollTop，滚动容器是应用的内容区。
  */
 type BackToTopProps = {
-  /** 内容区是否已滚动（由 App 传入） */
+  /** 页面是否已滚动（由 App 传入） */
   visible: boolean
+  /** 滚动容器 id，默认旧版内容区 */
+  targetId?: string
 }
 
-export function BackToTop({ visible }: BackToTopProps) {
-  const handleClick = () => {
-    // 桌面端滚动的是内容容器，窄屏滚动的是窗口，两处都滚一遍
-    document.getElementById('content-scroll')?.scrollTo({ top: 0, behavior: 'smooth' })
-    window.scrollTo({ top: 0, behavior: 'smooth' })
-  }
-
-  return (
-    <button
-      type="button"
-      className={`back-to-top${visible ? ' is-visible' : ''}`}
-      title="回到顶部"
-      aria-label="回到顶部"
-      tabIndex={visible ? 0 : -1}
-      onClick={handleClick}
-    >
-      <ArrowUpIcon />
-    </button>
-  )
+export function BackToTop({ visible, targetId = 'content-scroll' }: BackToTopProps) {
+  return <ScrollTop visible={visible} targetId={targetId} offset={30} />
 }
+

stash-web/src/components/common/CountBadge.tsx

@@ -1,11 +1,13 @@
+import { Badge } from '@stash/ui'
+
 /**
- * 数量角标：贴在分区标题右上角的小红标。
- * 纯展示组件，只接收数字，宽度由内容撑开（两位数不会变形）。
+ * 数量角标：贴在分区标题旁边的小红标。
+ * 组件库的 Badge 已经处理了两位数和 99+ 的宽度，这里只做语义封装。
  */
 type CountBadgeProps = {
   count: number
 }
 
 export function CountBadge({ count }: CountBadgeProps) {
-  return <span className="count-badge">{count}</span>
+  return <Badge count={count} tone="danger" />
 }

stash-web/src/components/common/GroupMark.tsx

@@ -0,0 +1,14 @@
+import { Icon, ICON_NAMES, type IconName } from '@stash/ui'
+
+/**
+ * 分组图标：能对上 iconfont 名字就渲染图标，否则按字符渲染。
+ *
+ * 旧数据里存的是 emoji / 任意字符，新数据存图标名（如 `folder_2_line`）；
+ * 两种都要能显示，所以这里做一次判定，前后台共用同一套规则。
+ */
+export function GroupMark({ icon, fallback = '' }: { icon: string; fallback?: string }) {
+  const value = icon.trim()
+  if (value === '') return fallback === '' ? null : <>{fallback}</>
+  if (ICON_NAMES.includes(value as IconName)) return <Icon name={value as IconName} />
+  return <>{value}</>
+}

stash-web/src/components/common/Icon.tsx

@@ -1,63 +1,57 @@
-/**
- * 通用图标组件。
- *
- * 全部使用 Alright 主题的 iconfont 线性图标（见 src/iconfont.css），
- * 尺寸与颜色由使用处的 CSS 控制（font-size / color），
- * 因此同一套图标可以复用在按钮、统计条、导航等不同位置。
- */
+import { Icon } from '@stash/ui'
 
+/**
+ * 语义图标：stash 内部一直按用途引用（SearchIcon / RefreshIcon…），
+ * 这里统一映射到 @stash/ui 的 iconfont 字形，避免各页面记字形名。
+ */
 type IconProps = {
-  /** 附加类名，便于局部覆盖字号或颜色 */
   className?: string
 }
 
-const base = (name: string, className?: string) =>
-  `iconfont icon-${name}${className !== undefined ? ` ${className}` : ''}`
-
 export function SearchIcon({ className }: IconProps) {
-  return <i className={base('search', className)} aria-hidden="true" />
+  return <Icon name="search_3_line" className={className} />
 }
 
 export function UserIcon({ className }: IconProps) {
-  return <i className={base('user', className)} aria-hidden="true" />
+  return <Icon name="user_3_line" className={className} />
 }
 
 export function RefreshIcon({ className }: IconProps) {
-  return <i className={base('refresh', className)} aria-hidden="true" />
+  return <Icon name="refresh_3_line" className={className} />
 }
 
 export function LinkIcon({ className }: IconProps) {
-  return <i className={base('link', className)} aria-hidden="true" />
+  return <Icon name="link_3_line" className={className} />
 }
 
 export function ExternalIcon({ className }: IconProps) {
-  return <i className={base('external', className)} aria-hidden="true" />
+  return <Icon name="a-external_link_line1" className={className} />
 }
 
 export function EyeIcon({ className }: IconProps) {
-  return <i className={base('eye', className)} aria-hidden="true" />
+  return <Icon name="eye_line" className={className} />
 }
 
 export function ThumbUpIcon({ className }: IconProps) {
-  return <i className={base('thumb-up', className)} aria-hidden="true" />
+  return <Icon name="thumb_up_2_line" className={className} />
 }
 
 export function ShareIcon({ className }: IconProps) {
-  return <i className={base('share', className)} aria-hidden="true" />
+  return <Icon name="share_3_line" className={className} />
 }
 
 export function CloseIcon({ className }: IconProps) {
-  return <i className={base('close', className)} aria-hidden="true" />
+  return <Icon name="close_line" className={className} />
 }
 
 export function MoreIcon({ className }: IconProps) {
-  return <i className={base('more', className)} aria-hidden="true" />
+  return <Icon name="more_1_line" className={className} />
 }
 
 export function ArrowUpIcon({ className }: IconProps) {
-  return <i className={base('arrow-up', className)} aria-hidden="true" />
+  return <Icon name="arrow_up_line" className={className} />
 }
 
 export function ArrowDownIcon({ className }: IconProps) {
-  return <i className={base('arrow-down', className)} aria-hidden="true" />
+  return <Icon name="arrow_down_line" className={className} />
 }

stash-web/src/components/content/AppCard.tsx

@@ -1,14 +1,9 @@
+import { EntryRow, ItemBadge } from '@stash/ui'
 import type { AppItem } from '../../data/types'
 
 /**
- * 应用卡片：逐项复刻 Alright 主题「推荐作者」条目的结构。
- *
- * 对应主题的：
- *   .flex-avatar  > img.avatar-48 + span.avatar-badge.badge_5
- *   .item-content > h3.font-title.text-md（名字 + span.item-badge.hot）
- *                 + div.text-xs.text-muted.h-1x（单行描述）
- *
- * 热门条目才会同时出现头像角标和 HOT 徽标，普通条目两者都没有。
+ * 应用卡片：头像 + 名称（热门带 HOT 角标）+ 单行描述。
+ * 版式与点击语义都在库里的 EntryRow，这里只做数据映射。
  */
 type AppCardProps = {
   item: AppItem
@@ -17,33 +12,15 @@ type AppCardProps = {
 
 export function AppCard({ item, onOpen }: AppCardProps) {
   return (
-    <a
-      className="app-card"
-      href={item.href}
+    <EntryRow
       title={item.name}
-      onClick={(event) => {
-        if (onOpen === undefined) return
-        if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return
-        event.preventDefault()
-        onOpen(item.id)
-      }}
-    >
-      <span className="app-card-avatar" aria-hidden="true">
-        {item.cover !== undefined ? (
-          <img src={item.cover} alt="" loading="lazy" />
-        ) : (
-          <span className="app-card-letter">{item.icon}</span>
-        )}
-        {item.hot === true && <span className="app-card-verify" />}
-      </span>
-
-      <span className="app-card-info">
-        <span className="app-card-title">
-          <span className="app-card-name">{item.name}</span>
-          {item.hot === true && <span className="app-card-badge" />}
-        </span>
-        <span className="app-card-desc">{item.desc}</span>
-      </span>
-    </a>
+      description={item.desc}
+      href={item.href}
+      avatar={item.cover}
+      fallback={item.icon}
+      verified={item.hot === true}
+      badge={item.hot === true ? <ItemBadge tone="hot">HOT</ItemBadge> : undefined}
+      onOpen={onOpen === undefined ? undefined : () => onOpen(item.id)}
+    />
   )
 }

stash-web/src/components/content/AppGrid.tsx

@@ -1,10 +1,8 @@
+import { Grid } from '@stash/ui'
 import type { AppItem } from '../../data/types'
 import { AppCard } from './AppCard'
 
-/**
- * 应用网格：默认 4 列，窄屏退化为 2 列。
- * 首页预览与明细页共用，靠 modifier 调整间距。
- */
+/** 应用网格：桌面 4 列，平板 / 手机 2 列（断点由组件库 Grid 负责） */
 type AppGridProps = {
   items: AppItem[]
   /** 明细页使用更宽松的间距 */
@@ -15,10 +13,15 @@ type AppGridProps = {
 
 export function AppGrid({ items, variant = 'home', onOpen }: AppGridProps) {
   return (
-    <div className={`app-grid${variant === 'detail' ? ' app-grid--detail' : ''}`}>
+    <Grid
+      columns={4}
+      tabletColumns={2}
+      mobileColumns={2}
+      gap={variant === 'detail' ? 'lg' : 'md'}
+    >
       {items.map((item) => (
         <AppCard key={item.id} item={item} onOpen={onOpen} />
       ))}
-    </div>
+    </Grid>
   )
 }

stash-web/src/components/content/ArticleBody.tsx

@@ -1,3 +1,4 @@
+import { Paragraph, Title } from '@stash/ui'
 import type { ReactNode } from 'react'
 
 /**
@@ -10,7 +11,6 @@ import type { ReactNode } from 'react'
  * - 行内 `**粗体**`、`` `代码` ``、`[文字](链接)`
  *
  * 不支持列表、表格、引用块——这里渲染的是文章正文，不是通用 Markdown 编辑器。
- * 需要完整语法时再换 react-markdown，渲染层已经隔离在这个组件里。
  */
 
 type Block =
@@ -104,9 +104,9 @@ export function ArticleBody({ markdown }: ArticleBodyProps) {
       {parseBlocks(markdown).map((block, index) => {
         if (block.kind === 'heading') {
           return (
-            <h3 className="article-body-heading" key={index}>
+            <Title level={2} as="h3" key={index}>
               {renderInline(block.text)}
-            </h3>
+            </Title>
           )
         }
 
@@ -123,9 +123,9 @@ export function ArticleBody({ markdown }: ArticleBodyProps) {
         }
 
         return (
-          <p className="article-body-text" key={index}>
+          <Paragraph tone="sub" size="md" leading="relaxed" key={index}>
             {renderInline(block.text)}
-          </p>
+          </Paragraph>
         )
       })}
     </>

stash-web/src/components/content/ArticleCard.tsx

@@ -1,3 +1,4 @@
+import { Cover } from '@stash/ui'
 import type { ArticleItem } from '../../data/types'
 
 /**
@@ -10,27 +11,13 @@ type ArticleCardProps = {
 }
 
 export function ArticleCard({ item, onOpen }: ArticleCardProps) {
-  const content = (
-    <>
-      <img className="article-cover" src={item.cover} alt={item.title} loading="lazy" />
-      <span className="article-caption">
-        <span className="article-title">{item.title}</span>
-      </span>
-    </>
-  )
-
-  if (onOpen === undefined) {
-    return <figure className="article-card">{content}</figure>
-  }
-
   return (
-    <button
-      type="button"
-      className="article-card"
-      title={item.title}
-      onClick={() => onOpen(item.id)}
-    >
-      {content}
-    </button>
+    <Cover
+      src={item.cover}
+      alt={item.title}
+      caption={item.title}
+      ratio="article"
+      onClick={onOpen === undefined ? undefined : () => onOpen(item.id)}
+    />
   )
 }

stash-web/src/components/content/ArticleDetailView.tsx

@@ -1,52 +1,76 @@
+import { Breadcrumb, Card, Paragraph, Text, Title } from '@stash/ui'
 import type { ArticleItem } from '../../data/types'
+import { viewPath } from '../../data/view'
 import { ArticleBody } from './ArticleBody'
 
 /**
  * 文章详情页（对应模板图二）：
- * 大标题 + [编辑] + 元信息行 + 白色正文卡。
+ * 面包屑 + 大标题 + [编辑] + 元信息行 + 白色正文卡。
  *
  * 正文是一整段 Markdown，交给 ArticleBody 解析渲染；
  * 渲染细节（支持哪些语法）都收在那一个组件里。
  */
 type ArticleDetailViewProps = {
   article: ArticleItem
+  categoryId: string
   categoryTitle: string
-  onBack: () => void
+  onNavigate: (href: string) => void
+  onEdit: () => void
+  /** 只有登录后才显示 [编辑] */
+  canEdit: boolean
 }
 
-export function ArticleDetailView({ article, categoryTitle, onBack }: ArticleDetailViewProps) {
+export function ArticleDetailView({
+  article,
+  categoryId,
+  categoryTitle,
+  onNavigate,
+  onEdit,
+  canEdit,
+}: ArticleDetailViewProps) {
   const meta = article.meta ?? ['2 年前', categoryTitle]
+  const crumbs = [
+    { label: '首页', href: '/' },
+    { label: categoryTitle, href: viewPath({ type: 'detail', categoryId }) },
+    { label: '文章' },
+  ]
 
   return (
     <div className="detail-view article-view">
-      <div className="detail-nav card-box">
-        <button type="button" className="detail-back" onClick={onBack}>
-          返回
-        </button>
-        <span className="detail-breadcrumb">{categoryTitle} / 文章</span>
-      </div>
+      <Card padding="none" className="detail-nav">
+        <Breadcrumb className="detail-breadcrumb" items={crumbs} onNavigate={onNavigate} />
+      </Card>
 
       <header className="article-head">
-        <h2 className="article-heading">
+        <Title level={1} as="h2" className="article-heading">
           {article.title}
-          <button type="button" className="item-edit" disabled title="编辑功能待接入">
-            [编辑]
-          </button>
-        </h2>
+          {canEdit && (
+            <button type="button" className="item-edit" title="编辑文章" onClick={onEdit}>
+              [编辑]
+            </button>
+          )}
+        </Title>
 
         <div className="article-meta">
           {meta.map((text, index) => (
             <span className="article-meta-item" key={text}>
               {index > 0 && <i className="article-meta-dot" aria-hidden="true" />}
-              {text}
+              <Text size="xs" tone="muted">
+                {text}
+              </Text>
             </span>
           ))}
         </div>
       </header>
 
-      <article className="article-body card-box">
-        <ArticleBody markdown={article.body} />
-      </article>
+      <Card padding="none" className="article-body-card">
+        <div className="article-body">
+          <Paragraph tone="main" size="md" leading="relaxed" className="article-lead">
+            {article.desc}
+          </Paragraph>
+          <ArticleBody markdown={article.body} />
+        </div>
+      </Card>
     </div>
   )
 }

stash-web/src/components/content/ArticleGrid.tsx

@@ -1,7 +1,8 @@
+import { Grid } from '@stash/ui'
 import type { ArticleItem } from '../../data/types'
 import { ArticleCard } from './ArticleCard'
 
-/** 图文网格：首页 4 列，窄屏 2 列 */
+/** 图文网格：桌面 4 列，平板 2 列，手机 1 列 */
 type ArticleGridProps = {
   items: ArticleItem[]
   /** 点击卡片打开文章详情 */
@@ -10,10 +11,10 @@ type ArticleGridProps = {
 
 export function ArticleGrid({ items, onOpen }: ArticleGridProps) {
   return (
-    <div className="article-grid">
+    <Grid columns={4} tabletColumns={2} mobileColumns={1} gap="md">
       {items.map((item) => (
         <ArticleCard key={item.id} item={item} onOpen={onOpen} />
       ))}
-    </div>
+    </Grid>
   )
 }

stash-web/src/components/content/CesCard.tsx

@@ -1,8 +1,9 @@
+import { EntryTile } from '@stash/ui'
 import type { ArticleItem } from '../../data/types'
 
 /**
  * 明细页图文卡：上图下文的白卡。
- * 传入 onOpen 时整张卡变成按钮，点击进入文章详情。
+ * 版式与点击语义都在库里的 EntryTile，这里只做数据映射。
  */
 type CesCardProps = {
   item: ArticleItem
@@ -10,28 +11,12 @@ type CesCardProps = {
 }
 
 export function CesCard({ item, onOpen }: CesCardProps) {
-  const content = (
-    <>
-      <img className="ces-cover" src={item.cover} alt={item.title} loading="lazy" />
-      <span className="ces-body">
-        <span className="ces-title">{item.title}</span>
-        <span className="ces-desc">{item.desc}</span>
-      </span>
-    </>
-  )
-
-  if (onOpen === undefined) {
-    return <article className="ces-card">{content}</article>
-  }
-
   return (
-    <button
-      type="button"
-      className="ces-card"
+    <EntryTile
       title={item.title}
-      onClick={() => onOpen(item.id)}
-    >
-      {content}
-    </button>
+      description={item.desc}
+      cover={item.cover}
+      onOpen={onOpen === undefined ? undefined : () => onOpen(item.id)}
+    />
   )
 }

stash-web/src/components/content/CesCardGrid.tsx

@@ -1,7 +1,8 @@
+import { Grid } from '@stash/ui'
 import type { ArticleItem } from '../../data/types'
 import { CesCard } from './CesCard'
 
-/** 明细页图文网格：4 列白卡，窄屏 2 列 */
+/** 明细页图文网格：桌面 4 列，平板 2 列，手机 1 列 */
 type CesCardGridProps = {
   items: ArticleItem[]
   /** 点击卡片打开文章详情 */
@@ -10,10 +11,10 @@ type CesCardGridProps = {
 
 export function CesCardGrid({ items, onOpen }: CesCardGridProps) {
   return (
-    <div className="ces-grid">
+    <Grid columns={4} tabletColumns={2} mobileColumns={1} gap="lg">
       {items.map((item) => (
         <CesCard key={item.id} item={item} onOpen={onOpen} />
       ))}
-    </div>
+    </Grid>
   )
 }

stash-web/src/components/content/DetailView.tsx

@@ -1,11 +1,19 @@
-import { categoryCount, type Category } from '../../data/types'
+import { Breadcrumb, Card, Empty, Space, Title } from '@stash/ui'
+import {
+  categoryCount,
+  type AppItem,
+  type ArticleItem,
+  type Category,
+  type PosterItem,
+} from '../../data/types'
+import { viewPath } from '../../data/view'
 import { AppGrid } from './AppGrid'
 import { CesCardGrid } from './CesCardGrid'
 import { GroupBlock } from './GroupBlock'
 import { PosterGrid } from './PosterGrid'
 
 /**
- * 分类明细视图：返回条 + 面包屑 + hero（图标 / 标题 / 数量）+ 内容区。
+ * 分类明细视图：面包屑 + hero（图标 / 标题 / 数量）+ 内容区。
  *
  * 内容区按分类类型切换：
  * - apps：指定分组时只渲染该组，否则单组扁平渲染、多组带小标题分组渲染；
@@ -16,67 +24,111 @@ type DetailViewProps = {
   category: Category
   /** 从侧栏子菜单进入时指定的分组 */
   groupId?: string
-  onBack: () => void
+  /** 点击面包屑中间项（SPA 路由） */
+  onNavigate: (href: string) => void
   /** 点击卡片 / 海报进入条目详情 */
   onOpenItem: (itemId: string) => void
 }
 
-export function DetailView({ category, groupId, onBack, onOpenItem }: DetailViewProps) {
-  const groups = category.kind === 'apps' ? category.groups : []
+export function DetailView({ category, groupId, onNavigate, onOpenItem }: DetailViewProps) {
+  // 三种类型共用「分区 → 分组 → 条目」结构；这里抹平联合类型，渲染时再按 kind 分派
+  type RenderItem = AppItem | PosterItem | ArticleItem
+  const groups = category.groups as {
+    id: string
+    name: string
+    items: RenderItem[]
+  }[]
   const activeGroup =
     groupId !== undefined ? groups.find((group) => group.id === groupId) : undefined
 
   const title = activeGroup?.name ?? category.title
   const count = activeGroup !== undefined ? activeGroup.items.length : categoryCount(category)
-  const breadcrumb =
+  const crumbs =
     activeGroup !== undefined
-      ? `首页 / ${category.title} / ${activeGroup.name}`
-      : `首页 / ${category.title}`
+      ? [
+          { label: '首页', href: '/' },
+          { label: category.title, href: viewPath({ type: 'detail', categoryId: category.id }) },
+          { label: activeGroup.name },
+        ]
+      : [
+          { label: '首页', href: '/' },
+          { label: category.title, href: viewPath({ type: 'detail', categoryId: category.id }) },
+        ]
 
-  function renderBody() {
+  /** 按类型渲染一组条目 */
+  function renderItems(items: RenderItem[]) {
     if (category.kind === 'posters') {
-      return <PosterGrid items={category.items} variant="detail" onOpen={onOpenItem} />
+      return <PosterGrid items={items as PosterItem[]} variant="detail" onOpen={onOpenItem} />
     }
 
     if (category.kind === 'articles') {
-      return <CesCardGrid items={category.items} onOpen={onOpenItem} />
+      return <CesCardGrid items={items as ArticleItem[]} onOpen={onOpenItem} />
     }
 
+    return <AppGrid items={items as AppItem[]} variant="detail" onOpen={onOpenItem} />
+  }
+
+  function renderBody() {
     if (activeGroup !== undefined) {
-      return <AppGrid items={activeGroup.items} variant="detail" onOpen={onOpenItem} />
+      return renderItems(activeGroup.items)
     }
 
-    if (category.groups.length === 1) {
-      return <AppGrid items={category.groups[0].items} variant="detail" onOpen={onOpenItem} />
+    const direct = (category.items ?? []) as RenderItem[]
+    // 空分组不占篇幅（管理后台仍然保留，之后可以往里加条目）
+    const filledGroups = groups.filter((group) => group.items.length > 0)
+
+    if (filledGroups.length === 0) {
+      return direct.length > 0 ? (
+        renderItems(direct)
+      ) : (
+        <Empty text={'emptyText' in category ? (category.emptyText ?? '暂无内容') : '暂无内容'} />
+      )
     }
 
-    if (category.groups.length === 0) {
-      return <p className="section-empty">{category.emptyText ?? '暂无内容'}</p>
+    if (filledGroups.length === 1 && direct.length === 0) {
+      return renderItems(filledGroups[0].items)
     }
 
     return (
-      <>
-        {category.groups.map((group) => (
-          <GroupBlock key={group.id} group={group} onOpen={onOpenItem} />
+      <Space direction="column" gap="lg" align="stretch">
+        {filledGroups.map((group) => (
+          <GroupBlock
+            key={group.id}
+            name={group.name}
+            barColor={category.barColor !== '' ? category.barColor : undefined}
+          >
+            {renderItems(group.items)}
+          </GroupBlock>
         ))}
-      </>
+        {direct.length > 0 && (
+          <GroupBlock
+            name="未分组"
+            barColor={category.barColor !== '' ? category.barColor : undefined}
+          >
+            {renderItems(direct)}
+          </GroupBlock>
+        )}
+      </Space>
     )
   }
 
   return (
     <div className="detail-view">
-      <div className="detail-nav card-box">
-        <button type="button" className="detail-back" onClick={onBack}>
-          返回首页
-        </button>
-        <span className="detail-breadcrumb">{breadcrumb}</span>
-      </div>
+      <Card padding="none" className="detail-nav">
+        <Breadcrumb
+          className="detail-breadcrumb"
+          items={crumbs}
+          onNavigate={onNavigate}
+        />
+      </Card>
 
       <div className="detail-hero">
         <span className="detail-hero-icon" aria-hidden="true">
           {category.icon}
         </span>
-        <h2 className="detail-hero-title">{title}</h2>
+        <Title level={1} as="h2" weight="strong" className="detail-hero-title">
+          {title}
+        </Title>
         <span className="detail-hero-count">[{count}]</span>
       </div>
 

stash-web/src/components/content/GroupBlock.tsx

@@ -1,20 +1,33 @@
-import type { AppGroup } from '../../data/types'
-import { AppGrid } from './AppGrid'
+import { Space, Title } from '@stash/ui'
+import type { ReactNode } from 'react'
 
 /**
- * 明细页的分组块：小标题 + 该组的应用网格。
- * 分类被拆成多个分组时重复使用，单个分组时明细页不渲染标题。
+ * 明细页的分组块：色条 + 小标题 + 该组的内容网格。
+ *
+ * 色条沿用分区的 `barColor`，与首页卡片标题保持同一套视觉语言；
+ * 具体网格由调用方传入（应用 / 海报 / 图文共用同一层外壳）。
  */
 type GroupBlockProps = {
-  group: AppGroup
-  onOpen?: (itemId: string) => void
+  name: string
+  /** 分区色条颜色；缺省用主题主色 */
+  barColor?: string
+  children: ReactNode
 }
 
-export function GroupBlock({ group, onOpen }: GroupBlockProps) {
+export function GroupBlock({ name, barColor, children }: GroupBlockProps) {
   return (
-    <section className="group-block">
-      <h3 className="group-title">{group.name}</h3>
-      <AppGrid items={group.items} variant="detail" onOpen={onOpen} />
-    </section>
+    <Space direction="column" gap="sm" align="stretch" className="group-block">
+      <div className="group-title">
+        <span
+          className="group-bar"
+          style={barColor !== undefined ? { backgroundColor: barColor } : undefined}
+          aria-hidden="true"
+        />
+        <Title level={4} as="h3">
+          {name}
+        </Title>
+      </div>
+      {children}
+    </Space>
   )
 }

stash-web/src/components/content/HomeView.tsx

@@ -1,35 +1,49 @@
 import { categoryCount, flattenAppItems, type Category } from '../../data/types'
 import { AppGrid } from './AppGrid'
 import { ArticleGrid } from './ArticleGrid'
+import { Empty } from '@stash/ui'
 import { PosterGrid } from './PosterGrid'
 import { SectionCard } from './SectionCard'
+import {
+  applySectionSettings,
+  sectionLimit,
+  sectionTitle,
+  type SectionSettings,
+} from '../../settings'
 
 /**
  * 首页：把每个分类渲染成一张分区卡片。
  *
- * 每个分区只展示前若干条（由分类的 previewLimit 决定），
- * 右上角 ••• 进入该分类明细，点击卡片 / 海报则进入该条目的详情。
+ * 每个分区只展示前若干条；标题、条数、顺序与显隐都可以在 `/admin`
+ * 的「首页卡片」里覆盖（见 settings.sections）。
  */
 type HomeViewProps = {
   categories: Category[]
+  sections: SectionSettings
   onOpenDetail: (categoryId: string) => void
   onOpenItem: (categoryId: string, itemId: string) => void
 }
 
-export function HomeView({ categories, onOpenDetail, onOpenItem }: HomeViewProps) {
+export function HomeView({ categories, sections, onOpenDetail, onOpenItem }: HomeViewProps) {
+  const cards = applySectionSettings(categories, sections)
+
   return (
     <div className="home-view">
-      {categories.map((category) => (
+      {cards.map((category) => (
         <SectionCard
           key={category.id}
           // 卡片标题跟着实际展示的内容走：配了展示块就用块标题（如「常用站点」），
-          // 没配（如「本地服务」）才用分类标题
-          title={category.block?.title ?? category.title}
+          // 没配（如「本地服务」）才用分类标题；设置里的覆盖值优先
+          title={sectionTitle(
+            category.id,
+            category.block?.title ?? category.title,
+            sections,
+          )}
           count={cardCount(category)}
           barColor={category.barColor}
           onMore={() => onOpenDetail(category.id)}
         >
-          {renderPreview(category, onOpenItem)}
+          {renderPreview(category, sections, onOpenItem)}
         </SectionCard>
       ))}
     </div>
@@ -43,7 +57,7 @@ export function HomeView({ categories, onOpenDetail, onOpenItem }: HomeViewProps
  * 否则（电影 / 文章 / 本地服务）数整个分区。
  */
 function cardCount(category: Category): number {
-  if (category.kind === 'apps' && category.block !== undefined) {
+  if (category.block !== undefined) {
     const group = category.groups.find((item) => item.id === category.block?.nodeKey)
     if (group !== undefined) return group.items.length
   }
@@ -51,41 +65,53 @@ function cardCount(category: Category): number {
   return categoryCount(category)
 }
 
+/** 某个分区配的「首页预览分组」；没配或找不到返回 undefined */
+function blockGroup<T>(category: { block?: { nodeKey?: string }; groups: { id: string; items: T[] }[] }) {
+  if (category.block?.nodeKey === undefined) return undefined
+  return category.groups.find((group) => group.id === category.block?.nodeKey)
+}
+
 /** 按分类类型输出对应的预览网格；应用类为空时给出提示文案 */
 function renderPreview(
   category: Category,
+  sections: SectionSettings,
   onOpenItem: (categoryId: string, itemId: string) => void,
 ) {
   if (category.kind === 'apps') {
-    // 配了展示块就只展示那个分组；没有配置（如「本地服务」）则退回全部条目
-    const blockGroup =
-      category.block !== undefined
-        ? category.groups.find((group) => group.id === category.block?.nodeKey)
-        : undefined
-
-    const source = category.block !== undefined ? (blockGroup?.items ?? []) : flattenAppItems(category)
-    const limit = category.block?.previewLimit ?? category.previewLimit ?? 4
+    // 配了展示块且指向分组时只展示该组；展示块指向分区本身（「整个分区」）时展示全部条目
+    const group = blockGroup(category)
+    const source = group !== undefined ? group.items : flattenAppItems(category)
+    const fallback = category.block?.previewLimit ?? category.previewLimit ?? 4
+    const limit = sectionLimit(category.id, fallback, sections)
     const items = source.slice(0, limit)
 
     if (items.length === 0) {
-      return <p className="section-empty">{category.emptyText ?? '暂无内容'}</p>
+      return <Empty text={category.emptyText ?? '暂无内容'} />
     }
 
     return <AppGrid items={items} onOpen={(itemId) => onOpenItem(category.id, itemId)} />
   }
 
   if (category.kind === 'posters') {
+    const group = blockGroup(category)
+    const source = group
+      ? group.items
+      : [...category.items, ...category.groups.flatMap((item) => item.items)]
     return (
       <PosterGrid
-        items={category.items.slice(0, category.previewLimit ?? 6)}
+        items={source.slice(0, sectionLimit(category.id, category.previewLimit ?? 6, sections))}
         onOpen={(itemId) => onOpenItem(category.id, itemId)}
       />
     )
   }
 
+  const group = blockGroup(category)
+  const source = group
+    ? group.items
+    : [...category.items, ...category.groups.flatMap((item) => item.items)]
   return (
     <ArticleGrid
-      items={category.items.slice(0, category.previewLimit ?? 4)}
+      items={source.slice(0, sectionLimit(category.id, category.previewLimit ?? 4, sections))}
       onOpen={(itemId) => onOpenItem(category.id, itemId)}
     />
   )

stash-web/src/components/content/ItemDetailView.tsx

@@ -1,46 +1,138 @@
+import {
+  Breadcrumb,
+  Card,
+  Icon,
+  IconButton,
+  Paragraph,
+  Space,
+  Tag,
+  Text,
+  Title,
+  toast,
+  type BreadcrumbItem,
+} from '@stash/ui'
+import { useEffect, useState } from 'react'
 import type { ItemDetailModel } from '../../data/detail'
+import { resolveHref } from '../../data/detail'
 import type { RelatedItem } from '../../data/types'
-import { ExternalIcon, EyeIcon, ShareIcon, ThumbUpIcon } from '../common/Icon'
 import { RelatedList } from './RelatedList'
 
 /**
  * 条目详情页：应用与电影共用。
  *
- * 版式：标题 + 主图（方形头像 / 竖版海报）+ 标签行 + 一句话评价 + 正文
+ * 版式：面包屑 + 标题 + 主图（方形头像 / 竖版海报）+ 标签行 + 一句话评价 + 正文
  * + 操作条（浏览 / 点赞 / 分享 / 跳转）+ 可选横幅 + 「推荐阅读」。
  * 具体形态由 ItemDetailModel 决定，这里不判断条目类型。
  */
 type ItemDetailViewProps = {
-  breadcrumb: string
+  /** 条目业务键：浏览 / 点赞要写回数据库 */
+  itemKey: string
+  crumbs: BreadcrumbItem[]
   model: ItemDetailModel
   related: RelatedItem[]
-  onBack: () => void
+  onNavigate: (href: string) => void
   onOpenItem: (itemId: string) => void
+  /** 打开编辑 Drawer */
+  onEdit: () => void
+  /** 只有登录后才显示 [编辑] */
+  canEdit: boolean
 }
 
 export function ItemDetailView({
-  breadcrumb,
+  itemKey,
+  crumbs,
   model,
   related,
-  onBack,
+  onNavigate,
   onOpenItem,
+  onEdit,
+  canEdit,
 }: ItemDetailViewProps) {
+  const [views, setViews] = useState(model.views)
+  const [likes, setLikes] = useState(model.likes)
+  // 历史数据可能是裸域名或占位符 #；统一解析成可跳转地址后再渲染
+  const jumpHref = resolveHref(model.href)
+  const [liked, setLiked] = useState(() => {
+    try {
+      return window.localStorage.getItem(`stash-liked:${itemKey}`) === '1'
+    } catch {
+      return false
+    }
+  })
+
+  // 进入详情页记一次浏览（每个页面打开一次）
+  useEffect(() => {
+    let alive = true
+    fetch(`/api/items/${encodeURIComponent(itemKey)}/view`, {
+      method: 'POST',
+      credentials: 'same-origin',
+    })
+      .then((response) => (response.ok ? response.json() : null))
+      .then((payload: { views?: number; likes?: number } | null) => {
+        if (!alive || payload === null) return
+        if (typeof payload.views === 'number') setViews(payload.views)
+        if (typeof payload.likes === 'number') setLikes(payload.likes)
+      })
+      .catch(() => undefined)
+
+    return () => {
+      alive = false
+    }
+  }, [itemKey])
+
+  const toggleLike = () => {
+    const next = !liked
+    setLiked(next)
+    setLikes((current) => Math.max(0, current + (next ? 1 : -1)))
+
+    try {
+      window.localStorage.setItem(`stash-liked:${itemKey}`, next ? '1' : '0')
+    } catch {
+      // 隐私模式下 localStorage 不可用，忽略即可
+    }
+
+    fetch(`/api/items/${encodeURIComponent(itemKey)}/like`, {
+      method: 'POST',
+      credentials: 'same-origin',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ liked: next }),
+    })
+      .then((response) => (response.ok ? response.json() : null))
+      .then((payload: { views?: number; likes?: number } | null) => {
+        if (payload === null) return
+        if (typeof payload.views === 'number') setViews(payload.views)
+        if (typeof payload.likes === 'number') setLikes(payload.likes)
+      })
+      .catch(() => undefined)
+  }
+
+  const share = () => {
+    const url = window.location.href
+    const clipboard = navigator.clipboard
+    if (clipboard === undefined) {
+      toast.error('当前浏览器不支持复制，请手动复制地址栏')
+      return
+    }
+    void clipboard
+      .writeText(url)
+      .then(() => toast.success('链接已复制'))
+      .catch(() => toast.error('复制失败，请手动复制地址栏'))
+  }
   return (
     <div className="detail-view item-view">
-      <div className="detail-nav card-box">
-        <button type="button" className="detail-back" onClick={onBack}>
-          返回
-        </button>
-        <span className="detail-breadcrumb">{breadcrumb}</span>
-      </div>
+      <Card padding="none" className="detail-nav">
+        <Breadcrumb className="detail-breadcrumb" items={crumbs} onNavigate={onNavigate} />
+      </Card>
 
-      <article className="item-card card-box">
-        <h2 className="item-title">
+      <Card padding="none" className="item-card">
+        <Title level={1} as="h2" weight="semibold" className="item-title">
           {model.title}
-          <button type="button" className="item-edit" disabled title="编辑功能待接入">
-            [编辑]
-          </button>
-        </h2>
+          {canEdit && (
+            <button type="button" className="item-edit" title="编辑条目" onClick={onEdit}>
+              [编辑]
+            </button>
+          )}
+        </Title>
 
         <div className={`item-cover item-cover--${model.shape}`}>
           {model.cover !== undefined ? (
@@ -51,60 +143,78 @@ export function ItemDetailView({
         </div>
 
         {model.tags.length > 0 && (
-          <div className="item-tags">
+          <Space gap="sm" wrap>
             {model.tags.map((tag) => (
-              <span className="item-tag" key={tag}>
+              <Tag key={tag} tone="primary" className="item-tag">
                 {tag}
-              </span>
+              </Tag>
             ))}
-          </div>
+          </Space>
         )}
 
         {model.comment !== undefined && (
-          <div className="item-quote">
+          <p className="item-quote">
             <span className="item-quote-mark" aria-hidden="true">
               “
             </span>
-            <p className="item-quote-text">{model.comment}</p>
-          </div>
+            <span className="item-quote-text">{model.comment}</span>
+          </p>
         )}
 
         {model.paragraphs.map((paragraph, index) => (
-          <p className="item-desc" key={`${index}-${paragraph.slice(0, 8)}`}>
+          <Paragraph
+            key={`${index}-${paragraph.slice(0, 8)}`}
+            tone="sub"
+            size="md"
+            className="item-desc"
+          >
             {paragraph}
-          </p>
+          </Paragraph>
         ))}
 
         <div className="item-actions">
-          <span className="item-stat" title="浏览量">
-            <EyeIcon />
-            <em>{model.views}</em>
-          </span>
+          <Space gap="sm">
+            <button
+              type="button"
+              className="item-stat"
+              title="浏览量"
+              onClick={() => toast.success(`浏览量 ${views}`)}
+            >
+              <Icon name="eye_line" />
+              <Text size="xs" tone="sub">
+                {views}
+              </Text>
+            </button>
+            <button
+              type="button"
+              className={`item-stat${liked ? ' is-liked' : ''}`}
+              title={liked ? '取消点赞' : '点赞'}
+              aria-pressed={liked}
+              onClick={toggleLike}
+            >
+              <Icon name="thumb_up_2_line" />
+              <Text size="xs" tone="sub">
+                {likes}
+              </Text>
+            </button>
+            <IconButton
+              label="分享链接"
+              size="sm"
+              icon={<Icon name="share_3_line" />}
+              onClick={share}
+            />
+          </Space>
 
-          <span className="item-stat" title="点赞数">
-            <ThumbUpIcon />
-            <em>{model.likes}</em>
-          </span>
-
-          <button
-            type="button"
-            className="item-stat item-stat--icon"
-            title="分享（待接入）"
-            aria-label="分享"
-          >
-            <ShareIcon />
-          </button>
-
-          {/* 占位数据没有真实地址时，按钮置灰而不是打开空白页 */}
-          {model.href === '#' ? (
-            <button type="button" className="item-jump" disabled title="暂无跳转地址">
+          {/* 没有真实地址（空 / # / 不安全协议）时置灰，避免打开错误页面 */}
+          {jumpHref === undefined ? (
+            <button type="button" className="item-jump" disabled title="暂无跳转地址，可在编辑里添加">
               跳转到
-              <ExternalIcon />
+              <Icon name="a-external_link_line1" />
             </button>
           ) : (
-            <a className="item-jump" href={model.href} target="_blank" rel="noreferrer">
+            <a className="item-jump" href={jumpHref} target="_blank" rel="noreferrer">
               跳转到
-              <ExternalIcon />
+              <Icon name="a-external_link_line1" />
             </a>
           )}
         </div>
@@ -112,7 +222,7 @@ export function ItemDetailView({
         {model.banner !== undefined && (
           <img className="item-banner" src={model.banner} alt="" loading="lazy" />
         )}
-      </article>
+      </Card>
 
       <RelatedList items={related} onOpen={onOpenItem} />
     </div>

stash-web/src/components/content/ItemEditor.tsx

@@ -0,0 +1,209 @@
+import { Button, Drawer, FormField, Icon, Input, Notice, Space, Textarea } from '@stash/ui'
+import { useEffect, useState } from 'react'
+import { fetchItem, saveItem, type EntryRecord } from '../../items'
+
+/**
+ * 条目编辑器（P2）：右侧 Drawer 表单，就地改标题 / 简介 / 标签 / 正文等。
+ *
+ * `updatedAt` 做乐观锁：别人先改过就提示刷新，避免静默覆盖。
+ */
+type ItemEditorProps = {
+  open: boolean
+  itemKey: string | null
+  onClose: () => void
+  onSaved: (entry: EntryRecord) => void
+}
+
+type FormState = {
+  name: string
+  description: string
+  tags: string
+  badge: string
+  comment: string
+  summary: string
+  body: string
+  cover: string
+  banner: string
+  href: string
+}
+
+const emptyForm: FormState = {
+  name: '',
+  description: '',
+  tags: '',
+  badge: '',
+  comment: '',
+  summary: '',
+  body: '',
+  cover: '',
+  banner: '',
+  href: '',
+}
+
+export function ItemEditor({ open, itemKey, onClose, onSaved }: ItemEditorProps) {
+  const [entry, setEntry] = useState<EntryRecord | null>(null)
+  const [form, setForm] = useState<FormState>(emptyForm)
+  const [loading, setLoading] = useState(false)
+  const [saving, setSaving] = useState(false)
+  const [error, setError] = useState('')
+
+  useEffect(() => {
+    if (!open || itemKey === null) return
+
+    let alive = true
+    setLoading(true)
+    setError('')
+    fetchItem(itemKey).then((result) => {
+      if (!alive) return
+      setLoading(false)
+      if (!result.ok) {
+        setError(result.error)
+        return
+      }
+
+      const next = result.entry
+      setEntry(next)
+      setForm({
+        name: next.name,
+        description: next.description,
+        tags: next.tags.join('，'),
+        badge: next.badge,
+        comment: next.comment,
+        summary: next.summary,
+        body: next.body,
+        cover: next.cover,
+        banner: next.banner,
+        href: next.href,
+      })
+    })
+
+    return () => {
+      alive = false
+    }
+  }, [open, itemKey])
+
+  const update = (patch: Partial<FormState>) => setForm((previous) => ({ ...previous, ...patch }))
+
+  const save = async () => {
+    if (entry === null) return
+    setSaving(true)
+    setError('')
+
+    const result = await saveItem(entry.key, entry.updated_at, {
+      ...form,
+      format: entry.format,
+      icon: entry.icon,
+      tags: form.tags
+        .split(/[，,]/)
+        .map((tag) => tag.trim())
+        .filter(Boolean),
+    })
+
+    setSaving(false)
+    if (!result.ok) {
+      setError(result.error)
+      return
+    }
+
+    onSaved(result.entry)
+    onClose()
+  }
+
+  return (
+    <Drawer
+      open={open}
+      onClose={onClose}
+      width={520}
+      title="编辑条目"
+      footer={
+        <Space gap="sm" justify="end">
+          <Button variant="secondary" onClick={onClose}>
+            取消
+          </Button>
+          <Button
+            loading={saving}
+            disabled={loading}
+            icon={<Icon name="check_line" />}
+            onClick={save}
+          >
+            保存
+          </Button>
+        </Space>
+      }
+    >
+      {loading && <p>正在读取…</p>}
+      {error !== '' && (
+        <Notice tone="error" title="保存失败">
+          {error}
+        </Notice>
+      )}
+
+      {!loading && entry !== null && (
+        <Space direction="column" gap="md" align="stretch">
+          <FormField label="标题" htmlFor="edit-name" required>
+            <Input
+              id="edit-name"
+              value={form.name}
+              onChange={(event) => update({ name: event.target.value })}
+            />
+          </FormField>
+
+          <FormField label="简介" htmlFor="edit-description" hint="列表卡片上的一行说明">
+            <Input
+              id="edit-description"
+              value={form.description}
+              onChange={(event) => update({ description: event.target.value })}
+            />
+          </FormField>
+
+          <FormField label="标签" htmlFor="edit-tags" hint="用逗号分隔，例如：推荐电影，动画">
+            <Input
+              id="edit-tags"
+              value={form.tags}
+              onChange={(event) => update({ tags: event.target.value })}
+            />
+          </FormField>
+
+          <FormField label="一句话评价" htmlFor="edit-comment">
+            <Input
+              id="edit-comment"
+              value={form.comment}
+              onChange={(event) => update({ comment: event.target.value })}
+            />
+          </FormField>
+
+          <FormField label="正文" htmlFor="edit-body" hint="支持 Markdown：##、段落、链接、图片">
+            <Textarea
+              id="edit-body"
+              rows={8}
+              value={form.body}
+              onChange={(event) => update({ body: event.target.value })}
+            />
+          </FormField>
+
+          <FormField label="封面地址" htmlFor="edit-cover">
+            <Input
+              id="edit-cover"
+              value={form.cover}
+              placeholder="https://…"
+              onChange={(event) => update({ cover: event.target.value })}
+            />
+          </FormField>
+
+          <FormField
+            label="跳转地址"
+            htmlFor="edit-href"
+            hint="可填 https://、www. 开头的域名或站内路径 /foo；留空则不显示跳转"
+          >
+            <Input
+              id="edit-href"
+              value={form.href}
+              placeholder="https://… 或 /project/"
+              onChange={(event) => update({ href: event.target.value })}
+            />
+          </FormField>
+        </Space>
+      )}
+    </Drawer>
+  )
+}

stash-web/src/components/content/PosterCard.tsx

@@ -1,3 +1,4 @@
+import { Cover } from '@stash/ui'
 import type { PosterItem } from '../../data/types'
 
 /**
@@ -10,27 +11,13 @@ type PosterCardProps = {
 }
 
 export function PosterCard({ item, onOpen }: PosterCardProps) {
-  const content = (
-    <>
-      <img className="poster-cover" src={item.cover} alt={item.title} loading="lazy" />
-      <span className="poster-caption">
-        <span className="poster-title">{item.title}</span>
-      </span>
-    </>
-  )
-
-  if (onOpen === undefined) {
-    return <figure className="poster-card">{content}</figure>
-  }
-
   return (
-    <button
-      type="button"
-      className="poster-card"
-      title={item.title}
-      onClick={() => onOpen(item.id)}
-    >
-      {content}
-    </button>
+    <Cover
+      src={item.cover}
+      alt={item.title}
+      caption={item.title}
+      ratio="poster"
+      onClick={onOpen === undefined ? undefined : () => onOpen(item.id)}
+    />
   )
 }

stash-web/src/components/content/PosterGrid.tsx

@@ -1,7 +1,8 @@
+import { Grid } from '@stash/ui'
 import type { PosterItem } from '../../data/types'
 import { PosterCard } from './PosterCard'
 
-/** 海报网格：首页 6 列，明细页同样 6 列但间距更大 */
+/** 海报网格：桌面 6 列，平板 4 列，手机 3 列 */
 type PosterGridProps = {
   items: PosterItem[]
   variant?: 'home' | 'detail'
@@ -9,12 +10,12 @@ type PosterGridProps = {
   onOpen?: (itemId: string) => void
 }
 
-export function PosterGrid({ items, variant = 'home', onOpen }: PosterGridProps) {
+export function PosterGrid({ items, onOpen }: PosterGridProps) {
   return (
-    <div className={`poster-grid${variant === 'detail' ? ' poster-grid--detail' : ''}`}>
+    <Grid columns={6} tabletColumns={4} mobileColumns={3} gap="md">
       {items.map((item) => (
         <PosterCard key={item.id} item={item} onOpen={onOpen} />
       ))}
-    </div>
+    </Grid>
   )
 }

stash-web/src/components/content/RelatedList.tsx

@@ -1,3 +1,4 @@
+import { Avatar, Card, Grid, Space, Text, Title } from '@stash/ui'
 import type { RelatedItem } from '../../data/types'
 
 /**
@@ -13,33 +14,37 @@ export function RelatedList({ items, onOpen }: RelatedListProps) {
   if (items.length === 0) return null
 
   return (
-    <section className="related-card card-box" aria-label="推荐阅读">
-      <h3 className="related-title">
-        <span className="related-title-icon" aria-hidden="true">
-          📚
-        </span>
+    <Card padding="md" className="related-card">
+      <Title level={3} as="h3" className="related-title">
+        <span aria-hidden="true">📚</span>
         推荐阅读
-      </h3>
+      </Title>
 
-      <ul className="related-grid">
+      <Grid className="related-grid" columns={2} tabletColumns={2} mobileColumns={1} gap="sm">
         {items.map((item) => (
-          <li key={item.id}>
-            <button type="button" className="related-item" onClick={() => onOpen(item.id)}>
-              <span className="related-avatar" aria-hidden="true">
-                {item.cover !== undefined ? (
-                  <img src={item.cover} alt="" loading="lazy" />
-                ) : (
-                  (item.icon ?? '•')
-                )}
-              </span>
-              <span className="related-info">
-                <span className="related-name">{item.name}</span>
-                <span className="related-desc">{item.desc}</span>
-              </span>
-            </button>
-          </li>
+          <button
+            key={item.id}
+            type="button"
+            className="related-item"
+            onClick={() => onOpen(item.id)}
+          >
+            <Avatar
+              size="md"
+              tone="primary"
+              src={item.cover}
+              fallback={item.icon ?? '•'}
+            />
+            <Space direction="column" gap="xs" align="start" className="related-info">
+              <Text size="sm" strong truncate>
+                {item.name}
+              </Text>
+              <Text size="xs" tone="muted" truncate>
+                {item.desc}
+              </Text>
+            </Space>
+          </button>
         ))}
-      </ul>
-    </section>
+      </Grid>
+    </Card>
   )
 }

stash-web/src/components/content/SectionCard.tsx

@@ -1,9 +1,8 @@
+import { Badge, Card, Icon, IconButton, Title } from '@stash/ui'
 import type { ReactNode } from 'react'
-import { CountBadge } from '../common/CountBadge'
-import { MoreIcon } from '../common/Icon'
 
 /**
- * 首页分区卡片：白底圆角容器，组成「色条 + 标题 + 角标 + 更多按钮 + 内容」。
+ * 首页分区卡片：白底容器，组成「色条 + 标题 + 角标 + 更多按钮 + 内容」。
  * 内容由调用方传入，因此同一容器可以承载应用网格、海报网格或图文网格。
  */
 type SectionCardProps = {
@@ -18,30 +17,30 @@ type SectionCardProps = {
 
 export function SectionCard({ title, count, barColor, onMore, children }: SectionCardProps) {
   return (
-    <section className="section-card">
-      <header className="section-header">
-        <div className="section-title-wrapper">
+    <Card padding="md" className="section-card">
+      <div className="section-header">
+        <span className="section-title-wrapper">
           <span className="section-bar" style={{ backgroundColor: barColor }} aria-hidden="true" />
           <span className="section-title-box">
-            <h2 className="section-title">{title}</h2>
-            <CountBadge count={count} />
+            <Title level={3} as="h2" weight="semibold">
+              {title}
+            </Title>
+            <Badge count={count} tone="danger" className="count-badge" />
           </span>
-        </div>
+        </span>
 
         {onMore !== undefined && (
-          <button
-            type="button"
+          <IconButton
+            size="xs"
             className="section-more"
-            title={`查看${title}全部`}
-            aria-label={`查看${title}全部`}
+            label={`查看${title}全部`}
+            icon={<Icon name="more_1_line" />}
             onClick={onMore}
-          >
-            <MoreIcon />
-          </button>
+          />
         )}
-      </header>
+      </div>
 
       {children}
-    </section>
+    </Card>
   )
 }

stash-web/src/components/header/HeaderInfoItem.tsx

@@ -1,24 +0,0 @@
-import type { ReactNode } from 'react'
-
-/**
- * 顶栏中间的一条信息，形如「[标签] 文本」。
- * 标签带浅色底，用于区分「本地 / 状态」这类类型前缀。
- */
-type HeaderInfoItemProps = {
-  /** 可选的前缀标签 */
-  tag?: string
-  /** 标签配色：默认蓝色，状态类用绿色 */
-  tone?: 'blue' | 'green'
-  children: ReactNode
-}
-
-export function HeaderInfoItem({ tag, tone = 'blue', children }: HeaderInfoItemProps) {
-  return (
-    <div className="header-info-item">
-      {tag !== undefined && (
-        <span className={`header-info-tag${tone === 'green' ? ' is-green' : ''}`}>{tag}</span>
-      )}
-      <span className="header-info-text">{children}</span>
-    </div>
-  )
-}

stash-web/src/components/header/SiteHeader.tsx

@@ -1,58 +1,126 @@
-import { SearchIcon, UserIcon } from '../common/Icon'
-import { HeaderInfoItem } from './HeaderInfoItem'
+import { Brand, Icon, IconButton, Tag, Ticker } from '@stash/ui'
+import {
+  fillHeaderText,
+  type HeaderItem,
+  type SettingsTone,
+  type SiteMetaSettings,
+} from '../../settings'
 
 /**
- * 顶部栏：左品牌、中间运行信息、右侧操作图标。
- * 信息区展示「共 N 个本地应用 / 第一个项目 / 连接状态」，
- * 对应模板里的 header-center-info。
+ * 顶部栏：左品牌、中间滚动信息（可在 /admin 配置）、右侧操作图标。
+ * 品牌与操作图标是否出现，都来自「页头」Tab 的站点设置。
+ * 外壳（品牌、跑马灯）都用组件库，这里只拼内容。
  */
 type SiteHeaderProps = {
   projectCount: number
   /** 用于展示的第一个项目名，没有项目时留空 */
   sampleProject?: string
   live: boolean
-  onFocusSearch: () => void
+  /** 页头滚动信息；为空时用默认三条 */
+  headerItems: HeaderItem[]
+  headerEnabled: boolean
+  /** 滚动一轮的秒数 */
+  headerSpeed: number
+  /** 信息条目之间的间距（px） */
+  headerGap?: number
+  /** 品牌与操作工具配置 */
+  site: SiteMetaSettings
+  /** 是否已登录：决定右侧是「登录」还是「退出登录」 */
+  authenticated: boolean
+  username?: string
+  /** 刷新中：刷新按钮转圈 */
+  refreshing?: boolean
+  /** 当前是否为深色，决定明暗按钮的图标与文案 */
+  dark?: boolean
+  onRefresh: () => void
+  onToggleTheme: () => void
+  onLogin: () => void
+  onLogout: () => void
+  onSettings: () => void
 }
 
-export function SiteHeader({ projectCount, sampleProject, live, onFocusSearch }: SiteHeaderProps) {
+const tagTone: Record<SettingsTone, 'neutral' | 'primary' | 'success'> = {
+  plain: 'neutral',
+  neutral: 'neutral',
+  primary: 'primary',
+  success: 'success',
+}
+
+export function SiteHeader({
+  projectCount,
+  sampleProject,
+  live,
+  headerItems,
+  headerEnabled,
+  headerSpeed,
+  headerGap,
+  site,
+  authenticated,
+  username,
+  refreshing = false,
+  dark = false,
+  onRefresh,
+  onToggleTheme,
+  onLogin,
+  onLogout,
+  onSettings,
+}: SiteHeaderProps) {
+  const context = { count: projectCount, project: sampleProject, live }
+
   return (
-    <header className="site-header">
-      <div className="layout-container site-header-inner">
-        <a className="site-brand" href="/" aria-label="Stash 首页">
-          <span className="site-brand-mark" aria-hidden="true">
-            S
-          </span>
-          <span className="site-brand-name">STASH</span>
-        </a>
+    <div className="site-header-inner">
+      <Brand
+        href="/"
+        name={site.brand.name}
+        mark={site.brand.mark}
+        logo={site.brand.logo}
+      />
 
-        <div className="header-info">
-          <HeaderInfoItem>共 {projectCount} 个本地应用</HeaderInfoItem>
+      {headerEnabled && (
+        <Ticker speed={headerSpeed} gap={headerGap} label="运行状态" className="header-ticker">
+          {headerItems.map((item, index) => (
+            <span className="header-ticker-item" key={`${index}-${item.text}`}>
+              {item.tag !== undefined && item.tag !== null && item.tag !== '' && (
+                <Tag tone={tagTone[item.tone]} shape="rounded">
+                  {item.tag}
+                </Tag>
+              )}
+              {fillHeaderText(item.text, context)}
+            </span>
+          ))}
+        </Ticker>
+      )}
 
-          {sampleProject !== undefined && (
-            <HeaderInfoItem tag="本地">{sampleProject}</HeaderInfoItem>
-          )}
-
-          <HeaderInfoItem tag="状态" tone={live ? 'green' : 'blue'}>
-            {live ? '实时同步已连接' : '等待服务连接'}
-          </HeaderInfoItem>
-        </div>
-
-        <div className="header-actions">
-          <button
-            type="button"
-            className="header-icon-button"
-            title="搜索（Ctrl+K）"
-            aria-label="聚焦搜索框"
-            onClick={onFocusSearch}
-          >
-            <SearchIcon />
-          </button>
-          {/* TODO(auth): 后端登录接口就绪后接上，目前仅作入口占位 */}
-          <button type="button" className="header-icon-button" title="登录" aria-label="登录">
-            <UserIcon />
-          </button>
-        </div>
+      <div className="header-actions">
+        {site.actions.theme && (
+          <IconButton
+            label={dark ? '切换到浅色' : '切换到深色'}
+            icon={<Icon name={dark ? 'sun_line' : 'moon_line'} />}
+            onClick={onToggleTheme}
+          />
+        )}
+        {site.actions.refresh && (
+          <IconButton
+            label="刷新（重扫项目并重拉内容）"
+            icon={<Icon name="lightning_line" />}
+            spinning={refreshing}
+            onClick={onRefresh}
+          />
+        )}
+        {site.actions.settings && authenticated && (
+          <IconButton label="站点设置" icon={<Icon name="settings_1_line" />} onClick={onSettings} />
+        )}
+        {site.actions.session &&
+          (authenticated ? (
+            <IconButton
+              label={username === undefined ? '退出登录' : `退出登录（${username}）`}
+              icon={<Icon name="exit_line" />}
+              onClick={onLogout}
+            />
+          ) : (
+            <IconButton label="登录" icon={<Icon name="user_3_line" />} onClick={onLogin} />
+          ))}
       </div>
-    </header>
+    </div>
   )
 }

stash-web/src/components/search/SearchBar.tsx

@@ -1,58 +0,0 @@
-import { useEffect, type RefObject } from 'react'
-import { CloseIcon, SearchIcon } from '../common/Icon'
-
-/**
- * 全局搜索框：固定悬浮在顶栏下方居中。
- * 支持 Ctrl/Cmd+K 聚焦、Esc 清空，输入内容由父组件接管过滤逻辑。
- */
-type SearchBarProps = {
-  value: string
-  onChange: (value: string) => void
-  inputRef: RefObject<HTMLInputElement | null>
-}
-
-export function SearchBar({ value, onChange, inputRef }: SearchBarProps) {
-  useEffect(() => {
-    const handleKeyDown = (event: KeyboardEvent) => {
-      if ((event.ctrlKey || event.metaKey) && event.key.toLowerCase() === 'k') {
-        event.preventDefault()
-        inputRef.current?.focus()
-        inputRef.current?.select()
-      }
-    }
-
-    window.addEventListener('keydown', handleKeyDown)
-    return () => window.removeEventListener('keydown', handleKeyDown)
-  }, [inputRef])
-
-  return (
-    <div className="search-bar card-box">
-      <SearchIcon className="search-icon" />
-
-      <input
-        ref={inputRef}
-        className="search-input"
-        type="text"
-        value={value}
-        placeholder="搜索本地项目…"
-        aria-label="搜索本地项目"
-        spellCheck={false}
-        onChange={(event) => onChange(event.target.value)}
-        onKeyDown={(event) => {
-          if (event.key === 'Escape') onChange('')
-        }}
-      />
-
-      {value !== '' && (
-        <button
-          type="button"
-          className="search-clear"
-          aria-label="清空搜索"
-          onClick={() => onChange('')}
-        >
-          <CloseIcon />
-        </button>
-      )}
-    </div>
-  )
-}

stash-web/src/components/sidebar/CategoryNav.tsx

@@ -1,98 +0,0 @@
-import { useState } from 'react'
-import type { NavTarget } from '../../data/nav'
-import type { Category } from '../../data/types'
-
-/**
- * 分类导航树：直接由内容树派生，不再读独立的导航数据。
- *
- * - 有分组的分类（apps）渲染成可折叠节点，子项是分组（分组可用 show_in_sidebar 单独隐藏）；
- * - 没有分组、或分组全被隐藏的分类，直接是链接。
- */
-type CategoryNavProps = {
-  /** 内容目录；顺序即侧栏顺序 */
-  categories: Category[]
-  /** 当前明细视图的分类 / 分组，用于高亮 */
-  activeCategoryId?: string
-  activeGroupId?: string
-  onNavigate: (target: NavTarget) => void
-}
-
-export function CategoryNav({
-  categories,
-  activeCategoryId,
-  activeGroupId,
-  onNavigate,
-}: CategoryNavProps) {
-  const [openGroups, setOpenGroups] = useState<string[]>([])
-
-  const toggle = (id: string) => {
-    setOpenGroups((previous) =>
-      previous.includes(id) ? previous.filter((item) => item !== id) : [...previous, id],
-    )
-  }
-
-  const isOpen = (id: string) => openGroups.includes(id)
-
-  return (
-    <nav className="nav-card card-box" aria-label="站点分类">
-      <ul className="nav-group">
-        {categories.map((category) => {
-          // 只显示允许出现在侧栏的分组
-          const groups =
-            category.kind === 'apps'
-              ? category.groups.filter((group) => group.showInSidebar !== false)
-              : []
-
-          // 没有分组的分类：整行就是一个链接
-          if (groups.length === 0) {
-            return (
-              <li className="nav-item" key={category.id}>
-                <button
-                  type="button"
-                  className={`nav-link${
-                    activeCategoryId === category.id && activeGroupId === undefined ? ' active' : ''
-                  }`}
-                  onClick={() => onNavigate({ categoryId: category.id })}
-                >
-                  <span>{category.title}</span>
-                </button>
-              </li>
-            )
-          }
-
-          // 有分组：分区可折叠，分组是真正的链接
-          return (
-            <li className={`nav-item${isOpen(category.id) ? ' open' : ''}`} key={category.id}>
-              <button
-                type="button"
-                className="nav-link has-children"
-                aria-expanded={isOpen(category.id)}
-                onClick={() => toggle(category.id)}
-              >
-                <span>{category.title}</span>
-              </button>
-
-              {/* 用 grid-template-rows 做高度动画：不需要猜 max-height，
-                  也不会在过渡期间出现滚动条 */}
-              <div className={`submenu-wrap${isOpen(category.id) ? ' is-open' : ''}`}>
-                <ul className="submenu">
-                  {groups.map((group) => (
-                    <li key={group.id}>
-                      <button
-                        type="button"
-                        className={`nav-link${activeGroupId === group.id ? ' active' : ''}`}
-                        onClick={() => onNavigate({ categoryId: category.id, groupId: group.id })}
-                      >
-                        <span>{group.name}</span>
-                      </button>
-                    </li>
-                  ))}
-                </ul>
-              </div>
-            </li>
-          )
-        })}
-      </ul>
-    </nav>
-  )
-}

stash-web/src/components/sidebar/ProfileCard.tsx

@@ -1,24 +1,34 @@
-import { PLACEHOLDER_PROFILE } from '../../profile'
-import { UserIcon } from '../common/Icon'
+import { Avatar, Card, Icon, Text, Title } from '@stash/ui'
+import type { ProfileSettings } from '../../settings'
 
 /**
  * 用户资料卡：头像、认证徽标、昵称、角色、简介、IP 属地。
- * 数据来自 profile.ts 的占位对象，后端接入鉴权后替换。
+ * 内容来自站点设置（/admin → 资料），未设置时用默认文案。
  */
-export function ProfileCard() {
-  const { name, role, bio, location } = PLACEHOLDER_PROFILE
+type ProfileCardProps = {
+  profile: ProfileSettings
+}
 
+export function ProfileCard({ profile }: ProfileCardProps) {
   return (
-    <section className="profile-card card-box" aria-label="用户信息">
-      <div className="profile-avatar" aria-hidden="true">
-        <UserIcon />
-        <span className="profile-badge">✓</span>
-      </div>
+    <Card padding="none" className="profile-card">
+      {profile.avatar !== '' ? (
+        <Avatar size="xl" src={profile.avatar} alt={profile.name} verified />
+      ) : (
+        <Avatar size="xl" tone="primary" icon={<Icon name="user_3_line" />} verified />
+      )}
 
-      <div className="profile-name">{name}</div>
-      <span className="profile-role">{role}</span>
-      <p className="profile-bio">{bio}</p>
-      <div className="profile-location">IP属地：{location}</div>
-    </section>
+      <Title level={4} weight="semibold" className="profile-name">
+        {profile.name}
+      </Title>
+
+      <span className="profile-role">{profile.role}</span>
+
+      <Text size="xs" tone="sub" className="profile-bio">
+        {profile.description}
+      </Text>
+
+      <span className="profile-location">{profile.location}</span>
+    </Card>
   )
 }

stash-web/src/components/sidebar/ServicePanel.tsx

@@ -1,5 +1,5 @@
+import { Button, Card, Icon, Space, Tag, Text, Title } from '@stash/ui'
 import type { Project } from '../../api'
-import { LinkIcon, RefreshIcon } from '../common/Icon'
 
 /**
  * 本地服务面板：连接状态、项目数、访问地址，以及两个操作入口。
@@ -10,56 +10,74 @@ type ServicePanelProps = {
   live: boolean
   refreshing: boolean
   onRefresh: () => void
+  /** 打开接口一览：走站内路由，不整页刷新 */
+  onOpenApi: () => void
 }
 
-export function ServicePanel({ projects, live, refreshing, onRefresh }: ServicePanelProps) {
+export function ServicePanel({
+  projects,
+  live,
+  refreshing,
+  onRefresh,
+  onOpenApi,
+}: ServicePanelProps) {
   const host = typeof window === 'undefined' ? '-' : window.location.host
 
   return (
-    <section className="service-panel card-box" aria-label="本地服务状态">
-      <header className="service-head">
-        <h2 className="service-title">本地服务</h2>
-        <span className={`service-pill${live ? ' is-on' : ''}`}>
-          <span className={`status-dot${live ? ' is-on' : ''}`} aria-hidden="true" />
+    <Card padding="none" className="service-panel">
+      <Space justify="between">
+        <Title level={4} as="h2" weight="semibold">
+          本地服务
+        </Title>
+        <Tag tone={live ? 'success' : 'neutral'} dot className="service-status">
           {live ? '已连接' : '未连接'}
-        </span>
-      </header>
+        </Tag>
+      </Space>
 
-      <dl className="service-stats">
-        <div>
-          <dt>项目数</dt>
-          <dd>{projects.length}</dd>
-        </div>
-        <div>
-          <dt>访问地址</dt>
-          <dd title={host}>{host}</dd>
-        </div>
-      </dl>
+      <div className="service-stats">
+        <Space justify="between">
+          <Text size="xs" tone="sub">
+            项目数
+          </Text>
+          <Text size="xs" strong>{projects.length}</Text>
+        </Space>
+        <Space justify="between">
+          <Text size="xs" tone="sub">
+            访问地址
+          </Text>
+          <Text size="xs" truncate title={host} className="service-host">
+            {host}
+          </Text>
+        </Space>
+      </div>
 
       <div className="service-actions">
-        <button
-          type="button"
+        <Button
+          size="sm"
+          variant="secondary"
           className="service-action"
-          title="重新扫描项目"
-          data-spinning={refreshing}
-          disabled={refreshing}
+          spinning={refreshing}
+          icon={<Icon name="refresh_3_line" />}
           onClick={onRefresh}
+          title="重新扫描项目"
         >
-          <RefreshIcon />
-          <span>重新扫描</span>
-        </button>
+          重新扫描
+        </Button>
 
         <a
-          className="service-action"
-          href="/api/projects"
-          target="_blank"
-          rel="noreferrer"
-          title="查看项目接口"
+          className="link-button"
+          href="/interface"
+          onClick={(event) => {
+            // 无修饰键时接管点击，走站内路由，只换右侧内容；按住修饰键仍可新标签打开
+            if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return
+            event.preventDefault()
+            onOpenApi()
+          }}
         >
-          <LinkIcon />
-          <span>查看接口</span>
+          <Icon name="link_3_line" />
+          查看接口
         </a>
       </div>
-    </section>
+    </Card>
   )
 }

stash-web/src/components/sidebar/Sidebar.tsx

@@ -1,53 +0,0 @@
-import type { Project } from '../../api'
-import type { NavTarget } from '../../data/nav'
-import type { Category } from '../../data/types'
-import { CategoryNav } from './CategoryNav'
-import { ProfileCard } from './ProfileCard'
-import { ServicePanel } from './ServicePanel'
-
-/**
- * 左侧栏容器：用户资料 + 本地服务面板 + 分类导航。
- * 只负责布局与数据透传，具体内容由三个子组件分别渲染。
- */
-type SidebarProps = {
-  projects: Project[]
-  /** 内容目录；侧栏直接由它派生 */
-  categories: Category[]
-  live: boolean
-  refreshing: boolean
-  onRefresh: () => void
-  activeCategoryId?: string
-  activeGroupId?: string
-  onNavigate: (target: NavTarget) => void
-}
-
-export function Sidebar({
-  projects,
-  categories,
-  live,
-  refreshing,
-  onRefresh,
-  activeCategoryId,
-  activeGroupId,
-  onNavigate,
-}: SidebarProps) {
-  return (
-    <aside className="sidebar">
-      <ProfileCard />
-
-      <ServicePanel
-        projects={projects}
-        live={live}
-        refreshing={refreshing}
-        onRefresh={onRefresh}
-      />
-
-      <CategoryNav
-        categories={categories}
-        activeCategoryId={activeCategoryId}
-        activeGroupId={activeGroupId}
-        onNavigate={onNavigate}
-      />
-    </aside>
-  )
-}

stash-web/src/data/detail.ts

@@ -28,8 +28,7 @@ export type ItemDetailModel = {
 }
 
 /** 把应用条目转成详情模型 */
-export function appDetailModel(item: AppItem): ItemDetailModel {
-  return {
+export function appDetailModel(item: AppItem): ItemDetailModel {  return {
     title: item.name,
     cover: item.cover,
     shape: 'square',
@@ -73,3 +72,38 @@ export function posterToRelatedItem(item: PosterItem): RelatedItem {
     cover: item.cover,
   }
 }
+
+/**
+ * 把库里的 `href` 解析成真正可跳转的地址。
+ *
+ * 兼容历史数据里没写协议的裸域名（`www.zhihu.com` → `https://…`）；
+ * 空值、`#` 与不安全/看不懂的协议返回 `undefined`，由页面把按钮置灰。
+ */
+export function resolveHref(raw: string | undefined): string | undefined {
+  const value = raw?.trim() ?? ''
+  if (value === '' || value === '#') return undefined
+
+  // 站内路径；`//host` 是协议相对地址，按外链补 https
+  if (value.startsWith('/') && !value.startsWith('//')) return value
+  if (/^https?:\/\//i.test(value)) return value
+  if (value.startsWith('//')) return `https:${value}`
+
+  // 其他协议（javascript: / data: / mailto: …）一律不当作跳转
+  if (/^[a-z][a-z0-9+.-]*:/i.test(value)) return undefined
+
+  return looksLikeDomain(value) ? `https://${value}` : undefined
+}
+
+function looksLikeDomain(value: string): boolean {
+  const [hostPort = ''] = value.split('/')
+  const [host = ''] = hostPort.split(':')
+  if (!host.includes('.')) return false
+
+  const parts = host.split('.')
+  const tld = parts.pop() ?? ''
+  return (
+    tld.length >= 2 &&
+    /^[a-z]+$/i.test(tld) &&
+    parts.every((part) => /^[a-z0-9-]+$/i.test(part))
+  )
+}

stash-web/src/data/types.ts

@@ -31,14 +31,16 @@ export type AppItem = {
 }
 
 /** 应用分组：明细页按组展示，首页按展示块取其中一组做预览 */
-export type AppGroup = {
+export type ContentGroup<T> = {
   id: string
   name: string
   /** 是否出现在侧栏；缺省视为 true */
   showInSidebar?: boolean
-  items: AppItem[]
+  items: T[]
 }
 
+export type AppGroup = ContentGroup<AppItem>
+
 /** 竖版海报条目（电影） */
 export type PosterItem = {
   id: string
@@ -97,6 +99,8 @@ export type AppCategory = {
   /** 明细页 hero 区的字符图标 */
   icon: string
   groups: AppGroup[]
+  /** 直接挂在分区上的条目（未分组） */
+  items?: AppItem[]
   /** 首页预览条数，默认 4 */
   previewLimit?: number
   /** 首页预览为空时的提示文案 */
@@ -114,6 +118,8 @@ export type PosterCategory = {
   title: string
   barColor: string
   icon: string
+  groups: ContentGroup<PosterItem>[]
+  /** 直接挂在分区上的条目（未分组） */
   items: PosterItem[]
   /** 首页预览条数，默认 6 */
   previewLimit?: number
@@ -130,6 +136,8 @@ export type ArticleCategory = {
   title: string
   barColor: string
   icon: string
+  groups: ContentGroup<ArticleItem>[]
+  /** 直接挂在分区上的条目（未分组） */
   items: ArticleItem[]
   /** 首页预览条数，默认 4 */
   previewLimit?: number
@@ -141,23 +149,28 @@ export type ArticleCategory = {
 
 export type Category = AppCategory | PosterCategory | ArticleCategory
 
-/** 分类内的条目总数，用于角标与明细页计数 */
+/** 分类内的条目总数（直属 + 分组的），用于角标与明细页计数 */
 export function categoryCount(category: Category): number {
-  if (category.kind === 'apps') {
-    return category.groups.reduce((total, group) => total + group.items.length, 0)
-  }
-  return category.items.length
+  const direct = category.items?.length ?? 0
+  const grouped = category.groups.reduce((total, group) => total + group.items.length, 0)
+  return direct + grouped
 }
 
-/** 把应用类分类的分组拍平，首页预览用 */
+/** 把应用类分类的条目拍平（分组 + 直属），首页预览用 */
 export function flattenAppItems(category: AppCategory): AppItem[] {
-  return category.groups.flatMap((group) => group.items)
+  return [
+    ...category.groups.flatMap((group) => group.items),
+    ...(category.items ?? []),
+  ]
 }
 
 /** 按 id 在分类里查找条目；详情页用 */
 export function findAppItem(category: Category, itemId: string): AppItem | undefined {
   if (category.kind !== 'apps') return undefined
 
+  const direct = (category.items ?? []).find((item) => item.id === itemId)
+  if (direct !== undefined) return direct
+
   for (const group of category.groups) {
     const found = group.items.find((item) => item.id === itemId)
     if (found !== undefined) return found
@@ -184,7 +197,13 @@ export function findPosterItem(
   itemId: string,
 ): PosterItem | undefined {
   if (category.kind !== 'posters') return undefined
-  return category.items.find((item) => item.id === itemId)
+  const direct = category.items.find((item) => item.id === itemId)
+  if (direct !== undefined) return direct
+  for (const group of category.groups) {
+    const found = group.items.find((item) => item.id === itemId)
+    if (found !== undefined) return found
+  }
+  return undefined
 }
 
 /** 取同分类下的其他海报，用于详情页的「推荐阅读」 */
@@ -195,7 +214,12 @@ export function relatedPosterItems(
 ): PosterItem[] {
   if (category.kind !== 'posters') return []
 
-  return category.items.filter((item) => item.id !== excludeId).slice(0, limit)
+  return [
+    ...category.items,
+    ...category.groups.flatMap((group) => group.items),
+  ]
+    .filter((item) => item.id !== excludeId)
+    .slice(0, limit)
 }
 
 /** 按 id 查找图文条目 */
@@ -204,5 +228,11 @@ export function findArticleItem(
   itemId: string,
 ): ArticleItem | undefined {
   if (category.kind !== 'articles') return undefined
-  return category.items.find((item) => item.id === itemId)
+  const direct = category.items.find((item) => item.id === itemId)
+  if (direct !== undefined) return direct
+  for (const group of category.groups) {
+    const found = group.items.find((item) => item.id === itemId)
+    if (found !== undefined) return found
+  }
+  return undefined
 }

stash-web/src/iconfont.css

@@ -1,74 +0,0 @@
-/**
- * 图标字体：取自 Alright 主题自带的 iconfont（Project id 4809463）。
- * 字体文件放在 public/fonts/iconfont.woff2，这里只保留项目用到的字形，
- * 避免把整份 500 多个图标的样式表打进包里。
- */
-@font-face {
-  font-family: 'iconfont';
-  src: url('./assets/iconfont.woff2') format('woff2');
-  font-display: swap;
-}
-
-.iconfont {
-  display: inline-block;
-  font-family: 'iconfont' !important;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
-  text-rendering: auto;
-  speak: none;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-search::before {
-  content: '\e942';
-}
-
-.icon-user::before {
-  content: '\e966';
-}
-
-.icon-refresh::before {
-  content: '\e93d';
-}
-
-.icon-link::before {
-  content: '\ea37';
-}
-
-.icon-external::before {
-  content: '\e8be';
-}
-
-.icon-eye::before {
-  content: '\e8fd';
-}
-
-.icon-thumb-up::before {
-  content: '\e957';
-}
-
-.icon-share::before {
-  content: '\e946';
-}
-
-.icon-close::before {
-  content: '\e8e4';
-}
-
-.icon-more::before {
-  content: '\e91f';
-}
-
-.icon-arrow-up::before {
-  content: '\e8c1';
-}
-
-.icon-arrow-left::before {
-  content: '\e8b5';
-}
-
-.icon-arrow-down::before {
-  content: '\e8b7';
-}

stash-web/src/index.css

@@ -1,44 +1,11 @@
+/* 页面级基础：字号 / 字体 / 重置。颜色与间距全部来自 @stash/ui 的令牌。 */
+
 :root {
-  /* ---------- 颜色：取自 Alright 主题的设计变量 ---------- */
-  --bg-color: #f7f8fa;
-  --card-bg: #ffffff;
-  --primary-color: #3858f6;
-  --primary-soft: rgba(56, 88, 246, 0.1);
-  --text-main: #1d2129;
-  --text-sub: #4e5969;
-  --text-muted: #86909c;
-  --border-color: #f6f6f6;
-  --border-strong: #eeeeee;
-  --danger: #ff3e3e;
-  --orange: #ffba3a;
-  --green: #4abd86;
-
-  --radius-sm: 6px;
-  --radius-main: 12px;
-  --radius-lg: 24px;
-
-  /* 主题的阴影很轻：0 6px 16px rgba(27,26,49,2%) */
-  --shadow-card: 0 6px 16px rgba(27, 26, 49, 0.02);
-  --shadow-hover: 0 6px 16px rgba(27, 26, 49, 0.06);
-
-  --sidebar-width: 240px;
-  --top-nav-height: 60px;
-  /* 内容区最大宽度，宽屏时整体居中 */
-  --layout-max-width: 1380px;
-  /* 内容列顶部让位高度（给悬浮搜索框），侧栏首卡与内容首卡都按它对齐 */
-  --content-top-offset: 52px;
-
-  /* 主题正文用霞鹜文楷（与演示站同一份 webfont），缺失时回退系统字体 */
-  --font-sans:
-    'LXGW WenKai', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
-    'Hiragino Sans GB', 'Microsoft YaHei', 'Source Han Sans CN', sans-serif;
-  --font-mono: ui-monospace, SFMono-Regular, Consolas, 'Liberation Mono', monospace;
-
-  font-family: var(--font-sans);
-  font-size: 14px;
-  line-height: 1.5;
-  color: var(--text-main);
-  background-color: var(--bg-color);
+  font-family: var(--su-font-sans);
+  font-size: var(--su-font-size-md);
+  line-height: var(--su-line-height-md);
+  color: var(--su-text-main);
+  background-color: var(--su-bg-page);
   color-scheme: light;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
@@ -53,15 +20,7 @@
 html,
 body,
 #root {
-  height: 100%;
-}
-
-/* 桌面端锁死视口，滚动交给右侧内容区 */
-body {
-  height: 100vh;
-  overflow: hidden;
-  background-color: var(--bg-color);
-  color: var(--text-main);
+  min-height: 100%;
 }
 
 a {
@@ -76,20 +35,23 @@ button {
   background: none;
 }
 
-:focus-visible {
-  outline: 2px solid var(--primary-color);
-  outline-offset: 2px;
+ul,
+ol {
+  list-style: none;
 }
 
-@media (max-width: 900px) {
-  html,
-  body,
-  #root {
-    height: auto;
-  }
+/* 键盘焦点环由组件库统一提供；这里只给「非表单控件」补兜底。
+   表单控件不能加全局 outline：输入框点击时也会命中 :focus-visible，
+   会和组件自己的边框态叠成「双框」（用户实际报过的 bug）。 */
+a:focus-visible,
+button:focus-visible,
+[tabindex]:not(input):focus-visible {
+  outline: var(--su-focus-ring);
+  outline-offset: var(--su-focus-ring-offset);
+}
 
-  body {
-    height: auto;
-    overflow: auto;
-  }
+input:focus-visible,
+textarea:focus-visible,
+select:focus-visible {
+  outline: none;
 }

stash-web/src/items.ts

@@ -0,0 +1,126 @@
+/**
+ * 条目编辑的前端接口。
+ *
+ * 读取是公开的（编辑表单要能预览），写入必须登录，并用 `updatedAt` 做乐观锁。
+ */
+export type EntryFormat = 'apps' | 'posters' | 'articles'
+
+export type EntryRecord = {
+  key: string
+  format: EntryFormat
+  name: string
+  description: string
+  icon: string
+  href: string
+  cover: string
+  banner: string
+  badge: string
+  comment: string
+  summary: string
+  body: string
+  tags: string[]
+  updated_at: number
+}
+
+export type EntryInput = {
+  name: string
+  /** 条目的展示格式；不传由后端按 apps 处理 */
+  format?: EntryFormat
+  description: string
+  icon: string
+  tags: string[]
+  badge: string
+  comment: string
+  summary: string
+  body: string
+  cover: string
+  banner: string
+  href: string
+  /** 编辑时传目标分区/分组，可移动条目 */
+  nodeKey?: string
+}
+
+export type ItemResult =
+  | { ok: true; entry: EntryRecord }
+  | { ok: false; status: number; error: string }
+
+export async function fetchItem(key: string): Promise<ItemResult> {
+  try {
+    const response = await fetch(`/api/items/${encodeURIComponent(key)}`, {
+      credentials: 'same-origin',
+    })
+    if (response.ok) {
+      return { ok: true, entry: (await response.json()) as EntryRecord }
+    }
+    const payload = (await response.json().catch(() => null)) as { error?: string } | null
+    return { ok: false, status: response.status, error: payload?.error ?? '读取失败' }
+  } catch (error) {
+    return { ok: false, status: 0, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+export async function saveItem(
+  key: string,
+  updatedAt: number,
+  item: EntryInput,
+): Promise<ItemResult> {
+  try {
+    const response = await fetch(`/api/items/${encodeURIComponent(key)}`, {
+      method: 'PATCH',
+      credentials: 'same-origin',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ updatedAt, item }),
+    })
+
+    if (response.ok) {
+      return { ok: true, entry: (await response.json()) as EntryRecord }
+    }
+
+    const payload = (await response.json().catch(() => null)) as { error?: string } | null
+    return {
+      ok: false,
+      status: response.status,
+      error: payload?.error ?? `保存失败（${response.status}）`,
+    }
+  } catch (error) {
+    return { ok: false, status: 0, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+/** 新建条目：指定分区 / 分组与字段 */
+export async function createItem(input: {
+  key: string
+  nodeKey: string
+  item: EntryInput
+}): Promise<SimpleResult> {
+  try {
+    const response = await fetch('/api/items', {
+      method: 'POST',
+      credentials: 'same-origin',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify(input),
+    })
+    if (response.ok) return { ok: true }
+    const payload = (await response.json().catch(() => null)) as { error?: string } | null
+    return { ok: false, error: payload?.error ?? `创建失败（${response.status}）` }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+/** 删除条目 */
+export async function deleteItem(key: string): Promise<SimpleResult> {
+  try {
+    const response = await fetch(`/api/items/${encodeURIComponent(key)}`, {
+      method: 'DELETE',
+      credentials: 'same-origin',
+    })
+    if (response.ok) return { ok: true }
+    const payload = (await response.json().catch(() => null)) as { error?: string } | null
+    return { ok: false, error: payload?.error ?? `删除失败（${response.status}）` }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+export type SimpleResult = { ok: true } | { ok: false; error: string }

stash-web/src/main.tsx

@@ -1,11 +1,27 @@
 import { StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
-import './iconfont.css'
+import '@stash/ui/style.css'
 import './index.css'
-import App from './App.tsx'
+import AppNext from './AppNext.tsx'
+import { AdminNext } from './components/admin/AdminNext'
 
-createRoot(document.getElementById('root')!).render(
-  <StrictMode>
-    <App />
-  </StrictMode>,
+/**
+ * 入口分流：
+ * - `/admin`：设置页独立壳；
+ * - `/login`：老地址，直接回首页（登录已改为页内弹窗）；
+ * - 其它：正常站点。
+ *
+ * 判定放在这里而不是 App 里，是因为 App 的 `useViewRoute` 会把地址规范化，
+ * 组件内部再读 pathname 已经晚了。
+ */
+const path = window.location.pathname
+
+if (path === '/login') {
+  window.location.replace('/')
+}
+
+const root = createRoot(document.getElementById('root')!)
+
+root.render(
+  <StrictMode>{path === '/admin' ? <AdminNext /> : <AppNext />}</StrictMode>,
 )

stash-web/src/manage.ts

@@ -0,0 +1,203 @@
+/**
+ * 原子模型的后台接口：分组树 + 卡片。
+ *
+ * 分组是唯一容器，卡片只是「勾选分组」的展示组合；两者都通过业务键关联。
+ */
+export type GroupFormat = 'apps' | 'posters' | 'articles'
+
+export type GroupEntry = {
+  id: string
+  format?: GroupFormat
+  name?: string
+  title?: string
+  href?: string
+  description?: string
+  desc?: string
+}
+
+export type GroupNode = {
+  key: string
+  parentKey?: string | null
+  title: string
+  format: GroupFormat
+  icon: string
+  barColor: string
+  previewLimit?: number | null
+  sort: number
+  /** 是否启用；禁用后前台不展示 */
+  enabled: boolean
+  entries: GroupEntry[]
+  children: GroupNode[]
+}
+
+export type CardGroupRef = {
+  groupKey: string
+  previewLimit?: number | null
+}
+
+export type CardItem = {
+  id: number
+  key: string
+  title: string
+  sort: number
+  groups: CardGroupRef[]
+}
+
+export type ManageData = {
+  groups: GroupNode[]
+  cards: CardItem[]
+}
+
+export type SimpleResult = { ok: true } | { ok: false; error: string }
+
+async function errorMessage(response: Response, fallback: string): Promise<string> {
+  const payload = (await response.json().catch(() => null)) as { error?: string } | null
+  return payload?.error ?? `${fallback}（${response.status}）`
+}
+
+export async function fetchManage(): Promise<ManageData> {
+  try {
+    const response = await fetch('/api/catalog2', { credentials: 'same-origin' })
+    if (!response.ok) return { groups: [], cards: [] }
+    return (await response.json()) as ManageData
+  } catch {
+    return { groups: [], cards: [] }
+  }
+}
+
+export async function createNode(input: {
+  key: string
+  title: string
+  parentKey?: string
+  format?: GroupFormat
+  icon?: string
+  sort?: number
+  enabled?: boolean
+}): Promise<SimpleResult> {
+  try {
+    const response = await fetch('/api/nodes', {
+      method: 'POST',
+      credentials: 'same-origin',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify(input),
+    })
+    return response.ok ? { ok: true } : { ok: false, error: await errorMessage(response, '创建失败') }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+export async function updateNode(
+  key: string,
+  patch: {
+    title?: string
+    parentKey?: string
+    sort?: number
+    format?: GroupFormat
+    icon?: string
+    enabled?: boolean
+  },
+): Promise<SimpleResult> {
+  try {
+    const response = await fetch(`/api/nodes/${encodeURIComponent(key)}`, {
+      method: 'PATCH',
+      credentials: 'same-origin',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify(patch),
+    })
+    return response.ok ? { ok: true } : { ok: false, error: await errorMessage(response, '保存失败') }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+export async function deleteNode(key: string): Promise<SimpleResult> {
+  try {
+    const response = await fetch(`/api/nodes/${encodeURIComponent(key)}`, {
+      method: 'DELETE',
+      credentials: 'same-origin',
+    })
+    return response.ok ? { ok: true } : { ok: false, error: await errorMessage(response, '删除失败') }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+export async function createCard(title: string): Promise<{ ok: true; id: number } | { ok: false; error: string }> {
+  try {
+    const response = await fetch('/api/cards', {
+      method: 'POST',
+      credentials: 'same-origin',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ title }),
+    })
+    if (!response.ok) return { ok: false, error: await errorMessage(response, '创建失败') }
+    const payload = (await response.json()) as { id: number }
+    return { ok: true, id: payload.id }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+export async function updateCard(
+  id: number,
+  patch: { title?: string; sort?: number },
+): Promise<SimpleResult> {
+  try {
+    const response = await fetch(`/api/cards/${id}`, {
+      method: 'PATCH',
+      credentials: 'same-origin',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify(patch),
+    })
+    return response.ok ? { ok: true } : { ok: false, error: await errorMessage(response, '保存失败') }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+export async function deleteCard(id: number): Promise<SimpleResult> {
+  try {
+    const response = await fetch(`/api/cards/${id}`, {
+      method: 'DELETE',
+      credentials: 'same-origin',
+    })
+    return response.ok ? { ok: true } : { ok: false, error: await errorMessage(response, '删除失败') }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+export async function setCardGroups(
+  id: number,
+  groups: CardGroupRef[],
+): Promise<SimpleResult> {
+  try {
+    const response = await fetch(`/api/cards/${id}/groups`, {
+      method: 'PUT',
+      credentials: 'same-origin',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify(groups),
+    })
+    return response.ok ? { ok: true } : { ok: false, error: await errorMessage(response, '保存失败') }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+/** 把分组树拍平成下拉选项 */
+export function flattenGroups(
+  groups: GroupNode[],
+  depth = 0,
+): { key: string; title: string; depth: number; format: GroupFormat; enabled: boolean }[] {
+  return groups.flatMap((group) => [
+    {
+      key: group.key,
+      title: group.title,
+      depth,
+      format: group.format,
+      enabled: group.enabled !== false,
+    },
+    ...flattenGroups(group.children, depth + 1),
+  ])
+}

stash-web/src/settings.ts

@@ -0,0 +1,433 @@
+/**
+ * 站点设置：页头滚动信息 + 侧栏顺序/显隐。
+ *
+ * 接口是公开读、登录后写；写的时候带 `version` 做乐观锁，
+ * 冲突（多标签页同时改）时返回 409，页面提示刷新。
+ */
+import type { Category } from './data/types'
+
+export type SettingsTone = 'plain' | 'primary' | 'success' | 'neutral'
+
+export type HeaderItem = {
+  text: string
+  tag?: string | null
+  tone: SettingsTone
+}
+
+export type SectionSettings = {
+  hidden: string[]
+  order: string[]
+  titles: Record<string, string>
+  limits: Record<string, number>
+}
+
+export type ProfileSettings = {
+  name: string
+  role: string
+  description: string
+  /** 完整文案，如「IP属地：局域网」 */
+  location: string
+  /** 头像地址；空表示用图标占位 */
+  avatar: string
+}
+
+export type SiteSettings = {
+  header: {
+    enabled: boolean
+    /** 滚动一轮的秒数（8–120） */
+    speed: number
+    /** 信息条目之间的间距（px），默认 26 ≈ 两个中文字宽 */
+    gap: number
+    items: HeaderItem[]
+  }
+  sidebar: {
+    /** 是否显示「本地管理员」资料卡 */
+    show_profile: boolean
+    /** 是否显示「本地服务」面板 */
+    show_service: boolean
+    /** 是否显示「分组导航」卡片（首页 / 分组树） */
+    show_nav: boolean
+    hidden: string[]
+    order: string[]
+    /** 隐藏的分组：`分区id/分组id` */
+    hidden_groups: string[]
+    /** 强制显示的分组（覆盖数据库 show_in_sidebar=0） */
+    shown_groups: string[]
+    /** 每个分区下的分组顺序：分区 id → 分组 id 列表 */
+    group_order: Record<string, string[]>
+    /** 新模型：侧栏隐藏的分组 key */
+    tree_hidden: string[]
+    /** 新模型：每级分组的顺序，键为父分组 key（根级用空串） */
+    tree_order: Record<string, string[]>
+  }
+  sections: SectionSettings
+  profile: ProfileSettings
+  /** 站点级：标签标题 / favicon / 品牌 / 页头操作工具 */
+  site: SiteMetaSettings
+}
+
+export type SiteTheme = 'light' | 'dark' | 'auto'
+
+export type SiteMetaSettings = {
+  /** 浏览器标签标题 */
+  title: string
+  /** favicon 地址；空表示用内置图标 */
+  favicon: string
+  /** 配色：浅色 / 深色 / 跟随系统 */
+  theme: SiteTheme
+  brand: {
+    /** 页头品牌文字，可留空 */
+    name: string
+    /** 没有图片时圆形标记里的首字 */
+    mark: string
+    /** logo 图片地址；空表示用首字 */
+    logo: string
+  }
+  actions: {
+    /** 明暗切换 */
+    theme: boolean
+    /** 刷新图标（重扫本地项目并重拉内容库） */
+    refresh: boolean
+    /** 站点设置图标 */
+    settings: boolean
+    /** 登录 / 退出登录 */
+    session: boolean
+  }
+}
+
+export type SettingsDocument = {
+  version: number
+  settings: SiteSettings
+}
+
+export type SettingsResult =
+  | { ok: true; document: SettingsDocument }
+  | { ok: false; status: number; error: string }
+
+export const TONE_OPTIONS: { value: SettingsTone; label: string }[] = [
+  { value: 'plain', label: '无底色' },
+  { value: 'neutral', label: '灰色' },
+  { value: 'primary', label: '品牌色' },
+  { value: 'success', label: '成功绿' },
+]
+
+export function defaultSettings(): SiteSettings {
+  return {
+    header: {
+      enabled: true,
+      speed: 24,
+      gap: 26,
+      items: [
+        { text: '共 {count} 个本地应用', tone: 'plain' },
+        { text: '{project}', tag: '本地', tone: 'primary' },
+        { text: '{status}', tag: '状态', tone: 'success' },
+      ],
+    },
+    sidebar: {
+      show_profile: true,
+      show_service: true,
+      show_nav: true,
+      hidden: [],
+      order: [],
+      hidden_groups: [],
+      shown_groups: [],
+      group_order: {},
+      tree_hidden: [],
+      tree_order: {},
+    },
+    sections: { hidden: [], order: [], titles: {}, limits: {} },
+    profile: {
+      name: '本地管理员',
+      role: '管理员',
+      description: '本地静态站点托管与预览，所有项目都运行在这台机器上。',
+      location: 'IP属地：局域网',
+      avatar: '',
+    },
+    site: {
+      title: 'Stash · 本地应用工作区',
+      favicon: '',
+      theme: 'auto',
+      brand: { name: 'STASH', mark: 'S', logo: '' },
+      actions: { theme: true, refresh: true, settings: true, session: true },
+    },
+  }
+}
+
+/** 占位符替换：`{count}` / `{project}` / `{status}` */
+export function fillHeaderText(
+  text: string,
+  context: { count: number; project?: string; live: boolean },
+): string {
+  return text
+    .replaceAll('{count}', String(context.count))
+    .replaceAll('{project}', context.project ?? '—')
+    .replaceAll('{status}', context.live ? '实时同步已连接' : '等待服务连接')
+}
+
+export async function fetchSettings(): Promise<SettingsDocument> {
+  try {
+    const response = await fetch('/api/settings', { credentials: 'same-origin' })
+    if (!response.ok) throw new Error(String(response.status))
+    return (await response.json()) as SettingsDocument
+  } catch {
+    return { version: 0, settings: defaultSettings() }
+  }
+}
+
+export async function saveSettings(
+  version: number,
+  settings: SiteSettings,
+): Promise<SettingsResult> {  try {
+    const response = await fetch('/api/settings', {
+      method: 'PATCH',
+      credentials: 'same-origin',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ version, settings }),
+    })
+
+    if (response.ok) {
+      return { ok: true, document: (await response.json()) as SettingsDocument }
+    }
+
+    const payload = (await response.json().catch(() => null)) as { error?: string } | null
+    return {
+      ok: false,
+      status: response.status,
+      error: payload?.error ?? `保存失败（${response.status}）`,
+    }
+  } catch (error) {
+    return {
+      ok: false,
+      status: 0,
+      error: error instanceof Error ? error.message : '网络错误',
+    }
+  }
+}
+
+/**
+ * 按设置重排侧栏：先按 `order`，未列出的保持原顺序，`hidden` 过滤掉。
+ */export function applySidebarSettings<T extends { id: string }>(
+  categories: T[],
+  sidebar: SiteSettings['sidebar'],
+): T[] {
+  return orderAndFilter(categories, sidebar)
+}
+
+/** 首页卡片：过滤隐藏、按 order 排序（未列出的保持原顺序） */
+export function applySectionSettings<T extends { id: string }>(
+  categories: T[],
+  sections: SectionSettings,
+): T[] {
+  return orderAndFilter(categories, sections)
+}
+
+/**
+ * 侧栏子分类（分组）：按设置过滤、排序。
+ *
+ * 数据库里的 `show_in_sidebar` 是默认值；`shown_groups` 可以把它强行打开，
+ * `hidden_groups` 则再隐藏一层。
+ */
+export function applySidebarGroups(
+  categories: Category[],
+  sidebar: SiteSettings['sidebar'],
+): Category[] {
+  return categories.map((category) => {
+    if (category.kind === 'apps') {
+      return { ...category, groups: filterGroups(category.groups, category.id, sidebar) }
+    }
+    if (category.kind === 'posters') {
+      return { ...category, groups: filterGroups(category.groups, category.id, sidebar) }
+    }
+    return { ...category, groups: filterGroups(category.groups, category.id, sidebar) }
+  })
+}
+
+/** 按设置过滤、排序某个分区下的分组 */
+function filterGroups<T extends { id: string }>(
+  groups: T[],
+  categoryId: string,
+  sidebar: SiteSettings['sidebar'],
+): T[] {
+  const hidden = new Set(sidebar.hidden_groups)
+  const shown = new Set(sidebar.shown_groups)
+  const ranks = new Map(
+    (sidebar.group_order[categoryId] ?? []).map((id, index) => [id, index] as const),
+  )
+
+  return groups
+    .filter((group) => {
+      const key = `${categoryId}/${group.id}`
+      const showInSidebar = (group as { showInSidebar?: boolean }).showInSidebar
+      return !hidden.has(key) && (showInSidebar !== false || shown.has(key))
+    })
+    .map((group, index) => ({
+      group,
+      index,
+      rank: ranks.get(group.id) ?? Number.MAX_SAFE_INTEGER,
+    }))
+    .sort((a, b) => (a.rank === b.rank ? a.index - b.index : a.rank - b.rank))
+    .map((entry) => entry.group)
+}
+
+/** 卡片标题：设置里的覆盖值优先 */
+export function sectionTitle(
+  id: string,
+  fallback: string,
+  sections: SectionSettings,
+): string {
+  const override = sections.titles[id]
+  return override !== undefined && override.trim() !== '' ? override : fallback
+}
+
+/** 卡片预览条数：设置里的覆盖值优先 */
+export function sectionLimit(
+  id: string,
+  fallback: number,
+  sections: SectionSettings,
+): number {
+  const override = sections.limits[id]
+  return typeof override === 'number' && override > 0 ? override : fallback
+}
+
+function orderAndFilter<T extends { id: string }>(  categories: T[],
+  config: { hidden: string[]; order: string[] },
+): T[] {
+  const hidden = new Set(config.hidden)
+  const ranks = new Map(config.order.map((id, index) => [id, index]))
+
+  return categories
+    .filter((category) => !hidden.has(category.id))
+    .map((category, index) => ({
+      category,
+      index,
+      rank: ranks.get(category.id) ?? Number.MAX_SAFE_INTEGER,
+    }))
+    .sort((a, b) => (a.rank === b.rank ? a.index - b.index : a.rank - b.rank))
+    .map((entry) => entry.category)
+}
+
+// ---------- 分区（首页卡片 / 侧栏项）的新增与删除 ----------
+
+export type NewCategory = { id: string; title: string; kind: 'apps' | 'posters' | 'articles' }
+
+export type SimpleResult = { ok: true } | { ok: false; error: string }
+
+export async function createCategory(input: NewCategory): Promise<SimpleResult> {
+  try {
+    const response = await fetch('/api/categories', {
+      method: 'POST',
+      credentials: 'same-origin',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify(input),
+    })
+    if (response.ok) return { ok: true }
+    const payload = (await response.json().catch(() => null)) as { error?: string } | null
+    return { ok: false, error: payload?.error ?? `创建失败（${response.status}）` }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+export async function deleteCategory(id: string): Promise<SimpleResult> {
+  try {
+    const response = await fetch(`/api/categories/${encodeURIComponent(id)}`, {
+      method: 'DELETE',
+      credentials: 'same-origin',
+    })
+    if (response.ok) return { ok: true }
+    const payload = (await response.json().catch(() => null)) as { error?: string } | null
+    return { ok: false, error: payload?.error ?? `删除失败（${response.status}）` }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+/** 修改分区（归类、标题、图标、色条、预览条数） */
+export type UpdateCategoryInput = {
+  title?: string
+  icon?: string
+  barColor?: string
+  kind?: 'apps' | 'posters' | 'articles'
+  previewLimit?: number
+  emptyText?: string
+  /** 首页卡片预览哪个节点（分区自己或其分组） */
+  blockNodeKey?: string
+  /** 是否允许子分组（与类型无关的开关） */
+  allowGroups?: boolean
+}
+
+export async function updateCategory(
+  id: string,
+  patch: UpdateCategoryInput,
+): Promise<SimpleResult> {
+  try {
+    const response = await fetch(`/api/categories/${encodeURIComponent(id)}`, {
+      method: 'PATCH',
+      credentials: 'same-origin',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify(patch),
+    })
+    if (response.ok) return { ok: true }
+    const payload = (await response.json().catch(() => null)) as { error?: string } | null
+    return { ok: false, error: payload?.error ?? `保存失败（${response.status}）` }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+// ---------- 分组（子分类） ----------
+
+export async function createGroup(
+  sectionId: string,
+  input: { id: string; title: string },
+): Promise<SimpleResult> {
+  try {
+    const response = await fetch(
+      `/api/categories/${encodeURIComponent(sectionId)}/groups`,
+      {
+        method: 'POST',
+        credentials: 'same-origin',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify(input),
+      },
+    )
+    if (response.ok) return { ok: true }
+    const payload = (await response.json().catch(() => null)) as { error?: string } | null
+    return { ok: false, error: payload?.error ?? `创建失败（${response.status}）` }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+export async function updateGroup(
+  id: string,
+  patch: { title?: string; showInSidebar?: boolean },
+): Promise<SimpleResult> {
+  try {
+    const response = await fetch(`/api/groups/${encodeURIComponent(id)}`, {
+      method: 'PATCH',
+      credentials: 'same-origin',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify(patch),
+    })
+    if (response.ok) return { ok: true }
+    const payload = (await response.json().catch(() => null)) as { error?: string } | null
+    return { ok: false, error: payload?.error ?? `保存失败（${response.status}）` }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}
+
+export async function deleteGroup(id: string): Promise<SimpleResult> {
+  try {
+    const response = await fetch(`/api/groups/${encodeURIComponent(id)}`, {
+      method: 'DELETE',
+      credentials: 'same-origin',
+    })
+    if (response.ok) return { ok: true }
+    const payload = (await response.json().catch(() => null)) as { error?: string } | null
+    return { ok: false, error: payload?.error ?? `删除失败（${response.status}）` }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : '网络错误' }
+  }
+}

stash-web/src/theme.ts

@@ -0,0 +1,35 @@
+/**
+ * 明暗主题的「本机偏好」。
+ *
+ * 站点设置里的 `site.theme` 是**所有人**的默认值；这里的 localStorage 是**这台浏览器**
+ * 的选择，读到时优先于默认值。前台页头的切换按钮只改本机偏好，不需要登录；
+ * 后台「页头 → 配色」改的是站点默认值。
+ */
+export type ThemeChoice = 'light' | 'dark'
+
+const STORAGE_KEY = 'stash-theme'
+
+export function readThemeOverride(): ThemeChoice | null {
+  try {
+    const value = window.localStorage.getItem(STORAGE_KEY)
+    return value === 'light' || value === 'dark' ? value : null
+  } catch {
+    return null
+  }
+}
+
+export function writeThemeOverride(value: ThemeChoice | null): void {
+  try {
+    if (value === null) window.localStorage.removeItem(STORAGE_KEY)
+    else window.localStorage.setItem(STORAGE_KEY, value)
+  } catch {
+    // 隐私模式下 localStorage 可能不可写，忽略即可
+  }
+}
+
+/** `light` / `dark` / `auto` 里，当前实际是不是深色 */
+export function isDarkScheme(scheme: string): boolean {
+  if (scheme === 'dark') return true
+  if (scheme === 'light') return false
+  return window.matchMedia('(prefers-color-scheme: dark)').matches
+}

stash-web/vite.config.ts

@@ -6,6 +6,10 @@ const BACKEND = 'http://127.0.0.1:8080'
 // 前后端分离开发：dev / preview 都把 /api 透传给本地 Rust 服务
 export default defineConfig({
   plugins: [react()],
+  // @stash/ui 是本地 file 依赖（软链），去重 React，避免加载两份运行时
+  resolve: {
+    dedupe: ['react', 'react-dom'],
+  },
   server: {
     port: 5173,
     proxy: {