From 96d5397cb5fe7037cb6eef449fab2a87deafbab1 Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Tue, 13 Jan 2026 00:37:29 +0900
Subject: [PATCH 01/15] =?UTF-8?q?docker.yaml=20=ED=8C=8C=EC=9D=BC=EC=9D=98?=
 =?UTF-8?q?=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/docker.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 6f0627d..9e085c8 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -31,7 +31,7 @@ jobs:
         with:
           images: ghcr.io/${{ github.repository }}
           tags: |
-            type=semver,value={{version}}
+            type=semver,pattern={{version}}
             type=raw,value=latest
             type=sha
 

From 37bd6a9315b705b98fc9dd61b579591e920724f5 Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Thu, 15 Jan 2026 15:11:03 +0900
Subject: [PATCH 02/15] =?UTF-8?q?=EA=B2=80=EC=83=89=20=EA=B8=B0=EB=8A=A5?=
 =?UTF-8?q?=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/components/atoms/Chip.svelte          |  53 +++++
 .../components/atoms/RowVirtualizer.svelte    |  16 +-
 .../atoms/buttons/ActionEntryButton.svelte    |   2 +-
 src/lib/components/atoms/index.ts             |   1 +
 .../components/atoms/inputs/TextInput.svelte  |   2 +-
 .../components/molecules/SubCategories.svelte |   6 +-
 src/lib/components/molecules/TopBar.svelte    |  19 +-
 src/lib/modules/file/upload.svelte.ts         |   2 +
 src/lib/modules/filesystem/types.ts           |   8 +-
 src/lib/server/db/file.ts                     | 132 ++++++++++++
 .../(fullscreen)/file/[id]/+page.svelte       |   4 +-
 .../(fullscreen)/file/uploads/+page.svelte    |   2 +-
 src/routes/(fullscreen)/gallery/+page.svelte  |   2 +-
 src/routes/(fullscreen)/search/+page.svelte   | 193 ++++++++++++++++++
 src/routes/(fullscreen)/search/+page.ts       |  18 ++
 .../(fullscreen)/search/Directory.svelte      |  16 ++
 src/routes/(fullscreen)/search/File.svelte    |  25 +++
 .../(fullscreen)/search/SearchBar.svelte      |  27 +++
 .../search/SelectCategoryBottomSheet.svelte   |  54 +++++
 src/routes/(fullscreen)/search/service.ts     |  95 +++++++++
 .../(main)/category/[[id]]/+page.svelte       |  12 +-
 .../(main)/directory/[[id]]/+page.svelte      |  35 +++-
 .../DirectoryEntries/DirectoryEntries.svelte  |  11 +-
 src/trpc/router.server.ts                     |   2 +
 src/trpc/routers/index.ts                     |   1 +
 src/trpc/routers/search.ts                    |  54 +++++
 26 files changed, 757 insertions(+), 35 deletions(-)
 create mode 100644 src/lib/components/atoms/Chip.svelte
 create mode 100644 src/routes/(fullscreen)/search/+page.svelte
 create mode 100644 src/routes/(fullscreen)/search/+page.ts
 create mode 100644 src/routes/(fullscreen)/search/Directory.svelte
 create mode 100644 src/routes/(fullscreen)/search/File.svelte
 create mode 100644 src/routes/(fullscreen)/search/SearchBar.svelte
 create mode 100644 src/routes/(fullscreen)/search/SelectCategoryBottomSheet.svelte
 create mode 100644 src/routes/(fullscreen)/search/service.ts
 create mode 100644 src/trpc/routers/search.ts

diff --git a/src/lib/components/atoms/Chip.svelte b/src/lib/components/atoms/Chip.svelte
new file mode 100644
index 0000000..034defc
--- /dev/null
+++ b/src/lib/components/atoms/Chip.svelte
@@ -0,0 +1,53 @@
+<script lang="ts">
+  import type { Snippet } from "svelte";
+  import type { ClassValue } from "svelte/elements";
+
+  import IconClose from "~icons/material-symbols/close";
+
+  interface Props {
+    children: Snippet;
+    class?: ClassValue;
+    onclick?: () => void;
+    onRemoveClick?: () => void;
+    selected?: boolean;
+    removable?: boolean;
+  }
+
+  let {
+    children,
+    class: className,
+    onclick = () => (selected = !selected),
+    onRemoveClick,
+    removable = false,
+    selected = $bindable(false),
+  }: Props = $props();
+</script>
+
+<!-- svelte-ignore a11y_no_static_element_interactions -->
+<!-- svelte-ignore a11y_click_events_have_key_events -->
+<div
+  onclick={onclick && (() => setTimeout(onclick, 100))}
+  class={[
+    "inline-flex cursor-pointer items-center gap-x-1 rounded-lg px-3 py-1.5 text-sm font-medium transition active:scale-95",
+    selected
+      ? "bg-primary-500 text-white active:bg-primary-400"
+      : "bg-gray-100 text-gray-700 active:bg-gray-200",
+    className,
+  ]}
+>
+  <span>
+    {@render children()}
+  </span>
+  {#if selected && removable}
+    <button
+      onclick={(e) => {
+        e.stopPropagation();
+        if (onRemoveClick) {
+          setTimeout(onRemoveClick, 100);
+        }
+      }}
+    >
+      <IconClose />
+    </button>
+  {/if}
+</div>
diff --git a/src/lib/components/atoms/RowVirtualizer.svelte b/src/lib/components/atoms/RowVirtualizer.svelte
index 67a684d..2641806 100644
--- a/src/lib/components/atoms/RowVirtualizer.svelte
+++ b/src/lib/components/atoms/RowVirtualizer.svelte
@@ -6,13 +6,22 @@
   interface Props {
     class?: ClassValue;
     count: number;
+    estimateItemHeight: (index: number) => number;
+    getItemKey?: (index: number) => string | number;
     item: Snippet<[index: number]>;
-    itemHeight: (index: number) => number;
     itemGap?: number;
     placeholder?: Snippet;
   }
 
-  let { class: className, count, item, itemHeight, itemGap, placeholder }: Props = $props();
+  let {
+    class: className,
+    count,
+    estimateItemHeight,
+    getItemKey,
+    item,
+    itemGap,
+    placeholder,
+  }: Props = $props();
 
   let element: HTMLElement | undefined = $state();
   let scrollMargin = $state(0);
@@ -20,8 +29,9 @@
   let virtualizer = $derived(
     createWindowVirtualizer({
       count,
-      estimateSize: itemHeight,
+      estimateSize: estimateItemHeight,
       gap: itemGap,
+      getItemKey: getItemKey,
       scrollMargin,
     }),
   );
diff --git a/src/lib/components/atoms/buttons/ActionEntryButton.svelte b/src/lib/components/atoms/buttons/ActionEntryButton.svelte
index c29fd7f..b257241 100644
--- a/src/lib/components/atoms/buttons/ActionEntryButton.svelte
+++ b/src/lib/components/atoms/buttons/ActionEntryButton.svelte
@@ -49,7 +49,7 @@
   </div>
 </div>
 
-<style>
+<style lang="postcss">
   #container:active:not(:has(#action-button:active)) {
     @apply bg-gray-100;
   }
diff --git a/src/lib/components/atoms/index.ts b/src/lib/components/atoms/index.ts
index 61a0238..5ab8892 100644
--- a/src/lib/components/atoms/index.ts
+++ b/src/lib/components/atoms/index.ts
@@ -1,5 +1,6 @@
 export { default as BottomSheet } from "./BottomSheet.svelte";
 export * from "./buttons";
+export { default as Chip } from "./Chip.svelte";
 export * from "./divs";
 export * from "./inputs";
 export { default as Modal } from "./Modal.svelte";
diff --git a/src/lib/components/atoms/inputs/TextInput.svelte b/src/lib/components/atoms/inputs/TextInput.svelte
index 613c85c..c2b6406 100644
--- a/src/lib/components/atoms/inputs/TextInput.svelte
+++ b/src/lib/components/atoms/inputs/TextInput.svelte
@@ -28,7 +28,7 @@
   </div>
 </div>
 
-<style>
+<style lang="postcss">
   input:focus,
   input:not(:placeholder-shown) {
     @apply border-primary-300;
diff --git a/src/lib/components/molecules/SubCategories.svelte b/src/lib/components/molecules/SubCategories.svelte
index 6db38f1..f756e00 100644
--- a/src/lib/components/molecules/SubCategories.svelte
+++ b/src/lib/components/molecules/SubCategories.svelte
@@ -10,9 +10,9 @@
     class?: ClassValue;
     info: CategoryInfo;
     onSubCategoryClick: (subCategory: SelectedCategory) => void;
-    onSubCategoryCreateClick: () => void;
+    onSubCategoryCreateClick?: () => void;
     onSubCategoryMenuClick?: (category: SelectedCategory) => void;
-    subCategoryCreatePosition?: "top" | "bottom";
+    subCategoryCreatePosition?: "top" | "bottom" | "none";
     subCategoryMenuIcon?: Component<SvelteHTMLElements["svg"]>;
   }
 
@@ -22,7 +22,7 @@
     onSubCategoryClick,
     onSubCategoryCreateClick,
     onSubCategoryMenuClick,
-    subCategoryCreatePosition = "bottom",
+    subCategoryCreatePosition = "none",
     subCategoryMenuIcon,
   }: Props = $props();
 </script>
diff --git a/src/lib/components/molecules/TopBar.svelte b/src/lib/components/molecules/TopBar.svelte
index cf7f8b8..b832c69 100644
--- a/src/lib/components/molecules/TopBar.svelte
+++ b/src/lib/components/molecules/TopBar.svelte
@@ -8,10 +8,11 @@
     children?: Snippet;
     class?: ClassValue;
     onBackClick?: () => void;
+    showBackButton?: boolean;
     title?: string;
   }
 
-  let { children, class: className, onBackClick, title }: Props = $props();
+  let { children, class: className, onBackClick, showBackButton = true, title }: Props = $props();
 </script>
 
 <div
@@ -20,12 +21,16 @@
     className,
   ]}
 >
