Merge branch 'chore/sidebar-240'

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

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

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

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

@@ -36,15 +36,11 @@
   async function restore(e: BinEntry): Promise<void> {
     busyId = e.id;
     try {
-      const r = await api<{ name: string; renamedFrom?: string }>(
+      const r = await api<{ name: string }>(
         `/database/api/bin/${encodeURIComponent(e.id)}/restore`,
         { method: "POST" },
       );
-      toastOk(
+      toastOk(`已恢复「${r.name}」`);
-        r.renamedFrom !== undefined && r.renamedFrom !== r.name
-          ? `已恢复为「${r.name}」(原名与现有节点冲突)`
-          : `已恢复「${r.name}」`,
-      );
       await load();
     } catch (err) {
       toastErr(err instanceof Error ? err.message : String(err));

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

@@ -31,13 +31,13 @@
   oncontextmenu={(e) => { e.preventDefault(); e.stopPropagation(); oncontextmenu(e.clientX, e.clientY); }}
   title={name}
 >
-  <span class="flex h-14 w-14 items-center justify-center">
+  <span class="flex h-20 w-20 items-center justify-center">
     {#if kind === "FOLDER"}
-      <svg width="54" height="54" viewBox="0 0 24 24" fill="#f5c94a" stroke="#d9a92b" stroke-width="0.6" stroke-linejoin="round"><path d="M3 7a2 2 0 0 1 2-2h4l2 2h8a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V7Z" /></svg>
+      <svg width="72" height="72" viewBox="0 0 24 24" fill="#f5c94a" stroke="#d9a92b" stroke-width="0.6" stroke-linejoin="round"><path d="M3 7a2 2 0 0 1 2-2h4l2 2h8a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V7Z" /></svg>
     {:else if kind === "PROJECT"}
-      <svg width="50" height="50" viewBox="0 0 24 24" fill="#e8f0ea" stroke="#4a6741" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"><path d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4" /></svg>
+      <svg width="66" height="66" viewBox="0 0 24 24" fill="#e8f0ea" stroke="#4a6741" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"><path d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4" /></svg>
     {:else}
-      <svg width="46" height="46" viewBox="0 0 24 24" fill="#ffffff" stroke="#9c9b96" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"><path d="M14 3H7a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V8l-5-5Z" /><path d="M14 3v5h5" /><path d="M9 13h6M9 17h6" /></svg>
+      <svg width="60" height="60" viewBox="0 0 24 24" fill="#ffffff" stroke="#9c9b96" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"><path d="M14 3H7a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V8l-5-5Z" /><path d="M14 3v5h5" /><path d="M9 13h6M9 17h6" /></svg>
     {/if}
   </span>
   <span class="line-clamp-2 w-full break-all text-center text-[12.5px] leading-snug text-ink">{name}</span>

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

@@ -11,7 +11,6 @@
   import { onMount } from "svelte";
   import { api } from "./api.js";
   import { me, toastErr, toastOk } from "./stores.js";
-  import { logout } from "./session.js";
   import { selectedFilePath, clearSelectedFile } from "./browser.js";
   import { ROLE_LABEL } from "./labels.js";
   import type { FileEntry, NodeChild, NodeDetail, Role } from "./types.js";
@@ -61,7 +60,6 @@
     currentFolder === null ? ($me?.isWebsiteAdmin ?? false) : atLeast(currentFolder.role, "EDIT"),
   );
   const projectCanEdit = $derived(projectNode !== null && projectNode.role !== "VIEW");
-  const initial = $derived(($me?.displayName ?? $me?.userId ?? "U").slice(0, 1).toUpperCase());
 
   /* ------------------------------------------------------------ 数据加载 */
 
@@ -387,16 +385,6 @@
       </button>
     {/if}
     <button class="btn btn-sm" onclick={refresh} title="刷新"><Icon name="refresh" size={13} /></button>
-
-    <div class="ml-1 flex shrink-0 items-center gap-2 border-l border-line-soft pl-3">
-      <span class="flex h-6 w-6 items-center justify-center rounded-full bg-accent text-[11px] font-semibold text-white">{initial}</span>
-      <span class="max-w-[120px] truncate text-[12.5px] text-ink">{$me?.displayName ?? $me?.userId ?? ""}</span>
-      <button
-        class="rounded-lg border border-line-soft px-2 py-1 text-[11.5px] text-ink-3 transition hover:bg-hover hover:text-ink"
-        onclick={logout}
-        title="退出登录"
-      >退出</button>
-    </div>
   </header>
 
   <!-- 主体:网格 + 文件预览栏 -->
@@ -416,7 +404,7 @@
             {currentFolder === null ? "空文件库" : "空文件夹"}{canCreateHere ? " · 右键或点上方按钮新建" : ""}
           </div>
         {:else}
-          <div class="grid grid-cols-[repeat(auto-fill,minmax(118px,1fr))] gap-x-2 gap-y-4">
+          <div class="grid grid-cols-[repeat(auto-fill,minmax(132px,1fr))] gap-x-2 gap-y-4">
             {#each children as n (n.id)}
               <GridCard
                 kind={n.kind}
@@ -438,7 +426,7 @@
         {:else if files.length === 0}
           <div class="quiet py-10 text-center">空仓库{projectCanEdit ? " · 右键或点上方按钮新建文件" : ""}</div>
         {:else}
-          <div class="grid grid-cols-[repeat(auto-fill,minmax(118px,1fr))] gap-x-2 gap-y-4">
+          <div class="grid grid-cols-[repeat(auto-fill,minmax(132px,1fr))] gap-x-2 gap-y-4">
             {#each files as f (f.path)}
               <GridCard
                 kind="FILE"

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

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

hub/src/database/filelib/binService.ts

@@ -11,7 +11,7 @@
  */
 
 import type { PrismaClient } from "@prisma/client";
-import { FileLibError, nameKey, NODE_NAME_MAX_LENGTH } from "./model.js";
+import { FileLibError, nameKey } from "./model.js";
 import { FILE_LIB_AUDIT_ACTIONS, writeFileLibAudit } from "./audit.js";
 import type { GroupResolver } from "./groupResolver.js";
 import type { FileLibActor } from "./treeService.js";
@@ -113,7 +113,6 @@ async function requireBinEntry(
 
 export interface RestoreResult {
   readonly name: string;
-  readonly renamedFrom?: string | undefined;
 }
 
 /**
@@ -126,33 +125,21 @@ export async function restoreBinEntry(deps: BinDeps, actor: FileLibActor, nodeId
   return deps.prisma.$transaction(async (tx) => {
     const node = await requireBinEntry(tx as PrismaClient, deps, actor, groupIds, nodeId);
 
-    const siblings = await tx.fileLibNode.findMany({
+    const clash = await tx.fileLibNode.findFirst({
       where: {
         organizationId: deps.organizationId,
         parentId: node.parentId,
         deletedAt: null,
         id: { not: node.id },
+        nameLower: nameKey(node.name),
       },
-      select: { nameLower: true },
+      select: { id: true },
     });
-    const taken = new Set(siblings.map((s) => s.nameLower));
+    if (clash !== null) {
-
+      throw new FileLibError(409, "name_conflict_on_restore", "name conflict on restore");
-    let name = node.name;
-    let renamedFrom: string | undefined;
-    if (taken.has(nameKey(name))) {
-      renamedFrom = node.name;
-      let n = 1;
-      do {
-        const suffix = n === 1 ? "(已恢复)" : `(已恢复 ${n})`;
-        name = node.name.slice(0, NODE_NAME_MAX_LENGTH - suffix.length) + suffix;
-        n += 1;
-      } while (taken.has(nameKey(name)));
     }
 
-    await tx.fileLibNode.update({
+    await tx.fileLibNode.update({ where: { id: node.id }, data: { deletedAt: null } });
-      where: { id: node.id },
-      data: { deletedAt: null, name, nameLower: nameKey(name) },
-    });
     await writeFileLibAudit(tx, {
       action: node.kind === "PROJECT"
         ? FILE_LIB_AUDIT_ACTIONS.projectRestore
@@ -162,9 +149,9 @@ export async function restoreBinEntry(deps: BinDeps, actor: FileLibActor, nodeId
       objectType: node.kind === "PROJECT" ? "project" : "folder",
       objectId: node.id,
       objectPath: node.pathIds,
-      detail: { name, ...(renamedFrom !== undefined ? { renamedFrom } : {}) },
+      detail: { name: node.name },
     });
-    return { name, renamedFrom };
+    return { name: node.name };
   });
 }
 

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

@@ -10,6 +10,7 @@ import {
   createNode,
   softDeleteNode,
   listChildren,
+  renameNode,
   type FileLibActor,
   type TreeServiceDeps,
 } from "../../src/database/filelib/treeService.js";
@@ -92,30 +93,27 @@ describe("binService · 恢复", () => {
     expect(audits).toHaveLength(1);
   });
 
-  it("ADR-0033:与活跃兄弟撞名时恢复为「(已恢复)」,不死锁;审计记 renamedFrom", async () => {
+  it("ADR-0035:撞名时恢复报 name_conflict_on_restore(不自动改名),清名后可恢复", async () => {
     const root = await createNode(treeDeps(), ADMIN, { parentId: null, kind: "FOLDER", name: "物理" });
     const child = await createNode(treeDeps(), ADMIN, { parentId: root.id, kind: "FOLDER", name: "必修一" });
     await softDeleteNode(treeDeps(), ADMIN, child.id);
-    // 删除后同名新建 → 活跃兄弟占了名字
+    // 删除后同名新建 -> 活跃兄弟占了名字
     await createNode(treeDeps(), ADMIN, { parentId: root.id, kind: "FOLDER", name: "必修一" });
 
+    await expect(restoreBinEntry(binDeps(), ADMIN, child.id)).rejects.toMatchObject({
+      statusCode: 409,
+      code: "name_conflict_on_restore",
+    });
+
+    // 改名现有节点后恢复 -> 成功,保留原名
+    const active = (await listChildren(treeDeps(), ADMIN, root.id)).find((c) => c.name === "必修一")!;
+    await renameNode(treeDeps(), ADMIN, active.id, "必修一(新)");
     const result = await restoreBinEntry(binDeps(), ADMIN, child.id);
-    expect(result.renamedFrom).toBe("必修一");
+    expect(result.name).toBe("必修一");
-    expect(result.name).toBe("必修一(已恢复)");
+    expect(result.renamedFrom).toBeUndefined();
 
     const visible = await listChildren(treeDeps(), ADMIN, root.id);
-    expect(visible.map((c) => c.name).sort()).toEqual(["必修一", "必修一(已恢复)"]);
+    expect(visible.map((c) => c.name).sort()).toEqual(["必修一", "必修一(新)"]);
-
-    // 再删再恢复:名字已是去重后的「(已恢复)」,不再冲突 → 保持,不二次改名
-    await softDeleteNode(treeDeps(), ADMIN, child.id);
-    const second = await restoreBinEntry(binDeps(), ADMIN, child.id);
-    expect(second.name).toBe("必修一(已恢复)");
-    expect(second.renamedFrom).toBeUndefined();
-
-    const audits = await prisma.auditEntry.findMany({
-      where: { action: FILE_LIB_AUDIT_ACTIONS.folderRestore },
-    });
-    expect(audits).toHaveLength(2);
   });
 });