-  <button
-    onclick={onBackClick || (() => history.back())}
-    class="w-[2.3rem] flex-shrink-0 rounded-full p-1 active:bg-black active:bg-opacity-[0.04]"
-  >
-    <IconArrowBack class="text-2xl" />
-  </button>
+  <div class="w-[2.3rem] flex-shrink-0">
+    {#if showBackButton}
+      <button
+        onclick={onBackClick ?? (() => history.back())}
+        class="w-[2.3rem] flex-shrink-0 rounded-full p-1 active:bg-black active:bg-opacity-[0.04]"
+      >
+        <IconArrowBack class="text-2xl" />
+      </button>
+    {/if}
+  </div>
   {#if title}
     <p class="flex-grow truncate text-center text-lg font-semibold">{title}</p>
   {/if}
diff --git a/src/lib/modules/file/upload.svelte.ts b/src/lib/modules/file/upload.svelte.ts
index 7ac15ce..18215a6 100644
--- a/src/lib/modules/file/upload.svelte.ts
+++ b/src/lib/modules/file/upload.svelte.ts
@@ -10,6 +10,7 @@ import { Scheduler } from "$lib/utils";
 import { trpc } from "$trpc/client";
 
 export interface FileUploadState {
+  id: string;
   name: string;
   parentId: DirectoryId;
   status:
@@ -208,6 +209,7 @@ export const uploadFile = async (
   onDuplicate: () => Promise<boolean>,
 ) => {
   uploadingFiles.push({
+    id: crypto.randomUUID(),
     name: file.name,
     parentId,
     status: "queued",
diff --git a/src/lib/modules/filesystem/types.ts b/src/lib/modules/filesystem/types.ts
index f4ce9cf..58df5eb 100644
--- a/src/lib/modules/filesystem/types.ts
+++ b/src/lib/modules/filesystem/types.ts
@@ -1,7 +1,7 @@
 export type DataKey = { key: CryptoKey; version: Date };
 type AllUndefined<T> = { [K in keyof T]?: undefined };
 
-interface LocalDirectoryInfo {
+export interface LocalDirectoryInfo {
   id: number;
   parentId: DirectoryId;
   dataKey?: DataKey;
@@ -10,7 +10,7 @@ interface LocalDirectoryInfo {
   files: SummarizedFileInfo[];
 }
 
-interface RootDirectoryInfo {
+export interface RootDirectoryInfo {
   id: "root";
   parentId?: undefined;
   dataKey?: undefined;
@@ -45,7 +45,7 @@ export type MaybeFileInfo =
 export type SummarizedFileInfo = Omit<FileInfo, "categories">;
 export type CategoryFileInfo = SummarizedFileInfo & { isRecursive: boolean };
 
-interface LocalCategoryInfo {
+export interface LocalCategoryInfo {
   id: number;
   parentId: DirectoryId;
   dataKey?: DataKey;
@@ -55,7 +55,7 @@ interface LocalCategoryInfo {
   isFileRecursive: boolean;
 }
 
-interface RootCategoryInfo {
+export interface RootCategoryInfo {
   id: "root";
   parentId?: undefined;
   dataKey?: undefined;
diff --git a/src/lib/server/db/file.ts b/src/lib/server/db/file.ts
index d0c54cc..0f396c8 100644
--- a/src/lib/server/db/file.ts
+++ b/src/lib/server/db/file.ts
@@ -101,6 +101,39 @@ export const getAllDirectoriesByParent = async (userId: number, parentId: Direct
   );
 };
 
+export const getAllRecursiveDirectoriesByParent = async (userId: number, parentId: DirectoryId) => {
+  const directories = await db
+    .withRecursive("directory_tree", (db) =>
+      db
+        .selectFrom("directory")
+        .selectAll()
+        .$if(parentId === "root", (qb) => qb.where("parent_id", "is", null))
+        .$if(parentId !== "root", (qb) => qb.where("parent_id", "=", parentId as number))
+        .where("user_id", "=", userId)
+        .unionAll((db) =>
+          db
+            .selectFrom("directory")
+            .innerJoin("directory_tree", "directory.parent_id", "directory_tree.id")
+            .selectAll("directory"),
+        ),
+    )
+    .selectFrom("directory_tree")
+    .selectAll()
+    .execute();
+  return directories.map(
+    (directory) =>
+      ({
+        id: directory.id,
+        parentId: directory.parent_id ?? "root",
+        userId: directory.user_id,
+        mekVersion: directory.master_encryption_key_version,
+        encDek: directory.encrypted_data_encryption_key,
+        dekVersion: directory.data_encryption_key_version,
+        encName: directory.encrypted_name,
+      }) satisfies Directory,
+  );
+};
+
 export const getDirectory = async (userId: number, directoryId: number) => {
   const directory = await db
     .selectFrom("directory")
@@ -434,6 +467,105 @@ export const getFilesWithCategories = async (userId: number, fileIds: number[])
   );
 };
 
+export const searchFiles = async (
+  userId: number,
+  filters: {
+    parentId: DirectoryId;
+    includeCategoryIds: number[];
+    excludeCategoryIds: number[];
+  },
+) => {
+  const ctes: string[] = [];
+  const conditions: string[] = [];
+
+  if (filters.parentId === "root") {
+    conditions.push(`user_id = ${userId}`);
+  } else {
+    ctes.push(`
+      directory_tree AS (
+        SELECT id FROM directory WHERE user_id = ${userId} AND id = ${filters.parentId}
+        UNION ALL
+        SELECT d.id FROM directory d INNER JOIN directory_tree dt ON d.parent_id = dt.id
+      )`);
+    conditions.push(`parent_id IN (SELECT id FROM directory_tree)`);
+  }
+
+  filters.includeCategoryIds.forEach((categoryId, index) => {
+    ctes.push(`
+      include_category_tree_${index} AS (
+        SELECT id FROM category WHERE user_id = ${userId} AND id = ${categoryId}
+        UNION ALL
+        SELECT c.id FROM category c INNER JOIN include_category_tree_${index} ct ON c.parent_id = ct.id
+      )`);
+    conditions.push(`
+      EXISTS(
+        SELECT 1 FROM file_category
+        WHERE file_id = file.id
+        AND EXISTS (SELECT 1 FROM include_category_tree_${index} ct WHERE ct.id = category_id)
+      )`);
+  });
+
+  if (filters.excludeCategoryIds.length > 0) {
+    ctes.push(`
+      exclude_category_tree AS (
+        SELECT id FROM category WHERE user_id = ${userId} AND id IN (${filters.excludeCategoryIds.join(",")})
+        UNION ALL
+        SELECT c.id FROM category c INNER JOIN exclude_category_tree ct ON c.parent_id = ct.id
+      )`);
+    conditions.push(`
+      NOT EXISTS(
+        SELECT 1 FROM file_category
+        WHERE file_id = id
+        AND EXISTS (SELECT 1 FROM exclude_category_tree ct WHERE ct.id = category_id)
+      )`);
+  }
+
+  const query = `
+    ${ctes.length > 0 ? `WITH RECURSIVE ${ctes.join(",")}` : ""}
+    SELECT * FROM file
+    WHERE ${conditions.join(" AND ")}
+  `;
+  const { rows } = await sql
+    .raw<{
+      id: number;
+      parent_id: number | null;
+      user_id: number;
+      path: string;
+      master_encryption_key_version: number;
+      encrypted_data_encryption_key: string;
+      data_encryption_key_version: Date;
+      hmac_secret_key_version: number;
+      content_hmac: string;
+      content_type: string;
+      encrypted_content_iv: string;
+      encrypted_content_hash: string;
+      encrypted_name: Ciphertext;
+      encrypted_created_at: Ciphertext | null;
+      encrypted_last_modified_at: Ciphertext;
+    }>(query)
+    .execute(db);
+  return rows.map(
+    (file) =>
+      ({
+        id: file.id,
+        parentId: file.parent_id ?? "root",
+        userId: file.user_id,
+        path: file.path,
+        mekVersion: file.master_encryption_key_version,
+        encDek: file.encrypted_data_encryption_key,
+        dekVersion: file.data_encryption_key_version,
+        hskVersion: file.hmac_secret_key_version,
+        contentHmac: file.content_hmac,
+        contentType: file.content_type,
+        encContentIv: file.encrypted_content_iv,
+        encContentHash: file.encrypted_content_hash,
+        encName: file.encrypted_name,
+        encCreatedAt: file.encrypted_created_at,
+        encLastModifiedAt: file.encrypted_last_modified_at,
+      }) satisfies File,
+  );
+};
+
 export const setFileEncName = async (
   userId: number,
   fileId: number,
diff --git a/src/routes/(fullscreen)/file/[id]/+page.svelte b/src/routes/(fullscreen)/file/[id]/+page.svelte
index 053d6bf..6221249 100644
--- a/src/routes/(fullscreen)/file/[id]/+page.svelte
+++ b/src/routes/(fullscreen)/file/[id]/+page.svelte
@@ -150,7 +150,9 @@
     </button>
     <TopBarMenu
       bind:isOpen={isMenuOpen}
-      directoryId={["category", "gallery"].includes(page.url.searchParams.get("from") ?? "")
+      directoryId={["category", "gallery", "search"].includes(
+        page.url.searchParams.get("from") ?? "",
+      )
         ? info?.parentId
         : undefined}
       {fileBlob}
diff --git a/src/routes/(fullscreen)/file/uploads/+page.svelte b/src/routes/(fullscreen)/file/uploads/+page.svelte
index d280e7f..d280ab1 100644
--- a/src/routes/(fullscreen)/file/uploads/+page.svelte
+++ b/src/routes/(fullscreen)/file/uploads/+page.svelte
@@ -16,7 +16,7 @@
 <TopBar />
 <FullscreenDiv>
   <div class="space-y-2 pb-4">
-    {#each uploadingFiles as file}
+    {#each uploadingFiles as file (file.id)}
       <File state={file} />
     {/each}
   </div>
diff --git a/src/routes/(fullscreen)/gallery/+page.svelte b/src/routes/(fullscreen)/gallery/+page.svelte
index b27b15f..ced406f 100644
--- a/src/routes/(fullscreen)/gallery/+page.svelte
+++ b/src/routes/(fullscreen)/gallery/+page.svelte
@@ -63,7 +63,7 @@
 <FullscreenDiv>
   <RowVirtualizer
     count={rows.length}
-    itemHeight={(index) =>
+    estimateItemHeight={(index) =>
       rows[index]!.type === "header" ? 28 : 181 + (rows[index]!.isLast ? 16 : 4)}
     class="flex flex-grow flex-col"
   >
diff --git a/src/routes/(fullscreen)/search/+page.svelte b/src/routes/(fullscreen)/search/+page.svelte
new file mode 100644
index 0000000..08315cf
--- /dev/null
+++ b/src/routes/(fullscreen)/search/+page.svelte
@@ -0,0 +1,193 @@
+<script lang="ts">
+  import { slide } from "svelte/transition";
+  import { goto } from "$app/navigation";
+  import { Chip, FullscreenDiv, RowVirtualizer } from "$lib/components/atoms";
+  import {
+    getDirectoryInfo,
+    type LocalCategoryInfo,
+    type MaybeDirectoryInfo,
+  } from "$lib/modules/filesystem";
+  import { masterKeyStore } from "$lib/stores";
+  import { HybridPromise, sortEntries } from "$lib/utils";
+  import Directory from "./Directory.svelte";
+  import File from "./File.svelte";
+  import SearchBar from "./SearchBar.svelte";
+  import SelectCategoryBottomSheet from "./SelectCategoryBottomSheet.svelte";
+  import { requestSearch, type SearchFilter, type SearchResult } from "./service";
+
+  let { data } = $props();
+
+  let directoryInfo: MaybeDirectoryInfo | undefined = $state();
+
+  let filters = $state({
+    name: "",
+    includeImages: false,
+    includeVideos: false,
+    includeDirectories: false,
+    searchInDirectory: false,
+    categories: [] as SearchFilter["categories"],
+  });
+  let hasCategoryFilter = $derived(filters.categories.length > 0);
+  let hasAnyFilter = $derived(
+    hasCategoryFilter ||
+      filters.includeImages ||
+      filters.includeVideos ||
+      filters.includeDirectories ||
+      filters.name.trim().length > 0,
+  );
+
+  let serverResult: SearchResult | undefined = $state();
+  let result = $derived.by(() => {
+    if (!serverResult) return [];
+
+    const nameFilter = filters.name.trim().toLowerCase();
+    const hasTypeFilter =
+      filters.includeImages || filters.includeVideos || filters.includeDirectories;
+
+    const directories =
+      !hasTypeFilter || filters.includeDirectories ? serverResult.directories : [];
+    const files =
+      !hasTypeFilter || filters.includeImages || filters.includeVideos
+        ? serverResult.files.filter(
+            ({ contentType }) =>
+              !hasTypeFilter ||
+              (filters.includeImages && contentType.startsWith("image/")) ||
+              (filters.includeVideos && contentType.startsWith("video/")),
+          )
+        : [];
+
+    return sortEntries(
+      [...directories, ...files].filter(
+        ({ name }) => !nameFilter || name.toLowerCase().includes(nameFilter),
+      ),
+    );
+  });
+
+  let isSelectCategoryBottomSheetOpen = $state(false);
+  let categorySelectMode: "include" | "exclude" = $state("include");
+
+  const openSelectCategoryBottomSheet = (mode: "include" | "exclude") => {
+    categorySelectMode = mode;
+    isSelectCategoryBottomSheetOpen = true;
+  };
+
+  const addCategoryFilter = (category: LocalCategoryInfo) => {
+    if (!filters.categories.some(({ info }) => info.id === category.id)) {
+      filters.categories.push({
+        info: category,
+        type: categorySelectMode,
+      });
+      isSelectCategoryBottomSheetOpen = false;
+    }
+  };
+
+  $effect(() => {
+    if (data.directoryId) {
+      HybridPromise.resolve(getDirectoryInfo(data.directoryId, $masterKeyStore?.get(1)?.key!)).then(
+        (res) => {
+          directoryInfo = res;
+          filters.searchInDirectory = res.exists;
+        },
+      );
+    } else {
+      directoryInfo = undefined;
+      filters.searchInDirectory = false;
+    }
+  });
+
+  $effect(() => {
+    if (hasAnyFilter) {
+      requestSearch(
+        {
+          ancestorId: filters.searchInDirectory ? data.directoryId! : "root",
+          categories: filters.categories,
+        },
+        $masterKeyStore?.get(1)?.key!,
+      ).then((res) => {
+        serverResult = res;
+      });
+    }
+  });
+</script>
+
+<svelte:head>
+  <title>검색</title>
+</svelte:head>
+
+<SearchBar bind:value={filters.name} />
+<FullscreenDiv class="bg-gray-100 !px-0">
+  <div class="flex flex-grow flex-col space-y-4">
+    <div class="space-y-2 bg-white p-4 !pt-0">
+      <div class="space-y-3">
+        <div class="flex flex-wrap gap-2">
+          <Chip bind:selected={filters.includeImages}>사진</Chip>
+          <Chip bind:selected={filters.includeVideos}>동영상</Chip>
+          {#if !hasCategoryFilter}
+            <Chip bind:selected={filters.includeDirectories}>폴더</Chip>
+          {/if}
+          {#if directoryInfo?.exists}
+            <Chip bind:selected={filters.searchInDirectory}>
+              위치: {directoryInfo.name}
+            </Chip>
+          {/if}
+        </div>
+        {#if !filters.includeDirectories}
+          <div class="space-y-2" transition:slide={{ duration: 300 }}>
+            <p class="text-sm font-medium text-gray-600">카테고리</p>
+            <div class="flex flex-wrap gap-2">
+              {#each filters.categories as { info, type }, i (info.id)}
+                <Chip
+                  selected
+                  removable
+                  onclick={() => {}}
+                  onRemoveClick={() => filters.categories.splice(i, 1)}
+                >
+                  {#if type === "include"}
+                    포함:
+                  {:else}
+                    제외:
+                  {/if}
+                  {info.name}
+                </Chip>
+              {/each}
+              <Chip onclick={() => openSelectCategoryBottomSheet("include")}>+ 포함</Chip>
+              <Chip onclick={() => openSelectCategoryBottomSheet("exclude")}>- 제외</Chip>
+            </div>
+          </div>
+        {/if}
+      </div>
+    </div>
+    {#if hasAnyFilter}
+      <div class="flex flex-grow flex-col space-y-2 bg-white p-4">
+        <p class="text-lg font-bold text-gray-800">검색 결과</p>
+        {#if result.length > 0}
+          <RowVirtualizer
+            count={result.length}
+            getItemKey={(index) => `${result[index]!.type}-${result[index]!.id}`}
+            estimateItemHeight={() => 56}
+            itemGap={4}
+          >
+            {#snippet item(index)}
+              {@const info = result[index]!}
+              {#if info.type === "directory"}
+                <Directory {info} onclick={() => goto(`/directory/${info.id}?from=search`)} />
+              {:else}
+                <File {info} onclick={() => goto(`/file/${info.id}?from=search`)} />
+              {/if}
+            {/snippet}
+          </RowVirtualizer>
+        {:else}
+          <div class="flex flex-grow items-center justify-center py-8">
+            <p class="text-gray-500">검색 결과가 없어요.</p>
+          </div>
+        {/if}
+      </div>
+    {/if}
+  </div>
+</FullscreenDiv>
+
+<SelectCategoryBottomSheet
+  bind:isOpen={isSelectCategoryBottomSheetOpen}
+  mode={categorySelectMode}
+  onSelectCategoryClick={addCategoryFilter}
+/>
diff --git a/src/routes/(fullscreen)/search/+page.ts b/src/routes/(fullscreen)/search/+page.ts
new file mode 100644
index 0000000..f570304
--- /dev/null
+++ b/src/routes/(fullscreen)/search/+page.ts
@@ -0,0 +1,18 @@
+import { error } from "@sveltejs/kit";
+import { z } from "zod";
+import type { PageLoad } from "./$types";
+
+export const load: PageLoad = ({ url }) => {
+  const directoryId = url.searchParams.get("directoryId");
+
+  const zodRes = z
+    .object({
+      directoryId: z.coerce.number().int().positive().nullable(),
+    })
+    .safeParse({ directoryId });
+  if (!zodRes.success) error(400, "Invalid query parameters");
+
+  return {
+    directoryId: zodRes.data.directoryId,
+  };
+};
diff --git a/src/routes/(fullscreen)/search/Directory.svelte b/src/routes/(fullscreen)/search/Directory.svelte
new file mode 100644
index 0000000..56448a6
--- /dev/null
+++ b/src/routes/(fullscreen)/search/Directory.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+  import { ActionEntryButton } from "$lib/components/atoms";
+  import { DirectoryEntryLabel } from "$lib/components/molecules";
+  import type { SubDirectoryInfo } from "$lib/modules/filesystem";
+
+  interface Props {
+    info: SubDirectoryInfo;
+    onclick: () => void;
+  }
+
+  let { info, onclick }: Props = $props();
+</script>
+
+<ActionEntryButton class="h-14" {onclick}>
+  <DirectoryEntryLabel type="directory" name={info.name} />
+</ActionEntryButton>
diff --git a/src/routes/(fullscreen)/search/File.svelte b/src/routes/(fullscreen)/search/File.svelte
new file mode 100644
index 0000000..3db8915
--- /dev/null
+++ b/src/routes/(fullscreen)/search/File.svelte
@@ -0,0 +1,25 @@
+<script lang="ts">
+  import { ActionEntryButton } from "$lib/components/atoms";
+  import { DirectoryEntryLabel } from "$lib/components/molecules";
+  import { getFileThumbnail } from "$lib/modules/file";
+  import type { SummarizedFileInfo } from "$lib/modules/filesystem";
+  import { formatDateTime } from "$lib/utils";
+
+  interface Props {
+    info: SummarizedFileInfo;
+    onclick: () => void;
+  }
+
+  let { info, onclick }: Props = $props();
+
+  let thumbnail = $derived(getFileThumbnail(info));
+</script>
+
+<ActionEntryButton class="h-14" {onclick}>
+  <DirectoryEntryLabel
+    type="file"
+    thumbnail={$thumbnail}
+    name={info.name}
+    subtext={formatDateTime(info.createdAt ?? info.lastModifiedAt)}
+  />
+</ActionEntryButton>
diff --git a/src/routes/(fullscreen)/search/SearchBar.svelte b/src/routes/(fullscreen)/search/SearchBar.svelte
new file mode 100644
index 0000000..cb3de64
--- /dev/null
+++ b/src/routes/(fullscreen)/search/SearchBar.svelte
@@ -0,0 +1,27 @@
+<script lang="ts">
+  import type { ClassValue } from "svelte/elements";
+
+  import IconArrowBack from "~icons/material-symbols/arrow-back";
+
+  interface Props {
+    class?: ClassValue;
+    value: string;
+  }
+
+  let { class: className, value = $bindable() }: Props = $props();
+</script>
+
+<div class={["sticky top-0 z-10 flex items-center gap-x-2 px-2 py-3 backdrop-blur-2xl", className]}>
+  <button
+    onclick={() => history.back()}
+    class="w-[2.3rem] flex-shrink-0 rounded-full p-1 active:bg-black active:bg-opacity-[0.04]"
+  >
+    <IconArrowBack class="text-2xl" />
+  </button>
+  <input
+    bind:value
+    type="text"
+    placeholder="검색"
+    class="mr-1 h-[2.3rem] flex-grow rounded-lg bg-gray-100 px-3 py-1.5 placeholder-gray-600 focus:outline-none"
+  />
+</div>
diff --git a/src/routes/(fullscreen)/search/SelectCategoryBottomSheet.svelte b/src/routes/(fullscreen)/search/SelectCategoryBottomSheet.svelte
new file mode 100644
index 0000000..af10b81
--- /dev/null
+++ b/src/routes/(fullscreen)/search/SelectCategoryBottomSheet.svelte
@@ -0,0 +1,54 @@
+<script lang="ts">
+  import { BottomDiv, BottomSheet, Button, FullscreenDiv } from "$lib/components/atoms";
+  import { SubCategories } from "$lib/components/molecules";
+  import {
+    getCategoryInfo,
+    type LocalCategoryInfo,
+    type MaybeCategoryInfo,
+  } from "$lib/modules/filesystem";
+  import { masterKeyStore } from "$lib/stores";
+  import { HybridPromise } from "$lib/utils";
+
+  interface Props {
+    isOpen: boolean;
+    mode: "include" | "exclude";
+    onSelectCategoryClick: (category: LocalCategoryInfo) => void;
+  }
+
+  let { isOpen = $bindable(), mode, onSelectCategoryClick }: Props = $props();
+
+  let categoryInfo: MaybeCategoryInfo | undefined = $state();
+
+  $effect(() => {
+    if (isOpen) {
+      HybridPromise.resolve(getCategoryInfo("root", $masterKeyStore?.get(1)?.key!)).then(
+        (result) => (categoryInfo = result),
+      );
+    }
+  });
+</script>
+
+{#if categoryInfo?.exists}
+  <BottomSheet bind:isOpen class="flex flex-col">
+    <FullscreenDiv>
+      <SubCategories
+        class="py-4"
+        info={categoryInfo}
+        onSubCategoryClick={({ id }) =>
+          HybridPromise.resolve(getCategoryInfo(id, $masterKeyStore?.get(1)?.key!)).then(
+            (result) => (categoryInfo = result),
+          )}
+      />
+      {#if categoryInfo.id !== "root"}
+        <BottomDiv>
+          <Button
+            onclick={() => onSelectCategoryClick(categoryInfo as LocalCategoryInfo)}
+            class="w-full"
+          >
+            {categoryInfo.name} 카테고리 {mode === "include" ? "꼭 포함하기" : "제외하기"}
+          </Button>
+        </BottomDiv>
+      {/if}
+    </FullscreenDiv>
+  </BottomSheet>
+{/if}
diff --git a/src/routes/(fullscreen)/search/service.ts b/src/routes/(fullscreen)/search/service.ts
new file mode 100644
index 0000000..e3d6be9
--- /dev/null
+++ b/src/routes/(fullscreen)/search/service.ts
@@ -0,0 +1,95 @@
+import type { DataKey, LocalCategoryInfo } from "$lib/modules/filesystem";
+import {
+  decryptDirectoryMetadata,
+  decryptFileMetadata,
+} from "$lib/modules/filesystem/internal.svelte";
+import { trpc } from "$trpc/client";
+
+export interface SearchFilter {
+  ancestorId: DirectoryId;
+  categories: { info: LocalCategoryInfo; type: "include" | "exclude" }[];
+}
+
+interface SearchedDirectory {
+  type: "directory";
+  id: number;
+  parentId: DirectoryId;
+  dataKey?: DataKey;
+  name: string;
+}
+
+interface SearchedFile {
+  type: "file";
+  id: number;
+  parentId: DirectoryId;
+  dataKey?: DataKey;
+  contentType: string;
+  name: string;
+  createdAt?: Date;
+  lastModifiedAt: Date;
+}
+
+export interface SearchResult {
+  directories: SearchedDirectory[];
+  files: SearchedFile[];
+}
+
+export const requestSearch = async (filter: SearchFilter, masterKey: CryptoKey) => {
+  const { directories: directoriesRaw, files: filesRaw } = await trpc().search.search.query({
+    ancestor: filter.ancestorId,
+    includeCategories: filter.categories
+      .filter(({ type }) => type === "include")
+      .map(({ info }) => info.id),
+    excludeCategories: filter.categories
+      .filter(({ type }) => type === "exclude")
+      .map(({ info }) => info.id),
+  });
+
+  // TODO: FIXME
+  const [directories, files] = await Promise.all([
+    Promise.all(
+      directoriesRaw.map(async (dir) => {
+        const metadata = await decryptDirectoryMetadata(
+          { dek: dir.dek, dekVersion: dir.dekVersion, name: dir.name, nameIv: dir.nameIv },
+          masterKey,
+        );
+        return {
+          type: "directory" as const,
+          id: dir.id,
+          parentId: dir.parent,
+          dataKey: metadata.dataKey,
+          name: metadata.name,
+        };
+      }),
+    ),
+    Promise.all(
+      filesRaw.map(async (file) => {
+        const metadata = await decryptFileMetadata(
+          {
+            dek: file.dek,
+            dekVersion: file.dekVersion,
+            name: file.name,
+            nameIv: file.nameIv,
+            createdAt: file.createdAt,
+            createdAtIv: file.createdAtIv,
+            lastModifiedAt: file.lastModifiedAt,
+            lastModifiedAtIv: file.lastModifiedAtIv,
+          },
+          masterKey,
+        );
+        return {
+          type: "file" as const,
+          id: file.id,
+          parentId: file.parent,
+          dataKey: metadata.dataKey,
+          contentType: file.contentType,
+          name: metadata.name,
+          createdAt: metadata.createdAt,
+          lastModifiedAt: metadata.lastModifiedAt,
+        };
+      }),
+    ),
+  ]);
+
+  return { directories, files };
+};
diff --git a/src/routes/(main)/category/[[id]]/+page.svelte b/src/routes/(main)/category/[[id]]/+page.svelte
index 8672c9a..701027f 100644
--- a/src/routes/(main)/category/[[id]]/+page.svelte
+++ b/src/routes/(main)/category/[[id]]/+page.svelte
@@ -76,7 +76,7 @@
 <div class="min-h-full bg-gray-100 pb-[5.5em]">
   {#if info?.exists}
     <div class="space-y-4">
-      <div class="space-y-4 bg-white p-4">
+      <div class="space-y-2 bg-white p-4">
         {#if info.id !== "root"}
           <p class="text-lg font-bold text-gray-800">하위 카테고리</p>
         {/if}
@@ -84,6 +84,7 @@
           {info}
           onSubCategoryClick={({ id }) => goto(`/category/${id}`)}
           onSubCategoryCreateClick={() => (isCategoryCreateModalOpen = true)}
+          subCategoryCreatePosition="bottom"
           onSubCategoryMenuClick={(subCategory) => {
             context.selectedCategory = subCategory;
             isCategoryMenuBottomSheetOpen = true;
@@ -92,14 +93,19 @@
         />
       </div>
       {#if info.id !== "root"}
-        <div class="space-y-4 bg-white p-4">
+        <div class="space-y-2 bg-white p-4">
           <div class="flex items-center justify-between">
             <p class="text-lg font-bold text-gray-800">파일</p>
             <CheckBox bind:checked={info.isFileRecursive}>
               <p class="font-medium">하위 카테고리의 파일</p>
             </CheckBox>
           </div>
-          <RowVirtualizer count={files.length} itemHeight={() => 48} itemGap={4}>
+          <RowVirtualizer
+            count={files.length}
+            getItemKey={(index) => files[index]!.details.id}
+            estimateItemHeight={() => 48}
+            itemGap={4}
+          >
             {#snippet item(index)}
               {@const { details } = files[index]!}
               <File
diff --git a/src/routes/(main)/directory/[[id]]/+page.svelte b/src/routes/(main)/directory/[[id]]/+page.svelte
index f500f34..f2d84d2 100644
--- a/src/routes/(main)/directory/[[id]]/+page.svelte
+++ b/src/routes/(main)/directory/[[id]]/+page.svelte
@@ -25,6 +25,7 @@
     requestEntryDeletion,
   } from "./service.svelte";
 
+  import IconSearch from "~icons/material-symbols/search";
   import IconAdd from "~icons/material-symbols/add";
 
   let { data } = $props();
@@ -43,8 +44,19 @@
   let isEntryRenameModalOpen = $state(false);
   let isEntryDeleteModalOpen = $state(false);
 
-  let isFromFilePage = $derived(page.url.searchParams.get("from") === "file");
-  let showTopBar = $derived(data.id !== "root" || isFromFilePage);
+  let showParentEntry = $derived(
+    ["file", "search"].includes(page.url.searchParams.get("from") ?? ""),
+  );
+  let showBackButton = $derived(data.id !== "root" || showParentEntry);
+
+  const onSearchClick = async () => {
+    const params = new URLSearchParams();
+    if (data.id !== "root") {
+      params.set("directoryId", data.id.toString());
+    }
+    const query = params.toString();
+    await goto(`/search${query ? `?${query}` : ""}`);
+  };
 
   const uploadFile = () => {
     const files = fileInput?.files;
@@ -96,11 +108,16 @@
 <input bind:this={fileInput} onchange={uploadFile} type="file" multiple class="hidden" />
 
 <div class="flex h-full flex-col">
-  {#if showTopBar}
-    <TopBar title={info?.name} class="flex-shrink-0" />
-  {/if}
+  <TopBar title={info?.name ?? "내 파일"} {showBackButton} class="flex-shrink-0">
+    <button
+      onclick={onSearchClick}
+      class="w-[2.3rem] flex-shrink-0 rounded-full p-1 active:bg-black active:bg-opacity-[0.04]"
+    >
+      <IconSearch class="text-2xl" />
+    </button>
+  </TopBar>
   {#if info?.exists}
-    <div class={["flex flex-grow flex-col px-4 pb-4", !showTopBar && "pt-4"]}>
+    <div class="flex flex-grow flex-col px-4 pb-4">
       <div class="flex gap-x-2">
         <UploadStatusCard onclick={() => goto("/file/uploads")} />
         <DownloadStatusCard onclick={() => goto("/file/downloads")} />
@@ -113,12 +130,12 @@
             context.selectedEntry = entry;
             isEntryMenuBottomSheetOpen = true;
           }}
-          showParentEntry={isFromFilePage && info.parentId !== undefined}
+          showParentEntry={showParentEntry && data.id !== "root"}
           onParentClick={() =>
             goto(
               info!.parentId === "root"
-                ? "/directory?from=file"
-                : `/directory/${info!.parentId}?from=file`,
+                ? `/directory?from=${page.url.searchParams.get("from")}`
+                : `/directory/${info!.parentId}?from=${page.url.searchParams.get("from")}`,
             )}
         />
       {/key}
diff --git a/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte b/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte
index b1ac220..1d02123 100644
--- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte
+++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte
@@ -46,7 +46,16 @@
 </script>
 
 {#if entries.length > 0}
-  <RowVirtualizer count={entries.length} itemHeight={() => 56} itemGap={4} class="pb-[4.5rem]">
+  <RowVirtualizer
+    count={entries.length}
+    getItemKey={(index) =>
+      entries[index]!.type !== "parent"
+        ? `${entries[index]!.type}-${entries[index]!.details.id}`
+        : entries[index]!.type!}
+    estimateItemHeight={() => 56}
+    itemGap={4}
+    class="pb-[4.5rem]"
+  >
     {#snippet item(index)}
       {@const entry = entries[index]!}
       {#if entry.type === "parent"}
diff --git a/src/trpc/router.server.ts b/src/trpc/router.server.ts
index d343fa6..c305a21 100644
--- a/src/trpc/router.server.ts
+++ b/src/trpc/router.server.ts
@@ -9,6 +9,7 @@ import {
   fileRouter,
   hskRouter,
   mekRouter,
+  searchRouter,
   uploadRouter,
   userRouter,
 } from "./routers";
@@ -21,6 +22,7 @@ export const appRouter = router({
   file: fileRouter,
   hsk: hskRouter,
   mek: mekRouter,
+  search: searchRouter,
   upload: uploadRouter,
   user: userRouter,
 });
diff --git a/src/trpc/routers/index.ts b/src/trpc/routers/index.ts
index 5c8df24..e8fbecc 100644
--- a/src/trpc/routers/index.ts
+++ b/src/trpc/routers/index.ts
@@ -5,5 +5,6 @@ export { default as directoryRouter } from "./directory";
 export { default as fileRouter } from "./file";
 export { default as hskRouter } from "./hsk";
 export { default as mekRouter } from "./mek";
+export { default as searchRouter } from "./search";
 export { default as uploadRouter } from "./upload";
 export { default as userRouter } from "./user";
diff --git a/src/trpc/routers/search.ts b/src/trpc/routers/search.ts
new file mode 100644
index 0000000..5aa2820
--- /dev/null
+++ b/src/trpc/routers/search.ts
@@ -0,0 +1,54 @@
+import { z } from "zod";
+import { DirectoryIdSchema } from "$lib/schemas";
+import { FileRepo } from "$lib/server/db";
+import { router, roleProcedure } from "../init.server";
+
+const searchRouter = router({
+  search: roleProcedure["activeClient"]
+    .input(
+      z.object({
+        ancestor: DirectoryIdSchema.default("root"),
+        includeCategories: z.number().positive().array().default([]),
+        excludeCategories: z.number().positive().array().default([]),
+      }),
+    )
+    .query(async ({ ctx, input }) => {
+      const [directories, files] = await Promise.all([
+        input.includeCategories.length === 0 && input.excludeCategories.length === 0
+          ? FileRepo.getAllRecursiveDirectoriesByParent(ctx.session.userId, input.ancestor)
+          : [],
+        FileRepo.searchFiles(ctx.session.userId, {
+          parentId: input.ancestor,
+          includeCategoryIds: input.includeCategories,
+          excludeCategoryIds: input.excludeCategories,
+        }),
+      ]);
+      return {
+        directories: directories.map((directory) => ({
+          id: directory.id,
+          parent: directory.parentId,
+          mekVersion: directory.mekVersion,
+          dek: directory.encDek,
+          dekVersion: directory.dekVersion,
+          name: directory.encName.ciphertext,
+          nameIv: directory.encName.iv,
+        })),
+        files: files.map((file) => ({
+          id: file.id,
+          parent: file.parentId,
+          mekVersion: file.mekVersion,
+          dek: file.encDek,
+          dekVersion: file.dekVersion,
+          contentType: file.contentType,
+          name: file.encName.ciphertext,
+          nameIv: file.encName.iv,
+          createdAt: file.encCreatedAt?.ciphertext,
+          createdAtIv: file.encCreatedAt?.iv,
+          lastModifiedAt: file.encLastModifiedAt.ciphertext,
+          lastModifiedAtIv: file.encLastModifiedAt.iv,
+        })),
+      };
+    }),
+});
+
+export default searchRouter;

From b3e3671c09fb5aba5938c4b5a6135e947c68f3c1 Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Thu, 15 Jan 2026 15:54:45 +0900
Subject: [PATCH 03/15] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EA=B2=80=EC=83=89?=
 =?UTF-8?q?=20=EC=BF=BC=EB=A6=AC=20=EC=B5=9C=EC=A0=81=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/server/db/file.ts | 182 +++++++++++++++++++-------------------
 1 file changed, 93 insertions(+), 89 deletions(-)

diff --git a/src/lib/server/db/file.ts b/src/lib/server/db/file.ts
index 0f396c8..1c61cf5 100644
--- a/src/lib/server/db/file.ts
+++ b/src/lib/server/db/file.ts
@@ -475,95 +475,99 @@ export const searchFiles = async (
     excludeCategoryIds: number[];
   },
 ) => {
-  const ctes: string[] = [];
-  const conditions: string[] = [];
-
-  if (filters.parentId === "root") {
-    conditions.push(`user_id = ${userId}`);
-  } else {
-    ctes.push(`
-      directory_tree AS (
-        SELECT id FROM directory WHERE user_id = ${userId} AND id = ${filters.parentId}
-        UNION ALL
-        SELECT d.id FROM directory d INNER JOIN directory_tree dt ON d.parent_id = dt.id
-      )`);
-    conditions.push(`parent_id IN (SELECT id FROM directory_tree)`);
-  }
-
-  filters.includeCategoryIds.forEach((categoryId, index) => {
-    ctes.push(`
-      include_category_tree_${index} AS (
-        SELECT id FROM category WHERE user_id = ${userId} AND id = ${categoryId}
-        UNION ALL
-        SELECT c.id FROM category c INNER JOIN include_category_tree_${index} ct ON c.parent_id = ct.id
-      )`);
-    conditions.push(`
-      EXISTS(
-        SELECT 1 FROM file_category
-        WHERE file_id = file.id
-        AND EXISTS (SELECT 1 FROM include_category_tree_${index} ct WHERE ct.id = category_id)
-      )`);
-  });
-
-  if (filters.excludeCategoryIds.length > 0) {
-    ctes.push(`
-      exclude_category_tree AS (
-        SELECT id FROM category WHERE user_id = ${userId} AND id IN (${filters.excludeCategoryIds.join(",")})
-        UNION ALL
-        SELECT c.id FROM category c INNER JOIN exclude_category_tree ct ON c.parent_id = ct.id
-      )`);
-    conditions.push(`
-      NOT EXISTS(
-        SELECT 1 FROM file_category
-        WHERE file_id = id
-        AND EXISTS (SELECT 1 FROM exclude_category_tree ct WHERE ct.id = category_id)
-      )`);
-  }
-
-  const query = `
-    ${ctes.length > 0 ? `WITH RECURSIVE ${ctes.join(",")}` : ""}
-    SELECT * FROM file
-    WHERE ${conditions.join(" AND ")}
-  `;
-  const { rows } = await sql
-    .raw<{
-      id: number;
-      parent_id: number | null;
-      user_id: number;
-      path: string;
-      master_encryption_key_version: number;
-      encrypted_data_encryption_key: string;
-      data_encryption_key_version: Date;
-      hmac_secret_key_version: number;
-      content_hmac: string;
-      content_type: string;
-      encrypted_content_iv: string;
-      encrypted_content_hash: string;
-      encrypted_name: Ciphertext;
-      encrypted_created_at: Ciphertext | null;
-      encrypted_last_modified_at: Ciphertext;
-    }>(query)
-    .execute(db);
-  return rows.map(
-    (file) =>
-      ({
-        id: file.id,
-        parentId: file.parent_id ?? "root",
-        userId: file.user_id,
-        path: file.path,
-        mekVersion: file.master_encryption_key_version,
-        encDek: file.encrypted_data_encryption_key,
-        dekVersion: file.data_encryption_key_version,
-        hskVersion: file.hmac_secret_key_version,
-        contentHmac: file.content_hmac,
-        contentType: file.content_type,
-        encContentIv: file.encrypted_content_iv,
-        encContentHash: file.encrypted_content_hash,
-        encName: file.encrypted_name,
-        encCreatedAt: file.encrypted_created_at,
-        encLastModifiedAt: file.encrypted_last_modified_at,
-      }) satisfies File,
-  );
+  const baseQuery = db
+    .withRecursive("directory_tree", (db) =>
+      db
+        .selectFrom("directory")
+        .select("id")
+        .where("user_id", "=", userId)
+        .where((eb) => eb.val(filters.parentId !== "root")) // directory_tree will be empty if parentId is "root"
+        .$if(filters.parentId !== "root", (qb) => qb.where("id", "=", filters.parentId as number))
+        .unionAll(
+          db
+            .selectFrom("directory as d")
+            .innerJoin("directory_tree as dt", "d.parent_id", "dt.id")
+            .select("d.id"),
+        ),
+    )
+    .withRecursive("include_category_tree", (db) =>
+      db
+        .selectFrom("category")
+        .select(["id", "id as root_id"])
+        .where("id", "=", (eb) => eb.fn.any(eb.val(filters.includeCategoryIds)))
+        .where("user_id", "=", userId)
+        .unionAll(
+          db
+            .selectFrom("category as c")
+            .innerJoin("include_category_tree as ct", "c.parent_id", "ct.id")
+            .select(["c.id", "ct.root_id"]),
+        ),
+    )
+    .withRecursive("exclude_category_tree", (db) =>
+      db
+        .selectFrom("category")
+        .select("id")
+        .where("id", "=", (eb) => eb.fn.any(eb.val(filters.excludeCategoryIds)))
+        .where("user_id", "=", userId)
+        .unionAll((db) =>
+          db
+            .selectFrom("category as c")
+            .innerJoin("exclude_category_tree as ct", "c.parent_id", "ct.id")
+            .select("c.id"),
+        ),
+    )
+    .selectFrom("file")
+    .selectAll("file")
+    .$if(filters.parentId === "root", (qb) => qb.where("user_id", "=", userId)) // directory_tree isn't used if parentId is "root"
+    .$if(filters.parentId !== "root", (qb) =>
+      qb.where("parent_id", "in", (eb) => eb.selectFrom("directory_tree").select("id")),
+    )
+    .where((eb) =>
+      eb.not(
+        eb.exists(
+          eb
+            .selectFrom("file_category")
+            .whereRef("file_id", "=", "file.id")
+            .where("category_id", "in", (eb) =>
+              eb.selectFrom("exclude_category_tree").select("id"),
+            ),
+        ),
+      ),
+    );
+  const files =
+    filters.includeCategoryIds.length > 0
+      ? await baseQuery
+          .innerJoin("file_category", "file.id", "file_category.file_id")
+          .innerJoin(
+            "include_category_tree",
+            "file_category.category_id",
+            "include_category_tree.id",
+          )
+          .groupBy("file.id")
+          .having(
+            (eb) => eb.fn.count("include_category_tree.root_id").distinct(),
+            "=",
+            filters.includeCategoryIds.length,
+          )
+          .execute()
+      : await baseQuery.execute();
+  return files.map((file) => ({
+    id: file.id,
+    parentId: file.parent_id ?? "root",
+    userId: file.user_id,
+    path: file.path,
+    mekVersion: file.master_encryption_key_version,
+    encDek: file.encrypted_data_encryption_key,
+    dekVersion: file.data_encryption_key_version,
+    hskVersion: file.hmac_secret_key_version,
+    contentHmac: file.content_hmac,
+    contentType: file.content_type,
+    encContentIv: file.encrypted_content_iv,
+    encContentHash: file.encrypted_content_hash,
+    encName: file.encrypted_name,
+    encCreatedAt: file.encrypted_created_at,
+    encLastModifiedAt: file.encrypted_last_modified_at,
+  }));
 };
 
 export const setFileEncName = async (

From ebcdbd2d83c85e547766b860cac0b59e6331f1f5 Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Thu, 15 Jan 2026 18:25:01 +0900
Subject: [PATCH 04/15] =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EA=B2=80=EC=83=89?=
 =?UTF-8?q?=20=EB=A1=9C=EC=A7=81=20=EA=B0=9C=EC=84=A0=20=EB=B0=8F=20?=
 =?UTF-8?q?=EB=92=A4=EB=A1=9C=EA=B0=80=EA=B8=B0=EB=A1=9C=20=EA=B2=80?=
 =?UTF-8?q?=EC=83=89=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=A1=9C=20=EB=8F=8C?=
 =?UTF-8?q?=EC=95=84=EC=98=A8=20=EA=B2=BD=EC=9A=B0=EC=97=90=20=ED=95=84?=
 =?UTF-8?q?=ED=84=B0=20=EB=B0=8F=20=EA=B2=80=EC=83=89=20=EA=B2=B0=EA=B3=BC?=
 =?UTF-8?q?=EA=B0=80=20=EC=9C=A0=EC=A7=80=EB=90=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                |  1 +
 pnpm-lock.yaml                              |  8 ++++
 src/lib/server/db/file.ts                   |  2 +-
 src/lib/utils/index.ts                      |  1 +
 src/lib/utils/search.ts                     | 28 ++++++++++++
 src/routes/(fullscreen)/search/+page.svelte | 47 ++++++++++++++++++---
 src/routes/(fullscreen)/search/service.ts   |  2 +-
 7 files changed, 82 insertions(+), 7 deletions(-)
 create mode 100644 src/lib/utils/search.ts

diff --git a/package.json b/package.json
index 02ed42d..07f8d07 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "autoprefixer": "^10.4.23",
     "axios": "^1.13.2",
     "dexie": "^4.2.1",
+    "es-hangul": "^2.3.8",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-svelte": "^3.14.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ac05c99..fd8be37 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -84,6 +84,9 @@ importers:
       dexie:
         specifier: ^4.2.1
         version: 4.2.1
+      es-hangul:
+        specifier: ^2.3.8
+        version: 2.3.8
       eslint:
         specifier: ^9.39.2
         version: 9.39.2(jiti@1.21.7)
@@ -989,6 +992,9 @@ packages:
     resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
     engines: {node: '>= 0.4'}
 
+  es-hangul@2.3.8:
+    resolution: {integrity: sha512-VrJuqYBC7W04aKYjCnswomuJNXQRc0q33SG1IltVrRofi2YEE6FwVDPlsEJIdKbHwsOpbBL/mk9sUaBxVpbd+w==}
+
   es-object-atoms@1.1.1:
     resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
     engines: {node: '>= 0.4'}
@@ -2781,6 +2787,8 @@ snapshots:
 
   es-errors@1.3.0: {}
 
+  es-hangul@2.3.8: {}
+
   es-object-atoms@1.1.1:
     dependencies:
       es-errors: 1.3.0
diff --git a/src/lib/server/db/file.ts b/src/lib/server/db/file.ts
index 1c61cf5..dba77d0 100644
--- a/src/lib/server/db/file.ts
+++ b/src/lib/server/db/file.ts
@@ -553,7 +553,7 @@ export const searchFiles = async (
       : await baseQuery.execute();
   return files.map((file) => ({
     id: file.id,
-    parentId: file.parent_id ?? "root",
+    parentId: file.parent_id ?? ("root" as const),
     userId: file.user_id,
     path: file.path,
     mekVersion: file.master_encryption_key_version,
diff --git a/src/lib/utils/index.ts b/src/lib/utils/index.ts
index 4c576d5..f860017 100644
--- a/src/lib/utils/index.ts
+++ b/src/lib/utils/index.ts
@@ -1,4 +1,5 @@
 export * from "./concurrency";
 export * from "./format";
 export * from "./gotoStateful";
+export * from "./search";
 export * from "./sort";
diff --git a/src/lib/utils/search.ts b/src/lib/utils/search.ts
new file mode 100644
index 0000000..c6e3d8c
--- /dev/null
+++ b/src/lib/utils/search.ts
@@ -0,0 +1,28 @@
+import { disassemble, getChoseong } from "es-hangul";
+
+const normalize = (s: string) => {
+  return s.normalize("NFC").toLowerCase().replace(/\s/g, "");
+};
+
+const extractHangul = (s: string) => {
+  return s.replace(/[^가-힣ㄱ-ㅎㅏ-ㅣ]/g, "");
+};
+
+const hangulSearch = (original: string, query: string) => {
+  original = extractHangul(original);
+  query = extractHangul(query);
+  if (!original || !query) return false;
+
+  return (
+    disassemble(original).includes(disassemble(query)) ||
+    getChoseong(original).includes(getChoseong(query))
+  );
+};
+
+export const searchString = (original: string, query: string) => {
+  original = normalize(original);
+  query = normalize(query);
+  if (!original || !query) return false;
+
+  return original.includes(query) || hangulSearch(original, query);
+};
diff --git a/src/routes/(fullscreen)/search/+page.svelte b/src/routes/(fullscreen)/search/+page.svelte
index 08315cf..fdaa3ed 100644
--- a/src/routes/(fullscreen)/search/+page.svelte
+++ b/src/routes/(fullscreen)/search/+page.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+  import type { Snapshot } from "@sveltejs/kit";
+  import superjson, { type SuperJSONResult } from "superjson";
+  import { untrack } from "svelte";
   import { slide } from "svelte/transition";
   import { goto } from "$app/navigation";
   import { Chip, FullscreenDiv, RowVirtualizer } from "$lib/components/atoms";
@@ -8,7 +11,7 @@
     type MaybeDirectoryInfo,
   } from "$lib/modules/filesystem";
   import { masterKeyStore } from "$lib/stores";
-  import { HybridPromise, sortEntries } from "$lib/utils";
+  import { HybridPromise, searchString, sortEntries } from "$lib/utils";
   import Directory from "./Directory.svelte";
   import File from "./File.svelte";
   import SearchBar from "./SearchBar.svelte";
@@ -17,15 +20,24 @@
 
   let { data } = $props();
 
+  interface SearchFilters {
+    name: string;
+    includeImages: boolean;
+    includeVideos: boolean;
+    includeDirectories: boolean;
+    searchInDirectory: boolean;
+    categories: SearchFilter["categories"];
+  }
+
   let directoryInfo: MaybeDirectoryInfo | undefined = $state();
 
-  let filters = $state({
+  let filters: SearchFilters = $state({
     name: "",
     includeImages: false,
     includeVideos: false,
     includeDirectories: false,
     searchInDirectory: false,
-    categories: [] as SearchFilter["categories"],
+    categories: [],
   });
   let hasCategoryFilter = $derived(filters.categories.length > 0);
   let hasAnyFilter = $derived(
@@ -36,11 +48,12 @@
       filters.name.trim().length > 0,
   );
 
+  let isRestoredFromSnapshot = $state(false);
   let serverResult: SearchResult | undefined = $state();
   let result = $derived.by(() => {
     if (!serverResult) return [];
 
-    const nameFilter = filters.name.trim().toLowerCase();
+    const nameFilter = filters.name.trim();
     const hasTypeFilter =
       filters.includeImages || filters.includeVideos || filters.includeDirectories;
 
@@ -58,7 +71,7 @@
 
     return sortEntries(
       [...directories, ...files].filter(
-        ({ name }) => !nameFilter || name.toLowerCase().includes(nameFilter),
+        ({ name }) => !nameFilter || searchString(name, nameFilter),
       ),
     );
   });
@@ -81,6 +94,20 @@
     }
   };
 
+  export const snapshot: Snapshot<{
+    filters: SearchFilters;
+    serverResult: SuperJSONResult;
+  }> = {
+    capture() {
+      return { filters, serverResult: superjson.serialize(serverResult) };
+    },
+    restore(value) {
+      filters = value.filters;
+      serverResult = superjson.deserialize(value.serverResult, { inPlace: true });
+      isRestoredFromSnapshot = true;
+    },
+  };
+
   $effect(() => {
     if (data.directoryId) {
       HybridPromise.resolve(getDirectoryInfo(data.directoryId, $masterKeyStore?.get(1)?.key!)).then(
@@ -96,6 +123,16 @@
   });
 
   $effect(() => {
+    // Svelte sucks
+    hasAnyFilter;
+    filters.searchInDirectory;
+    filters.categories.length;
+
+    if (untrack(() => isRestoredFromSnapshot)) {
+      isRestoredFromSnapshot = false;
+      return;
+    }
+
     if (hasAnyFilter) {
       requestSearch(
         {
diff --git a/src/routes/(fullscreen)/search/service.ts b/src/routes/(fullscreen)/search/service.ts
index e3d6be9..f8fd597 100644
--- a/src/routes/(fullscreen)/search/service.ts
+++ b/src/routes/(fullscreen)/search/service.ts
@@ -91,5 +91,5 @@ export const requestSearch = async (filter: SearchFilter, masterKey: CryptoKey)
     ),
   ]);
 
-  return { directories, files };
+  return { directories, files } satisfies SearchResult;
 };

From fe83a71a1f2cceb1135d19a723147c9953adac0c Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Thu, 15 Jan 2026 20:33:27 +0900
Subject: [PATCH 05/15] =?UTF-8?q?=EC=8D=B8=EB=84=A4=EC=9D=BC=EC=9D=B4=20?=
 =?UTF-8?q?=EB=88=84=EB=9D=BD=EB=90=9C=20=ED=8C=8C=EC=9D=BC=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EB=B0=8F=20=EB=A0=88=EA=B1=B0=EC=8B=9C=20=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EC=A1=B0=ED=9A=8C=20=EB=84=A4=ED=8A=B8=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=20=ED=98=B8=EC=B6=9C=20=EC=B5=9C=EC=A0=81=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...al.svelte.ts => FilesystemCache.svelte.ts} |  62 ++--------
 src/lib/modules/filesystem/category.ts        |   3 +-
 src/lib/modules/filesystem/common.ts          |  50 ++++++++
 src/lib/modules/filesystem/directory.ts       |  13 +-
 src/lib/modules/filesystem/file.ts            |  11 +-
 src/lib/modules/filesystem/index.ts           |   1 +
 src/lib/server/db/file.ts                     |  69 ++++++++++-
 src/lib/server/db/media.ts                    |  24 ----
 src/lib/utils/concurrency/HybridPromise.ts    |  38 ++++++
 src/routes/(fullscreen)/search/+page.svelte   |  24 ++--
 src/routes/(fullscreen)/search/service.ts     | 116 ++++++++----------
 .../settings/migration/+page.svelte           |  13 +-
 .../settings/migration/service.svelte.ts      |  39 +++++-
 .../settings/thumbnail/+page.svelte           |   5 +-
 .../settings/thumbnail/service.ts             |  39 +++++-
 src/trpc/routers/file.ts                      |  34 ++++-
 16 files changed, 367 insertions(+), 174 deletions(-)
 rename src/lib/modules/filesystem/{internal.svelte.ts => FilesystemCache.svelte.ts} (68%)
 create mode 100644 src/lib/modules/filesystem/common.ts

diff --git a/src/lib/modules/filesystem/internal.svelte.ts b/src/lib/modules/filesystem/FilesystemCache.svelte.ts
similarity index 68%
rename from src/lib/modules/filesystem/internal.svelte.ts
rename to src/lib/modules/filesystem/FilesystemCache.svelte.ts
index 7a8c446..c84757d 100644
--- a/src/lib/modules/filesystem/internal.svelte.ts
+++ b/src/lib/modules/filesystem/FilesystemCache.svelte.ts
@@ -1,7 +1,6 @@
 import { untrack } from "svelte";
-import { unwrapDataKey, decryptString } from "$lib/modules/crypto";
 
-interface FilesystemCacheOptions<K, V> {
+export interface FilesystemCacheOptions<K, V> {
   fetchFromIndexedDB: (key: K) => Promise<V | undefined>;
   fetchFromServer: (key: K, cachedValue: V | undefined, masterKey: CryptoKey) => Promise<V>;
   bulkFetchFromIndexedDB?: (keys: Set<K>) => Promise<Map<K, V>>;
@@ -16,7 +15,11 @@ export class FilesystemCache<K, V extends object> {
 
   constructor(private readonly options: FilesystemCacheOptions<K, V>) {}
 
-  get(key: K, masterKey: CryptoKey) {
+  get(
+    key: K,
+    masterKey: CryptoKey,
+    options?: { fetchFromServer?: FilesystemCacheOptions<K, V>["fetchFromServer"] },
+  ) {
     return untrack(() => {
       let state = this.map.get(key);
       if (state?.promise) return state.value ?? state.promise;
@@ -39,7 +42,9 @@ export class FilesystemCache<K, V extends object> {
             return loadedInfo;
           })
       )
-        .then((cachedInfo) => this.options.fetchFromServer(key, cachedInfo, masterKey))
+        .then((cachedInfo) =>
+          (options?.fetchFromServer ?? this.options.fetchFromServer)(key, cachedInfo, masterKey),
+        )
         .then((loadedInfo) => {
           if (state.value) {
             Object.assign(state.value, loadedInfo);
@@ -121,52 +126,3 @@ export class FilesystemCache<K, V extends object> {
     });
   }
 }
-
-export const decryptDirectoryMetadata = async (
-  metadata: { dek: string; dekVersion: Date; name: string; nameIv: string },
-  masterKey: CryptoKey,
-) => {
-  const { dataKey } = await unwrapDataKey(metadata.dek, masterKey);
-  const name = await decryptString(metadata.name, metadata.nameIv, dataKey);
-
-  return {
-    dataKey: { key: dataKey, version: metadata.dekVersion },
-    name,
-  };
-};
-
-const decryptDate = async (ciphertext: string, iv: string, dataKey: CryptoKey) => {
-  return new Date(parseInt(await decryptString(ciphertext, iv, dataKey), 10));
-};
-
-export const decryptFileMetadata = async (
-  metadata: {
-    dek: string;
-    dekVersion: Date;
-    name: string;
-    nameIv: string;
-    createdAt?: string;
-    createdAtIv?: string;
-    lastModifiedAt: string;
-    lastModifiedAtIv: string;
-  },
-  masterKey: CryptoKey,
-) => {
-  const { dataKey } = await unwrapDataKey(metadata.dek, masterKey);
-  const [name, createdAt, lastModifiedAt] = await Promise.all([
-    decryptString(metadata.name, metadata.nameIv, dataKey),
-    metadata.createdAt
-      ? decryptDate(metadata.createdAt, metadata.createdAtIv!, dataKey)
-      : undefined,
-    decryptDate(metadata.lastModifiedAt, metadata.lastModifiedAtIv, dataKey),
-  ]);
-
-  return {
-    dataKey: { key: dataKey, version: metadata.dekVersion },
-    name,
-    createdAt,
-    lastModifiedAt,
-  };
-};
-
-export const decryptCategoryMetadata = decryptDirectoryMetadata;
diff --git a/src/lib/modules/filesystem/category.ts b/src/lib/modules/filesystem/category.ts
index 778f75c..94740c6 100644
--- a/src/lib/modules/filesystem/category.ts
+++ b/src/lib/modules/filesystem/category.ts
@@ -1,6 +1,7 @@
 import * as IndexedDB from "$lib/indexedDB";
 import { trpc, isTRPCClientError } from "$trpc/client";
-import { FilesystemCache, decryptFileMetadata, decryptCategoryMetadata } from "./internal.svelte";
+import { decryptFileMetadata, decryptCategoryMetadata } from "./common";
+import { FilesystemCache } from "./FilesystemCache.svelte";
 import type { CategoryInfo, MaybeCategoryInfo } from "./types";
 
 const cache = new FilesystemCache<CategoryId, MaybeCategoryInfo>({
diff --git a/src/lib/modules/filesystem/common.ts b/src/lib/modules/filesystem/common.ts
new file mode 100644
index 0000000..dc3cc04
--- /dev/null
+++ b/src/lib/modules/filesystem/common.ts
@@ -0,0 +1,50 @@
+import { unwrapDataKey, decryptString } from "$lib/modules/crypto";
+
+export const decryptDirectoryMetadata = async (
+  metadata: { dek: string; dekVersion: Date; name: string; nameIv: string },
+  masterKey: CryptoKey,
+) => {
+  const { dataKey } = await unwrapDataKey(metadata.dek, masterKey);
+  const name = await decryptString(metadata.name, metadata.nameIv, dataKey);
+
+  return {
+    dataKey: { key: dataKey, version: metadata.dekVersion },
+    name,
+  };
+};
+
+const decryptDate = async (ciphertext: string, iv: string, dataKey: CryptoKey) => {
+  return new Date(parseInt(await decryptString(ciphertext, iv, dataKey), 10));
+};
+
+export const decryptFileMetadata = async (
+  metadata: {
+    dek: string;
+    dekVersion: Date;
+    name: string;
+    nameIv: string;
+    createdAt?: string;
+    createdAtIv?: string;
+    lastModifiedAt: string;
+    lastModifiedAtIv: string;
+  },
+  masterKey: CryptoKey,
+) => {
+  const { dataKey } = await unwrapDataKey(metadata.dek, masterKey);
+  const [name, createdAt, lastModifiedAt] = await Promise.all([
+    decryptString(metadata.name, metadata.nameIv, dataKey),
+    metadata.createdAt
+      ? decryptDate(metadata.createdAt, metadata.createdAtIv!, dataKey)
+      : undefined,
+    decryptDate(metadata.lastModifiedAt, metadata.lastModifiedAtIv, dataKey),
+  ]);
+
+  return {
+    dataKey: { key: dataKey, version: metadata.dekVersion },
+    name,
+    createdAt,
+    lastModifiedAt,
+  };
+};
+
+export const decryptCategoryMetadata = decryptDirectoryMetadata;
diff --git a/src/lib/modules/filesystem/directory.ts b/src/lib/modules/filesystem/directory.ts
index 4144a68..38b6376 100644
--- a/src/lib/modules/filesystem/directory.ts
+++ b/src/lib/modules/filesystem/directory.ts
@@ -1,6 +1,7 @@
 import * as IndexedDB from "$lib/indexedDB";
 import { trpc, isTRPCClientError } from "$trpc/client";
-import { FilesystemCache, decryptDirectoryMetadata, decryptFileMetadata } from "./internal.svelte";
+import { decryptDirectoryMetadata, decryptFileMetadata } from "./common";
+import { FilesystemCache, type FilesystemCacheOptions } from "./FilesystemCache.svelte";
 import type { DirectoryInfo, MaybeDirectoryInfo } from "./types";
 
 const cache = new FilesystemCache<DirectoryId, MaybeDirectoryInfo>({
@@ -97,6 +98,12 @@ const storeToIndexedDB = (info: DirectoryInfo) => {
   return { ...info, exists: true as const };
 };
 
-export const getDirectoryInfo = (id: DirectoryId, masterKey: CryptoKey) => {
-  return cache.get(id, masterKey);
+export const getDirectoryInfo = (
+  id: DirectoryId,
+  masterKey: CryptoKey,
+  options?: {
+    fetchFromServer?: FilesystemCacheOptions<DirectoryId, MaybeDirectoryInfo>["fetchFromServer"];
+  },
+) => {
+  return cache.get(id, masterKey, options);
 };
diff --git a/src/lib/modules/filesystem/file.ts b/src/lib/modules/filesystem/file.ts
index d80a872..5ef0fae 100644
--- a/src/lib/modules/filesystem/file.ts
+++ b/src/lib/modules/filesystem/file.ts
@@ -1,6 +1,7 @@
 import * as IndexedDB from "$lib/indexedDB";
 import { trpc, isTRPCClientError } from "$trpc/client";
-import { FilesystemCache, decryptFileMetadata, decryptCategoryMetadata } from "./internal.svelte";
+import { decryptFileMetadata, decryptCategoryMetadata } from "./common";
+import { FilesystemCache, type FilesystemCacheOptions } from "./FilesystemCache.svelte";
 import type { FileInfo, MaybeFileInfo } from "./types";
 
 const cache = new FilesystemCache<number, MaybeFileInfo>({
@@ -168,8 +169,12 @@ const bulkStoreToIndexedDB = (infos: FileInfo[]) => {
   return infos.map((info) => [info.id, { ...info, exists: true }] as const);
 };
 
-export const getFileInfo = (id: number, masterKey: CryptoKey) => {
-  return cache.get(id, masterKey);
+export const getFileInfo = (
+  id: number,
+  masterKey: CryptoKey,
+  options?: { fetchFromServer?: FilesystemCacheOptions<number, MaybeFileInfo>["fetchFromServer"] },
+) => {
+  return cache.get(id, masterKey, options);
 };
 
 export const bulkGetFileInfo = (ids: number[], masterKey: CryptoKey) => {
diff --git a/src/lib/modules/filesystem/index.ts b/src/lib/modules/filesystem/index.ts
index cb9e0f4..2d99afd 100644
--- a/src/lib/modules/filesystem/index.ts
+++ b/src/lib/modules/filesystem/index.ts
@@ -1,4 +1,5 @@
 export * from "./category";
+export * from "./common";
 export * from "./directory";
 export * from "./file";
 export * from "./types";
diff --git a/src/lib/server/db/file.ts b/src/lib/server/db/file.ts
index dba77d0..23a9b8c 100644
--- a/src/lib/server/db/file.ts
+++ b/src/lib/server/db/file.ts
@@ -367,14 +367,77 @@ export const getAllFileIds = async (userId: number) => {
   return files.map(({ id }) => id);
 };
 
-export const getLegacyFileIds = async (userId: number) => {
+export const getLegacyFiles = async (userId: number, limit: number = 100) => {
   const files = await db
     .selectFrom("file")
-    .select("id")
+    .selectAll()
     .where("user_id", "=", userId)
     .where("encrypted_content_iv", "is not", null)
+    .limit(limit)
     .execute();
-  return files.map(({ id }) => id);
+  return files.map(
+    (file) =>
+      ({
+        id: file.id,
+        parentId: file.parent_id ?? "root",
+        userId: file.user_id,
+        path: file.path,
+        mekVersion: file.master_encryption_key_version,
+        encDek: file.encrypted_data_encryption_key,
+        dekVersion: file.data_encryption_key_version,
+        hskVersion: file.hmac_secret_key_version,
+        contentHmac: file.content_hmac,
+        contentType: file.content_type,
+        encContentIv: file.encrypted_content_iv,
+        encContentHash: file.encrypted_content_hash,
+        encName: file.encrypted_name,
+        encCreatedAt: file.encrypted_created_at,
+        encLastModifiedAt: file.encrypted_last_modified_at,
+      }) satisfies File,
+  );
+};
+
+export const getFilesWithoutThumbnail = async (userId: number, limit: number = 100) => {
+  const files = await db
+    .selectFrom("file")
+    .selectAll()
+    .where("user_id", "=", userId)
+    .where((eb) =>
+      eb.or([eb("content_type", "like", "image/%"), eb("content_type", "like", "video/%")]),
+    )
+    .where((eb) =>
+      eb.not(
+        eb.exists(
+          eb
+            .selectFrom("thumbnail")
+            .select("thumbnail.id")
+            .whereRef("thumbnail.file_id", "=", "file.id")
+            .limit(1),
+        ),
+      ),
+    )
+    .limit(limit)
+    .execute();
+  return files.map(
+    (file) =>
+      ({
+        id: file.id,
+        parentId: file.parent_id ?? "root",
+        userId: file.user_id,
+        path: file.path,
+        mekVersion: file.master_encryption_key_version,
+        encDek: file.encrypted_data_encryption_key,
+        dekVersion: file.data_encryption_key_version,
+        hskVersion: file.hmac_secret_key_version,
+        contentHmac: file.content_hmac,
+        contentType: file.content_type,
+        encContentIv: file.encrypted_content_iv,
+        encContentHash: file.encrypted_content_hash,
+        encName: file.encrypted_name,
+        encCreatedAt: file.encrypted_created_at,
+        encLastModifiedAt: file.encrypted_last_modified_at,
+      }) satisfies File,
+  );
 };
 
 export const getAllFileIdsByContentHmac = async (
diff --git a/src/lib/server/db/media.ts b/src/lib/server/db/media.ts
index 3e165c0..9a080ab 100644
--- a/src/lib/server/db/media.ts
+++ b/src/lib/server/db/media.ts
@@ -83,27 +83,3 @@ export const getFileThumbnail = async (userId: number, fileId: number) => {
       } satisfies FileThumbnail)
     : null;
 };
-
-export const getMissingFileThumbnails = async (userId: number, limit: number = 100) => {
-  const files = await db
-    .selectFrom("file")
-    .select("id")
-    .where("user_id", "=", userId)
-    .where((eb) =>
-      eb.or([eb("content_type", "like", "image/%"), eb("content_type", "like", "video/%")]),
-    )
-    .where((eb) =>
-      eb.not(
-        eb.exists(
-          eb
-            .selectFrom("thumbnail")
-            .select("thumbnail.id")
-            .whereRef("thumbnail.file_id", "=", "file.id")
-            .limit(1),
-        ),
-      ),
-    )
-    .limit(limit)
-    .execute();
-  return files.map(({ id }) => id);
-};
diff --git a/src/lib/utils/concurrency/HybridPromise.ts b/src/lib/utils/concurrency/HybridPromise.ts
index 10c6be9..912a54c 100644
--- a/src/lib/utils/concurrency/HybridPromise.ts
+++ b/src/lib/utils/concurrency/HybridPromise.ts
@@ -90,4 +90,42 @@ export class HybridPromise<T> implements PromiseLike<T> {
       return HybridPromise.reject(e);
     }
   }
+
+  static all<T extends readonly unknown[] | []>(
+    maybePromises: T,
+  ): HybridPromise<{ -readonly [P in keyof T]: HybridAwaited<T[P]> }> {
+    const length = maybePromises.length;
+    if (length === 0) {
+      return HybridPromise.resolve([] as any);
+    }
+
+    const hps = Array.from(maybePromises).map((p) => HybridPromise.resolve(p));
+    if (hps.some((hp) => !hp.isSync())) {
+      return new HybridPromise({
+        mode: "async",
+        promise: Promise.all(hps.map((hp) => hp.toPromise())) as any,
+      });
+    }
+
+    try {
+      return HybridPromise.resolve(
+        Array.from(
+          hps.map((hp) => {
+            if (hp.state.mode === "sync") {
+              if (hp.state.status === "fulfilled") {
+                return hp.state.value;
+              } else {
+                throw hp.state.reason;
+              }
+            }
+          }),
+        ) as any,
+      );
+    } catch (e) {
+      return HybridPromise.reject(e);
+    }
+  }
 }
+
+export type HybridAwaited<T> =
+  T extends HybridPromise<infer U> ? U : T extends Promise<infer U> ? U : T;
diff --git a/src/routes/(fullscreen)/search/+page.svelte b/src/routes/(fullscreen)/search/+page.svelte
index fdaa3ed..c1296db 100644
--- a/src/routes/(fullscreen)/search/+page.svelte
+++ b/src/routes/(fullscreen)/search/+page.svelte
@@ -58,15 +58,25 @@
       filters.includeImages || filters.includeVideos || filters.includeDirectories;
 
     const directories =
-      !hasTypeFilter || filters.includeDirectories ? serverResult.directories : [];
+      !hasTypeFilter || filters.includeDirectories
+        ? serverResult.directories.map((directory) => ({
+            type: "directory" as const,
+            ...directory,
+          }))
+        : [];
     const files =
       !hasTypeFilter || filters.includeImages || filters.includeVideos
-        ? serverResult.files.filter(
-            ({ contentType }) =>
-              !hasTypeFilter ||
-              (filters.includeImages && contentType.startsWith("image/")) ||
-              (filters.includeVideos && contentType.startsWith("video/")),
-          )
+        ? serverResult.files
+            .filter(
+              ({ contentType }) =>
+                !hasTypeFilter ||
+                (filters.includeImages && contentType.startsWith("image/")) ||
+                (filters.includeVideos && contentType.startsWith("video/")),
+            )
+            .map((file) => ({
+              type: "file" as const,
+              ...file,
+            }))
         : [];
 
     return sortEntries(
diff --git a/src/routes/(fullscreen)/search/service.ts b/src/routes/(fullscreen)/search/service.ts
index f8fd597..d12ea1a 100644
--- a/src/routes/(fullscreen)/search/service.ts
+++ b/src/routes/(fullscreen)/search/service.ts
@@ -1,8 +1,13 @@
-import type { DataKey, LocalCategoryInfo } from "$lib/modules/filesystem";
 import {
   decryptDirectoryMetadata,
   decryptFileMetadata,
-} from "$lib/modules/filesystem/internal.svelte";
+  getDirectoryInfo,
+  getFileInfo,
+  type LocalDirectoryInfo,
+  type FileInfo,
+  type LocalCategoryInfo,
+} from "$lib/modules/filesystem";
+import { HybridPromise } from "$lib/utils";
 import { trpc } from "$trpc/client";
 
 export interface SearchFilter {
@@ -10,28 +15,9 @@ export interface SearchFilter {
   categories: { info: LocalCategoryInfo; type: "include" | "exclude" }[];
 }
 
-interface SearchedDirectory {
-  type: "directory";
-  id: number;
-  parentId: DirectoryId;
-  dataKey?: DataKey;
-  name: string;
-}
-
-interface SearchedFile {
-  type: "file";
-  id: number;
-  parentId: DirectoryId;
-  dataKey?: DataKey;
-  contentType: string;
-  name: string;
-  createdAt?: Date;
-  lastModifiedAt: Date;
-}
-
 export interface SearchResult {
-  directories: SearchedDirectory[];
-  files: SearchedFile[];
+  directories: LocalDirectoryInfo[];
+  files: FileInfo[];
 }
 
 export const requestSearch = async (filter: SearchFilter, masterKey: CryptoKey) => {
@@ -45,51 +31,47 @@ export const requestSearch = async (filter: SearchFilter, masterKey: CryptoKey)
       .map(({ info }) => info.id),
   });
 
-  // TODO: FIXME
-  const [directories, files] = await Promise.all([
-    Promise.all(
-      directoriesRaw.map(async (dir) => {
-        const metadata = await decryptDirectoryMetadata(
-          { dek: dir.dek, dekVersion: dir.dekVersion, name: dir.name, nameIv: dir.nameIv },
-          masterKey,
-        );
-        return {
-          type: "directory" as const,
-          id: dir.id,
-          parentId: dir.parent,
-          dataKey: metadata.dataKey,
-          name: metadata.name,
-        };
-      }),
+  const [directories, files] = await HybridPromise.all([
+    HybridPromise.all(
+      directoriesRaw.map((directory) =>
+        HybridPromise.resolve(
+          getDirectoryInfo(directory.id, masterKey, {
+            async fetchFromServer(id, cachedInfo, masterKey) {
+              const metadata = await decryptDirectoryMetadata(directory, masterKey);
+              return {
+                subDirectories: [],
+                files: [],
+                ...cachedInfo,
+                id: id as number,
+                exists: true,
+                parentId: directory.parent,
+                ...metadata,
+              };
+            },
+          }),
+        ),
+      ),
     ),
-    Promise.all(
-      filesRaw.map(async (file) => {
-        const metadata = await decryptFileMetadata(
-          {
-            dek: file.dek,
-            dekVersion: file.dekVersion,
-            name: file.name,
-            nameIv: file.nameIv,
-            createdAt: file.createdAt,
-            createdAtIv: file.createdAtIv,
-            lastModifiedAt: file.lastModifiedAt,
-            lastModifiedAtIv: file.lastModifiedAtIv,
-          },
-          masterKey,
-        );
-        return {
-          type: "file" as const,
-          id: file.id,
-          parentId: file.parent,
-          dataKey: metadata.dataKey,
-          contentType: file.contentType,
-          name: metadata.name,
-          createdAt: metadata.createdAt,
-          lastModifiedAt: metadata.lastModifiedAt,
-        };
-      }),
+    HybridPromise.all(
+      filesRaw.map((file) =>
+        HybridPromise.resolve(
+          getFileInfo(file.id, masterKey, {
+            async fetchFromServer(id, cachedInfo, masterKey) {
+              const metadata = await decryptFileMetadata(file, masterKey);
+              return {
+                categories: [],
+                ...cachedInfo,
+                id: id as number,
+                exists: true,
+                parentId: file.parent,
+                contentType: file.contentType,
+                ...metadata,
+              };
+            },
+          }),
+        ),
+      ),
     ),
   ]);
-
-  return { directories, files } satisfies SearchResult;
+  return { directories, files } as SearchResult;
 };
diff --git a/src/routes/(fullscreen)/settings/migration/+page.svelte b/src/routes/(fullscreen)/settings/migration/+page.svelte
index 4db6a80..87450d1 100644
--- a/src/routes/(fullscreen)/settings/migration/+page.svelte
+++ b/src/routes/(fullscreen)/settings/migration/+page.svelte
@@ -3,11 +3,16 @@
   import { goto } from "$app/navigation";
   import { BottomDiv, Button, FullscreenDiv } from "$lib/components/atoms";
   import { TopBar } from "$lib/components/molecules";
-  import { bulkGetFileInfo, type MaybeFileInfo } from "$lib/modules/filesystem";
+  import type { MaybeFileInfo } from "$lib/modules/filesystem";
   import { masterKeyStore } from "$lib/stores";
   import { sortEntries } from "$lib/utils";
   import File from "./File.svelte";
-  import { getMigrationState, clearMigrationStates, requestFileMigration } from "./service.svelte";
+  import {
+    getMigrationState,
+    clearMigrationStates,
+    requestLegacyFiles,
+    requestFileMigration,
+  } from "./service.svelte";
 
   let { data } = $props();
 
@@ -30,9 +35,7 @@
   };
 
   onMount(async () => {
-    fileInfos = sortEntries(
-      Array.from((await bulkGetFileInfo(data.files, $masterKeyStore?.get(1)?.key!)).values()),
-    );
+    fileInfos = sortEntries(await requestLegacyFiles(data.files, $masterKeyStore?.get(1)?.key!));
   });
 
   $effect(() => clearMigrationStates);
diff --git a/src/routes/(fullscreen)/settings/migration/service.svelte.ts b/src/routes/(fullscreen)/settings/migration/service.svelte.ts
index 1bdf869..9f1f7eb 100644
--- a/src/routes/(fullscreen)/settings/migration/service.svelte.ts
+++ b/src/routes/(fullscreen)/settings/migration/service.svelte.ts
@@ -1,11 +1,17 @@
 import { limitFunction } from "p-limit";
 import { SvelteMap } from "svelte/reactivity";
 import { CHUNK_SIZE } from "$lib/constants";
-import type { FileInfo } from "$lib/modules/filesystem";
+import {
+  decryptFileMetadata,
+  getFileInfo,
+  type FileInfo,
+  type MaybeFileInfo,
+} from "$lib/modules/filesystem";
 import { uploadBlob } from "$lib/modules/upload";
 import { requestFileDownload } from "$lib/services/file";
-import { Scheduler } from "$lib/utils";
+import { HybridPromise, Scheduler } from "$lib/utils";
 import { trpc } from "$trpc/client";
+import type { RouterOutputs } from "$trpc/router.server";
 
 export type MigrationStatus =
   | "queued"
@@ -24,6 +30,35 @@ export interface MigrationState {
 const scheduler = new Scheduler();
 const states = new SvelteMap<number, MigrationState>();
 
+export const requestLegacyFiles = async (
+  filesRaw: RouterOutputs["file"]["listLegacy"],
+  masterKey: CryptoKey,
+) => {
+  const files = await HybridPromise.all(
+    filesRaw.map((file) =>
+      HybridPromise.resolve(
+        getFileInfo(file.id, masterKey, {
+          async fetchFromServer(id, cachedInfo, masterKey) {
+            const metadata = await decryptFileMetadata(file, masterKey);
+            return {
+              categories: [],
+              ...cachedInfo,
+              id: id as number,
+              exists: true,
+              isLegacy: file.isLegacy,
+              parentId: file.parent,
+              contentType: file.contentType,
+              ...metadata,
+            };
+          },
+        }),
+      ),
+    ),
+  );
+
+  return files as MaybeFileInfo[];
+};
+
 const createState = (status: MigrationStatus): MigrationState => {
   const state = $state({ status });
   return state;
diff --git a/src/routes/(fullscreen)/settings/thumbnail/+page.svelte b/src/routes/(fullscreen)/settings/thumbnail/+page.svelte
index 521a7b1..eca602e 100644
--- a/src/routes/(fullscreen)/settings/thumbnail/+page.svelte
+++ b/src/routes/(fullscreen)/settings/thumbnail/+page.svelte
@@ -4,13 +4,14 @@
   import { BottomDiv, Button, FullscreenDiv } from "$lib/components/atoms";
   import { IconEntryButton, TopBar } from "$lib/components/molecules";
   import { deleteAllFileThumbnailCaches } from "$lib/modules/file";
-  import { bulkGetFileInfo, type MaybeFileInfo } from "$lib/modules/filesystem";
+  import type { MaybeFileInfo } from "$lib/modules/filesystem";
   import { masterKeyStore } from "$lib/stores";
   import { sortEntries } from "$lib/utils";
   import File from "./File.svelte";
   import {
     getThumbnailGenerationStatus,
     clearThumbnailGenerationStatuses,
+    requestMissingThumbnailFiles,
     requestThumbnailGeneration,
     type GenerationStatus,
   } from "./service";
@@ -42,7 +43,7 @@
 
   onMount(async () => {
     fileInfos = sortEntries(
-      Array.from((await bulkGetFileInfo(data.files, $masterKeyStore?.get(1)?.key!)).values()),
+      await requestMissingThumbnailFiles(data.files, $masterKeyStore?.get(1)?.key!),
     );
   });
 
diff --git a/src/routes/(fullscreen)/settings/thumbnail/service.ts b/src/routes/(fullscreen)/settings/thumbnail/service.ts
index 5c4c61d..ce06b78 100644
--- a/src/routes/(fullscreen)/settings/thumbnail/service.ts
+++ b/src/routes/(fullscreen)/settings/thumbnail/service.ts
@@ -1,10 +1,16 @@
 import { limitFunction } from "p-limit";
 import { SvelteMap } from "svelte/reactivity";
 import { storeFileThumbnailCache } from "$lib/modules/file";
-import type { FileInfo } from "$lib/modules/filesystem";
+import {
+  decryptFileMetadata,
+  getFileInfo,
+  type FileInfo,
+  type MaybeFileInfo,
+} from "$lib/modules/filesystem";
 import { generateThumbnail } from "$lib/modules/thumbnail";
 import { requestFileDownload, requestFileThumbnailUpload } from "$lib/services/file";
-import { Scheduler } from "$lib/utils";
+import { HybridPromise, Scheduler } from "$lib/utils";
+import type { RouterOutputs } from "$trpc/router.server";
 
 export type GenerationStatus =
   | "queued"
@@ -29,6 +35,35 @@ export const clearThumbnailGenerationStatuses = () => {
   }
 };
 
+export const requestMissingThumbnailFiles = async (
+  filesRaw: RouterOutputs["file"]["listWithoutThumbnail"],
+  masterKey: CryptoKey,
+) => {
+  const files = await HybridPromise.all(
+    filesRaw.map((file) =>
+      HybridPromise.resolve(
+        getFileInfo(file.id, masterKey, {
+          async fetchFromServer(id, cachedInfo, masterKey) {
+            const metadata = await decryptFileMetadata(file, masterKey);
+            return {
+              categories: [],
+              ...cachedInfo,
+              id: id as number,
+              exists: true,
+              isLegacy: file.isLegacy,
+              parentId: file.parent,
+              contentType: file.contentType,
+              ...metadata,
+            };
+          },
+        }),
+      ),
+    ),
+  );
+
+  return files as MaybeFileInfo[];
+};
+
 const requestThumbnailUpload = limitFunction(
   async (fileInfo: FileInfo, fileBuffer: ArrayBuffer) => {
     statuses.set(fileInfo.id, "generating");
diff --git a/src/trpc/routers/file.ts b/src/trpc/routers/file.ts
index d6d658c..ce6e5a6 100644
--- a/src/trpc/routers/file.ts
+++ b/src/trpc/routers/file.ts
@@ -97,11 +97,41 @@ const fileRouter = router({
     }),
 
   listWithoutThumbnail: roleProcedure["activeClient"].query(async ({ ctx }) => {
-    return await MediaRepo.getMissingFileThumbnails(ctx.session.userId);
+    const files = await FileRepo.getFilesWithoutThumbnail(ctx.session.userId);
+    return files.map((file) => ({
+      id: file.id,
+      isLegacy: !!file.encContentIv,
+      parent: file.parentId,
+      mekVersion: file.mekVersion,
+      dek: file.encDek,
+      dekVersion: file.dekVersion,
+      contentType: file.contentType,
+      name: file.encName.ciphertext,
+      nameIv: file.encName.iv,
+      createdAt: file.encCreatedAt?.ciphertext,
+      createdAtIv: file.encCreatedAt?.iv,
+      lastModifiedAt: file.encLastModifiedAt.ciphertext,
+      lastModifiedAtIv: file.encLastModifiedAt.iv,
+    }));
   }),
 
   listLegacy: roleProcedure["activeClient"].query(async ({ ctx }) => {
-    return await FileRepo.getLegacyFileIds(ctx.session.userId);
+    const files = await FileRepo.getLegacyFiles(ctx.session.userId);
+    return files.map((file) => ({
+      id: file.id,
+      isLegacy: true,
+      parent: file.parentId,
+      mekVersion: file.mekVersion,
+      dek: file.encDek,
+      dekVersion: file.dekVersion,
+      contentType: file.contentType,
+      name: file.encName.ciphertext,
+      nameIv: file.encName.iv,
+      createdAt: file.encCreatedAt?.ciphertext,
+      createdAtIv: file.encCreatedAt?.iv,
+      lastModifiedAt: file.encLastModifiedAt.ciphertext,
+      lastModifiedAtIv: file.encLastModifiedAt.iv,
+    }));
   }),
 
   rename: roleProcedure["activeClient"]

From cb5105a355aa96894603abaa923f80a6f41d7ca0 Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Fri, 16 Jan 2026 07:51:17 +0900
Subject: [PATCH 06/15] =?UTF-8?q?=ED=8C=A8=ED=82=A4=EC=A7=80=20=EB=B2=84?=
 =?UTF-8?q?=EC=A0=84=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json      |  20 +--
 pnpm-lock.yaml    | 366 +++++++++++++++++++++++-----------------------
 static/robots.txt |   2 +
 3 files changed, 191 insertions(+), 197 deletions(-)
 create mode 100644 static/robots.txt

diff --git a/package.json b/package.json
index 07f8d07..c6b35cb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "arkvault",
   "private": true,
-  "version": "0.8.0",
+  "version": "0.9.0",
   "type": "module",
   "scripts": {
     "dev": "vite dev",
@@ -20,8 +20,8 @@
     "@eslint/js": "^9.39.2",
     "@iconify-json/material-symbols": "^1.2.51",
     "@noble/hashes": "^2.0.1",
-    "@sveltejs/adapter-node": "^5.4.0",
-    "@sveltejs/kit": "^2.49.4",
+    "@sveltejs/adapter-node": "^5.5.1",
+    "@sveltejs/kit": "^2.49.5",
     "@sveltejs/vite-plugin-svelte": "^6.2.4",
     "@tanstack/svelte-virtual": "^3.13.18",
     "@trpc/client": "^11.8.1",
@@ -37,23 +37,23 @@
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-svelte": "^3.14.0",
     "eslint-plugin-tailwindcss": "^3.18.2",
-    "exifreader": "^4.35.0",
+    "exifreader": "^4.36.0",
     "file-saver": "^2.0.5",
     "globals": "^17.0.0",
     "heic2any": "^0.0.4",
-    "kysely-ctl": "^0.19.0",
+    "kysely-ctl": "^0.20.0",
     "lru-cache": "^11.2.4",
     "mime": "^4.1.0",
     "p-limit": "^7.2.0",
-    "prettier": "^3.7.4",
+    "prettier": "^3.8.0",
     "prettier-plugin-svelte": "^3.4.1",
     "prettier-plugin-tailwindcss": "^0.7.2",
-    "svelte": "^5.46.1",
+    "svelte": "^5.46.4",
     "svelte-check": "^4.3.5",
     "tailwindcss": "^3.4.19",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.52.0",
-    "unplugin-icons": "^22.5.0",
+    "typescript-eslint": "^8.53.0",
+    "unplugin-icons": "^23.0.1",
     "vite": "^7.3.1"
   },
   "dependencies": {
@@ -62,7 +62,7 @@
     "kysely": "^0.28.9",
     "ms": "^2.1.3",
     "node-schedule": "^2.1.1",
-    "pg": "^8.16.3",
+    "pg": "^8.17.1",
     "superjson": "^2.2.6",
     "uuid": "^13.0.0",
     "zod": "^4.3.5"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fd8be37..03e1dc1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -24,8 +24,8 @@ importers:
         specifier: ^2.1.1
         version: 2.1.1
       pg:
-        specifier: ^8.16.3
-        version: 8.16.3
+        specifier: ^8.17.1
+        version: 8.17.1
       superjson:
         specifier: ^2.2.6
         version: 2.2.6
@@ -49,17 +49,17 @@ importers:
         specifier: ^2.0.1
         version: 2.0.1
       '@sveltejs/adapter-node':
-        specifier: ^5.4.0
-        version: 5.4.0(@sveltejs/kit@2.49.4(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0)))(svelte@5.46.1)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0)))
+        specifier: ^5.5.1
+        version: 5.5.1(@sveltejs/kit@2.49.5(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0)))
       '@sveltejs/kit':
-        specifier: ^2.49.4
-        version: 2.49.4(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0)))(svelte@5.46.1)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0))
+        specifier: ^2.49.5
+        version: 2.49.5(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0))
       '@sveltejs/vite-plugin-svelte':
         specifier: ^6.2.4
-        version: 6.2.4(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0))
+        version: 6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0))
       '@tanstack/svelte-virtual':
         specifier: ^3.13.18
-        version: 3.13.18(svelte@5.46.1)
+        version: 3.13.18(svelte@5.46.4)
       '@trpc/client':
         specifier: ^11.8.1
         version: 11.8.1(@trpc/server@11.8.1(typescript@5.9.3))(typescript@5.9.3)
@@ -95,13 +95,13 @@ importers:
         version: 10.1.8(eslint@9.39.2(jiti@1.21.7))
       eslint-plugin-svelte:
         specifier: ^3.14.0
-        version: 3.14.0(eslint@9.39.2(jiti@1.21.7))(svelte@5.46.1)
+        version: 3.14.0(eslint@9.39.2(jiti@1.21.7))(svelte@5.46.4)
       eslint-plugin-tailwindcss:
         specifier: ^3.18.2
         version: 3.18.2(tailwindcss@3.4.19(yaml@2.8.0))
       exifreader:
-        specifier: ^4.35.0
-        version: 4.35.0
+        specifier: ^4.36.0
+        version: 4.36.0
       file-saver:
         specifier: ^2.0.5
         version: 2.0.5
@@ -112,8 +112,8 @@ importers:
         specifier: ^0.0.4
         version: 0.0.4
       kysely-ctl:
-        specifier: ^0.19.0
-        version: 0.19.0(kysely@0.28.9)(typescript@5.9.3)
+        specifier: ^0.20.0
+        version: 0.20.0(kysely@0.28.9)(typescript@5.9.3)
       lru-cache:
         specifier: ^11.2.4
         version: 11.2.4
@@ -124,20 +124,20 @@ importers:
         specifier: ^7.2.0
         version: 7.2.0
       prettier:
-        specifier: ^3.7.4
-        version: 3.7.4
+        specifier: ^3.8.0
+        version: 3.8.0
       prettier-plugin-svelte:
         specifier: ^3.4.1
-        version: 3.4.1(prettier@3.7.4)(svelte@5.46.1)
+        version: 3.4.1(prettier@3.8.0)(svelte@5.46.4)
       prettier-plugin-tailwindcss:
         specifier: ^0.7.2
-        version: 0.7.2(prettier-plugin-svelte@3.4.1(prettier@3.7.4)(svelte@5.46.1))(prettier@3.7.4)
+        version: 0.7.2(prettier-plugin-svelte@3.4.1(prettier@3.8.0)(svelte@5.46.4))(prettier@3.8.0)
       svelte:
-        specifier: ^5.46.1
-        version: 5.46.1
+        specifier: ^5.46.4
+        version: 5.46.4
       svelte-check:
         specifier: ^4.3.5
-        version: 4.3.5(picomatch@4.0.3)(svelte@5.46.1)(typescript@5.9.3)
+        version: 4.3.5(picomatch@4.0.3)(svelte@5.46.4)(typescript@5.9.3)
       tailwindcss:
         specifier: ^3.4.19
         version: 3.4.19(yaml@2.8.0)
@@ -145,14 +145,14 @@ importers:
         specifier: ^5.9.3
         version: 5.9.3
       typescript-eslint:
-        specifier: ^8.52.0
-        version: 8.52.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+        specifier: ^8.53.0
+        version: 8.53.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       unplugin-icons:
-        specifier: ^22.5.0
-        version: 22.5.0(svelte@5.46.1)
+        specifier: ^23.0.1
+        version: 23.0.1(svelte@5.46.4)
       vite:
         specifier: ^7.3.1
-        version: 7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0)
+        version: 7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0)
 
 packages:
 
@@ -606,13 +606,13 @@ packages:
     peerDependencies:
       acorn: ^8.9.0
 
-  '@sveltejs/adapter-node@5.4.0':
-    resolution: {integrity: sha512-NMsrwGVPEn+J73zH83Uhss/hYYZN6zT3u31R3IHAn3MiKC3h8fjmIAhLfTSOeNHr5wPYfjjMg8E+1gyFgyrEcQ==}
+  '@sveltejs/adapter-node@5.5.1':
+    resolution: {integrity: sha512-VpZdPNRPQuZRtgfAMETPWWKpZx9JwXmUUsgz/+eSpw/Oh7+2O1uZHlsQTuyfxydJHPrRzjfu/ItcJjY4oscCiQ==}
     peerDependencies:
       '@sveltejs/kit': ^2.4.0
 
-  '@sveltejs/kit@2.49.4':
-    resolution: {integrity: sha512-JFtOqDoU0DI/+QSG8qnq5bKcehVb3tCHhOG4amsSYth5/KgO4EkJvi42xSAiyKmXAAULW1/Zdb6lkgGEgSxdZg==}
+  '@sveltejs/kit@2.49.5':
+    resolution: {integrity: sha512-dCYqelr2RVnWUuxc+Dk/dB/SjV/8JBndp1UovCyCZdIQezd8TRwFLNZctYkzgHxRJtaNvseCSRsuuHPeUgIN/A==}
     engines: {node: '>=18.13'}
     hasBin: true
     peerDependencies:
@@ -679,8 +679,8 @@ packages:
   '@types/node-schedule@2.1.8':
     resolution: {integrity: sha512-k00g6Yj/oUg/CDC+MeLHUzu0+OFxWbIqrFfDiLi6OPKxTujvpv29mHGM8GtKr7B+9Vv92FcK/8mRqi1DK5f3hA==}
 
-  '@types/node@25.0.6':
-    resolution: {integrity: sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==}
+  '@types/node@25.0.9':
+    resolution: {integrity: sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==}
 
   '@types/pg@8.16.0':
     resolution: {integrity: sha512-RmhMd/wD+CF8Dfo+cVIy3RR5cl8CyfXQ0tGgW6XBL8L4LM/UTEbNXYRbLwU6w+CgrKBNbrQWt4FUtTfaU5jSYQ==}
@@ -688,63 +688,63 @@ packages:
   '@types/resolve@1.20.2':
     resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
 
-  '@typescript-eslint/eslint-plugin@8.52.0':
-    resolution: {integrity: sha512-okqtOgqu2qmZJ5iN4TWlgfF171dZmx2FzdOv2K/ixL2LZWDStL8+JgQerI2sa8eAEfoydG9+0V96m7V+P8yE1Q==}
+  '@typescript-eslint/eslint-plugin@8.53.0':
+    resolution: {integrity: sha512-eEXsVvLPu8Z4PkFibtuFJLJOTAV/nPdgtSjkGoPpddpFk3/ym2oy97jynY6ic2m6+nc5M8SE1e9v/mHKsulcJg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^8.52.0
+      '@typescript-eslint/parser': ^8.53.0
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/parser@8.52.0':
-    resolution: {integrity: sha512-iIACsx8pxRnguSYhHiMn2PvhvfpopO9FXHyn1mG5txZIsAaB6F0KwbFnUQN3KCiG3Jcuad/Cao2FAs1Wp7vAyg==}
+  '@typescript-eslint/parser@8.53.0':
+    resolution: {integrity: sha512-npiaib8XzbjtzS2N4HlqPvlpxpmZ14FjSJrteZpPxGUaYPlvhzlzUZ4mZyABo0EFrOWnvyd0Xxroq//hKhtAWg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/project-service@8.52.0':
-    resolution: {integrity: sha512-xD0MfdSdEmeFa3OmVqonHi+Cciab96ls1UhIF/qX/O/gPu5KXD0bY9lu33jj04fjzrXHcuvjBcBC+D3SNSadaw==}
+  '@typescript-eslint/project-service@8.53.0':
+    resolution: {integrity: sha512-Bl6Gdr7NqkqIP5yP9z1JU///Nmes4Eose6L1HwpuVHwScgDPPuEWbUVhvlZmb8hy0vX9syLk5EGNL700WcBlbg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/scope-manager@8.52.0':
-    resolution: {integrity: sha512-ixxqmmCcc1Nf8S0mS0TkJ/3LKcC8mruYJPOU6Ia2F/zUUR4pApW7LzrpU3JmtePbRUTes9bEqRc1Gg4iyRnDzA==}
+  '@typescript-eslint/scope-manager@8.53.0':
+    resolution: {integrity: sha512-kWNj3l01eOGSdVBnfAF2K1BTh06WS0Yet6JUgb9Cmkqaz3Jlu0fdVUjj9UI8gPidBWSMqDIglmEXifSgDT/D0g==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/tsconfig-utils@8.52.0':
-    resolution: {integrity: sha512-jl+8fzr/SdzdxWJznq5nvoI7qn2tNYV/ZBAEcaFMVXf+K6jmXvAFrgo/+5rxgnL152f//pDEAYAhhBAZGrVfwg==}
+  '@typescript-eslint/tsconfig-utils@8.53.0':
+    resolution: {integrity: sha512-K6Sc0R5GIG6dNoPdOooQ+KtvT5KCKAvTcY8h2rIuul19vxH5OTQk7ArKkd4yTzkw66WnNY0kPPzzcmWA+XRmiA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/type-utils@8.52.0':
-    resolution: {integrity: sha512-JD3wKBRWglYRQkAtsyGz1AewDu3mTc7NtRjR/ceTyGoPqmdS5oCdx/oZMWD5Zuqmo6/MpsYs0wp6axNt88/2EQ==}
+  '@typescript-eslint/type-utils@8.53.0':
+    resolution: {integrity: sha512-BBAUhlx7g4SmcLhn8cnbxoxtmS7hcq39xKCgiutL3oNx1TaIp+cny51s8ewnKMpVUKQUGb41RAUWZ9kxYdovuw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/types@8.52.0':
-    resolution: {integrity: sha512-LWQV1V4q9V4cT4H5JCIx3481iIFxH1UkVk+ZkGGAV1ZGcjGI9IoFOfg3O6ywz8QqCDEp7Inlg6kovMofsNRaGg==}
+  '@typescript-eslint/types@8.53.0':
+    resolution: {integrity: sha512-Bmh9KX31Vlxa13+PqPvt4RzKRN1XORYSLlAE+sO1i28NkisGbTtSLFVB3l7PWdHtR3E0mVMuC7JilWJ99m2HxQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/typescript-estree@8.52.0':
-    resolution: {integrity: sha512-XP3LClsCc0FsTK5/frGjolyADTh3QmsLp6nKd476xNI9CsSsLnmn4f0jrzNoAulmxlmNIpeXuHYeEQv61Q6qeQ==}
+  '@typescript-eslint/typescript-estree@8.53.0':
+    resolution: {integrity: sha512-pw0c0Gdo7Z4xOG987u3nJ8akL9093yEEKv8QTJ+Bhkghj1xyj8cgPaavlr9rq8h7+s6plUJ4QJYw2gCZodqmGw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/utils@8.52.0':
-    resolution: {integrity: sha512-wYndVMWkweqHpEpwPhwqE2lnD2DxC6WVLupU/DOt/0/v+/+iQbbzO3jOHjmBMnhu0DgLULvOaU4h4pwHYi2oRQ==}
+  '@typescript-eslint/utils@8.53.0':
+    resolution: {integrity: sha512-XDY4mXTez3Z1iRDI5mbRhH4DFSt46oaIFsLg+Zn97+sYrXACziXSQcSelMybnVZ5pa1P6xYkPr5cMJyunM1ZDA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/visitor-keys@8.52.0':
-    resolution: {integrity: sha512-ink3/Zofus34nmBsPjow63FP5M7IGff0RKAgqR6+CFpdk22M7aLwC9gOcLGYqr7MczLPzZVERW9hRog3O4n1sQ==}
+  '@typescript-eslint/visitor-keys@8.53.0':
+    resolution: {integrity: sha512-LZ2NqIHFhvFwxG0qZeLL9DvdNAHPGCY5dIRwBhyYeU+LfLhcStE1ImjsuTG/WaVh3XysGaeLW8Rqq7cGkPCFvw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@xmldom/xmldom@0.9.8':
@@ -961,8 +961,8 @@ packages:
   destr@2.0.5:
     resolution: {integrity: sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==}
 
-  devalue@5.6.1:
-    resolution: {integrity: sha512-jDwizj+IlEZBunHcOuuFVBnIMPAEHvTsJj0BcIp94xYguLRVBcXO853px/MyIJvbVzWdsGvrRweIUWJw8hBP7A==}
+  devalue@5.6.2:
+    resolution: {integrity: sha512-nPRkjWzzDQlsejL1WVifk5rvcFi/y1onBRxjaFMjZeR9mFpqu2gmAZ9xUB9/IEanEP/vBtGeGganC/GO1fmufg==}
 
   dexie@4.2.1:
     resolution: {integrity: sha512-Ckej0NS6jxQ4Po3OrSQBFddayRhTCic2DoCAG5zacOfOVB9P2Q5Xc5uL/nVa7ZVs+HdMnvUPzLFCB/JwpB6Csg==}
@@ -1089,8 +1089,8 @@ packages:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
 
-  exifreader@4.35.0:
-    resolution: {integrity: sha512-qiMONyOObmwI6sIXy13vRGqlcoi9VUKr70iGI1aefP+xJsbcXp+hcyL/4J6hov/yG9UhS7Hq1OQ1hAoSEZl+RA==}
+  exifreader@4.36.0:
+    resolution: {integrity: sha512-A9LvILHKAlVyF8k/ThqcnvvWrtprcKLw2BRuesuqhWZzgPu+GLDfQwVlqK4QE9ytmZDC6C71mY8ij5w9fZOANg==}
 
   exsolve@1.0.8:
     resolution: {integrity: sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA==}
@@ -1304,8 +1304,8 @@ packages:
   known-css-properties@0.37.0:
     resolution: {integrity: sha512-JCDrsP4Z1Sb9JwG0aJ8Eo2r7k4Ou5MwmThS/6lcIe1ICyb7UBJKGRIUUdqc2ASdE/42lgz6zFUnzAIhtXnBVrQ==}
 
-  kysely-ctl@0.19.0:
-    resolution: {integrity: sha512-89hzOd1cy/H063jB2E9wYHq+uKYpaHv6Mb5RiNFpRZL6BYCah9ncsdl3x5b52eirxry4UyWSmGNN3sFv+gK+ig==}
+  kysely-ctl@0.20.0:
+    resolution: {integrity: sha512-JoUBvW0uaEvM7BbR/JKaePvjQqZ8sHGOgy1VSESCjCIh5tIjP6pCuSz/u35hWpZnWrqeonqTjndW7xC7UNzqPA==}
     engines: {node: '>=20'}
     hasBin: true
     peerDependencies:
@@ -1509,30 +1509,30 @@ packages:
   perfect-debounce@2.0.0:
     resolution: {integrity: sha512-fkEH/OBiKrqqI/yIgjR92lMfs2K8105zt/VT6+7eTjNwisrsh47CeIED9z58zI7DfKdH3uHAn25ziRZn3kgAow==}
 
-  pg-cloudflare@1.2.7:
-    resolution: {integrity: sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==}
+  pg-cloudflare@1.3.0:
+    resolution: {integrity: sha512-6lswVVSztmHiRtD6I8hw4qP/nDm1EJbKMRhf3HCYaqud7frGysPv7FYJ5noZQdhQtN2xJnimfMtvQq21pdbzyQ==}
 
-  pg-connection-string@2.9.1:
-    resolution: {integrity: sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==}
+  pg-connection-string@2.10.0:
+    resolution: {integrity: sha512-ur/eoPKzDx2IjPaYyXS6Y8NSblxM7X64deV2ObV57vhjsWiwLvUD6meukAzogiOsu60GO8m/3Cb6FdJsWNjwXg==}
 
   pg-int8@1.0.1:
     resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==}
     engines: {node: '>=4.0.0'}
 
-  pg-pool@3.10.1:
-    resolution: {integrity: sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==}
+  pg-pool@3.11.0:
+    resolution: {integrity: sha512-MJYfvHwtGp870aeusDh+hg9apvOe2zmpZJpyt+BMtzUWlVqbhFmMK6bOBXLBUPd7iRtIF9fZplDc7KrPN3PN7w==}
     peerDependencies:
       pg: '>=8.0'
 
-  pg-protocol@1.10.3:
-    resolution: {integrity: sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==}
+  pg-protocol@1.11.0:
+    resolution: {integrity: sha512-pfsxk2M9M3BuGgDOfuy37VNRRX3jmKgMjcvAcWqNDpZSf4cUmv8HSOl5ViRQFsfARFn0KuUQTgLxVMbNq5NW3g==}
 
   pg-types@2.2.0:
     resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
     engines: {node: '>=4'}
 
-  pg@8.16.3:
-    resolution: {integrity: sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==}
+  pg@8.17.1:
+    resolution: {integrity: sha512-EIR+jXdYNSMOrpRp7g6WgQr7SaZNZfS7IzZIO0oTNEeibq956JxeD15t3Jk3zZH0KH8DmOIx38qJfQenoE8bXQ==}
     engines: {node: '>= 16.0.0'}
     peerDependencies:
       pg-native: '>=3.0.1'
@@ -1724,8 +1724,8 @@ packages:
       prettier-plugin-svelte:
         optional: true
 
-  prettier@3.7.4:
-    resolution: {integrity: sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==}
+  prettier@3.8.0:
+    resolution: {integrity: sha512-yEPsovQfpxYfgWNhCfECjG5AQaO+K3dp6XERmOepyPDVqcJm+bjyCVO3pmU+nAPe0N5dDvekfGezt/EIiRe1TA==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -1857,8 +1857,8 @@ packages:
       svelte:
         optional: true
 
-  svelte@5.46.1:
-    resolution: {integrity: sha512-ynjfCHD3nP2el70kN5Pmg37sSi0EjOm9FgHYQdC4giWG/hzO3AatzXXJJgP305uIhGQxSufJLuYWtkY8uK/8RA==}
+  svelte@5.46.4:
+    resolution: {integrity: sha512-VJwdXrmv9L8L7ZasJeWcCjoIuMRVbhuxbss0fpVnR8yorMmjNDwcjIH08vS6wmSzzzgAG5CADQ1JuXPS2nwt9w==}
     engines: {node: '>=18'}
 
   tailwindcss@3.4.19:
@@ -1912,8 +1912,8 @@ packages:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
 
-  typescript-eslint@8.52.0:
-    resolution: {integrity: sha512-atlQQJ2YkO4pfTVQmQ+wvYQwexPDOIgo+RaVcD7gHgzy/IQA+XTyuxNM9M9TVXvttkF7koBHmcwisKdOAf2EcA==}
+  typescript-eslint@8.53.0:
+    resolution: {integrity: sha512-xHURCQNxZ1dsWn0sdOaOfCSQG0HKeqSj9OexIxrz6ypU6wHYOdX2I3D2b8s8wFSsSOYJb+6q283cLiLlkEsBYw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
@@ -1924,21 +1924,19 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
-  ufo@1.6.2:
-    resolution: {integrity: sha512-heMioaxBcG9+Znsda5Q8sQbWnLJSl98AFDXTO80wELWEzX3hordXsTdxrIfMQoO9IY1MEnoGoPjpoKpMj+Yx0Q==}
+  ufo@1.6.3:
+    resolution: {integrity: sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q==}
 
   undici-types@7.16.0:
     resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}
 
-  unplugin-icons@22.5.0:
-    resolution: {integrity: sha512-MBlMtT5RuMYZy4TZgqUL2OTtOdTUVsS1Mhj6G1pEzMlFJlEnq6mhUfoIt45gBWxHcsOdXJDWLg3pRZ+YmvAVWQ==}
+  unplugin-icons@23.0.1:
+    resolution: {integrity: sha512-rv0XEJepajKzDLvRUWASM8K+8+/CCfZn2jtogXqg6RIp7kpatRc/aFrVJn8ANQA09e++lPEEv9yX8cC9enc+QQ==}
     peerDependencies:
       '@svgr/core': '>=7.0.0'
       '@svgx/core': ^1.0.1
-      '@vue/compiler-sfc': ^3.0.2 || ^2.7.0
+      '@vue/compiler-sfc': ^3.0.2
       svelte: ^3.0.0 || ^4.0.0 || ^5.0.0
-      vue-template-compiler: ^2.6.12
-      vue-template-es2015-compiler: ^1.9.0
     peerDependenciesMeta:
       '@svgr/core':
         optional: true
@@ -1948,10 +1946,6 @@ packages:
         optional: true
       svelte:
         optional: true
-      vue-template-compiler:
-        optional: true
-      vue-template-es2015-compiler:
-        optional: true
 
   unplugin@2.3.11:
     resolution: {integrity: sha512-5uKD0nqiYVzlmCRs01Fhs2BdkEgBS3SAVP6ndrBsuK42iC2+JHyxM05Rm9G8+5mkmRtzMZGY8Ct5+mliZxU/Ww==}
@@ -2382,23 +2376,23 @@ snapshots:
     dependencies:
       acorn: 8.15.0
 
-  '@sveltejs/adapter-node@5.4.0(@sveltejs/kit@2.49.4(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0)))(svelte@5.46.1)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0)))':
+  '@sveltejs/adapter-node@5.5.1(@sveltejs/kit@2.49.5(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0)))':
     dependencies:
       '@rollup/plugin-commonjs': 28.0.9(rollup@4.55.1)
       '@rollup/plugin-json': 6.1.0(rollup@4.55.1)
       '@rollup/plugin-node-resolve': 16.0.3(rollup@4.55.1)
-      '@sveltejs/kit': 2.49.4(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0)))(svelte@5.46.1)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0))
+      '@sveltejs/kit': 2.49.5(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0))
       rollup: 4.55.1
 
-  '@sveltejs/kit@2.49.4(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0)))(svelte@5.46.1)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0))':
+  '@sveltejs/kit@2.49.5(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0))':
     dependencies:
       '@standard-schema/spec': 1.1.0
       '@sveltejs/acorn-typescript': 1.0.8(acorn@8.15.0)
-      '@sveltejs/vite-plugin-svelte': 6.2.4(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0))
+      '@sveltejs/vite-plugin-svelte': 6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0))
       '@types/cookie': 0.6.0
       acorn: 8.15.0
       cookie: 0.6.0
-      devalue: 5.6.1
+      devalue: 5.6.2
       esm-env: 1.2.2
       kleur: 4.1.5
       magic-string: 0.30.21
@@ -2406,32 +2400,32 @@ snapshots:
       sade: 1.8.1
       set-cookie-parser: 2.7.2
       sirv: 3.0.2
-      svelte: 5.46.1
-      vite: 7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0)
+      svelte: 5.46.4
+      vite: 7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0)
     optionalDependencies:
       typescript: 5.9.3
 
-  '@sveltejs/vite-plugin-svelte-inspector@5.0.2(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0)))(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0))':
+  '@sveltejs/vite-plugin-svelte-inspector@5.0.2(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0)))(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 6.2.4(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0))
+      '@sveltejs/vite-plugin-svelte': 6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0))
       obug: 2.1.1
-      svelte: 5.46.1
-      vite: 7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0)
+      svelte: 5.46.4
+      vite: 7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0)
 
-  '@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0))':
+  '@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte-inspector': 5.0.2(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0)))(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0))
+      '@sveltejs/vite-plugin-svelte-inspector': 5.0.2(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0)))(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0))
       deepmerge: 4.3.1
       magic-string: 0.30.21
       obug: 2.1.1
-      svelte: 5.46.1
-      vite: 7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0)
-      vitefu: 1.1.1(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0))
+      svelte: 5.46.4
+      vite: 7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0)
+      vitefu: 1.1.1(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0))
 
-  '@tanstack/svelte-virtual@3.13.18(svelte@5.46.1)':
+  '@tanstack/svelte-virtual@3.13.18(svelte@5.46.4)':
     dependencies:
       '@tanstack/virtual-core': 3.13.18
-      svelte: 5.46.1
+      svelte: 5.46.4
 
   '@tanstack/virtual-core@3.13.18': {}
 
@@ -2456,28 +2450,28 @@ snapshots:
 
   '@types/node-schedule@2.1.8':
     dependencies:
-      '@types/node': 25.0.6
+      '@types/node': 25.0.9
 
-  '@types/node@25.0.6':
+  '@types/node@25.0.9':
     dependencies:
       undici-types: 7.16.0
 
   '@types/pg@8.16.0':
     dependencies:
-      '@types/node': 25.0.6
-      pg-protocol: 1.10.3
+      '@types/node': 25.0.9
+      pg-protocol: 1.11.0
       pg-types: 2.2.0
 
   '@types/resolve@1.20.2': {}
 
-  '@typescript-eslint/eslint-plugin@8.52.0(@typescript-eslint/parser@8.52.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+  '@typescript-eslint/eslint-plugin@8.53.0(@typescript-eslint/parser@8.53.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
     dependencies:
       '@eslint-community/regexpp': 4.12.2
-      '@typescript-eslint/parser': 8.52.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/scope-manager': 8.52.0
-      '@typescript-eslint/type-utils': 8.52.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.52.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.52.0
+      '@typescript-eslint/parser': 8.53.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.53.0
+      '@typescript-eslint/type-utils': 8.53.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.53.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.53.0
       eslint: 9.39.2(jiti@1.21.7)
       ignore: 7.0.5
       natural-compare: 1.4.0
@@ -2486,41 +2480,41 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.52.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+  '@typescript-eslint/parser@8.53.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/scope-manager': 8.52.0
-      '@typescript-eslint/types': 8.52.0
-      '@typescript-eslint/typescript-estree': 8.52.0(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.52.0
+      '@typescript-eslint/scope-manager': 8.53.0
+      '@typescript-eslint/types': 8.53.0
+      '@typescript-eslint/typescript-estree': 8.53.0(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.53.0
       debug: 4.4.3
       eslint: 9.39.2(jiti@1.21.7)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/project-service@8.52.0(typescript@5.9.3)':
+  '@typescript-eslint/project-service@8.53.0(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.52.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.52.0
+      '@typescript-eslint/tsconfig-utils': 8.53.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.53.0
       debug: 4.4.3
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/scope-manager@8.52.0':
+  '@typescript-eslint/scope-manager@8.53.0':
     dependencies:
-      '@typescript-eslint/types': 8.52.0
-      '@typescript-eslint/visitor-keys': 8.52.0
+      '@typescript-eslint/types': 8.53.0
+      '@typescript-eslint/visitor-keys': 8.53.0
 
-  '@typescript-eslint/tsconfig-utils@8.52.0(typescript@5.9.3)':
+  '@typescript-eslint/tsconfig-utils@8.53.0(typescript@5.9.3)':
     dependencies:
       typescript: 5.9.3
 
-  '@typescript-eslint/type-utils@8.52.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+  '@typescript-eslint/type-utils@8.53.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/types': 8.52.0
-      '@typescript-eslint/typescript-estree': 8.52.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.52.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/types': 8.53.0
+      '@typescript-eslint/typescript-estree': 8.53.0(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.53.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       debug: 4.4.3
       eslint: 9.39.2(jiti@1.21.7)
       ts-api-utils: 2.4.0(typescript@5.9.3)
@@ -2528,14 +2522,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/types@8.52.0': {}
+  '@typescript-eslint/types@8.53.0': {}
 
-  '@typescript-eslint/typescript-estree@8.52.0(typescript@5.9.3)':
+  '@typescript-eslint/typescript-estree@8.53.0(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/project-service': 8.52.0(typescript@5.9.3)
-      '@typescript-eslint/tsconfig-utils': 8.52.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.52.0
-      '@typescript-eslint/visitor-keys': 8.52.0
+      '@typescript-eslint/project-service': 8.53.0(typescript@5.9.3)
+      '@typescript-eslint/tsconfig-utils': 8.53.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.53.0
+      '@typescript-eslint/visitor-keys': 8.53.0
       debug: 4.4.3
       minimatch: 9.0.5
       semver: 7.7.3
@@ -2545,20 +2539,20 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.52.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+  '@typescript-eslint/utils@8.53.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
-      '@typescript-eslint/scope-manager': 8.52.0
-      '@typescript-eslint/types': 8.52.0
-      '@typescript-eslint/typescript-estree': 8.52.0(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.53.0
+      '@typescript-eslint/types': 8.53.0
+      '@typescript-eslint/typescript-estree': 8.53.0(typescript@5.9.3)
       eslint: 9.39.2(jiti@1.21.7)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/visitor-keys@8.52.0':
+  '@typescript-eslint/visitor-keys@8.53.0':
     dependencies:
-      '@typescript-eslint/types': 8.52.0
+      '@typescript-eslint/types': 8.53.0
       eslint-visitor-keys: 4.2.1
 
   '@xmldom/xmldom@0.9.8':
@@ -2765,7 +2759,7 @@ snapshots:
 
   destr@2.0.5: {}
 
-  devalue@5.6.1: {}
+  devalue@5.6.2: {}
 
   dexie@4.2.1: {}
 
@@ -2837,7 +2831,7 @@ snapshots:
     dependencies:
       eslint: 9.39.2(jiti@1.21.7)
 
-  eslint-plugin-svelte@3.14.0(eslint@9.39.2(jiti@1.21.7))(svelte@5.46.1):
+  eslint-plugin-svelte@3.14.0(eslint@9.39.2(jiti@1.21.7))(svelte@5.46.4):
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
       '@jridgewell/sourcemap-codec': 1.5.5
@@ -2849,9 +2843,9 @@ snapshots:
       postcss-load-config: 3.1.4(postcss@8.5.6)
       postcss-safe-parser: 7.0.1(postcss@8.5.6)
       semver: 7.7.3
-      svelte-eslint-parser: 1.4.1(svelte@5.46.1)
+      svelte-eslint-parser: 1.4.1(svelte@5.46.4)
     optionalDependencies:
-      svelte: 5.46.1
+      svelte: 5.46.4
     transitivePeerDependencies:
       - ts-node
 
@@ -2937,7 +2931,7 @@ snapshots:
 
   esutils@2.0.3: {}
 
-  exifreader@4.35.0:
+  exifreader@4.36.0:
     optionalDependencies:
       '@xmldom/xmldom': 0.9.8
 
@@ -3124,7 +3118,7 @@ snapshots:
 
   known-css-properties@0.37.0: {}
 
-  kysely-ctl@0.19.0(kysely@0.28.9)(typescript@5.9.3):
+  kysely-ctl@0.20.0(kysely@0.28.9)(typescript@5.9.3):
     dependencies:
       c12: 3.3.3
       citty: 0.1.6
@@ -3209,7 +3203,7 @@ snapshots:
       acorn: 8.15.0
       pathe: 2.0.3
       pkg-types: 1.3.1
-      ufo: 1.6.2
+      ufo: 1.6.3
 
   mri@1.2.0: {}
 
@@ -3261,7 +3255,7 @@ snapshots:
     dependencies:
       destr: 2.0.5
       node-fetch-native: 1.6.7
-      ufo: 1.6.2
+      ufo: 1.6.3
 
   ohash@2.0.11: {}
 
@@ -3302,18 +3296,18 @@ snapshots:
 
   perfect-debounce@2.0.0: {}
 
-  pg-cloudflare@1.2.7:
+  pg-cloudflare@1.3.0:
     optional: true
 
-  pg-connection-string@2.9.1: {}
+  pg-connection-string@2.10.0: {}
 
   pg-int8@1.0.1: {}
 
-  pg-pool@3.10.1(pg@8.16.3):
+  pg-pool@3.11.0(pg@8.17.1):
     dependencies:
-      pg: 8.16.3
+      pg: 8.17.1
 
-  pg-protocol@1.10.3: {}
+  pg-protocol@1.11.0: {}
 
   pg-types@2.2.0:
     dependencies:
@@ -3323,15 +3317,15 @@ snapshots:
       postgres-date: 1.0.7
       postgres-interval: 1.2.0
 
-  pg@8.16.3:
+  pg@8.17.1:
     dependencies:
-      pg-connection-string: 2.9.1
-      pg-pool: 3.10.1(pg@8.16.3)
-      pg-protocol: 1.10.3
+      pg-connection-string: 2.10.0
+      pg-pool: 3.11.0(pg@8.17.1)
+      pg-protocol: 1.11.0
       pg-types: 2.2.0
       pgpass: 1.0.5
     optionalDependencies:
-      pg-cloudflare: 1.2.7
+      pg-cloudflare: 1.3.0
 
   pgpass@1.0.5:
     dependencies:
@@ -3429,18 +3423,18 @@ snapshots:
 
   prelude-ls@1.2.1: {}
 
-  prettier-plugin-svelte@3.4.1(prettier@3.7.4)(svelte@5.46.1):
+  prettier-plugin-svelte@3.4.1(prettier@3.8.0)(svelte@5.46.4):
     dependencies:
-      prettier: 3.7.4
-      svelte: 5.46.1
+      prettier: 3.8.0
+      svelte: 5.46.4
 
-  prettier-plugin-tailwindcss@0.7.2(prettier-plugin-svelte@3.4.1(prettier@3.7.4)(svelte@5.46.1))(prettier@3.7.4):
+  prettier-plugin-tailwindcss@0.7.2(prettier-plugin-svelte@3.4.1(prettier@3.8.0)(svelte@5.46.4))(prettier@3.8.0):
     dependencies:
-      prettier: 3.7.4
+      prettier: 3.8.0
     optionalDependencies:
-      prettier-plugin-svelte: 3.4.1(prettier@3.7.4)(svelte@5.46.1)
+      prettier-plugin-svelte: 3.4.1(prettier@3.8.0)(svelte@5.46.4)
 
-  prettier@3.7.4: {}
+  prettier@3.8.0: {}
 
   proxy-from-env@1.1.0: {}
 
@@ -3562,19 +3556,19 @@ snapshots:
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
-  svelte-check@4.3.5(picomatch@4.0.3)(svelte@5.46.1)(typescript@5.9.3):
+  svelte-check@4.3.5(picomatch@4.0.3)(svelte@5.46.4)(typescript@5.9.3):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       chokidar: 4.0.3
       fdir: 6.5.0(picomatch@4.0.3)
       picocolors: 1.1.1
       sade: 1.8.1
-      svelte: 5.46.1
+      svelte: 5.46.4
       typescript: 5.9.3
     transitivePeerDependencies:
       - picomatch
 
-  svelte-eslint-parser@1.4.1(svelte@5.46.1):
+  svelte-eslint-parser@1.4.1(svelte@5.46.4):
     dependencies:
       eslint-scope: 8.4.0
       eslint-visitor-keys: 4.2.1
@@ -3583,9 +3577,9 @@ snapshots:
       postcss-scss: 4.0.9(postcss@8.5.6)
       postcss-selector-parser: 7.1.1
     optionalDependencies:
-      svelte: 5.46.1
+      svelte: 5.46.4
 
-  svelte@5.46.1:
+  svelte@5.46.4:
     dependencies:
       '@jridgewell/remapping': 2.3.5
       '@jridgewell/sourcemap-codec': 1.5.5
@@ -3595,7 +3589,7 @@ snapshots:
       aria-query: 5.3.2
       axobject-query: 4.1.0
       clsx: 2.1.1
-      devalue: 5.6.1
+      devalue: 5.6.2
       esm-env: 1.2.2
       esrap: 2.2.1
       is-reference: 3.0.3
@@ -3666,12 +3660,12 @@ snapshots:
     dependencies:
       prelude-ls: 1.2.1
 
-  typescript-eslint@8.52.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3):
+  typescript-eslint@8.53.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3):
     dependencies:
-      '@typescript-eslint/eslint-plugin': 8.52.0(@typescript-eslint/parser@8.52.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/parser': 8.52.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/typescript-estree': 8.52.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.52.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/eslint-plugin': 8.53.0(@typescript-eslint/parser@8.53.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.53.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/typescript-estree': 8.53.0(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.53.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       eslint: 9.39.2(jiti@1.21.7)
       typescript: 5.9.3
     transitivePeerDependencies:
@@ -3679,21 +3673,19 @@ snapshots:
 
   typescript@5.9.3: {}
 
-  ufo@1.6.2: {}
+  ufo@1.6.3: {}
 
   undici-types@7.16.0: {}
 
-  unplugin-icons@22.5.0(svelte@5.46.1):
+  unplugin-icons@23.0.1(svelte@5.46.4):
     dependencies:
       '@antfu/install-pkg': 1.1.0
       '@iconify/utils': 3.1.0
-      debug: 4.4.3
       local-pkg: 1.1.2
+      obug: 2.1.1
       unplugin: 2.3.11
     optionalDependencies:
-      svelte: 5.46.1
-    transitivePeerDependencies:
-      - supports-color
+      svelte: 5.46.4
 
   unplugin@2.3.11:
     dependencies:
@@ -3716,7 +3708,7 @@ snapshots:
 
   uuid@13.0.0: {}
 
-  vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0):
+  vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0):
     dependencies:
       esbuild: 0.27.2
       fdir: 6.5.0(picomatch@4.0.3)
@@ -3725,14 +3717,14 @@ snapshots:
       rollup: 4.55.1
       tinyglobby: 0.2.15
     optionalDependencies:
-      '@types/node': 25.0.6
+      '@types/node': 25.0.9
       fsevents: 2.3.3
       jiti: 1.21.7
       yaml: 2.8.0
 
-  vitefu@1.1.1(vite@7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0)):
+  vitefu@1.1.1(vite@7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0)):
     optionalDependencies:
-      vite: 7.3.1(@types/node@25.0.6)(jiti@1.21.7)(yaml@2.8.0)
+      vite: 7.3.1(@types/node@25.0.9)(jiti@1.21.7)(yaml@2.8.0)
 
   webpack-virtual-modules@0.6.2: {}
 
diff --git a/static/robots.txt b/static/robots.txt
new file mode 100644
index 0000000..1f53798
--- /dev/null
+++ b/static/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

From d8e18fb1d3e3a481a099f76b8333f3d7b931d41a Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Fri, 16 Jan 2026 10:24:32 +0900
Subject: [PATCH 07/15] =?UTF-8?q?OR=20=EC=A1=B0=EA=B1=B4=20=EB=8C=80?=
 =?UTF-8?q?=EC=8B=A0=20IN=20=EC=97=B0=EC=82=B0=EC=9E=90=EB=A5=BC=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=9D=BC?=
 =?UTF-8?q?=EB=B6=80=20SQL=20=EC=BF=BC=EB=A6=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/server/db/mek.ts                                    | 2 +-
 src/lib/server/db/migrations/1737422340-AddFileCategory.ts  | 4 +---
 src/lib/server/db/migrations/1768062380-AddChunkedUpload.ts | 2 ++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/server/db/mek.ts b/src/lib/server/db/mek.ts
index 65d00f8..7f4f5f2 100644
--- a/src/lib/server/db/mek.ts
+++ b/src/lib/server/db/mek.ts
@@ -71,7 +71,7 @@ export const getAllValidClientMeks = async (userId: number, clientId: number) =>
     .selectAll()
     .where("client_master_encryption_key.user_id", "=", userId)
     .where("client_master_encryption_key.client_id", "=", clientId)
-    .where((eb) => eb.or([eb("state", "=", "active"), eb("state", "=", "retired")]))
+    .where("state", "in", ["active", "retired"])
     .execute();
   return clientMeks.map(
     ({ user_id, client_id, version, state, encrypted_key, encrypted_key_signature }) =>
diff --git a/src/lib/server/db/migrations/1737422340-AddFileCategory.ts b/src/lib/server/db/migrations/1737422340-AddFileCategory.ts
index ff811e1..6200290 100644
--- a/src/lib/server/db/migrations/1737422340-AddFileCategory.ts
+++ b/src/lib/server/db/migrations/1737422340-AddFileCategory.ts
@@ -53,9 +53,7 @@ export const up = async (db: Kysely<any>) => {
 export const down = async (db: Kysely<any>) => {
   await db
     .deleteFrom("file_log")
-    .where((eb) =>
-      eb.or([eb("action", "=", "add-to-category"), eb("action", "=", "remove-from-category")]),
-    )
+    .where("action", "in", ["add-to-category", "remove-from-category"])
     .execute();
 
   await db.schema.dropTable("file_category").execute();
diff --git a/src/lib/server/db/migrations/1768062380-AddChunkedUpload.ts b/src/lib/server/db/migrations/1768062380-AddChunkedUpload.ts
index 22676aa..f92c0e4 100644
--- a/src/lib/server/db/migrations/1768062380-AddChunkedUpload.ts
+++ b/src/lib/server/db/migrations/1768062380-AddChunkedUpload.ts
@@ -62,6 +62,8 @@ export const up = async (db: Kysely<any>) => {
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const down = async (db: Kysely<any>) => {
+  await db.deleteFrom("file_log").where("action", "=", "migrate").execute();
+
   await db.schema.dropTable("upload_session").execute();
   await db.schema
     .alterTable("thumbnail")

From befa535526f4ff9182acc97804cc7478a08eb5dc Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Sat, 17 Jan 2026 18:25:54 +0900
Subject: [PATCH 08/15] =?UTF-8?q?=EB=B9=84=ED=9A=A8=EC=9C=A8=EC=A0=81?=
 =?UTF-8?q?=EC=9D=B8=20=EB=B9=84=EB=94=94=EC=98=A4=20=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=EB=A6=AC=EB=B0=8D=20=EB=A1=9C=EC=A7=81=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/service-worker/handlers/decryptFile.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/service-worker/handlers/decryptFile.ts b/src/service-worker/handlers/decryptFile.ts
index 9aa9717..075a08c 100644
--- a/src/service-worker/handlers/decryptFile.ts
+++ b/src/service-worker/handlers/decryptFile.ts
@@ -62,9 +62,7 @@ const streamFromServer = async (
 ) => {
   const totalSize = getDecryptedSize(metadata.encContentSize, metadata.isLegacy);
   const start = range?.start ?? 0;
-  const end =
-    range?.end ??
-    (range && !metadata.isLegacy ? Math.min(start + CHUNK_SIZE, totalSize) : totalSize) - 1;
+  const end = range?.end ?? totalSize - 1;
   if (start > end || start < 0 || end >= totalSize) {
     return new Response("Invalid range", { status: 416 });
   }

From 420e30f677945975720b9cee00d104b58d37b38f Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Sat, 17 Jan 2026 19:41:52 +0900
Subject: [PATCH 09/15] =?UTF-8?q?=EC=A6=90=EA=B2=A8=EC=B0=BE=EA=B8=B0=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/modules/filesystem/directory.ts       |   2 +
 src/lib/modules/filesystem/types.ts           |   2 +
 src/lib/server/db/error.ts                    |   4 +
 src/lib/server/db/file.ts                     | 139 +++++++++++++++++-
 .../db/migrations/1768643000-AddFavorites.ts  |  29 ++++
 src/lib/server/db/migrations/index.ts         |   2 +
 src/lib/server/db/schema/file.ts              |  13 +-
 .../(fullscreen)/file/[id]/+page.svelte       |   2 +-
 src/routes/(main)/BottomBar.svelte            |   2 +-
 .../(main)/directory/[[id]]/+page.svelte      |   9 +-
 .../[[id]]/DirectoryEntries/File.svelte       |   8 +-
 .../DirectoryEntries/SubDirectory.svelte      |   8 +-
 .../[[id]]/EntryMenuBottomSheet.svelte        |  15 +-
 .../(main)/directory/[[id]]/service.svelte.ts |  23 +++
 src/routes/(main)/favorite/+page.svelte       |   3 -
 src/routes/(main)/favorites/+page.server.ts   |   7 +
 src/routes/(main)/favorites/+page.svelte      |  84 +++++++++++
 src/routes/(main)/favorites/Directory.svelte  |  24 +++
 src/routes/(main)/favorites/File.svelte       |  27 ++++
 src/routes/(main)/favorites/service.ts        |  86 +++++++++++
 src/trpc/router.server.ts                     |   2 +
 src/trpc/routers/directory.ts                 |   3 +
 src/trpc/routers/favorites.ts                 | 124 ++++++++++++++++
 src/trpc/routers/index.ts                     |   1 +
 24 files changed, 605 insertions(+), 14 deletions(-)
 create mode 100644 src/lib/server/db/migrations/1768643000-AddFavorites.ts
 delete mode 100644 src/routes/(main)/favorite/+page.svelte
 create mode 100644 src/routes/(main)/favorites/+page.server.ts
 create mode 100644 src/routes/(main)/favorites/+page.svelte
 create mode 100644 src/routes/(main)/favorites/Directory.svelte
 create mode 100644 src/routes/(main)/favorites/File.svelte
 create mode 100644 src/routes/(main)/favorites/service.ts
 create mode 100644 src/trpc/routers/favorites.ts

diff --git a/src/lib/modules/filesystem/directory.ts b/src/lib/modules/filesystem/directory.ts
index 38b6376..361b3c5 100644
--- a/src/lib/modules/filesystem/directory.ts
+++ b/src/lib/modules/filesystem/directory.ts
@@ -39,6 +39,7 @@ const cache = new FilesystemCache<DirectoryId, MaybeDirectoryInfo>({
           directory.subDirectories.map(async (directory) => ({
             id: directory.id,
             parentId: id,
+            isFavorite: directory.isFavorite,
             ...(await decryptDirectoryMetadata(directory, masterKey)),
           })),
         ),
@@ -47,6 +48,7 @@ const cache = new FilesystemCache<DirectoryId, MaybeDirectoryInfo>({
             id: file.id,
             parentId: id,
             contentType: file.contentType,
+            isFavorite: file.isFavorite,
             ...(await decryptFileMetadata(file, masterKey)),
           })),
         ),
diff --git a/src/lib/modules/filesystem/types.ts b/src/lib/modules/filesystem/types.ts
index 58df5eb..f2bfbe6 100644
--- a/src/lib/modules/filesystem/types.ts
+++ b/src/lib/modules/filesystem/types.ts
@@ -6,6 +6,7 @@ export interface LocalDirectoryInfo {
   parentId: DirectoryId;
   dataKey?: DataKey;
   name: string;
+  isFavorite?: boolean;
   subDirectories: SubDirectoryInfo[];
   files: SummarizedFileInfo[];
 }
@@ -36,6 +37,7 @@ export interface FileInfo {
   createdAt?: Date;
   lastModifiedAt: Date;
   categories: FileCategoryInfo[];
+  isFavorite?: boolean;
 }
 
 export type MaybeFileInfo =
diff --git a/src/lib/server/db/error.ts b/src/lib/server/db/error.ts
index 0d61d72..0ca6ec2 100644
--- a/src/lib/server/db/error.ts
+++ b/src/lib/server/db/error.ts
@@ -8,10 +8,14 @@ type IntegrityErrorMessages =
   | "User client already exists"
   // File
   | "Directory not found"
+  | "Directory already favorited"
+  | "Directory not favorited"
   | "File not found"
   | "File is not legacy"
   | "File not found in category"
   | "File already added to category"
+  | "File already favorited"
+  | "File not favorited"
   | "Invalid DEK version"
   // HSK
   | "HSK already registered"
diff --git a/src/lib/server/db/file.ts b/src/lib/server/db/file.ts
index 23a9b8c..d70abf8 100644
--- a/src/lib/server/db/file.ts
+++ b/src/lib/server/db/file.ts
@@ -13,6 +13,7 @@ interface Directory {
   encDek: string;
   dekVersion: Date;
   encName: Ciphertext;
+  isFavorite: boolean;
 }
 
 interface File {
@@ -31,6 +32,7 @@ interface File {
   encName: Ciphertext;
   encCreatedAt: Ciphertext | null;
   encLastModifiedAt: Ciphertext;
+  isFavorite: boolean;
 }
 
 interface FileCategory {
@@ -42,7 +44,7 @@ interface FileCategory {
   encName: Ciphertext;
 }
 
-export const registerDirectory = async (params: Omit<Directory, "id">) => {
+export const registerDirectory = async (params: Omit<Directory, "id" | "isFavorite">) => {
   await db.transaction().execute(async (trx) => {
     const mek = await trx
       .selectFrom("master_encryption_key")
@@ -97,6 +99,7 @@ export const getAllDirectoriesByParent = async (userId: number, parentId: Direct
         encDek: directory.encrypted_data_encryption_key,
         dekVersion: directory.data_encryption_key_version,
         encName: directory.encrypted_name,
+        isFavorite: directory.is_favorite,
       }) satisfies Directory,
   );
 };
@@ -130,6 +133,7 @@ export const getAllRecursiveDirectoriesByParent = async (userId: number, parentI
         encDek: directory.encrypted_data_encryption_key,
         dekVersion: directory.data_encryption_key_version,
         encName: directory.encrypted_name,
+        isFavorite: directory.is_favorite,
       }) satisfies Directory,
   );
 };
@@ -151,6 +155,7 @@ export const getDirectory = async (userId: number, directoryId: number) => {
         encDek: directory.encrypted_data_encryption_key,
         dekVersion: directory.data_encryption_key_version,
         encName: directory.encrypted_name,
+        isFavorite: directory.is_favorite,
       } satisfies Directory)
     : null;
 };
@@ -243,7 +248,7 @@ export const unregisterDirectory = async (userId: number, directoryId: number) =
     });
 };
 
-export const registerFile = async (trx: typeof db, params: Omit<File, "id">) => {
+export const registerFile = async (trx: typeof db, params: Omit<File, "id" | "isFavorite">) => {
   if ((params.hskVersion && !params.contentHmac) || (!params.hskVersion && params.contentHmac)) {
     throw new Error("Invalid arguments");
   }
@@ -305,6 +310,7 @@ export const getAllFilesByParent = async (userId: number, parentId: DirectoryId)
         encName: file.encrypted_name,
         encCreatedAt: file.encrypted_created_at,
         encLastModifiedAt: file.encrypted_last_modified_at,
+        isFavorite: file.is_favorite,
       }) satisfies File,
   );
 };
@@ -357,6 +363,7 @@ export const getAllFilesByCategory = async (
         encName: file.encrypted_name,
         encCreatedAt: file.encrypted_created_at,
         encLastModifiedAt: file.encrypted_last_modified_at,
+        isFavorite: file.is_favorite,
         isRecursive: file.depth > 0,
       }) satisfies File & { isRecursive: boolean },
   );
@@ -393,6 +400,7 @@ export const getLegacyFiles = async (userId: number, limit: number = 100) => {
         encName: file.encrypted_name,
         encCreatedAt: file.encrypted_created_at,
         encLastModifiedAt: file.encrypted_last_modified_at,
+        isFavorite: file.is_favorite,
       }) satisfies File,
   );
 };
@@ -436,6 +444,7 @@ export const getFilesWithoutThumbnail = async (userId: number, limit: number = 1
         encName: file.encrypted_name,
         encCreatedAt: file.encrypted_created_at,
         encLastModifiedAt: file.encrypted_last_modified_at,
+        isFavorite: file.is_favorite,
       }) satisfies File,
   );
 };
@@ -480,6 +489,7 @@ export const getFile = async (userId: number, fileId: number) => {
         encName: file.encrypted_name,
         encCreatedAt: file.encrypted_created_at,
         encLastModifiedAt: file.encrypted_last_modified_at,
+        isFavorite: file.is_favorite,
       } satisfies File)
     : null;
 };
@@ -518,6 +528,7 @@ export const getFilesWithCategories = async (userId: number, fileIds: number[])
         encName: file.encrypted_name,
         encCreatedAt: file.encrypted_created_at,
         encLastModifiedAt: file.encrypted_last_modified_at,
+        isFavorite: file.is_favorite,
         categories: file.categories.map((category) => ({
           id: category.id,
           parentId: category.parent_id ?? "root",
@@ -803,3 +814,127 @@ export const removeFileFromCategory = async (fileId: number, categoryId: number)
       .execute();
   });
 };
+
+export const setFileFavorite = async (userId: number, fileId: number, isFavorite: boolean) => {
+  await db.transaction().execute(async (trx) => {
+    const file = await trx
+      .selectFrom("file")
+      .select("is_favorite")
+      .where("id", "=", fileId)
+      .where("user_id", "=", userId)
+      .limit(1)
+      .forUpdate()
+      .executeTakeFirst();
+    if (!file) {
+      throw new IntegrityError("File not found");
+    } else if (file.is_favorite === isFavorite) {
+      throw new IntegrityError(isFavorite ? "File already favorited" : "File not favorited");
+    }
+
+    await trx
+      .updateTable("file")
+      .set({ is_favorite: isFavorite })
+      .where("id", "=", fileId)
+      .where("user_id", "=", userId)
+      .execute();
+    await trx
+      .insertInto("file_log")
+      .values({
+        file_id: fileId,
+        timestamp: new Date(),
+        action: isFavorite ? "add-to-favorites" : "remove-from-favorites",
+      })
+      .execute();
+  });
+};
+
+export const setDirectoryFavorite = async (
+  userId: number,
+  directoryId: number,
+  isFavorite: boolean,
+) => {
+  await db.transaction().execute(async (trx) => {
+    const directory = await trx
+      .selectFrom("directory")
+      .select("is_favorite")
+      .where("id", "=", directoryId)
+      .where("user_id", "=", userId)
+      .limit(1)
+      .forUpdate()
+      .executeTakeFirst();
+    if (!directory) {
+      throw new IntegrityError("Directory not found");
+    } else if (directory.is_favorite === isFavorite) {
+      throw new IntegrityError(
+        isFavorite ? "Directory already favorited" : "Directory not favorited",
+      );
+    }
+
+    await trx
+      .updateTable("directory")
+      .set({ is_favorite: isFavorite })
+      .where("id", "=", directoryId)
+      .where("user_id", "=", userId)
+      .execute();
+    await trx
+      .insertInto("directory_log")
+      .values({
+        directory_id: directoryId,
+        timestamp: new Date(),
+        action: isFavorite ? "add-to-favorites" : "remove-from-favorites",
+      })
+      .execute();
+  });
+};
+
+export const getAllFavoriteFiles = async (userId: number) => {
+  const files = await db
+    .selectFrom("file")
+    .selectAll()
+    .where("user_id", "=", userId)
+    .where("is_favorite", "=", true)
+    .execute();
+  return files.map(
+    (file) =>
+      ({
+        id: file.id,
+        parentId: file.parent_id ?? "root",
+        userId: file.user_id,
+        path: file.path,
+        mekVersion: file.master_encryption_key_version,
+        encDek: file.encrypted_data_encryption_key,
+        dekVersion: file.data_encryption_key_version,
+        hskVersion: file.hmac_secret_key_version,
+        contentHmac: file.content_hmac,
+        contentType: file.content_type,
+        encContentIv: file.encrypted_content_iv,
+        encContentHash: file.encrypted_content_hash,
+        encName: file.encrypted_name,
+        encCreatedAt: file.encrypted_created_at,
+        encLastModifiedAt: file.encrypted_last_modified_at,
+        isFavorite: file.is_favorite,
+      }) satisfies File,
+  );
+};
+
+export const getAllFavoriteDirectories = async (userId: number) => {
+  const directories = await db
+    .selectFrom("directory")
+    .selectAll()
+    .where("user_id", "=", userId)
+    .where("is_favorite", "=", true)
+    .execute();
+  return directories.map(
+    (directory) =>
+      ({
+        id: directory.id,
+        parentId: directory.parent_id ?? "root",
+        userId: directory.user_id,
+        mekVersion: directory.master_encryption_key_version,
+        encDek: directory.encrypted_data_encryption_key,
+        dekVersion: directory.data_encryption_key_version,
+        encName: directory.encrypted_name,
+        isFavorite: directory.is_favorite,
+      }) satisfies Directory,
+  );
+};
diff --git a/src/lib/server/db/migrations/1768643000-AddFavorites.ts b/src/lib/server/db/migrations/1768643000-AddFavorites.ts
new file mode 100644
index 0000000..d18cce0
--- /dev/null
+++ b/src/lib/server/db/migrations/1768643000-AddFavorites.ts
@@ -0,0 +1,29 @@
+import { Kysely, sql } from "kysely";
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const up = async (db: Kysely<any>) => {
+  // file.ts
+  await db.schema
+    .alterTable("directory")
+    .addColumn("is_favorite", "boolean", (col) => col.notNull().defaultTo(false))
+    .execute();
+  await db.schema
+    .alterTable("file")
+    .addColumn("is_favorite", "boolean", (col) => col.notNull().defaultTo(false))
+    .execute();
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const down = async (db: Kysely<any>) => {
+  await db
+    .deleteFrom("file_log")
+    .where("action", "in", ["add-to-favorites", "remove-from-favorites"])
+    .execute();
+  await db
+    .deleteFrom("directory_log")
+    .where("action", "in", ["add-to-favorites", "remove-from-favorites"])
+    .execute();
+
+  await db.schema.alterTable("file").dropColumn("is_favorite").execute();
+  await db.schema.alterTable("directory").dropColumn("is_favorite").execute();
+};
diff --git a/src/lib/server/db/migrations/index.ts b/src/lib/server/db/migrations/index.ts
index ca3310a..363a394 100644
--- a/src/lib/server/db/migrations/index.ts
+++ b/src/lib/server/db/migrations/index.ts
@@ -2,10 +2,12 @@ import * as Initial1737357000 from "./1737357000-Initial";
 import * as AddFileCategory1737422340 from "./1737422340-AddFileCategory";
 import * as AddThumbnail1738409340 from "./1738409340-AddThumbnail";
 import * as AddChunkedUpload1768062380 from "./1768062380-AddChunkedUpload";
+import * as AddFavorites1768643000 from "./1768643000-AddFavorites";
 
 export default {
   "1737357000-Initial": Initial1737357000,
   "1737422340-AddFileCategory": AddFileCategory1737422340,
   "1738409340-AddThumbnail": AddThumbnail1738409340,
   "1768062380-AddChunkedUpload": AddChunkedUpload1768062380,
+  "1768643000-AddFavorites": AddFavorites1768643000,
 };
diff --git a/src/lib/server/db/schema/file.ts b/src/lib/server/db/schema/file.ts
index 3680d1d..c785b04 100644
--- a/src/lib/server/db/schema/file.ts
+++ b/src/lib/server/db/schema/file.ts
@@ -9,13 +9,14 @@ interface DirectoryTable {
   encrypted_data_encryption_key: string; // Base64
   data_encryption_key_version: Date;
   encrypted_name: Ciphertext;
+  is_favorite: Generated<boolean>;
 }
 
 interface DirectoryLogTable {
   id: Generated<number>;
   directory_id: number;
   timestamp: ColumnType<Date, Date, never>;
-  action: "create" | "rename";
+  action: "create" | "rename" | "add-to-favorites" | "remove-from-favorites";
   new_name: Ciphertext | null;
 }
 
@@ -35,13 +36,21 @@ interface FileTable {
   encrypted_name: Ciphertext;
   encrypted_created_at: Ciphertext | null;
   encrypted_last_modified_at: Ciphertext;
+  is_favorite: Generated<boolean>;
 }
 
 interface FileLogTable {
   id: Generated<number>;
   file_id: number;
   timestamp: ColumnType<Date, Date, never>;
-  action: "create" | "rename" | "migrate" | "add-to-category" | "remove-from-category";
+  action:
+    | "create"
+    | "rename"
+    | "migrate"
+    | "add-to-category"
+    | "remove-from-category"
+    | "add-to-favorites"
+    | "remove-from-favorites";
   new_name: Ciphertext | null;
   category_id: number | null;
 }
diff --git a/src/routes/(fullscreen)/file/[id]/+page.svelte b/src/routes/(fullscreen)/file/[id]/+page.svelte
index 6221249..9ae8825 100644
--- a/src/routes/(fullscreen)/file/[id]/+page.svelte
+++ b/src/routes/(fullscreen)/file/[id]/+page.svelte
@@ -150,7 +150,7 @@
     </button>
     <TopBarMenu
       bind:isOpen={isMenuOpen}
-      directoryId={["category", "gallery", "search"].includes(
+      directoryId={["category", "gallery", "search", "favorite"].includes(
         page.url.searchParams.get("from") ?? "",
       )
         ? info?.parentId
diff --git a/src/routes/(main)/BottomBar.svelte b/src/routes/(main)/BottomBar.svelte
index e1008df..3515a8f 100644
--- a/src/routes/(main)/BottomBar.svelte
+++ b/src/routes/(main)/BottomBar.svelte
@@ -12,7 +12,7 @@
   const pages = [
     { path: "/home", label: "홈", icon: IconHome },
     { path: "/directory", label: "파일", icon: IconFolder },
-    { path: "/favorite", label: "즐겨찾기", icon: IconFavorite },
+    { path: "/favorites", label: "즐겨찾기", icon: IconFavorite },
     { path: "/category", label: "카테고리", icon: IconCategory },
     { path: "/menu", label: "전체", icon: IconMenu },
   ];
diff --git a/src/routes/(main)/directory/[[id]]/+page.svelte b/src/routes/(main)/directory/[[id]]/+page.svelte
index f2d84d2..98abb79 100644
--- a/src/routes/(main)/directory/[[id]]/+page.svelte
+++ b/src/routes/(main)/directory/[[id]]/+page.svelte
@@ -23,6 +23,7 @@
     requestFileUpload,
     requestEntryRename,
     requestEntryDeletion,
+    requestFavoriteToggle,
   } from "./service.svelte";
 
   import IconSearch from "~icons/material-symbols/search";
@@ -45,7 +46,7 @@
   let isEntryDeleteModalOpen = $state(false);
 
   let showParentEntry = $derived(
-    ["file", "search"].includes(page.url.searchParams.get("from") ?? ""),
+    ["file", "search", "favorite"].includes(page.url.searchParams.get("from") ?? ""),
   );
   let showBackButton = $derived(data.id !== "root" || showParentEntry);
 
@@ -194,6 +195,12 @@
     isEntryMenuBottomSheetOpen = false;
     isEntryDeleteModalOpen = true;
   }}
+  onFavoriteClick={async () => {
+    if (await requestFavoriteToggle(context.selectedEntry!)) {
+      isEntryMenuBottomSheetOpen = false;
+      void getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+    }
+  }}
 />
 <EntryRenameModal
   bind:isOpen={isEntryRenameModalOpen}
diff --git a/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte b/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte
index 741bac3..a6c30c4 100644
--- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte
+++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte
@@ -19,7 +19,13 @@
   let thumbnail = $derived(getFileThumbnail(info));
 
   const action = (callback: typeof onclick) => {
-    callback({ type: "file", id: info.id, dataKey: info.dataKey, name: info.name });
+    callback({
+      type: "file",
+      id: info.id,
+      dataKey: info.dataKey,
+      name: info.name,
+      isFavorite: info.isFavorite ?? false,
+    });
   };
 </script>
 
diff --git a/src/routes/(main)/directory/[[id]]/DirectoryEntries/SubDirectory.svelte b/src/routes/(main)/directory/[[id]]/DirectoryEntries/SubDirectory.svelte
index 018a1e5..3f86025 100644
--- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/SubDirectory.svelte
+++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/SubDirectory.svelte
@@ -15,7 +15,13 @@
   let { info, onclick, onOpenMenuClick }: Props = $props();
 
   const action = (callback: typeof onclick) => {
-    callback({ type: "directory", id: info.id, dataKey: info.dataKey, name: info.name });
+    callback({
+      type: "directory",
+      id: info.id,
+      dataKey: info.dataKey,
+      name: info.name,
+      isFavorite: info.isFavorite ?? false,
+    });
   };
 </script>
 
diff --git a/src/routes/(main)/directory/[[id]]/EntryMenuBottomSheet.svelte b/src/routes/(main)/directory/[[id]]/EntryMenuBottomSheet.svelte
index 95e675a..a3d978a 100644
--- a/src/routes/(main)/directory/[[id]]/EntryMenuBottomSheet.svelte
+++ b/src/routes/(main)/directory/[[id]]/EntryMenuBottomSheet.svelte
@@ -3,24 +3,35 @@
   import { DirectoryEntryLabel, IconEntryButton } from "$lib/components/molecules";
   import { useContext } from "./service.svelte";
 
+  import IconFavorite from "~icons/material-symbols/favorite";
+  import IconFavoriteBorder from "~icons/material-symbols/favorite-outline";
   import IconEdit from "~icons/material-symbols/edit";
   import IconDelete from "~icons/material-symbols/delete";
 
   interface Props {
     isOpen: boolean;
     onDeleteClick: () => void;
+    onFavoriteClick: () => void;
     onRenameClick: () => void;
   }
 
-  let { isOpen = $bindable(), onDeleteClick, onRenameClick }: Props = $props();
+  let { isOpen = $bindable(), onDeleteClick, onFavoriteClick, onRenameClick }: Props = $props();
   let context = useContext();
 </script>
 
 {#if context.selectedEntry}
-  {@const { name, type } = context.selectedEntry}
+  {@const { name, type, isFavorite } = context.selectedEntry}
   <BottomSheet bind:isOpen class="p-4">
     <DirectoryEntryLabel {type} {name} class="h-12 p-2" textClass="!font-semibold" />
     <div class="my-2 h-px w-full bg-gray-200"></div>
+    <IconEntryButton
+      icon={isFavorite ? IconFavorite : IconFavoriteBorder}
+      onclick={onFavoriteClick}
+      class="h-12 w-full"
+      iconClass={isFavorite ? "text-red-500" : ""}
+    >
+      {isFavorite ? "즐겨찾기에서 해제하기" : "즐겨찾기에 추가하기"}
+    </IconEntryButton>
     <IconEntryButton icon={IconEdit} onclick={onRenameClick} class="h-12 w-full">
       이름 바꾸기
     </IconEntryButton>
diff --git a/src/routes/(main)/directory/[[id]]/service.svelte.ts b/src/routes/(main)/directory/[[id]]/service.svelte.ts
index be6392c..82a7456 100644
--- a/src/routes/(main)/directory/[[id]]/service.svelte.ts
+++ b/src/routes/(main)/directory/[[id]]/service.svelte.ts
@@ -17,6 +17,7 @@ export interface SelectedEntry {
   id: number;
   dataKey: DataKey | undefined;
   name: string;
+  isFavorite: boolean;
 }
 
 export const createContext = () => {
@@ -149,3 +150,25 @@ export const requestEntryDeletion = async (entry: SelectedEntry) => {
     return false;
   }
 };
+
+export const requestFavoriteToggle = async (entry: SelectedEntry) => {
+  try {
+    if (entry.type === "directory") {
+      if (entry.isFavorite) {
+        await trpc().favorites.removeDirectory.mutate({ id: entry.id });
+      } else {
+        await trpc().favorites.addDirectory.mutate({ id: entry.id });
+      }
+    } else {
+      if (entry.isFavorite) {
+        await trpc().favorites.removeFile.mutate({ id: entry.id });
+      } else {
+        await trpc().favorites.addFile.mutate({ id: entry.id });
+      }
+    }
+    return true;
+  } catch {
+    // TODO: Error Handling
+    return false;
+  }
+};
diff --git a/src/routes/(main)/favorite/+page.svelte b/src/routes/(main)/favorite/+page.svelte
deleted file mode 100644
index 73d68b7..0000000
--- a/src/routes/(main)/favorite/+page.svelte
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="flex h-full items-center justify-center p-4">
-  <p class="text-gray-500">아직 개발 중이에요.</p>
-</div>
diff --git a/src/routes/(main)/favorites/+page.server.ts b/src/routes/(main)/favorites/+page.server.ts
new file mode 100644
index 0000000..484016d
--- /dev/null
+++ b/src/routes/(main)/favorites/+page.server.ts
@@ -0,0 +1,7 @@
+import { createCaller } from "$trpc/router.server";
+import type { PageServerLoad } from "./$types";
+
+export const load: PageServerLoad = async (event) => {
+  const favorites = await createCaller(event).favorites.get();
+  return { favorites };
+};
diff --git a/src/routes/(main)/favorites/+page.svelte b/src/routes/(main)/favorites/+page.svelte
new file mode 100644
index 0000000..20d2a97
--- /dev/null
+++ b/src/routes/(main)/favorites/+page.svelte
@@ -0,0 +1,84 @@
+<script lang="ts">
+  import { onMount } from "svelte";
+  import { goto } from "$app/navigation";
+  import { RowVirtualizer } from "$lib/components/atoms";
+  import { masterKeyStore } from "$lib/stores";
+  import Directory from "./Directory.svelte";
+  import File from "./File.svelte";
+  import { requestFavoriteEntries, requestRemoveFavorite, type FavoriteEntry } from "./service";
+
+  let { data } = $props();
+
+  let entries: FavoriteEntry[] = $state([]);
+  let isLoading = $state(true);
+
+  onMount(async () => {
+    const masterKey = $masterKeyStore?.get(1)?.key;
+    if (masterKey) {
+      entries = await requestFavoriteEntries(data.favorites, masterKey);
+    }
+    isLoading = false;
+  });
+
+  const handleRemove = async (entry: FavoriteEntry) => {
+    if (await requestRemoveFavorite(entry.type, entry.details.id)) {
+      entries = entries.filter(
+        (e) => !(e.type === entry.type && e.details.id === entry.details.id),
+      );
+    }
+  };
+
+  const handleClick = (entry: FavoriteEntry) => {
+    goto(
+      entry.type === "file"
+        ? `/file/${entry.details.id}?from=favorite`
+        : `/directory/${entry.details.id}?from=favorite`,
+    );
+  };
+</script>
+
+<svelte:head>
+  <title>즐겨찾기</title>
+</svelte:head>
+
+<div class="flex h-full flex-col p-4">
+  {#if isLoading}
+    <div class="flex flex-grow items-center justify-center">
+      <p class="text-gray-500">
+        {#if data.favorites.files.length === 0 && data.favorites.directories.length === 0}
+          즐겨찾기한 항목이 없어요.
+        {:else}
+          로딩 중...
+        {/if}
+      </p>
+    </div>
+  {:else if entries.length === 0}
+    <div class="flex flex-grow items-center justify-center">
+      <p class="text-gray-500">즐겨찾기한 항목이 없어요.</p>
+    </div>
+  {:else}
+    <RowVirtualizer
+      count={entries.length}
+      getItemKey={(index) => `${entries[index]!.type}-${entries[index]!.details.id}`}
+      estimateItemHeight={() => 56}
+      itemGap={4}
+    >
+      {#snippet item(index)}
+        {@const entry = entries[index]!}
+        {#if entry.type === "directory"}
+          <Directory
+            info={entry.details}
+            onclick={() => handleClick(entry)}
+            onRemoveClick={() => handleRemove(entry)}
+          />
+        {:else}
+          <File
+            info={entry.details}
+            onclick={() => handleClick(entry)}
+            onRemoveClick={() => handleRemove(entry)}
+          />
+        {/if}
+      {/snippet}
+    </RowVirtualizer>
+  {/if}
+</div>
diff --git a/src/routes/(main)/favorites/Directory.svelte b/src/routes/(main)/favorites/Directory.svelte
new file mode 100644
index 0000000..ae1ab13
--- /dev/null
+++ b/src/routes/(main)/favorites/Directory.svelte
@@ -0,0 +1,24 @@
+<script lang="ts">
+  import { ActionEntryButton } from "$lib/components/atoms";
+  import { DirectoryEntryLabel } from "$lib/components/molecules";
+  import type { SubDirectoryInfo } from "$lib/modules/filesystem";
+
+  import IconClose from "~icons/material-symbols/close";
+
+  interface Props {
+    info: SubDirectoryInfo;
+    onclick: () => void;
+    onRemoveClick: () => void;
+  }
+
+  let { info, onclick, onRemoveClick }: Props = $props();
+</script>
+
+<ActionEntryButton
+  class="h-14"
+  {onclick}
+  actionButtonIcon={IconClose}
+  onActionButtonClick={onRemoveClick}
+>
+  <DirectoryEntryLabel type="directory" name={info.name} />
+</ActionEntryButton>
diff --git a/src/routes/(main)/favorites/File.svelte b/src/routes/(main)/favorites/File.svelte
new file mode 100644
index 0000000..78015d7
--- /dev/null
+++ b/src/routes/(main)/favorites/File.svelte
@@ -0,0 +1,27 @@
+<script lang="ts">
+  import { ActionEntryButton } from "$lib/components/atoms";
+  import { DirectoryEntryLabel } from "$lib/components/molecules";
+  import { getFileThumbnail } from "$lib/modules/file";
+  import type { SummarizedFileInfo } from "$lib/modules/filesystem";
+
+  import IconClose from "~icons/material-symbols/close";
+
+  interface Props {
+    info: SummarizedFileInfo;
+    onclick: () => void;
+    onRemoveClick: () => void;
+  }
+
+  let { info, onclick, onRemoveClick }: Props = $props();
+
+  let thumbnail = $derived(getFileThumbnail(info));
+</script>
+
+<ActionEntryButton
+  class="h-14"
+  {onclick}
+  actionButtonIcon={IconClose}
+  onActionButtonClick={onRemoveClick}
+>
+  <DirectoryEntryLabel type="file" thumbnail={$thumbnail} name={info.name} />
+</ActionEntryButton>
diff --git a/src/routes/(main)/favorites/service.ts b/src/routes/(main)/favorites/service.ts
new file mode 100644
index 0000000..7717d1c
--- /dev/null
+++ b/src/routes/(main)/favorites/service.ts
@@ -0,0 +1,86 @@
+import {
+  decryptDirectoryMetadata,
+  decryptFileMetadata,
+  getFileInfo,
+  type SummarizedFileInfo,
+  type SubDirectoryInfo,
+} from "$lib/modules/filesystem";
+import { HybridPromise, sortEntries } from "$lib/utils";
+import { trpc } from "$trpc/client";
+import type { RouterOutputs } from "$trpc/router.server";
+
+export type FavoriteEntry =
+  | { type: "directory"; name: string; details: SubDirectoryInfo }
+  | { type: "file"; name: string; details: SummarizedFileInfo };
+
+export const requestFavoriteEntries = async (
+  favorites: RouterOutputs["favorites"]["get"],
+  masterKey: CryptoKey,
+): Promise<FavoriteEntry[]> => {
+  const directories: FavoriteEntry[] = await Promise.all(
+    favorites.directories.map(async (dir) => {
+      const metadata = await decryptDirectoryMetadata(dir, masterKey);
+      return {
+        type: "directory" as const,
+        name: metadata.name,
+        details: {
+          id: dir.id,
+          parentId: dir.parent,
+          isFavorite: true,
+          dataKey: metadata.dataKey,
+          name: metadata.name,
+        } as SubDirectoryInfo,
+      };
+    }),
+  );
+
+  const fileResults = await Promise.all(
+    favorites.files.map(async (file) => {
+      const result = await HybridPromise.resolve(
+        getFileInfo(file.id, masterKey, {
+          async fetchFromServer(id, cachedInfo) {
+            const metadata = await decryptFileMetadata(file, masterKey);
+            return {
+              categories: [],
+              ...cachedInfo,
+              id: id as number,
+              exists: true,
+              parentId: file.parent,
+              contentType: file.contentType,
+              isFavorite: true,
+              ...metadata,
+            };
+          },
+        }),
+      );
+      if (result?.exists) {
+        return {
+          type: "file" as const,
+          name: result.name,
+          details: result as SummarizedFileInfo,
+        };
+      }
+      return null;
+    }),
+  );
+
+  const files = fileResults.filter(
+    (f): f is { type: "file"; name: string; details: SummarizedFileInfo } => f !== null,
+  );
+
+  return [...sortEntries(directories), ...sortEntries(files)];
+};
+
+export const requestRemoveFavorite = async (type: "file" | "directory", id: number) => {
+  try {
+    if (type === "directory") {
+      await trpc().favorites.removeDirectory.mutate({ id });
+    } else {
+      await trpc().favorites.removeFile.mutate({ id });
+    }
+    return true;
+  } catch {
+    // TODO: Error Handling
+    return false;
+  }
+};
diff --git a/src/trpc/router.server.ts b/src/trpc/router.server.ts
index c305a21..09a3918 100644
--- a/src/trpc/router.server.ts
+++ b/src/trpc/router.server.ts
@@ -6,6 +6,7 @@ import {
   categoryRouter,
   clientRouter,
   directoryRouter,
+  favoritesRouter,
   fileRouter,
   hskRouter,
   mekRouter,
@@ -19,6 +20,7 @@ export const appRouter = router({
   category: categoryRouter,
   client: clientRouter,
   directory: directoryRouter,
+  favorites: favoritesRouter,
   file: fileRouter,
   hsk: hskRouter,
   mek: mekRouter,
diff --git a/src/trpc/routers/directory.ts b/src/trpc/routers/directory.ts
index 15f16f3..dfe5a3b 100644
--- a/src/trpc/routers/directory.ts
+++ b/src/trpc/routers/directory.ts
@@ -31,6 +31,7 @@ const directoryRouter = router({
           dekVersion: directory.dekVersion,
           name: directory.encName.ciphertext,
           nameIv: directory.encName.iv,
+          isFavorite: directory.isFavorite,
         },
         subDirectories: directories.map((directory) => ({
           id: directory.id,
@@ -39,6 +40,7 @@ const directoryRouter = router({
           dekVersion: directory.dekVersion,
           name: directory.encName.ciphertext,
           nameIv: directory.encName.iv,
+          isFavorite: directory.isFavorite,
         })),
         files: files.map((file) => ({
           id: file.id,
@@ -52,6 +54,7 @@ const directoryRouter = router({
           createdAtIv: file.encCreatedAt?.iv,
           lastModifiedAt: file.encLastModifiedAt.ciphertext,
           lastModifiedAtIv: file.encLastModifiedAt.iv,
+          isFavorite: file.isFavorite,
         })),
       };
     }),
diff --git a/src/trpc/routers/favorites.ts b/src/trpc/routers/favorites.ts
new file mode 100644
index 0000000..8aba70b
--- /dev/null
+++ b/src/trpc/routers/favorites.ts
@@ -0,0 +1,124 @@
+import { TRPCError } from "@trpc/server";
+import { z } from "zod";
+import { FileRepo, IntegrityError } from "$lib/server/db";
+import { router, roleProcedure } from "../init.server";
+
+const favoritesRouter = router({
+  get: roleProcedure["activeClient"].query(async ({ ctx }) => {
+    const [files, directories] = await Promise.all([
+      FileRepo.getAllFavoriteFiles(ctx.session.userId),
+      FileRepo.getAllFavoriteDirectories(ctx.session.userId),
+    ]);
+    return {
+      files: files.map((file) => ({
+        id: file.id,
+        parent: file.parentId,
+        mekVersion: file.mekVersion,
+        dek: file.encDek,
+        dekVersion: file.dekVersion,
+        contentType: file.contentType,
+        name: file.encName.ciphertext,
+        nameIv: file.encName.iv,
+        createdAt: file.encCreatedAt?.ciphertext,
+        createdAtIv: file.encCreatedAt?.iv,
+        lastModifiedAt: file.encLastModifiedAt.ciphertext,
+        lastModifiedAtIv: file.encLastModifiedAt.iv,
+      })),
+      directories: directories.map((directory) => ({
+        id: directory.id,
+        parent: directory.parentId,
+        mekVersion: directory.mekVersion,
+        dek: directory.encDek,
+        dekVersion: directory.dekVersion,
+        name: directory.encName.ciphertext,
+        nameIv: directory.encName.iv,
+      })),
+    };
+  }),
+
+  addFile: roleProcedure["activeClient"]
+    .input(
+      z.object({
+        id: z.int().positive(),
+      }),
+    )
+    .mutation(async ({ ctx, input }) => {
+      try {
+        await FileRepo.setFileFavorite(ctx.session.userId, input.id, true);
+      } catch (e) {
+        if (e instanceof IntegrityError) {
+          if (e.message === "File not found") {
+            throw new TRPCError({ code: "NOT_FOUND", message: "Invalid file id" });
+          } else if (e.message === "File already favorited") {
+            throw new TRPCError({ code: "BAD_REQUEST", message: e.message });
+          }
+        }
+        throw e;
+      }
+    }),
+
+  removeFile: roleProcedure["activeClient"]
+    .input(
+      z.object({
+        id: z.int().positive(),
+      }),
+    )
+    .mutation(async ({ ctx, input }) => {
+      try {
+        await FileRepo.setFileFavorite(ctx.session.userId, input.id, false);
+      } catch (e) {
+        if (e instanceof IntegrityError) {
+          if (e.message === "File not found") {
+            throw new TRPCError({ code: "NOT_FOUND", message: "Invalid file id" });
+          } else if (e.message === "File not favorited") {
+            throw new TRPCError({ code: "BAD_REQUEST", message: e.message });
+          }
+        }
+        throw e;
+      }
+    }),
+
+  addDirectory: roleProcedure["activeClient"]
+    .input(
+      z.object({
+        id: z.int().positive(),
+      }),
+    )
+    .mutation(async ({ ctx, input }) => {
+      try {
+        await FileRepo.setDirectoryFavorite(ctx.session.userId, input.id, true);
+      } catch (e) {
+        if (e instanceof IntegrityError) {
+          if (e.message === "Directory not found") {
+            throw new TRPCError({ code: "NOT_FOUND", message: "Invalid directory id" });
+          } else if (e.message === "Directory already favorited") {
+            throw new TRPCError({ code: "BAD_REQUEST", message: e.message });
+          }
+        }
+        throw e;
+      }
+    }),
+
+  removeDirectory: roleProcedure["activeClient"]
+    .input(
+      z.object({
+        id: z.int().positive(),
+      }),
+    )
+    .mutation(async ({ ctx, input }) => {
+      try {
+        await FileRepo.setDirectoryFavorite(ctx.session.userId, input.id, false);
+      } catch (e) {
+        if (e instanceof IntegrityError) {
+          if (e.message === "Directory not found") {
+            throw new TRPCError({ code: "NOT_FOUND", message: "Invalid directory id" });
+          } else if (e.message === "Directory not favorited") {
+            throw new TRPCError({ code: "BAD_REQUEST", message: e.message });
+          }
+        }
+        throw e;
+      }
+    }),
+});
+
+export default favoritesRouter;
diff --git a/src/trpc/routers/index.ts b/src/trpc/routers/index.ts
index e8fbecc..3e3f7ba 100644
--- a/src/trpc/routers/index.ts
+++ b/src/trpc/routers/index.ts
@@ -2,6 +2,7 @@ export { default as authRouter } from "./auth";
 export { default as categoryRouter } from "./category";
 export { default as clientRouter } from "./client";
 export { default as directoryRouter } from "./directory";
+export { default as favoritesRouter } from "./favorites";
 export { default as fileRouter } from "./file";
 export { default as hskRouter } from "./hsk";
 export { default as mekRouter } from "./mek";

From ff6ea3a0b90df576303294e10cbe7bad50701173 Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Sat, 17 Jan 2026 20:11:01 +0900
Subject: [PATCH 10/15] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=EC=97=90=EC=84=9C=20=EC=A6=90=EA=B2=A8=EC=B0=BE?=
 =?UTF-8?q?=EA=B8=B0=20=EC=84=A4=EC=A0=95=EC=9D=B4=20=EA=B0=80=EB=8A=A5?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20?=
 =?UTF-8?q?=EC=A6=90=EA=B2=A8=EC=B0=BE=EA=B8=B0=EC=97=90=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=EB=90=9C=20=EA=B2=BD=EC=9A=B0=20=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=A6=90=EA=B2=A8=EC=B0=BE=EA=B8=B0=20?=
 =?UTF-8?q?=EC=97=AC=EB=B6=80=EB=A5=BC=20=EC=95=84=EC=9D=B4=EC=BD=98?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=ED=91=9C=EC=8B=9C=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../atoms/buttons/FileThumbnailButton.svelte  | 12 +++++++++-
 .../labels/DirectoryEntryLabel.svelte         | 13 ++++++++++-
 src/lib/indexedDB/filesystem.ts               |  2 ++
 src/lib/modules/filesystem/category.ts        |  2 ++
 src/lib/modules/filesystem/file.ts            |  3 +++
 src/lib/server/db/file.ts                     |  1 +
 .../(fullscreen)/file/[id]/+page.svelte       | 12 ++++++++++
 .../(fullscreen)/file/[id]/TopBarMenu.svelte  | 23 +++++++++++++++++--
 src/routes/(fullscreen)/file/[id]/service.ts  | 13 +++++++++++
 .../(fullscreen)/search/Directory.svelte      |  2 +-
 src/routes/(fullscreen)/search/File.svelte    |  1 +
 src/routes/(fullscreen)/search/service.ts     |  2 ++
 src/routes/(main)/category/[[id]]/File.svelte |  7 +++++-
 .../[[id]]/DirectoryEntries/File.svelte       |  1 +
 .../DirectoryEntries/SubDirectory.svelte      |  2 +-
 src/trpc/routers/category.ts                  |  1 +
 src/trpc/routers/file.ts                      |  2 ++
 src/trpc/routers/search.ts                    |  2 ++
 18 files changed, 94 insertions(+), 7 deletions(-)

diff --git a/src/lib/components/atoms/buttons/FileThumbnailButton.svelte b/src/lib/components/atoms/buttons/FileThumbnailButton.svelte
index 6c5632c..e95d07c 100644
--- a/src/lib/components/atoms/buttons/FileThumbnailButton.svelte
+++ b/src/lib/components/atoms/buttons/FileThumbnailButton.svelte
@@ -2,6 +2,8 @@
   import { getFileThumbnail } from "$lib/modules/file";
   import type { SummarizedFileInfo } from "$lib/modules/filesystem";
 
+  import IconFavorite from "~icons/material-symbols/favorite";
+
   interface Props {
     info: SummarizedFileInfo;
     onclick?: (file: SummarizedFileInfo) => void;
@@ -14,11 +16,19 @@
 
 <button
   onclick={onclick && (() => setTimeout(() => onclick(info), 100))}
-  class="aspect-square overflow-hidden rounded transition active:scale-95 active:brightness-90"
+  class="relative aspect-square overflow-hidden rounded transition active:scale-95 active:brightness-90"
 >
   {#if $thumbnail}
     <img src={$thumbnail} alt={info.name} class="h-full w-full object-cover" />
   {:else}
     <div class="h-full w-full bg-gray-100"></div>
   {/if}
+  {#if info.isFavorite}
+    <div class={["absolute bottom-0 right-0", !thumbnail && "rounded-full bg-white p-0.5"]}>
+      <IconFavorite
+        class="text-sm text-red-500"
+        style="filter: drop-shadow(0 0 1px white) drop-shadow(0 0 1px white);"
+      />
+    </div>
+  {/if}
 </button>
diff --git a/src/lib/components/molecules/labels/DirectoryEntryLabel.svelte b/src/lib/components/molecules/labels/DirectoryEntryLabel.svelte
index e85665d..001631b 100644
--- a/src/lib/components/molecules/labels/DirectoryEntryLabel.svelte
+++ b/src/lib/components/molecules/labels/DirectoryEntryLabel.svelte
@@ -5,9 +5,11 @@
   import IconFolder from "~icons/material-symbols/folder";
   import IconDriveFolderUpload from "~icons/material-symbols/drive-folder-upload";
   import IconDraft from "~icons/material-symbols/draft";
+  import IconFavorite from "~icons/material-symbols/favorite";
 
   interface Props {
     class?: ClassValue;
+    isFavorite?: boolean;
     name: string;
     subtext?: string;
     textClass?: ClassValue;
@@ -17,6 +19,7 @@
 
   let {
     class: className,
+    isFavorite = false,
     name,
     subtext,
     textClass: textClassName,
@@ -26,7 +29,7 @@
 </script>
 
 {#snippet iconSnippet()}
-  <div class="flex h-10 w-10 items-center justify-center text-xl">
+  <div class="relative flex h-10 w-10 items-center justify-center text-xl">
     {#if thumbnail}
       <img src={thumbnail} alt={name} loading="lazy" class="aspect-square rounded object-cover" />
     {:else if type === "directory"}
@@ -36,6 +39,14 @@
     {:else}
       <IconDraft class="text-blue-400" />
     {/if}
+    {#if isFavorite}
+      <div class={["absolute bottom-0 right-0", !thumbnail && "rounded-full bg-white p-0.5"]}>
+        <IconFavorite
+          class="text-xs text-red-500"
+          style="filter: drop-shadow(0 0 1px white) drop-shadow(0 0 1px white);"
+        />
+      </div>
+    {/if}
   </div>
 {/snippet}
 
diff --git a/src/lib/indexedDB/filesystem.ts b/src/lib/indexedDB/filesystem.ts
index 87c0d70..d5c3e4d 100644
--- a/src/lib/indexedDB/filesystem.ts
+++ b/src/lib/indexedDB/filesystem.ts
@@ -4,6 +4,7 @@ interface DirectoryInfo {
   id: number;
   parentId: DirectoryId;
   name: string;
+  isFavorite?: boolean;
 }
 
 interface FileInfo {
@@ -14,6 +15,7 @@ interface FileInfo {
   createdAt?: Date;
   lastModifiedAt: Date;
   categoryIds?: number[];
+  isFavorite?: boolean;
 }
 
 interface CategoryInfo {
diff --git a/src/lib/modules/filesystem/category.ts b/src/lib/modules/filesystem/category.ts
index 94740c6..db0ec45 100644
--- a/src/lib/modules/filesystem/category.ts
+++ b/src/lib/modules/filesystem/category.ts
@@ -22,6 +22,7 @@ const cache = new FilesystemCache<CategoryId, MaybeCategoryInfo>({
                   name: fileInfo.name,
                   createdAt: fileInfo.createdAt,
                   lastModifiedAt: fileInfo.lastModifiedAt,
+                  isFavorite: fileInfo.isFavorite,
                   isRecursive: file.isRecursive,
                 }
               : undefined;
@@ -66,6 +67,7 @@ const cache = new FilesystemCache<CategoryId, MaybeCategoryInfo>({
               parentId: file.parent,
               contentType: file.contentType,
               isRecursive: file.isRecursive,
+              isFavorite: file.isFavorite,
               ...(await decryptFileMetadata(file, masterKey)),
             })),
           ),
diff --git a/src/lib/modules/filesystem/file.ts b/src/lib/modules/filesystem/file.ts
index 5ef0fae..2517c02 100644
--- a/src/lib/modules/filesystem/file.ts
+++ b/src/lib/modules/filesystem/file.ts
@@ -27,6 +27,7 @@ const cache = new FilesystemCache<number, MaybeFileInfo>({
         name: file.name,
         createdAt: file.createdAt,
         lastModifiedAt: file.lastModifiedAt,
+        isFavorite: file.isFavorite,
         categories: categories?.filter((category) => !!category) ?? [],
       };
     }
@@ -55,6 +56,7 @@ const cache = new FilesystemCache<number, MaybeFileInfo>({
         name: metadata.name,
         createdAt: metadata.createdAt,
         lastModifiedAt: metadata.lastModifiedAt,
+        isFavorite: file.isFavorite,
         categories,
       });
     } catch (e) {
@@ -121,6 +123,7 @@ const cache = new FilesystemCache<number, MaybeFileInfo>({
           parentId: metadataRaw.parent,
           contentType: metadataRaw.contentType,
           categories,
+          isFavorite: metadataRaw.isFavorite,
           ...metadata,
         };
       }),
diff --git a/src/lib/server/db/file.ts b/src/lib/server/db/file.ts
index d70abf8..b6967be 100644
--- a/src/lib/server/db/file.ts
+++ b/src/lib/server/db/file.ts
@@ -641,6 +641,7 @@ export const searchFiles = async (
     encName: file.encrypted_name,
     encCreatedAt: file.encrypted_created_at,
     encLastModifiedAt: file.encrypted_last_modified_at,
+    isFavorite: file.is_favorite,
   }));
 };
 
diff --git a/src/routes/(fullscreen)/file/[id]/+page.svelte b/src/routes/(fullscreen)/file/[id]/+page.svelte
index 9ae8825..5922410 100644
--- a/src/routes/(fullscreen)/file/[id]/+page.svelte
+++ b/src/routes/(fullscreen)/file/[id]/+page.svelte
@@ -18,6 +18,7 @@
     requestThumbnailUpload,
     requestFileAdditionToCategory,
     requestVideoStream,
+    requestFavoriteToggle,
   } from "./service";
   import TopBarMenu from "./TopBarMenu.svelte";
 
@@ -75,6 +76,15 @@
     void getFileInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
   };
 
+  const toggleFavorite = async () => {
+    if (!info?.exists) return;
+    const isFavorite = !!info.isFavorite;
+    const success = await requestFavoriteToggle(data.id, isFavorite);
+    if (success) {
+      info.isFavorite = !isFavorite;
+    }
+  };
+
   $effect(() => {
     HybridPromise.resolve(getFileInfo(data.id, $masterKeyStore?.get(1)?.key!)).then((result) => {
       if (data.id === result.id) {
@@ -158,6 +168,8 @@
       {fileBlob}
       downloadUrl={videoStreamUrl}
       filename={info?.name}
+      isFavorite={info?.isFavorite}
+      onToggleFavorite={toggleFavorite}
     />
   </div>
 </TopBar>
diff --git a/src/routes/(fullscreen)/file/[id]/TopBarMenu.svelte b/src/routes/(fullscreen)/file/[id]/TopBarMenu.svelte
index d713e8c..923cff9 100644
--- a/src/routes/(fullscreen)/file/[id]/TopBarMenu.svelte
+++ b/src/routes/(fullscreen)/file/[id]/TopBarMenu.svelte
@@ -5,6 +5,8 @@
   import { fly } from "svelte/transition";
   import { goto } from "$app/navigation";
 
+  import IconFavorite from "~icons/material-symbols/favorite";
+  import IconFavoriteOutline from "~icons/material-symbols/favorite-outline";
   import IconFolderOpen from "~icons/material-symbols/folder-open";
   import IconCloudDownload from "~icons/material-symbols/cloud-download";
 
@@ -13,10 +15,20 @@
     downloadUrl?: string;
     fileBlob?: Blob;
     filename?: string;
+    isFavorite?: boolean;
     isOpen: boolean;
+    onToggleFavorite?: () => void;
   }
 
-  let { directoryId, downloadUrl, fileBlob, filename, isOpen = $bindable() }: Props = $props();
+  let {
+    directoryId,
+    downloadUrl,
+    fileBlob,
+    filename,
+    isFavorite,
+    isOpen = $bindable(),
+    onToggleFavorite,
+  }: Props = $props();
 
   const handleDownload = () => {
     if (fileBlob && filename) {
@@ -34,7 +46,7 @@
 
 {#if isOpen && (directoryId || downloadUrl || fileBlob)}
   <div
-    class="absolute right-2 top-full z-20 space-y-1 rounded-lg bg-white px-1 py-2 shadow-2xl"
+    class="absolute right-2 top-full z-20 min-w-44 space-y-1 rounded-lg bg-white px-1 py-2 shadow-2xl"
     transition:fly={{ y: -8, duration: 200 }}
   >
     <p class="px-3 pt-2 text-sm font-semibold text-gray-600">더보기</p>
@@ -54,6 +66,13 @@
         </button>
       {/snippet}
 
+      {#if typeof isFavorite === "boolean"}
+        {@render menuButton(
+          isFavorite ? IconFavorite : IconFavoriteOutline,
+          isFavorite ? "즐겨찾기 해제" : "즐겨찾기",
+          onToggleFavorite ?? (() => {}),
+        )}
+      {/if}
       {#if directoryId}
         {@render menuButton(IconFolderOpen, "폴더에서 보기", () =>
           goto(
diff --git a/src/routes/(fullscreen)/file/[id]/service.ts b/src/routes/(fullscreen)/file/[id]/service.ts
index 598418b..09b7d28 100644
--- a/src/routes/(fullscreen)/file/[id]/service.ts
+++ b/src/routes/(fullscreen)/file/[id]/service.ts
@@ -48,3 +48,16 @@ export const requestFileAdditionToCategory = async (fileId: number, categoryId:
     return false;
   }
 };
+
+export const requestFavoriteToggle = async (fileId: number, isFavorite: boolean) => {
+  try {
+    if (isFavorite) {
+      await trpc().favorites.removeFile.mutate({ id: fileId });
+    } else {
+      await trpc().favorites.addFile.mutate({ id: fileId });
+    }
+    return true;
+  } catch {
+    return false;
+  }
+};
diff --git a/src/routes/(fullscreen)/search/Directory.svelte b/src/routes/(fullscreen)/search/Directory.svelte
index 56448a6..700bd54 100644
--- a/src/routes/(fullscreen)/search/Directory.svelte
+++ b/src/routes/(fullscreen)/search/Directory.svelte
@@ -12,5 +12,5 @@
 </script>
 
 <ActionEntryButton class="h-14" {onclick}>
-  <DirectoryEntryLabel type="directory" name={info.name} />
+  <DirectoryEntryLabel type="directory" name={info.name} isFavorite={info.isFavorite} />
 </ActionEntryButton>
diff --git a/src/routes/(fullscreen)/search/File.svelte b/src/routes/(fullscreen)/search/File.svelte
index 3db8915..4e5c631 100644
--- a/src/routes/(fullscreen)/search/File.svelte
+++ b/src/routes/(fullscreen)/search/File.svelte
@@ -21,5 +21,6 @@
     thumbnail={$thumbnail}
     name={info.name}
     subtext={formatDateTime(info.createdAt ?? info.lastModifiedAt)}
+    isFavorite={info.isFavorite}
   />
 </ActionEntryButton>
diff --git a/src/routes/(fullscreen)/search/service.ts b/src/routes/(fullscreen)/search/service.ts
index d12ea1a..3f250dc 100644
--- a/src/routes/(fullscreen)/search/service.ts
+++ b/src/routes/(fullscreen)/search/service.ts
@@ -46,6 +46,7 @@ export const requestSearch = async (filter: SearchFilter, masterKey: CryptoKey)
                 exists: true,
                 parentId: directory.parent,
                 ...metadata,
+                isFavorite: !!directory.isFavorite,
               };
             },
           }),
@@ -65,6 +66,7 @@ export const requestSearch = async (filter: SearchFilter, masterKey: CryptoKey)
                 exists: true,
                 parentId: file.parent,
                 contentType: file.contentType,
+                isFavorite: !!file.isFavorite,
                 ...metadata,
               };
             },
diff --git a/src/routes/(main)/category/[[id]]/File.svelte b/src/routes/(main)/category/[[id]]/File.svelte
index 06ed8b3..90fb659 100644
--- a/src/routes/(main)/category/[[id]]/File.svelte
+++ b/src/routes/(main)/category/[[id]]/File.svelte
@@ -24,5 +24,10 @@
   actionButtonIcon={onRemoveClick && IconClose}
   onActionButtonClick={() => onRemoveClick?.(info)}
 >
-  <DirectoryEntryLabel type="file" thumbnail={$thumbnail} name={info.name} />
+  <DirectoryEntryLabel
+    type="file"
+    thumbnail={$thumbnail}
+    name={info.name}
+    isFavorite={info.isFavorite}
+  />
 </ActionEntryButton>
diff --git a/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte b/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte
index a6c30c4..d45beb7 100644
--- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte
+++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte
@@ -40,5 +40,6 @@
     thumbnail={$thumbnail}
     name={info.name}
     subtext={formatDateTime(info.createdAt ?? info.lastModifiedAt)}
+    isFavorite={info.isFavorite}
   />
 </ActionEntryButton>
diff --git a/src/routes/(main)/directory/[[id]]/DirectoryEntries/SubDirectory.svelte b/src/routes/(main)/directory/[[id]]/DirectoryEntries/SubDirectory.svelte
index 3f86025..33f4a47 100644
--- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/SubDirectory.svelte
+++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/SubDirectory.svelte
@@ -31,5 +31,5 @@
   actionButtonIcon={IconMoreVert}
   onActionButtonClick={() => action(onOpenMenuClick)}
 >
-  <DirectoryEntryLabel type="directory" name={info.name} />
+  <DirectoryEntryLabel type="directory" name={info.name} isFavorite={info.isFavorite} />
 </ActionEntryButton>
diff --git a/src/trpc/routers/category.ts b/src/trpc/routers/category.ts
index 34887f7..1d4fcee 100644
--- a/src/trpc/routers/category.ts
+++ b/src/trpc/routers/category.ts
@@ -57,6 +57,7 @@ const categoryRouter = router({
           createdAtIv: file.encCreatedAt?.iv,
           lastModifiedAt: file.encLastModifiedAt.ciphertext,
           lastModifiedAtIv: file.encLastModifiedAt.iv,
+          isFavorite: file.isFavorite,
           isRecursive: file.isRecursive,
         })),
       };
diff --git a/src/trpc/routers/file.ts b/src/trpc/routers/file.ts
index ce6e5a6..ad06cdc 100644
--- a/src/trpc/routers/file.ts
+++ b/src/trpc/routers/file.ts
@@ -31,6 +31,7 @@ const fileRouter = router({
         createdAtIv: file.encCreatedAt?.iv,
         lastModifiedAt: file.encLastModifiedAt.ciphertext,
         lastModifiedAtIv: file.encLastModifiedAt.iv,
+        isFavorite: file.isFavorite,
         categories: categories.map((category) => ({
           id: category.id,
           parent: category.parentId,
@@ -65,6 +66,7 @@ const fileRouter = router({
         createdAtIv: file.encCreatedAt?.iv,
         lastModifiedAt: file.encLastModifiedAt.ciphertext,
         lastModifiedAtIv: file.encLastModifiedAt.iv,
+        isFavorite: file.isFavorite,
         categories: file.categories.map((category) => ({
           id: category.id,
           parent: category.parentId,
diff --git a/src/trpc/routers/search.ts b/src/trpc/routers/search.ts
index 5aa2820..34e814d 100644
--- a/src/trpc/routers/search.ts
+++ b/src/trpc/routers/search.ts
@@ -32,6 +32,7 @@ const searchRouter = router({
           dekVersion: directory.dekVersion,
           name: directory.encName.ciphertext,
           nameIv: directory.encName.iv,
+          isFavorite: directory.isFavorite,
         })),
         files: files.map((file) => ({
           id: file.id,
@@ -46,6 +47,7 @@ const searchRouter = router({
           createdAtIv: file.encCreatedAt?.iv,
           lastModifiedAt: file.encLastModifiedAt.ciphertext,
           lastModifiedAtIv: file.encLastModifiedAt.iv,
+          isFavorite: file.isFavorite,
         })),
       };
     }),

From bcb57bb12d41ad2052c7cf56ae8ee57eace27086 Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Sun, 18 Jan 2026 11:33:30 +0900
Subject: [PATCH 11/15] =?UTF-8?q?IndexedDB=EC=97=90=20=EC=A6=90=EA=B2=A8?=
 =?UTF-8?q?=EC=B0=BE=EA=B8=B0=20=EC=97=AC=EB=B6=80=EB=A5=BC=20=ED=95=AD?=
 =?UTF-8?q?=EC=83=81=20=EC=A0=80=EC=9E=A5=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../atoms/buttons/FileThumbnailButton.svelte  |  4 ++--
 .../labels/DirectoryEntryLabel.svelte         |  2 +-
 src/lib/indexedDB/filesystem.ts               | 21 +++++++++++++++++--
 src/lib/modules/filesystem/category.ts        |  2 +-
 src/lib/modules/filesystem/directory.ts       |  2 ++
 src/lib/modules/filesystem/file.ts            |  4 ++--
 src/lib/modules/filesystem/types.ts           |  6 +++---
 .../db/migrations/1768643000-AddFavorites.ts  |  2 +-
 src/lib/types/utils.d.ts                      |  1 +
 .../settings/migration/service.svelte.ts      |  1 +
 .../settings/thumbnail/service.ts             |  1 +
 src/trpc/routers/file.ts                      |  2 ++
 12 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 src/lib/types/utils.d.ts

diff --git a/src/lib/components/atoms/buttons/FileThumbnailButton.svelte b/src/lib/components/atoms/buttons/FileThumbnailButton.svelte
index e95d07c..7c112d5 100644
--- a/src/lib/components/atoms/buttons/FileThumbnailButton.svelte
+++ b/src/lib/components/atoms/buttons/FileThumbnailButton.svelte
@@ -24,10 +24,10 @@
     <div class="h-full w-full bg-gray-100"></div>
   {/if}
   {#if info.isFavorite}
-    <div class={["absolute bottom-0 right-0", !thumbnail && "rounded-full bg-white p-0.5"]}>
+    <div class={["absolute bottom-0.5 right-0.5", !thumbnail && "rounded-full bg-white p-0.5"]}>
       <IconFavorite
         class="text-sm text-red-500"
-        style="filter: drop-shadow(0 0 1px white) drop-shadow(0 0 1px white);"
+        style="filter: drop-shadow(0 0 1px white) drop-shadow(0 0 1px white)"
       />
     </div>
   {/if}
diff --git a/src/lib/components/molecules/labels/DirectoryEntryLabel.svelte b/src/lib/components/molecules/labels/DirectoryEntryLabel.svelte
index 001631b..049fb1f 100644
--- a/src/lib/components/molecules/labels/DirectoryEntryLabel.svelte
+++ b/src/lib/components/molecules/labels/DirectoryEntryLabel.svelte
@@ -43,7 +43,7 @@
       <div class={["absolute bottom-0 right-0", !thumbnail && "rounded-full bg-white p-0.5"]}>
         <IconFavorite
           class="text-xs text-red-500"
-          style="filter: drop-shadow(0 0 1px white) drop-shadow(0 0 1px white);"
+          style="filter: drop-shadow(0 0 1px white) drop-shadow(0 0 1px white)"
         />
       </div>
     {/if}
diff --git a/src/lib/indexedDB/filesystem.ts b/src/lib/indexedDB/filesystem.ts
index d5c3e4d..daaf100 100644
--- a/src/lib/indexedDB/filesystem.ts
+++ b/src/lib/indexedDB/filesystem.ts
@@ -4,7 +4,7 @@ interface DirectoryInfo {
   id: number;
   parentId: DirectoryId;
   name: string;
-  isFavorite?: boolean;
+  isFavorite: boolean;
 }
 
 interface FileInfo {
@@ -15,7 +15,7 @@ interface FileInfo {
   createdAt?: Date;
   lastModifiedAt: Date;
   categoryIds?: number[];
-  isFavorite?: boolean;
+  isFavorite: boolean;
 }
 
 interface CategoryInfo {
@@ -48,6 +48,23 @@ filesystem
       });
   });
 
+filesystem.version(4).upgrade(async (trx) => {
+  await Promise.all([
+    trx
+      .table("directory")
+      .toCollection()
+      .modify((directory) => {
+        directory.isFavorite = false;
+      }),
+    trx
+      .table("file")
+      .toCollection()
+      .modify((file) => {
+        file.isFavorite = false;
+      }),
+  ]);
+});
+
 export const getDirectoryInfos = async (parentId: DirectoryId) => {
   return await filesystem.directory.where({ parentId }).toArray();
 };
diff --git a/src/lib/modules/filesystem/category.ts b/src/lib/modules/filesystem/category.ts
index db0ec45..041dbb1 100644
--- a/src/lib/modules/filesystem/category.ts
+++ b/src/lib/modules/filesystem/category.ts
@@ -66,8 +66,8 @@ const cache = new FilesystemCache<CategoryId, MaybeCategoryInfo>({
               id: file.id,
               parentId: file.parent,
               contentType: file.contentType,
-              isRecursive: file.isRecursive,
               isFavorite: file.isFavorite,
+              isRecursive: file.isRecursive,
               ...(await decryptFileMetadata(file, masterKey)),
             })),
           ),
diff --git a/src/lib/modules/filesystem/directory.ts b/src/lib/modules/filesystem/directory.ts
index 361b3c5..5626e31 100644
--- a/src/lib/modules/filesystem/directory.ts
+++ b/src/lib/modules/filesystem/directory.ts
@@ -27,6 +27,7 @@ const cache = new FilesystemCache<DirectoryId, MaybeDirectoryInfo>({
         name: directory.name,
         subDirectories,
         files,
+        isFavorite: directory.isFavorite,
       };
     }
   },
@@ -62,6 +63,7 @@ const cache = new FilesystemCache<DirectoryId, MaybeDirectoryInfo>({
               parentId: directory.metadata!.parent,
               subDirectories,
               files,
+              isFavorite: directory.metadata!.isFavorite,
               ...metadata!,
             }
           : { id, subDirectories, files },
diff --git a/src/lib/modules/filesystem/file.ts b/src/lib/modules/filesystem/file.ts
index 2517c02..3298f31 100644
--- a/src/lib/modules/filesystem/file.ts
+++ b/src/lib/modules/filesystem/file.ts
@@ -27,8 +27,8 @@ const cache = new FilesystemCache<number, MaybeFileInfo>({
         name: file.name,
         createdAt: file.createdAt,
         lastModifiedAt: file.lastModifiedAt,
-        isFavorite: file.isFavorite,
         categories: categories?.filter((category) => !!category) ?? [],
+        isFavorite: file.isFavorite,
       };
     }
   },
@@ -56,8 +56,8 @@ const cache = new FilesystemCache<number, MaybeFileInfo>({
         name: metadata.name,
         createdAt: metadata.createdAt,
         lastModifiedAt: metadata.lastModifiedAt,
-        isFavorite: file.isFavorite,
         categories,
+        isFavorite: file.isFavorite,
       });
     } catch (e) {
       if (isTRPCClientError(e) && e.data?.code === "NOT_FOUND") {
diff --git a/src/lib/modules/filesystem/types.ts b/src/lib/modules/filesystem/types.ts
index f2bfbe6..254d4c7 100644
--- a/src/lib/modules/filesystem/types.ts
+++ b/src/lib/modules/filesystem/types.ts
@@ -1,14 +1,13 @@
 export type DataKey = { key: CryptoKey; version: Date };
-type AllUndefined<T> = { [K in keyof T]?: undefined };
 
 export interface LocalDirectoryInfo {
   id: number;
   parentId: DirectoryId;
   dataKey?: DataKey;
   name: string;
-  isFavorite?: boolean;
   subDirectories: SubDirectoryInfo[];
   files: SummarizedFileInfo[];
+  isFavorite: boolean;
 }
 
 export interface RootDirectoryInfo {
@@ -18,6 +17,7 @@ export interface RootDirectoryInfo {
   name?: undefined;
   subDirectories: SubDirectoryInfo[];
   files: SummarizedFileInfo[];
+  isFavorite?: undefined;
 }
 
 export type DirectoryInfo = LocalDirectoryInfo | RootDirectoryInfo;
@@ -37,7 +37,7 @@ export interface FileInfo {
   createdAt?: Date;
   lastModifiedAt: Date;
   categories: FileCategoryInfo[];
-  isFavorite?: boolean;
+  isFavorite: boolean;
 }
 
 export type MaybeFileInfo =
diff --git a/src/lib/server/db/migrations/1768643000-AddFavorites.ts b/src/lib/server/db/migrations/1768643000-AddFavorites.ts
index d18cce0..660e116 100644
--- a/src/lib/server/db/migrations/1768643000-AddFavorites.ts
+++ b/src/lib/server/db/migrations/1768643000-AddFavorites.ts
@@ -1,4 +1,4 @@
-import { Kysely, sql } from "kysely";
+import { Kysely } from "kysely";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const up = async (db: Kysely<any>) => {
diff --git a/src/lib/types/utils.d.ts b/src/lib/types/utils.d.ts
new file mode 100644
index 0000000..498b8ae
--- /dev/null
+++ b/src/lib/types/utils.d.ts
@@ -0,0 +1 @@
+type AllUndefined<T> = { [K in keyof T]?: undefined };
diff --git a/src/routes/(fullscreen)/settings/migration/service.svelte.ts b/src/routes/(fullscreen)/settings/migration/service.svelte.ts
index 9f1f7eb..a304e38 100644
--- a/src/routes/(fullscreen)/settings/migration/service.svelte.ts
+++ b/src/routes/(fullscreen)/settings/migration/service.svelte.ts
@@ -48,6 +48,7 @@ export const requestLegacyFiles = async (
               isLegacy: file.isLegacy,
               parentId: file.parent,
               contentType: file.contentType,
+              isFavorite: file.isFavorite,
               ...metadata,
             };
           },
diff --git a/src/routes/(fullscreen)/settings/thumbnail/service.ts b/src/routes/(fullscreen)/settings/thumbnail/service.ts
index ce06b78..11ef262 100644
--- a/src/routes/(fullscreen)/settings/thumbnail/service.ts
+++ b/src/routes/(fullscreen)/settings/thumbnail/service.ts
@@ -53,6 +53,7 @@ export const requestMissingThumbnailFiles = async (
               isLegacy: file.isLegacy,
               parentId: file.parent,
               contentType: file.contentType,
+              isFavorite: file.isFavorite,
               ...metadata,
             };
           },
diff --git a/src/trpc/routers/file.ts b/src/trpc/routers/file.ts
index ad06cdc..30aaacd 100644
--- a/src/trpc/routers/file.ts
+++ b/src/trpc/routers/file.ts
@@ -114,6 +114,7 @@ const fileRouter = router({
       createdAtIv: file.encCreatedAt?.iv,
       lastModifiedAt: file.encLastModifiedAt.ciphertext,
       lastModifiedAtIv: file.encLastModifiedAt.iv,
+      isFavorite: file.isFavorite,
     }));
   }),
 
@@ -133,6 +134,7 @@ const fileRouter = router({
       createdAtIv: file.encCreatedAt?.iv,
       lastModifiedAt: file.encLastModifiedAt.ciphertext,
       lastModifiedAtIv: file.encLastModifiedAt.iv,
+      isFavorite: file.isFavorite,
     }));
   }),
 

From 14693160b8460f2c7694f71fc77da3d83e22b149 Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Sun, 18 Jan 2026 12:03:24 +0900
Subject: [PATCH 12/15] =?UTF-8?q?=EC=82=AC=EC=86=8C=ED=95=9C=20=EB=A6=AC?=
 =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/components/atoms/Chip.svelte                 |  4 ++--
 .../atoms/buttons/FileThumbnailButton.svelte         |  2 +-
 src/lib/components/molecules/TopBar.svelte           |  4 ++--
 src/routes/(fullscreen)/file/[id]/+page.svelte       | 12 ++++--------
 src/routes/(fullscreen)/file/[id]/TopBarMenu.svelte  |  8 +++-----
 src/routes/(fullscreen)/file/[id]/service.ts         |  1 +
 .../settings/migration/service.svelte.ts             |  3 +--
 .../(fullscreen)/settings/thumbnail/service.ts       |  3 +--
 .../directory/[[id]]/DirectoryEntries/File.svelte    |  2 +-
 .../[[id]]/DirectoryEntries/SubDirectory.svelte      |  2 +-
 10 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/lib/components/atoms/Chip.svelte b/src/lib/components/atoms/Chip.svelte
index 034defc..c86335c 100644
--- a/src/lib/components/atoms/Chip.svelte
+++ b/src/lib/components/atoms/Chip.svelte
@@ -9,8 +9,8 @@
     class?: ClassValue;
     onclick?: () => void;
     onRemoveClick?: () => void;
-    selected?: boolean;
     removable?: boolean;
+    selected?: boolean;
   }
 
   let {
@@ -38,7 +38,7 @@
   <span>
     {@render children()}
   </span>
-  {#if selected && removable}
+  {#if removable && selected}
     <button
       onclick={(e) => {
         e.stopPropagation();
diff --git a/src/lib/components/atoms/buttons/FileThumbnailButton.svelte b/src/lib/components/atoms/buttons/FileThumbnailButton.svelte
index 7c112d5..a415db9 100644
--- a/src/lib/components/atoms/buttons/FileThumbnailButton.svelte
+++ b/src/lib/components/atoms/buttons/FileThumbnailButton.svelte
@@ -24,7 +24,7 @@
     <div class="h-full w-full bg-gray-100"></div>
   {/if}
   {#if info.isFavorite}
-    <div class={["absolute bottom-0.5 right-0.5", !thumbnail && "rounded-full bg-white p-0.5"]}>
+    <div class={["absolute bottom-0.5 right-0.5"]}>
       <IconFavorite
         class="text-sm text-red-500"
         style="filter: drop-shadow(0 0 1px white) drop-shadow(0 0 1px white)"
diff --git a/src/lib/components/molecules/TopBar.svelte b/src/lib/components/molecules/TopBar.svelte
index b832c69..9921761 100644
--- a/src/lib/components/molecules/TopBar.svelte
+++ b/src/lib/components/molecules/TopBar.svelte
@@ -25,9 +25,9 @@
     {#if showBackButton}
       <button
         onclick={onBackClick ?? (() => history.back())}
-        class="w-[2.3rem] flex-shrink-0 rounded-full p-1 active:bg-black active:bg-opacity-[0.04]"
+        class="w-full rounded-full p-1 text-2xl active:bg-black active:bg-opacity-[0.04]"
       >
-        <IconArrowBack class="text-2xl" />
+        <IconArrowBack />
       </button>
     {/if}
   </div>
diff --git a/src/routes/(fullscreen)/file/[id]/+page.svelte b/src/routes/(fullscreen)/file/[id]/+page.svelte
index 5922410..9b83252 100644
--- a/src/routes/(fullscreen)/file/[id]/+page.svelte
+++ b/src/routes/(fullscreen)/file/[id]/+page.svelte
@@ -77,12 +77,8 @@
   };
 
   const toggleFavorite = async () => {
-    if (!info?.exists) return;
-    const isFavorite = !!info.isFavorite;
-    const success = await requestFavoriteToggle(data.id, isFavorite);
-    if (success) {
-      info.isFavorite = !isFavorite;
-    }
+    await requestFavoriteToggle(data.id, !!info?.isFavorite);
+    void getFileInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
   };
 
   $effect(() => {
@@ -154,9 +150,9 @@
   <div onclick={(e) => e.stopPropagation()}>
     <button
       onclick={() => (isMenuOpen = !isMenuOpen)}
-      class="w-[2.3rem] flex-shrink-0 rounded-full p-1 active:bg-black active:bg-opacity-[0.04]"
+      class="w-full rounded-full p-1 text-2xl active:bg-black active:bg-opacity-[0.04]"
     >
-      <IconMoreVert class="text-2xl" />
+      <IconMoreVert />
     </button>
     <TopBarMenu
       bind:isOpen={isMenuOpen}
diff --git a/src/routes/(fullscreen)/file/[id]/TopBarMenu.svelte b/src/routes/(fullscreen)/file/[id]/TopBarMenu.svelte
index 923cff9..5c12fd4 100644
--- a/src/routes/(fullscreen)/file/[id]/TopBarMenu.svelte
+++ b/src/routes/(fullscreen)/file/[id]/TopBarMenu.svelte
@@ -46,7 +46,7 @@
 
 {#if isOpen && (directoryId || downloadUrl || fileBlob)}
   <div
-    class="absolute right-2 top-full z-20 min-w-44 space-y-1 rounded-lg bg-white px-1 py-2 shadow-2xl"
+    class="absolute right-2 top-full z-20 min-w-40 space-y-1 rounded-lg bg-white px-1 py-2 shadow-2xl"
     transition:fly={{ y: -8, duration: 200 }}
   >
     <p class="px-3 pt-2 text-sm font-semibold text-gray-600">더보기</p>
@@ -57,16 +57,14 @@
         onclick: () => void,
       )}
         <button {onclick} class="rounded-xl active:bg-gray-100">
-          <div
-            class="flex items-center gap-x-3 px-3 py-2 text-lg text-gray-700 transition active:scale-95"
-          >
+          <div class="flex items-center gap-x-3 px-3 py-2 text-gray-700 transition active:scale-95">
             <Icon />
             <p class="font-medium">{text}</p>
           </div>
         </button>
       {/snippet}
 
-      {#if typeof isFavorite === "boolean"}
+      {#if isFavorite !== undefined}
         {@render menuButton(
           isFavorite ? IconFavorite : IconFavoriteOutline,
           isFavorite ? "즐겨찾기 해제" : "즐겨찾기",
diff --git a/src/routes/(fullscreen)/file/[id]/service.ts b/src/routes/(fullscreen)/file/[id]/service.ts
index 09b7d28..41eb630 100644
--- a/src/routes/(fullscreen)/file/[id]/service.ts
+++ b/src/routes/(fullscreen)/file/[id]/service.ts
@@ -58,6 +58,7 @@ export const requestFavoriteToggle = async (fileId: number, isFavorite: boolean)
     }
     return true;
   } catch {
+    // TODO: Error Handling
     return false;
   }
 };
diff --git a/src/routes/(fullscreen)/settings/migration/service.svelte.ts b/src/routes/(fullscreen)/settings/migration/service.svelte.ts
index a304e38..ae75463 100644
--- a/src/routes/(fullscreen)/settings/migration/service.svelte.ts
+++ b/src/routes/(fullscreen)/settings/migration/service.svelte.ts
@@ -56,8 +56,7 @@ export const requestLegacyFiles = async (
       ),
     ),
   );
-
-  return files as MaybeFileInfo[];
+  return files;
 };
 
 const createState = (status: MigrationStatus): MigrationState => {
diff --git a/src/routes/(fullscreen)/settings/thumbnail/service.ts b/src/routes/(fullscreen)/settings/thumbnail/service.ts
index 11ef262..e8dbf0c 100644
--- a/src/routes/(fullscreen)/settings/thumbnail/service.ts
+++ b/src/routes/(fullscreen)/settings/thumbnail/service.ts
@@ -61,8 +61,7 @@ export const requestMissingThumbnailFiles = async (
       ),
     ),
   );
-
-  return files as MaybeFileInfo[];
+  return files;
 };
 
 const requestThumbnailUpload = limitFunction(
diff --git a/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte b/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte
index d45beb7..966d5e5 100644
--- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte
+++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte
@@ -24,7 +24,7 @@
       id: info.id,
       dataKey: info.dataKey,
       name: info.name,
-      isFavorite: info.isFavorite ?? false,
+      isFavorite: info.isFavorite,
     });
   };
 </script>
diff --git a/src/routes/(main)/directory/[[id]]/DirectoryEntries/SubDirectory.svelte b/src/routes/(main)/directory/[[id]]/DirectoryEntries/SubDirectory.svelte
index 33f4a47..6a340ed 100644
--- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/SubDirectory.svelte
+++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/SubDirectory.svelte
@@ -20,7 +20,7 @@
       id: info.id,
       dataKey: info.dataKey,
       name: info.name,
-      isFavorite: info.isFavorite ?? false,
+      isFavorite: info.isFavorite,
     });
   };
 </script>

From 4797ccfd23f19b131eee00fc7cea6020ace12cfe Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Sun, 18 Jan 2026 12:34:04 +0900
Subject: [PATCH 13/15] =?UTF-8?q?FileRepo=EC=9D=98=20=ED=95=A8=EC=88=98=20?=
 =?UTF-8?q?=EC=A4=91=20=EB=94=94=EB=A0=89=ED=84=B0=EB=A6=AC=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=EB=90=9C=20=ED=95=A8=EC=88=98=EB=93=A4=EC=9D=84=20Dir?=
 =?UTF-8?q?ectoryRepo=EB=A1=9C=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/server/db/directory.ts                | 245 +++++++++
 src/lib/server/db/file.ts                     | 513 ++----------------
 src/lib/server/db/index.ts                    |   1 +
 .../db/migrations/1737357000-Initial.ts       |   4 +-
 .../db/migrations/1768643000-AddFavorites.ts  |   4 +-
 src/lib/server/db/schema/category.ts          |   4 +-
 src/lib/server/db/schema/client.ts            |   6 +-
 src/lib/server/db/schema/directory.ts         |  28 +
 src/lib/server/db/schema/file.ts              |  27 +-
 src/lib/server/db/schema/hsk.ts               |   4 +-
 src/lib/server/db/schema/index.ts             |   1 +
 src/lib/server/db/schema/media.ts             |   2 +-
 src/lib/server/db/schema/mek.ts               |   6 +-
 src/lib/server/db/schema/session.ts           |   4 +-
 src/lib/server/db/schema/upload.ts            |   2 +-
 src/lib/server/db/schema/user.ts              |   2 +-
 src/trpc/routers/directory.ts                 |  14 +-
 src/trpc/routers/favorites.ts                 | 108 ++--
 src/trpc/routers/search.ts                    |   4 +-
 19 files changed, 417 insertions(+), 562 deletions(-)
 create mode 100644 src/lib/server/db/directory.ts
 create mode 100644 src/lib/server/db/schema/directory.ts

diff --git a/src/lib/server/db/directory.ts b/src/lib/server/db/directory.ts
new file mode 100644
index 0000000..432b1dd
--- /dev/null
+++ b/src/lib/server/db/directory.ts
@@ -0,0 +1,245 @@
+import type { Selectable } from "kysely";
+import { IntegrityError } from "./error";
+import db from "./kysely";
+import type { Ciphertext, DirectoryTable } from "./schema";
+
+interface Directory {
+  id: number;
+  parentId: DirectoryId;
+  userId: number;
+  mekVersion: number;
+  encDek: string;
+  dekVersion: Date;
+  encName: Ciphertext;
+  isFavorite: boolean;
+}
+
+const toDirectory = (row: Selectable<DirectoryTable>): Directory => ({
+  id: row.id,
+  parentId: row.parent_id ?? "root",
+  userId: row.user_id,
+  mekVersion: row.master_encryption_key_version,
+  encDek: row.encrypted_data_encryption_key,
+  dekVersion: row.data_encryption_key_version,
+  encName: row.encrypted_name,
+  isFavorite: row.is_favorite,
+});
+
+export const registerDirectory = async (params: Omit<Directory, "id" | "isFavorite">) => {
+  await db.transaction().execute(async (trx) => {
+    const mek = await trx
+      .selectFrom("master_encryption_key")
+      .select("version")
+      .where("user_id", "=", params.userId)
+      .where("state", "=", "active")
+      .limit(1)
+      .forUpdate()
+      .executeTakeFirst();
+    if (mek?.version !== params.mekVersion) {
+      throw new IntegrityError("Inactive MEK version");
+    }
+
+    const { directoryId } = await trx
+      .insertInto("directory")
+      .values({
+        parent_id: params.parentId !== "root" ? params.parentId : null,
+        user_id: params.userId,
+        master_encryption_key_version: params.mekVersion,
+        encrypted_data_encryption_key: params.encDek,
+        data_encryption_key_version: params.dekVersion,
+        encrypted_name: params.encName,
+      })
+      .returning("id as directoryId")
+      .executeTakeFirstOrThrow();
+    await trx
+      .insertInto("directory_log")
+      .values({
+        directory_id: directoryId,
+        timestamp: new Date(),
+        action: "create",
+        new_name: params.encName,
+      })
+      .execute();
+  });
+};
+
+export const getAllDirectoriesByParent = async (userId: number, parentId: DirectoryId) => {
+  const directories = await db
+    .selectFrom("directory")
+    .selectAll()
+    .where("user_id", "=", userId)
+    .$if(parentId === "root", (qb) => qb.where("parent_id", "is", null))
+    .$if(parentId !== "root", (qb) => qb.where("parent_id", "=", parentId as number))
+    .execute();
+  return directories.map(toDirectory);
+};
+
+export const getAllRecursiveDirectoriesByParent = async (userId: number, parentId: DirectoryId) => {
+  const directories = await db
+    .withRecursive("directory_tree", (db) =>
+      db
+        .selectFrom("directory")
+        .selectAll()
+        .$if(parentId === "root", (qb) => qb.where("parent_id", "is", null))
+        .$if(parentId !== "root", (qb) => qb.where("parent_id", "=", parentId as number))
+        .where("user_id", "=", userId)
+        .unionAll((db) =>
+          db
+            .selectFrom("directory")
+            .innerJoin("directory_tree", "directory.parent_id", "directory_tree.id")
+            .selectAll("directory"),
+        ),
+    )
+    .selectFrom("directory_tree")
+    .selectAll()
+    .execute();
+  return directories.map(toDirectory);
+};
+
+export const getAllFavoriteDirectories = async (userId: number) => {
+  const directories = await db
+    .selectFrom("directory")
+    .selectAll()
+    .where("user_id", "=", userId)
+    .where("is_favorite", "=", true)
+    .execute();
+  return directories.map(toDirectory);
+};
+
+export const getDirectory = async (userId: number, directoryId: number) => {
+  const directory = await db
+    .selectFrom("directory")
+    .selectAll()
+    .where("id", "=", directoryId)
+    .where("user_id", "=", userId)
+    .limit(1)
+    .executeTakeFirst();
+  return directory ? toDirectory(directory) : null;
+};
+
+export const setDirectoryEncName = async (
+  userId: number,
+  directoryId: number,
+  dekVersion: Date,
+  encName: Ciphertext,
+) => {
+  await db.transaction().execute(async (trx) => {
+    const directory = await trx
+      .selectFrom("directory")
+      .select("data_encryption_key_version")
+      .where("id", "=", directoryId)
+      .where("user_id", "=", userId)
+      .limit(1)
+      .forUpdate()
+      .executeTakeFirst();
+    if (!directory) {
+      throw new IntegrityError("Directory not found");
+    } else if (directory.data_encryption_key_version.getTime() !== dekVersion.getTime()) {
+      throw new IntegrityError("Invalid DEK version");
+    }
+
+    await trx
+      .updateTable("directory")
+      .set({ encrypted_name: encName })
+      .where("id", "=", directoryId)
+      .where("user_id", "=", userId)
+      .execute();
+    await trx
+      .insertInto("directory_log")
+      .values({
+        directory_id: directoryId,
+        timestamp: new Date(),
+        action: "rename",
+        new_name: encName,
+      })
+      .execute();
+  });
+};
+
+export const setDirectoryFavorite = async (
+  userId: number,
+  directoryId: number,
+  isFavorite: boolean,
+) => {
+  await db.transaction().execute(async (trx) => {
+    const directory = await trx
+      .selectFrom("directory")
+      .select("is_favorite")
+      .where("id", "=", directoryId)
+      .where("user_id", "=", userId)
+      .limit(1)
+      .forUpdate()
+      .executeTakeFirst();
+    if (!directory) {
+      throw new IntegrityError("Directory not found");
+    } else if (directory.is_favorite === isFavorite) {
+      throw new IntegrityError(
+        isFavorite ? "Directory already favorited" : "Directory not favorited",
+      );
+    }
+
+    await trx
+      .updateTable("directory")
+      .set({ is_favorite: isFavorite })
+      .where("id", "=", directoryId)
+      .where("user_id", "=", userId)
+      .execute();
+    await trx
+      .insertInto("directory_log")
+      .values({
+        directory_id: directoryId,
+        timestamp: new Date(),
+        action: isFavorite ? "add-to-favorites" : "remove-from-favorites",
+      })
+      .execute();
+  });
+};
+
+export const unregisterDirectory = async (userId: number, directoryId: number) => {
+  return await db
+    .transaction()
+    .setIsolationLevel("repeatable read") // TODO: Sufficient?
+    .execute(async (trx) => {
+      const unregisterFiles = async (parentId: number) => {
+        const files = await trx
+          .selectFrom("file")
+          .leftJoin("thumbnail", "file.id", "thumbnail.file_id")
+          .select(["file.id", "file.path", "thumbnail.path as thumbnailPath"])
+          .where("file.parent_id", "=", parentId)
+          .where("file.user_id", "=", userId)
+          .forUpdate("file")
+          .execute();
+        await trx
+          .deleteFrom("file")
+          .where("parent_id", "=", parentId)
+          .where("user_id", "=", userId)
+          .execute();
+        return files;
+      };
+      const unregisterDirectoryRecursively = async (
+        directoryId: number,
+      ): Promise<{ id: number; path: string; thumbnailPath: string | null }[]> => {
+        const files = await unregisterFiles(directoryId);
+        const subDirectories = await trx
+          .selectFrom("directory")
+          .select("id")
+          .where("parent_id", "=", directoryId)
+          .where("user_id", "=", userId)
+          .execute();
+        const subDirectoryFilePaths = await Promise.all(
+          subDirectories.map(async ({ id }) => await unregisterDirectoryRecursively(id)),
+        );
+
+        const deleteRes = await trx
+          .deleteFrom("directory")
+          .where("id", "=", directoryId)
+          .where("user_id", "=", userId)
+          .executeTakeFirst();
+        if (deleteRes.numDeletedRows === 0n) {
+          throw new IntegrityError("Directory not found");
+        }
+        return files.concat(...subDirectoryFilePaths);
+      };
+      return await unregisterDirectoryRecursively(directoryId);
+    });
+};
diff --git a/src/lib/server/db/file.ts b/src/lib/server/db/file.ts
index b6967be..af2b6ad 100644
--- a/src/lib/server/db/file.ts
+++ b/src/lib/server/db/file.ts
@@ -1,20 +1,9 @@
-import { sql } from "kysely";
+import { sql, type Selectable } from "kysely";
 import { jsonArrayFrom } from "kysely/helpers/postgres";
 import pg from "pg";
 import { IntegrityError } from "./error";
 import db from "./kysely";
-import type { Ciphertext } from "./schema";
-
-interface Directory {
-  id: number;
-  parentId: DirectoryId;
-  userId: number;
-  mekVersion: number;
-  encDek: string;
-  dekVersion: Date;
-  encName: Ciphertext;
-  isFavorite: boolean;
-}
+import type { Ciphertext, FileTable } from "./schema";
 
 interface File {
   id: number;
@@ -44,209 +33,24 @@ interface FileCategory {
   encName: Ciphertext;
 }
 
-export const registerDirectory = async (params: Omit<Directory, "id" | "isFavorite">) => {
-  await db.transaction().execute(async (trx) => {
-    const mek = await trx
-      .selectFrom("master_encryption_key")
-      .select("version")
-      .where("user_id", "=", params.userId)
-      .where("state", "=", "active")
-      .limit(1)
-      .forUpdate()
-      .executeTakeFirst();
-    if (mek?.version !== params.mekVersion) {
-      throw new IntegrityError("Inactive MEK version");
-    }
-
-    const { directoryId } = await trx
-      .insertInto("directory")
-      .values({
-        parent_id: params.parentId !== "root" ? params.parentId : null,
-        user_id: params.userId,
-        master_encryption_key_version: params.mekVersion,
-        encrypted_data_encryption_key: params.encDek,
-        data_encryption_key_version: params.dekVersion,
-        encrypted_name: params.encName,
-      })
-      .returning("id as directoryId")
-      .executeTakeFirstOrThrow();
-    await trx
-      .insertInto("directory_log")
-      .values({
-        directory_id: directoryId,
-        timestamp: new Date(),
-        action: "create",
-        new_name: params.encName,
-      })
-      .execute();
-  });
-};
-
-export const getAllDirectoriesByParent = async (userId: number, parentId: DirectoryId) => {
-  let query = db.selectFrom("directory").selectAll().where("user_id", "=", userId);
-  query =
-    parentId === "root"
-      ? query.where("parent_id", "is", null)
-      : query.where("parent_id", "=", parentId);
-  const directories = await query.execute();
-  return directories.map(
-    (directory) =>
-      ({
-        id: directory.id,
-        parentId: directory.parent_id ?? "root",
-        userId: directory.user_id,
-        mekVersion: directory.master_encryption_key_version,
-        encDek: directory.encrypted_data_encryption_key,
-        dekVersion: directory.data_encryption_key_version,
-        encName: directory.encrypted_name,
-        isFavorite: directory.is_favorite,
-      }) satisfies Directory,
-  );
-};
-
-export const getAllRecursiveDirectoriesByParent = async (userId: number, parentId: DirectoryId) => {
-  const directories = await db
-    .withRecursive("directory_tree", (db) =>
-      db
-        .selectFrom("directory")
-        .selectAll()
-        .$if(parentId === "root", (qb) => qb.where("parent_id", "is", null))
-        .$if(parentId !== "root", (qb) => qb.where("parent_id", "=", parentId as number))
-        .where("user_id", "=", userId)
-        .unionAll((db) =>
-          db
-            .selectFrom("directory")
-            .innerJoin("directory_tree", "directory.parent_id", "directory_tree.id")
-            .selectAll("directory"),
-        ),
-    )
-    .selectFrom("directory_tree")
-    .selectAll()
-    .execute();
-  return directories.map(
-    (directory) =>
-      ({
-        id: directory.id,
-        parentId: directory.parent_id ?? "root",
-        userId: directory.user_id,
-        mekVersion: directory.master_encryption_key_version,
-        encDek: directory.encrypted_data_encryption_key,
-        dekVersion: directory.data_encryption_key_version,
-        encName: directory.encrypted_name,
-        isFavorite: directory.is_favorite,
-      }) satisfies Directory,
-  );
-};
-
-export const getDirectory = async (userId: number, directoryId: number) => {
-  const directory = await db
-    .selectFrom("directory")
-    .selectAll()
-    .where("id", "=", directoryId)
-    .where("user_id", "=", userId)
-    .limit(1)
-    .executeTakeFirst();
-  return directory
-    ? ({
-        id: directory.id,
-        parentId: directory.parent_id ?? "root",
-        userId: directory.user_id,
-        mekVersion: directory.master_encryption_key_version,
-        encDek: directory.encrypted_data_encryption_key,
-        dekVersion: directory.data_encryption_key_version,
-        encName: directory.encrypted_name,
-        isFavorite: directory.is_favorite,
-      } satisfies Directory)
-    : null;
-};
-
-export const setDirectoryEncName = async (
-  userId: number,
-  directoryId: number,
-  dekVersion: Date,
-  encName: Ciphertext,
-) => {
-  await db.transaction().execute(async (trx) => {
-    const directory = await trx
-      .selectFrom("directory")
-      .select("data_encryption_key_version")
-      .where("id", "=", directoryId)
-      .where("user_id", "=", userId)
-      .limit(1)
-      .forUpdate()
-      .executeTakeFirst();
-    if (!directory) {
-      throw new IntegrityError("Directory not found");
-    } else if (directory.data_encryption_key_version.getTime() !== dekVersion.getTime()) {
-      throw new IntegrityError("Invalid DEK version");
-    }
-
-    await trx
-      .updateTable("directory")
-      .set({ encrypted_name: encName })
-      .where("id", "=", directoryId)
-      .where("user_id", "=", userId)
-      .execute();
-    await trx
-      .insertInto("directory_log")
-      .values({
-        directory_id: directoryId,
-        timestamp: new Date(),
-        action: "rename",
-        new_name: encName,
-      })
-      .execute();
-  });
-};
-
-export const unregisterDirectory = async (userId: number, directoryId: number) => {
-  return await db
-    .transaction()
-    .setIsolationLevel("repeatable read") // TODO: Sufficient?
-    .execute(async (trx) => {
-      const unregisterFiles = async (parentId: number) => {
-        const files = await trx
-          .selectFrom("file")
-          .leftJoin("thumbnail", "file.id", "thumbnail.file_id")
-          .select(["file.id", "file.path", "thumbnail.path as thumbnailPath"])
-          .where("file.parent_id", "=", parentId)
-          .where("file.user_id", "=", userId)
-          .forUpdate("file")
-          .execute();
-        await trx
-          .deleteFrom("file")
-          .where("parent_id", "=", parentId)
-          .where("user_id", "=", userId)
-          .execute();
-        return files;
-      };
-      const unregisterDirectoryRecursively = async (
-        directoryId: number,
-      ): Promise<{ id: number; path: string; thumbnailPath: string | null }[]> => {
-        const files = await unregisterFiles(directoryId);
-        const subDirectories = await trx
-          .selectFrom("directory")
-          .select("id")
-          .where("parent_id", "=", directoryId)
-          .where("user_id", "=", userId)
-          .execute();
-        const subDirectoryFilePaths = await Promise.all(
-          subDirectories.map(async ({ id }) => await unregisterDirectoryRecursively(id)),
-        );
-
-        const deleteRes = await trx
-          .deleteFrom("directory")
-          .where("id", "=", directoryId)
-          .where("user_id", "=", userId)
-          .executeTakeFirst();
-        if (deleteRes.numDeletedRows === 0n) {
-          throw new IntegrityError("Directory not found");
-        }
-        return files.concat(...subDirectoryFilePaths);
-      };
-      return await unregisterDirectoryRecursively(directoryId);
-    });
-};
+const toFile = (row: Selectable<FileTable>): File => ({
+  id: row.id,
+  parentId: row.parent_id ?? "root",
+  userId: row.user_id,
+  path: row.path,
+  mekVersion: row.master_encryption_key_version,
+  encDek: row.encrypted_data_encryption_key,
+  dekVersion: row.data_encryption_key_version,
+  hskVersion: row.hmac_secret_key_version,
+  contentHmac: row.content_hmac,
+  contentType: row.content_type,
+  encContentIv: row.encrypted_content_iv,
+  encContentHash: row.encrypted_content_hash,
+  encName: row.encrypted_name,
+  encCreatedAt: row.encrypted_created_at,
+  encLastModifiedAt: row.encrypted_last_modified_at,
+  isFavorite: row.is_favorite,
+});
 
 export const registerFile = async (trx: typeof db, params: Omit<File, "id" | "isFavorite">) => {
   if ((params.hskVersion && !params.contentHmac) || (!params.hskVersion && params.contentHmac)) {
@@ -286,33 +90,14 @@ export const registerFile = async (trx: typeof db, params: Omit<File, "id" | "is
 };
 
 export const getAllFilesByParent = async (userId: number, parentId: DirectoryId) => {
-  let query = db.selectFrom("file").selectAll().where("user_id", "=", userId);
-  query =
-    parentId === "root"
-      ? query.where("parent_id", "is", null)
-      : query.where("parent_id", "=", parentId);
-  const files = await query.execute();
-  return files.map(
-    (file) =>
-      ({
-        id: file.id,
-        parentId: file.parent_id ?? "root",
-        userId: file.user_id,
-        path: file.path,
-        mekVersion: file.master_encryption_key_version,
-        encDek: file.encrypted_data_encryption_key,
-        dekVersion: file.data_encryption_key_version,
-        hskVersion: file.hmac_secret_key_version,
-        contentHmac: file.content_hmac,
-        contentType: file.content_type,
-        encContentIv: file.encrypted_content_iv,
-        encContentHash: file.encrypted_content_hash,
-        encName: file.encrypted_name,
-        encCreatedAt: file.encrypted_created_at,
-        encLastModifiedAt: file.encrypted_last_modified_at,
-        isFavorite: file.is_favorite,
-      }) satisfies File,
-  );
+  const files = await db
+    .selectFrom("file")
+    .selectAll()
+    .where("user_id", "=", userId)
+    .$if(parentId === "root", (qb) => qb.where("parent_id", "is", null))
+    .$if(parentId !== "root", (qb) => qb.where("parent_id", "=", parentId as number))
+    .execute();
+  return files.map(toFile);
 };
 
 export const getAllFilesByCategory = async (
@@ -345,28 +130,10 @@ export const getAllFilesByCategory = async (
     .orderBy("file_id")
     .orderBy("depth")
     .execute();
-  return files.map(
-    (file) =>
-      ({
-        id: file.file_id,
-        parentId: file.parent_id ?? "root",
-        userId: file.user_id,
-        path: file.path,
-        mekVersion: file.master_encryption_key_version,
-        encDek: file.encrypted_data_encryption_key,
-        dekVersion: file.data_encryption_key_version,
-        hskVersion: file.hmac_secret_key_version,
-        contentHmac: file.content_hmac,
-        contentType: file.content_type,
-        encContentIv: file.encrypted_content_iv,
-        encContentHash: file.encrypted_content_hash,
-        encName: file.encrypted_name,
-        encCreatedAt: file.encrypted_created_at,
-        encLastModifiedAt: file.encrypted_last_modified_at,
-        isFavorite: file.is_favorite,
-        isRecursive: file.depth > 0,
-      }) satisfies File & { isRecursive: boolean },
-  );
+  return files.map((file) => ({
+    ...toFile(file),
+    isRecursive: file.depth > 0,
+  }));
 };
 
 export const getAllFileIds = async (userId: number) => {
@@ -382,27 +149,7 @@ export const getLegacyFiles = async (userId: number, limit: number = 100) => {
     .where("encrypted_content_iv", "is not", null)
     .limit(limit)
     .execute();
-  return files.map(
-    (file) =>
-      ({
-        id: file.id,
-        parentId: file.parent_id ?? "root",
-        userId: file.user_id,
-        path: file.path,
-        mekVersion: file.master_encryption_key_version,
-        encDek: file.encrypted_data_encryption_key,
-        dekVersion: file.data_encryption_key_version,
-        hskVersion: file.hmac_secret_key_version,
-        contentHmac: file.content_hmac,
-        contentType: file.content_type,
-        encContentIv: file.encrypted_content_iv,
-        encContentHash: file.encrypted_content_hash,
-        encName: file.encrypted_name,
-        encCreatedAt: file.encrypted_created_at,
-        encLastModifiedAt: file.encrypted_last_modified_at,
-        isFavorite: file.is_favorite,
-      }) satisfies File,
-  );
+  return files.map(toFile);
 };
 
 export const getFilesWithoutThumbnail = async (userId: number, limit: number = 100) => {
@@ -426,27 +173,7 @@ export const getFilesWithoutThumbnail = async (userId: number, limit: number = 1
     )
     .limit(limit)
     .execute();
-  return files.map(
-    (file) =>
-      ({
-        id: file.id,
-        parentId: file.parent_id ?? "root",
-        userId: file.user_id,
-        path: file.path,
-        mekVersion: file.master_encryption_key_version,
-        encDek: file.encrypted_data_encryption_key,
-        dekVersion: file.data_encryption_key_version,
-        hskVersion: file.hmac_secret_key_version,
-        contentHmac: file.content_hmac,
-        contentType: file.content_type,
-        encContentIv: file.encrypted_content_iv,
-        encContentHash: file.encrypted_content_hash,
-        encName: file.encrypted_name,
-        encCreatedAt: file.encrypted_created_at,
-        encLastModifiedAt: file.encrypted_last_modified_at,
-        isFavorite: file.is_favorite,
-      }) satisfies File,
-  );
+  return files.map(toFile);
 };
 
 export const getAllFileIdsByContentHmac = async (
@@ -472,26 +199,7 @@ export const getFile = async (userId: number, fileId: number) => {
     .where("user_id", "=", userId)
     .limit(1)
     .executeTakeFirst();
-  return file
-    ? ({
-        id: file.id,
-        parentId: file.parent_id ?? "root",
-        userId: file.user_id,
-        path: file.path,
-        mekVersion: file.master_encryption_key_version,
-        encDek: file.encrypted_data_encryption_key,
-        dekVersion: file.data_encryption_key_version,
-        hskVersion: file.hmac_secret_key_version,
-        contentHmac: file.content_hmac,
-        contentType: file.content_type,
-        encContentIv: file.encrypted_content_iv,
-        encContentHash: file.encrypted_content_hash,
-        encName: file.encrypted_name,
-        encCreatedAt: file.encrypted_created_at,
-        encLastModifiedAt: file.encrypted_last_modified_at,
-        isFavorite: file.is_favorite,
-      } satisfies File)
-    : null;
+  return file ? toFile(file) : null;
 };
 
 export const getFilesWithCategories = async (userId: number, fileIds: number[]) => {
@@ -510,35 +218,30 @@ export const getFilesWithCategories = async (userId: number, fileIds: number[])
     .where("id", "=", (eb) => eb.fn.any(eb.val(fileIds)))
     .where("user_id", "=", userId)
     .execute();
-  return files.map(
-    (file) =>
-      ({
-        id: file.id,
-        parentId: file.parent_id ?? "root",
-        userId: file.user_id,
-        path: file.path,
-        mekVersion: file.master_encryption_key_version,
-        encDek: file.encrypted_data_encryption_key,
-        dekVersion: file.data_encryption_key_version,
-        hskVersion: file.hmac_secret_key_version,
-        contentHmac: file.content_hmac,
-        contentType: file.content_type,
-        encContentIv: file.encrypted_content_iv,
-        encContentHash: file.encrypted_content_hash,
-        encName: file.encrypted_name,
-        encCreatedAt: file.encrypted_created_at,
-        encLastModifiedAt: file.encrypted_last_modified_at,
-        isFavorite: file.is_favorite,
-        categories: file.categories.map((category) => ({
+  return files.map((file) => ({
+    ...toFile(file),
+    categories: file.categories.map(
+      (category) =>
+        ({
           id: category.id,
           parentId: category.parent_id ?? "root",
           mekVersion: category.master_encryption_key_version,
           encDek: category.encrypted_data_encryption_key,
           dekVersion: new Date(category.data_encryption_key_version),
           encName: category.encrypted_name,
-        })),
-      }) satisfies File & { categories: FileCategory[] },
-  );
+        }) satisfies FileCategory,
+    ),
+  }));
+};
+
+export const getAllFavoriteFiles = async (userId: number) => {
+  const files = await db
+    .selectFrom("file")
+    .selectAll()
+    .where("user_id", "=", userId)
+    .where("is_favorite", "=", true)
+    .execute();
+  return files.map(toFile);
 };
 
 export const searchFiles = async (
@@ -625,24 +328,7 @@ export const searchFiles = async (
           )
           .execute()
       : await baseQuery.execute();
-  return files.map((file) => ({
-    id: file.id,
-    parentId: file.parent_id ?? ("root" as const),
-    userId: file.user_id,
-    path: file.path,
-    mekVersion: file.master_encryption_key_version,
-    encDek: file.encrypted_data_encryption_key,
-    dekVersion: file.data_encryption_key_version,
-    hskVersion: file.hmac_secret_key_version,
-    contentHmac: file.content_hmac,
-    contentType: file.content_type,
-    encContentIv: file.encrypted_content_iv,
-    encContentHash: file.encrypted_content_hash,
-    encName: file.encrypted_name,
-    encCreatedAt: file.encrypted_created_at,
-    encLastModifiedAt: file.encrypted_last_modified_at,
-    isFavorite: file.is_favorite,
-  }));
+  return files.map(toFile);
 };
 
 export const setFileEncName = async (
@@ -848,94 +534,3 @@ export const setFileFavorite = async (userId: number, fileId: number, isFavorite
       .execute();
   });
 };
-
-export const setDirectoryFavorite = async (
-  userId: number,
-  directoryId: number,
-  isFavorite: boolean,
-) => {
-  await db.transaction().execute(async (trx) => {
-    const directory = await trx
-      .selectFrom("directory")
-      .select("is_favorite")
-      .where("id", "=", directoryId)
-      .where("user_id", "=", userId)
-      .limit(1)
-      .forUpdate()
-      .executeTakeFirst();
-    if (!directory) {
-      throw new IntegrityError("Directory not found");
-    } else if (directory.is_favorite === isFavorite) {
-      throw new IntegrityError(
-        isFavorite ? "Directory already favorited" : "Directory not favorited",
-      );
-    }
-
-    await trx
-      .updateTable("directory")
-      .set({ is_favorite: isFavorite })
-      .where("id", "=", directoryId)
-      .where("user_id", "=", userId)
-      .execute();
-    await trx
-      .insertInto("directory_log")
-      .values({
-        directory_id: directoryId,
-        timestamp: new Date(),
-        action: isFavorite ? "add-to-favorites" : "remove-from-favorites",
-      })
-      .execute();
-  });
-};
-
-export const getAllFavoriteFiles = async (userId: number) => {
-  const files = await db
-    .selectFrom("file")
-    .selectAll()
-    .where("user_id", "=", userId)
-    .where("is_favorite", "=", true)
-    .execute();
-  return files.map(
-    (file) =>
-      ({
-        id: file.id,
-        parentId: file.parent_id ?? "root",
-        userId: file.user_id,
-        path: file.path,
-        mekVersion: file.master_encryption_key_version,
-        encDek: file.encrypted_data_encryption_key,
-        dekVersion: file.data_encryption_key_version,
-        hskVersion: file.hmac_secret_key_version,
-        contentHmac: file.content_hmac,
-        contentType: file.content_type,
-        encContentIv: file.encrypted_content_iv,
-        encContentHash: file.encrypted_content_hash,
-        encName: file.encrypted_name,
-        encCreatedAt: file.encrypted_created_at,
-        encLastModifiedAt: file.encrypted_last_modified_at,
-        isFavorite: file.is_favorite,
-      }) satisfies File,
-  );
-};
-
-export const getAllFavoriteDirectories = async (userId: number) => {
-  const directories = await db
-    .selectFrom("directory")
-    .selectAll()
-    .where("user_id", "=", userId)
-    .where("is_favorite", "=", true)
-    .execute();
-  return directories.map(
-    (directory) =>
-      ({
-        id: directory.id,
-        parentId: directory.parent_id ?? "root",
-        userId: directory.user_id,
-        mekVersion: directory.master_encryption_key_version,
-        encDek: directory.encrypted_data_encryption_key,
-        dekVersion: directory.data_encryption_key_version,
-        encName: directory.encrypted_name,
-        isFavorite: directory.is_favorite,
-      }) satisfies Directory,
-  );
-};
diff --git a/src/lib/server/db/index.ts b/src/lib/server/db/index.ts
index 140cf7d..bc1dade 100644
--- a/src/lib/server/db/index.ts
+++ b/src/lib/server/db/index.ts
@@ -1,5 +1,6 @@
 export * as CategoryRepo from "./category";
 export * as ClientRepo from "./client";
+export * as DirectoryRepo from "./directory";
 export * as FileRepo from "./file";
 export * as HskRepo from "./hsk";
 export * as MediaRepo from "./media";
diff --git a/src/lib/server/db/migrations/1737357000-Initial.ts b/src/lib/server/db/migrations/1737357000-Initial.ts
index 5caf503..07bac98 100644
--- a/src/lib/server/db/migrations/1737357000-Initial.ts
+++ b/src/lib/server/db/migrations/1737357000-Initial.ts
@@ -135,7 +135,7 @@ export const up = async (db: Kysely<any>) => {
     )
     .execute();
 
-  // file.ts
+  // directory.ts
   await db.schema
     .createTable("directory")
     .addColumn("id", "integer", (col) => col.primaryKey().generatedAlwaysAsIdentity())
@@ -162,6 +162,8 @@ export const up = async (db: Kysely<any>) => {
     .addColumn("action", "text", (col) => col.notNull())
     .addColumn("new_name", "json")
     .execute();
+
+  // file.ts
   await db.schema
     .createTable("file")
     .addColumn("id", "integer", (col) => col.primaryKey().generatedAlwaysAsIdentity())
diff --git a/src/lib/server/db/migrations/1768643000-AddFavorites.ts b/src/lib/server/db/migrations/1768643000-AddFavorites.ts
index 660e116..4dc9323 100644
--- a/src/lib/server/db/migrations/1768643000-AddFavorites.ts
+++ b/src/lib/server/db/migrations/1768643000-AddFavorites.ts
@@ -2,11 +2,13 @@ import { Kysely } from "kysely";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const up = async (db: Kysely<any>) => {
-  // file.ts
+  // directory.ts
   await db.schema
     .alterTable("directory")
     .addColumn("is_favorite", "boolean", (col) => col.notNull().defaultTo(false))
     .execute();
+
+  // file.ts
   await db.schema
     .alterTable("file")
     .addColumn("is_favorite", "boolean", (col) => col.notNull().defaultTo(false))
diff --git a/src/lib/server/db/schema/category.ts b/src/lib/server/db/schema/category.ts
index ccaba95..5996f89 100644
--- a/src/lib/server/db/schema/category.ts
+++ b/src/lib/server/db/schema/category.ts
@@ -1,7 +1,7 @@
 import type { Generated } from "kysely";
 import type { Ciphertext } from "./utils";
 
-interface CategoryTable {
+export interface CategoryTable {
   id: Generated<number>;
   parent_id: number | null;
   user_id: number;
@@ -11,7 +11,7 @@ interface CategoryTable {
   encrypted_name: Ciphertext;
 }
 
-interface CategoryLogTable {
+export interface CategoryLogTable {
   id: Generated<number>;
   category_id: number;
   timestamp: Date;
diff --git a/src/lib/server/db/schema/client.ts b/src/lib/server/db/schema/client.ts
index d66e42b..f5de41b 100644
--- a/src/lib/server/db/schema/client.ts
+++ b/src/lib/server/db/schema/client.ts
@@ -1,6 +1,6 @@
 import type { ColumnType, Generated } from "kysely";
 
-interface ClientTable {
+export interface ClientTable {
   id: Generated<number>;
   encryption_public_key: string; // Base64
   signature_public_key: string; // Base64
@@ -8,13 +8,13 @@ interface ClientTable {
 
 export type UserClientState = "challenging" | "pending" | "active";
 
-interface UserClientTable {
+export interface UserClientTable {
   user_id: number;
   client_id: number;
   state: ColumnType<UserClientState, UserClientState | undefined>;
 }
 
-interface UserClientChallengeTable {
+export interface UserClientChallengeTable {
   id: Generated<number>;
   user_id: number;
   client_id: number;
diff --git a/src/lib/server/db/schema/directory.ts b/src/lib/server/db/schema/directory.ts
new file mode 100644
index 0000000..390998d
--- /dev/null
+++ b/src/lib/server/db/schema/directory.ts
@@ -0,0 +1,28 @@
+import type { ColumnType, Generated } from "kysely";
+import type { Ciphertext } from "./utils";
+
+export interface DirectoryTable {
+  id: Generated<number>;
+  parent_id: number | null;
+  user_id: number;
+  master_encryption_key_version: number;
+  encrypted_data_encryption_key: string; // Base64
+  data_encryption_key_version: Date;
+  encrypted_name: Ciphertext;
+  is_favorite: Generated<boolean>;
+}
+
+export interface DirectoryLogTable {
+  id: Generated<number>;
+  directory_id: number;
+  timestamp: ColumnType<Date, Date, never>;
+  action: "create" | "rename" | "add-to-favorites" | "remove-from-favorites";
+  new_name: Ciphertext | null;
+}
+
+declare module "./index" {
+  interface Database {
+    directory: DirectoryTable;
+    directory_log: DirectoryLogTable;
+  }
+}
diff --git a/src/lib/server/db/schema/file.ts b/src/lib/server/db/schema/file.ts
index c785b04..784ad93 100644
--- a/src/lib/server/db/schema/file.ts
+++ b/src/lib/server/db/schema/file.ts
@@ -1,26 +1,7 @@
 import type { ColumnType, Generated } from "kysely";
 import type { Ciphertext } from "./utils";
 
-interface DirectoryTable {
-  id: Generated<number>;
-  parent_id: number | null;
-  user_id: number;
-  master_encryption_key_version: number;
-  encrypted_data_encryption_key: string; // Base64
-  data_encryption_key_version: Date;
-  encrypted_name: Ciphertext;
-  is_favorite: Generated<boolean>;
-}
-
-interface DirectoryLogTable {
-  id: Generated<number>;
-  directory_id: number;
-  timestamp: ColumnType<Date, Date, never>;
-  action: "create" | "rename" | "add-to-favorites" | "remove-from-favorites";
-  new_name: Ciphertext | null;
-}
-
-interface FileTable {
+export interface FileTable {
   id: Generated<number>;
   parent_id: number | null;
   user_id: number;
@@ -39,7 +20,7 @@ interface FileTable {
   is_favorite: Generated<boolean>;
 }
 
-interface FileLogTable {
+export interface FileLogTable {
   id: Generated<number>;
   file_id: number;
   timestamp: ColumnType<Date, Date, never>;
@@ -55,15 +36,13 @@ interface FileLogTable {
   category_id: number | null;
 }
 
-interface FileCategoryTable {
+export interface FileCategoryTable {
   file_id: number;
   category_id: number;
 }
 
 declare module "./index" {
   interface Database {
-    directory: DirectoryTable;
-    directory_log: DirectoryLogTable;
     file: FileTable;
     file_log: FileLogTable;
     file_category: FileCategoryTable;
diff --git a/src/lib/server/db/schema/hsk.ts b/src/lib/server/db/schema/hsk.ts
index 71457b0..42ea1b6 100644
--- a/src/lib/server/db/schema/hsk.ts
+++ b/src/lib/server/db/schema/hsk.ts
@@ -2,7 +2,7 @@ import type { ColumnType, Generated } from "kysely";
 
 export type HskState = "active";
 
-interface HskTable {
+export interface HskTable {
   user_id: number;
   version: number;
   state: HskState;
@@ -10,7 +10,7 @@ interface HskTable {
   encrypted_key: string; // Base64
 }
 
-interface HskLogTable {
+export interface HskLogTable {
   id: Generated<number>;
   user_id: number;
   hmac_secret_key_version: number;
diff --git a/src/lib/server/db/schema/index.ts b/src/lib/server/db/schema/index.ts
index 7a13395..5c31e5f 100644
--- a/src/lib/server/db/schema/index.ts
+++ b/src/lib/server/db/schema/index.ts
@@ -1,5 +1,6 @@
 export * from "./category";
 export * from "./client";
+export * from "./directory";
 export * from "./file";
 export * from "./hsk";
 export * from "./media";
diff --git a/src/lib/server/db/schema/media.ts b/src/lib/server/db/schema/media.ts
index 1fef90b..97645df 100644
--- a/src/lib/server/db/schema/media.ts
+++ b/src/lib/server/db/schema/media.ts
@@ -1,6 +1,6 @@
 import type { Generated } from "kysely";
 
-interface ThumbnailTable {
+export interface ThumbnailTable {
   id: Generated<number>;
   directory_id: number | null;
   file_id: number | null;
diff --git a/src/lib/server/db/schema/mek.ts b/src/lib/server/db/schema/mek.ts
index d1b3c76..fce5ed1 100644
--- a/src/lib/server/db/schema/mek.ts
+++ b/src/lib/server/db/schema/mek.ts
@@ -2,13 +2,13 @@ import type { ColumnType, Generated } from "kysely";
 
 export type MekState = "active" | "retired" | "dead";
 
-interface MekTable {
+export interface MekTable {
   user_id: number;
   version: number;
   state: MekState;
 }
 
-interface MekLogTable {
+export interface MekLogTable {
   id: Generated<number>;
   user_id: number;
   master_encryption_key_version: number;
@@ -17,7 +17,7 @@ interface MekLogTable {
   action_by: number | null;
 }
 
-interface ClientMekTable {
+export interface ClientMekTable {
   user_id: number;
   client_id: number;
   version: number;
diff --git a/src/lib/server/db/schema/session.ts b/src/lib/server/db/schema/session.ts
index 301a879..3962691 100644
--- a/src/lib/server/db/schema/session.ts
+++ b/src/lib/server/db/schema/session.ts
@@ -1,6 +1,6 @@
 import type { ColumnType, Generated } from "kysely";
 
-interface SessionTable {
+export interface SessionTable {
   id: string;
   user_id: number;
   client_id: number | null;
@@ -10,7 +10,7 @@ interface SessionTable {
   last_used_by_agent: string | null;
 }
 
-interface SessionUpgradeChallengeTable {
+export interface SessionUpgradeChallengeTable {
   id: Generated<number>;
   session_id: string;
   client_id: number;
diff --git a/src/lib/server/db/schema/upload.ts b/src/lib/server/db/schema/upload.ts
index 5635921..b9c8510 100644
--- a/src/lib/server/db/schema/upload.ts
+++ b/src/lib/server/db/schema/upload.ts
@@ -1,7 +1,7 @@
 import type { Generated } from "kysely";
 import type { Ciphertext } from "./utils";
 
-interface UploadSessionTable {
+export interface UploadSessionTable {
   id: string;
   type: "file" | "thumbnail" | "migration";
   user_id: number;
diff --git a/src/lib/server/db/schema/user.ts b/src/lib/server/db/schema/user.ts
index a5f111f..9f1ebe0 100644
--- a/src/lib/server/db/schema/user.ts
+++ b/src/lib/server/db/schema/user.ts
@@ -1,6 +1,6 @@
 import type { Generated } from "kysely";
 
-interface UserTable {
+export interface UserTable {
   id: Generated<number>;
   email: string;
   nickname: string;
diff --git a/src/trpc/routers/directory.ts b/src/trpc/routers/directory.ts
index dfe5a3b..449d5b1 100644
--- a/src/trpc/routers/directory.ts
+++ b/src/trpc/routers/directory.ts
@@ -1,7 +1,7 @@
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
 import { DirectoryIdSchema } from "$lib/schemas";
-import { FileRepo, IntegrityError } from "$lib/server/db";
+import { DirectoryRepo, FileRepo, IntegrityError } from "$lib/server/db";
 import { safeUnlink } from "$lib/server/modules/filesystem";
 import { router, roleProcedure } from "../init.server";
 
@@ -14,13 +14,15 @@ const directoryRouter = router({
     )
     .query(async ({ ctx, input }) => {
       const directory =
-        input.id !== "root" ? await FileRepo.getDirectory(ctx.session.userId, input.id) : undefined;
+        input.id !== "root"
+          ? await DirectoryRepo.getDirectory(ctx.session.userId, input.id)
+          : undefined;
       if (directory === null) {
         throw new TRPCError({ code: "NOT_FOUND", message: "Invalid directory id" });
       }
 
       const [directories, files] = await Promise.all([
-        FileRepo.getAllDirectoriesByParent(ctx.session.userId, input.id),
+        DirectoryRepo.getAllDirectoriesByParent(ctx.session.userId, input.id),
         FileRepo.getAllFilesByParent(ctx.session.userId, input.id),
       ]);
       return {
@@ -78,7 +80,7 @@ const directoryRouter = router({
       }
 
       try {
-        await FileRepo.registerDirectory({
+        await DirectoryRepo.registerDirectory({
           parentId: input.parent,
           userId: ctx.session.userId,
           mekVersion: input.mekVersion,
@@ -105,7 +107,7 @@ const directoryRouter = router({
     )
     .mutation(async ({ ctx, input }) => {
       try {
-        await FileRepo.setDirectoryEncName(ctx.session.userId, input.id, input.dekVersion, {
+        await DirectoryRepo.setDirectoryEncName(ctx.session.userId, input.id, input.dekVersion, {
           ciphertext: input.name,
           iv: input.nameIv,
         });
@@ -129,7 +131,7 @@ const directoryRouter = router({
     )
     .mutation(async ({ ctx, input }) => {
       try {
-        const files = await FileRepo.unregisterDirectory(ctx.session.userId, input.id);
+        const files = await DirectoryRepo.unregisterDirectory(ctx.session.userId, input.id);
         return {
           deletedFiles: files.map((file) => {
             safeUnlink(file.path); // Intended
diff --git a/src/trpc/routers/favorites.ts b/src/trpc/routers/favorites.ts
index 8aba70b..18dc973 100644
--- a/src/trpc/routers/favorites.ts
+++ b/src/trpc/routers/favorites.ts
@@ -1,15 +1,24 @@
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
-import { FileRepo, IntegrityError } from "$lib/server/db";
+import { DirectoryRepo, FileRepo, IntegrityError } from "$lib/server/db";
 import { router, roleProcedure } from "../init.server";
 
 const favoritesRouter = router({
   get: roleProcedure["activeClient"].query(async ({ ctx }) => {
-    const [files, directories] = await Promise.all([
+    const [directories, files] = await Promise.all([
+      DirectoryRepo.getAllFavoriteDirectories(ctx.session.userId),
       FileRepo.getAllFavoriteFiles(ctx.session.userId),
-      FileRepo.getAllFavoriteDirectories(ctx.session.userId),
     ]);
     return {
+      directories: directories.map((directory) => ({
+        id: directory.id,
+        parent: directory.parentId,
+        mekVersion: directory.mekVersion,
+        dek: directory.encDek,
+        dekVersion: directory.dekVersion,
+        name: directory.encName.ciphertext,
+        nameIv: directory.encName.iv,
+      })),
       files: files.map((file) => ({
         id: file.id,
         parent: file.parentId,
@@ -24,18 +33,51 @@ const favoritesRouter = router({
         lastModifiedAt: file.encLastModifiedAt.ciphertext,
         lastModifiedAtIv: file.encLastModifiedAt.iv,
       })),
-      directories: directories.map((directory) => ({
-        id: directory.id,
-        parent: directory.parentId,
-        mekVersion: directory.mekVersion,
-        dek: directory.encDek,
-        dekVersion: directory.dekVersion,
-        name: directory.encName.ciphertext,
-        nameIv: directory.encName.iv,
-      })),
     };
   }),
 
+  addDirectory: roleProcedure["activeClient"]
+    .input(
+      z.object({
+        id: z.int().positive(),
+      }),
+    )
+    .mutation(async ({ ctx, input }) => {
+      try {
+        await DirectoryRepo.setDirectoryFavorite(ctx.session.userId, input.id, true);
+      } catch (e) {
+        if (e instanceof IntegrityError) {
+          if (e.message === "Directory not found") {
+            throw new TRPCError({ code: "NOT_FOUND", message: "Invalid directory id" });
+          } else if (e.message === "Directory already favorited") {
+            throw new TRPCError({ code: "BAD_REQUEST", message: e.message });
+          }
+        }
+        throw e;
+      }
+    }),
+
+  removeDirectory: roleProcedure["activeClient"]
+    .input(
+      z.object({
+        id: z.int().positive(),
+      }),
+    )
+    .mutation(async ({ ctx, input }) => {
+      try {
+        await DirectoryRepo.setDirectoryFavorite(ctx.session.userId, input.id, false);
+      } catch (e) {
+        if (e instanceof IntegrityError) {
+          if (e.message === "Directory not found") {
+            throw new TRPCError({ code: "NOT_FOUND", message: "Invalid directory id" });
+          } else if (e.message === "Directory not favorited") {
+            throw new TRPCError({ code: "BAD_REQUEST", message: e.message });
+          }
+        }
+        throw e;
+      }
+    }),
+
   addFile: roleProcedure["activeClient"]
     .input(
       z.object({
@@ -77,48 +119,6 @@ const favoritesRouter = router({
         throw e;
       }
     }),
-
-  addDirectory: roleProcedure["activeClient"]
-    .input(
-      z.object({
-        id: z.int().positive(),
-      }),
-    )
-    .mutation(async ({ ctx, input }) => {
-      try {
-        await FileRepo.setDirectoryFavorite(ctx.session.userId, input.id, true);
-      } catch (e) {
-        if (e instanceof IntegrityError) {
-          if (e.message === "Directory not found") {
-            throw new TRPCError({ code: "NOT_FOUND", message: "Invalid directory id" });
-          } else if (e.message === "Directory already favorited") {
-            throw new TRPCError({ code: "BAD_REQUEST", message: e.message });
-          }
-        }
-        throw e;
-      }
-    }),
-
-  removeDirectory: roleProcedure["activeClient"]
-    .input(
-      z.object({
-        id: z.int().positive(),
-      }),
-    )
-    .mutation(async ({ ctx, input }) => {
-      try {
-        await FileRepo.setDirectoryFavorite(ctx.session.userId, input.id, false);
-      } catch (e) {
-        if (e instanceof IntegrityError) {
-          if (e.message === "Directory not found") {
-            throw new TRPCError({ code: "NOT_FOUND", message: "Invalid directory id" });
-          } else if (e.message === "Directory not favorited") {
-            throw new TRPCError({ code: "BAD_REQUEST", message: e.message });
-          }
-        }
-        throw e;
-      }
-    }),
 });
 
 export default favoritesRouter;
diff --git a/src/trpc/routers/search.ts b/src/trpc/routers/search.ts
index 34e814d..07caeb2 100644
--- a/src/trpc/routers/search.ts
+++ b/src/trpc/routers/search.ts
@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { DirectoryIdSchema } from "$lib/schemas";
-import { FileRepo } from "$lib/server/db";
+import { DirectoryRepo, FileRepo } from "$lib/server/db";
 import { router, roleProcedure } from "../init.server";
 
 const searchRouter = router({
@@ -15,7 +15,7 @@ const searchRouter = router({
     .query(async ({ ctx, input }) => {
       const [directories, files] = await Promise.all([
         input.includeCategories.length === 0 && input.excludeCategories.length === 0
-          ? FileRepo.getAllRecursiveDirectoriesByParent(ctx.session.userId, input.ancestor)
+          ? DirectoryRepo.getAllRecursiveDirectoriesByParent(ctx.session.userId, input.ancestor)
           : [],
         FileRepo.searchFiles(ctx.session.userId, {
           parentId: input.ancestor,

From 63163d6279e5c3ce1dc56ad4365decc13c518a52 Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Sun, 18 Jan 2026 13:01:44 +0900
Subject: [PATCH 14/15] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=B0=8F=20?=
 =?UTF-8?q?=EB=94=94=EB=A0=89=ED=84=B0=EB=A6=AC=20=EB=A9=94=ED=83=80?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=B3=B5=ED=98=B8=ED=99=94=20?=
 =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/modules/filesystem/category.ts        |  3 +-
 src/lib/modules/filesystem/common.ts          | 50 -----------
 src/lib/modules/filesystem/directory.ts       | 29 +++++-
 src/lib/modules/filesystem/file.ts            | 36 +++++++-
 src/lib/modules/filesystem/index.ts           |  1 -
 ...stemCache.svelte.ts => internal.svelte.ts} | 60 ++++++++++++-
 src/routes/(fullscreen)/search/service.ts     | 41 +--------
 .../settings/migration/service.svelte.ts      | 28 +-----
 .../settings/thumbnail/service.ts             | 28 +-----
 src/routes/(main)/favorites/service.ts        | 90 ++++++++-----------
 10 files changed, 156 insertions(+), 210 deletions(-)
 delete mode 100644 src/lib/modules/filesystem/common.ts
 rename src/lib/modules/filesystem/{FilesystemCache.svelte.ts => internal.svelte.ts} (67%)

diff --git a/src/lib/modules/filesystem/category.ts b/src/lib/modules/filesystem/category.ts
index 041dbb1..16285ff 100644
--- a/src/lib/modules/filesystem/category.ts
+++ b/src/lib/modules/filesystem/category.ts
@@ -1,7 +1,6 @@
 import * as IndexedDB from "$lib/indexedDB";
 import { trpc, isTRPCClientError } from "$trpc/client";
-import { decryptFileMetadata, decryptCategoryMetadata } from "./common";
-import { FilesystemCache } from "./FilesystemCache.svelte";
+import { FilesystemCache, decryptFileMetadata, decryptCategoryMetadata } from "./internal.svelte";
 import type { CategoryInfo, MaybeCategoryInfo } from "./types";
 
 const cache = new FilesystemCache<CategoryId, MaybeCategoryInfo>({
diff --git a/src/lib/modules/filesystem/common.ts b/src/lib/modules/filesystem/common.ts
deleted file mode 100644
index dc3cc04..0000000
--- a/src/lib/modules/filesystem/common.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { unwrapDataKey, decryptString } from "$lib/modules/crypto";
-
-export const decryptDirectoryMetadata = async (
-  metadata: { dek: string; dekVersion: Date; name: string; nameIv: string },
-  masterKey: CryptoKey,
-) => {
-  const { dataKey } = await unwrapDataKey(metadata.dek, masterKey);
-  const name = await decryptString(metadata.name, metadata.nameIv, dataKey);
-
-  return {
-    dataKey: { key: dataKey, version: metadata.dekVersion },
-    name,
-  };
-};
-
-const decryptDate = async (ciphertext: string, iv: string, dataKey: CryptoKey) => {
-  return new Date(parseInt(await decryptString(ciphertext, iv, dataKey), 10));
-};
-
-export const decryptFileMetadata = async (
-  metadata: {
-    dek: string;
-    dekVersion: Date;
-    name: string;
-    nameIv: string;
-    createdAt?: string;
-    createdAtIv?: string;
-    lastModifiedAt: string;
-    lastModifiedAtIv: string;
-  },
-  masterKey: CryptoKey,
-) => {
-  const { dataKey } = await unwrapDataKey(metadata.dek, masterKey);
-  const [name, createdAt, lastModifiedAt] = await Promise.all([
-    decryptString(metadata.name, metadata.nameIv, dataKey),
-    metadata.createdAt
-      ? decryptDate(metadata.createdAt, metadata.createdAtIv!, dataKey)
-      : undefined,
-    decryptDate(metadata.lastModifiedAt, metadata.lastModifiedAtIv, dataKey),
-  ]);
-
-  return {
-    dataKey: { key: dataKey, version: metadata.dekVersion },
-    name,
-    createdAt,
-    lastModifiedAt,
-  };
-};
-
-export const decryptCategoryMetadata = decryptDirectoryMetadata;
diff --git a/src/lib/modules/filesystem/directory.ts b/src/lib/modules/filesystem/directory.ts
index 5626e31..e42b1aa 100644
--- a/src/lib/modules/filesystem/directory.ts
+++ b/src/lib/modules/filesystem/directory.ts
@@ -1,7 +1,6 @@
 import * as IndexedDB from "$lib/indexedDB";
 import { trpc, isTRPCClientError } from "$trpc/client";
-import { decryptDirectoryMetadata, decryptFileMetadata } from "./common";
-import { FilesystemCache, type FilesystemCacheOptions } from "./FilesystemCache.svelte";
+import { FilesystemCache, decryptDirectoryMetadata, decryptFileMetadata } from "./internal.svelte";
 import type { DirectoryInfo, MaybeDirectoryInfo } from "./types";
 
 const cache = new FilesystemCache<DirectoryId, MaybeDirectoryInfo>({
@@ -106,8 +105,30 @@ export const getDirectoryInfo = (
   id: DirectoryId,
   masterKey: CryptoKey,
   options?: {
-    fetchFromServer?: FilesystemCacheOptions<DirectoryId, MaybeDirectoryInfo>["fetchFromServer"];
+    serverResponse?: {
+      parent: DirectoryId;
+      dek: string;
+      dekVersion: Date;
+      name: string;
+      nameIv: string;
+      isFavorite: boolean;
+    };
   },
 ) => {
-  return cache.get(id, masterKey, options);
+  return cache.get(id, masterKey, {
+    fetchFromServer:
+      options?.serverResponse &&
+      (async (cachedValue) => {
+        const metadata = await decryptDirectoryMetadata(options!.serverResponse!, masterKey);
+        return storeToIndexedDB({
+          subDirectories: [],
+          files: [],
+          ...cachedValue,
+          id: id as number,
+          parentId: options!.serverResponse!.parent,
+          isFavorite: options!.serverResponse!.isFavorite,
+          ...metadata,
+        });
+      }),
+  });
 };
diff --git a/src/lib/modules/filesystem/file.ts b/src/lib/modules/filesystem/file.ts
index 3298f31..fdd2c8a 100644
--- a/src/lib/modules/filesystem/file.ts
+++ b/src/lib/modules/filesystem/file.ts
@@ -1,7 +1,6 @@
 import * as IndexedDB from "$lib/indexedDB";
 import { trpc, isTRPCClientError } from "$trpc/client";
-import { decryptFileMetadata, decryptCategoryMetadata } from "./common";
-import { FilesystemCache, type FilesystemCacheOptions } from "./FilesystemCache.svelte";
+import { FilesystemCache, decryptFileMetadata, decryptCategoryMetadata } from "./internal.svelte";
 import type { FileInfo, MaybeFileInfo } from "./types";
 
 const cache = new FilesystemCache<number, MaybeFileInfo>({
@@ -175,9 +174,38 @@ const bulkStoreToIndexedDB = (infos: FileInfo[]) => {
 export const getFileInfo = (
   id: number,
   masterKey: CryptoKey,
-  options?: { fetchFromServer?: FilesystemCacheOptions<number, MaybeFileInfo>["fetchFromServer"] },
+  options?: {
+    serverResponse?: {
+      parent: DirectoryId;
+      dek: string;
+      dekVersion: Date;
+      contentType: string;
+      name: string;
+      nameIv: string;
+      createdAt?: string;
+      createdAtIv?: string;
+      lastModifiedAt: string;
+      lastModifiedAtIv: string;
+      isFavorite: boolean;
+    };
+  },
 ) => {
-  return cache.get(id, masterKey, options);
+  return cache.get(id, masterKey, {
+    fetchFromServer:
+      options?.serverResponse &&
+      (async (cachedValue) => {
+        const metadata = await decryptFileMetadata(options!.serverResponse!, masterKey);
+        return storeToIndexedDB({
+          categories: [],
+          ...cachedValue,
+          id,
+          parentId: options!.serverResponse!.parent,
+          contentType: options!.serverResponse!.contentType,
+          isFavorite: options!.serverResponse!.isFavorite,
+          ...metadata,
+        });
+      }),
+  });
 };
 
 export const bulkGetFileInfo = (ids: number[], masterKey: CryptoKey) => {
diff --git a/src/lib/modules/filesystem/index.ts b/src/lib/modules/filesystem/index.ts
index 2d99afd..cb9e0f4 100644
--- a/src/lib/modules/filesystem/index.ts
+++ b/src/lib/modules/filesystem/index.ts
@@ -1,5 +1,4 @@
 export * from "./category";
-export * from "./common";
 export * from "./directory";
 export * from "./file";
 export * from "./types";
diff --git a/src/lib/modules/filesystem/FilesystemCache.svelte.ts b/src/lib/modules/filesystem/internal.svelte.ts
similarity index 67%
rename from src/lib/modules/filesystem/FilesystemCache.svelte.ts
rename to src/lib/modules/filesystem/internal.svelte.ts
index c84757d..30ba83b 100644
--- a/src/lib/modules/filesystem/FilesystemCache.svelte.ts
+++ b/src/lib/modules/filesystem/internal.svelte.ts
@@ -1,6 +1,7 @@
 import { untrack } from "svelte";
+import { unwrapDataKey, decryptString } from "$lib/modules/crypto";
 
-export interface FilesystemCacheOptions<K, V> {
+interface FilesystemCacheOptions<K, V> {
   fetchFromIndexedDB: (key: K) => Promise<V | undefined>;
   fetchFromServer: (key: K, cachedValue: V | undefined, masterKey: CryptoKey) => Promise<V>;
   bulkFetchFromIndexedDB?: (keys: Set<K>) => Promise<Map<K, V>>;
@@ -18,7 +19,7 @@ export class FilesystemCache<K, V extends object> {
   get(
     key: K,
     masterKey: CryptoKey,
-    options?: { fetchFromServer?: FilesystemCacheOptions<K, V>["fetchFromServer"] },
+    options?: { fetchFromServer?: (cachedValue: V | undefined) => Promise<V> },
   ) {
     return untrack(() => {
       let state = this.map.get(key);
@@ -42,8 +43,10 @@ export class FilesystemCache<K, V extends object> {
             return loadedInfo;
           })
       )
-        .then((cachedInfo) =>
-          (options?.fetchFromServer ?? this.options.fetchFromServer)(key, cachedInfo, masterKey),
+        .then(
+          (cachedInfo) =>
+            options?.fetchFromServer?.(cachedInfo) ??
+            this.options.fetchFromServer(key, cachedInfo, masterKey),
         )
         .then((loadedInfo) => {
           if (state.value) {
@@ -126,3 +129,52 @@ export class FilesystemCache<K, V extends object> {
     });
   }
 }
+
+export const decryptDirectoryMetadata = async (
+  metadata: { dek: string; dekVersion: Date; name: string; nameIv: string },
+  masterKey: CryptoKey,
+) => {
+  const { dataKey } = await unwrapDataKey(metadata.dek, masterKey);
+  const name = await decryptString(metadata.name, metadata.nameIv, dataKey);
+
+  return {
+    dataKey: { key: dataKey, version: metadata.dekVersion },
+    name,
+  };
+};
+
+const decryptDate = async (ciphertext: string, iv: string, dataKey: CryptoKey) => {
+  return new Date(parseInt(await decryptString(ciphertext, iv, dataKey), 10));
+};
+
+export const decryptFileMetadata = async (
+  metadata: {
+    dek: string;
+    dekVersion: Date;
+    name: string;
+    nameIv: string;
+    createdAt?: string;
+    createdAtIv?: string;
+    lastModifiedAt: string;
+    lastModifiedAtIv: string;
+  },
+  masterKey: CryptoKey,
+) => {
+  const { dataKey } = await unwrapDataKey(metadata.dek, masterKey);
+  const [name, createdAt, lastModifiedAt] = await Promise.all([
+    decryptString(metadata.name, metadata.nameIv, dataKey),
+    metadata.createdAt
+      ? decryptDate(metadata.createdAt, metadata.createdAtIv!, dataKey)
+      : undefined,
+    decryptDate(metadata.lastModifiedAt, metadata.lastModifiedAtIv, dataKey),
+  ]);
+
+  return {
+    dataKey: { key: dataKey, version: metadata.dekVersion },
+    name,
+    createdAt,
+    lastModifiedAt,
+  };
+};
+
+export const decryptCategoryMetadata = decryptDirectoryMetadata;
diff --git a/src/routes/(fullscreen)/search/service.ts b/src/routes/(fullscreen)/search/service.ts
index 3f250dc..d9c1e84 100644
--- a/src/routes/(fullscreen)/search/service.ts
+++ b/src/routes/(fullscreen)/search/service.ts
@@ -1,6 +1,4 @@
 import {
-  decryptDirectoryMetadata,
-  decryptFileMetadata,
   getDirectoryInfo,
   getFileInfo,
   type LocalDirectoryInfo,
@@ -30,49 +28,14 @@ export const requestSearch = async (filter: SearchFilter, masterKey: CryptoKey)
       .filter(({ type }) => type === "exclude")
       .map(({ info }) => info.id),
   });
-
   const [directories, files] = await HybridPromise.all([
     HybridPromise.all(
       directoriesRaw.map((directory) =>
-        HybridPromise.resolve(
-          getDirectoryInfo(directory.id, masterKey, {
-            async fetchFromServer(id, cachedInfo, masterKey) {
-              const metadata = await decryptDirectoryMetadata(directory, masterKey);
-              return {
-                subDirectories: [],
-                files: [],
-                ...cachedInfo,
-                id: id as number,
-                exists: true,
-                parentId: directory.parent,
-                ...metadata,
-                isFavorite: !!directory.isFavorite,
-              };
-            },
-          }),
-        ),
+        getDirectoryInfo(directory.id, masterKey, { serverResponse: directory }),
       ),
     ),
     HybridPromise.all(
-      filesRaw.map((file) =>
-        HybridPromise.resolve(
-          getFileInfo(file.id, masterKey, {
-            async fetchFromServer(id, cachedInfo, masterKey) {
-              const metadata = await decryptFileMetadata(file, masterKey);
-              return {
-                categories: [],
-                ...cachedInfo,
-                id: id as number,
-                exists: true,
-                parentId: file.parent,
-                contentType: file.contentType,
-                isFavorite: !!file.isFavorite,
-                ...metadata,
-              };
-            },
-          }),
-        ),
-      ),
+      filesRaw.map((file) => getFileInfo(file.id, masterKey, { serverResponse: file })),
     ),
   ]);
   return { directories, files } as SearchResult;
diff --git a/src/routes/(fullscreen)/settings/migration/service.svelte.ts b/src/routes/(fullscreen)/settings/migration/service.svelte.ts
index ae75463..cc4bc7f 100644
--- a/src/routes/(fullscreen)/settings/migration/service.svelte.ts
+++ b/src/routes/(fullscreen)/settings/migration/service.svelte.ts
@@ -1,12 +1,7 @@
 import { limitFunction } from "p-limit";
 import { SvelteMap } from "svelte/reactivity";
 import { CHUNK_SIZE } from "$lib/constants";
-import {
-  decryptFileMetadata,
-  getFileInfo,
-  type FileInfo,
-  type MaybeFileInfo,
-} from "$lib/modules/filesystem";
+import { getFileInfo, type FileInfo } from "$lib/modules/filesystem";
 import { uploadBlob } from "$lib/modules/upload";
 import { requestFileDownload } from "$lib/services/file";
 import { HybridPromise, Scheduler } from "$lib/utils";
@@ -35,26 +30,7 @@ export const requestLegacyFiles = async (
   masterKey: CryptoKey,
 ) => {
   const files = await HybridPromise.all(
-    filesRaw.map((file) =>
-      HybridPromise.resolve(
-        getFileInfo(file.id, masterKey, {
-          async fetchFromServer(id, cachedInfo, masterKey) {
-            const metadata = await decryptFileMetadata(file, masterKey);
-            return {
-              categories: [],
-              ...cachedInfo,
-              id: id as number,
-              exists: true,
-              isLegacy: file.isLegacy,
-              parentId: file.parent,
-              contentType: file.contentType,
-              isFavorite: file.isFavorite,
-              ...metadata,
-            };
-          },
-        }),
-      ),
-    ),
+    filesRaw.map((file) => getFileInfo(file.id, masterKey, { serverResponse: file })),
   );
   return files;
 };
diff --git a/src/routes/(fullscreen)/settings/thumbnail/service.ts b/src/routes/(fullscreen)/settings/thumbnail/service.ts
index e8dbf0c..138ccf1 100644
--- a/src/routes/(fullscreen)/settings/thumbnail/service.ts
+++ b/src/routes/(fullscreen)/settings/thumbnail/service.ts
@@ -1,12 +1,7 @@
 import { limitFunction } from "p-limit";
 import { SvelteMap } from "svelte/reactivity";
 import { storeFileThumbnailCache } from "$lib/modules/file";
-import {
-  decryptFileMetadata,
-  getFileInfo,
-  type FileInfo,
-  type MaybeFileInfo,
-} from "$lib/modules/filesystem";
+import { getFileInfo, type FileInfo } from "$lib/modules/filesystem";
 import { generateThumbnail } from "$lib/modules/thumbnail";
 import { requestFileDownload, requestFileThumbnailUpload } from "$lib/services/file";
 import { HybridPromise, Scheduler } from "$lib/utils";
@@ -40,26 +35,7 @@ export const requestMissingThumbnailFiles = async (
   masterKey: CryptoKey,
 ) => {
   const files = await HybridPromise.all(
-    filesRaw.map((file) =>
-      HybridPromise.resolve(
-        getFileInfo(file.id, masterKey, {
-          async fetchFromServer(id, cachedInfo, masterKey) {
-            const metadata = await decryptFileMetadata(file, masterKey);
-            return {
-              categories: [],
-              ...cachedInfo,
-              id: id as number,
-              exists: true,
-              isLegacy: file.isLegacy,
-              parentId: file.parent,
-              contentType: file.contentType,
-              isFavorite: file.isFavorite,
-              ...metadata,
-            };
-          },
-        }),
-      ),
-    ),
+    filesRaw.map((file) => getFileInfo(file.id, masterKey, { serverResponse: file })),
   );
   return files;
 };
diff --git a/src/routes/(main)/favorites/service.ts b/src/routes/(main)/favorites/service.ts
index 7717d1c..d02b85e 100644
--- a/src/routes/(main)/favorites/service.ts
+++ b/src/routes/(main)/favorites/service.ts
@@ -1,9 +1,9 @@
 import {
-  decryptDirectoryMetadata,
-  decryptFileMetadata,
+  getDirectoryInfo,
   getFileInfo,
   type SummarizedFileInfo,
   type SubDirectoryInfo,
+  type LocalDirectoryInfo,
 } from "$lib/modules/filesystem";
 import { HybridPromise, sortEntries } from "$lib/utils";
 import { trpc } from "$trpc/client";
@@ -16,59 +16,41 @@ export type FavoriteEntry =
 export const requestFavoriteEntries = async (
   favorites: RouterOutputs["favorites"]["get"],
   masterKey: CryptoKey,
-): Promise<FavoriteEntry[]> => {
-  const directories: FavoriteEntry[] = await Promise.all(
-    favorites.directories.map(async (dir) => {
-      const metadata = await decryptDirectoryMetadata(dir, masterKey);
-      return {
-        type: "directory" as const,
-        name: metadata.name,
-        details: {
-          id: dir.id,
-          parentId: dir.parent,
-          isFavorite: true,
-          dataKey: metadata.dataKey,
-          name: metadata.name,
-        } as SubDirectoryInfo,
-      };
-    }),
-  );
-
-  const fileResults = await Promise.all(
-    favorites.files.map(async (file) => {
-      const result = await HybridPromise.resolve(
-        getFileInfo(file.id, masterKey, {
-          async fetchFromServer(id, cachedInfo) {
-            const metadata = await decryptFileMetadata(file, masterKey);
-            return {
-              categories: [],
-              ...cachedInfo,
-              id: id as number,
-              exists: true,
-              parentId: file.parent,
-              contentType: file.contentType,
-              isFavorite: true,
-              ...metadata,
-            };
-          },
+) => {
+  const [directories, files] = await HybridPromise.all([
+    HybridPromise.all(
+      favorites.directories.map((directory) =>
+        getDirectoryInfo(directory.id, masterKey, {
+          serverResponse: { ...directory, isFavorite: true },
         }),
-      );
-      if (result?.exists) {
-        return {
-          type: "file" as const,
-          name: result.name,
-          details: result as SummarizedFileInfo,
-        };
-      }
-      return null;
-    }),
-  );
-
-  const files = fileResults.filter(
-    (f): f is { type: "file"; name: string; details: SummarizedFileInfo } => f !== null,
-  );
-
-  return [...sortEntries(directories), ...sortEntries(files)];
+      ),
+    ),
+    HybridPromise.all(
+      favorites.files.map((file) =>
+        getFileInfo(file.id, masterKey, { serverResponse: { ...file, isFavorite: true } }),
+      ),
+    ),
+  ]);
+  return [
+    ...sortEntries(
+      directories.map(
+        (directory): FavoriteEntry => ({
+          type: "directory",
+          name: directory.name!,
+          details: directory as LocalDirectoryInfo,
+        }),
+      ),
+    ),
+    ...sortEntries(
+      files.map(
+        (file): FavoriteEntry => ({
+          type: "file",
+          name: file.name!,
+          details: file as SummarizedFileInfo,
+        }),
+      ),
+    ),
+  ];
 };
 
 export const requestRemoveFavorite = async (type: "file" | "directory", id: number) => {

From 72babc532fab5f06e2074456981bed9d37102d73 Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Sun, 18 Jan 2026 13:29:06 +0900
Subject: [PATCH 15/15] =?UTF-8?q?=EA=B2=80=EC=83=89=20=ED=95=84=ED=84=B0?=
 =?UTF-8?q?=EC=97=90=20=EC=A6=90=EA=B2=A8=EC=B0=BE=EA=B8=B0=20=EC=97=AC?=
 =?UTF-8?q?=EB=B6=80=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/indexedDB/cacheIndex.ts              |  7 +++++-
 src/lib/indexedDB/filesystem.ts              | 23 +++++++++++++++++---
 src/routes/(fullscreen)/search/+page.svelte  | 14 ++++++++++--
 src/routes/(fullscreen)/search/+page.ts      |  5 ++++-
 src/routes/(main)/favorites/+page.svelte     | 15 +++++++++++--
 src/routes/(main)/favorites/Directory.svelte |  2 +-
 src/routes/(main)/favorites/File.svelte      |  2 +-
 7 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/src/lib/indexedDB/cacheIndex.ts b/src/lib/indexedDB/cacheIndex.ts
index c820007..1602c8c 100644
--- a/src/lib/indexedDB/cacheIndex.ts
+++ b/src/lib/indexedDB/cacheIndex.ts
@@ -20,7 +20,12 @@ export const getFileCacheIndex = async () => {
 };
 
 export const storeFileCacheIndex = async (fileCacheIndex: FileCacheIndex) => {
-  await cacheIndex.fileCache.put(fileCacheIndex);
+  await cacheIndex.fileCache.put({
+    fileId: fileCacheIndex.fileId,
+    cachedAt: fileCacheIndex.cachedAt,
+    lastRetrievedAt: fileCacheIndex.lastRetrievedAt,
+    size: fileCacheIndex.size,
+  });
 };
 
 export const deleteFileCacheIndex = async (fileId: number) => {
diff --git a/src/lib/indexedDB/filesystem.ts b/src/lib/indexedDB/filesystem.ts
index daaf100..937fe92 100644
--- a/src/lib/indexedDB/filesystem.ts
+++ b/src/lib/indexedDB/filesystem.ts
@@ -74,7 +74,11 @@ export const getDirectoryInfo = async (id: number) => {
 };
 
 export const storeDirectoryInfo = async (directoryInfo: DirectoryInfo) => {
-  await filesystem.directory.upsert(directoryInfo.id, { ...directoryInfo });
+  await filesystem.directory.upsert(directoryInfo.id, {
+    parentId: directoryInfo.parentId,
+    name: directoryInfo.name,
+    isFavorite: directoryInfo.isFavorite,
+  });
 };
 
 export const deleteDirectoryInfo = async (id: number) => {
@@ -108,7 +112,15 @@ export const bulkGetFileInfos = async (ids: number[]) => {
 };
 
 export const storeFileInfo = async (fileInfo: FileInfo) => {
-  await filesystem.file.upsert(fileInfo.id, { ...fileInfo });
+  await filesystem.file.upsert(fileInfo.id, {
+    parentId: fileInfo.parentId,
+    name: fileInfo.name,
+    contentType: fileInfo.contentType,
+    createdAt: fileInfo.createdAt,
+    lastModifiedAt: fileInfo.lastModifiedAt,
+    categoryIds: fileInfo.categoryIds,
+    isFavorite: fileInfo.isFavorite,
+  });
 };
 
 export const deleteFileInfo = async (id: number) => {
@@ -135,7 +147,12 @@ export const getCategoryInfo = async (id: number) => {
 };
 
 export const storeCategoryInfo = async (categoryInfo: CategoryInfo) => {
-  await filesystem.category.upsert(categoryInfo.id, { ...categoryInfo });
+  await filesystem.category.upsert(categoryInfo.id, {
+    parentId: categoryInfo.parentId,
+    name: categoryInfo.name,
+    files: categoryInfo.files,
+    isFileRecursive: categoryInfo.isFileRecursive,
+  });
 };
 
 export const updateCategoryInfo = async (id: number, changes: { isFileRecursive?: boolean }) => {
diff --git a/src/routes/(fullscreen)/search/+page.svelte b/src/routes/(fullscreen)/search/+page.svelte
index c1296db..ef0c447 100644
--- a/src/routes/(fullscreen)/search/+page.svelte
+++ b/src/routes/(fullscreen)/search/+page.svelte
@@ -25,6 +25,7 @@
     includeImages: boolean;
     includeVideos: boolean;
     includeDirectories: boolean;
+    searchInFavorites: boolean;
     searchInDirectory: boolean;
     categories: SearchFilter["categories"];
   }
@@ -36,6 +37,7 @@
     includeImages: false,
     includeVideos: false,
     includeDirectories: false,
+    searchInFavorites: false,
     searchInDirectory: false,
     categories: [],
   });
@@ -45,6 +47,7 @@
       filters.includeImages ||
       filters.includeVideos ||
       filters.includeDirectories ||
+      filters.searchInFavorites ||
       filters.name.trim().length > 0,
   );
 
@@ -81,7 +84,9 @@
 
     return sortEntries(
       [...directories, ...files].filter(
-        ({ name }) => !nameFilter || searchString(name, nameFilter),
+        (entry) =>
+          (!nameFilter || searchString(entry.name, nameFilter)) &&
+          (!filters.searchInFavorites || entry.isFavorite),
       ),
     );
   });
@@ -118,7 +123,7 @@
     },
   };
 
-  $effect(() => {
+  $effect.pre(() => {
     if (data.directoryId) {
       HybridPromise.resolve(getDirectoryInfo(data.directoryId, $masterKeyStore?.get(1)?.key!)).then(
         (res) => {
@@ -132,6 +137,10 @@
     }
   });
 
+  $effect.pre(() => {
+    filters.searchInFavorites = data.fromFavorites;
+  });
+
   $effect(() => {
     // Svelte sucks
     hasAnyFilter;
@@ -172,6 +181,7 @@
           {#if !hasCategoryFilter}
             <Chip bind:selected={filters.includeDirectories}>폴더</Chip>
           {/if}
+          <Chip bind:selected={filters.searchInFavorites}>즐겨찾기</Chip>
           {#if directoryInfo?.exists}
             <Chip bind:selected={filters.searchInDirectory}>
               위치: {directoryInfo.name}
diff --git a/src/routes/(fullscreen)/search/+page.ts b/src/routes/(fullscreen)/search/+page.ts
index f570304..6bf5a8e 100644
--- a/src/routes/(fullscreen)/search/+page.ts
+++ b/src/routes/(fullscreen)/search/+page.ts
@@ -4,15 +4,18 @@ import type { PageLoad } from "./$types";
 
 export const load: PageLoad = ({ url }) => {
   const directoryId = url.searchParams.get("directoryId");
+  const from = url.searchParams.get("from");
 
   const zodRes = z
     .object({
       directoryId: z.coerce.number().int().positive().nullable(),
+      from: z.enum(["favorites"]).nullable(),
     })
-    .safeParse({ directoryId });
+    .safeParse({ directoryId, from });
   if (!zodRes.success) error(400, "Invalid query parameters");
 
   return {
     directoryId: zodRes.data.directoryId,
+    fromFavorites: zodRes.data.from === "favorites",
   };
 };
diff --git a/src/routes/(main)/favorites/+page.svelte b/src/routes/(main)/favorites/+page.svelte
index 20d2a97..5c4c16d 100644
--- a/src/routes/(main)/favorites/+page.svelte
+++ b/src/routes/(main)/favorites/+page.svelte
@@ -2,11 +2,14 @@
   import { onMount } from "svelte";
   import { goto } from "$app/navigation";
   import { RowVirtualizer } from "$lib/components/atoms";
+  import { TopBar } from "$lib/components/molecules";
   import { masterKeyStore } from "$lib/stores";
   import Directory from "./Directory.svelte";
   import File from "./File.svelte";
   import { requestFavoriteEntries, requestRemoveFavorite, type FavoriteEntry } from "./service";
 
+  import IconSearch from "~icons/material-symbols/search";
+
   let { data } = $props();
 
   let entries: FavoriteEntry[] = $state([]);
@@ -41,14 +44,22 @@
   <title>즐겨찾기</title>
 </svelte:head>
 
-<div class="flex h-full flex-col p-4">
+<TopBar title="즐겨찾기" showBackButton={false}>
+  <button
+    onclick={() => goto("/search?from=favorites")}
+    class="w-full rounded-full p-1 text-2xl active:bg-black active:bg-opacity-[0.04]"
+  >
+    <IconSearch />
+  </button>
+</TopBar>
+<div class="flex h-full flex-col p-4 !pt-0">
   {#if isLoading}
     <div class="flex flex-grow items-center justify-center">
       <p class="text-gray-500">
         {#if data.favorites.files.length === 0 && data.favorites.directories.length === 0}
           즐겨찾기한 항목이 없어요.
         {:else}
-          로딩 중...
+          즐겨찾기 목록을 불러오고 있어요.
         {/if}
       </p>
     </div>
diff --git a/src/routes/(main)/favorites/Directory.svelte b/src/routes/(main)/favorites/Directory.svelte
index ae1ab13..9415478 100644
--- a/src/routes/(main)/favorites/Directory.svelte
+++ b/src/routes/(main)/favorites/Directory.svelte
@@ -20,5 +20,5 @@
   actionButtonIcon={IconClose}
   onActionButtonClick={onRemoveClick}
 >
-  <DirectoryEntryLabel type="directory" name={info.name} />
+  <DirectoryEntryLabel type="directory" name={info.name} isFavorite />
 </ActionEntryButton>
diff --git a/src/routes/(main)/favorites/File.svelte b/src/routes/(main)/favorites/File.svelte
index 78015d7..54fd07d 100644
--- a/src/routes/(main)/favorites/File.svelte
+++ b/src/routes/(main)/favorites/File.svelte
@@ -23,5 +23,5 @@
   actionButtonIcon={IconClose}
   onActionButtonClick={onRemoveClick}
 >
-  <DirectoryEntryLabel type="file" thumbnail={$thumbnail} name={info.name} />
+  <DirectoryEntryLabel type="file" thumbnail={$thumbnail} name={info.name} isFavorite />
 </ActionEntryButton>